From db09326a76bd2635dc9502ec68e366507c992f64 Mon Sep 17 00:00:00 2001 From: mappu Date: Wed, 18 Sep 2024 12:12:02 +1200 Subject: [PATCH] qt: rebuild (more accurate enum/typedef handling) --- qt/gen_qabstractanimation.cpp | 28 +-- qt/gen_qabstractanimation.go | 12 +- qt/gen_qabstractanimation.h | 12 +- qt/gen_qabstracteventdispatcher.cpp | 6 +- qt/gen_qabstracteventdispatcher.go | 8 +- qt/gen_qabstracteventdispatcher.h | 6 +- qt/gen_qabstractitemdelegate.cpp | 6 +- qt/gen_qabstractitemdelegate.go | 6 +- qt/gen_qabstractitemdelegate.h | 4 +- qt/gen_qabstractitemmodel.cpp | 30 +-- qt/gen_qabstractitemmodel.go | 34 ++-- qt/gen_qabstractitemmodel.h | 24 +-- qt/gen_qabstractitemview.cpp | 46 ++--- qt/gen_qabstractitemview.go | 20 +- qt/gen_qabstractitemview.h | 32 +-- qt/gen_qabstractproxymodel.cpp | 14 +- qt/gen_qabstractproxymodel.go | 14 +- qt/gen_qabstractproxymodel.h | 14 +- qt/gen_qabstractscrollarea.cpp | 18 +- qt/gen_qabstractscrollarea.go | 10 +- qt/gen_qabstractscrollarea.h | 12 +- qt/gen_qabstractslider.cpp | 8 +- qt/gen_qabstractslider.go | 4 +- qt/gen_qabstractslider.h | 6 +- qt/gen_qabstractspinbox.cpp | 18 +- qt/gen_qabstractspinbox.go | 8 +- qt/gen_qabstractspinbox.h | 12 +- qt/gen_qabstracttextdocumentlayout.cpp | 10 +- qt/gen_qabstracttextdocumentlayout.go | 10 +- qt/gen_qabstracttextdocumentlayout.h | 4 +- qt/gen_qabstracttransition.cpp | 10 +- qt/gen_qabstracttransition.go | 2 +- qt/gen_qabstracttransition.h | 4 +- qt/gen_qaccessible.cpp | 51 +++-- qt/gen_qaccessible.go | 24 ++- qt/gen_qaccessible.h | 27 +-- qt/gen_qaccessibleobject.cpp | 8 +- qt/gen_qaccessibleobject.go | 4 +- qt/gen_qaccessibleobject.h | 6 +- qt/gen_qaccessiblewidget.cpp | 10 +- qt/gen_qaccessiblewidget.go | 6 +- qt/gen_qaccessiblewidget.h | 8 +- qt/gen_qaction.cpp | 26 +-- qt/gen_qaction.go | 10 +- qt/gen_qaction.h | 16 +- qt/gen_qactiongroup.cpp | 8 +- qt/gen_qactiongroup.go | 2 +- qt/gen_qactiongroup.h | 4 +- qt/gen_qapplication.cpp | 6 +- qt/gen_qapplication.go | 6 +- qt/gen_qapplication.h | 6 +- qt/gen_qarraydata.cpp | 4 +- qt/gen_qarraydata.go | 4 +- qt/gen_qarraydata.h | 2 +- qt/gen_qbasictimer.cpp | 2 +- qt/gen_qbasictimer.go | 2 +- qt/gen_qbasictimer.h | 2 +- qt/gen_qbitmap.cpp | 2 +- qt/gen_qbitmap.go | 4 +- qt/gen_qbitmap.h | 2 +- qt/gen_qboxlayout.cpp | 10 +- qt/gen_qboxlayout.go | 10 +- qt/gen_qboxlayout.h | 8 +- qt/gen_qbrush.cpp | 58 +++--- qt/gen_qbrush.go | 26 ++- qt/gen_qbrush.h | 33 +-- qt/gen_qbuffer.cpp | 6 +- qt/gen_qbuffer.go | 2 +- qt/gen_qbuttongroup.cpp | 2 +- qt/gen_qbytearray.cpp | 107 ++++++---- qt/gen_qbytearray.go | 16 +- qt/gen_qbytearray.h | 19 +- qt/gen_qcalendar.cpp | 10 +- qt/gen_qcalendar.go | 10 +- qt/gen_qcalendar.h | 10 +- qt/gen_qcalendarwidget.cpp | 28 +-- qt/gen_qcalendarwidget.go | 12 +- qt/gen_qcalendarwidget.h | 20 +- qt/gen_qcborarray.cpp | 64 +++++- qt/gen_qcborarray.go | 56 +++++- qt/gen_qcborarray.h | 18 +- qt/gen_qcbormap.cpp | 64 +++++- qt/gen_qcbormap.go | 56 +++++- qt/gen_qcbormap.h | 18 +- qt/gen_qcborstreamreader.cpp | 39 ++-- qt/gen_qcborstreamreader.go | 8 +- qt/gen_qcborstreamreader.h | 12 +- qt/gen_qcborstreamwriter.cpp | 16 +- qt/gen_qcborstreamwriter.go | 8 +- qt/gen_qcborstreamwriter.h | 8 +- qt/gen_qcborvalue.cpp | 80 ++++---- qt/gen_qcborvalue.go | 40 ++-- qt/gen_qcborvalue.h | 32 +-- qt/gen_qchar.cpp | 101 ++++++---- qt/gen_qchar.go | 2 +- qt/gen_qchar.h | 32 +-- qt/gen_qcheckbox.cpp | 6 +- qt/gen_qcheckbox.go | 2 +- qt/gen_qcheckbox.h | 4 +- qt/gen_qclipboard.cpp | 24 +-- qt/gen_qclipboard.go | 24 +-- qt/gen_qclipboard.h | 22 +- qt/gen_qcollator.cpp | 6 +- qt/gen_qcollator.go | 2 +- qt/gen_qcollator.h | 4 +- qt/gen_qcolor.cpp | 72 ++++--- qt/gen_qcolor.go | 14 +- qt/gen_qcolor.h | 16 +- qt/gen_qcolordialog.cpp | 18 +- qt/gen_qcolordialog.go | 10 +- qt/gen_qcolordialog.h | 6 +- qt/gen_qcolormap.cpp | 7 +- qt/gen_qcolormap.h | 2 +- qt/gen_qcolorspace.cpp | 30 +-- qt/gen_qcolorspace.go | 22 +- qt/gen_qcolorspace.h | 26 +-- qt/gen_qcolortransform.cpp | 3 +- qt/gen_qcolumnview.cpp | 2 +- qt/gen_qcolumnview.go | 2 +- qt/gen_qcolumnview.h | 2 +- qt/gen_qcombobox.cpp | 22 +- qt/gen_qcombobox.go | 14 +- qt/gen_qcombobox.h | 16 +- qt/gen_qcommandlineoption.go | 2 +- qt/gen_qcommandlineparser.cpp | 4 +- qt/gen_qcommandlineparser.go | 4 +- qt/gen_qcommandlineparser.h | 4 +- qt/gen_qcommonstyle.cpp | 66 +++--- qt/gen_qcommonstyle.go | 62 +++--- qt/gen_qcommonstyle.h | 62 +++--- qt/gen_qcompleter.cpp | 18 +- qt/gen_qcompleter.go | 8 +- qt/gen_qcompleter.h | 12 +- qt/gen_qconcatenatetablesproxymodel.cpp | 10 +- qt/gen_qconcatenatetablesproxymodel.go | 8 +- qt/gen_qconcatenatetablesproxymodel.h | 8 +- qt/gen_qcoreapplication.cpp | 9 +- qt/gen_qcoreapplication.go | 10 +- qt/gen_qcoreapplication.h | 6 +- qt/gen_qcoreevent.cpp | 8 +- qt/gen_qcoreevent.go | 4 +- qt/gen_qcoreevent.h | 6 +- qt/gen_qcryptographichash.cpp | 6 +- qt/gen_qcryptographichash.go | 6 +- qt/gen_qcryptographichash.h | 6 +- qt/gen_qcursor.cpp | 12 +- qt/gen_qcursor.go | 8 +- qt/gen_qcursor.h | 10 +- qt/gen_qdatastream.cpp | 18 +- qt/gen_qdatastream.go | 8 +- qt/gen_qdatastream.h | 12 +- qt/gen_qdatawidgetmapper.cpp | 12 +- qt/gen_qdatawidgetmapper.go | 4 +- qt/gen_qdatawidgetmapper.h | 8 +- qt/gen_qdatetime.cpp | 84 ++++---- qt/gen_qdatetime.go | 52 ++--- qt/gen_qdatetime.h | 52 ++--- qt/gen_qdatetimeedit.cpp | 20 +- qt/gen_qdatetimeedit.go | 8 +- qt/gen_qdatetimeedit.h | 14 +- qt/gen_qdeadlinetimer.cpp | 36 ++-- qt/gen_qdeadlinetimer.go | 20 +- qt/gen_qdeadlinetimer.h | 22 +- qt/gen_qdial.cpp | 3 +- qt/gen_qdialog.cpp | 6 +- qt/gen_qdialog.go | 4 +- qt/gen_qdialog.h | 4 +- qt/gen_qdialogbuttonbox.cpp | 32 +-- qt/gen_qdialogbuttonbox.go | 24 +-- qt/gen_qdialogbuttonbox.h | 24 +-- qt/gen_qdir.cpp | 3 +- qt/gen_qdir.go | 26 +-- qt/gen_qdiriterator.go | 12 +- qt/gen_qdirmodel.cpp | 8 +- qt/gen_qdirmodel.go | 16 +- qt/gen_qdirmodel.h | 8 +- qt/gen_qdockwidget.cpp | 6 +- qt/gen_qdockwidget.go | 18 +- qt/gen_qdockwidget.h | 4 +- qt/gen_qdrag.cpp | 32 +-- qt/gen_qdrag.go | 14 +- qt/gen_qdrag.h | 18 +- qt/gen_qdrawutil.cpp | 4 +- qt/gen_qdrawutil.go | 4 +- qt/gen_qdrawutil.h | 4 +- qt/gen_qeasingcurve.cpp | 20 +- qt/gen_qeasingcurve.go | 4 +- qt/gen_qeasingcurve.h | 6 +- qt/gen_qelapsedtimer.cpp | 22 +- qt/gen_qelapsedtimer.h | 2 +- qt/gen_qevent.cpp | 254 ++++++++++++++---------- qt/gen_qevent.go | 164 +++++++++------ qt/gen_qevent.h | 144 +++++++------- qt/gen_qeventloop.go | 6 +- qt/gen_qeventtransition.cpp | 10 +- qt/gen_qeventtransition.go | 6 +- qt/gen_qeventtransition.h | 8 +- qt/gen_qexception.cpp | 4 + qt/gen_qexception.go | 4 + qt/gen_qexception.h | 1 + qt/gen_qfile.cpp | 3 +- qt/gen_qfile.go | 10 +- qt/gen_qfiledevice.cpp | 22 +- qt/gen_qfiledevice.go | 8 +- qt/gen_qfiledevice.h | 8 +- qt/gen_qfiledialog.cpp | 28 +-- qt/gen_qfiledialog.go | 28 +-- qt/gen_qfiledialog.h | 22 +- qt/gen_qfileiconprovider.cpp | 2 +- qt/gen_qfileiconprovider.go | 4 +- qt/gen_qfileiconprovider.h | 2 +- qt/gen_qfileinfo.cpp | 11 +- qt/gen_qfileinfo.go | 6 +- qt/gen_qfileinfo.h | 2 +- qt/gen_qfilesystemmodel.cpp | 17 +- qt/gen_qfilesystemmodel.go | 18 +- qt/gen_qfilesystemmodel.h | 14 +- qt/gen_qfont.cpp | 50 ++--- qt/gen_qfont.go | 14 +- qt/gen_qfont.h | 26 +-- qt/gen_qfontcombobox.cpp | 6 +- qt/gen_qfontcombobox.go | 4 +- qt/gen_qfontcombobox.h | 4 +- qt/gen_qfontdatabase.cpp | 16 +- qt/gen_qfontdatabase.go | 12 +- qt/gen_qfontdatabase.h | 8 +- qt/gen_qfontdialog.cpp | 6 +- qt/gen_qfontdialog.go | 10 +- qt/gen_qfontdialog.h | 6 +- qt/gen_qfontinfo.cpp | 11 +- qt/gen_qfontinfo.h | 4 +- qt/gen_qfontmetrics.cpp | 80 +++++--- qt/gen_qfontmetrics.go | 8 +- qt/gen_qfontmetrics.h | 8 +- qt/gen_qformlayout.cpp | 6 +- qt/gen_qformlayout.go | 6 +- qt/gen_qformlayout.h | 4 +- qt/gen_qframe.cpp | 12 +- qt/gen_qframe.go | 6 +- qt/gen_qframe.h | 8 +- qt/gen_qfutureinterface.cpp | 17 +- qt/gen_qfutureinterface.go | 12 +- qt/gen_qfutureinterface.h | 12 +- qt/gen_qgesture.cpp | 62 +++--- qt/gen_qgesture.go | 16 +- qt/gen_qgesture.h | 22 +- qt/gen_qgesturerecognizer.cpp | 6 +- qt/gen_qgesturerecognizer.go | 2 +- qt/gen_qgesturerecognizer.h | 4 +- qt/gen_qglyphrun.cpp | 6 +- qt/gen_qglyphrun.go | 6 +- qt/gen_qglyphrun.h | 4 +- qt/gen_qgraphicsanchorlayout.cpp | 21 +- qt/gen_qgraphicsanchorlayout.go | 10 +- qt/gen_qgraphicsanchorlayout.h | 10 +- qt/gen_qgraphicseffect.cpp | 30 ++- qt/gen_qgraphicseffect.go | 4 +- qt/gen_qgraphicsgridlayout.cpp | 34 ++-- qt/gen_qgraphicsgridlayout.go | 14 +- qt/gen_qgraphicsgridlayout.h | 4 +- qt/gen_qgraphicsitem.cpp | 85 ++++---- qt/gen_qgraphicsitem.go | 38 ++-- qt/gen_qgraphicsitem.h | 40 ++-- qt/gen_qgraphicsitemanimation.cpp | 21 +- qt/gen_qgraphicslayoutitem.cpp | 26 ++- qt/gen_qgraphicslayoutitem.go | 8 +- qt/gen_qgraphicslayoutitem.h | 8 +- qt/gen_qgraphicslinearlayout.cpp | 20 +- qt/gen_qgraphicslinearlayout.go | 12 +- qt/gen_qgraphicslinearlayout.h | 12 +- qt/gen_qgraphicsproxywidget.go | 2 +- qt/gen_qgraphicsscene.cpp | 103 +++++----- qt/gen_qgraphicsscene.go | 56 +++--- qt/gen_qgraphicsscene.h | 50 ++--- qt/gen_qgraphicssceneevent.cpp | 62 +++--- qt/gen_qgraphicssceneevent.go | 58 +++--- qt/gen_qgraphicssceneevent.h | 50 ++--- qt/gen_qgraphicstransform.cpp | 14 +- qt/gen_qgraphicstransform.go | 2 +- qt/gen_qgraphicstransform.h | 2 +- qt/gen_qgraphicsview.cpp | 72 +++---- qt/gen_qgraphicsview.go | 44 ++-- qt/gen_qgraphicsview.h | 44 ++-- qt/gen_qgraphicswidget.cpp | 26 +-- qt/gen_qgraphicswidget.go | 16 +- qt/gen_qgraphicswidget.h | 18 +- qt/gen_qgridlayout.cpp | 8 +- qt/gen_qgridlayout.go | 14 +- qt/gen_qgridlayout.h | 6 +- qt/gen_qguiapplication.cpp | 29 +-- qt/gen_qguiapplication.go | 12 +- qt/gen_qguiapplication.h | 14 +- qt/gen_qheaderview.cpp | 30 +-- qt/gen_qheaderview.go | 20 +- qt/gen_qheaderview.h | 22 +- qt/gen_qhistorystate.cpp | 10 +- qt/gen_qhistorystate.go | 6 +- qt/gen_qhistorystate.h | 8 +- qt/gen_qicon.cpp | 47 ++--- qt/gen_qicon.go | 48 ++--- qt/gen_qicon.h | 44 ++-- qt/gen_qiconengine.cpp | 24 ++- qt/gen_qiconengine.go | 24 ++- qt/gen_qiconengine.h | 18 +- qt/gen_qidentityproxymodel.cpp | 6 +- qt/gen_qidentityproxymodel.go | 8 +- qt/gen_qidentityproxymodel.h | 6 +- qt/gen_qimage.cpp | 93 +++++---- qt/gen_qimage.go | 52 ++--- qt/gen_qimage.h | 54 ++--- qt/gen_qimageiohandler.cpp | 6 +- qt/gen_qimageiohandler.go | 6 +- qt/gen_qimageiohandler.h | 6 +- qt/gen_qimagereader.cpp | 10 +- qt/gen_qimagereader.go | 2 +- qt/gen_qimagereader.h | 6 +- qt/gen_qimagewriter.cpp | 6 +- qt/gen_qimagewriter.go | 4 +- qt/gen_qimagewriter.h | 4 +- qt/gen_qinputdialog.cpp | 28 +-- qt/gen_qinputdialog.go | 38 ++-- qt/gen_qinputdialog.h | 24 +-- qt/gen_qinputmethod.cpp | 12 +- qt/gen_qinputmethod.go | 10 +- qt/gen_qinputmethod.h | 8 +- qt/gen_qiodevice.cpp | 39 ++-- qt/gen_qiodevice.go | 2 +- qt/gen_qitemselectionmodel.go | 4 +- qt/gen_qjsonarray.cpp | 56 +++++- qt/gen_qjsonarray.go | 48 ++++- qt/gen_qjsonarray.h | 16 +- qt/gen_qjsondocument.cpp | 6 +- qt/gen_qjsondocument.go | 6 +- qt/gen_qjsondocument.h | 6 +- qt/gen_qjsonobject.cpp | 56 +++++- qt/gen_qjsonobject.go | 48 ++++- qt/gen_qjsonobject.h | 16 +- qt/gen_qjsonvalue.cpp | 10 +- qt/gen_qjsonvalue.go | 2 +- qt/gen_qjsonvalue.h | 6 +- qt/gen_qkeyeventtransition.cpp | 4 +- qt/gen_qkeyeventtransition.go | 6 +- qt/gen_qkeyeventtransition.h | 4 +- qt/gen_qkeysequence.cpp | 18 +- qt/gen_qkeysequence.go | 14 +- qt/gen_qkeysequence.h | 16 +- qt/gen_qlabel.cpp | 10 +- qt/gen_qlabel.go | 14 +- qt/gen_qlabel.h | 8 +- qt/gen_qlayout.cpp | 6 +- qt/gen_qlayout.go | 8 +- qt/gen_qlayout.h | 4 +- qt/gen_qlayoutitem.cpp | 8 +- qt/gen_qlayoutitem.go | 10 +- qt/gen_qlayoutitem.h | 8 +- qt/gen_qlcdnumber.cpp | 12 +- qt/gen_qlcdnumber.go | 4 +- qt/gen_qlcdnumber.h | 8 +- qt/gen_qlibrary.go | 2 +- qt/gen_qlibraryinfo.cpp | 2 +- qt/gen_qlibraryinfo.go | 2 +- qt/gen_qlibraryinfo.h | 2 +- qt/gen_qline.cpp | 38 ++-- qt/gen_qline.go | 4 +- qt/gen_qline.h | 4 +- qt/gen_qlineedit.cpp | 20 +- qt/gen_qlineedit.go | 14 +- qt/gen_qlineedit.h | 16 +- qt/gen_qlistview.cpp | 32 +-- qt/gen_qlistview.go | 14 +- qt/gen_qlistview.h | 22 +- qt/gen_qlistwidget.cpp | 14 +- qt/gen_qlistwidget.go | 14 +- qt/gen_qlistwidget.h | 8 +- qt/gen_qlocale.cpp | 142 +++++++------ qt/gen_qlocale.go | 70 +++---- qt/gen_qlocale.h | 80 ++++---- qt/gen_qlockfile.cpp | 4 +- qt/gen_qlockfile.h | 2 +- qt/gen_qmainwindow.cpp | 50 ++--- qt/gen_qmainwindow.go | 32 +-- qt/gen_qmainwindow.h | 34 ++-- qt/gen_qmap.cpp | 6 +- qt/gen_qmap.go | 2 +- qt/gen_qmap.h | 4 +- qt/gen_qmargins.cpp | 12 +- qt/gen_qmatrix.cpp | 23 ++- qt/gen_qmatrix.go | 2 +- qt/gen_qmatrix.h | 2 +- qt/gen_qmatrix4x4.cpp | 2 +- qt/gen_qmatrix4x4.go | 2 +- qt/gen_qmatrix4x4.h | 2 +- qt/gen_qmdiarea.cpp | 36 ++-- qt/gen_qmdiarea.go | 18 +- qt/gen_qmdiarea.h | 24 +-- qt/gen_qmdisubwindow.cpp | 6 +- qt/gen_qmdisubwindow.go | 10 +- qt/gen_qmdisubwindow.h | 6 +- qt/gen_qmenubar.cpp | 4 +- qt/gen_qmenubar.go | 4 +- qt/gen_qmenubar.h | 4 +- qt/gen_qmessageauthenticationcode.cpp | 6 +- qt/gen_qmessageauthenticationcode.go | 6 +- qt/gen_qmessageauthenticationcode.h | 6 +- qt/gen_qmessagebox.cpp | 114 +++++------ qt/gen_qmessagebox.go | 64 +++--- qt/gen_qmessagebox.h | 76 +++---- qt/gen_qmetaobject.cpp | 56 +++--- qt/gen_qmetaobject.go | 44 ++-- qt/gen_qmetaobject.h | 50 ++--- qt/gen_qmetatype.cpp | 30 ++- qt/gen_qmetatype.go | 16 ++ qt/gen_qmetatype.h | 6 +- qt/gen_qmimedatabase.cpp | 4 +- qt/gen_qmimedatabase.go | 4 +- qt/gen_qmimedatabase.h | 4 +- qt/gen_qmouseeventtransition.cpp | 10 +- qt/gen_qmouseeventtransition.go | 8 +- qt/gen_qmouseeventtransition.h | 8 +- qt/gen_qmovie.cpp | 22 +- qt/gen_qmovie.go | 10 +- qt/gen_qmovie.h | 12 +- qt/gen_qmutex.cpp | 2 +- qt/gen_qmutex.go | 2 +- qt/gen_qmutex.h | 2 +- qt/gen_qobject.cpp | 9 +- qt/gen_qobject.go | 6 +- qt/gen_qobject.h | 6 +- qt/gen_qobjectdefs.cpp | 52 +++-- qt/gen_qobjectdefs.go | 52 +++-- qt/gen_qobjectdefs.h | 46 +++-- qt/gen_qoffscreensurface.cpp | 4 +- qt/gen_qoffscreensurface.h | 2 +- qt/gen_qoperatingsystemversion.cpp | 14 +- qt/gen_qoperatingsystemversion.go | 6 +- qt/gen_qoperatingsystemversion.h | 10 +- qt/gen_qpagedpaintdevice.cpp | 10 +- qt/gen_qpagedpaintdevice.go | 6 +- qt/gen_qpagedpaintdevice.h | 8 +- qt/gen_qpagelayout.cpp | 30 +-- qt/gen_qpagelayout.go | 18 +- qt/gen_qpagelayout.h | 24 +-- qt/gen_qpagesize.cpp | 60 +++--- qt/gen_qpagesize.go | 36 ++-- qt/gen_qpagesize.h | 44 ++-- qt/gen_qpaintdevice.cpp | 6 +- qt/gen_qpaintengine.cpp | 32 +-- qt/gen_qpaintengine.go | 14 +- qt/gen_qpaintengine.h | 12 +- qt/gen_qpainter.cpp | 69 +++---- qt/gen_qpainter.go | 70 +++---- qt/gen_qpainter.h | 60 +++--- qt/gen_qpainterpath.cpp | 50 +++-- qt/gen_qpainterpath.go | 12 +- qt/gen_qpainterpath.h | 18 +- qt/gen_qpalette.cpp | 36 ++-- qt/gen_qpalette.go | 26 +-- qt/gen_qpalette.h | 28 +-- qt/gen_qpdfwriter.cpp | 8 +- qt/gen_qpdfwriter.go | 4 +- qt/gen_qpdfwriter.h | 6 +- qt/gen_qpen.cpp | 37 ++-- qt/gen_qpen.go | 14 +- qt/gen_qpen.h | 20 +- qt/gen_qpicture.cpp | 3 +- qt/gen_qpixelformat.cpp | 79 +++++--- qt/gen_qpixelformat.go | 6 +- qt/gen_qpixelformat.h | 20 +- qt/gen_qpixmap.cpp | 34 ++-- qt/gen_qpixmap.go | 32 +-- qt/gen_qpixmap.h | 18 +- qt/gen_qpixmapcache.cpp | 4 + qt/gen_qpixmapcache.go | 4 + qt/gen_qpixmapcache.h | 1 + qt/gen_qplaintextedit.cpp | 25 +-- qt/gen_qplaintextedit.go | 22 +- qt/gen_qplaintextedit.h | 18 +- qt/gen_qpluginloader.go | 2 +- qt/gen_qpoint.cpp | 12 +- qt/gen_qprocess.cpp | 66 +++--- qt/gen_qprocess.go | 34 ++-- qt/gen_qprocess.h | 32 +-- qt/gen_qprogressbar.cpp | 12 +- qt/gen_qprogressbar.go | 6 +- qt/gen_qprogressbar.h | 8 +- qt/gen_qprogressdialog.go | 4 +- qt/gen_qproxystyle.cpp | 60 +++--- qt/gen_qproxystyle.go | 56 +++--- qt/gen_qproxystyle.h | 56 +++--- qt/gen_qquaternion.cpp | 2 +- qt/gen_qquaternion.go | 2 +- qt/gen_qquaternion.h | 2 +- qt/gen_qrandom.cpp | 45 +++-- qt/gen_qrandom.go | 12 +- qt/gen_qrandom.h | 12 +- qt/gen_qrawfont.cpp | 61 +++--- qt/gen_qrawfont.go | 20 +- qt/gen_qrawfont.h | 18 +- qt/gen_qreadwritelock.cpp | 2 +- qt/gen_qreadwritelock.go | 2 +- qt/gen_qreadwritelock.h | 2 +- qt/gen_qrect.cpp | 24 ++- qt/gen_qregexp.cpp | 20 +- qt/gen_qregexp.go | 12 +- qt/gen_qregexp.h | 16 +- qt/gen_qregion.cpp | 16 +- qt/gen_qregion.go | 4 +- qt/gen_qregion.h | 4 +- qt/gen_qregularexpression.cpp | 16 +- qt/gen_qregularexpression.go | 12 +- qt/gen_qregularexpression.h | 12 +- qt/gen_qresource.cpp | 13 +- qt/gen_qresource.h | 2 +- qt/gen_qresultstore.cpp | 4 + qt/gen_qresultstore.go | 4 + qt/gen_qresultstore.h | 1 + qt/gen_qrgba64.cpp | 30 ++- qt/gen_qrubberband.cpp | 8 +- qt/gen_qrubberband.go | 4 +- qt/gen_qrubberband.h | 6 +- qt/gen_qsavefile.go | 2 +- qt/gen_qscreen.cpp | 75 ++++--- qt/gen_qscreen.go | 20 +- qt/gen_qscreen.h | 20 +- qt/gen_qscrollarea.go | 2 +- qt/gen_qscrollbar.cpp | 4 +- qt/gen_qscrollbar.go | 4 +- qt/gen_qscrollbar.h | 4 +- qt/gen_qscroller.cpp | 26 +-- qt/gen_qscroller.go | 10 +- qt/gen_qscroller.h | 14 +- qt/gen_qscrollerproperties.cpp | 4 +- qt/gen_qscrollerproperties.go | 4 +- qt/gen_qscrollerproperties.h | 4 +- qt/gen_qsessionmanager.cpp | 6 +- qt/gen_qsessionmanager.go | 2 +- qt/gen_qsessionmanager.h | 4 +- qt/gen_qsettings.cpp | 40 ++-- qt/gen_qsettings.go | 24 +-- qt/gen_qsettings.h | 32 +-- qt/gen_qsharedmemory.cpp | 8 +- qt/gen_qsharedmemory.go | 4 +- qt/gen_qsharedmemory.h | 6 +- qt/gen_qshortcut.cpp | 8 +- qt/gen_qshortcut.go | 4 +- qt/gen_qshortcut.h | 6 +- qt/gen_qsize.cpp | 22 +- qt/gen_qsize.go | 16 +- qt/gen_qsize.h | 16 +- qt/gen_qsizepolicy.cpp | 22 +- qt/gen_qsizepolicy.go | 10 +- qt/gen_qsizepolicy.h | 16 +- qt/gen_qslider.cpp | 10 +- qt/gen_qslider.go | 6 +- qt/gen_qslider.h | 8 +- qt/gen_qsocketnotifier.cpp | 19 +- qt/gen_qsocketnotifier.go | 12 +- qt/gen_qsocketnotifier.h | 10 +- qt/gen_qsortfilterproxymodel.cpp | 36 ++-- qt/gen_qsortfilterproxymodel.go | 26 +-- qt/gen_qsortfilterproxymodel.h | 26 +-- qt/gen_qspinbox.cpp | 16 +- qt/gen_qspinbox.go | 4 +- qt/gen_qspinbox.h | 10 +- qt/gen_qsplashscreen.go | 6 +- qt/gen_qsplitter.cpp | 18 +- qt/gen_qsplitter.go | 10 +- qt/gen_qsplitter.h | 14 +- qt/gen_qstackedlayout.cpp | 6 +- qt/gen_qstackedlayout.go | 2 +- qt/gen_qstackedlayout.h | 4 +- qt/gen_qstandarditemmodel.cpp | 34 ++-- qt/gen_qstandarditemmodel.go | 24 +-- qt/gen_qstandarditemmodel.h | 18 +- qt/gen_qstandardpaths.cpp | 14 +- qt/gen_qstandardpaths.go | 14 +- qt/gen_qstandardpaths.h | 14 +- qt/gen_qstate.cpp | 12 +- qt/gen_qstate.go | 6 +- qt/gen_qstate.h | 8 +- qt/gen_qstatemachine.cpp | 18 +- qt/gen_qstatemachine.go | 8 +- qt/gen_qstatemachine.h | 12 +- qt/gen_qstatictext.cpp | 15 +- qt/gen_qstatictext.go | 4 +- qt/gen_qstatictext.h | 8 +- qt/gen_qstorageinfo.cpp | 9 +- qt/gen_qstringlistmodel.cpp | 2 +- qt/gen_qstringlistmodel.go | 2 +- qt/gen_qstringlistmodel.h | 2 +- qt/gen_qstringmatcher.cpp | 10 +- qt/gen_qstringmatcher.go | 6 +- qt/gen_qstringmatcher.h | 8 +- qt/gen_qstringview.cpp | 98 ++++++--- qt/gen_qstringview.go | 34 +++- qt/gen_qstringview.h | 31 +-- qt/gen_qstyle.cpp | 82 ++++---- qt/gen_qstyle.go | 78 ++++---- qt/gen_qstyle.h | 78 ++++---- qt/gen_qstylehints.cpp | 13 +- qt/gen_qstylehints.go | 6 +- qt/gen_qstylehints.h | 6 +- qt/gen_qstyleoption.cpp | 3 +- qt/gen_qstylepainter.cpp | 8 +- qt/gen_qstylepainter.go | 8 +- qt/gen_qstylepainter.h | 8 +- qt/gen_qsurface.cpp | 8 +- qt/gen_qsurface.h | 4 +- qt/gen_qsurfaceformat.cpp | 30 +-- qt/gen_qsurfaceformat.go | 22 +- qt/gen_qsurfaceformat.h | 22 +- qt/gen_qsystemsemaphore.cpp | 8 +- qt/gen_qsystemsemaphore.go | 4 +- qt/gen_qsystemsemaphore.h | 6 +- qt/gen_qsystemtrayicon.cpp | 8 +- qt/gen_qsystemtrayicon.go | 8 +- qt/gen_qsystemtrayicon.h | 6 +- qt/gen_qtabbar.cpp | 22 +- qt/gen_qtabbar.go | 10 +- qt/gen_qtabbar.h | 16 +- qt/gen_qtableview.cpp | 10 +- qt/gen_qtableview.go | 6 +- qt/gen_qtableview.h | 8 +- qt/gen_qtablewidget.cpp | 14 +- qt/gen_qtablewidget.go | 14 +- qt/gen_qtablewidget.h | 8 +- qt/gen_qtabwidget.cpp | 22 +- qt/gen_qtabwidget.go | 10 +- qt/gen_qtabwidget.h | 16 +- qt/gen_qtextboundaryfinder.cpp | 12 +- qt/gen_qtextboundaryfinder.go | 8 +- qt/gen_qtextboundaryfinder.h | 10 +- qt/gen_qtextbrowser.cpp | 6 +- qt/gen_qtextbrowser.go | 2 +- qt/gen_qtextbrowser.h | 4 +- qt/gen_qtextcodec.go | 10 +- qt/gen_qtextcursor.cpp | 16 +- qt/gen_qtextcursor.go | 16 +- qt/gen_qtextcursor.h | 16 +- qt/gen_qtextdocument.cpp | 24 ++- qt/gen_qtextdocument.go | 24 +-- qt/gen_qtextdocument.h | 10 +- qt/gen_qtextedit.cpp | 30 +-- qt/gen_qtextedit.go | 30 +-- qt/gen_qtextedit.h | 17 +- qt/gen_qtextformat.cpp | 204 +++++++++++-------- qt/gen_qtextformat.go | 48 ++--- qt/gen_qtextformat.h | 74 +++---- qt/gen_qtextlayout.cpp | 77 ++++--- qt/gen_qtextlayout.go | 12 +- qt/gen_qtextlayout.h | 16 +- qt/gen_qtextobject.cpp | 46 ++++- qt/gen_qtextobject.go | 40 +++- qt/gen_qtextobject.h | 16 +- qt/gen_qtextoption.cpp | 24 ++- qt/gen_qtextoption.go | 14 +- qt/gen_qtextoption.h | 12 +- qt/gen_qtextstream.cpp | 37 ++-- qt/gen_qtextstream.go | 20 +- qt/gen_qtextstream.h | 20 +- qt/gen_qthread.cpp | 11 +- qt/gen_qthread.go | 4 +- qt/gen_qthread.h | 6 +- qt/gen_qthreadpool.cpp | 3 +- qt/gen_qtimeline.cpp | 22 +- qt/gen_qtimeline.go | 4 +- qt/gen_qtimeline.h | 10 +- qt/gen_qtimer.cpp | 6 +- qt/gen_qtimer.go | 2 +- qt/gen_qtimer.h | 4 +- qt/gen_qtimezone.cpp | 28 +-- qt/gen_qtimezone.go | 24 ++- qt/gen_qtimezone.h | 23 ++- qt/gen_qtoolbar.cpp | 22 +- qt/gen_qtoolbar.go | 18 +- qt/gen_qtoolbar.h | 14 +- qt/gen_qtoolbox.go | 2 +- qt/gen_qtoolbutton.cpp | 18 +- qt/gen_qtoolbutton.go | 6 +- qt/gen_qtoolbutton.h | 12 +- qt/gen_qtouchdevice.cpp | 8 +- qt/gen_qtouchdevice.go | 4 +- qt/gen_qtouchdevice.h | 4 +- qt/gen_qtransform.cpp | 49 +++-- qt/gen_qtransform.go | 6 +- qt/gen_qtransform.h | 8 +- qt/gen_qtransposeproxymodel.cpp | 10 +- qt/gen_qtransposeproxymodel.go | 10 +- qt/gen_qtransposeproxymodel.h | 10 +- qt/gen_qtreeview.cpp | 4 +- qt/gen_qtreeview.go | 4 +- qt/gen_qtreeview.h | 4 +- qt/gen_qtreewidget.cpp | 26 +-- qt/gen_qtreewidget.go | 18 +- qt/gen_qtreewidget.h | 14 +- qt/gen_qtreewidgetitemiterator.go | 4 +- qt/gen_qundogroup.cpp | 2 +- qt/gen_qurl.cpp | 24 +-- qt/gen_qurl.go | 46 ++--- qt/gen_qurl.h | 24 +-- qt/gen_qurlquery.go | 8 +- qt/gen_quuid.cpp | 12 +- qt/gen_quuid.go | 4 +- qt/gen_quuid.h | 8 +- qt/gen_qvalidator.cpp | 30 +-- qt/gen_qvalidator.go | 6 +- qt/gen_qvalidator.h | 16 +- qt/gen_qvariant.cpp | 114 ++++++++--- qt/gen_qvariant.go | 62 +++++- qt/gen_qvariant.h | 36 ++-- qt/gen_qvector2d.cpp | 2 +- qt/gen_qvector2d.go | 2 +- qt/gen_qvector2d.h | 2 +- qt/gen_qvector3d.cpp | 2 +- qt/gen_qvector3d.go | 2 +- qt/gen_qvector3d.h | 2 +- qt/gen_qvector4d.cpp | 2 +- qt/gen_qvector4d.go | 2 +- qt/gen_qvector4d.h | 2 +- qt/gen_qwidget.cpp | 78 ++++---- qt/gen_qwidget.go | 56 +++--- qt/gen_qwidget.h | 50 ++--- qt/gen_qwindow.cpp | 70 ++++--- qt/gen_qwindow.go | 40 ++-- qt/gen_qwindow.h | 38 ++-- qt/gen_qwizard.cpp | 32 +-- qt/gen_qwizard.go | 24 +-- qt/gen_qwizard.h | 26 +-- qt/gen_qxmlstream.cpp | 23 ++- qt/gen_qxmlstream.go | 2 +- qt/gen_qxmlstream.h | 8 +- 731 files changed, 7645 insertions(+), 6256 deletions(-) diff --git a/qt/gen_qabstractanimation.cpp b/qt/gen_qabstractanimation.cpp index 89d83ca..c064399 100644 --- a/qt/gen_qabstractanimation.cpp +++ b/qt/gen_qabstractanimation.cpp @@ -28,21 +28,21 @@ struct miqt_string* QAbstractAnimation_TrUtf8(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -uintptr_t QAbstractAnimation_State(const QAbstractAnimation* self) { +int QAbstractAnimation_State(const QAbstractAnimation* self) { QAbstractAnimation::State _ret = self->state(); - return static_cast(_ret); + return static_cast(_ret); } QAnimationGroup* QAbstractAnimation_Group(const QAbstractAnimation* self) { return self->group(); } -uintptr_t QAbstractAnimation_Direction(const QAbstractAnimation* self) { +int QAbstractAnimation_Direction(const QAbstractAnimation* self) { QAbstractAnimation::Direction _ret = self->direction(); - return static_cast(_ret); + return static_cast(_ret); } -void QAbstractAnimation_SetDirection(QAbstractAnimation* self, uintptr_t direction) { +void QAbstractAnimation_SetDirection(QAbstractAnimation* self, int direction) { self->setDirection(static_cast(direction)); } @@ -84,16 +84,16 @@ void QAbstractAnimation_connect_Finished(QAbstractAnimation* self, void* slot) { }); } -void QAbstractAnimation_StateChanged(QAbstractAnimation* self, uintptr_t newState, uintptr_t oldState) { +void QAbstractAnimation_StateChanged(QAbstractAnimation* self, int newState, int oldState) { self->stateChanged(static_cast(newState), static_cast(oldState)); } void QAbstractAnimation_connect_StateChanged(QAbstractAnimation* self, void* slot) { QAbstractAnimation::connect(self, static_cast(&QAbstractAnimation::stateChanged), self, [=](QAbstractAnimation::State newState, QAbstractAnimation::State oldState) { QAbstractAnimation::State newState_ret = newState; - uintptr_t sigval1 = static_cast(newState_ret); + int sigval1 = static_cast(newState_ret); QAbstractAnimation::State oldState_ret = oldState; - uintptr_t sigval2 = static_cast(oldState_ret); + int sigval2 = static_cast(oldState_ret); miqt_exec_callback_QAbstractAnimation_StateChanged(slot, sigval1, sigval2); }); } @@ -109,14 +109,14 @@ void QAbstractAnimation_connect_CurrentLoopChanged(QAbstractAnimation* self, voi }); } -void QAbstractAnimation_DirectionChanged(QAbstractAnimation* self, uintptr_t param1) { +void QAbstractAnimation_DirectionChanged(QAbstractAnimation* self, int param1) { self->directionChanged(static_cast(param1)); } void QAbstractAnimation_connect_DirectionChanged(QAbstractAnimation* self, void* slot) { QAbstractAnimation::connect(self, static_cast(&QAbstractAnimation::directionChanged), self, [=](QAbstractAnimation::Direction param1) { QAbstractAnimation::Direction param1_ret = param1; - uintptr_t sigval1 = static_cast(param1_ret); + int sigval1 = static_cast(param1_ret); miqt_exec_callback_QAbstractAnimation_DirectionChanged(slot, sigval1); }); } @@ -173,7 +173,7 @@ struct miqt_string* QAbstractAnimation_TrUtf83(const char* s, const char* c, int return miqt_strdup(_b.data(), _b.length()); } -void QAbstractAnimation_Start1(QAbstractAnimation* self, uintptr_t policy) { +void QAbstractAnimation_Start1(QAbstractAnimation* self, int policy) { self->start(static_cast(policy)); } @@ -224,7 +224,8 @@ bool QAnimationDriver_IsRunning(const QAnimationDriver* self) { } long long QAnimationDriver_Elapsed(const QAnimationDriver* self) { - return self->elapsed(); + qint64 _ret = self->elapsed(); + return static_cast(_ret); } void QAnimationDriver_SetStartTime(QAnimationDriver* self, long long startTime) { @@ -232,7 +233,8 @@ void QAnimationDriver_SetStartTime(QAnimationDriver* self, long long startTime) } long long QAnimationDriver_StartTime(const QAnimationDriver* self) { - return self->startTime(); + qint64 _ret = self->startTime(); + return static_cast(_ret); } void QAnimationDriver_Started(QAnimationDriver* self) { diff --git a/qt/gen_qabstractanimation.go b/qt/gen_qabstractanimation.go index f52fe47..a55bb9e 100644 --- a/qt/gen_qabstractanimation.go +++ b/qt/gen_qabstractanimation.go @@ -94,7 +94,7 @@ func (this *QAbstractAnimation) Direction() QAbstractAnimation__Direction { } func (this *QAbstractAnimation) SetDirection(direction QAbstractAnimation__Direction) { - C.QAbstractAnimation_SetDirection(this.h, (C.uintptr_t)(direction)) + C.QAbstractAnimation_SetDirection(this.h, (C.int)(direction)) } func (this *QAbstractAnimation) CurrentTime() int { @@ -143,14 +143,14 @@ func miqt_exec_callback_QAbstractAnimation_Finished(cb *C.void) { } func (this *QAbstractAnimation) StateChanged(newState QAbstractAnimation__State, oldState QAbstractAnimation__State) { - C.QAbstractAnimation_StateChanged(this.h, (C.uintptr_t)(newState), (C.uintptr_t)(oldState)) + C.QAbstractAnimation_StateChanged(this.h, (C.int)(newState), (C.int)(oldState)) } func (this *QAbstractAnimation) OnStateChanged(slot func(newState QAbstractAnimation__State, oldState QAbstractAnimation__State)) { C.QAbstractAnimation_connect_StateChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QAbstractAnimation_StateChanged -func miqt_exec_callback_QAbstractAnimation_StateChanged(cb *C.void, newState C.uintptr_t, oldState C.uintptr_t) { +func miqt_exec_callback_QAbstractAnimation_StateChanged(cb *C.void, newState C.int, oldState C.int) { gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(newState QAbstractAnimation__State, oldState QAbstractAnimation__State)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -185,14 +185,14 @@ func miqt_exec_callback_QAbstractAnimation_CurrentLoopChanged(cb *C.void, curren } func (this *QAbstractAnimation) DirectionChanged(param1 QAbstractAnimation__Direction) { - C.QAbstractAnimation_DirectionChanged(this.h, (C.uintptr_t)(param1)) + C.QAbstractAnimation_DirectionChanged(this.h, (C.int)(param1)) } func (this *QAbstractAnimation) OnDirectionChanged(slot func(param1 QAbstractAnimation__Direction)) { C.QAbstractAnimation_connect_DirectionChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QAbstractAnimation_DirectionChanged -func miqt_exec_callback_QAbstractAnimation_DirectionChanged(cb *C.void, param1 C.uintptr_t) { +func miqt_exec_callback_QAbstractAnimation_DirectionChanged(cb *C.void, param1 C.int) { gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 QAbstractAnimation__Direction)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -273,7 +273,7 @@ func QAbstractAnimation_TrUtf83(s string, c string, n int) string { } func (this *QAbstractAnimation) Start1(policy QAbstractAnimation__DeletionPolicy) { - C.QAbstractAnimation_Start1(this.h, (C.uintptr_t)(policy)) + C.QAbstractAnimation_Start1(this.h, (C.int)(policy)) } // Delete this object from C++ memory. diff --git a/qt/gen_qabstractanimation.h b/qt/gen_qabstractanimation.h index e5d96d0..d87a250 100644 --- a/qt/gen_qabstractanimation.h +++ b/qt/gen_qabstractanimation.h @@ -30,10 +30,10 @@ typedef struct QObject QObject; QMetaObject* QAbstractAnimation_MetaObject(const QAbstractAnimation* self); struct miqt_string* QAbstractAnimation_Tr(const char* s); struct miqt_string* QAbstractAnimation_TrUtf8(const char* s); -uintptr_t QAbstractAnimation_State(const QAbstractAnimation* self); +int QAbstractAnimation_State(const QAbstractAnimation* self); QAnimationGroup* QAbstractAnimation_Group(const QAbstractAnimation* self); -uintptr_t QAbstractAnimation_Direction(const QAbstractAnimation* self); -void QAbstractAnimation_SetDirection(QAbstractAnimation* self, uintptr_t direction); +int QAbstractAnimation_Direction(const QAbstractAnimation* self); +void QAbstractAnimation_SetDirection(QAbstractAnimation* self, int direction); int QAbstractAnimation_CurrentTime(const QAbstractAnimation* self); int QAbstractAnimation_CurrentLoopTime(const QAbstractAnimation* self); int QAbstractAnimation_LoopCount(const QAbstractAnimation* self); @@ -43,11 +43,11 @@ int QAbstractAnimation_Duration(const QAbstractAnimation* self); int QAbstractAnimation_TotalDuration(const QAbstractAnimation* self); void QAbstractAnimation_Finished(QAbstractAnimation* self); void QAbstractAnimation_connect_Finished(QAbstractAnimation* self, void* slot); -void QAbstractAnimation_StateChanged(QAbstractAnimation* self, uintptr_t newState, uintptr_t oldState); +void QAbstractAnimation_StateChanged(QAbstractAnimation* self, int newState, int oldState); void QAbstractAnimation_connect_StateChanged(QAbstractAnimation* self, void* slot); void QAbstractAnimation_CurrentLoopChanged(QAbstractAnimation* self, int currentLoop); void QAbstractAnimation_connect_CurrentLoopChanged(QAbstractAnimation* self, void* slot); -void QAbstractAnimation_DirectionChanged(QAbstractAnimation* self, uintptr_t param1); +void QAbstractAnimation_DirectionChanged(QAbstractAnimation* self, int param1); void QAbstractAnimation_connect_DirectionChanged(QAbstractAnimation* self, void* slot); void QAbstractAnimation_Start(QAbstractAnimation* self); void QAbstractAnimation_Pause(QAbstractAnimation* self); @@ -59,7 +59,7 @@ struct miqt_string* QAbstractAnimation_Tr2(const char* s, const char* c); struct miqt_string* QAbstractAnimation_Tr3(const char* s, const char* c, int n); struct miqt_string* QAbstractAnimation_TrUtf82(const char* s, const char* c); struct miqt_string* QAbstractAnimation_TrUtf83(const char* s, const char* c, int n); -void QAbstractAnimation_Start1(QAbstractAnimation* self, uintptr_t policy); +void QAbstractAnimation_Start1(QAbstractAnimation* self, int policy); void QAbstractAnimation_Delete(QAbstractAnimation* self); QAnimationDriver* QAnimationDriver_new(); diff --git a/qt/gen_qabstracteventdispatcher.cpp b/qt/gen_qabstracteventdispatcher.cpp index 61e20aa..76952c6 100644 --- a/qt/gen_qabstracteventdispatcher.cpp +++ b/qt/gen_qabstracteventdispatcher.cpp @@ -51,11 +51,11 @@ void QAbstractEventDispatcher_UnregisterSocketNotifier(QAbstractEventDispatcher* self->unregisterSocketNotifier(notifier); } -int QAbstractEventDispatcher_RegisterTimer(QAbstractEventDispatcher* self, int interval, uintptr_t timerType, QObject* object) { +int QAbstractEventDispatcher_RegisterTimer(QAbstractEventDispatcher* self, int interval, int timerType, QObject* object) { return self->registerTimer(static_cast(interval), static_cast(timerType), object); } -void QAbstractEventDispatcher_RegisterTimer2(QAbstractEventDispatcher* self, int timerId, int interval, uintptr_t timerType, QObject* object) { +void QAbstractEventDispatcher_RegisterTimer2(QAbstractEventDispatcher* self, int timerId, int interval, int timerType, QObject* object) { self->registerTimer(static_cast(timerId), static_cast(interval), static_cast(timerType), object); } @@ -168,7 +168,7 @@ void QAbstractEventDispatcher_Delete(QAbstractEventDispatcher* self) { delete self; } -QAbstractEventDispatcher__TimerInfo* QAbstractEventDispatcher__TimerInfo_new(int id, int i, uintptr_t t) { +QAbstractEventDispatcher__TimerInfo* QAbstractEventDispatcher__TimerInfo_new(int id, int i, int t) { return new QAbstractEventDispatcher::TimerInfo(static_cast(id), static_cast(i), static_cast(t)); } diff --git a/qt/gen_qabstracteventdispatcher.go b/qt/gen_qabstracteventdispatcher.go index 2439532..dad69cf 100644 --- a/qt/gen_qabstracteventdispatcher.go +++ b/qt/gen_qabstracteventdispatcher.go @@ -64,7 +64,7 @@ func QAbstractEventDispatcher_Instance() *QAbstractEventDispatcher { } func (this *QAbstractEventDispatcher) ProcessEvents(flags int) bool { - return (bool)(C.QAbstractEventDispatcher_ProcessEvents(this.h, (C.int)(flags))) + return (bool)(C.QAbstractEventDispatcher_ProcessEvents(this.h, flags)) } func (this *QAbstractEventDispatcher) HasPendingEvents() bool { @@ -80,11 +80,11 @@ func (this *QAbstractEventDispatcher) UnregisterSocketNotifier(notifier *QSocket } func (this *QAbstractEventDispatcher) RegisterTimer(interval int, timerType TimerType, object *QObject) int { - return (int)(C.QAbstractEventDispatcher_RegisterTimer(this.h, (C.int)(interval), (C.uintptr_t)(timerType), object.cPointer())) + return (int)(C.QAbstractEventDispatcher_RegisterTimer(this.h, (C.int)(interval), (C.int)(timerType), object.cPointer())) } func (this *QAbstractEventDispatcher) RegisterTimer2(timerId int, interval int, timerType TimerType, object *QObject) { - C.QAbstractEventDispatcher_RegisterTimer2(this.h, (C.int)(timerId), (C.int)(interval), (C.uintptr_t)(timerType), object.cPointer()) + C.QAbstractEventDispatcher_RegisterTimer2(this.h, (C.int)(timerId), (C.int)(interval), (C.int)(timerType), object.cPointer()) } func (this *QAbstractEventDispatcher) UnregisterTimer(timerId int) bool { @@ -261,7 +261,7 @@ func newQAbstractEventDispatcher__TimerInfo_U(h unsafe.Pointer) *QAbstractEventD // NewQAbstractEventDispatcher__TimerInfo constructs a new QAbstractEventDispatcher::TimerInfo object. func NewQAbstractEventDispatcher__TimerInfo(id int, i int, t TimerType) *QAbstractEventDispatcher__TimerInfo { - ret := C.QAbstractEventDispatcher__TimerInfo_new((C.int)(id), (C.int)(i), (C.uintptr_t)(t)) + ret := C.QAbstractEventDispatcher__TimerInfo_new((C.int)(id), (C.int)(i), (C.int)(t)) return newQAbstractEventDispatcher__TimerInfo(ret) } diff --git a/qt/gen_qabstracteventdispatcher.h b/qt/gen_qabstracteventdispatcher.h index 15dc793..2c4c57d 100644 --- a/qt/gen_qabstracteventdispatcher.h +++ b/qt/gen_qabstracteventdispatcher.h @@ -43,8 +43,8 @@ bool QAbstractEventDispatcher_ProcessEvents(QAbstractEventDispatcher* self, int bool QAbstractEventDispatcher_HasPendingEvents(QAbstractEventDispatcher* self); void QAbstractEventDispatcher_RegisterSocketNotifier(QAbstractEventDispatcher* self, QSocketNotifier* notifier); void QAbstractEventDispatcher_UnregisterSocketNotifier(QAbstractEventDispatcher* self, QSocketNotifier* notifier); -int QAbstractEventDispatcher_RegisterTimer(QAbstractEventDispatcher* self, int interval, uintptr_t timerType, QObject* object); -void QAbstractEventDispatcher_RegisterTimer2(QAbstractEventDispatcher* self, int timerId, int interval, uintptr_t timerType, QObject* object); +int QAbstractEventDispatcher_RegisterTimer(QAbstractEventDispatcher* self, int interval, int timerType, QObject* object); +void QAbstractEventDispatcher_RegisterTimer2(QAbstractEventDispatcher* self, int timerId, int interval, int timerType, QObject* object); bool QAbstractEventDispatcher_UnregisterTimer(QAbstractEventDispatcher* self, int timerId); bool QAbstractEventDispatcher_UnregisterTimers(QAbstractEventDispatcher* self, QObject* object); struct miqt_array* QAbstractEventDispatcher_RegisteredTimers(const QAbstractEventDispatcher* self, QObject* object); @@ -67,7 +67,7 @@ struct miqt_string* QAbstractEventDispatcher_TrUtf83(const char* s, const char* QAbstractEventDispatcher* QAbstractEventDispatcher_Instance1(QThread* thread); void QAbstractEventDispatcher_Delete(QAbstractEventDispatcher* self); -QAbstractEventDispatcher__TimerInfo* QAbstractEventDispatcher__TimerInfo_new(int id, int i, uintptr_t t); +QAbstractEventDispatcher__TimerInfo* QAbstractEventDispatcher__TimerInfo_new(int id, int i, int t); void QAbstractEventDispatcher__TimerInfo_Delete(QAbstractEventDispatcher__TimerInfo* self); #ifdef __cplusplus diff --git a/qt/gen_qabstractitemdelegate.cpp b/qt/gen_qabstractitemdelegate.cpp index b434d65..23e43e7 100644 --- a/qt/gen_qabstractitemdelegate.cpp +++ b/qt/gen_qabstractitemdelegate.cpp @@ -68,7 +68,7 @@ bool QAbstractItemDelegate_EditorEvent(QAbstractItemDelegate* self, QEvent* even return self->editorEvent(event, model, *option, *index); } -struct miqt_string* QAbstractItemDelegate_ElidedText(QFontMetrics* fontMetrics, int width, uintptr_t mode, struct miqt_string* text) { +struct miqt_string* QAbstractItemDelegate_ElidedText(QFontMetrics* fontMetrics, int width, int mode, struct miqt_string* text) { QString text_QString = QString::fromUtf8(&text->data, text->len); QString _ret = QAbstractItemDelegate::elidedText(*fontMetrics, static_cast(width), static_cast(mode), text_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -156,7 +156,7 @@ struct miqt_string* QAbstractItemDelegate_TrUtf83(const char* s, const char* c, return miqt_strdup(_b.data(), _b.length()); } -void QAbstractItemDelegate_CloseEditor2(QAbstractItemDelegate* self, QWidget* editor, uintptr_t hint) { +void QAbstractItemDelegate_CloseEditor2(QAbstractItemDelegate* self, QWidget* editor, int hint) { self->closeEditor(editor, static_cast(hint)); } @@ -164,7 +164,7 @@ void QAbstractItemDelegate_connect_CloseEditor2(QAbstractItemDelegate* self, voi QAbstractItemDelegate::connect(self, static_cast(&QAbstractItemDelegate::closeEditor), self, [=](QWidget* editor, QAbstractItemDelegate::EndEditHint hint) { QWidget* sigval1 = editor; QAbstractItemDelegate::EndEditHint hint_ret = hint; - uintptr_t sigval2 = static_cast(hint_ret); + int sigval2 = static_cast(hint_ret); miqt_exec_callback_QAbstractItemDelegate_CloseEditor2(slot, sigval1, sigval2); }); } diff --git a/qt/gen_qabstractitemdelegate.go b/qt/gen_qabstractitemdelegate.go index 3172ff8..4277c99 100644 --- a/qt/gen_qabstractitemdelegate.go +++ b/qt/gen_qabstractitemdelegate.go @@ -107,7 +107,7 @@ func (this *QAbstractItemDelegate) EditorEvent(event *QEvent, model *QAbstractIt func QAbstractItemDelegate_ElidedText(fontMetrics *QFontMetrics, width int, mode TextElideMode, text string) string { text_ms := miqt_strdupg(text) defer C.free(text_ms) - var _ms *C.struct_miqt_string = C.QAbstractItemDelegate_ElidedText(fontMetrics.cPointer(), (C.int)(width), (C.uintptr_t)(mode), (*C.struct_miqt_string)(text_ms)) + var _ms *C.struct_miqt_string = C.QAbstractItemDelegate_ElidedText(fontMetrics.cPointer(), (C.int)(width), (C.int)(mode), (*C.struct_miqt_string)(text_ms)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -233,14 +233,14 @@ func QAbstractItemDelegate_TrUtf83(s string, c string, n int) string { } func (this *QAbstractItemDelegate) CloseEditor2(editor *QWidget, hint QAbstractItemDelegate__EndEditHint) { - C.QAbstractItemDelegate_CloseEditor2(this.h, editor.cPointer(), (C.uintptr_t)(hint)) + C.QAbstractItemDelegate_CloseEditor2(this.h, editor.cPointer(), (C.int)(hint)) } func (this *QAbstractItemDelegate) OnCloseEditor2(slot func(editor *QWidget, hint QAbstractItemDelegate__EndEditHint)) { C.QAbstractItemDelegate_connect_CloseEditor2(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QAbstractItemDelegate_CloseEditor2 -func miqt_exec_callback_QAbstractItemDelegate_CloseEditor2(cb *C.void, editor *C.QWidget, hint C.uintptr_t) { +func miqt_exec_callback_QAbstractItemDelegate_CloseEditor2(cb *C.void, editor *C.QWidget, hint C.int) { gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(editor *QWidget, hint QAbstractItemDelegate__EndEditHint)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt/gen_qabstractitemdelegate.h b/qt/gen_qabstractitemdelegate.h index 135dae0..9e972e9 100644 --- a/qt/gen_qabstractitemdelegate.h +++ b/qt/gen_qabstractitemdelegate.h @@ -52,7 +52,7 @@ void QAbstractItemDelegate_SetEditorData(const QAbstractItemDelegate* self, QWid void QAbstractItemDelegate_SetModelData(const QAbstractItemDelegate* self, QWidget* editor, QAbstractItemModel* model, QModelIndex* index); void QAbstractItemDelegate_UpdateEditorGeometry(const QAbstractItemDelegate* self, QWidget* editor, QStyleOptionViewItem* option, QModelIndex* index); bool QAbstractItemDelegate_EditorEvent(QAbstractItemDelegate* self, QEvent* event, QAbstractItemModel* model, QStyleOptionViewItem* option, QModelIndex* index); -struct miqt_string* QAbstractItemDelegate_ElidedText(QFontMetrics* fontMetrics, int width, uintptr_t mode, struct miqt_string* text); +struct miqt_string* QAbstractItemDelegate_ElidedText(QFontMetrics* fontMetrics, int width, int mode, struct miqt_string* text); bool QAbstractItemDelegate_HelpEvent(QAbstractItemDelegate* self, QHelpEvent* event, QAbstractItemView* view, QStyleOptionViewItem* option, QModelIndex* index); struct miqt_array* QAbstractItemDelegate_PaintingRoles(const QAbstractItemDelegate* self); void QAbstractItemDelegate_CommitData(QAbstractItemDelegate* self, QWidget* editor); @@ -65,7 +65,7 @@ struct miqt_string* QAbstractItemDelegate_Tr2(const char* s, const char* c); struct miqt_string* QAbstractItemDelegate_Tr3(const char* s, const char* c, int n); struct miqt_string* QAbstractItemDelegate_TrUtf82(const char* s, const char* c); struct miqt_string* QAbstractItemDelegate_TrUtf83(const char* s, const char* c, int n); -void QAbstractItemDelegate_CloseEditor2(QAbstractItemDelegate* self, QWidget* editor, uintptr_t hint); +void QAbstractItemDelegate_CloseEditor2(QAbstractItemDelegate* self, QWidget* editor, int hint); void QAbstractItemDelegate_connect_CloseEditor2(QAbstractItemDelegate* self, void* slot); void QAbstractItemDelegate_Delete(QAbstractItemDelegate* self); diff --git a/qt/gen_qabstractitemmodel.cpp b/qt/gen_qabstractitemmodel.cpp index 8e3e39b..4f630bd 100644 --- a/qt/gen_qabstractitemmodel.cpp +++ b/qt/gen_qabstractitemmodel.cpp @@ -241,11 +241,11 @@ bool QAbstractItemModel_SetData(QAbstractItemModel* self, QModelIndex* index, QV return self->setData(*index, *value); } -QVariant* QAbstractItemModel_HeaderData(const QAbstractItemModel* self, int section, uintptr_t orientation) { +QVariant* QAbstractItemModel_HeaderData(const QAbstractItemModel* self, int section, int orientation) { return new QVariant(self->headerData(static_cast(section), static_cast(orientation))); } -bool QAbstractItemModel_SetHeaderData(QAbstractItemModel* self, int section, uintptr_t orientation, QVariant* value) { +bool QAbstractItemModel_SetHeaderData(QAbstractItemModel* self, int section, int orientation, QVariant* value) { return self->setHeaderData(static_cast(section), static_cast(orientation), *value); } @@ -275,11 +275,11 @@ QMimeData* QAbstractItemModel_MimeData(const QAbstractItemModel* self, struct mi return self->mimeData(indexes_QList); } -bool QAbstractItemModel_CanDropMimeData(const QAbstractItemModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent) { +bool QAbstractItemModel_CanDropMimeData(const QAbstractItemModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent) { return self->canDropMimeData(data, static_cast(action), static_cast(row), static_cast(column), *parent); } -bool QAbstractItemModel_DropMimeData(QAbstractItemModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent) { +bool QAbstractItemModel_DropMimeData(QAbstractItemModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent) { return self->dropMimeData(data, static_cast(action), static_cast(row), static_cast(column), *parent); } @@ -399,14 +399,14 @@ void QAbstractItemModel_connect_DataChanged(QAbstractItemModel* self, void* slot }); } -void QAbstractItemModel_HeaderDataChanged(QAbstractItemModel* self, uintptr_t orientation, int first, int last) { +void QAbstractItemModel_HeaderDataChanged(QAbstractItemModel* self, int orientation, int first, int last) { self->headerDataChanged(static_cast(orientation), static_cast(first), static_cast(last)); } void QAbstractItemModel_connect_HeaderDataChanged(QAbstractItemModel* self, void* slot) { QAbstractItemModel::connect(self, static_cast(&QAbstractItemModel::headerDataChanged), self, [=](Qt::Orientation orientation, int first, int last) { Qt::Orientation orientation_ret = orientation; - uintptr_t sigval1 = static_cast(orientation_ret); + int sigval1 = static_cast(orientation_ret); int sigval2 = first; int sigval3 = last; miqt_exec_callback_QAbstractItemModel_HeaderDataChanged(slot, sigval1, sigval2, sigval3); @@ -497,11 +497,11 @@ bool QAbstractItemModel_SetData3(QAbstractItemModel* self, QModelIndex* index, Q return self->setData(*index, *value, static_cast(role)); } -QVariant* QAbstractItemModel_HeaderData3(const QAbstractItemModel* self, int section, uintptr_t orientation, int role) { +QVariant* QAbstractItemModel_HeaderData3(const QAbstractItemModel* self, int section, int orientation, int role) { return new QVariant(self->headerData(static_cast(section), static_cast(orientation), static_cast(role))); } -bool QAbstractItemModel_SetHeaderData4(QAbstractItemModel* self, int section, uintptr_t orientation, QVariant* value, int role) { +bool QAbstractItemModel_SetHeaderData4(QAbstractItemModel* self, int section, int orientation, QVariant* value, int role) { return self->setHeaderData(static_cast(section), static_cast(orientation), *value, static_cast(role)); } @@ -537,7 +537,7 @@ bool QAbstractItemModel_RemoveColumn2(QAbstractItemModel* self, int column, QMod return self->removeColumn(static_cast(column), *parent); } -void QAbstractItemModel_Sort2(QAbstractItemModel* self, int column, uintptr_t order) { +void QAbstractItemModel_Sort2(QAbstractItemModel* self, int column, int order) { self->sort(static_cast(column), static_cast(order)); } @@ -629,7 +629,7 @@ void QAbstractItemModel_connect_LayoutChanged1(QAbstractItemModel* self, void* s }); } -void QAbstractItemModel_LayoutChanged2(QAbstractItemModel* self, struct miqt_array* /* of QPersistentModelIndex* */ parents, uintptr_t hint) { +void QAbstractItemModel_LayoutChanged2(QAbstractItemModel* self, struct miqt_array* /* of QPersistentModelIndex* */ parents, int hint) { QList parents_QList; parents_QList.reserve(parents->len); QPersistentModelIndex** parents_arr = static_cast(parents->data); @@ -652,7 +652,7 @@ void QAbstractItemModel_connect_LayoutChanged2(QAbstractItemModel* self, void* s parents_out->data = static_cast(parents_arr); struct miqt_array* sigval1 = parents_out; QAbstractItemModel::LayoutChangeHint hint_ret = hint; - uintptr_t sigval2 = static_cast(hint_ret); + int sigval2 = static_cast(hint_ret); miqt_exec_callback_QAbstractItemModel_LayoutChanged2(slot, sigval1, sigval2); }); } @@ -683,7 +683,7 @@ void QAbstractItemModel_connect_LayoutAboutToBeChanged1(QAbstractItemModel* self }); } -void QAbstractItemModel_LayoutAboutToBeChanged2(QAbstractItemModel* self, struct miqt_array* /* of QPersistentModelIndex* */ parents, uintptr_t hint) { +void QAbstractItemModel_LayoutAboutToBeChanged2(QAbstractItemModel* self, struct miqt_array* /* of QPersistentModelIndex* */ parents, int hint) { QList parents_QList; parents_QList.reserve(parents->len); QPersistentModelIndex** parents_arr = static_cast(parents->data); @@ -706,7 +706,7 @@ void QAbstractItemModel_connect_LayoutAboutToBeChanged2(QAbstractItemModel* self parents_out->data = static_cast(parents_arr); struct miqt_array* sigval1 = parents_out; QAbstractItemModel::LayoutChangeHint hint_ret = hint; - uintptr_t sigval2 = static_cast(hint_ret); + int sigval2 = static_cast(hint_ret); miqt_exec_callback_QAbstractItemModel_LayoutAboutToBeChanged2(slot, sigval1, sigval2); }); } @@ -741,7 +741,7 @@ QModelIndex* QAbstractTableModel_Sibling(const QAbstractTableModel* self, int ro return new QModelIndex(self->sibling(static_cast(row), static_cast(column), *idx)); } -bool QAbstractTableModel_DropMimeData(QAbstractTableModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent) { +bool QAbstractTableModel_DropMimeData(QAbstractTableModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent) { return self->dropMimeData(data, static_cast(action), static_cast(row), static_cast(column), *parent); } @@ -812,7 +812,7 @@ QModelIndex* QAbstractListModel_Sibling(const QAbstractListModel* self, int row, return new QModelIndex(self->sibling(static_cast(row), static_cast(column), *idx)); } -bool QAbstractListModel_DropMimeData(QAbstractListModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent) { +bool QAbstractListModel_DropMimeData(QAbstractListModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent) { return self->dropMimeData(data, static_cast(action), static_cast(row), static_cast(column), *parent); } diff --git a/qt/gen_qabstractitemmodel.go b/qt/gen_qabstractitemmodel.go index 42e813d..39a5401 100644 --- a/qt/gen_qabstractitemmodel.go +++ b/qt/gen_qabstractitemmodel.go @@ -403,14 +403,14 @@ func (this *QAbstractItemModel) SetData(index *QModelIndex, value *QVariant) boo } func (this *QAbstractItemModel) HeaderData(section int, orientation Orientation) *QVariant { - _ret := C.QAbstractItemModel_HeaderData(this.h, (C.int)(section), (C.uintptr_t)(orientation)) + _ret := C.QAbstractItemModel_HeaderData(this.h, (C.int)(section), (C.int)(orientation)) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QAbstractItemModel) SetHeaderData(section int, orientation Orientation, value *QVariant) bool { - return (bool)(C.QAbstractItemModel_SetHeaderData(this.h, (C.int)(section), (C.uintptr_t)(orientation), value.cPointer())) + return (bool)(C.QAbstractItemModel_SetHeaderData(this.h, (C.int)(section), (C.int)(orientation), value.cPointer())) } func (this *QAbstractItemModel) MimeTypes() []string { @@ -440,11 +440,11 @@ func (this *QAbstractItemModel) MimeData(indexes []QModelIndex) *QMimeData { } func (this *QAbstractItemModel) CanDropMimeData(data *QMimeData, action DropAction, row int, column int, parent *QModelIndex) bool { - return (bool)(C.QAbstractItemModel_CanDropMimeData(this.h, data.cPointer(), (C.uintptr_t)(action), (C.int)(row), (C.int)(column), parent.cPointer())) + return (bool)(C.QAbstractItemModel_CanDropMimeData(this.h, data.cPointer(), (C.int)(action), (C.int)(row), (C.int)(column), parent.cPointer())) } func (this *QAbstractItemModel) DropMimeData(data *QMimeData, action DropAction, row int, column int, parent *QModelIndex) bool { - return (bool)(C.QAbstractItemModel_DropMimeData(this.h, data.cPointer(), (C.uintptr_t)(action), (C.int)(row), (C.int)(column), parent.cPointer())) + return (bool)(C.QAbstractItemModel_DropMimeData(this.h, data.cPointer(), (C.int)(action), (C.int)(row), (C.int)(column), parent.cPointer())) } func (this *QAbstractItemModel) SupportedDropActions() int { @@ -573,14 +573,14 @@ func miqt_exec_callback_QAbstractItemModel_DataChanged(cb *C.void, topLeft *C.QM } func (this *QAbstractItemModel) HeaderDataChanged(orientation Orientation, first int, last int) { - C.QAbstractItemModel_HeaderDataChanged(this.h, (C.uintptr_t)(orientation), (C.int)(first), (C.int)(last)) + C.QAbstractItemModel_HeaderDataChanged(this.h, (C.int)(orientation), (C.int)(first), (C.int)(last)) } func (this *QAbstractItemModel) OnHeaderDataChanged(slot func(orientation Orientation, first int, last int)) { C.QAbstractItemModel_connect_HeaderDataChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QAbstractItemModel_HeaderDataChanged -func miqt_exec_callback_QAbstractItemModel_HeaderDataChanged(cb *C.void, orientation C.uintptr_t, first C.int, last C.int) { +func miqt_exec_callback_QAbstractItemModel_HeaderDataChanged(cb *C.void, orientation C.int, first C.int, last C.int) { gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(orientation Orientation, first int, last int)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -717,14 +717,14 @@ func (this *QAbstractItemModel) SetData3(index *QModelIndex, value *QVariant, ro } func (this *QAbstractItemModel) HeaderData3(section int, orientation Orientation, role int) *QVariant { - _ret := C.QAbstractItemModel_HeaderData3(this.h, (C.int)(section), (C.uintptr_t)(orientation), (C.int)(role)) + _ret := C.QAbstractItemModel_HeaderData3(this.h, (C.int)(section), (C.int)(orientation), (C.int)(role)) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QAbstractItemModel) SetHeaderData4(section int, orientation Orientation, value *QVariant, role int) bool { - return (bool)(C.QAbstractItemModel_SetHeaderData4(this.h, (C.int)(section), (C.uintptr_t)(orientation), value.cPointer(), (C.int)(role))) + return (bool)(C.QAbstractItemModel_SetHeaderData4(this.h, (C.int)(section), (C.int)(orientation), value.cPointer(), (C.int)(role))) } func (this *QAbstractItemModel) InsertRows3(row int, count int, parent *QModelIndex) bool { @@ -760,7 +760,7 @@ func (this *QAbstractItemModel) RemoveColumn2(column int, parent *QModelIndex) b } func (this *QAbstractItemModel) Sort2(column int, order SortOrder) { - C.QAbstractItemModel_Sort2(this.h, (C.int)(column), (C.uintptr_t)(order)) + C.QAbstractItemModel_Sort2(this.h, (C.int)(column), (C.int)(order)) } func (this *QAbstractItemModel) Match4(start *QModelIndex, role int, value *QVariant, hits int) []QModelIndex { @@ -778,7 +778,7 @@ func (this *QAbstractItemModel) Match4(start *QModelIndex, role int, value *QVar } func (this *QAbstractItemModel) Match5(start *QModelIndex, role int, value *QVariant, hits int, flags int) []QModelIndex { - var _ma *C.struct_miqt_array = C.QAbstractItemModel_Match5(this.h, start.cPointer(), (C.int)(role), value.cPointer(), (C.int)(hits), (C.int)(flags)) + var _ma *C.struct_miqt_array = C.QAbstractItemModel_Match5(this.h, start.cPointer(), (C.int)(role), value.cPointer(), (C.int)(hits), flags) _ret := make([]QModelIndex, int(_ma.len)) _outCast := (*[0xffff]*C.QModelIndex)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -792,7 +792,7 @@ func (this *QAbstractItemModel) Match5(start *QModelIndex, role int, value *QVar } func (this *QAbstractItemModel) CheckIndex2(index *QModelIndex, options int) bool { - return (bool)(C.QAbstractItemModel_CheckIndex2(this.h, index.cPointer(), (C.int)(options))) + return (bool)(C.QAbstractItemModel_CheckIndex2(this.h, index.cPointer(), options)) } func (this *QAbstractItemModel) DataChanged3(topLeft *QModelIndex, bottomRight *QModelIndex, roles []int) { @@ -879,14 +879,14 @@ func (this *QAbstractItemModel) LayoutChanged2(parents []QPersistentModelIndex, } parents_ma := &C.struct_miqt_array{len: C.size_t(len(parents)), data: unsafe.Pointer(parents_CArray)} defer runtime.KeepAlive(unsafe.Pointer(parents_ma)) - C.QAbstractItemModel_LayoutChanged2(this.h, parents_ma, (C.uintptr_t)(hint)) + C.QAbstractItemModel_LayoutChanged2(this.h, parents_ma, (C.int)(hint)) } func (this *QAbstractItemModel) OnLayoutChanged2(slot func(parents []QPersistentModelIndex, hint QAbstractItemModel__LayoutChangeHint)) { C.QAbstractItemModel_connect_LayoutChanged2(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QAbstractItemModel_LayoutChanged2 -func miqt_exec_callback_QAbstractItemModel_LayoutChanged2(cb *C.void, parents *C.struct_miqt_array, hint C.uintptr_t) { +func miqt_exec_callback_QAbstractItemModel_LayoutChanged2(cb *C.void, parents *C.struct_miqt_array, hint C.int) { gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(parents []QPersistentModelIndex, hint QAbstractItemModel__LayoutChangeHint)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -957,14 +957,14 @@ func (this *QAbstractItemModel) LayoutAboutToBeChanged2(parents []QPersistentMod } parents_ma := &C.struct_miqt_array{len: C.size_t(len(parents)), data: unsafe.Pointer(parents_CArray)} defer runtime.KeepAlive(unsafe.Pointer(parents_ma)) - C.QAbstractItemModel_LayoutAboutToBeChanged2(this.h, parents_ma, (C.uintptr_t)(hint)) + C.QAbstractItemModel_LayoutAboutToBeChanged2(this.h, parents_ma, (C.int)(hint)) } func (this *QAbstractItemModel) OnLayoutAboutToBeChanged2(slot func(parents []QPersistentModelIndex, hint QAbstractItemModel__LayoutChangeHint)) { C.QAbstractItemModel_connect_LayoutAboutToBeChanged2(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QAbstractItemModel_LayoutAboutToBeChanged2 -func miqt_exec_callback_QAbstractItemModel_LayoutAboutToBeChanged2(cb *C.void, parents *C.struct_miqt_array, hint C.uintptr_t) { +func miqt_exec_callback_QAbstractItemModel_LayoutAboutToBeChanged2(cb *C.void, parents *C.struct_miqt_array, hint C.int) { gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(parents []QPersistentModelIndex, hint QAbstractItemModel__LayoutChangeHint)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -1062,7 +1062,7 @@ func (this *QAbstractTableModel) Sibling(row int, column int, idx *QModelIndex) } func (this *QAbstractTableModel) DropMimeData(data *QMimeData, action DropAction, row int, column int, parent *QModelIndex) bool { - return (bool)(C.QAbstractTableModel_DropMimeData(this.h, data.cPointer(), (C.uintptr_t)(action), (C.int)(row), (C.int)(column), parent.cPointer())) + return (bool)(C.QAbstractTableModel_DropMimeData(this.h, data.cPointer(), (C.int)(action), (C.int)(row), (C.int)(column), parent.cPointer())) } func (this *QAbstractTableModel) Flags(index *QModelIndex) int { @@ -1194,7 +1194,7 @@ func (this *QAbstractListModel) Sibling(row int, column int, idx *QModelIndex) * } func (this *QAbstractListModel) DropMimeData(data *QMimeData, action DropAction, row int, column int, parent *QModelIndex) bool { - return (bool)(C.QAbstractListModel_DropMimeData(this.h, data.cPointer(), (C.uintptr_t)(action), (C.int)(row), (C.int)(column), parent.cPointer())) + return (bool)(C.QAbstractListModel_DropMimeData(this.h, data.cPointer(), (C.int)(action), (C.int)(row), (C.int)(column), parent.cPointer())) } func (this *QAbstractListModel) Flags(index *QModelIndex) int { diff --git a/qt/gen_qabstractitemmodel.h b/qt/gen_qabstractitemmodel.h index 6db8242..1ef0108 100644 --- a/qt/gen_qabstractitemmodel.h +++ b/qt/gen_qabstractitemmodel.h @@ -91,12 +91,12 @@ int QAbstractItemModel_ColumnCount(const QAbstractItemModel* self); bool QAbstractItemModel_HasChildren(const QAbstractItemModel* self); QVariant* QAbstractItemModel_Data(const QAbstractItemModel* self, QModelIndex* index); bool QAbstractItemModel_SetData(QAbstractItemModel* self, QModelIndex* index, QVariant* value); -QVariant* QAbstractItemModel_HeaderData(const QAbstractItemModel* self, int section, uintptr_t orientation); -bool QAbstractItemModel_SetHeaderData(QAbstractItemModel* self, int section, uintptr_t orientation, QVariant* value); +QVariant* QAbstractItemModel_HeaderData(const QAbstractItemModel* self, int section, int orientation); +bool QAbstractItemModel_SetHeaderData(QAbstractItemModel* self, int section, int orientation, QVariant* value); struct miqt_array* QAbstractItemModel_MimeTypes(const QAbstractItemModel* self); QMimeData* QAbstractItemModel_MimeData(const QAbstractItemModel* self, struct miqt_array* /* of QModelIndex* */ indexes); -bool QAbstractItemModel_CanDropMimeData(const QAbstractItemModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent); -bool QAbstractItemModel_DropMimeData(QAbstractItemModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent); +bool QAbstractItemModel_CanDropMimeData(const QAbstractItemModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent); +bool QAbstractItemModel_DropMimeData(QAbstractItemModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent); int QAbstractItemModel_SupportedDropActions(const QAbstractItemModel* self); int QAbstractItemModel_SupportedDragActions(const QAbstractItemModel* self); bool QAbstractItemModel_InsertRows(QAbstractItemModel* self, int row, int count); @@ -121,7 +121,7 @@ QSize* QAbstractItemModel_Span(const QAbstractItemModel* self, QModelIndex* inde bool QAbstractItemModel_CheckIndex(const QAbstractItemModel* self, QModelIndex* index); void QAbstractItemModel_DataChanged(QAbstractItemModel* self, QModelIndex* topLeft, QModelIndex* bottomRight); void QAbstractItemModel_connect_DataChanged(QAbstractItemModel* self, void* slot); -void QAbstractItemModel_HeaderDataChanged(QAbstractItemModel* self, uintptr_t orientation, int first, int last); +void QAbstractItemModel_HeaderDataChanged(QAbstractItemModel* self, int orientation, int first, int last); void QAbstractItemModel_connect_HeaderDataChanged(QAbstractItemModel* self, void* slot); void QAbstractItemModel_LayoutChanged(QAbstractItemModel* self); void QAbstractItemModel_connect_LayoutChanged(QAbstractItemModel* self, void* slot); @@ -140,8 +140,8 @@ int QAbstractItemModel_ColumnCount1(const QAbstractItemModel* self, QModelIndex* bool QAbstractItemModel_HasChildren1(const QAbstractItemModel* self, QModelIndex* parent); QVariant* QAbstractItemModel_Data2(const QAbstractItemModel* self, QModelIndex* index, int role); bool QAbstractItemModel_SetData3(QAbstractItemModel* self, QModelIndex* index, QVariant* value, int role); -QVariant* QAbstractItemModel_HeaderData3(const QAbstractItemModel* self, int section, uintptr_t orientation, int role); -bool QAbstractItemModel_SetHeaderData4(QAbstractItemModel* self, int section, uintptr_t orientation, QVariant* value, int role); +QVariant* QAbstractItemModel_HeaderData3(const QAbstractItemModel* self, int section, int orientation, int role); +bool QAbstractItemModel_SetHeaderData4(QAbstractItemModel* self, int section, int orientation, QVariant* value, int role); bool QAbstractItemModel_InsertRows3(QAbstractItemModel* self, int row, int count, QModelIndex* parent); bool QAbstractItemModel_InsertColumns3(QAbstractItemModel* self, int column, int count, QModelIndex* parent); bool QAbstractItemModel_RemoveRows3(QAbstractItemModel* self, int row, int count, QModelIndex* parent); @@ -150,7 +150,7 @@ bool QAbstractItemModel_InsertRow2(QAbstractItemModel* self, int row, QModelInde bool QAbstractItemModel_InsertColumn2(QAbstractItemModel* self, int column, QModelIndex* parent); bool QAbstractItemModel_RemoveRow2(QAbstractItemModel* self, int row, QModelIndex* parent); bool QAbstractItemModel_RemoveColumn2(QAbstractItemModel* self, int column, QModelIndex* parent); -void QAbstractItemModel_Sort2(QAbstractItemModel* self, int column, uintptr_t order); +void QAbstractItemModel_Sort2(QAbstractItemModel* self, int column, int order); struct miqt_array* QAbstractItemModel_Match4(const QAbstractItemModel* self, QModelIndex* start, int role, QVariant* value, int hits); struct miqt_array* QAbstractItemModel_Match5(const QAbstractItemModel* self, QModelIndex* start, int role, QVariant* value, int hits, int flags); bool QAbstractItemModel_CheckIndex2(const QAbstractItemModel* self, QModelIndex* index, int options); @@ -158,11 +158,11 @@ void QAbstractItemModel_DataChanged3(QAbstractItemModel* self, QModelIndex* topL void QAbstractItemModel_connect_DataChanged3(QAbstractItemModel* self, void* slot); void QAbstractItemModel_LayoutChanged1(QAbstractItemModel* self, struct miqt_array* /* of QPersistentModelIndex* */ parents); void QAbstractItemModel_connect_LayoutChanged1(QAbstractItemModel* self, void* slot); -void QAbstractItemModel_LayoutChanged2(QAbstractItemModel* self, struct miqt_array* /* of QPersistentModelIndex* */ parents, uintptr_t hint); +void QAbstractItemModel_LayoutChanged2(QAbstractItemModel* self, struct miqt_array* /* of QPersistentModelIndex* */ parents, int hint); void QAbstractItemModel_connect_LayoutChanged2(QAbstractItemModel* self, void* slot); void QAbstractItemModel_LayoutAboutToBeChanged1(QAbstractItemModel* self, struct miqt_array* /* of QPersistentModelIndex* */ parents); void QAbstractItemModel_connect_LayoutAboutToBeChanged1(QAbstractItemModel* self, void* slot); -void QAbstractItemModel_LayoutAboutToBeChanged2(QAbstractItemModel* self, struct miqt_array* /* of QPersistentModelIndex* */ parents, uintptr_t hint); +void QAbstractItemModel_LayoutAboutToBeChanged2(QAbstractItemModel* self, struct miqt_array* /* of QPersistentModelIndex* */ parents, int hint); void QAbstractItemModel_connect_LayoutAboutToBeChanged2(QAbstractItemModel* self, void* slot); void QAbstractItemModel_Delete(QAbstractItemModel* self); @@ -171,7 +171,7 @@ struct miqt_string* QAbstractTableModel_Tr(const char* s); struct miqt_string* QAbstractTableModel_TrUtf8(const char* s); QModelIndex* QAbstractTableModel_Index(const QAbstractTableModel* self, int row, int column); QModelIndex* QAbstractTableModel_Sibling(const QAbstractTableModel* self, int row, int column, QModelIndex* idx); -bool QAbstractTableModel_DropMimeData(QAbstractTableModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent); +bool QAbstractTableModel_DropMimeData(QAbstractTableModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent); int QAbstractTableModel_Flags(const QAbstractTableModel* self, QModelIndex* index); struct miqt_string* QAbstractTableModel_Tr2(const char* s, const char* c); struct miqt_string* QAbstractTableModel_Tr3(const char* s, const char* c, int n); @@ -185,7 +185,7 @@ struct miqt_string* QAbstractListModel_Tr(const char* s); struct miqt_string* QAbstractListModel_TrUtf8(const char* s); QModelIndex* QAbstractListModel_Index(const QAbstractListModel* self, int row); QModelIndex* QAbstractListModel_Sibling(const QAbstractListModel* self, int row, int column, QModelIndex* idx); -bool QAbstractListModel_DropMimeData(QAbstractListModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent); +bool QAbstractListModel_DropMimeData(QAbstractListModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent); int QAbstractListModel_Flags(const QAbstractListModel* self, QModelIndex* index); struct miqt_string* QAbstractListModel_Tr2(const char* s, const char* c); struct miqt_string* QAbstractListModel_Tr3(const char* s, const char* c, int n); diff --git a/qt/gen_qabstractitemview.cpp b/qt/gen_qabstractitemview.cpp index 5cc06e8..77b260f 100644 --- a/qt/gen_qabstractitemview.cpp +++ b/qt/gen_qabstractitemview.cpp @@ -58,22 +58,22 @@ QAbstractItemDelegate* QAbstractItemView_ItemDelegate(const QAbstractItemView* s return self->itemDelegate(); } -void QAbstractItemView_SetSelectionMode(QAbstractItemView* self, uintptr_t mode) { +void QAbstractItemView_SetSelectionMode(QAbstractItemView* self, int mode) { self->setSelectionMode(static_cast(mode)); } -uintptr_t QAbstractItemView_SelectionMode(const QAbstractItemView* self) { +int QAbstractItemView_SelectionMode(const QAbstractItemView* self) { QAbstractItemView::SelectionMode _ret = self->selectionMode(); - return static_cast(_ret); + return static_cast(_ret); } -void QAbstractItemView_SetSelectionBehavior(QAbstractItemView* self, uintptr_t behavior) { +void QAbstractItemView_SetSelectionBehavior(QAbstractItemView* self, int behavior) { self->setSelectionBehavior(static_cast(behavior)); } -uintptr_t QAbstractItemView_SelectionBehavior(const QAbstractItemView* self) { +int QAbstractItemView_SelectionBehavior(const QAbstractItemView* self) { QAbstractItemView::SelectionBehavior _ret = self->selectionBehavior(); - return static_cast(_ret); + return static_cast(_ret); } QModelIndex* QAbstractItemView_CurrentIndex(const QAbstractItemView* self) { @@ -93,26 +93,26 @@ int QAbstractItemView_EditTriggers(const QAbstractItemView* self) { return static_cast(_ret); } -void QAbstractItemView_SetVerticalScrollMode(QAbstractItemView* self, uintptr_t mode) { +void QAbstractItemView_SetVerticalScrollMode(QAbstractItemView* self, int mode) { self->setVerticalScrollMode(static_cast(mode)); } -uintptr_t QAbstractItemView_VerticalScrollMode(const QAbstractItemView* self) { +int QAbstractItemView_VerticalScrollMode(const QAbstractItemView* self) { QAbstractItemView::ScrollMode _ret = self->verticalScrollMode(); - return static_cast(_ret); + return static_cast(_ret); } void QAbstractItemView_ResetVerticalScrollMode(QAbstractItemView* self) { self->resetVerticalScrollMode(); } -void QAbstractItemView_SetHorizontalScrollMode(QAbstractItemView* self, uintptr_t mode) { +void QAbstractItemView_SetHorizontalScrollMode(QAbstractItemView* self, int mode) { self->setHorizontalScrollMode(static_cast(mode)); } -uintptr_t QAbstractItemView_HorizontalScrollMode(const QAbstractItemView* self) { +int QAbstractItemView_HorizontalScrollMode(const QAbstractItemView* self) { QAbstractItemView::ScrollMode _ret = self->horizontalScrollMode(); - return static_cast(_ret); + return static_cast(_ret); } void QAbstractItemView_ResetHorizontalScrollMode(QAbstractItemView* self) { @@ -167,22 +167,22 @@ bool QAbstractItemView_DragDropOverwriteMode(const QAbstractItemView* self) { return self->dragDropOverwriteMode(); } -void QAbstractItemView_SetDragDropMode(QAbstractItemView* self, uintptr_t behavior) { +void QAbstractItemView_SetDragDropMode(QAbstractItemView* self, int behavior) { self->setDragDropMode(static_cast(behavior)); } -uintptr_t QAbstractItemView_DragDropMode(const QAbstractItemView* self) { +int QAbstractItemView_DragDropMode(const QAbstractItemView* self) { QAbstractItemView::DragDropMode _ret = self->dragDropMode(); - return static_cast(_ret); + return static_cast(_ret); } -void QAbstractItemView_SetDefaultDropAction(QAbstractItemView* self, uintptr_t dropAction) { +void QAbstractItemView_SetDefaultDropAction(QAbstractItemView* self, int dropAction) { self->setDefaultDropAction(static_cast(dropAction)); } -uintptr_t QAbstractItemView_DefaultDropAction(const QAbstractItemView* self) { +int QAbstractItemView_DefaultDropAction(const QAbstractItemView* self) { Qt::DropAction _ret = self->defaultDropAction(); - return static_cast(_ret); + return static_cast(_ret); } void QAbstractItemView_SetAlternatingRowColors(QAbstractItemView* self, bool enable) { @@ -201,13 +201,13 @@ QSize* QAbstractItemView_IconSize(const QAbstractItemView* self) { return new QSize(self->iconSize()); } -void QAbstractItemView_SetTextElideMode(QAbstractItemView* self, uintptr_t mode) { +void QAbstractItemView_SetTextElideMode(QAbstractItemView* self, int mode) { self->setTextElideMode(static_cast(mode)); } -uintptr_t QAbstractItemView_TextElideMode(const QAbstractItemView* self) { +int QAbstractItemView_TextElideMode(const QAbstractItemView* self) { Qt::TextElideMode _ret = self->textElideMode(); - return static_cast(_ret); + return static_cast(_ret); } void QAbstractItemView_KeyboardSearch(QAbstractItemView* self, struct miqt_string* search) { @@ -279,7 +279,7 @@ QAbstractItemDelegate* QAbstractItemView_ItemDelegateWithIndex(const QAbstractIt return self->itemDelegate(*index); } -QVariant* QAbstractItemView_InputMethodQuery(const QAbstractItemView* self, uintptr_t query) { +QVariant* QAbstractItemView_InputMethodQuery(const QAbstractItemView* self, int query) { return new QVariant(self->inputMethodQuery(static_cast(query))); } @@ -439,7 +439,7 @@ struct miqt_string* QAbstractItemView_TrUtf83(const char* s, const char* c, int return miqt_strdup(_b.data(), _b.length()); } -void QAbstractItemView_ScrollTo2(QAbstractItemView* self, QModelIndex* index, uintptr_t hint) { +void QAbstractItemView_ScrollTo2(QAbstractItemView* self, QModelIndex* index, int hint) { self->scrollTo(*index, static_cast(hint)); } diff --git a/qt/gen_qabstractitemview.go b/qt/gen_qabstractitemview.go index f1f46ca..4895788 100644 --- a/qt/gen_qabstractitemview.go +++ b/qt/gen_qabstractitemview.go @@ -140,7 +140,7 @@ func (this *QAbstractItemView) ItemDelegate() *QAbstractItemDelegate { } func (this *QAbstractItemView) SetSelectionMode(mode QAbstractItemView__SelectionMode) { - C.QAbstractItemView_SetSelectionMode(this.h, (C.uintptr_t)(mode)) + C.QAbstractItemView_SetSelectionMode(this.h, (C.int)(mode)) } func (this *QAbstractItemView) SelectionMode() QAbstractItemView__SelectionMode { @@ -148,7 +148,7 @@ func (this *QAbstractItemView) SelectionMode() QAbstractItemView__SelectionMode } func (this *QAbstractItemView) SetSelectionBehavior(behavior QAbstractItemView__SelectionBehavior) { - C.QAbstractItemView_SetSelectionBehavior(this.h, (C.uintptr_t)(behavior)) + C.QAbstractItemView_SetSelectionBehavior(this.h, (C.int)(behavior)) } func (this *QAbstractItemView) SelectionBehavior() QAbstractItemView__SelectionBehavior { @@ -170,7 +170,7 @@ func (this *QAbstractItemView) RootIndex() *QModelIndex { } func (this *QAbstractItemView) SetEditTriggers(triggers int) { - C.QAbstractItemView_SetEditTriggers(this.h, (C.int)(triggers)) + C.QAbstractItemView_SetEditTriggers(this.h, triggers) } func (this *QAbstractItemView) EditTriggers() int { @@ -178,7 +178,7 @@ func (this *QAbstractItemView) EditTriggers() int { } func (this *QAbstractItemView) SetVerticalScrollMode(mode QAbstractItemView__ScrollMode) { - C.QAbstractItemView_SetVerticalScrollMode(this.h, (C.uintptr_t)(mode)) + C.QAbstractItemView_SetVerticalScrollMode(this.h, (C.int)(mode)) } func (this *QAbstractItemView) VerticalScrollMode() QAbstractItemView__ScrollMode { @@ -190,7 +190,7 @@ func (this *QAbstractItemView) ResetVerticalScrollMode() { } func (this *QAbstractItemView) SetHorizontalScrollMode(mode QAbstractItemView__ScrollMode) { - C.QAbstractItemView_SetHorizontalScrollMode(this.h, (C.uintptr_t)(mode)) + C.QAbstractItemView_SetHorizontalScrollMode(this.h, (C.int)(mode)) } func (this *QAbstractItemView) HorizontalScrollMode() QAbstractItemView__ScrollMode { @@ -250,7 +250,7 @@ func (this *QAbstractItemView) DragDropOverwriteMode() bool { } func (this *QAbstractItemView) SetDragDropMode(behavior QAbstractItemView__DragDropMode) { - C.QAbstractItemView_SetDragDropMode(this.h, (C.uintptr_t)(behavior)) + C.QAbstractItemView_SetDragDropMode(this.h, (C.int)(behavior)) } func (this *QAbstractItemView) DragDropMode() QAbstractItemView__DragDropMode { @@ -258,7 +258,7 @@ func (this *QAbstractItemView) DragDropMode() QAbstractItemView__DragDropMode { } func (this *QAbstractItemView) SetDefaultDropAction(dropAction DropAction) { - C.QAbstractItemView_SetDefaultDropAction(this.h, (C.uintptr_t)(dropAction)) + C.QAbstractItemView_SetDefaultDropAction(this.h, (C.int)(dropAction)) } func (this *QAbstractItemView) DefaultDropAction() DropAction { @@ -285,7 +285,7 @@ func (this *QAbstractItemView) IconSize() *QSize { } func (this *QAbstractItemView) SetTextElideMode(mode TextElideMode) { - C.QAbstractItemView_SetTextElideMode(this.h, (C.uintptr_t)(mode)) + C.QAbstractItemView_SetTextElideMode(this.h, (C.int)(mode)) } func (this *QAbstractItemView) TextElideMode() TextElideMode { @@ -372,7 +372,7 @@ func (this *QAbstractItemView) ItemDelegateWithIndex(index *QModelIndex) *QAbstr } func (this *QAbstractItemView) InputMethodQuery(query InputMethodQuery) *QVariant { - _ret := C.QAbstractItemView_InputMethodQuery(this.h, (C.uintptr_t)(query)) + _ret := C.QAbstractItemView_InputMethodQuery(this.h, (C.int)(query)) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -600,7 +600,7 @@ func QAbstractItemView_TrUtf83(s string, c string, n int) string { } func (this *QAbstractItemView) ScrollTo2(index *QModelIndex, hint QAbstractItemView__ScrollHint) { - C.QAbstractItemView_ScrollTo2(this.h, index.cPointer(), (C.uintptr_t)(hint)) + C.QAbstractItemView_ScrollTo2(this.h, index.cPointer(), (C.int)(hint)) } // Delete this object from C++ memory. diff --git a/qt/gen_qabstractitemview.h b/qt/gen_qabstractitemview.h index fe142e5..f53b174 100644 --- a/qt/gen_qabstractitemview.h +++ b/qt/gen_qabstractitemview.h @@ -48,19 +48,19 @@ void QAbstractItemView_SetSelectionModel(QAbstractItemView* self, QItemSelection QItemSelectionModel* QAbstractItemView_SelectionModel(const QAbstractItemView* self); void QAbstractItemView_SetItemDelegate(QAbstractItemView* self, QAbstractItemDelegate* delegate); QAbstractItemDelegate* QAbstractItemView_ItemDelegate(const QAbstractItemView* self); -void QAbstractItemView_SetSelectionMode(QAbstractItemView* self, uintptr_t mode); -uintptr_t QAbstractItemView_SelectionMode(const QAbstractItemView* self); -void QAbstractItemView_SetSelectionBehavior(QAbstractItemView* self, uintptr_t behavior); -uintptr_t QAbstractItemView_SelectionBehavior(const QAbstractItemView* self); +void QAbstractItemView_SetSelectionMode(QAbstractItemView* self, int mode); +int QAbstractItemView_SelectionMode(const QAbstractItemView* self); +void QAbstractItemView_SetSelectionBehavior(QAbstractItemView* self, int behavior); +int QAbstractItemView_SelectionBehavior(const QAbstractItemView* self); QModelIndex* QAbstractItemView_CurrentIndex(const QAbstractItemView* self); QModelIndex* QAbstractItemView_RootIndex(const QAbstractItemView* self); void QAbstractItemView_SetEditTriggers(QAbstractItemView* self, int triggers); int QAbstractItemView_EditTriggers(const QAbstractItemView* self); -void QAbstractItemView_SetVerticalScrollMode(QAbstractItemView* self, uintptr_t mode); -uintptr_t QAbstractItemView_VerticalScrollMode(const QAbstractItemView* self); +void QAbstractItemView_SetVerticalScrollMode(QAbstractItemView* self, int mode); +int QAbstractItemView_VerticalScrollMode(const QAbstractItemView* self); void QAbstractItemView_ResetVerticalScrollMode(QAbstractItemView* self); -void QAbstractItemView_SetHorizontalScrollMode(QAbstractItemView* self, uintptr_t mode); -uintptr_t QAbstractItemView_HorizontalScrollMode(const QAbstractItemView* self); +void QAbstractItemView_SetHorizontalScrollMode(QAbstractItemView* self, int mode); +int QAbstractItemView_HorizontalScrollMode(const QAbstractItemView* self); void QAbstractItemView_ResetHorizontalScrollMode(QAbstractItemView* self); void QAbstractItemView_SetAutoScroll(QAbstractItemView* self, bool enable); bool QAbstractItemView_HasAutoScroll(const QAbstractItemView* self); @@ -74,16 +74,16 @@ void QAbstractItemView_SetDragEnabled(QAbstractItemView* self, bool enable); bool QAbstractItemView_DragEnabled(const QAbstractItemView* self); void QAbstractItemView_SetDragDropOverwriteMode(QAbstractItemView* self, bool overwrite); bool QAbstractItemView_DragDropOverwriteMode(const QAbstractItemView* self); -void QAbstractItemView_SetDragDropMode(QAbstractItemView* self, uintptr_t behavior); -uintptr_t QAbstractItemView_DragDropMode(const QAbstractItemView* self); -void QAbstractItemView_SetDefaultDropAction(QAbstractItemView* self, uintptr_t dropAction); -uintptr_t QAbstractItemView_DefaultDropAction(const QAbstractItemView* self); +void QAbstractItemView_SetDragDropMode(QAbstractItemView* self, int behavior); +int QAbstractItemView_DragDropMode(const QAbstractItemView* self); +void QAbstractItemView_SetDefaultDropAction(QAbstractItemView* self, int dropAction); +int QAbstractItemView_DefaultDropAction(const QAbstractItemView* self); void QAbstractItemView_SetAlternatingRowColors(QAbstractItemView* self, bool enable); bool QAbstractItemView_AlternatingRowColors(const QAbstractItemView* self); void QAbstractItemView_SetIconSize(QAbstractItemView* self, QSize* size); QSize* QAbstractItemView_IconSize(const QAbstractItemView* self); -void QAbstractItemView_SetTextElideMode(QAbstractItemView* self, uintptr_t mode); -uintptr_t QAbstractItemView_TextElideMode(const QAbstractItemView* self); +void QAbstractItemView_SetTextElideMode(QAbstractItemView* self, int mode); +int QAbstractItemView_TextElideMode(const QAbstractItemView* self); void QAbstractItemView_KeyboardSearch(QAbstractItemView* self, struct miqt_string* search); QRect* QAbstractItemView_VisualRect(const QAbstractItemView* self, QModelIndex* index); void QAbstractItemView_ScrollTo(QAbstractItemView* self, QModelIndex* index); @@ -101,7 +101,7 @@ QAbstractItemDelegate* QAbstractItemView_ItemDelegateForRow(const QAbstractItemV void QAbstractItemView_SetItemDelegateForColumn(QAbstractItemView* self, int column, QAbstractItemDelegate* delegate); QAbstractItemDelegate* QAbstractItemView_ItemDelegateForColumn(const QAbstractItemView* self, int column); QAbstractItemDelegate* QAbstractItemView_ItemDelegateWithIndex(const QAbstractItemView* self, QModelIndex* index); -QVariant* QAbstractItemView_InputMethodQuery(const QAbstractItemView* self, uintptr_t query); +QVariant* QAbstractItemView_InputMethodQuery(const QAbstractItemView* self, int query); void QAbstractItemView_Reset(QAbstractItemView* self); void QAbstractItemView_SetRootIndex(QAbstractItemView* self, QModelIndex* index); void QAbstractItemView_DoItemsLayout(QAbstractItemView* self); @@ -130,7 +130,7 @@ struct miqt_string* QAbstractItemView_Tr2(const char* s, const char* c); struct miqt_string* QAbstractItemView_Tr3(const char* s, const char* c, int n); struct miqt_string* QAbstractItemView_TrUtf82(const char* s, const char* c); struct miqt_string* QAbstractItemView_TrUtf83(const char* s, const char* c, int n); -void QAbstractItemView_ScrollTo2(QAbstractItemView* self, QModelIndex* index, uintptr_t hint); +void QAbstractItemView_ScrollTo2(QAbstractItemView* self, QModelIndex* index, int hint); void QAbstractItemView_Delete(QAbstractItemView* self); #ifdef __cplusplus diff --git a/qt/gen_qabstractproxymodel.cpp b/qt/gen_qabstractproxymodel.cpp index 0bde52e..9da733e 100644 --- a/qt/gen_qabstractproxymodel.cpp +++ b/qt/gen_qabstractproxymodel.cpp @@ -59,7 +59,7 @@ QVariant* QAbstractProxyModel_Data(const QAbstractProxyModel* self, QModelIndex* return new QVariant(self->data(*proxyIndex)); } -QVariant* QAbstractProxyModel_HeaderData(const QAbstractProxyModel* self, int section, uintptr_t orientation) { +QVariant* QAbstractProxyModel_HeaderData(const QAbstractProxyModel* self, int section, int orientation) { return new QVariant(self->headerData(static_cast(section), static_cast(orientation))); } @@ -72,7 +72,7 @@ bool QAbstractProxyModel_SetData(QAbstractProxyModel* self, QModelIndex* index, return self->setData(*index, *value); } -bool QAbstractProxyModel_SetHeaderData(QAbstractProxyModel* self, int section, uintptr_t orientation, QVariant* value) { +bool QAbstractProxyModel_SetHeaderData(QAbstractProxyModel* self, int section, int orientation, QVariant* value) { return self->setHeaderData(static_cast(section), static_cast(orientation), *value); } @@ -114,11 +114,11 @@ QMimeData* QAbstractProxyModel_MimeData(const QAbstractProxyModel* self, struct return self->mimeData(indexes_QList); } -bool QAbstractProxyModel_CanDropMimeData(const QAbstractProxyModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent) { +bool QAbstractProxyModel_CanDropMimeData(const QAbstractProxyModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent) { return self->canDropMimeData(data, static_cast(action), static_cast(row), static_cast(column), *parent); } -bool QAbstractProxyModel_DropMimeData(QAbstractProxyModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent) { +bool QAbstractProxyModel_DropMimeData(QAbstractProxyModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent) { return self->dropMimeData(data, static_cast(action), static_cast(row), static_cast(column), *parent); } @@ -180,7 +180,7 @@ QVariant* QAbstractProxyModel_Data2(const QAbstractProxyModel* self, QModelIndex return new QVariant(self->data(*proxyIndex, static_cast(role))); } -QVariant* QAbstractProxyModel_HeaderData3(const QAbstractProxyModel* self, int section, uintptr_t orientation, int role) { +QVariant* QAbstractProxyModel_HeaderData3(const QAbstractProxyModel* self, int section, int orientation, int role) { return new QVariant(self->headerData(static_cast(section), static_cast(orientation), static_cast(role))); } @@ -188,11 +188,11 @@ bool QAbstractProxyModel_SetData3(QAbstractProxyModel* self, QModelIndex* index, return self->setData(*index, *value, static_cast(role)); } -bool QAbstractProxyModel_SetHeaderData4(QAbstractProxyModel* self, int section, uintptr_t orientation, QVariant* value, int role) { +bool QAbstractProxyModel_SetHeaderData4(QAbstractProxyModel* self, int section, int orientation, QVariant* value, int role) { return self->setHeaderData(static_cast(section), static_cast(orientation), *value, static_cast(role)); } -void QAbstractProxyModel_Sort2(QAbstractProxyModel* self, int column, uintptr_t order) { +void QAbstractProxyModel_Sort2(QAbstractProxyModel* self, int column, int order) { self->sort(static_cast(column), static_cast(order)); } diff --git a/qt/gen_qabstractproxymodel.go b/qt/gen_qabstractproxymodel.go index d0abebc..aa98411 100644 --- a/qt/gen_qabstractproxymodel.go +++ b/qt/gen_qabstractproxymodel.go @@ -96,7 +96,7 @@ func (this *QAbstractProxyModel) Data(proxyIndex *QModelIndex) *QVariant { } func (this *QAbstractProxyModel) HeaderData(section int, orientation Orientation) *QVariant { - _ret := C.QAbstractProxyModel_HeaderData(this.h, (C.int)(section), (C.uintptr_t)(orientation)) + _ret := C.QAbstractProxyModel_HeaderData(this.h, (C.int)(section), (C.int)(orientation)) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -111,7 +111,7 @@ func (this *QAbstractProxyModel) SetData(index *QModelIndex, value *QVariant) bo } func (this *QAbstractProxyModel) SetHeaderData(section int, orientation Orientation, value *QVariant) bool { - return (bool)(C.QAbstractProxyModel_SetHeaderData(this.h, (C.int)(section), (C.uintptr_t)(orientation), value.cPointer())) + return (bool)(C.QAbstractProxyModel_SetHeaderData(this.h, (C.int)(section), (C.int)(orientation), value.cPointer())) } func (this *QAbstractProxyModel) Buddy(index *QModelIndex) *QModelIndex { @@ -164,11 +164,11 @@ func (this *QAbstractProxyModel) MimeData(indexes []QModelIndex) *QMimeData { } func (this *QAbstractProxyModel) CanDropMimeData(data *QMimeData, action DropAction, row int, column int, parent *QModelIndex) bool { - return (bool)(C.QAbstractProxyModel_CanDropMimeData(this.h, data.cPointer(), (C.uintptr_t)(action), (C.int)(row), (C.int)(column), parent.cPointer())) + return (bool)(C.QAbstractProxyModel_CanDropMimeData(this.h, data.cPointer(), (C.int)(action), (C.int)(row), (C.int)(column), parent.cPointer())) } func (this *QAbstractProxyModel) DropMimeData(data *QMimeData, action DropAction, row int, column int, parent *QModelIndex) bool { - return (bool)(C.QAbstractProxyModel_DropMimeData(this.h, data.cPointer(), (C.uintptr_t)(action), (C.int)(row), (C.int)(column), parent.cPointer())) + return (bool)(C.QAbstractProxyModel_DropMimeData(this.h, data.cPointer(), (C.int)(action), (C.int)(row), (C.int)(column), parent.cPointer())) } func (this *QAbstractProxyModel) MimeTypes() []string { @@ -245,7 +245,7 @@ func (this *QAbstractProxyModel) Data2(proxyIndex *QModelIndex, role int) *QVari } func (this *QAbstractProxyModel) HeaderData3(section int, orientation Orientation, role int) *QVariant { - _ret := C.QAbstractProxyModel_HeaderData3(this.h, (C.int)(section), (C.uintptr_t)(orientation), (C.int)(role)) + _ret := C.QAbstractProxyModel_HeaderData3(this.h, (C.int)(section), (C.int)(orientation), (C.int)(role)) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -256,11 +256,11 @@ func (this *QAbstractProxyModel) SetData3(index *QModelIndex, value *QVariant, r } func (this *QAbstractProxyModel) SetHeaderData4(section int, orientation Orientation, value *QVariant, role int) bool { - return (bool)(C.QAbstractProxyModel_SetHeaderData4(this.h, (C.int)(section), (C.uintptr_t)(orientation), value.cPointer(), (C.int)(role))) + return (bool)(C.QAbstractProxyModel_SetHeaderData4(this.h, (C.int)(section), (C.int)(orientation), value.cPointer(), (C.int)(role))) } func (this *QAbstractProxyModel) Sort2(column int, order SortOrder) { - C.QAbstractProxyModel_Sort2(this.h, (C.int)(column), (C.uintptr_t)(order)) + C.QAbstractProxyModel_Sort2(this.h, (C.int)(column), (C.int)(order)) } func (this *QAbstractProxyModel) HasChildren1(parent *QModelIndex) bool { diff --git a/qt/gen_qabstractproxymodel.h b/qt/gen_qabstractproxymodel.h index 4f5ffc9..700d825 100644 --- a/qt/gen_qabstractproxymodel.h +++ b/qt/gen_qabstractproxymodel.h @@ -41,10 +41,10 @@ QModelIndex* QAbstractProxyModel_MapFromSource(const QAbstractProxyModel* self, bool QAbstractProxyModel_Submit(QAbstractProxyModel* self); void QAbstractProxyModel_Revert(QAbstractProxyModel* self); QVariant* QAbstractProxyModel_Data(const QAbstractProxyModel* self, QModelIndex* proxyIndex); -QVariant* QAbstractProxyModel_HeaderData(const QAbstractProxyModel* self, int section, uintptr_t orientation); +QVariant* QAbstractProxyModel_HeaderData(const QAbstractProxyModel* self, int section, int orientation); int QAbstractProxyModel_Flags(const QAbstractProxyModel* self, QModelIndex* index); bool QAbstractProxyModel_SetData(QAbstractProxyModel* self, QModelIndex* index, QVariant* value); -bool QAbstractProxyModel_SetHeaderData(QAbstractProxyModel* self, int section, uintptr_t orientation, QVariant* value); +bool QAbstractProxyModel_SetHeaderData(QAbstractProxyModel* self, int section, int orientation, QVariant* value); QModelIndex* QAbstractProxyModel_Buddy(const QAbstractProxyModel* self, QModelIndex* index); bool QAbstractProxyModel_CanFetchMore(const QAbstractProxyModel* self, QModelIndex* parent); void QAbstractProxyModel_FetchMore(QAbstractProxyModel* self, QModelIndex* parent); @@ -53,8 +53,8 @@ QSize* QAbstractProxyModel_Span(const QAbstractProxyModel* self, QModelIndex* in bool QAbstractProxyModel_HasChildren(const QAbstractProxyModel* self); QModelIndex* QAbstractProxyModel_Sibling(const QAbstractProxyModel* self, int row, int column, QModelIndex* idx); QMimeData* QAbstractProxyModel_MimeData(const QAbstractProxyModel* self, struct miqt_array* /* of QModelIndex* */ indexes); -bool QAbstractProxyModel_CanDropMimeData(const QAbstractProxyModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent); -bool QAbstractProxyModel_DropMimeData(QAbstractProxyModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent); +bool QAbstractProxyModel_CanDropMimeData(const QAbstractProxyModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent); +bool QAbstractProxyModel_DropMimeData(QAbstractProxyModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent); struct miqt_array* QAbstractProxyModel_MimeTypes(const QAbstractProxyModel* self); int QAbstractProxyModel_SupportedDragActions(const QAbstractProxyModel* self); int QAbstractProxyModel_SupportedDropActions(const QAbstractProxyModel* self); @@ -63,10 +63,10 @@ struct miqt_string* QAbstractProxyModel_Tr3(const char* s, const char* c, int n) struct miqt_string* QAbstractProxyModel_TrUtf82(const char* s, const char* c); struct miqt_string* QAbstractProxyModel_TrUtf83(const char* s, const char* c, int n); QVariant* QAbstractProxyModel_Data2(const QAbstractProxyModel* self, QModelIndex* proxyIndex, int role); -QVariant* QAbstractProxyModel_HeaderData3(const QAbstractProxyModel* self, int section, uintptr_t orientation, int role); +QVariant* QAbstractProxyModel_HeaderData3(const QAbstractProxyModel* self, int section, int orientation, int role); bool QAbstractProxyModel_SetData3(QAbstractProxyModel* self, QModelIndex* index, QVariant* value, int role); -bool QAbstractProxyModel_SetHeaderData4(QAbstractProxyModel* self, int section, uintptr_t orientation, QVariant* value, int role); -void QAbstractProxyModel_Sort2(QAbstractProxyModel* self, int column, uintptr_t order); +bool QAbstractProxyModel_SetHeaderData4(QAbstractProxyModel* self, int section, int orientation, QVariant* value, int role); +void QAbstractProxyModel_Sort2(QAbstractProxyModel* self, int column, int order); bool QAbstractProxyModel_HasChildren1(const QAbstractProxyModel* self, QModelIndex* parent); void QAbstractProxyModel_Delete(QAbstractProxyModel* self); diff --git a/qt/gen_qabstractscrollarea.cpp b/qt/gen_qabstractscrollarea.cpp index 92664e7..4397559 100644 --- a/qt/gen_qabstractscrollarea.cpp +++ b/qt/gen_qabstractscrollarea.cpp @@ -37,12 +37,12 @@ struct miqt_string* QAbstractScrollArea_TrUtf8(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -uintptr_t QAbstractScrollArea_VerticalScrollBarPolicy(const QAbstractScrollArea* self) { +int QAbstractScrollArea_VerticalScrollBarPolicy(const QAbstractScrollArea* self) { Qt::ScrollBarPolicy _ret = self->verticalScrollBarPolicy(); - return static_cast(_ret); + return static_cast(_ret); } -void QAbstractScrollArea_SetVerticalScrollBarPolicy(QAbstractScrollArea* self, uintptr_t verticalScrollBarPolicy) { +void QAbstractScrollArea_SetVerticalScrollBarPolicy(QAbstractScrollArea* self, int verticalScrollBarPolicy) { self->setVerticalScrollBarPolicy(static_cast(verticalScrollBarPolicy)); } @@ -54,12 +54,12 @@ void QAbstractScrollArea_SetVerticalScrollBar(QAbstractScrollArea* self, QScroll self->setVerticalScrollBar(scrollbar); } -uintptr_t QAbstractScrollArea_HorizontalScrollBarPolicy(const QAbstractScrollArea* self) { +int QAbstractScrollArea_HorizontalScrollBarPolicy(const QAbstractScrollArea* self) { Qt::ScrollBarPolicy _ret = self->horizontalScrollBarPolicy(); - return static_cast(_ret); + return static_cast(_ret); } -void QAbstractScrollArea_SetHorizontalScrollBarPolicy(QAbstractScrollArea* self, uintptr_t horizontalScrollBarPolicy) { +void QAbstractScrollArea_SetHorizontalScrollBarPolicy(QAbstractScrollArea* self, int horizontalScrollBarPolicy) { self->setHorizontalScrollBarPolicy(static_cast(horizontalScrollBarPolicy)); } @@ -120,12 +120,12 @@ void QAbstractScrollArea_SetupViewport(QAbstractScrollArea* self, QWidget* viewp self->setupViewport(viewport); } -uintptr_t QAbstractScrollArea_SizeAdjustPolicy(const QAbstractScrollArea* self) { +int QAbstractScrollArea_SizeAdjustPolicy(const QAbstractScrollArea* self) { QAbstractScrollArea::SizeAdjustPolicy _ret = self->sizeAdjustPolicy(); - return static_cast(_ret); + return static_cast(_ret); } -void QAbstractScrollArea_SetSizeAdjustPolicy(QAbstractScrollArea* self, uintptr_t policy) { +void QAbstractScrollArea_SetSizeAdjustPolicy(QAbstractScrollArea* self, int policy) { self->setSizeAdjustPolicy(static_cast(policy)); } diff --git a/qt/gen_qabstractscrollarea.go b/qt/gen_qabstractscrollarea.go index c4b03ea..27c7aaf 100644 --- a/qt/gen_qabstractscrollarea.go +++ b/qt/gen_qabstractscrollarea.go @@ -83,7 +83,7 @@ func (this *QAbstractScrollArea) VerticalScrollBarPolicy() ScrollBarPolicy { } func (this *QAbstractScrollArea) SetVerticalScrollBarPolicy(verticalScrollBarPolicy ScrollBarPolicy) { - C.QAbstractScrollArea_SetVerticalScrollBarPolicy(this.h, (C.uintptr_t)(verticalScrollBarPolicy)) + C.QAbstractScrollArea_SetVerticalScrollBarPolicy(this.h, (C.int)(verticalScrollBarPolicy)) } func (this *QAbstractScrollArea) VerticalScrollBar() *QScrollBar { @@ -99,7 +99,7 @@ func (this *QAbstractScrollArea) HorizontalScrollBarPolicy() ScrollBarPolicy { } func (this *QAbstractScrollArea) SetHorizontalScrollBarPolicy(horizontalScrollBarPolicy ScrollBarPolicy) { - C.QAbstractScrollArea_SetHorizontalScrollBarPolicy(this.h, (C.uintptr_t)(horizontalScrollBarPolicy)) + C.QAbstractScrollArea_SetHorizontalScrollBarPolicy(this.h, (C.int)(horizontalScrollBarPolicy)) } func (this *QAbstractScrollArea) HorizontalScrollBar() *QScrollBar { @@ -119,11 +119,11 @@ func (this *QAbstractScrollArea) SetCornerWidget(widget *QWidget) { } func (this *QAbstractScrollArea) AddScrollBarWidget(widget *QWidget, alignment int) { - C.QAbstractScrollArea_AddScrollBarWidget(this.h, widget.cPointer(), (C.int)(alignment)) + C.QAbstractScrollArea_AddScrollBarWidget(this.h, widget.cPointer(), alignment) } func (this *QAbstractScrollArea) ScrollBarWidgets(alignment int) []*QWidget { - var _ma *C.struct_miqt_array = C.QAbstractScrollArea_ScrollBarWidgets(this.h, (C.int)(alignment)) + var _ma *C.struct_miqt_array = C.QAbstractScrollArea_ScrollBarWidgets(this.h, alignment) _ret := make([]*QWidget, int(_ma.len)) _outCast := (*[0xffff]*C.QWidget)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -171,7 +171,7 @@ func (this *QAbstractScrollArea) SizeAdjustPolicy() QAbstractScrollArea__SizeAdj } func (this *QAbstractScrollArea) SetSizeAdjustPolicy(policy QAbstractScrollArea__SizeAdjustPolicy) { - C.QAbstractScrollArea_SetSizeAdjustPolicy(this.h, (C.uintptr_t)(policy)) + C.QAbstractScrollArea_SetSizeAdjustPolicy(this.h, (C.int)(policy)) } func QAbstractScrollArea_Tr2(s string, c string) string { diff --git a/qt/gen_qabstractscrollarea.h b/qt/gen_qabstractscrollarea.h index ddf0a6a..d16d0dd 100644 --- a/qt/gen_qabstractscrollarea.h +++ b/qt/gen_qabstractscrollarea.h @@ -32,12 +32,12 @@ QAbstractScrollArea* QAbstractScrollArea_new2(QWidget* parent); QMetaObject* QAbstractScrollArea_MetaObject(const QAbstractScrollArea* self); struct miqt_string* QAbstractScrollArea_Tr(const char* s); struct miqt_string* QAbstractScrollArea_TrUtf8(const char* s); -uintptr_t QAbstractScrollArea_VerticalScrollBarPolicy(const QAbstractScrollArea* self); -void QAbstractScrollArea_SetVerticalScrollBarPolicy(QAbstractScrollArea* self, uintptr_t verticalScrollBarPolicy); +int QAbstractScrollArea_VerticalScrollBarPolicy(const QAbstractScrollArea* self); +void QAbstractScrollArea_SetVerticalScrollBarPolicy(QAbstractScrollArea* self, int verticalScrollBarPolicy); QScrollBar* QAbstractScrollArea_VerticalScrollBar(const QAbstractScrollArea* self); void QAbstractScrollArea_SetVerticalScrollBar(QAbstractScrollArea* self, QScrollBar* scrollbar); -uintptr_t QAbstractScrollArea_HorizontalScrollBarPolicy(const QAbstractScrollArea* self); -void QAbstractScrollArea_SetHorizontalScrollBarPolicy(QAbstractScrollArea* self, uintptr_t horizontalScrollBarPolicy); +int QAbstractScrollArea_HorizontalScrollBarPolicy(const QAbstractScrollArea* self); +void QAbstractScrollArea_SetHorizontalScrollBarPolicy(QAbstractScrollArea* self, int horizontalScrollBarPolicy); QScrollBar* QAbstractScrollArea_HorizontalScrollBar(const QAbstractScrollArea* self); void QAbstractScrollArea_SetHorizontalScrollBar(QAbstractScrollArea* self, QScrollBar* scrollbar); QWidget* QAbstractScrollArea_CornerWidget(const QAbstractScrollArea* self); @@ -50,8 +50,8 @@ QSize* QAbstractScrollArea_MaximumViewportSize(const QAbstractScrollArea* self); QSize* QAbstractScrollArea_MinimumSizeHint(const QAbstractScrollArea* self); QSize* QAbstractScrollArea_SizeHint(const QAbstractScrollArea* self); void QAbstractScrollArea_SetupViewport(QAbstractScrollArea* self, QWidget* viewport); -uintptr_t QAbstractScrollArea_SizeAdjustPolicy(const QAbstractScrollArea* self); -void QAbstractScrollArea_SetSizeAdjustPolicy(QAbstractScrollArea* self, uintptr_t policy); +int QAbstractScrollArea_SizeAdjustPolicy(const QAbstractScrollArea* self); +void QAbstractScrollArea_SetSizeAdjustPolicy(QAbstractScrollArea* self, int policy); struct miqt_string* QAbstractScrollArea_Tr2(const char* s, const char* c); struct miqt_string* QAbstractScrollArea_Tr3(const char* s, const char* c, int n); struct miqt_string* QAbstractScrollArea_TrUtf82(const char* s, const char* c); diff --git a/qt/gen_qabstractslider.cpp b/qt/gen_qabstractslider.cpp index e234f0c..f8f3ad6 100644 --- a/qt/gen_qabstractslider.cpp +++ b/qt/gen_qabstractslider.cpp @@ -34,9 +34,9 @@ struct miqt_string* QAbstractSlider_TrUtf8(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -uintptr_t QAbstractSlider_Orientation(const QAbstractSlider* self) { +int QAbstractSlider_Orientation(const QAbstractSlider* self) { Qt::Orientation _ret = self->orientation(); - return static_cast(_ret); + return static_cast(_ret); } void QAbstractSlider_SetMinimum(QAbstractSlider* self, int minimum) { @@ -115,7 +115,7 @@ int QAbstractSlider_Value(const QAbstractSlider* self) { return self->value(); } -void QAbstractSlider_TriggerAction(QAbstractSlider* self, uintptr_t action) { +void QAbstractSlider_TriggerAction(QAbstractSlider* self, int action) { self->triggerAction(static_cast(action)); } @@ -123,7 +123,7 @@ void QAbstractSlider_SetValue(QAbstractSlider* self, int value) { self->setValue(static_cast(value)); } -void QAbstractSlider_SetOrientation(QAbstractSlider* self, uintptr_t orientation) { +void QAbstractSlider_SetOrientation(QAbstractSlider* self, int orientation) { self->setOrientation(static_cast(orientation)); } diff --git a/qt/gen_qabstractslider.go b/qt/gen_qabstractslider.go index 440f6f9..873ee6e 100644 --- a/qt/gen_qabstractslider.go +++ b/qt/gen_qabstractslider.go @@ -165,7 +165,7 @@ func (this *QAbstractSlider) Value() int { } func (this *QAbstractSlider) TriggerAction(action QAbstractSlider__SliderAction) { - C.QAbstractSlider_TriggerAction(this.h, (C.uintptr_t)(action)) + C.QAbstractSlider_TriggerAction(this.h, (C.int)(action)) } func (this *QAbstractSlider) SetValue(value int) { @@ -173,7 +173,7 @@ func (this *QAbstractSlider) SetValue(value int) { } func (this *QAbstractSlider) SetOrientation(orientation Orientation) { - C.QAbstractSlider_SetOrientation(this.h, (C.uintptr_t)(orientation)) + C.QAbstractSlider_SetOrientation(this.h, (C.int)(orientation)) } func (this *QAbstractSlider) SetRange(min int, max int) { diff --git a/qt/gen_qabstractslider.h b/qt/gen_qabstractslider.h index f032e9d..810a04a 100644 --- a/qt/gen_qabstractslider.h +++ b/qt/gen_qabstractslider.h @@ -28,7 +28,7 @@ QAbstractSlider* QAbstractSlider_new2(QWidget* parent); QMetaObject* QAbstractSlider_MetaObject(const QAbstractSlider* self); struct miqt_string* QAbstractSlider_Tr(const char* s); struct miqt_string* QAbstractSlider_TrUtf8(const char* s); -uintptr_t QAbstractSlider_Orientation(const QAbstractSlider* self); +int QAbstractSlider_Orientation(const QAbstractSlider* self); void QAbstractSlider_SetMinimum(QAbstractSlider* self, int minimum); int QAbstractSlider_Minimum(const QAbstractSlider* self); void QAbstractSlider_SetMaximum(QAbstractSlider* self, int maximum); @@ -48,9 +48,9 @@ bool QAbstractSlider_InvertedAppearance(const QAbstractSlider* self); void QAbstractSlider_SetInvertedControls(QAbstractSlider* self, bool invertedControls); bool QAbstractSlider_InvertedControls(const QAbstractSlider* self); int QAbstractSlider_Value(const QAbstractSlider* self); -void QAbstractSlider_TriggerAction(QAbstractSlider* self, uintptr_t action); +void QAbstractSlider_TriggerAction(QAbstractSlider* self, int action); void QAbstractSlider_SetValue(QAbstractSlider* self, int value); -void QAbstractSlider_SetOrientation(QAbstractSlider* self, uintptr_t orientation); +void QAbstractSlider_SetOrientation(QAbstractSlider* self, int orientation); void QAbstractSlider_SetRange(QAbstractSlider* self, int min, int max); void QAbstractSlider_ValueChanged(QAbstractSlider* self, int value); void QAbstractSlider_connect_ValueChanged(QAbstractSlider* self, void* slot); diff --git a/qt/gen_qabstractspinbox.cpp b/qt/gen_qabstractspinbox.cpp index 41ebab3..39d00e1 100644 --- a/qt/gen_qabstractspinbox.cpp +++ b/qt/gen_qabstractspinbox.cpp @@ -37,22 +37,22 @@ struct miqt_string* QAbstractSpinBox_TrUtf8(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -uintptr_t QAbstractSpinBox_ButtonSymbols(const QAbstractSpinBox* self) { +int QAbstractSpinBox_ButtonSymbols(const QAbstractSpinBox* self) { QAbstractSpinBox::ButtonSymbols _ret = self->buttonSymbols(); - return static_cast(_ret); + return static_cast(_ret); } -void QAbstractSpinBox_SetButtonSymbols(QAbstractSpinBox* self, uintptr_t bs) { +void QAbstractSpinBox_SetButtonSymbols(QAbstractSpinBox* self, int bs) { self->setButtonSymbols(static_cast(bs)); } -void QAbstractSpinBox_SetCorrectionMode(QAbstractSpinBox* self, uintptr_t cm) { +void QAbstractSpinBox_SetCorrectionMode(QAbstractSpinBox* self, int cm) { self->setCorrectionMode(static_cast(cm)); } -uintptr_t QAbstractSpinBox_CorrectionMode(const QAbstractSpinBox* self) { +int QAbstractSpinBox_CorrectionMode(const QAbstractSpinBox* self) { QAbstractSpinBox::CorrectionMode _ret = self->correctionMode(); - return static_cast(_ret); + return static_cast(_ret); } bool QAbstractSpinBox_HasAcceptableInput(const QAbstractSpinBox* self) { @@ -151,14 +151,14 @@ bool QAbstractSpinBox_Event(QAbstractSpinBox* self, QEvent* event) { return self->event(event); } -QVariant* QAbstractSpinBox_InputMethodQuery(const QAbstractSpinBox* self, uintptr_t param1) { +QVariant* QAbstractSpinBox_InputMethodQuery(const QAbstractSpinBox* self, int param1) { return new QVariant(self->inputMethodQuery(static_cast(param1))); } -uintptr_t QAbstractSpinBox_Validate(const QAbstractSpinBox* self, struct miqt_string* input, int* pos) { +int QAbstractSpinBox_Validate(const QAbstractSpinBox* self, struct miqt_string* input, int* pos) { QString input_QString = QString::fromUtf8(&input->data, input->len); QValidator::State _ret = self->validate(input_QString, static_cast(*pos)); - return static_cast(_ret); + return static_cast(_ret); } void QAbstractSpinBox_Fixup(const QAbstractSpinBox* self, struct miqt_string* input) { diff --git a/qt/gen_qabstractspinbox.go b/qt/gen_qabstractspinbox.go index 895fa78..dd421a1 100644 --- a/qt/gen_qabstractspinbox.go +++ b/qt/gen_qabstractspinbox.go @@ -106,11 +106,11 @@ func (this *QAbstractSpinBox) ButtonSymbols() QAbstractSpinBox__ButtonSymbols { } func (this *QAbstractSpinBox) SetButtonSymbols(bs QAbstractSpinBox__ButtonSymbols) { - C.QAbstractSpinBox_SetButtonSymbols(this.h, (C.uintptr_t)(bs)) + C.QAbstractSpinBox_SetButtonSymbols(this.h, (C.int)(bs)) } func (this *QAbstractSpinBox) SetCorrectionMode(cm QAbstractSpinBox__CorrectionMode) { - C.QAbstractSpinBox_SetCorrectionMode(this.h, (C.uintptr_t)(cm)) + C.QAbstractSpinBox_SetCorrectionMode(this.h, (C.int)(cm)) } func (this *QAbstractSpinBox) CorrectionMode() QAbstractSpinBox__CorrectionMode { @@ -166,7 +166,7 @@ func (this *QAbstractSpinBox) KeyboardTracking() bool { } func (this *QAbstractSpinBox) SetAlignment(flag int) { - C.QAbstractSpinBox_SetAlignment(this.h, (C.int)(flag)) + C.QAbstractSpinBox_SetAlignment(this.h, flag) } func (this *QAbstractSpinBox) Alignment() int { @@ -220,7 +220,7 @@ func (this *QAbstractSpinBox) Event(event *QEvent) bool { } func (this *QAbstractSpinBox) InputMethodQuery(param1 InputMethodQuery) *QVariant { - _ret := C.QAbstractSpinBox_InputMethodQuery(this.h, (C.uintptr_t)(param1)) + _ret := C.QAbstractSpinBox_InputMethodQuery(this.h, (C.int)(param1)) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qabstractspinbox.h b/qt/gen_qabstractspinbox.h index c3099c2..de588d8 100644 --- a/qt/gen_qabstractspinbox.h +++ b/qt/gen_qabstractspinbox.h @@ -34,10 +34,10 @@ QAbstractSpinBox* QAbstractSpinBox_new2(QWidget* parent); QMetaObject* QAbstractSpinBox_MetaObject(const QAbstractSpinBox* self); struct miqt_string* QAbstractSpinBox_Tr(const char* s); struct miqt_string* QAbstractSpinBox_TrUtf8(const char* s); -uintptr_t QAbstractSpinBox_ButtonSymbols(const QAbstractSpinBox* self); -void QAbstractSpinBox_SetButtonSymbols(QAbstractSpinBox* self, uintptr_t bs); -void QAbstractSpinBox_SetCorrectionMode(QAbstractSpinBox* self, uintptr_t cm); -uintptr_t QAbstractSpinBox_CorrectionMode(const QAbstractSpinBox* self); +int QAbstractSpinBox_ButtonSymbols(const QAbstractSpinBox* self); +void QAbstractSpinBox_SetButtonSymbols(QAbstractSpinBox* self, int bs); +void QAbstractSpinBox_SetCorrectionMode(QAbstractSpinBox* self, int cm); +int QAbstractSpinBox_CorrectionMode(const QAbstractSpinBox* self); bool QAbstractSpinBox_HasAcceptableInput(const QAbstractSpinBox* self); struct miqt_string* QAbstractSpinBox_Text(const QAbstractSpinBox* self); struct miqt_string* QAbstractSpinBox_SpecialValueText(const QAbstractSpinBox* self); @@ -60,8 +60,8 @@ QSize* QAbstractSpinBox_SizeHint(const QAbstractSpinBox* self); QSize* QAbstractSpinBox_MinimumSizeHint(const QAbstractSpinBox* self); void QAbstractSpinBox_InterpretText(QAbstractSpinBox* self); bool QAbstractSpinBox_Event(QAbstractSpinBox* self, QEvent* event); -QVariant* QAbstractSpinBox_InputMethodQuery(const QAbstractSpinBox* self, uintptr_t param1); -uintptr_t QAbstractSpinBox_Validate(const QAbstractSpinBox* self, struct miqt_string* input, int* pos); +QVariant* QAbstractSpinBox_InputMethodQuery(const QAbstractSpinBox* self, int param1); +int QAbstractSpinBox_Validate(const QAbstractSpinBox* self, struct miqt_string* input, int* pos); void QAbstractSpinBox_Fixup(const QAbstractSpinBox* self, struct miqt_string* input); void QAbstractSpinBox_StepBy(QAbstractSpinBox* self, int steps); void QAbstractSpinBox_StepUp(QAbstractSpinBox* self); diff --git a/qt/gen_qabstracttextdocumentlayout.cpp b/qt/gen_qabstracttextdocumentlayout.cpp index ff657dd..302b3b3 100644 --- a/qt/gen_qabstracttextdocumentlayout.cpp +++ b/qt/gen_qabstracttextdocumentlayout.cpp @@ -42,7 +42,7 @@ void QAbstractTextDocumentLayout_Draw(QAbstractTextDocumentLayout* self, QPainte self->draw(painter, *context); } -int QAbstractTextDocumentLayout_HitTest(const QAbstractTextDocumentLayout* self, QPointF* point, uintptr_t accuracy) { +int QAbstractTextDocumentLayout_HitTest(const QAbstractTextDocumentLayout* self, QPointF* point, int accuracy) { return self->hitTest(*point, static_cast(accuracy)); } @@ -224,6 +224,10 @@ QAbstractTextDocumentLayout__Selection* QAbstractTextDocumentLayout__Selection_n return new QAbstractTextDocumentLayout::Selection(*param1); } +void QAbstractTextDocumentLayout__Selection_OperatorAssign(QAbstractTextDocumentLayout__Selection* self, QAbstractTextDocumentLayout__Selection* param1) { + self->operator=(*param1); +} + void QAbstractTextDocumentLayout__Selection_Delete(QAbstractTextDocumentLayout__Selection* self) { delete self; } @@ -236,6 +240,10 @@ QAbstractTextDocumentLayout__PaintContext* QAbstractTextDocumentLayout__PaintCon return new QAbstractTextDocumentLayout::PaintContext(*param1); } +void QAbstractTextDocumentLayout__PaintContext_OperatorAssign(QAbstractTextDocumentLayout__PaintContext* self, QAbstractTextDocumentLayout__PaintContext* param1) { + self->operator=(*param1); +} + void QAbstractTextDocumentLayout__PaintContext_Delete(QAbstractTextDocumentLayout__PaintContext* self) { delete self; } diff --git a/qt/gen_qabstracttextdocumentlayout.go b/qt/gen_qabstracttextdocumentlayout.go index 2cbc034..8622d42 100644 --- a/qt/gen_qabstracttextdocumentlayout.go +++ b/qt/gen_qabstracttextdocumentlayout.go @@ -64,7 +64,7 @@ func (this *QAbstractTextDocumentLayout) Draw(painter *QPainter, context *QAbstr } func (this *QAbstractTextDocumentLayout) HitTest(point *QPointF, accuracy HitTestAccuracy) int { - return (int)(C.QAbstractTextDocumentLayout_HitTest(this.h, point.cPointer(), (C.uintptr_t)(accuracy))) + return (int)(C.QAbstractTextDocumentLayout_HitTest(this.h, point.cPointer(), (C.int)(accuracy))) } func (this *QAbstractTextDocumentLayout) AnchorAt(pos *QPointF) string { @@ -382,6 +382,10 @@ func NewQAbstractTextDocumentLayout__Selection(param1 *QAbstractTextDocumentLayo return newQAbstractTextDocumentLayout__Selection(ret) } +func (this *QAbstractTextDocumentLayout__Selection) OperatorAssign(param1 *QAbstractTextDocumentLayout__Selection) { + C.QAbstractTextDocumentLayout__Selection_OperatorAssign(this.h, param1.cPointer()) +} + // Delete this object from C++ memory. func (this *QAbstractTextDocumentLayout__Selection) Delete() { C.QAbstractTextDocumentLayout__Selection_Delete(this.h) @@ -430,6 +434,10 @@ func NewQAbstractTextDocumentLayout__PaintContext2(param1 *QAbstractTextDocument return newQAbstractTextDocumentLayout__PaintContext(ret) } +func (this *QAbstractTextDocumentLayout__PaintContext) OperatorAssign(param1 *QAbstractTextDocumentLayout__PaintContext) { + C.QAbstractTextDocumentLayout__PaintContext_OperatorAssign(this.h, param1.cPointer()) +} + // Delete this object from C++ memory. func (this *QAbstractTextDocumentLayout__PaintContext) Delete() { C.QAbstractTextDocumentLayout__PaintContext_Delete(this.h) diff --git a/qt/gen_qabstracttextdocumentlayout.h b/qt/gen_qabstracttextdocumentlayout.h index 704c7c5..e8aff4a 100644 --- a/qt/gen_qabstracttextdocumentlayout.h +++ b/qt/gen_qabstracttextdocumentlayout.h @@ -59,7 +59,7 @@ QMetaObject* QAbstractTextDocumentLayout_MetaObject(const QAbstractTextDocumentL struct miqt_string* QAbstractTextDocumentLayout_Tr(const char* s); struct miqt_string* QAbstractTextDocumentLayout_TrUtf8(const char* s); void QAbstractTextDocumentLayout_Draw(QAbstractTextDocumentLayout* self, QPainter* painter, QAbstractTextDocumentLayout__PaintContext* context); -int QAbstractTextDocumentLayout_HitTest(const QAbstractTextDocumentLayout* self, QPointF* point, uintptr_t accuracy); +int QAbstractTextDocumentLayout_HitTest(const QAbstractTextDocumentLayout* self, QPointF* point, int accuracy); struct miqt_string* QAbstractTextDocumentLayout_AnchorAt(const QAbstractTextDocumentLayout* self, QPointF* pos); struct miqt_string* QAbstractTextDocumentLayout_ImageAt(const QAbstractTextDocumentLayout* self, QPointF* pos); QTextFormat* QAbstractTextDocumentLayout_FormatAt(const QAbstractTextDocumentLayout* self, QPointF* pos); @@ -97,10 +97,12 @@ void QTextObjectInterface_OperatorAssign(QTextObjectInterface* self, QTextObject void QTextObjectInterface_Delete(QTextObjectInterface* self); QAbstractTextDocumentLayout__Selection* QAbstractTextDocumentLayout__Selection_new(QAbstractTextDocumentLayout__Selection* param1); +void QAbstractTextDocumentLayout__Selection_OperatorAssign(QAbstractTextDocumentLayout__Selection* self, QAbstractTextDocumentLayout__Selection* param1); void QAbstractTextDocumentLayout__Selection_Delete(QAbstractTextDocumentLayout__Selection* self); QAbstractTextDocumentLayout__PaintContext* QAbstractTextDocumentLayout__PaintContext_new(); QAbstractTextDocumentLayout__PaintContext* QAbstractTextDocumentLayout__PaintContext_new2(QAbstractTextDocumentLayout__PaintContext* param1); +void QAbstractTextDocumentLayout__PaintContext_OperatorAssign(QAbstractTextDocumentLayout__PaintContext* self, QAbstractTextDocumentLayout__PaintContext* param1); void QAbstractTextDocumentLayout__PaintContext_Delete(QAbstractTextDocumentLayout__PaintContext* self); #ifdef __cplusplus diff --git a/qt/gen_qabstracttransition.cpp b/qt/gen_qabstracttransition.cpp index 05970cb..bbf3f12 100644 --- a/qt/gen_qabstracttransition.cpp +++ b/qt/gen_qabstracttransition.cpp @@ -43,7 +43,7 @@ void QAbstractTransition_SetTargetState(QAbstractTransition* self, QAbstractStat } struct miqt_array* QAbstractTransition_TargetStates(const QAbstractTransition* self) { - QList _ret = self->targetStates(); + QList _ret = self->targetStates(); // Convert QList<> from C++ memory to manually-managed C memory QAbstractState** _arr = static_cast(malloc(sizeof(QAbstractState*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -65,12 +65,12 @@ void QAbstractTransition_SetTargetStates(QAbstractTransition* self, struct miqt_ self->setTargetStates(targets_QList); } -uintptr_t QAbstractTransition_TransitionType(const QAbstractTransition* self) { +int QAbstractTransition_TransitionType(const QAbstractTransition* self) { QAbstractTransition::TransitionType _ret = self->transitionType(); - return static_cast(_ret); + return static_cast(_ret); } -void QAbstractTransition_SetTransitionType(QAbstractTransition* self, uintptr_t typeVal) { +void QAbstractTransition_SetTransitionType(QAbstractTransition* self, int typeVal) { self->setTransitionType(static_cast(typeVal)); } @@ -87,7 +87,7 @@ void QAbstractTransition_RemoveAnimation(QAbstractTransition* self, QAbstractAni } struct miqt_array* QAbstractTransition_Animations(const QAbstractTransition* self) { - QList _ret = self->animations(); + QList _ret = self->animations(); // Convert QList<> from C++ memory to manually-managed C memory QAbstractAnimation** _arr = static_cast(malloc(sizeof(QAbstractAnimation*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { diff --git a/qt/gen_qabstracttransition.go b/qt/gen_qabstracttransition.go index 9ae4ed5..0956de1 100644 --- a/qt/gen_qabstracttransition.go +++ b/qt/gen_qabstracttransition.go @@ -105,7 +105,7 @@ func (this *QAbstractTransition) TransitionType() QAbstractTransition__Transitio } func (this *QAbstractTransition) SetTransitionType(typeVal QAbstractTransition__TransitionType) { - C.QAbstractTransition_SetTransitionType(this.h, (C.uintptr_t)(typeVal)) + C.QAbstractTransition_SetTransitionType(this.h, (C.int)(typeVal)) } func (this *QAbstractTransition) Machine() *QStateMachine { diff --git a/qt/gen_qabstracttransition.h b/qt/gen_qabstracttransition.h index f7dc68a..255e25c 100644 --- a/qt/gen_qabstracttransition.h +++ b/qt/gen_qabstracttransition.h @@ -37,8 +37,8 @@ QAbstractState* QAbstractTransition_TargetState(const QAbstractTransition* self) void QAbstractTransition_SetTargetState(QAbstractTransition* self, QAbstractState* target); struct miqt_array* QAbstractTransition_TargetStates(const QAbstractTransition* self); void QAbstractTransition_SetTargetStates(QAbstractTransition* self, struct miqt_array* /* of QAbstractState* */ targets); -uintptr_t QAbstractTransition_TransitionType(const QAbstractTransition* self); -void QAbstractTransition_SetTransitionType(QAbstractTransition* self, uintptr_t typeVal); +int QAbstractTransition_TransitionType(const QAbstractTransition* self); +void QAbstractTransition_SetTransitionType(QAbstractTransition* self, int typeVal); QStateMachine* QAbstractTransition_Machine(const QAbstractTransition* self); void QAbstractTransition_AddAnimation(QAbstractTransition* self, QAbstractAnimation* animation); void QAbstractTransition_RemoveAnimation(QAbstractTransition* self, QAbstractAnimation* animation); diff --git a/qt/gen_qaccessible.cpp b/qt/gen_qaccessible.cpp index 917d48e..a94589b 100644 --- a/qt/gen_qaccessible.cpp +++ b/qt/gen_qaccessible.cpp @@ -46,7 +46,8 @@ QAccessibleInterface* QAccessible_QueryAccessibleInterface(QObject* param1) { } unsigned int QAccessible_UniqueId(QAccessibleInterface* iface) { - return QAccessible::uniqueId(iface); + QAccessible::Id _ret = QAccessible::uniqueId(iface); + return static_cast(_ret); } QAccessibleInterface* QAccessible_AccessibleInterface(unsigned int uniqueId) { @@ -54,7 +55,8 @@ QAccessibleInterface* QAccessible_AccessibleInterface(unsigned int uniqueId) { } unsigned int QAccessible_RegisterAccessibleInterface(QAccessibleInterface* iface) { - return QAccessible::registerAccessibleInterface(iface); + QAccessible::Id _ret = QAccessible::registerAccessibleInterface(iface); + return static_cast(_ret); } void QAccessible_DeleteAccessibleInterface(unsigned int uniqueId) { @@ -121,14 +123,14 @@ int QAccessibleInterface_IndexOfChild(const QAccessibleInterface* self, QAccessi return self->indexOfChild(param1); } -struct miqt_string* QAccessibleInterface_Text(const QAccessibleInterface* self, uintptr_t t) { +struct miqt_string* QAccessibleInterface_Text(const QAccessibleInterface* self, int t) { QString _ret = self->text(static_cast(t)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); } -void QAccessibleInterface_SetText(QAccessibleInterface* self, uintptr_t t, struct miqt_string* text) { +void QAccessibleInterface_SetText(QAccessibleInterface* self, int t, struct miqt_string* text) { QString text_QString = QString::fromUtf8(&text->data, text->len); self->setText(static_cast(t), text_QString); } @@ -137,9 +139,9 @@ QRect* QAccessibleInterface_Rect(const QAccessibleInterface* self) { return new QRect(self->rect()); } -uintptr_t QAccessibleInterface_Role(const QAccessibleInterface* self) { +int QAccessibleInterface_Role(const QAccessibleInterface* self) { QAccessible::Role _ret = self->role(); - return static_cast(_ret); + return static_cast(_ret); } QAccessible__State* QAccessibleInterface_State(const QAccessibleInterface* self) { @@ -217,21 +219,21 @@ struct miqt_string* QAccessibleTextInterface_Text(const QAccessibleTextInterface return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAccessibleTextInterface_TextBeforeOffset(const QAccessibleTextInterface* self, int offset, uintptr_t boundaryType, int* startOffset, int* endOffset) { +struct miqt_string* QAccessibleTextInterface_TextBeforeOffset(const QAccessibleTextInterface* self, int offset, int boundaryType, int* startOffset, int* endOffset) { QString _ret = self->textBeforeOffset(static_cast(offset), static_cast(boundaryType), static_cast(startOffset), static_cast(endOffset)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAccessibleTextInterface_TextAfterOffset(const QAccessibleTextInterface* self, int offset, uintptr_t boundaryType, int* startOffset, int* endOffset) { +struct miqt_string* QAccessibleTextInterface_TextAfterOffset(const QAccessibleTextInterface* self, int offset, int boundaryType, int* startOffset, int* endOffset) { QString _ret = self->textAfterOffset(static_cast(offset), static_cast(boundaryType), static_cast(startOffset), static_cast(endOffset)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAccessibleTextInterface_TextAtOffset(const QAccessibleTextInterface* self, int offset, uintptr_t boundaryType, int* startOffset, int* endOffset) { +struct miqt_string* QAccessibleTextInterface_TextAtOffset(const QAccessibleTextInterface* self, int offset, int boundaryType, int* startOffset, int* endOffset) { QString _ret = self->textAtOffset(static_cast(offset), static_cast(boundaryType), static_cast(startOffset), static_cast(endOffset)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -324,7 +326,7 @@ bool QAccessibleTableCellInterface_IsSelected(const QAccessibleTableCellInterfac } struct miqt_array* QAccessibleTableCellInterface_ColumnHeaderCells(const QAccessibleTableCellInterface* self) { - QList _ret = self->columnHeaderCells(); + QList _ret = self->columnHeaderCells(); // Convert QList<> from C++ memory to manually-managed C memory QAccessibleInterface** _arr = static_cast(malloc(sizeof(QAccessibleInterface*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -337,7 +339,7 @@ struct miqt_array* QAccessibleTableCellInterface_ColumnHeaderCells(const QAccess } struct miqt_array* QAccessibleTableCellInterface_RowHeaderCells(const QAccessibleTableCellInterface* self) { - QList _ret = self->rowHeaderCells(); + QList _ret = self->rowHeaderCells(); // Convert QList<> from C++ memory to manually-managed C memory QAccessibleInterface** _arr = static_cast(malloc(sizeof(QAccessibleInterface*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -394,7 +396,7 @@ int QAccessibleTableInterface_SelectedCellCount(const QAccessibleTableInterface* } struct miqt_array* QAccessibleTableInterface_SelectedCells(const QAccessibleTableInterface* self) { - QList _ret = self->selectedCells(); + QList _ret = self->selectedCells(); // Convert QList<> from C++ memory to manually-managed C memory QAccessibleInterface** _arr = static_cast(malloc(sizeof(QAccessibleInterface*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -705,17 +707,17 @@ void QAccessibleImageInterface_Delete(QAccessibleImageInterface* self) { delete self; } -QAccessibleEvent* QAccessibleEvent_new(QObject* obj, uintptr_t typ) { +QAccessibleEvent* QAccessibleEvent_new(QObject* obj, int typ) { return new QAccessibleEvent(obj, static_cast(typ)); } -QAccessibleEvent* QAccessibleEvent_new2(QAccessibleInterface* iface, uintptr_t typ) { +QAccessibleEvent* QAccessibleEvent_new2(QAccessibleInterface* iface, int typ) { return new QAccessibleEvent(iface, static_cast(typ)); } -uintptr_t QAccessibleEvent_Type(const QAccessibleEvent* self) { +int QAccessibleEvent_Type(const QAccessibleEvent* self) { QAccessible::Event _ret = self->type(); - return static_cast(_ret); + return static_cast(_ret); } QObject* QAccessibleEvent_Object(const QAccessibleEvent* self) { @@ -723,7 +725,8 @@ QObject* QAccessibleEvent_Object(const QAccessibleEvent* self) { } unsigned int QAccessibleEvent_UniqueId(const QAccessibleEvent* self) { - return self->uniqueId(); + QAccessible::Id _ret = self->uniqueId(); + return static_cast(_ret); } void QAccessibleEvent_SetChild(QAccessibleEvent* self, int chld) { @@ -906,21 +909,21 @@ void QAccessibleValueChangeEvent_Delete(QAccessibleValueChangeEvent* self) { delete self; } -QAccessibleTableModelChangeEvent* QAccessibleTableModelChangeEvent_new(QObject* obj, uintptr_t changeType) { +QAccessibleTableModelChangeEvent* QAccessibleTableModelChangeEvent_new(QObject* obj, int changeType) { return new QAccessibleTableModelChangeEvent(obj, static_cast(changeType)); } -QAccessibleTableModelChangeEvent* QAccessibleTableModelChangeEvent_new2(QAccessibleInterface* iface, uintptr_t changeType) { +QAccessibleTableModelChangeEvent* QAccessibleTableModelChangeEvent_new2(QAccessibleInterface* iface, int changeType) { return new QAccessibleTableModelChangeEvent(iface, static_cast(changeType)); } -void QAccessibleTableModelChangeEvent_SetModelChangeType(QAccessibleTableModelChangeEvent* self, uintptr_t changeType) { +void QAccessibleTableModelChangeEvent_SetModelChangeType(QAccessibleTableModelChangeEvent* self, int changeType) { self->setModelChangeType(static_cast(changeType)); } -uintptr_t QAccessibleTableModelChangeEvent_ModelChangeType(const QAccessibleTableModelChangeEvent* self) { +int QAccessibleTableModelChangeEvent_ModelChangeType(const QAccessibleTableModelChangeEvent* self) { QAccessibleTableModelChangeEvent::ModelChangeType _ret = self->modelChangeType(); - return static_cast(_ret); + return static_cast(_ret); } void QAccessibleTableModelChangeEvent_SetFirstRow(QAccessibleTableModelChangeEvent* self, int row) { @@ -975,6 +978,10 @@ void QAccessible__ActivationObserver_AccessibilityActiveChanged(QAccessible__Act self->accessibilityActiveChanged(active); } +void QAccessible__ActivationObserver_OperatorAssign(QAccessible__ActivationObserver* self, QAccessible__ActivationObserver* param1) { + self->operator=(*param1); +} + void QAccessible__ActivationObserver_Delete(QAccessible__ActivationObserver* self) { delete self; } diff --git a/qt/gen_qaccessible.go b/qt/gen_qaccessible.go index 82debbc..be72bc0 100644 --- a/qt/gen_qaccessible.go +++ b/qt/gen_qaccessible.go @@ -368,7 +368,7 @@ func (this *QAccessibleInterface) IndexOfChild(param1 *QAccessibleInterface) int } func (this *QAccessibleInterface) Text(t QAccessible__Text) string { - var _ms *C.struct_miqt_string = C.QAccessibleInterface_Text(this.h, (C.uintptr_t)(t)) + var _ms *C.struct_miqt_string = C.QAccessibleInterface_Text(this.h, (C.int)(t)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -377,7 +377,7 @@ func (this *QAccessibleInterface) Text(t QAccessible__Text) string { func (this *QAccessibleInterface) SetText(t QAccessible__Text, text string) { text_ms := miqt_strdupg(text) defer C.free(text_ms) - C.QAccessibleInterface_SetText(this.h, (C.uintptr_t)(t), (*C.struct_miqt_string)(text_ms)) + C.QAccessibleInterface_SetText(this.h, (C.int)(t), (*C.struct_miqt_string)(text_ms)) } func (this *QAccessibleInterface) Rect() *QRect { @@ -498,21 +498,21 @@ func (this *QAccessibleTextInterface) Text(startOffset int, endOffset int) strin } func (this *QAccessibleTextInterface) TextBeforeOffset(offset int, boundaryType QAccessible__TextBoundaryType, startOffset *int, endOffset *int) string { - var _ms *C.struct_miqt_string = C.QAccessibleTextInterface_TextBeforeOffset(this.h, (C.int)(offset), (C.uintptr_t)(boundaryType), (*C.int)(unsafe.Pointer(startOffset)), (*C.int)(unsafe.Pointer(endOffset))) + var _ms *C.struct_miqt_string = C.QAccessibleTextInterface_TextBeforeOffset(this.h, (C.int)(offset), (C.int)(boundaryType), (*C.int)(unsafe.Pointer(startOffset)), (*C.int)(unsafe.Pointer(endOffset))) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } func (this *QAccessibleTextInterface) TextAfterOffset(offset int, boundaryType QAccessible__TextBoundaryType, startOffset *int, endOffset *int) string { - var _ms *C.struct_miqt_string = C.QAccessibleTextInterface_TextAfterOffset(this.h, (C.int)(offset), (C.uintptr_t)(boundaryType), (*C.int)(unsafe.Pointer(startOffset)), (*C.int)(unsafe.Pointer(endOffset))) + var _ms *C.struct_miqt_string = C.QAccessibleTextInterface_TextAfterOffset(this.h, (C.int)(offset), (C.int)(boundaryType), (*C.int)(unsafe.Pointer(startOffset)), (*C.int)(unsafe.Pointer(endOffset))) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } func (this *QAccessibleTextInterface) TextAtOffset(offset int, boundaryType QAccessible__TextBoundaryType, startOffset *int, endOffset *int) string { - var _ms *C.struct_miqt_string = C.QAccessibleTextInterface_TextAtOffset(this.h, (C.int)(offset), (C.uintptr_t)(boundaryType), (*C.int)(unsafe.Pointer(startOffset)), (*C.int)(unsafe.Pointer(endOffset))) + var _ms *C.struct_miqt_string = C.QAccessibleTextInterface_TextAtOffset(this.h, (C.int)(offset), (C.int)(boundaryType), (*C.int)(unsafe.Pointer(startOffset)), (*C.int)(unsafe.Pointer(endOffset))) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -1244,13 +1244,13 @@ func newQAccessibleEvent_U(h unsafe.Pointer) *QAccessibleEvent { // NewQAccessibleEvent constructs a new QAccessibleEvent object. func NewQAccessibleEvent(obj *QObject, typ QAccessible__Event) *QAccessibleEvent { - ret := C.QAccessibleEvent_new(obj.cPointer(), (C.uintptr_t)(typ)) + ret := C.QAccessibleEvent_new(obj.cPointer(), (C.int)(typ)) return newQAccessibleEvent(ret) } // NewQAccessibleEvent2 constructs a new QAccessibleEvent object. func NewQAccessibleEvent2(iface *QAccessibleInterface, typ QAccessible__Event) *QAccessibleEvent { - ret := C.QAccessibleEvent_new2(iface.cPointer(), (C.uintptr_t)(typ)) + ret := C.QAccessibleEvent_new2(iface.cPointer(), (C.int)(typ)) return newQAccessibleEvent(ret) } @@ -1754,18 +1754,18 @@ func newQAccessibleTableModelChangeEvent_U(h unsafe.Pointer) *QAccessibleTableMo // NewQAccessibleTableModelChangeEvent constructs a new QAccessibleTableModelChangeEvent object. func NewQAccessibleTableModelChangeEvent(obj *QObject, changeType QAccessibleTableModelChangeEvent__ModelChangeType) *QAccessibleTableModelChangeEvent { - ret := C.QAccessibleTableModelChangeEvent_new(obj.cPointer(), (C.uintptr_t)(changeType)) + ret := C.QAccessibleTableModelChangeEvent_new(obj.cPointer(), (C.int)(changeType)) return newQAccessibleTableModelChangeEvent(ret) } // NewQAccessibleTableModelChangeEvent2 constructs a new QAccessibleTableModelChangeEvent object. func NewQAccessibleTableModelChangeEvent2(iface *QAccessibleInterface, changeType QAccessibleTableModelChangeEvent__ModelChangeType) *QAccessibleTableModelChangeEvent { - ret := C.QAccessibleTableModelChangeEvent_new2(iface.cPointer(), (C.uintptr_t)(changeType)) + ret := C.QAccessibleTableModelChangeEvent_new2(iface.cPointer(), (C.int)(changeType)) return newQAccessibleTableModelChangeEvent(ret) } func (this *QAccessibleTableModelChangeEvent) SetModelChangeType(changeType QAccessibleTableModelChangeEvent__ModelChangeType) { - C.QAccessibleTableModelChangeEvent_SetModelChangeType(this.h, (C.uintptr_t)(changeType)) + C.QAccessibleTableModelChangeEvent_SetModelChangeType(this.h, (C.int)(changeType)) } func (this *QAccessibleTableModelChangeEvent) ModelChangeType() QAccessibleTableModelChangeEvent__ModelChangeType { @@ -1892,6 +1892,10 @@ func (this *QAccessible__ActivationObserver) AccessibilityActiveChanged(active b C.QAccessible__ActivationObserver_AccessibilityActiveChanged(this.h, (C.bool)(active)) } +func (this *QAccessible__ActivationObserver) OperatorAssign(param1 *QAccessible__ActivationObserver) { + C.QAccessible__ActivationObserver_OperatorAssign(this.h, param1.cPointer()) +} + // Delete this object from C++ memory. func (this *QAccessible__ActivationObserver) Delete() { C.QAccessible__ActivationObserver_Delete(this.h) diff --git a/qt/gen_qaccessible.h b/qt/gen_qaccessible.h index 2fadb35..023e22a 100644 --- a/qt/gen_qaccessible.h +++ b/qt/gen_qaccessible.h @@ -102,10 +102,10 @@ QAccessibleInterface* QAccessibleInterface_Parent(const QAccessibleInterface* se QAccessibleInterface* QAccessibleInterface_Child(const QAccessibleInterface* self, int index); int QAccessibleInterface_ChildCount(const QAccessibleInterface* self); int QAccessibleInterface_IndexOfChild(const QAccessibleInterface* self, QAccessibleInterface* param1); -struct miqt_string* QAccessibleInterface_Text(const QAccessibleInterface* self, uintptr_t t); -void QAccessibleInterface_SetText(QAccessibleInterface* self, uintptr_t t, struct miqt_string* text); +struct miqt_string* QAccessibleInterface_Text(const QAccessibleInterface* self, int t); +void QAccessibleInterface_SetText(QAccessibleInterface* self, int t, struct miqt_string* text); QRect* QAccessibleInterface_Rect(const QAccessibleInterface* self); -uintptr_t QAccessibleInterface_Role(const QAccessibleInterface* self); +int QAccessibleInterface_Role(const QAccessibleInterface* self); QAccessible__State* QAccessibleInterface_State(const QAccessibleInterface* self); QColor* QAccessibleInterface_ForegroundColor(const QAccessibleInterface* self); QColor* QAccessibleInterface_BackgroundColor(const QAccessibleInterface* self); @@ -125,9 +125,9 @@ void QAccessibleTextInterface_SetSelection(QAccessibleTextInterface* self, int s int QAccessibleTextInterface_CursorPosition(const QAccessibleTextInterface* self); void QAccessibleTextInterface_SetCursorPosition(QAccessibleTextInterface* self, int position); struct miqt_string* QAccessibleTextInterface_Text(const QAccessibleTextInterface* self, int startOffset, int endOffset); -struct miqt_string* QAccessibleTextInterface_TextBeforeOffset(const QAccessibleTextInterface* self, int offset, uintptr_t boundaryType, int* startOffset, int* endOffset); -struct miqt_string* QAccessibleTextInterface_TextAfterOffset(const QAccessibleTextInterface* self, int offset, uintptr_t boundaryType, int* startOffset, int* endOffset); -struct miqt_string* QAccessibleTextInterface_TextAtOffset(const QAccessibleTextInterface* self, int offset, uintptr_t boundaryType, int* startOffset, int* endOffset); +struct miqt_string* QAccessibleTextInterface_TextBeforeOffset(const QAccessibleTextInterface* self, int offset, int boundaryType, int* startOffset, int* endOffset); +struct miqt_string* QAccessibleTextInterface_TextAfterOffset(const QAccessibleTextInterface* self, int offset, int boundaryType, int* startOffset, int* endOffset); +struct miqt_string* QAccessibleTextInterface_TextAtOffset(const QAccessibleTextInterface* self, int offset, int boundaryType, int* startOffset, int* endOffset); int QAccessibleTextInterface_CharacterCount(const QAccessibleTextInterface* self); QRect* QAccessibleTextInterface_CharacterRect(const QAccessibleTextInterface* self, int offset); int QAccessibleTextInterface_OffsetAtPoint(const QAccessibleTextInterface* self, QPoint* point); @@ -215,9 +215,9 @@ QPoint* QAccessibleImageInterface_ImagePosition(const QAccessibleImageInterface* void QAccessibleImageInterface_OperatorAssign(QAccessibleImageInterface* self, QAccessibleImageInterface* param1); void QAccessibleImageInterface_Delete(QAccessibleImageInterface* self); -QAccessibleEvent* QAccessibleEvent_new(QObject* obj, uintptr_t typ); -QAccessibleEvent* QAccessibleEvent_new2(QAccessibleInterface* iface, uintptr_t typ); -uintptr_t QAccessibleEvent_Type(const QAccessibleEvent* self); +QAccessibleEvent* QAccessibleEvent_new(QObject* obj, int typ); +QAccessibleEvent* QAccessibleEvent_new2(QAccessibleInterface* iface, int typ); +int QAccessibleEvent_Type(const QAccessibleEvent* self); QObject* QAccessibleEvent_Object(const QAccessibleEvent* self); unsigned int QAccessibleEvent_UniqueId(const QAccessibleEvent* self); void QAccessibleEvent_SetChild(QAccessibleEvent* self, int chld); @@ -268,10 +268,10 @@ void QAccessibleValueChangeEvent_SetValue(QAccessibleValueChangeEvent* self, QVa QVariant* QAccessibleValueChangeEvent_Value(const QAccessibleValueChangeEvent* self); void QAccessibleValueChangeEvent_Delete(QAccessibleValueChangeEvent* self); -QAccessibleTableModelChangeEvent* QAccessibleTableModelChangeEvent_new(QObject* obj, uintptr_t changeType); -QAccessibleTableModelChangeEvent* QAccessibleTableModelChangeEvent_new2(QAccessibleInterface* iface, uintptr_t changeType); -void QAccessibleTableModelChangeEvent_SetModelChangeType(QAccessibleTableModelChangeEvent* self, uintptr_t changeType); -uintptr_t QAccessibleTableModelChangeEvent_ModelChangeType(const QAccessibleTableModelChangeEvent* self); +QAccessibleTableModelChangeEvent* QAccessibleTableModelChangeEvent_new(QObject* obj, int changeType); +QAccessibleTableModelChangeEvent* QAccessibleTableModelChangeEvent_new2(QAccessibleInterface* iface, int changeType); +void QAccessibleTableModelChangeEvent_SetModelChangeType(QAccessibleTableModelChangeEvent* self, int changeType); +int QAccessibleTableModelChangeEvent_ModelChangeType(const QAccessibleTableModelChangeEvent* self); void QAccessibleTableModelChangeEvent_SetFirstRow(QAccessibleTableModelChangeEvent* self, int row); void QAccessibleTableModelChangeEvent_SetFirstColumn(QAccessibleTableModelChangeEvent* self, int col); void QAccessibleTableModelChangeEvent_SetLastRow(QAccessibleTableModelChangeEvent* self, int row); @@ -287,6 +287,7 @@ QAccessible__State* QAccessible__State_new2(QAccessible__State* param1); void QAccessible__State_Delete(QAccessible__State* self); void QAccessible__ActivationObserver_AccessibilityActiveChanged(QAccessible__ActivationObserver* self, bool active); +void QAccessible__ActivationObserver_OperatorAssign(QAccessible__ActivationObserver* self, QAccessible__ActivationObserver* param1); void QAccessible__ActivationObserver_Delete(QAccessible__ActivationObserver* self); #ifdef __cplusplus diff --git a/qt/gen_qaccessibleobject.cpp b/qt/gen_qaccessibleobject.cpp index 5f29390..eae6e3d 100644 --- a/qt/gen_qaccessibleobject.cpp +++ b/qt/gen_qaccessibleobject.cpp @@ -24,7 +24,7 @@ QRect* QAccessibleObject_Rect(const QAccessibleObject* self) { return new QRect(self->rect()); } -void QAccessibleObject_SetText(QAccessibleObject* self, uintptr_t t, struct miqt_string* text) { +void QAccessibleObject_SetText(QAccessibleObject* self, int t, struct miqt_string* text) { QString text_QString = QString::fromUtf8(&text->data, text->len); self->setText(static_cast(t), text_QString); } @@ -61,16 +61,16 @@ QAccessibleInterface* QAccessibleApplication_Child(const QAccessibleApplication* return self->child(static_cast(index)); } -struct miqt_string* QAccessibleApplication_Text(const QAccessibleApplication* self, uintptr_t t) { +struct miqt_string* QAccessibleApplication_Text(const QAccessibleApplication* self, int t) { QString _ret = self->text(static_cast(t)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); } -uintptr_t QAccessibleApplication_Role(const QAccessibleApplication* self) { +int QAccessibleApplication_Role(const QAccessibleApplication* self) { QAccessible::Role _ret = self->role(); - return static_cast(_ret); + return static_cast(_ret); } QAccessible__State* QAccessibleApplication_State(const QAccessibleApplication* self) { diff --git a/qt/gen_qaccessibleobject.go b/qt/gen_qaccessibleobject.go index 9d4206b..535983a 100644 --- a/qt/gen_qaccessibleobject.go +++ b/qt/gen_qaccessibleobject.go @@ -54,7 +54,7 @@ func (this *QAccessibleObject) Rect() *QRect { func (this *QAccessibleObject) SetText(t QAccessible__Text, text string) { text_ms := miqt_strdupg(text) defer C.free(text_ms) - C.QAccessibleObject_SetText(this.h, (C.uintptr_t)(t), (*C.struct_miqt_string)(text_ms)) + C.QAccessibleObject_SetText(this.h, (C.int)(t), (*C.struct_miqt_string)(text_ms)) } func (this *QAccessibleObject) ChildAt(x int, y int) *QAccessibleInterface { @@ -115,7 +115,7 @@ func (this *QAccessibleApplication) Child(index int) *QAccessibleInterface { } func (this *QAccessibleApplication) Text(t QAccessible__Text) string { - var _ms *C.struct_miqt_string = C.QAccessibleApplication_Text(this.h, (C.uintptr_t)(t)) + var _ms *C.struct_miqt_string = C.QAccessibleApplication_Text(this.h, (C.int)(t)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret diff --git a/qt/gen_qaccessibleobject.h b/qt/gen_qaccessibleobject.h index 548f808..b8c1e49 100644 --- a/qt/gen_qaccessibleobject.h +++ b/qt/gen_qaccessibleobject.h @@ -38,7 +38,7 @@ typedef struct QWindow QWindow; bool QAccessibleObject_IsValid(const QAccessibleObject* self); QObject* QAccessibleObject_Object(const QAccessibleObject* self); QRect* QAccessibleObject_Rect(const QAccessibleObject* self); -void QAccessibleObject_SetText(QAccessibleObject* self, uintptr_t t, struct miqt_string* text); +void QAccessibleObject_SetText(QAccessibleObject* self, int t, struct miqt_string* text); QAccessibleInterface* QAccessibleObject_ChildAt(const QAccessibleObject* self, int x, int y); QAccessibleApplication* QAccessibleApplication_new(); @@ -48,8 +48,8 @@ int QAccessibleApplication_IndexOfChild(const QAccessibleApplication* self, QAcc QAccessibleInterface* QAccessibleApplication_FocusChild(const QAccessibleApplication* self); QAccessibleInterface* QAccessibleApplication_Parent(const QAccessibleApplication* self); QAccessibleInterface* QAccessibleApplication_Child(const QAccessibleApplication* self, int index); -struct miqt_string* QAccessibleApplication_Text(const QAccessibleApplication* self, uintptr_t t); -uintptr_t QAccessibleApplication_Role(const QAccessibleApplication* self); +struct miqt_string* QAccessibleApplication_Text(const QAccessibleApplication* self, int t); +int QAccessibleApplication_Role(const QAccessibleApplication* self); QAccessible__State* QAccessibleApplication_State(const QAccessibleApplication* self); void QAccessibleApplication_Delete(QAccessibleApplication* self); diff --git a/qt/gen_qaccessiblewidget.cpp b/qt/gen_qaccessiblewidget.cpp index b8743d6..a185121 100644 --- a/qt/gen_qaccessiblewidget.cpp +++ b/qt/gen_qaccessiblewidget.cpp @@ -17,11 +17,11 @@ QAccessibleWidget* QAccessibleWidget_new(QWidget* o) { return new QAccessibleWidget(o); } -QAccessibleWidget* QAccessibleWidget_new2(QWidget* o, uintptr_t r) { +QAccessibleWidget* QAccessibleWidget_new2(QWidget* o, int r) { return new QAccessibleWidget(o, static_cast(r)); } -QAccessibleWidget* QAccessibleWidget_new3(QWidget* o, uintptr_t r, struct miqt_string* name) { +QAccessibleWidget* QAccessibleWidget_new3(QWidget* o, int r, struct miqt_string* name) { QString name_QString = QString::fromUtf8(&name->data, name->len); return new QAccessibleWidget(o, static_cast(r), name_QString); } @@ -58,16 +58,16 @@ QAccessibleInterface* QAccessibleWidget_Child(const QAccessibleWidget* self, int return self->child(static_cast(index)); } -struct miqt_string* QAccessibleWidget_Text(const QAccessibleWidget* self, uintptr_t t) { +struct miqt_string* QAccessibleWidget_Text(const QAccessibleWidget* self, int t) { QString _ret = self->text(static_cast(t)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); } -uintptr_t QAccessibleWidget_Role(const QAccessibleWidget* self) { +int QAccessibleWidget_Role(const QAccessibleWidget* self) { QAccessible::Role _ret = self->role(); - return static_cast(_ret); + return static_cast(_ret); } QAccessible__State* QAccessibleWidget_State(const QAccessibleWidget* self) { diff --git a/qt/gen_qaccessiblewidget.go b/qt/gen_qaccessiblewidget.go index b77e6ac..efa50e3 100644 --- a/qt/gen_qaccessiblewidget.go +++ b/qt/gen_qaccessiblewidget.go @@ -44,7 +44,7 @@ func NewQAccessibleWidget(o *QWidget) *QAccessibleWidget { // NewQAccessibleWidget2 constructs a new QAccessibleWidget object. func NewQAccessibleWidget2(o *QWidget, r QAccessible__Role) *QAccessibleWidget { - ret := C.QAccessibleWidget_new2(o.cPointer(), (C.uintptr_t)(r)) + ret := C.QAccessibleWidget_new2(o.cPointer(), (C.int)(r)) return newQAccessibleWidget(ret) } @@ -52,7 +52,7 @@ func NewQAccessibleWidget2(o *QWidget, r QAccessible__Role) *QAccessibleWidget { func NewQAccessibleWidget3(o *QWidget, r QAccessible__Role, name string) *QAccessibleWidget { name_ms := miqt_strdupg(name) defer C.free(name_ms) - ret := C.QAccessibleWidget_new3(o.cPointer(), (C.uintptr_t)(r), (*C.struct_miqt_string)(name_ms)) + ret := C.QAccessibleWidget_new3(o.cPointer(), (C.int)(r), (*C.struct_miqt_string)(name_ms)) return newQAccessibleWidget(ret) } @@ -92,7 +92,7 @@ func (this *QAccessibleWidget) Child(index int) *QAccessibleInterface { } func (this *QAccessibleWidget) Text(t QAccessible__Text) string { - var _ms *C.struct_miqt_string = C.QAccessibleWidget_Text(this.h, (C.uintptr_t)(t)) + var _ms *C.struct_miqt_string = C.QAccessibleWidget_Text(this.h, (C.int)(t)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret diff --git a/qt/gen_qaccessiblewidget.h b/qt/gen_qaccessiblewidget.h index ebc7730..355fe43 100644 --- a/qt/gen_qaccessiblewidget.h +++ b/qt/gen_qaccessiblewidget.h @@ -36,8 +36,8 @@ typedef struct QWindow QWindow; #endif QAccessibleWidget* QAccessibleWidget_new(QWidget* o); -QAccessibleWidget* QAccessibleWidget_new2(QWidget* o, uintptr_t r); -QAccessibleWidget* QAccessibleWidget_new3(QWidget* o, uintptr_t r, struct miqt_string* name); +QAccessibleWidget* QAccessibleWidget_new2(QWidget* o, int r); +QAccessibleWidget* QAccessibleWidget_new3(QWidget* o, int r, struct miqt_string* name); bool QAccessibleWidget_IsValid(const QAccessibleWidget* self); QWindow* QAccessibleWidget_Window(const QAccessibleWidget* self); int QAccessibleWidget_ChildCount(const QAccessibleWidget* self); @@ -46,8 +46,8 @@ QAccessibleInterface* QAccessibleWidget_FocusChild(const QAccessibleWidget* self QRect* QAccessibleWidget_Rect(const QAccessibleWidget* self); QAccessibleInterface* QAccessibleWidget_Parent(const QAccessibleWidget* self); QAccessibleInterface* QAccessibleWidget_Child(const QAccessibleWidget* self, int index); -struct miqt_string* QAccessibleWidget_Text(const QAccessibleWidget* self, uintptr_t t); -uintptr_t QAccessibleWidget_Role(const QAccessibleWidget* self); +struct miqt_string* QAccessibleWidget_Text(const QAccessibleWidget* self, int t); +int QAccessibleWidget_Role(const QAccessibleWidget* self); QAccessible__State* QAccessibleWidget_State(const QAccessibleWidget* self); QColor* QAccessibleWidget_ForegroundColor(const QAccessibleWidget* self); QColor* QAccessibleWidget_BackgroundColor(const QAccessibleWidget* self); diff --git a/qt/gen_qaction.cpp b/qt/gen_qaction.cpp index 424861d..601f064 100644 --- a/qt/gen_qaction.cpp +++ b/qt/gen_qaction.cpp @@ -139,13 +139,13 @@ struct miqt_string* QAction_WhatsThis(const QAction* self) { return miqt_strdup(_b.data(), _b.length()); } -void QAction_SetPriority(QAction* self, uintptr_t priority) { +void QAction_SetPriority(QAction* self, int priority) { self->setPriority(static_cast(priority)); } -uintptr_t QAction_Priority(const QAction* self) { +int QAction_Priority(const QAction* self) { QAction::Priority _ret = self->priority(); - return static_cast(_ret); + return static_cast(_ret); } QMenu* QAction_Menu(const QAction* self) { @@ -182,7 +182,7 @@ void QAction_SetShortcuts(QAction* self, struct miqt_array* /* of QKeySequence* self->setShortcuts(shortcuts_QList); } -void QAction_SetShortcutsWithShortcuts(QAction* self, uintptr_t shortcuts) { +void QAction_SetShortcutsWithShortcuts(QAction* self, int shortcuts) { self->setShortcuts(static_cast(shortcuts)); } @@ -199,13 +199,13 @@ struct miqt_array* QAction_Shortcuts(const QAction* self) { return _out; } -void QAction_SetShortcutContext(QAction* self, uintptr_t context) { +void QAction_SetShortcutContext(QAction* self, int context) { self->setShortcutContext(static_cast(context)); } -uintptr_t QAction_ShortcutContext(const QAction* self) { +int QAction_ShortcutContext(const QAction* self) { Qt::ShortcutContext _ret = self->shortcutContext(); - return static_cast(_ret); + return static_cast(_ret); } void QAction_SetAutoRepeat(QAction* self, bool autoRepeat) { @@ -252,7 +252,7 @@ bool QAction_IsVisible(const QAction* self) { return self->isVisible(); } -void QAction_Activate(QAction* self, uintptr_t event) { +void QAction_Activate(QAction* self, int event) { self->activate(static_cast(event)); } @@ -260,13 +260,13 @@ bool QAction_ShowStatusText(QAction* self) { return self->showStatusText(); } -void QAction_SetMenuRole(QAction* self, uintptr_t menuRole) { +void QAction_SetMenuRole(QAction* self, int menuRole) { self->setMenuRole(static_cast(menuRole)); } -uintptr_t QAction_MenuRole(const QAction* self) { +int QAction_MenuRole(const QAction* self) { QAction::MenuRole _ret = self->menuRole(); - return static_cast(_ret); + return static_cast(_ret); } void QAction_SetIconVisibleInMenu(QAction* self, bool visible) { @@ -290,7 +290,7 @@ QWidget* QAction_ParentWidget(const QAction* self) { } struct miqt_array* QAction_AssociatedWidgets(const QAction* self) { - QList _ret = self->associatedWidgets(); + QList _ret = self->associatedWidgets(); // Convert QList<> from C++ memory to manually-managed C memory QWidget** _arr = static_cast(malloc(sizeof(QWidget*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -303,7 +303,7 @@ struct miqt_array* QAction_AssociatedWidgets(const QAction* self) { } struct miqt_array* QAction_AssociatedGraphicsWidgets(const QAction* self) { - QList _ret = self->associatedGraphicsWidgets(); + QList _ret = self->associatedGraphicsWidgets(); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsWidget** _arr = static_cast(malloc(sizeof(QGraphicsWidget*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { diff --git a/qt/gen_qaction.go b/qt/gen_qaction.go index 968ef0c..af1df05 100644 --- a/qt/gen_qaction.go +++ b/qt/gen_qaction.go @@ -215,7 +215,7 @@ func (this *QAction) WhatsThis() string { } func (this *QAction) SetPriority(priority QAction__Priority) { - C.QAction_SetPriority(this.h, (C.uintptr_t)(priority)) + C.QAction_SetPriority(this.h, (C.int)(priority)) } func (this *QAction) Priority() QAction__Priority { @@ -262,7 +262,7 @@ func (this *QAction) SetShortcuts(shortcuts []QKeySequence) { } func (this *QAction) SetShortcutsWithShortcuts(shortcuts QKeySequence__StandardKey) { - C.QAction_SetShortcutsWithShortcuts(this.h, (C.uintptr_t)(shortcuts)) + C.QAction_SetShortcutsWithShortcuts(this.h, (C.int)(shortcuts)) } func (this *QAction) Shortcuts() []QKeySequence { @@ -280,7 +280,7 @@ func (this *QAction) Shortcuts() []QKeySequence { } func (this *QAction) SetShortcutContext(context ShortcutContext) { - C.QAction_SetShortcutContext(this.h, (C.uintptr_t)(context)) + C.QAction_SetShortcutContext(this.h, (C.int)(context)) } func (this *QAction) ShortcutContext() ShortcutContext { @@ -338,7 +338,7 @@ func (this *QAction) IsVisible() bool { } func (this *QAction) Activate(event QAction__ActionEvent) { - C.QAction_Activate(this.h, (C.uintptr_t)(event)) + C.QAction_Activate(this.h, (C.int)(event)) } func (this *QAction) ShowStatusText() bool { @@ -346,7 +346,7 @@ func (this *QAction) ShowStatusText() bool { } func (this *QAction) SetMenuRole(menuRole QAction__MenuRole) { - C.QAction_SetMenuRole(this.h, (C.uintptr_t)(menuRole)) + C.QAction_SetMenuRole(this.h, (C.int)(menuRole)) } func (this *QAction) MenuRole() QAction__MenuRole { diff --git a/qt/gen_qaction.h b/qt/gen_qaction.h index 2818bd2..9461852 100644 --- a/qt/gen_qaction.h +++ b/qt/gen_qaction.h @@ -62,8 +62,8 @@ void QAction_SetStatusTip(QAction* self, struct miqt_string* statusTip); struct miqt_string* QAction_StatusTip(const QAction* self); void QAction_SetWhatsThis(QAction* self, struct miqt_string* what); struct miqt_string* QAction_WhatsThis(const QAction* self); -void QAction_SetPriority(QAction* self, uintptr_t priority); -uintptr_t QAction_Priority(const QAction* self); +void QAction_SetPriority(QAction* self, int priority); +int QAction_Priority(const QAction* self); QMenu* QAction_Menu(const QAction* self); void QAction_SetMenu(QAction* self, QMenu* menu); void QAction_SetSeparator(QAction* self, bool b); @@ -71,10 +71,10 @@ bool QAction_IsSeparator(const QAction* self); void QAction_SetShortcut(QAction* self, QKeySequence* shortcut); QKeySequence* QAction_Shortcut(const QAction* self); void QAction_SetShortcuts(QAction* self, struct miqt_array* /* of QKeySequence* */ shortcuts); -void QAction_SetShortcutsWithShortcuts(QAction* self, uintptr_t shortcuts); +void QAction_SetShortcutsWithShortcuts(QAction* self, int shortcuts); struct miqt_array* QAction_Shortcuts(const QAction* self); -void QAction_SetShortcutContext(QAction* self, uintptr_t context); -uintptr_t QAction_ShortcutContext(const QAction* self); +void QAction_SetShortcutContext(QAction* self, int context); +int QAction_ShortcutContext(const QAction* self); void QAction_SetAutoRepeat(QAction* self, bool autoRepeat); bool QAction_AutoRepeat(const QAction* self); void QAction_SetFont(QAction* self, QFont* font); @@ -86,10 +86,10 @@ void QAction_SetData(QAction* self, QVariant* varVal); bool QAction_IsChecked(const QAction* self); bool QAction_IsEnabled(const QAction* self); bool QAction_IsVisible(const QAction* self); -void QAction_Activate(QAction* self, uintptr_t event); +void QAction_Activate(QAction* self, int event); bool QAction_ShowStatusText(QAction* self); -void QAction_SetMenuRole(QAction* self, uintptr_t menuRole); -uintptr_t QAction_MenuRole(const QAction* self); +void QAction_SetMenuRole(QAction* self, int menuRole); +int QAction_MenuRole(const QAction* self); void QAction_SetIconVisibleInMenu(QAction* self, bool visible); bool QAction_IsIconVisibleInMenu(const QAction* self); void QAction_SetShortcutVisibleInContextMenu(QAction* self, bool show); diff --git a/qt/gen_qactiongroup.cpp b/qt/gen_qactiongroup.cpp index 8e54903..e50d7aa 100644 --- a/qt/gen_qactiongroup.cpp +++ b/qt/gen_qactiongroup.cpp @@ -52,7 +52,7 @@ void QActionGroup_RemoveAction(QActionGroup* self, QAction* a) { } struct miqt_array* QActionGroup_Actions(const QActionGroup* self) { - QList _ret = self->actions(); + QList _ret = self->actions(); // Convert QList<> from C++ memory to manually-managed C memory QAction** _arr = static_cast(malloc(sizeof(QAction*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -80,9 +80,9 @@ bool QActionGroup_IsVisible(const QActionGroup* self) { return self->isVisible(); } -uintptr_t QActionGroup_ExclusionPolicy(const QActionGroup* self) { +int QActionGroup_ExclusionPolicy(const QActionGroup* self) { QActionGroup::ExclusionPolicy _ret = self->exclusionPolicy(); - return static_cast(_ret); + return static_cast(_ret); } void QActionGroup_SetEnabled(QActionGroup* self, bool enabled) { @@ -101,7 +101,7 @@ void QActionGroup_SetExclusive(QActionGroup* self, bool exclusive) { self->setExclusive(exclusive); } -void QActionGroup_SetExclusionPolicy(QActionGroup* self, uintptr_t policy) { +void QActionGroup_SetExclusionPolicy(QActionGroup* self, int policy) { self->setExclusionPolicy(static_cast(policy)); } diff --git a/qt/gen_qactiongroup.go b/qt/gen_qactiongroup.go index bc78044..4ba65c3 100644 --- a/qt/gen_qactiongroup.go +++ b/qt/gen_qactiongroup.go @@ -141,7 +141,7 @@ func (this *QActionGroup) SetExclusive(exclusive bool) { } func (this *QActionGroup) SetExclusionPolicy(policy QActionGroup__ExclusionPolicy) { - C.QActionGroup_SetExclusionPolicy(this.h, (C.uintptr_t)(policy)) + C.QActionGroup_SetExclusionPolicy(this.h, (C.int)(policy)) } func (this *QActionGroup) Triggered(param1 *QAction) { diff --git a/qt/gen_qactiongroup.h b/qt/gen_qactiongroup.h index e8b0238..3d434ed 100644 --- a/qt/gen_qactiongroup.h +++ b/qt/gen_qactiongroup.h @@ -40,12 +40,12 @@ QAction* QActionGroup_CheckedAction(const QActionGroup* self); bool QActionGroup_IsExclusive(const QActionGroup* self); bool QActionGroup_IsEnabled(const QActionGroup* self); bool QActionGroup_IsVisible(const QActionGroup* self); -uintptr_t QActionGroup_ExclusionPolicy(const QActionGroup* self); +int QActionGroup_ExclusionPolicy(const QActionGroup* self); void QActionGroup_SetEnabled(QActionGroup* self, bool enabled); void QActionGroup_SetDisabled(QActionGroup* self, bool b); void QActionGroup_SetVisible(QActionGroup* self, bool visible); void QActionGroup_SetExclusive(QActionGroup* self, bool exclusive); -void QActionGroup_SetExclusionPolicy(QActionGroup* self, uintptr_t policy); +void QActionGroup_SetExclusionPolicy(QActionGroup* self, int policy); void QActionGroup_Triggered(QActionGroup* self, QAction* param1); void QActionGroup_connect_Triggered(QActionGroup* self, void* slot); void QActionGroup_Hovered(QActionGroup* self, QAction* param1); diff --git a/qt/gen_qapplication.cpp b/qt/gen_qapplication.cpp index d7ce5cf..0949700 100644 --- a/qt/gen_qapplication.cpp +++ b/qt/gen_qapplication.cpp @@ -236,11 +236,11 @@ int QApplication_StartDragDistance() { return QApplication::startDragDistance(); } -bool QApplication_IsEffectEnabled(uintptr_t param1) { +bool QApplication_IsEffectEnabled(int param1) { return QApplication::isEffectEnabled(static_cast(param1)); } -void QApplication_SetEffectEnabled(uintptr_t param1) { +void QApplication_SetEffectEnabled(int param1) { QApplication::setEffectEnabled(static_cast(param1)); } @@ -332,7 +332,7 @@ void QApplication_Alert2(QWidget* widget, int duration) { QApplication::alert(widget, static_cast(duration)); } -void QApplication_SetEffectEnabled2(uintptr_t param1, bool enable) { +void QApplication_SetEffectEnabled2(int param1, bool enable) { QApplication::setEffectEnabled(static_cast(param1), enable); } diff --git a/qt/gen_qapplication.go b/qt/gen_qapplication.go index eb0597b..047acad 100644 --- a/qt/gen_qapplication.go +++ b/qt/gen_qapplication.go @@ -310,11 +310,11 @@ func QApplication_StartDragDistance() int { } func QApplication_IsEffectEnabled(param1 UIEffect) bool { - return (bool)(C.QApplication_IsEffectEnabled((C.uintptr_t)(param1))) + return (bool)(C.QApplication_IsEffectEnabled((C.int)(param1))) } func QApplication_SetEffectEnabled(param1 UIEffect) { - C.QApplication_SetEffectEnabled((C.uintptr_t)(param1)) + C.QApplication_SetEffectEnabled((C.int)(param1)) } func QApplication_Exec() int { @@ -436,7 +436,7 @@ func QApplication_Alert2(widget *QWidget, duration int) { } func QApplication_SetEffectEnabled2(param1 UIEffect, enable bool) { - C.QApplication_SetEffectEnabled2((C.uintptr_t)(param1), (C.bool)(enable)) + C.QApplication_SetEffectEnabled2((C.int)(param1), (C.bool)(enable)) } // Delete this object from C++ memory. diff --git a/qt/gen_qapplication.h b/qt/gen_qapplication.h index a3e50fe..720335e 100644 --- a/qt/gen_qapplication.h +++ b/qt/gen_qapplication.h @@ -91,8 +91,8 @@ void QApplication_SetStartDragTime(int ms); int QApplication_StartDragTime(); void QApplication_SetStartDragDistance(int l); int QApplication_StartDragDistance(); -bool QApplication_IsEffectEnabled(uintptr_t param1); -void QApplication_SetEffectEnabled(uintptr_t param1); +bool QApplication_IsEffectEnabled(int param1); +void QApplication_SetEffectEnabled(int param1); int QApplication_Exec(); bool QApplication_Notify(QApplication* self, QObject* param1, QEvent* param2); void QApplication_FocusChanged(QApplication* self, QWidget* old, QWidget* now); @@ -110,7 +110,7 @@ struct miqt_string* QApplication_TrUtf83(const char* s, const char* c, int n); void QApplication_SetPalette2(QPalette* param1, const char* className); void QApplication_SetFont2(QFont* param1, const char* className); void QApplication_Alert2(QWidget* widget, int duration); -void QApplication_SetEffectEnabled2(uintptr_t param1, bool enable); +void QApplication_SetEffectEnabled2(int param1, bool enable); void QApplication_Delete(QApplication* self); #ifdef __cplusplus diff --git a/qt/gen_qarraydata.cpp b/qt/gen_qarraydata.cpp index fb6e50d..b20f1fa 100644 --- a/qt/gen_qarraydata.cpp +++ b/qt/gen_qarraydata.cpp @@ -50,9 +50,9 @@ void QArrayData_Delete(QArrayData* self) { delete self; } -uintptr_t QtPrivate__QContainerImplHelper_Mid(int originalLength, int* position, int* length) { +int QtPrivate__QContainerImplHelper_Mid(int originalLength, int* position, int* length) { QtPrivate::QContainerImplHelper::CutResult _ret = QtPrivate::QContainerImplHelper::mid(static_cast(originalLength), static_cast(position), static_cast(length)); - return static_cast(_ret); + return static_cast(_ret); } void QtPrivate__QContainerImplHelper_Delete(QtPrivate__QContainerImplHelper* self) { diff --git a/qt/gen_qarraydata.go b/qt/gen_qarraydata.go index 73b402b..6ec0c14 100644 --- a/qt/gen_qarraydata.go +++ b/qt/gen_qarraydata.go @@ -87,11 +87,11 @@ func QArrayData_SharedNull() *QArrayData { } func QArrayData_Allocate4(objectSize uint64, alignment uint64, capacity uint64, options int) *QArrayData { - return newQArrayData_U(unsafe.Pointer(C.QArrayData_Allocate4((C.size_t)(objectSize), (C.size_t)(alignment), (C.size_t)(capacity), (C.int)(options)))) + return newQArrayData_U(unsafe.Pointer(C.QArrayData_Allocate4((C.size_t)(objectSize), (C.size_t)(alignment), (C.size_t)(capacity), options))) } func QArrayData_ReallocateUnaligned4(data *QArrayData, objectSize uint64, newCapacity uint64, newOptions int) *QArrayData { - return newQArrayData_U(unsafe.Pointer(C.QArrayData_ReallocateUnaligned4(data.cPointer(), (C.size_t)(objectSize), (C.size_t)(newCapacity), (C.int)(newOptions)))) + return newQArrayData_U(unsafe.Pointer(C.QArrayData_ReallocateUnaligned4(data.cPointer(), (C.size_t)(objectSize), (C.size_t)(newCapacity), newOptions))) } // Delete this object from C++ memory. diff --git a/qt/gen_qarraydata.h b/qt/gen_qarraydata.h index d0fc357..ed1e29d 100644 --- a/qt/gen_qarraydata.h +++ b/qt/gen_qarraydata.h @@ -37,7 +37,7 @@ QArrayData* QArrayData_Allocate4(size_t objectSize, size_t alignment, size_t cap QArrayData* QArrayData_ReallocateUnaligned4(QArrayData* data, size_t objectSize, size_t newCapacity, int newOptions); void QArrayData_Delete(QArrayData* self); -uintptr_t QtPrivate__QContainerImplHelper_Mid(int originalLength, int* position, int* length); +int QtPrivate__QContainerImplHelper_Mid(int originalLength, int* position, int* length); void QtPrivate__QContainerImplHelper_Delete(QtPrivate__QContainerImplHelper* self); #ifdef __cplusplus diff --git a/qt/gen_qbasictimer.cpp b/qt/gen_qbasictimer.cpp index 106ff9e..ce34b34 100644 --- a/qt/gen_qbasictimer.cpp +++ b/qt/gen_qbasictimer.cpp @@ -32,7 +32,7 @@ void QBasicTimer_Start(QBasicTimer* self, int msec, QObject* obj) { self->start(static_cast(msec), obj); } -void QBasicTimer_Start2(QBasicTimer* self, int msec, uintptr_t timerType, QObject* obj) { +void QBasicTimer_Start2(QBasicTimer* self, int msec, int timerType, QObject* obj) { self->start(static_cast(msec), static_cast(timerType), obj); } diff --git a/qt/gen_qbasictimer.go b/qt/gen_qbasictimer.go index efee8c9..8121cf4 100644 --- a/qt/gen_qbasictimer.go +++ b/qt/gen_qbasictimer.go @@ -68,7 +68,7 @@ func (this *QBasicTimer) Start(msec int, obj *QObject) { } func (this *QBasicTimer) Start2(msec int, timerType TimerType, obj *QObject) { - C.QBasicTimer_Start2(this.h, (C.int)(msec), (C.uintptr_t)(timerType), obj.cPointer()) + C.QBasicTimer_Start2(this.h, (C.int)(msec), (C.int)(timerType), obj.cPointer()) } func (this *QBasicTimer) Stop() { diff --git a/qt/gen_qbasictimer.h b/qt/gen_qbasictimer.h index efb8a00..c103750 100644 --- a/qt/gen_qbasictimer.h +++ b/qt/gen_qbasictimer.h @@ -28,7 +28,7 @@ void QBasicTimer_Swap(QBasicTimer* self, QBasicTimer* other); bool QBasicTimer_IsActive(const QBasicTimer* self); int QBasicTimer_TimerId(const QBasicTimer* self); void QBasicTimer_Start(QBasicTimer* self, int msec, QObject* obj); -void QBasicTimer_Start2(QBasicTimer* self, int msec, uintptr_t timerType, QObject* obj); +void QBasicTimer_Start2(QBasicTimer* self, int msec, int timerType, QObject* obj); void QBasicTimer_Stop(QBasicTimer* self); void QBasicTimer_Delete(QBasicTimer* self); diff --git a/qt/gen_qbitmap.cpp b/qt/gen_qbitmap.cpp index 83cc4fe..0c82676 100644 --- a/qt/gen_qbitmap.cpp +++ b/qt/gen_qbitmap.cpp @@ -77,7 +77,7 @@ QBitmap* QBitmap_FromImage2(QImage* image, int flags) { return new QBitmap(QBitmap::fromImage(*image, static_cast(flags))); } -QBitmap* QBitmap_FromData3(QSize* size, const unsigned char* bits, uintptr_t monoFormat) { +QBitmap* QBitmap_FromData3(QSize* size, const unsigned char* bits, int monoFormat) { return new QBitmap(QBitmap::fromData(*size, static_cast(bits), static_cast(monoFormat))); } diff --git a/qt/gen_qbitmap.go b/qt/gen_qbitmap.go index 09c2cc2..91ec774 100644 --- a/qt/gen_qbitmap.go +++ b/qt/gen_qbitmap.go @@ -129,14 +129,14 @@ func (this *QBitmap) TransformedWithMatrix(matrix *QTransform) *QBitmap { } func QBitmap_FromImage2(image *QImage, flags int) *QBitmap { - _ret := C.QBitmap_FromImage2(image.cPointer(), (C.int)(flags)) + _ret := C.QBitmap_FromImage2(image.cPointer(), flags) _goptr := newQBitmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QBitmap_FromData3(size *QSize, bits *byte, monoFormat QImage__Format) *QBitmap { - _ret := C.QBitmap_FromData3(size.cPointer(), (*C.uchar)(unsafe.Pointer(bits)), (C.uintptr_t)(monoFormat)) + _ret := C.QBitmap_FromData3(size.cPointer(), (*C.uchar)(unsafe.Pointer(bits)), (C.int)(monoFormat)) _goptr := newQBitmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qbitmap.h b/qt/gen_qbitmap.h index 015ce97..2ef28ea 100644 --- a/qt/gen_qbitmap.h +++ b/qt/gen_qbitmap.h @@ -45,7 +45,7 @@ QBitmap* QBitmap_FromData(QSize* size, const unsigned char* bits); QBitmap* QBitmap_Transformed(const QBitmap* self, QMatrix* param1); QBitmap* QBitmap_TransformedWithMatrix(const QBitmap* self, QTransform* matrix); QBitmap* QBitmap_FromImage2(QImage* image, int flags); -QBitmap* QBitmap_FromData3(QSize* size, const unsigned char* bits, uintptr_t monoFormat); +QBitmap* QBitmap_FromData3(QSize* size, const unsigned char* bits, int monoFormat); void QBitmap_Delete(QBitmap* self); #ifdef __cplusplus diff --git a/qt/gen_qboxlayout.cpp b/qt/gen_qboxlayout.cpp index 862c047..80df09e 100644 --- a/qt/gen_qboxlayout.cpp +++ b/qt/gen_qboxlayout.cpp @@ -15,11 +15,11 @@ #include "gen_qboxlayout.h" #include "_cgo_export.h" -QBoxLayout* QBoxLayout_new(uintptr_t param1) { +QBoxLayout* QBoxLayout_new(int param1) { return new QBoxLayout(static_cast(param1)); } -QBoxLayout* QBoxLayout_new2(uintptr_t param1, QWidget* parent) { +QBoxLayout* QBoxLayout_new2(int param1, QWidget* parent) { return new QBoxLayout(static_cast(param1), parent); } @@ -41,12 +41,12 @@ struct miqt_string* QBoxLayout_TrUtf8(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -uintptr_t QBoxLayout_Direction(const QBoxLayout* self) { +int QBoxLayout_Direction(const QBoxLayout* self) { QBoxLayout::Direction _ret = self->direction(); - return static_cast(_ret); + return static_cast(_ret); } -void QBoxLayout_SetDirection(QBoxLayout* self, uintptr_t direction) { +void QBoxLayout_SetDirection(QBoxLayout* self, int direction) { self->setDirection(static_cast(direction)); } diff --git a/qt/gen_qboxlayout.go b/qt/gen_qboxlayout.go index df88725..bbc4952 100644 --- a/qt/gen_qboxlayout.go +++ b/qt/gen_qboxlayout.go @@ -49,13 +49,13 @@ func newQBoxLayout_U(h unsafe.Pointer) *QBoxLayout { // NewQBoxLayout constructs a new QBoxLayout object. func NewQBoxLayout(param1 QBoxLayout__Direction) *QBoxLayout { - ret := C.QBoxLayout_new((C.uintptr_t)(param1)) + ret := C.QBoxLayout_new((C.int)(param1)) return newQBoxLayout(ret) } // NewQBoxLayout2 constructs a new QBoxLayout object. func NewQBoxLayout2(param1 QBoxLayout__Direction, parent *QWidget) *QBoxLayout { - ret := C.QBoxLayout_new2((C.uintptr_t)(param1), parent.cPointer()) + ret := C.QBoxLayout_new2((C.int)(param1), parent.cPointer()) return newQBoxLayout(ret) } @@ -86,7 +86,7 @@ func (this *QBoxLayout) Direction() QBoxLayout__Direction { } func (this *QBoxLayout) SetDirection(direction QBoxLayout__Direction) { - C.QBoxLayout_SetDirection(this.h, (C.uintptr_t)(direction)) + C.QBoxLayout_SetDirection(this.h, (C.int)(direction)) } func (this *QBoxLayout) AddSpacing(size int) { @@ -275,7 +275,7 @@ func (this *QBoxLayout) AddWidget2(param1 *QWidget, stretch int) { } func (this *QBoxLayout) AddWidget3(param1 *QWidget, stretch int, alignment int) { - C.QBoxLayout_AddWidget3(this.h, param1.cPointer(), (C.int)(stretch), (C.int)(alignment)) + C.QBoxLayout_AddWidget3(this.h, param1.cPointer(), (C.int)(stretch), alignment) } func (this *QBoxLayout) AddLayout2(layout *QLayout, stretch int) { @@ -291,7 +291,7 @@ func (this *QBoxLayout) InsertWidget3(index int, widget *QWidget, stretch int) { } func (this *QBoxLayout) InsertWidget4(index int, widget *QWidget, stretch int, alignment int) { - C.QBoxLayout_InsertWidget4(this.h, (C.int)(index), widget.cPointer(), (C.int)(stretch), (C.int)(alignment)) + C.QBoxLayout_InsertWidget4(this.h, (C.int)(index), widget.cPointer(), (C.int)(stretch), alignment) } func (this *QBoxLayout) InsertLayout3(index int, layout *QLayout, stretch int) { diff --git a/qt/gen_qboxlayout.h b/qt/gen_qboxlayout.h index 6df3502..3420d18 100644 --- a/qt/gen_qboxlayout.h +++ b/qt/gen_qboxlayout.h @@ -37,13 +37,13 @@ typedef struct QVBoxLayout QVBoxLayout; typedef struct QWidget QWidget; #endif -QBoxLayout* QBoxLayout_new(uintptr_t param1); -QBoxLayout* QBoxLayout_new2(uintptr_t param1, QWidget* parent); +QBoxLayout* QBoxLayout_new(int param1); +QBoxLayout* QBoxLayout_new2(int param1, QWidget* parent); QMetaObject* QBoxLayout_MetaObject(const QBoxLayout* self); struct miqt_string* QBoxLayout_Tr(const char* s); struct miqt_string* QBoxLayout_TrUtf8(const char* s); -uintptr_t QBoxLayout_Direction(const QBoxLayout* self); -void QBoxLayout_SetDirection(QBoxLayout* self, uintptr_t direction); +int QBoxLayout_Direction(const QBoxLayout* self); +void QBoxLayout_SetDirection(QBoxLayout* self, int direction); void QBoxLayout_AddSpacing(QBoxLayout* self, int size); void QBoxLayout_AddStretch(QBoxLayout* self); void QBoxLayout_AddSpacerItem(QBoxLayout* self, QSpacerItem* spacerItem); diff --git a/qt/gen_qbrush.cpp b/qt/gen_qbrush.cpp index 2544526..6d431d8 100644 --- a/qt/gen_qbrush.cpp +++ b/qt/gen_qbrush.cpp @@ -19,7 +19,7 @@ QBrush* QBrush_new() { return new QBrush(); } -QBrush* QBrush_new2(uintptr_t bs) { +QBrush* QBrush_new2(int bs) { return new QBrush(static_cast(bs)); } @@ -27,7 +27,7 @@ QBrush* QBrush_new3(QColor* color) { return new QBrush(*color); } -QBrush* QBrush_new4(uintptr_t color) { +QBrush* QBrush_new4(int color) { return new QBrush(static_cast(color)); } @@ -35,7 +35,7 @@ QBrush* QBrush_new5(QColor* color, QPixmap* pixmap) { return new QBrush(*color, *pixmap); } -QBrush* QBrush_new6(uintptr_t color, QPixmap* pixmap) { +QBrush* QBrush_new6(int color, QPixmap* pixmap) { return new QBrush(static_cast(color), *pixmap); } @@ -55,11 +55,11 @@ QBrush* QBrush_new10(QGradient* gradient) { return new QBrush(*gradient); } -QBrush* QBrush_new11(QColor* color, uintptr_t bs) { +QBrush* QBrush_new11(QColor* color, int bs) { return new QBrush(*color, static_cast(bs)); } -QBrush* QBrush_new12(uintptr_t color, uintptr_t bs) { +QBrush* QBrush_new12(int color, int bs) { return new QBrush(static_cast(color), static_cast(bs)); } @@ -71,12 +71,12 @@ void QBrush_Swap(QBrush* self, QBrush* other) { self->swap(*other); } -uintptr_t QBrush_Style(const QBrush* self) { +int QBrush_Style(const QBrush* self) { Qt::BrushStyle _ret = self->style(); - return static_cast(_ret); + return static_cast(_ret); } -void QBrush_SetStyle(QBrush* self, uintptr_t style) { +void QBrush_SetStyle(QBrush* self, int style) { self->setStyle(static_cast(style)); } @@ -124,7 +124,7 @@ void QBrush_SetColor(QBrush* self, QColor* color) { self->setColor(*color); } -void QBrush_SetColorWithColor(QBrush* self, uintptr_t color) { +void QBrush_SetColorWithColor(QBrush* self, int color) { self->setColor(static_cast(color)); } @@ -168,7 +168,7 @@ QGradient* QGradient_new() { return new QGradient(); } -QGradient* QGradient_new2(uintptr_t param1) { +QGradient* QGradient_new2(int param1) { return new QGradient(static_cast(param1)); } @@ -176,39 +176,39 @@ QGradient* QGradient_new3(QGradient* param1) { return new QGradient(*param1); } -uintptr_t QGradient_Type(const QGradient* self) { +int QGradient_Type(const QGradient* self) { QGradient::Type _ret = self->type(); - return static_cast(_ret); + return static_cast(_ret); } -void QGradient_SetSpread(QGradient* self, uintptr_t spread) { +void QGradient_SetSpread(QGradient* self, int spread) { self->setSpread(static_cast(spread)); } -uintptr_t QGradient_Spread(const QGradient* self) { +int QGradient_Spread(const QGradient* self) { QGradient::Spread _ret = self->spread(); - return static_cast(_ret); + return static_cast(_ret); } void QGradient_SetColorAt(QGradient* self, double pos, QColor* color) { self->setColorAt(static_cast(pos), *color); } -uintptr_t QGradient_CoordinateMode(const QGradient* self) { +int QGradient_CoordinateMode(const QGradient* self) { QGradient::CoordinateMode _ret = self->coordinateMode(); - return static_cast(_ret); + return static_cast(_ret); } -void QGradient_SetCoordinateMode(QGradient* self, uintptr_t mode) { +void QGradient_SetCoordinateMode(QGradient* self, int mode) { self->setCoordinateMode(static_cast(mode)); } -uintptr_t QGradient_InterpolationMode(const QGradient* self) { +int QGradient_InterpolationMode(const QGradient* self) { QGradient::InterpolationMode _ret = self->interpolationMode(); - return static_cast(_ret); + return static_cast(_ret); } -void QGradient_SetInterpolationMode(QGradient* self, uintptr_t mode) { +void QGradient_SetInterpolationMode(QGradient* self, int mode) { self->setInterpolationMode(static_cast(mode)); } @@ -325,7 +325,8 @@ void QRadialGradient_SetFocalPoint2(QRadialGradient* self, double x, double y) { } double QRadialGradient_Radius(const QRadialGradient* self) { - return self->radius(); + qreal _ret = self->radius(); + return static_cast(_ret); } void QRadialGradient_SetRadius(QRadialGradient* self, double radius) { @@ -333,7 +334,8 @@ void QRadialGradient_SetRadius(QRadialGradient* self, double radius) { } double QRadialGradient_CenterRadius(const QRadialGradient* self) { - return self->centerRadius(); + qreal _ret = self->centerRadius(); + return static_cast(_ret); } void QRadialGradient_SetCenterRadius(QRadialGradient* self, double radius) { @@ -341,7 +343,8 @@ void QRadialGradient_SetCenterRadius(QRadialGradient* self, double radius) { } double QRadialGradient_FocalRadius(const QRadialGradient* self) { - return self->focalRadius(); + qreal _ret = self->focalRadius(); + return static_cast(_ret); } void QRadialGradient_SetFocalRadius(QRadialGradient* self, double radius) { @@ -381,7 +384,8 @@ void QConicalGradient_SetCenter2(QConicalGradient* self, double x, double y) { } double QConicalGradient_Angle(const QConicalGradient* self) { - return self->angle(); + qreal _ret = self->angle(); + return static_cast(_ret); } void QConicalGradient_SetAngle(QConicalGradient* self, double angle) { @@ -396,6 +400,10 @@ QGradient__QGradientData* QGradient__QGradientData_new(QGradient__QGradientData* return new QGradient::QGradientData(*param1); } +void QGradient__QGradientData_OperatorAssign(QGradient__QGradientData* self, QGradient__QGradientData* param1) { + self->operator=(*param1); +} + void QGradient__QGradientData_Delete(QGradient__QGradientData* self) { delete self; } diff --git a/qt/gen_qbrush.go b/qt/gen_qbrush.go index 684df89..a742dc4 100644 --- a/qt/gen_qbrush.go +++ b/qt/gen_qbrush.go @@ -250,7 +250,7 @@ func NewQBrush() *QBrush { // NewQBrush2 constructs a new QBrush object. func NewQBrush2(bs BrushStyle) *QBrush { - ret := C.QBrush_new2((C.uintptr_t)(bs)) + ret := C.QBrush_new2((C.int)(bs)) return newQBrush(ret) } @@ -262,7 +262,7 @@ func NewQBrush3(color *QColor) *QBrush { // NewQBrush4 constructs a new QBrush object. func NewQBrush4(color GlobalColor) *QBrush { - ret := C.QBrush_new4((C.uintptr_t)(color)) + ret := C.QBrush_new4((C.int)(color)) return newQBrush(ret) } @@ -274,7 +274,7 @@ func NewQBrush5(color *QColor, pixmap *QPixmap) *QBrush { // NewQBrush6 constructs a new QBrush object. func NewQBrush6(color GlobalColor, pixmap *QPixmap) *QBrush { - ret := C.QBrush_new6((C.uintptr_t)(color), pixmap.cPointer()) + ret := C.QBrush_new6((C.int)(color), pixmap.cPointer()) return newQBrush(ret) } @@ -304,13 +304,13 @@ func NewQBrush10(gradient *QGradient) *QBrush { // NewQBrush11 constructs a new QBrush object. func NewQBrush11(color *QColor, bs BrushStyle) *QBrush { - ret := C.QBrush_new11(color.cPointer(), (C.uintptr_t)(bs)) + ret := C.QBrush_new11(color.cPointer(), (C.int)(bs)) return newQBrush(ret) } // NewQBrush12 constructs a new QBrush object. func NewQBrush12(color GlobalColor, bs BrushStyle) *QBrush { - ret := C.QBrush_new12((C.uintptr_t)(color), (C.uintptr_t)(bs)) + ret := C.QBrush_new12((C.int)(color), (C.int)(bs)) return newQBrush(ret) } @@ -327,7 +327,7 @@ func (this *QBrush) Style() BrushStyle { } func (this *QBrush) SetStyle(style BrushStyle) { - C.QBrush_SetStyle(this.h, (C.uintptr_t)(style)) + C.QBrush_SetStyle(this.h, (C.int)(style)) } func (this *QBrush) Matrix() *QMatrix { @@ -380,7 +380,7 @@ func (this *QBrush) SetColor(color *QColor) { } func (this *QBrush) SetColorWithColor(color GlobalColor) { - C.QBrush_SetColorWithColor(this.h, (C.uintptr_t)(color)) + C.QBrush_SetColorWithColor(this.h, (C.int)(color)) } func (this *QBrush) Gradient() *QGradient { @@ -493,7 +493,7 @@ func NewQGradient() *QGradient { // NewQGradient2 constructs a new QGradient object. func NewQGradient2(param1 QGradient__Preset) *QGradient { - ret := C.QGradient_new2((C.uintptr_t)(param1)) + ret := C.QGradient_new2((C.int)(param1)) return newQGradient(ret) } @@ -508,7 +508,7 @@ func (this *QGradient) Type() QGradient__Type { } func (this *QGradient) SetSpread(spread QGradient__Spread) { - C.QGradient_SetSpread(this.h, (C.uintptr_t)(spread)) + C.QGradient_SetSpread(this.h, (C.int)(spread)) } func (this *QGradient) Spread() QGradient__Spread { @@ -524,7 +524,7 @@ func (this *QGradient) CoordinateMode() QGradient__CoordinateMode { } func (this *QGradient) SetCoordinateMode(mode QGradient__CoordinateMode) { - C.QGradient_SetCoordinateMode(this.h, (C.uintptr_t)(mode)) + C.QGradient_SetCoordinateMode(this.h, (C.int)(mode)) } func (this *QGradient) InterpolationMode() QGradient__InterpolationMode { @@ -532,7 +532,7 @@ func (this *QGradient) InterpolationMode() QGradient__InterpolationMode { } func (this *QGradient) SetInterpolationMode(mode QGradient__InterpolationMode) { - C.QGradient_SetInterpolationMode(this.h, (C.uintptr_t)(mode)) + C.QGradient_SetInterpolationMode(this.h, (C.int)(mode)) } func (this *QGradient) OperatorEqual(gradient *QGradient) bool { @@ -899,6 +899,10 @@ func NewQGradient__QGradientData(param1 *QGradient__QGradientData) *QGradient__Q return newQGradient__QGradientData(ret) } +func (this *QGradient__QGradientData) OperatorAssign(param1 *QGradient__QGradientData) { + C.QGradient__QGradientData_OperatorAssign(this.h, param1.cPointer()) +} + // Delete this object from C++ memory. func (this *QGradient__QGradientData) Delete() { C.QGradient__QGradientData_Delete(this.h) diff --git a/qt/gen_qbrush.h b/qt/gen_qbrush.h index 711f383..206a638 100644 --- a/qt/gen_qbrush.h +++ b/qt/gen_qbrush.h @@ -48,21 +48,21 @@ typedef struct QTransform QTransform; #endif QBrush* QBrush_new(); -QBrush* QBrush_new2(uintptr_t bs); +QBrush* QBrush_new2(int bs); QBrush* QBrush_new3(QColor* color); -QBrush* QBrush_new4(uintptr_t color); +QBrush* QBrush_new4(int color); QBrush* QBrush_new5(QColor* color, QPixmap* pixmap); -QBrush* QBrush_new6(uintptr_t color, QPixmap* pixmap); +QBrush* QBrush_new6(int color, QPixmap* pixmap); QBrush* QBrush_new7(QPixmap* pixmap); QBrush* QBrush_new8(QImage* image); QBrush* QBrush_new9(QBrush* brush); QBrush* QBrush_new10(QGradient* gradient); -QBrush* QBrush_new11(QColor* color, uintptr_t bs); -QBrush* QBrush_new12(uintptr_t color, uintptr_t bs); +QBrush* QBrush_new11(QColor* color, int bs); +QBrush* QBrush_new12(int color, int bs); void QBrush_OperatorAssign(QBrush* self, QBrush* brush); void QBrush_Swap(QBrush* self, QBrush* other); -uintptr_t QBrush_Style(const QBrush* self); -void QBrush_SetStyle(QBrush* self, uintptr_t style); +int QBrush_Style(const QBrush* self); +void QBrush_SetStyle(QBrush* self, int style); QMatrix* QBrush_Matrix(const QBrush* self); void QBrush_SetMatrix(QBrush* self, QMatrix* mat); QTransform* QBrush_Transform(const QBrush* self); @@ -73,7 +73,7 @@ QImage* QBrush_TextureImage(const QBrush* self); void QBrush_SetTextureImage(QBrush* self, QImage* image); QColor* QBrush_Color(const QBrush* self); void QBrush_SetColor(QBrush* self, QColor* color); -void QBrush_SetColorWithColor(QBrush* self, uintptr_t color); +void QBrush_SetColorWithColor(QBrush* self, int color); QGradient* QBrush_Gradient(const QBrush* self); bool QBrush_IsOpaque(const QBrush* self); bool QBrush_OperatorEqual(const QBrush* self, QBrush* b); @@ -86,16 +86,16 @@ void QBrushData_OperatorAssign(QBrushData* self, QBrushData* param1); void QBrushData_Delete(QBrushData* self); QGradient* QGradient_new(); -QGradient* QGradient_new2(uintptr_t param1); +QGradient* QGradient_new2(int param1); QGradient* QGradient_new3(QGradient* param1); -uintptr_t QGradient_Type(const QGradient* self); -void QGradient_SetSpread(QGradient* self, uintptr_t spread); -uintptr_t QGradient_Spread(const QGradient* self); +int QGradient_Type(const QGradient* self); +void QGradient_SetSpread(QGradient* self, int spread); +int QGradient_Spread(const QGradient* self); void QGradient_SetColorAt(QGradient* self, double pos, QColor* color); -uintptr_t QGradient_CoordinateMode(const QGradient* self); -void QGradient_SetCoordinateMode(QGradient* self, uintptr_t mode); -uintptr_t QGradient_InterpolationMode(const QGradient* self); -void QGradient_SetInterpolationMode(QGradient* self, uintptr_t mode); +int QGradient_CoordinateMode(const QGradient* self); +void QGradient_SetCoordinateMode(QGradient* self, int mode); +int QGradient_InterpolationMode(const QGradient* self); +void QGradient_SetInterpolationMode(QGradient* self, int mode); bool QGradient_OperatorEqual(const QGradient* self, QGradient* gradient); bool QGradient_OperatorNotEqual(const QGradient* self, QGradient* other); void QGradient_Delete(QGradient* self); @@ -146,6 +146,7 @@ void QConicalGradient_SetAngle(QConicalGradient* self, double angle); void QConicalGradient_Delete(QConicalGradient* self); QGradient__QGradientData* QGradient__QGradientData_new(QGradient__QGradientData* param1); +void QGradient__QGradientData_OperatorAssign(QGradient__QGradientData* self, QGradient__QGradientData* param1); void QGradient__QGradientData_Delete(QGradient__QGradientData* self); #ifdef __cplusplus diff --git a/qt/gen_qbuffer.cpp b/qt/gen_qbuffer.cpp index 9a03c49..1989eaa 100644 --- a/qt/gen_qbuffer.cpp +++ b/qt/gen_qbuffer.cpp @@ -82,11 +82,13 @@ void QBuffer_Close(QBuffer* self) { } long long QBuffer_Size(const QBuffer* self) { - return self->size(); + qint64 _ret = self->size(); + return static_cast(_ret); } long long QBuffer_Pos(const QBuffer* self) { - return self->pos(); + qint64 _ret = self->pos(); + return static_cast(_ret); } bool QBuffer_Seek(QBuffer* self, long long off) { diff --git a/qt/gen_qbuffer.go b/qt/gen_qbuffer.go index c79615a..ec8ec16 100644 --- a/qt/gen_qbuffer.go +++ b/qt/gen_qbuffer.go @@ -109,7 +109,7 @@ func (this *QBuffer) Data() *QByteArray { } func (this *QBuffer) Open(openMode int) bool { - return (bool)(C.QBuffer_Open(this.h, (C.int)(openMode))) + return (bool)(C.QBuffer_Open(this.h, openMode)) } func (this *QBuffer) Close() { diff --git a/qt/gen_qbuttongroup.cpp b/qt/gen_qbuttongroup.cpp index c4f3ae4..9b158f6 100644 --- a/qt/gen_qbuttongroup.cpp +++ b/qt/gen_qbuttongroup.cpp @@ -53,7 +53,7 @@ void QButtonGroup_RemoveButton(QButtonGroup* self, QAbstractButton* param1) { } struct miqt_array* QButtonGroup_Buttons(const QButtonGroup* self) { - QList _ret = self->buttons(); + QList _ret = self->buttons(); // Convert QList<> from C++ memory to manually-managed C memory QAbstractButton** _arr = static_cast(malloc(sizeof(QAbstractButton*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { diff --git a/qt/gen_qbytearray.cpp b/qt/gen_qbytearray.cpp index 6c032cf..79b287c 100644 --- a/qt/gen_qbytearray.cpp +++ b/qt/gen_qbytearray.cpp @@ -34,7 +34,7 @@ QByteArray* QByteArray_new3(int size, char c) { return new QByteArray(static_cast(size), static_cast(c)); } -QByteArray* QByteArray_new4(int size, uintptr_t param2) { +QByteArray* QByteArray_new4(int size, int param2) { return new QByteArray(static_cast(size), static_cast(param2)); } @@ -576,7 +576,8 @@ int16_t QByteArray_ToShort(const QByteArray* self) { } uint16_t QByteArray_ToUShort(const QByteArray* self) { - return self->toUShort(); + ushort _ret = self->toUShort(); + return static_cast(_ret); } int QByteArray_ToInt(const QByteArray* self) { @@ -584,7 +585,8 @@ int QByteArray_ToInt(const QByteArray* self) { } unsigned int QByteArray_ToUInt(const QByteArray* self) { - return self->toUInt(); + uint _ret = self->toUInt(); + return static_cast(_ret); } long QByteArray_ToLong(const QByteArray* self) { @@ -592,15 +594,18 @@ long QByteArray_ToLong(const QByteArray* self) { } unsigned long QByteArray_ToULong(const QByteArray* self) { - return self->toULong(); + ulong _ret = self->toULong(); + return static_cast(_ret); } -int64_t QByteArray_ToLongLong(const QByteArray* self) { - return self->toLongLong(); +long long QByteArray_ToLongLong(const QByteArray* self) { + qlonglong _ret = self->toLongLong(); + return static_cast(_ret); } -uint64_t QByteArray_ToULongLong(const QByteArray* self) { - return self->toULongLong(); +unsigned long long QByteArray_ToULongLong(const QByteArray* self) { + qulonglong _ret = self->toULongLong(); + return static_cast(_ret); } float QByteArray_ToFloat(const QByteArray* self) { @@ -656,13 +661,13 @@ QByteArray* QByteArray_SetNumWithUint(QByteArray* self, unsigned int param1) { } QByteArray* QByteArray_SetNumWithQlonglong(QByteArray* self, long long param1) { - QByteArray& _ret = self->setNum(static_cast(param1)); + QByteArray& _ret = self->setNum(static_cast(param1)); // Cast returned reference into pointer return &_ret; } QByteArray* QByteArray_SetNumWithQulonglong(QByteArray* self, unsigned long long param1) { - QByteArray& _ret = self->setNum(static_cast(param1)); + QByteArray& _ret = self->setNum(static_cast(param1)); // Cast returned reference into pointer return &_ret; } @@ -694,11 +699,11 @@ QByteArray* QByteArray_NumberWithUint(unsigned int param1) { } QByteArray* QByteArray_NumberWithQlonglong(long long param1) { - return new QByteArray(QByteArray::number(static_cast(param1))); + return new QByteArray(QByteArray::number(static_cast(param1))); } QByteArray* QByteArray_NumberWithQulonglong(unsigned long long param1) { - return new QByteArray(QByteArray::number(static_cast(param1))); + return new QByteArray(QByteArray::number(static_cast(param1))); } QByteArray* QByteArray_NumberWithDouble(double param1) { @@ -730,35 +735,43 @@ QByteArray* QByteArray_FromPercentEncoding(QByteArray* pctEncoded) { } char* QByteArray_Begin(QByteArray* self) { - return self->begin(); + QByteArray::iterator* _ret = self->begin(); + return static_cast(_ret); } const char* QByteArray_Begin2(const QByteArray* self) { - return (const char*) self->begin(); + const QByteArray::const_iterator* _ret = self->begin(); + return static_cast(_ret); } const char* QByteArray_Cbegin(const QByteArray* self) { - return (const char*) self->cbegin(); + const QByteArray::const_iterator* _ret = self->cbegin(); + return static_cast(_ret); } const char* QByteArray_ConstBegin(const QByteArray* self) { - return (const char*) self->constBegin(); + const QByteArray::const_iterator* _ret = self->constBegin(); + return static_cast(_ret); } char* QByteArray_End(QByteArray* self) { - return self->end(); + QByteArray::iterator* _ret = self->end(); + return static_cast(_ret); } const char* QByteArray_End2(const QByteArray* self) { - return (const char*) self->end(); + const QByteArray::const_iterator* _ret = self->end(); + return static_cast(_ret); } const char* QByteArray_Cend(const QByteArray* self) { - return (const char*) self->cend(); + const QByteArray::const_iterator* _ret = self->cend(); + return static_cast(_ret); } const char* QByteArray_ConstEnd(const QByteArray* self) { - return (const char*) self->constEnd(); + const QByteArray::const_iterator* _ret = self->constEnd(); + return static_cast(_ret); } void QByteArray_PushBack(QByteArray* self, char c) { @@ -831,11 +844,11 @@ int QByteArray_LastIndexOf23(const QByteArray* self, QByteArray* a, int from) { return self->lastIndexOf(*a, static_cast(from)); } -int QByteArray_Compare2(const QByteArray* self, const char* c, uintptr_t cs) { +int QByteArray_Compare2(const QByteArray* self, const char* c, int cs) { return self->compare(c, static_cast(cs)); } -int QByteArray_Compare22(const QByteArray* self, QByteArray* a, uintptr_t cs) { +int QByteArray_Compare22(const QByteArray* self, QByteArray* a, int cs) { return self->compare(*a, static_cast(cs)); } @@ -878,11 +891,13 @@ int16_t QByteArray_ToShort2(const QByteArray* self, bool* ok, int base) { } uint16_t QByteArray_ToUShort1(const QByteArray* self, bool* ok) { - return self->toUShort(ok); + ushort _ret = self->toUShort(ok); + return static_cast(_ret); } uint16_t QByteArray_ToUShort2(const QByteArray* self, bool* ok, int base) { - return self->toUShort(ok, static_cast(base)); + ushort _ret = self->toUShort(ok, static_cast(base)); + return static_cast(_ret); } int QByteArray_ToInt1(const QByteArray* self, bool* ok) { @@ -894,11 +909,13 @@ int QByteArray_ToInt2(const QByteArray* self, bool* ok, int base) { } unsigned int QByteArray_ToUInt1(const QByteArray* self, bool* ok) { - return self->toUInt(ok); + uint _ret = self->toUInt(ok); + return static_cast(_ret); } unsigned int QByteArray_ToUInt2(const QByteArray* self, bool* ok, int base) { - return self->toUInt(ok, static_cast(base)); + uint _ret = self->toUInt(ok, static_cast(base)); + return static_cast(_ret); } long QByteArray_ToLong1(const QByteArray* self, bool* ok) { @@ -910,27 +927,33 @@ long QByteArray_ToLong2(const QByteArray* self, bool* ok, int base) { } unsigned long QByteArray_ToULong1(const QByteArray* self, bool* ok) { - return self->toULong(ok); + ulong _ret = self->toULong(ok); + return static_cast(_ret); } unsigned long QByteArray_ToULong2(const QByteArray* self, bool* ok, int base) { - return self->toULong(ok, static_cast(base)); + ulong _ret = self->toULong(ok, static_cast(base)); + return static_cast(_ret); } -int64_t QByteArray_ToLongLong1(const QByteArray* self, bool* ok) { - return self->toLongLong(ok); +long long QByteArray_ToLongLong1(const QByteArray* self, bool* ok) { + qlonglong _ret = self->toLongLong(ok); + return static_cast(_ret); } -int64_t QByteArray_ToLongLong2(const QByteArray* self, bool* ok, int base) { - return self->toLongLong(ok, static_cast(base)); +long long QByteArray_ToLongLong2(const QByteArray* self, bool* ok, int base) { + qlonglong _ret = self->toLongLong(ok, static_cast(base)); + return static_cast(_ret); } -uint64_t QByteArray_ToULongLong1(const QByteArray* self, bool* ok) { - return self->toULongLong(ok); +unsigned long long QByteArray_ToULongLong1(const QByteArray* self, bool* ok) { + qulonglong _ret = self->toULongLong(ok); + return static_cast(_ret); } -uint64_t QByteArray_ToULongLong2(const QByteArray* self, bool* ok, int base) { - return self->toULongLong(ok, static_cast(base)); +unsigned long long QByteArray_ToULongLong2(const QByteArray* self, bool* ok, int base) { + qulonglong _ret = self->toULongLong(ok, static_cast(base)); + return static_cast(_ret); } float QByteArray_ToFloat1(const QByteArray* self, bool* ok) { @@ -978,13 +1001,13 @@ QByteArray* QByteArray_SetNum24(QByteArray* self, unsigned int param1, int base) } QByteArray* QByteArray_SetNum25(QByteArray* self, long long param1, int base) { - QByteArray& _ret = self->setNum(static_cast(param1), static_cast(base)); + QByteArray& _ret = self->setNum(static_cast(param1), static_cast(base)); // Cast returned reference into pointer return &_ret; } QByteArray* QByteArray_SetNum26(QByteArray* self, unsigned long long param1, int base) { - QByteArray& _ret = self->setNum(static_cast(param1), static_cast(base)); + QByteArray& _ret = self->setNum(static_cast(param1), static_cast(base)); // Cast returned reference into pointer return &_ret; } @@ -1022,11 +1045,11 @@ QByteArray* QByteArray_Number22(unsigned int param1, int base) { } QByteArray* QByteArray_Number23(long long param1, int base) { - return new QByteArray(QByteArray::number(static_cast(param1), static_cast(base))); + return new QByteArray(QByteArray::number(static_cast(param1), static_cast(base))); } QByteArray* QByteArray_Number24(unsigned long long param1, int base) { - return new QByteArray(QByteArray::number(static_cast(param1), static_cast(base))); + return new QByteArray(QByteArray::number(static_cast(param1), static_cast(base))); } QByteArray* QByteArray_Number25(double param1, char f) { @@ -1109,6 +1132,10 @@ QByteArray* QByteArray__FromBase64Result_OperatorMultiply2(const QByteArray__Fro return const_cast(&_ret); } +void QByteArray__FromBase64Result_OperatorAssign(QByteArray__FromBase64Result* self, QByteArray__FromBase64Result* param1) { + self->operator=(*param1); +} + void QByteArray__FromBase64Result_Delete(QByteArray__FromBase64Result* self) { delete self; } diff --git a/qt/gen_qbytearray.go b/qt/gen_qbytearray.go index 5e78153..c8d7ed0 100644 --- a/qt/gen_qbytearray.go +++ b/qt/gen_qbytearray.go @@ -139,7 +139,7 @@ func NewQByteArray3(size int, c byte) *QByteArray { // NewQByteArray4 constructs a new QByteArray object. func NewQByteArray4(size int, param2 Initialization) *QByteArray { - ret := C.QByteArray_new4((C.int)(size), (C.uintptr_t)(param2)) + ret := C.QByteArray_new4((C.int)(size), (C.int)(param2)) return newQByteArray(ret) } @@ -764,7 +764,7 @@ func (this *QByteArray) ToDouble() float64 { } func (this *QByteArray) ToBase64(options int) *QByteArray { - _ret := C.QByteArray_ToBase64(this.h, (C.int)(options)) + _ret := C.QByteArray_ToBase64(this.h, options) _goptr := newQByteArray(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -888,7 +888,7 @@ func QByteArray_FromBase64Encoding(base64 *QByteArray) *QByteArray__FromBase64Re } func QByteArray_FromBase64(base64 *QByteArray, options int) *QByteArray { - _ret := C.QByteArray_FromBase64(base64.cPointer(), (C.int)(options)) + _ret := C.QByteArray_FromBase64(base64.cPointer(), options) _goptr := newQByteArray(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -1034,11 +1034,11 @@ func (this *QByteArray) LastIndexOf23(a *QByteArray, from int) int { func (this *QByteArray) Compare2(c string, cs CaseSensitivity) int { c_Cstring := C.CString(c) defer C.free(unsafe.Pointer(c_Cstring)) - return (int)(C.QByteArray_Compare2(this.h, c_Cstring, (C.uintptr_t)(cs))) + return (int)(C.QByteArray_Compare2(this.h, c_Cstring, (C.int)(cs))) } func (this *QByteArray) Compare22(a *QByteArray, cs CaseSensitivity) int { - return (int)(C.QByteArray_Compare22(this.h, a.cPointer(), (C.uintptr_t)(cs))) + return (int)(C.QByteArray_Compare22(this.h, a.cPointer(), (C.int)(cs))) } func (this *QByteArray) Mid2(index int, lenVal int) *QByteArray { @@ -1264,7 +1264,7 @@ func QByteArray_Number3(param1 float64, f byte, prec int) *QByteArray { } func QByteArray_FromBase64Encoding2(base64 *QByteArray, options int) *QByteArray__FromBase64Result { - _ret := C.QByteArray_FromBase64Encoding2(base64.cPointer(), (C.int)(options)) + _ret := C.QByteArray_FromBase64Encoding2(base64.cPointer(), options) _goptr := newQByteArray__FromBase64Result(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -1405,6 +1405,10 @@ func (this *QByteArray__FromBase64Result) OperatorMultiply2() *QByteArray { return newQByteArray_U(unsafe.Pointer(C.QByteArray__FromBase64Result_OperatorMultiply2(this.h))) } +func (this *QByteArray__FromBase64Result) OperatorAssign(param1 *QByteArray__FromBase64Result) { + C.QByteArray__FromBase64Result_OperatorAssign(this.h, param1.cPointer()) +} + // Delete this object from C++ memory. func (this *QByteArray__FromBase64Result) Delete() { C.QByteArray__FromBase64Result_Delete(this.h) diff --git a/qt/gen_qbytearray.h b/qt/gen_qbytearray.h index 06e52ab..5e55129 100644 --- a/qt/gen_qbytearray.h +++ b/qt/gen_qbytearray.h @@ -36,7 +36,7 @@ void QByteArrayDataPtr_Delete(QByteArrayDataPtr* self); QByteArray* QByteArray_new(); QByteArray* QByteArray_new2(const char* param1); QByteArray* QByteArray_new3(int size, char c); -QByteArray* QByteArray_new4(int size, uintptr_t param2); +QByteArray* QByteArray_new4(int size, int param2); QByteArray* QByteArray_new5(QByteArray* param1); QByteArray* QByteArray_new6(QByteArrayDataPtr* dd); QByteArray* QByteArray_new7(const char* param1, int size); @@ -152,8 +152,8 @@ int QByteArray_ToInt(const QByteArray* self); unsigned int QByteArray_ToUInt(const QByteArray* self); long QByteArray_ToLong(const QByteArray* self); unsigned long QByteArray_ToULong(const QByteArray* self); -int64_t QByteArray_ToLongLong(const QByteArray* self); -uint64_t QByteArray_ToULongLong(const QByteArray* self); +long long QByteArray_ToLongLong(const QByteArray* self); +unsigned long long QByteArray_ToULongLong(const QByteArray* self); float QByteArray_ToFloat(const QByteArray* self); double QByteArray_ToDouble(const QByteArray* self); QByteArray* QByteArray_ToBase64(const QByteArray* self, int options); @@ -206,8 +206,8 @@ int QByteArray_IndexOf23(const QByteArray* self, QByteArray* a, int from); int QByteArray_LastIndexOf2(const QByteArray* self, char c, int from); int QByteArray_LastIndexOf22(const QByteArray* self, const char* c, int from); int QByteArray_LastIndexOf23(const QByteArray* self, QByteArray* a, int from); -int QByteArray_Compare2(const QByteArray* self, const char* c, uintptr_t cs); -int QByteArray_Compare22(const QByteArray* self, QByteArray* a, uintptr_t cs); +int QByteArray_Compare2(const QByteArray* self, const char* c, int cs); +int QByteArray_Compare22(const QByteArray* self, QByteArray* a, int cs); QByteArray* QByteArray_Mid2(const QByteArray* self, int index, int lenVal); QByteArray* QByteArray_LeftJustified2(const QByteArray* self, int width, char fill); QByteArray* QByteArray_LeftJustified3(const QByteArray* self, int width, char fill, bool truncate); @@ -227,10 +227,10 @@ long QByteArray_ToLong1(const QByteArray* self, bool* ok); long QByteArray_ToLong2(const QByteArray* self, bool* ok, int base); unsigned long QByteArray_ToULong1(const QByteArray* self, bool* ok); unsigned long QByteArray_ToULong2(const QByteArray* self, bool* ok, int base); -int64_t QByteArray_ToLongLong1(const QByteArray* self, bool* ok); -int64_t QByteArray_ToLongLong2(const QByteArray* self, bool* ok, int base); -uint64_t QByteArray_ToULongLong1(const QByteArray* self, bool* ok); -uint64_t QByteArray_ToULongLong2(const QByteArray* self, bool* ok, int base); +long long QByteArray_ToLongLong1(const QByteArray* self, bool* ok); +long long QByteArray_ToLongLong2(const QByteArray* self, bool* ok, int base); +unsigned long long QByteArray_ToULongLong1(const QByteArray* self, bool* ok); +unsigned long long QByteArray_ToULongLong2(const QByteArray* self, bool* ok, int base); float QByteArray_ToFloat1(const QByteArray* self, bool* ok); double QByteArray_ToDouble1(const QByteArray* self, bool* ok); QByteArray* QByteArray_ToPercentEncoding1(const QByteArray* self, QByteArray* exclude); @@ -271,6 +271,7 @@ QByteArray__FromBase64Result* QByteArray__FromBase64Result_new(QByteArray__FromB void QByteArray__FromBase64Result_Swap(QByteArray__FromBase64Result* self, QByteArray__FromBase64Result* other); QByteArray* QByteArray__FromBase64Result_OperatorMultiply(QByteArray__FromBase64Result* self); QByteArray* QByteArray__FromBase64Result_OperatorMultiply2(const QByteArray__FromBase64Result* self); +void QByteArray__FromBase64Result_OperatorAssign(QByteArray__FromBase64Result* self, QByteArray__FromBase64Result* param1); void QByteArray__FromBase64Result_Delete(QByteArray__FromBase64Result* self); #ifdef __cplusplus diff --git a/qt/gen_qcalendar.cpp b/qt/gen_qcalendar.cpp index fef16c2..52ce970 100644 --- a/qt/gen_qcalendar.cpp +++ b/qt/gen_qcalendar.cpp @@ -14,7 +14,7 @@ QCalendar* QCalendar_new() { return new QCalendar(); } -QCalendar* QCalendar_new2(uintptr_t system) { +QCalendar* QCalendar_new2(int system) { return new QCalendar(static_cast(system)); } @@ -156,7 +156,7 @@ struct miqt_string* QCalendar_MonthName3(const QCalendar* self, QLocale* locale, return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QCalendar_MonthName4(const QCalendar* self, QLocale* locale, int month, int year, uintptr_t format) { +struct miqt_string* QCalendar_MonthName4(const QCalendar* self, QLocale* locale, int month, int year, int format) { QString _ret = self->monthName(*locale, static_cast(month), static_cast(year), static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -170,21 +170,21 @@ struct miqt_string* QCalendar_StandaloneMonthName3(const QCalendar* self, QLocal return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QCalendar_StandaloneMonthName4(const QCalendar* self, QLocale* locale, int month, int year, uintptr_t format) { +struct miqt_string* QCalendar_StandaloneMonthName4(const QCalendar* self, QLocale* locale, int month, int year, int format) { QString _ret = self->standaloneMonthName(*locale, static_cast(month), static_cast(year), static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QCalendar_WeekDayName3(const QCalendar* self, QLocale* locale, int day, uintptr_t format) { +struct miqt_string* QCalendar_WeekDayName3(const QCalendar* self, QLocale* locale, int day, int format) { QString _ret = self->weekDayName(*locale, static_cast(day), static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QCalendar_StandaloneWeekDayName3(const QCalendar* self, QLocale* locale, int day, uintptr_t format) { +struct miqt_string* QCalendar_StandaloneWeekDayName3(const QCalendar* self, QLocale* locale, int day, int format) { QString _ret = self->standaloneWeekDayName(*locale, static_cast(day), static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); diff --git a/qt/gen_qcalendar.go b/qt/gen_qcalendar.go index 051e256..19cc1a2 100644 --- a/qt/gen_qcalendar.go +++ b/qt/gen_qcalendar.go @@ -61,7 +61,7 @@ func NewQCalendar() *QCalendar { // NewQCalendar2 constructs a new QCalendar object. func NewQCalendar2(system QCalendar__System) *QCalendar { - ret := C.QCalendar_new2((C.uintptr_t)(system)) + ret := C.QCalendar_new2((C.int)(system)) return newQCalendar(ret) } @@ -211,7 +211,7 @@ func (this *QCalendar) MonthName3(locale *QLocale, month int, year int) string { } func (this *QCalendar) MonthName4(locale *QLocale, month int, year int, format QLocale__FormatType) string { - var _ms *C.struct_miqt_string = C.QCalendar_MonthName4(this.h, locale.cPointer(), (C.int)(month), (C.int)(year), (C.uintptr_t)(format)) + var _ms *C.struct_miqt_string = C.QCalendar_MonthName4(this.h, locale.cPointer(), (C.int)(month), (C.int)(year), (C.int)(format)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -225,21 +225,21 @@ func (this *QCalendar) StandaloneMonthName3(locale *QLocale, month int, year int } func (this *QCalendar) StandaloneMonthName4(locale *QLocale, month int, year int, format QLocale__FormatType) string { - var _ms *C.struct_miqt_string = C.QCalendar_StandaloneMonthName4(this.h, locale.cPointer(), (C.int)(month), (C.int)(year), (C.uintptr_t)(format)) + var _ms *C.struct_miqt_string = C.QCalendar_StandaloneMonthName4(this.h, locale.cPointer(), (C.int)(month), (C.int)(year), (C.int)(format)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } func (this *QCalendar) WeekDayName3(locale *QLocale, day int, format QLocale__FormatType) string { - var _ms *C.struct_miqt_string = C.QCalendar_WeekDayName3(this.h, locale.cPointer(), (C.int)(day), (C.uintptr_t)(format)) + var _ms *C.struct_miqt_string = C.QCalendar_WeekDayName3(this.h, locale.cPointer(), (C.int)(day), (C.int)(format)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } func (this *QCalendar) StandaloneWeekDayName3(locale *QLocale, day int, format QLocale__FormatType) string { - var _ms *C.struct_miqt_string = C.QCalendar_StandaloneWeekDayName3(this.h, locale.cPointer(), (C.int)(day), (C.uintptr_t)(format)) + var _ms *C.struct_miqt_string = C.QCalendar_StandaloneWeekDayName3(this.h, locale.cPointer(), (C.int)(day), (C.int)(format)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret diff --git a/qt/gen_qcalendar.h b/qt/gen_qcalendar.h index 687af2f..666dfd2 100644 --- a/qt/gen_qcalendar.h +++ b/qt/gen_qcalendar.h @@ -30,7 +30,7 @@ typedef struct QLocale QLocale; #endif QCalendar* QCalendar_new(); -QCalendar* QCalendar_new2(uintptr_t system); +QCalendar* QCalendar_new2(int system); bool QCalendar_IsValid(const QCalendar* self); int QCalendar_DaysInMonth(const QCalendar* self, int month); int QCalendar_DaysInYear(const QCalendar* self, int year); @@ -58,11 +58,11 @@ struct miqt_string* QCalendar_StandaloneWeekDayName(const QCalendar* self, QLoca struct miqt_array* QCalendar_AvailableCalendars(); int QCalendar_DaysInMonth2(const QCalendar* self, int month, int year); struct miqt_string* QCalendar_MonthName3(const QCalendar* self, QLocale* locale, int month, int year); -struct miqt_string* QCalendar_MonthName4(const QCalendar* self, QLocale* locale, int month, int year, uintptr_t format); +struct miqt_string* QCalendar_MonthName4(const QCalendar* self, QLocale* locale, int month, int year, int format); struct miqt_string* QCalendar_StandaloneMonthName3(const QCalendar* self, QLocale* locale, int month, int year); -struct miqt_string* QCalendar_StandaloneMonthName4(const QCalendar* self, QLocale* locale, int month, int year, uintptr_t format); -struct miqt_string* QCalendar_WeekDayName3(const QCalendar* self, QLocale* locale, int day, uintptr_t format); -struct miqt_string* QCalendar_StandaloneWeekDayName3(const QCalendar* self, QLocale* locale, int day, uintptr_t format); +struct miqt_string* QCalendar_StandaloneMonthName4(const QCalendar* self, QLocale* locale, int month, int year, int format); +struct miqt_string* QCalendar_WeekDayName3(const QCalendar* self, QLocale* locale, int day, int format); +struct miqt_string* QCalendar_StandaloneWeekDayName3(const QCalendar* self, QLocale* locale, int day, int format); void QCalendar_Delete(QCalendar* self); QCalendar__YearMonthDay* QCalendar__YearMonthDay_new(); diff --git a/qt/gen_qcalendarwidget.cpp b/qt/gen_qcalendarwidget.cpp index 5a59518..ea8b6ee 100644 --- a/qt/gen_qcalendarwidget.cpp +++ b/qt/gen_qcalendarwidget.cpp @@ -74,12 +74,12 @@ void QCalendarWidget_SetMaximumDate(QCalendarWidget* self, QDate* date) { self->setMaximumDate(*date); } -uintptr_t QCalendarWidget_FirstDayOfWeek(const QCalendarWidget* self) { +int QCalendarWidget_FirstDayOfWeek(const QCalendarWidget* self) { Qt::DayOfWeek _ret = self->firstDayOfWeek(); - return static_cast(_ret); + return static_cast(_ret); } -void QCalendarWidget_SetFirstDayOfWeek(QCalendarWidget* self, uintptr_t dayOfWeek) { +void QCalendarWidget_SetFirstDayOfWeek(QCalendarWidget* self, int dayOfWeek) { self->setFirstDayOfWeek(static_cast(dayOfWeek)); } @@ -99,30 +99,30 @@ void QCalendarWidget_SetCalendar(QCalendarWidget* self, QCalendar* calendar) { self->setCalendar(*calendar); } -uintptr_t QCalendarWidget_SelectionMode(const QCalendarWidget* self) { +int QCalendarWidget_SelectionMode(const QCalendarWidget* self) { QCalendarWidget::SelectionMode _ret = self->selectionMode(); - return static_cast(_ret); + return static_cast(_ret); } -void QCalendarWidget_SetSelectionMode(QCalendarWidget* self, uintptr_t mode) { +void QCalendarWidget_SetSelectionMode(QCalendarWidget* self, int mode) { self->setSelectionMode(static_cast(mode)); } -uintptr_t QCalendarWidget_HorizontalHeaderFormat(const QCalendarWidget* self) { +int QCalendarWidget_HorizontalHeaderFormat(const QCalendarWidget* self) { QCalendarWidget::HorizontalHeaderFormat _ret = self->horizontalHeaderFormat(); - return static_cast(_ret); + return static_cast(_ret); } -void QCalendarWidget_SetHorizontalHeaderFormat(QCalendarWidget* self, uintptr_t format) { +void QCalendarWidget_SetHorizontalHeaderFormat(QCalendarWidget* self, int format) { self->setHorizontalHeaderFormat(static_cast(format)); } -uintptr_t QCalendarWidget_VerticalHeaderFormat(const QCalendarWidget* self) { +int QCalendarWidget_VerticalHeaderFormat(const QCalendarWidget* self) { QCalendarWidget::VerticalHeaderFormat _ret = self->verticalHeaderFormat(); - return static_cast(_ret); + return static_cast(_ret); } -void QCalendarWidget_SetVerticalHeaderFormat(QCalendarWidget* self, uintptr_t format) { +void QCalendarWidget_SetVerticalHeaderFormat(QCalendarWidget* self, int format) { self->setVerticalHeaderFormat(static_cast(format)); } @@ -134,11 +134,11 @@ void QCalendarWidget_SetHeaderTextFormat(QCalendarWidget* self, QTextCharFormat* self->setHeaderTextFormat(*format); } -QTextCharFormat* QCalendarWidget_WeekdayTextFormat(const QCalendarWidget* self, uintptr_t dayOfWeek) { +QTextCharFormat* QCalendarWidget_WeekdayTextFormat(const QCalendarWidget* self, int dayOfWeek) { return new QTextCharFormat(self->weekdayTextFormat(static_cast(dayOfWeek))); } -void QCalendarWidget_SetWeekdayTextFormat(QCalendarWidget* self, uintptr_t dayOfWeek, QTextCharFormat* format) { +void QCalendarWidget_SetWeekdayTextFormat(QCalendarWidget* self, int dayOfWeek, QTextCharFormat* format) { self->setWeekdayTextFormat(static_cast(dayOfWeek), *format); } diff --git a/qt/gen_qcalendarwidget.go b/qt/gen_qcalendarwidget.go index dfdfb51..c9e3715 100644 --- a/qt/gen_qcalendarwidget.go +++ b/qt/gen_qcalendarwidget.go @@ -150,7 +150,7 @@ func (this *QCalendarWidget) FirstDayOfWeek() DayOfWeek { } func (this *QCalendarWidget) SetFirstDayOfWeek(dayOfWeek DayOfWeek) { - C.QCalendarWidget_SetFirstDayOfWeek(this.h, (C.uintptr_t)(dayOfWeek)) + C.QCalendarWidget_SetFirstDayOfWeek(this.h, (C.int)(dayOfWeek)) } func (this *QCalendarWidget) IsNavigationBarVisible() bool { @@ -177,7 +177,7 @@ func (this *QCalendarWidget) SelectionMode() QCalendarWidget__SelectionMode { } func (this *QCalendarWidget) SetSelectionMode(mode QCalendarWidget__SelectionMode) { - C.QCalendarWidget_SetSelectionMode(this.h, (C.uintptr_t)(mode)) + C.QCalendarWidget_SetSelectionMode(this.h, (C.int)(mode)) } func (this *QCalendarWidget) HorizontalHeaderFormat() QCalendarWidget__HorizontalHeaderFormat { @@ -185,7 +185,7 @@ func (this *QCalendarWidget) HorizontalHeaderFormat() QCalendarWidget__Horizonta } func (this *QCalendarWidget) SetHorizontalHeaderFormat(format QCalendarWidget__HorizontalHeaderFormat) { - C.QCalendarWidget_SetHorizontalHeaderFormat(this.h, (C.uintptr_t)(format)) + C.QCalendarWidget_SetHorizontalHeaderFormat(this.h, (C.int)(format)) } func (this *QCalendarWidget) VerticalHeaderFormat() QCalendarWidget__VerticalHeaderFormat { @@ -193,7 +193,7 @@ func (this *QCalendarWidget) VerticalHeaderFormat() QCalendarWidget__VerticalHea } func (this *QCalendarWidget) SetVerticalHeaderFormat(format QCalendarWidget__VerticalHeaderFormat) { - C.QCalendarWidget_SetVerticalHeaderFormat(this.h, (C.uintptr_t)(format)) + C.QCalendarWidget_SetVerticalHeaderFormat(this.h, (C.int)(format)) } func (this *QCalendarWidget) HeaderTextFormat() *QTextCharFormat { @@ -208,14 +208,14 @@ func (this *QCalendarWidget) SetHeaderTextFormat(format *QTextCharFormat) { } func (this *QCalendarWidget) WeekdayTextFormat(dayOfWeek DayOfWeek) *QTextCharFormat { - _ret := C.QCalendarWidget_WeekdayTextFormat(this.h, (C.uintptr_t)(dayOfWeek)) + _ret := C.QCalendarWidget_WeekdayTextFormat(this.h, (C.int)(dayOfWeek)) _goptr := newQTextCharFormat(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QCalendarWidget) SetWeekdayTextFormat(dayOfWeek DayOfWeek, format *QTextCharFormat) { - C.QCalendarWidget_SetWeekdayTextFormat(this.h, (C.uintptr_t)(dayOfWeek), format.cPointer()) + C.QCalendarWidget_SetWeekdayTextFormat(this.h, (C.int)(dayOfWeek), format.cPointer()) } func (this *QCalendarWidget) DateTextFormatWithDate(date *QDate) *QTextCharFormat { diff --git a/qt/gen_qcalendarwidget.h b/qt/gen_qcalendarwidget.h index c3dc3e0..1925280 100644 --- a/qt/gen_qcalendarwidget.h +++ b/qt/gen_qcalendarwidget.h @@ -45,22 +45,22 @@ QDate* QCalendarWidget_MinimumDate(const QCalendarWidget* self); void QCalendarWidget_SetMinimumDate(QCalendarWidget* self, QDate* date); QDate* QCalendarWidget_MaximumDate(const QCalendarWidget* self); void QCalendarWidget_SetMaximumDate(QCalendarWidget* self, QDate* date); -uintptr_t QCalendarWidget_FirstDayOfWeek(const QCalendarWidget* self); -void QCalendarWidget_SetFirstDayOfWeek(QCalendarWidget* self, uintptr_t dayOfWeek); +int QCalendarWidget_FirstDayOfWeek(const QCalendarWidget* self); +void QCalendarWidget_SetFirstDayOfWeek(QCalendarWidget* self, int dayOfWeek); bool QCalendarWidget_IsNavigationBarVisible(const QCalendarWidget* self); bool QCalendarWidget_IsGridVisible(const QCalendarWidget* self); QCalendar* QCalendarWidget_Calendar(const QCalendarWidget* self); void QCalendarWidget_SetCalendar(QCalendarWidget* self, QCalendar* calendar); -uintptr_t QCalendarWidget_SelectionMode(const QCalendarWidget* self); -void QCalendarWidget_SetSelectionMode(QCalendarWidget* self, uintptr_t mode); -uintptr_t QCalendarWidget_HorizontalHeaderFormat(const QCalendarWidget* self); -void QCalendarWidget_SetHorizontalHeaderFormat(QCalendarWidget* self, uintptr_t format); -uintptr_t QCalendarWidget_VerticalHeaderFormat(const QCalendarWidget* self); -void QCalendarWidget_SetVerticalHeaderFormat(QCalendarWidget* self, uintptr_t format); +int QCalendarWidget_SelectionMode(const QCalendarWidget* self); +void QCalendarWidget_SetSelectionMode(QCalendarWidget* self, int mode); +int QCalendarWidget_HorizontalHeaderFormat(const QCalendarWidget* self); +void QCalendarWidget_SetHorizontalHeaderFormat(QCalendarWidget* self, int format); +int QCalendarWidget_VerticalHeaderFormat(const QCalendarWidget* self); +void QCalendarWidget_SetVerticalHeaderFormat(QCalendarWidget* self, int format); QTextCharFormat* QCalendarWidget_HeaderTextFormat(const QCalendarWidget* self); void QCalendarWidget_SetHeaderTextFormat(QCalendarWidget* self, QTextCharFormat* format); -QTextCharFormat* QCalendarWidget_WeekdayTextFormat(const QCalendarWidget* self, uintptr_t dayOfWeek); -void QCalendarWidget_SetWeekdayTextFormat(QCalendarWidget* self, uintptr_t dayOfWeek, QTextCharFormat* format); +QTextCharFormat* QCalendarWidget_WeekdayTextFormat(const QCalendarWidget* self, int dayOfWeek); +void QCalendarWidget_SetWeekdayTextFormat(QCalendarWidget* self, int dayOfWeek, QTextCharFormat* format); QTextCharFormat* QCalendarWidget_DateTextFormatWithDate(const QCalendarWidget* self, QDate* date); void QCalendarWidget_SetDateTextFormat(QCalendarWidget* self, QDate* date, QTextCharFormat* format); bool QCalendarWidget_IsDateEditEnabled(const QCalendarWidget* self); diff --git a/qt/gen_qcborarray.cpp b/qt/gen_qcborarray.cpp index 691a909..2ea74b0 100644 --- a/qt/gen_qcborarray.cpp +++ b/qt/gen_qcborarray.cpp @@ -251,6 +251,10 @@ QCborArray__Iterator* QCborArray__Iterator_new2(QCborArray__Iterator* param1) { return new QCborArray::Iterator(*param1); } +void QCborArray__Iterator_OperatorAssign(QCborArray__Iterator* self, QCborArray__Iterator* other) { + self->operator=(*other); +} + QCborValueRef* QCborArray__Iterator_OperatorMultiply(const QCborArray__Iterator* self) { return new QCborValueRef(self->operator*()); } @@ -311,14 +315,38 @@ bool QCborArray__Iterator_OperatorGreaterOrEqualWithOther(const QCborArray__Iter return self->operator>=(*other); } -QCborArray__Iterator* QCborArray__Iterator_OperatorPlusPlus(QCborArray__Iterator* self, int param1) { +QCborArray__Iterator* QCborArray__Iterator_OperatorPlusPlus(QCborArray__Iterator* self) { + QCborArray::Iterator& _ret = self->operator++(); + // Cast returned reference into pointer + return &_ret; +} + +QCborArray__Iterator* QCborArray__Iterator_OperatorPlusPlusWithInt(QCborArray__Iterator* self, int param1) { return new QCborArray::Iterator(self->operator++(static_cast(param1))); } -QCborArray__Iterator* QCborArray__Iterator_OperatorMinusMinus(QCborArray__Iterator* self, int param1) { +QCborArray__Iterator* QCborArray__Iterator_OperatorMinusMinus(QCborArray__Iterator* self) { + QCborArray::Iterator& _ret = self->operator--(); + // Cast returned reference into pointer + return &_ret; +} + +QCborArray__Iterator* QCborArray__Iterator_OperatorMinusMinusWithInt(QCborArray__Iterator* self, int param1) { return new QCborArray::Iterator(self->operator--(static_cast(param1))); } +QCborArray__Iterator* QCborArray__Iterator_OperatorPlusAssign(QCborArray__Iterator* self, size_t j) { + QCborArray::Iterator& _ret = self->operator+=(static_cast(j)); + // Cast returned reference into pointer + return &_ret; +} + +QCborArray__Iterator* QCborArray__Iterator_OperatorMinusAssign(QCborArray__Iterator* self, size_t j) { + QCborArray::Iterator& _ret = self->operator-=(static_cast(j)); + // Cast returned reference into pointer + return &_ret; +} + QCborArray__Iterator* QCborArray__Iterator_OperatorPlus(const QCborArray__Iterator* self, size_t j) { return new QCborArray::Iterator(self->operator+(static_cast(j))); } @@ -343,6 +371,10 @@ QCborArray__ConstIterator* QCborArray__ConstIterator_new2(QCborArray__ConstItera return new QCborArray::ConstIterator(*param1); } +void QCborArray__ConstIterator_OperatorAssign(QCborArray__ConstIterator* self, QCborArray__ConstIterator* other) { + self->operator=(*other); +} + QCborValueRef* QCborArray__ConstIterator_OperatorMultiply(const QCborArray__ConstIterator* self) { return new QCborValueRef(self->operator*()); } @@ -403,14 +435,38 @@ bool QCborArray__ConstIterator_OperatorGreaterOrEqualWithOther(const QCborArray_ return self->operator>=(*other); } -QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorPlusPlus(QCborArray__ConstIterator* self, int param1) { +QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorPlusPlus(QCborArray__ConstIterator* self) { + QCborArray::ConstIterator& _ret = self->operator++(); + // Cast returned reference into pointer + return &_ret; +} + +QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorPlusPlusWithInt(QCborArray__ConstIterator* self, int param1) { return new QCborArray::ConstIterator(self->operator++(static_cast(param1))); } -QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorMinusMinus(QCborArray__ConstIterator* self, int param1) { +QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorMinusMinus(QCborArray__ConstIterator* self) { + QCborArray::ConstIterator& _ret = self->operator--(); + // Cast returned reference into pointer + return &_ret; +} + +QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorMinusMinusWithInt(QCborArray__ConstIterator* self, int param1) { return new QCborArray::ConstIterator(self->operator--(static_cast(param1))); } +QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorPlusAssign(QCborArray__ConstIterator* self, size_t j) { + QCborArray::ConstIterator& _ret = self->operator+=(static_cast(j)); + // Cast returned reference into pointer + return &_ret; +} + +QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorMinusAssign(QCborArray__ConstIterator* self, size_t j) { + QCborArray::ConstIterator& _ret = self->operator-=(static_cast(j)); + // Cast returned reference into pointer + return &_ret; +} + QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorPlus(const QCborArray__ConstIterator* self, size_t j) { return new QCborArray::ConstIterator(self->operator+(static_cast(j))); } diff --git a/qt/gen_qcborarray.go b/qt/gen_qcborarray.go index 8717386..76002c0 100644 --- a/qt/gen_qcborarray.go +++ b/qt/gen_qcborarray.go @@ -400,6 +400,10 @@ func NewQCborArray__Iterator2(param1 *QCborArray__Iterator) *QCborArray__Iterato return newQCborArray__Iterator(ret) } +func (this *QCborArray__Iterator) OperatorAssign(other *QCborArray__Iterator) { + C.QCborArray__Iterator_OperatorAssign(this.h, other.cPointer()) +} + func (this *QCborArray__Iterator) OperatorMultiply() *QCborValueRef { _ret := C.QCborArray__Iterator_OperatorMultiply(this.h) _goptr := newQCborValueRef(_ret) @@ -466,20 +470,36 @@ func (this *QCborArray__Iterator) OperatorGreaterOrEqualWithOther(other *QCborAr return (bool)(C.QCborArray__Iterator_OperatorGreaterOrEqualWithOther(this.h, other.cPointer())) } -func (this *QCborArray__Iterator) OperatorPlusPlus(param1 int) *QCborArray__Iterator { - _ret := C.QCborArray__Iterator_OperatorPlusPlus(this.h, (C.int)(param1)) +func (this *QCborArray__Iterator) OperatorPlusPlus() *QCborArray__Iterator { + return newQCborArray__Iterator_U(unsafe.Pointer(C.QCborArray__Iterator_OperatorPlusPlus(this.h))) +} + +func (this *QCborArray__Iterator) OperatorPlusPlusWithInt(param1 int) *QCborArray__Iterator { + _ret := C.QCborArray__Iterator_OperatorPlusPlusWithInt(this.h, (C.int)(param1)) _goptr := newQCborArray__Iterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborArray__Iterator) OperatorMinusMinus(param1 int) *QCborArray__Iterator { - _ret := C.QCborArray__Iterator_OperatorMinusMinus(this.h, (C.int)(param1)) +func (this *QCborArray__Iterator) OperatorMinusMinus() *QCborArray__Iterator { + return newQCborArray__Iterator_U(unsafe.Pointer(C.QCborArray__Iterator_OperatorMinusMinus(this.h))) +} + +func (this *QCborArray__Iterator) OperatorMinusMinusWithInt(param1 int) *QCborArray__Iterator { + _ret := C.QCborArray__Iterator_OperatorMinusMinusWithInt(this.h, (C.int)(param1)) _goptr := newQCborArray__Iterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } +func (this *QCborArray__Iterator) OperatorPlusAssign(j uint64) *QCborArray__Iterator { + return newQCborArray__Iterator_U(unsafe.Pointer(C.QCborArray__Iterator_OperatorPlusAssign(this.h, (C.size_t)(j)))) +} + +func (this *QCborArray__Iterator) OperatorMinusAssign(j uint64) *QCborArray__Iterator { + return newQCborArray__Iterator_U(unsafe.Pointer(C.QCborArray__Iterator_OperatorMinusAssign(this.h, (C.size_t)(j)))) +} + func (this *QCborArray__Iterator) OperatorPlus(j uint64) *QCborArray__Iterator { _ret := C.QCborArray__Iterator_OperatorPlus(this.h, (C.size_t)(j)) _goptr := newQCborArray__Iterator(_ret) @@ -546,6 +566,10 @@ func NewQCborArray__ConstIterator2(param1 *QCborArray__ConstIterator) *QCborArra return newQCborArray__ConstIterator(ret) } +func (this *QCborArray__ConstIterator) OperatorAssign(other *QCborArray__ConstIterator) { + C.QCborArray__ConstIterator_OperatorAssign(this.h, other.cPointer()) +} + func (this *QCborArray__ConstIterator) OperatorMultiply() *QCborValueRef { _ret := C.QCborArray__ConstIterator_OperatorMultiply(this.h) _goptr := newQCborValueRef(_ret) @@ -612,20 +636,36 @@ func (this *QCborArray__ConstIterator) OperatorGreaterOrEqualWithOther(other *QC return (bool)(C.QCborArray__ConstIterator_OperatorGreaterOrEqualWithOther(this.h, other.cPointer())) } -func (this *QCborArray__ConstIterator) OperatorPlusPlus(param1 int) *QCborArray__ConstIterator { - _ret := C.QCborArray__ConstIterator_OperatorPlusPlus(this.h, (C.int)(param1)) +func (this *QCborArray__ConstIterator) OperatorPlusPlus() *QCborArray__ConstIterator { + return newQCborArray__ConstIterator_U(unsafe.Pointer(C.QCborArray__ConstIterator_OperatorPlusPlus(this.h))) +} + +func (this *QCborArray__ConstIterator) OperatorPlusPlusWithInt(param1 int) *QCborArray__ConstIterator { + _ret := C.QCborArray__ConstIterator_OperatorPlusPlusWithInt(this.h, (C.int)(param1)) _goptr := newQCborArray__ConstIterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborArray__ConstIterator) OperatorMinusMinus(param1 int) *QCborArray__ConstIterator { - _ret := C.QCborArray__ConstIterator_OperatorMinusMinus(this.h, (C.int)(param1)) +func (this *QCborArray__ConstIterator) OperatorMinusMinus() *QCborArray__ConstIterator { + return newQCborArray__ConstIterator_U(unsafe.Pointer(C.QCborArray__ConstIterator_OperatorMinusMinus(this.h))) +} + +func (this *QCborArray__ConstIterator) OperatorMinusMinusWithInt(param1 int) *QCborArray__ConstIterator { + _ret := C.QCborArray__ConstIterator_OperatorMinusMinusWithInt(this.h, (C.int)(param1)) _goptr := newQCborArray__ConstIterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } +func (this *QCborArray__ConstIterator) OperatorPlusAssign(j uint64) *QCborArray__ConstIterator { + return newQCborArray__ConstIterator_U(unsafe.Pointer(C.QCborArray__ConstIterator_OperatorPlusAssign(this.h, (C.size_t)(j)))) +} + +func (this *QCborArray__ConstIterator) OperatorMinusAssign(j uint64) *QCborArray__ConstIterator { + return newQCborArray__ConstIterator_U(unsafe.Pointer(C.QCborArray__ConstIterator_OperatorMinusAssign(this.h, (C.size_t)(j)))) +} + func (this *QCborArray__ConstIterator) OperatorPlus(j uint64) *QCborArray__ConstIterator { _ret := C.QCborArray__ConstIterator_OperatorPlus(this.h, (C.size_t)(j)) _goptr := newQCborArray__ConstIterator(_ret) diff --git a/qt/gen_qcborarray.h b/qt/gen_qcborarray.h index b68fdb9..37b6a17 100644 --- a/qt/gen_qcborarray.h +++ b/qt/gen_qcborarray.h @@ -95,6 +95,7 @@ void QCborArray_Delete(QCborArray* self); QCborArray__Iterator* QCborArray__Iterator_new(); QCborArray__Iterator* QCborArray__Iterator_new2(QCborArray__Iterator* param1); +void QCborArray__Iterator_OperatorAssign(QCborArray__Iterator* self, QCborArray__Iterator* other); QCborValueRef* QCborArray__Iterator_OperatorMultiply(const QCborArray__Iterator* self); QCborValueRef* QCborArray__Iterator_OperatorMinusGreater(const QCborArray__Iterator* self); QCborValueRef* QCborArray__Iterator_OperatorSubscript(QCborArray__Iterator* self, size_t j); @@ -110,8 +111,12 @@ bool QCborArray__Iterator_OperatorLesserWithOther(const QCborArray__Iterator* se bool QCborArray__Iterator_OperatorLesserOrEqualWithOther(const QCborArray__Iterator* self, QCborArray__ConstIterator* other); bool QCborArray__Iterator_OperatorGreaterWithOther(const QCborArray__Iterator* self, QCborArray__ConstIterator* other); bool QCborArray__Iterator_OperatorGreaterOrEqualWithOther(const QCborArray__Iterator* self, QCborArray__ConstIterator* other); -QCborArray__Iterator* QCborArray__Iterator_OperatorPlusPlus(QCborArray__Iterator* self, int param1); -QCborArray__Iterator* QCborArray__Iterator_OperatorMinusMinus(QCborArray__Iterator* self, int param1); +QCborArray__Iterator* QCborArray__Iterator_OperatorPlusPlus(QCborArray__Iterator* self); +QCborArray__Iterator* QCborArray__Iterator_OperatorPlusPlusWithInt(QCborArray__Iterator* self, int param1); +QCborArray__Iterator* QCborArray__Iterator_OperatorMinusMinus(QCborArray__Iterator* self); +QCborArray__Iterator* QCborArray__Iterator_OperatorMinusMinusWithInt(QCborArray__Iterator* self, int param1); +QCborArray__Iterator* QCborArray__Iterator_OperatorPlusAssign(QCborArray__Iterator* self, size_t j); +QCborArray__Iterator* QCborArray__Iterator_OperatorMinusAssign(QCborArray__Iterator* self, size_t j); QCborArray__Iterator* QCborArray__Iterator_OperatorPlus(const QCborArray__Iterator* self, size_t j); QCborArray__Iterator* QCborArray__Iterator_OperatorMinus(const QCborArray__Iterator* self, size_t j); size_t QCborArray__Iterator_OperatorMinusWithQCborArrayIterator(const QCborArray__Iterator* self, QCborArray__Iterator* j); @@ -119,6 +124,7 @@ void QCborArray__Iterator_Delete(QCborArray__Iterator* self); QCborArray__ConstIterator* QCborArray__ConstIterator_new(); QCborArray__ConstIterator* QCborArray__ConstIterator_new2(QCborArray__ConstIterator* param1); +void QCborArray__ConstIterator_OperatorAssign(QCborArray__ConstIterator* self, QCborArray__ConstIterator* other); QCborValueRef* QCborArray__ConstIterator_OperatorMultiply(const QCborArray__ConstIterator* self); QCborValueRef* QCborArray__ConstIterator_OperatorMinusGreater(const QCborArray__ConstIterator* self); QCborValueRef* QCborArray__ConstIterator_OperatorSubscript(QCborArray__ConstIterator* self, size_t j); @@ -134,8 +140,12 @@ bool QCborArray__ConstIterator_OperatorLesserWithOther(const QCborArray__ConstIt bool QCborArray__ConstIterator_OperatorLesserOrEqualWithOther(const QCborArray__ConstIterator* self, QCborArray__ConstIterator* other); bool QCborArray__ConstIterator_OperatorGreaterWithOther(const QCborArray__ConstIterator* self, QCborArray__ConstIterator* other); bool QCborArray__ConstIterator_OperatorGreaterOrEqualWithOther(const QCborArray__ConstIterator* self, QCborArray__ConstIterator* other); -QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorPlusPlus(QCborArray__ConstIterator* self, int param1); -QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorMinusMinus(QCborArray__ConstIterator* self, int param1); +QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorPlusPlus(QCborArray__ConstIterator* self); +QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorPlusPlusWithInt(QCborArray__ConstIterator* self, int param1); +QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorMinusMinus(QCborArray__ConstIterator* self); +QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorMinusMinusWithInt(QCborArray__ConstIterator* self, int param1); +QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorPlusAssign(QCborArray__ConstIterator* self, size_t j); +QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorMinusAssign(QCborArray__ConstIterator* self, size_t j); QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorPlus(const QCborArray__ConstIterator* self, size_t j); QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorMinus(const QCborArray__ConstIterator* self, size_t j); size_t QCborArray__ConstIterator_OperatorMinusWithQCborArrayConstIterator(const QCborArray__ConstIterator* self, QCborArray__ConstIterator* j); diff --git a/qt/gen_qcbormap.cpp b/qt/gen_qcbormap.cpp index baf768d..06d842f 100644 --- a/qt/gen_qcbormap.cpp +++ b/qt/gen_qcbormap.cpp @@ -275,6 +275,10 @@ QCborMap__Iterator* QCborMap__Iterator_new2(QCborMap__Iterator* param1) { return new QCborMap::Iterator(*param1); } +void QCborMap__Iterator_OperatorAssign(QCborMap__Iterator* self, QCborMap__Iterator* other) { + self->operator=(*other); +} + QCborValueRef* QCborMap__Iterator_OperatorMinusGreater(const QCborMap__Iterator* self) { return self->operator->(); } @@ -335,14 +339,38 @@ bool QCborMap__Iterator_OperatorGreaterOrEqualWithOther(const QCborMap__Iterator return self->operator>=(*other); } -QCborMap__Iterator* QCborMap__Iterator_OperatorPlusPlus(QCborMap__Iterator* self, int param1) { +QCborMap__Iterator* QCborMap__Iterator_OperatorPlusPlus(QCborMap__Iterator* self) { + QCborMap::Iterator& _ret = self->operator++(); + // Cast returned reference into pointer + return &_ret; +} + +QCborMap__Iterator* QCborMap__Iterator_OperatorPlusPlusWithInt(QCborMap__Iterator* self, int param1) { return new QCborMap::Iterator(self->operator++(static_cast(param1))); } -QCborMap__Iterator* QCborMap__Iterator_OperatorMinusMinus(QCborMap__Iterator* self, int param1) { +QCborMap__Iterator* QCborMap__Iterator_OperatorMinusMinus(QCborMap__Iterator* self) { + QCborMap::Iterator& _ret = self->operator--(); + // Cast returned reference into pointer + return &_ret; +} + +QCborMap__Iterator* QCborMap__Iterator_OperatorMinusMinusWithInt(QCborMap__Iterator* self, int param1) { return new QCborMap::Iterator(self->operator--(static_cast(param1))); } +QCborMap__Iterator* QCborMap__Iterator_OperatorPlusAssign(QCborMap__Iterator* self, size_t j) { + QCborMap::Iterator& _ret = self->operator+=(static_cast(j)); + // Cast returned reference into pointer + return &_ret; +} + +QCborMap__Iterator* QCborMap__Iterator_OperatorMinusAssign(QCborMap__Iterator* self, size_t j) { + QCborMap::Iterator& _ret = self->operator-=(static_cast(j)); + // Cast returned reference into pointer + return &_ret; +} + QCborMap__Iterator* QCborMap__Iterator_OperatorPlus(const QCborMap__Iterator* self, size_t j) { return new QCborMap::Iterator(self->operator+(static_cast(j))); } @@ -367,6 +395,10 @@ QCborMap__ConstIterator* QCborMap__ConstIterator_new2(QCborMap__ConstIterator* p return new QCborMap::ConstIterator(*param1); } +void QCborMap__ConstIterator_OperatorAssign(QCborMap__ConstIterator* self, QCborMap__ConstIterator* other) { + self->operator=(*other); +} + QCborValueRef* QCborMap__ConstIterator_OperatorMinusGreater(const QCborMap__ConstIterator* self) { return (QCborValueRef*) self->operator->(); } @@ -427,14 +459,38 @@ bool QCborMap__ConstIterator_OperatorGreaterOrEqualWithOther(const QCborMap__Con return self->operator>=(*other); } -QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorPlusPlus(QCborMap__ConstIterator* self, int param1) { +QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorPlusPlus(QCborMap__ConstIterator* self) { + QCborMap::ConstIterator& _ret = self->operator++(); + // Cast returned reference into pointer + return &_ret; +} + +QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorPlusPlusWithInt(QCborMap__ConstIterator* self, int param1) { return new QCborMap::ConstIterator(self->operator++(static_cast(param1))); } -QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorMinusMinus(QCborMap__ConstIterator* self, int param1) { +QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorMinusMinus(QCborMap__ConstIterator* self) { + QCborMap::ConstIterator& _ret = self->operator--(); + // Cast returned reference into pointer + return &_ret; +} + +QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorMinusMinusWithInt(QCborMap__ConstIterator* self, int param1) { return new QCborMap::ConstIterator(self->operator--(static_cast(param1))); } +QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorPlusAssign(QCborMap__ConstIterator* self, size_t j) { + QCborMap::ConstIterator& _ret = self->operator+=(static_cast(j)); + // Cast returned reference into pointer + return &_ret; +} + +QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorMinusAssign(QCborMap__ConstIterator* self, size_t j) { + QCborMap::ConstIterator& _ret = self->operator-=(static_cast(j)); + // Cast returned reference into pointer + return &_ret; +} + QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorPlus(const QCborMap__ConstIterator* self, size_t j) { return new QCborMap::ConstIterator(self->operator+(static_cast(j))); } diff --git a/qt/gen_qcbormap.go b/qt/gen_qcbormap.go index e252d7b..650acfe 100644 --- a/qt/gen_qcbormap.go +++ b/qt/gen_qcbormap.go @@ -466,6 +466,10 @@ func NewQCborMap__Iterator2(param1 *QCborMap__Iterator) *QCborMap__Iterator { return newQCborMap__Iterator(ret) } +func (this *QCborMap__Iterator) OperatorAssign(other *QCborMap__Iterator) { + C.QCborMap__Iterator_OperatorAssign(this.h, other.cPointer()) +} + func (this *QCborMap__Iterator) OperatorMinusGreater() *QCborValueRef { return newQCborValueRef_U(unsafe.Pointer(C.QCborMap__Iterator_OperatorMinusGreater(this.h))) } @@ -532,20 +536,36 @@ func (this *QCborMap__Iterator) OperatorGreaterOrEqualWithOther(other *QCborMap_ return (bool)(C.QCborMap__Iterator_OperatorGreaterOrEqualWithOther(this.h, other.cPointer())) } -func (this *QCborMap__Iterator) OperatorPlusPlus(param1 int) *QCborMap__Iterator { - _ret := C.QCborMap__Iterator_OperatorPlusPlus(this.h, (C.int)(param1)) +func (this *QCborMap__Iterator) OperatorPlusPlus() *QCborMap__Iterator { + return newQCborMap__Iterator_U(unsafe.Pointer(C.QCborMap__Iterator_OperatorPlusPlus(this.h))) +} + +func (this *QCborMap__Iterator) OperatorPlusPlusWithInt(param1 int) *QCborMap__Iterator { + _ret := C.QCborMap__Iterator_OperatorPlusPlusWithInt(this.h, (C.int)(param1)) _goptr := newQCborMap__Iterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborMap__Iterator) OperatorMinusMinus(param1 int) *QCborMap__Iterator { - _ret := C.QCborMap__Iterator_OperatorMinusMinus(this.h, (C.int)(param1)) +func (this *QCborMap__Iterator) OperatorMinusMinus() *QCborMap__Iterator { + return newQCborMap__Iterator_U(unsafe.Pointer(C.QCborMap__Iterator_OperatorMinusMinus(this.h))) +} + +func (this *QCborMap__Iterator) OperatorMinusMinusWithInt(param1 int) *QCborMap__Iterator { + _ret := C.QCborMap__Iterator_OperatorMinusMinusWithInt(this.h, (C.int)(param1)) _goptr := newQCborMap__Iterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } +func (this *QCborMap__Iterator) OperatorPlusAssign(j uint64) *QCborMap__Iterator { + return newQCborMap__Iterator_U(unsafe.Pointer(C.QCborMap__Iterator_OperatorPlusAssign(this.h, (C.size_t)(j)))) +} + +func (this *QCborMap__Iterator) OperatorMinusAssign(j uint64) *QCborMap__Iterator { + return newQCborMap__Iterator_U(unsafe.Pointer(C.QCborMap__Iterator_OperatorMinusAssign(this.h, (C.size_t)(j)))) +} + func (this *QCborMap__Iterator) OperatorPlus(j uint64) *QCborMap__Iterator { _ret := C.QCborMap__Iterator_OperatorPlus(this.h, (C.size_t)(j)) _goptr := newQCborMap__Iterator(_ret) @@ -612,6 +632,10 @@ func NewQCborMap__ConstIterator2(param1 *QCborMap__ConstIterator) *QCborMap__Con return newQCborMap__ConstIterator(ret) } +func (this *QCborMap__ConstIterator) OperatorAssign(other *QCborMap__ConstIterator) { + C.QCborMap__ConstIterator_OperatorAssign(this.h, other.cPointer()) +} + func (this *QCborMap__ConstIterator) OperatorMinusGreater() *QCborValueRef { return newQCborValueRef_U(unsafe.Pointer(C.QCborMap__ConstIterator_OperatorMinusGreater(this.h))) } @@ -678,20 +702,36 @@ func (this *QCborMap__ConstIterator) OperatorGreaterOrEqualWithOther(other *QCbo return (bool)(C.QCborMap__ConstIterator_OperatorGreaterOrEqualWithOther(this.h, other.cPointer())) } -func (this *QCborMap__ConstIterator) OperatorPlusPlus(param1 int) *QCborMap__ConstIterator { - _ret := C.QCborMap__ConstIterator_OperatorPlusPlus(this.h, (C.int)(param1)) +func (this *QCborMap__ConstIterator) OperatorPlusPlus() *QCborMap__ConstIterator { + return newQCborMap__ConstIterator_U(unsafe.Pointer(C.QCborMap__ConstIterator_OperatorPlusPlus(this.h))) +} + +func (this *QCborMap__ConstIterator) OperatorPlusPlusWithInt(param1 int) *QCborMap__ConstIterator { + _ret := C.QCborMap__ConstIterator_OperatorPlusPlusWithInt(this.h, (C.int)(param1)) _goptr := newQCborMap__ConstIterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborMap__ConstIterator) OperatorMinusMinus(param1 int) *QCborMap__ConstIterator { - _ret := C.QCborMap__ConstIterator_OperatorMinusMinus(this.h, (C.int)(param1)) +func (this *QCborMap__ConstIterator) OperatorMinusMinus() *QCborMap__ConstIterator { + return newQCborMap__ConstIterator_U(unsafe.Pointer(C.QCborMap__ConstIterator_OperatorMinusMinus(this.h))) +} + +func (this *QCborMap__ConstIterator) OperatorMinusMinusWithInt(param1 int) *QCborMap__ConstIterator { + _ret := C.QCborMap__ConstIterator_OperatorMinusMinusWithInt(this.h, (C.int)(param1)) _goptr := newQCborMap__ConstIterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } +func (this *QCborMap__ConstIterator) OperatorPlusAssign(j uint64) *QCborMap__ConstIterator { + return newQCborMap__ConstIterator_U(unsafe.Pointer(C.QCborMap__ConstIterator_OperatorPlusAssign(this.h, (C.size_t)(j)))) +} + +func (this *QCborMap__ConstIterator) OperatorMinusAssign(j uint64) *QCborMap__ConstIterator { + return newQCborMap__ConstIterator_U(unsafe.Pointer(C.QCborMap__ConstIterator_OperatorMinusAssign(this.h, (C.size_t)(j)))) +} + func (this *QCborMap__ConstIterator) OperatorPlus(j uint64) *QCborMap__ConstIterator { _ret := C.QCborMap__ConstIterator_OperatorPlus(this.h, (C.size_t)(j)) _goptr := newQCborMap__ConstIterator(_ret) diff --git a/qt/gen_qcbormap.h b/qt/gen_qcbormap.h index 34386a7..ab929c4 100644 --- a/qt/gen_qcbormap.h +++ b/qt/gen_qcbormap.h @@ -99,6 +99,7 @@ void QCborMap_Delete(QCborMap* self); QCborMap__Iterator* QCborMap__Iterator_new(); QCborMap__Iterator* QCborMap__Iterator_new2(QCborMap__Iterator* param1); +void QCborMap__Iterator_OperatorAssign(QCborMap__Iterator* self, QCborMap__Iterator* other); QCborValueRef* QCborMap__Iterator_OperatorMinusGreater(const QCborMap__Iterator* self); QCborValue* QCborMap__Iterator_Key(const QCborMap__Iterator* self); QCborValueRef* QCborMap__Iterator_Value(const QCborMap__Iterator* self); @@ -114,8 +115,12 @@ bool QCborMap__Iterator_OperatorLesserWithOther(const QCborMap__Iterator* self, bool QCborMap__Iterator_OperatorLesserOrEqualWithOther(const QCborMap__Iterator* self, QCborMap__ConstIterator* other); bool QCborMap__Iterator_OperatorGreaterWithOther(const QCborMap__Iterator* self, QCborMap__ConstIterator* other); bool QCborMap__Iterator_OperatorGreaterOrEqualWithOther(const QCborMap__Iterator* self, QCborMap__ConstIterator* other); -QCborMap__Iterator* QCborMap__Iterator_OperatorPlusPlus(QCborMap__Iterator* self, int param1); -QCborMap__Iterator* QCborMap__Iterator_OperatorMinusMinus(QCborMap__Iterator* self, int param1); +QCborMap__Iterator* QCborMap__Iterator_OperatorPlusPlus(QCborMap__Iterator* self); +QCborMap__Iterator* QCborMap__Iterator_OperatorPlusPlusWithInt(QCborMap__Iterator* self, int param1); +QCborMap__Iterator* QCborMap__Iterator_OperatorMinusMinus(QCborMap__Iterator* self); +QCborMap__Iterator* QCborMap__Iterator_OperatorMinusMinusWithInt(QCborMap__Iterator* self, int param1); +QCborMap__Iterator* QCborMap__Iterator_OperatorPlusAssign(QCborMap__Iterator* self, size_t j); +QCborMap__Iterator* QCborMap__Iterator_OperatorMinusAssign(QCborMap__Iterator* self, size_t j); QCborMap__Iterator* QCborMap__Iterator_OperatorPlus(const QCborMap__Iterator* self, size_t j); QCborMap__Iterator* QCborMap__Iterator_OperatorMinus(const QCborMap__Iterator* self, size_t j); size_t QCborMap__Iterator_OperatorMinusWithQCborMapIterator(const QCborMap__Iterator* self, QCborMap__Iterator* j); @@ -123,6 +128,7 @@ void QCborMap__Iterator_Delete(QCborMap__Iterator* self); QCborMap__ConstIterator* QCborMap__ConstIterator_new(); QCborMap__ConstIterator* QCborMap__ConstIterator_new2(QCborMap__ConstIterator* param1); +void QCborMap__ConstIterator_OperatorAssign(QCborMap__ConstIterator* self, QCborMap__ConstIterator* other); QCborValueRef* QCborMap__ConstIterator_OperatorMinusGreater(const QCborMap__ConstIterator* self); QCborValue* QCborMap__ConstIterator_Key(const QCborMap__ConstIterator* self); QCborValueRef* QCborMap__ConstIterator_Value(const QCborMap__ConstIterator* self); @@ -138,8 +144,12 @@ bool QCborMap__ConstIterator_OperatorLesserWithOther(const QCborMap__ConstIterat bool QCborMap__ConstIterator_OperatorLesserOrEqualWithOther(const QCborMap__ConstIterator* self, QCborMap__ConstIterator* other); bool QCborMap__ConstIterator_OperatorGreaterWithOther(const QCborMap__ConstIterator* self, QCborMap__ConstIterator* other); bool QCborMap__ConstIterator_OperatorGreaterOrEqualWithOther(const QCborMap__ConstIterator* self, QCborMap__ConstIterator* other); -QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorPlusPlus(QCborMap__ConstIterator* self, int param1); -QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorMinusMinus(QCborMap__ConstIterator* self, int param1); +QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorPlusPlus(QCborMap__ConstIterator* self); +QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorPlusPlusWithInt(QCborMap__ConstIterator* self, int param1); +QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorMinusMinus(QCborMap__ConstIterator* self); +QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorMinusMinusWithInt(QCborMap__ConstIterator* self, int param1); +QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorPlusAssign(QCborMap__ConstIterator* self, size_t j); +QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorMinusAssign(QCborMap__ConstIterator* self, size_t j); QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorPlus(const QCborMap__ConstIterator* self, size_t j); QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorMinus(const QCborMap__ConstIterator* self, size_t j); size_t QCborMap__ConstIterator_OperatorMinusWithQCborMapConstIterator(const QCborMap__ConstIterator* self, QCborMap__ConstIterator* j); diff --git a/qt/gen_qcborstreamreader.cpp b/qt/gen_qcborstreamreader.cpp index d73e08c..7b56f9c 100644 --- a/qt/gen_qcborstreamreader.cpp +++ b/qt/gen_qcborstreamreader.cpp @@ -63,7 +63,8 @@ QCborError* QCborStreamReader_LastError(QCborStreamReader* self) { } long long QCborStreamReader_CurrentOffset(const QCborStreamReader* self) { - return self->currentOffset(); + qint64 _ret = self->currentOffset(); + return static_cast(_ret); } bool QCborStreamReader_IsValid(const QCborStreamReader* self) { @@ -74,9 +75,9 @@ int QCborStreamReader_ContainerDepth(const QCborStreamReader* self) { return self->containerDepth(); } -uintptr_t QCborStreamReader_ParentContainerType(const QCborStreamReader* self) { +uint8_t QCborStreamReader_ParentContainerType(const QCborStreamReader* self) { QCborStreamReader::Type _ret = self->parentContainerType(); - return static_cast(_ret); + return static_cast(_ret); } bool QCborStreamReader_HasNext(const QCborStreamReader* self) { @@ -87,9 +88,9 @@ bool QCborStreamReader_Next(QCborStreamReader* self) { return self->next(); } -uintptr_t QCborStreamReader_Type(const QCborStreamReader* self) { +uint8_t QCborStreamReader_Type(const QCborStreamReader* self) { QCborStreamReader::Type _ret = self->type(); - return static_cast(_ret); + return static_cast(_ret); } bool QCborStreamReader_IsUnsignedInteger(const QCborStreamReader* self) { @@ -144,8 +145,8 @@ bool QCborStreamReader_IsInvalid(const QCborStreamReader* self) { return self->isInvalid(); } -bool QCborStreamReader_IsSimpleTypeWithSt(const QCborStreamReader* self, QCborSimpleType st) { - return self->isSimpleType(st); +bool QCborStreamReader_IsSimpleTypeWithSt(const QCborStreamReader* self, uint8_t st) { + return self->isSimpleType(static_cast(st)); } bool QCborStreamReader_IsFalse(const QCborStreamReader* self) { @@ -173,7 +174,8 @@ bool QCborStreamReader_IsLengthKnown(const QCborStreamReader* self) { } unsigned long long QCborStreamReader_Length(const QCborStreamReader* self) { - return self->length(); + quint64 _ret = self->length(); + return static_cast(_ret); } bool QCborStreamReader_IsContainer(const QCborStreamReader* self) { @@ -196,20 +198,24 @@ bool QCborStreamReader_ToBool(const QCborStreamReader* self) { return self->toBool(); } -QCborTag QCborStreamReader_ToTag(const QCborStreamReader* self) { - return self->toTag(); +uint64_t QCborStreamReader_ToTag(const QCborStreamReader* self) { + QCborTag _ret = self->toTag(); + return static_cast(_ret); } unsigned long long QCborStreamReader_ToUnsignedInteger(const QCborStreamReader* self) { - return self->toUnsignedInteger(); + quint64 _ret = self->toUnsignedInteger(); + return static_cast(_ret); } -QCborNegativeInteger QCborStreamReader_ToNegativeInteger(const QCborStreamReader* self) { - return self->toNegativeInteger(); +uint64_t QCborStreamReader_ToNegativeInteger(const QCborStreamReader* self) { + QCborNegativeInteger _ret = self->toNegativeInteger(); + return static_cast(_ret); } -QCborSimpleType QCborStreamReader_ToSimpleType(const QCborStreamReader* self) { - return self->toSimpleType(); +uint8_t QCborStreamReader_ToSimpleType(const QCborStreamReader* self) { + QCborSimpleType _ret = self->toSimpleType(); + return static_cast(_ret); } float QCborStreamReader_ToFloat(const QCborStreamReader* self) { @@ -221,7 +227,8 @@ double QCborStreamReader_ToDouble(const QCborStreamReader* self) { } long long QCborStreamReader_ToInteger(const QCborStreamReader* self) { - return self->toInteger(); + qint64 _ret = self->toInteger(); + return static_cast(_ret); } bool QCborStreamReader_Next1(QCborStreamReader* self, int maxRecursion) { diff --git a/qt/gen_qcborstreamreader.go b/qt/gen_qcborstreamreader.go index 8913a0e..e511e87 100644 --- a/qt/gen_qcborstreamreader.go +++ b/qt/gen_qcborstreamreader.go @@ -217,7 +217,7 @@ func (this *QCborStreamReader) IsInvalid() bool { } func (this *QCborStreamReader) IsSimpleTypeWithSt(st QCborSimpleType) bool { - return (bool)(C.QCborStreamReader_IsSimpleTypeWithSt(this.h, st)) + return (bool)(C.QCborStreamReader_IsSimpleTypeWithSt(this.h, (C.uint8_t)(st))) } func (this *QCborStreamReader) IsFalse() bool { @@ -269,7 +269,7 @@ func (this *QCborStreamReader) ToBool() bool { } func (this *QCborStreamReader) ToTag() QCborTag { - return C.QCborStreamReader_ToTag(this.h) + return (QCborTag)(C.QCborStreamReader_ToTag(this.h)) } func (this *QCborStreamReader) ToUnsignedInteger() uint64 { @@ -277,11 +277,11 @@ func (this *QCborStreamReader) ToUnsignedInteger() uint64 { } func (this *QCborStreamReader) ToNegativeInteger() QCborNegativeInteger { - return C.QCborStreamReader_ToNegativeInteger(this.h) + return (QCborNegativeInteger)(C.QCborStreamReader_ToNegativeInteger(this.h)) } func (this *QCborStreamReader) ToSimpleType() QCborSimpleType { - return C.QCborStreamReader_ToSimpleType(this.h) + return (QCborSimpleType)(C.QCborStreamReader_ToSimpleType(this.h)) } func (this *QCborStreamReader) ToFloat() float32 { diff --git a/qt/gen_qcborstreamreader.h b/qt/gen_qcborstreamreader.h index 677e348..66a2b74 100644 --- a/qt/gen_qcborstreamreader.h +++ b/qt/gen_qcborstreamreader.h @@ -42,10 +42,10 @@ QCborError* QCborStreamReader_LastError(QCborStreamReader* self); long long QCborStreamReader_CurrentOffset(const QCborStreamReader* self); bool QCborStreamReader_IsValid(const QCborStreamReader* self); int QCborStreamReader_ContainerDepth(const QCborStreamReader* self); -uintptr_t QCborStreamReader_ParentContainerType(const QCborStreamReader* self); +uint8_t QCborStreamReader_ParentContainerType(const QCborStreamReader* self); bool QCborStreamReader_HasNext(const QCborStreamReader* self); bool QCborStreamReader_Next(QCborStreamReader* self); -uintptr_t QCborStreamReader_Type(const QCborStreamReader* self); +uint8_t QCborStreamReader_Type(const QCborStreamReader* self); bool QCborStreamReader_IsUnsignedInteger(const QCborStreamReader* self); bool QCborStreamReader_IsNegativeInteger(const QCborStreamReader* self); bool QCborStreamReader_IsInteger(const QCborStreamReader* self); @@ -59,7 +59,7 @@ bool QCborStreamReader_IsFloat16(const QCborStreamReader* self); bool QCborStreamReader_IsFloat(const QCborStreamReader* self); bool QCborStreamReader_IsDouble(const QCborStreamReader* self); bool QCborStreamReader_IsInvalid(const QCborStreamReader* self); -bool QCborStreamReader_IsSimpleTypeWithSt(const QCborStreamReader* self, QCborSimpleType st); +bool QCborStreamReader_IsSimpleTypeWithSt(const QCborStreamReader* self, uint8_t st); bool QCborStreamReader_IsFalse(const QCborStreamReader* self); bool QCborStreamReader_IsTrue(const QCborStreamReader* self); bool QCborStreamReader_IsBool(const QCborStreamReader* self); @@ -72,10 +72,10 @@ bool QCborStreamReader_EnterContainer(QCborStreamReader* self); bool QCborStreamReader_LeaveContainer(QCborStreamReader* self); size_t QCborStreamReader_CurrentStringChunkSize(const QCborStreamReader* self); bool QCborStreamReader_ToBool(const QCborStreamReader* self); -QCborTag QCborStreamReader_ToTag(const QCborStreamReader* self); +uint64_t QCborStreamReader_ToTag(const QCborStreamReader* self); unsigned long long QCborStreamReader_ToUnsignedInteger(const QCborStreamReader* self); -QCborNegativeInteger QCborStreamReader_ToNegativeInteger(const QCborStreamReader* self); -QCborSimpleType QCborStreamReader_ToSimpleType(const QCborStreamReader* self); +uint64_t QCborStreamReader_ToNegativeInteger(const QCborStreamReader* self); +uint8_t QCborStreamReader_ToSimpleType(const QCborStreamReader* self); float QCborStreamReader_ToFloat(const QCborStreamReader* self); double QCborStreamReader_ToDouble(const QCborStreamReader* self); long long QCborStreamReader_ToInteger(const QCborStreamReader* self); diff --git a/qt/gen_qcborstreamwriter.cpp b/qt/gen_qcborstreamwriter.cpp index 3ec791d..ba460ab 100644 --- a/qt/gen_qcborstreamwriter.cpp +++ b/qt/gen_qcborstreamwriter.cpp @@ -29,24 +29,24 @@ void QCborStreamWriter_AppendWithQint64(QCborStreamWriter* self, long long i) { self->append(static_cast(i)); } -void QCborStreamWriter_AppendWithQCborNegativeInteger(QCborStreamWriter* self, QCborNegativeInteger n) { - self->append(n); +void QCborStreamWriter_AppendWithQCborNegativeInteger(QCborStreamWriter* self, uint64_t n) { + self->append(static_cast(n)); } void QCborStreamWriter_AppendWithBa(QCborStreamWriter* self, QByteArray* ba) { self->append(*ba); } -void QCborStreamWriter_AppendWithTag(QCborStreamWriter* self, QCborTag tag) { - self->append(tag); +void QCborStreamWriter_AppendWithTag(QCborStreamWriter* self, uint64_t tag) { + self->append(static_cast(tag)); } -void QCborStreamWriter_Append3(QCborStreamWriter* self, QCborKnownTags tag) { - self->append(tag); +void QCborStreamWriter_Append3(QCborStreamWriter* self, int tag) { + self->append(static_cast(tag)); } -void QCborStreamWriter_AppendWithSt(QCborStreamWriter* self, QCborSimpleType st) { - self->append(st); +void QCborStreamWriter_AppendWithSt(QCborStreamWriter* self, uint8_t st) { + self->append(static_cast(st)); } void QCborStreamWriter_AppendWithFloat(QCborStreamWriter* self, float f) { diff --git a/qt/gen_qcborstreamwriter.go b/qt/gen_qcborstreamwriter.go index ebd0b7b..3adfc4d 100644 --- a/qt/gen_qcborstreamwriter.go +++ b/qt/gen_qcborstreamwriter.go @@ -64,7 +64,7 @@ func (this *QCborStreamWriter) AppendWithQint64(i int64) { } func (this *QCborStreamWriter) AppendWithQCborNegativeInteger(n QCborNegativeInteger) { - C.QCborStreamWriter_AppendWithQCborNegativeInteger(this.h, n) + C.QCborStreamWriter_AppendWithQCborNegativeInteger(this.h, (C.uint64_t)(n)) } func (this *QCborStreamWriter) AppendWithBa(ba *QByteArray) { @@ -72,15 +72,15 @@ func (this *QCborStreamWriter) AppendWithBa(ba *QByteArray) { } func (this *QCborStreamWriter) AppendWithTag(tag QCborTag) { - C.QCborStreamWriter_AppendWithTag(this.h, tag) + C.QCborStreamWriter_AppendWithTag(this.h, (C.uint64_t)(tag)) } func (this *QCborStreamWriter) Append3(tag QCborKnownTags) { - C.QCborStreamWriter_Append3(this.h, tag) + C.QCborStreamWriter_Append3(this.h, (C.int)(tag)) } func (this *QCborStreamWriter) AppendWithSt(st QCborSimpleType) { - C.QCborStreamWriter_AppendWithSt(this.h, st) + C.QCborStreamWriter_AppendWithSt(this.h, (C.uint8_t)(st)) } func (this *QCborStreamWriter) AppendWithFloat(f float32) { diff --git a/qt/gen_qcborstreamwriter.h b/qt/gen_qcborstreamwriter.h index 50a757e..0e8bb2f 100644 --- a/qt/gen_qcborstreamwriter.h +++ b/qt/gen_qcborstreamwriter.h @@ -29,11 +29,11 @@ void QCborStreamWriter_SetDevice(QCborStreamWriter* self, QIODevice* device); QIODevice* QCborStreamWriter_Device(const QCborStreamWriter* self); void QCborStreamWriter_Append(QCborStreamWriter* self, unsigned long long u); void QCborStreamWriter_AppendWithQint64(QCborStreamWriter* self, long long i); -void QCborStreamWriter_AppendWithQCborNegativeInteger(QCborStreamWriter* self, QCborNegativeInteger n); +void QCborStreamWriter_AppendWithQCborNegativeInteger(QCborStreamWriter* self, uint64_t n); void QCborStreamWriter_AppendWithBa(QCborStreamWriter* self, QByteArray* ba); -void QCborStreamWriter_AppendWithTag(QCborStreamWriter* self, QCborTag tag); -void QCborStreamWriter_Append3(QCborStreamWriter* self, QCborKnownTags tag); -void QCborStreamWriter_AppendWithSt(QCborStreamWriter* self, QCborSimpleType st); +void QCborStreamWriter_AppendWithTag(QCborStreamWriter* self, uint64_t tag); +void QCborStreamWriter_Append3(QCborStreamWriter* self, int tag); +void QCborStreamWriter_AppendWithSt(QCborStreamWriter* self, uint8_t st); void QCborStreamWriter_AppendWithFloat(QCborStreamWriter* self, float f); void QCborStreamWriter_AppendWithDouble(QCborStreamWriter* self, double d); void QCborStreamWriter_AppendByteString(QCborStreamWriter* self, const char* data, size_t lenVal); diff --git a/qt/gen_qcborvalue.cpp b/qt/gen_qcborvalue.cpp index 5e3e5e1..59c4d23 100644 --- a/qt/gen_qcborvalue.cpp +++ b/qt/gen_qcborvalue.cpp @@ -34,7 +34,7 @@ QCborValue* QCborValue_new() { return new QCborValue(); } -QCborValue* QCborValue_new2(uintptr_t t_) { +QCborValue* QCborValue_new2(int t_) { return new QCborValue(static_cast(t_)); } @@ -58,8 +58,8 @@ QCborValue* QCborValue_new7(double v) { return new QCborValue(static_cast(v)); } -QCborValue* QCborValue_new8(QCborSimpleType st) { - return new QCborValue(st); +QCborValue* QCborValue_new8(uint8_t st) { + return new QCborValue(static_cast(st)); } QCborValue* QCborValue_new9(QByteArray* ba) { @@ -83,12 +83,12 @@ QCborValue* QCborValue_new13(QCborMap* m) { return new QCborValue(*m); } -QCborValue* QCborValue_new14(QCborTag tag) { - return new QCborValue(tag); +QCborValue* QCborValue_new14(uint64_t tag) { + return new QCborValue(static_cast(tag)); } -QCborValue* QCborValue_new15(QCborKnownTags t_) { - return new QCborValue(t_); +QCborValue* QCborValue_new15(int t_) { + return new QCborValue(static_cast(t_)); } QCborValue* QCborValue_new16(QDateTime* dt) { @@ -111,12 +111,12 @@ QCborValue* QCborValue_new20(QCborValue* other) { return new QCborValue(*other); } -QCborValue* QCborValue_new21(QCborTag tag, QCborValue* taggedValue) { - return new QCborValue(tag, *taggedValue); +QCborValue* QCborValue_new21(uint64_t tag, QCborValue* taggedValue) { + return new QCborValue(static_cast(tag), *taggedValue); } -QCborValue* QCborValue_new22(QCborKnownTags t_, QCborValue* tv) { - return new QCborValue(t_, *tv); +QCborValue* QCborValue_new22(int t_, QCborValue* tv) { + return new QCborValue(static_cast(t_), *tv); } void QCborValue_OperatorAssign(QCborValue* self, QCborValue* other) { @@ -127,9 +127,9 @@ void QCborValue_Swap(QCborValue* self, QCborValue* other) { self->swap(*other); } -uintptr_t QCborValue_Type(const QCborValue* self) { +int QCborValue_Type(const QCborValue* self) { QCborValue::Type _ret = self->type(); - return static_cast(_ret); + return static_cast(_ret); } bool QCborValue_IsInteger(const QCborValue* self) { @@ -208,16 +208,18 @@ bool QCborValue_IsSimpleType(const QCborValue* self) { return self->isSimpleType(); } -bool QCborValue_IsSimpleTypeWithSt(const QCborValue* self, QCborSimpleType st) { - return self->isSimpleType(st); +bool QCborValue_IsSimpleTypeWithSt(const QCborValue* self, uint8_t st) { + return self->isSimpleType(static_cast(st)); } -QCborSimpleType QCborValue_ToSimpleType(const QCborValue* self) { - return self->toSimpleType(); +uint8_t QCborValue_ToSimpleType(const QCborValue* self) { + QCborSimpleType _ret = self->toSimpleType(); + return static_cast(_ret); } long long QCborValue_ToInteger(const QCborValue* self) { - return self->toInteger(); + qint64 _ret = self->toInteger(); + return static_cast(_ret); } bool QCborValue_ToBool(const QCborValue* self) { @@ -228,8 +230,9 @@ double QCborValue_ToDouble(const QCborValue* self) { return self->toDouble(); } -QCborTag QCborValue_Tag(const QCborValue* self) { - return self->tag(); +uint64_t QCborValue_Tag(const QCborValue* self) { + QCborTag _ret = self->tag(); + return static_cast(_ret); } QCborValue* QCborValue_TaggedValue(const QCborValue* self) { @@ -360,12 +363,14 @@ struct miqt_string* QCborValue_ToDiagnosticNotation(const QCborValue* self) { return miqt_strdup(_b.data(), _b.length()); } -QCborSimpleType QCborValue_ToSimpleType1(const QCborValue* self, QCborSimpleType defaultValue) { - return self->toSimpleType(defaultValue); +uint8_t QCborValue_ToSimpleType1(const QCborValue* self, uint8_t defaultValue) { + QCborSimpleType _ret = self->toSimpleType(static_cast(defaultValue)); + return static_cast(_ret); } long long QCborValue_ToInteger1(const QCborValue* self, long long defaultValue) { - return self->toInteger(static_cast(defaultValue)); + qint64 _ret = self->toInteger(static_cast(defaultValue)); + return static_cast(_ret); } bool QCborValue_ToBool1(const QCborValue* self, bool defaultValue) { @@ -376,8 +381,9 @@ double QCborValue_ToDouble1(const QCborValue* self, double defaultValue) { return self->toDouble(static_cast(defaultValue)); } -QCborTag QCborValue_Tag1(const QCborValue* self, QCborTag defaultValue) { - return self->tag(defaultValue); +uint64_t QCborValue_Tag1(const QCborValue* self, uint64_t defaultValue) { + QCborTag _ret = self->tag(static_cast(defaultValue)); + return static_cast(_ret); } QCborValue* QCborValue_TaggedValue1(const QCborValue* self, QCborValue* defaultValue) { @@ -455,9 +461,9 @@ void QCborValueRef_OperatorAssignWithOther(QCborValueRef* self, QCborValueRef* o self->operator=(*other); } -uintptr_t QCborValueRef_Type(const QCborValueRef* self) { +int QCborValueRef_Type(const QCborValueRef* self) { QCborValue::Type _ret = self->type(); - return static_cast(_ret); + return static_cast(_ret); } bool QCborValueRef_IsInteger(const QCborValueRef* self) { @@ -536,12 +542,13 @@ bool QCborValueRef_IsSimpleType(const QCborValueRef* self) { return self->isSimpleType(); } -bool QCborValueRef_IsSimpleTypeWithSt(const QCborValueRef* self, QCborSimpleType st) { - return self->isSimpleType(st); +bool QCborValueRef_IsSimpleTypeWithSt(const QCborValueRef* self, uint8_t st) { + return self->isSimpleType(static_cast(st)); } -QCborTag QCborValueRef_Tag(const QCborValueRef* self) { - return self->tag(); +uint64_t QCborValueRef_Tag(const QCborValueRef* self) { + QCborTag _ret = self->tag(); + return static_cast(_ret); } QCborValue* QCborValueRef_TaggedValue(const QCborValueRef* self) { @@ -549,7 +556,8 @@ QCborValue* QCborValueRef_TaggedValue(const QCborValueRef* self) { } long long QCborValueRef_ToInteger(const QCborValueRef* self) { - return self->toInteger(); + qint64 _ret = self->toInteger(); + return static_cast(_ret); } bool QCborValueRef_ToBool(const QCborValueRef* self) { @@ -660,8 +668,9 @@ struct miqt_string* QCborValueRef_ToDiagnosticNotation(QCborValueRef* self) { return miqt_strdup(_b.data(), _b.length()); } -QCborTag QCborValueRef_Tag1(const QCborValueRef* self, QCborTag defaultValue) { - return self->tag(defaultValue); +uint64_t QCborValueRef_Tag1(const QCborValueRef* self, uint64_t defaultValue) { + QCborTag _ret = self->tag(static_cast(defaultValue)); + return static_cast(_ret); } QCborValue* QCborValueRef_TaggedValue1(const QCborValueRef* self, QCborValue* defaultValue) { @@ -669,7 +678,8 @@ QCborValue* QCborValueRef_TaggedValue1(const QCborValueRef* self, QCborValue* de } long long QCborValueRef_ToInteger1(const QCborValueRef* self, long long defaultValue) { - return self->toInteger(static_cast(defaultValue)); + qint64 _ret = self->toInteger(static_cast(defaultValue)); + return static_cast(_ret); } bool QCborValueRef_ToBool1(const QCborValueRef* self, bool defaultValue) { diff --git a/qt/gen_qcborvalue.go b/qt/gen_qcborvalue.go index b6de81f..e7af73c 100644 --- a/qt/gen_qcborvalue.go +++ b/qt/gen_qcborvalue.go @@ -126,7 +126,7 @@ func NewQCborValue() *QCborValue { // NewQCborValue2 constructs a new QCborValue object. func NewQCborValue2(t_ QCborValue__Type) *QCborValue { - ret := C.QCborValue_new2((C.uintptr_t)(t_)) + ret := C.QCborValue_new2((C.int)(t_)) return newQCborValue(ret) } @@ -162,7 +162,7 @@ func NewQCborValue7(v float64) *QCborValue { // NewQCborValue8 constructs a new QCborValue object. func NewQCborValue8(st QCborSimpleType) *QCborValue { - ret := C.QCborValue_new8(st) + ret := C.QCborValue_new8((C.uint8_t)(st)) return newQCborValue(ret) } @@ -202,13 +202,13 @@ func NewQCborValue13(m *QCborMap) *QCborValue { // NewQCborValue14 constructs a new QCborValue object. func NewQCborValue14(tag QCborTag) *QCborValue { - ret := C.QCborValue_new14(tag) + ret := C.QCborValue_new14((C.uint64_t)(tag)) return newQCborValue(ret) } // NewQCborValue15 constructs a new QCborValue object. func NewQCborValue15(t_ QCborKnownTags) *QCborValue { - ret := C.QCborValue_new15(t_) + ret := C.QCborValue_new15((C.int)(t_)) return newQCborValue(ret) } @@ -244,13 +244,13 @@ func NewQCborValue20(other *QCborValue) *QCborValue { // NewQCborValue21 constructs a new QCborValue object. func NewQCborValue21(tag QCborTag, taggedValue *QCborValue) *QCborValue { - ret := C.QCborValue_new21(tag, taggedValue.cPointer()) + ret := C.QCborValue_new21((C.uint64_t)(tag), taggedValue.cPointer()) return newQCborValue(ret) } // NewQCborValue22 constructs a new QCborValue object. func NewQCborValue22(t_ QCborKnownTags, tv *QCborValue) *QCborValue { - ret := C.QCborValue_new22(t_, tv.cPointer()) + ret := C.QCborValue_new22((C.int)(t_), tv.cPointer()) return newQCborValue(ret) } @@ -343,11 +343,11 @@ func (this *QCborValue) IsSimpleType() bool { } func (this *QCborValue) IsSimpleTypeWithSt(st QCborSimpleType) bool { - return (bool)(C.QCborValue_IsSimpleTypeWithSt(this.h, st)) + return (bool)(C.QCborValue_IsSimpleTypeWithSt(this.h, (C.uint8_t)(st))) } func (this *QCborValue) ToSimpleType() QCborSimpleType { - return C.QCborValue_ToSimpleType(this.h) + return (QCborSimpleType)(C.QCborValue_ToSimpleType(this.h)) } func (this *QCborValue) ToInteger() int64 { @@ -363,7 +363,7 @@ func (this *QCborValue) ToDouble() float64 { } func (this *QCborValue) Tag() QCborTag { - return C.QCborValue_Tag(this.h) + return (QCborTag)(C.QCborValue_Tag(this.h)) } func (this *QCborValue) TaggedValue() *QCborValue { @@ -568,7 +568,7 @@ func (this *QCborValue) ToDiagnosticNotation() string { } func (this *QCborValue) ToSimpleType1(defaultValue QCborSimpleType) QCborSimpleType { - return C.QCborValue_ToSimpleType1(this.h, defaultValue) + return (QCborSimpleType)(C.QCborValue_ToSimpleType1(this.h, (C.uint8_t)(defaultValue))) } func (this *QCborValue) ToInteger1(defaultValue int64) int64 { @@ -584,7 +584,7 @@ func (this *QCborValue) ToDouble1(defaultValue float64) float64 { } func (this *QCborValue) Tag1(defaultValue QCborTag) QCborTag { - return C.QCborValue_Tag1(this.h, defaultValue) + return (QCborTag)(C.QCborValue_Tag1(this.h, (C.uint64_t)(defaultValue))) } func (this *QCborValue) TaggedValue1(defaultValue *QCborValue) *QCborValue { @@ -662,18 +662,18 @@ func QCborValue_FromCbor33(data *byte, lenVal uint64, error *QCborParserError) * } func (this *QCborValue) ToCbor1(opt int) *QByteArray { - _ret := C.QCborValue_ToCbor1(this.h, (C.int)(opt)) + _ret := C.QCborValue_ToCbor1(this.h, opt) _goptr := newQByteArray(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QCborValue) ToCbor2(writer *QCborStreamWriter, opt int) { - C.QCborValue_ToCbor2(this.h, writer.cPointer(), (C.int)(opt)) + C.QCborValue_ToCbor2(this.h, writer.cPointer(), opt) } func (this *QCborValue) ToDiagnosticNotation1(opts int) string { - var _ms *C.struct_miqt_string = C.QCborValue_ToDiagnosticNotation1(this.h, (C.int)(opts)) + var _ms *C.struct_miqt_string = C.QCborValue_ToDiagnosticNotation1(this.h, opts) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -810,11 +810,11 @@ func (this *QCborValueRef) IsSimpleType() bool { } func (this *QCborValueRef) IsSimpleTypeWithSt(st QCborSimpleType) bool { - return (bool)(C.QCborValueRef_IsSimpleTypeWithSt(this.h, st)) + return (bool)(C.QCborValueRef_IsSimpleTypeWithSt(this.h, (C.uint8_t)(st))) } func (this *QCborValueRef) Tag() QCborTag { - return C.QCborValueRef_Tag(this.h) + return (QCborTag)(C.QCborValueRef_Tag(this.h)) } func (this *QCborValueRef) TaggedValue() *QCborValue { @@ -987,7 +987,7 @@ func (this *QCborValueRef) ToDiagnosticNotation() string { } func (this *QCborValueRef) Tag1(defaultValue QCborTag) QCborTag { - return C.QCborValueRef_Tag1(this.h, defaultValue) + return (QCborTag)(C.QCborValueRef_Tag1(this.h, (C.uint64_t)(defaultValue))) } func (this *QCborValueRef) TaggedValue1(defaultValue *QCborValue) *QCborValue { @@ -1054,18 +1054,18 @@ func (this *QCborValueRef) ToUuid1(defaultValue *QUuid) *QUuid { } func (this *QCborValueRef) ToCbor1(opt int) *QByteArray { - _ret := C.QCborValueRef_ToCbor1(this.h, (C.int)(opt)) + _ret := C.QCborValueRef_ToCbor1(this.h, opt) _goptr := newQByteArray(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QCborValueRef) ToCbor2(writer *QCborStreamWriter, opt int) { - C.QCborValueRef_ToCbor2(this.h, writer.cPointer(), (C.int)(opt)) + C.QCborValueRef_ToCbor2(this.h, writer.cPointer(), opt) } func (this *QCborValueRef) ToDiagnosticNotation1(opt int) string { - var _ms *C.struct_miqt_string = C.QCborValueRef_ToDiagnosticNotation1(this.h, (C.int)(opt)) + var _ms *C.struct_miqt_string = C.QCborValueRef_ToDiagnosticNotation1(this.h, opt) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret diff --git a/qt/gen_qcborvalue.h b/qt/gen_qcborvalue.h index 2d765f1..323b2e7 100644 --- a/qt/gen_qcborvalue.h +++ b/qt/gen_qcborvalue.h @@ -49,30 +49,30 @@ struct miqt_string* QCborParserError_ErrorString(const QCborParserError* self); void QCborParserError_Delete(QCborParserError* self); QCborValue* QCborValue_new(); -QCborValue* QCborValue_new2(uintptr_t t_); +QCborValue* QCborValue_new2(int t_); QCborValue* QCborValue_new3(bool b_); QCborValue* QCborValue_new4(int i); QCborValue* QCborValue_new5(unsigned int u); QCborValue* QCborValue_new6(long long i); QCborValue* QCborValue_new7(double v); -QCborValue* QCborValue_new8(QCborSimpleType st); +QCborValue* QCborValue_new8(uint8_t st); QCborValue* QCborValue_new9(QByteArray* ba); QCborValue* QCborValue_new10(struct miqt_string* s); QCborValue* QCborValue_new11(const char* s); QCborValue* QCborValue_new12(QCborArray* a); QCborValue* QCborValue_new13(QCborMap* m); -QCborValue* QCborValue_new14(QCborTag tag); -QCborValue* QCborValue_new15(QCborKnownTags t_); +QCborValue* QCborValue_new14(uint64_t tag); +QCborValue* QCborValue_new15(int t_); QCborValue* QCborValue_new16(QDateTime* dt); QCborValue* QCborValue_new17(QUrl* url); QCborValue* QCborValue_new18(QRegularExpression* rx); QCborValue* QCborValue_new19(QUuid* uuid); QCborValue* QCborValue_new20(QCborValue* other); -QCborValue* QCborValue_new21(QCborTag tag, QCborValue* taggedValue); -QCborValue* QCborValue_new22(QCborKnownTags t_, QCborValue* tv); +QCborValue* QCborValue_new21(uint64_t tag, QCborValue* taggedValue); +QCborValue* QCborValue_new22(int t_, QCborValue* tv); void QCborValue_OperatorAssign(QCborValue* self, QCborValue* other); void QCborValue_Swap(QCborValue* self, QCborValue* other); -uintptr_t QCborValue_Type(const QCborValue* self); +int QCborValue_Type(const QCborValue* self); bool QCborValue_IsInteger(const QCborValue* self); bool QCborValue_IsByteArray(const QCborValue* self); bool QCborValue_IsString(const QCborValue* self); @@ -92,12 +92,12 @@ bool QCborValue_IsUuid(const QCborValue* self); bool QCborValue_IsInvalid(const QCborValue* self); bool QCborValue_IsContainer(const QCborValue* self); bool QCborValue_IsSimpleType(const QCborValue* self); -bool QCborValue_IsSimpleTypeWithSt(const QCborValue* self, QCborSimpleType st); -QCborSimpleType QCborValue_ToSimpleType(const QCborValue* self); +bool QCborValue_IsSimpleTypeWithSt(const QCborValue* self, uint8_t st); +uint8_t QCborValue_ToSimpleType(const QCborValue* self); long long QCborValue_ToInteger(const QCborValue* self); bool QCborValue_ToBool(const QCborValue* self); double QCborValue_ToDouble(const QCborValue* self); -QCborTag QCborValue_Tag(const QCborValue* self); +uint64_t QCborValue_Tag(const QCborValue* self); QCborValue* QCborValue_TaggedValue(const QCborValue* self); QByteArray* QCborValue_ToByteArray(const QCborValue* self); struct miqt_string* QCborValue_ToString(const QCborValue* self); @@ -128,11 +128,11 @@ QCborValue* QCborValue_FromCbor3(const unsigned char* data, size_t lenVal); QByteArray* QCborValue_ToCbor(QCborValue* self); void QCborValue_ToCborWithWriter(QCborValue* self, QCborStreamWriter* writer); struct miqt_string* QCborValue_ToDiagnosticNotation(const QCborValue* self); -QCborSimpleType QCborValue_ToSimpleType1(const QCborValue* self, QCborSimpleType defaultValue); +uint8_t QCborValue_ToSimpleType1(const QCborValue* self, uint8_t defaultValue); long long QCborValue_ToInteger1(const QCborValue* self, long long defaultValue); bool QCborValue_ToBool1(const QCborValue* self, bool defaultValue); double QCborValue_ToDouble1(const QCborValue* self, double defaultValue); -QCborTag QCborValue_Tag1(const QCborValue* self, QCborTag defaultValue); +uint64_t QCborValue_Tag1(const QCborValue* self, uint64_t defaultValue); QCborValue* QCborValue_TaggedValue1(const QCborValue* self, QCborValue* defaultValue); QByteArray* QCborValue_ToByteArray1(const QCborValue* self, QByteArray* defaultValue); struct miqt_string* QCborValue_ToString1(const QCborValue* self, struct miqt_string* defaultValue); @@ -151,7 +151,7 @@ void QCborValue_Delete(QCborValue* self); QCborValueRef* QCborValueRef_new(QCborValueRef* param1); void QCborValueRef_OperatorAssign(QCborValueRef* self, QCborValue* other); void QCborValueRef_OperatorAssignWithOther(QCborValueRef* self, QCborValueRef* other); -uintptr_t QCborValueRef_Type(const QCborValueRef* self); +int QCborValueRef_Type(const QCborValueRef* self); bool QCborValueRef_IsInteger(const QCborValueRef* self); bool QCborValueRef_IsByteArray(const QCborValueRef* self); bool QCborValueRef_IsString(const QCborValueRef* self); @@ -171,8 +171,8 @@ bool QCborValueRef_IsUuid(const QCborValueRef* self); bool QCborValueRef_IsInvalid(const QCborValueRef* self); bool QCborValueRef_IsContainer(const QCborValueRef* self); bool QCborValueRef_IsSimpleType(const QCborValueRef* self); -bool QCborValueRef_IsSimpleTypeWithSt(const QCborValueRef* self, QCborSimpleType st); -QCborTag QCborValueRef_Tag(const QCborValueRef* self); +bool QCborValueRef_IsSimpleTypeWithSt(const QCborValueRef* self, uint8_t st); +uint64_t QCborValueRef_Tag(const QCborValueRef* self); QCborValue* QCborValueRef_TaggedValue(const QCborValueRef* self); long long QCborValueRef_ToInteger(const QCborValueRef* self); bool QCborValueRef_ToBool(const QCborValueRef* self); @@ -200,7 +200,7 @@ QJsonValue* QCborValueRef_ToJsonValue(const QCborValueRef* self); QByteArray* QCborValueRef_ToCbor(QCborValueRef* self); void QCborValueRef_ToCborWithWriter(QCborValueRef* self, QCborStreamWriter* writer); struct miqt_string* QCborValueRef_ToDiagnosticNotation(QCborValueRef* self); -QCborTag QCborValueRef_Tag1(const QCborValueRef* self, QCborTag defaultValue); +uint64_t QCborValueRef_Tag1(const QCborValueRef* self, uint64_t defaultValue); QCborValue* QCborValueRef_TaggedValue1(const QCborValueRef* self, QCborValue* defaultValue); long long QCborValueRef_ToInteger1(const QCborValueRef* self, long long defaultValue); bool QCborValueRef_ToBool1(const QCborValueRef* self, bool defaultValue); diff --git a/qt/gen_qchar.cpp b/qt/gen_qchar.cpp index 02acd57..d41f559 100644 --- a/qt/gen_qchar.cpp +++ b/qt/gen_qchar.cpp @@ -20,7 +20,8 @@ char QLatin1Char_ToLatin1(const QLatin1Char* self) { } uint16_t QLatin1Char_Unicode(const QLatin1Char* self) { - return self->unicode(); + ushort _ret = self->unicode(); + return static_cast(_ret); } void QLatin1Char_Delete(QLatin1Char* self) { @@ -51,7 +52,7 @@ QChar* QChar_new6(int rc) { return new QChar(static_cast(rc)); } -QChar* QChar_new7(uintptr_t s) { +QChar* QChar_new7(int s) { return new QChar(static_cast(s)); } @@ -71,24 +72,24 @@ QChar* QChar_new11(QChar* param1) { return new QChar(*param1); } -uintptr_t QChar_Category(const QChar* self) { +int QChar_Category(const QChar* self) { QChar::Category _ret = self->category(); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QChar_Direction(const QChar* self) { +int QChar_Direction(const QChar* self) { QChar::Direction _ret = self->direction(); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QChar_JoiningType(const QChar* self) { +int QChar_JoiningType(const QChar* self) { QChar::JoiningType _ret = self->joiningType(); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QChar_Joining(const QChar* self) { +int QChar_Joining(const QChar* self) { QChar::Joining _ret = self->joining(); - return static_cast(_ret); + return static_cast(_ret); } unsigned char QChar_CombiningClass(const QChar* self) { @@ -110,9 +111,9 @@ struct miqt_string* QChar_Decomposition(const QChar* self) { return miqt_strdup(_b.data(), _b.length()); } -uintptr_t QChar_DecompositionTag(const QChar* self) { +int QChar_DecompositionTag(const QChar* self) { QChar::Decomposition _ret = self->decompositionTag(); - return static_cast(_ret); + return static_cast(_ret); } int QChar_DigitValue(const QChar* self) { @@ -135,14 +136,14 @@ QChar* QChar_ToCaseFolded(const QChar* self) { return new QChar(self->toCaseFolded()); } -uintptr_t QChar_Script(const QChar* self) { +int QChar_Script(const QChar* self) { QChar::Script _ret = self->script(); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QChar_UnicodeVersion(const QChar* self) { +int QChar_UnicodeVersion(const QChar* self) { QChar::UnicodeVersion _ret = self->unicodeVersion(); - return static_cast(_ret); + return static_cast(_ret); } char QChar_ToLatin1(const QChar* self) { @@ -150,7 +151,8 @@ char QChar_ToLatin1(const QChar* self) { } uint16_t QChar_Unicode(const QChar* self) { - return self->unicode(); + ushort _ret = self->unicode(); + return static_cast(_ret); } QChar* QChar_FromLatin1(char c) { @@ -226,11 +228,13 @@ bool QChar_IsSurrogate(const QChar* self) { } unsigned char QChar_Cell(const QChar* self) { - return self->cell(); + uchar _ret = self->cell(); + return static_cast(_ret); } unsigned char QChar_Row(const QChar* self) { - return self->row(); + uchar _ret = self->row(); + return static_cast(_ret); } void QChar_SetCell(QChar* self, unsigned char acell) { @@ -262,39 +266,43 @@ bool QChar_RequiresSurrogates(unsigned int ucs4) { } unsigned int QChar_SurrogateToUcs4(uint16_t high, uint16_t low) { - return QChar::surrogateToUcs4(static_cast(high), static_cast(low)); + uint _ret = QChar::surrogateToUcs4(static_cast(high), static_cast(low)); + return static_cast(_ret); } unsigned int QChar_SurrogateToUcs42(QChar* high, QChar* low) { - return QChar::surrogateToUcs4(*high, *low); + uint _ret = QChar::surrogateToUcs4(*high, *low); + return static_cast(_ret); } uint16_t QChar_HighSurrogate(unsigned int ucs4) { - return QChar::highSurrogate(static_cast(ucs4)); + ushort _ret = QChar::highSurrogate(static_cast(ucs4)); + return static_cast(_ret); } uint16_t QChar_LowSurrogate(unsigned int ucs4) { - return QChar::lowSurrogate(static_cast(ucs4)); + ushort _ret = QChar::lowSurrogate(static_cast(ucs4)); + return static_cast(_ret); } -uintptr_t QChar_CategoryWithUcs4(unsigned int ucs4) { +int QChar_CategoryWithUcs4(unsigned int ucs4) { QChar::Category _ret = QChar::category(static_cast(ucs4)); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QChar_DirectionWithUcs4(unsigned int ucs4) { +int QChar_DirectionWithUcs4(unsigned int ucs4) { QChar::Direction _ret = QChar::direction(static_cast(ucs4)); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QChar_JoiningTypeWithUcs4(unsigned int ucs4) { +int QChar_JoiningTypeWithUcs4(unsigned int ucs4) { QChar::JoiningType _ret = QChar::joiningType(static_cast(ucs4)); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QChar_JoiningWithUcs4(unsigned int ucs4) { +int QChar_JoiningWithUcs4(unsigned int ucs4) { QChar::Joining _ret = QChar::joining(static_cast(ucs4)); - return static_cast(_ret); + return static_cast(_ret); } unsigned char QChar_CombiningClassWithUcs4(unsigned int ucs4) { @@ -302,7 +310,8 @@ unsigned char QChar_CombiningClassWithUcs4(unsigned int ucs4) { } unsigned int QChar_MirroredCharWithUcs4(unsigned int ucs4) { - return QChar::mirroredChar(static_cast(ucs4)); + uint _ret = QChar::mirroredChar(static_cast(ucs4)); + return static_cast(_ret); } bool QChar_HasMirroredWithUcs4(unsigned int ucs4) { @@ -316,9 +325,9 @@ struct miqt_string* QChar_DecompositionWithUcs4(unsigned int ucs4) { return miqt_strdup(_b.data(), _b.length()); } -uintptr_t QChar_DecompositionTagWithUcs4(unsigned int ucs4) { +int QChar_DecompositionTagWithUcs4(unsigned int ucs4) { QChar::Decomposition _ret = QChar::decompositionTag(static_cast(ucs4)); - return static_cast(_ret); + return static_cast(_ret); } int QChar_DigitValueWithUcs4(unsigned int ucs4) { @@ -326,34 +335,38 @@ int QChar_DigitValueWithUcs4(unsigned int ucs4) { } unsigned int QChar_ToLowerWithUcs4(unsigned int ucs4) { - return QChar::toLower(static_cast(ucs4)); + uint _ret = QChar::toLower(static_cast(ucs4)); + return static_cast(_ret); } unsigned int QChar_ToUpperWithUcs4(unsigned int ucs4) { - return QChar::toUpper(static_cast(ucs4)); + uint _ret = QChar::toUpper(static_cast(ucs4)); + return static_cast(_ret); } unsigned int QChar_ToTitleCaseWithUcs4(unsigned int ucs4) { - return QChar::toTitleCase(static_cast(ucs4)); + uint _ret = QChar::toTitleCase(static_cast(ucs4)); + return static_cast(_ret); } unsigned int QChar_ToCaseFoldedWithUcs4(unsigned int ucs4) { - return QChar::toCaseFolded(static_cast(ucs4)); + uint _ret = QChar::toCaseFolded(static_cast(ucs4)); + return static_cast(_ret); } -uintptr_t QChar_ScriptWithUcs4(unsigned int ucs4) { +int QChar_ScriptWithUcs4(unsigned int ucs4) { QChar::Script _ret = QChar::script(static_cast(ucs4)); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QChar_UnicodeVersionWithUcs4(unsigned int ucs4) { +int QChar_UnicodeVersionWithUcs4(unsigned int ucs4) { QChar::UnicodeVersion _ret = QChar::unicodeVersion(static_cast(ucs4)); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QChar_CurrentUnicodeVersion() { +int QChar_CurrentUnicodeVersion() { QChar::UnicodeVersion _ret = QChar::currentUnicodeVersion(); - return static_cast(_ret); + return static_cast(_ret); } bool QChar_IsPrintWithUcs4(unsigned int ucs4) { diff --git a/qt/gen_qchar.go b/qt/gen_qchar.go index b34e6a6..3e14d84 100644 --- a/qt/gen_qchar.go +++ b/qt/gen_qchar.go @@ -471,7 +471,7 @@ func NewQChar6(rc int) *QChar { // NewQChar7 constructs a new QChar object. func NewQChar7(s QChar__SpecialCharacter) *QChar { - ret := C.QChar_new7((C.uintptr_t)(s)) + ret := C.QChar_new7((C.int)(s)) return newQChar(ret) } diff --git a/qt/gen_qchar.h b/qt/gen_qchar.h index aee8c1f..f4610f2 100644 --- a/qt/gen_qchar.h +++ b/qt/gen_qchar.h @@ -33,27 +33,27 @@ QChar* QChar_new3(unsigned char c, unsigned char r); QChar* QChar_new4(int16_t rc); QChar* QChar_new5(unsigned int rc); QChar* QChar_new6(int rc); -QChar* QChar_new7(uintptr_t s); +QChar* QChar_new7(int s); QChar* QChar_new8(QLatin1Char* ch); QChar* QChar_new9(char c); QChar* QChar_new10(unsigned char c); QChar* QChar_new11(QChar* param1); -uintptr_t QChar_Category(const QChar* self); -uintptr_t QChar_Direction(const QChar* self); -uintptr_t QChar_JoiningType(const QChar* self); -uintptr_t QChar_Joining(const QChar* self); +int QChar_Category(const QChar* self); +int QChar_Direction(const QChar* self); +int QChar_JoiningType(const QChar* self); +int QChar_Joining(const QChar* self); unsigned char QChar_CombiningClass(const QChar* self); QChar* QChar_MirroredChar(const QChar* self); bool QChar_HasMirrored(const QChar* self); struct miqt_string* QChar_Decomposition(const QChar* self); -uintptr_t QChar_DecompositionTag(const QChar* self); +int QChar_DecompositionTag(const QChar* self); int QChar_DigitValue(const QChar* self); QChar* QChar_ToLower(const QChar* self); QChar* QChar_ToUpper(const QChar* self); QChar* QChar_ToTitleCase(const QChar* self); QChar* QChar_ToCaseFolded(const QChar* self); -uintptr_t QChar_Script(const QChar* self); -uintptr_t QChar_UnicodeVersion(const QChar* self); +int QChar_Script(const QChar* self); +int QChar_UnicodeVersion(const QChar* self); char QChar_ToLatin1(const QChar* self); uint16_t QChar_Unicode(const QChar* self); QChar* QChar_FromLatin1(char c); @@ -87,23 +87,23 @@ unsigned int QChar_SurrogateToUcs4(uint16_t high, uint16_t low); unsigned int QChar_SurrogateToUcs42(QChar* high, QChar* low); uint16_t QChar_HighSurrogate(unsigned int ucs4); uint16_t QChar_LowSurrogate(unsigned int ucs4); -uintptr_t QChar_CategoryWithUcs4(unsigned int ucs4); -uintptr_t QChar_DirectionWithUcs4(unsigned int ucs4); -uintptr_t QChar_JoiningTypeWithUcs4(unsigned int ucs4); -uintptr_t QChar_JoiningWithUcs4(unsigned int ucs4); +int QChar_CategoryWithUcs4(unsigned int ucs4); +int QChar_DirectionWithUcs4(unsigned int ucs4); +int QChar_JoiningTypeWithUcs4(unsigned int ucs4); +int QChar_JoiningWithUcs4(unsigned int ucs4); unsigned char QChar_CombiningClassWithUcs4(unsigned int ucs4); unsigned int QChar_MirroredCharWithUcs4(unsigned int ucs4); bool QChar_HasMirroredWithUcs4(unsigned int ucs4); struct miqt_string* QChar_DecompositionWithUcs4(unsigned int ucs4); -uintptr_t QChar_DecompositionTagWithUcs4(unsigned int ucs4); +int QChar_DecompositionTagWithUcs4(unsigned int ucs4); int QChar_DigitValueWithUcs4(unsigned int ucs4); unsigned int QChar_ToLowerWithUcs4(unsigned int ucs4); unsigned int QChar_ToUpperWithUcs4(unsigned int ucs4); unsigned int QChar_ToTitleCaseWithUcs4(unsigned int ucs4); unsigned int QChar_ToCaseFoldedWithUcs4(unsigned int ucs4); -uintptr_t QChar_ScriptWithUcs4(unsigned int ucs4); -uintptr_t QChar_UnicodeVersionWithUcs4(unsigned int ucs4); -uintptr_t QChar_CurrentUnicodeVersion(); +int QChar_ScriptWithUcs4(unsigned int ucs4); +int QChar_UnicodeVersionWithUcs4(unsigned int ucs4); +int QChar_CurrentUnicodeVersion(); bool QChar_IsPrintWithUcs4(unsigned int ucs4); bool QChar_IsSpaceWithUcs4(unsigned int ucs4); bool QChar_IsMarkWithUcs4(unsigned int ucs4); diff --git a/qt/gen_qcheckbox.cpp b/qt/gen_qcheckbox.cpp index 37bea92..d45e9ec 100644 --- a/qt/gen_qcheckbox.cpp +++ b/qt/gen_qcheckbox.cpp @@ -61,12 +61,12 @@ bool QCheckBox_IsTristate(const QCheckBox* self) { return self->isTristate(); } -uintptr_t QCheckBox_CheckState(const QCheckBox* self) { +int QCheckBox_CheckState(const QCheckBox* self) { Qt::CheckState _ret = self->checkState(); - return static_cast(_ret); + return static_cast(_ret); } -void QCheckBox_SetCheckState(QCheckBox* self, uintptr_t state) { +void QCheckBox_SetCheckState(QCheckBox* self, int state) { self->setCheckState(static_cast(state)); } diff --git a/qt/gen_qcheckbox.go b/qt/gen_qcheckbox.go index 25232b0..09c6ca1 100644 --- a/qt/gen_qcheckbox.go +++ b/qt/gen_qcheckbox.go @@ -114,7 +114,7 @@ func (this *QCheckBox) CheckState() CheckState { } func (this *QCheckBox) SetCheckState(state CheckState) { - C.QCheckBox_SetCheckState(this.h, (C.uintptr_t)(state)) + C.QCheckBox_SetCheckState(this.h, (C.int)(state)) } func (this *QCheckBox) StateChanged(param1 int) { diff --git a/qt/gen_qcheckbox.h b/qt/gen_qcheckbox.h index 43b329c..6380835 100644 --- a/qt/gen_qcheckbox.h +++ b/qt/gen_qcheckbox.h @@ -36,8 +36,8 @@ QSize* QCheckBox_SizeHint(const QCheckBox* self); QSize* QCheckBox_MinimumSizeHint(const QCheckBox* self); void QCheckBox_SetTristate(QCheckBox* self); bool QCheckBox_IsTristate(const QCheckBox* self); -uintptr_t QCheckBox_CheckState(const QCheckBox* self); -void QCheckBox_SetCheckState(QCheckBox* self, uintptr_t state); +int QCheckBox_CheckState(const QCheckBox* self); +void QCheckBox_SetCheckState(QCheckBox* self, int state); void QCheckBox_StateChanged(QCheckBox* self, int param1); void QCheckBox_connect_StateChanged(QCheckBox* self, void* slot); struct miqt_string* QCheckBox_Tr2(const char* s, const char* c); diff --git a/qt/gen_qclipboard.cpp b/qt/gen_qclipboard.cpp index dff20ff..661ed4d 100644 --- a/qt/gen_qclipboard.cpp +++ b/qt/gen_qclipboard.cpp @@ -96,14 +96,14 @@ void QClipboard_SetPixmap(QClipboard* self, QPixmap* param1) { self->setPixmap(*param1); } -void QClipboard_Changed(QClipboard* self, uintptr_t mode) { +void QClipboard_Changed(QClipboard* self, int mode) { self->changed(static_cast(mode)); } void QClipboard_connect_Changed(QClipboard* self, void* slot) { QClipboard::connect(self, static_cast(&QClipboard::changed), self, [=](QClipboard::Mode mode) { QClipboard::Mode mode_ret = mode; - uintptr_t sigval1 = static_cast(mode_ret); + int sigval1 = static_cast(mode_ret); miqt_exec_callback_QClipboard_Changed(slot, sigval1); }); } @@ -166,18 +166,18 @@ struct miqt_string* QClipboard_TrUtf83(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -void QClipboard_Clear1(QClipboard* self, uintptr_t mode) { +void QClipboard_Clear1(QClipboard* self, int mode) { self->clear(static_cast(mode)); } -struct miqt_string* QClipboard_Text1(const QClipboard* self, uintptr_t mode) { +struct miqt_string* QClipboard_Text1(const QClipboard* self, int mode) { QString _ret = self->text(static_cast(mode)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QClipboard_Text2(const QClipboard* self, struct miqt_string* subtype, uintptr_t mode) { +struct miqt_string* QClipboard_Text2(const QClipboard* self, struct miqt_string* subtype, int mode) { QString subtype_QString = QString::fromUtf8(&subtype->data, subtype->len); QString _ret = self->text(subtype_QString, static_cast(mode)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -185,32 +185,32 @@ struct miqt_string* QClipboard_Text2(const QClipboard* self, struct miqt_string* return miqt_strdup(_b.data(), _b.length()); } -void QClipboard_SetText2(QClipboard* self, struct miqt_string* param1, uintptr_t mode) { +void QClipboard_SetText2(QClipboard* self, struct miqt_string* param1, int mode) { QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); self->setText(param1_QString, static_cast(mode)); } -QMimeData* QClipboard_MimeData1(const QClipboard* self, uintptr_t mode) { +QMimeData* QClipboard_MimeData1(const QClipboard* self, int mode) { return (QMimeData*) self->mimeData(static_cast(mode)); } -void QClipboard_SetMimeData2(QClipboard* self, QMimeData* data, uintptr_t mode) { +void QClipboard_SetMimeData2(QClipboard* self, QMimeData* data, int mode) { self->setMimeData(data, static_cast(mode)); } -QImage* QClipboard_Image1(const QClipboard* self, uintptr_t mode) { +QImage* QClipboard_Image1(const QClipboard* self, int mode) { return new QImage(self->image(static_cast(mode))); } -QPixmap* QClipboard_Pixmap1(const QClipboard* self, uintptr_t mode) { +QPixmap* QClipboard_Pixmap1(const QClipboard* self, int mode) { return new QPixmap(self->pixmap(static_cast(mode))); } -void QClipboard_SetImage2(QClipboard* self, QImage* param1, uintptr_t mode) { +void QClipboard_SetImage2(QClipboard* self, QImage* param1, int mode) { self->setImage(*param1, static_cast(mode)); } -void QClipboard_SetPixmap2(QClipboard* self, QPixmap* param1, uintptr_t mode) { +void QClipboard_SetPixmap2(QClipboard* self, QPixmap* param1, int mode) { self->setPixmap(*param1, static_cast(mode)); } diff --git a/qt/gen_qclipboard.go b/qt/gen_qclipboard.go index 6b62108..4d3e09a 100644 --- a/qt/gen_qclipboard.go +++ b/qt/gen_qclipboard.go @@ -144,14 +144,14 @@ func (this *QClipboard) SetPixmap(param1 *QPixmap) { } func (this *QClipboard) Changed(mode QClipboard__Mode) { - C.QClipboard_Changed(this.h, (C.uintptr_t)(mode)) + C.QClipboard_Changed(this.h, (C.int)(mode)) } func (this *QClipboard) OnChanged(slot func(mode QClipboard__Mode)) { C.QClipboard_connect_Changed(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QClipboard_Changed -func miqt_exec_callback_QClipboard_Changed(cb *C.void, mode C.uintptr_t) { +func miqt_exec_callback_QClipboard_Changed(cb *C.void, mode C.int) { gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(mode QClipboard__Mode)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -259,11 +259,11 @@ func QClipboard_TrUtf83(s string, c string, n int) string { } func (this *QClipboard) Clear1(mode QClipboard__Mode) { - C.QClipboard_Clear1(this.h, (C.uintptr_t)(mode)) + C.QClipboard_Clear1(this.h, (C.int)(mode)) } func (this *QClipboard) Text1(mode QClipboard__Mode) string { - var _ms *C.struct_miqt_string = C.QClipboard_Text1(this.h, (C.uintptr_t)(mode)) + var _ms *C.struct_miqt_string = C.QClipboard_Text1(this.h, (C.int)(mode)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -272,7 +272,7 @@ func (this *QClipboard) Text1(mode QClipboard__Mode) string { func (this *QClipboard) Text2(subtype string, mode QClipboard__Mode) string { subtype_ms := miqt_strdupg(subtype) defer C.free(subtype_ms) - var _ms *C.struct_miqt_string = C.QClipboard_Text2(this.h, (*C.struct_miqt_string)(subtype_ms), (C.uintptr_t)(mode)) + var _ms *C.struct_miqt_string = C.QClipboard_Text2(this.h, (*C.struct_miqt_string)(subtype_ms), (C.int)(mode)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -281,35 +281,35 @@ func (this *QClipboard) Text2(subtype string, mode QClipboard__Mode) string { func (this *QClipboard) SetText2(param1 string, mode QClipboard__Mode) { param1_ms := miqt_strdupg(param1) defer C.free(param1_ms) - C.QClipboard_SetText2(this.h, (*C.struct_miqt_string)(param1_ms), (C.uintptr_t)(mode)) + C.QClipboard_SetText2(this.h, (*C.struct_miqt_string)(param1_ms), (C.int)(mode)) } func (this *QClipboard) MimeData1(mode QClipboard__Mode) *QMimeData { - return newQMimeData_U(unsafe.Pointer(C.QClipboard_MimeData1(this.h, (C.uintptr_t)(mode)))) + return newQMimeData_U(unsafe.Pointer(C.QClipboard_MimeData1(this.h, (C.int)(mode)))) } func (this *QClipboard) SetMimeData2(data *QMimeData, mode QClipboard__Mode) { - C.QClipboard_SetMimeData2(this.h, data.cPointer(), (C.uintptr_t)(mode)) + C.QClipboard_SetMimeData2(this.h, data.cPointer(), (C.int)(mode)) } func (this *QClipboard) Image1(mode QClipboard__Mode) *QImage { - _ret := C.QClipboard_Image1(this.h, (C.uintptr_t)(mode)) + _ret := C.QClipboard_Image1(this.h, (C.int)(mode)) _goptr := newQImage(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QClipboard) Pixmap1(mode QClipboard__Mode) *QPixmap { - _ret := C.QClipboard_Pixmap1(this.h, (C.uintptr_t)(mode)) + _ret := C.QClipboard_Pixmap1(this.h, (C.int)(mode)) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QClipboard) SetImage2(param1 *QImage, mode QClipboard__Mode) { - C.QClipboard_SetImage2(this.h, param1.cPointer(), (C.uintptr_t)(mode)) + C.QClipboard_SetImage2(this.h, param1.cPointer(), (C.int)(mode)) } func (this *QClipboard) SetPixmap2(param1 *QPixmap, mode QClipboard__Mode) { - C.QClipboard_SetPixmap2(this.h, param1.cPointer(), (C.uintptr_t)(mode)) + C.QClipboard_SetPixmap2(this.h, param1.cPointer(), (C.int)(mode)) } diff --git a/qt/gen_qclipboard.h b/qt/gen_qclipboard.h index d42f54c..ce60236 100644 --- a/qt/gen_qclipboard.h +++ b/qt/gen_qclipboard.h @@ -45,7 +45,7 @@ QImage* QClipboard_Image(const QClipboard* self); QPixmap* QClipboard_Pixmap(const QClipboard* self); void QClipboard_SetImage(QClipboard* self, QImage* param1); void QClipboard_SetPixmap(QClipboard* self, QPixmap* param1); -void QClipboard_Changed(QClipboard* self, uintptr_t mode); +void QClipboard_Changed(QClipboard* self, int mode); void QClipboard_connect_Changed(QClipboard* self, void* slot); void QClipboard_SelectionChanged(QClipboard* self); void QClipboard_connect_SelectionChanged(QClipboard* self, void* slot); @@ -57,16 +57,16 @@ struct miqt_string* QClipboard_Tr2(const char* s, const char* c); struct miqt_string* QClipboard_Tr3(const char* s, const char* c, int n); struct miqt_string* QClipboard_TrUtf82(const char* s, const char* c); struct miqt_string* QClipboard_TrUtf83(const char* s, const char* c, int n); -void QClipboard_Clear1(QClipboard* self, uintptr_t mode); -struct miqt_string* QClipboard_Text1(const QClipboard* self, uintptr_t mode); -struct miqt_string* QClipboard_Text2(const QClipboard* self, struct miqt_string* subtype, uintptr_t mode); -void QClipboard_SetText2(QClipboard* self, struct miqt_string* param1, uintptr_t mode); -QMimeData* QClipboard_MimeData1(const QClipboard* self, uintptr_t mode); -void QClipboard_SetMimeData2(QClipboard* self, QMimeData* data, uintptr_t mode); -QImage* QClipboard_Image1(const QClipboard* self, uintptr_t mode); -QPixmap* QClipboard_Pixmap1(const QClipboard* self, uintptr_t mode); -void QClipboard_SetImage2(QClipboard* self, QImage* param1, uintptr_t mode); -void QClipboard_SetPixmap2(QClipboard* self, QPixmap* param1, uintptr_t mode); +void QClipboard_Clear1(QClipboard* self, int mode); +struct miqt_string* QClipboard_Text1(const QClipboard* self, int mode); +struct miqt_string* QClipboard_Text2(const QClipboard* self, struct miqt_string* subtype, int mode); +void QClipboard_SetText2(QClipboard* self, struct miqt_string* param1, int mode); +QMimeData* QClipboard_MimeData1(const QClipboard* self, int mode); +void QClipboard_SetMimeData2(QClipboard* self, QMimeData* data, int mode); +QImage* QClipboard_Image1(const QClipboard* self, int mode); +QPixmap* QClipboard_Pixmap1(const QClipboard* self, int mode); +void QClipboard_SetImage2(QClipboard* self, QImage* param1, int mode); +void QClipboard_SetPixmap2(QClipboard* self, QPixmap* param1, int mode); #ifdef __cplusplus } /* extern C */ diff --git a/qt/gen_qcollator.cpp b/qt/gen_qcollator.cpp index d99e783..eafb4cc 100644 --- a/qt/gen_qcollator.cpp +++ b/qt/gen_qcollator.cpp @@ -57,12 +57,12 @@ QLocale* QCollator_Locale(const QCollator* self) { return new QLocale(self->locale()); } -uintptr_t QCollator_CaseSensitivity(const QCollator* self) { +int QCollator_CaseSensitivity(const QCollator* self) { Qt::CaseSensitivity _ret = self->caseSensitivity(); - return static_cast(_ret); + return static_cast(_ret); } -void QCollator_SetCaseSensitivity(QCollator* self, uintptr_t cs) { +void QCollator_SetCaseSensitivity(QCollator* self, int cs) { self->setCaseSensitivity(static_cast(cs)); } diff --git a/qt/gen_qcollator.go b/qt/gen_qcollator.go index 3f8001d..d481a8a 100644 --- a/qt/gen_qcollator.go +++ b/qt/gen_qcollator.go @@ -131,7 +131,7 @@ func (this *QCollator) CaseSensitivity() CaseSensitivity { } func (this *QCollator) SetCaseSensitivity(cs CaseSensitivity) { - C.QCollator_SetCaseSensitivity(this.h, (C.uintptr_t)(cs)) + C.QCollator_SetCaseSensitivity(this.h, (C.int)(cs)) } func (this *QCollator) SetNumericMode(on bool) { diff --git a/qt/gen_qcollator.h b/qt/gen_qcollator.h index 006b553..28a7468 100644 --- a/qt/gen_qcollator.h +++ b/qt/gen_qcollator.h @@ -38,8 +38,8 @@ void QCollator_OperatorAssign(QCollator* self, QCollator* param1); void QCollator_Swap(QCollator* self, QCollator* other); void QCollator_SetLocale(QCollator* self, QLocale* locale); QLocale* QCollator_Locale(const QCollator* self); -uintptr_t QCollator_CaseSensitivity(const QCollator* self); -void QCollator_SetCaseSensitivity(QCollator* self, uintptr_t cs); +int QCollator_CaseSensitivity(const QCollator* self); +void QCollator_SetCaseSensitivity(QCollator* self, int cs); void QCollator_SetNumericMode(QCollator* self, bool on); bool QCollator_NumericMode(const QCollator* self); void QCollator_SetIgnorePunctuation(QCollator* self, bool on); diff --git a/qt/gen_qcolor.cpp b/qt/gen_qcolor.cpp index 95cd8a6..f28e131 100644 --- a/qt/gen_qcolor.cpp +++ b/qt/gen_qcolor.cpp @@ -12,7 +12,7 @@ QColor* QColor_new() { return new QColor(); } -QColor* QColor_new2(uintptr_t color) { +QColor* QColor_new2(int color) { return new QColor(static_cast(color)); } @@ -37,7 +37,7 @@ QColor* QColor_new7(const char* aname) { return new QColor(aname); } -QColor* QColor_new8(uintptr_t spec) { +QColor* QColor_new8(int spec) { return new QColor(static_cast(spec)); } @@ -45,7 +45,7 @@ QColor* QColor_new9(QColor* color) { return new QColor(*color); } -QColor* QColor_new10(uintptr_t spec, uint16_t a1, uint16_t a2, uint16_t a3, uint16_t a4) { +QColor* QColor_new10(int spec, uint16_t a1, uint16_t a2, uint16_t a3, uint16_t a4) { return new QColor(static_cast(spec), static_cast(a1), static_cast(a2), static_cast(a3), static_cast(a4)); } @@ -53,7 +53,7 @@ QColor* QColor_new11(int r, int g, int b, int a) { return new QColor(static_cast(r), static_cast(g), static_cast(b), static_cast(a)); } -QColor* QColor_new12(uintptr_t spec, uint16_t a1, uint16_t a2, uint16_t a3, uint16_t a4, uint16_t a5) { +QColor* QColor_new12(int spec, uint16_t a1, uint16_t a2, uint16_t a3, uint16_t a4, uint16_t a5) { return new QColor(static_cast(spec), static_cast(a1), static_cast(a2), static_cast(a3), static_cast(a4), static_cast(a5)); } @@ -61,7 +61,7 @@ void QColor_OperatorAssign(QColor* self, QColor* param1) { self->operator=(*param1); } -void QColor_OperatorAssignWithColor(QColor* self, uintptr_t color) { +void QColor_OperatorAssignWithColor(QColor* self, int color) { self->operator=(static_cast(color)); } @@ -76,7 +76,7 @@ struct miqt_string* QColor_Name(const QColor* self) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QColor_NameWithFormat(const QColor* self, uintptr_t format) { +struct miqt_string* QColor_NameWithFormat(const QColor* self, int format) { QString _ret = self->name(static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -104,9 +104,9 @@ struct miqt_array* QColor_ColorNames() { return _out; } -uintptr_t QColor_Spec(const QColor* self) { +int QColor_Spec(const QColor* self) { QColor::Spec _ret = self->spec(); - return static_cast(_ret); + return static_cast(_ret); } int QColor_Alpha(const QColor* self) { @@ -118,7 +118,8 @@ void QColor_SetAlpha(QColor* self, int alpha) { } double QColor_AlphaF(const QColor* self) { - return self->alphaF(); + qreal _ret = self->alphaF(); + return static_cast(_ret); } void QColor_SetAlphaF(QColor* self, double alpha) { @@ -150,15 +151,18 @@ void QColor_SetBlue(QColor* self, int blue) { } double QColor_RedF(const QColor* self) { - return self->redF(); + qreal _ret = self->redF(); + return static_cast(_ret); } double QColor_GreenF(const QColor* self) { - return self->greenF(); + qreal _ret = self->greenF(); + return static_cast(_ret); } double QColor_BlueF(const QColor* self) { - return self->blueF(); + qreal _ret = self->blueF(); + return static_cast(_ret); } void QColor_SetRedF(QColor* self, double red) { @@ -198,7 +202,8 @@ void QColor_SetRgba64(QColor* self, QRgba64* rgba) { } unsigned int QColor_Rgba(const QColor* self) { - return self->rgba(); + QRgb _ret = self->rgba(); + return static_cast(_ret); } void QColor_SetRgba(QColor* self, unsigned int rgba) { @@ -206,7 +211,8 @@ void QColor_SetRgba(QColor* self, unsigned int rgba) { } unsigned int QColor_Rgb(const QColor* self) { - return self->rgb(); + QRgb _ret = self->rgb(); + return static_cast(_ret); } void QColor_SetRgbWithRgb(QColor* self, unsigned int rgb) { @@ -234,23 +240,28 @@ int QColor_Value(const QColor* self) { } double QColor_HueF(const QColor* self) { - return self->hueF(); + qreal _ret = self->hueF(); + return static_cast(_ret); } double QColor_SaturationF(const QColor* self) { - return self->saturationF(); + qreal _ret = self->saturationF(); + return static_cast(_ret); } double QColor_HsvHueF(const QColor* self) { - return self->hsvHueF(); + qreal _ret = self->hsvHueF(); + return static_cast(_ret); } double QColor_HsvSaturationF(const QColor* self) { - return self->hsvSaturationF(); + qreal _ret = self->hsvSaturationF(); + return static_cast(_ret); } double QColor_ValueF(const QColor* self) { - return self->valueF(); + qreal _ret = self->valueF(); + return static_cast(_ret); } void QColor_GetHsv(const QColor* self, int* h, int* s, int* v) { @@ -286,19 +297,23 @@ int QColor_Black(const QColor* self) { } double QColor_CyanF(const QColor* self) { - return self->cyanF(); + qreal _ret = self->cyanF(); + return static_cast(_ret); } double QColor_MagentaF(const QColor* self) { - return self->magentaF(); + qreal _ret = self->magentaF(); + return static_cast(_ret); } double QColor_YellowF(const QColor* self) { - return self->yellowF(); + qreal _ret = self->yellowF(); + return static_cast(_ret); } double QColor_BlackF(const QColor* self) { - return self->blackF(); + qreal _ret = self->blackF(); + return static_cast(_ret); } void QColor_GetCmyk(QColor* self, int* c, int* m, int* y, int* k) { @@ -338,15 +353,18 @@ int QColor_Lightness(const QColor* self) { } double QColor_HslHueF(const QColor* self) { - return self->hslHueF(); + qreal _ret = self->hslHueF(); + return static_cast(_ret); } double QColor_HslSaturationF(const QColor* self) { - return self->hslSaturationF(); + qreal _ret = self->hslSaturationF(); + return static_cast(_ret); } double QColor_LightnessF(const QColor* self) { - return self->lightnessF(); + qreal _ret = self->lightnessF(); + return static_cast(_ret); } void QColor_GetHsl(const QColor* self, int* h, int* s, int* l) { @@ -385,7 +403,7 @@ QColor* QColor_ToExtendedRgb(const QColor* self) { return new QColor(self->toExtendedRgb()); } -QColor* QColor_ConvertTo(const QColor* self, uintptr_t colorSpec) { +QColor* QColor_ConvertTo(const QColor* self, int colorSpec) { return new QColor(self->convertTo(static_cast(colorSpec))); } diff --git a/qt/gen_qcolor.go b/qt/gen_qcolor.go index 8ecb441..fa54b07 100644 --- a/qt/gen_qcolor.go +++ b/qt/gen_qcolor.go @@ -61,7 +61,7 @@ func NewQColor() *QColor { // NewQColor2 constructs a new QColor object. func NewQColor2(color GlobalColor) *QColor { - ret := C.QColor_new2((C.uintptr_t)(color)) + ret := C.QColor_new2((C.int)(color)) return newQColor(ret) } @@ -101,7 +101,7 @@ func NewQColor7(aname string) *QColor { // NewQColor8 constructs a new QColor object. func NewQColor8(spec QColor__Spec) *QColor { - ret := C.QColor_new8((C.uintptr_t)(spec)) + ret := C.QColor_new8((C.int)(spec)) return newQColor(ret) } @@ -113,7 +113,7 @@ func NewQColor9(color *QColor) *QColor { // NewQColor10 constructs a new QColor object. 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)) + ret := C.QColor_new10((C.int)(spec), (C.uint16_t)(a1), (C.uint16_t)(a2), (C.uint16_t)(a3), (C.uint16_t)(a4)) return newQColor(ret) } @@ -125,7 +125,7 @@ func NewQColor11(r int, g int, b int, a int) *QColor { // NewQColor12 constructs a new QColor object. 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)) + ret := C.QColor_new12((C.int)(spec), (C.uint16_t)(a1), (C.uint16_t)(a2), (C.uint16_t)(a3), (C.uint16_t)(a4), (C.uint16_t)(a5)) return newQColor(ret) } @@ -134,7 +134,7 @@ func (this *QColor) OperatorAssign(param1 *QColor) { } func (this *QColor) OperatorAssignWithColor(color GlobalColor) { - C.QColor_OperatorAssignWithColor(this.h, (C.uintptr_t)(color)) + C.QColor_OperatorAssignWithColor(this.h, (C.int)(color)) } func (this *QColor) IsValid() bool { @@ -149,7 +149,7 @@ func (this *QColor) Name() string { } func (this *QColor) NameWithFormat(format QColor__NameFormat) string { - var _ms *C.struct_miqt_string = C.QColor_NameWithFormat(this.h, (C.uintptr_t)(format)) + var _ms *C.struct_miqt_string = C.QColor_NameWithFormat(this.h, (C.int)(format)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -474,7 +474,7 @@ func (this *QColor) ToExtendedRgb() *QColor { } func (this *QColor) ConvertTo(colorSpec QColor__Spec) *QColor { - _ret := C.QColor_ConvertTo(this.h, (C.uintptr_t)(colorSpec)) + _ret := C.QColor_ConvertTo(this.h, (C.int)(colorSpec)) _goptr := newQColor(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qcolor.h b/qt/gen_qcolor.h index d2abb72..de31e59 100644 --- a/qt/gen_qcolor.h +++ b/qt/gen_qcolor.h @@ -22,25 +22,25 @@ typedef struct QRgba64 QRgba64; #endif QColor* QColor_new(); -QColor* QColor_new2(uintptr_t color); +QColor* QColor_new2(int color); QColor* QColor_new3(int r, int g, int b); QColor* QColor_new4(unsigned int rgb); QColor* QColor_new5(QRgba64* rgba64); QColor* QColor_new6(struct miqt_string* name); QColor* QColor_new7(const char* aname); -QColor* QColor_new8(uintptr_t spec); +QColor* QColor_new8(int spec); QColor* QColor_new9(QColor* color); -QColor* QColor_new10(uintptr_t spec, uint16_t a1, uint16_t a2, uint16_t a3, uint16_t a4); +QColor* QColor_new10(int spec, uint16_t a1, uint16_t a2, uint16_t a3, uint16_t a4); QColor* QColor_new11(int r, int g, int b, int a); -QColor* QColor_new12(uintptr_t spec, uint16_t a1, uint16_t a2, uint16_t a3, uint16_t a4, uint16_t a5); +QColor* QColor_new12(int spec, uint16_t a1, uint16_t a2, uint16_t a3, uint16_t a4, uint16_t a5); void QColor_OperatorAssign(QColor* self, QColor* param1); -void QColor_OperatorAssignWithColor(QColor* self, uintptr_t color); +void QColor_OperatorAssignWithColor(QColor* self, int color); bool QColor_IsValid(const QColor* self); struct miqt_string* QColor_Name(const QColor* self); -struct miqt_string* QColor_NameWithFormat(const QColor* self, uintptr_t format); +struct miqt_string* QColor_NameWithFormat(const QColor* self, int format); void QColor_SetNamedColor(QColor* self, struct miqt_string* name); struct miqt_array* QColor_ColorNames(); -uintptr_t QColor_Spec(const QColor* self); +int QColor_Spec(const QColor* self); int QColor_Alpha(const QColor* self); void QColor_SetAlpha(QColor* self, int alpha); double QColor_AlphaF(const QColor* self); @@ -110,7 +110,7 @@ QColor* QColor_ToHsv(const QColor* self); QColor* QColor_ToCmyk(const QColor* self); QColor* QColor_ToHsl(const QColor* self); QColor* QColor_ToExtendedRgb(const QColor* self); -QColor* QColor_ConvertTo(const QColor* self, uintptr_t colorSpec); +QColor* QColor_ConvertTo(const QColor* self, int colorSpec); QColor* QColor_FromRgb(unsigned int rgb); QColor* QColor_FromRgba(unsigned int rgba); QColor* QColor_FromRgb2(int r, int g, int b); diff --git a/qt/gen_qcolordialog.cpp b/qt/gen_qcolordialog.cpp index e118f3d..678526c 100644 --- a/qt/gen_qcolordialog.cpp +++ b/qt/gen_qcolordialog.cpp @@ -55,11 +55,11 @@ QColor* QColorDialog_SelectedColor(const QColorDialog* self) { return new QColor(self->selectedColor()); } -void QColorDialog_SetOption(QColorDialog* self, uintptr_t option) { +void QColorDialog_SetOption(QColorDialog* self, int option) { self->setOption(static_cast(option)); } -bool QColorDialog_TestOption(const QColorDialog* self, uintptr_t option) { +bool QColorDialog_TestOption(const QColorDialog* self, int option) { return self->testOption(static_cast(option)); } @@ -81,7 +81,8 @@ QColor* QColorDialog_GetColor() { } unsigned int QColorDialog_GetRgba() { - return QColorDialog::getRgba(); + QRgb _ret = QColorDialog::getRgba(); + return static_cast(_ret); } int QColorDialog_CustomCount() { @@ -158,7 +159,7 @@ struct miqt_string* QColorDialog_TrUtf83(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -void QColorDialog_SetOption2(QColorDialog* self, uintptr_t option, bool on) { +void QColorDialog_SetOption2(QColorDialog* self, int option, bool on) { self->setOption(static_cast(option), on); } @@ -181,15 +182,18 @@ QColor* QColorDialog_GetColor4(QColor* initial, QWidget* parent, struct miqt_str } unsigned int QColorDialog_GetRgba1(unsigned int rgba) { - return QColorDialog::getRgba(static_cast(rgba)); + QRgb _ret = QColorDialog::getRgba(static_cast(rgba)); + return static_cast(_ret); } unsigned int QColorDialog_GetRgba2(unsigned int rgba, bool* ok) { - return QColorDialog::getRgba(static_cast(rgba), ok); + QRgb _ret = QColorDialog::getRgba(static_cast(rgba), ok); + return static_cast(_ret); } unsigned int QColorDialog_GetRgba3(unsigned int rgba, bool* ok, QWidget* parent) { - return QColorDialog::getRgba(static_cast(rgba), ok, parent); + QRgb _ret = QColorDialog::getRgba(static_cast(rgba), ok, parent); + return static_cast(_ret); } void QColorDialog_Delete(QColorDialog* self) { diff --git a/qt/gen_qcolordialog.go b/qt/gen_qcolordialog.go index b2b4c3a..1960205 100644 --- a/qt/gen_qcolordialog.go +++ b/qt/gen_qcolordialog.go @@ -110,15 +110,15 @@ func (this *QColorDialog) SelectedColor() *QColor { } func (this *QColorDialog) SetOption(option QColorDialog__ColorDialogOption) { - C.QColorDialog_SetOption(this.h, (C.uintptr_t)(option)) + C.QColorDialog_SetOption(this.h, (C.int)(option)) } func (this *QColorDialog) TestOption(option QColorDialog__ColorDialogOption) bool { - return (bool)(C.QColorDialog_TestOption(this.h, (C.uintptr_t)(option))) + return (bool)(C.QColorDialog_TestOption(this.h, (C.int)(option))) } func (this *QColorDialog) SetOptions(options int) { - C.QColorDialog_SetOptions(this.h, (C.int)(options)) + C.QColorDialog_SetOptions(this.h, options) } func (this *QColorDialog) Options() int { @@ -251,7 +251,7 @@ func QColorDialog_TrUtf83(s string, c string, n int) string { } func (this *QColorDialog) SetOption2(option QColorDialog__ColorDialogOption, on bool) { - C.QColorDialog_SetOption2(this.h, (C.uintptr_t)(option), (C.bool)(on)) + C.QColorDialog_SetOption2(this.h, (C.int)(option), (C.bool)(on)) } func QColorDialog_GetColor1(initial *QColor) *QColor { @@ -280,7 +280,7 @@ func QColorDialog_GetColor3(initial *QColor, parent *QWidget, title string) *QCo func QColorDialog_GetColor4(initial *QColor, parent *QWidget, title string, options int) *QColor { title_ms := miqt_strdupg(title) defer C.free(title_ms) - _ret := C.QColorDialog_GetColor4(initial.cPointer(), parent.cPointer(), (*C.struct_miqt_string)(title_ms), (C.int)(options)) + _ret := C.QColorDialog_GetColor4(initial.cPointer(), parent.cPointer(), (*C.struct_miqt_string)(title_ms), options) _goptr := newQColor(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qcolordialog.h b/qt/gen_qcolordialog.h index 0665852..18fc963 100644 --- a/qt/gen_qcolordialog.h +++ b/qt/gen_qcolordialog.h @@ -35,8 +35,8 @@ struct miqt_string* QColorDialog_TrUtf8(const char* s); void QColorDialog_SetCurrentColor(QColorDialog* self, QColor* color); QColor* QColorDialog_CurrentColor(const QColorDialog* self); QColor* QColorDialog_SelectedColor(const QColorDialog* self); -void QColorDialog_SetOption(QColorDialog* self, uintptr_t option); -bool QColorDialog_TestOption(const QColorDialog* self, uintptr_t option); +void QColorDialog_SetOption(QColorDialog* self, int option); +bool QColorDialog_TestOption(const QColorDialog* self, int option); void QColorDialog_SetOptions(QColorDialog* self, int options); int QColorDialog_Options(const QColorDialog* self); void QColorDialog_SetVisible(QColorDialog* self, bool visible); @@ -55,7 +55,7 @@ struct miqt_string* QColorDialog_Tr2(const char* s, const char* c); struct miqt_string* QColorDialog_Tr3(const char* s, const char* c, int n); struct miqt_string* QColorDialog_TrUtf82(const char* s, const char* c); struct miqt_string* QColorDialog_TrUtf83(const char* s, const char* c, int n); -void QColorDialog_SetOption2(QColorDialog* self, uintptr_t option, bool on); +void QColorDialog_SetOption2(QColorDialog* self, int option, bool on); QColor* QColorDialog_GetColor1(QColor* initial); QColor* QColorDialog_GetColor2(QColor* initial, QWidget* parent); QColor* QColorDialog_GetColor3(QColor* initial, QWidget* parent, struct miqt_string* title); diff --git a/qt/gen_qcolormap.cpp b/qt/gen_qcolormap.cpp index 1386263..539fa96 100644 --- a/qt/gen_qcolormap.cpp +++ b/qt/gen_qcolormap.cpp @@ -25,9 +25,9 @@ void QColormap_OperatorAssign(QColormap* self, QColormap* colormap) { self->operator=(*colormap); } -uintptr_t QColormap_Mode(const QColormap* self) { +int QColormap_Mode(const QColormap* self) { QColormap::Mode _ret = self->mode(); - return static_cast(_ret); + return static_cast(_ret); } int QColormap_Depth(const QColormap* self) { @@ -39,7 +39,8 @@ int QColormap_Size(const QColormap* self) { } unsigned int QColormap_Pixel(const QColormap* self, QColor* color) { - return self->pixel(*color); + uint _ret = self->pixel(*color); + return static_cast(_ret); } QColor* QColormap_ColorAt(const QColormap* self, unsigned int pixel) { diff --git a/qt/gen_qcolormap.h b/qt/gen_qcolormap.h index 8285aa7..bf5ddba 100644 --- a/qt/gen_qcolormap.h +++ b/qt/gen_qcolormap.h @@ -26,7 +26,7 @@ void QColormap_Initialize(); void QColormap_Cleanup(); QColormap* QColormap_Instance(); void QColormap_OperatorAssign(QColormap* self, QColormap* colormap); -uintptr_t QColormap_Mode(const QColormap* self); +int QColormap_Mode(const QColormap* self); int QColormap_Depth(const QColormap* self); int QColormap_Size(const QColormap* self); unsigned int QColormap_Pixel(const QColormap* self, QColor* color); diff --git a/qt/gen_qcolorspace.cpp b/qt/gen_qcolorspace.cpp index 52d06b6..d0c0dda 100644 --- a/qt/gen_qcolorspace.cpp +++ b/qt/gen_qcolorspace.cpp @@ -10,19 +10,19 @@ QColorSpace* QColorSpace_new() { return new QColorSpace(); } -QColorSpace* QColorSpace_new2(uintptr_t namedColorSpace) { +QColorSpace* QColorSpace_new2(int namedColorSpace) { return new QColorSpace(static_cast(namedColorSpace)); } -QColorSpace* QColorSpace_new3(uintptr_t primaries, uintptr_t transferFunction) { +QColorSpace* QColorSpace_new3(int primaries, int transferFunction) { return new QColorSpace(static_cast(primaries), static_cast(transferFunction)); } -QColorSpace* QColorSpace_new4(uintptr_t primaries, float gamma) { +QColorSpace* QColorSpace_new4(int primaries, float gamma) { return new QColorSpace(static_cast(primaries), static_cast(gamma)); } -QColorSpace* QColorSpace_new5(QPointF* whitePoint, QPointF* redPoint, QPointF* greenPoint, QPointF* bluePoint, uintptr_t transferFunction) { +QColorSpace* QColorSpace_new5(QPointF* whitePoint, QPointF* redPoint, QPointF* greenPoint, QPointF* bluePoint, int transferFunction) { return new QColorSpace(*whitePoint, *redPoint, *greenPoint, *bluePoint, static_cast(transferFunction)); } @@ -30,11 +30,11 @@ QColorSpace* QColorSpace_new6(QColorSpace* colorSpace) { return new QColorSpace(*colorSpace); } -QColorSpace* QColorSpace_new7(uintptr_t primaries, uintptr_t transferFunction, float gamma) { +QColorSpace* QColorSpace_new7(int primaries, int transferFunction, float gamma) { return new QColorSpace(static_cast(primaries), static_cast(transferFunction), static_cast(gamma)); } -QColorSpace* QColorSpace_new8(QPointF* whitePoint, QPointF* redPoint, QPointF* greenPoint, QPointF* bluePoint, uintptr_t transferFunction, float gamma) { +QColorSpace* QColorSpace_new8(QPointF* whitePoint, QPointF* redPoint, QPointF* greenPoint, QPointF* bluePoint, int transferFunction, float gamma) { return new QColorSpace(*whitePoint, *redPoint, *greenPoint, *bluePoint, static_cast(transferFunction), static_cast(gamma)); } @@ -46,29 +46,29 @@ void QColorSpace_Swap(QColorSpace* self, QColorSpace* colorSpace) { self->swap(*colorSpace); } -uintptr_t QColorSpace_Primaries(const QColorSpace* self) { +int QColorSpace_Primaries(const QColorSpace* self) { QColorSpace::Primaries _ret = self->primaries(); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QColorSpace_TransferFunction(const QColorSpace* self) { +int QColorSpace_TransferFunction(const QColorSpace* self) { QColorSpace::TransferFunction _ret = self->transferFunction(); - return static_cast(_ret); + return static_cast(_ret); } float QColorSpace_Gamma(const QColorSpace* self) { return self->gamma(); } -void QColorSpace_SetTransferFunction(QColorSpace* self, uintptr_t transferFunction) { +void QColorSpace_SetTransferFunction(QColorSpace* self, int transferFunction) { self->setTransferFunction(static_cast(transferFunction)); } -QColorSpace* QColorSpace_WithTransferFunction(const QColorSpace* self, uintptr_t transferFunction) { +QColorSpace* QColorSpace_WithTransferFunction(const QColorSpace* self, int transferFunction) { return new QColorSpace(self->withTransferFunction(static_cast(transferFunction))); } -void QColorSpace_SetPrimaries(QColorSpace* self, uintptr_t primariesId) { +void QColorSpace_SetPrimaries(QColorSpace* self, int primariesId) { self->setPrimaries(static_cast(primariesId)); } @@ -92,11 +92,11 @@ QColorTransform* QColorSpace_TransformationToColorSpace(const QColorSpace* self, return new QColorTransform(self->transformationToColorSpace(*colorspace)); } -void QColorSpace_SetTransferFunction2(QColorSpace* self, uintptr_t transferFunction, float gamma) { +void QColorSpace_SetTransferFunction2(QColorSpace* self, int transferFunction, float gamma) { self->setTransferFunction(static_cast(transferFunction), static_cast(gamma)); } -QColorSpace* QColorSpace_WithTransferFunction2(const QColorSpace* self, uintptr_t transferFunction, float gamma) { +QColorSpace* QColorSpace_WithTransferFunction2(const QColorSpace* self, int transferFunction, float gamma) { return new QColorSpace(self->withTransferFunction(static_cast(transferFunction), static_cast(gamma))); } diff --git a/qt/gen_qcolorspace.go b/qt/gen_qcolorspace.go index fd87d54..6bf3482 100644 --- a/qt/gen_qcolorspace.go +++ b/qt/gen_qcolorspace.go @@ -73,25 +73,25 @@ func NewQColorSpace() *QColorSpace { // NewQColorSpace2 constructs a new QColorSpace object. func NewQColorSpace2(namedColorSpace QColorSpace__NamedColorSpace) *QColorSpace { - ret := C.QColorSpace_new2((C.uintptr_t)(namedColorSpace)) + ret := C.QColorSpace_new2((C.int)(namedColorSpace)) return newQColorSpace(ret) } // NewQColorSpace3 constructs a new QColorSpace object. func NewQColorSpace3(primaries QColorSpace__Primaries, transferFunction QColorSpace__TransferFunction) *QColorSpace { - ret := C.QColorSpace_new3((C.uintptr_t)(primaries), (C.uintptr_t)(transferFunction)) + ret := C.QColorSpace_new3((C.int)(primaries), (C.int)(transferFunction)) return newQColorSpace(ret) } // NewQColorSpace4 constructs a new QColorSpace object. func NewQColorSpace4(primaries QColorSpace__Primaries, gamma float32) *QColorSpace { - ret := C.QColorSpace_new4((C.uintptr_t)(primaries), (C.float)(gamma)) + ret := C.QColorSpace_new4((C.int)(primaries), (C.float)(gamma)) return newQColorSpace(ret) } // NewQColorSpace5 constructs a new QColorSpace object. 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)) + ret := C.QColorSpace_new5(whitePoint.cPointer(), redPoint.cPointer(), greenPoint.cPointer(), bluePoint.cPointer(), (C.int)(transferFunction)) return newQColorSpace(ret) } @@ -103,13 +103,13 @@ func NewQColorSpace6(colorSpace *QColorSpace) *QColorSpace { // NewQColorSpace7 constructs a new QColorSpace object. 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)) + ret := C.QColorSpace_new7((C.int)(primaries), (C.int)(transferFunction), (C.float)(gamma)) return newQColorSpace(ret) } // NewQColorSpace8 constructs a new QColorSpace object. 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)) + ret := C.QColorSpace_new8(whitePoint.cPointer(), redPoint.cPointer(), greenPoint.cPointer(), bluePoint.cPointer(), (C.int)(transferFunction), (C.float)(gamma)) return newQColorSpace(ret) } @@ -134,18 +134,18 @@ func (this *QColorSpace) Gamma() float32 { } func (this *QColorSpace) SetTransferFunction(transferFunction QColorSpace__TransferFunction) { - C.QColorSpace_SetTransferFunction(this.h, (C.uintptr_t)(transferFunction)) + C.QColorSpace_SetTransferFunction(this.h, (C.int)(transferFunction)) } func (this *QColorSpace) WithTransferFunction(transferFunction QColorSpace__TransferFunction) *QColorSpace { - _ret := C.QColorSpace_WithTransferFunction(this.h, (C.uintptr_t)(transferFunction)) + _ret := C.QColorSpace_WithTransferFunction(this.h, (C.int)(transferFunction)) _goptr := newQColorSpace(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QColorSpace) SetPrimaries(primariesId QColorSpace__Primaries) { - C.QColorSpace_SetPrimaries(this.h, (C.uintptr_t)(primariesId)) + C.QColorSpace_SetPrimaries(this.h, (C.int)(primariesId)) } func (this *QColorSpace) SetPrimaries2(whitePoint *QPointF, redPoint *QPointF, greenPoint *QPointF, bluePoint *QPointF) { @@ -178,11 +178,11 @@ func (this *QColorSpace) TransformationToColorSpace(colorspace *QColorSpace) *QC } func (this *QColorSpace) SetTransferFunction2(transferFunction QColorSpace__TransferFunction, gamma float32) { - C.QColorSpace_SetTransferFunction2(this.h, (C.uintptr_t)(transferFunction), (C.float)(gamma)) + C.QColorSpace_SetTransferFunction2(this.h, (C.int)(transferFunction), (C.float)(gamma)) } func (this *QColorSpace) WithTransferFunction2(transferFunction QColorSpace__TransferFunction, gamma float32) *QColorSpace { - _ret := C.QColorSpace_WithTransferFunction2(this.h, (C.uintptr_t)(transferFunction), (C.float)(gamma)) + _ret := C.QColorSpace_WithTransferFunction2(this.h, (C.int)(transferFunction), (C.float)(gamma)) _goptr := newQColorSpace(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qcolorspace.h b/qt/gen_qcolorspace.h index 27b267c..ab55695 100644 --- a/qt/gen_qcolorspace.h +++ b/qt/gen_qcolorspace.h @@ -26,28 +26,28 @@ typedef struct QPointF QPointF; #endif QColorSpace* QColorSpace_new(); -QColorSpace* QColorSpace_new2(uintptr_t namedColorSpace); -QColorSpace* QColorSpace_new3(uintptr_t primaries, uintptr_t transferFunction); -QColorSpace* QColorSpace_new4(uintptr_t primaries, float gamma); -QColorSpace* QColorSpace_new5(QPointF* whitePoint, QPointF* redPoint, QPointF* greenPoint, QPointF* bluePoint, uintptr_t transferFunction); +QColorSpace* QColorSpace_new2(int namedColorSpace); +QColorSpace* QColorSpace_new3(int primaries, int transferFunction); +QColorSpace* QColorSpace_new4(int primaries, float gamma); +QColorSpace* QColorSpace_new5(QPointF* whitePoint, QPointF* redPoint, QPointF* greenPoint, QPointF* bluePoint, int transferFunction); QColorSpace* QColorSpace_new6(QColorSpace* colorSpace); -QColorSpace* QColorSpace_new7(uintptr_t primaries, uintptr_t transferFunction, float gamma); -QColorSpace* QColorSpace_new8(QPointF* whitePoint, QPointF* redPoint, QPointF* greenPoint, QPointF* bluePoint, uintptr_t transferFunction, float gamma); +QColorSpace* QColorSpace_new7(int primaries, int transferFunction, float gamma); +QColorSpace* QColorSpace_new8(QPointF* whitePoint, QPointF* redPoint, QPointF* greenPoint, QPointF* bluePoint, int transferFunction, float gamma); void QColorSpace_OperatorAssign(QColorSpace* self, QColorSpace* colorSpace); void QColorSpace_Swap(QColorSpace* self, QColorSpace* colorSpace); -uintptr_t QColorSpace_Primaries(const QColorSpace* self); -uintptr_t QColorSpace_TransferFunction(const QColorSpace* self); +int QColorSpace_Primaries(const QColorSpace* self); +int QColorSpace_TransferFunction(const QColorSpace* self); float QColorSpace_Gamma(const QColorSpace* self); -void QColorSpace_SetTransferFunction(QColorSpace* self, uintptr_t transferFunction); -QColorSpace* QColorSpace_WithTransferFunction(const QColorSpace* self, uintptr_t transferFunction); -void QColorSpace_SetPrimaries(QColorSpace* self, uintptr_t primariesId); +void QColorSpace_SetTransferFunction(QColorSpace* self, int transferFunction); +QColorSpace* QColorSpace_WithTransferFunction(const QColorSpace* self, int transferFunction); +void QColorSpace_SetPrimaries(QColorSpace* self, int primariesId); void QColorSpace_SetPrimaries2(QColorSpace* self, QPointF* whitePoint, QPointF* redPoint, QPointF* greenPoint, QPointF* bluePoint); bool QColorSpace_IsValid(const QColorSpace* self); QColorSpace* QColorSpace_FromIccProfile(QByteArray* iccProfile); QByteArray* QColorSpace_IccProfile(const QColorSpace* self); QColorTransform* QColorSpace_TransformationToColorSpace(const QColorSpace* self, QColorSpace* colorspace); -void QColorSpace_SetTransferFunction2(QColorSpace* self, uintptr_t transferFunction, float gamma); -QColorSpace* QColorSpace_WithTransferFunction2(const QColorSpace* self, uintptr_t transferFunction, float gamma); +void QColorSpace_SetTransferFunction2(QColorSpace* self, int transferFunction, float gamma); +QColorSpace* QColorSpace_WithTransferFunction2(const QColorSpace* self, int transferFunction, float gamma); void QColorSpace_Delete(QColorSpace* self); #ifdef __cplusplus diff --git a/qt/gen_qcolortransform.cpp b/qt/gen_qcolortransform.cpp index a9d28be..df6802c 100644 --- a/qt/gen_qcolortransform.cpp +++ b/qt/gen_qcolortransform.cpp @@ -22,7 +22,8 @@ void QColorTransform_Swap(QColorTransform* self, QColorTransform* other) { } unsigned int QColorTransform_Map(const QColorTransform* self, unsigned int argb) { - return self->map(static_cast(argb)); + QRgb _ret = self->map(static_cast(argb)); + return static_cast(_ret); } QRgba64* QColorTransform_MapWithRgba64(const QColorTransform* self, QRgba64* rgba64) { diff --git a/qt/gen_qcolumnview.cpp b/qt/gen_qcolumnview.cpp index 682f374..d709edf 100644 --- a/qt/gen_qcolumnview.cpp +++ b/qt/gen_qcolumnview.cpp @@ -153,7 +153,7 @@ struct miqt_string* QColumnView_TrUtf83(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -void QColumnView_ScrollTo2(QColumnView* self, QModelIndex* index, uintptr_t hint) { +void QColumnView_ScrollTo2(QColumnView* self, QModelIndex* index, int hint) { self->scrollTo(*index, static_cast(hint)); } diff --git a/qt/gen_qcolumnview.go b/qt/gen_qcolumnview.go index 3d897d0..3147cee 100644 --- a/qt/gen_qcolumnview.go +++ b/qt/gen_qcolumnview.go @@ -216,7 +216,7 @@ func QColumnView_TrUtf83(s string, c string, n int) string { } func (this *QColumnView) ScrollTo2(index *QModelIndex, hint QAbstractItemView__ScrollHint) { - C.QColumnView_ScrollTo2(this.h, index.cPointer(), (C.uintptr_t)(hint)) + C.QColumnView_ScrollTo2(this.h, index.cPointer(), (C.int)(hint)) } // Delete this object from C++ memory. diff --git a/qt/gen_qcolumnview.h b/qt/gen_qcolumnview.h index b982d05..7b6c418 100644 --- a/qt/gen_qcolumnview.h +++ b/qt/gen_qcolumnview.h @@ -60,7 +60,7 @@ struct miqt_string* QColumnView_Tr2(const char* s, const char* c); struct miqt_string* QColumnView_Tr3(const char* s, const char* c, int n); struct miqt_string* QColumnView_TrUtf82(const char* s, const char* c); struct miqt_string* QColumnView_TrUtf83(const char* s, const char* c, int n); -void QColumnView_ScrollTo2(QColumnView* self, QModelIndex* index, uintptr_t hint); +void QColumnView_ScrollTo2(QColumnView* self, QModelIndex* index, int hint); void QColumnView_Delete(QColumnView* self); #ifdef __cplusplus diff --git a/qt/gen_qcombobox.cpp b/qt/gen_qcombobox.cpp index 9b795d4..149997e 100644 --- a/qt/gen_qcombobox.cpp +++ b/qt/gen_qcombobox.cpp @@ -74,12 +74,12 @@ void QComboBox_SetAutoCompletion(QComboBox* self, bool enable) { self->setAutoCompletion(enable); } -uintptr_t QComboBox_AutoCompletionCaseSensitivity(const QComboBox* self) { +int QComboBox_AutoCompletionCaseSensitivity(const QComboBox* self) { Qt::CaseSensitivity _ret = self->autoCompletionCaseSensitivity(); - return static_cast(_ret); + return static_cast(_ret); } -void QComboBox_SetAutoCompletionCaseSensitivity(QComboBox* self, uintptr_t sensitivity) { +void QComboBox_SetAutoCompletionCaseSensitivity(QComboBox* self, int sensitivity) { self->setAutoCompletionCaseSensitivity(static_cast(sensitivity)); } @@ -108,21 +108,21 @@ int QComboBox_FindData(const QComboBox* self, QVariant* data) { return self->findData(*data); } -uintptr_t QComboBox_InsertPolicy(const QComboBox* self) { +int QComboBox_InsertPolicy(const QComboBox* self) { QComboBox::InsertPolicy _ret = self->insertPolicy(); - return static_cast(_ret); + return static_cast(_ret); } -void QComboBox_SetInsertPolicy(QComboBox* self, uintptr_t policy) { +void QComboBox_SetInsertPolicy(QComboBox* self, int policy) { self->setInsertPolicy(static_cast(policy)); } -uintptr_t QComboBox_SizeAdjustPolicy(const QComboBox* self) { +int QComboBox_SizeAdjustPolicy(const QComboBox* self) { QComboBox::SizeAdjustPolicy _ret = self->sizeAdjustPolicy(); - return static_cast(_ret); + return static_cast(_ret); } -void QComboBox_SetSizeAdjustPolicy(QComboBox* self, uintptr_t policy) { +void QComboBox_SetSizeAdjustPolicy(QComboBox* self, int policy) { self->setSizeAdjustPolicy(static_cast(policy)); } @@ -339,11 +339,11 @@ bool QComboBox_Event(QComboBox* self, QEvent* event) { return self->event(event); } -QVariant* QComboBox_InputMethodQuery(const QComboBox* self, uintptr_t param1) { +QVariant* QComboBox_InputMethodQuery(const QComboBox* self, int param1) { return new QVariant(self->inputMethodQuery(static_cast(param1))); } -QVariant* QComboBox_InputMethodQuery2(const QComboBox* self, uintptr_t query, QVariant* argument) { +QVariant* QComboBox_InputMethodQuery2(const QComboBox* self, int query, QVariant* argument) { return new QVariant(self->inputMethodQuery(static_cast(query), *argument)); } diff --git a/qt/gen_qcombobox.go b/qt/gen_qcombobox.go index 03fada1..c3e1bc9 100644 --- a/qt/gen_qcombobox.go +++ b/qt/gen_qcombobox.go @@ -125,7 +125,7 @@ func (this *QComboBox) AutoCompletionCaseSensitivity() CaseSensitivity { } func (this *QComboBox) SetAutoCompletionCaseSensitivity(sensitivity CaseSensitivity) { - C.QComboBox_SetAutoCompletionCaseSensitivity(this.h, (C.uintptr_t)(sensitivity)) + C.QComboBox_SetAutoCompletionCaseSensitivity(this.h, (C.int)(sensitivity)) } func (this *QComboBox) DuplicatesEnabled() bool { @@ -159,7 +159,7 @@ func (this *QComboBox) InsertPolicy() QComboBox__InsertPolicy { } func (this *QComboBox) SetInsertPolicy(policy QComboBox__InsertPolicy) { - C.QComboBox_SetInsertPolicy(this.h, (C.uintptr_t)(policy)) + C.QComboBox_SetInsertPolicy(this.h, (C.int)(policy)) } func (this *QComboBox) SizeAdjustPolicy() QComboBox__SizeAdjustPolicy { @@ -167,7 +167,7 @@ func (this *QComboBox) SizeAdjustPolicy() QComboBox__SizeAdjustPolicy { } func (this *QComboBox) SetSizeAdjustPolicy(policy QComboBox__SizeAdjustPolicy) { - C.QComboBox_SetSizeAdjustPolicy(this.h, (C.uintptr_t)(policy)) + C.QComboBox_SetSizeAdjustPolicy(this.h, (C.int)(policy)) } func (this *QComboBox) MinimumContentsLength() int { @@ -417,14 +417,14 @@ func (this *QComboBox) Event(event *QEvent) bool { } func (this *QComboBox) InputMethodQuery(param1 InputMethodQuery) *QVariant { - _ret := C.QComboBox_InputMethodQuery(this.h, (C.uintptr_t)(param1)) + _ret := C.QComboBox_InputMethodQuery(this.h, (C.int)(param1)) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QComboBox) InputMethodQuery2(query InputMethodQuery, argument *QVariant) *QVariant { - _ret := C.QComboBox_InputMethodQuery2(this.h, (C.uintptr_t)(query), argument.cPointer()) + _ret := C.QComboBox_InputMethodQuery2(this.h, (C.int)(query), argument.cPointer()) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -736,7 +736,7 @@ func QComboBox_TrUtf83(s string, c string, n int) string { func (this *QComboBox) FindText2(text string, flags int) int { text_ms := miqt_strdupg(text) defer C.free(text_ms) - return (int)(C.QComboBox_FindText2(this.h, (*C.struct_miqt_string)(text_ms), (C.int)(flags))) + return (int)(C.QComboBox_FindText2(this.h, (*C.struct_miqt_string)(text_ms), flags)) } func (this *QComboBox) FindData2(data *QVariant, role int) int { @@ -744,7 +744,7 @@ func (this *QComboBox) FindData2(data *QVariant, role int) int { } func (this *QComboBox) FindData3(data *QVariant, role int, flags int) int { - return (int)(C.QComboBox_FindData3(this.h, data.cPointer(), (C.int)(role), (C.int)(flags))) + return (int)(C.QComboBox_FindData3(this.h, data.cPointer(), (C.int)(role), flags)) } func (this *QComboBox) CurrentData1(role int) *QVariant { diff --git a/qt/gen_qcombobox.h b/qt/gen_qcombobox.h index c512c28..9eada23 100644 --- a/qt/gen_qcombobox.h +++ b/qt/gen_qcombobox.h @@ -57,18 +57,18 @@ void QComboBox_SetMaxCount(QComboBox* self, int max); int QComboBox_MaxCount(const QComboBox* self); bool QComboBox_AutoCompletion(const QComboBox* self); void QComboBox_SetAutoCompletion(QComboBox* self, bool enable); -uintptr_t QComboBox_AutoCompletionCaseSensitivity(const QComboBox* self); -void QComboBox_SetAutoCompletionCaseSensitivity(QComboBox* self, uintptr_t sensitivity); +int QComboBox_AutoCompletionCaseSensitivity(const QComboBox* self); +void QComboBox_SetAutoCompletionCaseSensitivity(QComboBox* self, int sensitivity); bool QComboBox_DuplicatesEnabled(const QComboBox* self); void QComboBox_SetDuplicatesEnabled(QComboBox* self, bool enable); void QComboBox_SetFrame(QComboBox* self, bool frame); bool QComboBox_HasFrame(const QComboBox* self); int QComboBox_FindText(const QComboBox* self, struct miqt_string* text); int QComboBox_FindData(const QComboBox* self, QVariant* data); -uintptr_t QComboBox_InsertPolicy(const QComboBox* self); -void QComboBox_SetInsertPolicy(QComboBox* self, uintptr_t policy); -uintptr_t QComboBox_SizeAdjustPolicy(const QComboBox* self); -void QComboBox_SetSizeAdjustPolicy(QComboBox* self, uintptr_t policy); +int QComboBox_InsertPolicy(const QComboBox* self); +void QComboBox_SetInsertPolicy(QComboBox* self, int policy); +int QComboBox_SizeAdjustPolicy(const QComboBox* self); +void QComboBox_SetSizeAdjustPolicy(QComboBox* self, int policy); int QComboBox_MinimumContentsLength(const QComboBox* self); void QComboBox_SetMinimumContentsLength(QComboBox* self, int characters); QSize* QComboBox_IconSize(const QComboBox* self); @@ -115,8 +115,8 @@ QSize* QComboBox_MinimumSizeHint(const QComboBox* self); void QComboBox_ShowPopup(QComboBox* self); void QComboBox_HidePopup(QComboBox* self); bool QComboBox_Event(QComboBox* self, QEvent* event); -QVariant* QComboBox_InputMethodQuery(const QComboBox* self, uintptr_t param1); -QVariant* QComboBox_InputMethodQuery2(const QComboBox* self, uintptr_t query, QVariant* argument); +QVariant* QComboBox_InputMethodQuery(const QComboBox* self, int param1); +QVariant* QComboBox_InputMethodQuery2(const QComboBox* self, int query, QVariant* argument); void QComboBox_Clear(QComboBox* self); void QComboBox_ClearEditText(QComboBox* self); void QComboBox_SetEditText(QComboBox* self, struct miqt_string* text); diff --git a/qt/gen_qcommandlineoption.go b/qt/gen_qcommandlineoption.go index 2965795..77ec8a6 100644 --- a/qt/gen_qcommandlineoption.go +++ b/qt/gen_qcommandlineoption.go @@ -255,7 +255,7 @@ func (this *QCommandLineOption) Flags() int { } func (this *QCommandLineOption) SetFlags(aflags int) { - C.QCommandLineOption_SetFlags(this.h, (C.int)(aflags)) + C.QCommandLineOption_SetFlags(this.h, aflags) } func (this *QCommandLineOption) SetHidden(hidden bool) { diff --git a/qt/gen_qcommandlineparser.cpp b/qt/gen_qcommandlineparser.cpp index 2142206..cfc760f 100644 --- a/qt/gen_qcommandlineparser.cpp +++ b/qt/gen_qcommandlineparser.cpp @@ -27,11 +27,11 @@ struct miqt_string* QCommandLineParser_TrUtf8(const char* sourceText) { return miqt_strdup(_b.data(), _b.length()); } -void QCommandLineParser_SetSingleDashWordOptionMode(QCommandLineParser* self, uintptr_t parsingMode) { +void QCommandLineParser_SetSingleDashWordOptionMode(QCommandLineParser* self, int parsingMode) { self->setSingleDashWordOptionMode(static_cast(parsingMode)); } -void QCommandLineParser_SetOptionsAfterPositionalArgumentsMode(QCommandLineParser* self, uintptr_t mode) { +void QCommandLineParser_SetOptionsAfterPositionalArgumentsMode(QCommandLineParser* self, int mode) { self->setOptionsAfterPositionalArgumentsMode(static_cast(mode)); } diff --git a/qt/gen_qcommandlineparser.go b/qt/gen_qcommandlineparser.go index f56086a..c6a2d8f 100644 --- a/qt/gen_qcommandlineparser.go +++ b/qt/gen_qcommandlineparser.go @@ -74,11 +74,11 @@ func QCommandLineParser_TrUtf8(sourceText string) string { } func (this *QCommandLineParser) SetSingleDashWordOptionMode(parsingMode QCommandLineParser__SingleDashWordOptionMode) { - C.QCommandLineParser_SetSingleDashWordOptionMode(this.h, (C.uintptr_t)(parsingMode)) + C.QCommandLineParser_SetSingleDashWordOptionMode(this.h, (C.int)(parsingMode)) } func (this *QCommandLineParser) SetOptionsAfterPositionalArgumentsMode(mode QCommandLineParser__OptionsAfterPositionalArgumentsMode) { - C.QCommandLineParser_SetOptionsAfterPositionalArgumentsMode(this.h, (C.uintptr_t)(mode)) + C.QCommandLineParser_SetOptionsAfterPositionalArgumentsMode(this.h, (C.int)(mode)) } func (this *QCommandLineParser) AddOption(commandLineOption *QCommandLineOption) bool { diff --git a/qt/gen_qcommandlineparser.h b/qt/gen_qcommandlineparser.h index 89fb4e9..9826b91 100644 --- a/qt/gen_qcommandlineparser.h +++ b/qt/gen_qcommandlineparser.h @@ -26,8 +26,8 @@ typedef struct QCoreApplication QCoreApplication; QCommandLineParser* QCommandLineParser_new(); struct miqt_string* QCommandLineParser_Tr(const char* sourceText); struct miqt_string* QCommandLineParser_TrUtf8(const char* sourceText); -void QCommandLineParser_SetSingleDashWordOptionMode(QCommandLineParser* self, uintptr_t parsingMode); -void QCommandLineParser_SetOptionsAfterPositionalArgumentsMode(QCommandLineParser* self, uintptr_t mode); +void QCommandLineParser_SetSingleDashWordOptionMode(QCommandLineParser* self, int parsingMode); +void QCommandLineParser_SetOptionsAfterPositionalArgumentsMode(QCommandLineParser* self, int mode); bool QCommandLineParser_AddOption(QCommandLineParser* self, QCommandLineOption* commandLineOption); bool QCommandLineParser_AddOptions(QCommandLineParser* self, struct miqt_array* /* of QCommandLineOption* */ options); QCommandLineOption* QCommandLineParser_AddVersionOption(QCommandLineParser* self); diff --git a/qt/gen_qcommonstyle.cpp b/qt/gen_qcommonstyle.cpp index 6c94beb..ce9cdbf 100644 --- a/qt/gen_qcommonstyle.cpp +++ b/qt/gen_qcommonstyle.cpp @@ -41,56 +41,56 @@ struct miqt_string* QCommonStyle_TrUtf8(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -void QCommonStyle_DrawPrimitive(const QCommonStyle* self, uintptr_t pe, QStyleOption* opt, QPainter* p) { +void QCommonStyle_DrawPrimitive(const QCommonStyle* self, int pe, QStyleOption* opt, QPainter* p) { self->drawPrimitive(static_cast(pe), opt, p); } -void QCommonStyle_DrawControl(const QCommonStyle* self, uintptr_t element, QStyleOption* opt, QPainter* p) { +void QCommonStyle_DrawControl(const QCommonStyle* self, int element, QStyleOption* opt, QPainter* p) { self->drawControl(static_cast(element), opt, p); } -QRect* QCommonStyle_SubElementRect(const QCommonStyle* self, uintptr_t r, QStyleOption* opt) { +QRect* QCommonStyle_SubElementRect(const QCommonStyle* self, int r, QStyleOption* opt) { return new QRect(self->subElementRect(static_cast(r), opt)); } -void QCommonStyle_DrawComplexControl(const QCommonStyle* self, uintptr_t cc, QStyleOptionComplex* opt, QPainter* p) { +void QCommonStyle_DrawComplexControl(const QCommonStyle* self, int cc, QStyleOptionComplex* opt, QPainter* p) { self->drawComplexControl(static_cast(cc), opt, p); } -uintptr_t QCommonStyle_HitTestComplexControl(const QCommonStyle* self, uintptr_t cc, QStyleOptionComplex* opt, QPoint* pt) { +int QCommonStyle_HitTestComplexControl(const QCommonStyle* self, int cc, QStyleOptionComplex* opt, QPoint* pt) { QStyle::SubControl _ret = self->hitTestComplexControl(static_cast(cc), opt, *pt); - return static_cast(_ret); + return static_cast(_ret); } -QRect* QCommonStyle_SubControlRect(const QCommonStyle* self, uintptr_t cc, QStyleOptionComplex* opt, uintptr_t sc) { +QRect* QCommonStyle_SubControlRect(const QCommonStyle* self, int cc, QStyleOptionComplex* opt, int sc) { return new QRect(self->subControlRect(static_cast(cc), opt, static_cast(sc))); } -QSize* QCommonStyle_SizeFromContents(const QCommonStyle* self, uintptr_t ct, QStyleOption* opt, QSize* contentsSize) { +QSize* QCommonStyle_SizeFromContents(const QCommonStyle* self, int ct, QStyleOption* opt, QSize* contentsSize) { return new QSize(self->sizeFromContents(static_cast(ct), opt, *contentsSize)); } -int QCommonStyle_PixelMetric(const QCommonStyle* self, uintptr_t m) { +int QCommonStyle_PixelMetric(const QCommonStyle* self, int m) { return self->pixelMetric(static_cast(m)); } -int QCommonStyle_StyleHint(const QCommonStyle* self, uintptr_t sh) { +int QCommonStyle_StyleHint(const QCommonStyle* self, int sh) { return self->styleHint(static_cast(sh)); } -QIcon* QCommonStyle_StandardIcon(const QCommonStyle* self, uintptr_t standardIcon) { +QIcon* QCommonStyle_StandardIcon(const QCommonStyle* self, int standardIcon) { return new QIcon(self->standardIcon(static_cast(standardIcon))); } -QPixmap* QCommonStyle_StandardPixmap(const QCommonStyle* self, uintptr_t sp) { +QPixmap* QCommonStyle_StandardPixmap(const QCommonStyle* self, int sp) { return new QPixmap(self->standardPixmap(static_cast(sp))); } -QPixmap* QCommonStyle_GeneratedIconPixmap(const QCommonStyle* self, uintptr_t iconMode, QPixmap* pixmap, QStyleOption* opt) { +QPixmap* QCommonStyle_GeneratedIconPixmap(const QCommonStyle* self, int iconMode, QPixmap* pixmap, QStyleOption* opt) { return new QPixmap(self->generatedIconPixmap(static_cast(iconMode), *pixmap, opt)); } -int QCommonStyle_LayoutSpacing(const QCommonStyle* self, uintptr_t control1, uintptr_t control2, uintptr_t orientation) { +int QCommonStyle_LayoutSpacing(const QCommonStyle* self, int control1, int control2, int orientation) { return self->layoutSpacing(static_cast(control1), static_cast(control2), static_cast(orientation)); } @@ -142,76 +142,76 @@ struct miqt_string* QCommonStyle_TrUtf83(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -void QCommonStyle_DrawPrimitive4(const QCommonStyle* self, uintptr_t pe, QStyleOption* opt, QPainter* p, QWidget* w) { +void QCommonStyle_DrawPrimitive4(const QCommonStyle* self, int pe, QStyleOption* opt, QPainter* p, QWidget* w) { self->drawPrimitive(static_cast(pe), opt, p, w); } -void QCommonStyle_DrawControl4(const QCommonStyle* self, uintptr_t element, QStyleOption* opt, QPainter* p, QWidget* w) { +void QCommonStyle_DrawControl4(const QCommonStyle* self, int element, QStyleOption* opt, QPainter* p, QWidget* w) { self->drawControl(static_cast(element), opt, p, w); } -QRect* QCommonStyle_SubElementRect3(const QCommonStyle* self, uintptr_t r, QStyleOption* opt, QWidget* widget) { +QRect* QCommonStyle_SubElementRect3(const QCommonStyle* self, int r, QStyleOption* opt, QWidget* widget) { return new QRect(self->subElementRect(static_cast(r), opt, widget)); } -void QCommonStyle_DrawComplexControl4(const QCommonStyle* self, uintptr_t cc, QStyleOptionComplex* opt, QPainter* p, QWidget* w) { +void QCommonStyle_DrawComplexControl4(const QCommonStyle* self, int cc, QStyleOptionComplex* opt, QPainter* p, QWidget* w) { self->drawComplexControl(static_cast(cc), opt, p, w); } -uintptr_t QCommonStyle_HitTestComplexControl4(const QCommonStyle* self, uintptr_t cc, QStyleOptionComplex* opt, QPoint* pt, QWidget* w) { +int QCommonStyle_HitTestComplexControl4(const QCommonStyle* self, int cc, QStyleOptionComplex* opt, QPoint* pt, QWidget* w) { QStyle::SubControl _ret = self->hitTestComplexControl(static_cast(cc), opt, *pt, w); - return static_cast(_ret); + return static_cast(_ret); } -QRect* QCommonStyle_SubControlRect4(const QCommonStyle* self, uintptr_t cc, QStyleOptionComplex* opt, uintptr_t sc, QWidget* w) { +QRect* QCommonStyle_SubControlRect4(const QCommonStyle* self, int cc, QStyleOptionComplex* opt, int sc, QWidget* w) { return new QRect(self->subControlRect(static_cast(cc), opt, static_cast(sc), w)); } -QSize* QCommonStyle_SizeFromContents4(const QCommonStyle* self, uintptr_t ct, QStyleOption* opt, QSize* contentsSize, QWidget* widget) { +QSize* QCommonStyle_SizeFromContents4(const QCommonStyle* self, int ct, QStyleOption* opt, QSize* contentsSize, QWidget* widget) { return new QSize(self->sizeFromContents(static_cast(ct), opt, *contentsSize, widget)); } -int QCommonStyle_PixelMetric2(const QCommonStyle* self, uintptr_t m, QStyleOption* opt) { +int QCommonStyle_PixelMetric2(const QCommonStyle* self, int m, QStyleOption* opt) { return self->pixelMetric(static_cast(m), opt); } -int QCommonStyle_PixelMetric3(const QCommonStyle* self, uintptr_t m, QStyleOption* opt, QWidget* widget) { +int QCommonStyle_PixelMetric3(const QCommonStyle* self, int m, QStyleOption* opt, QWidget* widget) { return self->pixelMetric(static_cast(m), opt, widget); } -int QCommonStyle_StyleHint2(const QCommonStyle* self, uintptr_t sh, QStyleOption* opt) { +int QCommonStyle_StyleHint2(const QCommonStyle* self, int sh, QStyleOption* opt) { return self->styleHint(static_cast(sh), opt); } -int QCommonStyle_StyleHint3(const QCommonStyle* self, uintptr_t sh, QStyleOption* opt, QWidget* w) { +int QCommonStyle_StyleHint3(const QCommonStyle* self, int sh, QStyleOption* opt, QWidget* w) { return self->styleHint(static_cast(sh), opt, w); } -int QCommonStyle_StyleHint4(const QCommonStyle* self, uintptr_t sh, QStyleOption* opt, QWidget* w, QStyleHintReturn* shret) { +int QCommonStyle_StyleHint4(const QCommonStyle* self, int sh, QStyleOption* opt, QWidget* w, QStyleHintReturn* shret) { return self->styleHint(static_cast(sh), opt, w, shret); } -QIcon* QCommonStyle_StandardIcon2(const QCommonStyle* self, uintptr_t standardIcon, QStyleOption* opt) { +QIcon* QCommonStyle_StandardIcon2(const QCommonStyle* self, int standardIcon, QStyleOption* opt) { return new QIcon(self->standardIcon(static_cast(standardIcon), opt)); } -QIcon* QCommonStyle_StandardIcon3(const QCommonStyle* self, uintptr_t standardIcon, QStyleOption* opt, QWidget* widget) { +QIcon* QCommonStyle_StandardIcon3(const QCommonStyle* self, int standardIcon, QStyleOption* opt, QWidget* widget) { return new QIcon(self->standardIcon(static_cast(standardIcon), opt, widget)); } -QPixmap* QCommonStyle_StandardPixmap2(const QCommonStyle* self, uintptr_t sp, QStyleOption* opt) { +QPixmap* QCommonStyle_StandardPixmap2(const QCommonStyle* self, int sp, QStyleOption* opt) { return new QPixmap(self->standardPixmap(static_cast(sp), opt)); } -QPixmap* QCommonStyle_StandardPixmap3(const QCommonStyle* self, uintptr_t sp, QStyleOption* opt, QWidget* widget) { +QPixmap* QCommonStyle_StandardPixmap3(const QCommonStyle* self, int sp, QStyleOption* opt, QWidget* widget) { return new QPixmap(self->standardPixmap(static_cast(sp), opt, widget)); } -int QCommonStyle_LayoutSpacing4(const QCommonStyle* self, uintptr_t control1, uintptr_t control2, uintptr_t orientation, QStyleOption* option) { +int QCommonStyle_LayoutSpacing4(const QCommonStyle* self, int control1, int control2, int orientation, QStyleOption* option) { return self->layoutSpacing(static_cast(control1), static_cast(control2), static_cast(orientation), option); } -int QCommonStyle_LayoutSpacing5(const QCommonStyle* self, uintptr_t control1, uintptr_t control2, uintptr_t orientation, QStyleOption* option, QWidget* widget) { +int QCommonStyle_LayoutSpacing5(const QCommonStyle* self, int control1, int control2, int orientation, QStyleOption* option, QWidget* widget) { return self->layoutSpacing(static_cast(control1), static_cast(control2), static_cast(orientation), option, widget); } diff --git a/qt/gen_qcommonstyle.go b/qt/gen_qcommonstyle.go index 28850d2..25468bc 100644 --- a/qt/gen_qcommonstyle.go +++ b/qt/gen_qcommonstyle.go @@ -65,73 +65,73 @@ func QCommonStyle_TrUtf8(s string) string { } func (this *QCommonStyle) DrawPrimitive(pe QStyle__PrimitiveElement, opt *QStyleOption, p *QPainter) { - C.QCommonStyle_DrawPrimitive(this.h, (C.uintptr_t)(pe), opt.cPointer(), p.cPointer()) + C.QCommonStyle_DrawPrimitive(this.h, (C.int)(pe), opt.cPointer(), p.cPointer()) } func (this *QCommonStyle) DrawControl(element QStyle__ControlElement, opt *QStyleOption, p *QPainter) { - C.QCommonStyle_DrawControl(this.h, (C.uintptr_t)(element), opt.cPointer(), p.cPointer()) + C.QCommonStyle_DrawControl(this.h, (C.int)(element), opt.cPointer(), p.cPointer()) } func (this *QCommonStyle) SubElementRect(r QStyle__SubElement, opt *QStyleOption) *QRect { - _ret := C.QCommonStyle_SubElementRect(this.h, (C.uintptr_t)(r), opt.cPointer()) + _ret := C.QCommonStyle_SubElementRect(this.h, (C.int)(r), opt.cPointer()) _goptr := newQRect(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QCommonStyle) DrawComplexControl(cc QStyle__ComplexControl, opt *QStyleOptionComplex, p *QPainter) { - C.QCommonStyle_DrawComplexControl(this.h, (C.uintptr_t)(cc), opt.cPointer(), p.cPointer()) + C.QCommonStyle_DrawComplexControl(this.h, (C.int)(cc), opt.cPointer(), p.cPointer()) } func (this *QCommonStyle) HitTestComplexControl(cc QStyle__ComplexControl, opt *QStyleOptionComplex, pt *QPoint) QStyle__SubControl { - return (QStyle__SubControl)(C.QCommonStyle_HitTestComplexControl(this.h, (C.uintptr_t)(cc), opt.cPointer(), pt.cPointer())) + return (QStyle__SubControl)(C.QCommonStyle_HitTestComplexControl(this.h, (C.int)(cc), opt.cPointer(), pt.cPointer())) } 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)) + _ret := C.QCommonStyle_SubControlRect(this.h, (C.int)(cc), opt.cPointer(), (C.int)(sc)) _goptr := newQRect(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } 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()) + _ret := C.QCommonStyle_SizeFromContents(this.h, (C.int)(ct), opt.cPointer(), contentsSize.cPointer()) _goptr := newQSize(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QCommonStyle) PixelMetric(m QStyle__PixelMetric) int { - return (int)(C.QCommonStyle_PixelMetric(this.h, (C.uintptr_t)(m))) + return (int)(C.QCommonStyle_PixelMetric(this.h, (C.int)(m))) } func (this *QCommonStyle) StyleHint(sh QStyle__StyleHint) int { - return (int)(C.QCommonStyle_StyleHint(this.h, (C.uintptr_t)(sh))) + return (int)(C.QCommonStyle_StyleHint(this.h, (C.int)(sh))) } func (this *QCommonStyle) StandardIcon(standardIcon QStyle__StandardPixmap) *QIcon { - _ret := C.QCommonStyle_StandardIcon(this.h, (C.uintptr_t)(standardIcon)) + _ret := C.QCommonStyle_StandardIcon(this.h, (C.int)(standardIcon)) _goptr := newQIcon(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QCommonStyle) StandardPixmap(sp QStyle__StandardPixmap) *QPixmap { - _ret := C.QCommonStyle_StandardPixmap(this.h, (C.uintptr_t)(sp)) + _ret := C.QCommonStyle_StandardPixmap(this.h, (C.int)(sp)) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } 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()) + _ret := C.QCommonStyle_GeneratedIconPixmap(this.h, (C.int)(iconMode), pixmap.cPointer(), opt.cPointer()) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QCommonStyle) LayoutSpacing(control1 QSizePolicy__ControlType, control2 QSizePolicy__ControlType, orientation Orientation) int { - return (int)(C.QCommonStyle_LayoutSpacing(this.h, (C.uintptr_t)(control1), (C.uintptr_t)(control2), (C.uintptr_t)(orientation))) + return (int)(C.QCommonStyle_LayoutSpacing(this.h, (C.int)(control1), (C.int)(control2), (C.int)(orientation))) } func (this *QCommonStyle) Polish(param1 *QPalette) { @@ -199,96 +199,96 @@ func QCommonStyle_TrUtf83(s string, c string, n int) string { } 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()) + C.QCommonStyle_DrawPrimitive4(this.h, (C.int)(pe), opt.cPointer(), p.cPointer(), w.cPointer()) } 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()) + C.QCommonStyle_DrawControl4(this.h, (C.int)(element), opt.cPointer(), p.cPointer(), w.cPointer()) } 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()) + _ret := C.QCommonStyle_SubElementRect3(this.h, (C.int)(r), opt.cPointer(), widget.cPointer()) _goptr := newQRect(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } 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()) + C.QCommonStyle_DrawComplexControl4(this.h, (C.int)(cc), opt.cPointer(), p.cPointer(), w.cPointer()) } func (this *QCommonStyle) HitTestComplexControl4(cc QStyle__ComplexControl, opt *QStyleOptionComplex, pt *QPoint, w *QWidget) QStyle__SubControl { - return (QStyle__SubControl)(C.QCommonStyle_HitTestComplexControl4(this.h, (C.uintptr_t)(cc), opt.cPointer(), pt.cPointer(), w.cPointer())) + return (QStyle__SubControl)(C.QCommonStyle_HitTestComplexControl4(this.h, (C.int)(cc), opt.cPointer(), pt.cPointer(), w.cPointer())) } 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()) + _ret := C.QCommonStyle_SubControlRect4(this.h, (C.int)(cc), opt.cPointer(), (C.int)(sc), w.cPointer()) _goptr := newQRect(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } 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()) + _ret := C.QCommonStyle_SizeFromContents4(this.h, (C.int)(ct), opt.cPointer(), contentsSize.cPointer(), widget.cPointer()) _goptr := newQSize(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QCommonStyle) PixelMetric2(m QStyle__PixelMetric, opt *QStyleOption) int { - return (int)(C.QCommonStyle_PixelMetric2(this.h, (C.uintptr_t)(m), opt.cPointer())) + return (int)(C.QCommonStyle_PixelMetric2(this.h, (C.int)(m), opt.cPointer())) } func (this *QCommonStyle) PixelMetric3(m QStyle__PixelMetric, opt *QStyleOption, widget *QWidget) int { - return (int)(C.QCommonStyle_PixelMetric3(this.h, (C.uintptr_t)(m), opt.cPointer(), widget.cPointer())) + return (int)(C.QCommonStyle_PixelMetric3(this.h, (C.int)(m), opt.cPointer(), widget.cPointer())) } func (this *QCommonStyle) StyleHint2(sh QStyle__StyleHint, opt *QStyleOption) int { - return (int)(C.QCommonStyle_StyleHint2(this.h, (C.uintptr_t)(sh), opt.cPointer())) + return (int)(C.QCommonStyle_StyleHint2(this.h, (C.int)(sh), opt.cPointer())) } func (this *QCommonStyle) StyleHint3(sh QStyle__StyleHint, opt *QStyleOption, w *QWidget) int { - return (int)(C.QCommonStyle_StyleHint3(this.h, (C.uintptr_t)(sh), opt.cPointer(), w.cPointer())) + return (int)(C.QCommonStyle_StyleHint3(this.h, (C.int)(sh), opt.cPointer(), w.cPointer())) } func (this *QCommonStyle) StyleHint4(sh QStyle__StyleHint, opt *QStyleOption, w *QWidget, shret *QStyleHintReturn) int { - return (int)(C.QCommonStyle_StyleHint4(this.h, (C.uintptr_t)(sh), opt.cPointer(), w.cPointer(), shret.cPointer())) + return (int)(C.QCommonStyle_StyleHint4(this.h, (C.int)(sh), opt.cPointer(), w.cPointer(), shret.cPointer())) } func (this *QCommonStyle) StandardIcon2(standardIcon QStyle__StandardPixmap, opt *QStyleOption) *QIcon { - _ret := C.QCommonStyle_StandardIcon2(this.h, (C.uintptr_t)(standardIcon), opt.cPointer()) + _ret := C.QCommonStyle_StandardIcon2(this.h, (C.int)(standardIcon), opt.cPointer()) _goptr := newQIcon(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } 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()) + _ret := C.QCommonStyle_StandardIcon3(this.h, (C.int)(standardIcon), opt.cPointer(), widget.cPointer()) _goptr := newQIcon(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QCommonStyle) StandardPixmap2(sp QStyle__StandardPixmap, opt *QStyleOption) *QPixmap { - _ret := C.QCommonStyle_StandardPixmap2(this.h, (C.uintptr_t)(sp), opt.cPointer()) + _ret := C.QCommonStyle_StandardPixmap2(this.h, (C.int)(sp), opt.cPointer()) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } 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()) + _ret := C.QCommonStyle_StandardPixmap3(this.h, (C.int)(sp), opt.cPointer(), widget.cPointer()) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QCommonStyle) LayoutSpacing4(control1 QSizePolicy__ControlType, control2 QSizePolicy__ControlType, orientation Orientation, option *QStyleOption) int { - return (int)(C.QCommonStyle_LayoutSpacing4(this.h, (C.uintptr_t)(control1), (C.uintptr_t)(control2), (C.uintptr_t)(orientation), option.cPointer())) + return (int)(C.QCommonStyle_LayoutSpacing4(this.h, (C.int)(control1), (C.int)(control2), (C.int)(orientation), option.cPointer())) } func (this *QCommonStyle) LayoutSpacing5(control1 QSizePolicy__ControlType, control2 QSizePolicy__ControlType, orientation Orientation, option *QStyleOption, widget *QWidget) int { - return (int)(C.QCommonStyle_LayoutSpacing5(this.h, (C.uintptr_t)(control1), (C.uintptr_t)(control2), (C.uintptr_t)(orientation), option.cPointer(), widget.cPointer())) + return (int)(C.QCommonStyle_LayoutSpacing5(this.h, (C.int)(control1), (C.int)(control2), (C.int)(orientation), option.cPointer(), widget.cPointer())) } // Delete this object from C++ memory. diff --git a/qt/gen_qcommonstyle.h b/qt/gen_qcommonstyle.h index 838825c..a340324 100644 --- a/qt/gen_qcommonstyle.h +++ b/qt/gen_qcommonstyle.h @@ -49,19 +49,19 @@ QCommonStyle* QCommonStyle_new(); QMetaObject* QCommonStyle_MetaObject(const QCommonStyle* self); struct miqt_string* QCommonStyle_Tr(const char* s); struct miqt_string* QCommonStyle_TrUtf8(const char* s); -void QCommonStyle_DrawPrimitive(const QCommonStyle* self, uintptr_t pe, QStyleOption* opt, QPainter* p); -void QCommonStyle_DrawControl(const QCommonStyle* self, uintptr_t element, QStyleOption* opt, QPainter* p); -QRect* QCommonStyle_SubElementRect(const QCommonStyle* self, uintptr_t r, QStyleOption* opt); -void QCommonStyle_DrawComplexControl(const QCommonStyle* self, uintptr_t cc, QStyleOptionComplex* opt, QPainter* p); -uintptr_t QCommonStyle_HitTestComplexControl(const QCommonStyle* self, uintptr_t cc, QStyleOptionComplex* opt, QPoint* pt); -QRect* QCommonStyle_SubControlRect(const QCommonStyle* self, uintptr_t cc, QStyleOptionComplex* opt, uintptr_t sc); -QSize* QCommonStyle_SizeFromContents(const QCommonStyle* self, uintptr_t ct, QStyleOption* opt, QSize* contentsSize); -int QCommonStyle_PixelMetric(const QCommonStyle* self, uintptr_t m); -int QCommonStyle_StyleHint(const QCommonStyle* self, uintptr_t sh); -QIcon* QCommonStyle_StandardIcon(const QCommonStyle* self, uintptr_t standardIcon); -QPixmap* QCommonStyle_StandardPixmap(const QCommonStyle* self, uintptr_t sp); -QPixmap* QCommonStyle_GeneratedIconPixmap(const QCommonStyle* self, uintptr_t iconMode, QPixmap* pixmap, QStyleOption* opt); -int QCommonStyle_LayoutSpacing(const QCommonStyle* self, uintptr_t control1, uintptr_t control2, uintptr_t orientation); +void QCommonStyle_DrawPrimitive(const QCommonStyle* self, int pe, QStyleOption* opt, QPainter* p); +void QCommonStyle_DrawControl(const QCommonStyle* self, int element, QStyleOption* opt, QPainter* p); +QRect* QCommonStyle_SubElementRect(const QCommonStyle* self, int r, QStyleOption* opt); +void QCommonStyle_DrawComplexControl(const QCommonStyle* self, int cc, QStyleOptionComplex* opt, QPainter* p); +int QCommonStyle_HitTestComplexControl(const QCommonStyle* self, int cc, QStyleOptionComplex* opt, QPoint* pt); +QRect* QCommonStyle_SubControlRect(const QCommonStyle* self, int cc, QStyleOptionComplex* opt, int sc); +QSize* QCommonStyle_SizeFromContents(const QCommonStyle* self, int ct, QStyleOption* opt, QSize* contentsSize); +int QCommonStyle_PixelMetric(const QCommonStyle* self, int m); +int QCommonStyle_StyleHint(const QCommonStyle* self, int sh); +QIcon* QCommonStyle_StandardIcon(const QCommonStyle* self, int standardIcon); +QPixmap* QCommonStyle_StandardPixmap(const QCommonStyle* self, int sp); +QPixmap* QCommonStyle_GeneratedIconPixmap(const QCommonStyle* self, int iconMode, QPixmap* pixmap, QStyleOption* opt); +int QCommonStyle_LayoutSpacing(const QCommonStyle* self, int control1, int control2, int orientation); void QCommonStyle_Polish(QCommonStyle* self, QPalette* param1); void QCommonStyle_PolishWithApp(QCommonStyle* self, QApplication* app); void QCommonStyle_PolishWithWidget(QCommonStyle* self, QWidget* widget); @@ -71,24 +71,24 @@ struct miqt_string* QCommonStyle_Tr2(const char* s, const char* c); struct miqt_string* QCommonStyle_Tr3(const char* s, const char* c, int n); struct miqt_string* QCommonStyle_TrUtf82(const char* s, const char* c); struct miqt_string* QCommonStyle_TrUtf83(const char* s, const char* c, int n); -void QCommonStyle_DrawPrimitive4(const QCommonStyle* self, uintptr_t pe, QStyleOption* opt, QPainter* p, QWidget* w); -void QCommonStyle_DrawControl4(const QCommonStyle* self, uintptr_t element, QStyleOption* opt, QPainter* p, QWidget* w); -QRect* QCommonStyle_SubElementRect3(const QCommonStyle* self, uintptr_t r, QStyleOption* opt, QWidget* widget); -void QCommonStyle_DrawComplexControl4(const QCommonStyle* self, uintptr_t cc, QStyleOptionComplex* opt, QPainter* p, QWidget* w); -uintptr_t QCommonStyle_HitTestComplexControl4(const QCommonStyle* self, uintptr_t cc, QStyleOptionComplex* opt, QPoint* pt, QWidget* w); -QRect* QCommonStyle_SubControlRect4(const QCommonStyle* self, uintptr_t cc, QStyleOptionComplex* opt, uintptr_t sc, QWidget* w); -QSize* QCommonStyle_SizeFromContents4(const QCommonStyle* self, uintptr_t ct, QStyleOption* opt, QSize* contentsSize, QWidget* widget); -int QCommonStyle_PixelMetric2(const QCommonStyle* self, uintptr_t m, QStyleOption* opt); -int QCommonStyle_PixelMetric3(const QCommonStyle* self, uintptr_t m, QStyleOption* opt, QWidget* widget); -int QCommonStyle_StyleHint2(const QCommonStyle* self, uintptr_t sh, QStyleOption* opt); -int QCommonStyle_StyleHint3(const QCommonStyle* self, uintptr_t sh, QStyleOption* opt, QWidget* w); -int QCommonStyle_StyleHint4(const QCommonStyle* self, uintptr_t sh, QStyleOption* opt, QWidget* w, QStyleHintReturn* shret); -QIcon* QCommonStyle_StandardIcon2(const QCommonStyle* self, uintptr_t standardIcon, QStyleOption* opt); -QIcon* QCommonStyle_StandardIcon3(const QCommonStyle* self, uintptr_t standardIcon, QStyleOption* opt, QWidget* widget); -QPixmap* QCommonStyle_StandardPixmap2(const QCommonStyle* self, uintptr_t sp, QStyleOption* opt); -QPixmap* QCommonStyle_StandardPixmap3(const QCommonStyle* self, uintptr_t sp, QStyleOption* opt, QWidget* widget); -int QCommonStyle_LayoutSpacing4(const QCommonStyle* self, uintptr_t control1, uintptr_t control2, uintptr_t orientation, QStyleOption* option); -int QCommonStyle_LayoutSpacing5(const QCommonStyle* self, uintptr_t control1, uintptr_t control2, uintptr_t orientation, QStyleOption* option, QWidget* widget); +void QCommonStyle_DrawPrimitive4(const QCommonStyle* self, int pe, QStyleOption* opt, QPainter* p, QWidget* w); +void QCommonStyle_DrawControl4(const QCommonStyle* self, int element, QStyleOption* opt, QPainter* p, QWidget* w); +QRect* QCommonStyle_SubElementRect3(const QCommonStyle* self, int r, QStyleOption* opt, QWidget* widget); +void QCommonStyle_DrawComplexControl4(const QCommonStyle* self, int cc, QStyleOptionComplex* opt, QPainter* p, QWidget* w); +int QCommonStyle_HitTestComplexControl4(const QCommonStyle* self, int cc, QStyleOptionComplex* opt, QPoint* pt, QWidget* w); +QRect* QCommonStyle_SubControlRect4(const QCommonStyle* self, int cc, QStyleOptionComplex* opt, int sc, QWidget* w); +QSize* QCommonStyle_SizeFromContents4(const QCommonStyle* self, int ct, QStyleOption* opt, QSize* contentsSize, QWidget* widget); +int QCommonStyle_PixelMetric2(const QCommonStyle* self, int m, QStyleOption* opt); +int QCommonStyle_PixelMetric3(const QCommonStyle* self, int m, QStyleOption* opt, QWidget* widget); +int QCommonStyle_StyleHint2(const QCommonStyle* self, int sh, QStyleOption* opt); +int QCommonStyle_StyleHint3(const QCommonStyle* self, int sh, QStyleOption* opt, QWidget* w); +int QCommonStyle_StyleHint4(const QCommonStyle* self, int sh, QStyleOption* opt, QWidget* w, QStyleHintReturn* shret); +QIcon* QCommonStyle_StandardIcon2(const QCommonStyle* self, int standardIcon, QStyleOption* opt); +QIcon* QCommonStyle_StandardIcon3(const QCommonStyle* self, int standardIcon, QStyleOption* opt, QWidget* widget); +QPixmap* QCommonStyle_StandardPixmap2(const QCommonStyle* self, int sp, QStyleOption* opt); +QPixmap* QCommonStyle_StandardPixmap3(const QCommonStyle* self, int sp, QStyleOption* opt, QWidget* widget); +int QCommonStyle_LayoutSpacing4(const QCommonStyle* self, int control1, int control2, int orientation, QStyleOption* option); +int QCommonStyle_LayoutSpacing5(const QCommonStyle* self, int control1, int control2, int orientation, QStyleOption* option, QWidget* widget); void QCommonStyle_Delete(QCommonStyle* self); #ifdef __cplusplus diff --git a/qt/gen_qcompleter.cpp b/qt/gen_qcompleter.cpp index c78eef0..20e3c58 100644 --- a/qt/gen_qcompleter.cpp +++ b/qt/gen_qcompleter.cpp @@ -86,13 +86,13 @@ QAbstractItemModel* QCompleter_Model(const QCompleter* self) { return self->model(); } -void QCompleter_SetCompletionMode(QCompleter* self, uintptr_t mode) { +void QCompleter_SetCompletionMode(QCompleter* self, int mode) { self->setCompletionMode(static_cast(mode)); } -uintptr_t QCompleter_CompletionMode(const QCompleter* self) { +int QCompleter_CompletionMode(const QCompleter* self) { QCompleter::CompletionMode _ret = self->completionMode(); - return static_cast(_ret); + return static_cast(_ret); } void QCompleter_SetFilterMode(QCompleter* self, int filterMode) { @@ -112,22 +112,22 @@ void QCompleter_SetPopup(QCompleter* self, QAbstractItemView* popup) { self->setPopup(popup); } -void QCompleter_SetCaseSensitivity(QCompleter* self, uintptr_t caseSensitivity) { +void QCompleter_SetCaseSensitivity(QCompleter* self, int caseSensitivity) { self->setCaseSensitivity(static_cast(caseSensitivity)); } -uintptr_t QCompleter_CaseSensitivity(const QCompleter* self) { +int QCompleter_CaseSensitivity(const QCompleter* self) { Qt::CaseSensitivity _ret = self->caseSensitivity(); - return static_cast(_ret); + return static_cast(_ret); } -void QCompleter_SetModelSorting(QCompleter* self, uintptr_t sorting) { +void QCompleter_SetModelSorting(QCompleter* self, int sorting) { self->setModelSorting(static_cast(sorting)); } -uintptr_t QCompleter_ModelSorting(const QCompleter* self) { +int QCompleter_ModelSorting(const QCompleter* self) { QCompleter::ModelSorting _ret = self->modelSorting(); - return static_cast(_ret); + return static_cast(_ret); } void QCompleter_SetCompletionColumn(QCompleter* self, int column) { diff --git a/qt/gen_qcompleter.go b/qt/gen_qcompleter.go index 962630c..1930c8c 100644 --- a/qt/gen_qcompleter.go +++ b/qt/gen_qcompleter.go @@ -148,7 +148,7 @@ func (this *QCompleter) Model() *QAbstractItemModel { } func (this *QCompleter) SetCompletionMode(mode QCompleter__CompletionMode) { - C.QCompleter_SetCompletionMode(this.h, (C.uintptr_t)(mode)) + C.QCompleter_SetCompletionMode(this.h, (C.int)(mode)) } func (this *QCompleter) CompletionMode() QCompleter__CompletionMode { @@ -156,7 +156,7 @@ func (this *QCompleter) CompletionMode() QCompleter__CompletionMode { } func (this *QCompleter) SetFilterMode(filterMode int) { - C.QCompleter_SetFilterMode(this.h, (C.int)(filterMode)) + C.QCompleter_SetFilterMode(this.h, filterMode) } func (this *QCompleter) FilterMode() int { @@ -172,7 +172,7 @@ func (this *QCompleter) SetPopup(popup *QAbstractItemView) { } func (this *QCompleter) SetCaseSensitivity(caseSensitivity CaseSensitivity) { - C.QCompleter_SetCaseSensitivity(this.h, (C.uintptr_t)(caseSensitivity)) + C.QCompleter_SetCaseSensitivity(this.h, (C.int)(caseSensitivity)) } func (this *QCompleter) CaseSensitivity() CaseSensitivity { @@ -180,7 +180,7 @@ func (this *QCompleter) CaseSensitivity() CaseSensitivity { } func (this *QCompleter) SetModelSorting(sorting QCompleter__ModelSorting) { - C.QCompleter_SetModelSorting(this.h, (C.uintptr_t)(sorting)) + C.QCompleter_SetModelSorting(this.h, (C.int)(sorting)) } func (this *QCompleter) ModelSorting() QCompleter__ModelSorting { diff --git a/qt/gen_qcompleter.h b/qt/gen_qcompleter.h index 76176b0..fa876b4 100644 --- a/qt/gen_qcompleter.h +++ b/qt/gen_qcompleter.h @@ -46,16 +46,16 @@ void QCompleter_SetWidget(QCompleter* self, QWidget* widget); QWidget* QCompleter_Widget(const QCompleter* self); void QCompleter_SetModel(QCompleter* self, QAbstractItemModel* c); QAbstractItemModel* QCompleter_Model(const QCompleter* self); -void QCompleter_SetCompletionMode(QCompleter* self, uintptr_t mode); -uintptr_t QCompleter_CompletionMode(const QCompleter* self); +void QCompleter_SetCompletionMode(QCompleter* self, int mode); +int QCompleter_CompletionMode(const QCompleter* self); void QCompleter_SetFilterMode(QCompleter* self, int filterMode); int QCompleter_FilterMode(const QCompleter* self); QAbstractItemView* QCompleter_Popup(const QCompleter* self); void QCompleter_SetPopup(QCompleter* self, QAbstractItemView* popup); -void QCompleter_SetCaseSensitivity(QCompleter* self, uintptr_t caseSensitivity); -uintptr_t QCompleter_CaseSensitivity(const QCompleter* self); -void QCompleter_SetModelSorting(QCompleter* self, uintptr_t sorting); -uintptr_t QCompleter_ModelSorting(const QCompleter* self); +void QCompleter_SetCaseSensitivity(QCompleter* self, int caseSensitivity); +int QCompleter_CaseSensitivity(const QCompleter* self); +void QCompleter_SetModelSorting(QCompleter* self, int sorting); +int QCompleter_ModelSorting(const QCompleter* self); void QCompleter_SetCompletionColumn(QCompleter* self, int column); int QCompleter_CompletionColumn(const QCompleter* self); void QCompleter_SetCompletionRole(QCompleter* self, int role); diff --git a/qt/gen_qconcatenatetablesproxymodel.cpp b/qt/gen_qconcatenatetablesproxymodel.cpp index a7fc687..216c73c 100644 --- a/qt/gen_qconcatenatetablesproxymodel.cpp +++ b/qt/gen_qconcatenatetablesproxymodel.cpp @@ -41,7 +41,7 @@ struct miqt_string* QConcatenateTablesProxyModel_TrUtf8(const char* s) { } struct miqt_array* QConcatenateTablesProxyModel_SourceModels(const QConcatenateTablesProxyModel* self) { - QList _ret = self->sourceModels(); + QList _ret = self->sourceModels(); // Convert QList<> from C++ memory to manually-managed C memory QAbstractItemModel** _arr = static_cast(malloc(sizeof(QAbstractItemModel*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -94,7 +94,7 @@ int QConcatenateTablesProxyModel_RowCount(const QConcatenateTablesProxyModel* se return self->rowCount(); } -QVariant* QConcatenateTablesProxyModel_HeaderData(const QConcatenateTablesProxyModel* self, int section, uintptr_t orientation) { +QVariant* QConcatenateTablesProxyModel_HeaderData(const QConcatenateTablesProxyModel* self, int section, int orientation) { return new QVariant(self->headerData(static_cast(section), static_cast(orientation))); } @@ -128,11 +128,11 @@ QMimeData* QConcatenateTablesProxyModel_MimeData(const QConcatenateTablesProxyMo return self->mimeData(indexes_QList); } -bool QConcatenateTablesProxyModel_CanDropMimeData(const QConcatenateTablesProxyModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent) { +bool QConcatenateTablesProxyModel_CanDropMimeData(const QConcatenateTablesProxyModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent) { return self->canDropMimeData(data, static_cast(action), static_cast(row), static_cast(column), *parent); } -bool QConcatenateTablesProxyModel_DropMimeData(QConcatenateTablesProxyModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent) { +bool QConcatenateTablesProxyModel_DropMimeData(QConcatenateTablesProxyModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent) { return self->dropMimeData(data, static_cast(action), static_cast(row), static_cast(column), *parent); } @@ -184,7 +184,7 @@ int QConcatenateTablesProxyModel_RowCount1(const QConcatenateTablesProxyModel* s return self->rowCount(*parent); } -QVariant* QConcatenateTablesProxyModel_HeaderData3(const QConcatenateTablesProxyModel* self, int section, uintptr_t orientation, int role) { +QVariant* QConcatenateTablesProxyModel_HeaderData3(const QConcatenateTablesProxyModel* self, int section, int orientation, int role) { return new QVariant(self->headerData(static_cast(section), static_cast(orientation), static_cast(role))); } diff --git a/qt/gen_qconcatenatetablesproxymodel.go b/qt/gen_qconcatenatetablesproxymodel.go index cede7ce..00ada52 100644 --- a/qt/gen_qconcatenatetablesproxymodel.go +++ b/qt/gen_qconcatenatetablesproxymodel.go @@ -137,7 +137,7 @@ func (this *QConcatenateTablesProxyModel) RowCount() int { } func (this *QConcatenateTablesProxyModel) HeaderData(section int, orientation Orientation) *QVariant { - _ret := C.QConcatenateTablesProxyModel_HeaderData(this.h, (C.int)(section), (C.uintptr_t)(orientation)) + _ret := C.QConcatenateTablesProxyModel_HeaderData(this.h, (C.int)(section), (C.int)(orientation)) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -174,11 +174,11 @@ func (this *QConcatenateTablesProxyModel) MimeData(indexes []QModelIndex) *QMime } func (this *QConcatenateTablesProxyModel) CanDropMimeData(data *QMimeData, action DropAction, row int, column int, parent *QModelIndex) bool { - return (bool)(C.QConcatenateTablesProxyModel_CanDropMimeData(this.h, data.cPointer(), (C.uintptr_t)(action), (C.int)(row), (C.int)(column), parent.cPointer())) + return (bool)(C.QConcatenateTablesProxyModel_CanDropMimeData(this.h, data.cPointer(), (C.int)(action), (C.int)(row), (C.int)(column), parent.cPointer())) } func (this *QConcatenateTablesProxyModel) DropMimeData(data *QMimeData, action DropAction, row int, column int, parent *QModelIndex) bool { - return (bool)(C.QConcatenateTablesProxyModel_DropMimeData(this.h, data.cPointer(), (C.uintptr_t)(action), (C.int)(row), (C.int)(column), parent.cPointer())) + return (bool)(C.QConcatenateTablesProxyModel_DropMimeData(this.h, data.cPointer(), (C.int)(action), (C.int)(row), (C.int)(column), parent.cPointer())) } func (this *QConcatenateTablesProxyModel) Span(index *QModelIndex) *QSize { @@ -255,7 +255,7 @@ func (this *QConcatenateTablesProxyModel) RowCount1(parent *QModelIndex) int { } 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)) + _ret := C.QConcatenateTablesProxyModel_HeaderData3(this.h, (C.int)(section), (C.int)(orientation), (C.int)(role)) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qconcatenatetablesproxymodel.h b/qt/gen_qconcatenatetablesproxymodel.h index bcb6363..5e5df91 100644 --- a/qt/gen_qconcatenatetablesproxymodel.h +++ b/qt/gen_qconcatenatetablesproxymodel.h @@ -49,12 +49,12 @@ int QConcatenateTablesProxyModel_Flags(const QConcatenateTablesProxyModel* self, QModelIndex* QConcatenateTablesProxyModel_Index(const QConcatenateTablesProxyModel* self, int row, int column); QModelIndex* QConcatenateTablesProxyModel_Parent(const QConcatenateTablesProxyModel* self, QModelIndex* index); int QConcatenateTablesProxyModel_RowCount(const QConcatenateTablesProxyModel* self); -QVariant* QConcatenateTablesProxyModel_HeaderData(const QConcatenateTablesProxyModel* self, int section, uintptr_t orientation); +QVariant* QConcatenateTablesProxyModel_HeaderData(const QConcatenateTablesProxyModel* self, int section, int orientation); int QConcatenateTablesProxyModel_ColumnCount(const QConcatenateTablesProxyModel* self); struct miqt_array* QConcatenateTablesProxyModel_MimeTypes(const QConcatenateTablesProxyModel* self); QMimeData* QConcatenateTablesProxyModel_MimeData(const QConcatenateTablesProxyModel* self, struct miqt_array* /* of QModelIndex* */ indexes); -bool QConcatenateTablesProxyModel_CanDropMimeData(const QConcatenateTablesProxyModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent); -bool QConcatenateTablesProxyModel_DropMimeData(QConcatenateTablesProxyModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent); +bool QConcatenateTablesProxyModel_CanDropMimeData(const QConcatenateTablesProxyModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent); +bool QConcatenateTablesProxyModel_DropMimeData(QConcatenateTablesProxyModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent); QSize* QConcatenateTablesProxyModel_Span(const QConcatenateTablesProxyModel* self, QModelIndex* index); struct miqt_string* QConcatenateTablesProxyModel_Tr2(const char* s, const char* c); struct miqt_string* QConcatenateTablesProxyModel_Tr3(const char* s, const char* c, int n); @@ -64,7 +64,7 @@ QVariant* QConcatenateTablesProxyModel_Data2(const QConcatenateTablesProxyModel* bool QConcatenateTablesProxyModel_SetData3(QConcatenateTablesProxyModel* self, QModelIndex* index, QVariant* value, int role); QModelIndex* QConcatenateTablesProxyModel_Index3(const QConcatenateTablesProxyModel* self, int row, int column, QModelIndex* parent); int QConcatenateTablesProxyModel_RowCount1(const QConcatenateTablesProxyModel* self, QModelIndex* parent); -QVariant* QConcatenateTablesProxyModel_HeaderData3(const QConcatenateTablesProxyModel* self, int section, uintptr_t orientation, int role); +QVariant* QConcatenateTablesProxyModel_HeaderData3(const QConcatenateTablesProxyModel* self, int section, int orientation, int role); int QConcatenateTablesProxyModel_ColumnCount1(const QConcatenateTablesProxyModel* self, QModelIndex* parent); void QConcatenateTablesProxyModel_Delete(QConcatenateTablesProxyModel* self); diff --git a/qt/gen_qcoreapplication.cpp b/qt/gen_qcoreapplication.cpp index ac558fa..002500e 100644 --- a/qt/gen_qcoreapplication.cpp +++ b/qt/gen_qcoreapplication.cpp @@ -55,11 +55,11 @@ struct miqt_array* QCoreApplication_Arguments() { return _out; } -void QCoreApplication_SetAttribute(uintptr_t attribute) { +void QCoreApplication_SetAttribute(int attribute) { QCoreApplication::setAttribute(static_cast(attribute)); } -bool QCoreApplication_TestAttribute(uintptr_t attribute) { +bool QCoreApplication_TestAttribute(int attribute) { return QCoreApplication::testAttribute(static_cast(attribute)); } @@ -194,7 +194,8 @@ struct miqt_string* QCoreApplication_ApplicationFilePath() { } long long QCoreApplication_ApplicationPid() { - return QCoreApplication::applicationPid(); + qint64 _ret = QCoreApplication::applicationPid(); + return static_cast(_ret); } void QCoreApplication_SetLibraryPaths(struct miqt_array* /* of struct miqt_string* */ libraryPaths) { @@ -341,7 +342,7 @@ struct miqt_string* QCoreApplication_TrUtf83(const char* s, const char* c, int n return miqt_strdup(_b.data(), _b.length()); } -void QCoreApplication_SetAttribute2(uintptr_t attribute, bool on) { +void QCoreApplication_SetAttribute2(int attribute, bool on) { QCoreApplication::setAttribute(static_cast(attribute), on); } diff --git a/qt/gen_qcoreapplication.go b/qt/gen_qcoreapplication.go index c3d8d03..c608d0b 100644 --- a/qt/gen_qcoreapplication.go +++ b/qt/gen_qcoreapplication.go @@ -106,11 +106,11 @@ func QCoreApplication_Arguments() []string { } func QCoreApplication_SetAttribute(attribute ApplicationAttribute) { - C.QCoreApplication_SetAttribute((C.uintptr_t)(attribute)) + C.QCoreApplication_SetAttribute((C.int)(attribute)) } func QCoreApplication_TestAttribute(attribute ApplicationAttribute) bool { - return (bool)(C.QCoreApplication_TestAttribute((C.uintptr_t)(attribute))) + return (bool)(C.QCoreApplication_TestAttribute((C.int)(attribute))) } func QCoreApplication_SetOrganizationDomain(orgDomain string) { @@ -186,7 +186,7 @@ func QCoreApplication_ProcessEvents() { } func QCoreApplication_ProcessEvents2(flags int, maxtime int) { - C.QCoreApplication_ProcessEvents2((C.int)(flags), (C.int)(maxtime)) + C.QCoreApplication_ProcessEvents2(flags, (C.int)(maxtime)) } func QCoreApplication_Exit() { @@ -447,11 +447,11 @@ func QCoreApplication_TrUtf83(s string, c string, n int) string { } func QCoreApplication_SetAttribute2(attribute ApplicationAttribute, on bool) { - C.QCoreApplication_SetAttribute2((C.uintptr_t)(attribute), (C.bool)(on)) + C.QCoreApplication_SetAttribute2((C.int)(attribute), (C.bool)(on)) } func QCoreApplication_ProcessEvents1(flags int) { - C.QCoreApplication_ProcessEvents1((C.int)(flags)) + C.QCoreApplication_ProcessEvents1(flags) } func QCoreApplication_Exit1(retcode int) { diff --git a/qt/gen_qcoreapplication.h b/qt/gen_qcoreapplication.h index 6f34529..ecdfc66 100644 --- a/qt/gen_qcoreapplication.h +++ b/qt/gen_qcoreapplication.h @@ -37,8 +37,8 @@ QMetaObject* QCoreApplication_MetaObject(const QCoreApplication* self); struct miqt_string* QCoreApplication_Tr(const char* s); struct miqt_string* QCoreApplication_TrUtf8(const char* s); struct miqt_array* QCoreApplication_Arguments(); -void QCoreApplication_SetAttribute(uintptr_t attribute); -bool QCoreApplication_TestAttribute(uintptr_t attribute); +void QCoreApplication_SetAttribute(int attribute); +bool QCoreApplication_TestAttribute(int attribute); void QCoreApplication_SetOrganizationDomain(struct miqt_string* orgDomain); struct miqt_string* QCoreApplication_OrganizationDomain(); void QCoreApplication_SetOrganizationName(struct miqt_string* orgName); @@ -92,7 +92,7 @@ struct miqt_string* QCoreApplication_Tr2(const char* s, const char* c); struct miqt_string* QCoreApplication_Tr3(const char* s, const char* c, int n); struct miqt_string* QCoreApplication_TrUtf82(const char* s, const char* c); struct miqt_string* QCoreApplication_TrUtf83(const char* s, const char* c, int n); -void QCoreApplication_SetAttribute2(uintptr_t attribute, bool on); +void QCoreApplication_SetAttribute2(int attribute, bool on); void QCoreApplication_ProcessEvents1(int flags); void QCoreApplication_Exit1(int retcode); void QCoreApplication_PostEvent3(QObject* receiver, QEvent* event, int priority); diff --git a/qt/gen_qcoreevent.cpp b/qt/gen_qcoreevent.cpp index 529ff72..306f3f6 100644 --- a/qt/gen_qcoreevent.cpp +++ b/qt/gen_qcoreevent.cpp @@ -9,7 +9,7 @@ #include "gen_qcoreevent.h" #include "_cgo_export.h" -QEvent* QEvent_new(uintptr_t typeVal) { +QEvent* QEvent_new(int typeVal) { return new QEvent(static_cast(typeVal)); } @@ -21,9 +21,9 @@ void QEvent_OperatorAssign(QEvent* self, QEvent* other) { self->operator=(*other); } -uintptr_t QEvent_Type(const QEvent* self) { +int QEvent_Type(const QEvent* self) { QEvent::Type _ret = self->type(); - return static_cast(_ret); + return static_cast(_ret); } bool QEvent_Spontaneous(const QEvent* self) { @@ -74,7 +74,7 @@ void QTimerEvent_Delete(QTimerEvent* self) { delete self; } -QChildEvent* QChildEvent_new(uintptr_t typeVal, QObject* child) { +QChildEvent* QChildEvent_new(int typeVal, QObject* child) { return new QChildEvent(static_cast(typeVal), child); } diff --git a/qt/gen_qcoreevent.go b/qt/gen_qcoreevent.go index 8db7c5b..f48e80c 100644 --- a/qt/gen_qcoreevent.go +++ b/qt/gen_qcoreevent.go @@ -214,7 +214,7 @@ func newQEvent_U(h unsafe.Pointer) *QEvent { // NewQEvent constructs a new QEvent object. func NewQEvent(typeVal QEvent__Type) *QEvent { - ret := C.QEvent_new((C.uintptr_t)(typeVal)) + ret := C.QEvent_new((C.int)(typeVal)) return newQEvent(ret) } @@ -352,7 +352,7 @@ func newQChildEvent_U(h unsafe.Pointer) *QChildEvent { // NewQChildEvent constructs a new QChildEvent object. func NewQChildEvent(typeVal QEvent__Type, child *QObject) *QChildEvent { - ret := C.QChildEvent_new((C.uintptr_t)(typeVal), child.cPointer()) + ret := C.QChildEvent_new((C.int)(typeVal), child.cPointer()) return newQChildEvent(ret) } diff --git a/qt/gen_qcoreevent.h b/qt/gen_qcoreevent.h index 89f0904..57e3c3d 100644 --- a/qt/gen_qcoreevent.h +++ b/qt/gen_qcoreevent.h @@ -31,10 +31,10 @@ typedef struct QObject QObject; typedef struct QTimerEvent QTimerEvent; #endif -QEvent* QEvent_new(uintptr_t typeVal); +QEvent* QEvent_new(int typeVal); QEvent* QEvent_new2(QEvent* other); void QEvent_OperatorAssign(QEvent* self, QEvent* other); -uintptr_t QEvent_Type(const QEvent* self); +int QEvent_Type(const QEvent* self); bool QEvent_Spontaneous(const QEvent* self); void QEvent_SetAccepted(QEvent* self, bool accepted); bool QEvent_IsAccepted(const QEvent* self); @@ -49,7 +49,7 @@ QTimerEvent* QTimerEvent_new2(QTimerEvent* param1); int QTimerEvent_TimerId(const QTimerEvent* self); void QTimerEvent_Delete(QTimerEvent* self); -QChildEvent* QChildEvent_new(uintptr_t typeVal, QObject* child); +QChildEvent* QChildEvent_new(int typeVal, QObject* child); QChildEvent* QChildEvent_new2(QChildEvent* param1); QObject* QChildEvent_Child(const QChildEvent* self); bool QChildEvent_Added(const QChildEvent* self); diff --git a/qt/gen_qcryptographichash.cpp b/qt/gen_qcryptographichash.cpp index efe6f91..63ceba6 100644 --- a/qt/gen_qcryptographichash.cpp +++ b/qt/gen_qcryptographichash.cpp @@ -5,7 +5,7 @@ #include "gen_qcryptographichash.h" #include "_cgo_export.h" -QCryptographicHash* QCryptographicHash_new(uintptr_t method) { +QCryptographicHash* QCryptographicHash_new(int method) { return new QCryptographicHash(static_cast(method)); } @@ -29,11 +29,11 @@ QByteArray* QCryptographicHash_Result(const QCryptographicHash* self) { return new QByteArray(self->result()); } -QByteArray* QCryptographicHash_Hash(QByteArray* data, uintptr_t method) { +QByteArray* QCryptographicHash_Hash(QByteArray* data, int method) { return new QByteArray(QCryptographicHash::hash(*data, static_cast(method))); } -int QCryptographicHash_HashLength(uintptr_t method) { +int QCryptographicHash_HashLength(int method) { return QCryptographicHash::hashLength(static_cast(method)); } diff --git a/qt/gen_qcryptographichash.go b/qt/gen_qcryptographichash.go index 6098e38..2bde2d8 100644 --- a/qt/gen_qcryptographichash.go +++ b/qt/gen_qcryptographichash.go @@ -61,7 +61,7 @@ func newQCryptographicHash_U(h unsafe.Pointer) *QCryptographicHash { // NewQCryptographicHash constructs a new QCryptographicHash object. func NewQCryptographicHash(method QCryptographicHash__Algorithm) *QCryptographicHash { - ret := C.QCryptographicHash_new((C.uintptr_t)(method)) + ret := C.QCryptographicHash_new((C.int)(method)) return newQCryptographicHash(ret) } @@ -91,14 +91,14 @@ func (this *QCryptographicHash) Result() *QByteArray { } func QCryptographicHash_Hash(data *QByteArray, method QCryptographicHash__Algorithm) *QByteArray { - _ret := C.QCryptographicHash_Hash(data.cPointer(), (C.uintptr_t)(method)) + _ret := C.QCryptographicHash_Hash(data.cPointer(), (C.int)(method)) _goptr := newQByteArray(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QCryptographicHash_HashLength(method QCryptographicHash__Algorithm) int { - return (int)(C.QCryptographicHash_HashLength((C.uintptr_t)(method))) + return (int)(C.QCryptographicHash_HashLength((C.int)(method))) } // Delete this object from C++ memory. diff --git a/qt/gen_qcryptographichash.h b/qt/gen_qcryptographichash.h index b38b486..2f48421 100644 --- a/qt/gen_qcryptographichash.h +++ b/qt/gen_qcryptographichash.h @@ -23,14 +23,14 @@ typedef struct QCryptographicHash QCryptographicHash; typedef struct QIODevice QIODevice; #endif -QCryptographicHash* QCryptographicHash_new(uintptr_t method); +QCryptographicHash* QCryptographicHash_new(int method); void QCryptographicHash_Reset(QCryptographicHash* self); void QCryptographicHash_AddData(QCryptographicHash* self, const char* data, int length); void QCryptographicHash_AddDataWithData(QCryptographicHash* self, QByteArray* data); bool QCryptographicHash_AddDataWithDevice(QCryptographicHash* self, QIODevice* device); QByteArray* QCryptographicHash_Result(const QCryptographicHash* self); -QByteArray* QCryptographicHash_Hash(QByteArray* data, uintptr_t method); -int QCryptographicHash_HashLength(uintptr_t method); +QByteArray* QCryptographicHash_Hash(QByteArray* data, int method); +int QCryptographicHash_HashLength(int method); void QCryptographicHash_Delete(QCryptographicHash* self); #ifdef __cplusplus diff --git a/qt/gen_qcursor.cpp b/qt/gen_qcursor.cpp index 5323392..4c5ae79 100644 --- a/qt/gen_qcursor.cpp +++ b/qt/gen_qcursor.cpp @@ -11,7 +11,7 @@ QCursor* QCursor_new() { return new QCursor(); } -QCursor* QCursor_new2(uintptr_t shape) { +QCursor* QCursor_new2(int shape) { return new QCursor(static_cast(shape)); } @@ -51,12 +51,12 @@ void QCursor_Swap(QCursor* self, QCursor* other) { self->swap(*other); } -uintptr_t QCursor_Shape(const QCursor* self) { +int QCursor_Shape(const QCursor* self) { Qt::CursorShape _ret = self->shape(); - return static_cast(_ret); + return static_cast(_ret); } -void QCursor_SetShape(QCursor* self, uintptr_t newShape) { +void QCursor_SetShape(QCursor* self, int newShape) { self->setShape(static_cast(newShape)); } @@ -68,11 +68,11 @@ QBitmap* QCursor_Mask(const QCursor* self) { return (QBitmap*) self->mask(); } -QBitmap* QCursor_BitmapWithQtReturnByValueConstant(const QCursor* self, uintptr_t param1) { +QBitmap* QCursor_BitmapWithQtReturnByValueConstant(const QCursor* self, int param1) { return new QBitmap(self->bitmap(static_cast(param1))); } -QBitmap* QCursor_MaskWithQtReturnByValueConstant(const QCursor* self, uintptr_t param1) { +QBitmap* QCursor_MaskWithQtReturnByValueConstant(const QCursor* self, int param1) { return new QBitmap(self->mask(static_cast(param1))); } diff --git a/qt/gen_qcursor.go b/qt/gen_qcursor.go index 1dd09da..04044a2 100644 --- a/qt/gen_qcursor.go +++ b/qt/gen_qcursor.go @@ -43,7 +43,7 @@ func NewQCursor() *QCursor { // NewQCursor2 constructs a new QCursor object. func NewQCursor2(shape CursorShape) *QCursor { - ret := C.QCursor_new2((C.uintptr_t)(shape)) + ret := C.QCursor_new2((C.int)(shape)) return newQCursor(ret) } @@ -102,7 +102,7 @@ func (this *QCursor) Shape() CursorShape { } func (this *QCursor) SetShape(newShape CursorShape) { - C.QCursor_SetShape(this.h, (C.uintptr_t)(newShape)) + C.QCursor_SetShape(this.h, (C.int)(newShape)) } func (this *QCursor) Bitmap() *QBitmap { @@ -114,14 +114,14 @@ func (this *QCursor) Mask() *QBitmap { } func (this *QCursor) BitmapWithQtReturnByValueConstant(param1 ReturnByValueConstant) *QBitmap { - _ret := C.QCursor_BitmapWithQtReturnByValueConstant(this.h, (C.uintptr_t)(param1)) + _ret := C.QCursor_BitmapWithQtReturnByValueConstant(this.h, (C.int)(param1)) _goptr := newQBitmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QCursor) MaskWithQtReturnByValueConstant(param1 ReturnByValueConstant) *QBitmap { - _ret := C.QCursor_MaskWithQtReturnByValueConstant(this.h, (C.uintptr_t)(param1)) + _ret := C.QCursor_MaskWithQtReturnByValueConstant(this.h, (C.int)(param1)) _goptr := newQBitmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qcursor.h b/qt/gen_qcursor.h index 678fe4c..8e34845 100644 --- a/qt/gen_qcursor.h +++ b/qt/gen_qcursor.h @@ -28,7 +28,7 @@ typedef struct QScreen QScreen; #endif QCursor* QCursor_new(); -QCursor* QCursor_new2(uintptr_t shape); +QCursor* QCursor_new2(int shape); QCursor* QCursor_new3(QBitmap* bitmap, QBitmap* mask); QCursor* QCursor_new4(QPixmap* pixmap); QCursor* QCursor_new5(QCursor* cursor); @@ -38,12 +38,12 @@ QCursor* QCursor_new8(QPixmap* pixmap, int hotX); QCursor* QCursor_new9(QPixmap* pixmap, int hotX, int hotY); void QCursor_OperatorAssign(QCursor* self, QCursor* cursor); void QCursor_Swap(QCursor* self, QCursor* other); -uintptr_t QCursor_Shape(const QCursor* self); -void QCursor_SetShape(QCursor* self, uintptr_t newShape); +int QCursor_Shape(const QCursor* self); +void QCursor_SetShape(QCursor* self, int newShape); QBitmap* QCursor_Bitmap(const QCursor* self); QBitmap* QCursor_Mask(const QCursor* self); -QBitmap* QCursor_BitmapWithQtReturnByValueConstant(const QCursor* self, uintptr_t param1); -QBitmap* QCursor_MaskWithQtReturnByValueConstant(const QCursor* self, uintptr_t param1); +QBitmap* QCursor_BitmapWithQtReturnByValueConstant(const QCursor* self, int param1); +QBitmap* QCursor_MaskWithQtReturnByValueConstant(const QCursor* self, int param1); QPixmap* QCursor_Pixmap(const QCursor* self); QPoint* QCursor_HotSpot(const QCursor* self); QPoint* QCursor_Pos(); diff --git a/qt/gen_qdatastream.cpp b/qt/gen_qdatastream.cpp index 9752efb..e476396 100644 --- a/qt/gen_qdatastream.cpp +++ b/qt/gen_qdatastream.cpp @@ -38,12 +38,12 @@ bool QDataStream_AtEnd(const QDataStream* self) { return self->atEnd(); } -uintptr_t QDataStream_Status(const QDataStream* self) { +int QDataStream_Status(const QDataStream* self) { QDataStream::Status _ret = self->status(); - return static_cast(_ret); + return static_cast(_ret); } -void QDataStream_SetStatus(QDataStream* self, uintptr_t status) { +void QDataStream_SetStatus(QDataStream* self, int status) { self->setStatus(static_cast(status)); } @@ -51,21 +51,21 @@ void QDataStream_ResetStatus(QDataStream* self) { self->resetStatus(); } -uintptr_t QDataStream_FloatingPointPrecision(const QDataStream* self) { +int QDataStream_FloatingPointPrecision(const QDataStream* self) { QDataStream::FloatingPointPrecision _ret = self->floatingPointPrecision(); - return static_cast(_ret); + return static_cast(_ret); } -void QDataStream_SetFloatingPointPrecision(QDataStream* self, uintptr_t precision) { +void QDataStream_SetFloatingPointPrecision(QDataStream* self, int precision) { self->setFloatingPointPrecision(static_cast(precision)); } -uintptr_t QDataStream_ByteOrder(const QDataStream* self) { +int QDataStream_ByteOrder(const QDataStream* self) { QDataStream::ByteOrder _ret = self->byteOrder(); - return static_cast(_ret); + return static_cast(_ret); } -void QDataStream_SetByteOrder(QDataStream* self, uintptr_t byteOrder) { +void QDataStream_SetByteOrder(QDataStream* self, int byteOrder) { self->setByteOrder(static_cast(byteOrder)); } diff --git a/qt/gen_qdatastream.go b/qt/gen_qdatastream.go index edf6f99..2763642 100644 --- a/qt/gen_qdatastream.go +++ b/qt/gen_qdatastream.go @@ -110,7 +110,7 @@ func NewQDataStream2(param1 *QIODevice) *QDataStream { // NewQDataStream3 constructs a new QDataStream object. func NewQDataStream3(param1 *QByteArray, flags int) *QDataStream { - ret := C.QDataStream_new3(param1.cPointer(), (C.int)(flags)) + ret := C.QDataStream_new3(param1.cPointer(), flags) return newQDataStream(ret) } @@ -141,7 +141,7 @@ func (this *QDataStream) Status() QDataStream__Status { } func (this *QDataStream) SetStatus(status QDataStream__Status) { - C.QDataStream_SetStatus(this.h, (C.uintptr_t)(status)) + C.QDataStream_SetStatus(this.h, (C.int)(status)) } func (this *QDataStream) ResetStatus() { @@ -153,7 +153,7 @@ func (this *QDataStream) FloatingPointPrecision() QDataStream__FloatingPointPrec } func (this *QDataStream) SetFloatingPointPrecision(precision QDataStream__FloatingPointPrecision) { - C.QDataStream_SetFloatingPointPrecision(this.h, (C.uintptr_t)(precision)) + C.QDataStream_SetFloatingPointPrecision(this.h, (C.int)(precision)) } func (this *QDataStream) ByteOrder() QDataStream__ByteOrder { @@ -161,7 +161,7 @@ func (this *QDataStream) ByteOrder() QDataStream__ByteOrder { } func (this *QDataStream) SetByteOrder(byteOrder QDataStream__ByteOrder) { - C.QDataStream_SetByteOrder(this.h, (C.uintptr_t)(byteOrder)) + C.QDataStream_SetByteOrder(this.h, (C.int)(byteOrder)) } func (this *QDataStream) Version() int { diff --git a/qt/gen_qdatastream.h b/qt/gen_qdatastream.h index 0968418..ac9982c 100644 --- a/qt/gen_qdatastream.h +++ b/qt/gen_qdatastream.h @@ -37,13 +37,13 @@ QIODevice* QDataStream_Device(const QDataStream* self); void QDataStream_SetDevice(QDataStream* self, QIODevice* device); void QDataStream_UnsetDevice(QDataStream* self); bool QDataStream_AtEnd(const QDataStream* self); -uintptr_t QDataStream_Status(const QDataStream* self); -void QDataStream_SetStatus(QDataStream* self, uintptr_t status); +int QDataStream_Status(const QDataStream* self); +void QDataStream_SetStatus(QDataStream* self, int status); void QDataStream_ResetStatus(QDataStream* self); -uintptr_t QDataStream_FloatingPointPrecision(const QDataStream* self); -void QDataStream_SetFloatingPointPrecision(QDataStream* self, uintptr_t precision); -uintptr_t QDataStream_ByteOrder(const QDataStream* self); -void QDataStream_SetByteOrder(QDataStream* self, uintptr_t byteOrder); +int QDataStream_FloatingPointPrecision(const QDataStream* self); +void QDataStream_SetFloatingPointPrecision(QDataStream* self, int precision); +int QDataStream_ByteOrder(const QDataStream* self); +void QDataStream_SetByteOrder(QDataStream* self, int byteOrder); int QDataStream_Version(const QDataStream* self); void QDataStream_SetVersion(QDataStream* self, int version); void QDataStream_OperatorShiftRight(QDataStream* self, signed char* i); diff --git a/qt/gen_qdatawidgetmapper.cpp b/qt/gen_qdatawidgetmapper.cpp index 243f784..6efe95b 100644 --- a/qt/gen_qdatawidgetmapper.cpp +++ b/qt/gen_qdatawidgetmapper.cpp @@ -63,22 +63,22 @@ QModelIndex* QDataWidgetMapper_RootIndex(const QDataWidgetMapper* self) { return new QModelIndex(self->rootIndex()); } -void QDataWidgetMapper_SetOrientation(QDataWidgetMapper* self, uintptr_t aOrientation) { +void QDataWidgetMapper_SetOrientation(QDataWidgetMapper* self, int aOrientation) { self->setOrientation(static_cast(aOrientation)); } -uintptr_t QDataWidgetMapper_Orientation(const QDataWidgetMapper* self) { +int QDataWidgetMapper_Orientation(const QDataWidgetMapper* self) { Qt::Orientation _ret = self->orientation(); - return static_cast(_ret); + return static_cast(_ret); } -void QDataWidgetMapper_SetSubmitPolicy(QDataWidgetMapper* self, uintptr_t policy) { +void QDataWidgetMapper_SetSubmitPolicy(QDataWidgetMapper* self, int policy) { self->setSubmitPolicy(static_cast(policy)); } -uintptr_t QDataWidgetMapper_SubmitPolicy(const QDataWidgetMapper* self) { +int QDataWidgetMapper_SubmitPolicy(const QDataWidgetMapper* self) { QDataWidgetMapper::SubmitPolicy _ret = self->submitPolicy(); - return static_cast(_ret); + return static_cast(_ret); } void QDataWidgetMapper_AddMapping(QDataWidgetMapper* self, QWidget* widget, int section) { diff --git a/qt/gen_qdatawidgetmapper.go b/qt/gen_qdatawidgetmapper.go index 01164ee..c1b9ae8 100644 --- a/qt/gen_qdatawidgetmapper.go +++ b/qt/gen_qdatawidgetmapper.go @@ -106,7 +106,7 @@ func (this *QDataWidgetMapper) RootIndex() *QModelIndex { } func (this *QDataWidgetMapper) SetOrientation(aOrientation Orientation) { - C.QDataWidgetMapper_SetOrientation(this.h, (C.uintptr_t)(aOrientation)) + C.QDataWidgetMapper_SetOrientation(this.h, (C.int)(aOrientation)) } func (this *QDataWidgetMapper) Orientation() Orientation { @@ -114,7 +114,7 @@ func (this *QDataWidgetMapper) Orientation() Orientation { } func (this *QDataWidgetMapper) SetSubmitPolicy(policy QDataWidgetMapper__SubmitPolicy) { - C.QDataWidgetMapper_SetSubmitPolicy(this.h, (C.uintptr_t)(policy)) + C.QDataWidgetMapper_SetSubmitPolicy(this.h, (C.int)(policy)) } func (this *QDataWidgetMapper) SubmitPolicy() QDataWidgetMapper__SubmitPolicy { diff --git a/qt/gen_qdatawidgetmapper.h b/qt/gen_qdatawidgetmapper.h index 3e9e11b..d50f5eb 100644 --- a/qt/gen_qdatawidgetmapper.h +++ b/qt/gen_qdatawidgetmapper.h @@ -44,10 +44,10 @@ void QDataWidgetMapper_SetItemDelegate(QDataWidgetMapper* self, QAbstractItemDel QAbstractItemDelegate* QDataWidgetMapper_ItemDelegate(const QDataWidgetMapper* self); void QDataWidgetMapper_SetRootIndex(QDataWidgetMapper* self, QModelIndex* index); QModelIndex* QDataWidgetMapper_RootIndex(const QDataWidgetMapper* self); -void QDataWidgetMapper_SetOrientation(QDataWidgetMapper* self, uintptr_t aOrientation); -uintptr_t QDataWidgetMapper_Orientation(const QDataWidgetMapper* self); -void QDataWidgetMapper_SetSubmitPolicy(QDataWidgetMapper* self, uintptr_t policy); -uintptr_t QDataWidgetMapper_SubmitPolicy(const QDataWidgetMapper* self); +void QDataWidgetMapper_SetOrientation(QDataWidgetMapper* self, int aOrientation); +int QDataWidgetMapper_Orientation(const QDataWidgetMapper* self); +void QDataWidgetMapper_SetSubmitPolicy(QDataWidgetMapper* self, int policy); +int QDataWidgetMapper_SubmitPolicy(const QDataWidgetMapper* self); void QDataWidgetMapper_AddMapping(QDataWidgetMapper* self, QWidget* widget, int section); void QDataWidgetMapper_AddMapping2(QDataWidgetMapper* self, QWidget* widget, int section, QByteArray* propertyName); void QDataWidgetMapper_RemoveMapping(QDataWidgetMapper* self, QWidget* widget); diff --git a/qt/gen_qdatetime.cpp b/qt/gen_qdatetime.cpp index d276f17..853236d 100644 --- a/qt/gen_qdatetime.cpp +++ b/qt/gen_qdatetime.cpp @@ -145,7 +145,7 @@ struct miqt_string* QDate_ToString(const QDate* self) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QDate_ToString2(const QDate* self, uintptr_t format, QCalendar* cal) { +struct miqt_string* QDate_ToString2(const QDate* self, int format, QCalendar* cal) { QString _ret = self->toString(static_cast(format), *cal); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -205,7 +205,8 @@ QDate* QDate_AddYears2(const QDate* self, int years, QCalendar* cal) { } long long QDate_DaysTo(const QDate* self, QDate* param1) { - return self->daysTo(*param1); + qint64 _ret = self->daysTo(*param1); + return static_cast(_ret); } bool QDate_OperatorEqual(const QDate* self, QDate* other) { @@ -266,65 +267,66 @@ QDate* QDate_FromJulianDay(long long jd_) { } long long QDate_ToJulianDay(const QDate* self) { - return self->toJulianDay(); + qint64 _ret = self->toJulianDay(); + return static_cast(_ret); } int QDate_WeekNumber1(const QDate* self, int* yearNum) { return self->weekNumber(static_cast(yearNum)); } -QDateTime* QDate_StartOfDay1(const QDate* self, uintptr_t spec) { +QDateTime* QDate_StartOfDay1(const QDate* self, int spec) { return new QDateTime(self->startOfDay(static_cast(spec))); } -QDateTime* QDate_StartOfDay2(const QDate* self, uintptr_t spec, int offsetSeconds) { +QDateTime* QDate_StartOfDay2(const QDate* self, int spec, int offsetSeconds) { return new QDateTime(self->startOfDay(static_cast(spec), static_cast(offsetSeconds))); } -QDateTime* QDate_EndOfDay1(const QDate* self, uintptr_t spec) { +QDateTime* QDate_EndOfDay1(const QDate* self, int spec) { return new QDateTime(self->endOfDay(static_cast(spec))); } -QDateTime* QDate_EndOfDay2(const QDate* self, uintptr_t spec, int offsetSeconds) { +QDateTime* QDate_EndOfDay2(const QDate* self, int spec, int offsetSeconds) { return new QDateTime(self->endOfDay(static_cast(spec), static_cast(offsetSeconds))); } -struct miqt_string* QDate_ShortMonthName2(int month, uintptr_t typeVal) { +struct miqt_string* QDate_ShortMonthName2(int month, int typeVal) { QString _ret = QDate::shortMonthName(static_cast(month), static_cast(typeVal)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QDate_ShortDayName2(int weekday, uintptr_t typeVal) { +struct miqt_string* QDate_ShortDayName2(int weekday, int typeVal) { QString _ret = QDate::shortDayName(static_cast(weekday), static_cast(typeVal)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QDate_LongMonthName2(int month, uintptr_t typeVal) { +struct miqt_string* QDate_LongMonthName2(int month, int typeVal) { QString _ret = QDate::longMonthName(static_cast(month), static_cast(typeVal)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QDate_LongDayName2(int weekday, uintptr_t typeVal) { +struct miqt_string* QDate_LongDayName2(int weekday, int typeVal) { QString _ret = QDate::longDayName(static_cast(weekday), static_cast(typeVal)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QDate_ToString1(const QDate* self, uintptr_t format) { +struct miqt_string* QDate_ToString1(const QDate* self, int format) { QString _ret = self->toString(static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); } -QDate* QDate_FromString22(struct miqt_string* s, uintptr_t f) { +QDate* QDate_FromString22(struct miqt_string* s, int f) { QString s_QString = QString::fromUtf8(&s->data, s->len); return new QDate(QDate::fromString(s_QString, static_cast(f))); } @@ -475,7 +477,7 @@ int QTime_Elapsed(const QTime* self) { return self->elapsed(); } -struct miqt_string* QTime_ToString1(const QTime* self, uintptr_t f) { +struct miqt_string* QTime_ToString1(const QTime* self, int f) { QString _ret = self->toString(static_cast(f)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -486,7 +488,7 @@ bool QTime_SetHMS4(QTime* self, int h, int m, int s, int ms) { return self->setHMS(static_cast(h), static_cast(m), static_cast(s), static_cast(ms)); } -QTime* QTime_FromString22(struct miqt_string* s, uintptr_t f) { +QTime* QTime_FromString22(struct miqt_string* s, int f) { QString s_QString = QString::fromUtf8(&s->data, s->len); return new QTime(QTime::fromString(s_QString, static_cast(f))); } @@ -507,7 +509,7 @@ QDateTime* QDateTime_new2(QDate* param1, QTime* param2) { return new QDateTime(*param1, *param2); } -QDateTime* QDateTime_new3(QDate* date, QTime* time, uintptr_t spec, int offsetSeconds) { +QDateTime* QDateTime_new3(QDate* date, QTime* time, int spec, int offsetSeconds) { return new QDateTime(*date, *time, static_cast(spec), static_cast(offsetSeconds)); } @@ -519,7 +521,7 @@ QDateTime* QDateTime_new5(QDateTime* other) { return new QDateTime(*other); } -QDateTime* QDateTime_new6(QDate* param1, QTime* param2, uintptr_t spec) { +QDateTime* QDateTime_new6(QDate* param1, QTime* param2, int spec) { return new QDateTime(*param1, *param2, static_cast(spec)); } @@ -547,9 +549,9 @@ QTime* QDateTime_Time(const QDateTime* self) { return new QTime(self->time()); } -uintptr_t QDateTime_TimeSpec(const QDateTime* self) { +int QDateTime_TimeSpec(const QDateTime* self) { Qt::TimeSpec _ret = self->timeSpec(); - return static_cast(_ret); + return static_cast(_ret); } int QDateTime_OffsetFromUtc(const QDateTime* self) { @@ -572,11 +574,13 @@ bool QDateTime_IsDaylightTime(const QDateTime* self) { } long long QDateTime_ToMSecsSinceEpoch(const QDateTime* self) { - return self->toMSecsSinceEpoch(); + qint64 _ret = self->toMSecsSinceEpoch(); + return static_cast(_ret); } long long QDateTime_ToSecsSinceEpoch(const QDateTime* self) { - return self->toSecsSinceEpoch(); + qint64 _ret = self->toSecsSinceEpoch(); + return static_cast(_ret); } void QDateTime_SetDate(QDateTime* self, QDate* date) { @@ -587,7 +591,7 @@ void QDateTime_SetTime(QDateTime* self, QTime* time) { self->setTime(*time); } -void QDateTime_SetTimeSpec(QDateTime* self, uintptr_t spec) { +void QDateTime_SetTimeSpec(QDateTime* self, int spec) { self->setTimeSpec(static_cast(spec)); } @@ -650,7 +654,7 @@ QDateTime* QDateTime_AddMSecs(const QDateTime* self, long long msecs) { return new QDateTime(self->addMSecs(static_cast(msecs))); } -QDateTime* QDateTime_ToTimeSpec(const QDateTime* self, uintptr_t spec) { +QDateTime* QDateTime_ToTimeSpec(const QDateTime* self, int spec) { return new QDateTime(self->toTimeSpec(static_cast(spec))); } @@ -671,15 +675,18 @@ QDateTime* QDateTime_ToTimeZone(const QDateTime* self, QTimeZone* toZone) { } long long QDateTime_DaysTo(const QDateTime* self, QDateTime* param1) { - return self->daysTo(*param1); + qint64 _ret = self->daysTo(*param1); + return static_cast(_ret); } long long QDateTime_SecsTo(const QDateTime* self, QDateTime* param1) { - return self->secsTo(*param1); + qint64 _ret = self->secsTo(*param1); + return static_cast(_ret); } long long QDateTime_MsecsTo(const QDateTime* self, QDateTime* param1) { - return self->msecsTo(*param1); + qint64 _ret = self->msecsTo(*param1); + return static_cast(_ret); } bool QDateTime_OperatorEqual(const QDateTime* self, QDateTime* other) { @@ -740,7 +747,8 @@ QDateTime* QDateTime_FromString3(struct miqt_string* s, struct miqt_string* form } unsigned int QDateTime_ToTimeT(const QDateTime* self) { - return self->toTime_t(); + uint _ret = self->toTime_t(); + return static_cast(_ret); } void QDateTime_SetTimeT(QDateTime* self, unsigned int secsSince1Jan1970UTC) { @@ -751,7 +759,7 @@ QDateTime* QDateTime_FromTimeT(unsigned int secsSince1Jan1970UTC) { return new QDateTime(QDateTime::fromTime_t(static_cast(secsSince1Jan1970UTC))); } -QDateTime* QDateTime_FromTimeT2(unsigned int secsSince1Jan1970UTC, uintptr_t spec) { +QDateTime* QDateTime_FromTimeT2(unsigned int secsSince1Jan1970UTC, int spec) { return new QDateTime(QDateTime::fromTime_t(static_cast(secsSince1Jan1970UTC), static_cast(spec))); } @@ -763,7 +771,7 @@ QDateTime* QDateTime_FromMSecsSinceEpoch(long long msecs) { return new QDateTime(QDateTime::fromMSecsSinceEpoch(static_cast(msecs))); } -QDateTime* QDateTime_FromMSecsSinceEpoch2(long long msecs, uintptr_t spec) { +QDateTime* QDateTime_FromMSecsSinceEpoch2(long long msecs, int spec) { return new QDateTime(QDateTime::fromMSecsSinceEpoch(static_cast(msecs), static_cast(spec))); } @@ -780,38 +788,40 @@ QDateTime* QDateTime_FromSecsSinceEpoch2(long long secs, QTimeZone* timeZone) { } long long QDateTime_CurrentMSecsSinceEpoch() { - return QDateTime::currentMSecsSinceEpoch(); + qint64 _ret = QDateTime::currentMSecsSinceEpoch(); + return static_cast(_ret); } long long QDateTime_CurrentSecsSinceEpoch() { - return QDateTime::currentSecsSinceEpoch(); + qint64 _ret = QDateTime::currentSecsSinceEpoch(); + return static_cast(_ret); } -struct miqt_string* QDateTime_ToString1(const QDateTime* self, uintptr_t format) { +struct miqt_string* QDateTime_ToString1(const QDateTime* self, int format) { QString _ret = self->toString(static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); } -QDateTime* QDateTime_FromString22(struct miqt_string* s, uintptr_t f) { +QDateTime* QDateTime_FromString22(struct miqt_string* s, int f) { QString s_QString = QString::fromUtf8(&s->data, s->len); return new QDateTime(QDateTime::fromString(s_QString, static_cast(f))); } -QDateTime* QDateTime_FromTimeT32(unsigned int secsSince1Jan1970UTC, uintptr_t spec, int offsetFromUtc) { +QDateTime* QDateTime_FromTimeT32(unsigned int secsSince1Jan1970UTC, int spec, int offsetFromUtc) { return new QDateTime(QDateTime::fromTime_t(static_cast(secsSince1Jan1970UTC), static_cast(spec), static_cast(offsetFromUtc))); } -QDateTime* QDateTime_FromMSecsSinceEpoch32(long long msecs, uintptr_t spec, int offsetFromUtc) { +QDateTime* QDateTime_FromMSecsSinceEpoch32(long long msecs, int spec, int offsetFromUtc) { return new QDateTime(QDateTime::fromMSecsSinceEpoch(static_cast(msecs), static_cast(spec), static_cast(offsetFromUtc))); } -QDateTime* QDateTime_FromSecsSinceEpoch22(long long secs, uintptr_t spe) { +QDateTime* QDateTime_FromSecsSinceEpoch22(long long secs, int spe) { return new QDateTime(QDateTime::fromSecsSinceEpoch(static_cast(secs), static_cast(spe))); } -QDateTime* QDateTime_FromSecsSinceEpoch3(long long secs, uintptr_t spe, int offsetFromUtc) { +QDateTime* QDateTime_FromSecsSinceEpoch3(long long secs, int spe, int offsetFromUtc) { return new QDateTime(QDateTime::fromSecsSinceEpoch(static_cast(secs), static_cast(spe), static_cast(offsetFromUtc))); } diff --git a/qt/gen_qdatetime.go b/qt/gen_qdatetime.go index 88d38e2..0319ab9 100644 --- a/qt/gen_qdatetime.go +++ b/qt/gen_qdatetime.go @@ -20,7 +20,7 @@ const ( QDate__MonthNameType__StandaloneFormat QDate__MonthNameType = 1 ) -type QDateTime__YearRange int32 +type QDateTime__YearRange int const ( QDateTime__YearRange__First QDateTime__YearRange = -292275056 @@ -205,7 +205,7 @@ func (this *QDate) ToString() string { } func (this *QDate) ToString2(format DateFormat, cal QCalendar) string { - var _ms *C.struct_miqt_string = C.QDate_ToString2(this.h, (C.uintptr_t)(format), cal.cPointer()) + var _ms *C.struct_miqt_string = C.QDate_ToString2(this.h, (C.int)(format), cal.cPointer()) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -370,63 +370,63 @@ func (this *QDate) WeekNumber1(yearNum *int) int { } func (this *QDate) StartOfDay1(spec TimeSpec) *QDateTime { - _ret := C.QDate_StartOfDay1(this.h, (C.uintptr_t)(spec)) + _ret := C.QDate_StartOfDay1(this.h, (C.int)(spec)) _goptr := newQDateTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QDate) StartOfDay2(spec TimeSpec, offsetSeconds int) *QDateTime { - _ret := C.QDate_StartOfDay2(this.h, (C.uintptr_t)(spec), (C.int)(offsetSeconds)) + _ret := C.QDate_StartOfDay2(this.h, (C.int)(spec), (C.int)(offsetSeconds)) _goptr := newQDateTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QDate) EndOfDay1(spec TimeSpec) *QDateTime { - _ret := C.QDate_EndOfDay1(this.h, (C.uintptr_t)(spec)) + _ret := C.QDate_EndOfDay1(this.h, (C.int)(spec)) _goptr := newQDateTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QDate) EndOfDay2(spec TimeSpec, offsetSeconds int) *QDateTime { - _ret := C.QDate_EndOfDay2(this.h, (C.uintptr_t)(spec), (C.int)(offsetSeconds)) + _ret := C.QDate_EndOfDay2(this.h, (C.int)(spec), (C.int)(offsetSeconds)) _goptr := newQDateTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QDate_ShortMonthName2(month int, typeVal QDate__MonthNameType) string { - var _ms *C.struct_miqt_string = C.QDate_ShortMonthName2((C.int)(month), (C.uintptr_t)(typeVal)) + var _ms *C.struct_miqt_string = C.QDate_ShortMonthName2((C.int)(month), (C.int)(typeVal)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } func QDate_ShortDayName2(weekday int, typeVal QDate__MonthNameType) string { - var _ms *C.struct_miqt_string = C.QDate_ShortDayName2((C.int)(weekday), (C.uintptr_t)(typeVal)) + var _ms *C.struct_miqt_string = C.QDate_ShortDayName2((C.int)(weekday), (C.int)(typeVal)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } func QDate_LongMonthName2(month int, typeVal QDate__MonthNameType) string { - var _ms *C.struct_miqt_string = C.QDate_LongMonthName2((C.int)(month), (C.uintptr_t)(typeVal)) + var _ms *C.struct_miqt_string = C.QDate_LongMonthName2((C.int)(month), (C.int)(typeVal)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } func QDate_LongDayName2(weekday int, typeVal QDate__MonthNameType) string { - var _ms *C.struct_miqt_string = C.QDate_LongDayName2((C.int)(weekday), (C.uintptr_t)(typeVal)) + var _ms *C.struct_miqt_string = C.QDate_LongDayName2((C.int)(weekday), (C.int)(typeVal)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } func (this *QDate) ToString1(format DateFormat) string { - var _ms *C.struct_miqt_string = C.QDate_ToString1(this.h, (C.uintptr_t)(format)) + var _ms *C.struct_miqt_string = C.QDate_ToString1(this.h, (C.int)(format)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -435,7 +435,7 @@ func (this *QDate) ToString1(format DateFormat) string { func QDate_FromString22(s string, f DateFormat) *QDate { s_ms := miqt_strdupg(s) defer C.free(s_ms) - _ret := C.QDate_FromString22((*C.struct_miqt_string)(s_ms), (C.uintptr_t)(f)) + _ret := C.QDate_FromString22((*C.struct_miqt_string)(s_ms), (C.int)(f)) _goptr := newQDate(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -652,7 +652,7 @@ func (this *QTime) Elapsed() int { } func (this *QTime) ToString1(f DateFormat) string { - var _ms *C.struct_miqt_string = C.QTime_ToString1(this.h, (C.uintptr_t)(f)) + var _ms *C.struct_miqt_string = C.QTime_ToString1(this.h, (C.int)(f)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -665,7 +665,7 @@ func (this *QTime) SetHMS4(h int, m int, s int, ms int) bool { func QTime_FromString22(s string, f DateFormat) *QTime { s_ms := miqt_strdupg(s) defer C.free(s_ms) - _ret := C.QTime_FromString22((*C.struct_miqt_string)(s_ms), (C.uintptr_t)(f)) + _ret := C.QTime_FromString22((*C.struct_miqt_string)(s_ms), (C.int)(f)) _goptr := newQTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -725,7 +725,7 @@ func NewQDateTime2(param1 *QDate, param2 *QTime) *QDateTime { // NewQDateTime3 constructs a new QDateTime object. 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)) + ret := C.QDateTime_new3(date.cPointer(), time.cPointer(), (C.int)(spec), (C.int)(offsetSeconds)) return newQDateTime(ret) } @@ -743,7 +743,7 @@ func NewQDateTime5(other *QDateTime) *QDateTime { // NewQDateTime6 constructs a new QDateTime object. func NewQDateTime6(param1 *QDate, param2 *QTime, spec TimeSpec) *QDateTime { - ret := C.QDateTime_new6(param1.cPointer(), param2.cPointer(), (C.uintptr_t)(spec)) + ret := C.QDateTime_new6(param1.cPointer(), param2.cPointer(), (C.int)(spec)) return newQDateTime(ret) } @@ -820,7 +820,7 @@ func (this *QDateTime) SetTime(time *QTime) { } func (this *QDateTime) SetTimeSpec(spec TimeSpec) { - C.QDateTime_SetTimeSpec(this.h, (C.uintptr_t)(spec)) + C.QDateTime_SetTimeSpec(this.h, (C.int)(spec)) } func (this *QDateTime) SetOffsetFromUtc(offsetSeconds int) { @@ -900,7 +900,7 @@ func (this *QDateTime) AddMSecs(msecs int64) *QDateTime { } func (this *QDateTime) ToTimeSpec(spec TimeSpec) *QDateTime { - _ret := C.QDateTime_ToTimeSpec(this.h, (C.uintptr_t)(spec)) + _ret := C.QDateTime_ToTimeSpec(this.h, (C.int)(spec)) _goptr := newQDateTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -1039,7 +1039,7 @@ func QDateTime_FromTimeT(secsSince1Jan1970UTC uint) *QDateTime { } func QDateTime_FromTimeT2(secsSince1Jan1970UTC uint, spec TimeSpec) *QDateTime { - _ret := C.QDateTime_FromTimeT2((C.uint)(secsSince1Jan1970UTC), (C.uintptr_t)(spec)) + _ret := C.QDateTime_FromTimeT2((C.uint)(secsSince1Jan1970UTC), (C.int)(spec)) _goptr := newQDateTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -1060,7 +1060,7 @@ func QDateTime_FromMSecsSinceEpoch(msecs int64) *QDateTime { } func QDateTime_FromMSecsSinceEpoch2(msecs int64, spec TimeSpec) *QDateTime { - _ret := C.QDateTime_FromMSecsSinceEpoch2((C.longlong)(msecs), (C.uintptr_t)(spec)) + _ret := C.QDateTime_FromMSecsSinceEpoch2((C.longlong)(msecs), (C.int)(spec)) _goptr := newQDateTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -1096,7 +1096,7 @@ func QDateTime_CurrentSecsSinceEpoch() int64 { } func (this *QDateTime) ToString1(format DateFormat) string { - var _ms *C.struct_miqt_string = C.QDateTime_ToString1(this.h, (C.uintptr_t)(format)) + var _ms *C.struct_miqt_string = C.QDateTime_ToString1(this.h, (C.int)(format)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -1105,35 +1105,35 @@ func (this *QDateTime) ToString1(format DateFormat) string { func QDateTime_FromString22(s string, f DateFormat) *QDateTime { s_ms := miqt_strdupg(s) defer C.free(s_ms) - _ret := C.QDateTime_FromString22((*C.struct_miqt_string)(s_ms), (C.uintptr_t)(f)) + _ret := C.QDateTime_FromString22((*C.struct_miqt_string)(s_ms), (C.int)(f)) _goptr := newQDateTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QDateTime_FromTimeT32(secsSince1Jan1970UTC uint, spec TimeSpec, offsetFromUtc int) *QDateTime { - _ret := C.QDateTime_FromTimeT32((C.uint)(secsSince1Jan1970UTC), (C.uintptr_t)(spec), (C.int)(offsetFromUtc)) + _ret := C.QDateTime_FromTimeT32((C.uint)(secsSince1Jan1970UTC), (C.int)(spec), (C.int)(offsetFromUtc)) _goptr := newQDateTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QDateTime_FromMSecsSinceEpoch32(msecs int64, spec TimeSpec, offsetFromUtc int) *QDateTime { - _ret := C.QDateTime_FromMSecsSinceEpoch32((C.longlong)(msecs), (C.uintptr_t)(spec), (C.int)(offsetFromUtc)) + _ret := C.QDateTime_FromMSecsSinceEpoch32((C.longlong)(msecs), (C.int)(spec), (C.int)(offsetFromUtc)) _goptr := newQDateTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QDateTime_FromSecsSinceEpoch22(secs int64, spe TimeSpec) *QDateTime { - _ret := C.QDateTime_FromSecsSinceEpoch22((C.longlong)(secs), (C.uintptr_t)(spe)) + _ret := C.QDateTime_FromSecsSinceEpoch22((C.longlong)(secs), (C.int)(spe)) _goptr := newQDateTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QDateTime_FromSecsSinceEpoch3(secs int64, spe TimeSpec, offsetFromUtc int) *QDateTime { - _ret := C.QDateTime_FromSecsSinceEpoch3((C.longlong)(secs), (C.uintptr_t)(spe), (C.int)(offsetFromUtc)) + _ret := C.QDateTime_FromSecsSinceEpoch3((C.longlong)(secs), (C.int)(spe), (C.int)(offsetFromUtc)) _goptr := newQDateTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qdatetime.h b/qt/gen_qdatetime.h index 5eddff8..99d5dd0 100644 --- a/qt/gen_qdatetime.h +++ b/qt/gen_qdatetime.h @@ -57,7 +57,7 @@ struct miqt_string* QDate_ShortDayName(int weekday); struct miqt_string* QDate_LongMonthName(int month); struct miqt_string* QDate_LongDayName(int weekday); struct miqt_string* QDate_ToString(const QDate* self); -struct miqt_string* QDate_ToString2(const QDate* self, uintptr_t format, QCalendar* cal); +struct miqt_string* QDate_ToString2(const QDate* self, int format, QCalendar* cal); struct miqt_string* QDate_ToStringWithFormat(const QDate* self, struct miqt_string* format); struct miqt_string* QDate_ToString3(const QDate* self, struct miqt_string* format, QCalendar* cal); bool QDate_SetDate(QDate* self, int year, int month, int day); @@ -85,16 +85,16 @@ bool QDate_IsLeapYear(int year); QDate* QDate_FromJulianDay(long long jd_); long long QDate_ToJulianDay(const QDate* self); int QDate_WeekNumber1(const QDate* self, int* yearNum); -QDateTime* QDate_StartOfDay1(const QDate* self, uintptr_t spec); -QDateTime* QDate_StartOfDay2(const QDate* self, uintptr_t spec, int offsetSeconds); -QDateTime* QDate_EndOfDay1(const QDate* self, uintptr_t spec); -QDateTime* QDate_EndOfDay2(const QDate* self, uintptr_t spec, int offsetSeconds); -struct miqt_string* QDate_ShortMonthName2(int month, uintptr_t typeVal); -struct miqt_string* QDate_ShortDayName2(int weekday, uintptr_t typeVal); -struct miqt_string* QDate_LongMonthName2(int month, uintptr_t typeVal); -struct miqt_string* QDate_LongDayName2(int weekday, uintptr_t typeVal); -struct miqt_string* QDate_ToString1(const QDate* self, uintptr_t format); -QDate* QDate_FromString22(struct miqt_string* s, uintptr_t f); +QDateTime* QDate_StartOfDay1(const QDate* self, int spec); +QDateTime* QDate_StartOfDay2(const QDate* self, int spec, int offsetSeconds); +QDateTime* QDate_EndOfDay1(const QDate* self, int spec); +QDateTime* QDate_EndOfDay2(const QDate* self, int spec, int offsetSeconds); +struct miqt_string* QDate_ShortMonthName2(int month, int typeVal); +struct miqt_string* QDate_ShortDayName2(int weekday, int typeVal); +struct miqt_string* QDate_LongMonthName2(int month, int typeVal); +struct miqt_string* QDate_LongDayName2(int weekday, int typeVal); +struct miqt_string* QDate_ToString1(const QDate* self, int format); +QDate* QDate_FromString22(struct miqt_string* s, int f); void QDate_Delete(QDate* self); QTime* QTime_new(); @@ -130,25 +130,25 @@ bool QTime_IsValid2(int h, int m, int s); void QTime_Start(QTime* self); int QTime_Restart(QTime* self); int QTime_Elapsed(const QTime* self); -struct miqt_string* QTime_ToString1(const QTime* self, uintptr_t f); +struct miqt_string* QTime_ToString1(const QTime* self, int f); bool QTime_SetHMS4(QTime* self, int h, int m, int s, int ms); -QTime* QTime_FromString22(struct miqt_string* s, uintptr_t f); +QTime* QTime_FromString22(struct miqt_string* s, int f); bool QTime_IsValid4(int h, int m, int s, int ms); void QTime_Delete(QTime* self); QDateTime* QDateTime_new(QDate* param1); QDateTime* QDateTime_new2(QDate* param1, QTime* param2); -QDateTime* QDateTime_new3(QDate* date, QTime* time, uintptr_t spec, int offsetSeconds); +QDateTime* QDateTime_new3(QDate* date, QTime* time, int spec, int offsetSeconds); QDateTime* QDateTime_new4(QDate* date, QTime* time, QTimeZone* timeZone); QDateTime* QDateTime_new5(QDateTime* other); -QDateTime* QDateTime_new6(QDate* param1, QTime* param2, uintptr_t spec); +QDateTime* QDateTime_new6(QDate* param1, QTime* param2, int spec); void QDateTime_OperatorAssign(QDateTime* self, QDateTime* other); void QDateTime_Swap(QDateTime* self, QDateTime* other); bool QDateTime_IsNull(const QDateTime* self); bool QDateTime_IsValid(const QDateTime* self); QDate* QDateTime_Date(const QDateTime* self); QTime* QDateTime_Time(const QDateTime* self); -uintptr_t QDateTime_TimeSpec(const QDateTime* self); +int QDateTime_TimeSpec(const QDateTime* self); int QDateTime_OffsetFromUtc(const QDateTime* self); QTimeZone* QDateTime_TimeZone(const QDateTime* self); struct miqt_string* QDateTime_TimeZoneAbbreviation(const QDateTime* self); @@ -157,7 +157,7 @@ long long QDateTime_ToMSecsSinceEpoch(const QDateTime* self); long long QDateTime_ToSecsSinceEpoch(const QDateTime* self); void QDateTime_SetDate(QDateTime* self, QDate* date); void QDateTime_SetTime(QDateTime* self, QTime* time); -void QDateTime_SetTimeSpec(QDateTime* self, uintptr_t spec); +void QDateTime_SetTimeSpec(QDateTime* self, int spec); void QDateTime_SetOffsetFromUtc(QDateTime* self, int offsetSeconds); void QDateTime_SetTimeZone(QDateTime* self, QTimeZone* toZone); void QDateTime_SetMSecsSinceEpoch(QDateTime* self, long long msecs); @@ -170,7 +170,7 @@ QDateTime* QDateTime_AddMonths(const QDateTime* self, int months); QDateTime* QDateTime_AddYears(const QDateTime* self, int years); QDateTime* QDateTime_AddSecs(const QDateTime* self, long long secs); QDateTime* QDateTime_AddMSecs(const QDateTime* self, long long msecs); -QDateTime* QDateTime_ToTimeSpec(const QDateTime* self, uintptr_t spec); +QDateTime* QDateTime_ToTimeSpec(const QDateTime* self, int spec); QDateTime* QDateTime_ToLocalTime(const QDateTime* self); QDateTime* QDateTime_ToUTC(const QDateTime* self); QDateTime* QDateTime_ToOffsetFromUtc(const QDateTime* self, int offsetSeconds); @@ -194,21 +194,21 @@ QDateTime* QDateTime_FromString3(struct miqt_string* s, struct miqt_string* form unsigned int QDateTime_ToTimeT(const QDateTime* self); void QDateTime_SetTimeT(QDateTime* self, unsigned int secsSince1Jan1970UTC); QDateTime* QDateTime_FromTimeT(unsigned int secsSince1Jan1970UTC); -QDateTime* QDateTime_FromTimeT2(unsigned int secsSince1Jan1970UTC, uintptr_t spec); +QDateTime* QDateTime_FromTimeT2(unsigned int secsSince1Jan1970UTC, int spec); QDateTime* QDateTime_FromTimeT3(unsigned int secsSince1Jan1970UTC, QTimeZone* timeZone); QDateTime* QDateTime_FromMSecsSinceEpoch(long long msecs); -QDateTime* QDateTime_FromMSecsSinceEpoch2(long long msecs, uintptr_t spec); +QDateTime* QDateTime_FromMSecsSinceEpoch2(long long msecs, int spec); QDateTime* QDateTime_FromSecsSinceEpoch(long long secs); QDateTime* QDateTime_FromMSecsSinceEpoch3(long long msecs, QTimeZone* timeZone); QDateTime* QDateTime_FromSecsSinceEpoch2(long long secs, QTimeZone* timeZone); long long QDateTime_CurrentMSecsSinceEpoch(); long long QDateTime_CurrentSecsSinceEpoch(); -struct miqt_string* QDateTime_ToString1(const QDateTime* self, uintptr_t format); -QDateTime* QDateTime_FromString22(struct miqt_string* s, uintptr_t f); -QDateTime* QDateTime_FromTimeT32(unsigned int secsSince1Jan1970UTC, uintptr_t spec, int offsetFromUtc); -QDateTime* QDateTime_FromMSecsSinceEpoch32(long long msecs, uintptr_t spec, int offsetFromUtc); -QDateTime* QDateTime_FromSecsSinceEpoch22(long long secs, uintptr_t spe); -QDateTime* QDateTime_FromSecsSinceEpoch3(long long secs, uintptr_t spe, int offsetFromUtc); +struct miqt_string* QDateTime_ToString1(const QDateTime* self, int format); +QDateTime* QDateTime_FromString22(struct miqt_string* s, int f); +QDateTime* QDateTime_FromTimeT32(unsigned int secsSince1Jan1970UTC, int spec, int offsetFromUtc); +QDateTime* QDateTime_FromMSecsSinceEpoch32(long long msecs, int spec, int offsetFromUtc); +QDateTime* QDateTime_FromSecsSinceEpoch22(long long secs, int spe); +QDateTime* QDateTime_FromSecsSinceEpoch3(long long secs, int spe, int offsetFromUtc); void QDateTime_Delete(QDateTime* self); #ifdef __cplusplus diff --git a/qt/gen_qdatetimeedit.cpp b/qt/gen_qdatetimeedit.cpp index f9d865a..2426c20 100644 --- a/qt/gen_qdatetimeedit.cpp +++ b/qt/gen_qdatetimeedit.cpp @@ -176,17 +176,17 @@ int QDateTimeEdit_DisplayedSections(const QDateTimeEdit* self) { return static_cast(_ret); } -uintptr_t QDateTimeEdit_CurrentSection(const QDateTimeEdit* self) { +int QDateTimeEdit_CurrentSection(const QDateTimeEdit* self) { QDateTimeEdit::Section _ret = self->currentSection(); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QDateTimeEdit_SectionAt(const QDateTimeEdit* self, int index) { +int QDateTimeEdit_SectionAt(const QDateTimeEdit* self, int index) { QDateTimeEdit::Section _ret = self->sectionAt(static_cast(index)); - return static_cast(_ret); + return static_cast(_ret); } -void QDateTimeEdit_SetCurrentSection(QDateTimeEdit* self, uintptr_t section) { +void QDateTimeEdit_SetCurrentSection(QDateTimeEdit* self, int section) { self->setCurrentSection(static_cast(section)); } @@ -210,11 +210,11 @@ int QDateTimeEdit_SectionCount(const QDateTimeEdit* self) { return self->sectionCount(); } -void QDateTimeEdit_SetSelectedSection(QDateTimeEdit* self, uintptr_t section) { +void QDateTimeEdit_SetSelectedSection(QDateTimeEdit* self, int section) { self->setSelectedSection(static_cast(section)); } -struct miqt_string* QDateTimeEdit_SectionText(const QDateTimeEdit* self, uintptr_t section) { +struct miqt_string* QDateTimeEdit_SectionText(const QDateTimeEdit* self, int section) { QString _ret = self->sectionText(static_cast(section)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -241,12 +241,12 @@ void QDateTimeEdit_SetCalendarPopup(QDateTimeEdit* self, bool enable) { self->setCalendarPopup(enable); } -uintptr_t QDateTimeEdit_TimeSpec(const QDateTimeEdit* self) { +int QDateTimeEdit_TimeSpec(const QDateTimeEdit* self) { Qt::TimeSpec _ret = self->timeSpec(); - return static_cast(_ret); + return static_cast(_ret); } -void QDateTimeEdit_SetTimeSpec(QDateTimeEdit* self, uintptr_t spec) { +void QDateTimeEdit_SetTimeSpec(QDateTimeEdit* self, int spec) { self->setTimeSpec(static_cast(spec)); } diff --git a/qt/gen_qdatetimeedit.go b/qt/gen_qdatetimeedit.go index ef87d7a..97249d9 100644 --- a/qt/gen_qdatetimeedit.go +++ b/qt/gen_qdatetimeedit.go @@ -270,7 +270,7 @@ func (this *QDateTimeEdit) SectionAt(index int) QDateTimeEdit__Section { } func (this *QDateTimeEdit) SetCurrentSection(section QDateTimeEdit__Section) { - C.QDateTimeEdit_SetCurrentSection(this.h, (C.uintptr_t)(section)) + C.QDateTimeEdit_SetCurrentSection(this.h, (C.int)(section)) } func (this *QDateTimeEdit) CurrentSectionIndex() int { @@ -294,11 +294,11 @@ func (this *QDateTimeEdit) SectionCount() int { } func (this *QDateTimeEdit) SetSelectedSection(section QDateTimeEdit__Section) { - C.QDateTimeEdit_SetSelectedSection(this.h, (C.uintptr_t)(section)) + C.QDateTimeEdit_SetSelectedSection(this.h, (C.int)(section)) } func (this *QDateTimeEdit) SectionText(section QDateTimeEdit__Section) string { - var _ms *C.struct_miqt_string = C.QDateTimeEdit_SectionText(this.h, (C.uintptr_t)(section)) + var _ms *C.struct_miqt_string = C.QDateTimeEdit_SectionText(this.h, (C.int)(section)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -330,7 +330,7 @@ func (this *QDateTimeEdit) TimeSpec() TimeSpec { } func (this *QDateTimeEdit) SetTimeSpec(spec TimeSpec) { - C.QDateTimeEdit_SetTimeSpec(this.h, (C.uintptr_t)(spec)) + C.QDateTimeEdit_SetTimeSpec(this.h, (C.int)(spec)) } func (this *QDateTimeEdit) SizeHint() *QSize { diff --git a/qt/gen_qdatetimeedit.h b/qt/gen_qdatetimeedit.h index 5c21d61..6c4667e 100644 --- a/qt/gen_qdatetimeedit.h +++ b/qt/gen_qdatetimeedit.h @@ -79,22 +79,22 @@ void QDateTimeEdit_SetMaximumTime(QDateTimeEdit* self, QTime* max); void QDateTimeEdit_ClearMaximumTime(QDateTimeEdit* self); void QDateTimeEdit_SetTimeRange(QDateTimeEdit* self, QTime* min, QTime* max); int QDateTimeEdit_DisplayedSections(const QDateTimeEdit* self); -uintptr_t QDateTimeEdit_CurrentSection(const QDateTimeEdit* self); -uintptr_t QDateTimeEdit_SectionAt(const QDateTimeEdit* self, int index); -void QDateTimeEdit_SetCurrentSection(QDateTimeEdit* self, uintptr_t section); +int QDateTimeEdit_CurrentSection(const QDateTimeEdit* self); +int QDateTimeEdit_SectionAt(const QDateTimeEdit* self, int index); +void QDateTimeEdit_SetCurrentSection(QDateTimeEdit* self, int section); int QDateTimeEdit_CurrentSectionIndex(const QDateTimeEdit* self); void QDateTimeEdit_SetCurrentSectionIndex(QDateTimeEdit* self, int index); QCalendarWidget* QDateTimeEdit_CalendarWidget(const QDateTimeEdit* self); void QDateTimeEdit_SetCalendarWidget(QDateTimeEdit* self, QCalendarWidget* calendarWidget); int QDateTimeEdit_SectionCount(const QDateTimeEdit* self); -void QDateTimeEdit_SetSelectedSection(QDateTimeEdit* self, uintptr_t section); -struct miqt_string* QDateTimeEdit_SectionText(const QDateTimeEdit* self, uintptr_t section); +void QDateTimeEdit_SetSelectedSection(QDateTimeEdit* self, int section); +struct miqt_string* QDateTimeEdit_SectionText(const QDateTimeEdit* self, int section); struct miqt_string* QDateTimeEdit_DisplayFormat(const QDateTimeEdit* self); void QDateTimeEdit_SetDisplayFormat(QDateTimeEdit* self, struct miqt_string* format); bool QDateTimeEdit_CalendarPopup(const QDateTimeEdit* self); void QDateTimeEdit_SetCalendarPopup(QDateTimeEdit* self, bool enable); -uintptr_t QDateTimeEdit_TimeSpec(const QDateTimeEdit* self); -void QDateTimeEdit_SetTimeSpec(QDateTimeEdit* self, uintptr_t spec); +int QDateTimeEdit_TimeSpec(const QDateTimeEdit* self); +void QDateTimeEdit_SetTimeSpec(QDateTimeEdit* self, int spec); QSize* QDateTimeEdit_SizeHint(const QDateTimeEdit* self); void QDateTimeEdit_Clear(QDateTimeEdit* self); void QDateTimeEdit_StepBy(QDateTimeEdit* self, int steps); diff --git a/qt/gen_qdeadlinetimer.cpp b/qt/gen_qdeadlinetimer.cpp index 6bbf542..cbf1e5c 100644 --- a/qt/gen_qdeadlinetimer.cpp +++ b/qt/gen_qdeadlinetimer.cpp @@ -7,7 +7,7 @@ QDeadlineTimer* QDeadlineTimer_new() { return new QDeadlineTimer(); } -QDeadlineTimer* QDeadlineTimer_new2(uintptr_t param1) { +QDeadlineTimer* QDeadlineTimer_new2(int param1) { return new QDeadlineTimer(static_cast(param1)); } @@ -19,15 +19,15 @@ QDeadlineTimer* QDeadlineTimer_new4(QDeadlineTimer* param1) { return new QDeadlineTimer(*param1); } -QDeadlineTimer* QDeadlineTimer_new5(uintptr_t type_) { +QDeadlineTimer* QDeadlineTimer_new5(int type_) { return new QDeadlineTimer(static_cast(type_)); } -QDeadlineTimer* QDeadlineTimer_new6(uintptr_t param1, uintptr_t type_) { +QDeadlineTimer* QDeadlineTimer_new6(int param1, int type_) { return new QDeadlineTimer(static_cast(param1), static_cast(type_)); } -QDeadlineTimer* QDeadlineTimer_new7(long long msecs, uintptr_t typeVal) { +QDeadlineTimer* QDeadlineTimer_new7(long long msecs, int typeVal) { return new QDeadlineTimer(static_cast(msecs), static_cast(typeVal)); } @@ -43,21 +43,23 @@ bool QDeadlineTimer_HasExpired(const QDeadlineTimer* self) { return self->hasExpired(); } -uintptr_t QDeadlineTimer_TimerType(const QDeadlineTimer* self) { +int QDeadlineTimer_TimerType(const QDeadlineTimer* self) { Qt::TimerType _ret = self->timerType(); - return static_cast(_ret); + return static_cast(_ret); } -void QDeadlineTimer_SetTimerType(QDeadlineTimer* self, uintptr_t typeVal) { +void QDeadlineTimer_SetTimerType(QDeadlineTimer* self, int typeVal) { self->setTimerType(static_cast(typeVal)); } long long QDeadlineTimer_RemainingTime(const QDeadlineTimer* self) { - return self->remainingTime(); + qint64 _ret = self->remainingTime(); + return static_cast(_ret); } long long QDeadlineTimer_RemainingTimeNSecs(const QDeadlineTimer* self) { - return self->remainingTimeNSecs(); + qint64 _ret = self->remainingTimeNSecs(); + return static_cast(_ret); } void QDeadlineTimer_SetRemainingTime(QDeadlineTimer* self, long long msecs) { @@ -69,11 +71,13 @@ void QDeadlineTimer_SetPreciseRemainingTime(QDeadlineTimer* self, long long secs } long long QDeadlineTimer_Deadline(const QDeadlineTimer* self) { - return self->deadline(); + qint64 _ret = self->deadline(); + return static_cast(_ret); } long long QDeadlineTimer_DeadlineNSecs(const QDeadlineTimer* self) { - return self->deadlineNSecs(); + qint64 _ret = self->deadlineNSecs(); + return static_cast(_ret); } void QDeadlineTimer_SetDeadline(QDeadlineTimer* self, long long msecs) { @@ -108,7 +112,7 @@ void QDeadlineTimer_OperatorAssign(QDeadlineTimer* self, QDeadlineTimer* param1) self->operator=(*param1); } -void QDeadlineTimer_SetRemainingTime2(QDeadlineTimer* self, long long msecs, uintptr_t typeVal) { +void QDeadlineTimer_SetRemainingTime2(QDeadlineTimer* self, long long msecs, int typeVal) { self->setRemainingTime(static_cast(msecs), static_cast(typeVal)); } @@ -116,11 +120,11 @@ void QDeadlineTimer_SetPreciseRemainingTime2(QDeadlineTimer* self, long long sec self->setPreciseRemainingTime(static_cast(secs), static_cast(nsecs)); } -void QDeadlineTimer_SetPreciseRemainingTime3(QDeadlineTimer* self, long long secs, long long nsecs, uintptr_t typeVal) { +void QDeadlineTimer_SetPreciseRemainingTime3(QDeadlineTimer* self, long long secs, long long nsecs, int typeVal) { self->setPreciseRemainingTime(static_cast(secs), static_cast(nsecs), static_cast(typeVal)); } -void QDeadlineTimer_SetDeadline2(QDeadlineTimer* self, long long msecs, uintptr_t timerType) { +void QDeadlineTimer_SetDeadline2(QDeadlineTimer* self, long long msecs, int timerType) { self->setDeadline(static_cast(msecs), static_cast(timerType)); } @@ -128,11 +132,11 @@ void QDeadlineTimer_SetPreciseDeadline2(QDeadlineTimer* self, long long secs, lo self->setPreciseDeadline(static_cast(secs), static_cast(nsecs)); } -void QDeadlineTimer_SetPreciseDeadline3(QDeadlineTimer* self, long long secs, long long nsecs, uintptr_t typeVal) { +void QDeadlineTimer_SetPreciseDeadline3(QDeadlineTimer* self, long long secs, long long nsecs, int typeVal) { self->setPreciseDeadline(static_cast(secs), static_cast(nsecs), static_cast(typeVal)); } -QDeadlineTimer* QDeadlineTimer_Current1(uintptr_t timerType) { +QDeadlineTimer* QDeadlineTimer_Current1(int timerType) { return new QDeadlineTimer(QDeadlineTimer::current(static_cast(timerType))); } diff --git a/qt/gen_qdeadlinetimer.go b/qt/gen_qdeadlinetimer.go index cee91f3..a0ec2bc 100644 --- a/qt/gen_qdeadlinetimer.go +++ b/qt/gen_qdeadlinetimer.go @@ -49,7 +49,7 @@ func NewQDeadlineTimer() *QDeadlineTimer { // NewQDeadlineTimer2 constructs a new QDeadlineTimer object. func NewQDeadlineTimer2(param1 QDeadlineTimer__ForeverConstant) *QDeadlineTimer { - ret := C.QDeadlineTimer_new2((C.uintptr_t)(param1)) + ret := C.QDeadlineTimer_new2((C.int)(param1)) return newQDeadlineTimer(ret) } @@ -67,19 +67,19 @@ func NewQDeadlineTimer4(param1 *QDeadlineTimer) *QDeadlineTimer { // NewQDeadlineTimer5 constructs a new QDeadlineTimer object. func NewQDeadlineTimer5(type_ TimerType) *QDeadlineTimer { - ret := C.QDeadlineTimer_new5((C.uintptr_t)(type_)) + ret := C.QDeadlineTimer_new5((C.int)(type_)) return newQDeadlineTimer(ret) } // NewQDeadlineTimer6 constructs a new QDeadlineTimer object. func NewQDeadlineTimer6(param1 QDeadlineTimer__ForeverConstant, type_ TimerType) *QDeadlineTimer { - ret := C.QDeadlineTimer_new6((C.uintptr_t)(param1), (C.uintptr_t)(type_)) + ret := C.QDeadlineTimer_new6((C.int)(param1), (C.int)(type_)) return newQDeadlineTimer(ret) } // NewQDeadlineTimer7 constructs a new QDeadlineTimer object. func NewQDeadlineTimer7(msecs int64, typeVal TimerType) *QDeadlineTimer { - ret := C.QDeadlineTimer_new7((C.longlong)(msecs), (C.uintptr_t)(typeVal)) + ret := C.QDeadlineTimer_new7((C.longlong)(msecs), (C.int)(typeVal)) return newQDeadlineTimer(ret) } @@ -100,7 +100,7 @@ func (this *QDeadlineTimer) TimerType() TimerType { } func (this *QDeadlineTimer) SetTimerType(typeVal TimerType) { - C.QDeadlineTimer_SetTimerType(this.h, (C.uintptr_t)(typeVal)) + C.QDeadlineTimer_SetTimerType(this.h, (C.int)(typeVal)) } func (this *QDeadlineTimer) RemainingTime() int64 { @@ -162,7 +162,7 @@ func (this *QDeadlineTimer) OperatorAssign(param1 *QDeadlineTimer) { } func (this *QDeadlineTimer) SetRemainingTime2(msecs int64, typeVal TimerType) { - C.QDeadlineTimer_SetRemainingTime2(this.h, (C.longlong)(msecs), (C.uintptr_t)(typeVal)) + C.QDeadlineTimer_SetRemainingTime2(this.h, (C.longlong)(msecs), (C.int)(typeVal)) } func (this *QDeadlineTimer) SetPreciseRemainingTime2(secs int64, nsecs int64) { @@ -170,11 +170,11 @@ func (this *QDeadlineTimer) SetPreciseRemainingTime2(secs int64, nsecs int64) { } 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)) + C.QDeadlineTimer_SetPreciseRemainingTime3(this.h, (C.longlong)(secs), (C.longlong)(nsecs), (C.int)(typeVal)) } func (this *QDeadlineTimer) SetDeadline2(msecs int64, timerType TimerType) { - C.QDeadlineTimer_SetDeadline2(this.h, (C.longlong)(msecs), (C.uintptr_t)(timerType)) + C.QDeadlineTimer_SetDeadline2(this.h, (C.longlong)(msecs), (C.int)(timerType)) } func (this *QDeadlineTimer) SetPreciseDeadline2(secs int64, nsecs int64) { @@ -182,11 +182,11 @@ func (this *QDeadlineTimer) SetPreciseDeadline2(secs int64, nsecs int64) { } 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)) + C.QDeadlineTimer_SetPreciseDeadline3(this.h, (C.longlong)(secs), (C.longlong)(nsecs), (C.int)(typeVal)) } func QDeadlineTimer_Current1(timerType TimerType) *QDeadlineTimer { - _ret := C.QDeadlineTimer_Current1((C.uintptr_t)(timerType)) + _ret := C.QDeadlineTimer_Current1((C.int)(timerType)) _goptr := newQDeadlineTimer(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qdeadlinetimer.h b/qt/gen_qdeadlinetimer.h index 33a956e..a4db5bf 100644 --- a/qt/gen_qdeadlinetimer.h +++ b/qt/gen_qdeadlinetimer.h @@ -20,17 +20,17 @@ typedef struct QDeadlineTimer QDeadlineTimer; #endif QDeadlineTimer* QDeadlineTimer_new(); -QDeadlineTimer* QDeadlineTimer_new2(uintptr_t param1); +QDeadlineTimer* QDeadlineTimer_new2(int param1); QDeadlineTimer* QDeadlineTimer_new3(long long msecs); QDeadlineTimer* QDeadlineTimer_new4(QDeadlineTimer* param1); -QDeadlineTimer* QDeadlineTimer_new5(uintptr_t type_); -QDeadlineTimer* QDeadlineTimer_new6(uintptr_t param1, uintptr_t type_); -QDeadlineTimer* QDeadlineTimer_new7(long long msecs, uintptr_t typeVal); +QDeadlineTimer* QDeadlineTimer_new5(int type_); +QDeadlineTimer* QDeadlineTimer_new6(int param1, int type_); +QDeadlineTimer* QDeadlineTimer_new7(long long msecs, int typeVal); void QDeadlineTimer_Swap(QDeadlineTimer* self, QDeadlineTimer* other); bool QDeadlineTimer_IsForever(const QDeadlineTimer* self); bool QDeadlineTimer_HasExpired(const QDeadlineTimer* self); -uintptr_t QDeadlineTimer_TimerType(const QDeadlineTimer* self); -void QDeadlineTimer_SetTimerType(QDeadlineTimer* self, uintptr_t typeVal); +int QDeadlineTimer_TimerType(const QDeadlineTimer* self); +void QDeadlineTimer_SetTimerType(QDeadlineTimer* self, int typeVal); long long QDeadlineTimer_RemainingTime(const QDeadlineTimer* self); long long QDeadlineTimer_RemainingTimeNSecs(const QDeadlineTimer* self); void QDeadlineTimer_SetRemainingTime(QDeadlineTimer* self, long long msecs); @@ -44,13 +44,13 @@ QDeadlineTimer* QDeadlineTimer_Current(); QDeadlineTimer* QDeadlineTimer_OperatorPlusAssign(QDeadlineTimer* self, long long msecs); QDeadlineTimer* QDeadlineTimer_OperatorMinusAssign(QDeadlineTimer* self, long long msecs); void QDeadlineTimer_OperatorAssign(QDeadlineTimer* self, QDeadlineTimer* param1); -void QDeadlineTimer_SetRemainingTime2(QDeadlineTimer* self, long long msecs, uintptr_t typeVal); +void QDeadlineTimer_SetRemainingTime2(QDeadlineTimer* self, long long msecs, int typeVal); void QDeadlineTimer_SetPreciseRemainingTime2(QDeadlineTimer* self, long long secs, long long nsecs); -void QDeadlineTimer_SetPreciseRemainingTime3(QDeadlineTimer* self, long long secs, long long nsecs, uintptr_t typeVal); -void QDeadlineTimer_SetDeadline2(QDeadlineTimer* self, long long msecs, uintptr_t timerType); +void QDeadlineTimer_SetPreciseRemainingTime3(QDeadlineTimer* self, long long secs, long long nsecs, int typeVal); +void QDeadlineTimer_SetDeadline2(QDeadlineTimer* self, long long msecs, int timerType); void QDeadlineTimer_SetPreciseDeadline2(QDeadlineTimer* self, long long secs, long long nsecs); -void QDeadlineTimer_SetPreciseDeadline3(QDeadlineTimer* self, long long secs, long long nsecs, uintptr_t typeVal); -QDeadlineTimer* QDeadlineTimer_Current1(uintptr_t timerType); +void QDeadlineTimer_SetPreciseDeadline3(QDeadlineTimer* self, long long secs, long long nsecs, int typeVal); +QDeadlineTimer* QDeadlineTimer_Current1(int timerType); void QDeadlineTimer_Delete(QDeadlineTimer* self); #ifdef __cplusplus diff --git a/qt/gen_qdial.cpp b/qt/gen_qdial.cpp index 04bca47..ae16b0b 100644 --- a/qt/gen_qdial.cpp +++ b/qt/gen_qdial.cpp @@ -48,7 +48,8 @@ void QDial_SetNotchTarget(QDial* self, double target) { } double QDial_NotchTarget(const QDial* self) { - return self->notchTarget(); + qreal _ret = self->notchTarget(); + return static_cast(_ret); } bool QDial_NotchesVisible(const QDial* self) { diff --git a/qt/gen_qdialog.cpp b/qt/gen_qdialog.cpp index 6e310b0..61b84d7 100644 --- a/qt/gen_qdialog.cpp +++ b/qt/gen_qdialog.cpp @@ -47,13 +47,13 @@ void QDialog_SetVisible(QDialog* self, bool visible) { self->setVisible(visible); } -void QDialog_SetOrientation(QDialog* self, uintptr_t orientation) { +void QDialog_SetOrientation(QDialog* self, int orientation) { self->setOrientation(static_cast(orientation)); } -uintptr_t QDialog_Orientation(const QDialog* self) { +int QDialog_Orientation(const QDialog* self) { Qt::Orientation _ret = self->orientation(); - return static_cast(_ret); + return static_cast(_ret); } void QDialog_SetExtension(QDialog* self, QWidget* extension) { diff --git a/qt/gen_qdialog.go b/qt/gen_qdialog.go index 85984b1..8807c56 100644 --- a/qt/gen_qdialog.go +++ b/qt/gen_qdialog.go @@ -58,7 +58,7 @@ func NewQDialog2(parent *QWidget) *QDialog { // NewQDialog3 constructs a new QDialog object. func NewQDialog3(parent *QWidget, f int) *QDialog { - ret := C.QDialog_new3(parent.cPointer(), (C.int)(f)) + ret := C.QDialog_new3(parent.cPointer(), f) return newQDialog(ret) } @@ -93,7 +93,7 @@ func (this *QDialog) SetVisible(visible bool) { } func (this *QDialog) SetOrientation(orientation Orientation) { - C.QDialog_SetOrientation(this.h, (C.uintptr_t)(orientation)) + C.QDialog_SetOrientation(this.h, (C.int)(orientation)) } func (this *QDialog) Orientation() Orientation { diff --git a/qt/gen_qdialog.h b/qt/gen_qdialog.h index 8544cc3..978f2c0 100644 --- a/qt/gen_qdialog.h +++ b/qt/gen_qdialog.h @@ -33,8 +33,8 @@ struct miqt_string* QDialog_Tr(const char* s); struct miqt_string* QDialog_TrUtf8(const char* s); int QDialog_Result(const QDialog* self); void QDialog_SetVisible(QDialog* self, bool visible); -void QDialog_SetOrientation(QDialog* self, uintptr_t orientation); -uintptr_t QDialog_Orientation(const QDialog* self); +void QDialog_SetOrientation(QDialog* self, int orientation); +int QDialog_Orientation(const QDialog* self); void QDialog_SetExtension(QDialog* self, QWidget* extension); QWidget* QDialog_Extension(const QDialog* self); QSize* QDialog_SizeHint(const QDialog* self); diff --git a/qt/gen_qdialogbuttonbox.cpp b/qt/gen_qdialogbuttonbox.cpp index 2c288ab..120d9bc 100644 --- a/qt/gen_qdialogbuttonbox.cpp +++ b/qt/gen_qdialogbuttonbox.cpp @@ -15,7 +15,7 @@ QDialogButtonBox* QDialogButtonBox_new() { return new QDialogButtonBox(); } -QDialogButtonBox* QDialogButtonBox_new2(uintptr_t orientation) { +QDialogButtonBox* QDialogButtonBox_new2(int orientation) { return new QDialogButtonBox(static_cast(orientation)); } @@ -23,7 +23,7 @@ QDialogButtonBox* QDialogButtonBox_new3(int buttons) { return new QDialogButtonBox(static_cast(buttons)); } -QDialogButtonBox* QDialogButtonBox_new4(int buttons, uintptr_t orientation) { +QDialogButtonBox* QDialogButtonBox_new4(int buttons, int orientation) { return new QDialogButtonBox(static_cast(buttons), static_cast(orientation)); } @@ -31,7 +31,7 @@ QDialogButtonBox* QDialogButtonBox_new5(QWidget* parent) { return new QDialogButtonBox(parent); } -QDialogButtonBox* QDialogButtonBox_new6(uintptr_t orientation, QWidget* parent) { +QDialogButtonBox* QDialogButtonBox_new6(int orientation, QWidget* parent) { return new QDialogButtonBox(static_cast(orientation), parent); } @@ -39,7 +39,7 @@ QDialogButtonBox* QDialogButtonBox_new7(int buttons, QWidget* parent) { return new QDialogButtonBox(static_cast(buttons), parent); } -QDialogButtonBox* QDialogButtonBox_new8(int buttons, uintptr_t orientation, QWidget* parent) { +QDialogButtonBox* QDialogButtonBox_new8(int buttons, int orientation, QWidget* parent) { return new QDialogButtonBox(static_cast(buttons), static_cast(orientation), parent); } @@ -61,25 +61,25 @@ struct miqt_string* QDialogButtonBox_TrUtf8(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -void QDialogButtonBox_SetOrientation(QDialogButtonBox* self, uintptr_t orientation) { +void QDialogButtonBox_SetOrientation(QDialogButtonBox* self, int orientation) { self->setOrientation(static_cast(orientation)); } -uintptr_t QDialogButtonBox_Orientation(const QDialogButtonBox* self) { +int QDialogButtonBox_Orientation(const QDialogButtonBox* self) { Qt::Orientation _ret = self->orientation(); - return static_cast(_ret); + return static_cast(_ret); } -void QDialogButtonBox_AddButton(QDialogButtonBox* self, QAbstractButton* button, uintptr_t role) { +void QDialogButtonBox_AddButton(QDialogButtonBox* self, QAbstractButton* button, int role) { self->addButton(button, static_cast(role)); } -QPushButton* QDialogButtonBox_AddButton2(QDialogButtonBox* self, struct miqt_string* text, uintptr_t role) { +QPushButton* QDialogButtonBox_AddButton2(QDialogButtonBox* self, struct miqt_string* text, int role) { QString text_QString = QString::fromUtf8(&text->data, text->len); return self->addButton(text_QString, static_cast(role)); } -QPushButton* QDialogButtonBox_AddButtonWithButton(QDialogButtonBox* self, uintptr_t button) { +QPushButton* QDialogButtonBox_AddButtonWithButton(QDialogButtonBox* self, int button) { return self->addButton(static_cast(button)); } @@ -92,7 +92,7 @@ void QDialogButtonBox_Clear(QDialogButtonBox* self) { } struct miqt_array* QDialogButtonBox_Buttons(const QDialogButtonBox* self) { - QList _ret = self->buttons(); + QList _ret = self->buttons(); // Convert QList<> from C++ memory to manually-managed C memory QAbstractButton** _arr = static_cast(malloc(sizeof(QAbstractButton*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -104,9 +104,9 @@ struct miqt_array* QDialogButtonBox_Buttons(const QDialogButtonBox* self) { return _out; } -uintptr_t QDialogButtonBox_ButtonRole(const QDialogButtonBox* self, QAbstractButton* button) { +int QDialogButtonBox_ButtonRole(const QDialogButtonBox* self, QAbstractButton* button) { QDialogButtonBox::ButtonRole _ret = self->buttonRole(button); - return static_cast(_ret); + return static_cast(_ret); } void QDialogButtonBox_SetStandardButtons(QDialogButtonBox* self, int buttons) { @@ -118,12 +118,12 @@ int QDialogButtonBox_StandardButtons(const QDialogButtonBox* self) { return static_cast(_ret); } -uintptr_t QDialogButtonBox_StandardButton(const QDialogButtonBox* self, QAbstractButton* button) { +int QDialogButtonBox_StandardButton(const QDialogButtonBox* self, QAbstractButton* button) { QDialogButtonBox::StandardButton _ret = self->standardButton(button); - return static_cast(_ret); + return static_cast(_ret); } -QPushButton* QDialogButtonBox_Button(const QDialogButtonBox* self, uintptr_t which) { +QPushButton* QDialogButtonBox_Button(const QDialogButtonBox* self, int which) { return self->button(static_cast(which)); } diff --git a/qt/gen_qdialogbuttonbox.go b/qt/gen_qdialogbuttonbox.go index 49fa3f6..2adf4d7 100644 --- a/qt/gen_qdialogbuttonbox.go +++ b/qt/gen_qdialogbuttonbox.go @@ -97,19 +97,19 @@ func NewQDialogButtonBox() *QDialogButtonBox { // NewQDialogButtonBox2 constructs a new QDialogButtonBox object. func NewQDialogButtonBox2(orientation Orientation) *QDialogButtonBox { - ret := C.QDialogButtonBox_new2((C.uintptr_t)(orientation)) + ret := C.QDialogButtonBox_new2((C.int)(orientation)) return newQDialogButtonBox(ret) } // NewQDialogButtonBox3 constructs a new QDialogButtonBox object. func NewQDialogButtonBox3(buttons int) *QDialogButtonBox { - ret := C.QDialogButtonBox_new3((C.int)(buttons)) + ret := C.QDialogButtonBox_new3(buttons) return newQDialogButtonBox(ret) } // NewQDialogButtonBox4 constructs a new QDialogButtonBox object. func NewQDialogButtonBox4(buttons int, orientation Orientation) *QDialogButtonBox { - ret := C.QDialogButtonBox_new4((C.int)(buttons), (C.uintptr_t)(orientation)) + ret := C.QDialogButtonBox_new4(buttons, (C.int)(orientation)) return newQDialogButtonBox(ret) } @@ -121,19 +121,19 @@ func NewQDialogButtonBox5(parent *QWidget) *QDialogButtonBox { // NewQDialogButtonBox6 constructs a new QDialogButtonBox object. func NewQDialogButtonBox6(orientation Orientation, parent *QWidget) *QDialogButtonBox { - ret := C.QDialogButtonBox_new6((C.uintptr_t)(orientation), parent.cPointer()) + ret := C.QDialogButtonBox_new6((C.int)(orientation), parent.cPointer()) return newQDialogButtonBox(ret) } // NewQDialogButtonBox7 constructs a new QDialogButtonBox object. func NewQDialogButtonBox7(buttons int, parent *QWidget) *QDialogButtonBox { - ret := C.QDialogButtonBox_new7((C.int)(buttons), parent.cPointer()) + ret := C.QDialogButtonBox_new7(buttons, parent.cPointer()) return newQDialogButtonBox(ret) } // NewQDialogButtonBox8 constructs a new QDialogButtonBox object. func NewQDialogButtonBox8(buttons int, orientation Orientation, parent *QWidget) *QDialogButtonBox { - ret := C.QDialogButtonBox_new8((C.int)(buttons), (C.uintptr_t)(orientation), parent.cPointer()) + ret := C.QDialogButtonBox_new8(buttons, (C.int)(orientation), parent.cPointer()) return newQDialogButtonBox(ret) } @@ -160,7 +160,7 @@ func QDialogButtonBox_TrUtf8(s string) string { } func (this *QDialogButtonBox) SetOrientation(orientation Orientation) { - C.QDialogButtonBox_SetOrientation(this.h, (C.uintptr_t)(orientation)) + C.QDialogButtonBox_SetOrientation(this.h, (C.int)(orientation)) } func (this *QDialogButtonBox) Orientation() Orientation { @@ -168,17 +168,17 @@ func (this *QDialogButtonBox) Orientation() Orientation { } func (this *QDialogButtonBox) AddButton(button *QAbstractButton, role QDialogButtonBox__ButtonRole) { - C.QDialogButtonBox_AddButton(this.h, button.cPointer(), (C.uintptr_t)(role)) + C.QDialogButtonBox_AddButton(this.h, button.cPointer(), (C.int)(role)) } func (this *QDialogButtonBox) AddButton2(text string, role QDialogButtonBox__ButtonRole) *QPushButton { text_ms := miqt_strdupg(text) defer C.free(text_ms) - return newQPushButton_U(unsafe.Pointer(C.QDialogButtonBox_AddButton2(this.h, (*C.struct_miqt_string)(text_ms), (C.uintptr_t)(role)))) + return newQPushButton_U(unsafe.Pointer(C.QDialogButtonBox_AddButton2(this.h, (*C.struct_miqt_string)(text_ms), (C.int)(role)))) } func (this *QDialogButtonBox) AddButtonWithButton(button QDialogButtonBox__StandardButton) *QPushButton { - return newQPushButton_U(unsafe.Pointer(C.QDialogButtonBox_AddButtonWithButton(this.h, (C.uintptr_t)(button)))) + return newQPushButton_U(unsafe.Pointer(C.QDialogButtonBox_AddButtonWithButton(this.h, (C.int)(button)))) } func (this *QDialogButtonBox) RemoveButton(button *QAbstractButton) { @@ -205,7 +205,7 @@ func (this *QDialogButtonBox) ButtonRole(button *QAbstractButton) QDialogButtonB } func (this *QDialogButtonBox) SetStandardButtons(buttons int) { - C.QDialogButtonBox_SetStandardButtons(this.h, (C.int)(buttons)) + C.QDialogButtonBox_SetStandardButtons(this.h, buttons) } func (this *QDialogButtonBox) StandardButtons() int { @@ -217,7 +217,7 @@ func (this *QDialogButtonBox) StandardButton(button *QAbstractButton) QDialogBut } func (this *QDialogButtonBox) Button(which QDialogButtonBox__StandardButton) *QPushButton { - return newQPushButton_U(unsafe.Pointer(C.QDialogButtonBox_Button(this.h, (C.uintptr_t)(which)))) + return newQPushButton_U(unsafe.Pointer(C.QDialogButtonBox_Button(this.h, (C.int)(which)))) } func (this *QDialogButtonBox) SetCenterButtons(center bool) { diff --git a/qt/gen_qdialogbuttonbox.h b/qt/gen_qdialogbuttonbox.h index ec021ed..6b53852 100644 --- a/qt/gen_qdialogbuttonbox.h +++ b/qt/gen_qdialogbuttonbox.h @@ -28,29 +28,29 @@ typedef struct QWidget QWidget; #endif QDialogButtonBox* QDialogButtonBox_new(); -QDialogButtonBox* QDialogButtonBox_new2(uintptr_t orientation); +QDialogButtonBox* QDialogButtonBox_new2(int orientation); QDialogButtonBox* QDialogButtonBox_new3(int buttons); -QDialogButtonBox* QDialogButtonBox_new4(int buttons, uintptr_t orientation); +QDialogButtonBox* QDialogButtonBox_new4(int buttons, int orientation); QDialogButtonBox* QDialogButtonBox_new5(QWidget* parent); -QDialogButtonBox* QDialogButtonBox_new6(uintptr_t orientation, QWidget* parent); +QDialogButtonBox* QDialogButtonBox_new6(int orientation, QWidget* parent); QDialogButtonBox* QDialogButtonBox_new7(int buttons, QWidget* parent); -QDialogButtonBox* QDialogButtonBox_new8(int buttons, uintptr_t orientation, QWidget* parent); +QDialogButtonBox* QDialogButtonBox_new8(int buttons, int orientation, QWidget* parent); QMetaObject* QDialogButtonBox_MetaObject(const QDialogButtonBox* self); struct miqt_string* QDialogButtonBox_Tr(const char* s); struct miqt_string* QDialogButtonBox_TrUtf8(const char* s); -void QDialogButtonBox_SetOrientation(QDialogButtonBox* self, uintptr_t orientation); -uintptr_t QDialogButtonBox_Orientation(const QDialogButtonBox* self); -void QDialogButtonBox_AddButton(QDialogButtonBox* self, QAbstractButton* button, uintptr_t role); -QPushButton* QDialogButtonBox_AddButton2(QDialogButtonBox* self, struct miqt_string* text, uintptr_t role); -QPushButton* QDialogButtonBox_AddButtonWithButton(QDialogButtonBox* self, uintptr_t button); +void QDialogButtonBox_SetOrientation(QDialogButtonBox* self, int orientation); +int QDialogButtonBox_Orientation(const QDialogButtonBox* self); +void QDialogButtonBox_AddButton(QDialogButtonBox* self, QAbstractButton* button, int role); +QPushButton* QDialogButtonBox_AddButton2(QDialogButtonBox* self, struct miqt_string* text, int role); +QPushButton* QDialogButtonBox_AddButtonWithButton(QDialogButtonBox* self, int button); void QDialogButtonBox_RemoveButton(QDialogButtonBox* self, QAbstractButton* button); void QDialogButtonBox_Clear(QDialogButtonBox* self); struct miqt_array* QDialogButtonBox_Buttons(const QDialogButtonBox* self); -uintptr_t QDialogButtonBox_ButtonRole(const QDialogButtonBox* self, QAbstractButton* button); +int QDialogButtonBox_ButtonRole(const QDialogButtonBox* self, QAbstractButton* button); void QDialogButtonBox_SetStandardButtons(QDialogButtonBox* self, int buttons); int QDialogButtonBox_StandardButtons(const QDialogButtonBox* self); -uintptr_t QDialogButtonBox_StandardButton(const QDialogButtonBox* self, QAbstractButton* button); -QPushButton* QDialogButtonBox_Button(const QDialogButtonBox* self, uintptr_t which); +int QDialogButtonBox_StandardButton(const QDialogButtonBox* self, QAbstractButton* button); +QPushButton* QDialogButtonBox_Button(const QDialogButtonBox* self, int which); void QDialogButtonBox_SetCenterButtons(QDialogButtonBox* self, bool center); bool QDialogButtonBox_CenterButtons(const QDialogButtonBox* self); void QDialogButtonBox_Clicked(QDialogButtonBox* self, QAbstractButton* button); diff --git a/qt/gen_qdir.cpp b/qt/gen_qdir.cpp index 8a31e35..d6d17f0 100644 --- a/qt/gen_qdir.cpp +++ b/qt/gen_qdir.cpp @@ -221,7 +221,8 @@ void QDir_SetSorting(QDir* self, int sort) { } unsigned int QDir_Count(const QDir* self) { - return self->count(); + uint _ret = self->count(); + return static_cast(_ret); } bool QDir_IsEmpty(const QDir* self) { diff --git a/qt/gen_qdir.go b/qt/gen_qdir.go index f191d63..4015abb 100644 --- a/qt/gen_qdir.go +++ b/qt/gen_qdir.go @@ -113,7 +113,7 @@ func NewQDir5(path string, nameFilter string, sort int) *QDir { defer C.free(path_ms) nameFilter_ms := miqt_strdupg(nameFilter) defer C.free(nameFilter_ms) - ret := C.QDir_new5((*C.struct_miqt_string)(path_ms), (*C.struct_miqt_string)(nameFilter_ms), (C.int)(sort)) + ret := C.QDir_new5((*C.struct_miqt_string)(path_ms), (*C.struct_miqt_string)(nameFilter_ms), sort) return newQDir(ret) } @@ -123,7 +123,7 @@ func NewQDir6(path string, nameFilter string, sort int, filter int) *QDir { defer C.free(path_ms) nameFilter_ms := miqt_strdupg(nameFilter) defer C.free(nameFilter_ms) - ret := C.QDir_new6((*C.struct_miqt_string)(path_ms), (*C.struct_miqt_string)(nameFilter_ms), (C.int)(sort), (C.int)(filter)) + ret := C.QDir_new6((*C.struct_miqt_string)(path_ms), (*C.struct_miqt_string)(nameFilter_ms), sort, filter) return newQDir(ret) } @@ -309,7 +309,7 @@ func (this *QDir) Filter() int { } func (this *QDir) SetFilter(filter int) { - C.QDir_SetFilter(this.h, (C.int)(filter)) + C.QDir_SetFilter(this.h, filter) } func (this *QDir) Sorting() int { @@ -317,7 +317,7 @@ func (this *QDir) Sorting() int { } func (this *QDir) SetSorting(sort int) { - C.QDir_SetSorting(this.h, (C.int)(sort)) + C.QDir_SetSorting(this.h, sort) } func (this *QDir) Count() uint { @@ -647,11 +647,11 @@ func (this *QDir) Refresh() { } func (this *QDir) IsEmpty1(filters int) bool { - return (bool)(C.QDir_IsEmpty1(this.h, (C.int)(filters))) + return (bool)(C.QDir_IsEmpty1(this.h, filters)) } func (this *QDir) EntryList1(filters int) []string { - var _ma *C.struct_miqt_array = C.QDir_EntryList1(this.h, (C.int)(filters)) + var _ma *C.struct_miqt_array = C.QDir_EntryList1(this.h, filters) _ret := make([]string, int(_ma.len)) _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -665,7 +665,7 @@ func (this *QDir) EntryList1(filters int) []string { } func (this *QDir) EntryList2(filters int, sort int) []string { - var _ma *C.struct_miqt_array = C.QDir_EntryList2(this.h, (C.int)(filters), (C.int)(sort)) + var _ma *C.struct_miqt_array = C.QDir_EntryList2(this.h, filters, sort) _ret := make([]string, int(_ma.len)) _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -689,7 +689,7 @@ func (this *QDir) EntryList22(nameFilters []string, filters int) []string { } nameFilters_ma := &C.struct_miqt_array{len: C.size_t(len(nameFilters)), data: unsafe.Pointer(nameFilters_CArray)} defer runtime.KeepAlive(unsafe.Pointer(nameFilters_ma)) - var _ma *C.struct_miqt_array = C.QDir_EntryList22(this.h, nameFilters_ma, (C.int)(filters)) + var _ma *C.struct_miqt_array = C.QDir_EntryList22(this.h, nameFilters_ma, filters) _ret := make([]string, int(_ma.len)) _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -713,7 +713,7 @@ func (this *QDir) EntryList3(nameFilters []string, filters int, sort int) []stri } nameFilters_ma := &C.struct_miqt_array{len: C.size_t(len(nameFilters)), data: unsafe.Pointer(nameFilters_CArray)} defer runtime.KeepAlive(unsafe.Pointer(nameFilters_ma)) - var _ma *C.struct_miqt_array = C.QDir_EntryList3(this.h, nameFilters_ma, (C.int)(filters), (C.int)(sort)) + var _ma *C.struct_miqt_array = C.QDir_EntryList3(this.h, nameFilters_ma, filters, sort) _ret := make([]string, int(_ma.len)) _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -727,7 +727,7 @@ func (this *QDir) EntryList3(nameFilters []string, filters int, sort int) []stri } func (this *QDir) EntryInfoList1(filters int) []QFileInfo { - var _ma *C.struct_miqt_array = C.QDir_EntryInfoList1(this.h, (C.int)(filters)) + var _ma *C.struct_miqt_array = C.QDir_EntryInfoList1(this.h, filters) _ret := make([]QFileInfo, int(_ma.len)) _outCast := (*[0xffff]*C.QFileInfo)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -741,7 +741,7 @@ func (this *QDir) EntryInfoList1(filters int) []QFileInfo { } func (this *QDir) EntryInfoList2(filters int, sort int) []QFileInfo { - var _ma *C.struct_miqt_array = C.QDir_EntryInfoList2(this.h, (C.int)(filters), (C.int)(sort)) + var _ma *C.struct_miqt_array = C.QDir_EntryInfoList2(this.h, filters, sort) _ret := make([]QFileInfo, int(_ma.len)) _outCast := (*[0xffff]*C.QFileInfo)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -765,7 +765,7 @@ func (this *QDir) EntryInfoList22(nameFilters []string, filters int) []QFileInfo } nameFilters_ma := &C.struct_miqt_array{len: C.size_t(len(nameFilters)), data: unsafe.Pointer(nameFilters_CArray)} defer runtime.KeepAlive(unsafe.Pointer(nameFilters_ma)) - var _ma *C.struct_miqt_array = C.QDir_EntryInfoList22(this.h, nameFilters_ma, (C.int)(filters)) + var _ma *C.struct_miqt_array = C.QDir_EntryInfoList22(this.h, nameFilters_ma, filters) _ret := make([]QFileInfo, int(_ma.len)) _outCast := (*[0xffff]*C.QFileInfo)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -789,7 +789,7 @@ func (this *QDir) EntryInfoList3(nameFilters []string, filters int, sort int) [] } nameFilters_ma := &C.struct_miqt_array{len: C.size_t(len(nameFilters)), data: unsafe.Pointer(nameFilters_CArray)} defer runtime.KeepAlive(unsafe.Pointer(nameFilters_ma)) - var _ma *C.struct_miqt_array = C.QDir_EntryInfoList3(this.h, nameFilters_ma, (C.int)(filters), (C.int)(sort)) + var _ma *C.struct_miqt_array = C.QDir_EntryInfoList3(this.h, nameFilters_ma, filters, sort) _ret := make([]QFileInfo, int(_ma.len)) _outCast := (*[0xffff]*C.QFileInfo)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { diff --git a/qt/gen_qdiriterator.go b/qt/gen_qdiriterator.go index 679f5fe..06228b6 100644 --- a/qt/gen_qdiriterator.go +++ b/qt/gen_qdiriterator.go @@ -61,7 +61,7 @@ func NewQDirIterator2(path string) *QDirIterator { func NewQDirIterator3(path string, filter int) *QDirIterator { path_ms := miqt_strdupg(path) defer C.free(path_ms) - ret := C.QDirIterator_new3((*C.struct_miqt_string)(path_ms), (C.int)(filter)) + ret := C.QDirIterator_new3((*C.struct_miqt_string)(path_ms), filter) return newQDirIterator(ret) } @@ -85,7 +85,7 @@ func NewQDirIterator4(path string, nameFilters []string) *QDirIterator { // NewQDirIterator5 constructs a new QDirIterator object. func NewQDirIterator5(dir *QDir, flags int) *QDirIterator { - ret := C.QDirIterator_new5(dir.cPointer(), (C.int)(flags)) + ret := C.QDirIterator_new5(dir.cPointer(), flags) return newQDirIterator(ret) } @@ -93,7 +93,7 @@ func NewQDirIterator5(dir *QDir, flags int) *QDirIterator { func NewQDirIterator6(path string, flags int) *QDirIterator { path_ms := miqt_strdupg(path) defer C.free(path_ms) - ret := C.QDirIterator_new6((*C.struct_miqt_string)(path_ms), (C.int)(flags)) + ret := C.QDirIterator_new6((*C.struct_miqt_string)(path_ms), flags) return newQDirIterator(ret) } @@ -101,7 +101,7 @@ func NewQDirIterator6(path string, flags int) *QDirIterator { func NewQDirIterator7(path string, filter int, flags int) *QDirIterator { path_ms := miqt_strdupg(path) defer C.free(path_ms) - ret := C.QDirIterator_new7((*C.struct_miqt_string)(path_ms), (C.int)(filter), (C.int)(flags)) + ret := C.QDirIterator_new7((*C.struct_miqt_string)(path_ms), filter, flags) return newQDirIterator(ret) } @@ -119,7 +119,7 @@ func NewQDirIterator8(path string, nameFilters []string, filters int) *QDirItera } nameFilters_ma := &C.struct_miqt_array{len: C.size_t(len(nameFilters)), data: unsafe.Pointer(nameFilters_CArray)} defer runtime.KeepAlive(unsafe.Pointer(nameFilters_ma)) - ret := C.QDirIterator_new8((*C.struct_miqt_string)(path_ms), nameFilters_ma, (C.int)(filters)) + ret := C.QDirIterator_new8((*C.struct_miqt_string)(path_ms), nameFilters_ma, filters) return newQDirIterator(ret) } @@ -137,7 +137,7 @@ func NewQDirIterator9(path string, nameFilters []string, filters int, flags int) } nameFilters_ma := &C.struct_miqt_array{len: C.size_t(len(nameFilters)), data: unsafe.Pointer(nameFilters_CArray)} defer runtime.KeepAlive(unsafe.Pointer(nameFilters_ma)) - ret := C.QDirIterator_new9((*C.struct_miqt_string)(path_ms), nameFilters_ma, (C.int)(filters), (C.int)(flags)) + ret := C.QDirIterator_new9((*C.struct_miqt_string)(path_ms), nameFilters_ma, filters, flags) return newQDirIterator(ret) } diff --git a/qt/gen_qdirmodel.cpp b/qt/gen_qdirmodel.cpp index 14db8ea..c18cdf9 100644 --- a/qt/gen_qdirmodel.cpp +++ b/qt/gen_qdirmodel.cpp @@ -87,7 +87,7 @@ bool QDirModel_SetData(QDirModel* self, QModelIndex* index, QVariant* value) { return self->setData(*index, *value); } -QVariant* QDirModel_HeaderData(const QDirModel* self, int section, uintptr_t orientation) { +QVariant* QDirModel_HeaderData(const QDirModel* self, int section, int orientation) { return new QVariant(self->headerData(static_cast(section), static_cast(orientation))); } @@ -130,7 +130,7 @@ QMimeData* QDirModel_MimeData(const QDirModel* self, struct miqt_array* /* of QM return self->mimeData(indexes_QList); } -bool QDirModel_DropMimeData(QDirModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent) { +bool QDirModel_DropMimeData(QDirModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent) { return self->dropMimeData(data, static_cast(action), static_cast(row), static_cast(column), *parent); } @@ -312,7 +312,7 @@ bool QDirModel_SetData3(QDirModel* self, QModelIndex* index, QVariant* value, in return self->setData(*index, *value, static_cast(role)); } -QVariant* QDirModel_HeaderData3(const QDirModel* self, int section, uintptr_t orientation, int role) { +QVariant* QDirModel_HeaderData3(const QDirModel* self, int section, int orientation, int role) { return new QVariant(self->headerData(static_cast(section), static_cast(orientation), static_cast(role))); } @@ -320,7 +320,7 @@ bool QDirModel_HasChildren1(const QDirModel* self, QModelIndex* index) { return self->hasChildren(*index); } -void QDirModel_Sort2(QDirModel* self, int column, uintptr_t order) { +void QDirModel_Sort2(QDirModel* self, int column, int order) { self->sort(static_cast(column), static_cast(order)); } diff --git a/qt/gen_qdirmodel.go b/qt/gen_qdirmodel.go index e7d1f59..ca4d2a4 100644 --- a/qt/gen_qdirmodel.go +++ b/qt/gen_qdirmodel.go @@ -56,7 +56,7 @@ func NewQDirModel(nameFilters []string, filters int, sort int) *QDirModel { } nameFilters_ma := &C.struct_miqt_array{len: C.size_t(len(nameFilters)), data: unsafe.Pointer(nameFilters_CArray)} defer runtime.KeepAlive(unsafe.Pointer(nameFilters_ma)) - ret := C.QDirModel_new(nameFilters_ma, (C.int)(filters), (C.int)(sort)) + ret := C.QDirModel_new(nameFilters_ma, filters, sort) return newQDirModel(ret) } @@ -78,7 +78,7 @@ func NewQDirModel3(nameFilters []string, filters int, sort int, parent *QObject) } nameFilters_ma := &C.struct_miqt_array{len: C.size_t(len(nameFilters)), data: unsafe.Pointer(nameFilters_CArray)} defer runtime.KeepAlive(unsafe.Pointer(nameFilters_ma)) - ret := C.QDirModel_new3(nameFilters_ma, (C.int)(filters), (C.int)(sort), parent.cPointer()) + ret := C.QDirModel_new3(nameFilters_ma, filters, sort, parent.cPointer()) return newQDirModel(ret) } @@ -144,7 +144,7 @@ func (this *QDirModel) SetData(index *QModelIndex, value *QVariant) bool { } func (this *QDirModel) HeaderData(section int, orientation Orientation) *QVariant { - _ret := C.QDirModel_HeaderData(this.h, (C.int)(section), (C.uintptr_t)(orientation)) + _ret := C.QDirModel_HeaderData(this.h, (C.int)(section), (C.int)(orientation)) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -189,7 +189,7 @@ func (this *QDirModel) MimeData(indexes []QModelIndex) *QMimeData { } func (this *QDirModel) DropMimeData(data *QMimeData, action DropAction, row int, column int, parent *QModelIndex) bool { - return (bool)(C.QDirModel_DropMimeData(this.h, data.cPointer(), (C.uintptr_t)(action), (C.int)(row), (C.int)(column), parent.cPointer())) + return (bool)(C.QDirModel_DropMimeData(this.h, data.cPointer(), (C.int)(action), (C.int)(row), (C.int)(column), parent.cPointer())) } func (this *QDirModel) SupportedDropActions() int { @@ -233,7 +233,7 @@ func (this *QDirModel) NameFilters() []string { } func (this *QDirModel) SetFilter(filters int) { - C.QDirModel_SetFilter(this.h, (C.int)(filters)) + C.QDirModel_SetFilter(this.h, filters) } func (this *QDirModel) Filter() int { @@ -241,7 +241,7 @@ func (this *QDirModel) Filter() int { } func (this *QDirModel) SetSorting(sort int) { - C.QDirModel_SetSorting(this.h, (C.int)(sort)) + C.QDirModel_SetSorting(this.h, sort) } func (this *QDirModel) Sorting() int { @@ -405,7 +405,7 @@ func (this *QDirModel) SetData3(index *QModelIndex, value *QVariant, role int) b } 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)) + _ret := C.QDirModel_HeaderData3(this.h, (C.int)(section), (C.int)(orientation), (C.int)(role)) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -416,7 +416,7 @@ func (this *QDirModel) HasChildren1(index *QModelIndex) bool { } func (this *QDirModel) Sort2(column int, order SortOrder) { - C.QDirModel_Sort2(this.h, (C.int)(column), (C.uintptr_t)(order)) + C.QDirModel_Sort2(this.h, (C.int)(column), (C.int)(order)) } func (this *QDirModel) Index2(path string, column int) *QModelIndex { diff --git a/qt/gen_qdirmodel.h b/qt/gen_qdirmodel.h index 1b3b608..068776b 100644 --- a/qt/gen_qdirmodel.h +++ b/qt/gen_qdirmodel.h @@ -48,13 +48,13 @@ int QDirModel_RowCount(const QDirModel* self); int QDirModel_ColumnCount(const QDirModel* self); QVariant* QDirModel_Data(const QDirModel* self, QModelIndex* index); bool QDirModel_SetData(QDirModel* self, QModelIndex* index, QVariant* value); -QVariant* QDirModel_HeaderData(const QDirModel* self, int section, uintptr_t orientation); +QVariant* QDirModel_HeaderData(const QDirModel* self, int section, int orientation); bool QDirModel_HasChildren(const QDirModel* self); int QDirModel_Flags(const QDirModel* self, QModelIndex* index); void QDirModel_Sort(QDirModel* self, int column); struct miqt_array* QDirModel_MimeTypes(const QDirModel* self); QMimeData* QDirModel_MimeData(const QDirModel* self, struct miqt_array* /* of QModelIndex* */ indexes); -bool QDirModel_DropMimeData(QDirModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent); +bool QDirModel_DropMimeData(QDirModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent); int QDirModel_SupportedDropActions(const QDirModel* self); void QDirModel_SetIconProvider(QDirModel* self, QFileIconProvider* provider); QFileIconProvider* QDirModel_IconProvider(const QDirModel* self); @@ -89,9 +89,9 @@ int QDirModel_RowCount1(const QDirModel* self, QModelIndex* parent); int QDirModel_ColumnCount1(const QDirModel* self, QModelIndex* parent); QVariant* QDirModel_Data2(const QDirModel* self, QModelIndex* index, int role); bool QDirModel_SetData3(QDirModel* self, QModelIndex* index, QVariant* value, int role); -QVariant* QDirModel_HeaderData3(const QDirModel* self, int section, uintptr_t orientation, int role); +QVariant* QDirModel_HeaderData3(const QDirModel* self, int section, int orientation, int role); bool QDirModel_HasChildren1(const QDirModel* self, QModelIndex* index); -void QDirModel_Sort2(QDirModel* self, int column, uintptr_t order); +void QDirModel_Sort2(QDirModel* self, int column, int order); QModelIndex* QDirModel_Index2(const QDirModel* self, struct miqt_string* path, int column); void QDirModel_Refresh1(QDirModel* self, QModelIndex* parent); void QDirModel_Delete(QDirModel* self); diff --git a/qt/gen_qdockwidget.cpp b/qt/gen_qdockwidget.cpp index aca1fda..1307e44 100644 --- a/qt/gen_qdockwidget.cpp +++ b/qt/gen_qdockwidget.cpp @@ -96,7 +96,7 @@ QWidget* QDockWidget_TitleBarWidget(const QDockWidget* self) { return self->titleBarWidget(); } -bool QDockWidget_IsAreaAllowed(const QDockWidget* self, uintptr_t area) { +bool QDockWidget_IsAreaAllowed(const QDockWidget* self, int area) { return self->isAreaAllowed(static_cast(area)); } @@ -150,14 +150,14 @@ void QDockWidget_connect_VisibilityChanged(QDockWidget* self, void* slot) { }); } -void QDockWidget_DockLocationChanged(QDockWidget* self, uintptr_t area) { +void QDockWidget_DockLocationChanged(QDockWidget* self, int area) { self->dockLocationChanged(static_cast(area)); } void QDockWidget_connect_DockLocationChanged(QDockWidget* self, void* slot) { QDockWidget::connect(self, static_cast(&QDockWidget::dockLocationChanged), self, [=](Qt::DockWidgetArea area) { Qt::DockWidgetArea area_ret = area; - uintptr_t sigval1 = static_cast(area_ret); + int sigval1 = static_cast(area_ret); miqt_exec_callback_QDockWidget_DockLocationChanged(slot, sigval1); }); } diff --git a/qt/gen_qdockwidget.go b/qt/gen_qdockwidget.go index de83d83..a11f2d7 100644 --- a/qt/gen_qdockwidget.go +++ b/qt/gen_qdockwidget.go @@ -76,7 +76,7 @@ func NewQDockWidget3(title string, parent *QWidget) *QDockWidget { func NewQDockWidget4(title string, parent *QWidget, flags int) *QDockWidget { title_ms := miqt_strdupg(title) defer C.free(title_ms) - ret := C.QDockWidget_new4((*C.struct_miqt_string)(title_ms), parent.cPointer(), (C.int)(flags)) + ret := C.QDockWidget_new4((*C.struct_miqt_string)(title_ms), parent.cPointer(), flags) return newQDockWidget(ret) } @@ -88,7 +88,7 @@ func NewQDockWidget5(parent *QWidget) *QDockWidget { // NewQDockWidget6 constructs a new QDockWidget object. func NewQDockWidget6(parent *QWidget, flags int) *QDockWidget { - ret := C.QDockWidget_new6(parent.cPointer(), (C.int)(flags)) + ret := C.QDockWidget_new6(parent.cPointer(), flags) return newQDockWidget(ret) } @@ -123,7 +123,7 @@ func (this *QDockWidget) SetWidget(widget *QWidget) { } func (this *QDockWidget) SetFeatures(features int) { - C.QDockWidget_SetFeatures(this.h, (C.int)(features)) + C.QDockWidget_SetFeatures(this.h, features) } func (this *QDockWidget) Features() int { @@ -139,7 +139,7 @@ func (this *QDockWidget) IsFloating() bool { } func (this *QDockWidget) SetAllowedAreas(areas int) { - C.QDockWidget_SetAllowedAreas(this.h, (C.int)(areas)) + C.QDockWidget_SetAllowedAreas(this.h, areas) } func (this *QDockWidget) AllowedAreas() int { @@ -155,7 +155,7 @@ func (this *QDockWidget) TitleBarWidget() *QWidget { } func (this *QDockWidget) IsAreaAllowed(area DockWidgetArea) bool { - return (bool)(C.QDockWidget_IsAreaAllowed(this.h, (C.uintptr_t)(area))) + return (bool)(C.QDockWidget_IsAreaAllowed(this.h, (C.int)(area))) } func (this *QDockWidget) ToggleViewAction() *QAction { @@ -163,7 +163,7 @@ func (this *QDockWidget) ToggleViewAction() *QAction { } func (this *QDockWidget) FeaturesChanged(features int) { - C.QDockWidget_FeaturesChanged(this.h, (C.int)(features)) + C.QDockWidget_FeaturesChanged(this.h, features) } func (this *QDockWidget) OnFeaturesChanged(slot func(features int)) { C.QDockWidget_connect_FeaturesChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) @@ -203,7 +203,7 @@ func miqt_exec_callback_QDockWidget_TopLevelChanged(cb *C.void, topLevel C.bool) } func (this *QDockWidget) AllowedAreasChanged(allowedAreas int) { - C.QDockWidget_AllowedAreasChanged(this.h, (C.int)(allowedAreas)) + C.QDockWidget_AllowedAreasChanged(this.h, allowedAreas) } func (this *QDockWidget) OnAllowedAreasChanged(slot func(allowedAreas int)) { C.QDockWidget_connect_AllowedAreasChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) @@ -243,14 +243,14 @@ func miqt_exec_callback_QDockWidget_VisibilityChanged(cb *C.void, visible C.bool } func (this *QDockWidget) DockLocationChanged(area DockWidgetArea) { - C.QDockWidget_DockLocationChanged(this.h, (C.uintptr_t)(area)) + C.QDockWidget_DockLocationChanged(this.h, (C.int)(area)) } func (this *QDockWidget) OnDockLocationChanged(slot func(area DockWidgetArea)) { C.QDockWidget_connect_DockLocationChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QDockWidget_DockLocationChanged -func miqt_exec_callback_QDockWidget_DockLocationChanged(cb *C.void, area C.uintptr_t) { +func miqt_exec_callback_QDockWidget_DockLocationChanged(cb *C.void, area C.int) { gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(area DockWidgetArea)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt/gen_qdockwidget.h b/qt/gen_qdockwidget.h index 25952b6..14376e3 100644 --- a/qt/gen_qdockwidget.h +++ b/qt/gen_qdockwidget.h @@ -44,7 +44,7 @@ void QDockWidget_SetAllowedAreas(QDockWidget* self, int areas); int QDockWidget_AllowedAreas(const QDockWidget* self); void QDockWidget_SetTitleBarWidget(QDockWidget* self, QWidget* widget); QWidget* QDockWidget_TitleBarWidget(const QDockWidget* self); -bool QDockWidget_IsAreaAllowed(const QDockWidget* self, uintptr_t area); +bool QDockWidget_IsAreaAllowed(const QDockWidget* self, int area); QAction* QDockWidget_ToggleViewAction(const QDockWidget* self); void QDockWidget_FeaturesChanged(QDockWidget* self, int features); void QDockWidget_connect_FeaturesChanged(QDockWidget* self, void* slot); @@ -54,7 +54,7 @@ void QDockWidget_AllowedAreasChanged(QDockWidget* self, int allowedAreas); void QDockWidget_connect_AllowedAreasChanged(QDockWidget* self, void* slot); void QDockWidget_VisibilityChanged(QDockWidget* self, bool visible); void QDockWidget_connect_VisibilityChanged(QDockWidget* self, void* slot); -void QDockWidget_DockLocationChanged(QDockWidget* self, uintptr_t area); +void QDockWidget_DockLocationChanged(QDockWidget* self, int area); void QDockWidget_connect_DockLocationChanged(QDockWidget* self, void* slot); struct miqt_string* QDockWidget_Tr2(const char* s, const char* c); struct miqt_string* QDockWidget_Tr3(const char* s, const char* c, int n); diff --git a/qt/gen_qdrag.cpp b/qt/gen_qdrag.cpp index b1bbc2b..8600ac5 100644 --- a/qt/gen_qdrag.cpp +++ b/qt/gen_qdrag.cpp @@ -65,26 +65,26 @@ QObject* QDrag_Target(const QDrag* self) { return self->target(); } -uintptr_t QDrag_Start(QDrag* self) { +int QDrag_Start(QDrag* self) { Qt::DropAction _ret = self->start(); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QDrag_Exec(QDrag* self) { +int QDrag_Exec(QDrag* self) { Qt::DropAction _ret = self->exec(); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QDrag_Exec2(QDrag* self, int supportedActions, uintptr_t defaultAction) { +int QDrag_Exec2(QDrag* self, int supportedActions, int defaultAction) { Qt::DropAction _ret = self->exec(static_cast(supportedActions), static_cast(defaultAction)); - return static_cast(_ret); + return static_cast(_ret); } -void QDrag_SetDragCursor(QDrag* self, QPixmap* cursor, uintptr_t action) { +void QDrag_SetDragCursor(QDrag* self, QPixmap* cursor, int action) { self->setDragCursor(*cursor, static_cast(action)); } -QPixmap* QDrag_DragCursor(const QDrag* self, uintptr_t action) { +QPixmap* QDrag_DragCursor(const QDrag* self, int action) { return new QPixmap(self->dragCursor(static_cast(action))); } @@ -93,23 +93,23 @@ int QDrag_SupportedActions(const QDrag* self) { return static_cast(_ret); } -uintptr_t QDrag_DefaultAction(const QDrag* self) { +int QDrag_DefaultAction(const QDrag* self) { Qt::DropAction _ret = self->defaultAction(); - return static_cast(_ret); + return static_cast(_ret); } void QDrag_Cancel() { QDrag::cancel(); } -void QDrag_ActionChanged(QDrag* self, uintptr_t action) { +void QDrag_ActionChanged(QDrag* self, int action) { self->actionChanged(static_cast(action)); } void QDrag_connect_ActionChanged(QDrag* self, void* slot) { QDrag::connect(self, static_cast(&QDrag::actionChanged), self, [=](Qt::DropAction action) { Qt::DropAction action_ret = action; - uintptr_t sigval1 = static_cast(action_ret); + int sigval1 = static_cast(action_ret); miqt_exec_callback_QDrag_ActionChanged(slot, sigval1); }); } @@ -153,14 +153,14 @@ struct miqt_string* QDrag_TrUtf83(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -uintptr_t QDrag_Start1(QDrag* self, int supportedActions) { +int QDrag_Start1(QDrag* self, int supportedActions) { Qt::DropAction _ret = self->start(static_cast(supportedActions)); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QDrag_Exec1(QDrag* self, int supportedActions) { +int QDrag_Exec1(QDrag* self, int supportedActions) { Qt::DropAction _ret = self->exec(static_cast(supportedActions)); - return static_cast(_ret); + return static_cast(_ret); } void QDrag_Delete(QDrag* self) { diff --git a/qt/gen_qdrag.go b/qt/gen_qdrag.go index 6c186a8..9fc3a41 100644 --- a/qt/gen_qdrag.go +++ b/qt/gen_qdrag.go @@ -112,15 +112,15 @@ func (this *QDrag) Exec() DropAction { } func (this *QDrag) Exec2(supportedActions int, defaultAction DropAction) DropAction { - return (DropAction)(C.QDrag_Exec2(this.h, (C.int)(supportedActions), (C.uintptr_t)(defaultAction))) + return (DropAction)(C.QDrag_Exec2(this.h, supportedActions, (C.int)(defaultAction))) } func (this *QDrag) SetDragCursor(cursor *QPixmap, action DropAction) { - C.QDrag_SetDragCursor(this.h, cursor.cPointer(), (C.uintptr_t)(action)) + C.QDrag_SetDragCursor(this.h, cursor.cPointer(), (C.int)(action)) } func (this *QDrag) DragCursor(action DropAction) *QPixmap { - _ret := C.QDrag_DragCursor(this.h, (C.uintptr_t)(action)) + _ret := C.QDrag_DragCursor(this.h, (C.int)(action)) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -139,14 +139,14 @@ func QDrag_Cancel() { } func (this *QDrag) ActionChanged(action DropAction) { - C.QDrag_ActionChanged(this.h, (C.uintptr_t)(action)) + C.QDrag_ActionChanged(this.h, (C.int)(action)) } func (this *QDrag) OnActionChanged(slot func(action DropAction)) { C.QDrag_connect_ActionChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QDrag_ActionChanged -func miqt_exec_callback_QDrag_ActionChanged(cb *C.void, action C.uintptr_t) { +func miqt_exec_callback_QDrag_ActionChanged(cb *C.void, action C.int) { gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(action DropAction)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -223,11 +223,11 @@ func QDrag_TrUtf83(s string, c string, n int) string { } func (this *QDrag) Start1(supportedActions int) DropAction { - return (DropAction)(C.QDrag_Start1(this.h, (C.int)(supportedActions))) + return (DropAction)(C.QDrag_Start1(this.h, supportedActions)) } func (this *QDrag) Exec1(supportedActions int) DropAction { - return (DropAction)(C.QDrag_Exec1(this.h, (C.int)(supportedActions))) + return (DropAction)(C.QDrag_Exec1(this.h, supportedActions)) } // Delete this object from C++ memory. diff --git a/qt/gen_qdrag.h b/qt/gen_qdrag.h index 41a8fbe..326b70b 100644 --- a/qt/gen_qdrag.h +++ b/qt/gen_qdrag.h @@ -41,15 +41,15 @@ void QDrag_SetHotSpot(QDrag* self, QPoint* hotspot); QPoint* QDrag_HotSpot(const QDrag* self); QObject* QDrag_Source(const QDrag* self); QObject* QDrag_Target(const QDrag* self); -uintptr_t QDrag_Start(QDrag* self); -uintptr_t QDrag_Exec(QDrag* self); -uintptr_t QDrag_Exec2(QDrag* self, int supportedActions, uintptr_t defaultAction); -void QDrag_SetDragCursor(QDrag* self, QPixmap* cursor, uintptr_t action); -QPixmap* QDrag_DragCursor(const QDrag* self, uintptr_t action); +int QDrag_Start(QDrag* self); +int QDrag_Exec(QDrag* self); +int QDrag_Exec2(QDrag* self, int supportedActions, int defaultAction); +void QDrag_SetDragCursor(QDrag* self, QPixmap* cursor, int action); +QPixmap* QDrag_DragCursor(const QDrag* self, int action); int QDrag_SupportedActions(const QDrag* self); -uintptr_t QDrag_DefaultAction(const QDrag* self); +int QDrag_DefaultAction(const QDrag* self); void QDrag_Cancel(); -void QDrag_ActionChanged(QDrag* self, uintptr_t action); +void QDrag_ActionChanged(QDrag* self, int action); void QDrag_connect_ActionChanged(QDrag* self, void* slot); void QDrag_TargetChanged(QDrag* self, QObject* newTarget); void QDrag_connect_TargetChanged(QDrag* self, void* slot); @@ -57,8 +57,8 @@ struct miqt_string* QDrag_Tr2(const char* s, const char* c); struct miqt_string* QDrag_Tr3(const char* s, const char* c, int n); struct miqt_string* QDrag_TrUtf82(const char* s, const char* c); struct miqt_string* QDrag_TrUtf83(const char* s, const char* c, int n); -uintptr_t QDrag_Start1(QDrag* self, int supportedActions); -uintptr_t QDrag_Exec1(QDrag* self, int supportedActions); +int QDrag_Start1(QDrag* self, int supportedActions); +int QDrag_Exec1(QDrag* self, int supportedActions); void QDrag_Delete(QDrag* self); #ifdef __cplusplus diff --git a/qt/gen_qdrawutil.cpp b/qt/gen_qdrawutil.cpp index f3c91a6..b490474 100644 --- a/qt/gen_qdrawutil.cpp +++ b/qt/gen_qdrawutil.cpp @@ -3,7 +3,7 @@ #include "gen_qdrawutil.h" #include "_cgo_export.h" -QTileRules* QTileRules_new(uintptr_t horizontalRule, uintptr_t verticalRule) { +QTileRules* QTileRules_new(int horizontalRule, int verticalRule) { return new QTileRules(static_cast(horizontalRule), static_cast(verticalRule)); } @@ -15,7 +15,7 @@ QTileRules* QTileRules_new3(QTileRules* param1) { return new QTileRules(*param1); } -QTileRules* QTileRules_new4(uintptr_t rule) { +QTileRules* QTileRules_new4(int rule) { return new QTileRules(static_cast(rule)); } diff --git a/qt/gen_qdrawutil.go b/qt/gen_qdrawutil.go index a184d14..badf84d 100644 --- a/qt/gen_qdrawutil.go +++ b/qt/gen_qdrawutil.go @@ -55,7 +55,7 @@ func newQTileRules_U(h unsafe.Pointer) *QTileRules { // NewQTileRules constructs a new QTileRules object. func NewQTileRules(horizontalRule TileRule, verticalRule TileRule) *QTileRules { - ret := C.QTileRules_new((C.uintptr_t)(horizontalRule), (C.uintptr_t)(verticalRule)) + ret := C.QTileRules_new((C.int)(horizontalRule), (C.int)(verticalRule)) return newQTileRules(ret) } @@ -73,7 +73,7 @@ func NewQTileRules3(param1 *QTileRules) *QTileRules { // NewQTileRules4 constructs a new QTileRules object. func NewQTileRules4(rule TileRule) *QTileRules { - ret := C.QTileRules_new4((C.uintptr_t)(rule)) + ret := C.QTileRules_new4((C.int)(rule)) return newQTileRules(ret) } diff --git a/qt/gen_qdrawutil.h b/qt/gen_qdrawutil.h index adb2393..b8533aa 100644 --- a/qt/gen_qdrawutil.h +++ b/qt/gen_qdrawutil.h @@ -19,10 +19,10 @@ class QTileRules; typedef struct QTileRules QTileRules; #endif -QTileRules* QTileRules_new(uintptr_t horizontalRule, uintptr_t verticalRule); +QTileRules* QTileRules_new(int horizontalRule, int verticalRule); QTileRules* QTileRules_new2(); QTileRules* QTileRules_new3(QTileRules* param1); -QTileRules* QTileRules_new4(uintptr_t rule); +QTileRules* QTileRules_new4(int rule); void QTileRules_Delete(QTileRules* self); #ifdef __cplusplus diff --git a/qt/gen_qeasingcurve.cpp b/qt/gen_qeasingcurve.cpp index 376f8dc..59a830a 100644 --- a/qt/gen_qeasingcurve.cpp +++ b/qt/gen_qeasingcurve.cpp @@ -13,7 +13,7 @@ QEasingCurve* QEasingCurve_new2(QEasingCurve* other) { return new QEasingCurve(*other); } -QEasingCurve* QEasingCurve_new3(uintptr_t typeVal) { +QEasingCurve* QEasingCurve_new3(int typeVal) { return new QEasingCurve(static_cast(typeVal)); } @@ -34,7 +34,8 @@ bool QEasingCurve_OperatorNotEqual(const QEasingCurve* self, QEasingCurve* other } double QEasingCurve_Amplitude(const QEasingCurve* self) { - return self->amplitude(); + qreal _ret = self->amplitude(); + return static_cast(_ret); } void QEasingCurve_SetAmplitude(QEasingCurve* self, double amplitude) { @@ -42,7 +43,8 @@ void QEasingCurve_SetAmplitude(QEasingCurve* self, double amplitude) { } double QEasingCurve_Period(const QEasingCurve* self) { - return self->period(); + qreal _ret = self->period(); + return static_cast(_ret); } void QEasingCurve_SetPeriod(QEasingCurve* self, double period) { @@ -50,7 +52,8 @@ void QEasingCurve_SetPeriod(QEasingCurve* self, double period) { } double QEasingCurve_Overshoot(const QEasingCurve* self) { - return self->overshoot(); + qreal _ret = self->overshoot(); + return static_cast(_ret); } void QEasingCurve_SetOvershoot(QEasingCurve* self, double overshoot) { @@ -78,17 +81,18 @@ struct miqt_array* QEasingCurve_ToCubicSpline(const QEasingCurve* self) { return _out; } -uintptr_t QEasingCurve_Type(const QEasingCurve* self) { +int QEasingCurve_Type(const QEasingCurve* self) { QEasingCurve::Type _ret = self->type(); - return static_cast(_ret); + return static_cast(_ret); } -void QEasingCurve_SetType(QEasingCurve* self, uintptr_t typeVal) { +void QEasingCurve_SetType(QEasingCurve* self, int typeVal) { self->setType(static_cast(typeVal)); } double QEasingCurve_ValueForProgress(const QEasingCurve* self, double progress) { - return self->valueForProgress(static_cast(progress)); + qreal _ret = self->valueForProgress(static_cast(progress)); + return static_cast(_ret); } void QEasingCurve_Delete(QEasingCurve* self) { diff --git a/qt/gen_qeasingcurve.go b/qt/gen_qeasingcurve.go index 18b0bd8..ad3157f 100644 --- a/qt/gen_qeasingcurve.go +++ b/qt/gen_qeasingcurve.go @@ -103,7 +103,7 @@ func NewQEasingCurve2(other *QEasingCurve) *QEasingCurve { // NewQEasingCurve3 constructs a new QEasingCurve object. func NewQEasingCurve3(typeVal QEasingCurve__Type) *QEasingCurve { - ret := C.QEasingCurve_new3((C.uintptr_t)(typeVal)) + ret := C.QEasingCurve_new3((C.int)(typeVal)) return newQEasingCurve(ret) } @@ -174,7 +174,7 @@ func (this *QEasingCurve) Type() QEasingCurve__Type { } func (this *QEasingCurve) SetType(typeVal QEasingCurve__Type) { - C.QEasingCurve_SetType(this.h, (C.uintptr_t)(typeVal)) + C.QEasingCurve_SetType(this.h, (C.int)(typeVal)) } func (this *QEasingCurve) ValueForProgress(progress float64) float64 { diff --git a/qt/gen_qeasingcurve.h b/qt/gen_qeasingcurve.h index 3ca5f62..9350e2d 100644 --- a/qt/gen_qeasingcurve.h +++ b/qt/gen_qeasingcurve.h @@ -23,7 +23,7 @@ typedef struct QPointF QPointF; QEasingCurve* QEasingCurve_new(); QEasingCurve* QEasingCurve_new2(QEasingCurve* other); -QEasingCurve* QEasingCurve_new3(uintptr_t typeVal); +QEasingCurve* QEasingCurve_new3(int typeVal); void QEasingCurve_OperatorAssign(QEasingCurve* self, QEasingCurve* other); void QEasingCurve_Swap(QEasingCurve* self, QEasingCurve* other); bool QEasingCurve_OperatorEqual(const QEasingCurve* self, QEasingCurve* other); @@ -37,8 +37,8 @@ void QEasingCurve_SetOvershoot(QEasingCurve* self, double overshoot); void QEasingCurve_AddCubicBezierSegment(QEasingCurve* self, QPointF* c1, QPointF* c2, QPointF* endPoint); void QEasingCurve_AddTCBSegment(QEasingCurve* self, QPointF* nextPoint, double t, double c, double b); struct miqt_array* QEasingCurve_ToCubicSpline(const QEasingCurve* self); -uintptr_t QEasingCurve_Type(const QEasingCurve* self); -void QEasingCurve_SetType(QEasingCurve* self, uintptr_t typeVal); +int QEasingCurve_Type(const QEasingCurve* self); +void QEasingCurve_SetType(QEasingCurve* self, int typeVal); double QEasingCurve_ValueForProgress(const QEasingCurve* self, double progress); void QEasingCurve_Delete(QEasingCurve* self); diff --git a/qt/gen_qelapsedtimer.cpp b/qt/gen_qelapsedtimer.cpp index 3bd64c8..c43ef09 100644 --- a/qt/gen_qelapsedtimer.cpp +++ b/qt/gen_qelapsedtimer.cpp @@ -7,9 +7,9 @@ QElapsedTimer* QElapsedTimer_new() { return new QElapsedTimer(); } -uintptr_t QElapsedTimer_ClockType() { +int QElapsedTimer_ClockType() { QElapsedTimer::ClockType _ret = QElapsedTimer::clockType(); - return static_cast(_ret); + return static_cast(_ret); } bool QElapsedTimer_IsMonotonic() { @@ -21,7 +21,8 @@ void QElapsedTimer_Start(QElapsedTimer* self) { } long long QElapsedTimer_Restart(QElapsedTimer* self) { - return self->restart(); + qint64 _ret = self->restart(); + return static_cast(_ret); } void QElapsedTimer_Invalidate(QElapsedTimer* self) { @@ -33,11 +34,13 @@ bool QElapsedTimer_IsValid(const QElapsedTimer* self) { } long long QElapsedTimer_NsecsElapsed(const QElapsedTimer* self) { - return self->nsecsElapsed(); + qint64 _ret = self->nsecsElapsed(); + return static_cast(_ret); } long long QElapsedTimer_Elapsed(const QElapsedTimer* self) { - return self->elapsed(); + qint64 _ret = self->elapsed(); + return static_cast(_ret); } bool QElapsedTimer_HasExpired(const QElapsedTimer* self, long long timeout) { @@ -45,15 +48,18 @@ bool QElapsedTimer_HasExpired(const QElapsedTimer* self, long long timeout) { } long long QElapsedTimer_MsecsSinceReference(const QElapsedTimer* self) { - return self->msecsSinceReference(); + qint64 _ret = self->msecsSinceReference(); + return static_cast(_ret); } long long QElapsedTimer_MsecsTo(const QElapsedTimer* self, QElapsedTimer* other) { - return self->msecsTo(*other); + qint64 _ret = self->msecsTo(*other); + return static_cast(_ret); } long long QElapsedTimer_SecsTo(const QElapsedTimer* self, QElapsedTimer* other) { - return self->secsTo(*other); + qint64 _ret = self->secsTo(*other); + return static_cast(_ret); } bool QElapsedTimer_OperatorEqual(const QElapsedTimer* self, QElapsedTimer* other) { diff --git a/qt/gen_qelapsedtimer.h b/qt/gen_qelapsedtimer.h index d0b28c9..229f068 100644 --- a/qt/gen_qelapsedtimer.h +++ b/qt/gen_qelapsedtimer.h @@ -20,7 +20,7 @@ typedef struct QElapsedTimer QElapsedTimer; #endif QElapsedTimer* QElapsedTimer_new(); -uintptr_t QElapsedTimer_ClockType(); +int QElapsedTimer_ClockType(); bool QElapsedTimer_IsMonotonic(); void QElapsedTimer_Start(QElapsedTimer* self); long long QElapsedTimer_Restart(QElapsedTimer* self); diff --git a/qt/gen_qevent.cpp b/qt/gen_qevent.cpp index a724096..ff54c13 100644 --- a/qt/gen_qevent.cpp +++ b/qt/gen_qevent.cpp @@ -64,7 +64,7 @@ #include "gen_qevent.h" #include "_cgo_export.h" -QInputEvent* QInputEvent_new(uintptr_t typeVal) { +QInputEvent* QInputEvent_new(int typeVal) { return new QInputEvent(static_cast(typeVal)); } @@ -72,7 +72,7 @@ QInputEvent* QInputEvent_new2(QInputEvent* param1) { return new QInputEvent(*param1); } -QInputEvent* QInputEvent_new3(uintptr_t typeVal, int modifiers) { +QInputEvent* QInputEvent_new3(int typeVal, int modifiers) { return new QInputEvent(static_cast(typeVal), static_cast(modifiers)); } @@ -86,7 +86,8 @@ void QInputEvent_SetModifiers(QInputEvent* self, int amodifiers) { } unsigned long QInputEvent_Timestamp(const QInputEvent* self) { - return self->timestamp(); + ulong _ret = self->timestamp(); + return static_cast(_ret); } void QInputEvent_SetTimestamp(QInputEvent* self, unsigned long atimestamp) { @@ -151,19 +152,19 @@ void QEnterEvent_Delete(QEnterEvent* self) { delete self; } -QMouseEvent* QMouseEvent_new(uintptr_t typeVal, QPointF* localPos, uintptr_t button, int buttons, int modifiers) { +QMouseEvent* QMouseEvent_new(int typeVal, QPointF* localPos, int button, int buttons, int modifiers) { return new QMouseEvent(static_cast(typeVal), *localPos, static_cast(button), static_cast(buttons), static_cast(modifiers)); } -QMouseEvent* QMouseEvent_new2(uintptr_t typeVal, QPointF* localPos, QPointF* screenPos, uintptr_t button, int buttons, int modifiers) { +QMouseEvent* QMouseEvent_new2(int typeVal, QPointF* localPos, QPointF* screenPos, int button, int buttons, int modifiers) { return new QMouseEvent(static_cast(typeVal), *localPos, *screenPos, static_cast(button), static_cast(buttons), static_cast(modifiers)); } -QMouseEvent* QMouseEvent_new3(uintptr_t typeVal, QPointF* localPos, QPointF* windowPos, QPointF* screenPos, uintptr_t button, int buttons, int modifiers) { +QMouseEvent* QMouseEvent_new3(int typeVal, QPointF* localPos, QPointF* windowPos, QPointF* screenPos, int button, int buttons, int modifiers) { return new QMouseEvent(static_cast(typeVal), *localPos, *windowPos, *screenPos, static_cast(button), static_cast(buttons), static_cast(modifiers)); } -QMouseEvent* QMouseEvent_new4(uintptr_t typeVal, QPointF* localPos, QPointF* windowPos, QPointF* screenPos, uintptr_t button, int buttons, int modifiers, uintptr_t source) { +QMouseEvent* QMouseEvent_new4(int typeVal, QPointF* localPos, QPointF* windowPos, QPointF* screenPos, int button, int buttons, int modifiers, int source) { return new QMouseEvent(static_cast(typeVal), *localPos, *windowPos, *screenPos, static_cast(button), static_cast(buttons), static_cast(modifiers), static_cast(source)); } @@ -213,9 +214,9 @@ QPointF* QMouseEvent_ScreenPos(const QMouseEvent* self) { return const_cast(&_ret); } -uintptr_t QMouseEvent_Button(const QMouseEvent* self) { +int QMouseEvent_Button(const QMouseEvent* self) { Qt::MouseButton _ret = self->button(); - return static_cast(_ret); + return static_cast(_ret); } int QMouseEvent_Buttons(const QMouseEvent* self) { @@ -227,9 +228,9 @@ void QMouseEvent_SetLocalPos(QMouseEvent* self, QPointF* localPosition) { self->setLocalPos(*localPosition); } -uintptr_t QMouseEvent_Source(const QMouseEvent* self) { +int QMouseEvent_Source(const QMouseEvent* self) { Qt::MouseEventSource _ret = self->source(); - return static_cast(_ret); + return static_cast(_ret); } int QMouseEvent_Flags(const QMouseEvent* self) { @@ -241,7 +242,7 @@ void QMouseEvent_Delete(QMouseEvent* self) { delete self; } -QHoverEvent* QHoverEvent_new(uintptr_t typeVal, QPointF* pos, QPointF* oldPos) { +QHoverEvent* QHoverEvent_new(int typeVal, QPointF* pos, QPointF* oldPos) { return new QHoverEvent(static_cast(typeVal), *pos, *oldPos); } @@ -249,7 +250,7 @@ QHoverEvent* QHoverEvent_new2(QHoverEvent* param1) { return new QHoverEvent(*param1); } -QHoverEvent* QHoverEvent_new3(uintptr_t typeVal, QPointF* pos, QPointF* oldPos, int modifiers) { +QHoverEvent* QHoverEvent_new3(int typeVal, QPointF* pos, QPointF* oldPos, int modifiers) { return new QHoverEvent(static_cast(typeVal), *pos, *oldPos, static_cast(modifiers)); } @@ -285,23 +286,23 @@ QWheelEvent* QWheelEvent_new2(QPointF* pos, QPointF* globalPos, int delta, int b return new QWheelEvent(*pos, *globalPos, static_cast(delta), static_cast(buttons), static_cast(modifiers)); } -QWheelEvent* QWheelEvent_new3(QPointF* pos, QPointF* globalPos, QPoint* pixelDelta, QPoint* angleDelta, int qt4Delta, uintptr_t qt4Orientation, int buttons, int modifiers) { +QWheelEvent* QWheelEvent_new3(QPointF* pos, QPointF* globalPos, QPoint* pixelDelta, QPoint* angleDelta, int qt4Delta, int qt4Orientation, int buttons, int modifiers) { return new QWheelEvent(*pos, *globalPos, *pixelDelta, *angleDelta, static_cast(qt4Delta), static_cast(qt4Orientation), static_cast(buttons), static_cast(modifiers)); } -QWheelEvent* QWheelEvent_new4(QPointF* pos, QPointF* globalPos, QPoint* pixelDelta, QPoint* angleDelta, int qt4Delta, uintptr_t qt4Orientation, int buttons, int modifiers, uintptr_t phase) { +QWheelEvent* QWheelEvent_new4(QPointF* pos, QPointF* globalPos, QPoint* pixelDelta, QPoint* angleDelta, int qt4Delta, int qt4Orientation, int buttons, int modifiers, int phase) { return new QWheelEvent(*pos, *globalPos, *pixelDelta, *angleDelta, static_cast(qt4Delta), static_cast(qt4Orientation), static_cast(buttons), static_cast(modifiers), static_cast(phase)); } -QWheelEvent* QWheelEvent_new5(QPointF* pos, QPointF* globalPos, QPoint* pixelDelta, QPoint* angleDelta, int qt4Delta, uintptr_t qt4Orientation, int buttons, int modifiers, uintptr_t phase, uintptr_t source) { +QWheelEvent* QWheelEvent_new5(QPointF* pos, QPointF* globalPos, QPoint* pixelDelta, QPoint* angleDelta, int qt4Delta, int qt4Orientation, int buttons, int modifiers, int phase, int source) { return new QWheelEvent(*pos, *globalPos, *pixelDelta, *angleDelta, static_cast(qt4Delta), static_cast(qt4Orientation), static_cast(buttons), static_cast(modifiers), static_cast(phase), static_cast(source)); } -QWheelEvent* QWheelEvent_new6(QPointF* pos, QPointF* globalPos, QPoint* pixelDelta, QPoint* angleDelta, int qt4Delta, uintptr_t qt4Orientation, int buttons, int modifiers, uintptr_t phase, uintptr_t source, bool inverted) { +QWheelEvent* QWheelEvent_new6(QPointF* pos, QPointF* globalPos, QPoint* pixelDelta, QPoint* angleDelta, int qt4Delta, int qt4Orientation, int buttons, int modifiers, int phase, int source, bool inverted) { return new QWheelEvent(*pos, *globalPos, *pixelDelta, *angleDelta, static_cast(qt4Delta), static_cast(qt4Orientation), static_cast(buttons), static_cast(modifiers), static_cast(phase), static_cast(source), inverted); } -QWheelEvent* QWheelEvent_new7(QPointF* pos, QPointF* globalPos, QPoint* pixelDelta, QPoint* angleDelta, int buttons, int modifiers, uintptr_t phase, bool inverted) { +QWheelEvent* QWheelEvent_new7(QPointF* pos, QPointF* globalPos, QPoint* pixelDelta, QPoint* angleDelta, int buttons, int modifiers, int phase, bool inverted) { return new QWheelEvent(*pos, *globalPos, *pixelDelta, *angleDelta, static_cast(buttons), static_cast(modifiers), static_cast(phase), inverted); } @@ -309,15 +310,15 @@ QWheelEvent* QWheelEvent_new8(QWheelEvent* param1) { return new QWheelEvent(*param1); } -QWheelEvent* QWheelEvent_new9(QPointF* pos, int delta, int buttons, int modifiers, uintptr_t orient) { +QWheelEvent* QWheelEvent_new9(QPointF* pos, int delta, int buttons, int modifiers, int orient) { return new QWheelEvent(*pos, static_cast(delta), static_cast(buttons), static_cast(modifiers), static_cast(orient)); } -QWheelEvent* QWheelEvent_new10(QPointF* pos, QPointF* globalPos, int delta, int buttons, int modifiers, uintptr_t orient) { +QWheelEvent* QWheelEvent_new10(QPointF* pos, QPointF* globalPos, int delta, int buttons, int modifiers, int orient) { return new QWheelEvent(*pos, *globalPos, static_cast(delta), static_cast(buttons), static_cast(modifiers), static_cast(orient)); } -QWheelEvent* QWheelEvent_new11(QPointF* pos, QPointF* globalPos, QPoint* pixelDelta, QPoint* angleDelta, int buttons, int modifiers, uintptr_t phase, bool inverted, uintptr_t source) { +QWheelEvent* QWheelEvent_new11(QPointF* pos, QPointF* globalPos, QPoint* pixelDelta, QPoint* angleDelta, int buttons, int modifiers, int phase, bool inverted, int source) { return new QWheelEvent(*pos, *globalPos, *pixelDelta, *angleDelta, static_cast(buttons), static_cast(modifiers), static_cast(phase), inverted, static_cast(source)); } @@ -333,9 +334,9 @@ int QWheelEvent_Delta(const QWheelEvent* self) { return self->delta(); } -uintptr_t QWheelEvent_Orientation(const QWheelEvent* self) { +int QWheelEvent_Orientation(const QWheelEvent* self) { Qt::Orientation _ret = self->orientation(); - return static_cast(_ret); + return static_cast(_ret); } QPoint* QWheelEvent_Pos(const QWheelEvent* self) { @@ -387,29 +388,29 @@ int QWheelEvent_Buttons(const QWheelEvent* self) { return static_cast(_ret); } -uintptr_t QWheelEvent_Phase(const QWheelEvent* self) { +int QWheelEvent_Phase(const QWheelEvent* self) { Qt::ScrollPhase _ret = self->phase(); - return static_cast(_ret); + return static_cast(_ret); } bool QWheelEvent_Inverted(const QWheelEvent* self) { return self->inverted(); } -uintptr_t QWheelEvent_Source(const QWheelEvent* self) { +int QWheelEvent_Source(const QWheelEvent* self) { Qt::MouseEventSource _ret = self->source(); - return static_cast(_ret); + return static_cast(_ret); } void QWheelEvent_Delete(QWheelEvent* self) { delete self; } -QTabletEvent* QTabletEvent_new(uintptr_t t, QPointF* pos, QPointF* globalPos, int device, int pointerType, double pressure, int xTilt, int yTilt, double tangentialPressure, double rotation, int z, int keyState, long long uniqueID) { +QTabletEvent* QTabletEvent_new(int t, QPointF* pos, QPointF* globalPos, int device, int pointerType, double pressure, int xTilt, int yTilt, double tangentialPressure, double rotation, int z, int keyState, long long uniqueID) { return new QTabletEvent(static_cast(t), *pos, *globalPos, static_cast(device), static_cast(pointerType), static_cast(pressure), static_cast(xTilt), static_cast(yTilt), static_cast(tangentialPressure), static_cast(rotation), static_cast(z), static_cast(keyState), static_cast(uniqueID)); } -QTabletEvent* QTabletEvent_new2(uintptr_t t, QPointF* pos, QPointF* globalPos, int device, int pointerType, double pressure, int xTilt, int yTilt, double tangentialPressure, double rotation, int z, int keyState, long long uniqueID, uintptr_t button, int buttons) { +QTabletEvent* QTabletEvent_new2(int t, QPointF* pos, QPointF* globalPos, int device, int pointerType, double pressure, int xTilt, int yTilt, double tangentialPressure, double rotation, int z, int keyState, long long uniqueID, int button, int buttons) { return new QTabletEvent(static_cast(t), *pos, *globalPos, static_cast(device), static_cast(pointerType), static_cast(pressure), static_cast(xTilt), static_cast(yTilt), static_cast(tangentialPressure), static_cast(rotation), static_cast(z), static_cast(keyState), static_cast(uniqueID), static_cast(button), static_cast(buttons)); } @@ -454,34 +455,38 @@ int QTabletEvent_GlobalY(const QTabletEvent* self) { } double QTabletEvent_HiResGlobalX(const QTabletEvent* self) { - return self->hiResGlobalX(); + qreal _ret = self->hiResGlobalX(); + return static_cast(_ret); } double QTabletEvent_HiResGlobalY(const QTabletEvent* self) { - return self->hiResGlobalY(); + qreal _ret = self->hiResGlobalY(); + return static_cast(_ret); } -uintptr_t QTabletEvent_Device(const QTabletEvent* self) { +int QTabletEvent_Device(const QTabletEvent* self) { QTabletEvent::TabletDevice _ret = self->device(); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QTabletEvent_DeviceType(const QTabletEvent* self) { +int QTabletEvent_DeviceType(const QTabletEvent* self) { QTabletEvent::TabletDevice _ret = self->deviceType(); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QTabletEvent_PointerType(const QTabletEvent* self) { +int QTabletEvent_PointerType(const QTabletEvent* self) { QTabletEvent::PointerType _ret = self->pointerType(); - return static_cast(_ret); + return static_cast(_ret); } long long QTabletEvent_UniqueId(const QTabletEvent* self) { - return self->uniqueId(); + qint64 _ret = self->uniqueId(); + return static_cast(_ret); } double QTabletEvent_Pressure(const QTabletEvent* self) { - return self->pressure(); + qreal _ret = self->pressure(); + return static_cast(_ret); } int QTabletEvent_Z(const QTabletEvent* self) { @@ -489,11 +494,13 @@ int QTabletEvent_Z(const QTabletEvent* self) { } double QTabletEvent_TangentialPressure(const QTabletEvent* self) { - return self->tangentialPressure(); + qreal _ret = self->tangentialPressure(); + return static_cast(_ret); } double QTabletEvent_Rotation(const QTabletEvent* self) { - return self->rotation(); + qreal _ret = self->rotation(); + return static_cast(_ret); } int QTabletEvent_XTilt(const QTabletEvent* self) { @@ -504,9 +511,9 @@ int QTabletEvent_YTilt(const QTabletEvent* self) { return self->yTilt(); } -uintptr_t QTabletEvent_Button(const QTabletEvent* self) { +int QTabletEvent_Button(const QTabletEvent* self) { Qt::MouseButton _ret = self->button(); - return static_cast(_ret); + return static_cast(_ret); } int QTabletEvent_Buttons(const QTabletEvent* self) { @@ -518,11 +525,11 @@ void QTabletEvent_Delete(QTabletEvent* self) { delete self; } -QNativeGestureEvent* QNativeGestureEvent_new(uintptr_t typeVal, QPointF* localPos, QPointF* windowPos, QPointF* screenPos, double value, unsigned long sequenceId, unsigned long long intArgument) { +QNativeGestureEvent* QNativeGestureEvent_new(int typeVal, QPointF* localPos, QPointF* windowPos, QPointF* screenPos, double value, unsigned long sequenceId, unsigned long long intArgument) { return new QNativeGestureEvent(static_cast(typeVal), *localPos, *windowPos, *screenPos, static_cast(value), static_cast(sequenceId), static_cast(intArgument)); } -QNativeGestureEvent* QNativeGestureEvent_new2(uintptr_t typeVal, QTouchDevice* dev, QPointF* localPos, QPointF* windowPos, QPointF* screenPos, double value, unsigned long sequenceId, unsigned long long intArgument) { +QNativeGestureEvent* QNativeGestureEvent_new2(int typeVal, QTouchDevice* dev, QPointF* localPos, QPointF* windowPos, QPointF* screenPos, double value, unsigned long sequenceId, unsigned long long intArgument) { return new QNativeGestureEvent(static_cast(typeVal), dev, *localPos, *windowPos, *screenPos, static_cast(value), static_cast(sequenceId), static_cast(intArgument)); } @@ -530,13 +537,14 @@ QNativeGestureEvent* QNativeGestureEvent_new3(QNativeGestureEvent* param1) { return new QNativeGestureEvent(*param1); } -uintptr_t QNativeGestureEvent_GestureType(const QNativeGestureEvent* self) { +int QNativeGestureEvent_GestureType(const QNativeGestureEvent* self) { Qt::NativeGestureType _ret = self->gestureType(); - return static_cast(_ret); + return static_cast(_ret); } double QNativeGestureEvent_Value(const QNativeGestureEvent* self) { - return self->value(); + qreal _ret = self->value(); + return static_cast(_ret); } QPoint* QNativeGestureEvent_Pos(const QNativeGestureEvent* self) { @@ -573,11 +581,11 @@ void QNativeGestureEvent_Delete(QNativeGestureEvent* self) { delete self; } -QKeyEvent* QKeyEvent_new(uintptr_t typeVal, int key, int modifiers) { +QKeyEvent* QKeyEvent_new(int typeVal, int key, int modifiers) { return new QKeyEvent(static_cast(typeVal), static_cast(key), static_cast(modifiers)); } -QKeyEvent* QKeyEvent_new2(uintptr_t typeVal, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers) { +QKeyEvent* QKeyEvent_new2(int typeVal, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers) { return new QKeyEvent(static_cast(typeVal), static_cast(key), static_cast(modifiers), static_cast(nativeScanCode), static_cast(nativeVirtualKey), static_cast(nativeModifiers)); } @@ -585,32 +593,32 @@ QKeyEvent* QKeyEvent_new3(QKeyEvent* param1) { return new QKeyEvent(*param1); } -QKeyEvent* QKeyEvent_new4(uintptr_t typeVal, int key, int modifiers, struct miqt_string* text) { +QKeyEvent* QKeyEvent_new4(int typeVal, int key, int modifiers, struct miqt_string* text) { QString text_QString = QString::fromUtf8(&text->data, text->len); return new QKeyEvent(static_cast(typeVal), static_cast(key), static_cast(modifiers), text_QString); } -QKeyEvent* QKeyEvent_new5(uintptr_t typeVal, int key, int modifiers, struct miqt_string* text, bool autorep) { +QKeyEvent* QKeyEvent_new5(int typeVal, int key, int modifiers, struct miqt_string* text, bool autorep) { QString text_QString = QString::fromUtf8(&text->data, text->len); return new QKeyEvent(static_cast(typeVal), static_cast(key), static_cast(modifiers), text_QString, autorep); } -QKeyEvent* QKeyEvent_new6(uintptr_t typeVal, int key, int modifiers, struct miqt_string* text, bool autorep, uint16_t count) { +QKeyEvent* QKeyEvent_new6(int typeVal, int key, int modifiers, struct miqt_string* text, bool autorep, uint16_t count) { QString text_QString = QString::fromUtf8(&text->data, text->len); return new QKeyEvent(static_cast(typeVal), static_cast(key), static_cast(modifiers), text_QString, autorep, static_cast(count)); } -QKeyEvent* QKeyEvent_new7(uintptr_t typeVal, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string* text) { +QKeyEvent* QKeyEvent_new7(int typeVal, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string* text) { QString text_QString = QString::fromUtf8(&text->data, text->len); return new QKeyEvent(static_cast(typeVal), static_cast(key), static_cast(modifiers), static_cast(nativeScanCode), static_cast(nativeVirtualKey), static_cast(nativeModifiers), text_QString); } -QKeyEvent* QKeyEvent_new8(uintptr_t typeVal, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string* text, bool autorep) { +QKeyEvent* QKeyEvent_new8(int typeVal, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string* text, bool autorep) { QString text_QString = QString::fromUtf8(&text->data, text->len); return new QKeyEvent(static_cast(typeVal), static_cast(key), static_cast(modifiers), static_cast(nativeScanCode), static_cast(nativeVirtualKey), static_cast(nativeModifiers), text_QString, autorep); } -QKeyEvent* QKeyEvent_new9(uintptr_t typeVal, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string* text, bool autorep, uint16_t count) { +QKeyEvent* QKeyEvent_new9(int typeVal, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string* text, bool autorep, uint16_t count) { QString text_QString = QString::fromUtf8(&text->data, text->len); return new QKeyEvent(static_cast(typeVal), static_cast(key), static_cast(modifiers), static_cast(nativeScanCode), static_cast(nativeVirtualKey), static_cast(nativeModifiers), text_QString, autorep, static_cast(count)); } @@ -619,7 +627,7 @@ int QKeyEvent_Key(const QKeyEvent* self) { return self->key(); } -bool QKeyEvent_Matches(const QKeyEvent* self, uintptr_t key) { +bool QKeyEvent_Matches(const QKeyEvent* self, int key) { return self->matches(static_cast(key)); } @@ -644,22 +652,25 @@ int QKeyEvent_Count(const QKeyEvent* self) { } unsigned int QKeyEvent_NativeScanCode(const QKeyEvent* self) { - return self->nativeScanCode(); + quint32 _ret = self->nativeScanCode(); + return static_cast(_ret); } unsigned int QKeyEvent_NativeVirtualKey(const QKeyEvent* self) { - return self->nativeVirtualKey(); + quint32 _ret = self->nativeVirtualKey(); + return static_cast(_ret); } unsigned int QKeyEvent_NativeModifiers(const QKeyEvent* self) { - return self->nativeModifiers(); + quint32 _ret = self->nativeModifiers(); + return static_cast(_ret); } void QKeyEvent_Delete(QKeyEvent* self) { delete self; } -QFocusEvent* QFocusEvent_new(uintptr_t typeVal) { +QFocusEvent* QFocusEvent_new(int typeVal) { return new QFocusEvent(static_cast(typeVal)); } @@ -667,7 +678,7 @@ QFocusEvent* QFocusEvent_new2(QFocusEvent* param1) { return new QFocusEvent(*param1); } -QFocusEvent* QFocusEvent_new3(uintptr_t typeVal, uintptr_t reason) { +QFocusEvent* QFocusEvent_new3(int typeVal, int reason) { return new QFocusEvent(static_cast(typeVal), static_cast(reason)); } @@ -679,9 +690,9 @@ bool QFocusEvent_LostFocus(const QFocusEvent* self) { return self->lostFocus(); } -uintptr_t QFocusEvent_Reason(const QFocusEvent* self) { +int QFocusEvent_Reason(const QFocusEvent* self) { Qt::FocusReason _ret = self->reason(); - return static_cast(_ret); + return static_cast(_ret); } void QFocusEvent_Delete(QFocusEvent* self) { @@ -758,7 +769,7 @@ void QExposeEvent_Delete(QExposeEvent* self) { delete self; } -QPlatformSurfaceEvent* QPlatformSurfaceEvent_new(uintptr_t surfaceEventType) { +QPlatformSurfaceEvent* QPlatformSurfaceEvent_new(int surfaceEventType) { return new QPlatformSurfaceEvent(static_cast(surfaceEventType)); } @@ -766,9 +777,9 @@ QPlatformSurfaceEvent* QPlatformSurfaceEvent_new2(QPlatformSurfaceEvent* param1) return new QPlatformSurfaceEvent(*param1); } -uintptr_t QPlatformSurfaceEvent_SurfaceEventType(const QPlatformSurfaceEvent* self) { +int QPlatformSurfaceEvent_SurfaceEventType(const QPlatformSurfaceEvent* self) { QPlatformSurfaceEvent::SurfaceEventType _ret = self->surfaceEventType(); - return static_cast(_ret); + return static_cast(_ret); } void QPlatformSurfaceEvent_Delete(QPlatformSurfaceEvent* self) { @@ -863,15 +874,15 @@ void QHideEvent_Delete(QHideEvent* self) { delete self; } -QContextMenuEvent* QContextMenuEvent_new(uintptr_t reason, QPoint* pos, QPoint* globalPos, int modifiers) { +QContextMenuEvent* QContextMenuEvent_new(int reason, QPoint* pos, QPoint* globalPos, int modifiers) { return new QContextMenuEvent(static_cast(reason), *pos, *globalPos, static_cast(modifiers)); } -QContextMenuEvent* QContextMenuEvent_new2(uintptr_t reason, QPoint* pos, QPoint* globalPos) { +QContextMenuEvent* QContextMenuEvent_new2(int reason, QPoint* pos, QPoint* globalPos) { return new QContextMenuEvent(static_cast(reason), *pos, *globalPos); } -QContextMenuEvent* QContextMenuEvent_new3(uintptr_t reason, QPoint* pos) { +QContextMenuEvent* QContextMenuEvent_new3(int reason, QPoint* pos) { return new QContextMenuEvent(static_cast(reason), *pos); } @@ -907,9 +918,9 @@ QPoint* QContextMenuEvent_GlobalPos(const QContextMenuEvent* self) { return const_cast(&_ret); } -uintptr_t QContextMenuEvent_Reason(const QContextMenuEvent* self) { +int QContextMenuEvent_Reason(const QContextMenuEvent* self) { QContextMenuEvent::Reason _ret = self->reason(); - return static_cast(_ret); + return static_cast(_ret); } void QContextMenuEvent_Delete(QContextMenuEvent* self) { @@ -940,6 +951,19 @@ void QInputMethodEvent_SetCommitString(QInputMethodEvent* self, struct miqt_stri self->setCommitString(commitString_QString); } +struct miqt_array* QInputMethodEvent_Attributes(const QInputMethodEvent* self) { + const QList& _ret = self->attributes(); + // Convert QList<> from C++ memory to manually-managed C memory + QInputMethodEvent__Attribute** _arr = static_cast(malloc(sizeof(QInputMethodEvent__Attribute*) * _ret.length())); + for (size_t i = 0, e = _ret.length(); i < e; ++i) { + _arr[i] = new QInputMethodEvent::Attribute(_ret[i]); + } + struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); + _out->len = _ret.length(); + _out->data = static_cast(_arr); + return _out; +} + struct miqt_string* QInputMethodEvent_PreeditString(const QInputMethodEvent* self) { const QString _ret = self->preeditString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -989,11 +1013,11 @@ int QInputMethodQueryEvent_Queries(const QInputMethodQueryEvent* self) { return static_cast(_ret); } -void QInputMethodQueryEvent_SetValue(QInputMethodQueryEvent* self, uintptr_t query, QVariant* value) { +void QInputMethodQueryEvent_SetValue(QInputMethodQueryEvent* self, int query, QVariant* value) { self->setValue(static_cast(query), *value); } -QVariant* QInputMethodQueryEvent_Value(const QInputMethodQueryEvent* self, uintptr_t query) { +QVariant* QInputMethodQueryEvent_Value(const QInputMethodQueryEvent* self, int query) { return new QVariant(self->value(static_cast(query))); } @@ -1009,7 +1033,7 @@ QDropEvent* QDropEvent_new2(QDropEvent* param1) { return new QDropEvent(*param1); } -QDropEvent* QDropEvent_new3(QPointF* pos, int actions, QMimeData* data, int buttons, int modifiers, uintptr_t typeVal) { +QDropEvent* QDropEvent_new3(QPointF* pos, int actions, QMimeData* data, int buttons, int modifiers, int typeVal) { return new QDropEvent(*pos, static_cast(actions), data, static_cast(buttons), static_cast(modifiers), static_cast(typeVal)); } @@ -1038,21 +1062,21 @@ int QDropEvent_PossibleActions(const QDropEvent* self) { return static_cast(_ret); } -uintptr_t QDropEvent_ProposedAction(const QDropEvent* self) { +int QDropEvent_ProposedAction(const QDropEvent* self) { Qt::DropAction _ret = self->proposedAction(); - return static_cast(_ret); + return static_cast(_ret); } void QDropEvent_AcceptProposedAction(QDropEvent* self) { self->acceptProposedAction(); } -uintptr_t QDropEvent_DropAction(const QDropEvent* self) { +int QDropEvent_DropAction(const QDropEvent* self) { Qt::DropAction _ret = self->dropAction(); - return static_cast(_ret); + return static_cast(_ret); } -void QDropEvent_SetDropAction(QDropEvent* self, uintptr_t action) { +void QDropEvent_SetDropAction(QDropEvent* self, int action) { self->setDropAction(static_cast(action)); } @@ -1076,7 +1100,7 @@ QDragMoveEvent* QDragMoveEvent_new2(QDragMoveEvent* param1) { return new QDragMoveEvent(*param1); } -QDragMoveEvent* QDragMoveEvent_new3(QPoint* pos, int actions, QMimeData* data, int buttons, int modifiers, uintptr_t typeVal) { +QDragMoveEvent* QDragMoveEvent_new3(QPoint* pos, int actions, QMimeData* data, int buttons, int modifiers, int typeVal) { return new QDragMoveEvent(*pos, static_cast(actions), data, static_cast(buttons), static_cast(modifiers), static_cast(typeVal)); } @@ -1136,7 +1160,7 @@ void QDragLeaveEvent_Delete(QDragLeaveEvent* self) { delete self; } -QHelpEvent* QHelpEvent_new(uintptr_t typeVal, QPoint* pos, QPoint* globalPos) { +QHelpEvent* QHelpEvent_new(int typeVal, QPoint* pos, QPoint* globalPos) { return new QHelpEvent(static_cast(typeVal), *pos, *globalPos); } @@ -1364,14 +1388,15 @@ bool QPointingDeviceUniqueId_IsValid(const QPointingDeviceUniqueId* self) { } long long QPointingDeviceUniqueId_NumericId(const QPointingDeviceUniqueId* self) { - return self->numericId(); + qint64 _ret = self->numericId(); + return static_cast(_ret); } void QPointingDeviceUniqueId_Delete(QPointingDeviceUniqueId* self) { delete self; } -QTouchEvent* QTouchEvent_new(uintptr_t eventType) { +QTouchEvent* QTouchEvent_new(int eventType) { return new QTouchEvent(static_cast(eventType)); } @@ -1379,19 +1404,19 @@ QTouchEvent* QTouchEvent_new2(QTouchEvent* param1) { return new QTouchEvent(*param1); } -QTouchEvent* QTouchEvent_new3(uintptr_t eventType, QTouchDevice* device) { +QTouchEvent* QTouchEvent_new3(int eventType, QTouchDevice* device) { return new QTouchEvent(static_cast(eventType), device); } -QTouchEvent* QTouchEvent_new4(uintptr_t eventType, QTouchDevice* device, int modifiers) { +QTouchEvent* QTouchEvent_new4(int eventType, QTouchDevice* device, int modifiers) { return new QTouchEvent(static_cast(eventType), device, static_cast(modifiers)); } -QTouchEvent* QTouchEvent_new5(uintptr_t eventType, QTouchDevice* device, int modifiers, int touchPointStates) { +QTouchEvent* QTouchEvent_new5(int eventType, QTouchDevice* device, int modifiers, int touchPointStates) { return new QTouchEvent(static_cast(eventType), device, static_cast(modifiers), static_cast(touchPointStates)); } -QTouchEvent* QTouchEvent_new6(uintptr_t eventType, QTouchDevice* device, int modifiers, int touchPointStates, struct miqt_array* /* of QTouchEvent__TouchPoint* */ touchPoints) { +QTouchEvent* QTouchEvent_new6(int eventType, QTouchDevice* device, int modifiers, int touchPointStates, struct miqt_array* /* of QTouchEvent__TouchPoint* */ touchPoints) { QList touchPoints_QList; touchPoints_QList.reserve(touchPoints->len); QTouchEvent__TouchPoint** touchPoints_arr = static_cast(touchPoints->data); @@ -1414,6 +1439,19 @@ int QTouchEvent_TouchPointStates(const QTouchEvent* self) { return static_cast(_ret); } +struct miqt_array* QTouchEvent_TouchPoints(const QTouchEvent* self) { + const QList& _ret = self->touchPoints(); + // Convert QList<> from C++ memory to manually-managed C memory + QTouchEvent__TouchPoint** _arr = static_cast(malloc(sizeof(QTouchEvent__TouchPoint*) * _ret.length())); + for (size_t i = 0, e = _ret.length(); i < e; ++i) { + _arr[i] = new QTouchEvent::TouchPoint(_ret[i]); + } + struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); + _out->len = _ret.length(); + _out->data = static_cast(_arr); + return _out; +} + QTouchDevice* QTouchEvent_Device(const QTouchEvent* self) { return self->device(); } @@ -1488,7 +1526,7 @@ void QScrollPrepareEvent_Delete(QScrollPrepareEvent* self) { delete self; } -QScrollEvent* QScrollEvent_new(QPointF* contentPos, QPointF* overshoot, uintptr_t scrollState) { +QScrollEvent* QScrollEvent_new(QPointF* contentPos, QPointF* overshoot, int scrollState) { return new QScrollEvent(*contentPos, *overshoot, static_cast(scrollState)); } @@ -1504,16 +1542,16 @@ QPointF* QScrollEvent_OvershootDistance(const QScrollEvent* self) { return new QPointF(self->overshootDistance()); } -uintptr_t QScrollEvent_ScrollState(const QScrollEvent* self) { +int QScrollEvent_ScrollState(const QScrollEvent* self) { QScrollEvent::ScrollState _ret = self->scrollState(); - return static_cast(_ret); + return static_cast(_ret); } void QScrollEvent_Delete(QScrollEvent* self) { delete self; } -QScreenOrientationChangeEvent* QScreenOrientationChangeEvent_new(QScreen* screen, uintptr_t orientation) { +QScreenOrientationChangeEvent* QScreenOrientationChangeEvent_new(QScreen* screen, int orientation) { return new QScreenOrientationChangeEvent(screen, static_cast(orientation)); } @@ -1525,16 +1563,16 @@ QScreen* QScreenOrientationChangeEvent_Screen(const QScreenOrientationChangeEven return self->screen(); } -uintptr_t QScreenOrientationChangeEvent_Orientation(const QScreenOrientationChangeEvent* self) { +int QScreenOrientationChangeEvent_Orientation(const QScreenOrientationChangeEvent* self) { Qt::ScreenOrientation _ret = self->orientation(); - return static_cast(_ret); + return static_cast(_ret); } void QScreenOrientationChangeEvent_Delete(QScreenOrientationChangeEvent* self) { delete self; } -QApplicationStateChangeEvent* QApplicationStateChangeEvent_new(uintptr_t state) { +QApplicationStateChangeEvent* QApplicationStateChangeEvent_new(int state) { return new QApplicationStateChangeEvent(static_cast(state)); } @@ -1542,20 +1580,20 @@ QApplicationStateChangeEvent* QApplicationStateChangeEvent_new2(QApplicationStat return new QApplicationStateChangeEvent(*param1); } -uintptr_t QApplicationStateChangeEvent_ApplicationState(const QApplicationStateChangeEvent* self) { +int QApplicationStateChangeEvent_ApplicationState(const QApplicationStateChangeEvent* self) { Qt::ApplicationState _ret = self->applicationState(); - return static_cast(_ret); + return static_cast(_ret); } void QApplicationStateChangeEvent_Delete(QApplicationStateChangeEvent* self) { delete self; } -QInputMethodEvent__Attribute* QInputMethodEvent__Attribute_new(uintptr_t typ, int s, int l, QVariant* val) { +QInputMethodEvent__Attribute* QInputMethodEvent__Attribute_new(int typ, int s, int l, QVariant* val) { return new QInputMethodEvent::Attribute(static_cast(typ), static_cast(s), static_cast(l), *val); } -QInputMethodEvent__Attribute* QInputMethodEvent__Attribute_new2(uintptr_t typ, int s, int l) { +QInputMethodEvent__Attribute* QInputMethodEvent__Attribute_new2(int typ, int s, int l) { return new QInputMethodEvent::Attribute(static_cast(typ), static_cast(s), static_cast(l)); } @@ -1563,6 +1601,10 @@ QInputMethodEvent__Attribute* QInputMethodEvent__Attribute_new3(QInputMethodEven return new QInputMethodEvent::Attribute(*param1); } +void QInputMethodEvent__Attribute_OperatorAssign(QInputMethodEvent__Attribute* self, QInputMethodEvent__Attribute* param1) { + self->operator=(*param1); +} + void QInputMethodEvent__Attribute_Delete(QInputMethodEvent__Attribute* self) { delete self; } @@ -1579,6 +1621,10 @@ QTouchEvent__TouchPoint* QTouchEvent__TouchPoint_new3(int id) { return new QTouchEvent::TouchPoint(static_cast(id)); } +void QTouchEvent__TouchPoint_OperatorAssign(QTouchEvent__TouchPoint* self, QTouchEvent__TouchPoint* other) { + self->operator=(*other); +} + void QTouchEvent__TouchPoint_Swap(QTouchEvent__TouchPoint* self, QTouchEvent__TouchPoint* other) { self->swap(*other); } @@ -1591,9 +1637,9 @@ QPointingDeviceUniqueId* QTouchEvent__TouchPoint_UniqueId(const QTouchEvent__Tou return new QPointingDeviceUniqueId(self->uniqueId()); } -uintptr_t QTouchEvent__TouchPoint_State(const QTouchEvent__TouchPoint* self) { +int QTouchEvent__TouchPoint_State(const QTouchEvent__TouchPoint* self) { Qt::TouchPointState _ret = self->state(); - return static_cast(_ret); + return static_cast(_ret); } QPointF* QTouchEvent__TouchPoint_Pos(const QTouchEvent__TouchPoint* self) { @@ -1669,11 +1715,13 @@ void QTouchEvent__TouchPoint_SetScreenRect(QTouchEvent__TouchPoint* self, QRectF } double QTouchEvent__TouchPoint_Pressure(const QTouchEvent__TouchPoint* self) { - return self->pressure(); + qreal _ret = self->pressure(); + return static_cast(_ret); } double QTouchEvent__TouchPoint_Rotation(const QTouchEvent__TouchPoint* self) { - return self->rotation(); + qreal _ret = self->rotation(); + return static_cast(_ret); } QSizeF* QTouchEvent__TouchPoint_EllipseDiameters(const QTouchEvent__TouchPoint* self) { diff --git a/qt/gen_qevent.go b/qt/gen_qevent.go index 56e0d9c..6d19fc4 100644 --- a/qt/gen_qevent.go +++ b/qt/gen_qevent.go @@ -98,7 +98,7 @@ func newQInputEvent_U(h unsafe.Pointer) *QInputEvent { // NewQInputEvent constructs a new QInputEvent object. func NewQInputEvent(typeVal QEvent__Type) *QInputEvent { - ret := C.QInputEvent_new((C.uintptr_t)(typeVal)) + ret := C.QInputEvent_new((C.int)(typeVal)) return newQInputEvent(ret) } @@ -110,7 +110,7 @@ func NewQInputEvent2(param1 *QInputEvent) *QInputEvent { // NewQInputEvent3 constructs a new QInputEvent object. func NewQInputEvent3(typeVal QEvent__Type, modifiers int) *QInputEvent { - ret := C.QInputEvent_new3((C.uintptr_t)(typeVal), (C.int)(modifiers)) + ret := C.QInputEvent_new3((C.int)(typeVal), modifiers) return newQInputEvent(ret) } @@ -119,7 +119,7 @@ func (this *QInputEvent) Modifiers() int { } func (this *QInputEvent) SetModifiers(amodifiers int) { - C.QInputEvent_SetModifiers(this.h, (C.int)(amodifiers)) + C.QInputEvent_SetModifiers(this.h, amodifiers) } func (this *QInputEvent) Timestamp() uint64 { @@ -260,25 +260,25 @@ func newQMouseEvent_U(h unsafe.Pointer) *QMouseEvent { // NewQMouseEvent constructs a new QMouseEvent object. 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)) + ret := C.QMouseEvent_new((C.int)(typeVal), localPos.cPointer(), (C.int)(button), buttons, modifiers) return newQMouseEvent(ret) } // NewQMouseEvent2 constructs a new QMouseEvent object. 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)) + ret := C.QMouseEvent_new2((C.int)(typeVal), localPos.cPointer(), screenPos.cPointer(), (C.int)(button), buttons, modifiers) return newQMouseEvent(ret) } // NewQMouseEvent3 constructs a new QMouseEvent object. 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)) + ret := C.QMouseEvent_new3((C.int)(typeVal), localPos.cPointer(), windowPos.cPointer(), screenPos.cPointer(), (C.int)(button), buttons, modifiers) return newQMouseEvent(ret) } // NewQMouseEvent4 constructs a new QMouseEvent object. 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)) + ret := C.QMouseEvent_new4((C.int)(typeVal), localPos.cPointer(), windowPos.cPointer(), screenPos.cPointer(), (C.int)(button), buttons, modifiers, (C.int)(source)) return newQMouseEvent(ret) } @@ -389,7 +389,7 @@ func newQHoverEvent_U(h unsafe.Pointer) *QHoverEvent { // NewQHoverEvent constructs a new QHoverEvent object. func NewQHoverEvent(typeVal QEvent__Type, pos *QPointF, oldPos *QPointF) *QHoverEvent { - ret := C.QHoverEvent_new((C.uintptr_t)(typeVal), pos.cPointer(), oldPos.cPointer()) + ret := C.QHoverEvent_new((C.int)(typeVal), pos.cPointer(), oldPos.cPointer()) return newQHoverEvent(ret) } @@ -401,7 +401,7 @@ func NewQHoverEvent2(param1 *QHoverEvent) *QHoverEvent { // NewQHoverEvent3 constructs a new QHoverEvent object. 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)) + ret := C.QHoverEvent_new3((C.int)(typeVal), pos.cPointer(), oldPos.cPointer(), modifiers) return newQHoverEvent(ret) } @@ -466,43 +466,43 @@ func newQWheelEvent_U(h unsafe.Pointer) *QWheelEvent { // NewQWheelEvent constructs a new QWheelEvent object. func NewQWheelEvent(pos *QPointF, delta int, buttons int, modifiers int) *QWheelEvent { - ret := C.QWheelEvent_new(pos.cPointer(), (C.int)(delta), (C.int)(buttons), (C.int)(modifiers)) + ret := C.QWheelEvent_new(pos.cPointer(), (C.int)(delta), buttons, modifiers) return newQWheelEvent(ret) } // NewQWheelEvent2 constructs a new QWheelEvent object. func NewQWheelEvent2(pos *QPointF, globalPos *QPointF, delta int, buttons int, modifiers int) *QWheelEvent { - ret := C.QWheelEvent_new2(pos.cPointer(), globalPos.cPointer(), (C.int)(delta), (C.int)(buttons), (C.int)(modifiers)) + ret := C.QWheelEvent_new2(pos.cPointer(), globalPos.cPointer(), (C.int)(delta), buttons, modifiers) return newQWheelEvent(ret) } // NewQWheelEvent3 constructs a new QWheelEvent object. 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)) + ret := C.QWheelEvent_new3(pos.cPointer(), globalPos.cPointer(), pixelDelta.cPointer(), angleDelta.cPointer(), (C.int)(qt4Delta), (C.int)(qt4Orientation), buttons, modifiers) return newQWheelEvent(ret) } // NewQWheelEvent4 constructs a new QWheelEvent object. 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)) + ret := C.QWheelEvent_new4(pos.cPointer(), globalPos.cPointer(), pixelDelta.cPointer(), angleDelta.cPointer(), (C.int)(qt4Delta), (C.int)(qt4Orientation), buttons, modifiers, (C.int)(phase)) return newQWheelEvent(ret) } // NewQWheelEvent5 constructs a new QWheelEvent object. 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)) + ret := C.QWheelEvent_new5(pos.cPointer(), globalPos.cPointer(), pixelDelta.cPointer(), angleDelta.cPointer(), (C.int)(qt4Delta), (C.int)(qt4Orientation), buttons, modifiers, (C.int)(phase), (C.int)(source)) return newQWheelEvent(ret) } // NewQWheelEvent6 constructs a new QWheelEvent object. 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)) + ret := C.QWheelEvent_new6(pos.cPointer(), globalPos.cPointer(), pixelDelta.cPointer(), angleDelta.cPointer(), (C.int)(qt4Delta), (C.int)(qt4Orientation), buttons, modifiers, (C.int)(phase), (C.int)(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 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)) + ret := C.QWheelEvent_new7(pos.cPointer(), globalPos.cPointer(), pixelDelta.cPointer(), angleDelta.cPointer(), buttons, modifiers, (C.int)(phase), (C.bool)(inverted)) return newQWheelEvent(ret) } @@ -514,19 +514,19 @@ func NewQWheelEvent8(param1 *QWheelEvent) *QWheelEvent { // NewQWheelEvent9 constructs a new QWheelEvent object. 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)) + ret := C.QWheelEvent_new9(pos.cPointer(), (C.int)(delta), buttons, modifiers, (C.int)(orient)) return newQWheelEvent(ret) } // NewQWheelEvent10 constructs a new QWheelEvent object. 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)) + ret := C.QWheelEvent_new10(pos.cPointer(), globalPos.cPointer(), (C.int)(delta), buttons, modifiers, (C.int)(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 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)) + ret := C.QWheelEvent_new11(pos.cPointer(), globalPos.cPointer(), pixelDelta.cPointer(), angleDelta.cPointer(), buttons, modifiers, (C.int)(phase), (C.bool)(inverted), (C.int)(source)) return newQWheelEvent(ret) } @@ -659,13 +659,13 @@ func newQTabletEvent_U(h unsafe.Pointer) *QTabletEvent { // NewQTabletEvent constructs a new QTabletEvent object. 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)) + ret := C.QTabletEvent_new((C.int)(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), keyState, (C.longlong)(uniqueID)) return newQTabletEvent(ret) } // NewQTabletEvent2 constructs a new QTabletEvent object. 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)) + ret := C.QTabletEvent_new2((C.int)(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), keyState, (C.longlong)(uniqueID), (C.int)(button), buttons) return newQTabletEvent(ret) } @@ -808,13 +808,13 @@ func newQNativeGestureEvent_U(h unsafe.Pointer) *QNativeGestureEvent { // NewQNativeGestureEvent constructs a new QNativeGestureEvent object. 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)) + ret := C.QNativeGestureEvent_new((C.int)(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 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)) + ret := C.QNativeGestureEvent_new2((C.int)(typeVal), dev.cPointer(), localPos.cPointer(), windowPos.cPointer(), screenPos.cPointer(), (C.double)(value), (C.ulong)(sequenceId), (C.ulonglong)(intArgument)) return newQNativeGestureEvent(ret) } @@ -901,13 +901,13 @@ func newQKeyEvent_U(h unsafe.Pointer) *QKeyEvent { // NewQKeyEvent constructs a new QKeyEvent object. func NewQKeyEvent(typeVal QEvent__Type, key int, modifiers int) *QKeyEvent { - ret := C.QKeyEvent_new((C.uintptr_t)(typeVal), (C.int)(key), (C.int)(modifiers)) + ret := C.QKeyEvent_new((C.int)(typeVal), (C.int)(key), modifiers) return newQKeyEvent(ret) } // NewQKeyEvent2 constructs a new QKeyEvent object. 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)) + ret := C.QKeyEvent_new2((C.int)(typeVal), (C.int)(key), modifiers, (C.uint)(nativeScanCode), (C.uint)(nativeVirtualKey), (C.uint)(nativeModifiers)) return newQKeyEvent(ret) } @@ -921,7 +921,7 @@ func NewQKeyEvent3(param1 *QKeyEvent) *QKeyEvent { func NewQKeyEvent4(typeVal QEvent__Type, key int, modifiers int, text string) *QKeyEvent { text_ms := miqt_strdupg(text) defer C.free(text_ms) - ret := C.QKeyEvent_new4((C.uintptr_t)(typeVal), (C.int)(key), (C.int)(modifiers), (*C.struct_miqt_string)(text_ms)) + ret := C.QKeyEvent_new4((C.int)(typeVal), (C.int)(key), modifiers, (*C.struct_miqt_string)(text_ms)) return newQKeyEvent(ret) } @@ -929,7 +929,7 @@ func NewQKeyEvent4(typeVal QEvent__Type, key int, modifiers int, text string) *Q func NewQKeyEvent5(typeVal QEvent__Type, key int, modifiers int, text string, autorep bool) *QKeyEvent { text_ms := miqt_strdupg(text) defer C.free(text_ms) - ret := C.QKeyEvent_new5((C.uintptr_t)(typeVal), (C.int)(key), (C.int)(modifiers), (*C.struct_miqt_string)(text_ms), (C.bool)(autorep)) + ret := C.QKeyEvent_new5((C.int)(typeVal), (C.int)(key), modifiers, (*C.struct_miqt_string)(text_ms), (C.bool)(autorep)) return newQKeyEvent(ret) } @@ -937,7 +937,7 @@ func NewQKeyEvent5(typeVal QEvent__Type, key int, modifiers int, text string, au func NewQKeyEvent6(typeVal QEvent__Type, key int, modifiers int, text string, autorep bool, count uint16) *QKeyEvent { text_ms := miqt_strdupg(text) defer C.free(text_ms) - ret := C.QKeyEvent_new6((C.uintptr_t)(typeVal), (C.int)(key), (C.int)(modifiers), (*C.struct_miqt_string)(text_ms), (C.bool)(autorep), (C.uint16_t)(count)) + ret := C.QKeyEvent_new6((C.int)(typeVal), (C.int)(key), modifiers, (*C.struct_miqt_string)(text_ms), (C.bool)(autorep), (C.uint16_t)(count)) return newQKeyEvent(ret) } @@ -945,7 +945,7 @@ func NewQKeyEvent6(typeVal QEvent__Type, key int, modifiers int, text string, au func NewQKeyEvent7(typeVal QEvent__Type, key int, modifiers int, nativeScanCode uint, nativeVirtualKey uint, nativeModifiers uint, text string) *QKeyEvent { text_ms := miqt_strdupg(text) defer C.free(text_ms) - ret := C.QKeyEvent_new7((C.uintptr_t)(typeVal), (C.int)(key), (C.int)(modifiers), (C.uint)(nativeScanCode), (C.uint)(nativeVirtualKey), (C.uint)(nativeModifiers), (*C.struct_miqt_string)(text_ms)) + ret := C.QKeyEvent_new7((C.int)(typeVal), (C.int)(key), modifiers, (C.uint)(nativeScanCode), (C.uint)(nativeVirtualKey), (C.uint)(nativeModifiers), (*C.struct_miqt_string)(text_ms)) return newQKeyEvent(ret) } @@ -953,7 +953,7 @@ func NewQKeyEvent7(typeVal QEvent__Type, key int, modifiers int, nativeScanCode func NewQKeyEvent8(typeVal QEvent__Type, key int, modifiers int, nativeScanCode uint, nativeVirtualKey uint, nativeModifiers uint, text string, autorep bool) *QKeyEvent { text_ms := miqt_strdupg(text) defer C.free(text_ms) - ret := C.QKeyEvent_new8((C.uintptr_t)(typeVal), (C.int)(key), (C.int)(modifiers), (C.uint)(nativeScanCode), (C.uint)(nativeVirtualKey), (C.uint)(nativeModifiers), (*C.struct_miqt_string)(text_ms), (C.bool)(autorep)) + ret := C.QKeyEvent_new8((C.int)(typeVal), (C.int)(key), modifiers, (C.uint)(nativeScanCode), (C.uint)(nativeVirtualKey), (C.uint)(nativeModifiers), (*C.struct_miqt_string)(text_ms), (C.bool)(autorep)) return newQKeyEvent(ret) } @@ -961,7 +961,7 @@ func NewQKeyEvent8(typeVal QEvent__Type, key int, modifiers int, nativeScanCode func NewQKeyEvent9(typeVal QEvent__Type, key int, modifiers int, nativeScanCode uint, nativeVirtualKey uint, nativeModifiers uint, text string, autorep bool, count uint16) *QKeyEvent { text_ms := miqt_strdupg(text) defer C.free(text_ms) - ret := C.QKeyEvent_new9((C.uintptr_t)(typeVal), (C.int)(key), (C.int)(modifiers), (C.uint)(nativeScanCode), (C.uint)(nativeVirtualKey), (C.uint)(nativeModifiers), (*C.struct_miqt_string)(text_ms), (C.bool)(autorep), (C.uint16_t)(count)) + ret := C.QKeyEvent_new9((C.int)(typeVal), (C.int)(key), modifiers, (C.uint)(nativeScanCode), (C.uint)(nativeVirtualKey), (C.uint)(nativeModifiers), (*C.struct_miqt_string)(text_ms), (C.bool)(autorep), (C.uint16_t)(count)) return newQKeyEvent(ret) } @@ -970,7 +970,7 @@ func (this *QKeyEvent) Key() int { } func (this *QKeyEvent) Matches(key QKeySequence__StandardKey) bool { - return (bool)(C.QKeyEvent_Matches(this.h, (C.uintptr_t)(key))) + return (bool)(C.QKeyEvent_Matches(this.h, (C.int)(key))) } func (this *QKeyEvent) Modifiers() int { @@ -1043,7 +1043,7 @@ func newQFocusEvent_U(h unsafe.Pointer) *QFocusEvent { // NewQFocusEvent constructs a new QFocusEvent object. func NewQFocusEvent(typeVal QEvent__Type) *QFocusEvent { - ret := C.QFocusEvent_new((C.uintptr_t)(typeVal)) + ret := C.QFocusEvent_new((C.int)(typeVal)) return newQFocusEvent(ret) } @@ -1055,7 +1055,7 @@ func NewQFocusEvent2(param1 *QFocusEvent) *QFocusEvent { // NewQFocusEvent3 constructs a new QFocusEvent object. func NewQFocusEvent3(typeVal QEvent__Type, reason FocusReason) *QFocusEvent { - ret := C.QFocusEvent_new3((C.uintptr_t)(typeVal), (C.uintptr_t)(reason)) + ret := C.QFocusEvent_new3((C.int)(typeVal), (C.int)(reason)) return newQFocusEvent(ret) } @@ -1283,7 +1283,7 @@ func newQPlatformSurfaceEvent_U(h unsafe.Pointer) *QPlatformSurfaceEvent { // NewQPlatformSurfaceEvent constructs a new QPlatformSurfaceEvent object. func NewQPlatformSurfaceEvent(surfaceEventType QPlatformSurfaceEvent__SurfaceEventType) *QPlatformSurfaceEvent { - ret := C.QPlatformSurfaceEvent_new((C.uintptr_t)(surfaceEventType)) + ret := C.QPlatformSurfaceEvent_new((C.int)(surfaceEventType)) return newQPlatformSurfaceEvent(ret) } @@ -1605,19 +1605,19 @@ func newQContextMenuEvent_U(h unsafe.Pointer) *QContextMenuEvent { // NewQContextMenuEvent constructs a new QContextMenuEvent object. 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)) + ret := C.QContextMenuEvent_new((C.int)(reason), pos.cPointer(), globalPos.cPointer(), modifiers) return newQContextMenuEvent(ret) } // NewQContextMenuEvent2 constructs a new QContextMenuEvent object. func NewQContextMenuEvent2(reason QContextMenuEvent__Reason, pos *QPoint, globalPos *QPoint) *QContextMenuEvent { - ret := C.QContextMenuEvent_new2((C.uintptr_t)(reason), pos.cPointer(), globalPos.cPointer()) + ret := C.QContextMenuEvent_new2((C.int)(reason), pos.cPointer(), globalPos.cPointer()) return newQContextMenuEvent(ret) } // NewQContextMenuEvent3 constructs a new QContextMenuEvent object. func NewQContextMenuEvent3(reason QContextMenuEvent__Reason, pos *QPoint) *QContextMenuEvent { - ret := C.QContextMenuEvent_new3((C.uintptr_t)(reason), pos.cPointer()) + ret := C.QContextMenuEvent_new3((C.int)(reason), pos.cPointer()) return newQContextMenuEvent(ret) } @@ -1726,6 +1726,20 @@ func (this *QInputMethodEvent) SetCommitString(commitString string) { C.QInputMethodEvent_SetCommitString(this.h, (*C.struct_miqt_string)(commitString_ms)) } +func (this *QInputMethodEvent) Attributes() []QInputMethodEvent__Attribute { + var _ma *C.struct_miqt_array = C.QInputMethodEvent_Attributes(this.h) + _ret := make([]QInputMethodEvent__Attribute, int(_ma.len)) + _outCast := (*[0xffff]*C.QInputMethodEvent__Attribute)(unsafe.Pointer(_ma.data)) // hey ya + for i := 0; i < int(_ma.len); i++ { + _lv_ret := _outCast[i] + _lv_goptr := newQInputMethodEvent__Attribute(_lv_ret) + _lv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + _ret[i] = *_lv_goptr + } + C.free(unsafe.Pointer(_ma)) + return _ret +} + func (this *QInputMethodEvent) PreeditString() string { var _ms *C.struct_miqt_string = C.QInputMethodEvent_PreeditString(this.h) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) @@ -1799,7 +1813,7 @@ func newQInputMethodQueryEvent_U(h unsafe.Pointer) *QInputMethodQueryEvent { // NewQInputMethodQueryEvent constructs a new QInputMethodQueryEvent object. func NewQInputMethodQueryEvent(queries int) *QInputMethodQueryEvent { - ret := C.QInputMethodQueryEvent_new((C.int)(queries)) + ret := C.QInputMethodQueryEvent_new(queries) return newQInputMethodQueryEvent(ret) } @@ -1814,11 +1828,11 @@ func (this *QInputMethodQueryEvent) Queries() int { } func (this *QInputMethodQueryEvent) SetValue(query InputMethodQuery, value *QVariant) { - C.QInputMethodQueryEvent_SetValue(this.h, (C.uintptr_t)(query), value.cPointer()) + C.QInputMethodQueryEvent_SetValue(this.h, (C.int)(query), value.cPointer()) } func (this *QInputMethodQueryEvent) Value(query InputMethodQuery) *QVariant { - _ret := C.QInputMethodQueryEvent_Value(this.h, (C.uintptr_t)(query)) + _ret := C.QInputMethodQueryEvent_Value(this.h, (C.int)(query)) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -1863,7 +1877,7 @@ func newQDropEvent_U(h unsafe.Pointer) *QDropEvent { // NewQDropEvent constructs a new QDropEvent object. func NewQDropEvent(pos *QPointF, actions int, data *QMimeData, buttons int, modifiers int) *QDropEvent { - ret := C.QDropEvent_new(pos.cPointer(), (C.int)(actions), data.cPointer(), (C.int)(buttons), (C.int)(modifiers)) + ret := C.QDropEvent_new(pos.cPointer(), actions, data.cPointer(), buttons, modifiers) return newQDropEvent(ret) } @@ -1875,7 +1889,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 QEvent__Type) *QDropEvent { - ret := C.QDropEvent_new3(pos.cPointer(), (C.int)(actions), data.cPointer(), (C.int)(buttons), (C.int)(modifiers), (C.uintptr_t)(typeVal)) + ret := C.QDropEvent_new3(pos.cPointer(), actions, data.cPointer(), buttons, modifiers, (C.int)(typeVal)) return newQDropEvent(ret) } @@ -1915,7 +1929,7 @@ func (this *QDropEvent) DropAction() DropAction { } func (this *QDropEvent) SetDropAction(action DropAction) { - C.QDropEvent_SetDropAction(this.h, (C.uintptr_t)(action)) + C.QDropEvent_SetDropAction(this.h, (C.int)(action)) } func (this *QDropEvent) Source() *QObject { @@ -1965,7 +1979,7 @@ func newQDragMoveEvent_U(h unsafe.Pointer) *QDragMoveEvent { // NewQDragMoveEvent constructs a new QDragMoveEvent object. func NewQDragMoveEvent(pos *QPoint, actions int, data *QMimeData, buttons int, modifiers int) *QDragMoveEvent { - ret := C.QDragMoveEvent_new(pos.cPointer(), (C.int)(actions), data.cPointer(), (C.int)(buttons), (C.int)(modifiers)) + ret := C.QDragMoveEvent_new(pos.cPointer(), actions, data.cPointer(), buttons, modifiers) return newQDragMoveEvent(ret) } @@ -1977,7 +1991,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 QEvent__Type) *QDragMoveEvent { - ret := C.QDragMoveEvent_new3(pos.cPointer(), (C.int)(actions), data.cPointer(), (C.int)(buttons), (C.int)(modifiers), (C.uintptr_t)(typeVal)) + ret := C.QDragMoveEvent_new3(pos.cPointer(), actions, data.cPointer(), buttons, modifiers, (C.int)(typeVal)) return newQDragMoveEvent(ret) } @@ -2043,7 +2057,7 @@ func newQDragEnterEvent_U(h unsafe.Pointer) *QDragEnterEvent { // NewQDragEnterEvent constructs a new QDragEnterEvent object. func NewQDragEnterEvent(pos *QPoint, actions int, data *QMimeData, buttons int, modifiers int) *QDragEnterEvent { - ret := C.QDragEnterEvent_new(pos.cPointer(), (C.int)(actions), data.cPointer(), (C.int)(buttons), (C.int)(modifiers)) + ret := C.QDragEnterEvent_new(pos.cPointer(), actions, data.cPointer(), buttons, modifiers) return newQDragEnterEvent(ret) } @@ -2149,7 +2163,7 @@ func newQHelpEvent_U(h unsafe.Pointer) *QHelpEvent { // NewQHelpEvent constructs a new QHelpEvent object. func NewQHelpEvent(typeVal QEvent__Type, pos *QPoint, globalPos *QPoint) *QHelpEvent { - ret := C.QHelpEvent_new((C.uintptr_t)(typeVal), pos.cPointer(), globalPos.cPointer()) + ret := C.QHelpEvent_new((C.int)(typeVal), pos.cPointer(), globalPos.cPointer()) return newQHelpEvent(ret) } @@ -2438,7 +2452,7 @@ func (this *QFileOpenEvent) Url() *QUrl { } func (this *QFileOpenEvent) OpenFile(file *QFile, flags int) bool { - return (bool)(C.QFileOpenEvent_OpenFile(this.h, file.cPointer(), (C.int)(flags))) + return (bool)(C.QFileOpenEvent_OpenFile(this.h, file.cPointer(), flags)) } // Delete this object from C++ memory. @@ -2600,7 +2614,7 @@ func newQWindowStateChangeEvent_U(h unsafe.Pointer) *QWindowStateChangeEvent { // NewQWindowStateChangeEvent constructs a new QWindowStateChangeEvent object. func NewQWindowStateChangeEvent(aOldState int) *QWindowStateChangeEvent { - ret := C.QWindowStateChangeEvent_new((C.int)(aOldState)) + ret := C.QWindowStateChangeEvent_new(aOldState) return newQWindowStateChangeEvent(ret) } @@ -2612,7 +2626,7 @@ func NewQWindowStateChangeEvent2(param1 *QWindowStateChangeEvent) *QWindowStateC // NewQWindowStateChangeEvent3 constructs a new QWindowStateChangeEvent object. func NewQWindowStateChangeEvent3(aOldState int, isOverride bool) *QWindowStateChangeEvent { - ret := C.QWindowStateChangeEvent_new3((C.int)(aOldState), (C.bool)(isOverride)) + ret := C.QWindowStateChangeEvent_new3(aOldState, (C.bool)(isOverride)) return newQWindowStateChangeEvent(ret) } @@ -2726,7 +2740,7 @@ func newQTouchEvent_U(h unsafe.Pointer) *QTouchEvent { // NewQTouchEvent constructs a new QTouchEvent object. func NewQTouchEvent(eventType QEvent__Type) *QTouchEvent { - ret := C.QTouchEvent_new((C.uintptr_t)(eventType)) + ret := C.QTouchEvent_new((C.int)(eventType)) return newQTouchEvent(ret) } @@ -2738,19 +2752,19 @@ func NewQTouchEvent2(param1 *QTouchEvent) *QTouchEvent { // NewQTouchEvent3 constructs a new QTouchEvent object. func NewQTouchEvent3(eventType QEvent__Type, device *QTouchDevice) *QTouchEvent { - ret := C.QTouchEvent_new3((C.uintptr_t)(eventType), device.cPointer()) + ret := C.QTouchEvent_new3((C.int)(eventType), device.cPointer()) return newQTouchEvent(ret) } // NewQTouchEvent4 constructs a new QTouchEvent object. func NewQTouchEvent4(eventType QEvent__Type, device *QTouchDevice, modifiers int) *QTouchEvent { - ret := C.QTouchEvent_new4((C.uintptr_t)(eventType), device.cPointer(), (C.int)(modifiers)) + ret := C.QTouchEvent_new4((C.int)(eventType), device.cPointer(), modifiers) return newQTouchEvent(ret) } // NewQTouchEvent5 constructs a new QTouchEvent object. 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)) + ret := C.QTouchEvent_new5((C.int)(eventType), device.cPointer(), modifiers, touchPointStates) return newQTouchEvent(ret) } @@ -2764,7 +2778,7 @@ func NewQTouchEvent6(eventType QEvent__Type, device *QTouchDevice, modifiers int } touchPoints_ma := &C.struct_miqt_array{len: C.size_t(len(touchPoints)), data: unsafe.Pointer(touchPoints_CArray)} defer runtime.KeepAlive(unsafe.Pointer(touchPoints_ma)) - ret := C.QTouchEvent_new6((C.uintptr_t)(eventType), device.cPointer(), (C.int)(modifiers), (C.int)(touchPointStates), touchPoints_ma) + ret := C.QTouchEvent_new6((C.int)(eventType), device.cPointer(), modifiers, touchPointStates, touchPoints_ma) return newQTouchEvent(ret) } @@ -2780,6 +2794,20 @@ func (this *QTouchEvent) TouchPointStates() int { return (int)(C.QTouchEvent_TouchPointStates(this.h)) } +func (this *QTouchEvent) TouchPoints() []QTouchEvent__TouchPoint { + var _ma *C.struct_miqt_array = C.QTouchEvent_TouchPoints(this.h) + _ret := make([]QTouchEvent__TouchPoint, int(_ma.len)) + _outCast := (*[0xffff]*C.QTouchEvent__TouchPoint)(unsafe.Pointer(_ma.data)) // hey ya + for i := 0; i < int(_ma.len); i++ { + _lv_ret := _outCast[i] + _lv_goptr := newQTouchEvent__TouchPoint(_lv_ret) + _lv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + _ret[i] = *_lv_goptr + } + C.free(unsafe.Pointer(_ma)) + return _ret +} + func (this *QTouchEvent) Device() *QTouchDevice { return newQTouchDevice_U(unsafe.Pointer(C.QTouchEvent_Device(this.h))) } @@ -2793,7 +2821,7 @@ func (this *QTouchEvent) SetTarget(atarget *QObject) { } func (this *QTouchEvent) SetTouchPointStates(aTouchPointStates int) { - C.QTouchEvent_SetTouchPointStates(this.h, (C.int)(aTouchPointStates)) + C.QTouchEvent_SetTouchPointStates(this.h, aTouchPointStates) } func (this *QTouchEvent) SetTouchPoints(atouchPoints []QTouchEvent__TouchPoint) { @@ -2940,7 +2968,7 @@ func newQScrollEvent_U(h unsafe.Pointer) *QScrollEvent { // NewQScrollEvent constructs a new QScrollEvent object. func NewQScrollEvent(contentPos *QPointF, overshoot *QPointF, scrollState QScrollEvent__ScrollState) *QScrollEvent { - ret := C.QScrollEvent_new(contentPos.cPointer(), overshoot.cPointer(), (C.uintptr_t)(scrollState)) + ret := C.QScrollEvent_new(contentPos.cPointer(), overshoot.cPointer(), (C.int)(scrollState)) return newQScrollEvent(ret) } @@ -3007,7 +3035,7 @@ func newQScreenOrientationChangeEvent_U(h unsafe.Pointer) *QScreenOrientationCha // NewQScreenOrientationChangeEvent constructs a new QScreenOrientationChangeEvent object. func NewQScreenOrientationChangeEvent(screen *QScreen, orientation ScreenOrientation) *QScreenOrientationChangeEvent { - ret := C.QScreenOrientationChangeEvent_new(screen.cPointer(), (C.uintptr_t)(orientation)) + ret := C.QScreenOrientationChangeEvent_new(screen.cPointer(), (C.int)(orientation)) return newQScreenOrientationChangeEvent(ret) } @@ -3064,7 +3092,7 @@ func newQApplicationStateChangeEvent_U(h unsafe.Pointer) *QApplicationStateChang // NewQApplicationStateChangeEvent constructs a new QApplicationStateChangeEvent object. func NewQApplicationStateChangeEvent(state ApplicationState) *QApplicationStateChangeEvent { - ret := C.QApplicationStateChangeEvent_new((C.uintptr_t)(state)) + ret := C.QApplicationStateChangeEvent_new((C.int)(state)) return newQApplicationStateChangeEvent(ret) } @@ -3116,13 +3144,13 @@ func newQInputMethodEvent__Attribute_U(h unsafe.Pointer) *QInputMethodEvent__Att // NewQInputMethodEvent__Attribute constructs a new QInputMethodEvent::Attribute object. 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()) + ret := C.QInputMethodEvent__Attribute_new((C.int)(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 QInputMethodEvent__AttributeType, s int, l int) *QInputMethodEvent__Attribute { - ret := C.QInputMethodEvent__Attribute_new2((C.uintptr_t)(typ), (C.int)(s), (C.int)(l)) + ret := C.QInputMethodEvent__Attribute_new2((C.int)(typ), (C.int)(s), (C.int)(l)) return newQInputMethodEvent__Attribute(ret) } @@ -3132,6 +3160,10 @@ func NewQInputMethodEvent__Attribute3(param1 *QInputMethodEvent__Attribute) *QIn return newQInputMethodEvent__Attribute(ret) } +func (this *QInputMethodEvent__Attribute) OperatorAssign(param1 *QInputMethodEvent__Attribute) { + C.QInputMethodEvent__Attribute_OperatorAssign(this.h, param1.cPointer()) +} + // Delete this object from C++ memory. func (this *QInputMethodEvent__Attribute) Delete() { C.QInputMethodEvent__Attribute_Delete(this.h) @@ -3186,6 +3218,10 @@ func NewQTouchEvent__TouchPoint3(id int) *QTouchEvent__TouchPoint { return newQTouchEvent__TouchPoint(ret) } +func (this *QTouchEvent__TouchPoint) OperatorAssign(other *QTouchEvent__TouchPoint) { + C.QTouchEvent__TouchPoint_OperatorAssign(this.h, other.cPointer()) +} + func (this *QTouchEvent__TouchPoint) Swap(other *QTouchEvent__TouchPoint) { C.QTouchEvent__TouchPoint_Swap(this.h, other.cPointer()) } @@ -3371,7 +3407,7 @@ func (this *QTouchEvent__TouchPoint) SetUniqueId(uid int64) { } func (this *QTouchEvent__TouchPoint) SetState(state int) { - C.QTouchEvent__TouchPoint_SetState(this.h, (C.int)(state)) + C.QTouchEvent__TouchPoint_SetState(this.h, state) } func (this *QTouchEvent__TouchPoint) SetPos(pos *QPointF) { @@ -3439,7 +3475,7 @@ func (this *QTouchEvent__TouchPoint) SetVelocity(v *QVector2D) { } func (this *QTouchEvent__TouchPoint) SetFlags(flags int) { - C.QTouchEvent__TouchPoint_SetFlags(this.h, (C.int)(flags)) + C.QTouchEvent__TouchPoint_SetFlags(this.h, flags) } func (this *QTouchEvent__TouchPoint) SetRawScreenPositions(positions []QPointF) { diff --git a/qt/gen_qevent.h b/qt/gen_qevent.h index c97e4b8..3c9210a 100644 --- a/qt/gen_qevent.h +++ b/qt/gen_qevent.h @@ -143,9 +143,9 @@ typedef struct QWindow QWindow; typedef struct QWindowStateChangeEvent QWindowStateChangeEvent; #endif -QInputEvent* QInputEvent_new(uintptr_t typeVal); +QInputEvent* QInputEvent_new(int typeVal); QInputEvent* QInputEvent_new2(QInputEvent* param1); -QInputEvent* QInputEvent_new3(uintptr_t typeVal, int modifiers); +QInputEvent* QInputEvent_new3(int typeVal, int modifiers); int QInputEvent_Modifiers(const QInputEvent* self); void QInputEvent_SetModifiers(QInputEvent* self, int amodifiers); unsigned long QInputEvent_Timestamp(const QInputEvent* self); @@ -165,10 +165,10 @@ QPointF* QEnterEvent_WindowPos(const QEnterEvent* self); QPointF* QEnterEvent_ScreenPos(const QEnterEvent* self); void QEnterEvent_Delete(QEnterEvent* self); -QMouseEvent* QMouseEvent_new(uintptr_t typeVal, QPointF* localPos, uintptr_t button, int buttons, int modifiers); -QMouseEvent* QMouseEvent_new2(uintptr_t typeVal, QPointF* localPos, QPointF* screenPos, uintptr_t button, int buttons, int modifiers); -QMouseEvent* QMouseEvent_new3(uintptr_t typeVal, QPointF* localPos, QPointF* windowPos, QPointF* screenPos, uintptr_t button, int buttons, int modifiers); -QMouseEvent* QMouseEvent_new4(uintptr_t typeVal, QPointF* localPos, QPointF* windowPos, QPointF* screenPos, uintptr_t button, int buttons, int modifiers, uintptr_t source); +QMouseEvent* QMouseEvent_new(int typeVal, QPointF* localPos, int button, int buttons, int modifiers); +QMouseEvent* QMouseEvent_new2(int typeVal, QPointF* localPos, QPointF* screenPos, int button, int buttons, int modifiers); +QMouseEvent* QMouseEvent_new3(int typeVal, QPointF* localPos, QPointF* windowPos, QPointF* screenPos, int button, int buttons, int modifiers); +QMouseEvent* QMouseEvent_new4(int typeVal, QPointF* localPos, QPointF* windowPos, QPointF* screenPos, int button, int buttons, int modifiers, int source); QMouseEvent* QMouseEvent_new5(QMouseEvent* param1); QPoint* QMouseEvent_Pos(const QMouseEvent* self); QPoint* QMouseEvent_GlobalPos(const QMouseEvent* self); @@ -179,16 +179,16 @@ int QMouseEvent_GlobalY(const QMouseEvent* self); QPointF* QMouseEvent_LocalPos(const QMouseEvent* self); QPointF* QMouseEvent_WindowPos(const QMouseEvent* self); QPointF* QMouseEvent_ScreenPos(const QMouseEvent* self); -uintptr_t QMouseEvent_Button(const QMouseEvent* self); +int QMouseEvent_Button(const QMouseEvent* self); int QMouseEvent_Buttons(const QMouseEvent* self); void QMouseEvent_SetLocalPos(QMouseEvent* self, QPointF* localPosition); -uintptr_t QMouseEvent_Source(const QMouseEvent* self); +int QMouseEvent_Source(const QMouseEvent* self); int QMouseEvent_Flags(const QMouseEvent* self); void QMouseEvent_Delete(QMouseEvent* self); -QHoverEvent* QHoverEvent_new(uintptr_t typeVal, QPointF* pos, QPointF* oldPos); +QHoverEvent* QHoverEvent_new(int typeVal, QPointF* pos, QPointF* oldPos); QHoverEvent* QHoverEvent_new2(QHoverEvent* param1); -QHoverEvent* QHoverEvent_new3(uintptr_t typeVal, QPointF* pos, QPointF* oldPos, int modifiers); +QHoverEvent* QHoverEvent_new3(int typeVal, QPointF* pos, QPointF* oldPos, int modifiers); QPoint* QHoverEvent_Pos(const QHoverEvent* self); QPoint* QHoverEvent_OldPos(const QHoverEvent* self); QPointF* QHoverEvent_PosF(const QHoverEvent* self); @@ -197,19 +197,19 @@ void QHoverEvent_Delete(QHoverEvent* self); QWheelEvent* QWheelEvent_new(QPointF* pos, int delta, int buttons, int modifiers); QWheelEvent* QWheelEvent_new2(QPointF* pos, QPointF* globalPos, int delta, int buttons, int modifiers); -QWheelEvent* QWheelEvent_new3(QPointF* pos, QPointF* globalPos, QPoint* pixelDelta, QPoint* angleDelta, int qt4Delta, uintptr_t qt4Orientation, int buttons, int modifiers); -QWheelEvent* QWheelEvent_new4(QPointF* pos, QPointF* globalPos, QPoint* pixelDelta, QPoint* angleDelta, int qt4Delta, uintptr_t qt4Orientation, int buttons, int modifiers, uintptr_t phase); -QWheelEvent* QWheelEvent_new5(QPointF* pos, QPointF* globalPos, QPoint* pixelDelta, QPoint* angleDelta, int qt4Delta, uintptr_t qt4Orientation, int buttons, int modifiers, uintptr_t phase, uintptr_t source); -QWheelEvent* QWheelEvent_new6(QPointF* pos, QPointF* globalPos, QPoint* pixelDelta, QPoint* angleDelta, int qt4Delta, uintptr_t qt4Orientation, int buttons, int modifiers, uintptr_t phase, uintptr_t source, bool inverted); -QWheelEvent* QWheelEvent_new7(QPointF* pos, QPointF* globalPos, QPoint* pixelDelta, QPoint* angleDelta, int buttons, int modifiers, uintptr_t phase, bool inverted); +QWheelEvent* QWheelEvent_new3(QPointF* pos, QPointF* globalPos, QPoint* pixelDelta, QPoint* angleDelta, int qt4Delta, int qt4Orientation, int buttons, int modifiers); +QWheelEvent* QWheelEvent_new4(QPointF* pos, QPointF* globalPos, QPoint* pixelDelta, QPoint* angleDelta, int qt4Delta, int qt4Orientation, int buttons, int modifiers, int phase); +QWheelEvent* QWheelEvent_new5(QPointF* pos, QPointF* globalPos, QPoint* pixelDelta, QPoint* angleDelta, int qt4Delta, int qt4Orientation, int buttons, int modifiers, int phase, int source); +QWheelEvent* QWheelEvent_new6(QPointF* pos, QPointF* globalPos, QPoint* pixelDelta, QPoint* angleDelta, int qt4Delta, int qt4Orientation, int buttons, int modifiers, int phase, int source, bool inverted); +QWheelEvent* QWheelEvent_new7(QPointF* pos, QPointF* globalPos, QPoint* pixelDelta, QPoint* angleDelta, int buttons, int modifiers, int phase, bool inverted); QWheelEvent* QWheelEvent_new8(QWheelEvent* param1); -QWheelEvent* QWheelEvent_new9(QPointF* pos, int delta, int buttons, int modifiers, uintptr_t orient); -QWheelEvent* QWheelEvent_new10(QPointF* pos, QPointF* globalPos, int delta, int buttons, int modifiers, uintptr_t orient); -QWheelEvent* QWheelEvent_new11(QPointF* pos, QPointF* globalPos, QPoint* pixelDelta, QPoint* angleDelta, int buttons, int modifiers, uintptr_t phase, bool inverted, uintptr_t source); +QWheelEvent* QWheelEvent_new9(QPointF* pos, int delta, int buttons, int modifiers, int orient); +QWheelEvent* QWheelEvent_new10(QPointF* pos, QPointF* globalPos, int delta, int buttons, int modifiers, int orient); +QWheelEvent* QWheelEvent_new11(QPointF* pos, QPointF* globalPos, QPoint* pixelDelta, QPoint* angleDelta, int buttons, int modifiers, int phase, bool inverted, int source); QPoint* QWheelEvent_PixelDelta(const QWheelEvent* self); QPoint* QWheelEvent_AngleDelta(const QWheelEvent* self); int QWheelEvent_Delta(const QWheelEvent* self); -uintptr_t QWheelEvent_Orientation(const QWheelEvent* self); +int QWheelEvent_Orientation(const QWheelEvent* self); QPoint* QWheelEvent_Pos(const QWheelEvent* self); QPoint* QWheelEvent_GlobalPos(const QWheelEvent* self); int QWheelEvent_X(const QWheelEvent* self); @@ -221,13 +221,13 @@ QPointF* QWheelEvent_GlobalPosF(const QWheelEvent* self); QPointF* QWheelEvent_Position(const QWheelEvent* self); QPointF* QWheelEvent_GlobalPosition(const QWheelEvent* self); int QWheelEvent_Buttons(const QWheelEvent* self); -uintptr_t QWheelEvent_Phase(const QWheelEvent* self); +int QWheelEvent_Phase(const QWheelEvent* self); bool QWheelEvent_Inverted(const QWheelEvent* self); -uintptr_t QWheelEvent_Source(const QWheelEvent* self); +int QWheelEvent_Source(const QWheelEvent* self); void QWheelEvent_Delete(QWheelEvent* self); -QTabletEvent* QTabletEvent_new(uintptr_t t, QPointF* pos, QPointF* globalPos, int device, int pointerType, double pressure, int xTilt, int yTilt, double tangentialPressure, double rotation, int z, int keyState, long long uniqueID); -QTabletEvent* QTabletEvent_new2(uintptr_t t, QPointF* pos, QPointF* globalPos, int device, int pointerType, double pressure, int xTilt, int yTilt, double tangentialPressure, double rotation, int z, int keyState, long long uniqueID, uintptr_t button, int buttons); +QTabletEvent* QTabletEvent_new(int t, QPointF* pos, QPointF* globalPos, int device, int pointerType, double pressure, int xTilt, int yTilt, double tangentialPressure, double rotation, int z, int keyState, long long uniqueID); +QTabletEvent* QTabletEvent_new2(int t, QPointF* pos, QPointF* globalPos, int device, int pointerType, double pressure, int xTilt, int yTilt, double tangentialPressure, double rotation, int z, int keyState, long long uniqueID, int button, int buttons); QTabletEvent* QTabletEvent_new3(QTabletEvent* param1); QPoint* QTabletEvent_Pos(const QTabletEvent* self); QPoint* QTabletEvent_GlobalPos(const QTabletEvent* self); @@ -239,9 +239,9 @@ int QTabletEvent_GlobalX(const QTabletEvent* self); int QTabletEvent_GlobalY(const QTabletEvent* self); double QTabletEvent_HiResGlobalX(const QTabletEvent* self); double QTabletEvent_HiResGlobalY(const QTabletEvent* self); -uintptr_t QTabletEvent_Device(const QTabletEvent* self); -uintptr_t QTabletEvent_DeviceType(const QTabletEvent* self); -uintptr_t QTabletEvent_PointerType(const QTabletEvent* self); +int QTabletEvent_Device(const QTabletEvent* self); +int QTabletEvent_DeviceType(const QTabletEvent* self); +int QTabletEvent_PointerType(const QTabletEvent* self); long long QTabletEvent_UniqueId(const QTabletEvent* self); double QTabletEvent_Pressure(const QTabletEvent* self); int QTabletEvent_Z(const QTabletEvent* self); @@ -249,14 +249,14 @@ double QTabletEvent_TangentialPressure(const QTabletEvent* self); double QTabletEvent_Rotation(const QTabletEvent* self); int QTabletEvent_XTilt(const QTabletEvent* self); int QTabletEvent_YTilt(const QTabletEvent* self); -uintptr_t QTabletEvent_Button(const QTabletEvent* self); +int QTabletEvent_Button(const QTabletEvent* self); int QTabletEvent_Buttons(const QTabletEvent* self); void QTabletEvent_Delete(QTabletEvent* self); -QNativeGestureEvent* QNativeGestureEvent_new(uintptr_t typeVal, QPointF* localPos, QPointF* windowPos, QPointF* screenPos, double value, unsigned long sequenceId, unsigned long long intArgument); -QNativeGestureEvent* QNativeGestureEvent_new2(uintptr_t typeVal, QTouchDevice* dev, QPointF* localPos, QPointF* windowPos, QPointF* screenPos, double value, unsigned long sequenceId, unsigned long long intArgument); +QNativeGestureEvent* QNativeGestureEvent_new(int typeVal, QPointF* localPos, QPointF* windowPos, QPointF* screenPos, double value, unsigned long sequenceId, unsigned long long intArgument); +QNativeGestureEvent* QNativeGestureEvent_new2(int typeVal, QTouchDevice* dev, QPointF* localPos, QPointF* windowPos, QPointF* screenPos, double value, unsigned long sequenceId, unsigned long long intArgument); QNativeGestureEvent* QNativeGestureEvent_new3(QNativeGestureEvent* param1); -uintptr_t QNativeGestureEvent_GestureType(const QNativeGestureEvent* self); +int QNativeGestureEvent_GestureType(const QNativeGestureEvent* self); double QNativeGestureEvent_Value(const QNativeGestureEvent* self); QPoint* QNativeGestureEvent_Pos(const QNativeGestureEvent* self); QPoint* QNativeGestureEvent_GlobalPos(const QNativeGestureEvent* self); @@ -266,17 +266,17 @@ QPointF* QNativeGestureEvent_ScreenPos(const QNativeGestureEvent* self); QTouchDevice* QNativeGestureEvent_Device(const QNativeGestureEvent* self); void QNativeGestureEvent_Delete(QNativeGestureEvent* self); -QKeyEvent* QKeyEvent_new(uintptr_t typeVal, int key, int modifiers); -QKeyEvent* QKeyEvent_new2(uintptr_t typeVal, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers); +QKeyEvent* QKeyEvent_new(int typeVal, int key, int modifiers); +QKeyEvent* QKeyEvent_new2(int typeVal, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers); QKeyEvent* QKeyEvent_new3(QKeyEvent* param1); -QKeyEvent* QKeyEvent_new4(uintptr_t typeVal, int key, int modifiers, struct miqt_string* text); -QKeyEvent* QKeyEvent_new5(uintptr_t typeVal, int key, int modifiers, struct miqt_string* text, bool autorep); -QKeyEvent* QKeyEvent_new6(uintptr_t typeVal, int key, int modifiers, struct miqt_string* text, bool autorep, uint16_t count); -QKeyEvent* QKeyEvent_new7(uintptr_t typeVal, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string* text); -QKeyEvent* QKeyEvent_new8(uintptr_t typeVal, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string* text, bool autorep); -QKeyEvent* QKeyEvent_new9(uintptr_t typeVal, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string* text, bool autorep, uint16_t count); +QKeyEvent* QKeyEvent_new4(int typeVal, int key, int modifiers, struct miqt_string* text); +QKeyEvent* QKeyEvent_new5(int typeVal, int key, int modifiers, struct miqt_string* text, bool autorep); +QKeyEvent* QKeyEvent_new6(int typeVal, int key, int modifiers, struct miqt_string* text, bool autorep, uint16_t count); +QKeyEvent* QKeyEvent_new7(int typeVal, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string* text); +QKeyEvent* QKeyEvent_new8(int typeVal, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string* text, bool autorep); +QKeyEvent* QKeyEvent_new9(int typeVal, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string* text, bool autorep, uint16_t count); int QKeyEvent_Key(const QKeyEvent* self); -bool QKeyEvent_Matches(const QKeyEvent* self, uintptr_t key); +bool QKeyEvent_Matches(const QKeyEvent* self, int key); int QKeyEvent_Modifiers(const QKeyEvent* self); struct miqt_string* QKeyEvent_Text(const QKeyEvent* self); bool QKeyEvent_IsAutoRepeat(const QKeyEvent* self); @@ -286,12 +286,12 @@ unsigned int QKeyEvent_NativeVirtualKey(const QKeyEvent* self); unsigned int QKeyEvent_NativeModifiers(const QKeyEvent* self); void QKeyEvent_Delete(QKeyEvent* self); -QFocusEvent* QFocusEvent_new(uintptr_t typeVal); +QFocusEvent* QFocusEvent_new(int typeVal); QFocusEvent* QFocusEvent_new2(QFocusEvent* param1); -QFocusEvent* QFocusEvent_new3(uintptr_t typeVal, uintptr_t reason); +QFocusEvent* QFocusEvent_new3(int typeVal, int reason); bool QFocusEvent_GotFocus(const QFocusEvent* self); bool QFocusEvent_LostFocus(const QFocusEvent* self); -uintptr_t QFocusEvent_Reason(const QFocusEvent* self); +int QFocusEvent_Reason(const QFocusEvent* self); void QFocusEvent_Delete(QFocusEvent* self); QPaintEvent* QPaintEvent_new(QRegion* paintRegion); @@ -312,9 +312,9 @@ QExposeEvent* QExposeEvent_new2(QExposeEvent* param1); QRegion* QExposeEvent_Region(const QExposeEvent* self); void QExposeEvent_Delete(QExposeEvent* self); -QPlatformSurfaceEvent* QPlatformSurfaceEvent_new(uintptr_t surfaceEventType); +QPlatformSurfaceEvent* QPlatformSurfaceEvent_new(int surfaceEventType); QPlatformSurfaceEvent* QPlatformSurfaceEvent_new2(QPlatformSurfaceEvent* param1); -uintptr_t QPlatformSurfaceEvent_SurfaceEventType(const QPlatformSurfaceEvent* self); +int QPlatformSurfaceEvent_SurfaceEventType(const QPlatformSurfaceEvent* self); void QPlatformSurfaceEvent_Delete(QPlatformSurfaceEvent* self); QResizeEvent* QResizeEvent_new(QSize* size, QSize* oldSize); @@ -343,9 +343,9 @@ QHideEvent* QHideEvent_new2(QHideEvent* param1); void QHideEvent_OperatorAssign(QHideEvent* self, QHideEvent* param1); void QHideEvent_Delete(QHideEvent* self); -QContextMenuEvent* QContextMenuEvent_new(uintptr_t reason, QPoint* pos, QPoint* globalPos, int modifiers); -QContextMenuEvent* QContextMenuEvent_new2(uintptr_t reason, QPoint* pos, QPoint* globalPos); -QContextMenuEvent* QContextMenuEvent_new3(uintptr_t reason, QPoint* pos); +QContextMenuEvent* QContextMenuEvent_new(int reason, QPoint* pos, QPoint* globalPos, int modifiers); +QContextMenuEvent* QContextMenuEvent_new2(int reason, QPoint* pos, QPoint* globalPos); +QContextMenuEvent* QContextMenuEvent_new3(int reason, QPoint* pos); QContextMenuEvent* QContextMenuEvent_new4(QContextMenuEvent* param1); int QContextMenuEvent_X(const QContextMenuEvent* self); int QContextMenuEvent_Y(const QContextMenuEvent* self); @@ -353,13 +353,14 @@ int QContextMenuEvent_GlobalX(const QContextMenuEvent* self); int QContextMenuEvent_GlobalY(const QContextMenuEvent* self); QPoint* QContextMenuEvent_Pos(const QContextMenuEvent* self); QPoint* QContextMenuEvent_GlobalPos(const QContextMenuEvent* self); -uintptr_t QContextMenuEvent_Reason(const QContextMenuEvent* self); +int QContextMenuEvent_Reason(const QContextMenuEvent* self); void QContextMenuEvent_Delete(QContextMenuEvent* self); QInputMethodEvent* QInputMethodEvent_new(); QInputMethodEvent* QInputMethodEvent_new2(struct miqt_string* preeditText, struct miqt_array* /* of QInputMethodEvent__Attribute* */ attributes); QInputMethodEvent* QInputMethodEvent_new3(QInputMethodEvent* other); void QInputMethodEvent_SetCommitString(QInputMethodEvent* self, struct miqt_string* commitString); +struct miqt_array* QInputMethodEvent_Attributes(const QInputMethodEvent* self); struct miqt_string* QInputMethodEvent_PreeditString(const QInputMethodEvent* self); struct miqt_string* QInputMethodEvent_CommitString(const QInputMethodEvent* self); int QInputMethodEvent_ReplacementStart(const QInputMethodEvent* self); @@ -371,29 +372,29 @@ void QInputMethodEvent_Delete(QInputMethodEvent* self); QInputMethodQueryEvent* QInputMethodQueryEvent_new(int queries); QInputMethodQueryEvent* QInputMethodQueryEvent_new2(QInputMethodQueryEvent* param1); int QInputMethodQueryEvent_Queries(const QInputMethodQueryEvent* self); -void QInputMethodQueryEvent_SetValue(QInputMethodQueryEvent* self, uintptr_t query, QVariant* value); -QVariant* QInputMethodQueryEvent_Value(const QInputMethodQueryEvent* self, uintptr_t query); +void QInputMethodQueryEvent_SetValue(QInputMethodQueryEvent* self, int query, QVariant* value); +QVariant* QInputMethodQueryEvent_Value(const QInputMethodQueryEvent* self, int query); void QInputMethodQueryEvent_Delete(QInputMethodQueryEvent* self); QDropEvent* QDropEvent_new(QPointF* pos, int actions, QMimeData* data, int buttons, int modifiers); QDropEvent* QDropEvent_new2(QDropEvent* param1); -QDropEvent* QDropEvent_new3(QPointF* pos, int actions, QMimeData* data, int buttons, int modifiers, uintptr_t typeVal); +QDropEvent* QDropEvent_new3(QPointF* pos, int actions, QMimeData* data, int buttons, int modifiers, int typeVal); QPoint* QDropEvent_Pos(const QDropEvent* self); QPointF* QDropEvent_PosF(const QDropEvent* self); int QDropEvent_MouseButtons(const QDropEvent* self); int QDropEvent_KeyboardModifiers(const QDropEvent* self); int QDropEvent_PossibleActions(const QDropEvent* self); -uintptr_t QDropEvent_ProposedAction(const QDropEvent* self); +int QDropEvent_ProposedAction(const QDropEvent* self); void QDropEvent_AcceptProposedAction(QDropEvent* self); -uintptr_t QDropEvent_DropAction(const QDropEvent* self); -void QDropEvent_SetDropAction(QDropEvent* self, uintptr_t action); +int QDropEvent_DropAction(const QDropEvent* self); +void QDropEvent_SetDropAction(QDropEvent* self, int action); QObject* QDropEvent_Source(const QDropEvent* self); QMimeData* QDropEvent_MimeData(const QDropEvent* self); void QDropEvent_Delete(QDropEvent* self); QDragMoveEvent* QDragMoveEvent_new(QPoint* pos, int actions, QMimeData* data, int buttons, int modifiers); QDragMoveEvent* QDragMoveEvent_new2(QDragMoveEvent* param1); -QDragMoveEvent* QDragMoveEvent_new3(QPoint* pos, int actions, QMimeData* data, int buttons, int modifiers, uintptr_t typeVal); +QDragMoveEvent* QDragMoveEvent_new3(QPoint* pos, int actions, QMimeData* data, int buttons, int modifiers, int typeVal); QRect* QDragMoveEvent_AnswerRect(const QDragMoveEvent* self); void QDragMoveEvent_Accept(QDragMoveEvent* self); void QDragMoveEvent_Ignore(QDragMoveEvent* self); @@ -411,7 +412,7 @@ QDragLeaveEvent* QDragLeaveEvent_new2(QDragLeaveEvent* param1); void QDragLeaveEvent_OperatorAssign(QDragLeaveEvent* self, QDragLeaveEvent* param1); void QDragLeaveEvent_Delete(QDragLeaveEvent* self); -QHelpEvent* QHelpEvent_new(uintptr_t typeVal, QPoint* pos, QPoint* globalPos); +QHelpEvent* QHelpEvent_new(int typeVal, QPoint* pos, QPoint* globalPos); QHelpEvent* QHelpEvent_new2(QHelpEvent* param1); int QHelpEvent_X(const QHelpEvent* self); int QHelpEvent_Y(const QHelpEvent* self); @@ -474,15 +475,16 @@ bool QPointingDeviceUniqueId_IsValid(const QPointingDeviceUniqueId* self); long long QPointingDeviceUniqueId_NumericId(const QPointingDeviceUniqueId* self); void QPointingDeviceUniqueId_Delete(QPointingDeviceUniqueId* self); -QTouchEvent* QTouchEvent_new(uintptr_t eventType); +QTouchEvent* QTouchEvent_new(int eventType); QTouchEvent* QTouchEvent_new2(QTouchEvent* param1); -QTouchEvent* QTouchEvent_new3(uintptr_t eventType, QTouchDevice* device); -QTouchEvent* QTouchEvent_new4(uintptr_t eventType, QTouchDevice* device, int modifiers); -QTouchEvent* QTouchEvent_new5(uintptr_t eventType, QTouchDevice* device, int modifiers, int touchPointStates); -QTouchEvent* QTouchEvent_new6(uintptr_t eventType, QTouchDevice* device, int modifiers, int touchPointStates, struct miqt_array* /* of QTouchEvent__TouchPoint* */ touchPoints); +QTouchEvent* QTouchEvent_new3(int eventType, QTouchDevice* device); +QTouchEvent* QTouchEvent_new4(int eventType, QTouchDevice* device, int modifiers); +QTouchEvent* QTouchEvent_new5(int eventType, QTouchDevice* device, int modifiers, int touchPointStates); +QTouchEvent* QTouchEvent_new6(int eventType, QTouchDevice* device, int modifiers, int touchPointStates, struct miqt_array* /* of QTouchEvent__TouchPoint* */ touchPoints); QWindow* QTouchEvent_Window(const QTouchEvent* self); QObject* QTouchEvent_Target(const QTouchEvent* self); int QTouchEvent_TouchPointStates(const QTouchEvent* self); +struct miqt_array* QTouchEvent_TouchPoints(const QTouchEvent* self); QTouchDevice* QTouchEvent_Device(const QTouchEvent* self); void QTouchEvent_SetWindow(QTouchEvent* self, QWindow* awindow); void QTouchEvent_SetTarget(QTouchEvent* self, QObject* atarget); @@ -502,36 +504,38 @@ void QScrollPrepareEvent_SetContentPosRange(QScrollPrepareEvent* self, QRectF* r void QScrollPrepareEvent_SetContentPos(QScrollPrepareEvent* self, QPointF* pos); void QScrollPrepareEvent_Delete(QScrollPrepareEvent* self); -QScrollEvent* QScrollEvent_new(QPointF* contentPos, QPointF* overshoot, uintptr_t scrollState); +QScrollEvent* QScrollEvent_new(QPointF* contentPos, QPointF* overshoot, int scrollState); QScrollEvent* QScrollEvent_new2(QScrollEvent* param1); QPointF* QScrollEvent_ContentPos(const QScrollEvent* self); QPointF* QScrollEvent_OvershootDistance(const QScrollEvent* self); -uintptr_t QScrollEvent_ScrollState(const QScrollEvent* self); +int QScrollEvent_ScrollState(const QScrollEvent* self); void QScrollEvent_Delete(QScrollEvent* self); -QScreenOrientationChangeEvent* QScreenOrientationChangeEvent_new(QScreen* screen, uintptr_t orientation); +QScreenOrientationChangeEvent* QScreenOrientationChangeEvent_new(QScreen* screen, int orientation); QScreenOrientationChangeEvent* QScreenOrientationChangeEvent_new2(QScreenOrientationChangeEvent* param1); QScreen* QScreenOrientationChangeEvent_Screen(const QScreenOrientationChangeEvent* self); -uintptr_t QScreenOrientationChangeEvent_Orientation(const QScreenOrientationChangeEvent* self); +int QScreenOrientationChangeEvent_Orientation(const QScreenOrientationChangeEvent* self); void QScreenOrientationChangeEvent_Delete(QScreenOrientationChangeEvent* self); -QApplicationStateChangeEvent* QApplicationStateChangeEvent_new(uintptr_t state); +QApplicationStateChangeEvent* QApplicationStateChangeEvent_new(int state); QApplicationStateChangeEvent* QApplicationStateChangeEvent_new2(QApplicationStateChangeEvent* param1); -uintptr_t QApplicationStateChangeEvent_ApplicationState(const QApplicationStateChangeEvent* self); +int QApplicationStateChangeEvent_ApplicationState(const QApplicationStateChangeEvent* self); void QApplicationStateChangeEvent_Delete(QApplicationStateChangeEvent* self); -QInputMethodEvent__Attribute* QInputMethodEvent__Attribute_new(uintptr_t typ, int s, int l, QVariant* val); -QInputMethodEvent__Attribute* QInputMethodEvent__Attribute_new2(uintptr_t typ, int s, int l); +QInputMethodEvent__Attribute* QInputMethodEvent__Attribute_new(int typ, int s, int l, QVariant* val); +QInputMethodEvent__Attribute* QInputMethodEvent__Attribute_new2(int typ, int s, int l); QInputMethodEvent__Attribute* QInputMethodEvent__Attribute_new3(QInputMethodEvent__Attribute* param1); +void QInputMethodEvent__Attribute_OperatorAssign(QInputMethodEvent__Attribute* self, QInputMethodEvent__Attribute* param1); void QInputMethodEvent__Attribute_Delete(QInputMethodEvent__Attribute* self); QTouchEvent__TouchPoint* QTouchEvent__TouchPoint_new(); QTouchEvent__TouchPoint* QTouchEvent__TouchPoint_new2(QTouchEvent__TouchPoint* other); QTouchEvent__TouchPoint* QTouchEvent__TouchPoint_new3(int id); +void QTouchEvent__TouchPoint_OperatorAssign(QTouchEvent__TouchPoint* self, QTouchEvent__TouchPoint* other); void QTouchEvent__TouchPoint_Swap(QTouchEvent__TouchPoint* self, QTouchEvent__TouchPoint* other); int QTouchEvent__TouchPoint_Id(const QTouchEvent__TouchPoint* self); QPointingDeviceUniqueId* QTouchEvent__TouchPoint_UniqueId(const QTouchEvent__TouchPoint* self); -uintptr_t QTouchEvent__TouchPoint_State(const QTouchEvent__TouchPoint* self); +int QTouchEvent__TouchPoint_State(const QTouchEvent__TouchPoint* self); QPointF* QTouchEvent__TouchPoint_Pos(const QTouchEvent__TouchPoint* self); QPointF* QTouchEvent__TouchPoint_StartPos(const QTouchEvent__TouchPoint* self); QPointF* QTouchEvent__TouchPoint_LastPos(const QTouchEvent__TouchPoint* self); diff --git a/qt/gen_qeventloop.go b/qt/gen_qeventloop.go index cbafc76..f59ff92 100644 --- a/qt/gen_qeventloop.go +++ b/qt/gen_qeventloop.go @@ -87,7 +87,7 @@ func (this *QEventLoop) ProcessEvents() bool { } func (this *QEventLoop) ProcessEvents2(flags int, maximumTime int) { - C.QEventLoop_ProcessEvents2(this.h, (C.int)(flags), (C.int)(maximumTime)) + C.QEventLoop_ProcessEvents2(this.h, flags, (C.int)(maximumTime)) } func (this *QEventLoop) Exec() int { @@ -159,11 +159,11 @@ func QEventLoop_TrUtf83(s string, c string, n int) string { } func (this *QEventLoop) ProcessEvents1(flags int) bool { - return (bool)(C.QEventLoop_ProcessEvents1(this.h, (C.int)(flags))) + return (bool)(C.QEventLoop_ProcessEvents1(this.h, flags)) } func (this *QEventLoop) Exec1(flags int) int { - return (int)(C.QEventLoop_Exec1(this.h, (C.int)(flags))) + return (int)(C.QEventLoop_Exec1(this.h, flags)) } func (this *QEventLoop) Exit1(returnCode int) { diff --git a/qt/gen_qeventtransition.cpp b/qt/gen_qeventtransition.cpp index 95590eb..05d7dc6 100644 --- a/qt/gen_qeventtransition.cpp +++ b/qt/gen_qeventtransition.cpp @@ -13,7 +13,7 @@ QEventTransition* QEventTransition_new() { return new QEventTransition(); } -QEventTransition* QEventTransition_new2(QObject* object, uintptr_t typeVal) { +QEventTransition* QEventTransition_new2(QObject* object, int typeVal) { return new QEventTransition(object, static_cast(typeVal)); } @@ -21,7 +21,7 @@ QEventTransition* QEventTransition_new3(QState* sourceState) { return new QEventTransition(sourceState); } -QEventTransition* QEventTransition_new4(QObject* object, uintptr_t typeVal, QState* sourceState) { +QEventTransition* QEventTransition_new4(QObject* object, int typeVal, QState* sourceState) { return new QEventTransition(object, static_cast(typeVal), sourceState); } @@ -51,12 +51,12 @@ void QEventTransition_SetEventSource(QEventTransition* self, QObject* object) { self->setEventSource(object); } -uintptr_t QEventTransition_EventType(const QEventTransition* self) { +int QEventTransition_EventType(const QEventTransition* self) { QEvent::Type _ret = self->eventType(); - return static_cast(_ret); + return static_cast(_ret); } -void QEventTransition_SetEventType(QEventTransition* self, uintptr_t typeVal) { +void QEventTransition_SetEventType(QEventTransition* self, int typeVal) { self->setEventType(static_cast(typeVal)); } diff --git a/qt/gen_qeventtransition.go b/qt/gen_qeventtransition.go index 039980f..d77d4ea 100644 --- a/qt/gen_qeventtransition.go +++ b/qt/gen_qeventtransition.go @@ -44,7 +44,7 @@ func NewQEventTransition() *QEventTransition { // NewQEventTransition2 constructs a new QEventTransition object. func NewQEventTransition2(object *QObject, typeVal QEvent__Type) *QEventTransition { - ret := C.QEventTransition_new2(object.cPointer(), (C.uintptr_t)(typeVal)) + ret := C.QEventTransition_new2(object.cPointer(), (C.int)(typeVal)) return newQEventTransition(ret) } @@ -56,7 +56,7 @@ func NewQEventTransition3(sourceState *QState) *QEventTransition { // NewQEventTransition4 constructs a new QEventTransition object. func NewQEventTransition4(object *QObject, typeVal QEvent__Type, sourceState *QState) *QEventTransition { - ret := C.QEventTransition_new4(object.cPointer(), (C.uintptr_t)(typeVal), sourceState.cPointer()) + ret := C.QEventTransition_new4(object.cPointer(), (C.int)(typeVal), sourceState.cPointer()) return newQEventTransition(ret) } @@ -95,7 +95,7 @@ func (this *QEventTransition) EventType() QEvent__Type { } func (this *QEventTransition) SetEventType(typeVal QEvent__Type) { - C.QEventTransition_SetEventType(this.h, (C.uintptr_t)(typeVal)) + C.QEventTransition_SetEventType(this.h, (C.int)(typeVal)) } func QEventTransition_Tr2(s string, c string) string { diff --git a/qt/gen_qeventtransition.h b/qt/gen_qeventtransition.h index 0dd646e..96634da 100644 --- a/qt/gen_qeventtransition.h +++ b/qt/gen_qeventtransition.h @@ -26,16 +26,16 @@ typedef struct QState QState; #endif QEventTransition* QEventTransition_new(); -QEventTransition* QEventTransition_new2(QObject* object, uintptr_t typeVal); +QEventTransition* QEventTransition_new2(QObject* object, int typeVal); QEventTransition* QEventTransition_new3(QState* sourceState); -QEventTransition* QEventTransition_new4(QObject* object, uintptr_t typeVal, QState* sourceState); +QEventTransition* QEventTransition_new4(QObject* object, int typeVal, QState* sourceState); QMetaObject* QEventTransition_MetaObject(const QEventTransition* self); struct miqt_string* QEventTransition_Tr(const char* s); struct miqt_string* QEventTransition_TrUtf8(const char* s); QObject* QEventTransition_EventSource(const QEventTransition* self); void QEventTransition_SetEventSource(QEventTransition* self, QObject* object); -uintptr_t QEventTransition_EventType(const QEventTransition* self); -void QEventTransition_SetEventType(QEventTransition* self, uintptr_t typeVal); +int QEventTransition_EventType(const QEventTransition* self); +void QEventTransition_SetEventType(QEventTransition* self, int typeVal); struct miqt_string* QEventTransition_Tr2(const char* s, const char* c); struct miqt_string* QEventTransition_Tr3(const char* s, const char* c, int n); struct miqt_string* QEventTransition_TrUtf82(const char* s, const char* c); diff --git a/qt/gen_qexception.cpp b/qt/gen_qexception.cpp index b22451d..1ec4e82 100644 --- a/qt/gen_qexception.cpp +++ b/qt/gen_qexception.cpp @@ -40,6 +40,10 @@ bool QtPrivate__ExceptionStore_HasThrown(const QtPrivate__ExceptionStore* self) return self->hasThrown(); } +void QtPrivate__ExceptionStore_OperatorAssign(QtPrivate__ExceptionStore* self, QtPrivate__ExceptionStore* param1) { + self->operator=(*param1); +} + void QtPrivate__ExceptionStore_Delete(QtPrivate__ExceptionStore* self) { delete self; } diff --git a/qt/gen_qexception.go b/qt/gen_qexception.go index 8fd5301..1bb0200 100644 --- a/qt/gen_qexception.go +++ b/qt/gen_qexception.go @@ -112,6 +112,10 @@ func (this *QtPrivate__ExceptionStore) HasThrown() bool { return (bool)(C.QtPrivate__ExceptionStore_HasThrown(this.h)) } +func (this *QtPrivate__ExceptionStore) OperatorAssign(param1 *QtPrivate__ExceptionStore) { + C.QtPrivate__ExceptionStore_OperatorAssign(this.h, param1.cPointer()) +} + // Delete this object from C++ memory. func (this *QtPrivate__ExceptionStore) Delete() { C.QtPrivate__ExceptionStore_Delete(this.h) diff --git a/qt/gen_qexception.h b/qt/gen_qexception.h index d6e2dca..7cfa47e 100644 --- a/qt/gen_qexception.h +++ b/qt/gen_qexception.h @@ -39,6 +39,7 @@ bool QtPrivate__ExceptionStore_HasException(const QtPrivate__ExceptionStore* sel QtPrivate__ExceptionHolder* QtPrivate__ExceptionStore_Exception(QtPrivate__ExceptionStore* self); void QtPrivate__ExceptionStore_ThrowPossibleException(QtPrivate__ExceptionStore* self); bool QtPrivate__ExceptionStore_HasThrown(const QtPrivate__ExceptionStore* self); +void QtPrivate__ExceptionStore_OperatorAssign(QtPrivate__ExceptionStore* self, QtPrivate__ExceptionStore* param1); void QtPrivate__ExceptionStore_Delete(QtPrivate__ExceptionStore* self); #ifdef __cplusplus diff --git a/qt/gen_qfile.cpp b/qt/gen_qfile.cpp index 9324152..22ee1ae 100644 --- a/qt/gen_qfile.cpp +++ b/qt/gen_qfile.cpp @@ -175,7 +175,8 @@ bool QFile_Open3(QFile* self, int fd, int ioFlags) { } long long QFile_Size(const QFile* self) { - return self->size(); + qint64 _ret = self->size(); + return static_cast(_ret); } bool QFile_Resize(QFile* self, long long sz) { diff --git a/qt/gen_qfile.go b/qt/gen_qfile.go index 1503913..c44d622 100644 --- a/qt/gen_qfile.go +++ b/qt/gen_qfile.go @@ -229,11 +229,11 @@ func QFile_Copy2(fileName string, newName string) bool { } func (this *QFile) Open(flags int) bool { - return (bool)(C.QFile_Open(this.h, (C.int)(flags))) + return (bool)(C.QFile_Open(this.h, flags)) } func (this *QFile) Open3(fd int, ioFlags int) bool { - return (bool)(C.QFile_Open3(this.h, (C.int)(fd), (C.int)(ioFlags))) + return (bool)(C.QFile_Open3(this.h, (C.int)(fd), ioFlags)) } func (this *QFile) Size() int64 { @@ -261,13 +261,13 @@ func QFile_PermissionsWithFilename(filename string) int { } func (this *QFile) SetPermissions(permissionSpec int) bool { - return (bool)(C.QFile_SetPermissions(this.h, (C.int)(permissionSpec))) + return (bool)(C.QFile_SetPermissions(this.h, permissionSpec)) } func QFile_SetPermissions2(filename string, permissionSpec int) bool { filename_ms := miqt_strdupg(filename) defer C.free(filename_ms) - return (bool)(C.QFile_SetPermissions2((*C.struct_miqt_string)(filename_ms), (C.int)(permissionSpec))) + return (bool)(C.QFile_SetPermissions2((*C.struct_miqt_string)(filename_ms), permissionSpec)) } func QFile_Tr2(s string, c string) string { @@ -315,7 +315,7 @@ func QFile_TrUtf83(s string, c string, n int) string { } func (this *QFile) Open33(fd int, ioFlags int, handleFlags int) bool { - return (bool)(C.QFile_Open33(this.h, (C.int)(fd), (C.int)(ioFlags), (C.int)(handleFlags))) + return (bool)(C.QFile_Open33(this.h, (C.int)(fd), ioFlags, handleFlags)) } // Delete this object from C++ memory. diff --git a/qt/gen_qfiledevice.cpp b/qt/gen_qfiledevice.cpp index e0d5c66..dd7baaa 100644 --- a/qt/gen_qfiledevice.cpp +++ b/qt/gen_qfiledevice.cpp @@ -26,9 +26,9 @@ struct miqt_string* QFileDevice_TrUtf8(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -uintptr_t QFileDevice_Error(const QFileDevice* self) { +int QFileDevice_Error(const QFileDevice* self) { QFileDevice::FileError _ret = self->error(); - return static_cast(_ret); + return static_cast(_ret); } void QFileDevice_UnsetError(QFileDevice* self) { @@ -55,7 +55,8 @@ struct miqt_string* QFileDevice_FileName(const QFileDevice* self) { } long long QFileDevice_Pos(const QFileDevice* self) { - return self->pos(); + qint64 _ret = self->pos(); + return static_cast(_ret); } bool QFileDevice_Seek(QFileDevice* self, long long offset) { @@ -71,7 +72,8 @@ bool QFileDevice_Flush(QFileDevice* self) { } long long QFileDevice_Size(const QFileDevice* self) { - return self->size(); + qint64 _ret = self->size(); + return static_cast(_ret); } bool QFileDevice_Resize(QFileDevice* self, long long sz) { @@ -88,18 +90,19 @@ bool QFileDevice_SetPermissions(QFileDevice* self, int permissionSpec) { } unsigned char* QFileDevice_Map(QFileDevice* self, long long offset, long long size) { - return self->map(static_cast(offset), static_cast(size)); + uchar* _ret = self->map(static_cast(offset), static_cast(size)); + return static_cast(_ret); } bool QFileDevice_Unmap(QFileDevice* self, unsigned char* address) { return self->unmap(static_cast(address)); } -QDateTime* QFileDevice_FileTime(const QFileDevice* self, uintptr_t time) { +QDateTime* QFileDevice_FileTime(const QFileDevice* self, int time) { return new QDateTime(self->fileTime(static_cast(time))); } -bool QFileDevice_SetFileTime(QFileDevice* self, QDateTime* newDate, uintptr_t fileTime) { +bool QFileDevice_SetFileTime(QFileDevice* self, QDateTime* newDate, int fileTime) { return self->setFileTime(*newDate, static_cast(fileTime)); } @@ -131,8 +134,9 @@ struct miqt_string* QFileDevice_TrUtf83(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -unsigned char* QFileDevice_Map3(QFileDevice* self, long long offset, long long size, uintptr_t flags) { - return self->map(static_cast(offset), static_cast(size), static_cast(flags)); +unsigned char* QFileDevice_Map3(QFileDevice* self, long long offset, long long size, int flags) { + uchar* _ret = self->map(static_cast(offset), static_cast(size), static_cast(flags)); + return static_cast(_ret); } void QFileDevice_Delete(QFileDevice* self) { diff --git a/qt/gen_qfiledevice.go b/qt/gen_qfiledevice.go index c8730e5..fb03bbf 100644 --- a/qt/gen_qfiledevice.go +++ b/qt/gen_qfiledevice.go @@ -174,7 +174,7 @@ func (this *QFileDevice) Permissions() int { } func (this *QFileDevice) SetPermissions(permissionSpec int) bool { - return (bool)(C.QFileDevice_SetPermissions(this.h, (C.int)(permissionSpec))) + return (bool)(C.QFileDevice_SetPermissions(this.h, permissionSpec)) } func (this *QFileDevice) Map(offset int64, size int64) *byte { @@ -186,14 +186,14 @@ func (this *QFileDevice) Unmap(address *byte) bool { } func (this *QFileDevice) FileTime(time QFileDevice__FileTime) *QDateTime { - _ret := C.QFileDevice_FileTime(this.h, (C.uintptr_t)(time)) + _ret := C.QFileDevice_FileTime(this.h, (C.int)(time)) _goptr := newQDateTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QFileDevice) SetFileTime(newDate *QDateTime, fileTime QFileDevice__FileTime) bool { - return (bool)(C.QFileDevice_SetFileTime(this.h, newDate.cPointer(), (C.uintptr_t)(fileTime))) + return (bool)(C.QFileDevice_SetFileTime(this.h, newDate.cPointer(), (C.int)(fileTime))) } func QFileDevice_Tr2(s string, c string) string { @@ -241,7 +241,7 @@ func QFileDevice_TrUtf83(s string, c string, n int) string { } func (this *QFileDevice) Map3(offset int64, size int64, flags QFileDevice__MemoryMapFlags) *byte { - return (*byte)(C.QFileDevice_Map3(this.h, (C.longlong)(offset), (C.longlong)(size), (C.uintptr_t)(flags))) + return (*byte)(C.QFileDevice_Map3(this.h, (C.longlong)(offset), (C.longlong)(size), (C.int)(flags))) } // Delete this object from C++ memory. diff --git a/qt/gen_qfiledevice.h b/qt/gen_qfiledevice.h index 13e2ddb..2730bb0 100644 --- a/qt/gen_qfiledevice.h +++ b/qt/gen_qfiledevice.h @@ -26,7 +26,7 @@ typedef struct QMetaObject QMetaObject; QMetaObject* QFileDevice_MetaObject(const QFileDevice* self); struct miqt_string* QFileDevice_Tr(const char* s); struct miqt_string* QFileDevice_TrUtf8(const char* s); -uintptr_t QFileDevice_Error(const QFileDevice* self); +int QFileDevice_Error(const QFileDevice* self); void QFileDevice_UnsetError(QFileDevice* self); void QFileDevice_Close(QFileDevice* self); bool QFileDevice_IsSequential(const QFileDevice* self); @@ -42,13 +42,13 @@ int QFileDevice_Permissions(const QFileDevice* self); bool QFileDevice_SetPermissions(QFileDevice* self, int permissionSpec); unsigned char* QFileDevice_Map(QFileDevice* self, long long offset, long long size); bool QFileDevice_Unmap(QFileDevice* self, unsigned char* address); -QDateTime* QFileDevice_FileTime(const QFileDevice* self, uintptr_t time); -bool QFileDevice_SetFileTime(QFileDevice* self, QDateTime* newDate, uintptr_t fileTime); +QDateTime* QFileDevice_FileTime(const QFileDevice* self, int time); +bool QFileDevice_SetFileTime(QFileDevice* self, QDateTime* newDate, int fileTime); struct miqt_string* QFileDevice_Tr2(const char* s, const char* c); struct miqt_string* QFileDevice_Tr3(const char* s, const char* c, int n); struct miqt_string* QFileDevice_TrUtf82(const char* s, const char* c); struct miqt_string* QFileDevice_TrUtf83(const char* s, const char* c, int n); -unsigned char* QFileDevice_Map3(QFileDevice* self, long long offset, long long size, uintptr_t flags); +unsigned char* QFileDevice_Map3(QFileDevice* self, long long offset, long long size, int flags); void QFileDevice_Delete(QFileDevice* self); #ifdef __cplusplus diff --git a/qt/gen_qfiledialog.cpp b/qt/gen_qfiledialog.cpp index c260f7a..a0c4c41 100644 --- a/qt/gen_qfiledialog.cpp +++ b/qt/gen_qfiledialog.cpp @@ -222,31 +222,31 @@ void QFileDialog_SetFilter(QFileDialog* self, int filters) { self->setFilter(static_cast(filters)); } -void QFileDialog_SetViewMode(QFileDialog* self, uintptr_t mode) { +void QFileDialog_SetViewMode(QFileDialog* self, int mode) { self->setViewMode(static_cast(mode)); } -uintptr_t QFileDialog_ViewMode(const QFileDialog* self) { +int QFileDialog_ViewMode(const QFileDialog* self) { QFileDialog::ViewMode _ret = self->viewMode(); - return static_cast(_ret); + return static_cast(_ret); } -void QFileDialog_SetFileMode(QFileDialog* self, uintptr_t mode) { +void QFileDialog_SetFileMode(QFileDialog* self, int mode) { self->setFileMode(static_cast(mode)); } -uintptr_t QFileDialog_FileMode(const QFileDialog* self) { +int QFileDialog_FileMode(const QFileDialog* self) { QFileDialog::FileMode _ret = self->fileMode(); - return static_cast(_ret); + return static_cast(_ret); } -void QFileDialog_SetAcceptMode(QFileDialog* self, uintptr_t mode) { +void QFileDialog_SetAcceptMode(QFileDialog* self, int mode) { self->setAcceptMode(static_cast(mode)); } -uintptr_t QFileDialog_AcceptMode(const QFileDialog* self) { +int QFileDialog_AcceptMode(const QFileDialog* self) { QFileDialog::AcceptMode _ret = self->acceptMode(); - return static_cast(_ret); + return static_cast(_ret); } void QFileDialog_SetReadOnly(QFileDialog* self, bool enabled) { @@ -359,12 +359,12 @@ QFileIconProvider* QFileDialog_IconProvider(const QFileDialog* self) { return self->iconProvider(); } -void QFileDialog_SetLabelText(QFileDialog* self, uintptr_t label, struct miqt_string* text) { +void QFileDialog_SetLabelText(QFileDialog* self, int label, struct miqt_string* text) { QString text_QString = QString::fromUtf8(&text->data, text->len); self->setLabelText(static_cast(label), text_QString); } -struct miqt_string* QFileDialog_LabelText(const QFileDialog* self, uintptr_t label) { +struct miqt_string* QFileDialog_LabelText(const QFileDialog* self, int label) { QString _ret = self->labelText(static_cast(label)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -406,11 +406,11 @@ QAbstractProxyModel* QFileDialog_ProxyModel(const QFileDialog* self) { return self->proxyModel(); } -void QFileDialog_SetOption(QFileDialog* self, uintptr_t option) { +void QFileDialog_SetOption(QFileDialog* self, int option) { self->setOption(static_cast(option)); } -bool QFileDialog_TestOption(const QFileDialog* self, uintptr_t option) { +bool QFileDialog_TestOption(const QFileDialog* self, int option) { return self->testOption(static_cast(option)); } @@ -676,7 +676,7 @@ struct miqt_string* QFileDialog_TrUtf83(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -void QFileDialog_SetOption2(QFileDialog* self, uintptr_t option, bool on) { +void QFileDialog_SetOption2(QFileDialog* self, int option, bool on) { self->setOption(static_cast(option), on); } diff --git a/qt/gen_qfiledialog.go b/qt/gen_qfiledialog.go index f54fb31..3df37da 100644 --- a/qt/gen_qfiledialog.go +++ b/qt/gen_qfiledialog.go @@ -86,7 +86,7 @@ func newQFileDialog_U(h unsafe.Pointer) *QFileDialog { // NewQFileDialog constructs a new QFileDialog object. func NewQFileDialog(parent *QWidget, f int) *QFileDialog { - ret := C.QFileDialog_new(parent.cPointer(), (C.int)(f)) + ret := C.QFileDialog_new(parent.cPointer(), f) return newQFileDialog(ret) } @@ -321,11 +321,11 @@ func (this *QFileDialog) Filter() int { } func (this *QFileDialog) SetFilter(filters int) { - C.QFileDialog_SetFilter(this.h, (C.int)(filters)) + C.QFileDialog_SetFilter(this.h, filters) } func (this *QFileDialog) SetViewMode(mode QFileDialog__ViewMode) { - C.QFileDialog_SetViewMode(this.h, (C.uintptr_t)(mode)) + C.QFileDialog_SetViewMode(this.h, (C.int)(mode)) } func (this *QFileDialog) ViewMode() QFileDialog__ViewMode { @@ -333,7 +333,7 @@ func (this *QFileDialog) ViewMode() QFileDialog__ViewMode { } func (this *QFileDialog) SetFileMode(mode QFileDialog__FileMode) { - C.QFileDialog_SetFileMode(this.h, (C.uintptr_t)(mode)) + C.QFileDialog_SetFileMode(this.h, (C.int)(mode)) } func (this *QFileDialog) FileMode() QFileDialog__FileMode { @@ -341,7 +341,7 @@ func (this *QFileDialog) FileMode() QFileDialog__FileMode { } func (this *QFileDialog) SetAcceptMode(mode QFileDialog__AcceptMode) { - C.QFileDialog_SetAcceptMode(this.h, (C.uintptr_t)(mode)) + C.QFileDialog_SetAcceptMode(this.h, (C.int)(mode)) } func (this *QFileDialog) AcceptMode() QFileDialog__AcceptMode { @@ -469,11 +469,11 @@ func (this *QFileDialog) IconProvider() *QFileIconProvider { func (this *QFileDialog) SetLabelText(label QFileDialog__DialogLabel, text string) { text_ms := miqt_strdupg(text) defer C.free(text_ms) - C.QFileDialog_SetLabelText(this.h, (C.uintptr_t)(label), (*C.struct_miqt_string)(text_ms)) + C.QFileDialog_SetLabelText(this.h, (C.int)(label), (*C.struct_miqt_string)(text_ms)) } func (this *QFileDialog) LabelText(label QFileDialog__DialogLabel) string { - var _ms *C.struct_miqt_string = C.QFileDialog_LabelText(this.h, (C.uintptr_t)(label)) + var _ms *C.struct_miqt_string = C.QFileDialog_LabelText(this.h, (C.int)(label)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -516,15 +516,15 @@ func (this *QFileDialog) ProxyModel() *QAbstractProxyModel { } func (this *QFileDialog) SetOption(option QFileDialog__Option) { - C.QFileDialog_SetOption(this.h, (C.uintptr_t)(option)) + C.QFileDialog_SetOption(this.h, (C.int)(option)) } func (this *QFileDialog) TestOption(option QFileDialog__Option) bool { - return (bool)(C.QFileDialog_TestOption(this.h, (C.uintptr_t)(option))) + return (bool)(C.QFileDialog_TestOption(this.h, (C.int)(option))) } func (this *QFileDialog) SetOptions(options int) { - C.QFileDialog_SetOptions(this.h, (C.int)(options)) + C.QFileDialog_SetOptions(this.h, options) } func (this *QFileDialog) Options() int { @@ -892,7 +892,7 @@ func QFileDialog_TrUtf83(s string, c string, n int) string { } func (this *QFileDialog) SetOption2(option QFileDialog__Option, on bool) { - C.QFileDialog_SetOption2(this.h, (C.uintptr_t)(option), (C.bool)(on)) + C.QFileDialog_SetOption2(this.h, (C.int)(option), (C.bool)(on)) } func QFileDialog_GetOpenFileName1(parent *QWidget) string { @@ -1079,7 +1079,7 @@ func QFileDialog_GetExistingDirectory4(parent *QWidget, caption string, dir stri defer C.free(caption_ms) dir_ms := miqt_strdupg(dir) defer C.free(dir_ms) - var _ms *C.struct_miqt_string = C.QFileDialog_GetExistingDirectory4(parent.cPointer(), (*C.struct_miqt_string)(caption_ms), (*C.struct_miqt_string)(dir_ms), (C.int)(options)) + var _ms *C.struct_miqt_string = C.QFileDialog_GetExistingDirectory4(parent.cPointer(), (*C.struct_miqt_string)(caption_ms), (*C.struct_miqt_string)(dir_ms), options) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -1113,7 +1113,7 @@ func QFileDialog_GetExistingDirectoryUrl3(parent *QWidget, caption string, dir * func QFileDialog_GetExistingDirectoryUrl4(parent *QWidget, caption string, dir *QUrl, options int) *QUrl { caption_ms := miqt_strdupg(caption) defer C.free(caption_ms) - _ret := C.QFileDialog_GetExistingDirectoryUrl4(parent.cPointer(), (*C.struct_miqt_string)(caption_ms), dir.cPointer(), (C.int)(options)) + _ret := C.QFileDialog_GetExistingDirectoryUrl4(parent.cPointer(), (*C.struct_miqt_string)(caption_ms), dir.cPointer(), options) _goptr := newQUrl(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -1132,7 +1132,7 @@ func QFileDialog_GetExistingDirectoryUrl5(parent *QWidget, caption string, dir * } supportedSchemes_ma := &C.struct_miqt_array{len: C.size_t(len(supportedSchemes)), data: unsafe.Pointer(supportedSchemes_CArray)} defer runtime.KeepAlive(unsafe.Pointer(supportedSchemes_ma)) - _ret := C.QFileDialog_GetExistingDirectoryUrl5(parent.cPointer(), (*C.struct_miqt_string)(caption_ms), dir.cPointer(), (C.int)(options), supportedSchemes_ma) + _ret := C.QFileDialog_GetExistingDirectoryUrl5(parent.cPointer(), (*C.struct_miqt_string)(caption_ms), dir.cPointer(), options, supportedSchemes_ma) _goptr := newQUrl(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qfiledialog.h b/qt/gen_qfiledialog.h index 9c61ea9..9b48a55 100644 --- a/qt/gen_qfiledialog.h +++ b/qt/gen_qfiledialog.h @@ -66,12 +66,12 @@ struct miqt_array* QFileDialog_MimeTypeFilters(const QFileDialog* self); void QFileDialog_SelectMimeTypeFilter(QFileDialog* self, struct miqt_string* filter); int QFileDialog_Filter(const QFileDialog* self); void QFileDialog_SetFilter(QFileDialog* self, int filters); -void QFileDialog_SetViewMode(QFileDialog* self, uintptr_t mode); -uintptr_t QFileDialog_ViewMode(const QFileDialog* self); -void QFileDialog_SetFileMode(QFileDialog* self, uintptr_t mode); -uintptr_t QFileDialog_FileMode(const QFileDialog* self); -void QFileDialog_SetAcceptMode(QFileDialog* self, uintptr_t mode); -uintptr_t QFileDialog_AcceptMode(const QFileDialog* self); +void QFileDialog_SetViewMode(QFileDialog* self, int mode); +int QFileDialog_ViewMode(const QFileDialog* self); +void QFileDialog_SetFileMode(QFileDialog* self, int mode); +int QFileDialog_FileMode(const QFileDialog* self); +void QFileDialog_SetAcceptMode(QFileDialog* self, int mode); +int QFileDialog_AcceptMode(const QFileDialog* self); void QFileDialog_SetReadOnly(QFileDialog* self, bool enabled); bool QFileDialog_IsReadOnly(const QFileDialog* self); void QFileDialog_SetResolveSymlinks(QFileDialog* self, bool enabled); @@ -90,14 +90,14 @@ void QFileDialog_SetItemDelegate(QFileDialog* self, QAbstractItemDelegate* deleg QAbstractItemDelegate* QFileDialog_ItemDelegate(const QFileDialog* self); void QFileDialog_SetIconProvider(QFileDialog* self, QFileIconProvider* provider); QFileIconProvider* QFileDialog_IconProvider(const QFileDialog* self); -void QFileDialog_SetLabelText(QFileDialog* self, uintptr_t label, struct miqt_string* text); -struct miqt_string* QFileDialog_LabelText(const QFileDialog* self, uintptr_t label); +void QFileDialog_SetLabelText(QFileDialog* self, int label, struct miqt_string* text); +struct miqt_string* QFileDialog_LabelText(const QFileDialog* self, int label); void QFileDialog_SetSupportedSchemes(QFileDialog* self, struct miqt_array* /* of struct miqt_string* */ schemes); struct miqt_array* QFileDialog_SupportedSchemes(const QFileDialog* self); void QFileDialog_SetProxyModel(QFileDialog* self, QAbstractProxyModel* model); QAbstractProxyModel* QFileDialog_ProxyModel(const QFileDialog* self); -void QFileDialog_SetOption(QFileDialog* self, uintptr_t option); -bool QFileDialog_TestOption(const QFileDialog* self, uintptr_t option); +void QFileDialog_SetOption(QFileDialog* self, int option); +bool QFileDialog_TestOption(const QFileDialog* self, int option); void QFileDialog_SetOptions(QFileDialog* self, int options); int QFileDialog_Options(const QFileDialog* self); void QFileDialog_SetVisible(QFileDialog* self, bool visible); @@ -132,7 +132,7 @@ struct miqt_string* QFileDialog_Tr2(const char* s, const char* c); struct miqt_string* QFileDialog_Tr3(const char* s, const char* c, int n); struct miqt_string* QFileDialog_TrUtf82(const char* s, const char* c); struct miqt_string* QFileDialog_TrUtf83(const char* s, const char* c, int n); -void QFileDialog_SetOption2(QFileDialog* self, uintptr_t option, bool on); +void QFileDialog_SetOption2(QFileDialog* self, int option, bool on); struct miqt_string* QFileDialog_GetOpenFileName1(QWidget* parent); struct miqt_string* QFileDialog_GetOpenFileName2(QWidget* parent, struct miqt_string* caption); struct miqt_string* QFileDialog_GetOpenFileName3(QWidget* parent, struct miqt_string* caption, struct miqt_string* dir); diff --git a/qt/gen_qfileiconprovider.cpp b/qt/gen_qfileiconprovider.cpp index f3d3f84..40d18f4 100644 --- a/qt/gen_qfileiconprovider.cpp +++ b/qt/gen_qfileiconprovider.cpp @@ -12,7 +12,7 @@ QFileIconProvider* QFileIconProvider_new() { return new QFileIconProvider(); } -QIcon* QFileIconProvider_Icon(const QFileIconProvider* self, uintptr_t typeVal) { +QIcon* QFileIconProvider_Icon(const QFileIconProvider* self, int typeVal) { return new QIcon(self->icon(static_cast(typeVal))); } diff --git a/qt/gen_qfileiconprovider.go b/qt/gen_qfileiconprovider.go index de726f3..5a47db5 100644 --- a/qt/gen_qfileiconprovider.go +++ b/qt/gen_qfileiconprovider.go @@ -60,7 +60,7 @@ func NewQFileIconProvider() *QFileIconProvider { } func (this *QFileIconProvider) Icon(typeVal QFileIconProvider__IconType) *QIcon { - _ret := C.QFileIconProvider_Icon(this.h, (C.uintptr_t)(typeVal)) + _ret := C.QFileIconProvider_Icon(this.h, (C.int)(typeVal)) _goptr := newQIcon(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -81,7 +81,7 @@ func (this *QFileIconProvider) Type(info *QFileInfo) string { } func (this *QFileIconProvider) SetOptions(options int) { - C.QFileIconProvider_SetOptions(this.h, (C.int)(options)) + C.QFileIconProvider_SetOptions(this.h, options) } func (this *QFileIconProvider) Options() int { diff --git a/qt/gen_qfileiconprovider.h b/qt/gen_qfileiconprovider.h index 3df18e3..3a36486 100644 --- a/qt/gen_qfileiconprovider.h +++ b/qt/gen_qfileiconprovider.h @@ -24,7 +24,7 @@ typedef struct QIcon QIcon; #endif QFileIconProvider* QFileIconProvider_new(); -QIcon* QFileIconProvider_Icon(const QFileIconProvider* self, uintptr_t typeVal); +QIcon* QFileIconProvider_Icon(const QFileIconProvider* self, int typeVal); QIcon* QFileIconProvider_IconWithInfo(const QFileIconProvider* self, QFileInfo* info); struct miqt_string* QFileIconProvider_Type(const QFileIconProvider* self, QFileInfo* info); void QFileIconProvider_SetOptions(QFileIconProvider* self, int options); diff --git a/qt/gen_qfileinfo.cpp b/qt/gen_qfileinfo.cpp index 6c0635c..6fc91bc 100644 --- a/qt/gen_qfileinfo.cpp +++ b/qt/gen_qfileinfo.cpp @@ -252,7 +252,8 @@ struct miqt_string* QFileInfo_Owner(const QFileInfo* self) { } unsigned int QFileInfo_OwnerId(const QFileInfo* self) { - return self->ownerId(); + uint _ret = self->ownerId(); + return static_cast(_ret); } struct miqt_string* QFileInfo_Group(const QFileInfo* self) { @@ -263,7 +264,8 @@ struct miqt_string* QFileInfo_Group(const QFileInfo* self) { } unsigned int QFileInfo_GroupId(const QFileInfo* self) { - return self->groupId(); + uint _ret = self->groupId(); + return static_cast(_ret); } bool QFileInfo_Permission(const QFileInfo* self, int permissions) { @@ -276,7 +278,8 @@ int QFileInfo_Permissions(const QFileInfo* self) { } long long QFileInfo_Size(const QFileInfo* self) { - return self->size(); + qint64 _ret = self->size(); + return static_cast(_ret); } QDateTime* QFileInfo_Created(const QFileInfo* self) { @@ -299,7 +302,7 @@ QDateTime* QFileInfo_LastRead(const QFileInfo* self) { return new QDateTime(self->lastRead()); } -QDateTime* QFileInfo_FileTime(const QFileInfo* self, uintptr_t time) { +QDateTime* QFileInfo_FileTime(const QFileInfo* self, int time) { return new QDateTime(self->fileTime(static_cast(time))); } diff --git a/qt/gen_qfileinfo.go b/qt/gen_qfileinfo.go index c8122f6..77b77ce 100644 --- a/qt/gen_qfileinfo.go +++ b/qt/gen_qfileinfo.go @@ -314,7 +314,7 @@ func (this *QFileInfo) GroupId() uint { } func (this *QFileInfo) Permission(permissions int) bool { - return (bool)(C.QFileInfo_Permission(this.h, (C.int)(permissions))) + return (bool)(C.QFileInfo_Permission(this.h, permissions)) } func (this *QFileInfo) Permissions() int { @@ -360,8 +360,8 @@ func (this *QFileInfo) LastRead() *QDateTime { return _goptr } -func (this *QFileInfo) FileTime(time uintptr) *QDateTime { - _ret := C.QFileInfo_FileTime(this.h, (C.uintptr_t)(time)) +func (this *QFileInfo) FileTime(time QFileDevice__FileTime) *QDateTime { + _ret := C.QFileInfo_FileTime(this.h, (C.int)(time)) _goptr := newQDateTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qfileinfo.h b/qt/gen_qfileinfo.h index 1b25f44..2408dc6 100644 --- a/qt/gen_qfileinfo.h +++ b/qt/gen_qfileinfo.h @@ -84,7 +84,7 @@ QDateTime* QFileInfo_BirthTime(const QFileInfo* self); QDateTime* QFileInfo_MetadataChangeTime(const QFileInfo* self); QDateTime* QFileInfo_LastModified(const QFileInfo* self); QDateTime* QFileInfo_LastRead(const QFileInfo* self); -QDateTime* QFileInfo_FileTime(const QFileInfo* self, uintptr_t time); +QDateTime* QFileInfo_FileTime(const QFileInfo* self, int time); bool QFileInfo_Caching(const QFileInfo* self); void QFileInfo_SetCaching(QFileInfo* self, bool on); void QFileInfo_Delete(QFileInfo* self); diff --git a/qt/gen_qfilesystemmodel.cpp b/qt/gen_qfilesystemmodel.cpp index 95da76e..2ec30ad 100644 --- a/qt/gen_qfilesystemmodel.cpp +++ b/qt/gen_qfilesystemmodel.cpp @@ -147,7 +147,7 @@ bool QFileSystemModel_SetData(QFileSystemModel* self, QModelIndex* index, QVaria return self->setData(*index, *value); } -QVariant* QFileSystemModel_HeaderData(const QFileSystemModel* self, int section, uintptr_t orientation) { +QVariant* QFileSystemModel_HeaderData(const QFileSystemModel* self, int section, int orientation) { return new QVariant(self->headerData(static_cast(section), static_cast(orientation))); } @@ -186,7 +186,7 @@ QMimeData* QFileSystemModel_MimeData(const QFileSystemModel* self, struct miqt_a return self->mimeData(indexes_QList); } -bool QFileSystemModel_DropMimeData(QFileSystemModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent) { +bool QFileSystemModel_DropMimeData(QFileSystemModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent) { return self->dropMimeData(data, static_cast(action), static_cast(row), static_cast(column), *parent); } @@ -279,11 +279,11 @@ struct miqt_array* QFileSystemModel_NameFilters(const QFileSystemModel* self) { return _out; } -void QFileSystemModel_SetOption(QFileSystemModel* self, uintptr_t option) { +void QFileSystemModel_SetOption(QFileSystemModel* self, int option) { self->setOption(static_cast(option)); } -bool QFileSystemModel_TestOption(const QFileSystemModel* self, uintptr_t option) { +bool QFileSystemModel_TestOption(const QFileSystemModel* self, int option) { return self->testOption(static_cast(option)); } @@ -308,7 +308,8 @@ bool QFileSystemModel_IsDir(const QFileSystemModel* self, QModelIndex* index) { } long long QFileSystemModel_Size(const QFileSystemModel* self, QModelIndex* index) { - return self->size(*index); + qint64 _ret = self->size(*index); + return static_cast(_ret); } struct miqt_string* QFileSystemModel_Type(const QFileSystemModel* self, QModelIndex* index) { @@ -416,15 +417,15 @@ bool QFileSystemModel_SetData3(QFileSystemModel* self, QModelIndex* index, QVari return self->setData(*index, *value, static_cast(role)); } -QVariant* QFileSystemModel_HeaderData3(const QFileSystemModel* self, int section, uintptr_t orientation, int role) { +QVariant* QFileSystemModel_HeaderData3(const QFileSystemModel* self, int section, int orientation, int role) { return new QVariant(self->headerData(static_cast(section), static_cast(orientation), static_cast(role))); } -void QFileSystemModel_Sort2(QFileSystemModel* self, int column, uintptr_t order) { +void QFileSystemModel_Sort2(QFileSystemModel* self, int column, int order) { self->sort(static_cast(column), static_cast(order)); } -void QFileSystemModel_SetOption2(QFileSystemModel* self, uintptr_t option, bool on) { +void QFileSystemModel_SetOption2(QFileSystemModel* self, int option, bool on) { self->setOption(static_cast(option), on); } diff --git a/qt/gen_qfilesystemmodel.go b/qt/gen_qfilesystemmodel.go index bd2b366..6b54aee 100644 --- a/qt/gen_qfilesystemmodel.go +++ b/qt/gen_qfilesystemmodel.go @@ -244,7 +244,7 @@ func (this *QFileSystemModel) SetData(index *QModelIndex, value *QVariant) bool } func (this *QFileSystemModel) HeaderData(section int, orientation Orientation) *QVariant { - _ret := C.QFileSystemModel_HeaderData(this.h, (C.int)(section), (C.uintptr_t)(orientation)) + _ret := C.QFileSystemModel_HeaderData(this.h, (C.int)(section), (C.int)(orientation)) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -285,7 +285,7 @@ func (this *QFileSystemModel) MimeData(indexes []QModelIndex) *QMimeData { } func (this *QFileSystemModel) DropMimeData(data *QMimeData, action DropAction, row int, column int, parent *QModelIndex) bool { - return (bool)(C.QFileSystemModel_DropMimeData(this.h, data.cPointer(), (C.uintptr_t)(action), (C.int)(row), (C.int)(column), parent.cPointer())) + return (bool)(C.QFileSystemModel_DropMimeData(this.h, data.cPointer(), (C.int)(action), (C.int)(row), (C.int)(column), parent.cPointer())) } func (this *QFileSystemModel) SupportedDropActions() int { @@ -324,7 +324,7 @@ func (this *QFileSystemModel) IconProvider() *QFileIconProvider { } func (this *QFileSystemModel) SetFilter(filters int) { - C.QFileSystemModel_SetFilter(this.h, (C.int)(filters)) + C.QFileSystemModel_SetFilter(this.h, filters) } func (this *QFileSystemModel) Filter() int { @@ -384,15 +384,15 @@ func (this *QFileSystemModel) NameFilters() []string { } func (this *QFileSystemModel) SetOption(option QFileSystemModel__Option) { - C.QFileSystemModel_SetOption(this.h, (C.uintptr_t)(option)) + C.QFileSystemModel_SetOption(this.h, (C.int)(option)) } func (this *QFileSystemModel) TestOption(option QFileSystemModel__Option) bool { - return (bool)(C.QFileSystemModel_TestOption(this.h, (C.uintptr_t)(option))) + return (bool)(C.QFileSystemModel_TestOption(this.h, (C.int)(option))) } func (this *QFileSystemModel) SetOptions(options int) { - C.QFileSystemModel_SetOptions(this.h, (C.int)(options)) + C.QFileSystemModel_SetOptions(this.h, options) } func (this *QFileSystemModel) Options() int { @@ -561,18 +561,18 @@ func (this *QFileSystemModel) SetData3(index *QModelIndex, value *QVariant, role } 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)) + _ret := C.QFileSystemModel_HeaderData3(this.h, (C.int)(section), (C.int)(orientation), (C.int)(role)) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QFileSystemModel) Sort2(column int, order SortOrder) { - C.QFileSystemModel_Sort2(this.h, (C.int)(column), (C.uintptr_t)(order)) + C.QFileSystemModel_Sort2(this.h, (C.int)(column), (C.int)(order)) } func (this *QFileSystemModel) SetOption2(option QFileSystemModel__Option, on bool) { - C.QFileSystemModel_SetOption2(this.h, (C.uintptr_t)(option), (C.bool)(on)) + C.QFileSystemModel_SetOption2(this.h, (C.int)(option), (C.bool)(on)) } // Delete this object from C++ memory. diff --git a/qt/gen_qfilesystemmodel.h b/qt/gen_qfilesystemmodel.h index ecf005b..f2901dc 100644 --- a/qt/gen_qfilesystemmodel.h +++ b/qt/gen_qfilesystemmodel.h @@ -62,12 +62,12 @@ int QFileSystemModel_ColumnCount(const QFileSystemModel* self); QVariant* QFileSystemModel_MyComputer(const QFileSystemModel* self); QVariant* QFileSystemModel_Data(const QFileSystemModel* self, QModelIndex* index); bool QFileSystemModel_SetData(QFileSystemModel* self, QModelIndex* index, QVariant* value); -QVariant* QFileSystemModel_HeaderData(const QFileSystemModel* self, int section, uintptr_t orientation); +QVariant* QFileSystemModel_HeaderData(const QFileSystemModel* self, int section, int orientation); int QFileSystemModel_Flags(const QFileSystemModel* self, QModelIndex* index); void QFileSystemModel_Sort(QFileSystemModel* self, int column); struct miqt_array* QFileSystemModel_MimeTypes(const QFileSystemModel* self); QMimeData* QFileSystemModel_MimeData(const QFileSystemModel* self, struct miqt_array* /* of QModelIndex* */ indexes); -bool QFileSystemModel_DropMimeData(QFileSystemModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent); +bool QFileSystemModel_DropMimeData(QFileSystemModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent); int QFileSystemModel_SupportedDropActions(const QFileSystemModel* self); QModelIndex* QFileSystemModel_SetRootPath(QFileSystemModel* self, struct miqt_string* path); struct miqt_string* QFileSystemModel_RootPath(const QFileSystemModel* self); @@ -84,8 +84,8 @@ void QFileSystemModel_SetNameFilterDisables(QFileSystemModel* self, bool enable) bool QFileSystemModel_NameFilterDisables(const QFileSystemModel* self); void QFileSystemModel_SetNameFilters(QFileSystemModel* self, struct miqt_array* /* of struct miqt_string* */ filters); struct miqt_array* QFileSystemModel_NameFilters(const QFileSystemModel* self); -void QFileSystemModel_SetOption(QFileSystemModel* self, uintptr_t option); -bool QFileSystemModel_TestOption(const QFileSystemModel* self, uintptr_t option); +void QFileSystemModel_SetOption(QFileSystemModel* self, int option); +bool QFileSystemModel_TestOption(const QFileSystemModel* self, int option); void QFileSystemModel_SetOptions(QFileSystemModel* self, int options); int QFileSystemModel_Options(const QFileSystemModel* self); struct miqt_string* QFileSystemModel_FilePath(const QFileSystemModel* self, QModelIndex* index); @@ -112,9 +112,9 @@ int QFileSystemModel_ColumnCount1(const QFileSystemModel* self, QModelIndex* par QVariant* QFileSystemModel_MyComputer1(const QFileSystemModel* self, int role); QVariant* QFileSystemModel_Data2(const QFileSystemModel* self, QModelIndex* index, int role); bool QFileSystemModel_SetData3(QFileSystemModel* self, QModelIndex* index, QVariant* value, int role); -QVariant* QFileSystemModel_HeaderData3(const QFileSystemModel* self, int section, uintptr_t orientation, int role); -void QFileSystemModel_Sort2(QFileSystemModel* self, int column, uintptr_t order); -void QFileSystemModel_SetOption2(QFileSystemModel* self, uintptr_t option, bool on); +QVariant* QFileSystemModel_HeaderData3(const QFileSystemModel* self, int section, int orientation, int role); +void QFileSystemModel_Sort2(QFileSystemModel* self, int column, int order); +void QFileSystemModel_SetOption2(QFileSystemModel* self, int option, bool on); void QFileSystemModel_Delete(QFileSystemModel* self); #ifdef __cplusplus diff --git a/qt/gen_qfont.cpp b/qt/gen_qfont.cpp index 1ada630..2d07b58 100644 --- a/qt/gen_qfont.cpp +++ b/qt/gen_qfont.cpp @@ -108,7 +108,8 @@ void QFont_SetPointSize(QFont* self, int pointSize) { } double QFont_PointSizeF(const QFont* self) { - return self->pointSizeF(); + qreal _ret = self->pointSizeF(); + return static_cast(_ret); } void QFont_SetPointSizeF(QFont* self, double pointSizeF) { @@ -139,13 +140,13 @@ void QFont_SetBold(QFont* self, bool bold) { self->setBold(bold); } -void QFont_SetStyle(QFont* self, uintptr_t style) { +void QFont_SetStyle(QFont* self, int style) { self->setStyle(static_cast(style)); } -uintptr_t QFont_Style(const QFont* self) { +int QFont_Style(const QFont* self) { QFont::Style _ret = self->style(); - return static_cast(_ret); + return static_cast(_ret); } bool QFont_Italic(const QFont* self) { @@ -196,21 +197,21 @@ void QFont_SetKerning(QFont* self, bool kerning) { self->setKerning(kerning); } -uintptr_t QFont_StyleHint(const QFont* self) { +int QFont_StyleHint(const QFont* self) { QFont::StyleHint _ret = self->styleHint(); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QFont_StyleStrategy(const QFont* self) { +int QFont_StyleStrategy(const QFont* self) { QFont::StyleStrategy _ret = self->styleStrategy(); - return static_cast(_ret); + return static_cast(_ret); } -void QFont_SetStyleHint(QFont* self, uintptr_t param1) { +void QFont_SetStyleHint(QFont* self, int param1) { self->setStyleHint(static_cast(param1)); } -void QFont_SetStyleStrategy(QFont* self, uintptr_t s) { +void QFont_SetStyleStrategy(QFont* self, int s) { self->setStyleStrategy(static_cast(s)); } @@ -223,42 +224,44 @@ void QFont_SetStretch(QFont* self, int stretch) { } double QFont_LetterSpacing(const QFont* self) { - return self->letterSpacing(); + qreal _ret = self->letterSpacing(); + return static_cast(_ret); } -uintptr_t QFont_LetterSpacingType(const QFont* self) { +int QFont_LetterSpacingType(const QFont* self) { QFont::SpacingType _ret = self->letterSpacingType(); - return static_cast(_ret); + return static_cast(_ret); } -void QFont_SetLetterSpacing(QFont* self, uintptr_t typeVal, double spacing) { +void QFont_SetLetterSpacing(QFont* self, int typeVal, double spacing) { self->setLetterSpacing(static_cast(typeVal), static_cast(spacing)); } double QFont_WordSpacing(const QFont* self) { - return self->wordSpacing(); + qreal _ret = self->wordSpacing(); + return static_cast(_ret); } void QFont_SetWordSpacing(QFont* self, double spacing) { self->setWordSpacing(static_cast(spacing)); } -void QFont_SetCapitalization(QFont* self, uintptr_t capitalization) { +void QFont_SetCapitalization(QFont* self, int capitalization) { self->setCapitalization(static_cast(capitalization)); } -uintptr_t QFont_Capitalization(const QFont* self) { +int QFont_Capitalization(const QFont* self) { QFont::Capitalization _ret = self->capitalization(); - return static_cast(_ret); + return static_cast(_ret); } -void QFont_SetHintingPreference(QFont* self, uintptr_t hintingPreference) { +void QFont_SetHintingPreference(QFont* self, int hintingPreference) { self->setHintingPreference(static_cast(hintingPreference)); } -uintptr_t QFont_HintingPreference(const QFont* self) { +int QFont_HintingPreference(const QFont* self) { QFont::HintingPreference _ret = self->hintingPreference(); - return static_cast(_ret); + return static_cast(_ret); } bool QFont_RawMode(const QFont* self) { @@ -426,14 +429,15 @@ QFont* QFont_Resolve(const QFont* self, QFont* param1) { } unsigned int QFont_Resolve2(const QFont* self) { - return self->resolve(); + uint _ret = self->resolve(); + return static_cast(_ret); } void QFont_ResolveWithMask(QFont* self, unsigned int mask) { self->resolve(static_cast(mask)); } -void QFont_SetStyleHint2(QFont* self, uintptr_t param1, uintptr_t param2) { +void QFont_SetStyleHint2(QFont* self, int param1, int param2) { self->setStyleHint(static_cast(param1), static_cast(param2)); } diff --git a/qt/gen_qfont.go b/qt/gen_qfont.go index 374bbea..32e5fb5 100644 --- a/qt/gen_qfont.go +++ b/qt/gen_qfont.go @@ -315,7 +315,7 @@ func (this *QFont) SetBold(bold bool) { } func (this *QFont) SetStyle(style QFont__Style) { - C.QFont_SetStyle(this.h, (C.uintptr_t)(style)) + C.QFont_SetStyle(this.h, (C.int)(style)) } func (this *QFont) Style() QFont__Style { @@ -379,11 +379,11 @@ func (this *QFont) StyleStrategy() QFont__StyleStrategy { } func (this *QFont) SetStyleHint(param1 QFont__StyleHint) { - C.QFont_SetStyleHint(this.h, (C.uintptr_t)(param1)) + C.QFont_SetStyleHint(this.h, (C.int)(param1)) } func (this *QFont) SetStyleStrategy(s QFont__StyleStrategy) { - C.QFont_SetStyleStrategy(this.h, (C.uintptr_t)(s)) + C.QFont_SetStyleStrategy(this.h, (C.int)(s)) } func (this *QFont) Stretch() int { @@ -403,7 +403,7 @@ func (this *QFont) LetterSpacingType() QFont__SpacingType { } func (this *QFont) SetLetterSpacing(typeVal QFont__SpacingType, spacing float64) { - C.QFont_SetLetterSpacing(this.h, (C.uintptr_t)(typeVal), (C.double)(spacing)) + C.QFont_SetLetterSpacing(this.h, (C.int)(typeVal), (C.double)(spacing)) } func (this *QFont) WordSpacing() float64 { @@ -415,7 +415,7 @@ func (this *QFont) SetWordSpacing(spacing float64) { } func (this *QFont) SetCapitalization(capitalization QFont__Capitalization) { - C.QFont_SetCapitalization(this.h, (C.uintptr_t)(capitalization)) + C.QFont_SetCapitalization(this.h, (C.int)(capitalization)) } func (this *QFont) Capitalization() QFont__Capitalization { @@ -423,7 +423,7 @@ func (this *QFont) Capitalization() QFont__Capitalization { } func (this *QFont) SetHintingPreference(hintingPreference QFont__HintingPreference) { - C.QFont_SetHintingPreference(this.h, (C.uintptr_t)(hintingPreference)) + C.QFont_SetHintingPreference(this.h, (C.int)(hintingPreference)) } func (this *QFont) HintingPreference() QFont__HintingPreference { @@ -613,7 +613,7 @@ func (this *QFont) ResolveWithMask(mask uint) { } func (this *QFont) SetStyleHint2(param1 QFont__StyleHint, param2 QFont__StyleStrategy) { - C.QFont_SetStyleHint2(this.h, (C.uintptr_t)(param1), (C.uintptr_t)(param2)) + C.QFont_SetStyleHint2(this.h, (C.int)(param1), (C.int)(param2)) } // Delete this object from C++ memory. diff --git a/qt/gen_qfont.h b/qt/gen_qfont.h index 7589250..4b45805 100644 --- a/qt/gen_qfont.h +++ b/qt/gen_qfont.h @@ -46,8 +46,8 @@ int QFont_Weight(const QFont* self); void QFont_SetWeight(QFont* self, int weight); bool QFont_Bold(const QFont* self); void QFont_SetBold(QFont* self, bool bold); -void QFont_SetStyle(QFont* self, uintptr_t style); -uintptr_t QFont_Style(const QFont* self); +void QFont_SetStyle(QFont* self, int style); +int QFont_Style(const QFont* self); bool QFont_Italic(const QFont* self); void QFont_SetItalic(QFont* self, bool b); bool QFont_Underline(const QFont* self); @@ -60,21 +60,21 @@ bool QFont_FixedPitch(const QFont* self); void QFont_SetFixedPitch(QFont* self, bool fixedPitch); bool QFont_Kerning(const QFont* self); void QFont_SetKerning(QFont* self, bool kerning); -uintptr_t QFont_StyleHint(const QFont* self); -uintptr_t QFont_StyleStrategy(const QFont* self); -void QFont_SetStyleHint(QFont* self, uintptr_t param1); -void QFont_SetStyleStrategy(QFont* self, uintptr_t s); +int QFont_StyleHint(const QFont* self); +int QFont_StyleStrategy(const QFont* self); +void QFont_SetStyleHint(QFont* self, int param1); +void QFont_SetStyleStrategy(QFont* self, int s); int QFont_Stretch(const QFont* self); void QFont_SetStretch(QFont* self, int stretch); double QFont_LetterSpacing(const QFont* self); -uintptr_t QFont_LetterSpacingType(const QFont* self); -void QFont_SetLetterSpacing(QFont* self, uintptr_t typeVal, double spacing); +int QFont_LetterSpacingType(const QFont* self); +void QFont_SetLetterSpacing(QFont* self, int typeVal, double spacing); double QFont_WordSpacing(const QFont* self); void QFont_SetWordSpacing(QFont* self, double spacing); -void QFont_SetCapitalization(QFont* self, uintptr_t capitalization); -uintptr_t QFont_Capitalization(const QFont* self); -void QFont_SetHintingPreference(QFont* self, uintptr_t hintingPreference); -uintptr_t QFont_HintingPreference(const QFont* self); +void QFont_SetCapitalization(QFont* self, int capitalization); +int QFont_Capitalization(const QFont* self); +void QFont_SetHintingPreference(QFont* self, int hintingPreference); +int QFont_HintingPreference(const QFont* self); bool QFont_RawMode(const QFont* self); void QFont_SetRawMode(QFont* self, bool rawMode); bool QFont_ExactMatch(const QFont* self); @@ -103,7 +103,7 @@ struct miqt_string* QFont_LastResortFont(const QFont* self); QFont* QFont_Resolve(const QFont* self, QFont* param1); unsigned int QFont_Resolve2(const QFont* self); void QFont_ResolveWithMask(QFont* self, unsigned int mask); -void QFont_SetStyleHint2(QFont* self, uintptr_t param1, uintptr_t param2); +void QFont_SetStyleHint2(QFont* self, int param1, int param2); void QFont_Delete(QFont* self); #ifdef __cplusplus diff --git a/qt/gen_qfontcombobox.cpp b/qt/gen_qfontcombobox.cpp index a0238d8..b00ea9e 100644 --- a/qt/gen_qfontcombobox.cpp +++ b/qt/gen_qfontcombobox.cpp @@ -36,13 +36,13 @@ struct miqt_string* QFontComboBox_TrUtf8(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -void QFontComboBox_SetWritingSystem(QFontComboBox* self, uintptr_t writingSystem) { +void QFontComboBox_SetWritingSystem(QFontComboBox* self, int writingSystem) { self->setWritingSystem(static_cast(writingSystem)); } -uintptr_t QFontComboBox_WritingSystem(const QFontComboBox* self) { +int QFontComboBox_WritingSystem(const QFontComboBox* self) { QFontDatabase::WritingSystem _ret = self->writingSystem(); - return static_cast(_ret); + return static_cast(_ret); } void QFontComboBox_SetFontFilters(QFontComboBox* self, int filters) { diff --git a/qt/gen_qfontcombobox.go b/qt/gen_qfontcombobox.go index f785ee9..ec57c63 100644 --- a/qt/gen_qfontcombobox.go +++ b/qt/gen_qfontcombobox.go @@ -82,7 +82,7 @@ func QFontComboBox_TrUtf8(s string) string { } func (this *QFontComboBox) SetWritingSystem(writingSystem QFontDatabase__WritingSystem) { - C.QFontComboBox_SetWritingSystem(this.h, (C.uintptr_t)(writingSystem)) + C.QFontComboBox_SetWritingSystem(this.h, (C.int)(writingSystem)) } func (this *QFontComboBox) WritingSystem() QFontDatabase__WritingSystem { @@ -90,7 +90,7 @@ func (this *QFontComboBox) WritingSystem() QFontDatabase__WritingSystem { } func (this *QFontComboBox) SetFontFilters(filters int) { - C.QFontComboBox_SetFontFilters(this.h, (C.int)(filters)) + C.QFontComboBox_SetFontFilters(this.h, filters) } func (this *QFontComboBox) FontFilters() int { diff --git a/qt/gen_qfontcombobox.h b/qt/gen_qfontcombobox.h index 51b7d10..d14f9d7 100644 --- a/qt/gen_qfontcombobox.h +++ b/qt/gen_qfontcombobox.h @@ -32,8 +32,8 @@ QFontComboBox* QFontComboBox_new2(QWidget* parent); QMetaObject* QFontComboBox_MetaObject(const QFontComboBox* self); struct miqt_string* QFontComboBox_Tr(const char* s); struct miqt_string* QFontComboBox_TrUtf8(const char* s); -void QFontComboBox_SetWritingSystem(QFontComboBox* self, uintptr_t writingSystem); -uintptr_t QFontComboBox_WritingSystem(const QFontComboBox* self); +void QFontComboBox_SetWritingSystem(QFontComboBox* self, int writingSystem); +int QFontComboBox_WritingSystem(const QFontComboBox* self); void QFontComboBox_SetFontFilters(QFontComboBox* self, int filters); int QFontComboBox_FontFilters(const QFontComboBox* self); QFont* QFontComboBox_CurrentFont(const QFontComboBox* self); diff --git a/qt/gen_qfontdatabase.cpp b/qt/gen_qfontdatabase.cpp index 39c2466..84a863b 100644 --- a/qt/gen_qfontdatabase.cpp +++ b/qt/gen_qfontdatabase.cpp @@ -30,10 +30,10 @@ struct miqt_array* QFontDatabase_StandardSizes() { struct miqt_array* QFontDatabase_WritingSystems(const QFontDatabase* self) { QList _ret = self->writingSystems(); // Convert QList<> from C++ memory to manually-managed C memory - uintptr_t* _arr = static_cast(malloc(sizeof(uintptr_t) * _ret.length())); + int* _arr = static_cast(malloc(sizeof(int) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QFontDatabase::WritingSystem _lv_ret = _ret[i]; - _arr[i] = static_cast(_lv_ret); + _arr[i] = static_cast(_lv_ret); } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -45,10 +45,10 @@ struct miqt_array* QFontDatabase_WritingSystemsWithFamily(const QFontDatabase* s QString family_QString = QString::fromUtf8(&family->data, family->len); QList _ret = self->writingSystems(family_QString); // Convert QList<> from C++ memory to manually-managed C memory - uintptr_t* _arr = static_cast(malloc(sizeof(uintptr_t) * _ret.length())); + int* _arr = static_cast(malloc(sizeof(int) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QFontDatabase::WritingSystem _lv_ret = _ret[i]; - _arr[i] = static_cast(_lv_ret); + _arr[i] = static_cast(_lv_ret); } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -186,14 +186,14 @@ bool QFontDatabase_IsPrivateFamily(const QFontDatabase* self, struct miqt_string return self->isPrivateFamily(family_QString); } -struct miqt_string* QFontDatabase_WritingSystemName(uintptr_t writingSystem) { +struct miqt_string* QFontDatabase_WritingSystemName(int writingSystem) { QString _ret = QFontDatabase::writingSystemName(static_cast(writingSystem)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QFontDatabase_WritingSystemSample(uintptr_t writingSystem) { +struct miqt_string* QFontDatabase_WritingSystemSample(int writingSystem) { QString _ret = QFontDatabase::writingSystemSample(static_cast(writingSystem)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -237,11 +237,11 @@ bool QFontDatabase_SupportsThreadedFontRendering() { return QFontDatabase::supportsThreadedFontRendering(); } -QFont* QFontDatabase_SystemFont(uintptr_t typeVal) { +QFont* QFontDatabase_SystemFont(int typeVal) { return new QFont(QFontDatabase::systemFont(static_cast(typeVal))); } -struct miqt_array* QFontDatabase_Families1(const QFontDatabase* self, uintptr_t writingSystem) { +struct miqt_array* QFontDatabase_Families1(const QFontDatabase* self, int writingSystem) { QStringList _ret = self->families(static_cast(writingSystem)); // Convert QList<> from C++ memory to manually-managed C memory struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); diff --git a/qt/gen_qfontdatabase.go b/qt/gen_qfontdatabase.go index f3ed067..dc333a2 100644 --- a/qt/gen_qfontdatabase.go +++ b/qt/gen_qfontdatabase.go @@ -105,7 +105,7 @@ func QFontDatabase_StandardSizes() []int { func (this *QFontDatabase) WritingSystems() []QFontDatabase__WritingSystem { var _ma *C.struct_miqt_array = C.QFontDatabase_WritingSystems(this.h) _ret := make([]QFontDatabase__WritingSystem, int(_ma.len)) - _outCast := (*[0xffff]C.uintptr_t)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.int)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { _ret[i] = (QFontDatabase__WritingSystem)(_outCast[i]) } @@ -118,7 +118,7 @@ func (this *QFontDatabase) WritingSystemsWithFamily(family string) []QFontDataba defer C.free(family_ms) var _ma *C.struct_miqt_array = C.QFontDatabase_WritingSystemsWithFamily(this.h, (*C.struct_miqt_string)(family_ms)) _ret := make([]QFontDatabase__WritingSystem, int(_ma.len)) - _outCast := (*[0xffff]C.uintptr_t)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.int)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { _ret[i] = (QFontDatabase__WritingSystem)(_outCast[i]) } @@ -270,14 +270,14 @@ func (this *QFontDatabase) IsPrivateFamily(family string) bool { } func QFontDatabase_WritingSystemName(writingSystem QFontDatabase__WritingSystem) string { - var _ms *C.struct_miqt_string = C.QFontDatabase_WritingSystemName((C.uintptr_t)(writingSystem)) + var _ms *C.struct_miqt_string = C.QFontDatabase_WritingSystemName((C.int)(writingSystem)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } func QFontDatabase_WritingSystemSample(writingSystem QFontDatabase__WritingSystem) string { - var _ms *C.struct_miqt_string = C.QFontDatabase_WritingSystemSample((C.uintptr_t)(writingSystem)) + var _ms *C.struct_miqt_string = C.QFontDatabase_WritingSystemSample((C.int)(writingSystem)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -320,14 +320,14 @@ func QFontDatabase_SupportsThreadedFontRendering() bool { } func QFontDatabase_SystemFont(typeVal QFontDatabase__SystemFont) *QFont { - _ret := C.QFontDatabase_SystemFont((C.uintptr_t)(typeVal)) + _ret := C.QFontDatabase_SystemFont((C.int)(typeVal)) _goptr := newQFont(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QFontDatabase) Families1(writingSystem QFontDatabase__WritingSystem) []string { - var _ma *C.struct_miqt_array = C.QFontDatabase_Families1(this.h, (C.uintptr_t)(writingSystem)) + var _ma *C.struct_miqt_array = C.QFontDatabase_Families1(this.h, (C.int)(writingSystem)) _ret := make([]string, int(_ma.len)) _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { diff --git a/qt/gen_qfontdatabase.h b/qt/gen_qfontdatabase.h index 6e40230..b2dbdec 100644 --- a/qt/gen_qfontdatabase.h +++ b/qt/gen_qfontdatabase.h @@ -45,16 +45,16 @@ bool QFontDatabase_Bold(const QFontDatabase* self, struct miqt_string* family, s int QFontDatabase_Weight(const QFontDatabase* self, struct miqt_string* family, struct miqt_string* style); bool QFontDatabase_HasFamily(const QFontDatabase* self, struct miqt_string* family); bool QFontDatabase_IsPrivateFamily(const QFontDatabase* self, struct miqt_string* family); -struct miqt_string* QFontDatabase_WritingSystemName(uintptr_t writingSystem); -struct miqt_string* QFontDatabase_WritingSystemSample(uintptr_t writingSystem); +struct miqt_string* QFontDatabase_WritingSystemName(int writingSystem); +struct miqt_string* QFontDatabase_WritingSystemSample(int writingSystem); int QFontDatabase_AddApplicationFont(struct miqt_string* fileName); int QFontDatabase_AddApplicationFontFromData(QByteArray* fontData); struct miqt_array* QFontDatabase_ApplicationFontFamilies(int id); bool QFontDatabase_RemoveApplicationFont(int id); bool QFontDatabase_RemoveAllApplicationFonts(); bool QFontDatabase_SupportsThreadedFontRendering(); -QFont* QFontDatabase_SystemFont(uintptr_t typeVal); -struct miqt_array* QFontDatabase_Families1(const QFontDatabase* self, uintptr_t writingSystem); +QFont* QFontDatabase_SystemFont(int typeVal); +struct miqt_array* QFontDatabase_Families1(const QFontDatabase* self, int writingSystem); struct miqt_array* QFontDatabase_PointSizes2(QFontDatabase* self, struct miqt_string* family, struct miqt_string* style); bool QFontDatabase_IsBitmapScalable2(const QFontDatabase* self, struct miqt_string* family, struct miqt_string* style); bool QFontDatabase_IsSmoothlyScalable2(const QFontDatabase* self, struct miqt_string* family, struct miqt_string* style); diff --git a/qt/gen_qfontdialog.cpp b/qt/gen_qfontdialog.cpp index 2a7548d..29f0a81 100644 --- a/qt/gen_qfontdialog.cpp +++ b/qt/gen_qfontdialog.cpp @@ -55,11 +55,11 @@ QFont* QFontDialog_SelectedFont(const QFontDialog* self) { return new QFont(self->selectedFont()); } -void QFontDialog_SetOption(QFontDialog* self, uintptr_t option) { +void QFontDialog_SetOption(QFontDialog* self, int option) { self->setOption(static_cast(option)); } -bool QFontDialog_TestOption(const QFontDialog* self, uintptr_t option) { +bool QFontDialog_TestOption(const QFontDialog* self, int option) { return self->testOption(static_cast(option)); } @@ -138,7 +138,7 @@ struct miqt_string* QFontDialog_TrUtf83(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -void QFontDialog_SetOption2(QFontDialog* self, uintptr_t option, bool on) { +void QFontDialog_SetOption2(QFontDialog* self, int option, bool on) { self->setOption(static_cast(option), on); } diff --git a/qt/gen_qfontdialog.go b/qt/gen_qfontdialog.go index ec25197..0731cf1 100644 --- a/qt/gen_qfontdialog.go +++ b/qt/gen_qfontdialog.go @@ -113,15 +113,15 @@ func (this *QFontDialog) SelectedFont() *QFont { } func (this *QFontDialog) SetOption(option QFontDialog__FontDialogOption) { - C.QFontDialog_SetOption(this.h, (C.uintptr_t)(option)) + C.QFontDialog_SetOption(this.h, (C.int)(option)) } func (this *QFontDialog) TestOption(option QFontDialog__FontDialogOption) bool { - return (bool)(C.QFontDialog_TestOption(this.h, (C.uintptr_t)(option))) + return (bool)(C.QFontDialog_TestOption(this.h, (C.int)(option))) } func (this *QFontDialog) SetOptions(options int) { - C.QFontDialog_SetOptions(this.h, (C.int)(options)) + C.QFontDialog_SetOptions(this.h, options) } func (this *QFontDialog) Options() int { @@ -231,7 +231,7 @@ func QFontDialog_TrUtf83(s string, c string, n int) string { } func (this *QFontDialog) SetOption2(option QFontDialog__FontDialogOption, on bool) { - C.QFontDialog_SetOption2(this.h, (C.uintptr_t)(option), (C.bool)(on)) + C.QFontDialog_SetOption2(this.h, (C.int)(option), (C.bool)(on)) } func QFontDialog_GetFont22(ok *bool, parent *QWidget) *QFont { @@ -260,7 +260,7 @@ func QFontDialog_GetFont4(ok *bool, initial *QFont, parent *QWidget, title strin func QFontDialog_GetFont5(ok *bool, initial *QFont, parent *QWidget, title string, options int) *QFont { title_ms := miqt_strdupg(title) defer C.free(title_ms) - _ret := C.QFontDialog_GetFont5((*C.bool)(unsafe.Pointer(ok)), initial.cPointer(), parent.cPointer(), (*C.struct_miqt_string)(title_ms), (C.int)(options)) + _ret := C.QFontDialog_GetFont5((*C.bool)(unsafe.Pointer(ok)), initial.cPointer(), parent.cPointer(), (*C.struct_miqt_string)(title_ms), options) _goptr := newQFont(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qfontdialog.h b/qt/gen_qfontdialog.h index 4626bba..a3005b1 100644 --- a/qt/gen_qfontdialog.h +++ b/qt/gen_qfontdialog.h @@ -35,8 +35,8 @@ struct miqt_string* QFontDialog_TrUtf8(const char* s); void QFontDialog_SetCurrentFont(QFontDialog* self, QFont* font); QFont* QFontDialog_CurrentFont(const QFontDialog* self); QFont* QFontDialog_SelectedFont(const QFontDialog* self); -void QFontDialog_SetOption(QFontDialog* self, uintptr_t option); -bool QFontDialog_TestOption(const QFontDialog* self, uintptr_t option); +void QFontDialog_SetOption(QFontDialog* self, int option); +bool QFontDialog_TestOption(const QFontDialog* self, int option); void QFontDialog_SetOptions(QFontDialog* self, int options); int QFontDialog_Options(const QFontDialog* self); void QFontDialog_SetVisible(QFontDialog* self, bool visible); @@ -50,7 +50,7 @@ struct miqt_string* QFontDialog_Tr2(const char* s, const char* c); struct miqt_string* QFontDialog_Tr3(const char* s, const char* c, int n); struct miqt_string* QFontDialog_TrUtf82(const char* s, const char* c); struct miqt_string* QFontDialog_TrUtf83(const char* s, const char* c, int n); -void QFontDialog_SetOption2(QFontDialog* self, uintptr_t option, bool on); +void QFontDialog_SetOption2(QFontDialog* self, int option, bool on); QFont* QFontDialog_GetFont22(bool* ok, QWidget* parent); QFont* QFontDialog_GetFont3(bool* ok, QFont* initial, QWidget* parent); QFont* QFontDialog_GetFont4(bool* ok, QFont* initial, QWidget* parent, struct miqt_string* title); diff --git a/qt/gen_qfontinfo.cpp b/qt/gen_qfontinfo.cpp index c34e692..ff89622 100644 --- a/qt/gen_qfontinfo.cpp +++ b/qt/gen_qfontinfo.cpp @@ -46,16 +46,17 @@ int QFontInfo_PointSize(const QFontInfo* self) { } double QFontInfo_PointSizeF(const QFontInfo* self) { - return self->pointSizeF(); + qreal _ret = self->pointSizeF(); + return static_cast(_ret); } bool QFontInfo_Italic(const QFontInfo* self) { return self->italic(); } -uintptr_t QFontInfo_Style(const QFontInfo* self) { +int QFontInfo_Style(const QFontInfo* self) { QFont::Style _ret = self->style(); - return static_cast(_ret); + return static_cast(_ret); } int QFontInfo_Weight(const QFontInfo* self) { @@ -82,9 +83,9 @@ bool QFontInfo_FixedPitch(const QFontInfo* self) { return self->fixedPitch(); } -uintptr_t QFontInfo_StyleHint(const QFontInfo* self) { +int QFontInfo_StyleHint(const QFontInfo* self) { QFont::StyleHint _ret = self->styleHint(); - return static_cast(_ret); + return static_cast(_ret); } bool QFontInfo_RawMode(const QFontInfo* self) { diff --git a/qt/gen_qfontinfo.h b/qt/gen_qfontinfo.h index 43a9f81..8b287e7 100644 --- a/qt/gen_qfontinfo.h +++ b/qt/gen_qfontinfo.h @@ -31,14 +31,14 @@ int QFontInfo_PixelSize(const QFontInfo* self); int QFontInfo_PointSize(const QFontInfo* self); double QFontInfo_PointSizeF(const QFontInfo* self); bool QFontInfo_Italic(const QFontInfo* self); -uintptr_t QFontInfo_Style(const QFontInfo* self); +int QFontInfo_Style(const QFontInfo* self); int QFontInfo_Weight(const QFontInfo* self); bool QFontInfo_Bold(const QFontInfo* self); bool QFontInfo_Underline(const QFontInfo* self); bool QFontInfo_Overline(const QFontInfo* self); bool QFontInfo_StrikeOut(const QFontInfo* self); bool QFontInfo_FixedPitch(const QFontInfo* self); -uintptr_t QFontInfo_StyleHint(const QFontInfo* self); +int QFontInfo_StyleHint(const QFontInfo* self); bool QFontInfo_RawMode(const QFontInfo* self); bool QFontInfo_ExactMatch(const QFontInfo* self); void QFontInfo_Delete(QFontInfo* self); diff --git a/qt/gen_qfontmetrics.cpp b/qt/gen_qfontmetrics.cpp index 3f36d4f..64aaf41 100644 --- a/qt/gen_qfontmetrics.cpp +++ b/qt/gen_qfontmetrics.cpp @@ -151,7 +151,7 @@ QRect* QFontMetrics_TightBoundingRect(const QFontMetrics* self, struct miqt_stri return new QRect(self->tightBoundingRect(text_QString)); } -struct miqt_string* QFontMetrics_ElidedText(const QFontMetrics* self, struct miqt_string* text, uintptr_t mode, int width) { +struct miqt_string* QFontMetrics_ElidedText(const QFontMetrics* self, struct miqt_string* text, int mode, int width) { QString text_QString = QString::fromUtf8(&text->data, text->len); QString _ret = self->elidedText(text_QString, static_cast(mode), static_cast(width)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -176,7 +176,8 @@ int QFontMetrics_LineWidth(const QFontMetrics* self) { } double QFontMetrics_FontDpi(const QFontMetrics* self) { - return self->fontDpi(); + qreal _ret = self->fontDpi(); + return static_cast(_ret); } bool QFontMetrics_OperatorEqual(const QFontMetrics* self, QFontMetrics* other) { @@ -227,7 +228,7 @@ QSize* QFontMetrics_Size4(const QFontMetrics* self, int flags, struct miqt_strin return new QSize(self->size(static_cast(flags), str_QString, static_cast(tabstops), static_cast(tabarray))); } -struct miqt_string* QFontMetrics_ElidedText4(const QFontMetrics* self, struct miqt_string* text, uintptr_t mode, int width, int flags) { +struct miqt_string* QFontMetrics_ElidedText4(const QFontMetrics* self, struct miqt_string* text, int mode, int width, int flags) { QString text_QString = QString::fromUtf8(&text->data, text->len); QString _ret = self->elidedText(text_QString, static_cast(mode), static_cast(width), static_cast(flags)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -268,47 +269,58 @@ void QFontMetricsF_Swap(QFontMetricsF* self, QFontMetricsF* other) { } double QFontMetricsF_Ascent(const QFontMetricsF* self) { - return self->ascent(); + qreal _ret = self->ascent(); + return static_cast(_ret); } double QFontMetricsF_CapHeight(const QFontMetricsF* self) { - return self->capHeight(); + qreal _ret = self->capHeight(); + return static_cast(_ret); } double QFontMetricsF_Descent(const QFontMetricsF* self) { - return self->descent(); + qreal _ret = self->descent(); + return static_cast(_ret); } double QFontMetricsF_Height(const QFontMetricsF* self) { - return self->height(); + qreal _ret = self->height(); + return static_cast(_ret); } double QFontMetricsF_Leading(const QFontMetricsF* self) { - return self->leading(); + qreal _ret = self->leading(); + return static_cast(_ret); } double QFontMetricsF_LineSpacing(const QFontMetricsF* self) { - return self->lineSpacing(); + qreal _ret = self->lineSpacing(); + return static_cast(_ret); } double QFontMetricsF_MinLeftBearing(const QFontMetricsF* self) { - return self->minLeftBearing(); + qreal _ret = self->minLeftBearing(); + return static_cast(_ret); } double QFontMetricsF_MinRightBearing(const QFontMetricsF* self) { - return self->minRightBearing(); + qreal _ret = self->minRightBearing(); + return static_cast(_ret); } double QFontMetricsF_MaxWidth(const QFontMetricsF* self) { - return self->maxWidth(); + qreal _ret = self->maxWidth(); + return static_cast(_ret); } double QFontMetricsF_XHeight(const QFontMetricsF* self) { - return self->xHeight(); + qreal _ret = self->xHeight(); + return static_cast(_ret); } double QFontMetricsF_AverageCharWidth(const QFontMetricsF* self) { - return self->averageCharWidth(); + qreal _ret = self->averageCharWidth(); + return static_cast(_ret); } bool QFontMetricsF_InFont(const QFontMetricsF* self, QChar* param1) { @@ -320,29 +332,35 @@ bool QFontMetricsF_InFontUcs4(const QFontMetricsF* self, unsigned int ucs4) { } double QFontMetricsF_LeftBearing(const QFontMetricsF* self, QChar* param1) { - return self->leftBearing(*param1); + qreal _ret = self->leftBearing(*param1); + return static_cast(_ret); } double QFontMetricsF_RightBearing(const QFontMetricsF* self, QChar* param1) { - return self->rightBearing(*param1); + qreal _ret = self->rightBearing(*param1); + return static_cast(_ret); } double QFontMetricsF_Width(const QFontMetricsF* self, struct miqt_string* stringVal) { QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); - return self->width(stringVal_QString); + qreal _ret = self->width(stringVal_QString); + return static_cast(_ret); } double QFontMetricsF_WidthWithQChar(const QFontMetricsF* self, QChar* param1) { - return self->width(*param1); + qreal _ret = self->width(*param1); + return static_cast(_ret); } double QFontMetricsF_HorizontalAdvance(const QFontMetricsF* self, struct miqt_string* stringVal) { QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); - return self->horizontalAdvance(stringVal_QString); + qreal _ret = self->horizontalAdvance(stringVal_QString); + return static_cast(_ret); } double QFontMetricsF_HorizontalAdvanceWithQChar(const QFontMetricsF* self, QChar* param1) { - return self->horizontalAdvance(*param1); + qreal _ret = self->horizontalAdvance(*param1); + return static_cast(_ret); } QRectF* QFontMetricsF_BoundingRect(const QFontMetricsF* self, struct miqt_string* stringVal) { @@ -369,7 +387,7 @@ QRectF* QFontMetricsF_TightBoundingRect(const QFontMetricsF* self, struct miqt_s return new QRectF(self->tightBoundingRect(text_QString)); } -struct miqt_string* QFontMetricsF_ElidedText(const QFontMetricsF* self, struct miqt_string* text, uintptr_t mode, double width) { +struct miqt_string* QFontMetricsF_ElidedText(const QFontMetricsF* self, struct miqt_string* text, int mode, double width) { QString text_QString = QString::fromUtf8(&text->data, text->len); QString _ret = self->elidedText(text_QString, static_cast(mode), static_cast(width)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -378,23 +396,28 @@ struct miqt_string* QFontMetricsF_ElidedText(const QFontMetricsF* self, struct m } double QFontMetricsF_UnderlinePos(const QFontMetricsF* self) { - return self->underlinePos(); + qreal _ret = self->underlinePos(); + return static_cast(_ret); } double QFontMetricsF_OverlinePos(const QFontMetricsF* self) { - return self->overlinePos(); + qreal _ret = self->overlinePos(); + return static_cast(_ret); } double QFontMetricsF_StrikeOutPos(const QFontMetricsF* self) { - return self->strikeOutPos(); + qreal _ret = self->strikeOutPos(); + return static_cast(_ret); } double QFontMetricsF_LineWidth(const QFontMetricsF* self) { - return self->lineWidth(); + qreal _ret = self->lineWidth(); + return static_cast(_ret); } double QFontMetricsF_FontDpi(const QFontMetricsF* self) { - return self->fontDpi(); + qreal _ret = self->fontDpi(); + return static_cast(_ret); } bool QFontMetricsF_OperatorEqual(const QFontMetricsF* self, QFontMetricsF* other) { @@ -407,7 +430,8 @@ bool QFontMetricsF_OperatorNotEqual(const QFontMetricsF* self, QFontMetricsF* ot double QFontMetricsF_HorizontalAdvance2(const QFontMetricsF* self, struct miqt_string* stringVal, int length) { QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); - return self->horizontalAdvance(stringVal_QString, static_cast(length)); + qreal _ret = self->horizontalAdvance(stringVal_QString, static_cast(length)); + return static_cast(_ret); } QRectF* QFontMetricsF_BoundingRect4(const QFontMetricsF* self, QRectF* r, int flags, struct miqt_string* stringVal, int tabstops) { @@ -430,7 +454,7 @@ QSizeF* QFontMetricsF_Size4(const QFontMetricsF* self, int flags, struct miqt_st return new QSizeF(self->size(static_cast(flags), str_QString, static_cast(tabstops), static_cast(tabarray))); } -struct miqt_string* QFontMetricsF_ElidedText4(const QFontMetricsF* self, struct miqt_string* text, uintptr_t mode, double width, int flags) { +struct miqt_string* QFontMetricsF_ElidedText4(const QFontMetricsF* self, struct miqt_string* text, int mode, double width, int flags) { QString text_QString = QString::fromUtf8(&text->data, text->len); QString _ret = self->elidedText(text_QString, static_cast(mode), static_cast(width), static_cast(flags)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory diff --git a/qt/gen_qfontmetrics.go b/qt/gen_qfontmetrics.go index dca9c09..6bfbed0 100644 --- a/qt/gen_qfontmetrics.go +++ b/qt/gen_qfontmetrics.go @@ -208,7 +208,7 @@ func (this *QFontMetrics) TightBoundingRect(text string) *QRect { func (this *QFontMetrics) ElidedText(text string, mode TextElideMode, width int) string { text_ms := miqt_strdupg(text) defer C.free(text_ms) - var _ms *C.struct_miqt_string = C.QFontMetrics_ElidedText(this.h, (*C.struct_miqt_string)(text_ms), (C.uintptr_t)(mode), (C.int)(width)) + var _ms *C.struct_miqt_string = C.QFontMetrics_ElidedText(this.h, (*C.struct_miqt_string)(text_ms), (C.int)(mode), (C.int)(width)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -311,7 +311,7 @@ func (this *QFontMetrics) Size4(flags int, str string, tabstops int, tabarray *i func (this *QFontMetrics) ElidedText4(text string, mode TextElideMode, width int, flags int) string { text_ms := miqt_strdupg(text) defer C.free(text_ms) - var _ms *C.struct_miqt_string = C.QFontMetrics_ElidedText4(this.h, (*C.struct_miqt_string)(text_ms), (C.uintptr_t)(mode), (C.int)(width), (C.int)(flags)) + var _ms *C.struct_miqt_string = C.QFontMetrics_ElidedText4(this.h, (*C.struct_miqt_string)(text_ms), (C.int)(mode), (C.int)(width), (C.int)(flags)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -515,7 +515,7 @@ func (this *QFontMetricsF) TightBoundingRect(text string) *QRectF { func (this *QFontMetricsF) ElidedText(text string, mode TextElideMode, width float64) string { text_ms := miqt_strdupg(text) defer C.free(text_ms) - var _ms *C.struct_miqt_string = C.QFontMetricsF_ElidedText(this.h, (*C.struct_miqt_string)(text_ms), (C.uintptr_t)(mode), (C.double)(width)) + var _ms *C.struct_miqt_string = C.QFontMetricsF_ElidedText(this.h, (*C.struct_miqt_string)(text_ms), (C.int)(mode), (C.double)(width)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -594,7 +594,7 @@ func (this *QFontMetricsF) Size4(flags int, str string, tabstops int, tabarray * func (this *QFontMetricsF) ElidedText4(text string, mode TextElideMode, width float64, flags int) string { text_ms := miqt_strdupg(text) defer C.free(text_ms) - var _ms *C.struct_miqt_string = C.QFontMetricsF_ElidedText4(this.h, (*C.struct_miqt_string)(text_ms), (C.uintptr_t)(mode), (C.double)(width), (C.int)(flags)) + var _ms *C.struct_miqt_string = C.QFontMetricsF_ElidedText4(this.h, (*C.struct_miqt_string)(text_ms), (C.int)(mode), (C.double)(width), (C.int)(flags)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret diff --git a/qt/gen_qfontmetrics.h b/qt/gen_qfontmetrics.h index 71a3980..7b19973 100644 --- a/qt/gen_qfontmetrics.h +++ b/qt/gen_qfontmetrics.h @@ -67,7 +67,7 @@ QRect* QFontMetrics_BoundingRect2(const QFontMetrics* self, QRect* r, int flags, QRect* QFontMetrics_BoundingRect3(const QFontMetrics* self, int x, int y, int w, int h, int flags, struct miqt_string* text); QSize* QFontMetrics_Size(const QFontMetrics* self, int flags, struct miqt_string* str); QRect* QFontMetrics_TightBoundingRect(const QFontMetrics* self, struct miqt_string* text); -struct miqt_string* QFontMetrics_ElidedText(const QFontMetrics* self, struct miqt_string* text, uintptr_t mode, int width); +struct miqt_string* QFontMetrics_ElidedText(const QFontMetrics* self, struct miqt_string* text, int mode, int width); int QFontMetrics_UnderlinePos(const QFontMetrics* self); int QFontMetrics_OverlinePos(const QFontMetrics* self); int QFontMetrics_StrikeOutPos(const QFontMetrics* self); @@ -83,7 +83,7 @@ QRect* QFontMetrics_BoundingRect7(const QFontMetrics* self, int x, int y, int w, QRect* QFontMetrics_BoundingRect8(const QFontMetrics* self, int x, int y, int w, int h, int flags, struct miqt_string* text, int tabstops, int* tabarray); QSize* QFontMetrics_Size3(const QFontMetrics* self, int flags, struct miqt_string* str, int tabstops); QSize* QFontMetrics_Size4(const QFontMetrics* self, int flags, struct miqt_string* str, int tabstops, int* tabarray); -struct miqt_string* QFontMetrics_ElidedText4(const QFontMetrics* self, struct miqt_string* text, uintptr_t mode, int width, int flags); +struct miqt_string* QFontMetrics_ElidedText4(const QFontMetrics* self, struct miqt_string* text, int mode, int width, int flags); void QFontMetrics_Delete(QFontMetrics* self); QFontMetricsF* QFontMetricsF_new(QFont* font); @@ -117,7 +117,7 @@ QRectF* QFontMetricsF_BoundingRectWithQChar(const QFontMetricsF* self, QChar* pa QRectF* QFontMetricsF_BoundingRect2(const QFontMetricsF* self, QRectF* r, int flags, struct miqt_string* stringVal); QSizeF* QFontMetricsF_Size(const QFontMetricsF* self, int flags, struct miqt_string* str); QRectF* QFontMetricsF_TightBoundingRect(const QFontMetricsF* self, struct miqt_string* text); -struct miqt_string* QFontMetricsF_ElidedText(const QFontMetricsF* self, struct miqt_string* text, uintptr_t mode, double width); +struct miqt_string* QFontMetricsF_ElidedText(const QFontMetricsF* self, struct miqt_string* text, int mode, double width); double QFontMetricsF_UnderlinePos(const QFontMetricsF* self); double QFontMetricsF_OverlinePos(const QFontMetricsF* self); double QFontMetricsF_StrikeOutPos(const QFontMetricsF* self); @@ -130,7 +130,7 @@ QRectF* QFontMetricsF_BoundingRect4(const QFontMetricsF* self, QRectF* r, int fl QRectF* QFontMetricsF_BoundingRect5(const QFontMetricsF* self, QRectF* r, int flags, struct miqt_string* stringVal, int tabstops, int* tabarray); QSizeF* QFontMetricsF_Size3(const QFontMetricsF* self, int flags, struct miqt_string* str, int tabstops); QSizeF* QFontMetricsF_Size4(const QFontMetricsF* self, int flags, struct miqt_string* str, int tabstops, int* tabarray); -struct miqt_string* QFontMetricsF_ElidedText4(const QFontMetricsF* self, struct miqt_string* text, uintptr_t mode, double width, int flags); +struct miqt_string* QFontMetricsF_ElidedText4(const QFontMetricsF* self, struct miqt_string* text, int mode, double width, int flags); void QFontMetricsF_Delete(QFontMetricsF* self); #ifdef __cplusplus diff --git a/qt/gen_qformlayout.cpp b/qt/gen_qformlayout.cpp index d619044..d6bdac6 100644 --- a/qt/gen_qformlayout.cpp +++ b/qt/gen_qformlayout.cpp @@ -39,13 +39,13 @@ struct miqt_string* QFormLayout_TrUtf8(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -void QFormLayout_SetFieldGrowthPolicy(QFormLayout* self, uintptr_t policy) { +void QFormLayout_SetFieldGrowthPolicy(QFormLayout* self, int policy) { self->setFieldGrowthPolicy(static_cast(policy)); } -uintptr_t QFormLayout_FieldGrowthPolicy(const QFormLayout* self) { +int QFormLayout_FieldGrowthPolicy(const QFormLayout* self) { QFormLayout::FieldGrowthPolicy _ret = self->fieldGrowthPolicy(); - return static_cast(_ret); + return static_cast(_ret); } void QFormLayout_SetRowWrapPolicy(QFormLayout* self, int policy) { diff --git a/qt/gen_qformlayout.go b/qt/gen_qformlayout.go index 12ff535..7756c4a 100644 --- a/qt/gen_qformlayout.go +++ b/qt/gen_qformlayout.go @@ -95,7 +95,7 @@ func QFormLayout_TrUtf8(s string) string { } func (this *QFormLayout) SetFieldGrowthPolicy(policy QFormLayout__FieldGrowthPolicy) { - C.QFormLayout_SetFieldGrowthPolicy(this.h, (C.uintptr_t)(policy)) + C.QFormLayout_SetFieldGrowthPolicy(this.h, (C.int)(policy)) } func (this *QFormLayout) FieldGrowthPolicy() QFormLayout__FieldGrowthPolicy { @@ -111,7 +111,7 @@ func (this *QFormLayout) RowWrapPolicy() int { } func (this *QFormLayout) SetLabelAlignment(alignment int) { - C.QFormLayout_SetLabelAlignment(this.h, (C.int)(alignment)) + C.QFormLayout_SetLabelAlignment(this.h, alignment) } func (this *QFormLayout) LabelAlignment() int { @@ -119,7 +119,7 @@ func (this *QFormLayout) LabelAlignment() int { } func (this *QFormLayout) SetFormAlignment(alignment int) { - C.QFormLayout_SetFormAlignment(this.h, (C.int)(alignment)) + C.QFormLayout_SetFormAlignment(this.h, alignment) } func (this *QFormLayout) FormAlignment() int { diff --git a/qt/gen_qformlayout.h b/qt/gen_qformlayout.h index f547a6f..baf895b 100644 --- a/qt/gen_qformlayout.h +++ b/qt/gen_qformlayout.h @@ -42,8 +42,8 @@ QFormLayout* QFormLayout_new2(QWidget* parent); QMetaObject* QFormLayout_MetaObject(const QFormLayout* self); struct miqt_string* QFormLayout_Tr(const char* s); struct miqt_string* QFormLayout_TrUtf8(const char* s); -void QFormLayout_SetFieldGrowthPolicy(QFormLayout* self, uintptr_t policy); -uintptr_t QFormLayout_FieldGrowthPolicy(const QFormLayout* self); +void QFormLayout_SetFieldGrowthPolicy(QFormLayout* self, int policy); +int QFormLayout_FieldGrowthPolicy(const QFormLayout* self); void QFormLayout_SetRowWrapPolicy(QFormLayout* self, int policy); int QFormLayout_RowWrapPolicy(const QFormLayout* self); void QFormLayout_SetLabelAlignment(QFormLayout* self, int alignment); diff --git a/qt/gen_qframe.cpp b/qt/gen_qframe.cpp index 3e242ca..b1ef482 100644 --- a/qt/gen_qframe.cpp +++ b/qt/gen_qframe.cpp @@ -56,21 +56,21 @@ QSize* QFrame_SizeHint(const QFrame* self) { return new QSize(self->sizeHint()); } -uintptr_t QFrame_FrameShape(const QFrame* self) { +int QFrame_FrameShape(const QFrame* self) { QFrame::Shape _ret = self->frameShape(); - return static_cast(_ret); + return static_cast(_ret); } -void QFrame_SetFrameShape(QFrame* self, uintptr_t frameShape) { +void QFrame_SetFrameShape(QFrame* self, int frameShape) { self->setFrameShape(static_cast(frameShape)); } -uintptr_t QFrame_FrameShadow(const QFrame* self) { +int QFrame_FrameShadow(const QFrame* self) { QFrame::Shadow _ret = self->frameShadow(); - return static_cast(_ret); + return static_cast(_ret); } -void QFrame_SetFrameShadow(QFrame* self, uintptr_t frameShadow) { +void QFrame_SetFrameShadow(QFrame* self, int frameShadow) { self->setFrameShadow(static_cast(frameShadow)); } diff --git a/qt/gen_qframe.go b/qt/gen_qframe.go index afc3e8f..4845c57 100644 --- a/qt/gen_qframe.go +++ b/qt/gen_qframe.go @@ -77,7 +77,7 @@ func NewQFrame2(parent *QWidget) *QFrame { // NewQFrame3 constructs a new QFrame object. func NewQFrame3(parent *QWidget, f int) *QFrame { - ret := C.QFrame_new3(parent.cPointer(), (C.int)(f)) + ret := C.QFrame_new3(parent.cPointer(), f) return newQFrame(ret) } @@ -127,7 +127,7 @@ func (this *QFrame) FrameShape() QFrame__Shape { } func (this *QFrame) SetFrameShape(frameShape QFrame__Shape) { - C.QFrame_SetFrameShape(this.h, (C.uintptr_t)(frameShape)) + C.QFrame_SetFrameShape(this.h, (C.int)(frameShape)) } func (this *QFrame) FrameShadow() QFrame__Shadow { @@ -135,7 +135,7 @@ func (this *QFrame) FrameShadow() QFrame__Shadow { } func (this *QFrame) SetFrameShadow(frameShadow QFrame__Shadow) { - C.QFrame_SetFrameShadow(this.h, (C.uintptr_t)(frameShadow)) + C.QFrame_SetFrameShadow(this.h, (C.int)(frameShadow)) } func (this *QFrame) LineWidth() int { diff --git a/qt/gen_qframe.h b/qt/gen_qframe.h index 5930fc9..21789cb 100644 --- a/qt/gen_qframe.h +++ b/qt/gen_qframe.h @@ -37,10 +37,10 @@ int QFrame_FrameStyle(const QFrame* self); void QFrame_SetFrameStyle(QFrame* self, int frameStyle); int QFrame_FrameWidth(const QFrame* self); QSize* QFrame_SizeHint(const QFrame* self); -uintptr_t QFrame_FrameShape(const QFrame* self); -void QFrame_SetFrameShape(QFrame* self, uintptr_t frameShape); -uintptr_t QFrame_FrameShadow(const QFrame* self); -void QFrame_SetFrameShadow(QFrame* self, uintptr_t frameShadow); +int QFrame_FrameShape(const QFrame* self); +void QFrame_SetFrameShape(QFrame* self, int frameShape); +int QFrame_FrameShadow(const QFrame* self); +void QFrame_SetFrameShadow(QFrame* self, int frameShadow); int QFrame_LineWidth(const QFrame* self); void QFrame_SetLineWidth(QFrame* self, int lineWidth); int QFrame_MidLineWidth(const QFrame* self); diff --git a/qt/gen_qfutureinterface.cpp b/qt/gen_qfutureinterface.cpp index b34ab3b..f3883b8 100644 --- a/qt/gen_qfutureinterface.cpp +++ b/qt/gen_qfutureinterface.cpp @@ -6,6 +6,7 @@ #include #include #define WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__ExceptionStore +#define WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__ResultStoreBase #include "qfutureinterface.h" #include "gen_qfutureinterface.h" #include "_cgo_export.h" @@ -18,7 +19,7 @@ QFutureInterfaceBase* QFutureInterfaceBase_new2(QFutureInterfaceBase* other) { return new QFutureInterfaceBase(*other); } -QFutureInterfaceBase* QFutureInterfaceBase_new3(uintptr_t initialState) { +QFutureInterfaceBase* QFutureInterfaceBase_new3(int initialState) { return new QFutureInterfaceBase(static_cast(initialState)); } @@ -98,7 +99,7 @@ int QFutureInterfaceBase_ResultCount(const QFutureInterfaceBase* self) { return self->resultCount(); } -bool QFutureInterfaceBase_QueryState(const QFutureInterfaceBase* self, uintptr_t state) { +bool QFutureInterfaceBase_QueryState(const QFutureInterfaceBase* self, int state) { return self->queryState(static_cast(state)); } @@ -178,6 +179,18 @@ QtPrivate__ExceptionStore* QFutureInterfaceBase_ExceptionStore(QFutureInterfaceB return &_ret; } +QtPrivate__ResultStoreBase* QFutureInterfaceBase_ResultStoreBase(QFutureInterfaceBase* self) { + QtPrivate::ResultStoreBase& _ret = self->resultStoreBase(); + // Cast returned reference into pointer + return &_ret; +} + +QtPrivate__ResultStoreBase* QFutureInterfaceBase_ResultStoreBase2(const QFutureInterfaceBase* self) { + const QtPrivate::ResultStoreBase& _ret = self->resultStoreBase(); + // Cast returned reference into pointer + return const_cast(&_ret); +} + bool QFutureInterfaceBase_OperatorEqual(const QFutureInterfaceBase* self, QFutureInterfaceBase* other) { return self->operator==(*other); } diff --git a/qt/gen_qfutureinterface.go b/qt/gen_qfutureinterface.go index 1ccafc2..d64e6c9 100644 --- a/qt/gen_qfutureinterface.go +++ b/qt/gen_qfutureinterface.go @@ -61,7 +61,7 @@ func NewQFutureInterfaceBase2(other *QFutureInterfaceBase) *QFutureInterfaceBase // NewQFutureInterfaceBase3 constructs a new QFutureInterfaceBase object. func NewQFutureInterfaceBase3(initialState QFutureInterfaceBase__State) *QFutureInterfaceBase { - ret := C.QFutureInterfaceBase_new3((C.uintptr_t)(initialState)) + ret := C.QFutureInterfaceBase_new3((C.int)(initialState)) return newQFutureInterfaceBase(ret) } @@ -143,7 +143,7 @@ func (this *QFutureInterfaceBase) ResultCount() int { } func (this *QFutureInterfaceBase) QueryState(state QFutureInterfaceBase__State) bool { - return (bool)(C.QFutureInterfaceBase_QueryState(this.h, (C.uintptr_t)(state))) + return (bool)(C.QFutureInterfaceBase_QueryState(this.h, (C.int)(state))) } func (this *QFutureInterfaceBase) IsRunning() bool { @@ -218,6 +218,14 @@ func (this *QFutureInterfaceBase) ExceptionStore() *QtPrivate__ExceptionStore { return newQtPrivate__ExceptionStore_U(unsafe.Pointer(C.QFutureInterfaceBase_ExceptionStore(this.h))) } +func (this *QFutureInterfaceBase) ResultStoreBase() *QtPrivate__ResultStoreBase { + return newQtPrivate__ResultStoreBase_U(unsafe.Pointer(C.QFutureInterfaceBase_ResultStoreBase(this.h))) +} + +func (this *QFutureInterfaceBase) ResultStoreBase2() *QtPrivate__ResultStoreBase { + return newQtPrivate__ResultStoreBase_U(unsafe.Pointer(C.QFutureInterfaceBase_ResultStoreBase2(this.h))) +} + func (this *QFutureInterfaceBase) OperatorEqual(other *QFutureInterfaceBase) bool { return (bool)(C.QFutureInterfaceBase_OperatorEqual(this.h, other.cPointer())) } diff --git a/qt/gen_qfutureinterface.h b/qt/gen_qfutureinterface.h index 2f52e78..d86f661 100644 --- a/qt/gen_qfutureinterface.h +++ b/qt/gen_qfutureinterface.h @@ -23,17 +23,23 @@ typedef QtPrivate::ExceptionStore QtPrivate__ExceptionStore; #else class QtPrivate__ExceptionStore; #endif +#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__ResultStoreBase) +typedef QtPrivate::ResultStoreBase QtPrivate__ResultStoreBase; +#else +class QtPrivate__ResultStoreBase; +#endif #else typedef struct QFutureInterfaceBase QFutureInterfaceBase; typedef struct QMutex QMutex; typedef struct QRunnable QRunnable; typedef struct QThreadPool QThreadPool; typedef struct QtPrivate__ExceptionStore QtPrivate__ExceptionStore; +typedef struct QtPrivate__ResultStoreBase QtPrivate__ResultStoreBase; #endif QFutureInterfaceBase* QFutureInterfaceBase_new(); QFutureInterfaceBase* QFutureInterfaceBase_new2(QFutureInterfaceBase* other); -QFutureInterfaceBase* QFutureInterfaceBase_new3(uintptr_t initialState); +QFutureInterfaceBase* QFutureInterfaceBase_new3(int initialState); void QFutureInterfaceBase_ReportStarted(QFutureInterfaceBase* self); void QFutureInterfaceBase_ReportFinished(QFutureInterfaceBase* self); void QFutureInterfaceBase_ReportCanceled(QFutureInterfaceBase* self); @@ -52,7 +58,7 @@ struct miqt_string* QFutureInterfaceBase_ProgressText(const QFutureInterfaceBase void QFutureInterfaceBase_SetExpectedResultCount(QFutureInterfaceBase* self, int resultCount); int QFutureInterfaceBase_ExpectedResultCount(QFutureInterfaceBase* self); int QFutureInterfaceBase_ResultCount(const QFutureInterfaceBase* self); -bool QFutureInterfaceBase_QueryState(const QFutureInterfaceBase* self, uintptr_t state); +bool QFutureInterfaceBase_QueryState(const QFutureInterfaceBase* self, int state); bool QFutureInterfaceBase_IsRunning(const QFutureInterfaceBase* self); bool QFutureInterfaceBase_IsStarted(const QFutureInterfaceBase* self); bool QFutureInterfaceBase_IsCanceled(const QFutureInterfaceBase* self); @@ -71,6 +77,8 @@ void QFutureInterfaceBase_WaitForResume(QFutureInterfaceBase* self); QMutex* QFutureInterfaceBase_Mutex(const QFutureInterfaceBase* self); QMutex* QFutureInterfaceBase_MutexWithInt(const QFutureInterfaceBase* self, int param1); QtPrivate__ExceptionStore* QFutureInterfaceBase_ExceptionStore(QFutureInterfaceBase* self); +QtPrivate__ResultStoreBase* QFutureInterfaceBase_ResultStoreBase(QFutureInterfaceBase* self); +QtPrivate__ResultStoreBase* QFutureInterfaceBase_ResultStoreBase2(const QFutureInterfaceBase* self); bool QFutureInterfaceBase_OperatorEqual(const QFutureInterfaceBase* self, QFutureInterfaceBase* other); bool QFutureInterfaceBase_OperatorNotEqual(const QFutureInterfaceBase* self, QFutureInterfaceBase* other); void QFutureInterfaceBase_OperatorAssign(QFutureInterfaceBase* self, QFutureInterfaceBase* other); diff --git a/qt/gen_qgesture.cpp b/qt/gen_qgesture.cpp index c6a51d6..efc771b 100644 --- a/qt/gen_qgesture.cpp +++ b/qt/gen_qgesture.cpp @@ -43,14 +43,14 @@ struct miqt_string* QGesture_TrUtf8(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -uintptr_t QGesture_GestureType(const QGesture* self) { +int QGesture_GestureType(const QGesture* self) { Qt::GestureType _ret = self->gestureType(); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QGesture_State(const QGesture* self) { +int QGesture_State(const QGesture* self) { Qt::GestureState _ret = self->state(); - return static_cast(_ret); + return static_cast(_ret); } QPointF* QGesture_HotSpot(const QGesture* self) { @@ -69,13 +69,13 @@ void QGesture_UnsetHotSpot(QGesture* self) { self->unsetHotSpot(); } -void QGesture_SetGestureCancelPolicy(QGesture* self, uintptr_t policy) { +void QGesture_SetGestureCancelPolicy(QGesture* self, int policy) { self->setGestureCancelPolicy(static_cast(policy)); } -uintptr_t QGesture_GestureCancelPolicy(const QGesture* self) { +int QGesture_GestureCancelPolicy(const QGesture* self) { QGesture::GestureCancelPolicy _ret = self->gestureCancelPolicy(); - return static_cast(_ret); + return static_cast(_ret); } struct miqt_string* QGesture_Tr2(const char* s, const char* c) { @@ -149,7 +149,8 @@ QPointF* QPanGesture_Delta(const QPanGesture* self) { } double QPanGesture_Acceleration(const QPanGesture* self) { - return self->acceleration(); + qreal _ret = self->acceleration(); + return static_cast(_ret); } void QPanGesture_SetLastOffset(QPanGesture* self, QPointF* value) { @@ -265,15 +266,18 @@ void QPinchGesture_SetCenterPoint(QPinchGesture* self, QPointF* value) { } double QPinchGesture_TotalScaleFactor(const QPinchGesture* self) { - return self->totalScaleFactor(); + qreal _ret = self->totalScaleFactor(); + return static_cast(_ret); } double QPinchGesture_LastScaleFactor(const QPinchGesture* self) { - return self->lastScaleFactor(); + qreal _ret = self->lastScaleFactor(); + return static_cast(_ret); } double QPinchGesture_ScaleFactor(const QPinchGesture* self) { - return self->scaleFactor(); + qreal _ret = self->scaleFactor(); + return static_cast(_ret); } void QPinchGesture_SetTotalScaleFactor(QPinchGesture* self, double value) { @@ -289,15 +293,18 @@ void QPinchGesture_SetScaleFactor(QPinchGesture* self, double value) { } double QPinchGesture_TotalRotationAngle(const QPinchGesture* self) { - return self->totalRotationAngle(); + qreal _ret = self->totalRotationAngle(); + return static_cast(_ret); } double QPinchGesture_LastRotationAngle(const QPinchGesture* self) { - return self->lastRotationAngle(); + qreal _ret = self->lastRotationAngle(); + return static_cast(_ret); } double QPinchGesture_RotationAngle(const QPinchGesture* self) { - return self->rotationAngle(); + qreal _ret = self->rotationAngle(); + return static_cast(_ret); } void QPinchGesture_SetTotalRotationAngle(QPinchGesture* self, double value) { @@ -370,18 +377,19 @@ struct miqt_string* QSwipeGesture_TrUtf8(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -uintptr_t QSwipeGesture_HorizontalDirection(const QSwipeGesture* self) { +int QSwipeGesture_HorizontalDirection(const QSwipeGesture* self) { QSwipeGesture::SwipeDirection _ret = self->horizontalDirection(); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QSwipeGesture_VerticalDirection(const QSwipeGesture* self) { +int QSwipeGesture_VerticalDirection(const QSwipeGesture* self) { QSwipeGesture::SwipeDirection _ret = self->verticalDirection(); - return static_cast(_ret); + return static_cast(_ret); } double QSwipeGesture_SwipeAngle(const QSwipeGesture* self) { - return self->swipeAngle(); + qreal _ret = self->swipeAngle(); + return static_cast(_ret); } void QSwipeGesture_SetSwipeAngle(QSwipeGesture* self, double value) { @@ -575,7 +583,7 @@ QGestureEvent* QGestureEvent_new2(QGestureEvent* param1) { } struct miqt_array* QGestureEvent_Gestures(const QGestureEvent* self) { - QList _ret = self->gestures(); + QList _ret = self->gestures(); // Convert QList<> from C++ memory to manually-managed C memory QGesture** _arr = static_cast(malloc(sizeof(QGesture*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -587,12 +595,12 @@ struct miqt_array* QGestureEvent_Gestures(const QGestureEvent* self) { return _out; } -QGesture* QGestureEvent_Gesture(const QGestureEvent* self, uintptr_t typeVal) { +QGesture* QGestureEvent_Gesture(const QGestureEvent* self, int typeVal) { return self->gesture(static_cast(typeVal)); } struct miqt_array* QGestureEvent_ActiveGestures(const QGestureEvent* self) { - QList _ret = self->activeGestures(); + QList _ret = self->activeGestures(); // Convert QList<> from C++ memory to manually-managed C memory QGesture** _arr = static_cast(malloc(sizeof(QGesture*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -605,7 +613,7 @@ struct miqt_array* QGestureEvent_ActiveGestures(const QGestureEvent* self) { } struct miqt_array* QGestureEvent_CanceledGestures(const QGestureEvent* self) { - QList _ret = self->canceledGestures(); + QList _ret = self->canceledGestures(); // Convert QList<> from C++ memory to manually-managed C memory QGesture** _arr = static_cast(malloc(sizeof(QGesture*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -633,19 +641,19 @@ bool QGestureEvent_IsAccepted(const QGestureEvent* self, QGesture* param1) { return self->isAccepted(param1); } -void QGestureEvent_SetAccepted2(QGestureEvent* self, uintptr_t param1, bool param2) { +void QGestureEvent_SetAccepted2(QGestureEvent* self, int param1, bool param2) { self->setAccepted(static_cast(param1), param2); } -void QGestureEvent_AcceptWithQtGestureType(QGestureEvent* self, uintptr_t param1) { +void QGestureEvent_AcceptWithQtGestureType(QGestureEvent* self, int param1) { self->accept(static_cast(param1)); } -void QGestureEvent_IgnoreWithQtGestureType(QGestureEvent* self, uintptr_t param1) { +void QGestureEvent_IgnoreWithQtGestureType(QGestureEvent* self, int param1) { self->ignore(static_cast(param1)); } -bool QGestureEvent_IsAcceptedWithQtGestureType(const QGestureEvent* self, uintptr_t param1) { +bool QGestureEvent_IsAcceptedWithQtGestureType(const QGestureEvent* self, int param1) { return self->isAccepted(static_cast(param1)); } diff --git a/qt/gen_qgesture.go b/qt/gen_qgesture.go index 56d9c3e..2e628de 100644 --- a/qt/gen_qgesture.go +++ b/qt/gen_qgesture.go @@ -123,7 +123,7 @@ func (this *QGesture) UnsetHotSpot() { } func (this *QGesture) SetGestureCancelPolicy(policy QGesture__GestureCancelPolicy) { - C.QGesture_SetGestureCancelPolicy(this.h, (C.uintptr_t)(policy)) + C.QGesture_SetGestureCancelPolicy(this.h, (C.int)(policy)) } func (this *QGesture) GestureCancelPolicy() QGesture__GestureCancelPolicy { @@ -402,7 +402,7 @@ func (this *QPinchGesture) TotalChangeFlags() int { } func (this *QPinchGesture) SetTotalChangeFlags(value int) { - C.QPinchGesture_SetTotalChangeFlags(this.h, (C.int)(value)) + C.QPinchGesture_SetTotalChangeFlags(this.h, value) } func (this *QPinchGesture) ChangeFlags() int { @@ -410,7 +410,7 @@ func (this *QPinchGesture) ChangeFlags() int { } func (this *QPinchGesture) SetChangeFlags(value int) { - C.QPinchGesture_SetChangeFlags(this.h, (C.int)(value)) + C.QPinchGesture_SetChangeFlags(this.h, value) } func (this *QPinchGesture) StartCenterPoint() *QPointF { @@ -998,7 +998,7 @@ func (this *QGestureEvent) Gestures() []*QGesture { } func (this *QGestureEvent) Gesture(typeVal GestureType) *QGesture { - return newQGesture_U(unsafe.Pointer(C.QGestureEvent_Gesture(this.h, (C.uintptr_t)(typeVal)))) + return newQGesture_U(unsafe.Pointer(C.QGestureEvent_Gesture(this.h, (C.int)(typeVal)))) } func (this *QGestureEvent) ActiveGestures() []*QGesture { @@ -1040,19 +1040,19 @@ func (this *QGestureEvent) IsAccepted(param1 *QGesture) bool { } func (this *QGestureEvent) SetAccepted2(param1 GestureType, param2 bool) { - C.QGestureEvent_SetAccepted2(this.h, (C.uintptr_t)(param1), (C.bool)(param2)) + C.QGestureEvent_SetAccepted2(this.h, (C.int)(param1), (C.bool)(param2)) } func (this *QGestureEvent) AcceptWithQtGestureType(param1 GestureType) { - C.QGestureEvent_AcceptWithQtGestureType(this.h, (C.uintptr_t)(param1)) + C.QGestureEvent_AcceptWithQtGestureType(this.h, (C.int)(param1)) } func (this *QGestureEvent) IgnoreWithQtGestureType(param1 GestureType) { - C.QGestureEvent_IgnoreWithQtGestureType(this.h, (C.uintptr_t)(param1)) + C.QGestureEvent_IgnoreWithQtGestureType(this.h, (C.int)(param1)) } func (this *QGestureEvent) IsAcceptedWithQtGestureType(param1 GestureType) bool { - return (bool)(C.QGestureEvent_IsAcceptedWithQtGestureType(this.h, (C.uintptr_t)(param1))) + return (bool)(C.QGestureEvent_IsAcceptedWithQtGestureType(this.h, (C.int)(param1))) } func (this *QGestureEvent) SetWidget(widget *QWidget) { diff --git a/qt/gen_qgesture.h b/qt/gen_qgesture.h index 882e2ab..949a12c 100644 --- a/qt/gen_qgesture.h +++ b/qt/gen_qgesture.h @@ -44,14 +44,14 @@ QGesture* QGesture_new2(QObject* parent); QMetaObject* QGesture_MetaObject(const QGesture* self); struct miqt_string* QGesture_Tr(const char* s); struct miqt_string* QGesture_TrUtf8(const char* s); -uintptr_t QGesture_GestureType(const QGesture* self); -uintptr_t QGesture_State(const QGesture* self); +int QGesture_GestureType(const QGesture* self); +int QGesture_State(const QGesture* self); QPointF* QGesture_HotSpot(const QGesture* self); void QGesture_SetHotSpot(QGesture* self, QPointF* value); bool QGesture_HasHotSpot(const QGesture* self); void QGesture_UnsetHotSpot(QGesture* self); -void QGesture_SetGestureCancelPolicy(QGesture* self, uintptr_t policy); -uintptr_t QGesture_GestureCancelPolicy(const QGesture* self); +void QGesture_SetGestureCancelPolicy(QGesture* self, int policy); +int QGesture_GestureCancelPolicy(const QGesture* self); struct miqt_string* QGesture_Tr2(const char* s, const char* c); struct miqt_string* QGesture_Tr3(const char* s, const char* c, int n); struct miqt_string* QGesture_TrUtf82(const char* s, const char* c); @@ -114,8 +114,8 @@ QSwipeGesture* QSwipeGesture_new2(QObject* parent); QMetaObject* QSwipeGesture_MetaObject(const QSwipeGesture* self); struct miqt_string* QSwipeGesture_Tr(const char* s); struct miqt_string* QSwipeGesture_TrUtf8(const char* s); -uintptr_t QSwipeGesture_HorizontalDirection(const QSwipeGesture* self); -uintptr_t QSwipeGesture_VerticalDirection(const QSwipeGesture* self); +int QSwipeGesture_HorizontalDirection(const QSwipeGesture* self); +int QSwipeGesture_VerticalDirection(const QSwipeGesture* self); double QSwipeGesture_SwipeAngle(const QSwipeGesture* self); void QSwipeGesture_SetSwipeAngle(QSwipeGesture* self, double value); struct miqt_string* QSwipeGesture_Tr2(const char* s, const char* c); @@ -155,17 +155,17 @@ void QTapAndHoldGesture_Delete(QTapAndHoldGesture* self); QGestureEvent* QGestureEvent_new(struct miqt_array* /* of QGesture* */ gestures); QGestureEvent* QGestureEvent_new2(QGestureEvent* param1); struct miqt_array* QGestureEvent_Gestures(const QGestureEvent* self); -QGesture* QGestureEvent_Gesture(const QGestureEvent* self, uintptr_t typeVal); +QGesture* QGestureEvent_Gesture(const QGestureEvent* self, int typeVal); struct miqt_array* QGestureEvent_ActiveGestures(const QGestureEvent* self); struct miqt_array* QGestureEvent_CanceledGestures(const QGestureEvent* self); void QGestureEvent_SetAccepted(QGestureEvent* self, QGesture* param1, bool param2); void QGestureEvent_Accept(QGestureEvent* self, QGesture* param1); void QGestureEvent_Ignore(QGestureEvent* self, QGesture* param1); bool QGestureEvent_IsAccepted(const QGestureEvent* self, QGesture* param1); -void QGestureEvent_SetAccepted2(QGestureEvent* self, uintptr_t param1, bool param2); -void QGestureEvent_AcceptWithQtGestureType(QGestureEvent* self, uintptr_t param1); -void QGestureEvent_IgnoreWithQtGestureType(QGestureEvent* self, uintptr_t param1); -bool QGestureEvent_IsAcceptedWithQtGestureType(const QGestureEvent* self, uintptr_t param1); +void QGestureEvent_SetAccepted2(QGestureEvent* self, int param1, bool param2); +void QGestureEvent_AcceptWithQtGestureType(QGestureEvent* self, int param1); +void QGestureEvent_IgnoreWithQtGestureType(QGestureEvent* self, int param1); +bool QGestureEvent_IsAcceptedWithQtGestureType(const QGestureEvent* self, int param1); void QGestureEvent_SetWidget(QGestureEvent* self, QWidget* widget); QWidget* QGestureEvent_Widget(const QGestureEvent* self); QPointF* QGestureEvent_MapToGraphicsScene(const QGestureEvent* self, QPointF* gesturePoint); diff --git a/qt/gen_qgesturerecognizer.cpp b/qt/gen_qgesturerecognizer.cpp index 75048ce..16defb1 100644 --- a/qt/gen_qgesturerecognizer.cpp +++ b/qt/gen_qgesturerecognizer.cpp @@ -19,12 +19,12 @@ void QGestureRecognizer_Reset(QGestureRecognizer* self, QGesture* state) { self->reset(state); } -uintptr_t QGestureRecognizer_RegisterRecognizer(QGestureRecognizer* recognizer) { +int QGestureRecognizer_RegisterRecognizer(QGestureRecognizer* recognizer) { Qt::GestureType _ret = QGestureRecognizer::registerRecognizer(recognizer); - return static_cast(_ret); + return static_cast(_ret); } -void QGestureRecognizer_UnregisterRecognizer(uintptr_t typeVal) { +void QGestureRecognizer_UnregisterRecognizer(int typeVal) { QGestureRecognizer::unregisterRecognizer(static_cast(typeVal)); } diff --git a/qt/gen_qgesturerecognizer.go b/qt/gen_qgesturerecognizer.go index ee8eaf2..e1910fc 100644 --- a/qt/gen_qgesturerecognizer.go +++ b/qt/gen_qgesturerecognizer.go @@ -65,7 +65,7 @@ func QGestureRecognizer_RegisterRecognizer(recognizer *QGestureRecognizer) Gestu } func QGestureRecognizer_UnregisterRecognizer(typeVal GestureType) { - C.QGestureRecognizer_UnregisterRecognizer((C.uintptr_t)(typeVal)) + C.QGestureRecognizer_UnregisterRecognizer((C.int)(typeVal)) } func (this *QGestureRecognizer) OperatorAssign(param1 *QGestureRecognizer) { diff --git a/qt/gen_qgesturerecognizer.h b/qt/gen_qgesturerecognizer.h index 1f53598..1787714 100644 --- a/qt/gen_qgesturerecognizer.h +++ b/qt/gen_qgesturerecognizer.h @@ -28,8 +28,8 @@ typedef struct QObject QObject; QGesture* QGestureRecognizer_Create(QGestureRecognizer* self, QObject* target); int QGestureRecognizer_Recognize(QGestureRecognizer* self, QGesture* state, QObject* watched, QEvent* event); void QGestureRecognizer_Reset(QGestureRecognizer* self, QGesture* state); -uintptr_t QGestureRecognizer_RegisterRecognizer(QGestureRecognizer* recognizer); -void QGestureRecognizer_UnregisterRecognizer(uintptr_t typeVal); +int QGestureRecognizer_RegisterRecognizer(QGestureRecognizer* recognizer); +void QGestureRecognizer_UnregisterRecognizer(int typeVal); void QGestureRecognizer_OperatorAssign(QGestureRecognizer* self, QGestureRecognizer* param1); void QGestureRecognizer_Delete(QGestureRecognizer* self); diff --git a/qt/gen_qglyphrun.cpp b/qt/gen_qglyphrun.cpp index fa5003a..a651f3b 100644 --- a/qt/gen_qglyphrun.cpp +++ b/qt/gen_qglyphrun.cpp @@ -36,7 +36,7 @@ void QGlyphRun_SetRawData(QGlyphRun* self, const unsigned int* glyphIndexArray, } struct miqt_array* QGlyphRun_GlyphIndexes(const QGlyphRun* self) { - QVector _ret = self->glyphIndexes(); + QVector _ret = self->glyphIndexes(); // Convert QList<> from C++ memory to manually-managed C memory unsigned int* _arr = static_cast(malloc(sizeof(unsigned int) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -125,7 +125,7 @@ bool QGlyphRun_IsRightToLeft(const QGlyphRun* self) { return self->isRightToLeft(); } -void QGlyphRun_SetFlag(QGlyphRun* self, uintptr_t flag) { +void QGlyphRun_SetFlag(QGlyphRun* self, int flag) { self->setFlag(static_cast(flag)); } @@ -150,7 +150,7 @@ bool QGlyphRun_IsEmpty(const QGlyphRun* self) { return self->isEmpty(); } -void QGlyphRun_SetFlag2(QGlyphRun* self, uintptr_t flag, bool enabled) { +void QGlyphRun_SetFlag2(QGlyphRun* self, int flag, bool enabled) { self->setFlag(static_cast(flag), enabled); } diff --git a/qt/gen_qglyphrun.go b/qt/gen_qglyphrun.go index 46ee70b..fb88cc0 100644 --- a/qt/gen_qglyphrun.go +++ b/qt/gen_qglyphrun.go @@ -174,11 +174,11 @@ func (this *QGlyphRun) IsRightToLeft() bool { } func (this *QGlyphRun) SetFlag(flag QGlyphRun__GlyphRunFlag) { - C.QGlyphRun_SetFlag(this.h, (C.uintptr_t)(flag)) + C.QGlyphRun_SetFlag(this.h, (C.int)(flag)) } func (this *QGlyphRun) SetFlags(flags int) { - C.QGlyphRun_SetFlags(this.h, (C.int)(flags)) + C.QGlyphRun_SetFlags(this.h, flags) } func (this *QGlyphRun) Flags() int { @@ -201,7 +201,7 @@ func (this *QGlyphRun) IsEmpty() bool { } func (this *QGlyphRun) SetFlag2(flag QGlyphRun__GlyphRunFlag, enabled bool) { - C.QGlyphRun_SetFlag2(this.h, (C.uintptr_t)(flag), (C.bool)(enabled)) + C.QGlyphRun_SetFlag2(this.h, (C.int)(flag), (C.bool)(enabled)) } // Delete this object from C++ memory. diff --git a/qt/gen_qglyphrun.h b/qt/gen_qglyphrun.h index 950d5a1..70ff6d6 100644 --- a/qt/gen_qglyphrun.h +++ b/qt/gen_qglyphrun.h @@ -47,13 +47,13 @@ void QGlyphRun_SetStrikeOut(QGlyphRun* self, bool strikeOut); bool QGlyphRun_StrikeOut(const QGlyphRun* self); void QGlyphRun_SetRightToLeft(QGlyphRun* self, bool on); bool QGlyphRun_IsRightToLeft(const QGlyphRun* self); -void QGlyphRun_SetFlag(QGlyphRun* self, uintptr_t flag); +void QGlyphRun_SetFlag(QGlyphRun* self, int flag); void QGlyphRun_SetFlags(QGlyphRun* self, int flags); int QGlyphRun_Flags(const QGlyphRun* self); void QGlyphRun_SetBoundingRect(QGlyphRun* self, QRectF* boundingRect); QRectF* QGlyphRun_BoundingRect(const QGlyphRun* self); bool QGlyphRun_IsEmpty(const QGlyphRun* self); -void QGlyphRun_SetFlag2(QGlyphRun* self, uintptr_t flag, bool enabled); +void QGlyphRun_SetFlag2(QGlyphRun* self, int flag, bool enabled); void QGlyphRun_Delete(QGlyphRun* self); #ifdef __cplusplus diff --git a/qt/gen_qgraphicsanchorlayout.cpp b/qt/gen_qgraphicsanchorlayout.cpp index a6d3a62..0ecdc04 100644 --- a/qt/gen_qgraphicsanchorlayout.cpp +++ b/qt/gen_qgraphicsanchorlayout.cpp @@ -37,16 +37,17 @@ void QGraphicsAnchor_UnsetSpacing(QGraphicsAnchor* self) { } double QGraphicsAnchor_Spacing(const QGraphicsAnchor* self) { - return self->spacing(); + qreal _ret = self->spacing(); + return static_cast(_ret); } -void QGraphicsAnchor_SetSizePolicy(QGraphicsAnchor* self, uintptr_t policy) { +void QGraphicsAnchor_SetSizePolicy(QGraphicsAnchor* self, int policy) { self->setSizePolicy(static_cast(policy)); } -uintptr_t QGraphicsAnchor_SizePolicy(const QGraphicsAnchor* self) { +int QGraphicsAnchor_SizePolicy(const QGraphicsAnchor* self) { QSizePolicy::Policy _ret = self->sizePolicy(); - return static_cast(_ret); + return static_cast(_ret); } struct miqt_string* QGraphicsAnchor_Tr2(const char* s, const char* c) { @@ -89,15 +90,15 @@ QGraphicsAnchorLayout* QGraphicsAnchorLayout_new2(QGraphicsLayoutItem* parent) { return new QGraphicsAnchorLayout(parent); } -QGraphicsAnchor* QGraphicsAnchorLayout_AddAnchor(QGraphicsAnchorLayout* self, QGraphicsLayoutItem* firstItem, uintptr_t firstEdge, QGraphicsLayoutItem* secondItem, uintptr_t secondEdge) { +QGraphicsAnchor* QGraphicsAnchorLayout_AddAnchor(QGraphicsAnchorLayout* self, QGraphicsLayoutItem* firstItem, int firstEdge, QGraphicsLayoutItem* secondItem, int secondEdge) { return self->addAnchor(firstItem, static_cast(firstEdge), secondItem, static_cast(secondEdge)); } -QGraphicsAnchor* QGraphicsAnchorLayout_Anchor(QGraphicsAnchorLayout* self, QGraphicsLayoutItem* firstItem, uintptr_t firstEdge, QGraphicsLayoutItem* secondItem, uintptr_t secondEdge) { +QGraphicsAnchor* QGraphicsAnchorLayout_Anchor(QGraphicsAnchorLayout* self, QGraphicsLayoutItem* firstItem, int firstEdge, QGraphicsLayoutItem* secondItem, int secondEdge) { return self->anchor(firstItem, static_cast(firstEdge), secondItem, static_cast(secondEdge)); } -void QGraphicsAnchorLayout_AddCornerAnchors(QGraphicsAnchorLayout* self, QGraphicsLayoutItem* firstItem, uintptr_t firstCorner, QGraphicsLayoutItem* secondItem, uintptr_t secondCorner) { +void QGraphicsAnchorLayout_AddCornerAnchors(QGraphicsAnchorLayout* self, QGraphicsLayoutItem* firstItem, int firstCorner, QGraphicsLayoutItem* secondItem, int secondCorner) { self->addCornerAnchors(firstItem, static_cast(firstCorner), secondItem, static_cast(secondCorner)); } @@ -118,11 +119,13 @@ void QGraphicsAnchorLayout_SetSpacing(QGraphicsAnchorLayout* self, double spacin } double QGraphicsAnchorLayout_HorizontalSpacing(const QGraphicsAnchorLayout* self) { - return self->horizontalSpacing(); + qreal _ret = self->horizontalSpacing(); + return static_cast(_ret); } double QGraphicsAnchorLayout_VerticalSpacing(const QGraphicsAnchorLayout* self) { - return self->verticalSpacing(); + qreal _ret = self->verticalSpacing(); + return static_cast(_ret); } void QGraphicsAnchorLayout_RemoveAt(QGraphicsAnchorLayout* self, int index) { diff --git a/qt/gen_qgraphicsanchorlayout.go b/qt/gen_qgraphicsanchorlayout.go index e1a9049..4f26295 100644 --- a/qt/gen_qgraphicsanchorlayout.go +++ b/qt/gen_qgraphicsanchorlayout.go @@ -71,7 +71,7 @@ func (this *QGraphicsAnchor) Spacing() float64 { } func (this *QGraphicsAnchor) SetSizePolicy(policy QSizePolicy__Policy) { - C.QGraphicsAnchor_SetSizePolicy(this.h, (C.uintptr_t)(policy)) + C.QGraphicsAnchor_SetSizePolicy(this.h, (C.int)(policy)) } func (this *QGraphicsAnchor) SizePolicy() QSizePolicy__Policy { @@ -172,15 +172,15 @@ func NewQGraphicsAnchorLayout2(parent *QGraphicsLayoutItem) *QGraphicsAnchorLayo } func (this *QGraphicsAnchorLayout) AddAnchor(firstItem *QGraphicsLayoutItem, firstEdge AnchorPoint, secondItem *QGraphicsLayoutItem, secondEdge AnchorPoint) *QGraphicsAnchor { - return newQGraphicsAnchor_U(unsafe.Pointer(C.QGraphicsAnchorLayout_AddAnchor(this.h, firstItem.cPointer(), (C.uintptr_t)(firstEdge), secondItem.cPointer(), (C.uintptr_t)(secondEdge)))) + return newQGraphicsAnchor_U(unsafe.Pointer(C.QGraphicsAnchorLayout_AddAnchor(this.h, firstItem.cPointer(), (C.int)(firstEdge), secondItem.cPointer(), (C.int)(secondEdge)))) } func (this *QGraphicsAnchorLayout) Anchor(firstItem *QGraphicsLayoutItem, firstEdge AnchorPoint, secondItem *QGraphicsLayoutItem, secondEdge AnchorPoint) *QGraphicsAnchor { - return newQGraphicsAnchor_U(unsafe.Pointer(C.QGraphicsAnchorLayout_Anchor(this.h, firstItem.cPointer(), (C.uintptr_t)(firstEdge), secondItem.cPointer(), (C.uintptr_t)(secondEdge)))) + return newQGraphicsAnchor_U(unsafe.Pointer(C.QGraphicsAnchorLayout_Anchor(this.h, firstItem.cPointer(), (C.int)(firstEdge), secondItem.cPointer(), (C.int)(secondEdge)))) } 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)) + C.QGraphicsAnchorLayout_AddCornerAnchors(this.h, firstItem.cPointer(), (C.int)(firstCorner), secondItem.cPointer(), (C.int)(secondCorner)) } func (this *QGraphicsAnchorLayout) AddAnchors(firstItem *QGraphicsLayoutItem, secondItem *QGraphicsLayoutItem) { @@ -228,7 +228,7 @@ func (this *QGraphicsAnchorLayout) Invalidate() { } func (this *QGraphicsAnchorLayout) AddAnchors3(firstItem *QGraphicsLayoutItem, secondItem *QGraphicsLayoutItem, orientations int) { - C.QGraphicsAnchorLayout_AddAnchors3(this.h, firstItem.cPointer(), secondItem.cPointer(), (C.int)(orientations)) + C.QGraphicsAnchorLayout_AddAnchors3(this.h, firstItem.cPointer(), secondItem.cPointer(), orientations) } // Delete this object from C++ memory. diff --git a/qt/gen_qgraphicsanchorlayout.h b/qt/gen_qgraphicsanchorlayout.h index c34ae8b..4b4a3d1 100644 --- a/qt/gen_qgraphicsanchorlayout.h +++ b/qt/gen_qgraphicsanchorlayout.h @@ -33,8 +33,8 @@ struct miqt_string* QGraphicsAnchor_TrUtf8(const char* s); void QGraphicsAnchor_SetSpacing(QGraphicsAnchor* self, double spacing); void QGraphicsAnchor_UnsetSpacing(QGraphicsAnchor* self); double QGraphicsAnchor_Spacing(const QGraphicsAnchor* self); -void QGraphicsAnchor_SetSizePolicy(QGraphicsAnchor* self, uintptr_t policy); -uintptr_t QGraphicsAnchor_SizePolicy(const QGraphicsAnchor* self); +void QGraphicsAnchor_SetSizePolicy(QGraphicsAnchor* self, int policy); +int QGraphicsAnchor_SizePolicy(const QGraphicsAnchor* self); struct miqt_string* QGraphicsAnchor_Tr2(const char* s, const char* c); struct miqt_string* QGraphicsAnchor_Tr3(const char* s, const char* c, int n); struct miqt_string* QGraphicsAnchor_TrUtf82(const char* s, const char* c); @@ -43,9 +43,9 @@ void QGraphicsAnchor_Delete(QGraphicsAnchor* self); QGraphicsAnchorLayout* QGraphicsAnchorLayout_new(); QGraphicsAnchorLayout* QGraphicsAnchorLayout_new2(QGraphicsLayoutItem* parent); -QGraphicsAnchor* QGraphicsAnchorLayout_AddAnchor(QGraphicsAnchorLayout* self, QGraphicsLayoutItem* firstItem, uintptr_t firstEdge, QGraphicsLayoutItem* secondItem, uintptr_t secondEdge); -QGraphicsAnchor* QGraphicsAnchorLayout_Anchor(QGraphicsAnchorLayout* self, QGraphicsLayoutItem* firstItem, uintptr_t firstEdge, QGraphicsLayoutItem* secondItem, uintptr_t secondEdge); -void QGraphicsAnchorLayout_AddCornerAnchors(QGraphicsAnchorLayout* self, QGraphicsLayoutItem* firstItem, uintptr_t firstCorner, QGraphicsLayoutItem* secondItem, uintptr_t secondCorner); +QGraphicsAnchor* QGraphicsAnchorLayout_AddAnchor(QGraphicsAnchorLayout* self, QGraphicsLayoutItem* firstItem, int firstEdge, QGraphicsLayoutItem* secondItem, int secondEdge); +QGraphicsAnchor* QGraphicsAnchorLayout_Anchor(QGraphicsAnchorLayout* self, QGraphicsLayoutItem* firstItem, int firstEdge, QGraphicsLayoutItem* secondItem, int secondEdge); +void QGraphicsAnchorLayout_AddCornerAnchors(QGraphicsAnchorLayout* self, QGraphicsLayoutItem* firstItem, int firstCorner, QGraphicsLayoutItem* secondItem, int secondCorner); void QGraphicsAnchorLayout_AddAnchors(QGraphicsAnchorLayout* self, QGraphicsLayoutItem* firstItem, QGraphicsLayoutItem* secondItem); void QGraphicsAnchorLayout_SetHorizontalSpacing(QGraphicsAnchorLayout* self, double spacing); void QGraphicsAnchorLayout_SetVerticalSpacing(QGraphicsAnchorLayout* self, double spacing); diff --git a/qt/gen_qgraphicseffect.cpp b/qt/gen_qgraphicseffect.cpp index 91952a0..c996ab8 100644 --- a/qt/gen_qgraphicseffect.cpp +++ b/qt/gen_qgraphicseffect.cpp @@ -128,7 +128,8 @@ QColor* QGraphicsColorizeEffect_Color(const QGraphicsColorizeEffect* self) { } double QGraphicsColorizeEffect_Strength(const QGraphicsColorizeEffect* self) { - return self->strength(); + qreal _ret = self->strength(); + return static_cast(_ret); } void QGraphicsColorizeEffect_SetColor(QGraphicsColorizeEffect* self, QColor* c) { @@ -158,7 +159,8 @@ void QGraphicsColorizeEffect_StrengthChanged(QGraphicsColorizeEffect* self, doub void QGraphicsColorizeEffect_connect_StrengthChanged(QGraphicsColorizeEffect* self, void* slot) { QGraphicsColorizeEffect::connect(self, static_cast(&QGraphicsColorizeEffect::strengthChanged), self, [=](qreal strength) { - double sigval1 = strength; + qreal strength_ret = strength; + double sigval1 = static_cast(strength_ret); miqt_exec_callback_QGraphicsColorizeEffect_StrengthChanged(slot, sigval1); }); } @@ -226,7 +228,8 @@ QRectF* QGraphicsBlurEffect_BoundingRectFor(const QGraphicsBlurEffect* self, QRe } double QGraphicsBlurEffect_BlurRadius(const QGraphicsBlurEffect* self) { - return self->blurRadius(); + qreal _ret = self->blurRadius(); + return static_cast(_ret); } int QGraphicsBlurEffect_BlurHints(const QGraphicsBlurEffect* self) { @@ -248,7 +251,8 @@ void QGraphicsBlurEffect_BlurRadiusChanged(QGraphicsBlurEffect* self, double blu void QGraphicsBlurEffect_connect_BlurRadiusChanged(QGraphicsBlurEffect* self, void* slot) { QGraphicsBlurEffect::connect(self, static_cast(&QGraphicsBlurEffect::blurRadiusChanged), self, [=](qreal blurRadius) { - double sigval1 = blurRadius; + qreal blurRadius_ret = blurRadius; + double sigval1 = static_cast(blurRadius_ret); miqt_exec_callback_QGraphicsBlurEffect_BlurRadiusChanged(slot, sigval1); }); } @@ -332,15 +336,18 @@ QPointF* QGraphicsDropShadowEffect_Offset(const QGraphicsDropShadowEffect* self) } double QGraphicsDropShadowEffect_XOffset(const QGraphicsDropShadowEffect* self) { - return self->xOffset(); + qreal _ret = self->xOffset(); + return static_cast(_ret); } double QGraphicsDropShadowEffect_YOffset(const QGraphicsDropShadowEffect* self) { - return self->yOffset(); + qreal _ret = self->yOffset(); + return static_cast(_ret); } double QGraphicsDropShadowEffect_BlurRadius(const QGraphicsDropShadowEffect* self) { - return self->blurRadius(); + qreal _ret = self->blurRadius(); + return static_cast(_ret); } QColor* QGraphicsDropShadowEffect_Color(const QGraphicsDropShadowEffect* self) { @@ -394,7 +401,8 @@ void QGraphicsDropShadowEffect_BlurRadiusChanged(QGraphicsDropShadowEffect* self void QGraphicsDropShadowEffect_connect_BlurRadiusChanged(QGraphicsDropShadowEffect* self, void* slot) { QGraphicsDropShadowEffect::connect(self, static_cast(&QGraphicsDropShadowEffect::blurRadiusChanged), self, [=](qreal blurRadius) { - double sigval1 = blurRadius; + qreal blurRadius_ret = blurRadius; + double sigval1 = static_cast(blurRadius_ret); miqt_exec_callback_QGraphicsDropShadowEffect_BlurRadiusChanged(slot, sigval1); }); } @@ -471,7 +479,8 @@ struct miqt_string* QGraphicsOpacityEffect_TrUtf8(const char* s) { } double QGraphicsOpacityEffect_Opacity(const QGraphicsOpacityEffect* self) { - return self->opacity(); + qreal _ret = self->opacity(); + return static_cast(_ret); } QBrush* QGraphicsOpacityEffect_OpacityMask(const QGraphicsOpacityEffect* self) { @@ -492,7 +501,8 @@ void QGraphicsOpacityEffect_OpacityChanged(QGraphicsOpacityEffect* self, double void QGraphicsOpacityEffect_connect_OpacityChanged(QGraphicsOpacityEffect* self, void* slot) { QGraphicsOpacityEffect::connect(self, static_cast(&QGraphicsOpacityEffect::opacityChanged), self, [=](qreal opacity) { - double sigval1 = opacity; + qreal opacity_ret = opacity; + double sigval1 = static_cast(opacity_ret); miqt_exec_callback_QGraphicsOpacityEffect_OpacityChanged(slot, sigval1); }); } diff --git a/qt/gen_qgraphicseffect.go b/qt/gen_qgraphicseffect.go index 24887f9..fc441c1 100644 --- a/qt/gen_qgraphicseffect.go +++ b/qt/gen_qgraphicseffect.go @@ -439,7 +439,7 @@ func (this *QGraphicsBlurEffect) SetBlurRadius(blurRadius float64) { } func (this *QGraphicsBlurEffect) SetBlurHints(hints int) { - C.QGraphicsBlurEffect_SetBlurHints(this.h, (C.int)(hints)) + C.QGraphicsBlurEffect_SetBlurHints(this.h, hints) } func (this *QGraphicsBlurEffect) BlurRadiusChanged(blurRadius float64) { @@ -463,7 +463,7 @@ func miqt_exec_callback_QGraphicsBlurEffect_BlurRadiusChanged(cb *C.void, blurRa } func (this *QGraphicsBlurEffect) BlurHintsChanged(hints int) { - C.QGraphicsBlurEffect_BlurHintsChanged(this.h, (C.int)(hints)) + C.QGraphicsBlurEffect_BlurHintsChanged(this.h, hints) } func (this *QGraphicsBlurEffect) OnBlurHintsChanged(slot func(hints int)) { C.QGraphicsBlurEffect_connect_BlurHintsChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) diff --git a/qt/gen_qgraphicsgridlayout.cpp b/qt/gen_qgraphicsgridlayout.cpp index eb759ca..4bf94ca 100644 --- a/qt/gen_qgraphicsgridlayout.cpp +++ b/qt/gen_qgraphicsgridlayout.cpp @@ -27,7 +27,8 @@ void QGraphicsGridLayout_SetHorizontalSpacing(QGraphicsGridLayout* self, double } double QGraphicsGridLayout_HorizontalSpacing(const QGraphicsGridLayout* self) { - return self->horizontalSpacing(); + qreal _ret = self->horizontalSpacing(); + return static_cast(_ret); } void QGraphicsGridLayout_SetVerticalSpacing(QGraphicsGridLayout* self, double spacing) { @@ -35,7 +36,8 @@ void QGraphicsGridLayout_SetVerticalSpacing(QGraphicsGridLayout* self, double sp } double QGraphicsGridLayout_VerticalSpacing(const QGraphicsGridLayout* self) { - return self->verticalSpacing(); + qreal _ret = self->verticalSpacing(); + return static_cast(_ret); } void QGraphicsGridLayout_SetSpacing(QGraphicsGridLayout* self, double spacing) { @@ -47,7 +49,8 @@ void QGraphicsGridLayout_SetRowSpacing(QGraphicsGridLayout* self, int row, doubl } double QGraphicsGridLayout_RowSpacing(const QGraphicsGridLayout* self, int row) { - return self->rowSpacing(static_cast(row)); + qreal _ret = self->rowSpacing(static_cast(row)); + return static_cast(_ret); } void QGraphicsGridLayout_SetColumnSpacing(QGraphicsGridLayout* self, int column, double spacing) { @@ -55,7 +58,8 @@ void QGraphicsGridLayout_SetColumnSpacing(QGraphicsGridLayout* self, int column, } double QGraphicsGridLayout_ColumnSpacing(const QGraphicsGridLayout* self, int column) { - return self->columnSpacing(static_cast(column)); + qreal _ret = self->columnSpacing(static_cast(column)); + return static_cast(_ret); } void QGraphicsGridLayout_SetRowStretchFactor(QGraphicsGridLayout* self, int row, int stretch) { @@ -79,7 +83,8 @@ void QGraphicsGridLayout_SetRowMinimumHeight(QGraphicsGridLayout* self, int row, } double QGraphicsGridLayout_RowMinimumHeight(const QGraphicsGridLayout* self, int row) { - return self->rowMinimumHeight(static_cast(row)); + qreal _ret = self->rowMinimumHeight(static_cast(row)); + return static_cast(_ret); } void QGraphicsGridLayout_SetRowPreferredHeight(QGraphicsGridLayout* self, int row, double height) { @@ -87,7 +92,8 @@ void QGraphicsGridLayout_SetRowPreferredHeight(QGraphicsGridLayout* self, int ro } double QGraphicsGridLayout_RowPreferredHeight(const QGraphicsGridLayout* self, int row) { - return self->rowPreferredHeight(static_cast(row)); + qreal _ret = self->rowPreferredHeight(static_cast(row)); + return static_cast(_ret); } void QGraphicsGridLayout_SetRowMaximumHeight(QGraphicsGridLayout* self, int row, double height) { @@ -95,7 +101,8 @@ void QGraphicsGridLayout_SetRowMaximumHeight(QGraphicsGridLayout* self, int row, } double QGraphicsGridLayout_RowMaximumHeight(const QGraphicsGridLayout* self, int row) { - return self->rowMaximumHeight(static_cast(row)); + qreal _ret = self->rowMaximumHeight(static_cast(row)); + return static_cast(_ret); } void QGraphicsGridLayout_SetRowFixedHeight(QGraphicsGridLayout* self, int row, double height) { @@ -107,7 +114,8 @@ void QGraphicsGridLayout_SetColumnMinimumWidth(QGraphicsGridLayout* self, int co } double QGraphicsGridLayout_ColumnMinimumWidth(const QGraphicsGridLayout* self, int column) { - return self->columnMinimumWidth(static_cast(column)); + qreal _ret = self->columnMinimumWidth(static_cast(column)); + return static_cast(_ret); } void QGraphicsGridLayout_SetColumnPreferredWidth(QGraphicsGridLayout* self, int column, double width) { @@ -115,7 +123,8 @@ void QGraphicsGridLayout_SetColumnPreferredWidth(QGraphicsGridLayout* self, int } double QGraphicsGridLayout_ColumnPreferredWidth(const QGraphicsGridLayout* self, int column) { - return self->columnPreferredWidth(static_cast(column)); + qreal _ret = self->columnPreferredWidth(static_cast(column)); + return static_cast(_ret); } void QGraphicsGridLayout_SetColumnMaximumWidth(QGraphicsGridLayout* self, int column, double width) { @@ -123,7 +132,8 @@ void QGraphicsGridLayout_SetColumnMaximumWidth(QGraphicsGridLayout* self, int co } double QGraphicsGridLayout_ColumnMaximumWidth(const QGraphicsGridLayout* self, int column) { - return self->columnMaximumWidth(static_cast(column)); + qreal _ret = self->columnMaximumWidth(static_cast(column)); + return static_cast(_ret); } void QGraphicsGridLayout_SetColumnFixedWidth(QGraphicsGridLayout* self, int column, double width) { @@ -193,7 +203,7 @@ void QGraphicsGridLayout_SetGeometry(QGraphicsGridLayout* self, QRectF* rect) { self->setGeometry(*rect); } -QSizeF* QGraphicsGridLayout_SizeHint(const QGraphicsGridLayout* self, uintptr_t which) { +QSizeF* QGraphicsGridLayout_SizeHint(const QGraphicsGridLayout* self, int which) { return new QSizeF(self->sizeHint(static_cast(which))); } @@ -205,7 +215,7 @@ void QGraphicsGridLayout_AddItem4(QGraphicsGridLayout* self, QGraphicsLayoutItem self->addItem(item, static_cast(row), static_cast(column), static_cast(alignment)); } -QSizeF* QGraphicsGridLayout_SizeHint2(const QGraphicsGridLayout* self, uintptr_t which, QSizeF* constraint) { +QSizeF* QGraphicsGridLayout_SizeHint2(const QGraphicsGridLayout* self, int which, QSizeF* constraint) { return new QSizeF(self->sizeHint(static_cast(which), *constraint)); } diff --git a/qt/gen_qgraphicsgridlayout.go b/qt/gen_qgraphicsgridlayout.go index f804a40..0b0b313 100644 --- a/qt/gen_qgraphicsgridlayout.go +++ b/qt/gen_qgraphicsgridlayout.go @@ -165,7 +165,7 @@ func (this *QGraphicsGridLayout) SetColumnFixedWidth(column int, width float64) } func (this *QGraphicsGridLayout) SetRowAlignment(row int, alignment int) { - C.QGraphicsGridLayout_SetRowAlignment(this.h, (C.int)(row), (C.int)(alignment)) + C.QGraphicsGridLayout_SetRowAlignment(this.h, (C.int)(row), alignment) } func (this *QGraphicsGridLayout) RowAlignment(row int) int { @@ -173,7 +173,7 @@ func (this *QGraphicsGridLayout) RowAlignment(row int) int { } func (this *QGraphicsGridLayout) SetColumnAlignment(column int, alignment int) { - C.QGraphicsGridLayout_SetColumnAlignment(this.h, (C.int)(column), (C.int)(alignment)) + C.QGraphicsGridLayout_SetColumnAlignment(this.h, (C.int)(column), alignment) } func (this *QGraphicsGridLayout) ColumnAlignment(column int) int { @@ -181,7 +181,7 @@ func (this *QGraphicsGridLayout) ColumnAlignment(column int) int { } func (this *QGraphicsGridLayout) SetAlignment(item *QGraphicsLayoutItem, alignment int) { - C.QGraphicsGridLayout_SetAlignment(this.h, item.cPointer(), (C.int)(alignment)) + C.QGraphicsGridLayout_SetAlignment(this.h, item.cPointer(), alignment) } func (this *QGraphicsGridLayout) Alignment(item *QGraphicsLayoutItem) int { @@ -225,22 +225,22 @@ func (this *QGraphicsGridLayout) SetGeometry(rect *QRectF) { } func (this *QGraphicsGridLayout) SizeHint(which SizeHint) *QSizeF { - _ret := C.QGraphicsGridLayout_SizeHint(this.h, (C.uintptr_t)(which)) + _ret := C.QGraphicsGridLayout_SizeHint(this.h, (C.int)(which)) _goptr := newQSizeF(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QGraphicsGridLayout) AddItem6(item *QGraphicsLayoutItem, row int, column int, rowSpan int, columnSpan int, alignment int) { - C.QGraphicsGridLayout_AddItem6(this.h, item.cPointer(), (C.int)(row), (C.int)(column), (C.int)(rowSpan), (C.int)(columnSpan), (C.int)(alignment)) + C.QGraphicsGridLayout_AddItem6(this.h, item.cPointer(), (C.int)(row), (C.int)(column), (C.int)(rowSpan), (C.int)(columnSpan), alignment) } func (this *QGraphicsGridLayout) AddItem4(item *QGraphicsLayoutItem, row int, column int, alignment int) { - C.QGraphicsGridLayout_AddItem4(this.h, item.cPointer(), (C.int)(row), (C.int)(column), (C.int)(alignment)) + C.QGraphicsGridLayout_AddItem4(this.h, item.cPointer(), (C.int)(row), (C.int)(column), alignment) } func (this *QGraphicsGridLayout) SizeHint2(which SizeHint, constraint *QSizeF) *QSizeF { - _ret := C.QGraphicsGridLayout_SizeHint2(this.h, (C.uintptr_t)(which), constraint.cPointer()) + _ret := C.QGraphicsGridLayout_SizeHint2(this.h, (C.int)(which), constraint.cPointer()) _goptr := newQSizeF(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qgraphicsgridlayout.h b/qt/gen_qgraphicsgridlayout.h index c3d3204..0007dbc 100644 --- a/qt/gen_qgraphicsgridlayout.h +++ b/qt/gen_qgraphicsgridlayout.h @@ -71,10 +71,10 @@ void QGraphicsGridLayout_RemoveAt(QGraphicsGridLayout* self, int index); void QGraphicsGridLayout_RemoveItem(QGraphicsGridLayout* self, QGraphicsLayoutItem* item); void QGraphicsGridLayout_Invalidate(QGraphicsGridLayout* self); void QGraphicsGridLayout_SetGeometry(QGraphicsGridLayout* self, QRectF* rect); -QSizeF* QGraphicsGridLayout_SizeHint(const QGraphicsGridLayout* self, uintptr_t which); +QSizeF* QGraphicsGridLayout_SizeHint(const QGraphicsGridLayout* self, int which); void QGraphicsGridLayout_AddItem6(QGraphicsGridLayout* self, QGraphicsLayoutItem* item, int row, int column, int rowSpan, int columnSpan, int alignment); void QGraphicsGridLayout_AddItem4(QGraphicsGridLayout* self, QGraphicsLayoutItem* item, int row, int column, int alignment); -QSizeF* QGraphicsGridLayout_SizeHint2(const QGraphicsGridLayout* self, uintptr_t which, QSizeF* constraint); +QSizeF* QGraphicsGridLayout_SizeHint2(const QGraphicsGridLayout* self, int which, QSizeF* constraint); void QGraphicsGridLayout_Delete(QGraphicsGridLayout* self); #ifdef __cplusplus diff --git a/qt/gen_qgraphicsitem.cpp b/qt/gen_qgraphicsitem.cpp index 4995ab0..f3d026e 100644 --- a/qt/gen_qgraphicsitem.cpp +++ b/qt/gen_qgraphicsitem.cpp @@ -80,7 +80,7 @@ void QGraphicsItem_SetParentItem(QGraphicsItem* self, QGraphicsItem* parent) { } struct miqt_array* QGraphicsItem_ChildItems(const QGraphicsItem* self) { - QList _ret = self->childItems(); + QList _ret = self->childItems(); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -125,7 +125,7 @@ int QGraphicsItem_Flags(const QGraphicsItem* self) { return static_cast(_ret); } -void QGraphicsItem_SetFlag(QGraphicsItem* self, uintptr_t flag) { +void QGraphicsItem_SetFlag(QGraphicsItem* self, int flag) { self->setFlag(static_cast(flag)); } @@ -133,21 +133,21 @@ void QGraphicsItem_SetFlags(QGraphicsItem* self, int flags) { self->setFlags(static_cast(flags)); } -uintptr_t QGraphicsItem_CacheMode(const QGraphicsItem* self) { +int QGraphicsItem_CacheMode(const QGraphicsItem* self) { QGraphicsItem::CacheMode _ret = self->cacheMode(); - return static_cast(_ret); + return static_cast(_ret); } -void QGraphicsItem_SetCacheMode(QGraphicsItem* self, uintptr_t mode) { +void QGraphicsItem_SetCacheMode(QGraphicsItem* self, int mode) { self->setCacheMode(static_cast(mode)); } -uintptr_t QGraphicsItem_PanelModality(const QGraphicsItem* self) { +int QGraphicsItem_PanelModality(const QGraphicsItem* self) { QGraphicsItem::PanelModality _ret = self->panelModality(); - return static_cast(_ret); + return static_cast(_ret); } -void QGraphicsItem_SetPanelModality(QGraphicsItem* self, uintptr_t panelModality) { +void QGraphicsItem_SetPanelModality(QGraphicsItem* self, int panelModality) { self->setPanelModality(static_cast(panelModality)); } @@ -228,11 +228,13 @@ void QGraphicsItem_SetAcceptDrops(QGraphicsItem* self, bool on) { } double QGraphicsItem_Opacity(const QGraphicsItem* self) { - return self->opacity(); + qreal _ret = self->opacity(); + return static_cast(_ret); } double QGraphicsItem_EffectiveOpacity(const QGraphicsItem* self) { - return self->effectiveOpacity(); + qreal _ret = self->effectiveOpacity(); + return static_cast(_ret); } void QGraphicsItem_SetOpacity(QGraphicsItem* self, double opacity) { @@ -345,7 +347,8 @@ QPointF* QGraphicsItem_Pos(const QGraphicsItem* self) { } double QGraphicsItem_X(const QGraphicsItem* self) { - return self->x(); + qreal _ret = self->x(); + return static_cast(_ret); } void QGraphicsItem_SetX(QGraphicsItem* self, double x) { @@ -353,7 +356,8 @@ void QGraphicsItem_SetX(QGraphicsItem* self, double x) { } double QGraphicsItem_Y(const QGraphicsItem* self) { - return self->y(); + qreal _ret = self->y(); + return static_cast(_ret); } void QGraphicsItem_SetY(QGraphicsItem* self, double y) { @@ -429,7 +433,8 @@ void QGraphicsItem_SetRotation(QGraphicsItem* self, double angle) { } double QGraphicsItem_Rotation(const QGraphicsItem* self) { - return self->rotation(); + qreal _ret = self->rotation(); + return static_cast(_ret); } void QGraphicsItem_SetScale(QGraphicsItem* self, double scale) { @@ -437,11 +442,12 @@ void QGraphicsItem_SetScale(QGraphicsItem* self, double scale) { } double QGraphicsItem_Scale(const QGraphicsItem* self) { - return self->scale(); + qreal _ret = self->scale(); + return static_cast(_ret); } struct miqt_array* QGraphicsItem_Transformations(const QGraphicsItem* self) { - QList _ret = self->transformations(); + QList _ret = self->transformations(); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsTransform** _arr = static_cast(malloc(sizeof(QGraphicsTransform*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -480,7 +486,8 @@ void QGraphicsItem_Advance(QGraphicsItem* self, int phase) { } double QGraphicsItem_ZValue(const QGraphicsItem* self) { - return self->zValue(); + qreal _ret = self->zValue(); + return static_cast(_ret); } void QGraphicsItem_SetZValue(QGraphicsItem* self, double z) { @@ -528,7 +535,7 @@ bool QGraphicsItem_CollidesWithPath(const QGraphicsItem* self, QPainterPath* pat } struct miqt_array* QGraphicsItem_CollidingItems(const QGraphicsItem* self) { - QList _ret = self->collidingItems(); + QList _ret = self->collidingItems(); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -561,7 +568,8 @@ QRegion* QGraphicsItem_BoundingRegion(const QGraphicsItem* self, QTransform* ite } double QGraphicsItem_BoundingRegionGranularity(const QGraphicsItem* self) { - return self->boundingRegionGranularity(); + qreal _ret = self->boundingRegionGranularity(); + return static_cast(_ret); } void QGraphicsItem_SetBoundingRegionGranularity(QGraphicsItem* self, double granularity) { @@ -745,15 +753,15 @@ void QGraphicsItem_RemoveSceneEventFilter(QGraphicsItem* self, QGraphicsItem* fi self->removeSceneEventFilter(filterItem); } -void QGraphicsItem_SetFlag2(QGraphicsItem* self, uintptr_t flag, bool enabled) { +void QGraphicsItem_SetFlag2(QGraphicsItem* self, int flag, bool enabled) { self->setFlag(static_cast(flag), enabled); } -void QGraphicsItem_SetCacheMode2(QGraphicsItem* self, uintptr_t mode, QSize* cacheSize) { +void QGraphicsItem_SetCacheMode2(QGraphicsItem* self, int mode, QSize* cacheSize) { self->setCacheMode(static_cast(mode), *cacheSize); } -void QGraphicsItem_SetFocus1(QGraphicsItem* self, uintptr_t focusReason) { +void QGraphicsItem_SetFocus1(QGraphicsItem* self, int focusReason) { self->setFocus(static_cast(focusReason)); } @@ -789,16 +797,16 @@ void QGraphicsItem_SetTransform2(QGraphicsItem* self, QTransform* matrix, bool c self->setTransform(*matrix, combine); } -bool QGraphicsItem_CollidesWithItem2(const QGraphicsItem* self, QGraphicsItem* other, uintptr_t mode) { +bool QGraphicsItem_CollidesWithItem2(const QGraphicsItem* self, QGraphicsItem* other, int mode) { return self->collidesWithItem(other, static_cast(mode)); } -bool QGraphicsItem_CollidesWithPath2(const QGraphicsItem* self, QPainterPath* path, uintptr_t mode) { +bool QGraphicsItem_CollidesWithPath2(const QGraphicsItem* self, QPainterPath* path, int mode) { return self->collidesWithPath(*path, static_cast(mode)); } -struct miqt_array* QGraphicsItem_CollidingItems1(const QGraphicsItem* self, uintptr_t mode) { - QList _ret = self->collidingItems(static_cast(mode)); +struct miqt_array* QGraphicsItem_CollidingItems1(const QGraphicsItem* self, int mode) { + QList _ret = self->collidingItems(static_cast(mode)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -848,11 +856,11 @@ struct miqt_string* QGraphicsObject_TrUtf8(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -void QGraphicsObject_GrabGesture(QGraphicsObject* self, uintptr_t typeVal) { +void QGraphicsObject_GrabGesture(QGraphicsObject* self, int typeVal) { self->grabGesture(static_cast(typeVal)); } -void QGraphicsObject_UngrabGesture(QGraphicsObject* self, uintptr_t typeVal) { +void QGraphicsObject_UngrabGesture(QGraphicsObject* self, int typeVal) { self->ungrabGesture(static_cast(typeVal)); } @@ -1004,7 +1012,7 @@ struct miqt_string* QGraphicsObject_TrUtf83(const char* s, const char* c, int n) return miqt_strdup(_b.data(), _b.length()); } -void QGraphicsObject_GrabGesture2(QGraphicsObject* self, uintptr_t typeVal, int flags) { +void QGraphicsObject_GrabGesture2(QGraphicsObject* self, int typeVal, int flags) { self->grabGesture(static_cast(typeVal), static_cast(flags)); } @@ -1268,12 +1276,12 @@ QGraphicsPolygonItem* QGraphicsPolygonItem_new2(QGraphicsItem* parent) { return new QGraphicsPolygonItem(parent); } -uintptr_t QGraphicsPolygonItem_FillRule(const QGraphicsPolygonItem* self) { +int QGraphicsPolygonItem_FillRule(const QGraphicsPolygonItem* self) { Qt::FillRule _ret = self->fillRule(); - return static_cast(_ret); + return static_cast(_ret); } -void QGraphicsPolygonItem_SetFillRule(QGraphicsPolygonItem* self, uintptr_t rule) { +void QGraphicsPolygonItem_SetFillRule(QGraphicsPolygonItem* self, int rule) { self->setFillRule(static_cast(rule)); } @@ -1417,12 +1425,12 @@ void QGraphicsPixmapItem_SetPixmap(QGraphicsPixmapItem* self, QPixmap* pixmap) { self->setPixmap(*pixmap); } -uintptr_t QGraphicsPixmapItem_TransformationMode(const QGraphicsPixmapItem* self) { +int QGraphicsPixmapItem_TransformationMode(const QGraphicsPixmapItem* self) { Qt::TransformationMode _ret = self->transformationMode(); - return static_cast(_ret); + return static_cast(_ret); } -void QGraphicsPixmapItem_SetTransformationMode(QGraphicsPixmapItem* self, uintptr_t mode) { +void QGraphicsPixmapItem_SetTransformationMode(QGraphicsPixmapItem* self, int mode) { self->setTransformationMode(static_cast(mode)); } @@ -1466,12 +1474,12 @@ int QGraphicsPixmapItem_Type(const QGraphicsPixmapItem* self) { return self->type(); } -uintptr_t QGraphicsPixmapItem_ShapeMode(const QGraphicsPixmapItem* self) { +int QGraphicsPixmapItem_ShapeMode(const QGraphicsPixmapItem* self) { QGraphicsPixmapItem::ShapeMode _ret = self->shapeMode(); - return static_cast(_ret); + return static_cast(_ret); } -void QGraphicsPixmapItem_SetShapeMode(QGraphicsPixmapItem* self, uintptr_t mode) { +void QGraphicsPixmapItem_SetShapeMode(QGraphicsPixmapItem* self, int mode) { self->setShapeMode(static_cast(mode)); } @@ -1588,7 +1596,8 @@ void QGraphicsTextItem_SetTextWidth(QGraphicsTextItem* self, double width) { } double QGraphicsTextItem_TextWidth(const QGraphicsTextItem* self) { - return self->textWidth(); + qreal _ret = self->textWidth(); + return static_cast(_ret); } void QGraphicsTextItem_AdjustSize(QGraphicsTextItem* self) { diff --git a/qt/gen_qgraphicsitem.go b/qt/gen_qgraphicsitem.go index 92e1024..18005a7 100644 --- a/qt/gen_qgraphicsitem.go +++ b/qt/gen_qgraphicsitem.go @@ -265,11 +265,11 @@ func (this *QGraphicsItem) Flags() int { } func (this *QGraphicsItem) SetFlag(flag QGraphicsItem__GraphicsItemFlag) { - C.QGraphicsItem_SetFlag(this.h, (C.uintptr_t)(flag)) + C.QGraphicsItem_SetFlag(this.h, (C.int)(flag)) } func (this *QGraphicsItem) SetFlags(flags int) { - C.QGraphicsItem_SetFlags(this.h, (C.int)(flags)) + C.QGraphicsItem_SetFlags(this.h, flags) } func (this *QGraphicsItem) CacheMode() QGraphicsItem__CacheMode { @@ -277,7 +277,7 @@ func (this *QGraphicsItem) CacheMode() QGraphicsItem__CacheMode { } func (this *QGraphicsItem) SetCacheMode(mode QGraphicsItem__CacheMode) { - C.QGraphicsItem_SetCacheMode(this.h, (C.uintptr_t)(mode)) + C.QGraphicsItem_SetCacheMode(this.h, (C.int)(mode)) } func (this *QGraphicsItem) PanelModality() QGraphicsItem__PanelModality { @@ -285,7 +285,7 @@ func (this *QGraphicsItem) PanelModality() QGraphicsItem__PanelModality { } func (this *QGraphicsItem) SetPanelModality(panelModality QGraphicsItem__PanelModality) { - C.QGraphicsItem_SetPanelModality(this.h, (C.uintptr_t)(panelModality)) + C.QGraphicsItem_SetPanelModality(this.h, (C.int)(panelModality)) } func (this *QGraphicsItem) IsBlockedByModalPanel() bool { @@ -393,7 +393,7 @@ func (this *QGraphicsItem) AcceptedMouseButtons() int { } func (this *QGraphicsItem) SetAcceptedMouseButtons(buttons int) { - C.QGraphicsItem_SetAcceptedMouseButtons(this.h, (C.int)(buttons)) + C.QGraphicsItem_SetAcceptedMouseButtons(this.h, buttons) } func (this *QGraphicsItem) AcceptHoverEvents() bool { @@ -1008,7 +1008,7 @@ func (this *QGraphicsItem) InputMethodHints() int { } func (this *QGraphicsItem) SetInputMethodHints(hints int) { - C.QGraphicsItem_SetInputMethodHints(this.h, (C.int)(hints)) + C.QGraphicsItem_SetInputMethodHints(this.h, hints) } func (this *QGraphicsItem) Type() int { @@ -1024,15 +1024,15 @@ func (this *QGraphicsItem) RemoveSceneEventFilter(filterItem *QGraphicsItem) { } func (this *QGraphicsItem) SetFlag2(flag QGraphicsItem__GraphicsItemFlag, enabled bool) { - C.QGraphicsItem_SetFlag2(this.h, (C.uintptr_t)(flag), (C.bool)(enabled)) + C.QGraphicsItem_SetFlag2(this.h, (C.int)(flag), (C.bool)(enabled)) } func (this *QGraphicsItem) SetCacheMode2(mode QGraphicsItem__CacheMode, cacheSize *QSize) { - C.QGraphicsItem_SetCacheMode2(this.h, (C.uintptr_t)(mode), cacheSize.cPointer()) + C.QGraphicsItem_SetCacheMode2(this.h, (C.int)(mode), cacheSize.cPointer()) } func (this *QGraphicsItem) SetFocus1(focusReason FocusReason) { - C.QGraphicsItem_SetFocus1(this.h, (C.uintptr_t)(focusReason)) + C.QGraphicsItem_SetFocus1(this.h, (C.int)(focusReason)) } func (this *QGraphicsItem) EnsureVisible1(rect *QRectF) { @@ -1071,15 +1071,15 @@ func (this *QGraphicsItem) SetTransform2(matrix *QTransform, combine bool) { } func (this *QGraphicsItem) CollidesWithItem2(other *QGraphicsItem, mode ItemSelectionMode) bool { - return (bool)(C.QGraphicsItem_CollidesWithItem2(this.h, other.cPointer(), (C.uintptr_t)(mode))) + return (bool)(C.QGraphicsItem_CollidesWithItem2(this.h, other.cPointer(), (C.int)(mode))) } func (this *QGraphicsItem) CollidesWithPath2(path *QPainterPath, mode ItemSelectionMode) bool { - return (bool)(C.QGraphicsItem_CollidesWithPath2(this.h, path.cPointer(), (C.uintptr_t)(mode))) + return (bool)(C.QGraphicsItem_CollidesWithPath2(this.h, path.cPointer(), (C.int)(mode))) } func (this *QGraphicsItem) CollidingItems1(mode ItemSelectionMode) []*QGraphicsItem { - var _ma *C.struct_miqt_array = C.QGraphicsItem_CollidingItems1(this.h, (C.uintptr_t)(mode)) + var _ma *C.struct_miqt_array = C.QGraphicsItem_CollidingItems1(this.h, (C.int)(mode)) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -1166,11 +1166,11 @@ func QGraphicsObject_TrUtf8(s string) string { } func (this *QGraphicsObject) GrabGesture(typeVal GestureType) { - C.QGraphicsObject_GrabGesture(this.h, (C.uintptr_t)(typeVal)) + C.QGraphicsObject_GrabGesture(this.h, (C.int)(typeVal)) } func (this *QGraphicsObject) UngrabGesture(typeVal GestureType) { - C.QGraphicsObject_UngrabGesture(this.h, (C.uintptr_t)(typeVal)) + C.QGraphicsObject_UngrabGesture(this.h, (C.int)(typeVal)) } func (this *QGraphicsObject) ParentChanged() { @@ -1422,7 +1422,7 @@ func QGraphicsObject_TrUtf83(s string, c string, n int) string { } func (this *QGraphicsObject) GrabGesture2(typeVal GestureType, flags int) { - C.QGraphicsObject_GrabGesture2(this.h, (C.uintptr_t)(typeVal), (C.int)(flags)) + C.QGraphicsObject_GrabGesture2(this.h, (C.int)(typeVal), flags) } // Delete this object from C++ memory. @@ -1936,7 +1936,7 @@ func (this *QGraphicsPolygonItem) FillRule() FillRule { } func (this *QGraphicsPolygonItem) SetFillRule(rule FillRule) { - C.QGraphicsPolygonItem_SetFillRule(this.h, (C.uintptr_t)(rule)) + C.QGraphicsPolygonItem_SetFillRule(this.h, (C.int)(rule)) } func (this *QGraphicsPolygonItem) BoundingRect() *QRectF { @@ -2197,7 +2197,7 @@ func (this *QGraphicsPixmapItem) TransformationMode() TransformationMode { } func (this *QGraphicsPixmapItem) SetTransformationMode(mode TransformationMode) { - C.QGraphicsPixmapItem_SetTransformationMode(this.h, (C.uintptr_t)(mode)) + C.QGraphicsPixmapItem_SetTransformationMode(this.h, (C.int)(mode)) } func (this *QGraphicsPixmapItem) Offset() *QPointF { @@ -2257,7 +2257,7 @@ func (this *QGraphicsPixmapItem) ShapeMode() QGraphicsPixmapItem__ShapeMode { } func (this *QGraphicsPixmapItem) SetShapeMode(mode QGraphicsPixmapItem__ShapeMode) { - C.QGraphicsPixmapItem_SetShapeMode(this.h, (C.uintptr_t)(mode)) + C.QGraphicsPixmapItem_SetShapeMode(this.h, (C.int)(mode)) } // Delete this object from C++ memory. @@ -2453,7 +2453,7 @@ func (this *QGraphicsTextItem) Document() *QTextDocument { } func (this *QGraphicsTextItem) SetTextInteractionFlags(flags int) { - C.QGraphicsTextItem_SetTextInteractionFlags(this.h, (C.int)(flags)) + C.QGraphicsTextItem_SetTextInteractionFlags(this.h, flags) } func (this *QGraphicsTextItem) TextInteractionFlags() int { diff --git a/qt/gen_qgraphicsitem.h b/qt/gen_qgraphicsitem.h index 93ee462..c60b370 100644 --- a/qt/gen_qgraphicsitem.h +++ b/qt/gen_qgraphicsitem.h @@ -109,12 +109,12 @@ QGraphicsObject* QGraphicsItem_ToGraphicsObject2(const QGraphicsItem* self); QGraphicsItemGroup* QGraphicsItem_Group(const QGraphicsItem* self); void QGraphicsItem_SetGroup(QGraphicsItem* self, QGraphicsItemGroup* group); int QGraphicsItem_Flags(const QGraphicsItem* self); -void QGraphicsItem_SetFlag(QGraphicsItem* self, uintptr_t flag); +void QGraphicsItem_SetFlag(QGraphicsItem* self, int flag); void QGraphicsItem_SetFlags(QGraphicsItem* self, int flags); -uintptr_t QGraphicsItem_CacheMode(const QGraphicsItem* self); -void QGraphicsItem_SetCacheMode(QGraphicsItem* self, uintptr_t mode); -uintptr_t QGraphicsItem_PanelModality(const QGraphicsItem* self); -void QGraphicsItem_SetPanelModality(QGraphicsItem* self, uintptr_t panelModality); +int QGraphicsItem_CacheMode(const QGraphicsItem* self); +void QGraphicsItem_SetCacheMode(QGraphicsItem* self, int mode); +int QGraphicsItem_PanelModality(const QGraphicsItem* self); +void QGraphicsItem_SetPanelModality(QGraphicsItem* self, int panelModality); bool QGraphicsItem_IsBlockedByModalPanel(const QGraphicsItem* self); struct miqt_string* QGraphicsItem_ToolTip(const QGraphicsItem* self); void QGraphicsItem_SetToolTip(QGraphicsItem* self, struct miqt_string* toolTip); @@ -256,9 +256,9 @@ void QGraphicsItem_SetInputMethodHints(QGraphicsItem* self, int hints); int QGraphicsItem_Type(const QGraphicsItem* self); void QGraphicsItem_InstallSceneEventFilter(QGraphicsItem* self, QGraphicsItem* filterItem); void QGraphicsItem_RemoveSceneEventFilter(QGraphicsItem* self, QGraphicsItem* filterItem); -void QGraphicsItem_SetFlag2(QGraphicsItem* self, uintptr_t flag, bool enabled); -void QGraphicsItem_SetCacheMode2(QGraphicsItem* self, uintptr_t mode, QSize* cacheSize); -void QGraphicsItem_SetFocus1(QGraphicsItem* self, uintptr_t focusReason); +void QGraphicsItem_SetFlag2(QGraphicsItem* self, int flag, bool enabled); +void QGraphicsItem_SetCacheMode2(QGraphicsItem* self, int mode, QSize* cacheSize); +void QGraphicsItem_SetFocus1(QGraphicsItem* self, int focusReason); void QGraphicsItem_EnsureVisible1(QGraphicsItem* self, QRectF* rect); void QGraphicsItem_EnsureVisible22(QGraphicsItem* self, QRectF* rect, int xmargin); void QGraphicsItem_EnsureVisible3(QGraphicsItem* self, QRectF* rect, int xmargin, int ymargin); @@ -267,9 +267,9 @@ void QGraphicsItem_EnsureVisible6(QGraphicsItem* self, double x, double y, doubl void QGraphicsItem_SetMatrix2(QGraphicsItem* self, QMatrix* matrix, bool combine); QTransform* QGraphicsItem_ItemTransform2(const QGraphicsItem* self, QGraphicsItem* other, bool* ok); void QGraphicsItem_SetTransform2(QGraphicsItem* self, QTransform* matrix, bool combine); -bool QGraphicsItem_CollidesWithItem2(const QGraphicsItem* self, QGraphicsItem* other, uintptr_t mode); -bool QGraphicsItem_CollidesWithPath2(const QGraphicsItem* self, QPainterPath* path, uintptr_t mode); -struct miqt_array* QGraphicsItem_CollidingItems1(const QGraphicsItem* self, uintptr_t mode); +bool QGraphicsItem_CollidesWithItem2(const QGraphicsItem* self, QGraphicsItem* other, int mode); +bool QGraphicsItem_CollidesWithPath2(const QGraphicsItem* self, QPainterPath* path, int mode); +struct miqt_array* QGraphicsItem_CollidingItems1(const QGraphicsItem* self, int mode); bool QGraphicsItem_IsObscured1(const QGraphicsItem* self, QRectF* rect); void QGraphicsItem_Paint3(QGraphicsItem* self, QPainter* painter, QStyleOptionGraphicsItem* option, QWidget* widget); void QGraphicsItem_Update1(QGraphicsItem* self, QRectF* rect); @@ -279,8 +279,8 @@ void QGraphicsItem_Delete(QGraphicsItem* self); QMetaObject* QGraphicsObject_MetaObject(const QGraphicsObject* self); struct miqt_string* QGraphicsObject_Tr(const char* s); struct miqt_string* QGraphicsObject_TrUtf8(const char* s); -void QGraphicsObject_GrabGesture(QGraphicsObject* self, uintptr_t typeVal); -void QGraphicsObject_UngrabGesture(QGraphicsObject* self, uintptr_t typeVal); +void QGraphicsObject_GrabGesture(QGraphicsObject* self, int typeVal); +void QGraphicsObject_UngrabGesture(QGraphicsObject* self, int typeVal); void QGraphicsObject_ParentChanged(QGraphicsObject* self); void QGraphicsObject_connect_ParentChanged(QGraphicsObject* self, void* slot); void QGraphicsObject_OpacityChanged(QGraphicsObject* self); @@ -309,7 +309,7 @@ struct miqt_string* QGraphicsObject_Tr2(const char* s, const char* c); struct miqt_string* QGraphicsObject_Tr3(const char* s, const char* c, int n); struct miqt_string* QGraphicsObject_TrUtf82(const char* s, const char* c); struct miqt_string* QGraphicsObject_TrUtf83(const char* s, const char* c, int n); -void QGraphicsObject_GrabGesture2(QGraphicsObject* self, uintptr_t typeVal, int flags); +void QGraphicsObject_GrabGesture2(QGraphicsObject* self, int typeVal, int flags); void QGraphicsObject_Delete(QGraphicsObject* self); QPen* QAbstractGraphicsShapeItem_Pen(const QAbstractGraphicsShapeItem* self); @@ -380,8 +380,8 @@ void QGraphicsEllipseItem_Delete(QGraphicsEllipseItem* self); QGraphicsPolygonItem* QGraphicsPolygonItem_new(); QGraphicsPolygonItem* QGraphicsPolygonItem_new2(QGraphicsItem* parent); -uintptr_t QGraphicsPolygonItem_FillRule(const QGraphicsPolygonItem* self); -void QGraphicsPolygonItem_SetFillRule(QGraphicsPolygonItem* self, uintptr_t rule); +int QGraphicsPolygonItem_FillRule(const QGraphicsPolygonItem* self); +void QGraphicsPolygonItem_SetFillRule(QGraphicsPolygonItem* self, int rule); QRectF* QGraphicsPolygonItem_BoundingRect(const QGraphicsPolygonItem* self); QPainterPath* QGraphicsPolygonItem_Shape(const QGraphicsPolygonItem* self); bool QGraphicsPolygonItem_Contains(const QGraphicsPolygonItem* self, QPointF* point); @@ -419,8 +419,8 @@ QGraphicsPixmapItem* QGraphicsPixmapItem_new3(QGraphicsItem* parent); QGraphicsPixmapItem* QGraphicsPixmapItem_new4(QPixmap* pixmap, QGraphicsItem* parent); QPixmap* QGraphicsPixmapItem_Pixmap(const QGraphicsPixmapItem* self); void QGraphicsPixmapItem_SetPixmap(QGraphicsPixmapItem* self, QPixmap* pixmap); -uintptr_t QGraphicsPixmapItem_TransformationMode(const QGraphicsPixmapItem* self); -void QGraphicsPixmapItem_SetTransformationMode(QGraphicsPixmapItem* self, uintptr_t mode); +int QGraphicsPixmapItem_TransformationMode(const QGraphicsPixmapItem* self); +void QGraphicsPixmapItem_SetTransformationMode(QGraphicsPixmapItem* self, int mode); QPointF* QGraphicsPixmapItem_Offset(const QGraphicsPixmapItem* self); void QGraphicsPixmapItem_SetOffset(QGraphicsPixmapItem* self, QPointF* offset); void QGraphicsPixmapItem_SetOffset2(QGraphicsPixmapItem* self, double x, double y); @@ -431,8 +431,8 @@ void QGraphicsPixmapItem_Paint(QGraphicsPixmapItem* self, QPainter* painter, QSt bool QGraphicsPixmapItem_IsObscuredBy(const QGraphicsPixmapItem* self, QGraphicsItem* item); QPainterPath* QGraphicsPixmapItem_OpaqueArea(const QGraphicsPixmapItem* self); int QGraphicsPixmapItem_Type(const QGraphicsPixmapItem* self); -uintptr_t QGraphicsPixmapItem_ShapeMode(const QGraphicsPixmapItem* self); -void QGraphicsPixmapItem_SetShapeMode(QGraphicsPixmapItem* self, uintptr_t mode); +int QGraphicsPixmapItem_ShapeMode(const QGraphicsPixmapItem* self); +void QGraphicsPixmapItem_SetShapeMode(QGraphicsPixmapItem* self, int mode); void QGraphicsPixmapItem_Delete(QGraphicsPixmapItem* self); QGraphicsTextItem* QGraphicsTextItem_new(); diff --git a/qt/gen_qgraphicsitemanimation.cpp b/qt/gen_qgraphicsitemanimation.cpp index 220c2bf..a321679 100644 --- a/qt/gen_qgraphicsitemanimation.cpp +++ b/qt/gen_qgraphicsitemanimation.cpp @@ -72,7 +72,8 @@ QTransform* QGraphicsItemAnimation_TransformAt(const QGraphicsItemAnimation* sel } double QGraphicsItemAnimation_RotationAt(const QGraphicsItemAnimation* self, double step) { - return self->rotationAt(static_cast(step)); + qreal _ret = self->rotationAt(static_cast(step)); + return static_cast(_ret); } void QGraphicsItemAnimation_SetRotationAt(QGraphicsItemAnimation* self, double step, double angle) { @@ -80,11 +81,13 @@ void QGraphicsItemAnimation_SetRotationAt(QGraphicsItemAnimation* self, double s } double QGraphicsItemAnimation_XTranslationAt(const QGraphicsItemAnimation* self, double step) { - return self->xTranslationAt(static_cast(step)); + qreal _ret = self->xTranslationAt(static_cast(step)); + return static_cast(_ret); } double QGraphicsItemAnimation_YTranslationAt(const QGraphicsItemAnimation* self, double step) { - return self->yTranslationAt(static_cast(step)); + qreal _ret = self->yTranslationAt(static_cast(step)); + return static_cast(_ret); } void QGraphicsItemAnimation_SetTranslationAt(QGraphicsItemAnimation* self, double step, double dx, double dy) { @@ -92,11 +95,13 @@ void QGraphicsItemAnimation_SetTranslationAt(QGraphicsItemAnimation* self, doubl } double QGraphicsItemAnimation_VerticalScaleAt(const QGraphicsItemAnimation* self, double step) { - return self->verticalScaleAt(static_cast(step)); + qreal _ret = self->verticalScaleAt(static_cast(step)); + return static_cast(_ret); } double QGraphicsItemAnimation_HorizontalScaleAt(const QGraphicsItemAnimation* self, double step) { - return self->horizontalScaleAt(static_cast(step)); + qreal _ret = self->horizontalScaleAt(static_cast(step)); + return static_cast(_ret); } void QGraphicsItemAnimation_SetScaleAt(QGraphicsItemAnimation* self, double step, double sx, double sy) { @@ -104,11 +109,13 @@ void QGraphicsItemAnimation_SetScaleAt(QGraphicsItemAnimation* self, double step } double QGraphicsItemAnimation_VerticalShearAt(const QGraphicsItemAnimation* self, double step) { - return self->verticalShearAt(static_cast(step)); + qreal _ret = self->verticalShearAt(static_cast(step)); + return static_cast(_ret); } double QGraphicsItemAnimation_HorizontalShearAt(const QGraphicsItemAnimation* self, double step) { - return self->horizontalShearAt(static_cast(step)); + qreal _ret = self->horizontalShearAt(static_cast(step)); + return static_cast(_ret); } void QGraphicsItemAnimation_SetShearAt(QGraphicsItemAnimation* self, double step, double sh, double sv) { diff --git a/qt/gen_qgraphicslayoutitem.cpp b/qt/gen_qgraphicslayoutitem.cpp index 16264d7..3b4fb3a 100644 --- a/qt/gen_qgraphicslayoutitem.cpp +++ b/qt/gen_qgraphicslayoutitem.cpp @@ -11,7 +11,7 @@ void QGraphicsLayoutItem_SetSizePolicy(QGraphicsLayoutItem* self, QSizePolicy* p self->setSizePolicy(*policy); } -void QGraphicsLayoutItem_SetSizePolicy2(QGraphicsLayoutItem* self, uintptr_t hPolicy, uintptr_t vPolicy) { +void QGraphicsLayoutItem_SetSizePolicy2(QGraphicsLayoutItem* self, int hPolicy, int vPolicy) { self->setSizePolicy(static_cast(hPolicy), static_cast(vPolicy)); } @@ -36,7 +36,8 @@ void QGraphicsLayoutItem_SetMinimumWidth(QGraphicsLayoutItem* self, double width } double QGraphicsLayoutItem_MinimumWidth(const QGraphicsLayoutItem* self) { - return self->minimumWidth(); + qreal _ret = self->minimumWidth(); + return static_cast(_ret); } void QGraphicsLayoutItem_SetMinimumHeight(QGraphicsLayoutItem* self, double height) { @@ -44,7 +45,8 @@ void QGraphicsLayoutItem_SetMinimumHeight(QGraphicsLayoutItem* self, double heig } double QGraphicsLayoutItem_MinimumHeight(const QGraphicsLayoutItem* self) { - return self->minimumHeight(); + qreal _ret = self->minimumHeight(); + return static_cast(_ret); } void QGraphicsLayoutItem_SetPreferredSize(QGraphicsLayoutItem* self, QSizeF* size) { @@ -64,7 +66,8 @@ void QGraphicsLayoutItem_SetPreferredWidth(QGraphicsLayoutItem* self, double wid } double QGraphicsLayoutItem_PreferredWidth(const QGraphicsLayoutItem* self) { - return self->preferredWidth(); + qreal _ret = self->preferredWidth(); + return static_cast(_ret); } void QGraphicsLayoutItem_SetPreferredHeight(QGraphicsLayoutItem* self, double height) { @@ -72,7 +75,8 @@ void QGraphicsLayoutItem_SetPreferredHeight(QGraphicsLayoutItem* self, double he } double QGraphicsLayoutItem_PreferredHeight(const QGraphicsLayoutItem* self) { - return self->preferredHeight(); + qreal _ret = self->preferredHeight(); + return static_cast(_ret); } void QGraphicsLayoutItem_SetMaximumSize(QGraphicsLayoutItem* self, QSizeF* size) { @@ -92,7 +96,8 @@ void QGraphicsLayoutItem_SetMaximumWidth(QGraphicsLayoutItem* self, double width } double QGraphicsLayoutItem_MaximumWidth(const QGraphicsLayoutItem* self) { - return self->maximumWidth(); + qreal _ret = self->maximumWidth(); + return static_cast(_ret); } void QGraphicsLayoutItem_SetMaximumHeight(QGraphicsLayoutItem* self, double height) { @@ -100,7 +105,8 @@ void QGraphicsLayoutItem_SetMaximumHeight(QGraphicsLayoutItem* self, double heig } double QGraphicsLayoutItem_MaximumHeight(const QGraphicsLayoutItem* self) { - return self->maximumHeight(); + qreal _ret = self->maximumHeight(); + return static_cast(_ret); } void QGraphicsLayoutItem_SetGeometry(QGraphicsLayoutItem* self, QRectF* rect) { @@ -119,7 +125,7 @@ QRectF* QGraphicsLayoutItem_ContentsRect(const QGraphicsLayoutItem* self) { return new QRectF(self->contentsRect()); } -QSizeF* QGraphicsLayoutItem_EffectiveSizeHint(const QGraphicsLayoutItem* self, uintptr_t which) { +QSizeF* QGraphicsLayoutItem_EffectiveSizeHint(const QGraphicsLayoutItem* self, int which) { return new QSizeF(self->effectiveSizeHint(static_cast(which))); } @@ -147,11 +153,11 @@ bool QGraphicsLayoutItem_OwnedByLayout(const QGraphicsLayoutItem* self) { return self->ownedByLayout(); } -void QGraphicsLayoutItem_SetSizePolicy3(QGraphicsLayoutItem* self, uintptr_t hPolicy, uintptr_t vPolicy, uintptr_t controlType) { +void QGraphicsLayoutItem_SetSizePolicy3(QGraphicsLayoutItem* self, int hPolicy, int vPolicy, int controlType) { self->setSizePolicy(static_cast(hPolicy), static_cast(vPolicy), static_cast(controlType)); } -QSizeF* QGraphicsLayoutItem_EffectiveSizeHint2(const QGraphicsLayoutItem* self, uintptr_t which, QSizeF* constraint) { +QSizeF* QGraphicsLayoutItem_EffectiveSizeHint2(const QGraphicsLayoutItem* self, int which, QSizeF* constraint) { return new QSizeF(self->effectiveSizeHint(static_cast(which), *constraint)); } diff --git a/qt/gen_qgraphicslayoutitem.go b/qt/gen_qgraphicslayoutitem.go index 5d0258f..3faba8f 100644 --- a/qt/gen_qgraphicslayoutitem.go +++ b/qt/gen_qgraphicslayoutitem.go @@ -40,7 +40,7 @@ func (this *QGraphicsLayoutItem) SetSizePolicy(policy *QSizePolicy) { } func (this *QGraphicsLayoutItem) SetSizePolicy2(hPolicy QSizePolicy__Policy, vPolicy QSizePolicy__Policy) { - C.QGraphicsLayoutItem_SetSizePolicy2(this.h, (C.uintptr_t)(hPolicy), (C.uintptr_t)(vPolicy)) + C.QGraphicsLayoutItem_SetSizePolicy2(this.h, (C.int)(hPolicy), (C.int)(vPolicy)) } func (this *QGraphicsLayoutItem) SizePolicy() *QSizePolicy { @@ -166,7 +166,7 @@ func (this *QGraphicsLayoutItem) ContentsRect() *QRectF { } func (this *QGraphicsLayoutItem) EffectiveSizeHint(which SizeHint) *QSizeF { - _ret := C.QGraphicsLayoutItem_EffectiveSizeHint(this.h, (C.uintptr_t)(which)) + _ret := C.QGraphicsLayoutItem_EffectiveSizeHint(this.h, (C.int)(which)) _goptr := newQSizeF(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -197,11 +197,11 @@ func (this *QGraphicsLayoutItem) OwnedByLayout() bool { } 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)) + C.QGraphicsLayoutItem_SetSizePolicy3(this.h, (C.int)(hPolicy), (C.int)(vPolicy), (C.int)(controlType)) } func (this *QGraphicsLayoutItem) EffectiveSizeHint2(which SizeHint, constraint *QSizeF) *QSizeF { - _ret := C.QGraphicsLayoutItem_EffectiveSizeHint2(this.h, (C.uintptr_t)(which), constraint.cPointer()) + _ret := C.QGraphicsLayoutItem_EffectiveSizeHint2(this.h, (C.int)(which), constraint.cPointer()) _goptr := newQSizeF(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qgraphicslayoutitem.h b/qt/gen_qgraphicslayoutitem.h index 8cdb568..e0baabe 100644 --- a/qt/gen_qgraphicslayoutitem.h +++ b/qt/gen_qgraphicslayoutitem.h @@ -28,7 +28,7 @@ typedef struct QSizePolicy QSizePolicy; #endif void QGraphicsLayoutItem_SetSizePolicy(QGraphicsLayoutItem* self, QSizePolicy* policy); -void QGraphicsLayoutItem_SetSizePolicy2(QGraphicsLayoutItem* self, uintptr_t hPolicy, uintptr_t vPolicy); +void QGraphicsLayoutItem_SetSizePolicy2(QGraphicsLayoutItem* self, int hPolicy, int vPolicy); QSizePolicy* QGraphicsLayoutItem_SizePolicy(const QGraphicsLayoutItem* self); void QGraphicsLayoutItem_SetMinimumSize(QGraphicsLayoutItem* self, QSizeF* size); void QGraphicsLayoutItem_SetMinimumSize2(QGraphicsLayoutItem* self, double w, double h); @@ -55,15 +55,15 @@ void QGraphicsLayoutItem_SetGeometry(QGraphicsLayoutItem* self, QRectF* rect); QRectF* QGraphicsLayoutItem_Geometry(const QGraphicsLayoutItem* self); void QGraphicsLayoutItem_GetContentsMargins(const QGraphicsLayoutItem* self, double* left, double* top, double* right, double* bottom); QRectF* QGraphicsLayoutItem_ContentsRect(const QGraphicsLayoutItem* self); -QSizeF* QGraphicsLayoutItem_EffectiveSizeHint(const QGraphicsLayoutItem* self, uintptr_t which); +QSizeF* QGraphicsLayoutItem_EffectiveSizeHint(const QGraphicsLayoutItem* self, int which); void QGraphicsLayoutItem_UpdateGeometry(QGraphicsLayoutItem* self); QGraphicsLayoutItem* QGraphicsLayoutItem_ParentLayoutItem(const QGraphicsLayoutItem* self); void QGraphicsLayoutItem_SetParentLayoutItem(QGraphicsLayoutItem* self, QGraphicsLayoutItem* parent); bool QGraphicsLayoutItem_IsLayout(const QGraphicsLayoutItem* self); QGraphicsItem* QGraphicsLayoutItem_GraphicsItem(const QGraphicsLayoutItem* self); bool QGraphicsLayoutItem_OwnedByLayout(const QGraphicsLayoutItem* self); -void QGraphicsLayoutItem_SetSizePolicy3(QGraphicsLayoutItem* self, uintptr_t hPolicy, uintptr_t vPolicy, uintptr_t controlType); -QSizeF* QGraphicsLayoutItem_EffectiveSizeHint2(const QGraphicsLayoutItem* self, uintptr_t which, QSizeF* constraint); +void QGraphicsLayoutItem_SetSizePolicy3(QGraphicsLayoutItem* self, int hPolicy, int vPolicy, int controlType); +QSizeF* QGraphicsLayoutItem_EffectiveSizeHint2(const QGraphicsLayoutItem* self, int which, QSizeF* constraint); void QGraphicsLayoutItem_Delete(QGraphicsLayoutItem* self); #ifdef __cplusplus diff --git a/qt/gen_qgraphicslinearlayout.cpp b/qt/gen_qgraphicslinearlayout.cpp index 2fb3f7d..f948824 100644 --- a/qt/gen_qgraphicslinearlayout.cpp +++ b/qt/gen_qgraphicslinearlayout.cpp @@ -10,7 +10,7 @@ QGraphicsLinearLayout* QGraphicsLinearLayout_new() { return new QGraphicsLinearLayout(); } -QGraphicsLinearLayout* QGraphicsLinearLayout_new2(uintptr_t orientation) { +QGraphicsLinearLayout* QGraphicsLinearLayout_new2(int orientation) { return new QGraphicsLinearLayout(static_cast(orientation)); } @@ -18,17 +18,17 @@ QGraphicsLinearLayout* QGraphicsLinearLayout_new3(QGraphicsLayoutItem* parent) { return new QGraphicsLinearLayout(parent); } -QGraphicsLinearLayout* QGraphicsLinearLayout_new4(uintptr_t orientation, QGraphicsLayoutItem* parent) { +QGraphicsLinearLayout* QGraphicsLinearLayout_new4(int orientation, QGraphicsLayoutItem* parent) { return new QGraphicsLinearLayout(static_cast(orientation), parent); } -void QGraphicsLinearLayout_SetOrientation(QGraphicsLinearLayout* self, uintptr_t orientation) { +void QGraphicsLinearLayout_SetOrientation(QGraphicsLinearLayout* self, int orientation) { self->setOrientation(static_cast(orientation)); } -uintptr_t QGraphicsLinearLayout_Orientation(const QGraphicsLinearLayout* self) { +int QGraphicsLinearLayout_Orientation(const QGraphicsLinearLayout* self) { Qt::Orientation _ret = self->orientation(); - return static_cast(_ret); + return static_cast(_ret); } void QGraphicsLinearLayout_AddItem(QGraphicsLinearLayout* self, QGraphicsLayoutItem* item) { @@ -60,7 +60,8 @@ void QGraphicsLinearLayout_SetSpacing(QGraphicsLinearLayout* self, double spacin } double QGraphicsLinearLayout_Spacing(const QGraphicsLinearLayout* self) { - return self->spacing(); + qreal _ret = self->spacing(); + return static_cast(_ret); } void QGraphicsLinearLayout_SetItemSpacing(QGraphicsLinearLayout* self, int index, double spacing) { @@ -68,7 +69,8 @@ void QGraphicsLinearLayout_SetItemSpacing(QGraphicsLinearLayout* self, int index } double QGraphicsLinearLayout_ItemSpacing(const QGraphicsLinearLayout* self, int index) { - return self->itemSpacing(static_cast(index)); + qreal _ret = self->itemSpacing(static_cast(index)); + return static_cast(_ret); } void QGraphicsLinearLayout_SetStretchFactor(QGraphicsLinearLayout* self, QGraphicsLayoutItem* item, int stretch) { @@ -104,7 +106,7 @@ void QGraphicsLinearLayout_Invalidate(QGraphicsLinearLayout* self) { self->invalidate(); } -QSizeF* QGraphicsLinearLayout_SizeHint(const QGraphicsLinearLayout* self, uintptr_t which) { +QSizeF* QGraphicsLinearLayout_SizeHint(const QGraphicsLinearLayout* self, int which) { return new QSizeF(self->sizeHint(static_cast(which))); } @@ -120,7 +122,7 @@ void QGraphicsLinearLayout_InsertStretch2(QGraphicsLinearLayout* self, int index self->insertStretch(static_cast(index), static_cast(stretch)); } -QSizeF* QGraphicsLinearLayout_SizeHint2(const QGraphicsLinearLayout* self, uintptr_t which, QSizeF* constraint) { +QSizeF* QGraphicsLinearLayout_SizeHint2(const QGraphicsLinearLayout* self, int which, QSizeF* constraint) { return new QSizeF(self->sizeHint(static_cast(which), *constraint)); } diff --git a/qt/gen_qgraphicslinearlayout.go b/qt/gen_qgraphicslinearlayout.go index 558f687..8b72d51 100644 --- a/qt/gen_qgraphicslinearlayout.go +++ b/qt/gen_qgraphicslinearlayout.go @@ -44,7 +44,7 @@ func NewQGraphicsLinearLayout() *QGraphicsLinearLayout { // NewQGraphicsLinearLayout2 constructs a new QGraphicsLinearLayout object. func NewQGraphicsLinearLayout2(orientation Orientation) *QGraphicsLinearLayout { - ret := C.QGraphicsLinearLayout_new2((C.uintptr_t)(orientation)) + ret := C.QGraphicsLinearLayout_new2((C.int)(orientation)) return newQGraphicsLinearLayout(ret) } @@ -56,12 +56,12 @@ func NewQGraphicsLinearLayout3(parent *QGraphicsLayoutItem) *QGraphicsLinearLayo // NewQGraphicsLinearLayout4 constructs a new QGraphicsLinearLayout object. func NewQGraphicsLinearLayout4(orientation Orientation, parent *QGraphicsLayoutItem) *QGraphicsLinearLayout { - ret := C.QGraphicsLinearLayout_new4((C.uintptr_t)(orientation), parent.cPointer()) + ret := C.QGraphicsLinearLayout_new4((C.int)(orientation), parent.cPointer()) return newQGraphicsLinearLayout(ret) } func (this *QGraphicsLinearLayout) SetOrientation(orientation Orientation) { - C.QGraphicsLinearLayout_SetOrientation(this.h, (C.uintptr_t)(orientation)) + C.QGraphicsLinearLayout_SetOrientation(this.h, (C.int)(orientation)) } func (this *QGraphicsLinearLayout) Orientation() Orientation { @@ -117,7 +117,7 @@ func (this *QGraphicsLinearLayout) StretchFactor(item *QGraphicsLayoutItem) int } func (this *QGraphicsLinearLayout) SetAlignment(item *QGraphicsLayoutItem, alignment int) { - C.QGraphicsLinearLayout_SetAlignment(this.h, item.cPointer(), (C.int)(alignment)) + C.QGraphicsLinearLayout_SetAlignment(this.h, item.cPointer(), alignment) } func (this *QGraphicsLinearLayout) Alignment(item *QGraphicsLayoutItem) int { @@ -141,7 +141,7 @@ func (this *QGraphicsLinearLayout) Invalidate() { } func (this *QGraphicsLinearLayout) SizeHint(which SizeHint) *QSizeF { - _ret := C.QGraphicsLinearLayout_SizeHint(this.h, (C.uintptr_t)(which)) + _ret := C.QGraphicsLinearLayout_SizeHint(this.h, (C.int)(which)) _goptr := newQSizeF(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -160,7 +160,7 @@ func (this *QGraphicsLinearLayout) InsertStretch2(index int, stretch int) { } func (this *QGraphicsLinearLayout) SizeHint2(which SizeHint, constraint *QSizeF) *QSizeF { - _ret := C.QGraphicsLinearLayout_SizeHint2(this.h, (C.uintptr_t)(which), constraint.cPointer()) + _ret := C.QGraphicsLinearLayout_SizeHint2(this.h, (C.int)(which), constraint.cPointer()) _goptr := newQSizeF(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qgraphicslinearlayout.h b/qt/gen_qgraphicslinearlayout.h index 5fbdcb0..2dcbf4a 100644 --- a/qt/gen_qgraphicslinearlayout.h +++ b/qt/gen_qgraphicslinearlayout.h @@ -26,11 +26,11 @@ typedef struct QSizeF QSizeF; #endif QGraphicsLinearLayout* QGraphicsLinearLayout_new(); -QGraphicsLinearLayout* QGraphicsLinearLayout_new2(uintptr_t orientation); +QGraphicsLinearLayout* QGraphicsLinearLayout_new2(int orientation); QGraphicsLinearLayout* QGraphicsLinearLayout_new3(QGraphicsLayoutItem* parent); -QGraphicsLinearLayout* QGraphicsLinearLayout_new4(uintptr_t orientation, QGraphicsLayoutItem* parent); -void QGraphicsLinearLayout_SetOrientation(QGraphicsLinearLayout* self, uintptr_t orientation); -uintptr_t QGraphicsLinearLayout_Orientation(const QGraphicsLinearLayout* self); +QGraphicsLinearLayout* QGraphicsLinearLayout_new4(int orientation, QGraphicsLayoutItem* parent); +void QGraphicsLinearLayout_SetOrientation(QGraphicsLinearLayout* self, int orientation); +int QGraphicsLinearLayout_Orientation(const QGraphicsLinearLayout* self); void QGraphicsLinearLayout_AddItem(QGraphicsLinearLayout* self, QGraphicsLayoutItem* item); void QGraphicsLinearLayout_AddStretch(QGraphicsLinearLayout* self); void QGraphicsLinearLayout_InsertItem(QGraphicsLinearLayout* self, int index, QGraphicsLayoutItem* item); @@ -49,11 +49,11 @@ void QGraphicsLinearLayout_SetGeometry(QGraphicsLinearLayout* self, QRectF* rect int QGraphicsLinearLayout_Count(const QGraphicsLinearLayout* self); QGraphicsLayoutItem* QGraphicsLinearLayout_ItemAt(const QGraphicsLinearLayout* self, int index); void QGraphicsLinearLayout_Invalidate(QGraphicsLinearLayout* self); -QSizeF* QGraphicsLinearLayout_SizeHint(const QGraphicsLinearLayout* self, uintptr_t which); +QSizeF* QGraphicsLinearLayout_SizeHint(const QGraphicsLinearLayout* self, int which); void QGraphicsLinearLayout_Dump(const QGraphicsLinearLayout* self); void QGraphicsLinearLayout_AddStretch1(QGraphicsLinearLayout* self, int stretch); void QGraphicsLinearLayout_InsertStretch2(QGraphicsLinearLayout* self, int index, int stretch); -QSizeF* QGraphicsLinearLayout_SizeHint2(const QGraphicsLinearLayout* self, uintptr_t which, QSizeF* constraint); +QSizeF* QGraphicsLinearLayout_SizeHint2(const QGraphicsLinearLayout* self, int which, QSizeF* constraint); void QGraphicsLinearLayout_Dump1(const QGraphicsLinearLayout* self, int indent); void QGraphicsLinearLayout_Delete(QGraphicsLinearLayout* self); diff --git a/qt/gen_qgraphicsproxywidget.go b/qt/gen_qgraphicsproxywidget.go index c5e13c5..9cc8f26 100644 --- a/qt/gen_qgraphicsproxywidget.go +++ b/qt/gen_qgraphicsproxywidget.go @@ -56,7 +56,7 @@ func NewQGraphicsProxyWidget2(parent *QGraphicsItem) *QGraphicsProxyWidget { // NewQGraphicsProxyWidget3 constructs a new QGraphicsProxyWidget object. func NewQGraphicsProxyWidget3(parent *QGraphicsItem, wFlags int) *QGraphicsProxyWidget { - ret := C.QGraphicsProxyWidget_new3(parent.cPointer(), (C.int)(wFlags)) + ret := C.QGraphicsProxyWidget_new3(parent.cPointer(), wFlags) return newQGraphicsProxyWidget(ret) } diff --git a/qt/gen_qgraphicsscene.cpp b/qt/gen_qgraphicsscene.cpp index b1b524b..a59f748 100644 --- a/qt/gen_qgraphicsscene.cpp +++ b/qt/gen_qgraphicsscene.cpp @@ -83,11 +83,13 @@ QRectF* QGraphicsScene_SceneRect(const QGraphicsScene* self) { } double QGraphicsScene_Width(const QGraphicsScene* self) { - return self->width(); + qreal _ret = self->width(); + return static_cast(_ret); } double QGraphicsScene_Height(const QGraphicsScene* self) { - return self->height(); + qreal _ret = self->height(); + return static_cast(_ret); } void QGraphicsScene_SetSceneRect(QGraphicsScene* self, QRectF* rect) { @@ -102,12 +104,12 @@ void QGraphicsScene_Render(QGraphicsScene* self, QPainter* painter) { self->render(painter); } -uintptr_t QGraphicsScene_ItemIndexMethod(const QGraphicsScene* self) { +int QGraphicsScene_ItemIndexMethod(const QGraphicsScene* self) { QGraphicsScene::ItemIndexMethod _ret = self->itemIndexMethod(); - return static_cast(_ret); + return static_cast(_ret); } -void QGraphicsScene_SetItemIndexMethod(QGraphicsScene* self, uintptr_t method) { +void QGraphicsScene_SetItemIndexMethod(QGraphicsScene* self, int method) { self->setItemIndexMethod(static_cast(method)); } @@ -132,7 +134,7 @@ QRectF* QGraphicsScene_ItemsBoundingRect(const QGraphicsScene* self) { } struct miqt_array* QGraphicsScene_Items(const QGraphicsScene* self) { - QList _ret = self->items(); + QList _ret = self->items(); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -145,7 +147,7 @@ struct miqt_array* QGraphicsScene_Items(const QGraphicsScene* self) { } struct miqt_array* QGraphicsScene_ItemsWithPos(const QGraphicsScene* self, QPointF* pos) { - QList _ret = self->items(*pos); + QList _ret = self->items(*pos); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -158,7 +160,7 @@ struct miqt_array* QGraphicsScene_ItemsWithPos(const QGraphicsScene* self, QPoin } struct miqt_array* QGraphicsScene_ItemsWithRect(const QGraphicsScene* self, QRectF* rect) { - QList _ret = self->items(*rect); + QList _ret = self->items(*rect); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -171,7 +173,7 @@ struct miqt_array* QGraphicsScene_ItemsWithRect(const QGraphicsScene* self, QRec } struct miqt_array* QGraphicsScene_ItemsWithPath(const QGraphicsScene* self, QPainterPath* path) { - QList _ret = self->items(*path); + QList _ret = self->items(*path); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -184,7 +186,7 @@ struct miqt_array* QGraphicsScene_ItemsWithPath(const QGraphicsScene* self, QPai } struct miqt_array* QGraphicsScene_CollidingItems(const QGraphicsScene* self, QGraphicsItem* item) { - QList _ret = self->collidingItems(item); + QList _ret = self->collidingItems(item); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -200,8 +202,8 @@ QGraphicsItem* QGraphicsScene_ItemAt(const QGraphicsScene* self, QPointF* pos, Q return self->itemAt(*pos, *deviceTransform); } -struct miqt_array* QGraphicsScene_Items2(const QGraphicsScene* self, double x, double y, double w, double h, uintptr_t mode, uintptr_t order) { - QList _ret = self->items(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(mode), static_cast(order)); +struct miqt_array* QGraphicsScene_Items2(const QGraphicsScene* self, double x, double y, double w, double h, int mode, int order) { + QList _ret = self->items(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(mode), static_cast(order)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -218,7 +220,7 @@ QGraphicsItem* QGraphicsScene_ItemAt2(const QGraphicsScene* self, double x, doub } struct miqt_array* QGraphicsScene_SelectedItems(const QGraphicsScene* self) { - QList _ret = self->selectedItems(); + QList _ret = self->selectedItems(); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -242,7 +244,7 @@ void QGraphicsScene_SetSelectionAreaWithPath(QGraphicsScene* self, QPainterPath* self->setSelectionArea(*path); } -void QGraphicsScene_SetSelectionArea2(QGraphicsScene* self, QPainterPath* path, uintptr_t selectionOperation) { +void QGraphicsScene_SetSelectionArea2(QGraphicsScene* self, QPainterPath* path, int selectionOperation) { self->setSelectionArea(*path, static_cast(selectionOperation)); } @@ -362,12 +364,12 @@ void QGraphicsScene_SetForegroundBrush(QGraphicsScene* self, QBrush* brush) { self->setForegroundBrush(*brush); } -QVariant* QGraphicsScene_InputMethodQuery(const QGraphicsScene* self, uintptr_t query) { +QVariant* QGraphicsScene_InputMethodQuery(const QGraphicsScene* self, int query) { return new QVariant(self->inputMethodQuery(static_cast(query))); } struct miqt_array* QGraphicsScene_Views(const QGraphicsScene* self) { - QList _ret = self->views(); + QList _ret = self->views(); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsView** _arr = static_cast(malloc(sizeof(QGraphicsView*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -436,7 +438,8 @@ bool QGraphicsScene_SendEvent(QGraphicsScene* self, QGraphicsItem* item, QEvent* } double QGraphicsScene_MinimumRenderSize(const QGraphicsScene* self) { - return self->minimumRenderSize(); + qreal _ret = self->minimumRenderSize(); + return static_cast(_ret); } void QGraphicsScene_SetMinimumRenderSize(QGraphicsScene* self, double minSize) { @@ -520,7 +523,7 @@ void QGraphicsScene_connect_SelectionChanged(QGraphicsScene* self, void* slot) { }); } -void QGraphicsScene_FocusItemChanged(QGraphicsScene* self, QGraphicsItem* newFocus, QGraphicsItem* oldFocus, uintptr_t reason) { +void QGraphicsScene_FocusItemChanged(QGraphicsScene* self, QGraphicsItem* newFocus, QGraphicsItem* oldFocus, int reason) { self->focusItemChanged(newFocus, oldFocus, static_cast(reason)); } @@ -529,7 +532,7 @@ void QGraphicsScene_connect_FocusItemChanged(QGraphicsScene* self, void* slot) { QGraphicsItem* sigval1 = newFocus; QGraphicsItem* sigval2 = oldFocus; Qt::FocusReason reason_ret = reason; - uintptr_t sigval3 = static_cast(reason_ret); + int sigval3 = static_cast(reason_ret); miqt_exec_callback_QGraphicsScene_FocusItemChanged(slot, sigval1, sigval2, sigval3); }); } @@ -570,12 +573,12 @@ void QGraphicsScene_Render3(QGraphicsScene* self, QPainter* painter, QRectF* tar self->render(painter, *target, *source); } -void QGraphicsScene_Render4(QGraphicsScene* self, QPainter* painter, QRectF* target, QRectF* source, uintptr_t aspectRatioMode) { +void QGraphicsScene_Render4(QGraphicsScene* self, QPainter* painter, QRectF* target, QRectF* source, int aspectRatioMode) { self->render(painter, *target, *source, static_cast(aspectRatioMode)); } -struct miqt_array* QGraphicsScene_Items1(const QGraphicsScene* self, uintptr_t order) { - QList _ret = self->items(static_cast(order)); +struct miqt_array* QGraphicsScene_Items1(const QGraphicsScene* self, int order) { + QList _ret = self->items(static_cast(order)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -587,8 +590,8 @@ struct miqt_array* QGraphicsScene_Items1(const QGraphicsScene* self, uintptr_t o return _out; } -struct miqt_array* QGraphicsScene_Items22(const QGraphicsScene* self, QPointF* pos, uintptr_t mode) { - QList _ret = self->items(*pos, static_cast(mode)); +struct miqt_array* QGraphicsScene_Items22(const QGraphicsScene* self, QPointF* pos, int mode) { + QList _ret = self->items(*pos, static_cast(mode)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -600,8 +603,8 @@ struct miqt_array* QGraphicsScene_Items22(const QGraphicsScene* self, QPointF* p return _out; } -struct miqt_array* QGraphicsScene_Items3(const QGraphicsScene* self, QPointF* pos, uintptr_t mode, uintptr_t order) { - QList _ret = self->items(*pos, static_cast(mode), static_cast(order)); +struct miqt_array* QGraphicsScene_Items3(const QGraphicsScene* self, QPointF* pos, int mode, int order) { + QList _ret = self->items(*pos, static_cast(mode), static_cast(order)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -613,8 +616,8 @@ struct miqt_array* QGraphicsScene_Items3(const QGraphicsScene* self, QPointF* po return _out; } -struct miqt_array* QGraphicsScene_Items4(const QGraphicsScene* self, QPointF* pos, uintptr_t mode, uintptr_t order, QTransform* deviceTransform) { - QList _ret = self->items(*pos, static_cast(mode), static_cast(order), *deviceTransform); +struct miqt_array* QGraphicsScene_Items4(const QGraphicsScene* self, QPointF* pos, int mode, int order, QTransform* deviceTransform) { + QList _ret = self->items(*pos, static_cast(mode), static_cast(order), *deviceTransform); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -626,8 +629,8 @@ struct miqt_array* QGraphicsScene_Items4(const QGraphicsScene* self, QPointF* po return _out; } -struct miqt_array* QGraphicsScene_Items23(const QGraphicsScene* self, QRectF* rect, uintptr_t mode) { - QList _ret = self->items(*rect, static_cast(mode)); +struct miqt_array* QGraphicsScene_Items23(const QGraphicsScene* self, QRectF* rect, int mode) { + QList _ret = self->items(*rect, static_cast(mode)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -639,8 +642,8 @@ struct miqt_array* QGraphicsScene_Items23(const QGraphicsScene* self, QRectF* re return _out; } -struct miqt_array* QGraphicsScene_Items32(const QGraphicsScene* self, QRectF* rect, uintptr_t mode, uintptr_t order) { - QList _ret = self->items(*rect, static_cast(mode), static_cast(order)); +struct miqt_array* QGraphicsScene_Items32(const QGraphicsScene* self, QRectF* rect, int mode, int order) { + QList _ret = self->items(*rect, static_cast(mode), static_cast(order)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -652,8 +655,8 @@ struct miqt_array* QGraphicsScene_Items32(const QGraphicsScene* self, QRectF* re return _out; } -struct miqt_array* QGraphicsScene_Items42(const QGraphicsScene* self, QRectF* rect, uintptr_t mode, uintptr_t order, QTransform* deviceTransform) { - QList _ret = self->items(*rect, static_cast(mode), static_cast(order), *deviceTransform); +struct miqt_array* QGraphicsScene_Items42(const QGraphicsScene* self, QRectF* rect, int mode, int order, QTransform* deviceTransform) { + QList _ret = self->items(*rect, static_cast(mode), static_cast(order), *deviceTransform); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -665,8 +668,8 @@ struct miqt_array* QGraphicsScene_Items42(const QGraphicsScene* self, QRectF* re return _out; } -struct miqt_array* QGraphicsScene_Items25(const QGraphicsScene* self, QPainterPath* path, uintptr_t mode) { - QList _ret = self->items(*path, static_cast(mode)); +struct miqt_array* QGraphicsScene_Items25(const QGraphicsScene* self, QPainterPath* path, int mode) { + QList _ret = self->items(*path, static_cast(mode)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -678,8 +681,8 @@ struct miqt_array* QGraphicsScene_Items25(const QGraphicsScene* self, QPainterPa return _out; } -struct miqt_array* QGraphicsScene_Items34(const QGraphicsScene* self, QPainterPath* path, uintptr_t mode, uintptr_t order) { - QList _ret = self->items(*path, static_cast(mode), static_cast(order)); +struct miqt_array* QGraphicsScene_Items34(const QGraphicsScene* self, QPainterPath* path, int mode, int order) { + QList _ret = self->items(*path, static_cast(mode), static_cast(order)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -691,8 +694,8 @@ struct miqt_array* QGraphicsScene_Items34(const QGraphicsScene* self, QPainterPa return _out; } -struct miqt_array* QGraphicsScene_Items44(const QGraphicsScene* self, QPainterPath* path, uintptr_t mode, uintptr_t order, QTransform* deviceTransform) { - QList _ret = self->items(*path, static_cast(mode), static_cast(order), *deviceTransform); +struct miqt_array* QGraphicsScene_Items44(const QGraphicsScene* self, QPainterPath* path, int mode, int order, QTransform* deviceTransform) { + QList _ret = self->items(*path, static_cast(mode), static_cast(order), *deviceTransform); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -704,8 +707,8 @@ struct miqt_array* QGraphicsScene_Items44(const QGraphicsScene* self, QPainterPa return _out; } -struct miqt_array* QGraphicsScene_CollidingItems2(const QGraphicsScene* self, QGraphicsItem* item, uintptr_t mode) { - QList _ret = self->collidingItems(item, static_cast(mode)); +struct miqt_array* QGraphicsScene_CollidingItems2(const QGraphicsScene* self, QGraphicsItem* item, int mode) { + QList _ret = self->collidingItems(item, static_cast(mode)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -717,8 +720,8 @@ struct miqt_array* QGraphicsScene_CollidingItems2(const QGraphicsScene* self, QG return _out; } -struct miqt_array* QGraphicsScene_Items7(const QGraphicsScene* self, double x, double y, double w, double h, uintptr_t mode, uintptr_t order, QTransform* deviceTransform) { - QList _ret = self->items(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(mode), static_cast(order), *deviceTransform); +struct miqt_array* QGraphicsScene_Items7(const QGraphicsScene* self, double x, double y, double w, double h, int mode, int order, QTransform* deviceTransform) { + QList _ret = self->items(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(mode), static_cast(order), *deviceTransform); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -730,19 +733,19 @@ struct miqt_array* QGraphicsScene_Items7(const QGraphicsScene* self, double x, d return _out; } -void QGraphicsScene_SetSelectionArea22(QGraphicsScene* self, QPainterPath* path, uintptr_t mode) { +void QGraphicsScene_SetSelectionArea22(QGraphicsScene* self, QPainterPath* path, int mode) { self->setSelectionArea(*path, static_cast(mode)); } -void QGraphicsScene_SetSelectionArea3(QGraphicsScene* self, QPainterPath* path, uintptr_t mode, QTransform* deviceTransform) { +void QGraphicsScene_SetSelectionArea3(QGraphicsScene* self, QPainterPath* path, int mode, QTransform* deviceTransform) { self->setSelectionArea(*path, static_cast(mode), *deviceTransform); } -void QGraphicsScene_SetSelectionArea32(QGraphicsScene* self, QPainterPath* path, uintptr_t selectionOperation, uintptr_t mode) { +void QGraphicsScene_SetSelectionArea32(QGraphicsScene* self, QPainterPath* path, int selectionOperation, int mode) { self->setSelectionArea(*path, static_cast(selectionOperation), static_cast(mode)); } -void QGraphicsScene_SetSelectionArea4(QGraphicsScene* self, QPainterPath* path, uintptr_t selectionOperation, uintptr_t mode, QTransform* deviceTransform) { +void QGraphicsScene_SetSelectionArea4(QGraphicsScene* self, QPainterPath* path, int selectionOperation, int mode, QTransform* deviceTransform) { self->setSelectionArea(*path, static_cast(selectionOperation), static_cast(mode), *deviceTransform); } @@ -808,11 +811,11 @@ QGraphicsRectItem* QGraphicsScene_AddRect6(QGraphicsScene* self, double x, doubl return self->addRect(static_cast(x), static_cast(y), static_cast(w), static_cast(h), *pen, *brush); } -void QGraphicsScene_SetFocusItem2(QGraphicsScene* self, QGraphicsItem* item, uintptr_t focusReason) { +void QGraphicsScene_SetFocusItem2(QGraphicsScene* self, QGraphicsItem* item, int focusReason) { self->setFocusItem(item, static_cast(focusReason)); } -void QGraphicsScene_SetFocus1(QGraphicsScene* self, uintptr_t focusReason) { +void QGraphicsScene_SetFocus1(QGraphicsScene* self, int focusReason) { self->setFocus(static_cast(focusReason)); } diff --git a/qt/gen_qgraphicsscene.go b/qt/gen_qgraphicsscene.go index 6a7e635..8190d0a 100644 --- a/qt/gen_qgraphicsscene.go +++ b/qt/gen_qgraphicsscene.go @@ -143,7 +143,7 @@ func (this *QGraphicsScene) ItemIndexMethod() QGraphicsScene__ItemIndexMethod { } func (this *QGraphicsScene) SetItemIndexMethod(method QGraphicsScene__ItemIndexMethod) { - C.QGraphicsScene_SetItemIndexMethod(this.h, (C.uintptr_t)(method)) + C.QGraphicsScene_SetItemIndexMethod(this.h, (C.int)(method)) } func (this *QGraphicsScene) IsSortCacheEnabled() bool { @@ -229,7 +229,7 @@ func (this *QGraphicsScene) ItemAt(pos *QPointF, deviceTransform *QTransform) *Q } func (this *QGraphicsScene) Items2(x float64, y float64, w float64, h float64, mode ItemSelectionMode, order SortOrder) []*QGraphicsItem { - var _ma *C.struct_miqt_array = 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)) + var _ma *C.struct_miqt_array = C.QGraphicsScene_Items2(this.h, (C.double)(x), (C.double)(y), (C.double)(w), (C.double)(h), (C.int)(mode), (C.int)(order)) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -270,7 +270,7 @@ func (this *QGraphicsScene) SetSelectionAreaWithPath(path *QPainterPath) { } func (this *QGraphicsScene) SetSelectionArea2(path *QPainterPath, selectionOperation ItemSelectionOperation) { - C.QGraphicsScene_SetSelectionArea2(this.h, path.cPointer(), (C.uintptr_t)(selectionOperation)) + C.QGraphicsScene_SetSelectionArea2(this.h, path.cPointer(), (C.int)(selectionOperation)) } func (this *QGraphicsScene) CreateItemGroup(items []*QGraphicsItem) *QGraphicsItemGroup { @@ -400,7 +400,7 @@ func (this *QGraphicsScene) SetForegroundBrush(brush *QBrush) { } func (this *QGraphicsScene) InputMethodQuery(query InputMethodQuery) *QVariant { - _ret := C.QGraphicsScene_InputMethodQuery(this.h, (C.uintptr_t)(query)) + _ret := C.QGraphicsScene_InputMethodQuery(this.h, (C.int)(query)) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -591,14 +591,14 @@ func miqt_exec_callback_QGraphicsScene_SelectionChanged(cb *C.void) { } func (this *QGraphicsScene) FocusItemChanged(newFocus *QGraphicsItem, oldFocus *QGraphicsItem, reason FocusReason) { - C.QGraphicsScene_FocusItemChanged(this.h, newFocus.cPointer(), oldFocus.cPointer(), (C.uintptr_t)(reason)) + C.QGraphicsScene_FocusItemChanged(this.h, newFocus.cPointer(), oldFocus.cPointer(), (C.int)(reason)) } func (this *QGraphicsScene) OnFocusItemChanged(slot func(newFocus *QGraphicsItem, oldFocus *QGraphicsItem, reason FocusReason)) { C.QGraphicsScene_connect_FocusItemChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QGraphicsScene_FocusItemChanged -func miqt_exec_callback_QGraphicsScene_FocusItemChanged(cb *C.void, newFocus *C.QGraphicsItem, oldFocus *C.QGraphicsItem, reason C.uintptr_t) { +func miqt_exec_callback_QGraphicsScene_FocusItemChanged(cb *C.void, newFocus *C.QGraphicsItem, oldFocus *C.QGraphicsItem, reason C.int) { gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(newFocus *QGraphicsItem, oldFocus *QGraphicsItem, reason FocusReason)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -665,11 +665,11 @@ func (this *QGraphicsScene) Render3(painter *QPainter, target *QRectF, source *Q } 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)) + C.QGraphicsScene_Render4(this.h, painter.cPointer(), target.cPointer(), source.cPointer(), (C.int)(aspectRatioMode)) } func (this *QGraphicsScene) Items1(order SortOrder) []*QGraphicsItem { - var _ma *C.struct_miqt_array = C.QGraphicsScene_Items1(this.h, (C.uintptr_t)(order)) + var _ma *C.struct_miqt_array = C.QGraphicsScene_Items1(this.h, (C.int)(order)) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -680,7 +680,7 @@ func (this *QGraphicsScene) Items1(order SortOrder) []*QGraphicsItem { } func (this *QGraphicsScene) Items22(pos *QPointF, mode ItemSelectionMode) []*QGraphicsItem { - var _ma *C.struct_miqt_array = C.QGraphicsScene_Items22(this.h, pos.cPointer(), (C.uintptr_t)(mode)) + var _ma *C.struct_miqt_array = C.QGraphicsScene_Items22(this.h, pos.cPointer(), (C.int)(mode)) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -691,7 +691,7 @@ func (this *QGraphicsScene) Items22(pos *QPointF, mode ItemSelectionMode) []*QGr } func (this *QGraphicsScene) Items3(pos *QPointF, mode ItemSelectionMode, order SortOrder) []*QGraphicsItem { - var _ma *C.struct_miqt_array = C.QGraphicsScene_Items3(this.h, pos.cPointer(), (C.uintptr_t)(mode), (C.uintptr_t)(order)) + var _ma *C.struct_miqt_array = C.QGraphicsScene_Items3(this.h, pos.cPointer(), (C.int)(mode), (C.int)(order)) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -702,7 +702,7 @@ func (this *QGraphicsScene) Items3(pos *QPointF, mode ItemSelectionMode, order S } func (this *QGraphicsScene) Items4(pos *QPointF, mode ItemSelectionMode, order SortOrder, deviceTransform *QTransform) []*QGraphicsItem { - var _ma *C.struct_miqt_array = C.QGraphicsScene_Items4(this.h, pos.cPointer(), (C.uintptr_t)(mode), (C.uintptr_t)(order), deviceTransform.cPointer()) + var _ma *C.struct_miqt_array = C.QGraphicsScene_Items4(this.h, pos.cPointer(), (C.int)(mode), (C.int)(order), deviceTransform.cPointer()) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -713,7 +713,7 @@ func (this *QGraphicsScene) Items4(pos *QPointF, mode ItemSelectionMode, order S } func (this *QGraphicsScene) Items23(rect *QRectF, mode ItemSelectionMode) []*QGraphicsItem { - var _ma *C.struct_miqt_array = C.QGraphicsScene_Items23(this.h, rect.cPointer(), (C.uintptr_t)(mode)) + var _ma *C.struct_miqt_array = C.QGraphicsScene_Items23(this.h, rect.cPointer(), (C.int)(mode)) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -724,7 +724,7 @@ func (this *QGraphicsScene) Items23(rect *QRectF, mode ItemSelectionMode) []*QGr } func (this *QGraphicsScene) Items32(rect *QRectF, mode ItemSelectionMode, order SortOrder) []*QGraphicsItem { - var _ma *C.struct_miqt_array = C.QGraphicsScene_Items32(this.h, rect.cPointer(), (C.uintptr_t)(mode), (C.uintptr_t)(order)) + var _ma *C.struct_miqt_array = C.QGraphicsScene_Items32(this.h, rect.cPointer(), (C.int)(mode), (C.int)(order)) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -735,7 +735,7 @@ func (this *QGraphicsScene) Items32(rect *QRectF, mode ItemSelectionMode, order } func (this *QGraphicsScene) Items42(rect *QRectF, mode ItemSelectionMode, order SortOrder, deviceTransform *QTransform) []*QGraphicsItem { - var _ma *C.struct_miqt_array = C.QGraphicsScene_Items42(this.h, rect.cPointer(), (C.uintptr_t)(mode), (C.uintptr_t)(order), deviceTransform.cPointer()) + var _ma *C.struct_miqt_array = C.QGraphicsScene_Items42(this.h, rect.cPointer(), (C.int)(mode), (C.int)(order), deviceTransform.cPointer()) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -746,7 +746,7 @@ func (this *QGraphicsScene) Items42(rect *QRectF, mode ItemSelectionMode, order } func (this *QGraphicsScene) Items25(path *QPainterPath, mode ItemSelectionMode) []*QGraphicsItem { - var _ma *C.struct_miqt_array = C.QGraphicsScene_Items25(this.h, path.cPointer(), (C.uintptr_t)(mode)) + var _ma *C.struct_miqt_array = C.QGraphicsScene_Items25(this.h, path.cPointer(), (C.int)(mode)) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -757,7 +757,7 @@ func (this *QGraphicsScene) Items25(path *QPainterPath, mode ItemSelectionMode) } func (this *QGraphicsScene) Items34(path *QPainterPath, mode ItemSelectionMode, order SortOrder) []*QGraphicsItem { - var _ma *C.struct_miqt_array = C.QGraphicsScene_Items34(this.h, path.cPointer(), (C.uintptr_t)(mode), (C.uintptr_t)(order)) + var _ma *C.struct_miqt_array = C.QGraphicsScene_Items34(this.h, path.cPointer(), (C.int)(mode), (C.int)(order)) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -768,7 +768,7 @@ func (this *QGraphicsScene) Items34(path *QPainterPath, mode ItemSelectionMode, } func (this *QGraphicsScene) Items44(path *QPainterPath, mode ItemSelectionMode, order SortOrder, deviceTransform *QTransform) []*QGraphicsItem { - var _ma *C.struct_miqt_array = C.QGraphicsScene_Items44(this.h, path.cPointer(), (C.uintptr_t)(mode), (C.uintptr_t)(order), deviceTransform.cPointer()) + var _ma *C.struct_miqt_array = C.QGraphicsScene_Items44(this.h, path.cPointer(), (C.int)(mode), (C.int)(order), deviceTransform.cPointer()) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -779,7 +779,7 @@ func (this *QGraphicsScene) Items44(path *QPainterPath, mode ItemSelectionMode, } func (this *QGraphicsScene) CollidingItems2(item *QGraphicsItem, mode ItemSelectionMode) []*QGraphicsItem { - var _ma *C.struct_miqt_array = C.QGraphicsScene_CollidingItems2(this.h, item.cPointer(), (C.uintptr_t)(mode)) + var _ma *C.struct_miqt_array = C.QGraphicsScene_CollidingItems2(this.h, item.cPointer(), (C.int)(mode)) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -790,7 +790,7 @@ func (this *QGraphicsScene) CollidingItems2(item *QGraphicsItem, mode ItemSelect } func (this *QGraphicsScene) Items7(x float64, y float64, w float64, h float64, mode ItemSelectionMode, order SortOrder, deviceTransform *QTransform) []*QGraphicsItem { - var _ma *C.struct_miqt_array = 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()) + var _ma *C.struct_miqt_array = C.QGraphicsScene_Items7(this.h, (C.double)(x), (C.double)(y), (C.double)(w), (C.double)(h), (C.int)(mode), (C.int)(order), deviceTransform.cPointer()) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -801,19 +801,19 @@ func (this *QGraphicsScene) Items7(x float64, y float64, w float64, h float64, m } func (this *QGraphicsScene) SetSelectionArea22(path *QPainterPath, mode ItemSelectionMode) { - C.QGraphicsScene_SetSelectionArea22(this.h, path.cPointer(), (C.uintptr_t)(mode)) + C.QGraphicsScene_SetSelectionArea22(this.h, path.cPointer(), (C.int)(mode)) } func (this *QGraphicsScene) SetSelectionArea3(path *QPainterPath, mode ItemSelectionMode, deviceTransform *QTransform) { - C.QGraphicsScene_SetSelectionArea3(this.h, path.cPointer(), (C.uintptr_t)(mode), deviceTransform.cPointer()) + C.QGraphicsScene_SetSelectionArea3(this.h, path.cPointer(), (C.int)(mode), deviceTransform.cPointer()) } 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)) + C.QGraphicsScene_SetSelectionArea32(this.h, path.cPointer(), (C.int)(selectionOperation), (C.int)(mode)) } 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()) + C.QGraphicsScene_SetSelectionArea4(this.h, path.cPointer(), (C.int)(selectionOperation), (C.int)(mode), deviceTransform.cPointer()) } func (this *QGraphicsScene) AddEllipse22(rect *QRectF, pen *QPen) *QGraphicsEllipseItem { @@ -857,7 +857,7 @@ func (this *QGraphicsScene) AddSimpleText2(text string, font *QFont) *QGraphicsS } func (this *QGraphicsScene) AddWidget2(widget *QWidget, wFlags int) *QGraphicsProxyWidget { - return newQGraphicsProxyWidget_U(unsafe.Pointer(C.QGraphicsScene_AddWidget2(this.h, widget.cPointer(), (C.int)(wFlags)))) + return newQGraphicsProxyWidget_U(unsafe.Pointer(C.QGraphicsScene_AddWidget2(this.h, widget.cPointer(), wFlags))) } func (this *QGraphicsScene) AddEllipse5(x float64, y float64, w float64, h float64, pen *QPen) *QGraphicsEllipseItem { @@ -881,15 +881,15 @@ func (this *QGraphicsScene) AddRect6(x float64, y float64, w float64, h float64, } func (this *QGraphicsScene) SetFocusItem2(item *QGraphicsItem, focusReason FocusReason) { - C.QGraphicsScene_SetFocusItem2(this.h, item.cPointer(), (C.uintptr_t)(focusReason)) + C.QGraphicsScene_SetFocusItem2(this.h, item.cPointer(), (C.int)(focusReason)) } func (this *QGraphicsScene) SetFocus1(focusReason FocusReason) { - C.QGraphicsScene_SetFocus1(this.h, (C.uintptr_t)(focusReason)) + C.QGraphicsScene_SetFocus1(this.h, (C.int)(focusReason)) } func (this *QGraphicsScene) Invalidate5(x float64, y float64, w float64, h float64, layers int) { - C.QGraphicsScene_Invalidate5(this.h, (C.double)(x), (C.double)(y), (C.double)(w), (C.double)(h), (C.int)(layers)) + C.QGraphicsScene_Invalidate5(this.h, (C.double)(x), (C.double)(y), (C.double)(w), (C.double)(h), layers) } func (this *QGraphicsScene) Update1(rect *QRectF) { @@ -901,7 +901,7 @@ func (this *QGraphicsScene) Invalidate1(rect *QRectF) { } func (this *QGraphicsScene) Invalidate22(rect *QRectF, layers int) { - C.QGraphicsScene_Invalidate22(this.h, rect.cPointer(), (C.int)(layers)) + C.QGraphicsScene_Invalidate22(this.h, rect.cPointer(), layers) } // Delete this object from C++ memory. diff --git a/qt/gen_qgraphicsscene.h b/qt/gen_qgraphicsscene.h index 4bd581f..b8801c7 100644 --- a/qt/gen_qgraphicsscene.h +++ b/qt/gen_qgraphicsscene.h @@ -92,8 +92,8 @@ double QGraphicsScene_Height(const QGraphicsScene* self); void QGraphicsScene_SetSceneRect(QGraphicsScene* self, QRectF* rect); void QGraphicsScene_SetSceneRect2(QGraphicsScene* self, double x, double y, double w, double h); void QGraphicsScene_Render(QGraphicsScene* self, QPainter* painter); -uintptr_t QGraphicsScene_ItemIndexMethod(const QGraphicsScene* self); -void QGraphicsScene_SetItemIndexMethod(QGraphicsScene* self, uintptr_t method); +int QGraphicsScene_ItemIndexMethod(const QGraphicsScene* self); +void QGraphicsScene_SetItemIndexMethod(QGraphicsScene* self, int method); bool QGraphicsScene_IsSortCacheEnabled(const QGraphicsScene* self); void QGraphicsScene_SetSortCacheEnabled(QGraphicsScene* self, bool enabled); int QGraphicsScene_BspTreeDepth(const QGraphicsScene* self); @@ -105,13 +105,13 @@ struct miqt_array* QGraphicsScene_ItemsWithRect(const QGraphicsScene* self, QRec struct miqt_array* QGraphicsScene_ItemsWithPath(const QGraphicsScene* self, QPainterPath* path); struct miqt_array* QGraphicsScene_CollidingItems(const QGraphicsScene* self, QGraphicsItem* item); QGraphicsItem* QGraphicsScene_ItemAt(const QGraphicsScene* self, QPointF* pos, QTransform* deviceTransform); -struct miqt_array* QGraphicsScene_Items2(const QGraphicsScene* self, double x, double y, double w, double h, uintptr_t mode, uintptr_t order); +struct miqt_array* QGraphicsScene_Items2(const QGraphicsScene* self, double x, double y, double w, double h, int mode, int order); QGraphicsItem* QGraphicsScene_ItemAt2(const QGraphicsScene* self, double x, double y, QTransform* deviceTransform); struct miqt_array* QGraphicsScene_SelectedItems(const QGraphicsScene* self); QPainterPath* QGraphicsScene_SelectionArea(const QGraphicsScene* self); void QGraphicsScene_SetSelectionArea(QGraphicsScene* self, QPainterPath* path, QTransform* deviceTransform); void QGraphicsScene_SetSelectionAreaWithPath(QGraphicsScene* self, QPainterPath* path); -void QGraphicsScene_SetSelectionArea2(QGraphicsScene* self, QPainterPath* path, uintptr_t selectionOperation); +void QGraphicsScene_SetSelectionArea2(QGraphicsScene* self, QPainterPath* path, int selectionOperation); QGraphicsItemGroup* QGraphicsScene_CreateItemGroup(QGraphicsScene* self, struct miqt_array* /* of QGraphicsItem* */ items); void QGraphicsScene_DestroyItemGroup(QGraphicsScene* self, QGraphicsItemGroup* group); void QGraphicsScene_AddItem(QGraphicsScene* self, QGraphicsItem* item); @@ -139,7 +139,7 @@ QBrush* QGraphicsScene_BackgroundBrush(const QGraphicsScene* self); void QGraphicsScene_SetBackgroundBrush(QGraphicsScene* self, QBrush* brush); QBrush* QGraphicsScene_ForegroundBrush(const QGraphicsScene* self); void QGraphicsScene_SetForegroundBrush(QGraphicsScene* self, QBrush* brush); -QVariant* QGraphicsScene_InputMethodQuery(const QGraphicsScene* self, uintptr_t query); +QVariant* QGraphicsScene_InputMethodQuery(const QGraphicsScene* self, int query); struct miqt_array* QGraphicsScene_Views(const QGraphicsScene* self); void QGraphicsScene_Update(QGraphicsScene* self, double x, double y, double w, double h); void QGraphicsScene_Invalidate(QGraphicsScene* self, double x, double y, double w, double h); @@ -170,7 +170,7 @@ void QGraphicsScene_SceneRectChanged(QGraphicsScene* self, QRectF* rect); void QGraphicsScene_connect_SceneRectChanged(QGraphicsScene* self, void* slot); void QGraphicsScene_SelectionChanged(QGraphicsScene* self); void QGraphicsScene_connect_SelectionChanged(QGraphicsScene* self, void* slot); -void QGraphicsScene_FocusItemChanged(QGraphicsScene* self, QGraphicsItem* newFocus, QGraphicsItem* oldFocus, uintptr_t reason); +void QGraphicsScene_FocusItemChanged(QGraphicsScene* self, QGraphicsItem* newFocus, QGraphicsItem* oldFocus, int reason); void QGraphicsScene_connect_FocusItemChanged(QGraphicsScene* self, void* slot); struct miqt_string* QGraphicsScene_Tr2(const char* s, const char* c); struct miqt_string* QGraphicsScene_Tr3(const char* s, const char* c, int n); @@ -178,23 +178,23 @@ struct miqt_string* QGraphicsScene_TrUtf82(const char* s, const char* c); struct miqt_string* QGraphicsScene_TrUtf83(const char* s, const char* c, int n); void QGraphicsScene_Render2(QGraphicsScene* self, QPainter* painter, QRectF* target); void QGraphicsScene_Render3(QGraphicsScene* self, QPainter* painter, QRectF* target, QRectF* source); -void QGraphicsScene_Render4(QGraphicsScene* self, QPainter* painter, QRectF* target, QRectF* source, uintptr_t aspectRatioMode); -struct miqt_array* QGraphicsScene_Items1(const QGraphicsScene* self, uintptr_t order); -struct miqt_array* QGraphicsScene_Items22(const QGraphicsScene* self, QPointF* pos, uintptr_t mode); -struct miqt_array* QGraphicsScene_Items3(const QGraphicsScene* self, QPointF* pos, uintptr_t mode, uintptr_t order); -struct miqt_array* QGraphicsScene_Items4(const QGraphicsScene* self, QPointF* pos, uintptr_t mode, uintptr_t order, QTransform* deviceTransform); -struct miqt_array* QGraphicsScene_Items23(const QGraphicsScene* self, QRectF* rect, uintptr_t mode); -struct miqt_array* QGraphicsScene_Items32(const QGraphicsScene* self, QRectF* rect, uintptr_t mode, uintptr_t order); -struct miqt_array* QGraphicsScene_Items42(const QGraphicsScene* self, QRectF* rect, uintptr_t mode, uintptr_t order, QTransform* deviceTransform); -struct miqt_array* QGraphicsScene_Items25(const QGraphicsScene* self, QPainterPath* path, uintptr_t mode); -struct miqt_array* QGraphicsScene_Items34(const QGraphicsScene* self, QPainterPath* path, uintptr_t mode, uintptr_t order); -struct miqt_array* QGraphicsScene_Items44(const QGraphicsScene* self, QPainterPath* path, uintptr_t mode, uintptr_t order, QTransform* deviceTransform); -struct miqt_array* QGraphicsScene_CollidingItems2(const QGraphicsScene* self, QGraphicsItem* item, uintptr_t mode); -struct miqt_array* QGraphicsScene_Items7(const QGraphicsScene* self, double x, double y, double w, double h, uintptr_t mode, uintptr_t order, QTransform* deviceTransform); -void QGraphicsScene_SetSelectionArea22(QGraphicsScene* self, QPainterPath* path, uintptr_t mode); -void QGraphicsScene_SetSelectionArea3(QGraphicsScene* self, QPainterPath* path, uintptr_t mode, QTransform* deviceTransform); -void QGraphicsScene_SetSelectionArea32(QGraphicsScene* self, QPainterPath* path, uintptr_t selectionOperation, uintptr_t mode); -void QGraphicsScene_SetSelectionArea4(QGraphicsScene* self, QPainterPath* path, uintptr_t selectionOperation, uintptr_t mode, QTransform* deviceTransform); +void QGraphicsScene_Render4(QGraphicsScene* self, QPainter* painter, QRectF* target, QRectF* source, int aspectRatioMode); +struct miqt_array* QGraphicsScene_Items1(const QGraphicsScene* self, int order); +struct miqt_array* QGraphicsScene_Items22(const QGraphicsScene* self, QPointF* pos, int mode); +struct miqt_array* QGraphicsScene_Items3(const QGraphicsScene* self, QPointF* pos, int mode, int order); +struct miqt_array* QGraphicsScene_Items4(const QGraphicsScene* self, QPointF* pos, int mode, int order, QTransform* deviceTransform); +struct miqt_array* QGraphicsScene_Items23(const QGraphicsScene* self, QRectF* rect, int mode); +struct miqt_array* QGraphicsScene_Items32(const QGraphicsScene* self, QRectF* rect, int mode, int order); +struct miqt_array* QGraphicsScene_Items42(const QGraphicsScene* self, QRectF* rect, int mode, int order, QTransform* deviceTransform); +struct miqt_array* QGraphicsScene_Items25(const QGraphicsScene* self, QPainterPath* path, int mode); +struct miqt_array* QGraphicsScene_Items34(const QGraphicsScene* self, QPainterPath* path, int mode, int order); +struct miqt_array* QGraphicsScene_Items44(const QGraphicsScene* self, QPainterPath* path, int mode, int order, QTransform* deviceTransform); +struct miqt_array* QGraphicsScene_CollidingItems2(const QGraphicsScene* self, QGraphicsItem* item, int mode); +struct miqt_array* QGraphicsScene_Items7(const QGraphicsScene* self, double x, double y, double w, double h, int mode, int order, QTransform* deviceTransform); +void QGraphicsScene_SetSelectionArea22(QGraphicsScene* self, QPainterPath* path, int mode); +void QGraphicsScene_SetSelectionArea3(QGraphicsScene* self, QPainterPath* path, int mode, QTransform* deviceTransform); +void QGraphicsScene_SetSelectionArea32(QGraphicsScene* self, QPainterPath* path, int selectionOperation, int mode); +void QGraphicsScene_SetSelectionArea4(QGraphicsScene* self, QPainterPath* path, int selectionOperation, int mode, QTransform* deviceTransform); QGraphicsEllipseItem* QGraphicsScene_AddEllipse22(QGraphicsScene* self, QRectF* rect, QPen* pen); QGraphicsEllipseItem* QGraphicsScene_AddEllipse3(QGraphicsScene* self, QRectF* rect, QPen* pen, QBrush* brush); QGraphicsLineItem* QGraphicsScene_AddLine22(QGraphicsScene* self, QLineF* line, QPen* pen); @@ -210,8 +210,8 @@ QGraphicsEllipseItem* QGraphicsScene_AddEllipse6(QGraphicsScene* self, double x, QGraphicsLineItem* QGraphicsScene_AddLine5(QGraphicsScene* self, double x1, double y1, double x2, double y2, QPen* pen); QGraphicsRectItem* QGraphicsScene_AddRect5(QGraphicsScene* self, double x, double y, double w, double h, QPen* pen); QGraphicsRectItem* QGraphicsScene_AddRect6(QGraphicsScene* self, double x, double y, double w, double h, QPen* pen, QBrush* brush); -void QGraphicsScene_SetFocusItem2(QGraphicsScene* self, QGraphicsItem* item, uintptr_t focusReason); -void QGraphicsScene_SetFocus1(QGraphicsScene* self, uintptr_t focusReason); +void QGraphicsScene_SetFocusItem2(QGraphicsScene* self, QGraphicsItem* item, int focusReason); +void QGraphicsScene_SetFocus1(QGraphicsScene* self, int focusReason); void QGraphicsScene_Invalidate5(QGraphicsScene* self, double x, double y, double w, double h, int layers); void QGraphicsScene_Update1(QGraphicsScene* self, QRectF* rect); void QGraphicsScene_Invalidate1(QGraphicsScene* self, QRectF* rect); diff --git a/qt/gen_qgraphicssceneevent.cpp b/qt/gen_qgraphicssceneevent.cpp index 92ffa82..86da562 100644 --- a/qt/gen_qgraphicssceneevent.cpp +++ b/qt/gen_qgraphicssceneevent.cpp @@ -16,7 +16,7 @@ #include "gen_qgraphicssceneevent.h" #include "_cgo_export.h" -QGraphicsSceneEvent* QGraphicsSceneEvent_new(uintptr_t typeVal) { +QGraphicsSceneEvent* QGraphicsSceneEvent_new(int typeVal) { return new QGraphicsSceneEvent(static_cast(typeVal)); } @@ -36,7 +36,7 @@ QGraphicsSceneMouseEvent* QGraphicsSceneMouseEvent_new() { return new QGraphicsSceneMouseEvent(); } -QGraphicsSceneMouseEvent* QGraphicsSceneMouseEvent_new2(uintptr_t typeVal) { +QGraphicsSceneMouseEvent* QGraphicsSceneMouseEvent_new2(int typeVal) { return new QGraphicsSceneMouseEvent(static_cast(typeVal)); } @@ -64,27 +64,27 @@ void QGraphicsSceneMouseEvent_SetScreenPos(QGraphicsSceneMouseEvent* self, QPoin self->setScreenPos(*pos); } -QPointF* QGraphicsSceneMouseEvent_ButtonDownPos(const QGraphicsSceneMouseEvent* self, uintptr_t button) { +QPointF* QGraphicsSceneMouseEvent_ButtonDownPos(const QGraphicsSceneMouseEvent* self, int button) { return new QPointF(self->buttonDownPos(static_cast(button))); } -void QGraphicsSceneMouseEvent_SetButtonDownPos(QGraphicsSceneMouseEvent* self, uintptr_t button, QPointF* pos) { +void QGraphicsSceneMouseEvent_SetButtonDownPos(QGraphicsSceneMouseEvent* self, int button, QPointF* pos) { self->setButtonDownPos(static_cast(button), *pos); } -QPointF* QGraphicsSceneMouseEvent_ButtonDownScenePos(const QGraphicsSceneMouseEvent* self, uintptr_t button) { +QPointF* QGraphicsSceneMouseEvent_ButtonDownScenePos(const QGraphicsSceneMouseEvent* self, int button) { return new QPointF(self->buttonDownScenePos(static_cast(button))); } -void QGraphicsSceneMouseEvent_SetButtonDownScenePos(QGraphicsSceneMouseEvent* self, uintptr_t button, QPointF* pos) { +void QGraphicsSceneMouseEvent_SetButtonDownScenePos(QGraphicsSceneMouseEvent* self, int button, QPointF* pos) { self->setButtonDownScenePos(static_cast(button), *pos); } -QPoint* QGraphicsSceneMouseEvent_ButtonDownScreenPos(const QGraphicsSceneMouseEvent* self, uintptr_t button) { +QPoint* QGraphicsSceneMouseEvent_ButtonDownScreenPos(const QGraphicsSceneMouseEvent* self, int button) { return new QPoint(self->buttonDownScreenPos(static_cast(button))); } -void QGraphicsSceneMouseEvent_SetButtonDownScreenPos(QGraphicsSceneMouseEvent* self, uintptr_t button, QPoint* pos) { +void QGraphicsSceneMouseEvent_SetButtonDownScreenPos(QGraphicsSceneMouseEvent* self, int button, QPoint* pos) { self->setButtonDownScreenPos(static_cast(button), *pos); } @@ -121,12 +121,12 @@ void QGraphicsSceneMouseEvent_SetButtons(QGraphicsSceneMouseEvent* self, int but self->setButtons(static_cast(buttons)); } -uintptr_t QGraphicsSceneMouseEvent_Button(const QGraphicsSceneMouseEvent* self) { +int QGraphicsSceneMouseEvent_Button(const QGraphicsSceneMouseEvent* self) { Qt::MouseButton _ret = self->button(); - return static_cast(_ret); + return static_cast(_ret); } -void QGraphicsSceneMouseEvent_SetButton(QGraphicsSceneMouseEvent* self, uintptr_t button) { +void QGraphicsSceneMouseEvent_SetButton(QGraphicsSceneMouseEvent* self, int button) { self->setButton(static_cast(button)); } @@ -139,12 +139,12 @@ void QGraphicsSceneMouseEvent_SetModifiers(QGraphicsSceneMouseEvent* self, int m self->setModifiers(static_cast(modifiers)); } -uintptr_t QGraphicsSceneMouseEvent_Source(const QGraphicsSceneMouseEvent* self) { +int QGraphicsSceneMouseEvent_Source(const QGraphicsSceneMouseEvent* self) { Qt::MouseEventSource _ret = self->source(); - return static_cast(_ret); + return static_cast(_ret); } -void QGraphicsSceneMouseEvent_SetSource(QGraphicsSceneMouseEvent* self, uintptr_t source) { +void QGraphicsSceneMouseEvent_SetSource(QGraphicsSceneMouseEvent* self, int source) { self->setSource(static_cast(source)); } @@ -165,7 +165,7 @@ QGraphicsSceneWheelEvent* QGraphicsSceneWheelEvent_new() { return new QGraphicsSceneWheelEvent(); } -QGraphicsSceneWheelEvent* QGraphicsSceneWheelEvent_new2(uintptr_t typeVal) { +QGraphicsSceneWheelEvent* QGraphicsSceneWheelEvent_new2(int typeVal) { return new QGraphicsSceneWheelEvent(static_cast(typeVal)); } @@ -219,12 +219,12 @@ void QGraphicsSceneWheelEvent_SetDelta(QGraphicsSceneWheelEvent* self, int delta self->setDelta(static_cast(delta)); } -uintptr_t QGraphicsSceneWheelEvent_Orientation(const QGraphicsSceneWheelEvent* self) { +int QGraphicsSceneWheelEvent_Orientation(const QGraphicsSceneWheelEvent* self) { Qt::Orientation _ret = self->orientation(); - return static_cast(_ret); + return static_cast(_ret); } -void QGraphicsSceneWheelEvent_SetOrientation(QGraphicsSceneWheelEvent* self, uintptr_t orientation) { +void QGraphicsSceneWheelEvent_SetOrientation(QGraphicsSceneWheelEvent* self, int orientation) { self->setOrientation(static_cast(orientation)); } @@ -236,7 +236,7 @@ QGraphicsSceneContextMenuEvent* QGraphicsSceneContextMenuEvent_new() { return new QGraphicsSceneContextMenuEvent(); } -QGraphicsSceneContextMenuEvent* QGraphicsSceneContextMenuEvent_new2(uintptr_t typeVal) { +QGraphicsSceneContextMenuEvent* QGraphicsSceneContextMenuEvent_new2(int typeVal) { return new QGraphicsSceneContextMenuEvent(static_cast(typeVal)); } @@ -273,12 +273,12 @@ void QGraphicsSceneContextMenuEvent_SetModifiers(QGraphicsSceneContextMenuEvent* self->setModifiers(static_cast(modifiers)); } -uintptr_t QGraphicsSceneContextMenuEvent_Reason(const QGraphicsSceneContextMenuEvent* self) { +int QGraphicsSceneContextMenuEvent_Reason(const QGraphicsSceneContextMenuEvent* self) { QGraphicsSceneContextMenuEvent::Reason _ret = self->reason(); - return static_cast(_ret); + return static_cast(_ret); } -void QGraphicsSceneContextMenuEvent_SetReason(QGraphicsSceneContextMenuEvent* self, uintptr_t reason) { +void QGraphicsSceneContextMenuEvent_SetReason(QGraphicsSceneContextMenuEvent* self, int reason) { self->setReason(static_cast(reason)); } @@ -290,7 +290,7 @@ QGraphicsSceneHoverEvent* QGraphicsSceneHoverEvent_new() { return new QGraphicsSceneHoverEvent(); } -QGraphicsSceneHoverEvent* QGraphicsSceneHoverEvent_new2(uintptr_t typeVal) { +QGraphicsSceneHoverEvent* QGraphicsSceneHoverEvent_new2(int typeVal) { return new QGraphicsSceneHoverEvent(static_cast(typeVal)); } @@ -359,7 +359,7 @@ QGraphicsSceneHelpEvent* QGraphicsSceneHelpEvent_new() { return new QGraphicsSceneHelpEvent(); } -QGraphicsSceneHelpEvent* QGraphicsSceneHelpEvent_new2(uintptr_t typeVal) { +QGraphicsSceneHelpEvent* QGraphicsSceneHelpEvent_new2(int typeVal) { return new QGraphicsSceneHelpEvent(static_cast(typeVal)); } @@ -387,7 +387,7 @@ QGraphicsSceneDragDropEvent* QGraphicsSceneDragDropEvent_new() { return new QGraphicsSceneDragDropEvent(); } -QGraphicsSceneDragDropEvent* QGraphicsSceneDragDropEvent_new2(uintptr_t typeVal) { +QGraphicsSceneDragDropEvent* QGraphicsSceneDragDropEvent_new2(int typeVal) { return new QGraphicsSceneDragDropEvent(static_cast(typeVal)); } @@ -442,12 +442,12 @@ void QGraphicsSceneDragDropEvent_SetPossibleActions(QGraphicsSceneDragDropEvent* self->setPossibleActions(static_cast(actions)); } -uintptr_t QGraphicsSceneDragDropEvent_ProposedAction(const QGraphicsSceneDragDropEvent* self) { +int QGraphicsSceneDragDropEvent_ProposedAction(const QGraphicsSceneDragDropEvent* self) { Qt::DropAction _ret = self->proposedAction(); - return static_cast(_ret); + return static_cast(_ret); } -void QGraphicsSceneDragDropEvent_SetProposedAction(QGraphicsSceneDragDropEvent* self, uintptr_t action) { +void QGraphicsSceneDragDropEvent_SetProposedAction(QGraphicsSceneDragDropEvent* self, int action) { self->setProposedAction(static_cast(action)); } @@ -455,12 +455,12 @@ void QGraphicsSceneDragDropEvent_AcceptProposedAction(QGraphicsSceneDragDropEven self->acceptProposedAction(); } -uintptr_t QGraphicsSceneDragDropEvent_DropAction(const QGraphicsSceneDragDropEvent* self) { +int QGraphicsSceneDragDropEvent_DropAction(const QGraphicsSceneDragDropEvent* self) { Qt::DropAction _ret = self->dropAction(); - return static_cast(_ret); + return static_cast(_ret); } -void QGraphicsSceneDragDropEvent_SetDropAction(QGraphicsSceneDragDropEvent* self, uintptr_t action) { +void QGraphicsSceneDragDropEvent_SetDropAction(QGraphicsSceneDragDropEvent* self, int action) { self->setDropAction(static_cast(action)); } diff --git a/qt/gen_qgraphicssceneevent.go b/qt/gen_qgraphicssceneevent.go index a432c99..34ef06a 100644 --- a/qt/gen_qgraphicssceneevent.go +++ b/qt/gen_qgraphicssceneevent.go @@ -46,7 +46,7 @@ func newQGraphicsSceneEvent_U(h unsafe.Pointer) *QGraphicsSceneEvent { // NewQGraphicsSceneEvent constructs a new QGraphicsSceneEvent object. func NewQGraphicsSceneEvent(typeVal QEvent__Type) *QGraphicsSceneEvent { - ret := C.QGraphicsSceneEvent_new((C.uintptr_t)(typeVal)) + ret := C.QGraphicsSceneEvent_new((C.int)(typeVal)) return newQGraphicsSceneEvent(ret) } @@ -103,7 +103,7 @@ func NewQGraphicsSceneMouseEvent() *QGraphicsSceneMouseEvent { // NewQGraphicsSceneMouseEvent2 constructs a new QGraphicsSceneMouseEvent object. func NewQGraphicsSceneMouseEvent2(typeVal QEvent__Type) *QGraphicsSceneMouseEvent { - ret := C.QGraphicsSceneMouseEvent_new2((C.uintptr_t)(typeVal)) + ret := C.QGraphicsSceneMouseEvent_new2((C.int)(typeVal)) return newQGraphicsSceneMouseEvent(ret) } @@ -141,36 +141,36 @@ func (this *QGraphicsSceneMouseEvent) SetScreenPos(pos *QPoint) { } func (this *QGraphicsSceneMouseEvent) ButtonDownPos(button MouseButton) *QPointF { - _ret := C.QGraphicsSceneMouseEvent_ButtonDownPos(this.h, (C.uintptr_t)(button)) + _ret := C.QGraphicsSceneMouseEvent_ButtonDownPos(this.h, (C.int)(button)) _goptr := newQPointF(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QGraphicsSceneMouseEvent) SetButtonDownPos(button MouseButton, pos *QPointF) { - C.QGraphicsSceneMouseEvent_SetButtonDownPos(this.h, (C.uintptr_t)(button), pos.cPointer()) + C.QGraphicsSceneMouseEvent_SetButtonDownPos(this.h, (C.int)(button), pos.cPointer()) } func (this *QGraphicsSceneMouseEvent) ButtonDownScenePos(button MouseButton) *QPointF { - _ret := C.QGraphicsSceneMouseEvent_ButtonDownScenePos(this.h, (C.uintptr_t)(button)) + _ret := C.QGraphicsSceneMouseEvent_ButtonDownScenePos(this.h, (C.int)(button)) _goptr := newQPointF(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QGraphicsSceneMouseEvent) SetButtonDownScenePos(button MouseButton, pos *QPointF) { - C.QGraphicsSceneMouseEvent_SetButtonDownScenePos(this.h, (C.uintptr_t)(button), pos.cPointer()) + C.QGraphicsSceneMouseEvent_SetButtonDownScenePos(this.h, (C.int)(button), pos.cPointer()) } func (this *QGraphicsSceneMouseEvent) ButtonDownScreenPos(button MouseButton) *QPoint { - _ret := C.QGraphicsSceneMouseEvent_ButtonDownScreenPos(this.h, (C.uintptr_t)(button)) + _ret := C.QGraphicsSceneMouseEvent_ButtonDownScreenPos(this.h, (C.int)(button)) _goptr := newQPoint(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QGraphicsSceneMouseEvent) SetButtonDownScreenPos(button MouseButton, pos *QPoint) { - C.QGraphicsSceneMouseEvent_SetButtonDownScreenPos(this.h, (C.uintptr_t)(button), pos.cPointer()) + C.QGraphicsSceneMouseEvent_SetButtonDownScreenPos(this.h, (C.int)(button), pos.cPointer()) } func (this *QGraphicsSceneMouseEvent) LastPos() *QPointF { @@ -211,7 +211,7 @@ func (this *QGraphicsSceneMouseEvent) Buttons() int { } func (this *QGraphicsSceneMouseEvent) SetButtons(buttons int) { - C.QGraphicsSceneMouseEvent_SetButtons(this.h, (C.int)(buttons)) + C.QGraphicsSceneMouseEvent_SetButtons(this.h, buttons) } func (this *QGraphicsSceneMouseEvent) Button() MouseButton { @@ -219,7 +219,7 @@ func (this *QGraphicsSceneMouseEvent) Button() MouseButton { } func (this *QGraphicsSceneMouseEvent) SetButton(button MouseButton) { - C.QGraphicsSceneMouseEvent_SetButton(this.h, (C.uintptr_t)(button)) + C.QGraphicsSceneMouseEvent_SetButton(this.h, (C.int)(button)) } func (this *QGraphicsSceneMouseEvent) Modifiers() int { @@ -227,7 +227,7 @@ func (this *QGraphicsSceneMouseEvent) Modifiers() int { } func (this *QGraphicsSceneMouseEvent) SetModifiers(modifiers int) { - C.QGraphicsSceneMouseEvent_SetModifiers(this.h, (C.int)(modifiers)) + C.QGraphicsSceneMouseEvent_SetModifiers(this.h, modifiers) } func (this *QGraphicsSceneMouseEvent) Source() MouseEventSource { @@ -235,7 +235,7 @@ func (this *QGraphicsSceneMouseEvent) Source() MouseEventSource { } func (this *QGraphicsSceneMouseEvent) SetSource(source MouseEventSource) { - C.QGraphicsSceneMouseEvent_SetSource(this.h, (C.uintptr_t)(source)) + C.QGraphicsSceneMouseEvent_SetSource(this.h, (C.int)(source)) } func (this *QGraphicsSceneMouseEvent) Flags() int { @@ -243,7 +243,7 @@ func (this *QGraphicsSceneMouseEvent) Flags() int { } func (this *QGraphicsSceneMouseEvent) SetFlags(flags int) { - C.QGraphicsSceneMouseEvent_SetFlags(this.h, (C.int)(flags)) + C.QGraphicsSceneMouseEvent_SetFlags(this.h, flags) } // Delete this object from C++ memory. @@ -291,7 +291,7 @@ func NewQGraphicsSceneWheelEvent() *QGraphicsSceneWheelEvent { // NewQGraphicsSceneWheelEvent2 constructs a new QGraphicsSceneWheelEvent object. func NewQGraphicsSceneWheelEvent2(typeVal QEvent__Type) *QGraphicsSceneWheelEvent { - ret := C.QGraphicsSceneWheelEvent_new2((C.uintptr_t)(typeVal)) + ret := C.QGraphicsSceneWheelEvent_new2((C.int)(typeVal)) return newQGraphicsSceneWheelEvent(ret) } @@ -333,7 +333,7 @@ func (this *QGraphicsSceneWheelEvent) Buttons() int { } func (this *QGraphicsSceneWheelEvent) SetButtons(buttons int) { - C.QGraphicsSceneWheelEvent_SetButtons(this.h, (C.int)(buttons)) + C.QGraphicsSceneWheelEvent_SetButtons(this.h, buttons) } func (this *QGraphicsSceneWheelEvent) Modifiers() int { @@ -341,7 +341,7 @@ func (this *QGraphicsSceneWheelEvent) Modifiers() int { } func (this *QGraphicsSceneWheelEvent) SetModifiers(modifiers int) { - C.QGraphicsSceneWheelEvent_SetModifiers(this.h, (C.int)(modifiers)) + C.QGraphicsSceneWheelEvent_SetModifiers(this.h, modifiers) } func (this *QGraphicsSceneWheelEvent) Delta() int { @@ -357,7 +357,7 @@ func (this *QGraphicsSceneWheelEvent) Orientation() Orientation { } func (this *QGraphicsSceneWheelEvent) SetOrientation(orientation Orientation) { - C.QGraphicsSceneWheelEvent_SetOrientation(this.h, (C.uintptr_t)(orientation)) + C.QGraphicsSceneWheelEvent_SetOrientation(this.h, (C.int)(orientation)) } // Delete this object from C++ memory. @@ -405,7 +405,7 @@ func NewQGraphicsSceneContextMenuEvent() *QGraphicsSceneContextMenuEvent { // NewQGraphicsSceneContextMenuEvent2 constructs a new QGraphicsSceneContextMenuEvent object. func NewQGraphicsSceneContextMenuEvent2(typeVal QEvent__Type) *QGraphicsSceneContextMenuEvent { - ret := C.QGraphicsSceneContextMenuEvent_new2((C.uintptr_t)(typeVal)) + ret := C.QGraphicsSceneContextMenuEvent_new2((C.int)(typeVal)) return newQGraphicsSceneContextMenuEvent(ret) } @@ -447,7 +447,7 @@ func (this *QGraphicsSceneContextMenuEvent) Modifiers() int { } func (this *QGraphicsSceneContextMenuEvent) SetModifiers(modifiers int) { - C.QGraphicsSceneContextMenuEvent_SetModifiers(this.h, (C.int)(modifiers)) + C.QGraphicsSceneContextMenuEvent_SetModifiers(this.h, modifiers) } func (this *QGraphicsSceneContextMenuEvent) Reason() QGraphicsSceneContextMenuEvent__Reason { @@ -455,7 +455,7 @@ func (this *QGraphicsSceneContextMenuEvent) Reason() QGraphicsSceneContextMenuEv } func (this *QGraphicsSceneContextMenuEvent) SetReason(reason QGraphicsSceneContextMenuEvent__Reason) { - C.QGraphicsSceneContextMenuEvent_SetReason(this.h, (C.uintptr_t)(reason)) + C.QGraphicsSceneContextMenuEvent_SetReason(this.h, (C.int)(reason)) } // Delete this object from C++ memory. @@ -503,7 +503,7 @@ func NewQGraphicsSceneHoverEvent() *QGraphicsSceneHoverEvent { // NewQGraphicsSceneHoverEvent2 constructs a new QGraphicsSceneHoverEvent object. func NewQGraphicsSceneHoverEvent2(typeVal QEvent__Type) *QGraphicsSceneHoverEvent { - ret := C.QGraphicsSceneHoverEvent_new2((C.uintptr_t)(typeVal)) + ret := C.QGraphicsSceneHoverEvent_new2((C.int)(typeVal)) return newQGraphicsSceneHoverEvent(ret) } @@ -578,7 +578,7 @@ func (this *QGraphicsSceneHoverEvent) Modifiers() int { } func (this *QGraphicsSceneHoverEvent) SetModifiers(modifiers int) { - C.QGraphicsSceneHoverEvent_SetModifiers(this.h, (C.int)(modifiers)) + C.QGraphicsSceneHoverEvent_SetModifiers(this.h, modifiers) } // Delete this object from C++ memory. @@ -626,7 +626,7 @@ func NewQGraphicsSceneHelpEvent() *QGraphicsSceneHelpEvent { // NewQGraphicsSceneHelpEvent2 constructs a new QGraphicsSceneHelpEvent object. func NewQGraphicsSceneHelpEvent2(typeVal QEvent__Type) *QGraphicsSceneHelpEvent { - ret := C.QGraphicsSceneHelpEvent_new2((C.uintptr_t)(typeVal)) + ret := C.QGraphicsSceneHelpEvent_new2((C.int)(typeVal)) return newQGraphicsSceneHelpEvent(ret) } @@ -697,7 +697,7 @@ func NewQGraphicsSceneDragDropEvent() *QGraphicsSceneDragDropEvent { // NewQGraphicsSceneDragDropEvent2 constructs a new QGraphicsSceneDragDropEvent object. func NewQGraphicsSceneDragDropEvent2(typeVal QEvent__Type) *QGraphicsSceneDragDropEvent { - ret := C.QGraphicsSceneDragDropEvent_new2((C.uintptr_t)(typeVal)) + ret := C.QGraphicsSceneDragDropEvent_new2((C.int)(typeVal)) return newQGraphicsSceneDragDropEvent(ret) } @@ -739,7 +739,7 @@ func (this *QGraphicsSceneDragDropEvent) Buttons() int { } func (this *QGraphicsSceneDragDropEvent) SetButtons(buttons int) { - C.QGraphicsSceneDragDropEvent_SetButtons(this.h, (C.int)(buttons)) + C.QGraphicsSceneDragDropEvent_SetButtons(this.h, buttons) } func (this *QGraphicsSceneDragDropEvent) Modifiers() int { @@ -747,7 +747,7 @@ func (this *QGraphicsSceneDragDropEvent) Modifiers() int { } func (this *QGraphicsSceneDragDropEvent) SetModifiers(modifiers int) { - C.QGraphicsSceneDragDropEvent_SetModifiers(this.h, (C.int)(modifiers)) + C.QGraphicsSceneDragDropEvent_SetModifiers(this.h, modifiers) } func (this *QGraphicsSceneDragDropEvent) PossibleActions() int { @@ -755,7 +755,7 @@ func (this *QGraphicsSceneDragDropEvent) PossibleActions() int { } func (this *QGraphicsSceneDragDropEvent) SetPossibleActions(actions int) { - C.QGraphicsSceneDragDropEvent_SetPossibleActions(this.h, (C.int)(actions)) + C.QGraphicsSceneDragDropEvent_SetPossibleActions(this.h, actions) } func (this *QGraphicsSceneDragDropEvent) ProposedAction() DropAction { @@ -763,7 +763,7 @@ func (this *QGraphicsSceneDragDropEvent) ProposedAction() DropAction { } func (this *QGraphicsSceneDragDropEvent) SetProposedAction(action DropAction) { - C.QGraphicsSceneDragDropEvent_SetProposedAction(this.h, (C.uintptr_t)(action)) + C.QGraphicsSceneDragDropEvent_SetProposedAction(this.h, (C.int)(action)) } func (this *QGraphicsSceneDragDropEvent) AcceptProposedAction() { @@ -775,7 +775,7 @@ func (this *QGraphicsSceneDragDropEvent) DropAction() DropAction { } func (this *QGraphicsSceneDragDropEvent) SetDropAction(action DropAction) { - C.QGraphicsSceneDragDropEvent_SetDropAction(this.h, (C.uintptr_t)(action)) + C.QGraphicsSceneDragDropEvent_SetDropAction(this.h, (C.int)(action)) } func (this *QGraphicsSceneDragDropEvent) Source() *QWidget { diff --git a/qt/gen_qgraphicssceneevent.h b/qt/gen_qgraphicssceneevent.h index 0058182..a0e20a0 100644 --- a/qt/gen_qgraphicssceneevent.h +++ b/qt/gen_qgraphicssceneevent.h @@ -45,25 +45,25 @@ typedef struct QSizeF QSizeF; typedef struct QWidget QWidget; #endif -QGraphicsSceneEvent* QGraphicsSceneEvent_new(uintptr_t typeVal); +QGraphicsSceneEvent* QGraphicsSceneEvent_new(int typeVal); QWidget* QGraphicsSceneEvent_Widget(const QGraphicsSceneEvent* self); void QGraphicsSceneEvent_SetWidget(QGraphicsSceneEvent* self, QWidget* widget); void QGraphicsSceneEvent_Delete(QGraphicsSceneEvent* self); QGraphicsSceneMouseEvent* QGraphicsSceneMouseEvent_new(); -QGraphicsSceneMouseEvent* QGraphicsSceneMouseEvent_new2(uintptr_t typeVal); +QGraphicsSceneMouseEvent* QGraphicsSceneMouseEvent_new2(int typeVal); QPointF* QGraphicsSceneMouseEvent_Pos(const QGraphicsSceneMouseEvent* self); void QGraphicsSceneMouseEvent_SetPos(QGraphicsSceneMouseEvent* self, QPointF* pos); QPointF* QGraphicsSceneMouseEvent_ScenePos(const QGraphicsSceneMouseEvent* self); void QGraphicsSceneMouseEvent_SetScenePos(QGraphicsSceneMouseEvent* self, QPointF* pos); QPoint* QGraphicsSceneMouseEvent_ScreenPos(const QGraphicsSceneMouseEvent* self); void QGraphicsSceneMouseEvent_SetScreenPos(QGraphicsSceneMouseEvent* self, QPoint* pos); -QPointF* QGraphicsSceneMouseEvent_ButtonDownPos(const QGraphicsSceneMouseEvent* self, uintptr_t button); -void QGraphicsSceneMouseEvent_SetButtonDownPos(QGraphicsSceneMouseEvent* self, uintptr_t button, QPointF* pos); -QPointF* QGraphicsSceneMouseEvent_ButtonDownScenePos(const QGraphicsSceneMouseEvent* self, uintptr_t button); -void QGraphicsSceneMouseEvent_SetButtonDownScenePos(QGraphicsSceneMouseEvent* self, uintptr_t button, QPointF* pos); -QPoint* QGraphicsSceneMouseEvent_ButtonDownScreenPos(const QGraphicsSceneMouseEvent* self, uintptr_t button); -void QGraphicsSceneMouseEvent_SetButtonDownScreenPos(QGraphicsSceneMouseEvent* self, uintptr_t button, QPoint* pos); +QPointF* QGraphicsSceneMouseEvent_ButtonDownPos(const QGraphicsSceneMouseEvent* self, int button); +void QGraphicsSceneMouseEvent_SetButtonDownPos(QGraphicsSceneMouseEvent* self, int button, QPointF* pos); +QPointF* QGraphicsSceneMouseEvent_ButtonDownScenePos(const QGraphicsSceneMouseEvent* self, int button); +void QGraphicsSceneMouseEvent_SetButtonDownScenePos(QGraphicsSceneMouseEvent* self, int button, QPointF* pos); +QPoint* QGraphicsSceneMouseEvent_ButtonDownScreenPos(const QGraphicsSceneMouseEvent* self, int button); +void QGraphicsSceneMouseEvent_SetButtonDownScreenPos(QGraphicsSceneMouseEvent* self, int button, QPoint* pos); QPointF* QGraphicsSceneMouseEvent_LastPos(const QGraphicsSceneMouseEvent* self); void QGraphicsSceneMouseEvent_SetLastPos(QGraphicsSceneMouseEvent* self, QPointF* pos); QPointF* QGraphicsSceneMouseEvent_LastScenePos(const QGraphicsSceneMouseEvent* self); @@ -72,18 +72,18 @@ QPoint* QGraphicsSceneMouseEvent_LastScreenPos(const QGraphicsSceneMouseEvent* s void QGraphicsSceneMouseEvent_SetLastScreenPos(QGraphicsSceneMouseEvent* self, QPoint* pos); int QGraphicsSceneMouseEvent_Buttons(const QGraphicsSceneMouseEvent* self); void QGraphicsSceneMouseEvent_SetButtons(QGraphicsSceneMouseEvent* self, int buttons); -uintptr_t QGraphicsSceneMouseEvent_Button(const QGraphicsSceneMouseEvent* self); -void QGraphicsSceneMouseEvent_SetButton(QGraphicsSceneMouseEvent* self, uintptr_t button); +int QGraphicsSceneMouseEvent_Button(const QGraphicsSceneMouseEvent* self); +void QGraphicsSceneMouseEvent_SetButton(QGraphicsSceneMouseEvent* self, int button); int QGraphicsSceneMouseEvent_Modifiers(const QGraphicsSceneMouseEvent* self); void QGraphicsSceneMouseEvent_SetModifiers(QGraphicsSceneMouseEvent* self, int modifiers); -uintptr_t QGraphicsSceneMouseEvent_Source(const QGraphicsSceneMouseEvent* self); -void QGraphicsSceneMouseEvent_SetSource(QGraphicsSceneMouseEvent* self, uintptr_t source); +int QGraphicsSceneMouseEvent_Source(const QGraphicsSceneMouseEvent* self); +void QGraphicsSceneMouseEvent_SetSource(QGraphicsSceneMouseEvent* self, int source); int QGraphicsSceneMouseEvent_Flags(const QGraphicsSceneMouseEvent* self); void QGraphicsSceneMouseEvent_SetFlags(QGraphicsSceneMouseEvent* self, int flags); void QGraphicsSceneMouseEvent_Delete(QGraphicsSceneMouseEvent* self); QGraphicsSceneWheelEvent* QGraphicsSceneWheelEvent_new(); -QGraphicsSceneWheelEvent* QGraphicsSceneWheelEvent_new2(uintptr_t typeVal); +QGraphicsSceneWheelEvent* QGraphicsSceneWheelEvent_new2(int typeVal); QPointF* QGraphicsSceneWheelEvent_Pos(const QGraphicsSceneWheelEvent* self); void QGraphicsSceneWheelEvent_SetPos(QGraphicsSceneWheelEvent* self, QPointF* pos); QPointF* QGraphicsSceneWheelEvent_ScenePos(const QGraphicsSceneWheelEvent* self); @@ -96,12 +96,12 @@ int QGraphicsSceneWheelEvent_Modifiers(const QGraphicsSceneWheelEvent* self); void QGraphicsSceneWheelEvent_SetModifiers(QGraphicsSceneWheelEvent* self, int modifiers); int QGraphicsSceneWheelEvent_Delta(const QGraphicsSceneWheelEvent* self); void QGraphicsSceneWheelEvent_SetDelta(QGraphicsSceneWheelEvent* self, int delta); -uintptr_t QGraphicsSceneWheelEvent_Orientation(const QGraphicsSceneWheelEvent* self); -void QGraphicsSceneWheelEvent_SetOrientation(QGraphicsSceneWheelEvent* self, uintptr_t orientation); +int QGraphicsSceneWheelEvent_Orientation(const QGraphicsSceneWheelEvent* self); +void QGraphicsSceneWheelEvent_SetOrientation(QGraphicsSceneWheelEvent* self, int orientation); void QGraphicsSceneWheelEvent_Delete(QGraphicsSceneWheelEvent* self); QGraphicsSceneContextMenuEvent* QGraphicsSceneContextMenuEvent_new(); -QGraphicsSceneContextMenuEvent* QGraphicsSceneContextMenuEvent_new2(uintptr_t typeVal); +QGraphicsSceneContextMenuEvent* QGraphicsSceneContextMenuEvent_new2(int typeVal); QPointF* QGraphicsSceneContextMenuEvent_Pos(const QGraphicsSceneContextMenuEvent* self); void QGraphicsSceneContextMenuEvent_SetPos(QGraphicsSceneContextMenuEvent* self, QPointF* pos); QPointF* QGraphicsSceneContextMenuEvent_ScenePos(const QGraphicsSceneContextMenuEvent* self); @@ -110,12 +110,12 @@ QPoint* QGraphicsSceneContextMenuEvent_ScreenPos(const QGraphicsSceneContextMenu void QGraphicsSceneContextMenuEvent_SetScreenPos(QGraphicsSceneContextMenuEvent* self, QPoint* pos); int QGraphicsSceneContextMenuEvent_Modifiers(const QGraphicsSceneContextMenuEvent* self); void QGraphicsSceneContextMenuEvent_SetModifiers(QGraphicsSceneContextMenuEvent* self, int modifiers); -uintptr_t QGraphicsSceneContextMenuEvent_Reason(const QGraphicsSceneContextMenuEvent* self); -void QGraphicsSceneContextMenuEvent_SetReason(QGraphicsSceneContextMenuEvent* self, uintptr_t reason); +int QGraphicsSceneContextMenuEvent_Reason(const QGraphicsSceneContextMenuEvent* self); +void QGraphicsSceneContextMenuEvent_SetReason(QGraphicsSceneContextMenuEvent* self, int reason); void QGraphicsSceneContextMenuEvent_Delete(QGraphicsSceneContextMenuEvent* self); QGraphicsSceneHoverEvent* QGraphicsSceneHoverEvent_new(); -QGraphicsSceneHoverEvent* QGraphicsSceneHoverEvent_new2(uintptr_t typeVal); +QGraphicsSceneHoverEvent* QGraphicsSceneHoverEvent_new2(int typeVal); QPointF* QGraphicsSceneHoverEvent_Pos(const QGraphicsSceneHoverEvent* self); void QGraphicsSceneHoverEvent_SetPos(QGraphicsSceneHoverEvent* self, QPointF* pos); QPointF* QGraphicsSceneHoverEvent_ScenePos(const QGraphicsSceneHoverEvent* self); @@ -133,7 +133,7 @@ void QGraphicsSceneHoverEvent_SetModifiers(QGraphicsSceneHoverEvent* self, int m void QGraphicsSceneHoverEvent_Delete(QGraphicsSceneHoverEvent* self); QGraphicsSceneHelpEvent* QGraphicsSceneHelpEvent_new(); -QGraphicsSceneHelpEvent* QGraphicsSceneHelpEvent_new2(uintptr_t typeVal); +QGraphicsSceneHelpEvent* QGraphicsSceneHelpEvent_new2(int typeVal); QPointF* QGraphicsSceneHelpEvent_ScenePos(const QGraphicsSceneHelpEvent* self); void QGraphicsSceneHelpEvent_SetScenePos(QGraphicsSceneHelpEvent* self, QPointF* pos); QPoint* QGraphicsSceneHelpEvent_ScreenPos(const QGraphicsSceneHelpEvent* self); @@ -141,7 +141,7 @@ void QGraphicsSceneHelpEvent_SetScreenPos(QGraphicsSceneHelpEvent* self, QPoint* void QGraphicsSceneHelpEvent_Delete(QGraphicsSceneHelpEvent* self); QGraphicsSceneDragDropEvent* QGraphicsSceneDragDropEvent_new(); -QGraphicsSceneDragDropEvent* QGraphicsSceneDragDropEvent_new2(uintptr_t typeVal); +QGraphicsSceneDragDropEvent* QGraphicsSceneDragDropEvent_new2(int typeVal); QPointF* QGraphicsSceneDragDropEvent_Pos(const QGraphicsSceneDragDropEvent* self); void QGraphicsSceneDragDropEvent_SetPos(QGraphicsSceneDragDropEvent* self, QPointF* pos); QPointF* QGraphicsSceneDragDropEvent_ScenePos(const QGraphicsSceneDragDropEvent* self); @@ -154,11 +154,11 @@ int QGraphicsSceneDragDropEvent_Modifiers(const QGraphicsSceneDragDropEvent* sel void QGraphicsSceneDragDropEvent_SetModifiers(QGraphicsSceneDragDropEvent* self, int modifiers); int QGraphicsSceneDragDropEvent_PossibleActions(const QGraphicsSceneDragDropEvent* self); void QGraphicsSceneDragDropEvent_SetPossibleActions(QGraphicsSceneDragDropEvent* self, int actions); -uintptr_t QGraphicsSceneDragDropEvent_ProposedAction(const QGraphicsSceneDragDropEvent* self); -void QGraphicsSceneDragDropEvent_SetProposedAction(QGraphicsSceneDragDropEvent* self, uintptr_t action); +int QGraphicsSceneDragDropEvent_ProposedAction(const QGraphicsSceneDragDropEvent* self); +void QGraphicsSceneDragDropEvent_SetProposedAction(QGraphicsSceneDragDropEvent* self, int action); void QGraphicsSceneDragDropEvent_AcceptProposedAction(QGraphicsSceneDragDropEvent* self); -uintptr_t QGraphicsSceneDragDropEvent_DropAction(const QGraphicsSceneDragDropEvent* self); -void QGraphicsSceneDragDropEvent_SetDropAction(QGraphicsSceneDragDropEvent* self, uintptr_t action); +int QGraphicsSceneDragDropEvent_DropAction(const QGraphicsSceneDragDropEvent* self); +void QGraphicsSceneDragDropEvent_SetDropAction(QGraphicsSceneDragDropEvent* self, int action); QWidget* QGraphicsSceneDragDropEvent_Source(const QGraphicsSceneDragDropEvent* self); void QGraphicsSceneDragDropEvent_SetSource(QGraphicsSceneDragDropEvent* self, QWidget* source); QMimeData* QGraphicsSceneDragDropEvent_MimeData(const QGraphicsSceneDragDropEvent* self); diff --git a/qt/gen_qgraphicstransform.cpp b/qt/gen_qgraphicstransform.cpp index 52acf02..6745bdb 100644 --- a/qt/gen_qgraphicstransform.cpp +++ b/qt/gen_qgraphicstransform.cpp @@ -101,7 +101,8 @@ void QGraphicsScale_SetOrigin(QGraphicsScale* self, QVector3D* point) { } double QGraphicsScale_XScale(const QGraphicsScale* self) { - return self->xScale(); + qreal _ret = self->xScale(); + return static_cast(_ret); } void QGraphicsScale_SetXScale(QGraphicsScale* self, double xScale) { @@ -109,7 +110,8 @@ void QGraphicsScale_SetXScale(QGraphicsScale* self, double xScale) { } double QGraphicsScale_YScale(const QGraphicsScale* self) { - return self->yScale(); + qreal _ret = self->yScale(); + return static_cast(_ret); } void QGraphicsScale_SetYScale(QGraphicsScale* self, double yScale) { @@ -117,7 +119,8 @@ void QGraphicsScale_SetYScale(QGraphicsScale* self, double yScale) { } double QGraphicsScale_ZScale(const QGraphicsScale* self) { - return self->zScale(); + qreal _ret = self->zScale(); + return static_cast(_ret); } void QGraphicsScale_SetZScale(QGraphicsScale* self, double zScale) { @@ -245,7 +248,8 @@ void QGraphicsRotation_SetOrigin(QGraphicsRotation* self, QVector3D* point) { } double QGraphicsRotation_Angle(const QGraphicsRotation* self) { - return self->angle(); + qreal _ret = self->angle(); + return static_cast(_ret); } void QGraphicsRotation_SetAngle(QGraphicsRotation* self, double angle) { @@ -260,7 +264,7 @@ void QGraphicsRotation_SetAxis(QGraphicsRotation* self, QVector3D* axis) { self->setAxis(*axis); } -void QGraphicsRotation_SetAxisWithAxis(QGraphicsRotation* self, uintptr_t axis) { +void QGraphicsRotation_SetAxisWithAxis(QGraphicsRotation* self, int axis) { self->setAxis(static_cast(axis)); } diff --git a/qt/gen_qgraphicstransform.go b/qt/gen_qgraphicstransform.go index 724e41f..4a6a729 100644 --- a/qt/gen_qgraphicstransform.go +++ b/qt/gen_qgraphicstransform.go @@ -448,7 +448,7 @@ func (this *QGraphicsRotation) SetAxis(axis *QVector3D) { } func (this *QGraphicsRotation) SetAxisWithAxis(axis Axis) { - C.QGraphicsRotation_SetAxisWithAxis(this.h, (C.uintptr_t)(axis)) + C.QGraphicsRotation_SetAxisWithAxis(this.h, (C.int)(axis)) } func (this *QGraphicsRotation) ApplyTo(matrix *QMatrix4x4) { diff --git a/qt/gen_qgraphicstransform.h b/qt/gen_qgraphicstransform.h index 14a14c5..7218b97 100644 --- a/qt/gen_qgraphicstransform.h +++ b/qt/gen_qgraphicstransform.h @@ -82,7 +82,7 @@ double QGraphicsRotation_Angle(const QGraphicsRotation* self); void QGraphicsRotation_SetAngle(QGraphicsRotation* self, double angle); QVector3D* QGraphicsRotation_Axis(const QGraphicsRotation* self); void QGraphicsRotation_SetAxis(QGraphicsRotation* self, QVector3D* axis); -void QGraphicsRotation_SetAxisWithAxis(QGraphicsRotation* self, uintptr_t axis); +void QGraphicsRotation_SetAxisWithAxis(QGraphicsRotation* self, int axis); void QGraphicsRotation_ApplyTo(const QGraphicsRotation* self, QMatrix4x4* matrix); void QGraphicsRotation_OriginChanged(QGraphicsRotation* self); void QGraphicsRotation_connect_OriginChanged(QGraphicsRotation* self, void* slot); diff --git a/qt/gen_qgraphicsview.cpp b/qt/gen_qgraphicsview.cpp index 966539a..a86e5a9 100644 --- a/qt/gen_qgraphicsview.cpp +++ b/qt/gen_qgraphicsview.cpp @@ -65,7 +65,7 @@ int QGraphicsView_RenderHints(const QGraphicsView* self) { return static_cast(_ret); } -void QGraphicsView_SetRenderHint(QGraphicsView* self, uintptr_t hint) { +void QGraphicsView_SetRenderHint(QGraphicsView* self, int hint) { self->setRenderHint(static_cast(hint)); } @@ -82,30 +82,30 @@ void QGraphicsView_SetAlignment(QGraphicsView* self, int alignment) { self->setAlignment(static_cast(alignment)); } -uintptr_t QGraphicsView_TransformationAnchor(const QGraphicsView* self) { +int QGraphicsView_TransformationAnchor(const QGraphicsView* self) { QGraphicsView::ViewportAnchor _ret = self->transformationAnchor(); - return static_cast(_ret); + return static_cast(_ret); } -void QGraphicsView_SetTransformationAnchor(QGraphicsView* self, uintptr_t anchor) { +void QGraphicsView_SetTransformationAnchor(QGraphicsView* self, int anchor) { self->setTransformationAnchor(static_cast(anchor)); } -uintptr_t QGraphicsView_ResizeAnchor(const QGraphicsView* self) { +int QGraphicsView_ResizeAnchor(const QGraphicsView* self) { QGraphicsView::ViewportAnchor _ret = self->resizeAnchor(); - return static_cast(_ret); + return static_cast(_ret); } -void QGraphicsView_SetResizeAnchor(QGraphicsView* self, uintptr_t anchor) { +void QGraphicsView_SetResizeAnchor(QGraphicsView* self, int anchor) { self->setResizeAnchor(static_cast(anchor)); } -uintptr_t QGraphicsView_ViewportUpdateMode(const QGraphicsView* self) { +int QGraphicsView_ViewportUpdateMode(const QGraphicsView* self) { QGraphicsView::ViewportUpdateMode _ret = self->viewportUpdateMode(); - return static_cast(_ret); + return static_cast(_ret); } -void QGraphicsView_SetViewportUpdateMode(QGraphicsView* self, uintptr_t mode) { +void QGraphicsView_SetViewportUpdateMode(QGraphicsView* self, int mode) { self->setViewportUpdateMode(static_cast(mode)); } @@ -114,7 +114,7 @@ int QGraphicsView_OptimizationFlags(const QGraphicsView* self) { return static_cast(_ret); } -void QGraphicsView_SetOptimizationFlag(QGraphicsView* self, uintptr_t flag) { +void QGraphicsView_SetOptimizationFlag(QGraphicsView* self, int flag) { self->setOptimizationFlag(static_cast(flag)); } @@ -122,21 +122,21 @@ void QGraphicsView_SetOptimizationFlags(QGraphicsView* self, int flags) { self->setOptimizationFlags(static_cast(flags)); } -uintptr_t QGraphicsView_DragMode(const QGraphicsView* self) { +int QGraphicsView_DragMode(const QGraphicsView* self) { QGraphicsView::DragMode _ret = self->dragMode(); - return static_cast(_ret); + return static_cast(_ret); } -void QGraphicsView_SetDragMode(QGraphicsView* self, uintptr_t mode) { +void QGraphicsView_SetDragMode(QGraphicsView* self, int mode) { self->setDragMode(static_cast(mode)); } -uintptr_t QGraphicsView_RubberBandSelectionMode(const QGraphicsView* self) { +int QGraphicsView_RubberBandSelectionMode(const QGraphicsView* self) { Qt::ItemSelectionMode _ret = self->rubberBandSelectionMode(); - return static_cast(_ret); + return static_cast(_ret); } -void QGraphicsView_SetRubberBandSelectionMode(QGraphicsView* self, uintptr_t mode) { +void QGraphicsView_SetRubberBandSelectionMode(QGraphicsView* self, int mode) { self->setRubberBandSelectionMode(static_cast(mode)); } @@ -274,7 +274,7 @@ void QGraphicsView_Render(QGraphicsView* self, QPainter* painter) { } struct miqt_array* QGraphicsView_Items(const QGraphicsView* self) { - QList _ret = self->items(); + QList _ret = self->items(); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -287,7 +287,7 @@ struct miqt_array* QGraphicsView_Items(const QGraphicsView* self) { } struct miqt_array* QGraphicsView_ItemsWithPos(const QGraphicsView* self, QPoint* pos) { - QList _ret = self->items(*pos); + QList _ret = self->items(*pos); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -300,7 +300,7 @@ struct miqt_array* QGraphicsView_ItemsWithPos(const QGraphicsView* self, QPoint* } struct miqt_array* QGraphicsView_Items2(const QGraphicsView* self, int x, int y) { - QList _ret = self->items(static_cast(x), static_cast(y)); + QList _ret = self->items(static_cast(x), static_cast(y)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -313,7 +313,7 @@ struct miqt_array* QGraphicsView_Items2(const QGraphicsView* self, int x, int y) } struct miqt_array* QGraphicsView_ItemsWithRect(const QGraphicsView* self, QRect* rect) { - QList _ret = self->items(*rect); + QList _ret = self->items(*rect); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -326,7 +326,7 @@ struct miqt_array* QGraphicsView_ItemsWithRect(const QGraphicsView* self, QRect* } struct miqt_array* QGraphicsView_Items3(const QGraphicsView* self, int x, int y, int w, int h) { - QList _ret = self->items(static_cast(x), static_cast(y), static_cast(w), static_cast(h)); + QList _ret = self->items(static_cast(x), static_cast(y), static_cast(w), static_cast(h)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -339,7 +339,7 @@ struct miqt_array* QGraphicsView_Items3(const QGraphicsView* self, int x, int y, } struct miqt_array* QGraphicsView_ItemsWithPath(const QGraphicsView* self, QPainterPath* path) { - QList _ret = self->items(*path); + QList _ret = self->items(*path); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -383,7 +383,7 @@ QPoint* QGraphicsView_MapFromScene2(const QGraphicsView* self, double x, double return new QPoint(self->mapFromScene(static_cast(x), static_cast(y))); } -QVariant* QGraphicsView_InputMethodQuery(const QGraphicsView* self, uintptr_t query) { +QVariant* QGraphicsView_InputMethodQuery(const QGraphicsView* self, int query) { return new QVariant(self->inputMethodQuery(static_cast(query))); } @@ -462,11 +462,11 @@ struct miqt_string* QGraphicsView_TrUtf83(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -void QGraphicsView_SetRenderHint2(QGraphicsView* self, uintptr_t hint, bool enabled) { +void QGraphicsView_SetRenderHint2(QGraphicsView* self, int hint, bool enabled) { self->setRenderHint(static_cast(hint), enabled); } -void QGraphicsView_SetOptimizationFlag2(QGraphicsView* self, uintptr_t flag, bool enabled) { +void QGraphicsView_SetOptimizationFlag2(QGraphicsView* self, int flag, bool enabled) { self->setOptimizationFlag(static_cast(flag), enabled); } @@ -502,15 +502,15 @@ void QGraphicsView_EnsureVisible32(QGraphicsView* self, QGraphicsItem* item, int self->ensureVisible(item, static_cast(xmargin), static_cast(ymargin)); } -void QGraphicsView_FitInView22(QGraphicsView* self, QRectF* rect, uintptr_t aspectRadioMode) { +void QGraphicsView_FitInView22(QGraphicsView* self, QRectF* rect, int aspectRadioMode) { self->fitInView(*rect, static_cast(aspectRadioMode)); } -void QGraphicsView_FitInView5(QGraphicsView* self, double x, double y, double w, double h, uintptr_t aspectRadioMode) { +void QGraphicsView_FitInView5(QGraphicsView* self, double x, double y, double w, double h, int aspectRadioMode) { self->fitInView(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(aspectRadioMode)); } -void QGraphicsView_FitInView23(QGraphicsView* self, QGraphicsItem* item, uintptr_t aspectRadioMode) { +void QGraphicsView_FitInView23(QGraphicsView* self, QGraphicsItem* item, int aspectRadioMode) { self->fitInView(item, static_cast(aspectRadioMode)); } @@ -522,12 +522,12 @@ void QGraphicsView_Render3(QGraphicsView* self, QPainter* painter, QRectF* targe self->render(painter, *target, *source); } -void QGraphicsView_Render4(QGraphicsView* self, QPainter* painter, QRectF* target, QRect* source, uintptr_t aspectRatioMode) { +void QGraphicsView_Render4(QGraphicsView* self, QPainter* painter, QRectF* target, QRect* source, int aspectRatioMode) { self->render(painter, *target, *source, static_cast(aspectRatioMode)); } -struct miqt_array* QGraphicsView_Items22(const QGraphicsView* self, QRect* rect, uintptr_t mode) { - QList _ret = self->items(*rect, static_cast(mode)); +struct miqt_array* QGraphicsView_Items22(const QGraphicsView* self, QRect* rect, int mode) { + QList _ret = self->items(*rect, static_cast(mode)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -539,8 +539,8 @@ struct miqt_array* QGraphicsView_Items22(const QGraphicsView* self, QRect* rect, return _out; } -struct miqt_array* QGraphicsView_Items5(const QGraphicsView* self, int x, int y, int w, int h, uintptr_t mode) { - QList _ret = self->items(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(mode)); +struct miqt_array* QGraphicsView_Items5(const QGraphicsView* self, int x, int y, int w, int h, int mode) { + QList _ret = self->items(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(mode)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -552,8 +552,8 @@ struct miqt_array* QGraphicsView_Items5(const QGraphicsView* self, int x, int y, return _out; } -struct miqt_array* QGraphicsView_Items24(const QGraphicsView* self, QPainterPath* path, uintptr_t mode) { - QList _ret = self->items(*path, static_cast(mode)); +struct miqt_array* QGraphicsView_Items24(const QGraphicsView* self, QPainterPath* path, int mode) { + QList _ret = self->items(*path, static_cast(mode)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** _arr = static_cast(malloc(sizeof(QGraphicsItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { diff --git a/qt/gen_qgraphicsview.go b/qt/gen_qgraphicsview.go index 07a08f9..62576d8 100644 --- a/qt/gen_qgraphicsview.go +++ b/qt/gen_qgraphicsview.go @@ -137,11 +137,11 @@ func (this *QGraphicsView) RenderHints() int { } func (this *QGraphicsView) SetRenderHint(hint QPainter__RenderHint) { - C.QGraphicsView_SetRenderHint(this.h, (C.uintptr_t)(hint)) + C.QGraphicsView_SetRenderHint(this.h, (C.int)(hint)) } func (this *QGraphicsView) SetRenderHints(hints int) { - C.QGraphicsView_SetRenderHints(this.h, (C.int)(hints)) + C.QGraphicsView_SetRenderHints(this.h, hints) } func (this *QGraphicsView) Alignment() int { @@ -149,7 +149,7 @@ func (this *QGraphicsView) Alignment() int { } func (this *QGraphicsView) SetAlignment(alignment int) { - C.QGraphicsView_SetAlignment(this.h, (C.int)(alignment)) + C.QGraphicsView_SetAlignment(this.h, alignment) } func (this *QGraphicsView) TransformationAnchor() QGraphicsView__ViewportAnchor { @@ -157,7 +157,7 @@ func (this *QGraphicsView) TransformationAnchor() QGraphicsView__ViewportAnchor } func (this *QGraphicsView) SetTransformationAnchor(anchor QGraphicsView__ViewportAnchor) { - C.QGraphicsView_SetTransformationAnchor(this.h, (C.uintptr_t)(anchor)) + C.QGraphicsView_SetTransformationAnchor(this.h, (C.int)(anchor)) } func (this *QGraphicsView) ResizeAnchor() QGraphicsView__ViewportAnchor { @@ -165,7 +165,7 @@ func (this *QGraphicsView) ResizeAnchor() QGraphicsView__ViewportAnchor { } func (this *QGraphicsView) SetResizeAnchor(anchor QGraphicsView__ViewportAnchor) { - C.QGraphicsView_SetResizeAnchor(this.h, (C.uintptr_t)(anchor)) + C.QGraphicsView_SetResizeAnchor(this.h, (C.int)(anchor)) } func (this *QGraphicsView) ViewportUpdateMode() QGraphicsView__ViewportUpdateMode { @@ -173,7 +173,7 @@ func (this *QGraphicsView) ViewportUpdateMode() QGraphicsView__ViewportUpdateMod } func (this *QGraphicsView) SetViewportUpdateMode(mode QGraphicsView__ViewportUpdateMode) { - C.QGraphicsView_SetViewportUpdateMode(this.h, (C.uintptr_t)(mode)) + C.QGraphicsView_SetViewportUpdateMode(this.h, (C.int)(mode)) } func (this *QGraphicsView) OptimizationFlags() int { @@ -181,11 +181,11 @@ func (this *QGraphicsView) OptimizationFlags() int { } func (this *QGraphicsView) SetOptimizationFlag(flag QGraphicsView__OptimizationFlag) { - C.QGraphicsView_SetOptimizationFlag(this.h, (C.uintptr_t)(flag)) + C.QGraphicsView_SetOptimizationFlag(this.h, (C.int)(flag)) } func (this *QGraphicsView) SetOptimizationFlags(flags int) { - C.QGraphicsView_SetOptimizationFlags(this.h, (C.int)(flags)) + C.QGraphicsView_SetOptimizationFlags(this.h, flags) } func (this *QGraphicsView) DragMode() QGraphicsView__DragMode { @@ -193,7 +193,7 @@ func (this *QGraphicsView) DragMode() QGraphicsView__DragMode { } func (this *QGraphicsView) SetDragMode(mode QGraphicsView__DragMode) { - C.QGraphicsView_SetDragMode(this.h, (C.uintptr_t)(mode)) + C.QGraphicsView_SetDragMode(this.h, (C.int)(mode)) } func (this *QGraphicsView) RubberBandSelectionMode() ItemSelectionMode { @@ -201,7 +201,7 @@ func (this *QGraphicsView) RubberBandSelectionMode() ItemSelectionMode { } func (this *QGraphicsView) SetRubberBandSelectionMode(mode ItemSelectionMode) { - C.QGraphicsView_SetRubberBandSelectionMode(this.h, (C.uintptr_t)(mode)) + C.QGraphicsView_SetRubberBandSelectionMode(this.h, (C.int)(mode)) } func (this *QGraphicsView) RubberBandRect() *QRect { @@ -216,7 +216,7 @@ func (this *QGraphicsView) CacheMode() int { } func (this *QGraphicsView) SetCacheMode(mode int) { - C.QGraphicsView_SetCacheMode(this.h, (C.int)(mode)) + C.QGraphicsView_SetCacheMode(this.h, mode) } func (this *QGraphicsView) ResetCachedContent() { @@ -468,7 +468,7 @@ func (this *QGraphicsView) MapFromScene2(x float64, y float64) *QPoint { } func (this *QGraphicsView) InputMethodQuery(query InputMethodQuery) *QVariant { - _ret := C.QGraphicsView_InputMethodQuery(this.h, (C.uintptr_t)(query)) + _ret := C.QGraphicsView_InputMethodQuery(this.h, (C.int)(query)) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -594,11 +594,11 @@ func QGraphicsView_TrUtf83(s string, c string, n int) string { } func (this *QGraphicsView) SetRenderHint2(hint QPainter__RenderHint, enabled bool) { - C.QGraphicsView_SetRenderHint2(this.h, (C.uintptr_t)(hint), (C.bool)(enabled)) + C.QGraphicsView_SetRenderHint2(this.h, (C.int)(hint), (C.bool)(enabled)) } func (this *QGraphicsView) SetOptimizationFlag2(flag QGraphicsView__OptimizationFlag, enabled bool) { - C.QGraphicsView_SetOptimizationFlag2(this.h, (C.uintptr_t)(flag), (C.bool)(enabled)) + C.QGraphicsView_SetOptimizationFlag2(this.h, (C.int)(flag), (C.bool)(enabled)) } func (this *QGraphicsView) SetMatrix2(matrix *QMatrix, combine bool) { @@ -634,15 +634,15 @@ func (this *QGraphicsView) EnsureVisible32(item *QGraphicsItem, xmargin int, yma } func (this *QGraphicsView) FitInView22(rect *QRectF, aspectRadioMode AspectRatioMode) { - C.QGraphicsView_FitInView22(this.h, rect.cPointer(), (C.uintptr_t)(aspectRadioMode)) + C.QGraphicsView_FitInView22(this.h, rect.cPointer(), (C.int)(aspectRadioMode)) } 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)) + C.QGraphicsView_FitInView5(this.h, (C.double)(x), (C.double)(y), (C.double)(w), (C.double)(h), (C.int)(aspectRadioMode)) } func (this *QGraphicsView) FitInView23(item *QGraphicsItem, aspectRadioMode AspectRatioMode) { - C.QGraphicsView_FitInView23(this.h, item.cPointer(), (C.uintptr_t)(aspectRadioMode)) + C.QGraphicsView_FitInView23(this.h, item.cPointer(), (C.int)(aspectRadioMode)) } func (this *QGraphicsView) Render2(painter *QPainter, target *QRectF) { @@ -654,11 +654,11 @@ func (this *QGraphicsView) Render3(painter *QPainter, target *QRectF, source *QR } 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)) + C.QGraphicsView_Render4(this.h, painter.cPointer(), target.cPointer(), source.cPointer(), (C.int)(aspectRatioMode)) } func (this *QGraphicsView) Items22(rect *QRect, mode ItemSelectionMode) []*QGraphicsItem { - var _ma *C.struct_miqt_array = C.QGraphicsView_Items22(this.h, rect.cPointer(), (C.uintptr_t)(mode)) + var _ma *C.struct_miqt_array = C.QGraphicsView_Items22(this.h, rect.cPointer(), (C.int)(mode)) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -669,7 +669,7 @@ func (this *QGraphicsView) Items22(rect *QRect, mode ItemSelectionMode) []*QGrap } func (this *QGraphicsView) Items5(x int, y int, w int, h int, mode ItemSelectionMode) []*QGraphicsItem { - var _ma *C.struct_miqt_array = C.QGraphicsView_Items5(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.uintptr_t)(mode)) + var _ma *C.struct_miqt_array = C.QGraphicsView_Items5(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.int)(mode)) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -680,7 +680,7 @@ func (this *QGraphicsView) Items5(x int, y int, w int, h int, mode ItemSelection } func (this *QGraphicsView) Items24(path *QPainterPath, mode ItemSelectionMode) []*QGraphicsItem { - var _ma *C.struct_miqt_array = C.QGraphicsView_Items24(this.h, path.cPointer(), (C.uintptr_t)(mode)) + var _ma *C.struct_miqt_array = C.QGraphicsView_Items24(this.h, path.cPointer(), (C.int)(mode)) _ret := make([]*QGraphicsItem, int(_ma.len)) _outCast := (*[0xffff]*C.QGraphicsItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -695,7 +695,7 @@ func (this *QGraphicsView) InvalidateScene1(rect *QRectF) { } func (this *QGraphicsView) InvalidateScene2(rect *QRectF, layers int) { - C.QGraphicsView_InvalidateScene2(this.h, rect.cPointer(), (C.int)(layers)) + C.QGraphicsView_InvalidateScene2(this.h, rect.cPointer(), layers) } // Delete this object from C++ memory. diff --git a/qt/gen_qgraphicsview.h b/qt/gen_qgraphicsview.h index a951c2b..50e2dbe 100644 --- a/qt/gen_qgraphicsview.h +++ b/qt/gen_qgraphicsview.h @@ -58,23 +58,23 @@ struct miqt_string* QGraphicsView_Tr(const char* s); struct miqt_string* QGraphicsView_TrUtf8(const char* s); QSize* QGraphicsView_SizeHint(const QGraphicsView* self); int QGraphicsView_RenderHints(const QGraphicsView* self); -void QGraphicsView_SetRenderHint(QGraphicsView* self, uintptr_t hint); +void QGraphicsView_SetRenderHint(QGraphicsView* self, int hint); void QGraphicsView_SetRenderHints(QGraphicsView* self, int hints); int QGraphicsView_Alignment(const QGraphicsView* self); void QGraphicsView_SetAlignment(QGraphicsView* self, int alignment); -uintptr_t QGraphicsView_TransformationAnchor(const QGraphicsView* self); -void QGraphicsView_SetTransformationAnchor(QGraphicsView* self, uintptr_t anchor); -uintptr_t QGraphicsView_ResizeAnchor(const QGraphicsView* self); -void QGraphicsView_SetResizeAnchor(QGraphicsView* self, uintptr_t anchor); -uintptr_t QGraphicsView_ViewportUpdateMode(const QGraphicsView* self); -void QGraphicsView_SetViewportUpdateMode(QGraphicsView* self, uintptr_t mode); +int QGraphicsView_TransformationAnchor(const QGraphicsView* self); +void QGraphicsView_SetTransformationAnchor(QGraphicsView* self, int anchor); +int QGraphicsView_ResizeAnchor(const QGraphicsView* self); +void QGraphicsView_SetResizeAnchor(QGraphicsView* self, int anchor); +int QGraphicsView_ViewportUpdateMode(const QGraphicsView* self); +void QGraphicsView_SetViewportUpdateMode(QGraphicsView* self, int mode); int QGraphicsView_OptimizationFlags(const QGraphicsView* self); -void QGraphicsView_SetOptimizationFlag(QGraphicsView* self, uintptr_t flag); +void QGraphicsView_SetOptimizationFlag(QGraphicsView* self, int flag); void QGraphicsView_SetOptimizationFlags(QGraphicsView* self, int flags); -uintptr_t QGraphicsView_DragMode(const QGraphicsView* self); -void QGraphicsView_SetDragMode(QGraphicsView* self, uintptr_t mode); -uintptr_t QGraphicsView_RubberBandSelectionMode(const QGraphicsView* self); -void QGraphicsView_SetRubberBandSelectionMode(QGraphicsView* self, uintptr_t mode); +int QGraphicsView_DragMode(const QGraphicsView* self); +void QGraphicsView_SetDragMode(QGraphicsView* self, int mode); +int QGraphicsView_RubberBandSelectionMode(const QGraphicsView* self); +void QGraphicsView_SetRubberBandSelectionMode(QGraphicsView* self, int mode); QRect* QGraphicsView_RubberBandRect(const QGraphicsView* self); int QGraphicsView_CacheMode(const QGraphicsView* self); void QGraphicsView_SetCacheMode(QGraphicsView* self, int mode); @@ -122,7 +122,7 @@ QPoint* QGraphicsView_MapFromScene(const QGraphicsView* self, QPointF* point); QPainterPath* QGraphicsView_MapFromSceneWithPath(const QGraphicsView* self, QPainterPath* path); QPointF* QGraphicsView_MapToScene2(const QGraphicsView* self, int x, int y); QPoint* QGraphicsView_MapFromScene2(const QGraphicsView* self, double x, double y); -QVariant* QGraphicsView_InputMethodQuery(const QGraphicsView* self, uintptr_t query); +QVariant* QGraphicsView_InputMethodQuery(const QGraphicsView* self, int query); QBrush* QGraphicsView_BackgroundBrush(const QGraphicsView* self); void QGraphicsView_SetBackgroundBrush(QGraphicsView* self, QBrush* brush); QBrush* QGraphicsView_ForegroundBrush(const QGraphicsView* self); @@ -136,8 +136,8 @@ struct miqt_string* QGraphicsView_Tr2(const char* s, const char* c); struct miqt_string* QGraphicsView_Tr3(const char* s, const char* c, int n); struct miqt_string* QGraphicsView_TrUtf82(const char* s, const char* c); struct miqt_string* QGraphicsView_TrUtf83(const char* s, const char* c, int n); -void QGraphicsView_SetRenderHint2(QGraphicsView* self, uintptr_t hint, bool enabled); -void QGraphicsView_SetOptimizationFlag2(QGraphicsView* self, uintptr_t flag, bool enabled); +void QGraphicsView_SetRenderHint2(QGraphicsView* self, int hint, bool enabled); +void QGraphicsView_SetOptimizationFlag2(QGraphicsView* self, int flag, bool enabled); void QGraphicsView_SetMatrix2(QGraphicsView* self, QMatrix* matrix, bool combine); void QGraphicsView_SetTransform2(QGraphicsView* self, QTransform* matrix, bool combine); void QGraphicsView_EnsureVisible22(QGraphicsView* self, QRectF* rect, int xmargin); @@ -146,15 +146,15 @@ void QGraphicsView_EnsureVisible5(QGraphicsView* self, double x, double y, doubl void QGraphicsView_EnsureVisible6(QGraphicsView* self, double x, double y, double w, double h, int xmargin, int ymargin); void QGraphicsView_EnsureVisible23(QGraphicsView* self, QGraphicsItem* item, int xmargin); void QGraphicsView_EnsureVisible32(QGraphicsView* self, QGraphicsItem* item, int xmargin, int ymargin); -void QGraphicsView_FitInView22(QGraphicsView* self, QRectF* rect, uintptr_t aspectRadioMode); -void QGraphicsView_FitInView5(QGraphicsView* self, double x, double y, double w, double h, uintptr_t aspectRadioMode); -void QGraphicsView_FitInView23(QGraphicsView* self, QGraphicsItem* item, uintptr_t aspectRadioMode); +void QGraphicsView_FitInView22(QGraphicsView* self, QRectF* rect, int aspectRadioMode); +void QGraphicsView_FitInView5(QGraphicsView* self, double x, double y, double w, double h, int aspectRadioMode); +void QGraphicsView_FitInView23(QGraphicsView* self, QGraphicsItem* item, int aspectRadioMode); void QGraphicsView_Render2(QGraphicsView* self, QPainter* painter, QRectF* target); void QGraphicsView_Render3(QGraphicsView* self, QPainter* painter, QRectF* target, QRect* source); -void QGraphicsView_Render4(QGraphicsView* self, QPainter* painter, QRectF* target, QRect* source, uintptr_t aspectRatioMode); -struct miqt_array* QGraphicsView_Items22(const QGraphicsView* self, QRect* rect, uintptr_t mode); -struct miqt_array* QGraphicsView_Items5(const QGraphicsView* self, int x, int y, int w, int h, uintptr_t mode); -struct miqt_array* QGraphicsView_Items24(const QGraphicsView* self, QPainterPath* path, uintptr_t mode); +void QGraphicsView_Render4(QGraphicsView* self, QPainter* painter, QRectF* target, QRect* source, int aspectRatioMode); +struct miqt_array* QGraphicsView_Items22(const QGraphicsView* self, QRect* rect, int mode); +struct miqt_array* QGraphicsView_Items5(const QGraphicsView* self, int x, int y, int w, int h, int mode); +struct miqt_array* QGraphicsView_Items24(const QGraphicsView* self, QPainterPath* path, int mode); void QGraphicsView_InvalidateScene1(QGraphicsView* self, QRectF* rect); void QGraphicsView_InvalidateScene2(QGraphicsView* self, QRectF* rect, int layers); void QGraphicsView_Delete(QGraphicsView* self); diff --git a/qt/gen_qgraphicswidget.cpp b/qt/gen_qgraphicswidget.cpp index ce85bf1..5655ee4 100644 --- a/qt/gen_qgraphicswidget.cpp +++ b/qt/gen_qgraphicswidget.cpp @@ -64,12 +64,12 @@ void QGraphicsWidget_AdjustSize(QGraphicsWidget* self) { self->adjustSize(); } -uintptr_t QGraphicsWidget_LayoutDirection(const QGraphicsWidget* self) { +int QGraphicsWidget_LayoutDirection(const QGraphicsWidget* self) { Qt::LayoutDirection _ret = self->layoutDirection(); - return static_cast(_ret); + return static_cast(_ret); } -void QGraphicsWidget_SetLayoutDirection(QGraphicsWidget* self, uintptr_t direction) { +void QGraphicsWidget_SetLayoutDirection(QGraphicsWidget* self, int direction) { self->setLayoutDirection(static_cast(direction)); } @@ -174,9 +174,9 @@ int QGraphicsWidget_WindowFlags(const QGraphicsWidget* self) { return static_cast(_ret); } -uintptr_t QGraphicsWidget_WindowType(const QGraphicsWidget* self) { +int QGraphicsWidget_WindowType(const QGraphicsWidget* self) { Qt::WindowType _ret = self->windowType(); - return static_cast(_ret); + return static_cast(_ret); } void QGraphicsWidget_SetWindowFlags(QGraphicsWidget* self, int wFlags) { @@ -199,12 +199,12 @@ struct miqt_string* QGraphicsWidget_WindowTitle(const QGraphicsWidget* self) { return miqt_strdup(_b.data(), _b.length()); } -uintptr_t QGraphicsWidget_FocusPolicy(const QGraphicsWidget* self) { +int QGraphicsWidget_FocusPolicy(const QGraphicsWidget* self) { Qt::FocusPolicy _ret = self->focusPolicy(); - return static_cast(_ret); + return static_cast(_ret); } -void QGraphicsWidget_SetFocusPolicy(QGraphicsWidget* self, uintptr_t policy) { +void QGraphicsWidget_SetFocusPolicy(QGraphicsWidget* self, int policy) { self->setFocusPolicy(static_cast(policy)); } @@ -265,7 +265,7 @@ void QGraphicsWidget_RemoveAction(QGraphicsWidget* self, QAction* action) { } struct miqt_array* QGraphicsWidget_Actions(const QGraphicsWidget* self) { - QList _ret = self->actions(); + QList _ret = self->actions(); // Convert QList<> from C++ memory to manually-managed C memory QAction** _arr = static_cast(malloc(sizeof(QAction*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -277,11 +277,11 @@ struct miqt_array* QGraphicsWidget_Actions(const QGraphicsWidget* self) { return _out; } -void QGraphicsWidget_SetAttribute(QGraphicsWidget* self, uintptr_t attribute) { +void QGraphicsWidget_SetAttribute(QGraphicsWidget* self, int attribute) { self->setAttribute(static_cast(attribute)); } -bool QGraphicsWidget_TestAttribute(const QGraphicsWidget* self, uintptr_t attribute) { +bool QGraphicsWidget_TestAttribute(const QGraphicsWidget* self, int attribute) { return self->testAttribute(static_cast(attribute)); } @@ -357,7 +357,7 @@ struct miqt_string* QGraphicsWidget_TrUtf83(const char* s, const char* c, int n) return miqt_strdup(_b.data(), _b.length()); } -int QGraphicsWidget_GrabShortcut2(QGraphicsWidget* self, QKeySequence* sequence, uintptr_t context) { +int QGraphicsWidget_GrabShortcut2(QGraphicsWidget* self, QKeySequence* sequence, int context) { return self->grabShortcut(*sequence, static_cast(context)); } @@ -369,7 +369,7 @@ void QGraphicsWidget_SetShortcutAutoRepeat2(QGraphicsWidget* self, int id, bool self->setShortcutAutoRepeat(static_cast(id), enabled); } -void QGraphicsWidget_SetAttribute2(QGraphicsWidget* self, uintptr_t attribute, bool on) { +void QGraphicsWidget_SetAttribute2(QGraphicsWidget* self, int attribute, bool on) { self->setAttribute(static_cast(attribute), on); } diff --git a/qt/gen_qgraphicswidget.go b/qt/gen_qgraphicswidget.go index 2fac817..4bac705 100644 --- a/qt/gen_qgraphicswidget.go +++ b/qt/gen_qgraphicswidget.go @@ -58,7 +58,7 @@ func NewQGraphicsWidget2(parent *QGraphicsItem) *QGraphicsWidget { // NewQGraphicsWidget3 constructs a new QGraphicsWidget object. func NewQGraphicsWidget3(parent *QGraphicsItem, wFlags int) *QGraphicsWidget { - ret := C.QGraphicsWidget_new3(parent.cPointer(), (C.int)(wFlags)) + ret := C.QGraphicsWidget_new3(parent.cPointer(), wFlags) return newQGraphicsWidget(ret) } @@ -101,7 +101,7 @@ func (this *QGraphicsWidget) LayoutDirection() LayoutDirection { } func (this *QGraphicsWidget) SetLayoutDirection(direction LayoutDirection) { - C.QGraphicsWidget_SetLayoutDirection(this.h, (C.uintptr_t)(direction)) + C.QGraphicsWidget_SetLayoutDirection(this.h, (C.int)(direction)) } func (this *QGraphicsWidget) UnsetLayoutDirection() { @@ -227,7 +227,7 @@ func (this *QGraphicsWidget) WindowType() WindowType { } func (this *QGraphicsWidget) SetWindowFlags(wFlags int) { - C.QGraphicsWidget_SetWindowFlags(this.h, (C.int)(wFlags)) + C.QGraphicsWidget_SetWindowFlags(this.h, wFlags) } func (this *QGraphicsWidget) IsActiveWindow() bool { @@ -252,7 +252,7 @@ func (this *QGraphicsWidget) FocusPolicy() FocusPolicy { } func (this *QGraphicsWidget) SetFocusPolicy(policy FocusPolicy) { - C.QGraphicsWidget_SetFocusPolicy(this.h, (C.uintptr_t)(policy)) + C.QGraphicsWidget_SetFocusPolicy(this.h, (C.int)(policy)) } func QGraphicsWidget_SetTabOrder(first *QGraphicsWidget, second *QGraphicsWidget) { @@ -327,11 +327,11 @@ func (this *QGraphicsWidget) Actions() []*QAction { } func (this *QGraphicsWidget) SetAttribute(attribute WidgetAttribute) { - C.QGraphicsWidget_SetAttribute(this.h, (C.uintptr_t)(attribute)) + C.QGraphicsWidget_SetAttribute(this.h, (C.int)(attribute)) } func (this *QGraphicsWidget) TestAttribute(attribute WidgetAttribute) bool { - return (bool)(C.QGraphicsWidget_TestAttribute(this.h, (C.uintptr_t)(attribute))) + return (bool)(C.QGraphicsWidget_TestAttribute(this.h, (C.int)(attribute))) } func (this *QGraphicsWidget) Type() int { @@ -443,7 +443,7 @@ func QGraphicsWidget_TrUtf83(s string, c string, n int) string { } func (this *QGraphicsWidget) GrabShortcut2(sequence *QKeySequence, context ShortcutContext) int { - return (int)(C.QGraphicsWidget_GrabShortcut2(this.h, sequence.cPointer(), (C.uintptr_t)(context))) + return (int)(C.QGraphicsWidget_GrabShortcut2(this.h, sequence.cPointer(), (C.int)(context))) } func (this *QGraphicsWidget) SetShortcutEnabled2(id int, enabled bool) { @@ -455,7 +455,7 @@ func (this *QGraphicsWidget) SetShortcutAutoRepeat2(id int, enabled bool) { } func (this *QGraphicsWidget) SetAttribute2(attribute WidgetAttribute, on bool) { - C.QGraphicsWidget_SetAttribute2(this.h, (C.uintptr_t)(attribute), (C.bool)(on)) + C.QGraphicsWidget_SetAttribute2(this.h, (C.int)(attribute), (C.bool)(on)) } func (this *QGraphicsWidget) Paint3(painter *QPainter, option *QStyleOptionGraphicsItem, widget *QWidget) { diff --git a/qt/gen_qgraphicswidget.h b/qt/gen_qgraphicswidget.h index 9e3388e..e1b620d 100644 --- a/qt/gen_qgraphicswidget.h +++ b/qt/gen_qgraphicswidget.h @@ -58,8 +58,8 @@ struct miqt_string* QGraphicsWidget_TrUtf8(const char* s); QGraphicsLayout* QGraphicsWidget_Layout(const QGraphicsWidget* self); void QGraphicsWidget_SetLayout(QGraphicsWidget* self, QGraphicsLayout* layout); void QGraphicsWidget_AdjustSize(QGraphicsWidget* self); -uintptr_t QGraphicsWidget_LayoutDirection(const QGraphicsWidget* self); -void QGraphicsWidget_SetLayoutDirection(QGraphicsWidget* self, uintptr_t direction); +int QGraphicsWidget_LayoutDirection(const QGraphicsWidget* self); +void QGraphicsWidget_SetLayoutDirection(QGraphicsWidget* self, int direction); void QGraphicsWidget_UnsetLayoutDirection(QGraphicsWidget* self); QStyle* QGraphicsWidget_Style(const QGraphicsWidget* self); void QGraphicsWidget_SetStyle(QGraphicsWidget* self, QStyle* style); @@ -85,13 +85,13 @@ void QGraphicsWidget_UnsetWindowFrameMargins(QGraphicsWidget* self); QRectF* QGraphicsWidget_WindowFrameGeometry(const QGraphicsWidget* self); QRectF* QGraphicsWidget_WindowFrameRect(const QGraphicsWidget* self); int QGraphicsWidget_WindowFlags(const QGraphicsWidget* self); -uintptr_t QGraphicsWidget_WindowType(const QGraphicsWidget* self); +int QGraphicsWidget_WindowType(const QGraphicsWidget* self); void QGraphicsWidget_SetWindowFlags(QGraphicsWidget* self, int wFlags); bool QGraphicsWidget_IsActiveWindow(const QGraphicsWidget* self); void QGraphicsWidget_SetWindowTitle(QGraphicsWidget* self, struct miqt_string* title); struct miqt_string* QGraphicsWidget_WindowTitle(const QGraphicsWidget* self); -uintptr_t QGraphicsWidget_FocusPolicy(const QGraphicsWidget* self); -void QGraphicsWidget_SetFocusPolicy(QGraphicsWidget* self, uintptr_t policy); +int QGraphicsWidget_FocusPolicy(const QGraphicsWidget* self); +void QGraphicsWidget_SetFocusPolicy(QGraphicsWidget* self, int policy); void QGraphicsWidget_SetTabOrder(QGraphicsWidget* first, QGraphicsWidget* second); QGraphicsWidget* QGraphicsWidget_FocusWidget(const QGraphicsWidget* self); int QGraphicsWidget_GrabShortcut(QGraphicsWidget* self, QKeySequence* sequence); @@ -104,8 +104,8 @@ void QGraphicsWidget_InsertActions(QGraphicsWidget* self, QAction* before, struc void QGraphicsWidget_InsertAction(QGraphicsWidget* self, QAction* before, QAction* action); void QGraphicsWidget_RemoveAction(QGraphicsWidget* self, QAction* action); struct miqt_array* QGraphicsWidget_Actions(const QGraphicsWidget* self); -void QGraphicsWidget_SetAttribute(QGraphicsWidget* self, uintptr_t attribute); -bool QGraphicsWidget_TestAttribute(const QGraphicsWidget* self, uintptr_t attribute); +void QGraphicsWidget_SetAttribute(QGraphicsWidget* self, int attribute); +bool QGraphicsWidget_TestAttribute(const QGraphicsWidget* self, int attribute); int QGraphicsWidget_Type(const QGraphicsWidget* self); void QGraphicsWidget_Paint(QGraphicsWidget* self, QPainter* painter, QStyleOptionGraphicsItem* option); void QGraphicsWidget_PaintWindowFrame(QGraphicsWidget* self, QPainter* painter, QStyleOptionGraphicsItem* option); @@ -120,10 +120,10 @@ struct miqt_string* QGraphicsWidget_Tr2(const char* s, const char* c); struct miqt_string* QGraphicsWidget_Tr3(const char* s, const char* c, int n); struct miqt_string* QGraphicsWidget_TrUtf82(const char* s, const char* c); struct miqt_string* QGraphicsWidget_TrUtf83(const char* s, const char* c, int n); -int QGraphicsWidget_GrabShortcut2(QGraphicsWidget* self, QKeySequence* sequence, uintptr_t context); +int QGraphicsWidget_GrabShortcut2(QGraphicsWidget* self, QKeySequence* sequence, int context); void QGraphicsWidget_SetShortcutEnabled2(QGraphicsWidget* self, int id, bool enabled); void QGraphicsWidget_SetShortcutAutoRepeat2(QGraphicsWidget* self, int id, bool enabled); -void QGraphicsWidget_SetAttribute2(QGraphicsWidget* self, uintptr_t attribute, bool on); +void QGraphicsWidget_SetAttribute2(QGraphicsWidget* self, int attribute, bool on); void QGraphicsWidget_Paint3(QGraphicsWidget* self, QPainter* painter, QStyleOptionGraphicsItem* option, QWidget* widget); void QGraphicsWidget_PaintWindowFrame3(QGraphicsWidget* self, QPainter* painter, QStyleOptionGraphicsItem* option, QWidget* widget); void QGraphicsWidget_Delete(QGraphicsWidget* self); diff --git a/qt/gen_qgridlayout.cpp b/qt/gen_qgridlayout.cpp index cad5890..9c3a0c6 100644 --- a/qt/gen_qgridlayout.cpp +++ b/qt/gen_qgridlayout.cpp @@ -159,13 +159,13 @@ void QGridLayout_AddLayout2(QGridLayout* self, QLayout* param1, int row, int col self->addLayout(param1, static_cast(row), static_cast(column), static_cast(rowSpan), static_cast(columnSpan)); } -void QGridLayout_SetOriginCorner(QGridLayout* self, uintptr_t originCorner) { +void QGridLayout_SetOriginCorner(QGridLayout* self, int originCorner) { self->setOriginCorner(static_cast(originCorner)); } -uintptr_t QGridLayout_OriginCorner(const QGridLayout* self) { +int QGridLayout_OriginCorner(const QGridLayout* self) { Qt::Corner _ret = self->originCorner(); - return static_cast(_ret); + return static_cast(_ret); } QLayoutItem* QGridLayout_ItemAt(const QGridLayout* self, int index) { @@ -192,7 +192,7 @@ void QGridLayout_AddItem(QGridLayout* self, QLayoutItem* item, int row, int colu self->addItem(item, static_cast(row), static_cast(column)); } -void QGridLayout_SetDefaultPositioning(QGridLayout* self, int n, uintptr_t orient) { +void QGridLayout_SetDefaultPositioning(QGridLayout* self, int n, int orient) { self->setDefaultPositioning(static_cast(n), static_cast(orient)); } diff --git a/qt/gen_qgridlayout.go b/qt/gen_qgridlayout.go index 92c4cce..7f002d6 100644 --- a/qt/gen_qgridlayout.go +++ b/qt/gen_qgridlayout.go @@ -203,7 +203,7 @@ func (this *QGridLayout) AddLayout2(param1 *QLayout, row int, column int, rowSpa } func (this *QGridLayout) SetOriginCorner(originCorner Corner) { - C.QGridLayout_SetOriginCorner(this.h, (C.uintptr_t)(originCorner)) + C.QGridLayout_SetOriginCorner(this.h, (C.int)(originCorner)) } func (this *QGridLayout) OriginCorner() Corner { @@ -235,7 +235,7 @@ func (this *QGridLayout) AddItem(item *QLayoutItem, row int, column int) { } func (this *QGridLayout) SetDefaultPositioning(n int, orient Orientation) { - C.QGridLayout_SetDefaultPositioning(this.h, (C.int)(n), (C.uintptr_t)(orient)) + C.QGridLayout_SetDefaultPositioning(this.h, (C.int)(n), (C.int)(orient)) } func (this *QGridLayout) GetItemPosition(idx int, row *int, column *int, rowSpan *int, columnSpan *int) { @@ -287,19 +287,19 @@ func QGridLayout_TrUtf83(s string, c string, n int) string { } func (this *QGridLayout) AddWidget4(param1 *QWidget, row int, column int, param4 int) { - C.QGridLayout_AddWidget4(this.h, param1.cPointer(), (C.int)(row), (C.int)(column), (C.int)(param4)) + C.QGridLayout_AddWidget4(this.h, param1.cPointer(), (C.int)(row), (C.int)(column), param4) } func (this *QGridLayout) AddWidget6(param1 *QWidget, row int, column int, rowSpan int, columnSpan int, param6 int) { - C.QGridLayout_AddWidget6(this.h, param1.cPointer(), (C.int)(row), (C.int)(column), (C.int)(rowSpan), (C.int)(columnSpan), (C.int)(param6)) + C.QGridLayout_AddWidget6(this.h, param1.cPointer(), (C.int)(row), (C.int)(column), (C.int)(rowSpan), (C.int)(columnSpan), param6) } func (this *QGridLayout) AddLayout4(param1 *QLayout, row int, column int, param4 int) { - C.QGridLayout_AddLayout4(this.h, param1.cPointer(), (C.int)(row), (C.int)(column), (C.int)(param4)) + C.QGridLayout_AddLayout4(this.h, param1.cPointer(), (C.int)(row), (C.int)(column), param4) } func (this *QGridLayout) AddLayout6(param1 *QLayout, row int, column int, rowSpan int, columnSpan int, param6 int) { - C.QGridLayout_AddLayout6(this.h, param1.cPointer(), (C.int)(row), (C.int)(column), (C.int)(rowSpan), (C.int)(columnSpan), (C.int)(param6)) + C.QGridLayout_AddLayout6(this.h, param1.cPointer(), (C.int)(row), (C.int)(column), (C.int)(rowSpan), (C.int)(columnSpan), param6) } func (this *QGridLayout) AddItem4(item *QLayoutItem, row int, column int, rowSpan int) { @@ -311,7 +311,7 @@ func (this *QGridLayout) AddItem5(item *QLayoutItem, row int, column int, rowSpa } func (this *QGridLayout) AddItem6(item *QLayoutItem, row int, column int, rowSpan int, columnSpan int, param6 int) { - C.QGridLayout_AddItem6(this.h, item.cPointer(), (C.int)(row), (C.int)(column), (C.int)(rowSpan), (C.int)(columnSpan), (C.int)(param6)) + C.QGridLayout_AddItem6(this.h, item.cPointer(), (C.int)(row), (C.int)(column), (C.int)(rowSpan), (C.int)(columnSpan), param6) } // Delete this object from C++ memory. diff --git a/qt/gen_qgridlayout.h b/qt/gen_qgridlayout.h index 31999ac..a3cc8db 100644 --- a/qt/gen_qgridlayout.h +++ b/qt/gen_qgridlayout.h @@ -66,15 +66,15 @@ void QGridLayout_AddWidget2(QGridLayout* self, QWidget* param1, int row, int col void QGridLayout_AddWidget3(QGridLayout* self, QWidget* param1, int row, int column, int rowSpan, int columnSpan); void QGridLayout_AddLayout(QGridLayout* self, QLayout* param1, int row, int column); void QGridLayout_AddLayout2(QGridLayout* self, QLayout* param1, int row, int column, int rowSpan, int columnSpan); -void QGridLayout_SetOriginCorner(QGridLayout* self, uintptr_t originCorner); -uintptr_t QGridLayout_OriginCorner(const QGridLayout* self); +void QGridLayout_SetOriginCorner(QGridLayout* self, int originCorner); +int QGridLayout_OriginCorner(const QGridLayout* self); QLayoutItem* QGridLayout_ItemAt(const QGridLayout* self, int index); QLayoutItem* QGridLayout_ItemAtPosition(const QGridLayout* self, int row, int column); QLayoutItem* QGridLayout_TakeAt(QGridLayout* self, int index); int QGridLayout_Count(const QGridLayout* self); void QGridLayout_SetGeometry(QGridLayout* self, QRect* geometry); void QGridLayout_AddItem(QGridLayout* self, QLayoutItem* item, int row, int column); -void QGridLayout_SetDefaultPositioning(QGridLayout* self, int n, uintptr_t orient); +void QGridLayout_SetDefaultPositioning(QGridLayout* self, int n, int orient); void QGridLayout_GetItemPosition(const QGridLayout* self, int idx, int* row, int* column, int* rowSpan, int* columnSpan); struct miqt_string* QGridLayout_Tr2(const char* s, const char* c); struct miqt_string* QGridLayout_Tr3(const char* s, const char* c, int n); diff --git a/qt/gen_qguiapplication.cpp b/qt/gen_qguiapplication.cpp index d59e983..72a6498 100644 --- a/qt/gen_qguiapplication.cpp +++ b/qt/gen_qguiapplication.cpp @@ -133,7 +133,7 @@ QScreen* QGuiApplication_PrimaryScreen() { } struct miqt_array* QGuiApplication_Screens() { - QList _ret = QGuiApplication::screens(); + QList _ret = QGuiApplication::screens(); // Convert QList<> from C++ memory to manually-managed C memory QScreen** _arr = static_cast(malloc(sizeof(QScreen*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -150,7 +150,8 @@ QScreen* QGuiApplication_ScreenAt(QPoint* point) { } double QGuiApplication_DevicePixelRatio(const QGuiApplication* self) { - return self->devicePixelRatio(); + qreal _ret = self->devicePixelRatio(); + return static_cast(_ret); } QCursor* QGuiApplication_OverrideCursor() { @@ -204,13 +205,13 @@ int QGuiApplication_MouseButtons() { return static_cast(_ret); } -void QGuiApplication_SetLayoutDirection(uintptr_t direction) { +void QGuiApplication_SetLayoutDirection(int direction) { QGuiApplication::setLayoutDirection(static_cast(direction)); } -uintptr_t QGuiApplication_LayoutDirection() { +int QGuiApplication_LayoutDirection() { Qt::LayoutDirection _ret = QGuiApplication::layoutDirection(); - return static_cast(_ret); + return static_cast(_ret); } bool QGuiApplication_IsRightToLeft() { @@ -245,18 +246,18 @@ bool QGuiApplication_QuitOnLastWindowClosed() { return QGuiApplication::quitOnLastWindowClosed(); } -uintptr_t QGuiApplication_ApplicationState() { +int QGuiApplication_ApplicationState() { Qt::ApplicationState _ret = QGuiApplication::applicationState(); - return static_cast(_ret); + return static_cast(_ret); } -void QGuiApplication_SetHighDpiScaleFactorRoundingPolicy(uintptr_t policy) { +void QGuiApplication_SetHighDpiScaleFactorRoundingPolicy(int policy) { QGuiApplication::setHighDpiScaleFactorRoundingPolicy(static_cast(policy)); } -uintptr_t QGuiApplication_HighDpiScaleFactorRoundingPolicy() { +int QGuiApplication_HighDpiScaleFactorRoundingPolicy() { Qt::HighDpiScaleFactorRoundingPolicy _ret = QGuiApplication::highDpiScaleFactorRoundingPolicy(); - return static_cast(_ret); + return static_cast(_ret); } int QGuiApplication_Exec() { @@ -376,26 +377,26 @@ void QGuiApplication_connect_FocusWindowChanged(QGuiApplication* self, void* slo }); } -void QGuiApplication_ApplicationStateChanged(QGuiApplication* self, uintptr_t state) { +void QGuiApplication_ApplicationStateChanged(QGuiApplication* self, int state) { self->applicationStateChanged(static_cast(state)); } void QGuiApplication_connect_ApplicationStateChanged(QGuiApplication* self, void* slot) { QGuiApplication::connect(self, static_cast(&QGuiApplication::applicationStateChanged), self, [=](Qt::ApplicationState state) { Qt::ApplicationState state_ret = state; - uintptr_t sigval1 = static_cast(state_ret); + int sigval1 = static_cast(state_ret); miqt_exec_callback_QGuiApplication_ApplicationStateChanged(slot, sigval1); }); } -void QGuiApplication_LayoutDirectionChanged(QGuiApplication* self, uintptr_t direction) { +void QGuiApplication_LayoutDirectionChanged(QGuiApplication* self, int direction) { self->layoutDirectionChanged(static_cast(direction)); } void QGuiApplication_connect_LayoutDirectionChanged(QGuiApplication* self, void* slot) { QGuiApplication::connect(self, static_cast(&QGuiApplication::layoutDirectionChanged), self, [=](Qt::LayoutDirection direction) { Qt::LayoutDirection direction_ret = direction; - uintptr_t sigval1 = static_cast(direction_ret); + int sigval1 = static_cast(direction_ret); miqt_exec_callback_QGuiApplication_LayoutDirectionChanged(slot, sigval1); }); } diff --git a/qt/gen_qguiapplication.go b/qt/gen_qguiapplication.go index 3e872f2..8d8531a 100644 --- a/qt/gen_qguiapplication.go +++ b/qt/gen_qguiapplication.go @@ -245,7 +245,7 @@ func QGuiApplication_MouseButtons() int { } func QGuiApplication_SetLayoutDirection(direction LayoutDirection) { - C.QGuiApplication_SetLayoutDirection((C.uintptr_t)(direction)) + C.QGuiApplication_SetLayoutDirection((C.int)(direction)) } func QGuiApplication_LayoutDirection() LayoutDirection { @@ -289,7 +289,7 @@ func QGuiApplication_ApplicationState() ApplicationState { } func QGuiApplication_SetHighDpiScaleFactorRoundingPolicy(policy HighDpiScaleFactorRoundingPolicy) { - C.QGuiApplication_SetHighDpiScaleFactorRoundingPolicy((C.uintptr_t)(policy)) + C.QGuiApplication_SetHighDpiScaleFactorRoundingPolicy((C.int)(policy)) } func QGuiApplication_HighDpiScaleFactorRoundingPolicy() HighDpiScaleFactorRoundingPolicy { @@ -473,14 +473,14 @@ func miqt_exec_callback_QGuiApplication_FocusWindowChanged(cb *C.void, focusWind } func (this *QGuiApplication) ApplicationStateChanged(state ApplicationState) { - C.QGuiApplication_ApplicationStateChanged(this.h, (C.uintptr_t)(state)) + C.QGuiApplication_ApplicationStateChanged(this.h, (C.int)(state)) } func (this *QGuiApplication) OnApplicationStateChanged(slot func(state ApplicationState)) { C.QGuiApplication_connect_ApplicationStateChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QGuiApplication_ApplicationStateChanged -func miqt_exec_callback_QGuiApplication_ApplicationStateChanged(cb *C.void, state C.uintptr_t) { +func miqt_exec_callback_QGuiApplication_ApplicationStateChanged(cb *C.void, state C.int) { gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(state ApplicationState)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -493,14 +493,14 @@ func miqt_exec_callback_QGuiApplication_ApplicationStateChanged(cb *C.void, stat } func (this *QGuiApplication) LayoutDirectionChanged(direction LayoutDirection) { - C.QGuiApplication_LayoutDirectionChanged(this.h, (C.uintptr_t)(direction)) + C.QGuiApplication_LayoutDirectionChanged(this.h, (C.int)(direction)) } func (this *QGuiApplication) OnLayoutDirectionChanged(slot func(direction LayoutDirection)) { C.QGuiApplication_connect_LayoutDirectionChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QGuiApplication_LayoutDirectionChanged -func miqt_exec_callback_QGuiApplication_LayoutDirectionChanged(cb *C.void, direction C.uintptr_t) { +func miqt_exec_callback_QGuiApplication_LayoutDirectionChanged(cb *C.void, direction C.int) { gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(direction LayoutDirection)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt/gen_qguiapplication.h b/qt/gen_qguiapplication.h index eaa88b6..503dc81 100644 --- a/qt/gen_qguiapplication.h +++ b/qt/gen_qguiapplication.h @@ -81,8 +81,8 @@ void QGuiApplication_SetPalette(QPalette* pal); int QGuiApplication_KeyboardModifiers(); int QGuiApplication_QueryKeyboardModifiers(); int QGuiApplication_MouseButtons(); -void QGuiApplication_SetLayoutDirection(uintptr_t direction); -uintptr_t QGuiApplication_LayoutDirection(); +void QGuiApplication_SetLayoutDirection(int direction); +int QGuiApplication_LayoutDirection(); bool QGuiApplication_IsRightToLeft(); bool QGuiApplication_IsLeftToRight(); QStyleHints* QGuiApplication_StyleHints(); @@ -91,9 +91,9 @@ bool QGuiApplication_DesktopSettingsAware(); QInputMethod* QGuiApplication_InputMethod(); void QGuiApplication_SetQuitOnLastWindowClosed(bool quit); bool QGuiApplication_QuitOnLastWindowClosed(); -uintptr_t QGuiApplication_ApplicationState(); -void QGuiApplication_SetHighDpiScaleFactorRoundingPolicy(uintptr_t policy); -uintptr_t QGuiApplication_HighDpiScaleFactorRoundingPolicy(); +int QGuiApplication_ApplicationState(); +void QGuiApplication_SetHighDpiScaleFactorRoundingPolicy(int policy); +int QGuiApplication_HighDpiScaleFactorRoundingPolicy(); int QGuiApplication_Exec(); bool QGuiApplication_Notify(QGuiApplication* self, QObject* param1, QEvent* param2); bool QGuiApplication_IsSessionRestored(const QGuiApplication* self); @@ -117,9 +117,9 @@ void QGuiApplication_FocusObjectChanged(QGuiApplication* self, QObject* focusObj void QGuiApplication_connect_FocusObjectChanged(QGuiApplication* self, void* slot); void QGuiApplication_FocusWindowChanged(QGuiApplication* self, QWindow* focusWindow); void QGuiApplication_connect_FocusWindowChanged(QGuiApplication* self, void* slot); -void QGuiApplication_ApplicationStateChanged(QGuiApplication* self, uintptr_t state); +void QGuiApplication_ApplicationStateChanged(QGuiApplication* self, int state); void QGuiApplication_connect_ApplicationStateChanged(QGuiApplication* self, void* slot); -void QGuiApplication_LayoutDirectionChanged(QGuiApplication* self, uintptr_t direction); +void QGuiApplication_LayoutDirectionChanged(QGuiApplication* self, int direction); void QGuiApplication_connect_LayoutDirectionChanged(QGuiApplication* self, void* slot); void QGuiApplication_CommitDataRequest(QGuiApplication* self, QSessionManager* sessionManager); void QGuiApplication_connect_CommitDataRequest(QGuiApplication* self, void* slot); diff --git a/qt/gen_qheaderview.cpp b/qt/gen_qheaderview.cpp index 39a0e0c..d00a03b 100644 --- a/qt/gen_qheaderview.cpp +++ b/qt/gen_qheaderview.cpp @@ -12,11 +12,11 @@ #include "gen_qheaderview.h" #include "_cgo_export.h" -QHeaderView* QHeaderView_new(uintptr_t orientation) { +QHeaderView* QHeaderView_new(int orientation) { return new QHeaderView(static_cast(orientation)); } -QHeaderView* QHeaderView_new2(uintptr_t orientation, QWidget* parent) { +QHeaderView* QHeaderView_new2(int orientation, QWidget* parent) { return new QHeaderView(static_cast(orientation), parent); } @@ -42,9 +42,9 @@ void QHeaderView_SetModel(QHeaderView* self, QAbstractItemModel* model) { self->setModel(model); } -uintptr_t QHeaderView_Orientation(const QHeaderView* self) { +int QHeaderView_Orientation(const QHeaderView* self) { Qt::Orientation _ret = self->orientation(); - return static_cast(_ret); + return static_cast(_ret); } int QHeaderView_Offset(const QHeaderView* self) { @@ -107,7 +107,7 @@ void QHeaderView_ResizeSection(QHeaderView* self, int logicalIndex, int size) { self->resizeSection(static_cast(logicalIndex), static_cast(size)); } -void QHeaderView_ResizeSections(QHeaderView* self, uintptr_t mode) { +void QHeaderView_ResizeSections(QHeaderView* self, int mode) { self->resizeSections(static_cast(mode)); } @@ -175,16 +175,16 @@ bool QHeaderView_HighlightSections(const QHeaderView* self) { return self->highlightSections(); } -uintptr_t QHeaderView_SectionResizeMode(const QHeaderView* self, int logicalIndex) { +int QHeaderView_SectionResizeMode(const QHeaderView* self, int logicalIndex) { QHeaderView::ResizeMode _ret = self->sectionResizeMode(static_cast(logicalIndex)); - return static_cast(_ret); + return static_cast(_ret); } -void QHeaderView_SetSectionResizeMode(QHeaderView* self, uintptr_t mode) { +void QHeaderView_SetSectionResizeMode(QHeaderView* self, int mode) { self->setSectionResizeMode(static_cast(mode)); } -void QHeaderView_SetSectionResizeMode2(QHeaderView* self, int logicalIndex, uintptr_t mode) { +void QHeaderView_SetSectionResizeMode2(QHeaderView* self, int logicalIndex, int mode) { self->setSectionResizeMode(static_cast(logicalIndex), static_cast(mode)); } @@ -208,7 +208,7 @@ bool QHeaderView_IsSortIndicatorShown(const QHeaderView* self) { return self->isSortIndicatorShown(); } -void QHeaderView_SetSortIndicator(QHeaderView* self, int logicalIndex, uintptr_t order) { +void QHeaderView_SetSortIndicator(QHeaderView* self, int logicalIndex, int order) { self->setSortIndicator(static_cast(logicalIndex), static_cast(order)); } @@ -216,9 +216,9 @@ int QHeaderView_SortIndicatorSection(const QHeaderView* self) { return self->sortIndicatorSection(); } -uintptr_t QHeaderView_SortIndicatorOrder(const QHeaderView* self) { +int QHeaderView_SortIndicatorOrder(const QHeaderView* self) { Qt::SortOrder _ret = self->sortIndicatorOrder(); - return static_cast(_ret); + return static_cast(_ret); } bool QHeaderView_StretchLastSection(const QHeaderView* self) { @@ -310,7 +310,7 @@ void QHeaderView_SetOffsetToLastSection(QHeaderView* self) { self->setOffsetToLastSection(); } -void QHeaderView_HeaderDataChanged(QHeaderView* self, uintptr_t orientation, int logicalFirst, int logicalLast) { +void QHeaderView_HeaderDataChanged(QHeaderView* self, int orientation, int logicalFirst, int logicalLast) { self->headerDataChanged(static_cast(orientation), static_cast(logicalFirst), static_cast(logicalLast)); } @@ -417,7 +417,7 @@ void QHeaderView_connect_GeometriesChanged(QHeaderView* self, void* slot) { }); } -void QHeaderView_SortIndicatorChanged(QHeaderView* self, int logicalIndex, uintptr_t order) { +void QHeaderView_SortIndicatorChanged(QHeaderView* self, int logicalIndex, int order) { self->sortIndicatorChanged(static_cast(logicalIndex), static_cast(order)); } @@ -425,7 +425,7 @@ void QHeaderView_connect_SortIndicatorChanged(QHeaderView* self, void* slot) { QHeaderView::connect(self, static_cast(&QHeaderView::sortIndicatorChanged), self, [=](int logicalIndex, Qt::SortOrder order) { int sigval1 = logicalIndex; Qt::SortOrder order_ret = order; - uintptr_t sigval2 = static_cast(order_ret); + int sigval2 = static_cast(order_ret); miqt_exec_callback_QHeaderView_SortIndicatorChanged(slot, sigval1, sigval2); }); } diff --git a/qt/gen_qheaderview.go b/qt/gen_qheaderview.go index a496283..9a9e59d 100644 --- a/qt/gen_qheaderview.go +++ b/qt/gen_qheaderview.go @@ -49,13 +49,13 @@ func newQHeaderView_U(h unsafe.Pointer) *QHeaderView { // NewQHeaderView constructs a new QHeaderView object. func NewQHeaderView(orientation Orientation) *QHeaderView { - ret := C.QHeaderView_new((C.uintptr_t)(orientation)) + ret := C.QHeaderView_new((C.int)(orientation)) return newQHeaderView(ret) } // NewQHeaderView2 constructs a new QHeaderView object. func NewQHeaderView2(orientation Orientation, parent *QWidget) *QHeaderView { - ret := C.QHeaderView_new2((C.uintptr_t)(orientation), parent.cPointer()) + ret := C.QHeaderView_new2((C.int)(orientation), parent.cPointer()) return newQHeaderView(ret) } @@ -153,7 +153,7 @@ func (this *QHeaderView) ResizeSection(logicalIndex int, size int) { } func (this *QHeaderView) ResizeSections(mode QHeaderView__ResizeMode) { - C.QHeaderView_ResizeSections(this.h, (C.uintptr_t)(mode)) + C.QHeaderView_ResizeSections(this.h, (C.int)(mode)) } func (this *QHeaderView) IsSectionHidden(logicalIndex int) bool { @@ -225,11 +225,11 @@ func (this *QHeaderView) SectionResizeMode(logicalIndex int) QHeaderView__Resize } func (this *QHeaderView) SetSectionResizeMode(mode QHeaderView__ResizeMode) { - C.QHeaderView_SetSectionResizeMode(this.h, (C.uintptr_t)(mode)) + C.QHeaderView_SetSectionResizeMode(this.h, (C.int)(mode)) } func (this *QHeaderView) SetSectionResizeMode2(logicalIndex int, mode QHeaderView__ResizeMode) { - C.QHeaderView_SetSectionResizeMode2(this.h, (C.int)(logicalIndex), (C.uintptr_t)(mode)) + C.QHeaderView_SetSectionResizeMode2(this.h, (C.int)(logicalIndex), (C.int)(mode)) } func (this *QHeaderView) SetResizeContentsPrecision(precision int) { @@ -253,7 +253,7 @@ func (this *QHeaderView) IsSortIndicatorShown() bool { } func (this *QHeaderView) SetSortIndicator(logicalIndex int, order SortOrder) { - C.QHeaderView_SetSortIndicator(this.h, (C.int)(logicalIndex), (C.uintptr_t)(order)) + C.QHeaderView_SetSortIndicator(this.h, (C.int)(logicalIndex), (C.int)(order)) } func (this *QHeaderView) SortIndicatorSection() int { @@ -313,7 +313,7 @@ func (this *QHeaderView) DefaultAlignment() int { } func (this *QHeaderView) SetDefaultAlignment(alignment int) { - C.QHeaderView_SetDefaultAlignment(this.h, (C.int)(alignment)) + C.QHeaderView_SetDefaultAlignment(this.h, alignment) } func (this *QHeaderView) DoItemsLayout() { @@ -356,7 +356,7 @@ func (this *QHeaderView) SetOffsetToLastSection() { } 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)) + C.QHeaderView_HeaderDataChanged(this.h, (C.int)(orientation), (C.int)(logicalFirst), (C.int)(logicalLast)) } func (this *QHeaderView) SectionMoved(logicalIndex int, oldVisualIndex int, newVisualIndex int) { @@ -547,14 +547,14 @@ func miqt_exec_callback_QHeaderView_GeometriesChanged(cb *C.void) { } func (this *QHeaderView) SortIndicatorChanged(logicalIndex int, order SortOrder) { - C.QHeaderView_SortIndicatorChanged(this.h, (C.int)(logicalIndex), (C.uintptr_t)(order)) + C.QHeaderView_SortIndicatorChanged(this.h, (C.int)(logicalIndex), (C.int)(order)) } func (this *QHeaderView) OnSortIndicatorChanged(slot func(logicalIndex int, order SortOrder)) { C.QHeaderView_connect_SortIndicatorChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QHeaderView_SortIndicatorChanged -func miqt_exec_callback_QHeaderView_SortIndicatorChanged(cb *C.void, logicalIndex C.int, order C.uintptr_t) { +func miqt_exec_callback_QHeaderView_SortIndicatorChanged(cb *C.void, logicalIndex C.int, order C.int) { gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(logicalIndex int, order SortOrder)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt/gen_qheaderview.h b/qt/gen_qheaderview.h index 689a2e3..015d632 100644 --- a/qt/gen_qheaderview.h +++ b/qt/gen_qheaderview.h @@ -31,13 +31,13 @@ typedef struct QSize QSize; typedef struct QWidget QWidget; #endif -QHeaderView* QHeaderView_new(uintptr_t orientation); -QHeaderView* QHeaderView_new2(uintptr_t orientation, QWidget* parent); +QHeaderView* QHeaderView_new(int orientation); +QHeaderView* QHeaderView_new2(int orientation, QWidget* parent); QMetaObject* QHeaderView_MetaObject(const QHeaderView* self); struct miqt_string* QHeaderView_Tr(const char* s); struct miqt_string* QHeaderView_TrUtf8(const char* s); void QHeaderView_SetModel(QHeaderView* self, QAbstractItemModel* model); -uintptr_t QHeaderView_Orientation(const QHeaderView* self); +int QHeaderView_Orientation(const QHeaderView* self); int QHeaderView_Offset(const QHeaderView* self); int QHeaderView_Length(const QHeaderView* self); QSize* QHeaderView_SizeHint(const QHeaderView* self); @@ -53,7 +53,7 @@ int QHeaderView_SectionViewportPosition(const QHeaderView* self, int logicalInde void QHeaderView_MoveSection(QHeaderView* self, int from, int to); void QHeaderView_SwapSections(QHeaderView* self, int first, int second); void QHeaderView_ResizeSection(QHeaderView* self, int logicalIndex, int size); -void QHeaderView_ResizeSections(QHeaderView* self, uintptr_t mode); +void QHeaderView_ResizeSections(QHeaderView* self, int mode); bool QHeaderView_IsSectionHidden(const QHeaderView* self, int logicalIndex); void QHeaderView_SetSectionHidden(QHeaderView* self, int logicalIndex, bool hide); int QHeaderView_HiddenSectionCount(const QHeaderView* self); @@ -70,17 +70,17 @@ void QHeaderView_SetSectionsClickable(QHeaderView* self, bool clickable); bool QHeaderView_SectionsClickable(const QHeaderView* self); void QHeaderView_SetHighlightSections(QHeaderView* self, bool highlight); bool QHeaderView_HighlightSections(const QHeaderView* self); -uintptr_t QHeaderView_SectionResizeMode(const QHeaderView* self, int logicalIndex); -void QHeaderView_SetSectionResizeMode(QHeaderView* self, uintptr_t mode); -void QHeaderView_SetSectionResizeMode2(QHeaderView* self, int logicalIndex, uintptr_t mode); +int QHeaderView_SectionResizeMode(const QHeaderView* self, int logicalIndex); +void QHeaderView_SetSectionResizeMode(QHeaderView* self, int mode); +void QHeaderView_SetSectionResizeMode2(QHeaderView* self, int logicalIndex, int mode); void QHeaderView_SetResizeContentsPrecision(QHeaderView* self, int precision); int QHeaderView_ResizeContentsPrecision(const QHeaderView* self); int QHeaderView_StretchSectionCount(const QHeaderView* self); void QHeaderView_SetSortIndicatorShown(QHeaderView* self, bool show); bool QHeaderView_IsSortIndicatorShown(const QHeaderView* self); -void QHeaderView_SetSortIndicator(QHeaderView* self, int logicalIndex, uintptr_t order); +void QHeaderView_SetSortIndicator(QHeaderView* self, int logicalIndex, int order); int QHeaderView_SortIndicatorSection(const QHeaderView* self); -uintptr_t QHeaderView_SortIndicatorOrder(const QHeaderView* self); +int QHeaderView_SortIndicatorOrder(const QHeaderView* self); bool QHeaderView_StretchLastSection(const QHeaderView* self); void QHeaderView_SetStretchLastSection(QHeaderView* self, bool stretch); bool QHeaderView_CascadingSectionResizes(const QHeaderView* self); @@ -103,7 +103,7 @@ void QHeaderView_Reset(QHeaderView* self); void QHeaderView_SetOffset(QHeaderView* self, int offset); void QHeaderView_SetOffsetToSectionPosition(QHeaderView* self, int visualIndex); void QHeaderView_SetOffsetToLastSection(QHeaderView* self); -void QHeaderView_HeaderDataChanged(QHeaderView* self, uintptr_t orientation, int logicalFirst, int logicalLast); +void QHeaderView_HeaderDataChanged(QHeaderView* self, int orientation, int logicalFirst, int logicalLast); void QHeaderView_SectionMoved(QHeaderView* self, int logicalIndex, int oldVisualIndex, int newVisualIndex); void QHeaderView_connect_SectionMoved(QHeaderView* self, void* slot); void QHeaderView_SectionResized(QHeaderView* self, int logicalIndex, int oldSize, int newSize); @@ -122,7 +122,7 @@ void QHeaderView_SectionHandleDoubleClicked(QHeaderView* self, int logicalIndex) void QHeaderView_connect_SectionHandleDoubleClicked(QHeaderView* self, void* slot); void QHeaderView_GeometriesChanged(QHeaderView* self); void QHeaderView_connect_GeometriesChanged(QHeaderView* self, void* slot); -void QHeaderView_SortIndicatorChanged(QHeaderView* self, int logicalIndex, uintptr_t order); +void QHeaderView_SortIndicatorChanged(QHeaderView* self, int logicalIndex, int order); void QHeaderView_connect_SortIndicatorChanged(QHeaderView* self, void* slot); struct miqt_string* QHeaderView_Tr2(const char* s, const char* c); struct miqt_string* QHeaderView_Tr3(const char* s, const char* c, int n); diff --git a/qt/gen_qhistorystate.cpp b/qt/gen_qhistorystate.cpp index d439c52..218b0f2 100644 --- a/qt/gen_qhistorystate.cpp +++ b/qt/gen_qhistorystate.cpp @@ -14,7 +14,7 @@ QHistoryState* QHistoryState_new() { return new QHistoryState(); } -QHistoryState* QHistoryState_new2(uintptr_t typeVal) { +QHistoryState* QHistoryState_new2(int typeVal) { return new QHistoryState(static_cast(typeVal)); } @@ -22,7 +22,7 @@ QHistoryState* QHistoryState_new3(QState* parent) { return new QHistoryState(parent); } -QHistoryState* QHistoryState_new4(uintptr_t typeVal, QState* parent) { +QHistoryState* QHistoryState_new4(int typeVal, QState* parent) { return new QHistoryState(static_cast(typeVal), parent); } @@ -60,12 +60,12 @@ void QHistoryState_SetDefaultState(QHistoryState* self, QAbstractState* state) { self->setDefaultState(state); } -uintptr_t QHistoryState_HistoryType(const QHistoryState* self) { +int QHistoryState_HistoryType(const QHistoryState* self) { QHistoryState::HistoryType _ret = self->historyType(); - return static_cast(_ret); + return static_cast(_ret); } -void QHistoryState_SetHistoryType(QHistoryState* self, uintptr_t typeVal) { +void QHistoryState_SetHistoryType(QHistoryState* self, int typeVal) { self->setHistoryType(static_cast(typeVal)); } diff --git a/qt/gen_qhistorystate.go b/qt/gen_qhistorystate.go index aaaf4da..e0b6449 100644 --- a/qt/gen_qhistorystate.go +++ b/qt/gen_qhistorystate.go @@ -51,7 +51,7 @@ func NewQHistoryState() *QHistoryState { // NewQHistoryState2 constructs a new QHistoryState object. func NewQHistoryState2(typeVal QHistoryState__HistoryType) *QHistoryState { - ret := C.QHistoryState_new2((C.uintptr_t)(typeVal)) + ret := C.QHistoryState_new2((C.int)(typeVal)) return newQHistoryState(ret) } @@ -63,7 +63,7 @@ func NewQHistoryState3(parent *QState) *QHistoryState { // NewQHistoryState4 constructs a new QHistoryState object. func NewQHistoryState4(typeVal QHistoryState__HistoryType, parent *QState) *QHistoryState { - ret := C.QHistoryState_new4((C.uintptr_t)(typeVal), parent.cPointer()) + ret := C.QHistoryState_new4((C.int)(typeVal), parent.cPointer()) return newQHistoryState(ret) } @@ -110,7 +110,7 @@ func (this *QHistoryState) HistoryType() QHistoryState__HistoryType { } func (this *QHistoryState) SetHistoryType(typeVal QHistoryState__HistoryType) { - C.QHistoryState_SetHistoryType(this.h, (C.uintptr_t)(typeVal)) + C.QHistoryState_SetHistoryType(this.h, (C.int)(typeVal)) } func QHistoryState_Tr2(s string, c string) string { diff --git a/qt/gen_qhistorystate.h b/qt/gen_qhistorystate.h index 35b67bd..9e138c0 100644 --- a/qt/gen_qhistorystate.h +++ b/qt/gen_qhistorystate.h @@ -28,9 +28,9 @@ typedef struct QState QState; #endif QHistoryState* QHistoryState_new(); -QHistoryState* QHistoryState_new2(uintptr_t typeVal); +QHistoryState* QHistoryState_new2(int typeVal); QHistoryState* QHistoryState_new3(QState* parent); -QHistoryState* QHistoryState_new4(uintptr_t typeVal, QState* parent); +QHistoryState* QHistoryState_new4(int typeVal, QState* parent); QMetaObject* QHistoryState_MetaObject(const QHistoryState* self); struct miqt_string* QHistoryState_Tr(const char* s); struct miqt_string* QHistoryState_TrUtf8(const char* s); @@ -38,8 +38,8 @@ QAbstractTransition* QHistoryState_DefaultTransition(const QHistoryState* self); void QHistoryState_SetDefaultTransition(QHistoryState* self, QAbstractTransition* transition); QAbstractState* QHistoryState_DefaultState(const QHistoryState* self); void QHistoryState_SetDefaultState(QHistoryState* self, QAbstractState* state); -uintptr_t QHistoryState_HistoryType(const QHistoryState* self); -void QHistoryState_SetHistoryType(QHistoryState* self, uintptr_t typeVal); +int QHistoryState_HistoryType(const QHistoryState* self); +void QHistoryState_SetHistoryType(QHistoryState* self, int typeVal); struct miqt_string* QHistoryState_Tr2(const char* s, const char* c); struct miqt_string* QHistoryState_Tr3(const char* s, const char* c, int n); struct miqt_string* QHistoryState_TrUtf82(const char* s, const char* c); diff --git a/qt/gen_qicon.cpp b/qt/gen_qicon.cpp index cd7183a..868e960 100644 --- a/qt/gen_qicon.cpp +++ b/qt/gen_qicon.cpp @@ -94,7 +94,8 @@ void QIcon_Detach(QIcon* self) { } long long QIcon_CacheKey(const QIcon* self) { - return self->cacheKey(); + qint64 _ret = self->cacheKey(); + return static_cast(_ret); } void QIcon_AddPixmap(QIcon* self, QPixmap* pixmap) { @@ -220,51 +221,51 @@ void QIcon_SetFallbackThemeName(struct miqt_string* name) { QIcon::setFallbackThemeName(name_QString); } -QPixmap* QIcon_Pixmap22(const QIcon* self, QSize* size, uintptr_t mode) { +QPixmap* QIcon_Pixmap22(const QIcon* self, QSize* size, int mode) { return new QPixmap(self->pixmap(*size, static_cast(mode))); } -QPixmap* QIcon_Pixmap32(const QIcon* self, QSize* size, uintptr_t mode, uintptr_t state) { +QPixmap* QIcon_Pixmap32(const QIcon* self, QSize* size, int mode, int state) { return new QPixmap(self->pixmap(*size, static_cast(mode), static_cast(state))); } -QPixmap* QIcon_Pixmap33(const QIcon* self, int w, int h, uintptr_t mode) { +QPixmap* QIcon_Pixmap33(const QIcon* self, int w, int h, int mode) { return new QPixmap(self->pixmap(static_cast(w), static_cast(h), static_cast(mode))); } -QPixmap* QIcon_Pixmap4(const QIcon* self, int w, int h, uintptr_t mode, uintptr_t state) { +QPixmap* QIcon_Pixmap4(const QIcon* self, int w, int h, int mode, int state) { return new QPixmap(self->pixmap(static_cast(w), static_cast(h), static_cast(mode), static_cast(state))); } -QPixmap* QIcon_Pixmap23(const QIcon* self, int extent, uintptr_t mode) { +QPixmap* QIcon_Pixmap23(const QIcon* self, int extent, int mode) { return new QPixmap(self->pixmap(static_cast(extent), static_cast(mode))); } -QPixmap* QIcon_Pixmap34(const QIcon* self, int extent, uintptr_t mode, uintptr_t state) { +QPixmap* QIcon_Pixmap34(const QIcon* self, int extent, int mode, int state) { return new QPixmap(self->pixmap(static_cast(extent), static_cast(mode), static_cast(state))); } -QPixmap* QIcon_Pixmap35(const QIcon* self, QWindow* window, QSize* size, uintptr_t mode) { +QPixmap* QIcon_Pixmap35(const QIcon* self, QWindow* window, QSize* size, int mode) { return new QPixmap(self->pixmap(window, *size, static_cast(mode))); } -QPixmap* QIcon_Pixmap42(const QIcon* self, QWindow* window, QSize* size, uintptr_t mode, uintptr_t state) { +QPixmap* QIcon_Pixmap42(const QIcon* self, QWindow* window, QSize* size, int mode, int state) { return new QPixmap(self->pixmap(window, *size, static_cast(mode), static_cast(state))); } -QSize* QIcon_ActualSize22(const QIcon* self, QSize* size, uintptr_t mode) { +QSize* QIcon_ActualSize22(const QIcon* self, QSize* size, int mode) { return new QSize(self->actualSize(*size, static_cast(mode))); } -QSize* QIcon_ActualSize3(const QIcon* self, QSize* size, uintptr_t mode, uintptr_t state) { +QSize* QIcon_ActualSize3(const QIcon* self, QSize* size, int mode, int state) { return new QSize(self->actualSize(*size, static_cast(mode), static_cast(state))); } -QSize* QIcon_ActualSize32(const QIcon* self, QWindow* window, QSize* size, uintptr_t mode) { +QSize* QIcon_ActualSize32(const QIcon* self, QWindow* window, QSize* size, int mode) { return new QSize(self->actualSize(window, *size, static_cast(mode))); } -QSize* QIcon_ActualSize4(const QIcon* self, QWindow* window, QSize* size, uintptr_t mode, uintptr_t state) { +QSize* QIcon_ActualSize4(const QIcon* self, QWindow* window, QSize* size, int mode, int state) { return new QSize(self->actualSize(window, *size, static_cast(mode), static_cast(state))); } @@ -272,11 +273,11 @@ void QIcon_Paint3(const QIcon* self, QPainter* painter, QRect* rect, int alignme self->paint(painter, *rect, static_cast(alignment)); } -void QIcon_Paint4(const QIcon* self, QPainter* painter, QRect* rect, int alignment, uintptr_t mode) { +void QIcon_Paint4(const QIcon* self, QPainter* painter, QRect* rect, int alignment, int mode) { self->paint(painter, *rect, static_cast(alignment), static_cast(mode)); } -void QIcon_Paint5(const QIcon* self, QPainter* painter, QRect* rect, int alignment, uintptr_t mode, uintptr_t state) { +void QIcon_Paint5(const QIcon* self, QPainter* painter, QRect* rect, int alignment, int mode, int state) { self->paint(painter, *rect, static_cast(alignment), static_cast(mode), static_cast(state)); } @@ -284,19 +285,19 @@ void QIcon_Paint6(const QIcon* self, QPainter* painter, int x, int y, int w, int self->paint(painter, static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(alignment)); } -void QIcon_Paint7(const QIcon* self, QPainter* painter, int x, int y, int w, int h, int alignment, uintptr_t mode) { +void QIcon_Paint7(const QIcon* self, QPainter* painter, int x, int y, int w, int h, int alignment, int mode) { self->paint(painter, static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(alignment), static_cast(mode)); } -void QIcon_Paint8(const QIcon* self, QPainter* painter, int x, int y, int w, int h, int alignment, uintptr_t mode, uintptr_t state) { +void QIcon_Paint8(const QIcon* self, QPainter* painter, int x, int y, int w, int h, int alignment, int mode, int state) { self->paint(painter, static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(alignment), static_cast(mode), static_cast(state)); } -void QIcon_AddPixmap2(QIcon* self, QPixmap* pixmap, uintptr_t mode) { +void QIcon_AddPixmap2(QIcon* self, QPixmap* pixmap, int mode) { self->addPixmap(*pixmap, static_cast(mode)); } -void QIcon_AddPixmap3(QIcon* self, QPixmap* pixmap, uintptr_t mode, uintptr_t state) { +void QIcon_AddPixmap3(QIcon* self, QPixmap* pixmap, int mode, int state) { self->addPixmap(*pixmap, static_cast(mode), static_cast(state)); } @@ -305,17 +306,17 @@ void QIcon_AddFile2(QIcon* self, struct miqt_string* fileName, QSize* size) { self->addFile(fileName_QString, *size); } -void QIcon_AddFile3(QIcon* self, struct miqt_string* fileName, QSize* size, uintptr_t mode) { +void QIcon_AddFile3(QIcon* self, struct miqt_string* fileName, QSize* size, int mode) { QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); self->addFile(fileName_QString, *size, static_cast(mode)); } -void QIcon_AddFile4(QIcon* self, struct miqt_string* fileName, QSize* size, uintptr_t mode, uintptr_t state) { +void QIcon_AddFile4(QIcon* self, struct miqt_string* fileName, QSize* size, int mode, int state) { QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); self->addFile(fileName_QString, *size, static_cast(mode), static_cast(state)); } -struct miqt_array* QIcon_AvailableSizes1(const QIcon* self, uintptr_t mode) { +struct miqt_array* QIcon_AvailableSizes1(const QIcon* self, int mode) { QList _ret = self->availableSizes(static_cast(mode)); // Convert QList<> from C++ memory to manually-managed C memory QSize** _arr = static_cast(malloc(sizeof(QSize*) * _ret.length())); @@ -328,7 +329,7 @@ struct miqt_array* QIcon_AvailableSizes1(const QIcon* self, uintptr_t mode) { return _out; } -struct miqt_array* QIcon_AvailableSizes2(const QIcon* self, uintptr_t mode, uintptr_t state) { +struct miqt_array* QIcon_AvailableSizes2(const QIcon* self, int mode, int state) { QList _ret = self->availableSizes(static_cast(mode), static_cast(state)); // Convert QList<> from C++ memory to manually-managed C memory QSize** _arr = static_cast(malloc(sizeof(QSize*) * _ret.length())); diff --git a/qt/gen_qicon.go b/qt/gen_qicon.go index b512677..048587c 100644 --- a/qt/gen_qicon.go +++ b/qt/gen_qicon.go @@ -303,119 +303,119 @@ func QIcon_SetFallbackThemeName(name string) { } func (this *QIcon) Pixmap22(size *QSize, mode QIcon__Mode) *QPixmap { - _ret := C.QIcon_Pixmap22(this.h, size.cPointer(), (C.uintptr_t)(mode)) + _ret := C.QIcon_Pixmap22(this.h, size.cPointer(), (C.int)(mode)) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } 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)) + _ret := C.QIcon_Pixmap32(this.h, size.cPointer(), (C.int)(mode), (C.int)(state)) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } 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)) + _ret := C.QIcon_Pixmap33(this.h, (C.int)(w), (C.int)(h), (C.int)(mode)) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } 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)) + _ret := C.QIcon_Pixmap4(this.h, (C.int)(w), (C.int)(h), (C.int)(mode), (C.int)(state)) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QIcon) Pixmap23(extent int, mode QIcon__Mode) *QPixmap { - _ret := C.QIcon_Pixmap23(this.h, (C.int)(extent), (C.uintptr_t)(mode)) + _ret := C.QIcon_Pixmap23(this.h, (C.int)(extent), (C.int)(mode)) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } 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)) + _ret := C.QIcon_Pixmap34(this.h, (C.int)(extent), (C.int)(mode), (C.int)(state)) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } 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)) + _ret := C.QIcon_Pixmap35(this.h, window.cPointer(), size.cPointer(), (C.int)(mode)) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } 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)) + _ret := C.QIcon_Pixmap42(this.h, window.cPointer(), size.cPointer(), (C.int)(mode), (C.int)(state)) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QIcon) ActualSize22(size *QSize, mode QIcon__Mode) *QSize { - _ret := C.QIcon_ActualSize22(this.h, size.cPointer(), (C.uintptr_t)(mode)) + _ret := C.QIcon_ActualSize22(this.h, size.cPointer(), (C.int)(mode)) _goptr := newQSize(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } 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)) + _ret := C.QIcon_ActualSize3(this.h, size.cPointer(), (C.int)(mode), (C.int)(state)) _goptr := newQSize(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } 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)) + _ret := C.QIcon_ActualSize32(this.h, window.cPointer(), size.cPointer(), (C.int)(mode)) _goptr := newQSize(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } 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)) + _ret := C.QIcon_ActualSize4(this.h, window.cPointer(), size.cPointer(), (C.int)(mode), (C.int)(state)) _goptr := newQSize(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QIcon) Paint3(painter *QPainter, rect *QRect, alignment int) { - C.QIcon_Paint3(this.h, painter.cPointer(), rect.cPointer(), (C.int)(alignment)) + C.QIcon_Paint3(this.h, painter.cPointer(), rect.cPointer(), alignment) } 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)) + C.QIcon_Paint4(this.h, painter.cPointer(), rect.cPointer(), alignment, (C.int)(mode)) } 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)) + C.QIcon_Paint5(this.h, painter.cPointer(), rect.cPointer(), alignment, (C.int)(mode), (C.int)(state)) } func (this *QIcon) Paint6(painter *QPainter, x int, y int, w int, h int, alignment int) { - C.QIcon_Paint6(this.h, painter.cPointer(), (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.int)(alignment)) + C.QIcon_Paint6(this.h, painter.cPointer(), (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), alignment) } 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)) + C.QIcon_Paint7(this.h, painter.cPointer(), (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), alignment, (C.int)(mode)) } 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)) + C.QIcon_Paint8(this.h, painter.cPointer(), (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), alignment, (C.int)(mode), (C.int)(state)) } func (this *QIcon) AddPixmap2(pixmap *QPixmap, mode QIcon__Mode) { - C.QIcon_AddPixmap2(this.h, pixmap.cPointer(), (C.uintptr_t)(mode)) + C.QIcon_AddPixmap2(this.h, pixmap.cPointer(), (C.int)(mode)) } 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)) + C.QIcon_AddPixmap3(this.h, pixmap.cPointer(), (C.int)(mode), (C.int)(state)) } func (this *QIcon) AddFile2(fileName string, size *QSize) { @@ -427,17 +427,17 @@ func (this *QIcon) AddFile2(fileName string, size *QSize) { func (this *QIcon) AddFile3(fileName string, size *QSize, mode QIcon__Mode) { fileName_ms := miqt_strdupg(fileName) defer C.free(fileName_ms) - C.QIcon_AddFile3(this.h, (*C.struct_miqt_string)(fileName_ms), size.cPointer(), (C.uintptr_t)(mode)) + C.QIcon_AddFile3(this.h, (*C.struct_miqt_string)(fileName_ms), size.cPointer(), (C.int)(mode)) } func (this *QIcon) AddFile4(fileName string, size *QSize, mode QIcon__Mode, state QIcon__State) { fileName_ms := miqt_strdupg(fileName) defer C.free(fileName_ms) - C.QIcon_AddFile4(this.h, (*C.struct_miqt_string)(fileName_ms), size.cPointer(), (C.uintptr_t)(mode), (C.uintptr_t)(state)) + C.QIcon_AddFile4(this.h, (*C.struct_miqt_string)(fileName_ms), size.cPointer(), (C.int)(mode), (C.int)(state)) } func (this *QIcon) AvailableSizes1(mode QIcon__Mode) []QSize { - var _ma *C.struct_miqt_array = C.QIcon_AvailableSizes1(this.h, (C.uintptr_t)(mode)) + var _ma *C.struct_miqt_array = C.QIcon_AvailableSizes1(this.h, (C.int)(mode)) _ret := make([]QSize, int(_ma.len)) _outCast := (*[0xffff]*C.QSize)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -451,7 +451,7 @@ func (this *QIcon) AvailableSizes1(mode QIcon__Mode) []QSize { } func (this *QIcon) AvailableSizes2(mode QIcon__Mode, state QIcon__State) []QSize { - var _ma *C.struct_miqt_array = C.QIcon_AvailableSizes2(this.h, (C.uintptr_t)(mode), (C.uintptr_t)(state)) + var _ma *C.struct_miqt_array = C.QIcon_AvailableSizes2(this.h, (C.int)(mode), (C.int)(state)) _ret := make([]QSize, int(_ma.len)) _outCast := (*[0xffff]*C.QSize)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { diff --git a/qt/gen_qicon.h b/qt/gen_qicon.h index bfd4871..dce160d 100644 --- a/qt/gen_qicon.h +++ b/qt/gen_qicon.h @@ -67,31 +67,31 @@ struct miqt_string* QIcon_ThemeName(); void QIcon_SetThemeName(struct miqt_string* path); struct miqt_string* QIcon_FallbackThemeName(); void QIcon_SetFallbackThemeName(struct miqt_string* name); -QPixmap* QIcon_Pixmap22(const QIcon* self, QSize* size, uintptr_t mode); -QPixmap* QIcon_Pixmap32(const QIcon* self, QSize* size, uintptr_t mode, uintptr_t state); -QPixmap* QIcon_Pixmap33(const QIcon* self, int w, int h, uintptr_t mode); -QPixmap* QIcon_Pixmap4(const QIcon* self, int w, int h, uintptr_t mode, uintptr_t state); -QPixmap* QIcon_Pixmap23(const QIcon* self, int extent, uintptr_t mode); -QPixmap* QIcon_Pixmap34(const QIcon* self, int extent, uintptr_t mode, uintptr_t state); -QPixmap* QIcon_Pixmap35(const QIcon* self, QWindow* window, QSize* size, uintptr_t mode); -QPixmap* QIcon_Pixmap42(const QIcon* self, QWindow* window, QSize* size, uintptr_t mode, uintptr_t state); -QSize* QIcon_ActualSize22(const QIcon* self, QSize* size, uintptr_t mode); -QSize* QIcon_ActualSize3(const QIcon* self, QSize* size, uintptr_t mode, uintptr_t state); -QSize* QIcon_ActualSize32(const QIcon* self, QWindow* window, QSize* size, uintptr_t mode); -QSize* QIcon_ActualSize4(const QIcon* self, QWindow* window, QSize* size, uintptr_t mode, uintptr_t state); +QPixmap* QIcon_Pixmap22(const QIcon* self, QSize* size, int mode); +QPixmap* QIcon_Pixmap32(const QIcon* self, QSize* size, int mode, int state); +QPixmap* QIcon_Pixmap33(const QIcon* self, int w, int h, int mode); +QPixmap* QIcon_Pixmap4(const QIcon* self, int w, int h, int mode, int state); +QPixmap* QIcon_Pixmap23(const QIcon* self, int extent, int mode); +QPixmap* QIcon_Pixmap34(const QIcon* self, int extent, int mode, int state); +QPixmap* QIcon_Pixmap35(const QIcon* self, QWindow* window, QSize* size, int mode); +QPixmap* QIcon_Pixmap42(const QIcon* self, QWindow* window, QSize* size, int mode, int state); +QSize* QIcon_ActualSize22(const QIcon* self, QSize* size, int mode); +QSize* QIcon_ActualSize3(const QIcon* self, QSize* size, int mode, int state); +QSize* QIcon_ActualSize32(const QIcon* self, QWindow* window, QSize* size, int mode); +QSize* QIcon_ActualSize4(const QIcon* self, QWindow* window, QSize* size, int mode, int state); void QIcon_Paint3(const QIcon* self, QPainter* painter, QRect* rect, int alignment); -void QIcon_Paint4(const QIcon* self, QPainter* painter, QRect* rect, int alignment, uintptr_t mode); -void QIcon_Paint5(const QIcon* self, QPainter* painter, QRect* rect, int alignment, uintptr_t mode, uintptr_t state); +void QIcon_Paint4(const QIcon* self, QPainter* painter, QRect* rect, int alignment, int mode); +void QIcon_Paint5(const QIcon* self, QPainter* painter, QRect* rect, int alignment, int mode, int state); void QIcon_Paint6(const QIcon* self, QPainter* painter, int x, int y, int w, int h, int alignment); -void QIcon_Paint7(const QIcon* self, QPainter* painter, int x, int y, int w, int h, int alignment, uintptr_t mode); -void QIcon_Paint8(const QIcon* self, QPainter* painter, int x, int y, int w, int h, int alignment, uintptr_t mode, uintptr_t state); -void QIcon_AddPixmap2(QIcon* self, QPixmap* pixmap, uintptr_t mode); -void QIcon_AddPixmap3(QIcon* self, QPixmap* pixmap, uintptr_t mode, uintptr_t state); +void QIcon_Paint7(const QIcon* self, QPainter* painter, int x, int y, int w, int h, int alignment, int mode); +void QIcon_Paint8(const QIcon* self, QPainter* painter, int x, int y, int w, int h, int alignment, int mode, int state); +void QIcon_AddPixmap2(QIcon* self, QPixmap* pixmap, int mode); +void QIcon_AddPixmap3(QIcon* self, QPixmap* pixmap, int mode, int state); void QIcon_AddFile2(QIcon* self, struct miqt_string* fileName, QSize* size); -void QIcon_AddFile3(QIcon* self, struct miqt_string* fileName, QSize* size, uintptr_t mode); -void QIcon_AddFile4(QIcon* self, struct miqt_string* fileName, QSize* size, uintptr_t mode, uintptr_t state); -struct miqt_array* QIcon_AvailableSizes1(const QIcon* self, uintptr_t mode); -struct miqt_array* QIcon_AvailableSizes2(const QIcon* self, uintptr_t mode, uintptr_t state); +void QIcon_AddFile3(QIcon* self, struct miqt_string* fileName, QSize* size, int mode); +void QIcon_AddFile4(QIcon* self, struct miqt_string* fileName, QSize* size, int mode, int state); +struct miqt_array* QIcon_AvailableSizes1(const QIcon* self, int mode); +struct miqt_array* QIcon_AvailableSizes2(const QIcon* self, int mode, int state); void QIcon_Delete(QIcon* self); #ifdef __cplusplus diff --git a/qt/gen_qiconengine.cpp b/qt/gen_qiconengine.cpp index 92f8c4e..55f8cb5 100644 --- a/qt/gen_qiconengine.cpp +++ b/qt/gen_qiconengine.cpp @@ -14,23 +14,23 @@ #include "gen_qiconengine.h" #include "_cgo_export.h" -void QIconEngine_Paint(QIconEngine* self, QPainter* painter, QRect* rect, uintptr_t mode, uintptr_t state) { +void QIconEngine_Paint(QIconEngine* self, QPainter* painter, QRect* rect, int mode, int state) { self->paint(painter, *rect, static_cast(mode), static_cast(state)); } -QSize* QIconEngine_ActualSize(QIconEngine* self, QSize* size, uintptr_t mode, uintptr_t state) { +QSize* QIconEngine_ActualSize(QIconEngine* self, QSize* size, int mode, int state) { return new QSize(self->actualSize(*size, static_cast(mode), static_cast(state))); } -QPixmap* QIconEngine_Pixmap(QIconEngine* self, QSize* size, uintptr_t mode, uintptr_t state) { +QPixmap* QIconEngine_Pixmap(QIconEngine* self, QSize* size, int mode, int state) { return new QPixmap(self->pixmap(*size, static_cast(mode), static_cast(state))); } -void QIconEngine_AddPixmap(QIconEngine* self, QPixmap* pixmap, uintptr_t mode, uintptr_t state) { +void QIconEngine_AddPixmap(QIconEngine* self, QPixmap* pixmap, int mode, int state) { self->addPixmap(*pixmap, static_cast(mode), static_cast(state)); } -void QIconEngine_AddFile(QIconEngine* self, struct miqt_string* fileName, QSize* size, uintptr_t mode, uintptr_t state) { +void QIconEngine_AddFile(QIconEngine* self, struct miqt_string* fileName, QSize* size, int mode, int state) { QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); self->addFile(fileName_QString, *size, static_cast(mode), static_cast(state)); } @@ -78,11 +78,11 @@ bool QIconEngine_IsNull(const QIconEngine* self) { return self->isNull(); } -QPixmap* QIconEngine_ScaledPixmap(QIconEngine* self, QSize* size, uintptr_t mode, uintptr_t state, double scale) { +QPixmap* QIconEngine_ScaledPixmap(QIconEngine* self, QSize* size, int mode, int state, double scale) { return new QPixmap(self->scaledPixmap(*size, static_cast(mode), static_cast(state), static_cast(scale))); } -struct miqt_array* QIconEngine_AvailableSizes1(const QIconEngine* self, uintptr_t mode) { +struct miqt_array* QIconEngine_AvailableSizes1(const QIconEngine* self, int mode) { QList _ret = self->availableSizes(static_cast(mode)); // Convert QList<> from C++ memory to manually-managed C memory QSize** _arr = static_cast(malloc(sizeof(QSize*) * _ret.length())); @@ -95,7 +95,7 @@ struct miqt_array* QIconEngine_AvailableSizes1(const QIconEngine* self, uintptr_ return _out; } -struct miqt_array* QIconEngine_AvailableSizes2(const QIconEngine* self, uintptr_t mode, uintptr_t state) { +struct miqt_array* QIconEngine_AvailableSizes2(const QIconEngine* self, int mode, int state) { QList _ret = self->availableSizes(static_cast(mode), static_cast(state)); // Convert QList<> from C++ memory to manually-managed C memory QSize** _arr = static_cast(malloc(sizeof(QSize*) * _ret.length())); @@ -116,6 +116,10 @@ QIconEngine__AvailableSizesArgument* QIconEngine__AvailableSizesArgument_new(QIc return new QIconEngine::AvailableSizesArgument(*param1); } +void QIconEngine__AvailableSizesArgument_OperatorAssign(QIconEngine__AvailableSizesArgument* self, QIconEngine__AvailableSizesArgument* param1) { + self->operator=(*param1); +} + void QIconEngine__AvailableSizesArgument_Delete(QIconEngine__AvailableSizesArgument* self) { delete self; } @@ -124,6 +128,10 @@ QIconEngine__ScaledPixmapArgument* QIconEngine__ScaledPixmapArgument_new(QIconEn return new QIconEngine::ScaledPixmapArgument(*param1); } +void QIconEngine__ScaledPixmapArgument_OperatorAssign(QIconEngine__ScaledPixmapArgument* self, QIconEngine__ScaledPixmapArgument* param1) { + self->operator=(*param1); +} + void QIconEngine__ScaledPixmapArgument_Delete(QIconEngine__ScaledPixmapArgument* self) { delete self; } diff --git a/qt/gen_qiconengine.go b/qt/gen_qiconengine.go index f69dad0..dd53d9e 100644 --- a/qt/gen_qiconengine.go +++ b/qt/gen_qiconengine.go @@ -45,31 +45,31 @@ func newQIconEngine_U(h unsafe.Pointer) *QIconEngine { } 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)) + C.QIconEngine_Paint(this.h, painter.cPointer(), rect.cPointer(), (C.int)(mode), (C.int)(state)) } 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)) + _ret := C.QIconEngine_ActualSize(this.h, size.cPointer(), (C.int)(mode), (C.int)(state)) _goptr := newQSize(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } 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)) + _ret := C.QIconEngine_Pixmap(this.h, size.cPointer(), (C.int)(mode), (C.int)(state)) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } 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)) + C.QIconEngine_AddPixmap(this.h, pixmap.cPointer(), (C.int)(mode), (C.int)(state)) } func (this *QIconEngine) AddFile(fileName string, size *QSize, mode QIcon__Mode, state QIcon__State) { fileName_ms := miqt_strdupg(fileName) defer C.free(fileName_ms) - C.QIconEngine_AddFile(this.h, (*C.struct_miqt_string)(fileName_ms), size.cPointer(), (C.uintptr_t)(mode), (C.uintptr_t)(state)) + C.QIconEngine_AddFile(this.h, (*C.struct_miqt_string)(fileName_ms), size.cPointer(), (C.int)(mode), (C.int)(state)) } func (this *QIconEngine) Key() string { @@ -117,14 +117,14 @@ func (this *QIconEngine) IsNull() bool { } 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)) + _ret := C.QIconEngine_ScaledPixmap(this.h, size.cPointer(), (C.int)(mode), (C.int)(state), (C.double)(scale)) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QIconEngine) AvailableSizes1(mode QIcon__Mode) []QSize { - var _ma *C.struct_miqt_array = C.QIconEngine_AvailableSizes1(this.h, (C.uintptr_t)(mode)) + var _ma *C.struct_miqt_array = C.QIconEngine_AvailableSizes1(this.h, (C.int)(mode)) _ret := make([]QSize, int(_ma.len)) _outCast := (*[0xffff]*C.QSize)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -138,7 +138,7 @@ func (this *QIconEngine) AvailableSizes1(mode QIcon__Mode) []QSize { } func (this *QIconEngine) AvailableSizes2(mode QIcon__Mode, state QIcon__State) []QSize { - var _ma *C.struct_miqt_array = C.QIconEngine_AvailableSizes2(this.h, (C.uintptr_t)(mode), (C.uintptr_t)(state)) + var _ma *C.struct_miqt_array = C.QIconEngine_AvailableSizes2(this.h, (C.int)(mode), (C.int)(state)) _ret := make([]QSize, int(_ma.len)) _outCast := (*[0xffff]*C.QSize)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -193,6 +193,10 @@ func NewQIconEngine__AvailableSizesArgument(param1 *QIconEngine__AvailableSizesA return newQIconEngine__AvailableSizesArgument(ret) } +func (this *QIconEngine__AvailableSizesArgument) OperatorAssign(param1 *QIconEngine__AvailableSizesArgument) { + C.QIconEngine__AvailableSizesArgument_OperatorAssign(this.h, param1.cPointer()) +} + // Delete this object from C++ memory. func (this *QIconEngine__AvailableSizesArgument) Delete() { C.QIconEngine__AvailableSizesArgument_Delete(this.h) @@ -235,6 +239,10 @@ func NewQIconEngine__ScaledPixmapArgument(param1 *QIconEngine__ScaledPixmapArgum return newQIconEngine__ScaledPixmapArgument(ret) } +func (this *QIconEngine__ScaledPixmapArgument) OperatorAssign(param1 *QIconEngine__ScaledPixmapArgument) { + C.QIconEngine__ScaledPixmapArgument_OperatorAssign(this.h, param1.cPointer()) +} + // Delete this object from C++ memory. func (this *QIconEngine__ScaledPixmapArgument) Delete() { C.QIconEngine__ScaledPixmapArgument_Delete(this.h) diff --git a/qt/gen_qiconengine.h b/qt/gen_qiconengine.h index dc5f582..22a586c 100644 --- a/qt/gen_qiconengine.h +++ b/qt/gen_qiconengine.h @@ -41,11 +41,11 @@ typedef struct QRect QRect; typedef struct QSize QSize; #endif -void QIconEngine_Paint(QIconEngine* self, QPainter* painter, QRect* rect, uintptr_t mode, uintptr_t state); -QSize* QIconEngine_ActualSize(QIconEngine* self, QSize* size, uintptr_t mode, uintptr_t state); -QPixmap* QIconEngine_Pixmap(QIconEngine* self, QSize* size, uintptr_t mode, uintptr_t state); -void QIconEngine_AddPixmap(QIconEngine* self, QPixmap* pixmap, uintptr_t mode, uintptr_t state); -void QIconEngine_AddFile(QIconEngine* self, struct miqt_string* fileName, QSize* size, uintptr_t mode, uintptr_t state); +void QIconEngine_Paint(QIconEngine* self, QPainter* painter, QRect* rect, int mode, int state); +QSize* QIconEngine_ActualSize(QIconEngine* self, QSize* size, int mode, int state); +QPixmap* QIconEngine_Pixmap(QIconEngine* self, QSize* size, int mode, int state); +void QIconEngine_AddPixmap(QIconEngine* self, QPixmap* pixmap, int mode, int state); +void QIconEngine_AddFile(QIconEngine* self, struct miqt_string* fileName, QSize* size, int mode, int state); struct miqt_string* QIconEngine_Key(const QIconEngine* self); QIconEngine* QIconEngine_Clone(const QIconEngine* self); bool QIconEngine_Read(QIconEngine* self, QDataStream* in); @@ -53,15 +53,17 @@ bool QIconEngine_Write(const QIconEngine* self, QDataStream* out); struct miqt_array* QIconEngine_AvailableSizes(const QIconEngine* self); struct miqt_string* QIconEngine_IconName(const QIconEngine* self); bool QIconEngine_IsNull(const QIconEngine* self); -QPixmap* QIconEngine_ScaledPixmap(QIconEngine* self, QSize* size, uintptr_t mode, uintptr_t state, double scale); -struct miqt_array* QIconEngine_AvailableSizes1(const QIconEngine* self, uintptr_t mode); -struct miqt_array* QIconEngine_AvailableSizes2(const QIconEngine* self, uintptr_t mode, uintptr_t state); +QPixmap* QIconEngine_ScaledPixmap(QIconEngine* self, QSize* size, int mode, int state, double scale); +struct miqt_array* QIconEngine_AvailableSizes1(const QIconEngine* self, int mode); +struct miqt_array* QIconEngine_AvailableSizes2(const QIconEngine* self, int mode, int state); void QIconEngine_Delete(QIconEngine* self); QIconEngine__AvailableSizesArgument* QIconEngine__AvailableSizesArgument_new(QIconEngine__AvailableSizesArgument* param1); +void QIconEngine__AvailableSizesArgument_OperatorAssign(QIconEngine__AvailableSizesArgument* self, QIconEngine__AvailableSizesArgument* param1); void QIconEngine__AvailableSizesArgument_Delete(QIconEngine__AvailableSizesArgument* self); QIconEngine__ScaledPixmapArgument* QIconEngine__ScaledPixmapArgument_new(QIconEngine__ScaledPixmapArgument* param1); +void QIconEngine__ScaledPixmapArgument_OperatorAssign(QIconEngine__ScaledPixmapArgument* self, QIconEngine__ScaledPixmapArgument* param1); void QIconEngine__ScaledPixmapArgument_Delete(QIconEngine__ScaledPixmapArgument* self); #ifdef __cplusplus diff --git a/qt/gen_qidentityproxymodel.cpp b/qt/gen_qidentityproxymodel.cpp index cb700b4..1425c35 100644 --- a/qt/gen_qidentityproxymodel.cpp +++ b/qt/gen_qidentityproxymodel.cpp @@ -63,11 +63,11 @@ int QIdentityProxyModel_RowCount(const QIdentityProxyModel* self) { return self->rowCount(); } -QVariant* QIdentityProxyModel_HeaderData(const QIdentityProxyModel* self, int section, uintptr_t orientation) { +QVariant* QIdentityProxyModel_HeaderData(const QIdentityProxyModel* self, int section, int orientation) { return new QVariant(self->headerData(static_cast(section), static_cast(orientation))); } -bool QIdentityProxyModel_DropMimeData(QIdentityProxyModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent) { +bool QIdentityProxyModel_DropMimeData(QIdentityProxyModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent) { return self->dropMimeData(data, static_cast(action), static_cast(row), static_cast(column), *parent); } @@ -156,7 +156,7 @@ int QIdentityProxyModel_RowCount1(const QIdentityProxyModel* self, QModelIndex* return self->rowCount(*parent); } -QVariant* QIdentityProxyModel_HeaderData3(const QIdentityProxyModel* self, int section, uintptr_t orientation, int role) { +QVariant* QIdentityProxyModel_HeaderData3(const QIdentityProxyModel* self, int section, int orientation, int role) { return new QVariant(self->headerData(static_cast(section), static_cast(orientation), static_cast(role))); } diff --git a/qt/gen_qidentityproxymodel.go b/qt/gen_qidentityproxymodel.go index 49a0de2..ccc4f14 100644 --- a/qt/gen_qidentityproxymodel.go +++ b/qt/gen_qidentityproxymodel.go @@ -107,14 +107,14 @@ func (this *QIdentityProxyModel) RowCount() int { } func (this *QIdentityProxyModel) HeaderData(section int, orientation Orientation) *QVariant { - _ret := C.QIdentityProxyModel_HeaderData(this.h, (C.int)(section), (C.uintptr_t)(orientation)) + _ret := C.QIdentityProxyModel_HeaderData(this.h, (C.int)(section), (C.int)(orientation)) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QIdentityProxyModel) DropMimeData(data *QMimeData, action DropAction, row int, column int, parent *QModelIndex) bool { - return (bool)(C.QIdentityProxyModel_DropMimeData(this.h, data.cPointer(), (C.uintptr_t)(action), (C.int)(row), (C.int)(column), parent.cPointer())) + return (bool)(C.QIdentityProxyModel_DropMimeData(this.h, data.cPointer(), (C.int)(action), (C.int)(row), (C.int)(column), parent.cPointer())) } func (this *QIdentityProxyModel) Sibling(row int, column int, idx *QModelIndex) *QModelIndex { @@ -226,7 +226,7 @@ func (this *QIdentityProxyModel) RowCount1(parent *QModelIndex) int { } func (this *QIdentityProxyModel) HeaderData3(section int, orientation Orientation, role int) *QVariant { - _ret := C.QIdentityProxyModel_HeaderData3(this.h, (C.int)(section), (C.uintptr_t)(orientation), (C.int)(role)) + _ret := C.QIdentityProxyModel_HeaderData3(this.h, (C.int)(section), (C.int)(orientation), (C.int)(role)) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -247,7 +247,7 @@ func (this *QIdentityProxyModel) Match4(start *QModelIndex, role int, value *QVa } func (this *QIdentityProxyModel) Match5(start *QModelIndex, role int, value *QVariant, hits int, flags int) []QModelIndex { - var _ma *C.struct_miqt_array = C.QIdentityProxyModel_Match5(this.h, start.cPointer(), (C.int)(role), value.cPointer(), (C.int)(hits), (C.int)(flags)) + var _ma *C.struct_miqt_array = C.QIdentityProxyModel_Match5(this.h, start.cPointer(), (C.int)(role), value.cPointer(), (C.int)(hits), flags) _ret := make([]QModelIndex, int(_ma.len)) _outCast := (*[0xffff]*C.QModelIndex)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { diff --git a/qt/gen_qidentityproxymodel.h b/qt/gen_qidentityproxymodel.h index 8e6e764..99f8647 100644 --- a/qt/gen_qidentityproxymodel.h +++ b/qt/gen_qidentityproxymodel.h @@ -42,8 +42,8 @@ QModelIndex* QIdentityProxyModel_MapFromSource(const QIdentityProxyModel* self, QModelIndex* QIdentityProxyModel_MapToSource(const QIdentityProxyModel* self, QModelIndex* proxyIndex); QModelIndex* QIdentityProxyModel_Parent(const QIdentityProxyModel* self, QModelIndex* child); int QIdentityProxyModel_RowCount(const QIdentityProxyModel* self); -QVariant* QIdentityProxyModel_HeaderData(const QIdentityProxyModel* self, int section, uintptr_t orientation); -bool QIdentityProxyModel_DropMimeData(QIdentityProxyModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent); +QVariant* QIdentityProxyModel_HeaderData(const QIdentityProxyModel* self, int section, int orientation); +bool QIdentityProxyModel_DropMimeData(QIdentityProxyModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent); QModelIndex* QIdentityProxyModel_Sibling(const QIdentityProxyModel* self, int row, int column, QModelIndex* idx); struct miqt_array* QIdentityProxyModel_Match(const QIdentityProxyModel* self, QModelIndex* start, int role, QVariant* value); void QIdentityProxyModel_SetSourceModel(QIdentityProxyModel* self, QAbstractItemModel* sourceModel); @@ -60,7 +60,7 @@ struct miqt_string* QIdentityProxyModel_TrUtf83(const char* s, const char* c, in int QIdentityProxyModel_ColumnCount1(const QIdentityProxyModel* self, QModelIndex* parent); QModelIndex* QIdentityProxyModel_Index3(const QIdentityProxyModel* self, int row, int column, QModelIndex* parent); int QIdentityProxyModel_RowCount1(const QIdentityProxyModel* self, QModelIndex* parent); -QVariant* QIdentityProxyModel_HeaderData3(const QIdentityProxyModel* self, int section, uintptr_t orientation, int role); +QVariant* QIdentityProxyModel_HeaderData3(const QIdentityProxyModel* self, int section, int orientation, int role); struct miqt_array* QIdentityProxyModel_Match4(const QIdentityProxyModel* self, QModelIndex* start, int role, QVariant* value, int hits); struct miqt_array* QIdentityProxyModel_Match5(const QIdentityProxyModel* self, QModelIndex* start, int role, QVariant* value, int hits, int flags); bool QIdentityProxyModel_InsertColumns3(QIdentityProxyModel* self, int column, int count, QModelIndex* parent); diff --git a/qt/gen_qimage.cpp b/qt/gen_qimage.cpp index bbd1108..1fbbf12 100644 --- a/qt/gen_qimage.cpp +++ b/qt/gen_qimage.cpp @@ -23,27 +23,27 @@ QImage* QImage_new() { return new QImage(); } -QImage* QImage_new2(QSize* size, uintptr_t format) { +QImage* QImage_new2(QSize* size, int format) { return new QImage(*size, static_cast(format)); } -QImage* QImage_new3(int width, int height, uintptr_t format) { +QImage* QImage_new3(int width, int height, int format) { return new QImage(static_cast(width), static_cast(height), static_cast(format)); } -QImage* QImage_new4(unsigned char* data, int width, int height, uintptr_t format) { +QImage* QImage_new4(unsigned char* data, int width, int height, int format) { return new QImage(static_cast(data), static_cast(width), static_cast(height), static_cast(format)); } -QImage* QImage_new5(const unsigned char* data, int width, int height, uintptr_t format) { +QImage* QImage_new5(const unsigned char* data, int width, int height, int format) { return new QImage(static_cast(data), static_cast(width), static_cast(height), static_cast(format)); } -QImage* QImage_new6(unsigned char* data, int width, int height, int bytesPerLine, uintptr_t format) { +QImage* QImage_new6(unsigned char* data, int width, int height, int bytesPerLine, int format) { return new QImage(static_cast(data), static_cast(width), static_cast(height), static_cast(bytesPerLine), static_cast(format)); } -QImage* QImage_new7(const unsigned char* data, int width, int height, int bytesPerLine, uintptr_t format) { +QImage* QImage_new7(const unsigned char* data, int width, int height, int bytesPerLine, int format) { return new QImage(static_cast(data), static_cast(width), static_cast(height), static_cast(bytesPerLine), static_cast(format)); } @@ -101,16 +101,16 @@ QImage* QImage_Copy2(const QImage* self, int x, int y, int w, int h) { return new QImage(self->copy(static_cast(x), static_cast(y), static_cast(w), static_cast(h))); } -uintptr_t QImage_Format(const QImage* self) { +int QImage_Format(const QImage* self) { QImage::Format _ret = self->format(); - return static_cast(_ret); + return static_cast(_ret); } -QImage* QImage_ConvertToFormat(const QImage* self, uintptr_t f) { +QImage* QImage_ConvertToFormat(const QImage* self, int f) { return new QImage(self->convertToFormat(static_cast(f))); } -QImage* QImage_ConvertToFormat2(const QImage* self, uintptr_t f, struct miqt_array* /* of unsigned int */ colorTable) { +QImage* QImage_ConvertToFormat2(const QImage* self, int f, struct miqt_array* /* of unsigned int */ colorTable) { QVector colorTable_QList; colorTable_QList.reserve(colorTable->len); unsigned int* colorTable_arr = static_cast(colorTable->data); @@ -120,11 +120,11 @@ QImage* QImage_ConvertToFormat2(const QImage* self, uintptr_t f, struct miqt_arr return new QImage(self->convertToFormat(static_cast(f), colorTable_QList)); } -bool QImage_ReinterpretAsFormat(QImage* self, uintptr_t f) { +bool QImage_ReinterpretAsFormat(QImage* self, int f) { return self->reinterpretAsFormat(static_cast(f)); } -void QImage_ConvertTo(QImage* self, uintptr_t f) { +void QImage_ConvertTo(QImage* self, int f) { self->convertTo(static_cast(f)); } @@ -157,7 +157,8 @@ int QImage_BitPlaneCount(const QImage* self) { } unsigned int QImage_Color(const QImage* self, int i) { - return self->color(static_cast(i)); + QRgb _ret = self->color(static_cast(i)); + return static_cast(_ret); } void QImage_SetColor(QImage* self, int i, unsigned int c) { @@ -177,15 +178,18 @@ bool QImage_IsGrayscale(const QImage* self) { } unsigned char* QImage_Bits(QImage* self) { - return self->bits(); + uchar* _ret = self->bits(); + return static_cast(_ret); } const unsigned char* QImage_Bits2(const QImage* self) { - return (const unsigned char*) self->bits(); + const uchar* _ret = self->bits(); + return static_cast(_ret); } const unsigned char* QImage_ConstBits(const QImage* self) { - return (const unsigned char*) self->constBits(); + const uchar* _ret = self->constBits(); + return static_cast(_ret); } int QImage_ByteCount(const QImage* self) { @@ -197,15 +201,18 @@ size_t QImage_SizeInBytes(const QImage* self) { } unsigned char* QImage_ScanLine(QImage* self, int param1) { - return self->scanLine(static_cast(param1)); + uchar* _ret = self->scanLine(static_cast(param1)); + return static_cast(_ret); } const unsigned char* QImage_ScanLineWithInt(const QImage* self, int param1) { - return (const unsigned char*) self->scanLine(static_cast(param1)); + const uchar* _ret = self->scanLine(static_cast(param1)); + return static_cast(_ret); } const unsigned char* QImage_ConstScanLine(const QImage* self, int param1) { - return (const unsigned char*) self->constScanLine(static_cast(param1)); + const uchar* _ret = self->constScanLine(static_cast(param1)); + return static_cast(_ret); } int QImage_BytesPerLine(const QImage* self) { @@ -229,11 +236,13 @@ int QImage_PixelIndexWithPt(const QImage* self, QPoint* pt) { } unsigned int QImage_Pixel(const QImage* self, int x, int y) { - return self->pixel(static_cast(x), static_cast(y)); + QRgb _ret = self->pixel(static_cast(x), static_cast(y)); + return static_cast(_ret); } unsigned int QImage_PixelWithPt(const QImage* self, QPoint* pt) { - return self->pixel(*pt); + QRgb _ret = self->pixel(*pt); + return static_cast(_ret); } void QImage_SetPixel(QImage* self, int x, int y, unsigned int index_or_rgb) { @@ -261,7 +270,7 @@ void QImage_SetPixelColor2(QImage* self, QPoint* pt, QColor* c) { } struct miqt_array* QImage_ColorTable(const QImage* self) { - QVector _ret = self->colorTable(); + QVector _ret = self->colorTable(); // Convert QList<> from C++ memory to manually-managed C memory unsigned int* _arr = static_cast(malloc(sizeof(unsigned int) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -284,7 +293,8 @@ void QImage_SetColorTable(QImage* self, struct miqt_array* /* of unsigned int */ } double QImage_DevicePixelRatio(const QImage* self) { - return self->devicePixelRatio(); + qreal _ret = self->devicePixelRatio(); + return static_cast(_ret); } void QImage_SetDevicePixelRatio(QImage* self, double scaleFactor) { @@ -299,7 +309,7 @@ void QImage_FillWithColor(QImage* self, QColor* color) { self->fill(*color); } -void QImage_Fill2(QImage* self, uintptr_t color) { +void QImage_Fill2(QImage* self, int color) { self->fill(static_cast(color)); } @@ -426,7 +436,8 @@ QImage* QImage_FromDataWithData(QByteArray* data) { } long long QImage_CacheKey(const QImage* self) { - return self->cacheKey(); + qint64 _ret = self->cacheKey(); + return static_cast(_ret); } QPaintEngine* QImage_PaintEngine(const QImage* self) { @@ -490,24 +501,24 @@ QPixelFormat* QImage_PixelFormat(const QImage* self) { return new QPixelFormat(self->pixelFormat()); } -QPixelFormat* QImage_ToPixelFormat(uintptr_t format) { +QPixelFormat* QImage_ToPixelFormat(int format) { return new QPixelFormat(QImage::toPixelFormat(static_cast(format))); } -uintptr_t QImage_ToImageFormat(QPixelFormat* format) { +int QImage_ToImageFormat(QPixelFormat* format) { QImage::Format _ret = QImage::toImageFormat(*format); - return static_cast(_ret); + return static_cast(_ret); } QImage* QImage_Copy1(const QImage* self, QRect* rect) { return new QImage(self->copy(*rect)); } -QImage* QImage_ConvertToFormat22(const QImage* self, uintptr_t f, int flags) { +QImage* QImage_ConvertToFormat22(const QImage* self, int f, int flags) { return new QImage(self->convertToFormat(static_cast(f), static_cast(flags))); } -QImage* QImage_ConvertToFormat3(const QImage* self, uintptr_t f, struct miqt_array* /* of unsigned int */ colorTable, int flags) { +QImage* QImage_ConvertToFormat3(const QImage* self, int f, struct miqt_array* /* of unsigned int */ colorTable, int flags) { QVector colorTable_QList; colorTable_QList.reserve(colorTable->len); unsigned int* colorTable_arr = static_cast(colorTable->data); @@ -517,7 +528,7 @@ QImage* QImage_ConvertToFormat3(const QImage* self, uintptr_t f, struct miqt_arr return new QImage(self->convertToFormat(static_cast(f), colorTable_QList, static_cast(flags))); } -void QImage_ConvertTo2(QImage* self, uintptr_t f, int flags) { +void QImage_ConvertTo2(QImage* self, int f, int flags) { self->convertTo(static_cast(f), static_cast(flags)); } @@ -529,39 +540,39 @@ QImage* QImage_CreateHeuristicMask1(const QImage* self, bool clipTight) { return new QImage(self->createHeuristicMask(clipTight)); } -QImage* QImage_CreateMaskFromColor2(const QImage* self, unsigned int color, uintptr_t mode) { +QImage* QImage_CreateMaskFromColor2(const QImage* self, unsigned int color, int mode) { return new QImage(self->createMaskFromColor(static_cast(color), static_cast(mode))); } -QImage* QImage_Scaled3(const QImage* self, int w, int h, uintptr_t aspectMode) { +QImage* QImage_Scaled3(const QImage* self, int w, int h, int aspectMode) { return new QImage(self->scaled(static_cast(w), static_cast(h), static_cast(aspectMode))); } -QImage* QImage_Scaled4(const QImage* self, int w, int h, uintptr_t aspectMode, uintptr_t mode) { +QImage* QImage_Scaled4(const QImage* self, int w, int h, int aspectMode, int mode) { return new QImage(self->scaled(static_cast(w), static_cast(h), static_cast(aspectMode), static_cast(mode))); } -QImage* QImage_Scaled2(const QImage* self, QSize* s, uintptr_t aspectMode) { +QImage* QImage_Scaled2(const QImage* self, QSize* s, int aspectMode) { return new QImage(self->scaled(*s, static_cast(aspectMode))); } -QImage* QImage_Scaled32(const QImage* self, QSize* s, uintptr_t aspectMode, uintptr_t mode) { +QImage* QImage_Scaled32(const QImage* self, QSize* s, int aspectMode, int mode) { return new QImage(self->scaled(*s, static_cast(aspectMode), static_cast(mode))); } -QImage* QImage_ScaledToWidth2(const QImage* self, int w, uintptr_t mode) { +QImage* QImage_ScaledToWidth2(const QImage* self, int w, int mode) { return new QImage(self->scaledToWidth(static_cast(w), static_cast(mode))); } -QImage* QImage_ScaledToHeight2(const QImage* self, int h, uintptr_t mode) { +QImage* QImage_ScaledToHeight2(const QImage* self, int h, int mode) { return new QImage(self->scaledToHeight(static_cast(h), static_cast(mode))); } -QImage* QImage_Transformed2(const QImage* self, QMatrix* matrix, uintptr_t mode) { +QImage* QImage_Transformed2(const QImage* self, QMatrix* matrix, int mode) { return new QImage(self->transformed(*matrix, static_cast(mode))); } -QImage* QImage_Transformed22(const QImage* self, QTransform* matrix, uintptr_t mode) { +QImage* QImage_Transformed22(const QImage* self, QTransform* matrix, int mode) { return new QImage(self->transformed(*matrix, static_cast(mode))); } @@ -573,7 +584,7 @@ QImage* QImage_Mirrored2(const QImage* self, bool horizontally, bool vertically) return new QImage(self->mirrored(horizontally, vertically)); } -void QImage_InvertPixels1(QImage* self, uintptr_t param1) { +void QImage_InvertPixels1(QImage* self, int param1) { self->invertPixels(static_cast(param1)); } diff --git a/qt/gen_qimage.go b/qt/gen_qimage.go index d37ed76..0d85a2f 100644 --- a/qt/gen_qimage.go +++ b/qt/gen_qimage.go @@ -87,37 +87,37 @@ func NewQImage() *QImage { // NewQImage2 constructs a new QImage object. func NewQImage2(size *QSize, format QImage__Format) *QImage { - ret := C.QImage_new2(size.cPointer(), (C.uintptr_t)(format)) + ret := C.QImage_new2(size.cPointer(), (C.int)(format)) return newQImage(ret) } // NewQImage3 constructs a new QImage object. func NewQImage3(width int, height int, format QImage__Format) *QImage { - ret := C.QImage_new3((C.int)(width), (C.int)(height), (C.uintptr_t)(format)) + ret := C.QImage_new3((C.int)(width), (C.int)(height), (C.int)(format)) return newQImage(ret) } // NewQImage4 constructs a new QImage object. func NewQImage4(data *byte, width int, height int, format QImage__Format) *QImage { - ret := C.QImage_new4((*C.uchar)(unsafe.Pointer(data)), (C.int)(width), (C.int)(height), (C.uintptr_t)(format)) + ret := C.QImage_new4((*C.uchar)(unsafe.Pointer(data)), (C.int)(width), (C.int)(height), (C.int)(format)) return newQImage(ret) } // NewQImage5 constructs a new QImage object. func NewQImage5(data *byte, width int, height int, format QImage__Format) *QImage { - ret := C.QImage_new5((*C.uchar)(unsafe.Pointer(data)), (C.int)(width), (C.int)(height), (C.uintptr_t)(format)) + ret := C.QImage_new5((*C.uchar)(unsafe.Pointer(data)), (C.int)(width), (C.int)(height), (C.int)(format)) return newQImage(ret) } // NewQImage6 constructs a new QImage object. func NewQImage6(data *byte, width int, height int, bytesPerLine int, format QImage__Format) *QImage { - ret := C.QImage_new6((*C.uchar)(unsafe.Pointer(data)), (C.int)(width), (C.int)(height), (C.int)(bytesPerLine), (C.uintptr_t)(format)) + ret := C.QImage_new6((*C.uchar)(unsafe.Pointer(data)), (C.int)(width), (C.int)(height), (C.int)(bytesPerLine), (C.int)(format)) return newQImage(ret) } // NewQImage7 constructs a new QImage object. func NewQImage7(data *byte, width int, height int, bytesPerLine int, format QImage__Format) *QImage { - ret := C.QImage_new7((*C.uchar)(unsafe.Pointer(data)), (C.int)(width), (C.int)(height), (C.int)(bytesPerLine), (C.uintptr_t)(format)) + ret := C.QImage_new7((*C.uchar)(unsafe.Pointer(data)), (C.int)(width), (C.int)(height), (C.int)(bytesPerLine), (C.int)(format)) return newQImage(ret) } @@ -196,7 +196,7 @@ func (this *QImage) Format() QImage__Format { } func (this *QImage) ConvertToFormat(f QImage__Format) *QImage { - _ret := C.QImage_ConvertToFormat(this.h, (C.uintptr_t)(f)) + _ret := C.QImage_ConvertToFormat(this.h, (C.int)(f)) _goptr := newQImage(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -211,18 +211,18 @@ func (this *QImage) ConvertToFormat2(f QImage__Format, colorTable []uint) *QImag } colorTable_ma := &C.struct_miqt_array{len: C.size_t(len(colorTable)), data: unsafe.Pointer(colorTable_CArray)} defer runtime.KeepAlive(unsafe.Pointer(colorTable_ma)) - _ret := C.QImage_ConvertToFormat2(this.h, (C.uintptr_t)(f), colorTable_ma) + _ret := C.QImage_ConvertToFormat2(this.h, (C.int)(f), colorTable_ma) _goptr := newQImage(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QImage) ReinterpretAsFormat(f QImage__Format) bool { - return (bool)(C.QImage_ReinterpretAsFormat(this.h, (C.uintptr_t)(f))) + return (bool)(C.QImage_ReinterpretAsFormat(this.h, (C.int)(f))) } func (this *QImage) ConvertTo(f QImage__Format) { - C.QImage_ConvertTo(this.h, (C.uintptr_t)(f)) + C.QImage_ConvertTo(this.h, (C.int)(f)) } func (this *QImage) Width() int { @@ -409,7 +409,7 @@ func (this *QImage) FillWithColor(color *QColor) { } func (this *QImage) Fill2(color GlobalColor) { - C.QImage_Fill2(this.h, (C.uintptr_t)(color)) + C.QImage_Fill2(this.h, (C.int)(color)) } func (this *QImage) HasAlphaChannel() bool { @@ -664,7 +664,7 @@ func (this *QImage) PixelFormat() *QPixelFormat { } func QImage_ToPixelFormat(format QImage__Format) *QPixelFormat { - _ret := C.QImage_ToPixelFormat((C.uintptr_t)(format)) + _ret := C.QImage_ToPixelFormat((C.int)(format)) _goptr := newQPixelFormat(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -682,7 +682,7 @@ func (this *QImage) Copy1(rect *QRect) *QImage { } func (this *QImage) ConvertToFormat22(f QImage__Format, flags int) *QImage { - _ret := C.QImage_ConvertToFormat22(this.h, (C.uintptr_t)(f), (C.int)(flags)) + _ret := C.QImage_ConvertToFormat22(this.h, (C.int)(f), flags) _goptr := newQImage(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -697,18 +697,18 @@ func (this *QImage) ConvertToFormat3(f QImage__Format, colorTable []uint, flags } colorTable_ma := &C.struct_miqt_array{len: C.size_t(len(colorTable)), data: unsafe.Pointer(colorTable_CArray)} defer runtime.KeepAlive(unsafe.Pointer(colorTable_ma)) - _ret := C.QImage_ConvertToFormat3(this.h, (C.uintptr_t)(f), colorTable_ma, (C.int)(flags)) + _ret := C.QImage_ConvertToFormat3(this.h, (C.int)(f), colorTable_ma, flags) _goptr := newQImage(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QImage) ConvertTo2(f QImage__Format, flags int) { - C.QImage_ConvertTo2(this.h, (C.uintptr_t)(f), (C.int)(flags)) + C.QImage_ConvertTo2(this.h, (C.int)(f), flags) } func (this *QImage) CreateAlphaMask1(flags int) *QImage { - _ret := C.QImage_CreateAlphaMask1(this.h, (C.int)(flags)) + _ret := C.QImage_CreateAlphaMask1(this.h, flags) _goptr := newQImage(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -722,63 +722,63 @@ func (this *QImage) CreateHeuristicMask1(clipTight bool) *QImage { } func (this *QImage) CreateMaskFromColor2(color uint, mode MaskMode) *QImage { - _ret := C.QImage_CreateMaskFromColor2(this.h, (C.uint)(color), (C.uintptr_t)(mode)) + _ret := C.QImage_CreateMaskFromColor2(this.h, (C.uint)(color), (C.int)(mode)) _goptr := newQImage(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QImage) Scaled3(w int, h int, aspectMode AspectRatioMode) *QImage { - _ret := C.QImage_Scaled3(this.h, (C.int)(w), (C.int)(h), (C.uintptr_t)(aspectMode)) + _ret := C.QImage_Scaled3(this.h, (C.int)(w), (C.int)(h), (C.int)(aspectMode)) _goptr := newQImage(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QImage) Scaled4(w int, h int, aspectMode AspectRatioMode, mode TransformationMode) *QImage { - _ret := C.QImage_Scaled4(this.h, (C.int)(w), (C.int)(h), (C.uintptr_t)(aspectMode), (C.uintptr_t)(mode)) + _ret := C.QImage_Scaled4(this.h, (C.int)(w), (C.int)(h), (C.int)(aspectMode), (C.int)(mode)) _goptr := newQImage(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QImage) Scaled2(s *QSize, aspectMode AspectRatioMode) *QImage { - _ret := C.QImage_Scaled2(this.h, s.cPointer(), (C.uintptr_t)(aspectMode)) + _ret := C.QImage_Scaled2(this.h, s.cPointer(), (C.int)(aspectMode)) _goptr := newQImage(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QImage) Scaled32(s *QSize, aspectMode AspectRatioMode, mode TransformationMode) *QImage { - _ret := C.QImage_Scaled32(this.h, s.cPointer(), (C.uintptr_t)(aspectMode), (C.uintptr_t)(mode)) + _ret := C.QImage_Scaled32(this.h, s.cPointer(), (C.int)(aspectMode), (C.int)(mode)) _goptr := newQImage(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QImage) ScaledToWidth2(w int, mode TransformationMode) *QImage { - _ret := C.QImage_ScaledToWidth2(this.h, (C.int)(w), (C.uintptr_t)(mode)) + _ret := C.QImage_ScaledToWidth2(this.h, (C.int)(w), (C.int)(mode)) _goptr := newQImage(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QImage) ScaledToHeight2(h int, mode TransformationMode) *QImage { - _ret := C.QImage_ScaledToHeight2(this.h, (C.int)(h), (C.uintptr_t)(mode)) + _ret := C.QImage_ScaledToHeight2(this.h, (C.int)(h), (C.int)(mode)) _goptr := newQImage(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QImage) Transformed2(matrix *QMatrix, mode TransformationMode) *QImage { - _ret := C.QImage_Transformed2(this.h, matrix.cPointer(), (C.uintptr_t)(mode)) + _ret := C.QImage_Transformed2(this.h, matrix.cPointer(), (C.int)(mode)) _goptr := newQImage(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QImage) Transformed22(matrix *QTransform, mode TransformationMode) *QImage { - _ret := C.QImage_Transformed22(this.h, matrix.cPointer(), (C.uintptr_t)(mode)) + _ret := C.QImage_Transformed22(this.h, matrix.cPointer(), (C.int)(mode)) _goptr := newQImage(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -799,7 +799,7 @@ func (this *QImage) Mirrored2(horizontally bool, vertically bool) *QImage { } func (this *QImage) InvertPixels1(param1 QImage__InvertMode) { - C.QImage_InvertPixels1(this.h, (C.uintptr_t)(param1)) + C.QImage_InvertPixels1(this.h, (C.int)(param1)) } func (this *QImage) Load2(fileName string, format string) bool { diff --git a/qt/gen_qimage.h b/qt/gen_qimage.h index 716cba1..c092d8d 100644 --- a/qt/gen_qimage.h +++ b/qt/gen_qimage.h @@ -44,12 +44,12 @@ typedef struct QTransform QTransform; #endif QImage* QImage_new(); -QImage* QImage_new2(QSize* size, uintptr_t format); -QImage* QImage_new3(int width, int height, uintptr_t format); -QImage* QImage_new4(unsigned char* data, int width, int height, uintptr_t format); -QImage* QImage_new5(const unsigned char* data, int width, int height, uintptr_t format); -QImage* QImage_new6(unsigned char* data, int width, int height, int bytesPerLine, uintptr_t format); -QImage* QImage_new7(const unsigned char* data, int width, int height, int bytesPerLine, uintptr_t format); +QImage* QImage_new2(QSize* size, int format); +QImage* QImage_new3(int width, int height, int format); +QImage* QImage_new4(unsigned char* data, int width, int height, int format); +QImage* QImage_new5(const unsigned char* data, int width, int height, int format); +QImage* QImage_new6(unsigned char* data, int width, int height, int bytesPerLine, int format); +QImage* QImage_new7(const unsigned char* data, int width, int height, int bytesPerLine, int format); QImage* QImage_new8(struct miqt_string* fileName); QImage* QImage_new9(QImage* param1); QImage* QImage_new10(struct miqt_string* fileName, const char* format); @@ -63,11 +63,11 @@ void QImage_Detach(QImage* self); bool QImage_IsDetached(const QImage* self); QImage* QImage_Copy(const QImage* self); QImage* QImage_Copy2(const QImage* self, int x, int y, int w, int h); -uintptr_t QImage_Format(const QImage* self); -QImage* QImage_ConvertToFormat(const QImage* self, uintptr_t f); -QImage* QImage_ConvertToFormat2(const QImage* self, uintptr_t f, struct miqt_array* /* of unsigned int */ colorTable); -bool QImage_ReinterpretAsFormat(QImage* self, uintptr_t f); -void QImage_ConvertTo(QImage* self, uintptr_t f); +int QImage_Format(const QImage* self); +QImage* QImage_ConvertToFormat(const QImage* self, int f); +QImage* QImage_ConvertToFormat2(const QImage* self, int f, struct miqt_array* /* of unsigned int */ colorTable); +bool QImage_ReinterpretAsFormat(QImage* self, int f); +void QImage_ConvertTo(QImage* self, int f); int QImage_Width(const QImage* self); int QImage_Height(const QImage* self); QSize* QImage_Size(const QImage* self); @@ -107,7 +107,7 @@ double QImage_DevicePixelRatio(const QImage* self); void QImage_SetDevicePixelRatio(QImage* self, double scaleFactor); void QImage_Fill(QImage* self, unsigned int pixel); void QImage_FillWithColor(QImage* self, QColor* color); -void QImage_Fill2(QImage* self, uintptr_t color); +void QImage_Fill2(QImage* self, int color); bool QImage_HasAlphaChannel(const QImage* self); void QImage_SetAlphaChannel(QImage* self, QImage* alphaChannel); QImage* QImage_AlphaChannel(const QImage* self); @@ -150,26 +150,26 @@ struct miqt_array* QImage_TextKeys(const QImage* self); struct miqt_string* QImage_Text(const QImage* self); void QImage_SetText(QImage* self, struct miqt_string* key, struct miqt_string* value); QPixelFormat* QImage_PixelFormat(const QImage* self); -QPixelFormat* QImage_ToPixelFormat(uintptr_t format); -uintptr_t QImage_ToImageFormat(QPixelFormat* format); +QPixelFormat* QImage_ToPixelFormat(int format); +int QImage_ToImageFormat(QPixelFormat* format); QImage* QImage_Copy1(const QImage* self, QRect* rect); -QImage* QImage_ConvertToFormat22(const QImage* self, uintptr_t f, int flags); -QImage* QImage_ConvertToFormat3(const QImage* self, uintptr_t f, struct miqt_array* /* of unsigned int */ colorTable, int flags); -void QImage_ConvertTo2(QImage* self, uintptr_t f, int flags); +QImage* QImage_ConvertToFormat22(const QImage* self, int f, int flags); +QImage* QImage_ConvertToFormat3(const QImage* self, int f, struct miqt_array* /* of unsigned int */ colorTable, int flags); +void QImage_ConvertTo2(QImage* self, int f, int flags); QImage* QImage_CreateAlphaMask1(const QImage* self, int flags); QImage* QImage_CreateHeuristicMask1(const QImage* self, bool clipTight); -QImage* QImage_CreateMaskFromColor2(const QImage* self, unsigned int color, uintptr_t mode); -QImage* QImage_Scaled3(const QImage* self, int w, int h, uintptr_t aspectMode); -QImage* QImage_Scaled4(const QImage* self, int w, int h, uintptr_t aspectMode, uintptr_t mode); -QImage* QImage_Scaled2(const QImage* self, QSize* s, uintptr_t aspectMode); -QImage* QImage_Scaled32(const QImage* self, QSize* s, uintptr_t aspectMode, uintptr_t mode); -QImage* QImage_ScaledToWidth2(const QImage* self, int w, uintptr_t mode); -QImage* QImage_ScaledToHeight2(const QImage* self, int h, uintptr_t mode); -QImage* QImage_Transformed2(const QImage* self, QMatrix* matrix, uintptr_t mode); -QImage* QImage_Transformed22(const QImage* self, QTransform* matrix, uintptr_t mode); +QImage* QImage_CreateMaskFromColor2(const QImage* self, unsigned int color, int mode); +QImage* QImage_Scaled3(const QImage* self, int w, int h, int aspectMode); +QImage* QImage_Scaled4(const QImage* self, int w, int h, int aspectMode, int mode); +QImage* QImage_Scaled2(const QImage* self, QSize* s, int aspectMode); +QImage* QImage_Scaled32(const QImage* self, QSize* s, int aspectMode, int mode); +QImage* QImage_ScaledToWidth2(const QImage* self, int w, int mode); +QImage* QImage_ScaledToHeight2(const QImage* self, int h, int mode); +QImage* QImage_Transformed2(const QImage* self, QMatrix* matrix, int mode); +QImage* QImage_Transformed22(const QImage* self, QTransform* matrix, int mode); QImage* QImage_Mirrored1(const QImage* self, bool horizontally); QImage* QImage_Mirrored2(const QImage* self, bool horizontally, bool vertically); -void QImage_InvertPixels1(QImage* self, uintptr_t param1); +void QImage_InvertPixels1(QImage* self, int param1); bool QImage_Load2(QImage* self, struct miqt_string* fileName, const char* format); bool QImage_LoadFromData3(QImage* self, const unsigned char* buf, int lenVal, const char* format); bool QImage_LoadFromData2(QImage* self, QByteArray* data, const char* aformat); diff --git a/qt/gen_qimageiohandler.cpp b/qt/gen_qimageiohandler.cpp index 9da4cd9..db6637b 100644 --- a/qt/gen_qimageiohandler.cpp +++ b/qt/gen_qimageiohandler.cpp @@ -49,15 +49,15 @@ bool QImageIOHandler_Write(QImageIOHandler* self, QImage* image) { return self->write(*image); } -QVariant* QImageIOHandler_Option(const QImageIOHandler* self, uintptr_t option) { +QVariant* QImageIOHandler_Option(const QImageIOHandler* self, int option) { return new QVariant(self->option(static_cast(option))); } -void QImageIOHandler_SetOption(QImageIOHandler* self, uintptr_t option, QVariant* value) { +void QImageIOHandler_SetOption(QImageIOHandler* self, int option, QVariant* value) { self->setOption(static_cast(option), *value); } -bool QImageIOHandler_SupportsOption(const QImageIOHandler* self, uintptr_t option) { +bool QImageIOHandler_SupportsOption(const QImageIOHandler* self, int option) { return self->supportsOption(static_cast(option)); } diff --git a/qt/gen_qimageiohandler.go b/qt/gen_qimageiohandler.go index 12b94e4..5bee11c 100644 --- a/qt/gen_qimageiohandler.go +++ b/qt/gen_qimageiohandler.go @@ -124,18 +124,18 @@ func (this *QImageIOHandler) Write(image *QImage) bool { } func (this *QImageIOHandler) Option(option QImageIOHandler__ImageOption) *QVariant { - _ret := C.QImageIOHandler_Option(this.h, (C.uintptr_t)(option)) + _ret := C.QImageIOHandler_Option(this.h, (C.int)(option)) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QImageIOHandler) SetOption(option QImageIOHandler__ImageOption, value *QVariant) { - C.QImageIOHandler_SetOption(this.h, (C.uintptr_t)(option), value.cPointer()) + C.QImageIOHandler_SetOption(this.h, (C.int)(option), value.cPointer()) } func (this *QImageIOHandler) SupportsOption(option QImageIOHandler__ImageOption) bool { - return (bool)(C.QImageIOHandler_SupportsOption(this.h, (C.uintptr_t)(option))) + return (bool)(C.QImageIOHandler_SupportsOption(this.h, (C.int)(option))) } func (this *QImageIOHandler) JumpToNextImage() bool { diff --git a/qt/gen_qimageiohandler.h b/qt/gen_qimageiohandler.h index c69ec1e..72bd76e 100644 --- a/qt/gen_qimageiohandler.h +++ b/qt/gen_qimageiohandler.h @@ -42,9 +42,9 @@ QByteArray* QImageIOHandler_Name(const QImageIOHandler* self); bool QImageIOHandler_CanRead(const QImageIOHandler* self); bool QImageIOHandler_Read(QImageIOHandler* self, QImage* image); bool QImageIOHandler_Write(QImageIOHandler* self, QImage* image); -QVariant* QImageIOHandler_Option(const QImageIOHandler* self, uintptr_t option); -void QImageIOHandler_SetOption(QImageIOHandler* self, uintptr_t option, QVariant* value); -bool QImageIOHandler_SupportsOption(const QImageIOHandler* self, uintptr_t option); +QVariant* QImageIOHandler_Option(const QImageIOHandler* self, int option); +void QImageIOHandler_SetOption(QImageIOHandler* self, int option, QVariant* value); +bool QImageIOHandler_SupportsOption(const QImageIOHandler* self, int option); bool QImageIOHandler_JumpToNextImage(QImageIOHandler* self); bool QImageIOHandler_JumpToImage(QImageIOHandler* self, int imageNumber); int QImageIOHandler_LoopCount(const QImageIOHandler* self); diff --git a/qt/gen_qimagereader.cpp b/qt/gen_qimagereader.cpp index e05ad99..bd50587 100644 --- a/qt/gen_qimagereader.cpp +++ b/qt/gen_qimagereader.cpp @@ -97,9 +97,9 @@ QSize* QImageReader_Size(const QImageReader* self) { return new QSize(self->size()); } -uintptr_t QImageReader_ImageFormat(const QImageReader* self) { +int QImageReader_ImageFormat(const QImageReader* self) { QImage::Format _ret = self->imageFormat(); - return static_cast(_ret); + return static_cast(_ret); } struct miqt_array* QImageReader_TextKeys(const QImageReader* self) { @@ -248,9 +248,9 @@ QRect* QImageReader_CurrentImageRect(const QImageReader* self) { return new QRect(self->currentImageRect()); } -uintptr_t QImageReader_Error(const QImageReader* self) { +int QImageReader_Error(const QImageReader* self) { QImageReader::ImageReaderError _ret = self->error(); - return static_cast(_ret); + return static_cast(_ret); } struct miqt_string* QImageReader_ErrorString(const QImageReader* self) { @@ -260,7 +260,7 @@ struct miqt_string* QImageReader_ErrorString(const QImageReader* self) { return miqt_strdup(_b.data(), _b.length()); } -bool QImageReader_SupportsOption(const QImageReader* self, uintptr_t option) { +bool QImageReader_SupportsOption(const QImageReader* self, int option) { return self->supportsOption(static_cast(option)); } diff --git a/qt/gen_qimagereader.go b/qt/gen_qimagereader.go index 012f1c2..439a87e 100644 --- a/qt/gen_qimagereader.go +++ b/qt/gen_qimagereader.go @@ -334,7 +334,7 @@ func (this *QImageReader) ErrorString() string { } func (this *QImageReader) SupportsOption(option QImageIOHandler__ImageOption) bool { - return (bool)(C.QImageReader_SupportsOption(this.h, (C.uintptr_t)(option))) + return (bool)(C.QImageReader_SupportsOption(this.h, (C.int)(option))) } func QImageReader_ImageFormatWithFileName(fileName string) *QByteArray { diff --git a/qt/gen_qimagereader.h b/qt/gen_qimagereader.h index 847c2db..3117bcf 100644 --- a/qt/gen_qimagereader.h +++ b/qt/gen_qimagereader.h @@ -49,7 +49,7 @@ QIODevice* QImageReader_Device(const QImageReader* self); void QImageReader_SetFileName(QImageReader* self, struct miqt_string* fileName); struct miqt_string* QImageReader_FileName(const QImageReader* self); QSize* QImageReader_Size(const QImageReader* self); -uintptr_t QImageReader_ImageFormat(const QImageReader* self); +int QImageReader_ImageFormat(const QImageReader* self); struct miqt_array* QImageReader_TextKeys(const QImageReader* self); struct miqt_string* QImageReader_Text(const QImageReader* self, struct miqt_string* key); void QImageReader_SetClipRect(QImageReader* self, QRect* rect); @@ -80,9 +80,9 @@ int QImageReader_ImageCount(const QImageReader* self); int QImageReader_NextImageDelay(const QImageReader* self); int QImageReader_CurrentImageNumber(const QImageReader* self); QRect* QImageReader_CurrentImageRect(const QImageReader* self); -uintptr_t QImageReader_Error(const QImageReader* self); +int QImageReader_Error(const QImageReader* self); struct miqt_string* QImageReader_ErrorString(const QImageReader* self); -bool QImageReader_SupportsOption(const QImageReader* self, uintptr_t option); +bool QImageReader_SupportsOption(const QImageReader* self, int option); QByteArray* QImageReader_ImageFormatWithFileName(struct miqt_string* fileName); QByteArray* QImageReader_ImageFormatWithDevice(QIODevice* device); struct miqt_array* QImageReader_SupportedImageFormats(); diff --git a/qt/gen_qimagewriter.cpp b/qt/gen_qimagewriter.cpp index 708d888..7517de8 100644 --- a/qt/gen_qimagewriter.cpp +++ b/qt/gen_qimagewriter.cpp @@ -166,9 +166,9 @@ bool QImageWriter_Write(QImageWriter* self, QImage* image) { return self->write(*image); } -uintptr_t QImageWriter_Error(const QImageWriter* self) { +int QImageWriter_Error(const QImageWriter* self) { QImageWriter::ImageWriterError _ret = self->error(); - return static_cast(_ret); + return static_cast(_ret); } struct miqt_string* QImageWriter_ErrorString(const QImageWriter* self) { @@ -178,7 +178,7 @@ struct miqt_string* QImageWriter_ErrorString(const QImageWriter* self) { return miqt_strdup(_b.data(), _b.length()); } -bool QImageWriter_SupportsOption(const QImageWriter* self, uintptr_t option) { +bool QImageWriter_SupportsOption(const QImageWriter* self, int option) { return self->supportsOption(static_cast(option)); } diff --git a/qt/gen_qimagewriter.go b/qt/gen_qimagewriter.go index 541f884..edc84b2 100644 --- a/qt/gen_qimagewriter.go +++ b/qt/gen_qimagewriter.go @@ -192,7 +192,7 @@ func (this *QImageWriter) Transformation() int { } func (this *QImageWriter) SetTransformation(orientation int) { - C.QImageWriter_SetTransformation(this.h, (C.int)(orientation)) + C.QImageWriter_SetTransformation(this.h, orientation) } func (this *QImageWriter) SetDescription(description string) { @@ -236,7 +236,7 @@ func (this *QImageWriter) ErrorString() string { } func (this *QImageWriter) SupportsOption(option QImageIOHandler__ImageOption) bool { - return (bool)(C.QImageWriter_SupportsOption(this.h, (C.uintptr_t)(option))) + return (bool)(C.QImageWriter_SupportsOption(this.h, (C.int)(option))) } func QImageWriter_SupportedImageFormats() []QByteArray { diff --git a/qt/gen_qimagewriter.h b/qt/gen_qimagewriter.h index 608926f..2753f53 100644 --- a/qt/gen_qimagewriter.h +++ b/qt/gen_qimagewriter.h @@ -57,9 +57,9 @@ struct miqt_string* QImageWriter_Description(const QImageWriter* self); void QImageWriter_SetText(QImageWriter* self, struct miqt_string* key, struct miqt_string* text); bool QImageWriter_CanWrite(const QImageWriter* self); bool QImageWriter_Write(QImageWriter* self, QImage* image); -uintptr_t QImageWriter_Error(const QImageWriter* self); +int QImageWriter_Error(const QImageWriter* self); struct miqt_string* QImageWriter_ErrorString(const QImageWriter* self); -bool QImageWriter_SupportsOption(const QImageWriter* self, uintptr_t option); +bool QImageWriter_SupportsOption(const QImageWriter* self, int option); struct miqt_array* QImageWriter_SupportedImageFormats(); struct miqt_array* QImageWriter_SupportedMimeTypes(); struct miqt_array* QImageWriter_ImageFormatsForMimeType(QByteArray* mimeType); diff --git a/qt/gen_qinputdialog.cpp b/qt/gen_qinputdialog.cpp index d2f2071..b61b404 100644 --- a/qt/gen_qinputdialog.cpp +++ b/qt/gen_qinputdialog.cpp @@ -40,13 +40,13 @@ struct miqt_string* QInputDialog_TrUtf8(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -void QInputDialog_SetInputMode(QInputDialog* self, uintptr_t mode) { +void QInputDialog_SetInputMode(QInputDialog* self, int mode) { self->setInputMode(static_cast(mode)); } -uintptr_t QInputDialog_InputMode(const QInputDialog* self) { +int QInputDialog_InputMode(const QInputDialog* self) { QInputDialog::InputMode _ret = self->inputMode(); - return static_cast(_ret); + return static_cast(_ret); } void QInputDialog_SetLabelText(QInputDialog* self, struct miqt_string* text) { @@ -61,11 +61,11 @@ struct miqt_string* QInputDialog_LabelText(const QInputDialog* self) { return miqt_strdup(_b.data(), _b.length()); } -void QInputDialog_SetOption(QInputDialog* self, uintptr_t option) { +void QInputDialog_SetOption(QInputDialog* self, int option) { self->setOption(static_cast(option)); } -bool QInputDialog_TestOption(const QInputDialog* self, uintptr_t option) { +bool QInputDialog_TestOption(const QInputDialog* self, int option) { return self->testOption(static_cast(option)); } @@ -90,13 +90,13 @@ struct miqt_string* QInputDialog_TextValue(const QInputDialog* self) { return miqt_strdup(_b.data(), _b.length()); } -void QInputDialog_SetTextEchoMode(QInputDialog* self, uintptr_t mode) { +void QInputDialog_SetTextEchoMode(QInputDialog* self, int mode) { self->setTextEchoMode(static_cast(mode)); } -uintptr_t QInputDialog_TextEchoMode(const QInputDialog* self) { +int QInputDialog_TextEchoMode(const QInputDialog* self) { QLineEdit::EchoMode _ret = self->textEchoMode(); - return static_cast(_ret); + return static_cast(_ret); } void QInputDialog_SetComboBoxEditable(QInputDialog* self, bool editable) { @@ -408,11 +408,11 @@ struct miqt_string* QInputDialog_TrUtf83(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -void QInputDialog_SetOption2(QInputDialog* self, uintptr_t option, bool on) { +void QInputDialog_SetOption2(QInputDialog* self, int option, bool on) { self->setOption(static_cast(option), on); } -struct miqt_string* QInputDialog_GetText4(QWidget* parent, struct miqt_string* title, struct miqt_string* label, uintptr_t echo) { +struct miqt_string* QInputDialog_GetText4(QWidget* parent, struct miqt_string* title, struct miqt_string* label, int echo) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString label_QString = QString::fromUtf8(&label->data, label->len); QString _ret = QInputDialog::getText(parent, title_QString, label_QString, static_cast(echo)); @@ -421,7 +421,7 @@ struct miqt_string* QInputDialog_GetText4(QWidget* parent, struct miqt_string* t return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QInputDialog_GetText5(QWidget* parent, struct miqt_string* title, struct miqt_string* label, uintptr_t echo, struct miqt_string* text) { +struct miqt_string* QInputDialog_GetText5(QWidget* parent, struct miqt_string* title, struct miqt_string* label, int echo, struct miqt_string* text) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString label_QString = QString::fromUtf8(&label->data, label->len); QString text_QString = QString::fromUtf8(&text->data, text->len); @@ -431,7 +431,7 @@ struct miqt_string* QInputDialog_GetText5(QWidget* parent, struct miqt_string* t return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QInputDialog_GetText6(QWidget* parent, struct miqt_string* title, struct miqt_string* label, uintptr_t echo, struct miqt_string* text, bool* ok) { +struct miqt_string* QInputDialog_GetText6(QWidget* parent, struct miqt_string* title, struct miqt_string* label, int echo, struct miqt_string* text, bool* ok) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString label_QString = QString::fromUtf8(&label->data, label->len); QString text_QString = QString::fromUtf8(&text->data, text->len); @@ -441,7 +441,7 @@ struct miqt_string* QInputDialog_GetText6(QWidget* parent, struct miqt_string* t return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QInputDialog_GetText7(QWidget* parent, struct miqt_string* title, struct miqt_string* label, uintptr_t echo, struct miqt_string* text, bool* ok, int flags) { +struct miqt_string* QInputDialog_GetText7(QWidget* parent, struct miqt_string* title, struct miqt_string* label, int echo, struct miqt_string* text, bool* ok, int flags) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString label_QString = QString::fromUtf8(&label->data, label->len); QString text_QString = QString::fromUtf8(&text->data, text->len); @@ -451,7 +451,7 @@ struct miqt_string* QInputDialog_GetText7(QWidget* parent, struct miqt_string* t return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QInputDialog_GetText8(QWidget* parent, struct miqt_string* title, struct miqt_string* label, uintptr_t echo, struct miqt_string* text, bool* ok, int flags, int inputMethodHints) { +struct miqt_string* QInputDialog_GetText8(QWidget* parent, struct miqt_string* title, struct miqt_string* label, int echo, struct miqt_string* text, bool* ok, int flags, int inputMethodHints) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString label_QString = QString::fromUtf8(&label->data, label->len); QString text_QString = QString::fromUtf8(&text->data, text->len); diff --git a/qt/gen_qinputdialog.go b/qt/gen_qinputdialog.go index e565e9c..b8aff9e 100644 --- a/qt/gen_qinputdialog.go +++ b/qt/gen_qinputdialog.go @@ -67,7 +67,7 @@ func NewQInputDialog2(parent *QWidget) *QInputDialog { // NewQInputDialog3 constructs a new QInputDialog object. func NewQInputDialog3(parent *QWidget, flags int) *QInputDialog { - ret := C.QInputDialog_new3(parent.cPointer(), (C.int)(flags)) + ret := C.QInputDialog_new3(parent.cPointer(), flags) return newQInputDialog(ret) } @@ -94,7 +94,7 @@ func QInputDialog_TrUtf8(s string) string { } func (this *QInputDialog) SetInputMode(mode QInputDialog__InputMode) { - C.QInputDialog_SetInputMode(this.h, (C.uintptr_t)(mode)) + C.QInputDialog_SetInputMode(this.h, (C.int)(mode)) } func (this *QInputDialog) InputMode() QInputDialog__InputMode { @@ -115,15 +115,15 @@ func (this *QInputDialog) LabelText() string { } func (this *QInputDialog) SetOption(option QInputDialog__InputDialogOption) { - C.QInputDialog_SetOption(this.h, (C.uintptr_t)(option)) + C.QInputDialog_SetOption(this.h, (C.int)(option)) } func (this *QInputDialog) TestOption(option QInputDialog__InputDialogOption) bool { - return (bool)(C.QInputDialog_TestOption(this.h, (C.uintptr_t)(option))) + return (bool)(C.QInputDialog_TestOption(this.h, (C.int)(option))) } func (this *QInputDialog) SetOptions(options int) { - C.QInputDialog_SetOptions(this.h, (C.int)(options)) + C.QInputDialog_SetOptions(this.h, options) } func (this *QInputDialog) Options() int { @@ -144,7 +144,7 @@ func (this *QInputDialog) TextValue() string { } func (this *QInputDialog) SetTextEchoMode(mode QLineEdit__EchoMode) { - C.QInputDialog_SetTextEchoMode(this.h, (C.uintptr_t)(mode)) + C.QInputDialog_SetTextEchoMode(this.h, (C.int)(mode)) } func (this *QInputDialog) TextEchoMode() QLineEdit__EchoMode { @@ -367,7 +367,7 @@ func QInputDialog_GetDouble2(parent *QWidget, title string, label string, value defer C.free(title_ms) label_ms := miqt_strdupg(label) defer C.free(label_ms) - return (float64)(C.QInputDialog_GetDouble2(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (C.double)(value), (C.double)(minValue), (C.double)(maxValue), (C.int)(decimals), (*C.bool)(unsafe.Pointer(ok)), (C.int)(flags), (C.double)(step))) + return (float64)(C.QInputDialog_GetDouble2(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (C.double)(value), (C.double)(minValue), (C.double)(maxValue), (C.int)(decimals), (*C.bool)(unsafe.Pointer(ok)), flags, (C.double)(step))) } func (this *QInputDialog) SetDoubleStep(step float64) { @@ -557,7 +557,7 @@ func QInputDialog_TrUtf83(s string, c string, n int) string { } func (this *QInputDialog) SetOption2(option QInputDialog__InputDialogOption, on bool) { - C.QInputDialog_SetOption2(this.h, (C.uintptr_t)(option), (C.bool)(on)) + C.QInputDialog_SetOption2(this.h, (C.int)(option), (C.bool)(on)) } func QInputDialog_GetText4(parent *QWidget, title string, label string, echo QLineEdit__EchoMode) string { @@ -565,7 +565,7 @@ func QInputDialog_GetText4(parent *QWidget, title string, label string, echo QLi defer C.free(title_ms) label_ms := miqt_strdupg(label) defer C.free(label_ms) - var _ms *C.struct_miqt_string = C.QInputDialog_GetText4(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (C.uintptr_t)(echo)) + var _ms *C.struct_miqt_string = C.QInputDialog_GetText4(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (C.int)(echo)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -578,7 +578,7 @@ func QInputDialog_GetText5(parent *QWidget, title string, label string, echo QLi defer C.free(label_ms) text_ms := miqt_strdupg(text) defer C.free(text_ms) - var _ms *C.struct_miqt_string = C.QInputDialog_GetText5(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (C.uintptr_t)(echo), (*C.struct_miqt_string)(text_ms)) + var _ms *C.struct_miqt_string = C.QInputDialog_GetText5(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (C.int)(echo), (*C.struct_miqt_string)(text_ms)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -591,7 +591,7 @@ func QInputDialog_GetText6(parent *QWidget, title string, label string, echo QLi defer C.free(label_ms) text_ms := miqt_strdupg(text) defer C.free(text_ms) - var _ms *C.struct_miqt_string = C.QInputDialog_GetText6(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (C.uintptr_t)(echo), (*C.struct_miqt_string)(text_ms), (*C.bool)(unsafe.Pointer(ok))) + var _ms *C.struct_miqt_string = C.QInputDialog_GetText6(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (C.int)(echo), (*C.struct_miqt_string)(text_ms), (*C.bool)(unsafe.Pointer(ok))) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -604,7 +604,7 @@ func QInputDialog_GetText7(parent *QWidget, title string, label string, echo QLi defer C.free(label_ms) text_ms := miqt_strdupg(text) defer C.free(text_ms) - var _ms *C.struct_miqt_string = C.QInputDialog_GetText7(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (C.uintptr_t)(echo), (*C.struct_miqt_string)(text_ms), (*C.bool)(unsafe.Pointer(ok)), (C.int)(flags)) + var _ms *C.struct_miqt_string = C.QInputDialog_GetText7(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (C.int)(echo), (*C.struct_miqt_string)(text_ms), (*C.bool)(unsafe.Pointer(ok)), flags) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -617,7 +617,7 @@ func QInputDialog_GetText8(parent *QWidget, title string, label string, echo QLi defer C.free(label_ms) text_ms := miqt_strdupg(text) defer C.free(text_ms) - var _ms *C.struct_miqt_string = C.QInputDialog_GetText8(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (C.uintptr_t)(echo), (*C.struct_miqt_string)(text_ms), (*C.bool)(unsafe.Pointer(ok)), (C.int)(flags), (C.int)(inputMethodHints)) + var _ms *C.struct_miqt_string = C.QInputDialog_GetText8(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (C.int)(echo), (*C.struct_miqt_string)(text_ms), (*C.bool)(unsafe.Pointer(ok)), flags, inputMethodHints) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -656,7 +656,7 @@ func QInputDialog_GetMultiLineText6(parent *QWidget, title string, label string, defer C.free(label_ms) text_ms := miqt_strdupg(text) defer C.free(text_ms) - var _ms *C.struct_miqt_string = C.QInputDialog_GetMultiLineText6(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (*C.struct_miqt_string)(text_ms), (*C.bool)(unsafe.Pointer(ok)), (C.int)(flags)) + var _ms *C.struct_miqt_string = C.QInputDialog_GetMultiLineText6(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (*C.struct_miqt_string)(text_ms), (*C.bool)(unsafe.Pointer(ok)), flags) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -669,7 +669,7 @@ func QInputDialog_GetMultiLineText7(parent *QWidget, title string, label string, defer C.free(label_ms) text_ms := miqt_strdupg(text) defer C.free(text_ms) - var _ms *C.struct_miqt_string = C.QInputDialog_GetMultiLineText7(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (*C.struct_miqt_string)(text_ms), (*C.bool)(unsafe.Pointer(ok)), (C.int)(flags), (C.int)(inputMethodHints)) + var _ms *C.struct_miqt_string = C.QInputDialog_GetMultiLineText7(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (*C.struct_miqt_string)(text_ms), (*C.bool)(unsafe.Pointer(ok)), flags, inputMethodHints) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -753,7 +753,7 @@ func QInputDialog_GetItem8(parent *QWidget, title string, label string, items [] } items_ma := &C.struct_miqt_array{len: C.size_t(len(items)), data: unsafe.Pointer(items_CArray)} defer runtime.KeepAlive(unsafe.Pointer(items_ma)) - var _ms *C.struct_miqt_string = C.QInputDialog_GetItem8(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), items_ma, (C.int)(current), (C.bool)(editable), (*C.bool)(unsafe.Pointer(ok)), (C.int)(flags)) + var _ms *C.struct_miqt_string = C.QInputDialog_GetItem8(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), items_ma, (C.int)(current), (C.bool)(editable), (*C.bool)(unsafe.Pointer(ok)), flags) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -774,7 +774,7 @@ func QInputDialog_GetItem9(parent *QWidget, title string, label string, items [] } items_ma := &C.struct_miqt_array{len: C.size_t(len(items)), data: unsafe.Pointer(items_CArray)} defer runtime.KeepAlive(unsafe.Pointer(items_ma)) - var _ms *C.struct_miqt_string = C.QInputDialog_GetItem9(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), items_ma, (C.int)(current), (C.bool)(editable), (*C.bool)(unsafe.Pointer(ok)), (C.int)(flags), (C.int)(inputMethodHints)) + var _ms *C.struct_miqt_string = C.QInputDialog_GetItem9(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), items_ma, (C.int)(current), (C.bool)(editable), (*C.bool)(unsafe.Pointer(ok)), flags, inputMethodHints) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -825,7 +825,7 @@ func QInputDialog_GetInt9(parent *QWidget, title string, label string, value int defer C.free(title_ms) label_ms := miqt_strdupg(label) defer C.free(label_ms) - return (int)(C.QInputDialog_GetInt9(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (C.int)(value), (C.int)(minValue), (C.int)(maxValue), (C.int)(step), (*C.bool)(unsafe.Pointer(ok)), (C.int)(flags))) + return (int)(C.QInputDialog_GetInt9(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (C.int)(value), (C.int)(minValue), (C.int)(maxValue), (C.int)(step), (*C.bool)(unsafe.Pointer(ok)), flags)) } func QInputDialog_GetDouble4(parent *QWidget, title string, label string, value float64) float64 { @@ -873,7 +873,7 @@ func QInputDialog_GetDouble9(parent *QWidget, title string, label string, value defer C.free(title_ms) label_ms := miqt_strdupg(label) defer C.free(label_ms) - return (float64)(C.QInputDialog_GetDouble9(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (C.double)(value), (C.double)(minValue), (C.double)(maxValue), (C.int)(decimals), (*C.bool)(unsafe.Pointer(ok)), (C.int)(flags))) + return (float64)(C.QInputDialog_GetDouble9(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms), (C.double)(value), (C.double)(minValue), (C.double)(maxValue), (C.int)(decimals), (*C.bool)(unsafe.Pointer(ok)), flags)) } // Delete this object from C++ memory. diff --git a/qt/gen_qinputdialog.h b/qt/gen_qinputdialog.h index bab2e13..5b749c5 100644 --- a/qt/gen_qinputdialog.h +++ b/qt/gen_qinputdialog.h @@ -31,18 +31,18 @@ QInputDialog* QInputDialog_new3(QWidget* parent, int flags); QMetaObject* QInputDialog_MetaObject(const QInputDialog* self); struct miqt_string* QInputDialog_Tr(const char* s); struct miqt_string* QInputDialog_TrUtf8(const char* s); -void QInputDialog_SetInputMode(QInputDialog* self, uintptr_t mode); -uintptr_t QInputDialog_InputMode(const QInputDialog* self); +void QInputDialog_SetInputMode(QInputDialog* self, int mode); +int QInputDialog_InputMode(const QInputDialog* self); void QInputDialog_SetLabelText(QInputDialog* self, struct miqt_string* text); struct miqt_string* QInputDialog_LabelText(const QInputDialog* self); -void QInputDialog_SetOption(QInputDialog* self, uintptr_t option); -bool QInputDialog_TestOption(const QInputDialog* self, uintptr_t option); +void QInputDialog_SetOption(QInputDialog* self, int option); +bool QInputDialog_TestOption(const QInputDialog* self, int option); void QInputDialog_SetOptions(QInputDialog* self, int options); int QInputDialog_Options(const QInputDialog* self); void QInputDialog_SetTextValue(QInputDialog* self, struct miqt_string* text); struct miqt_string* QInputDialog_TextValue(const QInputDialog* self); -void QInputDialog_SetTextEchoMode(QInputDialog* self, uintptr_t mode); -uintptr_t QInputDialog_TextEchoMode(const QInputDialog* self); +void QInputDialog_SetTextEchoMode(QInputDialog* self, int mode); +int QInputDialog_TextEchoMode(const QInputDialog* self); void QInputDialog_SetComboBoxEditable(QInputDialog* self, bool editable); bool QInputDialog_IsComboBoxEditable(const QInputDialog* self); void QInputDialog_SetComboBoxItems(QInputDialog* self, struct miqt_array* /* of struct miqt_string* */ items); @@ -97,12 +97,12 @@ struct miqt_string* QInputDialog_Tr2(const char* s, const char* c); struct miqt_string* QInputDialog_Tr3(const char* s, const char* c, int n); struct miqt_string* QInputDialog_TrUtf82(const char* s, const char* c); struct miqt_string* QInputDialog_TrUtf83(const char* s, const char* c, int n); -void QInputDialog_SetOption2(QInputDialog* self, uintptr_t option, bool on); -struct miqt_string* QInputDialog_GetText4(QWidget* parent, struct miqt_string* title, struct miqt_string* label, uintptr_t echo); -struct miqt_string* QInputDialog_GetText5(QWidget* parent, struct miqt_string* title, struct miqt_string* label, uintptr_t echo, struct miqt_string* text); -struct miqt_string* QInputDialog_GetText6(QWidget* parent, struct miqt_string* title, struct miqt_string* label, uintptr_t echo, struct miqt_string* text, bool* ok); -struct miqt_string* QInputDialog_GetText7(QWidget* parent, struct miqt_string* title, struct miqt_string* label, uintptr_t echo, struct miqt_string* text, bool* ok, int flags); -struct miqt_string* QInputDialog_GetText8(QWidget* parent, struct miqt_string* title, struct miqt_string* label, uintptr_t echo, struct miqt_string* text, bool* ok, int flags, int inputMethodHints); +void QInputDialog_SetOption2(QInputDialog* self, int option, bool on); +struct miqt_string* QInputDialog_GetText4(QWidget* parent, struct miqt_string* title, struct miqt_string* label, int echo); +struct miqt_string* QInputDialog_GetText5(QWidget* parent, struct miqt_string* title, struct miqt_string* label, int echo, struct miqt_string* text); +struct miqt_string* QInputDialog_GetText6(QWidget* parent, struct miqt_string* title, struct miqt_string* label, int echo, struct miqt_string* text, bool* ok); +struct miqt_string* QInputDialog_GetText7(QWidget* parent, struct miqt_string* title, struct miqt_string* label, int echo, struct miqt_string* text, bool* ok, int flags); +struct miqt_string* QInputDialog_GetText8(QWidget* parent, struct miqt_string* title, struct miqt_string* label, int echo, struct miqt_string* text, bool* ok, int flags, int inputMethodHints); struct miqt_string* QInputDialog_GetMultiLineText4(QWidget* parent, struct miqt_string* title, struct miqt_string* label, struct miqt_string* text); struct miqt_string* QInputDialog_GetMultiLineText5(QWidget* parent, struct miqt_string* title, struct miqt_string* label, struct miqt_string* text, bool* ok); struct miqt_string* QInputDialog_GetMultiLineText6(QWidget* parent, struct miqt_string* title, struct miqt_string* label, struct miqt_string* text, bool* ok, int flags); diff --git a/qt/gen_qinputmethod.cpp b/qt/gen_qinputmethod.cpp index 29c72f3..2067d1f 100644 --- a/qt/gen_qinputmethod.cpp +++ b/qt/gen_qinputmethod.cpp @@ -77,12 +77,12 @@ QLocale* QInputMethod_Locale(const QInputMethod* self) { return new QLocale(self->locale()); } -uintptr_t QInputMethod_InputDirection(const QInputMethod* self) { +int QInputMethod_InputDirection(const QInputMethod* self) { Qt::LayoutDirection _ret = self->inputDirection(); - return static_cast(_ret); + return static_cast(_ret); } -QVariant* QInputMethod_QueryFocusObject(uintptr_t query, QVariant* argument) { +QVariant* QInputMethod_QueryFocusObject(int query, QVariant* argument) { return new QVariant(QInputMethod::queryFocusObject(static_cast(query), *argument)); } @@ -106,7 +106,7 @@ void QInputMethod_Commit(QInputMethod* self) { self->commit(); } -void QInputMethod_InvokeAction(QInputMethod* self, uintptr_t a, int cursorPosition) { +void QInputMethod_InvokeAction(QInputMethod* self, int a, int cursorPosition) { self->invokeAction(static_cast(a), static_cast(cursorPosition)); } @@ -180,14 +180,14 @@ void QInputMethod_connect_LocaleChanged(QInputMethod* self, void* slot) { }); } -void QInputMethod_InputDirectionChanged(QInputMethod* self, uintptr_t newDirection) { +void QInputMethod_InputDirectionChanged(QInputMethod* self, int newDirection) { self->inputDirectionChanged(static_cast(newDirection)); } void QInputMethod_connect_InputDirectionChanged(QInputMethod* self, void* slot) { QInputMethod::connect(self, static_cast(&QInputMethod::inputDirectionChanged), self, [=](Qt::LayoutDirection newDirection) { Qt::LayoutDirection newDirection_ret = newDirection; - uintptr_t sigval1 = static_cast(newDirection_ret); + int sigval1 = static_cast(newDirection_ret); miqt_exec_callback_QInputMethod_InputDirectionChanged(slot, sigval1); }); } diff --git a/qt/gen_qinputmethod.go b/qt/gen_qinputmethod.go index 34bae10..e3b2c98 100644 --- a/qt/gen_qinputmethod.go +++ b/qt/gen_qinputmethod.go @@ -139,7 +139,7 @@ func (this *QInputMethod) InputDirection() LayoutDirection { } func QInputMethod_QueryFocusObject(query InputMethodQuery, argument QVariant) *QVariant { - _ret := C.QInputMethod_QueryFocusObject((C.uintptr_t)(query), argument.cPointer()) + _ret := C.QInputMethod_QueryFocusObject((C.int)(query), argument.cPointer()) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -154,7 +154,7 @@ func (this *QInputMethod) Hide() { } func (this *QInputMethod) Update(queries int) { - C.QInputMethod_Update(this.h, (C.int)(queries)) + C.QInputMethod_Update(this.h, queries) } func (this *QInputMethod) Reset() { @@ -166,7 +166,7 @@ func (this *QInputMethod) Commit() { } func (this *QInputMethod) InvokeAction(a QInputMethod__Action, cursorPosition int) { - C.QInputMethod_InvokeAction(this.h, (C.uintptr_t)(a), (C.int)(cursorPosition)) + C.QInputMethod_InvokeAction(this.h, (C.int)(a), (C.int)(cursorPosition)) } func (this *QInputMethod) CursorRectangleChanged() { @@ -289,14 +289,14 @@ func miqt_exec_callback_QInputMethod_LocaleChanged(cb *C.void) { } func (this *QInputMethod) InputDirectionChanged(newDirection LayoutDirection) { - C.QInputMethod_InputDirectionChanged(this.h, (C.uintptr_t)(newDirection)) + C.QInputMethod_InputDirectionChanged(this.h, (C.int)(newDirection)) } func (this *QInputMethod) OnInputDirectionChanged(slot func(newDirection LayoutDirection)) { C.QInputMethod_connect_InputDirectionChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QInputMethod_InputDirectionChanged -func miqt_exec_callback_QInputMethod_InputDirectionChanged(cb *C.void, newDirection C.uintptr_t) { +func miqt_exec_callback_QInputMethod_InputDirectionChanged(cb *C.void, newDirection C.int) { gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(newDirection LayoutDirection)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt/gen_qinputmethod.h b/qt/gen_qinputmethod.h index 4943c94..2aa8ce4 100644 --- a/qt/gen_qinputmethod.h +++ b/qt/gen_qinputmethod.h @@ -44,14 +44,14 @@ bool QInputMethod_IsVisible(const QInputMethod* self); void QInputMethod_SetVisible(QInputMethod* self, bool visible); bool QInputMethod_IsAnimating(const QInputMethod* self); QLocale* QInputMethod_Locale(const QInputMethod* self); -uintptr_t QInputMethod_InputDirection(const QInputMethod* self); -QVariant* QInputMethod_QueryFocusObject(uintptr_t query, QVariant* argument); +int QInputMethod_InputDirection(const QInputMethod* self); +QVariant* QInputMethod_QueryFocusObject(int query, QVariant* argument); void QInputMethod_Show(QInputMethod* self); void QInputMethod_Hide(QInputMethod* self); void QInputMethod_Update(QInputMethod* self, int queries); void QInputMethod_Reset(QInputMethod* self); void QInputMethod_Commit(QInputMethod* self); -void QInputMethod_InvokeAction(QInputMethod* self, uintptr_t a, int cursorPosition); +void QInputMethod_InvokeAction(QInputMethod* self, int a, int cursorPosition); void QInputMethod_CursorRectangleChanged(QInputMethod* self); void QInputMethod_connect_CursorRectangleChanged(QInputMethod* self, void* slot); void QInputMethod_AnchorRectangleChanged(QInputMethod* self); @@ -66,7 +66,7 @@ void QInputMethod_AnimatingChanged(QInputMethod* self); void QInputMethod_connect_AnimatingChanged(QInputMethod* self, void* slot); void QInputMethod_LocaleChanged(QInputMethod* self); void QInputMethod_connect_LocaleChanged(QInputMethod* self, void* slot); -void QInputMethod_InputDirectionChanged(QInputMethod* self, uintptr_t newDirection); +void QInputMethod_InputDirectionChanged(QInputMethod* self, int newDirection); void QInputMethod_connect_InputDirectionChanged(QInputMethod* self, void* slot); struct miqt_string* QInputMethod_Tr2(const char* s, const char* c); struct miqt_string* QInputMethod_Tr3(const char* s, const char* c, int n); diff --git a/qt/gen_qiodevice.cpp b/qt/gen_qiodevice.cpp index 52d3d45..43737e5 100644 --- a/qt/gen_qiodevice.cpp +++ b/qt/gen_qiodevice.cpp @@ -88,11 +88,13 @@ void QIODevice_Close(QIODevice* self) { } long long QIODevice_Pos(const QIODevice* self) { - return self->pos(); + qint64 _ret = self->pos(); + return static_cast(_ret); } long long QIODevice_Size(const QIODevice* self) { - return self->size(); + qint64 _ret = self->size(); + return static_cast(_ret); } bool QIODevice_Seek(QIODevice* self, long long pos) { @@ -108,15 +110,18 @@ bool QIODevice_Reset(QIODevice* self) { } long long QIODevice_BytesAvailable(const QIODevice* self) { - return self->bytesAvailable(); + qint64 _ret = self->bytesAvailable(); + return static_cast(_ret); } long long QIODevice_BytesToWrite(const QIODevice* self) { - return self->bytesToWrite(); + qint64 _ret = self->bytesToWrite(); + return static_cast(_ret); } long long QIODevice_Read(QIODevice* self, char* data, long long maxlen) { - return self->read(data, static_cast(maxlen)); + qint64 _ret = self->read(data, static_cast(maxlen)); + return static_cast(_ret); } QByteArray* QIODevice_ReadWithMaxlen(QIODevice* self, long long maxlen) { @@ -128,7 +133,8 @@ QByteArray* QIODevice_ReadAll(QIODevice* self) { } long long QIODevice_ReadLine(QIODevice* self, char* data, long long maxlen) { - return self->readLine(data, static_cast(maxlen)); + qint64 _ret = self->readLine(data, static_cast(maxlen)); + return static_cast(_ret); } QByteArray* QIODevice_ReadLine2(QIODevice* self) { @@ -156,19 +162,23 @@ bool QIODevice_IsTransactionStarted(const QIODevice* self) { } long long QIODevice_Write(QIODevice* self, const char* data, long long lenVal) { - return self->write(data, static_cast(lenVal)); + qint64 _ret = self->write(data, static_cast(lenVal)); + return static_cast(_ret); } long long QIODevice_WriteWithData(QIODevice* self, const char* data) { - return self->write(data); + qint64 _ret = self->write(data); + return static_cast(_ret); } long long QIODevice_Write2(QIODevice* self, QByteArray* data) { - return self->write(*data); + qint64 _ret = self->write(*data); + return static_cast(_ret); } long long QIODevice_Peek(QIODevice* self, char* data, long long maxlen) { - return self->peek(data, static_cast(maxlen)); + qint64 _ret = self->peek(data, static_cast(maxlen)); + return static_cast(_ret); } QByteArray* QIODevice_PeekWithMaxlen(QIODevice* self, long long maxlen) { @@ -176,7 +186,8 @@ QByteArray* QIODevice_PeekWithMaxlen(QIODevice* self, long long maxlen) { } long long QIODevice_Skip(QIODevice* self, long long maxSize) { - return self->skip(static_cast(maxSize)); + qint64 _ret = self->skip(static_cast(maxSize)); + return static_cast(_ret); } bool QIODevice_WaitForReadyRead(QIODevice* self, int msecs) { @@ -233,7 +244,8 @@ void QIODevice_BytesWritten(QIODevice* self, long long bytes) { void QIODevice_connect_BytesWritten(QIODevice* self, void* slot) { QIODevice::connect(self, static_cast(&QIODevice::bytesWritten), self, [=](qint64 bytes) { - long long sigval1 = bytes; + qint64 bytes_ret = bytes; + long long sigval1 = static_cast(bytes_ret); miqt_exec_callback_QIODevice_BytesWritten(slot, sigval1); }); } @@ -245,7 +257,8 @@ void QIODevice_ChannelBytesWritten(QIODevice* self, int channel, long long bytes void QIODevice_connect_ChannelBytesWritten(QIODevice* self, void* slot) { QIODevice::connect(self, static_cast(&QIODevice::channelBytesWritten), self, [=](int channel, qint64 bytes) { int sigval1 = channel; - long long sigval2 = bytes; + qint64 bytes_ret = bytes; + long long sigval2 = static_cast(bytes_ret); miqt_exec_callback_QIODevice_ChannelBytesWritten(slot, sigval1, sigval2); }); } diff --git a/qt/gen_qiodevice.go b/qt/gen_qiodevice.go index 7373af1..26a9a45 100644 --- a/qt/gen_qiodevice.go +++ b/qt/gen_qiodevice.go @@ -127,7 +127,7 @@ func (this *QIODevice) SetCurrentWriteChannel(channel int) { } func (this *QIODevice) Open(mode int) bool { - return (bool)(C.QIODevice_Open(this.h, (C.int)(mode))) + return (bool)(C.QIODevice_Open(this.h, mode)) } func (this *QIODevice) Close() { diff --git a/qt/gen_qitemselectionmodel.go b/qt/gen_qitemselectionmodel.go index ae594b8..baf35ab 100644 --- a/qt/gen_qitemselectionmodel.go +++ b/qt/gen_qitemselectionmodel.go @@ -343,11 +343,11 @@ func (this *QItemSelectionModel) SetModel(model *QAbstractItemModel) { } func (this *QItemSelectionModel) SetCurrentIndex(index *QModelIndex, command int) { - C.QItemSelectionModel_SetCurrentIndex(this.h, index.cPointer(), (C.int)(command)) + C.QItemSelectionModel_SetCurrentIndex(this.h, index.cPointer(), command) } func (this *QItemSelectionModel) Select(index *QModelIndex, command int) { - C.QItemSelectionModel_Select(this.h, index.cPointer(), (C.int)(command)) + C.QItemSelectionModel_Select(this.h, index.cPointer(), command) } func (this *QItemSelectionModel) Clear() { diff --git a/qt/gen_qjsonarray.cpp b/qt/gen_qjsonarray.cpp index e15d153..14d8c1d 100644 --- a/qt/gen_qjsonarray.cpp +++ b/qt/gen_qjsonarray.cpp @@ -268,14 +268,38 @@ bool QJsonArray__iterator_OperatorGreaterOrEqualWithOther(const QJsonArray__iter return self->operator>=(*other); } -QJsonArray__iterator* QJsonArray__iterator_OperatorPlusPlus(QJsonArray__iterator* self, int param1) { +QJsonArray__iterator* QJsonArray__iterator_OperatorPlusPlus(QJsonArray__iterator* self) { + QJsonArray::iterator& _ret = self->operator++(); + // Cast returned reference into pointer + return &_ret; +} + +QJsonArray__iterator* QJsonArray__iterator_OperatorPlusPlusWithInt(QJsonArray__iterator* self, int param1) { return new QJsonArray::iterator(self->operator++(static_cast(param1))); } -QJsonArray__iterator* QJsonArray__iterator_OperatorMinusMinus(QJsonArray__iterator* self, int param1) { +QJsonArray__iterator* QJsonArray__iterator_OperatorMinusMinus(QJsonArray__iterator* self) { + QJsonArray::iterator& _ret = self->operator--(); + // Cast returned reference into pointer + return &_ret; +} + +QJsonArray__iterator* QJsonArray__iterator_OperatorMinusMinusWithInt(QJsonArray__iterator* self, int param1) { return new QJsonArray::iterator(self->operator--(static_cast(param1))); } +QJsonArray__iterator* QJsonArray__iterator_OperatorPlusAssign(QJsonArray__iterator* self, int j) { + QJsonArray::iterator& _ret = self->operator+=(static_cast(j)); + // Cast returned reference into pointer + return &_ret; +} + +QJsonArray__iterator* QJsonArray__iterator_OperatorMinusAssign(QJsonArray__iterator* self, int j) { + QJsonArray::iterator& _ret = self->operator-=(static_cast(j)); + // Cast returned reference into pointer + return &_ret; +} + QJsonArray__iterator* QJsonArray__iterator_OperatorPlus(const QJsonArray__iterator* self, int j) { return new QJsonArray::iterator(self->operator+(static_cast(j))); } @@ -344,14 +368,38 @@ bool QJsonArray__const_iterator_OperatorGreaterOrEqual(const QJsonArray__const_i return self->operator>=(*other); } -QJsonArray__const_iterator* QJsonArray__const_iterator_OperatorPlusPlus(QJsonArray__const_iterator* self, int param1) { +QJsonArray__const_iterator* QJsonArray__const_iterator_OperatorPlusPlus(QJsonArray__const_iterator* self) { + QJsonArray::const_iterator& _ret = self->operator++(); + // Cast returned reference into pointer + return &_ret; +} + +QJsonArray__const_iterator* QJsonArray__const_iterator_OperatorPlusPlusWithInt(QJsonArray__const_iterator* self, int param1) { return new QJsonArray::const_iterator(self->operator++(static_cast(param1))); } -QJsonArray__const_iterator* QJsonArray__const_iterator_OperatorMinusMinus(QJsonArray__const_iterator* self, int param1) { +QJsonArray__const_iterator* QJsonArray__const_iterator_OperatorMinusMinus(QJsonArray__const_iterator* self) { + QJsonArray::const_iterator& _ret = self->operator--(); + // Cast returned reference into pointer + return &_ret; +} + +QJsonArray__const_iterator* QJsonArray__const_iterator_OperatorMinusMinusWithInt(QJsonArray__const_iterator* self, int param1) { return new QJsonArray::const_iterator(self->operator--(static_cast(param1))); } +QJsonArray__const_iterator* QJsonArray__const_iterator_OperatorPlusAssign(QJsonArray__const_iterator* self, int j) { + QJsonArray::const_iterator& _ret = self->operator+=(static_cast(j)); + // Cast returned reference into pointer + return &_ret; +} + +QJsonArray__const_iterator* QJsonArray__const_iterator_OperatorMinusAssign(QJsonArray__const_iterator* self, int j) { + QJsonArray::const_iterator& _ret = self->operator-=(static_cast(j)); + // Cast returned reference into pointer + return &_ret; +} + QJsonArray__const_iterator* QJsonArray__const_iterator_OperatorPlus(const QJsonArray__const_iterator* self, int j) { return new QJsonArray::const_iterator(self->operator+(static_cast(j))); } diff --git a/qt/gen_qjsonarray.go b/qt/gen_qjsonarray.go index 436f973..b624ea7 100644 --- a/qt/gen_qjsonarray.go +++ b/qt/gen_qjsonarray.go @@ -394,20 +394,36 @@ func (this *QJsonArray__iterator) OperatorGreaterOrEqualWithOther(other *QJsonAr return (bool)(C.QJsonArray__iterator_OperatorGreaterOrEqualWithOther(this.h, other.cPointer())) } -func (this *QJsonArray__iterator) OperatorPlusPlus(param1 int) *QJsonArray__iterator { - _ret := C.QJsonArray__iterator_OperatorPlusPlus(this.h, (C.int)(param1)) +func (this *QJsonArray__iterator) OperatorPlusPlus() *QJsonArray__iterator { + return newQJsonArray__iterator_U(unsafe.Pointer(C.QJsonArray__iterator_OperatorPlusPlus(this.h))) +} + +func (this *QJsonArray__iterator) OperatorPlusPlusWithInt(param1 int) *QJsonArray__iterator { + _ret := C.QJsonArray__iterator_OperatorPlusPlusWithInt(this.h, (C.int)(param1)) _goptr := newQJsonArray__iterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QJsonArray__iterator) OperatorMinusMinus(param1 int) *QJsonArray__iterator { - _ret := C.QJsonArray__iterator_OperatorMinusMinus(this.h, (C.int)(param1)) +func (this *QJsonArray__iterator) OperatorMinusMinus() *QJsonArray__iterator { + return newQJsonArray__iterator_U(unsafe.Pointer(C.QJsonArray__iterator_OperatorMinusMinus(this.h))) +} + +func (this *QJsonArray__iterator) OperatorMinusMinusWithInt(param1 int) *QJsonArray__iterator { + _ret := C.QJsonArray__iterator_OperatorMinusMinusWithInt(this.h, (C.int)(param1)) _goptr := newQJsonArray__iterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } +func (this *QJsonArray__iterator) OperatorPlusAssign(j int) *QJsonArray__iterator { + return newQJsonArray__iterator_U(unsafe.Pointer(C.QJsonArray__iterator_OperatorPlusAssign(this.h, (C.int)(j)))) +} + +func (this *QJsonArray__iterator) OperatorMinusAssign(j int) *QJsonArray__iterator { + return newQJsonArray__iterator_U(unsafe.Pointer(C.QJsonArray__iterator_OperatorMinusAssign(this.h, (C.int)(j)))) +} + func (this *QJsonArray__iterator) OperatorPlus(j int) *QJsonArray__iterator { _ret := C.QJsonArray__iterator_OperatorPlus(this.h, (C.int)(j)) _goptr := newQJsonArray__iterator(_ret) @@ -531,20 +547,36 @@ func (this *QJsonArray__const_iterator) OperatorGreaterOrEqual(other *QJsonArray return (bool)(C.QJsonArray__const_iterator_OperatorGreaterOrEqual(this.h, other.cPointer())) } -func (this *QJsonArray__const_iterator) OperatorPlusPlus(param1 int) *QJsonArray__const_iterator { - _ret := C.QJsonArray__const_iterator_OperatorPlusPlus(this.h, (C.int)(param1)) +func (this *QJsonArray__const_iterator) OperatorPlusPlus() *QJsonArray__const_iterator { + return newQJsonArray__const_iterator_U(unsafe.Pointer(C.QJsonArray__const_iterator_OperatorPlusPlus(this.h))) +} + +func (this *QJsonArray__const_iterator) OperatorPlusPlusWithInt(param1 int) *QJsonArray__const_iterator { + _ret := C.QJsonArray__const_iterator_OperatorPlusPlusWithInt(this.h, (C.int)(param1)) _goptr := newQJsonArray__const_iterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QJsonArray__const_iterator) OperatorMinusMinus(param1 int) *QJsonArray__const_iterator { - _ret := C.QJsonArray__const_iterator_OperatorMinusMinus(this.h, (C.int)(param1)) +func (this *QJsonArray__const_iterator) OperatorMinusMinus() *QJsonArray__const_iterator { + return newQJsonArray__const_iterator_U(unsafe.Pointer(C.QJsonArray__const_iterator_OperatorMinusMinus(this.h))) +} + +func (this *QJsonArray__const_iterator) OperatorMinusMinusWithInt(param1 int) *QJsonArray__const_iterator { + _ret := C.QJsonArray__const_iterator_OperatorMinusMinusWithInt(this.h, (C.int)(param1)) _goptr := newQJsonArray__const_iterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } +func (this *QJsonArray__const_iterator) OperatorPlusAssign(j int) *QJsonArray__const_iterator { + return newQJsonArray__const_iterator_U(unsafe.Pointer(C.QJsonArray__const_iterator_OperatorPlusAssign(this.h, (C.int)(j)))) +} + +func (this *QJsonArray__const_iterator) OperatorMinusAssign(j int) *QJsonArray__const_iterator { + return newQJsonArray__const_iterator_U(unsafe.Pointer(C.QJsonArray__const_iterator_OperatorMinusAssign(this.h, (C.int)(j)))) +} + func (this *QJsonArray__const_iterator) OperatorPlus(j int) *QJsonArray__const_iterator { _ret := C.QJsonArray__const_iterator_OperatorPlus(this.h, (C.int)(j)) _goptr := newQJsonArray__const_iterator(_ret) diff --git a/qt/gen_qjsonarray.h b/qt/gen_qjsonarray.h index 9aed26d..b205336 100644 --- a/qt/gen_qjsonarray.h +++ b/qt/gen_qjsonarray.h @@ -101,8 +101,12 @@ bool QJsonArray__iterator_OperatorLesserWithOther(const QJsonArray__iterator* se bool QJsonArray__iterator_OperatorLesserOrEqualWithOther(const QJsonArray__iterator* self, QJsonArray__const_iterator* other); bool QJsonArray__iterator_OperatorGreaterWithOther(const QJsonArray__iterator* self, QJsonArray__const_iterator* other); bool QJsonArray__iterator_OperatorGreaterOrEqualWithOther(const QJsonArray__iterator* self, QJsonArray__const_iterator* other); -QJsonArray__iterator* QJsonArray__iterator_OperatorPlusPlus(QJsonArray__iterator* self, int param1); -QJsonArray__iterator* QJsonArray__iterator_OperatorMinusMinus(QJsonArray__iterator* self, int param1); +QJsonArray__iterator* QJsonArray__iterator_OperatorPlusPlus(QJsonArray__iterator* self); +QJsonArray__iterator* QJsonArray__iterator_OperatorPlusPlusWithInt(QJsonArray__iterator* self, int param1); +QJsonArray__iterator* QJsonArray__iterator_OperatorMinusMinus(QJsonArray__iterator* self); +QJsonArray__iterator* QJsonArray__iterator_OperatorMinusMinusWithInt(QJsonArray__iterator* self, int param1); +QJsonArray__iterator* QJsonArray__iterator_OperatorPlusAssign(QJsonArray__iterator* self, int j); +QJsonArray__iterator* QJsonArray__iterator_OperatorMinusAssign(QJsonArray__iterator* self, int j); QJsonArray__iterator* QJsonArray__iterator_OperatorPlus(const QJsonArray__iterator* self, int j); QJsonArray__iterator* QJsonArray__iterator_OperatorMinus(const QJsonArray__iterator* self, int j); int QJsonArray__iterator_OperatorMinusWithQJsonArrayiterator(const QJsonArray__iterator* self, QJsonArray__iterator* j); @@ -121,8 +125,12 @@ bool QJsonArray__const_iterator_OperatorLesser(const QJsonArray__const_iterator* bool QJsonArray__const_iterator_OperatorLesserOrEqual(const QJsonArray__const_iterator* self, QJsonArray__const_iterator* other); bool QJsonArray__const_iterator_OperatorGreater(const QJsonArray__const_iterator* self, QJsonArray__const_iterator* other); bool QJsonArray__const_iterator_OperatorGreaterOrEqual(const QJsonArray__const_iterator* self, QJsonArray__const_iterator* other); -QJsonArray__const_iterator* QJsonArray__const_iterator_OperatorPlusPlus(QJsonArray__const_iterator* self, int param1); -QJsonArray__const_iterator* QJsonArray__const_iterator_OperatorMinusMinus(QJsonArray__const_iterator* self, int param1); +QJsonArray__const_iterator* QJsonArray__const_iterator_OperatorPlusPlus(QJsonArray__const_iterator* self); +QJsonArray__const_iterator* QJsonArray__const_iterator_OperatorPlusPlusWithInt(QJsonArray__const_iterator* self, int param1); +QJsonArray__const_iterator* QJsonArray__const_iterator_OperatorMinusMinus(QJsonArray__const_iterator* self); +QJsonArray__const_iterator* QJsonArray__const_iterator_OperatorMinusMinusWithInt(QJsonArray__const_iterator* self, int param1); +QJsonArray__const_iterator* QJsonArray__const_iterator_OperatorPlusAssign(QJsonArray__const_iterator* self, int j); +QJsonArray__const_iterator* QJsonArray__const_iterator_OperatorMinusAssign(QJsonArray__const_iterator* self, int j); QJsonArray__const_iterator* QJsonArray__const_iterator_OperatorPlus(const QJsonArray__const_iterator* self, int j); QJsonArray__const_iterator* QJsonArray__const_iterator_OperatorMinus(const QJsonArray__const_iterator* self, int j); int QJsonArray__const_iterator_OperatorMinusWithQJsonArrayconstIterator(const QJsonArray__const_iterator* self, QJsonArray__const_iterator* j); diff --git a/qt/gen_qjsondocument.cpp b/qt/gen_qjsondocument.cpp index 0449e48..ee390d3 100644 --- a/qt/gen_qjsondocument.cpp +++ b/qt/gen_qjsondocument.cpp @@ -79,7 +79,7 @@ QByteArray* QJsonDocument_ToJson(const QJsonDocument* self) { return new QByteArray(self->toJson()); } -QByteArray* QJsonDocument_ToJsonWithFormat(const QJsonDocument* self, uintptr_t format) { +QByteArray* QJsonDocument_ToJsonWithFormat(const QJsonDocument* self, int format) { return new QByteArray(self->toJson(static_cast(format))); } @@ -132,11 +132,11 @@ bool QJsonDocument_IsNull(const QJsonDocument* self) { return self->isNull(); } -QJsonDocument* QJsonDocument_FromRawData3(const char* data, int size, uintptr_t validation) { +QJsonDocument* QJsonDocument_FromRawData3(const char* data, int size, int validation) { return new QJsonDocument(QJsonDocument::fromRawData(data, static_cast(size), static_cast(validation))); } -QJsonDocument* QJsonDocument_FromBinaryData2(QByteArray* data, uintptr_t validation) { +QJsonDocument* QJsonDocument_FromBinaryData2(QByteArray* data, int validation) { return new QJsonDocument(QJsonDocument::fromBinaryData(*data, static_cast(validation))); } diff --git a/qt/gen_qjsondocument.go b/qt/gen_qjsondocument.go index 4749a42..15f3823 100644 --- a/qt/gen_qjsondocument.go +++ b/qt/gen_qjsondocument.go @@ -201,7 +201,7 @@ func (this *QJsonDocument) ToJson() *QByteArray { } func (this *QJsonDocument) ToJsonWithFormat(format QJsonDocument__JsonFormat) *QByteArray { - _ret := C.QJsonDocument_ToJsonWithFormat(this.h, (C.uintptr_t)(format)) + _ret := C.QJsonDocument_ToJsonWithFormat(this.h, (C.int)(format)) _goptr := newQByteArray(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -272,14 +272,14 @@ func (this *QJsonDocument) IsNull() bool { func QJsonDocument_FromRawData3(data string, size int, validation QJsonDocument__DataValidation) *QJsonDocument { data_Cstring := C.CString(data) defer C.free(unsafe.Pointer(data_Cstring)) - _ret := C.QJsonDocument_FromRawData3(data_Cstring, (C.int)(size), (C.uintptr_t)(validation)) + _ret := C.QJsonDocument_FromRawData3(data_Cstring, (C.int)(size), (C.int)(validation)) _goptr := newQJsonDocument(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QJsonDocument_FromBinaryData2(data *QByteArray, validation QJsonDocument__DataValidation) *QJsonDocument { - _ret := C.QJsonDocument_FromBinaryData2(data.cPointer(), (C.uintptr_t)(validation)) + _ret := C.QJsonDocument_FromBinaryData2(data.cPointer(), (C.int)(validation)) _goptr := newQJsonDocument(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qjsondocument.h b/qt/gen_qjsondocument.h index 1b1ba5f..354c9d9 100644 --- a/qt/gen_qjsondocument.h +++ b/qt/gen_qjsondocument.h @@ -48,7 +48,7 @@ QJsonDocument* QJsonDocument_FromVariant(QVariant* variant); QVariant* QJsonDocument_ToVariant(const QJsonDocument* self); QJsonDocument* QJsonDocument_FromJson(QByteArray* json); QByteArray* QJsonDocument_ToJson(const QJsonDocument* self); -QByteArray* QJsonDocument_ToJsonWithFormat(const QJsonDocument* self, uintptr_t format); +QByteArray* QJsonDocument_ToJsonWithFormat(const QJsonDocument* self, int format); bool QJsonDocument_IsEmpty(const QJsonDocument* self); bool QJsonDocument_IsArray(const QJsonDocument* self); bool QJsonDocument_IsObject(const QJsonDocument* self); @@ -61,8 +61,8 @@ QJsonValue* QJsonDocument_OperatorSubscriptWithInt(const QJsonDocument* self, in bool QJsonDocument_OperatorEqual(const QJsonDocument* self, QJsonDocument* other); bool QJsonDocument_OperatorNotEqual(const QJsonDocument* self, QJsonDocument* other); bool QJsonDocument_IsNull(const QJsonDocument* self); -QJsonDocument* QJsonDocument_FromRawData3(const char* data, int size, uintptr_t validation); -QJsonDocument* QJsonDocument_FromBinaryData2(QByteArray* data, uintptr_t validation); +QJsonDocument* QJsonDocument_FromRawData3(const char* data, int size, int validation); +QJsonDocument* QJsonDocument_FromBinaryData2(QByteArray* data, int validation); QJsonDocument* QJsonDocument_FromJson2(QByteArray* json, QJsonParseError* error); void QJsonDocument_Delete(QJsonDocument* self); diff --git a/qt/gen_qjsonobject.cpp b/qt/gen_qjsonobject.cpp index a9483a8..c372dbf 100644 --- a/qt/gen_qjsonobject.cpp +++ b/qt/gen_qjsonobject.cpp @@ -214,11 +214,23 @@ bool QJsonObject__iterator_OperatorGreaterOrEqual(const QJsonObject__iterator* s return self->operator>=(*other); } -QJsonObject__iterator* QJsonObject__iterator_OperatorPlusPlus(QJsonObject__iterator* self, int param1) { +QJsonObject__iterator* QJsonObject__iterator_OperatorPlusPlus(QJsonObject__iterator* self) { + QJsonObject::iterator& _ret = self->operator++(); + // Cast returned reference into pointer + return &_ret; +} + +QJsonObject__iterator* QJsonObject__iterator_OperatorPlusPlusWithInt(QJsonObject__iterator* self, int param1) { return new QJsonObject::iterator(self->operator++(static_cast(param1))); } -QJsonObject__iterator* QJsonObject__iterator_OperatorMinusMinus(QJsonObject__iterator* self, int param1) { +QJsonObject__iterator* QJsonObject__iterator_OperatorMinusMinus(QJsonObject__iterator* self) { + QJsonObject::iterator& _ret = self->operator--(); + // Cast returned reference into pointer + return &_ret; +} + +QJsonObject__iterator* QJsonObject__iterator_OperatorMinusMinusWithInt(QJsonObject__iterator* self, int param1) { return new QJsonObject::iterator(self->operator--(static_cast(param1))); } @@ -230,6 +242,18 @@ QJsonObject__iterator* QJsonObject__iterator_OperatorMinus(const QJsonObject__it return new QJsonObject::iterator(self->operator-(static_cast(j))); } +QJsonObject__iterator* QJsonObject__iterator_OperatorPlusAssign(QJsonObject__iterator* self, int j) { + QJsonObject::iterator& _ret = self->operator+=(static_cast(j)); + // Cast returned reference into pointer + return &_ret; +} + +QJsonObject__iterator* QJsonObject__iterator_OperatorMinusAssign(QJsonObject__iterator* self, int j) { + QJsonObject::iterator& _ret = self->operator-=(static_cast(j)); + // Cast returned reference into pointer + return &_ret; +} + int QJsonObject__iterator_OperatorMinusWithQJsonObjectiterator(const QJsonObject__iterator* self, QJsonObject__iterator* j) { return self->operator-(*j); } @@ -325,11 +349,23 @@ bool QJsonObject__const_iterator_OperatorGreaterOrEqual(const QJsonObject__const return self->operator>=(*other); } -QJsonObject__const_iterator* QJsonObject__const_iterator_OperatorPlusPlus(QJsonObject__const_iterator* self, int param1) { +QJsonObject__const_iterator* QJsonObject__const_iterator_OperatorPlusPlus(QJsonObject__const_iterator* self) { + QJsonObject::const_iterator& _ret = self->operator++(); + // Cast returned reference into pointer + return &_ret; +} + +QJsonObject__const_iterator* QJsonObject__const_iterator_OperatorPlusPlusWithInt(QJsonObject__const_iterator* self, int param1) { return new QJsonObject::const_iterator(self->operator++(static_cast(param1))); } -QJsonObject__const_iterator* QJsonObject__const_iterator_OperatorMinusMinus(QJsonObject__const_iterator* self, int param1) { +QJsonObject__const_iterator* QJsonObject__const_iterator_OperatorMinusMinus(QJsonObject__const_iterator* self) { + QJsonObject::const_iterator& _ret = self->operator--(); + // Cast returned reference into pointer + return &_ret; +} + +QJsonObject__const_iterator* QJsonObject__const_iterator_OperatorMinusMinusWithInt(QJsonObject__const_iterator* self, int param1) { return new QJsonObject::const_iterator(self->operator--(static_cast(param1))); } @@ -341,6 +377,18 @@ QJsonObject__const_iterator* QJsonObject__const_iterator_OperatorMinus(const QJs return new QJsonObject::const_iterator(self->operator-(static_cast(j))); } +QJsonObject__const_iterator* QJsonObject__const_iterator_OperatorPlusAssign(QJsonObject__const_iterator* self, int j) { + QJsonObject::const_iterator& _ret = self->operator+=(static_cast(j)); + // Cast returned reference into pointer + return &_ret; +} + +QJsonObject__const_iterator* QJsonObject__const_iterator_OperatorMinusAssign(QJsonObject__const_iterator* self, int j) { + QJsonObject::const_iterator& _ret = self->operator-=(static_cast(j)); + // Cast returned reference into pointer + return &_ret; +} + int QJsonObject__const_iterator_OperatorMinusWithQJsonObjectconstIterator(const QJsonObject__const_iterator* self, QJsonObject__const_iterator* j) { return self->operator-(*j); } diff --git a/qt/gen_qjsonobject.go b/qt/gen_qjsonobject.go index 978a00c..32b0ff1 100644 --- a/qt/gen_qjsonobject.go +++ b/qt/gen_qjsonobject.go @@ -343,15 +343,23 @@ func (this *QJsonObject__iterator) OperatorGreaterOrEqual(other *QJsonObject__it return (bool)(C.QJsonObject__iterator_OperatorGreaterOrEqual(this.h, other.cPointer())) } -func (this *QJsonObject__iterator) OperatorPlusPlus(param1 int) *QJsonObject__iterator { - _ret := C.QJsonObject__iterator_OperatorPlusPlus(this.h, (C.int)(param1)) +func (this *QJsonObject__iterator) OperatorPlusPlus() *QJsonObject__iterator { + return newQJsonObject__iterator_U(unsafe.Pointer(C.QJsonObject__iterator_OperatorPlusPlus(this.h))) +} + +func (this *QJsonObject__iterator) OperatorPlusPlusWithInt(param1 int) *QJsonObject__iterator { + _ret := C.QJsonObject__iterator_OperatorPlusPlusWithInt(this.h, (C.int)(param1)) _goptr := newQJsonObject__iterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QJsonObject__iterator) OperatorMinusMinus(param1 int) *QJsonObject__iterator { - _ret := C.QJsonObject__iterator_OperatorMinusMinus(this.h, (C.int)(param1)) +func (this *QJsonObject__iterator) OperatorMinusMinus() *QJsonObject__iterator { + return newQJsonObject__iterator_U(unsafe.Pointer(C.QJsonObject__iterator_OperatorMinusMinus(this.h))) +} + +func (this *QJsonObject__iterator) OperatorMinusMinusWithInt(param1 int) *QJsonObject__iterator { + _ret := C.QJsonObject__iterator_OperatorMinusMinusWithInt(this.h, (C.int)(param1)) _goptr := newQJsonObject__iterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -371,6 +379,14 @@ func (this *QJsonObject__iterator) OperatorMinus(j int) *QJsonObject__iterator { return _goptr } +func (this *QJsonObject__iterator) OperatorPlusAssign(j int) *QJsonObject__iterator { + return newQJsonObject__iterator_U(unsafe.Pointer(C.QJsonObject__iterator_OperatorPlusAssign(this.h, (C.int)(j)))) +} + +func (this *QJsonObject__iterator) OperatorMinusAssign(j int) *QJsonObject__iterator { + return newQJsonObject__iterator_U(unsafe.Pointer(C.QJsonObject__iterator_OperatorMinusAssign(this.h, (C.int)(j)))) +} + func (this *QJsonObject__iterator) OperatorMinusWithQJsonObjectiterator(j QJsonObject__iterator) int { return (int)(C.QJsonObject__iterator_OperatorMinusWithQJsonObjectiterator(this.h, j.cPointer())) } @@ -518,15 +534,23 @@ func (this *QJsonObject__const_iterator) OperatorGreaterOrEqual(other *QJsonObje return (bool)(C.QJsonObject__const_iterator_OperatorGreaterOrEqual(this.h, other.cPointer())) } -func (this *QJsonObject__const_iterator) OperatorPlusPlus(param1 int) *QJsonObject__const_iterator { - _ret := C.QJsonObject__const_iterator_OperatorPlusPlus(this.h, (C.int)(param1)) +func (this *QJsonObject__const_iterator) OperatorPlusPlus() *QJsonObject__const_iterator { + return newQJsonObject__const_iterator_U(unsafe.Pointer(C.QJsonObject__const_iterator_OperatorPlusPlus(this.h))) +} + +func (this *QJsonObject__const_iterator) OperatorPlusPlusWithInt(param1 int) *QJsonObject__const_iterator { + _ret := C.QJsonObject__const_iterator_OperatorPlusPlusWithInt(this.h, (C.int)(param1)) _goptr := newQJsonObject__const_iterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QJsonObject__const_iterator) OperatorMinusMinus(param1 int) *QJsonObject__const_iterator { - _ret := C.QJsonObject__const_iterator_OperatorMinusMinus(this.h, (C.int)(param1)) +func (this *QJsonObject__const_iterator) OperatorMinusMinus() *QJsonObject__const_iterator { + return newQJsonObject__const_iterator_U(unsafe.Pointer(C.QJsonObject__const_iterator_OperatorMinusMinus(this.h))) +} + +func (this *QJsonObject__const_iterator) OperatorMinusMinusWithInt(param1 int) *QJsonObject__const_iterator { + _ret := C.QJsonObject__const_iterator_OperatorMinusMinusWithInt(this.h, (C.int)(param1)) _goptr := newQJsonObject__const_iterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -546,6 +570,14 @@ func (this *QJsonObject__const_iterator) OperatorMinus(j int) *QJsonObject__cons return _goptr } +func (this *QJsonObject__const_iterator) OperatorPlusAssign(j int) *QJsonObject__const_iterator { + return newQJsonObject__const_iterator_U(unsafe.Pointer(C.QJsonObject__const_iterator_OperatorPlusAssign(this.h, (C.int)(j)))) +} + +func (this *QJsonObject__const_iterator) OperatorMinusAssign(j int) *QJsonObject__const_iterator { + return newQJsonObject__const_iterator_U(unsafe.Pointer(C.QJsonObject__const_iterator_OperatorMinusAssign(this.h, (C.int)(j)))) +} + func (this *QJsonObject__const_iterator) OperatorMinusWithQJsonObjectconstIterator(j QJsonObject__const_iterator) int { return (int)(C.QJsonObject__const_iterator_OperatorMinusWithQJsonObjectconstIterator(this.h, j.cPointer())) } diff --git a/qt/gen_qjsonobject.h b/qt/gen_qjsonobject.h index 997913b..a910a15 100644 --- a/qt/gen_qjsonobject.h +++ b/qt/gen_qjsonobject.h @@ -84,10 +84,14 @@ bool QJsonObject__iterator_OperatorLesser(const QJsonObject__iterator* self, QJs bool QJsonObject__iterator_OperatorLesserOrEqual(const QJsonObject__iterator* self, QJsonObject__iterator* other); bool QJsonObject__iterator_OperatorGreater(const QJsonObject__iterator* self, QJsonObject__iterator* other); bool QJsonObject__iterator_OperatorGreaterOrEqual(const QJsonObject__iterator* self, QJsonObject__iterator* other); -QJsonObject__iterator* QJsonObject__iterator_OperatorPlusPlus(QJsonObject__iterator* self, int param1); -QJsonObject__iterator* QJsonObject__iterator_OperatorMinusMinus(QJsonObject__iterator* self, int param1); +QJsonObject__iterator* QJsonObject__iterator_OperatorPlusPlus(QJsonObject__iterator* self); +QJsonObject__iterator* QJsonObject__iterator_OperatorPlusPlusWithInt(QJsonObject__iterator* self, int param1); +QJsonObject__iterator* QJsonObject__iterator_OperatorMinusMinus(QJsonObject__iterator* self); +QJsonObject__iterator* QJsonObject__iterator_OperatorMinusMinusWithInt(QJsonObject__iterator* self, int param1); QJsonObject__iterator* QJsonObject__iterator_OperatorPlus(const QJsonObject__iterator* self, int j); QJsonObject__iterator* QJsonObject__iterator_OperatorMinus(const QJsonObject__iterator* self, int j); +QJsonObject__iterator* QJsonObject__iterator_OperatorPlusAssign(QJsonObject__iterator* self, int j); +QJsonObject__iterator* QJsonObject__iterator_OperatorMinusAssign(QJsonObject__iterator* self, int j); int QJsonObject__iterator_OperatorMinusWithQJsonObjectiterator(const QJsonObject__iterator* self, QJsonObject__iterator* j); bool QJsonObject__iterator_OperatorEqualWithOther(const QJsonObject__iterator* self, QJsonObject__const_iterator* other); bool QJsonObject__iterator_OperatorNotEqualWithOther(const QJsonObject__iterator* self, QJsonObject__const_iterator* other); @@ -112,10 +116,14 @@ bool QJsonObject__const_iterator_OperatorLesser(const QJsonObject__const_iterato bool QJsonObject__const_iterator_OperatorLesserOrEqual(const QJsonObject__const_iterator* self, QJsonObject__const_iterator* other); bool QJsonObject__const_iterator_OperatorGreater(const QJsonObject__const_iterator* self, QJsonObject__const_iterator* other); bool QJsonObject__const_iterator_OperatorGreaterOrEqual(const QJsonObject__const_iterator* self, QJsonObject__const_iterator* other); -QJsonObject__const_iterator* QJsonObject__const_iterator_OperatorPlusPlus(QJsonObject__const_iterator* self, int param1); -QJsonObject__const_iterator* QJsonObject__const_iterator_OperatorMinusMinus(QJsonObject__const_iterator* self, int param1); +QJsonObject__const_iterator* QJsonObject__const_iterator_OperatorPlusPlus(QJsonObject__const_iterator* self); +QJsonObject__const_iterator* QJsonObject__const_iterator_OperatorPlusPlusWithInt(QJsonObject__const_iterator* self, int param1); +QJsonObject__const_iterator* QJsonObject__const_iterator_OperatorMinusMinus(QJsonObject__const_iterator* self); +QJsonObject__const_iterator* QJsonObject__const_iterator_OperatorMinusMinusWithInt(QJsonObject__const_iterator* self, int param1); QJsonObject__const_iterator* QJsonObject__const_iterator_OperatorPlus(const QJsonObject__const_iterator* self, int j); QJsonObject__const_iterator* QJsonObject__const_iterator_OperatorMinus(const QJsonObject__const_iterator* self, int j); +QJsonObject__const_iterator* QJsonObject__const_iterator_OperatorPlusAssign(QJsonObject__const_iterator* self, int j); +QJsonObject__const_iterator* QJsonObject__const_iterator_OperatorMinusAssign(QJsonObject__const_iterator* self, int j); int QJsonObject__const_iterator_OperatorMinusWithQJsonObjectconstIterator(const QJsonObject__const_iterator* self, QJsonObject__const_iterator* j); bool QJsonObject__const_iterator_OperatorEqualWithOther(const QJsonObject__const_iterator* self, QJsonObject__iterator* other); bool QJsonObject__const_iterator_OperatorNotEqualWithOther(const QJsonObject__const_iterator* self, QJsonObject__iterator* other); diff --git a/qt/gen_qjsonvalue.cpp b/qt/gen_qjsonvalue.cpp index e503de4..761cbf9 100644 --- a/qt/gen_qjsonvalue.cpp +++ b/qt/gen_qjsonvalue.cpp @@ -53,7 +53,7 @@ QJsonValue* QJsonValue_new10(QJsonValue* other) { return new QJsonValue(*other); } -QJsonValue* QJsonValue_new11(uintptr_t param1) { +QJsonValue* QJsonValue_new11(int param1) { return new QJsonValue(static_cast(param1)); } @@ -73,9 +73,9 @@ QVariant* QJsonValue_ToVariant(const QJsonValue* self) { return new QVariant(self->toVariant()); } -uintptr_t QJsonValue_Type(const QJsonValue* self) { +int QJsonValue_Type(const QJsonValue* self) { QJsonValue::Type _ret = self->type(); - return static_cast(_ret); + return static_cast(_ret); } bool QJsonValue_IsNull(const QJsonValue* self) { @@ -206,9 +206,9 @@ QVariant* QJsonValueRef_ToVariant(const QJsonValueRef* self) { return new QVariant(self->toVariant()); } -uintptr_t QJsonValueRef_Type(const QJsonValueRef* self) { +int QJsonValueRef_Type(const QJsonValueRef* self) { QJsonValue::Type _ret = self->type(); - return static_cast(_ret); + return static_cast(_ret); } bool QJsonValueRef_IsNull(const QJsonValueRef* self) { diff --git a/qt/gen_qjsonvalue.go b/qt/gen_qjsonvalue.go index 48d00b6..475221e 100644 --- a/qt/gen_qjsonvalue.go +++ b/qt/gen_qjsonvalue.go @@ -113,7 +113,7 @@ func NewQJsonValue10(other *QJsonValue) *QJsonValue { // NewQJsonValue11 constructs a new QJsonValue object. func NewQJsonValue11(param1 QJsonValue__Type) *QJsonValue { - ret := C.QJsonValue_new11((C.uintptr_t)(param1)) + ret := C.QJsonValue_new11((C.int)(param1)) return newQJsonValue(ret) } diff --git a/qt/gen_qjsonvalue.h b/qt/gen_qjsonvalue.h index 24c0c8e..43960be 100644 --- a/qt/gen_qjsonvalue.h +++ b/qt/gen_qjsonvalue.h @@ -41,12 +41,12 @@ QJsonValue* QJsonValue_new7(const char* s); QJsonValue* QJsonValue_new8(QJsonArray* a); QJsonValue* QJsonValue_new9(QJsonObject* o); QJsonValue* QJsonValue_new10(QJsonValue* other); -QJsonValue* QJsonValue_new11(uintptr_t param1); +QJsonValue* QJsonValue_new11(int param1); void QJsonValue_OperatorAssign(QJsonValue* self, QJsonValue* other); void QJsonValue_Swap(QJsonValue* self, QJsonValue* other); QJsonValue* QJsonValue_FromVariant(QVariant* variant); QVariant* QJsonValue_ToVariant(const QJsonValue* self); -uintptr_t QJsonValue_Type(const QJsonValue* self); +int QJsonValue_Type(const QJsonValue* self); bool QJsonValue_IsNull(const QJsonValue* self); bool QJsonValue_IsBool(const QJsonValue* self); bool QJsonValue_IsDouble(const QJsonValue* self); @@ -78,7 +78,7 @@ QJsonValueRef* QJsonValueRef_new3(QJsonObject* object, int idx); void QJsonValueRef_OperatorAssign(QJsonValueRef* self, QJsonValue* val); void QJsonValueRef_OperatorAssignWithVal(QJsonValueRef* self, QJsonValueRef* val); QVariant* QJsonValueRef_ToVariant(const QJsonValueRef* self); -uintptr_t QJsonValueRef_Type(const QJsonValueRef* self); +int QJsonValueRef_Type(const QJsonValueRef* self); bool QJsonValueRef_IsNull(const QJsonValueRef* self); bool QJsonValueRef_IsBool(const QJsonValueRef* self); bool QJsonValueRef_IsDouble(const QJsonValueRef* self); diff --git a/qt/gen_qkeyeventtransition.cpp b/qt/gen_qkeyeventtransition.cpp index 9693b00..c14b2b8 100644 --- a/qt/gen_qkeyeventtransition.cpp +++ b/qt/gen_qkeyeventtransition.cpp @@ -13,7 +13,7 @@ QKeyEventTransition* QKeyEventTransition_new() { return new QKeyEventTransition(); } -QKeyEventTransition* QKeyEventTransition_new2(QObject* object, uintptr_t typeVal, int key) { +QKeyEventTransition* QKeyEventTransition_new2(QObject* object, int typeVal, int key) { return new QKeyEventTransition(object, static_cast(typeVal), static_cast(key)); } @@ -21,7 +21,7 @@ QKeyEventTransition* QKeyEventTransition_new3(QState* sourceState) { return new QKeyEventTransition(sourceState); } -QKeyEventTransition* QKeyEventTransition_new4(QObject* object, uintptr_t typeVal, int key, QState* sourceState) { +QKeyEventTransition* QKeyEventTransition_new4(QObject* object, int typeVal, int key, QState* sourceState) { return new QKeyEventTransition(object, static_cast(typeVal), static_cast(key), sourceState); } diff --git a/qt/gen_qkeyeventtransition.go b/qt/gen_qkeyeventtransition.go index ee6de4d..3b4d693 100644 --- a/qt/gen_qkeyeventtransition.go +++ b/qt/gen_qkeyeventtransition.go @@ -44,7 +44,7 @@ func NewQKeyEventTransition() *QKeyEventTransition { // NewQKeyEventTransition2 constructs a new QKeyEventTransition object. func NewQKeyEventTransition2(object *QObject, typeVal QEvent__Type, key int) *QKeyEventTransition { - ret := C.QKeyEventTransition_new2(object.cPointer(), (C.uintptr_t)(typeVal), (C.int)(key)) + ret := C.QKeyEventTransition_new2(object.cPointer(), (C.int)(typeVal), (C.int)(key)) return newQKeyEventTransition(ret) } @@ -56,7 +56,7 @@ func NewQKeyEventTransition3(sourceState *QState) *QKeyEventTransition { // NewQKeyEventTransition4 constructs a new QKeyEventTransition object. func NewQKeyEventTransition4(object *QObject, typeVal QEvent__Type, key int, sourceState *QState) *QKeyEventTransition { - ret := C.QKeyEventTransition_new4(object.cPointer(), (C.uintptr_t)(typeVal), (C.int)(key), sourceState.cPointer()) + ret := C.QKeyEventTransition_new4(object.cPointer(), (C.int)(typeVal), (C.int)(key), sourceState.cPointer()) return newQKeyEventTransition(ret) } @@ -95,7 +95,7 @@ func (this *QKeyEventTransition) ModifierMask() int { } func (this *QKeyEventTransition) SetModifierMask(modifiers int) { - C.QKeyEventTransition_SetModifierMask(this.h, (C.int)(modifiers)) + C.QKeyEventTransition_SetModifierMask(this.h, modifiers) } func QKeyEventTransition_Tr2(s string, c string) string { diff --git a/qt/gen_qkeyeventtransition.h b/qt/gen_qkeyeventtransition.h index d06d612..a4ed28d 100644 --- a/qt/gen_qkeyeventtransition.h +++ b/qt/gen_qkeyeventtransition.h @@ -26,9 +26,9 @@ typedef struct QState QState; #endif QKeyEventTransition* QKeyEventTransition_new(); -QKeyEventTransition* QKeyEventTransition_new2(QObject* object, uintptr_t typeVal, int key); +QKeyEventTransition* QKeyEventTransition_new2(QObject* object, int typeVal, int key); QKeyEventTransition* QKeyEventTransition_new3(QState* sourceState); -QKeyEventTransition* QKeyEventTransition_new4(QObject* object, uintptr_t typeVal, int key, QState* sourceState); +QKeyEventTransition* QKeyEventTransition_new4(QObject* object, int typeVal, int key, QState* sourceState); QMetaObject* QKeyEventTransition_MetaObject(const QKeyEventTransition* self); struct miqt_string* QKeyEventTransition_Tr(const char* s); struct miqt_string* QKeyEventTransition_TrUtf8(const char* s); diff --git a/qt/gen_qkeysequence.cpp b/qt/gen_qkeysequence.cpp index 66d6b40..8345a21 100644 --- a/qt/gen_qkeysequence.cpp +++ b/qt/gen_qkeysequence.cpp @@ -24,11 +24,11 @@ QKeySequence* QKeySequence_new4(QKeySequence* ks) { return new QKeySequence(*ks); } -QKeySequence* QKeySequence_new5(uintptr_t key) { +QKeySequence* QKeySequence_new5(int key) { return new QKeySequence(static_cast(key)); } -QKeySequence* QKeySequence_new6(struct miqt_string* key, uintptr_t format) { +QKeySequence* QKeySequence_new6(struct miqt_string* key, int format) { QString key_QString = QString::fromUtf8(&key->data, key->len); return new QKeySequence(key_QString, static_cast(format)); } @@ -92,9 +92,9 @@ struct miqt_string* QKeySequence_ListToString(struct miqt_array* /* of QKeySeque return miqt_strdup(_b.data(), _b.length()); } -uintptr_t QKeySequence_Matches(const QKeySequence* self, QKeySequence* seq) { +int QKeySequence_Matches(const QKeySequence* self, QKeySequence* seq) { QKeySequence::SequenceMatch _ret = self->matches(*seq); - return static_cast(_ret); + return static_cast(_ret); } QKeySequence* QKeySequence_Mnemonic(struct miqt_string* text) { @@ -102,7 +102,7 @@ QKeySequence* QKeySequence_Mnemonic(struct miqt_string* text) { return new QKeySequence(QKeySequence::mnemonic(text_QString)); } -struct miqt_array* QKeySequence_KeyBindings(uintptr_t key) { +struct miqt_array* QKeySequence_KeyBindings(int key) { QList _ret = QKeySequence::keyBindings(static_cast(key)); // Convert QList<> from C++ memory to manually-managed C memory QKeySequence** _arr = static_cast(malloc(sizeof(QKeySequence*) * _ret.length())); @@ -155,19 +155,19 @@ bool QKeySequence_IsDetached(const QKeySequence* self) { return self->isDetached(); } -struct miqt_string* QKeySequence_ToString1(const QKeySequence* self, uintptr_t format) { +struct miqt_string* QKeySequence_ToString1(const QKeySequence* self, int format) { QString _ret = self->toString(static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); } -QKeySequence* QKeySequence_FromString2(struct miqt_string* str, uintptr_t format) { +QKeySequence* QKeySequence_FromString2(struct miqt_string* str, int format) { QString str_QString = QString::fromUtf8(&str->data, str->len); return new QKeySequence(QKeySequence::fromString(str_QString, static_cast(format))); } -struct miqt_array* QKeySequence_ListFromString2(struct miqt_string* str, uintptr_t format) { +struct miqt_array* QKeySequence_ListFromString2(struct miqt_string* str, int format) { QString str_QString = QString::fromUtf8(&str->data, str->len); QList _ret = QKeySequence::listFromString(str_QString, static_cast(format)); // Convert QList<> from C++ memory to manually-managed C memory @@ -181,7 +181,7 @@ struct miqt_array* QKeySequence_ListFromString2(struct miqt_string* str, uintptr return _out; } -struct miqt_string* QKeySequence_ListToString2(struct miqt_array* /* of QKeySequence* */ list, uintptr_t format) { +struct miqt_string* QKeySequence_ListToString2(struct miqt_array* /* of QKeySequence* */ list, int format) { QList list_QList; list_QList.reserve(list->len); QKeySequence** list_arr = static_cast(list->data); diff --git a/qt/gen_qkeysequence.go b/qt/gen_qkeysequence.go index 5afd32b..3fe03cc 100644 --- a/qt/gen_qkeysequence.go +++ b/qt/gen_qkeysequence.go @@ -154,7 +154,7 @@ func NewQKeySequence4(ks *QKeySequence) *QKeySequence { // NewQKeySequence5 constructs a new QKeySequence object. func NewQKeySequence5(key QKeySequence__StandardKey) *QKeySequence { - ret := C.QKeySequence_new5((C.uintptr_t)(key)) + ret := C.QKeySequence_new5((C.int)(key)) return newQKeySequence(ret) } @@ -162,7 +162,7 @@ func NewQKeySequence5(key QKeySequence__StandardKey) *QKeySequence { func NewQKeySequence6(key string, format QKeySequence__SequenceFormat) *QKeySequence { key_ms := miqt_strdupg(key) defer C.free(key_ms) - ret := C.QKeySequence_new6((*C.struct_miqt_string)(key_ms), (C.uintptr_t)(format)) + ret := C.QKeySequence_new6((*C.struct_miqt_string)(key_ms), (C.int)(format)) return newQKeySequence(ret) } @@ -253,7 +253,7 @@ func QKeySequence_Mnemonic(text string) *QKeySequence { } func QKeySequence_KeyBindings(key QKeySequence__StandardKey) []QKeySequence { - var _ma *C.struct_miqt_array = C.QKeySequence_KeyBindings((C.uintptr_t)(key)) + var _ma *C.struct_miqt_array = C.QKeySequence_KeyBindings((C.int)(key)) _ret := make([]QKeySequence, int(_ma.len)) _outCast := (*[0xffff]*C.QKeySequence)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -307,7 +307,7 @@ func (this *QKeySequence) IsDetached() bool { } func (this *QKeySequence) ToString1(format QKeySequence__SequenceFormat) string { - var _ms *C.struct_miqt_string = C.QKeySequence_ToString1(this.h, (C.uintptr_t)(format)) + var _ms *C.struct_miqt_string = C.QKeySequence_ToString1(this.h, (C.int)(format)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -316,7 +316,7 @@ func (this *QKeySequence) ToString1(format QKeySequence__SequenceFormat) string func QKeySequence_FromString2(str string, format QKeySequence__SequenceFormat) *QKeySequence { str_ms := miqt_strdupg(str) defer C.free(str_ms) - _ret := C.QKeySequence_FromString2((*C.struct_miqt_string)(str_ms), (C.uintptr_t)(format)) + _ret := C.QKeySequence_FromString2((*C.struct_miqt_string)(str_ms), (C.int)(format)) _goptr := newQKeySequence(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -325,7 +325,7 @@ func QKeySequence_FromString2(str string, format QKeySequence__SequenceFormat) * func QKeySequence_ListFromString2(str string, format QKeySequence__SequenceFormat) []QKeySequence { str_ms := miqt_strdupg(str) defer C.free(str_ms) - var _ma *C.struct_miqt_array = C.QKeySequence_ListFromString2((*C.struct_miqt_string)(str_ms), (C.uintptr_t)(format)) + var _ma *C.struct_miqt_array = C.QKeySequence_ListFromString2((*C.struct_miqt_string)(str_ms), (C.int)(format)) _ret := make([]QKeySequence, int(_ma.len)) _outCast := (*[0xffff]*C.QKeySequence)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -347,7 +347,7 @@ func QKeySequence_ListToString2(list []QKeySequence, format QKeySequence__Sequen } list_ma := &C.struct_miqt_array{len: C.size_t(len(list)), data: unsafe.Pointer(list_CArray)} defer runtime.KeepAlive(unsafe.Pointer(list_ma)) - var _ms *C.struct_miqt_string = C.QKeySequence_ListToString2(list_ma, (C.uintptr_t)(format)) + var _ms *C.struct_miqt_string = C.QKeySequence_ListToString2(list_ma, (C.int)(format)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret diff --git a/qt/gen_qkeysequence.h b/qt/gen_qkeysequence.h index 6555dfa..d863ae0 100644 --- a/qt/gen_qkeysequence.h +++ b/qt/gen_qkeysequence.h @@ -23,8 +23,8 @@ QKeySequence* QKeySequence_new(); QKeySequence* QKeySequence_new2(struct miqt_string* key); QKeySequence* QKeySequence_new3(int k1); QKeySequence* QKeySequence_new4(QKeySequence* ks); -QKeySequence* QKeySequence_new5(uintptr_t key); -QKeySequence* QKeySequence_new6(struct miqt_string* key, uintptr_t format); +QKeySequence* QKeySequence_new5(int key); +QKeySequence* QKeySequence_new6(struct miqt_string* key, int format); QKeySequence* QKeySequence_new7(int k1, int k2); QKeySequence* QKeySequence_new8(int k1, int k2, int k3); QKeySequence* QKeySequence_new9(int k1, int k2, int k3, int k4); @@ -34,9 +34,9 @@ struct miqt_string* QKeySequence_ToString(const QKeySequence* self); QKeySequence* QKeySequence_FromString(struct miqt_string* str); struct miqt_array* QKeySequence_ListFromString(struct miqt_string* str); struct miqt_string* QKeySequence_ListToString(struct miqt_array* /* of QKeySequence* */ list); -uintptr_t QKeySequence_Matches(const QKeySequence* self, QKeySequence* seq); +int QKeySequence_Matches(const QKeySequence* self, QKeySequence* seq); QKeySequence* QKeySequence_Mnemonic(struct miqt_string* text); -struct miqt_array* QKeySequence_KeyBindings(uintptr_t key); +struct miqt_array* QKeySequence_KeyBindings(int key); int QKeySequence_OperatorSubscript(const QKeySequence* self, unsigned int i); void QKeySequence_OperatorAssign(QKeySequence* self, QKeySequence* other); void QKeySequence_Swap(QKeySequence* self, QKeySequence* other); @@ -47,10 +47,10 @@ bool QKeySequence_OperatorGreater(const QKeySequence* self, QKeySequence* other) bool QKeySequence_OperatorLesserOrEqual(const QKeySequence* self, QKeySequence* other); bool QKeySequence_OperatorGreaterOrEqual(const QKeySequence* self, QKeySequence* other); bool QKeySequence_IsDetached(const QKeySequence* self); -struct miqt_string* QKeySequence_ToString1(const QKeySequence* self, uintptr_t format); -QKeySequence* QKeySequence_FromString2(struct miqt_string* str, uintptr_t format); -struct miqt_array* QKeySequence_ListFromString2(struct miqt_string* str, uintptr_t format); -struct miqt_string* QKeySequence_ListToString2(struct miqt_array* /* of QKeySequence* */ list, uintptr_t format); +struct miqt_string* QKeySequence_ToString1(const QKeySequence* self, int format); +QKeySequence* QKeySequence_FromString2(struct miqt_string* str, int format); +struct miqt_array* QKeySequence_ListFromString2(struct miqt_string* str, int format); +struct miqt_string* QKeySequence_ListToString2(struct miqt_array* /* of QKeySequence* */ list, int format); void QKeySequence_Delete(QKeySequence* self); #ifdef __cplusplus diff --git a/qt/gen_qlabel.cpp b/qt/gen_qlabel.cpp index a35f196..bd66181 100644 --- a/qt/gen_qlabel.cpp +++ b/qt/gen_qlabel.cpp @@ -68,7 +68,7 @@ QPixmap* QLabel_Pixmap(const QLabel* self) { return (QPixmap*) self->pixmap(); } -QPixmap* QLabel_PixmapWithQtReturnByValueConstant(const QLabel* self, uintptr_t param1) { +QPixmap* QLabel_PixmapWithQtReturnByValueConstant(const QLabel* self, int param1) { return new QPixmap(self->pixmap(static_cast(param1))); } @@ -76,7 +76,7 @@ QPicture* QLabel_Picture(const QLabel* self) { return (QPicture*) self->picture(); } -QPicture* QLabel_PictureWithQtReturnByValueConstant(const QLabel* self, uintptr_t param1) { +QPicture* QLabel_PictureWithQtReturnByValueConstant(const QLabel* self, int param1) { return new QPicture(self->picture(static_cast(param1))); } @@ -84,12 +84,12 @@ QMovie* QLabel_Movie(const QLabel* self) { return self->movie(); } -uintptr_t QLabel_TextFormat(const QLabel* self) { +int QLabel_TextFormat(const QLabel* self) { Qt::TextFormat _ret = self->textFormat(); - return static_cast(_ret); + return static_cast(_ret); } -void QLabel_SetTextFormat(QLabel* self, uintptr_t textFormat) { +void QLabel_SetTextFormat(QLabel* self, int textFormat) { self->setTextFormat(static_cast(textFormat)); } diff --git a/qt/gen_qlabel.go b/qt/gen_qlabel.go index 0b79781..ee6ade7 100644 --- a/qt/gen_qlabel.go +++ b/qt/gen_qlabel.go @@ -59,7 +59,7 @@ func NewQLabel3(parent *QWidget) *QLabel { // NewQLabel4 constructs a new QLabel object. func NewQLabel4(parent *QWidget, f int) *QLabel { - ret := C.QLabel_new4(parent.cPointer(), (C.int)(f)) + ret := C.QLabel_new4(parent.cPointer(), f) return newQLabel(ret) } @@ -75,7 +75,7 @@ func NewQLabel5(text string, parent *QWidget) *QLabel { func NewQLabel6(text string, parent *QWidget, f int) *QLabel { text_ms := miqt_strdupg(text) defer C.free(text_ms) - ret := C.QLabel_new6((*C.struct_miqt_string)(text_ms), parent.cPointer(), (C.int)(f)) + ret := C.QLabel_new6((*C.struct_miqt_string)(text_ms), parent.cPointer(), f) return newQLabel(ret) } @@ -113,7 +113,7 @@ func (this *QLabel) Pixmap() *QPixmap { } func (this *QLabel) PixmapWithQtReturnByValueConstant(param1 ReturnByValueConstant) *QPixmap { - _ret := C.QLabel_PixmapWithQtReturnByValueConstant(this.h, (C.uintptr_t)(param1)) + _ret := C.QLabel_PixmapWithQtReturnByValueConstant(this.h, (C.int)(param1)) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -124,7 +124,7 @@ func (this *QLabel) Picture() *QPicture { } func (this *QLabel) PictureWithQtReturnByValueConstant(param1 ReturnByValueConstant) *QPicture { - _ret := C.QLabel_PictureWithQtReturnByValueConstant(this.h, (C.uintptr_t)(param1)) + _ret := C.QLabel_PictureWithQtReturnByValueConstant(this.h, (C.int)(param1)) _goptr := newQPicture(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -139,7 +139,7 @@ func (this *QLabel) TextFormat() TextFormat { } func (this *QLabel) SetTextFormat(textFormat TextFormat) { - C.QLabel_SetTextFormat(this.h, (C.uintptr_t)(textFormat)) + C.QLabel_SetTextFormat(this.h, (C.int)(textFormat)) } func (this *QLabel) Alignment() int { @@ -147,7 +147,7 @@ func (this *QLabel) Alignment() int { } func (this *QLabel) SetAlignment(alignment int) { - C.QLabel_SetAlignment(this.h, (C.int)(alignment)) + C.QLabel_SetAlignment(this.h, alignment) } func (this *QLabel) SetWordWrap(on bool) { @@ -217,7 +217,7 @@ func (this *QLabel) SetOpenExternalLinks(open bool) { } func (this *QLabel) SetTextInteractionFlags(flags int) { - C.QLabel_SetTextInteractionFlags(this.h, (C.int)(flags)) + C.QLabel_SetTextInteractionFlags(this.h, flags) } func (this *QLabel) TextInteractionFlags() int { diff --git a/qt/gen_qlabel.h b/qt/gen_qlabel.h index 9f95ba5..76dd8a7 100644 --- a/qt/gen_qlabel.h +++ b/qt/gen_qlabel.h @@ -42,12 +42,12 @@ struct miqt_string* QLabel_Tr(const char* s); struct miqt_string* QLabel_TrUtf8(const char* s); struct miqt_string* QLabel_Text(const QLabel* self); QPixmap* QLabel_Pixmap(const QLabel* self); -QPixmap* QLabel_PixmapWithQtReturnByValueConstant(const QLabel* self, uintptr_t param1); +QPixmap* QLabel_PixmapWithQtReturnByValueConstant(const QLabel* self, int param1); QPicture* QLabel_Picture(const QLabel* self); -QPicture* QLabel_PictureWithQtReturnByValueConstant(const QLabel* self, uintptr_t param1); +QPicture* QLabel_PictureWithQtReturnByValueConstant(const QLabel* self, int param1); QMovie* QLabel_Movie(const QLabel* self); -uintptr_t QLabel_TextFormat(const QLabel* self); -void QLabel_SetTextFormat(QLabel* self, uintptr_t textFormat); +int QLabel_TextFormat(const QLabel* self); +void QLabel_SetTextFormat(QLabel* self, int textFormat); int QLabel_Alignment(const QLabel* self); void QLabel_SetAlignment(QLabel* self, int alignment); void QLabel_SetWordWrap(QLabel* self, bool on); diff --git a/qt/gen_qlayout.cpp b/qt/gen_qlayout.cpp index 4fa95b9..82f6084 100644 --- a/qt/gen_qlayout.cpp +++ b/qt/gen_qlayout.cpp @@ -74,13 +74,13 @@ bool QLayout_SetAlignment2(QLayout* self, QLayout* l, int alignment) { return self->setAlignment(l, static_cast(alignment)); } -void QLayout_SetSizeConstraint(QLayout* self, uintptr_t sizeConstraint) { +void QLayout_SetSizeConstraint(QLayout* self, int sizeConstraint) { self->setSizeConstraint(static_cast(sizeConstraint)); } -uintptr_t QLayout_SizeConstraint(const QLayout* self) { +int QLayout_SizeConstraint(const QLayout* self) { QLayout::SizeConstraint _ret = self->sizeConstraint(); - return static_cast(_ret); + return static_cast(_ret); } void QLayout_SetMenuBar(QLayout* self, QWidget* w) { diff --git a/qt/gen_qlayout.go b/qt/gen_qlayout.go index 94d7e54..0beee88 100644 --- a/qt/gen_qlayout.go +++ b/qt/gen_qlayout.go @@ -113,15 +113,15 @@ func (this *QLayout) ContentsRect() *QRect { } func (this *QLayout) SetAlignment(w *QWidget, alignment int) bool { - return (bool)(C.QLayout_SetAlignment(this.h, w.cPointer(), (C.int)(alignment))) + return (bool)(C.QLayout_SetAlignment(this.h, w.cPointer(), alignment)) } func (this *QLayout) SetAlignment2(l *QLayout, alignment int) bool { - return (bool)(C.QLayout_SetAlignment2(this.h, l.cPointer(), (C.int)(alignment))) + return (bool)(C.QLayout_SetAlignment2(this.h, l.cPointer(), alignment)) } func (this *QLayout) SetSizeConstraint(sizeConstraint QLayout__SizeConstraint) { - C.QLayout_SetSizeConstraint(this.h, (C.uintptr_t)(sizeConstraint)) + C.QLayout_SetSizeConstraint(this.h, (C.int)(sizeConstraint)) } func (this *QLayout) SizeConstraint() QLayout__SizeConstraint { @@ -318,7 +318,7 @@ func QLayout_TrUtf83(s string, c string, n int) string { } func (this *QLayout) ReplaceWidget3(from *QWidget, to *QWidget, options int) *QLayoutItem { - return newQLayoutItem_U(unsafe.Pointer(C.QLayout_ReplaceWidget3(this.h, from.cPointer(), to.cPointer(), (C.int)(options)))) + return newQLayoutItem_U(unsafe.Pointer(C.QLayout_ReplaceWidget3(this.h, from.cPointer(), to.cPointer(), options))) } // Delete this object from C++ memory. diff --git a/qt/gen_qlayout.h b/qt/gen_qlayout.h index 0c9326a..69947bf 100644 --- a/qt/gen_qlayout.h +++ b/qt/gen_qlayout.h @@ -45,8 +45,8 @@ QMargins* QLayout_ContentsMargins(const QLayout* self); QRect* QLayout_ContentsRect(const QLayout* self); bool QLayout_SetAlignment(QLayout* self, QWidget* w, int alignment); bool QLayout_SetAlignment2(QLayout* self, QLayout* l, int alignment); -void QLayout_SetSizeConstraint(QLayout* self, uintptr_t sizeConstraint); -uintptr_t QLayout_SizeConstraint(const QLayout* self); +void QLayout_SetSizeConstraint(QLayout* self, int sizeConstraint); +int QLayout_SizeConstraint(const QLayout* self); void QLayout_SetMenuBar(QLayout* self, QWidget* w); QWidget* QLayout_MenuBar(const QLayout* self); QWidget* QLayout_ParentWidget(const QLayout* self); diff --git a/qt/gen_qlayoutitem.cpp b/qt/gen_qlayoutitem.cpp index 1cfc4b7..5b062c0 100644 --- a/qt/gen_qlayoutitem.cpp +++ b/qt/gen_qlayoutitem.cpp @@ -94,11 +94,11 @@ QSpacerItem* QSpacerItem_new2(QSpacerItem* param1) { return new QSpacerItem(*param1); } -QSpacerItem* QSpacerItem_new3(int w, int h, uintptr_t hData) { +QSpacerItem* QSpacerItem_new3(int w, int h, int hData) { return new QSpacerItem(static_cast(w), static_cast(h), static_cast(hData)); } -QSpacerItem* QSpacerItem_new4(int w, int h, uintptr_t hData, uintptr_t vData) { +QSpacerItem* QSpacerItem_new4(int w, int h, int hData, int vData) { return new QSpacerItem(static_cast(w), static_cast(h), static_cast(hData), static_cast(vData)); } @@ -143,11 +143,11 @@ QSizePolicy* QSpacerItem_SizePolicy(const QSpacerItem* self) { return new QSizePolicy(self->sizePolicy()); } -void QSpacerItem_ChangeSize3(QSpacerItem* self, int w, int h, uintptr_t hData) { +void QSpacerItem_ChangeSize3(QSpacerItem* self, int w, int h, int hData) { self->changeSize(static_cast(w), static_cast(h), static_cast(hData)); } -void QSpacerItem_ChangeSize4(QSpacerItem* self, int w, int h, uintptr_t hData, uintptr_t vData) { +void QSpacerItem_ChangeSize4(QSpacerItem* self, int w, int h, int hData, int vData) { self->changeSize(static_cast(w), static_cast(h), static_cast(hData), static_cast(vData)); } diff --git a/qt/gen_qlayoutitem.go b/qt/gen_qlayoutitem.go index e7f0281..1c1c3cd 100644 --- a/qt/gen_qlayoutitem.go +++ b/qt/gen_qlayoutitem.go @@ -108,7 +108,7 @@ func (this *QLayoutItem) Alignment() int { } func (this *QLayoutItem) SetAlignment(a int) { - C.QLayoutItem_SetAlignment(this.h, (C.int)(a)) + C.QLayoutItem_SetAlignment(this.h, a) } func (this *QLayoutItem) ControlTypes() int { @@ -166,13 +166,13 @@ func NewQSpacerItem2(param1 *QSpacerItem) *QSpacerItem { // NewQSpacerItem3 constructs a new QSpacerItem object. func NewQSpacerItem3(w int, h int, hData QSizePolicy__Policy) *QSpacerItem { - ret := C.QSpacerItem_new3((C.int)(w), (C.int)(h), (C.uintptr_t)(hData)) + ret := C.QSpacerItem_new3((C.int)(w), (C.int)(h), (C.int)(hData)) return newQSpacerItem(ret) } // NewQSpacerItem4 constructs a new QSpacerItem object. func NewQSpacerItem4(w int, h int, hData QSizePolicy__Policy, vData QSizePolicy__Policy) *QSpacerItem { - ret := C.QSpacerItem_new4((C.int)(w), (C.int)(h), (C.uintptr_t)(hData), (C.uintptr_t)(vData)) + ret := C.QSpacerItem_new4((C.int)(w), (C.int)(h), (C.int)(hData), (C.int)(vData)) return newQSpacerItem(ret) } @@ -232,11 +232,11 @@ func (this *QSpacerItem) SizePolicy() *QSizePolicy { } func (this *QSpacerItem) ChangeSize3(w int, h int, hData QSizePolicy__Policy) { - C.QSpacerItem_ChangeSize3(this.h, (C.int)(w), (C.int)(h), (C.uintptr_t)(hData)) + C.QSpacerItem_ChangeSize3(this.h, (C.int)(w), (C.int)(h), (C.int)(hData)) } func (this *QSpacerItem) ChangeSize4(w int, h int, hData QSizePolicy__Policy, vData QSizePolicy__Policy) { - C.QSpacerItem_ChangeSize4(this.h, (C.int)(w), (C.int)(h), (C.uintptr_t)(hData), (C.uintptr_t)(vData)) + C.QSpacerItem_ChangeSize4(this.h, (C.int)(w), (C.int)(h), (C.int)(hData), (C.int)(vData)) } // Delete this object from C++ memory. diff --git a/qt/gen_qlayoutitem.h b/qt/gen_qlayoutitem.h index 22c3d76..aafd4ca 100644 --- a/qt/gen_qlayoutitem.h +++ b/qt/gen_qlayoutitem.h @@ -56,8 +56,8 @@ void QLayoutItem_Delete(QLayoutItem* self); QSpacerItem* QSpacerItem_new(int w, int h); QSpacerItem* QSpacerItem_new2(QSpacerItem* param1); -QSpacerItem* QSpacerItem_new3(int w, int h, uintptr_t hData); -QSpacerItem* QSpacerItem_new4(int w, int h, uintptr_t hData, uintptr_t vData); +QSpacerItem* QSpacerItem_new3(int w, int h, int hData); +QSpacerItem* QSpacerItem_new4(int w, int h, int hData, int vData); void QSpacerItem_ChangeSize(QSpacerItem* self, int w, int h); QSize* QSpacerItem_SizeHint(const QSpacerItem* self); QSize* QSpacerItem_MinimumSize(const QSpacerItem* self); @@ -68,8 +68,8 @@ void QSpacerItem_SetGeometry(QSpacerItem* self, QRect* geometry); QRect* QSpacerItem_Geometry(const QSpacerItem* self); QSpacerItem* QSpacerItem_SpacerItem(QSpacerItem* self); QSizePolicy* QSpacerItem_SizePolicy(const QSpacerItem* self); -void QSpacerItem_ChangeSize3(QSpacerItem* self, int w, int h, uintptr_t hData); -void QSpacerItem_ChangeSize4(QSpacerItem* self, int w, int h, uintptr_t hData, uintptr_t vData); +void QSpacerItem_ChangeSize3(QSpacerItem* self, int w, int h, int hData); +void QSpacerItem_ChangeSize4(QSpacerItem* self, int w, int h, int hData, int vData); void QSpacerItem_Delete(QSpacerItem* self); QWidgetItem* QWidgetItem_new(QWidget* w); diff --git a/qt/gen_qlcdnumber.cpp b/qt/gen_qlcdnumber.cpp index 7b90598..e80141d 100644 --- a/qt/gen_qlcdnumber.cpp +++ b/qt/gen_qlcdnumber.cpp @@ -63,21 +63,21 @@ bool QLCDNumber_CheckOverflowWithNum(const QLCDNumber* self, int num) { return self->checkOverflow(static_cast(num)); } -uintptr_t QLCDNumber_Mode(const QLCDNumber* self) { +int QLCDNumber_Mode(const QLCDNumber* self) { QLCDNumber::Mode _ret = self->mode(); - return static_cast(_ret); + return static_cast(_ret); } -void QLCDNumber_SetMode(QLCDNumber* self, uintptr_t mode) { +void QLCDNumber_SetMode(QLCDNumber* self, int mode) { self->setMode(static_cast(mode)); } -uintptr_t QLCDNumber_SegmentStyle(const QLCDNumber* self) { +int QLCDNumber_SegmentStyle(const QLCDNumber* self) { QLCDNumber::SegmentStyle _ret = self->segmentStyle(); - return static_cast(_ret); + return static_cast(_ret); } -void QLCDNumber_SetSegmentStyle(QLCDNumber* self, uintptr_t segmentStyle) { +void QLCDNumber_SetSegmentStyle(QLCDNumber* self, int segmentStyle) { self->setSegmentStyle(static_cast(segmentStyle)); } diff --git a/qt/gen_qlcdnumber.go b/qt/gen_qlcdnumber.go index bd462aa..d0ea45e 100644 --- a/qt/gen_qlcdnumber.go +++ b/qt/gen_qlcdnumber.go @@ -125,7 +125,7 @@ func (this *QLCDNumber) Mode() QLCDNumber__Mode { } func (this *QLCDNumber) SetMode(mode QLCDNumber__Mode) { - C.QLCDNumber_SetMode(this.h, (C.uintptr_t)(mode)) + C.QLCDNumber_SetMode(this.h, (C.int)(mode)) } func (this *QLCDNumber) SegmentStyle() QLCDNumber__SegmentStyle { @@ -133,7 +133,7 @@ func (this *QLCDNumber) SegmentStyle() QLCDNumber__SegmentStyle { } func (this *QLCDNumber) SetSegmentStyle(segmentStyle QLCDNumber__SegmentStyle) { - C.QLCDNumber_SetSegmentStyle(this.h, (C.uintptr_t)(segmentStyle)) + C.QLCDNumber_SetSegmentStyle(this.h, (C.int)(segmentStyle)) } func (this *QLCDNumber) Value() float64 { diff --git a/qt/gen_qlcdnumber.h b/qt/gen_qlcdnumber.h index 02ba5d1..726ac64 100644 --- a/qt/gen_qlcdnumber.h +++ b/qt/gen_qlcdnumber.h @@ -37,10 +37,10 @@ int QLCDNumber_DigitCount(const QLCDNumber* self); void QLCDNumber_SetDigitCount(QLCDNumber* self, int nDigits); bool QLCDNumber_CheckOverflow(const QLCDNumber* self, double num); bool QLCDNumber_CheckOverflowWithNum(const QLCDNumber* self, int num); -uintptr_t QLCDNumber_Mode(const QLCDNumber* self); -void QLCDNumber_SetMode(QLCDNumber* self, uintptr_t mode); -uintptr_t QLCDNumber_SegmentStyle(const QLCDNumber* self); -void QLCDNumber_SetSegmentStyle(QLCDNumber* self, uintptr_t segmentStyle); +int QLCDNumber_Mode(const QLCDNumber* self); +void QLCDNumber_SetMode(QLCDNumber* self, int mode); +int QLCDNumber_SegmentStyle(const QLCDNumber* self); +void QLCDNumber_SetSegmentStyle(QLCDNumber* self, int segmentStyle); double QLCDNumber_Value(const QLCDNumber* self); int QLCDNumber_IntValue(const QLCDNumber* self); QSize* QLCDNumber_SizeHint(const QLCDNumber* self); diff --git a/qt/gen_qlibrary.go b/qt/gen_qlibrary.go index abc79c9..46089fc 100644 --- a/qt/gen_qlibrary.go +++ b/qt/gen_qlibrary.go @@ -185,7 +185,7 @@ func (this *QLibrary) ErrorString() string { } func (this *QLibrary) SetLoadHints(hints int) { - C.QLibrary_SetLoadHints(this.h, (C.int)(hints)) + C.QLibrary_SetLoadHints(this.h, hints) } func (this *QLibrary) LoadHints() int { diff --git a/qt/gen_qlibraryinfo.cpp b/qt/gen_qlibraryinfo.cpp index d85e318..da655c8 100644 --- a/qt/gen_qlibraryinfo.cpp +++ b/qt/gen_qlibraryinfo.cpp @@ -39,7 +39,7 @@ QVersionNumber* QLibraryInfo_Version() { return new QVersionNumber(QLibraryInfo::version()); } -struct miqt_string* QLibraryInfo_Location(uintptr_t param1) { +struct miqt_string* QLibraryInfo_Location(int param1) { QString _ret = QLibraryInfo::location(static_cast(param1)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); diff --git a/qt/gen_qlibraryinfo.go b/qt/gen_qlibraryinfo.go index d6201e8..fb407c4 100644 --- a/qt/gen_qlibraryinfo.go +++ b/qt/gen_qlibraryinfo.go @@ -93,7 +93,7 @@ func QLibraryInfo_Version() *QVersionNumber { } func QLibraryInfo_Location(param1 QLibraryInfo__LibraryLocation) string { - var _ms *C.struct_miqt_string = C.QLibraryInfo_Location((C.uintptr_t)(param1)) + var _ms *C.struct_miqt_string = C.QLibraryInfo_Location((C.int)(param1)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret diff --git a/qt/gen_qlibraryinfo.h b/qt/gen_qlibraryinfo.h index 15e3b31..f1ff8b4 100644 --- a/qt/gen_qlibraryinfo.h +++ b/qt/gen_qlibraryinfo.h @@ -29,7 +29,7 @@ QDate* QLibraryInfo_BuildDate(); const char* QLibraryInfo_Build(); bool QLibraryInfo_IsDebugBuild(); QVersionNumber* QLibraryInfo_Version(); -struct miqt_string* QLibraryInfo_Location(uintptr_t param1); +struct miqt_string* QLibraryInfo_Location(int param1); struct miqt_array* QLibraryInfo_PlatformPluginArguments(struct miqt_string* platformName); void QLibraryInfo_Delete(QLibraryInfo* self); diff --git a/qt/gen_qline.cpp b/qt/gen_qline.cpp index 5a731a6..c1ebb3a 100644 --- a/qt/gen_qline.cpp +++ b/qt/gen_qline.cpp @@ -143,31 +143,38 @@ QPointF* QLineF_P2(const QLineF* self) { } double QLineF_X1(const QLineF* self) { - return self->x1(); + qreal _ret = self->x1(); + return static_cast(_ret); } double QLineF_Y1(const QLineF* self) { - return self->y1(); + qreal _ret = self->y1(); + return static_cast(_ret); } double QLineF_X2(const QLineF* self) { - return self->x2(); + qreal _ret = self->x2(); + return static_cast(_ret); } double QLineF_Y2(const QLineF* self) { - return self->y2(); + qreal _ret = self->y2(); + return static_cast(_ret); } double QLineF_Dx(const QLineF* self) { - return self->dx(); + qreal _ret = self->dx(); + return static_cast(_ret); } double QLineF_Dy(const QLineF* self) { - return self->dy(); + qreal _ret = self->dy(); + return static_cast(_ret); } double QLineF_Length(const QLineF* self) { - return self->length(); + qreal _ret = self->length(); + return static_cast(_ret); } void QLineF_SetLength(QLineF* self, double lenVal) { @@ -175,7 +182,8 @@ void QLineF_SetLength(QLineF* self, double lenVal) { } double QLineF_Angle(const QLineF* self) { - return self->angle(); + qreal _ret = self->angle(); + return static_cast(_ret); } void QLineF_SetAngle(QLineF* self, double angle) { @@ -183,7 +191,8 @@ void QLineF_SetAngle(QLineF* self, double angle) { } double QLineF_AngleTo(const QLineF* self, QLineF* l) { - return self->angleTo(*l); + qreal _ret = self->angleTo(*l); + return static_cast(_ret); } QLineF* QLineF_UnitVector(const QLineF* self) { @@ -194,18 +203,19 @@ QLineF* QLineF_NormalVector(const QLineF* self) { return new QLineF(self->normalVector()); } -uintptr_t QLineF_Intersects(const QLineF* self, QLineF* l, QPointF* intersectionPoint) { +int QLineF_Intersects(const QLineF* self, QLineF* l, QPointF* intersectionPoint) { QLineF::IntersectionType _ret = self->intersects(*l, intersectionPoint); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QLineF_Intersect(const QLineF* self, QLineF* l, QPointF* intersectionPoint) { +int QLineF_Intersect(const QLineF* self, QLineF* l, QPointF* intersectionPoint) { QLineF::IntersectType _ret = self->intersect(*l, intersectionPoint); - return static_cast(_ret); + return static_cast(_ret); } double QLineF_AngleWithQLineF(const QLineF* self, QLineF* l) { - return self->angle(*l); + qreal _ret = self->angle(*l); + return static_cast(_ret); } QPointF* QLineF_PointAt(const QLineF* self, double t) { diff --git a/qt/gen_qline.go b/qt/gen_qline.go index 3e90e02..7aa540a 100644 --- a/qt/gen_qline.go +++ b/qt/gen_qline.go @@ -311,8 +311,8 @@ func (this *QLineF) NormalVector() *QLineF { return _goptr } -func (this *QLineF) Intersects(l *QLineF, intersectionPoint *QPointF) uintptr { - return (uintptr)(C.QLineF_Intersects(this.h, l.cPointer(), intersectionPoint.cPointer())) +func (this *QLineF) Intersects(l *QLineF, intersectionPoint *QPointF) QLineF__IntersectType { + return (QLineF__IntersectType)(C.QLineF_Intersects(this.h, l.cPointer(), intersectionPoint.cPointer())) } func (this *QLineF) Intersect(l *QLineF, intersectionPoint *QPointF) QLineF__IntersectType { diff --git a/qt/gen_qline.h b/qt/gen_qline.h index e541f4b..2d9ce2b 100644 --- a/qt/gen_qline.h +++ b/qt/gen_qline.h @@ -73,8 +73,8 @@ void QLineF_SetAngle(QLineF* self, double angle); double QLineF_AngleTo(const QLineF* self, QLineF* l); QLineF* QLineF_UnitVector(const QLineF* self); QLineF* QLineF_NormalVector(const QLineF* self); -uintptr_t QLineF_Intersects(const QLineF* self, QLineF* l, QPointF* intersectionPoint); -uintptr_t QLineF_Intersect(const QLineF* self, QLineF* l, QPointF* intersectionPoint); +int QLineF_Intersects(const QLineF* self, QLineF* l, QPointF* intersectionPoint); +int QLineF_Intersect(const QLineF* self, QLineF* l, QPointF* intersectionPoint); double QLineF_AngleWithQLineF(const QLineF* self, QLineF* l); QPointF* QLineF_PointAt(const QLineF* self, double t); void QLineF_Translate(QLineF* self, QPointF* p); diff --git a/qt/gen_qlineedit.cpp b/qt/gen_qlineedit.cpp index 63da4bb..5fb3e45 100644 --- a/qt/gen_qlineedit.cpp +++ b/qt/gen_qlineedit.cpp @@ -104,12 +104,12 @@ bool QLineEdit_IsClearButtonEnabled(const QLineEdit* self) { return self->isClearButtonEnabled(); } -uintptr_t QLineEdit_EchoMode(const QLineEdit* self) { +int QLineEdit_EchoMode(const QLineEdit* self) { QLineEdit::EchoMode _ret = self->echoMode(); - return static_cast(_ret); + return static_cast(_ret); } -void QLineEdit_SetEchoMode(QLineEdit* self, uintptr_t echoMode) { +void QLineEdit_SetEchoMode(QLineEdit* self, int echoMode) { self->setEchoMode(static_cast(echoMode)); } @@ -249,13 +249,13 @@ bool QLineEdit_DragEnabled(const QLineEdit* self) { return self->dragEnabled(); } -void QLineEdit_SetCursorMoveStyle(QLineEdit* self, uintptr_t style) { +void QLineEdit_SetCursorMoveStyle(QLineEdit* self, int style) { self->setCursorMoveStyle(static_cast(style)); } -uintptr_t QLineEdit_CursorMoveStyle(const QLineEdit* self) { +int QLineEdit_CursorMoveStyle(const QLineEdit* self) { Qt::CursorMoveStyle _ret = self->cursorMoveStyle(); - return static_cast(_ret); + return static_cast(_ret); } struct miqt_string* QLineEdit_InputMask(const QLineEdit* self) { @@ -290,11 +290,11 @@ QMargins* QLineEdit_TextMargins(const QLineEdit* self) { return new QMargins(self->textMargins()); } -void QLineEdit_AddAction(QLineEdit* self, QAction* action, uintptr_t position) { +void QLineEdit_AddAction(QLineEdit* self, QAction* action, int position) { self->addAction(action, static_cast(position)); } -QAction* QLineEdit_AddAction2(QLineEdit* self, QIcon* icon, uintptr_t position) { +QAction* QLineEdit_AddAction2(QLineEdit* self, QIcon* icon, int position) { return self->addAction(*icon, static_cast(position)); } @@ -426,11 +426,11 @@ void QLineEdit_connect_InputRejected(QLineEdit* self, void* slot) { }); } -QVariant* QLineEdit_InputMethodQuery(const QLineEdit* self, uintptr_t param1) { +QVariant* QLineEdit_InputMethodQuery(const QLineEdit* self, int param1) { return new QVariant(self->inputMethodQuery(static_cast(param1))); } -QVariant* QLineEdit_InputMethodQuery2(const QLineEdit* self, uintptr_t property, QVariant* argument) { +QVariant* QLineEdit_InputMethodQuery2(const QLineEdit* self, int property, QVariant* argument) { return new QVariant(self->inputMethodQuery(static_cast(property), *argument)); } diff --git a/qt/gen_qlineedit.go b/qt/gen_qlineedit.go index 7a3997d..cdd7882 100644 --- a/qt/gen_qlineedit.go +++ b/qt/gen_qlineedit.go @@ -159,7 +159,7 @@ func (this *QLineEdit) EchoMode() QLineEdit__EchoMode { } func (this *QLineEdit) SetEchoMode(echoMode QLineEdit__EchoMode) { - C.QLineEdit_SetEchoMode(this.h, (C.uintptr_t)(echoMode)) + C.QLineEdit_SetEchoMode(this.h, (C.int)(echoMode)) } func (this *QLineEdit) IsReadOnly() bool { @@ -213,7 +213,7 @@ func (this *QLineEdit) CursorPositionAt(pos *QPoint) int { } func (this *QLineEdit) SetAlignment(flag int) { - C.QLineEdit_SetAlignment(this.h, (C.int)(flag)) + C.QLineEdit_SetAlignment(this.h, flag) } func (this *QLineEdit) Alignment() int { @@ -304,7 +304,7 @@ func (this *QLineEdit) DragEnabled() bool { } func (this *QLineEdit) SetCursorMoveStyle(style CursorMoveStyle) { - C.QLineEdit_SetCursorMoveStyle(this.h, (C.uintptr_t)(style)) + C.QLineEdit_SetCursorMoveStyle(this.h, (C.int)(style)) } func (this *QLineEdit) CursorMoveStyle() CursorMoveStyle { @@ -348,11 +348,11 @@ func (this *QLineEdit) TextMargins() *QMargins { } func (this *QLineEdit) AddAction(action *QAction, position QLineEdit__ActionPosition) { - C.QLineEdit_AddAction(this.h, action.cPointer(), (C.uintptr_t)(position)) + C.QLineEdit_AddAction(this.h, action.cPointer(), (C.int)(position)) } func (this *QLineEdit) AddAction2(icon *QIcon, position QLineEdit__ActionPosition) *QAction { - return newQAction_U(unsafe.Pointer(C.QLineEdit_AddAction2(this.h, icon.cPointer(), (C.uintptr_t)(position)))) + return newQAction_U(unsafe.Pointer(C.QLineEdit_AddAction2(this.h, icon.cPointer(), (C.int)(position)))) } func (this *QLineEdit) SetText(text string) { @@ -544,14 +544,14 @@ func miqt_exec_callback_QLineEdit_InputRejected(cb *C.void) { } func (this *QLineEdit) InputMethodQuery(param1 InputMethodQuery) *QVariant { - _ret := C.QLineEdit_InputMethodQuery(this.h, (C.uintptr_t)(param1)) + _ret := C.QLineEdit_InputMethodQuery(this.h, (C.int)(param1)) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QLineEdit) InputMethodQuery2(property InputMethodQuery, argument QVariant) *QVariant { - _ret := C.QLineEdit_InputMethodQuery2(this.h, (C.uintptr_t)(property), argument.cPointer()) + _ret := C.QLineEdit_InputMethodQuery2(this.h, (C.int)(property), argument.cPointer()) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qlineedit.h b/qt/gen_qlineedit.h index 585b388..4151471 100644 --- a/qt/gen_qlineedit.h +++ b/qt/gen_qlineedit.h @@ -60,8 +60,8 @@ void QLineEdit_SetFrame(QLineEdit* self, bool frame); bool QLineEdit_HasFrame(const QLineEdit* self); void QLineEdit_SetClearButtonEnabled(QLineEdit* self, bool enable); bool QLineEdit_IsClearButtonEnabled(const QLineEdit* self); -uintptr_t QLineEdit_EchoMode(const QLineEdit* self); -void QLineEdit_SetEchoMode(QLineEdit* self, uintptr_t echoMode); +int QLineEdit_EchoMode(const QLineEdit* self); +void QLineEdit_SetEchoMode(QLineEdit* self, int echoMode); bool QLineEdit_IsReadOnly(const QLineEdit* self); void QLineEdit_SetReadOnly(QLineEdit* self, bool readOnly); void QLineEdit_SetValidator(QLineEdit* self, QValidator* validator); @@ -95,8 +95,8 @@ bool QLineEdit_IsUndoAvailable(const QLineEdit* self); bool QLineEdit_IsRedoAvailable(const QLineEdit* self); void QLineEdit_SetDragEnabled(QLineEdit* self, bool b); bool QLineEdit_DragEnabled(const QLineEdit* self); -void QLineEdit_SetCursorMoveStyle(QLineEdit* self, uintptr_t style); -uintptr_t QLineEdit_CursorMoveStyle(const QLineEdit* self); +void QLineEdit_SetCursorMoveStyle(QLineEdit* self, int style); +int QLineEdit_CursorMoveStyle(const QLineEdit* self); struct miqt_string* QLineEdit_InputMask(const QLineEdit* self); void QLineEdit_SetInputMask(QLineEdit* self, struct miqt_string* inputMask); bool QLineEdit_HasAcceptableInput(const QLineEdit* self); @@ -104,8 +104,8 @@ void QLineEdit_SetTextMargins(QLineEdit* self, int left, int top, int right, int void QLineEdit_SetTextMarginsWithMargins(QLineEdit* self, QMargins* margins); void QLineEdit_GetTextMargins(const QLineEdit* self, int* left, int* top, int* right, int* bottom); QMargins* QLineEdit_TextMargins(const QLineEdit* self); -void QLineEdit_AddAction(QLineEdit* self, QAction* action, uintptr_t position); -QAction* QLineEdit_AddAction2(QLineEdit* self, QIcon* icon, uintptr_t position); +void QLineEdit_AddAction(QLineEdit* self, QAction* action, int position); +QAction* QLineEdit_AddAction2(QLineEdit* self, QIcon* icon, int position); void QLineEdit_SetText(QLineEdit* self, struct miqt_string* text); void QLineEdit_Clear(QLineEdit* self); void QLineEdit_SelectAll(QLineEdit* self); @@ -131,8 +131,8 @@ void QLineEdit_SelectionChanged(QLineEdit* self); void QLineEdit_connect_SelectionChanged(QLineEdit* self, void* slot); void QLineEdit_InputRejected(QLineEdit* self); void QLineEdit_connect_InputRejected(QLineEdit* self, void* slot); -QVariant* QLineEdit_InputMethodQuery(const QLineEdit* self, uintptr_t param1); -QVariant* QLineEdit_InputMethodQuery2(const QLineEdit* self, uintptr_t property, QVariant* argument); +QVariant* QLineEdit_InputMethodQuery(const QLineEdit* self, int param1); +QVariant* QLineEdit_InputMethodQuery2(const QLineEdit* self, int property, QVariant* argument); bool QLineEdit_Event(QLineEdit* self, QEvent* param1); struct miqt_string* QLineEdit_Tr2(const char* s, const char* c); struct miqt_string* QLineEdit_Tr3(const char* s, const char* c, int n); diff --git a/qt/gen_qlistview.cpp b/qt/gen_qlistview.cpp index d441cce..4ba2813 100644 --- a/qt/gen_qlistview.cpp +++ b/qt/gen_qlistview.cpp @@ -39,22 +39,22 @@ struct miqt_string* QListView_TrUtf8(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -void QListView_SetMovement(QListView* self, uintptr_t movement) { +void QListView_SetMovement(QListView* self, int movement) { self->setMovement(static_cast(movement)); } -uintptr_t QListView_Movement(const QListView* self) { +int QListView_Movement(const QListView* self) { QListView::Movement _ret = self->movement(); - return static_cast(_ret); + return static_cast(_ret); } -void QListView_SetFlow(QListView* self, uintptr_t flow) { +void QListView_SetFlow(QListView* self, int flow) { self->setFlow(static_cast(flow)); } -uintptr_t QListView_Flow(const QListView* self) { +int QListView_Flow(const QListView* self) { QListView::Flow _ret = self->flow(); - return static_cast(_ret); + return static_cast(_ret); } void QListView_SetWrapping(QListView* self, bool enable) { @@ -65,22 +65,22 @@ bool QListView_IsWrapping(const QListView* self) { return self->isWrapping(); } -void QListView_SetResizeMode(QListView* self, uintptr_t mode) { +void QListView_SetResizeMode(QListView* self, int mode) { self->setResizeMode(static_cast(mode)); } -uintptr_t QListView_ResizeMode(const QListView* self) { +int QListView_ResizeMode(const QListView* self) { QListView::ResizeMode _ret = self->resizeMode(); - return static_cast(_ret); + return static_cast(_ret); } -void QListView_SetLayoutMode(QListView* self, uintptr_t mode) { +void QListView_SetLayoutMode(QListView* self, int mode) { self->setLayoutMode(static_cast(mode)); } -uintptr_t QListView_LayoutMode(const QListView* self) { +int QListView_LayoutMode(const QListView* self) { QListView::LayoutMode _ret = self->layoutMode(); - return static_cast(_ret); + return static_cast(_ret); } void QListView_SetSpacing(QListView* self, int space) { @@ -107,13 +107,13 @@ QSize* QListView_GridSize(const QListView* self) { return new QSize(self->gridSize()); } -void QListView_SetViewMode(QListView* self, uintptr_t mode) { +void QListView_SetViewMode(QListView* self, int mode) { self->setViewMode(static_cast(mode)); } -uintptr_t QListView_ViewMode(const QListView* self) { +int QListView_ViewMode(const QListView* self) { QListView::ViewMode _ret = self->viewMode(); - return static_cast(_ret); + return static_cast(_ret); } void QListView_ClearPropertyFlags(QListView* self) { @@ -247,7 +247,7 @@ struct miqt_string* QListView_TrUtf83(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -void QListView_ScrollTo2(QListView* self, QModelIndex* index, uintptr_t hint) { +void QListView_ScrollTo2(QListView* self, QModelIndex* index, int hint) { self->scrollTo(*index, static_cast(hint)); } diff --git a/qt/gen_qlistview.go b/qt/gen_qlistview.go index e1ca476..e1dbd79 100644 --- a/qt/gen_qlistview.go +++ b/qt/gen_qlistview.go @@ -108,7 +108,7 @@ func QListView_TrUtf8(s string) string { } func (this *QListView) SetMovement(movement QListView__Movement) { - C.QListView_SetMovement(this.h, (C.uintptr_t)(movement)) + C.QListView_SetMovement(this.h, (C.int)(movement)) } func (this *QListView) Movement() QListView__Movement { @@ -116,7 +116,7 @@ func (this *QListView) Movement() QListView__Movement { } func (this *QListView) SetFlow(flow QListView__Flow) { - C.QListView_SetFlow(this.h, (C.uintptr_t)(flow)) + C.QListView_SetFlow(this.h, (C.int)(flow)) } func (this *QListView) Flow() QListView__Flow { @@ -132,7 +132,7 @@ func (this *QListView) IsWrapping() bool { } func (this *QListView) SetResizeMode(mode QListView__ResizeMode) { - C.QListView_SetResizeMode(this.h, (C.uintptr_t)(mode)) + C.QListView_SetResizeMode(this.h, (C.int)(mode)) } func (this *QListView) ResizeMode() QListView__ResizeMode { @@ -140,7 +140,7 @@ func (this *QListView) ResizeMode() QListView__ResizeMode { } func (this *QListView) SetLayoutMode(mode QListView__LayoutMode) { - C.QListView_SetLayoutMode(this.h, (C.uintptr_t)(mode)) + C.QListView_SetLayoutMode(this.h, (C.int)(mode)) } func (this *QListView) LayoutMode() QListView__LayoutMode { @@ -175,7 +175,7 @@ func (this *QListView) GridSize() *QSize { } func (this *QListView) SetViewMode(mode QListView__ViewMode) { - C.QListView_SetViewMode(this.h, (C.uintptr_t)(mode)) + C.QListView_SetViewMode(this.h, (C.int)(mode)) } func (this *QListView) ViewMode() QListView__ViewMode { @@ -227,7 +227,7 @@ func (this *QListView) IsSelectionRectVisible() bool { } func (this *QListView) SetItemAlignment(alignment int) { - C.QListView_SetItemAlignment(this.h, (C.int)(alignment)) + C.QListView_SetItemAlignment(this.h, alignment) } func (this *QListView) ItemAlignment() int { @@ -347,7 +347,7 @@ func QListView_TrUtf83(s string, c string, n int) string { } func (this *QListView) ScrollTo2(index *QModelIndex, hint QAbstractItemView__ScrollHint) { - C.QListView_ScrollTo2(this.h, index.cPointer(), (C.uintptr_t)(hint)) + C.QListView_ScrollTo2(this.h, index.cPointer(), (C.int)(hint)) } // Delete this object from C++ memory. diff --git a/qt/gen_qlistview.h b/qt/gen_qlistview.h index 05eb350..ba8377f 100644 --- a/qt/gen_qlistview.h +++ b/qt/gen_qlistview.h @@ -36,24 +36,24 @@ QListView* QListView_new2(QWidget* parent); QMetaObject* QListView_MetaObject(const QListView* self); struct miqt_string* QListView_Tr(const char* s); struct miqt_string* QListView_TrUtf8(const char* s); -void QListView_SetMovement(QListView* self, uintptr_t movement); -uintptr_t QListView_Movement(const QListView* self); -void QListView_SetFlow(QListView* self, uintptr_t flow); -uintptr_t QListView_Flow(const QListView* self); +void QListView_SetMovement(QListView* self, int movement); +int QListView_Movement(const QListView* self); +void QListView_SetFlow(QListView* self, int flow); +int QListView_Flow(const QListView* self); void QListView_SetWrapping(QListView* self, bool enable); bool QListView_IsWrapping(const QListView* self); -void QListView_SetResizeMode(QListView* self, uintptr_t mode); -uintptr_t QListView_ResizeMode(const QListView* self); -void QListView_SetLayoutMode(QListView* self, uintptr_t mode); -uintptr_t QListView_LayoutMode(const QListView* self); +void QListView_SetResizeMode(QListView* self, int mode); +int QListView_ResizeMode(const QListView* self); +void QListView_SetLayoutMode(QListView* self, int mode); +int QListView_LayoutMode(const QListView* self); void QListView_SetSpacing(QListView* self, int space); int QListView_Spacing(const QListView* self); void QListView_SetBatchSize(QListView* self, int batchSize); int QListView_BatchSize(const QListView* self); void QListView_SetGridSize(QListView* self, QSize* size); QSize* QListView_GridSize(const QListView* self); -void QListView_SetViewMode(QListView* self, uintptr_t mode); -uintptr_t QListView_ViewMode(const QListView* self); +void QListView_SetViewMode(QListView* self, int mode); +int QListView_ViewMode(const QListView* self); void QListView_ClearPropertyFlags(QListView* self); bool QListView_IsRowHidden(const QListView* self, int row); void QListView_SetRowHidden(QListView* self, int row, bool hide); @@ -79,7 +79,7 @@ struct miqt_string* QListView_Tr2(const char* s, const char* c); struct miqt_string* QListView_Tr3(const char* s, const char* c, int n); struct miqt_string* QListView_TrUtf82(const char* s, const char* c); struct miqt_string* QListView_TrUtf83(const char* s, const char* c, int n); -void QListView_ScrollTo2(QListView* self, QModelIndex* index, uintptr_t hint); +void QListView_ScrollTo2(QListView* self, QModelIndex* index, int hint); void QListView_Delete(QListView* self); #ifdef __cplusplus diff --git a/qt/gen_qlistwidget.cpp b/qt/gen_qlistwidget.cpp index 1f72500..939bcb1 100644 --- a/qt/gen_qlistwidget.cpp +++ b/qt/gen_qlistwidget.cpp @@ -204,12 +204,12 @@ void QListWidgetItem_SetForeground(QListWidgetItem* self, QBrush* brush) { self->setForeground(*brush); } -uintptr_t QListWidgetItem_CheckState(const QListWidgetItem* self) { +int QListWidgetItem_CheckState(const QListWidgetItem* self) { Qt::CheckState _ret = self->checkState(); - return static_cast(_ret); + return static_cast(_ret); } -void QListWidgetItem_SetCheckState(QListWidgetItem* self, uintptr_t state) { +void QListWidgetItem_SetCheckState(QListWidgetItem* self, int state) { self->setCheckState(static_cast(state)); } @@ -424,7 +424,7 @@ void QListWidget_SetItemSelected(QListWidget* self, QListWidgetItem* item, bool } struct miqt_array* QListWidget_SelectedItems(const QListWidget* self) { - QList _ret = self->selectedItems(); + QList _ret = self->selectedItems(); // Convert QList<> from C++ memory to manually-managed C memory QListWidgetItem** _arr = static_cast(malloc(sizeof(QListWidgetItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -438,7 +438,7 @@ struct miqt_array* QListWidget_SelectedItems(const QListWidget* self) { struct miqt_array* QListWidget_FindItems(const QListWidget* self, struct miqt_string* text, int flags) { QString text_QString = QString::fromUtf8(&text->data, text->len); - QList _ret = self->findItems(text_QString, static_cast(flags)); + QList _ret = self->findItems(text_QString, static_cast(flags)); // Convert QList<> from C++ memory to manually-managed C memory QListWidgetItem** _arr = static_cast(malloc(sizeof(QListWidgetItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -612,11 +612,11 @@ struct miqt_string* QListWidget_TrUtf83(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -void QListWidget_SortItems1(QListWidget* self, uintptr_t order) { +void QListWidget_SortItems1(QListWidget* self, int order) { self->sortItems(static_cast(order)); } -void QListWidget_ScrollToItem2(QListWidget* self, QListWidgetItem* item, uintptr_t hint) { +void QListWidget_ScrollToItem2(QListWidget* self, QListWidgetItem* item, int hint) { self->scrollToItem(item, static_cast(hint)); } diff --git a/qt/gen_qlistwidget.go b/qt/gen_qlistwidget.go index 7b5b6a5..58c080b 100644 --- a/qt/gen_qlistwidget.go +++ b/qt/gen_qlistwidget.go @@ -144,7 +144,7 @@ func (this *QListWidgetItem) Flags() int { } func (this *QListWidgetItem) SetFlags(flags int) { - C.QListWidgetItem_SetFlags(this.h, (C.int)(flags)) + C.QListWidgetItem_SetFlags(this.h, flags) } func (this *QListWidgetItem) Text() string { @@ -278,7 +278,7 @@ func (this *QListWidgetItem) CheckState() CheckState { } func (this *QListWidgetItem) SetCheckState(state CheckState) { - C.QListWidgetItem_SetCheckState(this.h, (C.uintptr_t)(state)) + C.QListWidgetItem_SetCheckState(this.h, (C.int)(state)) } func (this *QListWidgetItem) SizeHint() *QSize { @@ -471,7 +471,7 @@ func (this *QListWidget) SetCurrentItem(item *QListWidgetItem) { } func (this *QListWidget) SetCurrentItem2(item *QListWidgetItem, command int) { - C.QListWidget_SetCurrentItem2(this.h, item.cPointer(), (C.int)(command)) + C.QListWidget_SetCurrentItem2(this.h, item.cPointer(), command) } func (this *QListWidget) CurrentRow() int { @@ -483,7 +483,7 @@ func (this *QListWidget) SetCurrentRow(row int) { } func (this *QListWidget) SetCurrentRow2(row int, command int) { - C.QListWidget_SetCurrentRow2(this.h, (C.int)(row), (C.int)(command)) + C.QListWidget_SetCurrentRow2(this.h, (C.int)(row), command) } func (this *QListWidget) ItemAt(p *QPoint) *QListWidgetItem { @@ -563,7 +563,7 @@ func (this *QListWidget) SelectedItems() []*QListWidgetItem { func (this *QListWidget) FindItems(text string, flags int) []*QListWidgetItem { text_ms := miqt_strdupg(text) defer C.free(text_ms) - var _ma *C.struct_miqt_array = C.QListWidget_FindItems(this.h, (*C.struct_miqt_string)(text_ms), (C.int)(flags)) + var _ma *C.struct_miqt_array = C.QListWidget_FindItems(this.h, (*C.struct_miqt_string)(text_ms), flags) _ret := make([]*QListWidgetItem, int(_ma.len)) _outCast := (*[0xffff]*C.QListWidgetItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -841,11 +841,11 @@ func QListWidget_TrUtf83(s string, c string, n int) string { } func (this *QListWidget) SortItems1(order SortOrder) { - C.QListWidget_SortItems1(this.h, (C.uintptr_t)(order)) + C.QListWidget_SortItems1(this.h, (C.int)(order)) } func (this *QListWidget) ScrollToItem2(item *QListWidgetItem, hint QAbstractItemView__ScrollHint) { - C.QListWidget_ScrollToItem2(this.h, item.cPointer(), (C.uintptr_t)(hint)) + C.QListWidget_ScrollToItem2(this.h, item.cPointer(), (C.int)(hint)) } // Delete this object from C++ memory. diff --git a/qt/gen_qlistwidget.h b/qt/gen_qlistwidget.h index 9944f24..53a9b06 100644 --- a/qt/gen_qlistwidget.h +++ b/qt/gen_qlistwidget.h @@ -87,8 +87,8 @@ QColor* QListWidgetItem_TextColor(const QListWidgetItem* self); void QListWidgetItem_SetTextColor(QListWidgetItem* self, QColor* color); QBrush* QListWidgetItem_Foreground(const QListWidgetItem* self); void QListWidgetItem_SetForeground(QListWidgetItem* self, QBrush* brush); -uintptr_t QListWidgetItem_CheckState(const QListWidgetItem* self); -void QListWidgetItem_SetCheckState(QListWidgetItem* self, uintptr_t state); +int QListWidgetItem_CheckState(const QListWidgetItem* self); +void QListWidgetItem_SetCheckState(QListWidgetItem* self, int state); QSize* QListWidgetItem_SizeHint(const QListWidgetItem* self); void QListWidgetItem_SetSizeHint(QListWidgetItem* self, QSize* size); QVariant* QListWidgetItem_Data(const QListWidgetItem* self, int role); @@ -168,8 +168,8 @@ struct miqt_string* QListWidget_Tr2(const char* s, const char* c); struct miqt_string* QListWidget_Tr3(const char* s, const char* c, int n); struct miqt_string* QListWidget_TrUtf82(const char* s, const char* c); struct miqt_string* QListWidget_TrUtf83(const char* s, const char* c, int n); -void QListWidget_SortItems1(QListWidget* self, uintptr_t order); -void QListWidget_ScrollToItem2(QListWidget* self, QListWidgetItem* item, uintptr_t hint); +void QListWidget_SortItems1(QListWidget* self, int order); +void QListWidget_ScrollToItem2(QListWidget* self, QListWidgetItem* item, int hint); void QListWidget_Delete(QListWidget* self); #ifdef __cplusplus diff --git a/qt/gen_qlocale.cpp b/qt/gen_qlocale.cpp index 96a9c8d..b855bea 100644 --- a/qt/gen_qlocale.cpp +++ b/qt/gen_qlocale.cpp @@ -21,11 +21,11 @@ QLocale* QLocale_new2(struct miqt_string* name) { return new QLocale(name_QString); } -QLocale* QLocale_new3(uintptr_t language) { +QLocale* QLocale_new3(int language) { return new QLocale(static_cast(language)); } -QLocale* QLocale_new4(uintptr_t language, uintptr_t script, uintptr_t country) { +QLocale* QLocale_new4(int language, int script, int country) { return new QLocale(static_cast(language), static_cast(script), static_cast(country)); } @@ -33,7 +33,7 @@ QLocale* QLocale_new5(QLocale* other) { return new QLocale(*other); } -QLocale* QLocale_new6(uintptr_t language, uintptr_t country) { +QLocale* QLocale_new6(int language, int country) { return new QLocale(static_cast(language), static_cast(country)); } @@ -45,19 +45,19 @@ void QLocale_Swap(QLocale* self, QLocale* other) { self->swap(*other); } -uintptr_t QLocale_Language(const QLocale* self) { +int QLocale_Language(const QLocale* self) { QLocale::Language _ret = self->language(); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QLocale_Script(const QLocale* self) { +int QLocale_Script(const QLocale* self) { QLocale::Script _ret = self->script(); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QLocale_Country(const QLocale* self) { +int QLocale_Country(const QLocale* self) { QLocale::Country _ret = self->country(); - return static_cast(_ret); + return static_cast(_ret); } struct miqt_string* QLocale_Name(const QLocale* self) { @@ -95,7 +95,8 @@ int16_t QLocale_ToShort(const QLocale* self, struct miqt_string* s) { uint16_t QLocale_ToUShort(const QLocale* self, struct miqt_string* s) { QString s_QString = QString::fromUtf8(&s->data, s->len); - return self->toUShort(s_QString); + ushort _ret = self->toUShort(s_QString); + return static_cast(_ret); } int QLocale_ToInt(const QLocale* self, struct miqt_string* s) { @@ -105,7 +106,8 @@ int QLocale_ToInt(const QLocale* self, struct miqt_string* s) { unsigned int QLocale_ToUInt(const QLocale* self, struct miqt_string* s) { QString s_QString = QString::fromUtf8(&s->data, s->len); - return self->toUInt(s_QString); + uint _ret = self->toUInt(s_QString); + return static_cast(_ret); } long QLocale_ToLong(const QLocale* self, struct miqt_string* s) { @@ -115,17 +117,20 @@ long QLocale_ToLong(const QLocale* self, struct miqt_string* s) { unsigned long QLocale_ToULong(const QLocale* self, struct miqt_string* s) { QString s_QString = QString::fromUtf8(&s->data, s->len); - return self->toULong(s_QString); + ulong _ret = self->toULong(s_QString); + return static_cast(_ret); } -int64_t QLocale_ToLongLong(const QLocale* self, struct miqt_string* s) { +long long QLocale_ToLongLong(const QLocale* self, struct miqt_string* s) { QString s_QString = QString::fromUtf8(&s->data, s->len); - return self->toLongLong(s_QString); + qlonglong _ret = self->toLongLong(s_QString); + return static_cast(_ret); } -uint64_t QLocale_ToULongLong(const QLocale* self, struct miqt_string* s) { +unsigned long long QLocale_ToULongLong(const QLocale* self, struct miqt_string* s) { QString s_QString = QString::fromUtf8(&s->data, s->len); - return self->toULongLong(s_QString); + qulonglong _ret = self->toULongLong(s_QString); + return static_cast(_ret); } float QLocale_ToFloat(const QLocale* self, struct miqt_string* s) { @@ -138,15 +143,15 @@ double QLocale_ToDouble(const QLocale* self, struct miqt_string* s) { return self->toDouble(s_QString); } -struct miqt_string* QLocale_ToString(const QLocale* self, int64_t i) { - QString _ret = self->toString((qlonglong)(i)); +struct miqt_string* QLocale_ToString(const QLocale* self, long long i) { + QString _ret = self->toString(static_cast(i)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QLocale_ToStringWithQulonglong(const QLocale* self, uint64_t i) { - QString _ret = self->toString((qulonglong)(i)); +struct miqt_string* QLocale_ToStringWithQulonglong(const QLocale* self, unsigned long long i) { + QString _ret = self->toString(static_cast(i)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); @@ -253,14 +258,14 @@ struct miqt_string* QLocale_ToStringWithDateTime(const QLocale* self, QDateTime* return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QLocale_ToString9(const QLocale* self, QDate* date, uintptr_t format, QCalendar* cal) { +struct miqt_string* QLocale_ToString9(const QLocale* self, QDate* date, int format, QCalendar* cal) { QString _ret = self->toString(*date, static_cast(format), *cal); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QLocale_ToString10(const QLocale* self, QDateTime* dateTime, uintptr_t format, QCalendar* cal) { +struct miqt_string* QLocale_ToString10(const QLocale* self, QDateTime* dateTime, int format, QCalendar* cal) { QString _ret = self->toString(*dateTime, static_cast(format), *cal); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -321,12 +326,12 @@ QDateTime* QLocale_ToDateTime2(const QLocale* self, struct miqt_string* stringVa return new QDateTime(self->toDateTime(stringVal_QString, format_QString)); } -QDate* QLocale_ToDate3(const QLocale* self, struct miqt_string* stringVal, uintptr_t format, QCalendar* cal) { +QDate* QLocale_ToDate3(const QLocale* self, struct miqt_string* stringVal, int format, QCalendar* cal) { QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); return new QDate(self->toDate(stringVal_QString, static_cast(format), *cal)); } -QDateTime* QLocale_ToDateTime3(const QLocale* self, struct miqt_string* stringVal, uintptr_t format, QCalendar* cal) { +QDateTime* QLocale_ToDateTime3(const QLocale* self, struct miqt_string* stringVal, int format, QCalendar* cal) { QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); return new QDateTime(self->toDateTime(stringVal_QString, static_cast(format), *cal)); } @@ -343,7 +348,7 @@ QDateTime* QLocale_ToDateTime4(const QLocale* self, struct miqt_string* stringVa return new QDateTime(self->toDateTime(stringVal_QString, format_QString, *cal)); } -QTime* QLocale_ToTime3(const QLocale* self, struct miqt_string* stringVal, uintptr_t format, QCalendar* cal) { +QTime* QLocale_ToTime3(const QLocale* self, struct miqt_string* stringVal, int format, QCalendar* cal) { QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); return new QTime(self->toTime(stringVal_QString, static_cast(format), *cal)); } @@ -410,18 +415,18 @@ struct miqt_string* QLocale_StandaloneDayName(const QLocale* self, int param1) { return miqt_strdup(_b.data(), _b.length()); } -uintptr_t QLocale_FirstDayOfWeek(const QLocale* self) { +int QLocale_FirstDayOfWeek(const QLocale* self) { Qt::DayOfWeek _ret = self->firstDayOfWeek(); - return static_cast(_ret); + return static_cast(_ret); } struct miqt_array* QLocale_Weekdays(const QLocale* self) { QList _ret = self->weekdays(); // Convert QList<> from C++ memory to manually-managed C memory - uintptr_t* _arr = static_cast(malloc(sizeof(uintptr_t) * _ret.length())); + int* _arr = static_cast(malloc(sizeof(int) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { Qt::DayOfWeek _lv_ret = _ret[i]; - _arr[i] = static_cast(_lv_ret); + _arr[i] = static_cast(_lv_ret); } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -443,18 +448,18 @@ struct miqt_string* QLocale_PmText(const QLocale* self) { return miqt_strdup(_b.data(), _b.length()); } -uintptr_t QLocale_MeasurementSystem(const QLocale* self) { +int QLocale_MeasurementSystem(const QLocale* self) { QLocale::MeasurementSystem _ret = self->measurementSystem(); - return static_cast(_ret); + return static_cast(_ret); } QLocale* QLocale_Collation(const QLocale* self) { return new QLocale(self->collation()); } -uintptr_t QLocale_TextDirection(const QLocale* self) { +int QLocale_TextDirection(const QLocale* self) { Qt::LayoutDirection _ret = self->textDirection(); - return static_cast(_ret); + return static_cast(_ret); } struct miqt_string* QLocale_ToUpper(const QLocale* self, struct miqt_string* str) { @@ -481,14 +486,14 @@ struct miqt_string* QLocale_CurrencySymbol(const QLocale* self) { } struct miqt_string* QLocale_ToCurrencyString(const QLocale* self, long long param1) { - QString _ret = self->toCurrencyString(static_cast(param1)); + QString _ret = self->toCurrencyString(static_cast(param1)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); } struct miqt_string* QLocale_ToCurrencyStringWithQulonglong(const QLocale* self, unsigned long long param1) { - QString _ret = self->toCurrencyString(static_cast(param1)); + QString _ret = self->toCurrencyString(static_cast(param1)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); @@ -590,21 +595,21 @@ bool QLocale_OperatorNotEqual(const QLocale* self, QLocale* other) { return self->operator!=(*other); } -struct miqt_string* QLocale_LanguageToString(uintptr_t language) { +struct miqt_string* QLocale_LanguageToString(int language) { QString _ret = QLocale::languageToString(static_cast(language)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QLocale_CountryToString(uintptr_t country) { +struct miqt_string* QLocale_CountryToString(int country) { QString _ret = QLocale::countryToString(static_cast(country)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QLocale_ScriptToString(uintptr_t script) { +struct miqt_string* QLocale_ScriptToString(int script) { QString _ret = QLocale::scriptToString(static_cast(script)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -623,7 +628,7 @@ QLocale* QLocale_System() { return new QLocale(QLocale::system()); } -struct miqt_array* QLocale_MatchingLocales(uintptr_t language, uintptr_t script, uintptr_t country) { +struct miqt_array* QLocale_MatchingLocales(int language, int script, int country) { QList _ret = QLocale::matchingLocales(static_cast(language), static_cast(script), static_cast(country)); // Convert QList<> from C++ memory to manually-managed C memory QLocale** _arr = static_cast(malloc(sizeof(QLocale*) * _ret.length())); @@ -636,13 +641,13 @@ struct miqt_array* QLocale_MatchingLocales(uintptr_t language, uintptr_t script, return _out; } -struct miqt_array* QLocale_CountriesForLanguage(uintptr_t lang) { +struct miqt_array* QLocale_CountriesForLanguage(int lang) { QList _ret = QLocale::countriesForLanguage(static_cast(lang)); // Convert QList<> from C++ memory to manually-managed C memory - uintptr_t* _arr = static_cast(malloc(sizeof(uintptr_t) * _ret.length())); + int* _arr = static_cast(malloc(sizeof(int) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QLocale::Country _lv_ret = _ret[i]; - _arr[i] = static_cast(_lv_ret); + _arr[i] = static_cast(_lv_ret); } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -688,7 +693,8 @@ int16_t QLocale_ToShort2(const QLocale* self, struct miqt_string* s, bool* ok) { uint16_t QLocale_ToUShort2(const QLocale* self, struct miqt_string* s, bool* ok) { QString s_QString = QString::fromUtf8(&s->data, s->len); - return self->toUShort(s_QString, ok); + ushort _ret = self->toUShort(s_QString, ok); + return static_cast(_ret); } int QLocale_ToInt2(const QLocale* self, struct miqt_string* s, bool* ok) { @@ -698,7 +704,8 @@ int QLocale_ToInt2(const QLocale* self, struct miqt_string* s, bool* ok) { unsigned int QLocale_ToUInt2(const QLocale* self, struct miqt_string* s, bool* ok) { QString s_QString = QString::fromUtf8(&s->data, s->len); - return self->toUInt(s_QString, ok); + uint _ret = self->toUInt(s_QString, ok); + return static_cast(_ret); } long QLocale_ToLong2(const QLocale* self, struct miqt_string* s, bool* ok) { @@ -708,17 +715,20 @@ long QLocale_ToLong2(const QLocale* self, struct miqt_string* s, bool* ok) { unsigned long QLocale_ToULong2(const QLocale* self, struct miqt_string* s, bool* ok) { QString s_QString = QString::fromUtf8(&s->data, s->len); - return self->toULong(s_QString, ok); + ulong _ret = self->toULong(s_QString, ok); + return static_cast(_ret); } -int64_t QLocale_ToLongLong2(const QLocale* self, struct miqt_string* s, bool* ok) { +long long QLocale_ToLongLong2(const QLocale* self, struct miqt_string* s, bool* ok) { QString s_QString = QString::fromUtf8(&s->data, s->len); - return self->toLongLong(s_QString, ok); + qlonglong _ret = self->toLongLong(s_QString, ok); + return static_cast(_ret); } -uint64_t QLocale_ToULongLong2(const QLocale* self, struct miqt_string* s, bool* ok) { +unsigned long long QLocale_ToULongLong2(const QLocale* self, struct miqt_string* s, bool* ok) { QString s_QString = QString::fromUtf8(&s->data, s->len); - return self->toULongLong(s_QString, ok); + qulonglong _ret = self->toULongLong(s_QString, ok); + return static_cast(_ret); } float QLocale_ToFloat2(const QLocale* self, struct miqt_string* s, bool* ok) { @@ -759,92 +769,92 @@ struct miqt_string* QLocale_ToString33(const QLocale* self, float i, char f, int return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QLocale_ToString24(const QLocale* self, QDate* date, uintptr_t format) { +struct miqt_string* QLocale_ToString24(const QLocale* self, QDate* date, int format) { QString _ret = self->toString(*date, static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QLocale_ToString25(const QLocale* self, QTime* time, uintptr_t format) { +struct miqt_string* QLocale_ToString25(const QLocale* self, QTime* time, int format) { QString _ret = self->toString(*time, static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QLocale_ToString26(const QLocale* self, QDateTime* dateTime, uintptr_t format) { +struct miqt_string* QLocale_ToString26(const QLocale* self, QDateTime* dateTime, int format) { QString _ret = self->toString(*dateTime, static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QLocale_DateFormat1(const QLocale* self, uintptr_t format) { +struct miqt_string* QLocale_DateFormat1(const QLocale* self, int format) { QString _ret = self->dateFormat(static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QLocale_TimeFormat1(const QLocale* self, uintptr_t format) { +struct miqt_string* QLocale_TimeFormat1(const QLocale* self, int format) { QString _ret = self->timeFormat(static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QLocale_DateTimeFormat1(const QLocale* self, uintptr_t format) { +struct miqt_string* QLocale_DateTimeFormat1(const QLocale* self, int format) { QString _ret = self->dateTimeFormat(static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); } -QDate* QLocale_ToDate22(const QLocale* self, struct miqt_string* stringVal, uintptr_t param2) { +QDate* QLocale_ToDate22(const QLocale* self, struct miqt_string* stringVal, int param2) { QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); return new QDate(self->toDate(stringVal_QString, static_cast(param2))); } -QTime* QLocale_ToTime22(const QLocale* self, struct miqt_string* stringVal, uintptr_t param2) { +QTime* QLocale_ToTime22(const QLocale* self, struct miqt_string* stringVal, int param2) { QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); return new QTime(self->toTime(stringVal_QString, static_cast(param2))); } -QDateTime* QLocale_ToDateTime22(const QLocale* self, struct miqt_string* stringVal, uintptr_t format) { +QDateTime* QLocale_ToDateTime22(const QLocale* self, struct miqt_string* stringVal, int format) { QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); return new QDateTime(self->toDateTime(stringVal_QString, static_cast(format))); } -struct miqt_string* QLocale_MonthName2(const QLocale* self, int param1, uintptr_t format) { +struct miqt_string* QLocale_MonthName2(const QLocale* self, int param1, int format) { QString _ret = self->monthName(static_cast(param1), static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QLocale_StandaloneMonthName2(const QLocale* self, int param1, uintptr_t format) { +struct miqt_string* QLocale_StandaloneMonthName2(const QLocale* self, int param1, int format) { QString _ret = self->standaloneMonthName(static_cast(param1), static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QLocale_DayName2(const QLocale* self, int param1, uintptr_t format) { +struct miqt_string* QLocale_DayName2(const QLocale* self, int param1, int format) { QString _ret = self->dayName(static_cast(param1), static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QLocale_StandaloneDayName2(const QLocale* self, int param1, uintptr_t format) { +struct miqt_string* QLocale_StandaloneDayName2(const QLocale* self, int param1, int format) { QString _ret = self->standaloneDayName(static_cast(param1), static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QLocale_CurrencySymbol1(const QLocale* self, uintptr_t param1) { +struct miqt_string* QLocale_CurrencySymbol1(const QLocale* self, int param1) { QString _ret = self->currencySymbol(static_cast(param1)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -853,7 +863,7 @@ struct miqt_string* QLocale_CurrencySymbol1(const QLocale* self, uintptr_t param struct miqt_string* QLocale_ToCurrencyString22(const QLocale* self, long long param1, struct miqt_string* symbol) { QString symbol_QString = QString::fromUtf8(&symbol->data, symbol->len); - QString _ret = self->toCurrencyString(static_cast(param1), symbol_QString); + QString _ret = self->toCurrencyString(static_cast(param1), symbol_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); @@ -861,7 +871,7 @@ struct miqt_string* QLocale_ToCurrencyString22(const QLocale* self, long long pa struct miqt_string* QLocale_ToCurrencyString23(const QLocale* self, unsigned long long param1, struct miqt_string* symbol) { QString symbol_QString = QString::fromUtf8(&symbol->data, symbol->len); - QString _ret = self->toCurrencyString(static_cast(param1), symbol_QString); + QString _ret = self->toCurrencyString(static_cast(param1), symbol_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); @@ -943,7 +953,7 @@ struct miqt_string* QLocale_FormattedDataSize32(const QLocale* self, long long b return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QLocale_QuoteString2(const QLocale* self, struct miqt_string* str, uintptr_t style) { +struct miqt_string* QLocale_QuoteString2(const QLocale* self, struct miqt_string* str, int style) { QString str_QString = QString::fromUtf8(&str->data, str->len); QString _ret = self->quoteString(str_QString, static_cast(style)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory diff --git a/qt/gen_qlocale.go b/qt/gen_qlocale.go index 75938f5..4c74f67 100644 --- a/qt/gen_qlocale.go +++ b/qt/gen_qlocale.go @@ -929,13 +929,13 @@ func NewQLocale2(name string) *QLocale { // NewQLocale3 constructs a new QLocale object. func NewQLocale3(language QLocale__Language) *QLocale { - ret := C.QLocale_new3((C.uintptr_t)(language)) + ret := C.QLocale_new3((C.int)(language)) return newQLocale(ret) } // NewQLocale4 constructs a new QLocale object. func NewQLocale4(language QLocale__Language, script QLocale__Script, country QLocale__Country) *QLocale { - ret := C.QLocale_new4((C.uintptr_t)(language), (C.uintptr_t)(script), (C.uintptr_t)(country)) + ret := C.QLocale_new4((C.int)(language), (C.int)(script), (C.int)(country)) return newQLocale(ret) } @@ -947,7 +947,7 @@ func NewQLocale5(other *QLocale) *QLocale { // NewQLocale6 constructs a new QLocale object. func NewQLocale6(language QLocale__Language, country QLocale__Country) *QLocale { - ret := C.QLocale_new6((C.uintptr_t)(language), (C.uintptr_t)(country)) + ret := C.QLocale_new6((C.int)(language), (C.int)(country)) return newQLocale(ret) } @@ -1060,14 +1060,14 @@ func (this *QLocale) ToDouble(s string) float64 { } func (this *QLocale) ToString(i int64) string { - var _ms *C.struct_miqt_string = C.QLocale_ToString(this.h, (C.int64_t)(i)) + var _ms *C.struct_miqt_string = C.QLocale_ToString(this.h, (C.longlong)(i)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } func (this *QLocale) ToStringWithQulonglong(i uint64) string { - var _ms *C.struct_miqt_string = C.QLocale_ToStringWithQulonglong(this.h, (C.uint64_t)(i)) + var _ms *C.struct_miqt_string = C.QLocale_ToStringWithQulonglong(this.h, (C.ulonglong)(i)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -1178,14 +1178,14 @@ func (this *QLocale) ToStringWithDateTime(dateTime *QDateTime) string { } func (this *QLocale) ToString9(date *QDate, format QLocale__FormatType, cal QCalendar) string { - var _ms *C.struct_miqt_string = C.QLocale_ToString9(this.h, date.cPointer(), (C.uintptr_t)(format), cal.cPointer()) + var _ms *C.struct_miqt_string = C.QLocale_ToString9(this.h, date.cPointer(), (C.int)(format), cal.cPointer()) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } func (this *QLocale) ToString10(dateTime *QDateTime, format QLocale__FormatType, cal QCalendar) string { - var _ms *C.struct_miqt_string = C.QLocale_ToString10(this.h, dateTime.cPointer(), (C.uintptr_t)(format), cal.cPointer()) + var _ms *C.struct_miqt_string = C.QLocale_ToString10(this.h, dateTime.cPointer(), (C.int)(format), cal.cPointer()) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -1275,7 +1275,7 @@ func (this *QLocale) ToDateTime2(stringVal string, format string) *QDateTime { func (this *QLocale) ToDate3(stringVal string, format QLocale__FormatType, cal QCalendar) *QDate { stringVal_ms := miqt_strdupg(stringVal) defer C.free(stringVal_ms) - _ret := C.QLocale_ToDate3(this.h, (*C.struct_miqt_string)(stringVal_ms), (C.uintptr_t)(format), cal.cPointer()) + _ret := C.QLocale_ToDate3(this.h, (*C.struct_miqt_string)(stringVal_ms), (C.int)(format), cal.cPointer()) _goptr := newQDate(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -1284,7 +1284,7 @@ func (this *QLocale) ToDate3(stringVal string, format QLocale__FormatType, cal Q func (this *QLocale) ToDateTime3(stringVal string, format QLocale__FormatType, cal QCalendar) *QDateTime { stringVal_ms := miqt_strdupg(stringVal) defer C.free(stringVal_ms) - _ret := C.QLocale_ToDateTime3(this.h, (*C.struct_miqt_string)(stringVal_ms), (C.uintptr_t)(format), cal.cPointer()) + _ret := C.QLocale_ToDateTime3(this.h, (*C.struct_miqt_string)(stringVal_ms), (C.int)(format), cal.cPointer()) _goptr := newQDateTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -1315,7 +1315,7 @@ func (this *QLocale) ToDateTime4(stringVal string, format string, cal QCalendar) func (this *QLocale) ToTime3(stringVal string, format QLocale__FormatType, cal QCalendar) *QTime { stringVal_ms := miqt_strdupg(stringVal) defer C.free(stringVal_ms) - _ret := C.QLocale_ToTime3(this.h, (*C.struct_miqt_string)(stringVal_ms), (C.uintptr_t)(format), cal.cPointer()) + _ret := C.QLocale_ToTime3(this.h, (*C.struct_miqt_string)(stringVal_ms), (C.int)(format), cal.cPointer()) _goptr := newQTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -1416,7 +1416,7 @@ func (this *QLocale) FirstDayOfWeek() DayOfWeek { func (this *QLocale) Weekdays() []DayOfWeek { var _ma *C.struct_miqt_array = C.QLocale_Weekdays(this.h) _ret := make([]DayOfWeek, int(_ma.len)) - _outCast := (*[0xffff]C.uintptr_t)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.int)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { _ret[i] = (DayOfWeek)(_outCast[i]) } @@ -1589,21 +1589,21 @@ func (this *QLocale) OperatorNotEqual(other *QLocale) bool { } func QLocale_LanguageToString(language QLocale__Language) string { - var _ms *C.struct_miqt_string = C.QLocale_LanguageToString((C.uintptr_t)(language)) + var _ms *C.struct_miqt_string = C.QLocale_LanguageToString((C.int)(language)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } func QLocale_CountryToString(country QLocale__Country) string { - var _ms *C.struct_miqt_string = C.QLocale_CountryToString((C.uintptr_t)(country)) + var _ms *C.struct_miqt_string = C.QLocale_CountryToString((C.int)(country)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } func QLocale_ScriptToString(script QLocale__Script) string { - var _ms *C.struct_miqt_string = C.QLocale_ScriptToString((C.uintptr_t)(script)) + var _ms *C.struct_miqt_string = C.QLocale_ScriptToString((C.int)(script)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -1628,7 +1628,7 @@ func QLocale_System() *QLocale { } func QLocale_MatchingLocales(language QLocale__Language, script QLocale__Script, country QLocale__Country) []QLocale { - var _ma *C.struct_miqt_array = C.QLocale_MatchingLocales((C.uintptr_t)(language), (C.uintptr_t)(script), (C.uintptr_t)(country)) + var _ma *C.struct_miqt_array = C.QLocale_MatchingLocales((C.int)(language), (C.int)(script), (C.int)(country)) _ret := make([]QLocale, int(_ma.len)) _outCast := (*[0xffff]*C.QLocale)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -1642,9 +1642,9 @@ func QLocale_MatchingLocales(language QLocale__Language, script QLocale__Script, } func QLocale_CountriesForLanguage(lang QLocale__Language) []QLocale__Country { - var _ma *C.struct_miqt_array = C.QLocale_CountriesForLanguage((C.uintptr_t)(lang)) + var _ma *C.struct_miqt_array = C.QLocale_CountriesForLanguage((C.int)(lang)) _ret := make([]QLocale__Country, int(_ma.len)) - _outCast := (*[0xffff]C.uintptr_t)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.int)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { _ret[i] = (QLocale__Country)(_outCast[i]) } @@ -1653,7 +1653,7 @@ func QLocale_CountriesForLanguage(lang QLocale__Language) []QLocale__Country { } func (this *QLocale) SetNumberOptions(options int) { - C.QLocale_SetNumberOptions(this.h, (C.int)(options)) + C.QLocale_SetNumberOptions(this.h, options) } func (this *QLocale) NumberOptions() int { @@ -1775,42 +1775,42 @@ func (this *QLocale) ToString33(i float32, f byte, prec int) string { } func (this *QLocale) ToString24(date *QDate, format QLocale__FormatType) string { - var _ms *C.struct_miqt_string = C.QLocale_ToString24(this.h, date.cPointer(), (C.uintptr_t)(format)) + var _ms *C.struct_miqt_string = C.QLocale_ToString24(this.h, date.cPointer(), (C.int)(format)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } func (this *QLocale) ToString25(time *QTime, format QLocale__FormatType) string { - var _ms *C.struct_miqt_string = C.QLocale_ToString25(this.h, time.cPointer(), (C.uintptr_t)(format)) + var _ms *C.struct_miqt_string = C.QLocale_ToString25(this.h, time.cPointer(), (C.int)(format)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } func (this *QLocale) ToString26(dateTime *QDateTime, format QLocale__FormatType) string { - var _ms *C.struct_miqt_string = C.QLocale_ToString26(this.h, dateTime.cPointer(), (C.uintptr_t)(format)) + var _ms *C.struct_miqt_string = C.QLocale_ToString26(this.h, dateTime.cPointer(), (C.int)(format)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } func (this *QLocale) DateFormat1(format QLocale__FormatType) string { - var _ms *C.struct_miqt_string = C.QLocale_DateFormat1(this.h, (C.uintptr_t)(format)) + var _ms *C.struct_miqt_string = C.QLocale_DateFormat1(this.h, (C.int)(format)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } func (this *QLocale) TimeFormat1(format QLocale__FormatType) string { - var _ms *C.struct_miqt_string = C.QLocale_TimeFormat1(this.h, (C.uintptr_t)(format)) + var _ms *C.struct_miqt_string = C.QLocale_TimeFormat1(this.h, (C.int)(format)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } func (this *QLocale) DateTimeFormat1(format QLocale__FormatType) string { - var _ms *C.struct_miqt_string = C.QLocale_DateTimeFormat1(this.h, (C.uintptr_t)(format)) + var _ms *C.struct_miqt_string = C.QLocale_DateTimeFormat1(this.h, (C.int)(format)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -1819,7 +1819,7 @@ func (this *QLocale) DateTimeFormat1(format QLocale__FormatType) string { func (this *QLocale) ToDate22(stringVal string, param2 QLocale__FormatType) *QDate { stringVal_ms := miqt_strdupg(stringVal) defer C.free(stringVal_ms) - _ret := C.QLocale_ToDate22(this.h, (*C.struct_miqt_string)(stringVal_ms), (C.uintptr_t)(param2)) + _ret := C.QLocale_ToDate22(this.h, (*C.struct_miqt_string)(stringVal_ms), (C.int)(param2)) _goptr := newQDate(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -1828,7 +1828,7 @@ func (this *QLocale) ToDate22(stringVal string, param2 QLocale__FormatType) *QDa func (this *QLocale) ToTime22(stringVal string, param2 QLocale__FormatType) *QTime { stringVal_ms := miqt_strdupg(stringVal) defer C.free(stringVal_ms) - _ret := C.QLocale_ToTime22(this.h, (*C.struct_miqt_string)(stringVal_ms), (C.uintptr_t)(param2)) + _ret := C.QLocale_ToTime22(this.h, (*C.struct_miqt_string)(stringVal_ms), (C.int)(param2)) _goptr := newQTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -1837,42 +1837,42 @@ func (this *QLocale) ToTime22(stringVal string, param2 QLocale__FormatType) *QTi func (this *QLocale) ToDateTime22(stringVal string, format QLocale__FormatType) *QDateTime { stringVal_ms := miqt_strdupg(stringVal) defer C.free(stringVal_ms) - _ret := C.QLocale_ToDateTime22(this.h, (*C.struct_miqt_string)(stringVal_ms), (C.uintptr_t)(format)) + _ret := C.QLocale_ToDateTime22(this.h, (*C.struct_miqt_string)(stringVal_ms), (C.int)(format)) _goptr := newQDateTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QLocale) MonthName2(param1 int, format QLocale__FormatType) string { - var _ms *C.struct_miqt_string = C.QLocale_MonthName2(this.h, (C.int)(param1), (C.uintptr_t)(format)) + var _ms *C.struct_miqt_string = C.QLocale_MonthName2(this.h, (C.int)(param1), (C.int)(format)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } func (this *QLocale) StandaloneMonthName2(param1 int, format QLocale__FormatType) string { - var _ms *C.struct_miqt_string = C.QLocale_StandaloneMonthName2(this.h, (C.int)(param1), (C.uintptr_t)(format)) + var _ms *C.struct_miqt_string = C.QLocale_StandaloneMonthName2(this.h, (C.int)(param1), (C.int)(format)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } func (this *QLocale) DayName2(param1 int, format QLocale__FormatType) string { - var _ms *C.struct_miqt_string = C.QLocale_DayName2(this.h, (C.int)(param1), (C.uintptr_t)(format)) + var _ms *C.struct_miqt_string = C.QLocale_DayName2(this.h, (C.int)(param1), (C.int)(format)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } func (this *QLocale) StandaloneDayName2(param1 int, format QLocale__FormatType) string { - var _ms *C.struct_miqt_string = C.QLocale_StandaloneDayName2(this.h, (C.int)(param1), (C.uintptr_t)(format)) + var _ms *C.struct_miqt_string = C.QLocale_StandaloneDayName2(this.h, (C.int)(param1), (C.int)(format)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } func (this *QLocale) CurrencySymbol1(param1 QLocale__CurrencySymbolFormat) string { - var _ms *C.struct_miqt_string = C.QLocale_CurrencySymbol1(this.h, (C.uintptr_t)(param1)) + var _ms *C.struct_miqt_string = C.QLocale_CurrencySymbol1(this.h, (C.int)(param1)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -1958,7 +1958,7 @@ func (this *QLocale) FormattedDataSize2(bytes int64, precision int) string { } func (this *QLocale) FormattedDataSize3(bytes int64, precision int, format int) string { - var _ms *C.struct_miqt_string = C.QLocale_FormattedDataSize3(this.h, (C.longlong)(bytes), (C.int)(precision), (C.int)(format)) + var _ms *C.struct_miqt_string = C.QLocale_FormattedDataSize3(this.h, (C.longlong)(bytes), (C.int)(precision), format) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -1972,7 +1972,7 @@ func (this *QLocale) FormattedDataSize22(bytes int64, precision int) string { } func (this *QLocale) FormattedDataSize32(bytes int64, precision int, format int) string { - var _ms *C.struct_miqt_string = C.QLocale_FormattedDataSize32(this.h, (C.longlong)(bytes), (C.int)(precision), (C.int)(format)) + var _ms *C.struct_miqt_string = C.QLocale_FormattedDataSize32(this.h, (C.longlong)(bytes), (C.int)(precision), format) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -1981,7 +1981,7 @@ func (this *QLocale) FormattedDataSize32(bytes int64, precision int, format int) func (this *QLocale) QuoteString2(str string, style QLocale__QuotationStyle) string { str_ms := miqt_strdupg(str) defer C.free(str_ms) - var _ms *C.struct_miqt_string = C.QLocale_QuoteString2(this.h, (*C.struct_miqt_string)(str_ms), (C.uintptr_t)(style)) + var _ms *C.struct_miqt_string = C.QLocale_QuoteString2(this.h, (*C.struct_miqt_string)(str_ms), (C.int)(style)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret diff --git a/qt/gen_qlocale.h b/qt/gen_qlocale.h index 79301af..dc9de32 100644 --- a/qt/gen_qlocale.h +++ b/qt/gen_qlocale.h @@ -31,15 +31,15 @@ typedef struct QTime QTime; QLocale* QLocale_new(); QLocale* QLocale_new2(struct miqt_string* name); -QLocale* QLocale_new3(uintptr_t language); -QLocale* QLocale_new4(uintptr_t language, uintptr_t script, uintptr_t country); +QLocale* QLocale_new3(int language); +QLocale* QLocale_new4(int language, int script, int country); QLocale* QLocale_new5(QLocale* other); -QLocale* QLocale_new6(uintptr_t language, uintptr_t country); +QLocale* QLocale_new6(int language, int country); void QLocale_OperatorAssign(QLocale* self, QLocale* other); void QLocale_Swap(QLocale* self, QLocale* other); -uintptr_t QLocale_Language(const QLocale* self); -uintptr_t QLocale_Script(const QLocale* self); -uintptr_t QLocale_Country(const QLocale* self); +int QLocale_Language(const QLocale* self); +int QLocale_Script(const QLocale* self); +int QLocale_Country(const QLocale* self); struct miqt_string* QLocale_Name(const QLocale* self); struct miqt_string* QLocale_Bcp47Name(const QLocale* self); struct miqt_string* QLocale_NativeLanguageName(const QLocale* self); @@ -50,12 +50,12 @@ int QLocale_ToInt(const QLocale* self, struct miqt_string* s); unsigned int QLocale_ToUInt(const QLocale* self, struct miqt_string* s); long QLocale_ToLong(const QLocale* self, struct miqt_string* s); unsigned long QLocale_ToULong(const QLocale* self, struct miqt_string* s); -int64_t QLocale_ToLongLong(const QLocale* self, struct miqt_string* s); -uint64_t QLocale_ToULongLong(const QLocale* self, struct miqt_string* s); +long long QLocale_ToLongLong(const QLocale* self, struct miqt_string* s); +unsigned long long QLocale_ToULongLong(const QLocale* self, struct miqt_string* s); float QLocale_ToFloat(const QLocale* self, struct miqt_string* s); double QLocale_ToDouble(const QLocale* self, struct miqt_string* s); -struct miqt_string* QLocale_ToString(const QLocale* self, int64_t i); -struct miqt_string* QLocale_ToStringWithQulonglong(const QLocale* self, uint64_t i); +struct miqt_string* QLocale_ToString(const QLocale* self, long long i); +struct miqt_string* QLocale_ToStringWithQulonglong(const QLocale* self, unsigned long long i); struct miqt_string* QLocale_ToStringWithLong(const QLocale* self, long i); struct miqt_string* QLocale_ToStringWithUlong(const QLocale* self, unsigned long i); struct miqt_string* QLocale_ToStringWithShort(const QLocale* self, int16_t i); @@ -70,8 +70,8 @@ struct miqt_string* QLocale_ToString4(const QLocale* self, QDateTime* dateTime, struct miqt_string* QLocale_ToStringWithDate(const QLocale* self, QDate* date); struct miqt_string* QLocale_ToStringWithTime(const QLocale* self, QTime* time); struct miqt_string* QLocale_ToStringWithDateTime(const QLocale* self, QDateTime* dateTime); -struct miqt_string* QLocale_ToString9(const QLocale* self, QDate* date, uintptr_t format, QCalendar* cal); -struct miqt_string* QLocale_ToString10(const QLocale* self, QDateTime* dateTime, uintptr_t format, QCalendar* cal); +struct miqt_string* QLocale_ToString9(const QLocale* self, QDate* date, int format, QCalendar* cal); +struct miqt_string* QLocale_ToString10(const QLocale* self, QDateTime* dateTime, int format, QCalendar* cal); struct miqt_string* QLocale_DateFormat(const QLocale* self); struct miqt_string* QLocale_TimeFormat(const QLocale* self); struct miqt_string* QLocale_DateTimeFormat(const QLocale* self); @@ -81,11 +81,11 @@ QDateTime* QLocale_ToDateTime(const QLocale* self, struct miqt_string* stringVal QDate* QLocale_ToDate2(const QLocale* self, struct miqt_string* stringVal, struct miqt_string* format); QTime* QLocale_ToTime2(const QLocale* self, struct miqt_string* stringVal, struct miqt_string* format); QDateTime* QLocale_ToDateTime2(const QLocale* self, struct miqt_string* stringVal, struct miqt_string* format); -QDate* QLocale_ToDate3(const QLocale* self, struct miqt_string* stringVal, uintptr_t format, QCalendar* cal); -QDateTime* QLocale_ToDateTime3(const QLocale* self, struct miqt_string* stringVal, uintptr_t format, QCalendar* cal); +QDate* QLocale_ToDate3(const QLocale* self, struct miqt_string* stringVal, int format, QCalendar* cal); +QDateTime* QLocale_ToDateTime3(const QLocale* self, struct miqt_string* stringVal, int format, QCalendar* cal); QDate* QLocale_ToDate4(const QLocale* self, struct miqt_string* stringVal, struct miqt_string* format, QCalendar* cal); QDateTime* QLocale_ToDateTime4(const QLocale* self, struct miqt_string* stringVal, struct miqt_string* format, QCalendar* cal); -QTime* QLocale_ToTime3(const QLocale* self, struct miqt_string* stringVal, uintptr_t format, QCalendar* cal); +QTime* QLocale_ToTime3(const QLocale* self, struct miqt_string* stringVal, int format, QCalendar* cal); QTime* QLocale_ToTime4(const QLocale* self, struct miqt_string* stringVal, struct miqt_string* format, QCalendar* cal); QChar* QLocale_DecimalPoint(const QLocale* self); QChar* QLocale_GroupSeparator(const QLocale* self); @@ -98,13 +98,13 @@ struct miqt_string* QLocale_MonthName(const QLocale* self, int param1); struct miqt_string* QLocale_StandaloneMonthName(const QLocale* self, int param1); struct miqt_string* QLocale_DayName(const QLocale* self, int param1); struct miqt_string* QLocale_StandaloneDayName(const QLocale* self, int param1); -uintptr_t QLocale_FirstDayOfWeek(const QLocale* self); +int QLocale_FirstDayOfWeek(const QLocale* self); struct miqt_array* QLocale_Weekdays(const QLocale* self); struct miqt_string* QLocale_AmText(const QLocale* self); struct miqt_string* QLocale_PmText(const QLocale* self); -uintptr_t QLocale_MeasurementSystem(const QLocale* self); +int QLocale_MeasurementSystem(const QLocale* self); QLocale* QLocale_Collation(const QLocale* self); -uintptr_t QLocale_TextDirection(const QLocale* self); +int QLocale_TextDirection(const QLocale* self); struct miqt_string* QLocale_ToUpper(const QLocale* self, struct miqt_string* str); struct miqt_string* QLocale_ToLower(const QLocale* self, struct miqt_string* str); struct miqt_string* QLocale_CurrencySymbol(const QLocale* self); @@ -123,14 +123,14 @@ struct miqt_string* QLocale_FormattedDataSizeWithBytes(const QLocale* self, long struct miqt_array* QLocale_UiLanguages(const QLocale* self); bool QLocale_OperatorEqual(const QLocale* self, QLocale* other); bool QLocale_OperatorNotEqual(const QLocale* self, QLocale* other); -struct miqt_string* QLocale_LanguageToString(uintptr_t language); -struct miqt_string* QLocale_CountryToString(uintptr_t country); -struct miqt_string* QLocale_ScriptToString(uintptr_t script); +struct miqt_string* QLocale_LanguageToString(int language); +struct miqt_string* QLocale_CountryToString(int country); +struct miqt_string* QLocale_ScriptToString(int script); void QLocale_SetDefault(QLocale* locale); QLocale* QLocale_C(); QLocale* QLocale_System(); -struct miqt_array* QLocale_MatchingLocales(uintptr_t language, uintptr_t script, uintptr_t country); -struct miqt_array* QLocale_CountriesForLanguage(uintptr_t lang); +struct miqt_array* QLocale_MatchingLocales(int language, int script, int country); +struct miqt_array* QLocale_CountriesForLanguage(int lang); void QLocale_SetNumberOptions(QLocale* self, int options); int QLocale_NumberOptions(const QLocale* self); struct miqt_string* QLocale_QuoteString(const QLocale* self, struct miqt_string* str); @@ -141,28 +141,28 @@ int QLocale_ToInt2(const QLocale* self, struct miqt_string* s, bool* ok); unsigned int QLocale_ToUInt2(const QLocale* self, struct miqt_string* s, bool* ok); long QLocale_ToLong2(const QLocale* self, struct miqt_string* s, bool* ok); unsigned long QLocale_ToULong2(const QLocale* self, struct miqt_string* s, bool* ok); -int64_t QLocale_ToLongLong2(const QLocale* self, struct miqt_string* s, bool* ok); -uint64_t QLocale_ToULongLong2(const QLocale* self, struct miqt_string* s, bool* ok); +long long QLocale_ToLongLong2(const QLocale* self, struct miqt_string* s, bool* ok); +unsigned long long QLocale_ToULongLong2(const QLocale* self, struct miqt_string* s, bool* ok); float QLocale_ToFloat2(const QLocale* self, struct miqt_string* s, bool* ok); double QLocale_ToDouble2(const QLocale* self, struct miqt_string* s, bool* ok); struct miqt_string* QLocale_ToString22(const QLocale* self, double i, char f); struct miqt_string* QLocale_ToString32(const QLocale* self, double i, char f, int prec); struct miqt_string* QLocale_ToString23(const QLocale* self, float i, char f); struct miqt_string* QLocale_ToString33(const QLocale* self, float i, char f, int prec); -struct miqt_string* QLocale_ToString24(const QLocale* self, QDate* date, uintptr_t format); -struct miqt_string* QLocale_ToString25(const QLocale* self, QTime* time, uintptr_t format); -struct miqt_string* QLocale_ToString26(const QLocale* self, QDateTime* dateTime, uintptr_t format); -struct miqt_string* QLocale_DateFormat1(const QLocale* self, uintptr_t format); -struct miqt_string* QLocale_TimeFormat1(const QLocale* self, uintptr_t format); -struct miqt_string* QLocale_DateTimeFormat1(const QLocale* self, uintptr_t format); -QDate* QLocale_ToDate22(const QLocale* self, struct miqt_string* stringVal, uintptr_t param2); -QTime* QLocale_ToTime22(const QLocale* self, struct miqt_string* stringVal, uintptr_t param2); -QDateTime* QLocale_ToDateTime22(const QLocale* self, struct miqt_string* stringVal, uintptr_t format); -struct miqt_string* QLocale_MonthName2(const QLocale* self, int param1, uintptr_t format); -struct miqt_string* QLocale_StandaloneMonthName2(const QLocale* self, int param1, uintptr_t format); -struct miqt_string* QLocale_DayName2(const QLocale* self, int param1, uintptr_t format); -struct miqt_string* QLocale_StandaloneDayName2(const QLocale* self, int param1, uintptr_t format); -struct miqt_string* QLocale_CurrencySymbol1(const QLocale* self, uintptr_t param1); +struct miqt_string* QLocale_ToString24(const QLocale* self, QDate* date, int format); +struct miqt_string* QLocale_ToString25(const QLocale* self, QTime* time, int format); +struct miqt_string* QLocale_ToString26(const QLocale* self, QDateTime* dateTime, int format); +struct miqt_string* QLocale_DateFormat1(const QLocale* self, int format); +struct miqt_string* QLocale_TimeFormat1(const QLocale* self, int format); +struct miqt_string* QLocale_DateTimeFormat1(const QLocale* self, int format); +QDate* QLocale_ToDate22(const QLocale* self, struct miqt_string* stringVal, int param2); +QTime* QLocale_ToTime22(const QLocale* self, struct miqt_string* stringVal, int param2); +QDateTime* QLocale_ToDateTime22(const QLocale* self, struct miqt_string* stringVal, int format); +struct miqt_string* QLocale_MonthName2(const QLocale* self, int param1, int format); +struct miqt_string* QLocale_StandaloneMonthName2(const QLocale* self, int param1, int format); +struct miqt_string* QLocale_DayName2(const QLocale* self, int param1, int format); +struct miqt_string* QLocale_StandaloneDayName2(const QLocale* self, int param1, int format); +struct miqt_string* QLocale_CurrencySymbol1(const QLocale* self, int param1); struct miqt_string* QLocale_ToCurrencyString22(const QLocale* self, long long param1, struct miqt_string* symbol); struct miqt_string* QLocale_ToCurrencyString23(const QLocale* self, unsigned long long param1, struct miqt_string* symbol); struct miqt_string* QLocale_ToCurrencyString24(const QLocale* self, int16_t param1, struct miqt_string* symbol); @@ -175,7 +175,7 @@ struct miqt_string* QLocale_FormattedDataSize2(QLocale* self, long long bytes, i struct miqt_string* QLocale_FormattedDataSize3(QLocale* self, long long bytes, int precision, int format); struct miqt_string* QLocale_FormattedDataSize22(const QLocale* self, long long bytes, int precision); struct miqt_string* QLocale_FormattedDataSize32(const QLocale* self, long long bytes, int precision, int format); -struct miqt_string* QLocale_QuoteString2(const QLocale* self, struct miqt_string* str, uintptr_t style); +struct miqt_string* QLocale_QuoteString2(const QLocale* self, struct miqt_string* str, int style); void QLocale_Delete(QLocale* self); #ifdef __cplusplus diff --git a/qt/gen_qlockfile.cpp b/qt/gen_qlockfile.cpp index 000c9a1..96f57b1 100644 --- a/qt/gen_qlockfile.cpp +++ b/qt/gen_qlockfile.cpp @@ -39,9 +39,9 @@ bool QLockFile_RemoveStaleLockFile(QLockFile* self) { return self->removeStaleLockFile(); } -uintptr_t QLockFile_Error(const QLockFile* self) { +int QLockFile_Error(const QLockFile* self) { QLockFile::LockError _ret = self->error(); - return static_cast(_ret); + return static_cast(_ret); } bool QLockFile_TryLock1(QLockFile* self, int timeout) { diff --git a/qt/gen_qlockfile.h b/qt/gen_qlockfile.h index a62a153..ace760f 100644 --- a/qt/gen_qlockfile.h +++ b/qt/gen_qlockfile.h @@ -27,7 +27,7 @@ void QLockFile_SetStaleLockTime(QLockFile* self, int staleLockTime); int QLockFile_StaleLockTime(const QLockFile* self); bool QLockFile_IsLocked(const QLockFile* self); bool QLockFile_RemoveStaleLockFile(QLockFile* self); -uintptr_t QLockFile_Error(const QLockFile* self); +int QLockFile_Error(const QLockFile* self); bool QLockFile_TryLock1(QLockFile* self, int timeout); void QLockFile_Delete(QLockFile* self); diff --git a/qt/gen_qmainwindow.cpp b/qt/gen_qmainwindow.cpp index d478557..3aa0cda 100644 --- a/qt/gen_qmainwindow.cpp +++ b/qt/gen_qmainwindow.cpp @@ -55,12 +55,12 @@ void QMainWindow_SetIconSize(QMainWindow* self, QSize* iconSize) { self->setIconSize(*iconSize); } -uintptr_t QMainWindow_ToolButtonStyle(const QMainWindow* self) { +int QMainWindow_ToolButtonStyle(const QMainWindow* self) { Qt::ToolButtonStyle _ret = self->toolButtonStyle(); - return static_cast(_ret); + return static_cast(_ret); } -void QMainWindow_SetToolButtonStyle(QMainWindow* self, uintptr_t toolButtonStyle) { +void QMainWindow_SetToolButtonStyle(QMainWindow* self, int toolButtonStyle) { self->setToolButtonStyle(static_cast(toolButtonStyle)); } @@ -80,21 +80,21 @@ void QMainWindow_SetDocumentMode(QMainWindow* self, bool enabled) { self->setDocumentMode(enabled); } -uintptr_t QMainWindow_TabShape(const QMainWindow* self) { +int QMainWindow_TabShape(const QMainWindow* self) { QTabWidget::TabShape _ret = self->tabShape(); - return static_cast(_ret); + return static_cast(_ret); } -void QMainWindow_SetTabShape(QMainWindow* self, uintptr_t tabShape) { +void QMainWindow_SetTabShape(QMainWindow* self, int tabShape) { self->setTabShape(static_cast(tabShape)); } -uintptr_t QMainWindow_TabPosition(const QMainWindow* self, uintptr_t area) { +int QMainWindow_TabPosition(const QMainWindow* self, int area) { QTabWidget::TabPosition _ret = self->tabPosition(static_cast(area)); - return static_cast(_ret); + return static_cast(_ret); } -void QMainWindow_SetTabPosition(QMainWindow* self, int areas, uintptr_t tabPosition) { +void QMainWindow_SetTabPosition(QMainWindow* self, int areas, int tabPosition) { self->setTabPosition(static_cast(areas), static_cast(tabPosition)); } @@ -147,13 +147,13 @@ QWidget* QMainWindow_TakeCentralWidget(QMainWindow* self) { return self->takeCentralWidget(); } -void QMainWindow_SetCorner(QMainWindow* self, uintptr_t corner, uintptr_t area) { +void QMainWindow_SetCorner(QMainWindow* self, int corner, int area) { self->setCorner(static_cast(corner), static_cast(area)); } -uintptr_t QMainWindow_Corner(const QMainWindow* self, uintptr_t corner) { +int QMainWindow_Corner(const QMainWindow* self, int corner) { Qt::DockWidgetArea _ret = self->corner(static_cast(corner)); - return static_cast(_ret); + return static_cast(_ret); } void QMainWindow_AddToolBarBreak(QMainWindow* self) { @@ -164,7 +164,7 @@ void QMainWindow_InsertToolBarBreak(QMainWindow* self, QToolBar* before) { self->insertToolBarBreak(before); } -void QMainWindow_AddToolBar(QMainWindow* self, uintptr_t area, QToolBar* toolbar) { +void QMainWindow_AddToolBar(QMainWindow* self, int area, QToolBar* toolbar) { self->addToolBar(static_cast(area), toolbar); } @@ -193,24 +193,24 @@ bool QMainWindow_UnifiedTitleAndToolBarOnMac(const QMainWindow* self) { return self->unifiedTitleAndToolBarOnMac(); } -uintptr_t QMainWindow_ToolBarArea(const QMainWindow* self, QToolBar* toolbar) { +int QMainWindow_ToolBarArea(const QMainWindow* self, QToolBar* toolbar) { Qt::ToolBarArea _ret = self->toolBarArea(toolbar); - return static_cast(_ret); + return static_cast(_ret); } bool QMainWindow_ToolBarBreak(const QMainWindow* self, QToolBar* toolbar) { return self->toolBarBreak(toolbar); } -void QMainWindow_AddDockWidget(QMainWindow* self, uintptr_t area, QDockWidget* dockwidget) { +void QMainWindow_AddDockWidget(QMainWindow* self, int area, QDockWidget* dockwidget) { self->addDockWidget(static_cast(area), dockwidget); } -void QMainWindow_AddDockWidget2(QMainWindow* self, uintptr_t area, QDockWidget* dockwidget, uintptr_t orientation) { +void QMainWindow_AddDockWidget2(QMainWindow* self, int area, QDockWidget* dockwidget, int orientation) { self->addDockWidget(static_cast(area), dockwidget, static_cast(orientation)); } -void QMainWindow_SplitDockWidget(QMainWindow* self, QDockWidget* after, QDockWidget* dockwidget, uintptr_t orientation) { +void QMainWindow_SplitDockWidget(QMainWindow* self, QDockWidget* after, QDockWidget* dockwidget, int orientation) { self->splitDockWidget(after, dockwidget, static_cast(orientation)); } @@ -219,7 +219,7 @@ void QMainWindow_TabifyDockWidget(QMainWindow* self, QDockWidget* first, QDockWi } struct miqt_array* QMainWindow_TabifiedDockWidgets(const QMainWindow* self, QDockWidget* dockwidget) { - QList _ret = self->tabifiedDockWidgets(dockwidget); + QList _ret = self->tabifiedDockWidgets(dockwidget); // Convert QList<> from C++ memory to manually-managed C memory QDockWidget** _arr = static_cast(malloc(sizeof(QDockWidget*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -239,12 +239,12 @@ bool QMainWindow_RestoreDockWidget(QMainWindow* self, QDockWidget* dockwidget) { return self->restoreDockWidget(dockwidget); } -uintptr_t QMainWindow_DockWidgetArea(const QMainWindow* self, QDockWidget* dockwidget) { +int QMainWindow_DockWidgetArea(const QMainWindow* self, QDockWidget* dockwidget) { Qt::DockWidgetArea _ret = self->dockWidgetArea(dockwidget); - return static_cast(_ret); + return static_cast(_ret); } -void QMainWindow_ResizeDocks(QMainWindow* self, struct miqt_array* /* of QDockWidget* */ docks, struct miqt_array* /* of int */ sizes, uintptr_t orientation) { +void QMainWindow_ResizeDocks(QMainWindow* self, struct miqt_array* /* of QDockWidget* */ docks, struct miqt_array* /* of int */ sizes, int orientation) { QList docks_QList; docks_QList.reserve(docks->len); QDockWidget** docks_arr = static_cast(docks->data); @@ -297,14 +297,14 @@ void QMainWindow_connect_IconSizeChanged(QMainWindow* self, void* slot) { }); } -void QMainWindow_ToolButtonStyleChanged(QMainWindow* self, uintptr_t toolButtonStyle) { +void QMainWindow_ToolButtonStyleChanged(QMainWindow* self, int toolButtonStyle) { self->toolButtonStyleChanged(static_cast(toolButtonStyle)); } void QMainWindow_connect_ToolButtonStyleChanged(QMainWindow* self, void* slot) { QMainWindow::connect(self, static_cast(&QMainWindow::toolButtonStyleChanged), self, [=](Qt::ToolButtonStyle toolButtonStyle) { Qt::ToolButtonStyle toolButtonStyle_ret = toolButtonStyle; - uintptr_t sigval1 = static_cast(toolButtonStyle_ret); + int sigval1 = static_cast(toolButtonStyle_ret); miqt_exec_callback_QMainWindow_ToolButtonStyleChanged(slot, sigval1); }); } @@ -348,7 +348,7 @@ struct miqt_string* QMainWindow_TrUtf83(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -void QMainWindow_AddToolBarBreak1(QMainWindow* self, uintptr_t area) { +void QMainWindow_AddToolBarBreak1(QMainWindow* self, int area) { self->addToolBarBreak(static_cast(area)); } diff --git a/qt/gen_qmainwindow.go b/qt/gen_qmainwindow.go index 76c6dbf..5f0942b 100644 --- a/qt/gen_qmainwindow.go +++ b/qt/gen_qmainwindow.go @@ -62,7 +62,7 @@ func NewQMainWindow2(parent *QWidget) *QMainWindow { // NewQMainWindow3 constructs a new QMainWindow object. func NewQMainWindow3(parent *QWidget, flags int) *QMainWindow { - ret := C.QMainWindow_new3(parent.cPointer(), (C.int)(flags)) + ret := C.QMainWindow_new3(parent.cPointer(), flags) return newQMainWindow(ret) } @@ -104,7 +104,7 @@ func (this *QMainWindow) ToolButtonStyle() ToolButtonStyle { } func (this *QMainWindow) SetToolButtonStyle(toolButtonStyle ToolButtonStyle) { - C.QMainWindow_SetToolButtonStyle(this.h, (C.uintptr_t)(toolButtonStyle)) + C.QMainWindow_SetToolButtonStyle(this.h, (C.int)(toolButtonStyle)) } func (this *QMainWindow) IsAnimated() bool { @@ -128,19 +128,19 @@ func (this *QMainWindow) TabShape() QTabWidget__TabShape { } func (this *QMainWindow) SetTabShape(tabShape QTabWidget__TabShape) { - C.QMainWindow_SetTabShape(this.h, (C.uintptr_t)(tabShape)) + C.QMainWindow_SetTabShape(this.h, (C.int)(tabShape)) } func (this *QMainWindow) TabPosition(area DockWidgetArea) QTabWidget__TabPosition { - return (QTabWidget__TabPosition)(C.QMainWindow_TabPosition(this.h, (C.uintptr_t)(area))) + return (QTabWidget__TabPosition)(C.QMainWindow_TabPosition(this.h, (C.int)(area))) } func (this *QMainWindow) SetTabPosition(areas int, tabPosition QTabWidget__TabPosition) { - C.QMainWindow_SetTabPosition(this.h, (C.int)(areas), (C.uintptr_t)(tabPosition)) + C.QMainWindow_SetTabPosition(this.h, areas, (C.int)(tabPosition)) } func (this *QMainWindow) SetDockOptions(options int) { - C.QMainWindow_SetDockOptions(this.h, (C.int)(options)) + C.QMainWindow_SetDockOptions(this.h, options) } func (this *QMainWindow) DockOptions() int { @@ -188,11 +188,11 @@ func (this *QMainWindow) TakeCentralWidget() *QWidget { } func (this *QMainWindow) SetCorner(corner Corner, area DockWidgetArea) { - C.QMainWindow_SetCorner(this.h, (C.uintptr_t)(corner), (C.uintptr_t)(area)) + C.QMainWindow_SetCorner(this.h, (C.int)(corner), (C.int)(area)) } func (this *QMainWindow) Corner(corner Corner) DockWidgetArea { - return (DockWidgetArea)(C.QMainWindow_Corner(this.h, (C.uintptr_t)(corner))) + return (DockWidgetArea)(C.QMainWindow_Corner(this.h, (C.int)(corner))) } func (this *QMainWindow) AddToolBarBreak() { @@ -204,7 +204,7 @@ func (this *QMainWindow) InsertToolBarBreak(before *QToolBar) { } func (this *QMainWindow) AddToolBar(area ToolBarArea, toolbar *QToolBar) { - C.QMainWindow_AddToolBar(this.h, (C.uintptr_t)(area), toolbar.cPointer()) + C.QMainWindow_AddToolBar(this.h, (C.int)(area), toolbar.cPointer()) } func (this *QMainWindow) AddToolBarWithToolbar(toolbar *QToolBar) { @@ -242,15 +242,15 @@ func (this *QMainWindow) ToolBarBreak(toolbar *QToolBar) bool { } func (this *QMainWindow) AddDockWidget(area DockWidgetArea, dockwidget *QDockWidget) { - C.QMainWindow_AddDockWidget(this.h, (C.uintptr_t)(area), dockwidget.cPointer()) + C.QMainWindow_AddDockWidget(this.h, (C.int)(area), dockwidget.cPointer()) } func (this *QMainWindow) AddDockWidget2(area DockWidgetArea, dockwidget *QDockWidget, orientation Orientation) { - C.QMainWindow_AddDockWidget2(this.h, (C.uintptr_t)(area), dockwidget.cPointer(), (C.uintptr_t)(orientation)) + C.QMainWindow_AddDockWidget2(this.h, (C.int)(area), dockwidget.cPointer(), (C.int)(orientation)) } func (this *QMainWindow) SplitDockWidget(after *QDockWidget, dockwidget *QDockWidget, orientation Orientation) { - C.QMainWindow_SplitDockWidget(this.h, after.cPointer(), dockwidget.cPointer(), (C.uintptr_t)(orientation)) + C.QMainWindow_SplitDockWidget(this.h, after.cPointer(), dockwidget.cPointer(), (C.int)(orientation)) } func (this *QMainWindow) TabifyDockWidget(first *QDockWidget, second *QDockWidget) { @@ -297,7 +297,7 @@ func (this *QMainWindow) ResizeDocks(docks []*QDockWidget, sizes []int, orientat } sizes_ma := &C.struct_miqt_array{len: C.size_t(len(sizes)), data: unsafe.Pointer(sizes_CArray)} defer runtime.KeepAlive(unsafe.Pointer(sizes_ma)) - C.QMainWindow_ResizeDocks(this.h, docks_ma, sizes_ma, (C.uintptr_t)(orientation)) + C.QMainWindow_ResizeDocks(this.h, docks_ma, sizes_ma, (C.int)(orientation)) } func (this *QMainWindow) SaveState() *QByteArray { @@ -348,14 +348,14 @@ func miqt_exec_callback_QMainWindow_IconSizeChanged(cb *C.void, iconSize *C.QSiz } func (this *QMainWindow) ToolButtonStyleChanged(toolButtonStyle ToolButtonStyle) { - C.QMainWindow_ToolButtonStyleChanged(this.h, (C.uintptr_t)(toolButtonStyle)) + C.QMainWindow_ToolButtonStyleChanged(this.h, (C.int)(toolButtonStyle)) } func (this *QMainWindow) OnToolButtonStyleChanged(slot func(toolButtonStyle ToolButtonStyle)) { C.QMainWindow_connect_ToolButtonStyleChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QMainWindow_ToolButtonStyleChanged -func miqt_exec_callback_QMainWindow_ToolButtonStyleChanged(cb *C.void, toolButtonStyle C.uintptr_t) { +func miqt_exec_callback_QMainWindow_ToolButtonStyleChanged(cb *C.void, toolButtonStyle C.int) { gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(toolButtonStyle ToolButtonStyle)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -432,7 +432,7 @@ func QMainWindow_TrUtf83(s string, c string, n int) string { } func (this *QMainWindow) AddToolBarBreak1(area ToolBarArea) { - C.QMainWindow_AddToolBarBreak1(this.h, (C.uintptr_t)(area)) + C.QMainWindow_AddToolBarBreak1(this.h, (C.int)(area)) } func (this *QMainWindow) SaveState1(version int) *QByteArray { diff --git a/qt/gen_qmainwindow.h b/qt/gen_qmainwindow.h index 0e40987..99ae666 100644 --- a/qt/gen_qmainwindow.h +++ b/qt/gen_qmainwindow.h @@ -47,16 +47,16 @@ struct miqt_string* QMainWindow_Tr(const char* s); struct miqt_string* QMainWindow_TrUtf8(const char* s); QSize* QMainWindow_IconSize(const QMainWindow* self); void QMainWindow_SetIconSize(QMainWindow* self, QSize* iconSize); -uintptr_t QMainWindow_ToolButtonStyle(const QMainWindow* self); -void QMainWindow_SetToolButtonStyle(QMainWindow* self, uintptr_t toolButtonStyle); +int QMainWindow_ToolButtonStyle(const QMainWindow* self); +void QMainWindow_SetToolButtonStyle(QMainWindow* self, int toolButtonStyle); bool QMainWindow_IsAnimated(const QMainWindow* self); bool QMainWindow_IsDockNestingEnabled(const QMainWindow* self); bool QMainWindow_DocumentMode(const QMainWindow* self); void QMainWindow_SetDocumentMode(QMainWindow* self, bool enabled); -uintptr_t QMainWindow_TabShape(const QMainWindow* self); -void QMainWindow_SetTabShape(QMainWindow* self, uintptr_t tabShape); -uintptr_t QMainWindow_TabPosition(const QMainWindow* self, uintptr_t area); -void QMainWindow_SetTabPosition(QMainWindow* self, int areas, uintptr_t tabPosition); +int QMainWindow_TabShape(const QMainWindow* self); +void QMainWindow_SetTabShape(QMainWindow* self, int tabShape); +int QMainWindow_TabPosition(const QMainWindow* self, int area); +void QMainWindow_SetTabPosition(QMainWindow* self, int areas, int tabPosition); void QMainWindow_SetDockOptions(QMainWindow* self, int options); int QMainWindow_DockOptions(const QMainWindow* self); bool QMainWindow_IsSeparator(const QMainWindow* self, QPoint* pos); @@ -69,28 +69,28 @@ void QMainWindow_SetStatusBar(QMainWindow* self, QStatusBar* statusbar); QWidget* QMainWindow_CentralWidget(const QMainWindow* self); void QMainWindow_SetCentralWidget(QMainWindow* self, QWidget* widget); QWidget* QMainWindow_TakeCentralWidget(QMainWindow* self); -void QMainWindow_SetCorner(QMainWindow* self, uintptr_t corner, uintptr_t area); -uintptr_t QMainWindow_Corner(const QMainWindow* self, uintptr_t corner); +void QMainWindow_SetCorner(QMainWindow* self, int corner, int area); +int QMainWindow_Corner(const QMainWindow* self, int corner); void QMainWindow_AddToolBarBreak(QMainWindow* self); void QMainWindow_InsertToolBarBreak(QMainWindow* self, QToolBar* before); -void QMainWindow_AddToolBar(QMainWindow* self, uintptr_t area, QToolBar* toolbar); +void QMainWindow_AddToolBar(QMainWindow* self, int area, QToolBar* toolbar); void QMainWindow_AddToolBarWithToolbar(QMainWindow* self, QToolBar* toolbar); QToolBar* QMainWindow_AddToolBarWithTitle(QMainWindow* self, struct miqt_string* title); void QMainWindow_InsertToolBar(QMainWindow* self, QToolBar* before, QToolBar* toolbar); void QMainWindow_RemoveToolBar(QMainWindow* self, QToolBar* toolbar); void QMainWindow_RemoveToolBarBreak(QMainWindow* self, QToolBar* before); bool QMainWindow_UnifiedTitleAndToolBarOnMac(const QMainWindow* self); -uintptr_t QMainWindow_ToolBarArea(const QMainWindow* self, QToolBar* toolbar); +int QMainWindow_ToolBarArea(const QMainWindow* self, QToolBar* toolbar); bool QMainWindow_ToolBarBreak(const QMainWindow* self, QToolBar* toolbar); -void QMainWindow_AddDockWidget(QMainWindow* self, uintptr_t area, QDockWidget* dockwidget); -void QMainWindow_AddDockWidget2(QMainWindow* self, uintptr_t area, QDockWidget* dockwidget, uintptr_t orientation); -void QMainWindow_SplitDockWidget(QMainWindow* self, QDockWidget* after, QDockWidget* dockwidget, uintptr_t orientation); +void QMainWindow_AddDockWidget(QMainWindow* self, int area, QDockWidget* dockwidget); +void QMainWindow_AddDockWidget2(QMainWindow* self, int area, QDockWidget* dockwidget, int orientation); +void QMainWindow_SplitDockWidget(QMainWindow* self, QDockWidget* after, QDockWidget* dockwidget, int orientation); void QMainWindow_TabifyDockWidget(QMainWindow* self, QDockWidget* first, QDockWidget* second); struct miqt_array* QMainWindow_TabifiedDockWidgets(const QMainWindow* self, QDockWidget* dockwidget); void QMainWindow_RemoveDockWidget(QMainWindow* self, QDockWidget* dockwidget); bool QMainWindow_RestoreDockWidget(QMainWindow* self, QDockWidget* dockwidget); -uintptr_t QMainWindow_DockWidgetArea(const QMainWindow* self, QDockWidget* dockwidget); -void QMainWindow_ResizeDocks(QMainWindow* self, struct miqt_array* /* of QDockWidget* */ docks, struct miqt_array* /* of int */ sizes, uintptr_t orientation); +int QMainWindow_DockWidgetArea(const QMainWindow* self, QDockWidget* dockwidget); +void QMainWindow_ResizeDocks(QMainWindow* self, struct miqt_array* /* of QDockWidget* */ docks, struct miqt_array* /* of int */ sizes, int orientation); QByteArray* QMainWindow_SaveState(const QMainWindow* self); bool QMainWindow_RestoreState(QMainWindow* self, QByteArray* state); QMenu* QMainWindow_CreatePopupMenu(QMainWindow* self); @@ -99,7 +99,7 @@ void QMainWindow_SetDockNestingEnabled(QMainWindow* self, bool enabled); void QMainWindow_SetUnifiedTitleAndToolBarOnMac(QMainWindow* self, bool set); void QMainWindow_IconSizeChanged(QMainWindow* self, QSize* iconSize); void QMainWindow_connect_IconSizeChanged(QMainWindow* self, void* slot); -void QMainWindow_ToolButtonStyleChanged(QMainWindow* self, uintptr_t toolButtonStyle); +void QMainWindow_ToolButtonStyleChanged(QMainWindow* self, int toolButtonStyle); void QMainWindow_connect_ToolButtonStyleChanged(QMainWindow* self, void* slot); void QMainWindow_TabifiedDockWidgetActivated(QMainWindow* self, QDockWidget* dockWidget); void QMainWindow_connect_TabifiedDockWidgetActivated(QMainWindow* self, void* slot); @@ -107,7 +107,7 @@ struct miqt_string* QMainWindow_Tr2(const char* s, const char* c); struct miqt_string* QMainWindow_Tr3(const char* s, const char* c, int n); struct miqt_string* QMainWindow_TrUtf82(const char* s, const char* c); struct miqt_string* QMainWindow_TrUtf83(const char* s, const char* c, int n); -void QMainWindow_AddToolBarBreak1(QMainWindow* self, uintptr_t area); +void QMainWindow_AddToolBarBreak1(QMainWindow* self, int area); QByteArray* QMainWindow_SaveState1(const QMainWindow* self, int version); bool QMainWindow_RestoreState2(QMainWindow* self, QByteArray* state, int version); void QMainWindow_Delete(QMainWindow* self); diff --git a/qt/gen_qmap.cpp b/qt/gen_qmap.cpp index 1f8a1f7..7ada1a0 100644 --- a/qt/gen_qmap.cpp +++ b/qt/gen_qmap.cpp @@ -24,12 +24,12 @@ QMapNodeBase* QMapNodeBase_PreviousNode2(QMapNodeBase* self) { return self->previousNode(); } -uintptr_t QMapNodeBase_Color(const QMapNodeBase* self) { +int QMapNodeBase_Color(const QMapNodeBase* self) { QMapNodeBase::Color _ret = self->color(); - return static_cast(_ret); + return static_cast(_ret); } -void QMapNodeBase_SetColor(QMapNodeBase* self, uintptr_t c) { +void QMapNodeBase_SetColor(QMapNodeBase* self, int c) { self->setColor(static_cast(c)); } diff --git a/qt/gen_qmap.go b/qt/gen_qmap.go index 76054a2..590d7fa 100644 --- a/qt/gen_qmap.go +++ b/qt/gen_qmap.go @@ -75,7 +75,7 @@ func (this *QMapNodeBase) Color() QMapNodeBase__Color { } func (this *QMapNodeBase) SetColor(c QMapNodeBase__Color) { - C.QMapNodeBase_SetColor(this.h, (C.uintptr_t)(c)) + C.QMapNodeBase_SetColor(this.h, (C.int)(c)) } func (this *QMapNodeBase) Parent() *QMapNodeBase { diff --git a/qt/gen_qmap.h b/qt/gen_qmap.h index dcd6ed6..f77455d 100644 --- a/qt/gen_qmap.h +++ b/qt/gen_qmap.h @@ -26,8 +26,8 @@ QMapNodeBase* QMapNodeBase_NextNode(const QMapNodeBase* self); QMapNodeBase* QMapNodeBase_NextNode2(QMapNodeBase* self); QMapNodeBase* QMapNodeBase_PreviousNode(const QMapNodeBase* self); QMapNodeBase* QMapNodeBase_PreviousNode2(QMapNodeBase* self); -uintptr_t QMapNodeBase_Color(const QMapNodeBase* self); -void QMapNodeBase_SetColor(QMapNodeBase* self, uintptr_t c); +int QMapNodeBase_Color(const QMapNodeBase* self); +void QMapNodeBase_SetColor(QMapNodeBase* self, int c); QMapNodeBase* QMapNodeBase_Parent(const QMapNodeBase* self); void QMapNodeBase_SetParent(QMapNodeBase* self, QMapNodeBase* pp); void QMapNodeBase_OperatorAssign(QMapNodeBase* self, QMapNodeBase* param1); diff --git a/qt/gen_qmargins.cpp b/qt/gen_qmargins.cpp index 3c5eae1..99fd4ab 100644 --- a/qt/gen_qmargins.cpp +++ b/qt/gen_qmargins.cpp @@ -125,19 +125,23 @@ bool QMarginsF_IsNull(const QMarginsF* self) { } double QMarginsF_Left(const QMarginsF* self) { - return self->left(); + qreal _ret = self->left(); + return static_cast(_ret); } double QMarginsF_Top(const QMarginsF* self) { - return self->top(); + qreal _ret = self->top(); + return static_cast(_ret); } double QMarginsF_Right(const QMarginsF* self) { - return self->right(); + qreal _ret = self->right(); + return static_cast(_ret); } double QMarginsF_Bottom(const QMarginsF* self) { - return self->bottom(); + qreal _ret = self->bottom(); + return static_cast(_ret); } void QMarginsF_SetLeft(QMarginsF* self, double left) { diff --git a/qt/gen_qmatrix.cpp b/qt/gen_qmatrix.cpp index 981ab44..5a9b32e 100644 --- a/qt/gen_qmatrix.cpp +++ b/qt/gen_qmatrix.cpp @@ -11,7 +11,7 @@ #include "gen_qmatrix.h" #include "_cgo_export.h" -QMatrix* QMatrix_new(uintptr_t param1) { +QMatrix* QMatrix_new(int param1) { return new QMatrix(static_cast(param1)); } @@ -36,27 +36,33 @@ void QMatrix_SetMatrix(QMatrix* self, double m11, double m12, double m21, double } double QMatrix_M11(const QMatrix* self) { - return self->m11(); + qreal _ret = self->m11(); + return static_cast(_ret); } double QMatrix_M12(const QMatrix* self) { - return self->m12(); + qreal _ret = self->m12(); + return static_cast(_ret); } double QMatrix_M21(const QMatrix* self) { - return self->m21(); + qreal _ret = self->m21(); + return static_cast(_ret); } double QMatrix_M22(const QMatrix* self) { - return self->m22(); + qreal _ret = self->m22(); + return static_cast(_ret); } double QMatrix_Dx(const QMatrix* self) { - return self->dx(); + qreal _ret = self->dx(); + return static_cast(_ret); } double QMatrix_Dy(const QMatrix* self) { - return self->dy(); + qreal _ret = self->dy(); + return static_cast(_ret); } void QMatrix_Map(const QMatrix* self, int x, int y, int* tx, int* ty) { @@ -136,7 +142,8 @@ bool QMatrix_IsInvertible(const QMatrix* self) { } double QMatrix_Determinant(const QMatrix* self) { - return self->determinant(); + qreal _ret = self->determinant(); + return static_cast(_ret); } QMatrix* QMatrix_Inverted(const QMatrix* self) { diff --git a/qt/gen_qmatrix.go b/qt/gen_qmatrix.go index a6a39af..93be44e 100644 --- a/qt/gen_qmatrix.go +++ b/qt/gen_qmatrix.go @@ -37,7 +37,7 @@ func newQMatrix_U(h unsafe.Pointer) *QMatrix { // NewQMatrix constructs a new QMatrix object. func NewQMatrix(param1 Initialization) *QMatrix { - ret := C.QMatrix_new((C.uintptr_t)(param1)) + ret := C.QMatrix_new((C.int)(param1)) return newQMatrix(ret) } diff --git a/qt/gen_qmatrix.h b/qt/gen_qmatrix.h index 50a70f4..037fe57 100644 --- a/qt/gen_qmatrix.h +++ b/qt/gen_qmatrix.h @@ -35,7 +35,7 @@ typedef struct QRectF QRectF; typedef struct QRegion QRegion; #endif -QMatrix* QMatrix_new(uintptr_t param1); +QMatrix* QMatrix_new(int param1); QMatrix* QMatrix_new2(); QMatrix* QMatrix_new3(double m11, double m12, double m21, double m22, double dx, double dy); QMatrix* QMatrix_new4(QMatrix* other); diff --git a/qt/gen_qmatrix4x4.cpp b/qt/gen_qmatrix4x4.cpp index 14b59c9..3700f07 100644 --- a/qt/gen_qmatrix4x4.cpp +++ b/qt/gen_qmatrix4x4.cpp @@ -16,7 +16,7 @@ QMatrix4x4* QMatrix4x4_new() { return new QMatrix4x4(); } -QMatrix4x4* QMatrix4x4_new2(uintptr_t param1) { +QMatrix4x4* QMatrix4x4_new2(int param1) { return new QMatrix4x4(static_cast(param1)); } diff --git a/qt/gen_qmatrix4x4.go b/qt/gen_qmatrix4x4.go index c7b5658..a4aa2b7 100644 --- a/qt/gen_qmatrix4x4.go +++ b/qt/gen_qmatrix4x4.go @@ -43,7 +43,7 @@ func NewQMatrix4x4() *QMatrix4x4 { // NewQMatrix4x42 constructs a new QMatrix4x4 object. func NewQMatrix4x42(param1 Initialization) *QMatrix4x4 { - ret := C.QMatrix4x4_new2((C.uintptr_t)(param1)) + ret := C.QMatrix4x4_new2((C.int)(param1)) return newQMatrix4x4(ret) } diff --git a/qt/gen_qmatrix4x4.h b/qt/gen_qmatrix4x4.h index d71a342..960e532 100644 --- a/qt/gen_qmatrix4x4.h +++ b/qt/gen_qmatrix4x4.h @@ -38,7 +38,7 @@ typedef struct QVector4D QVector4D; #endif QMatrix4x4* QMatrix4x4_new(); -QMatrix4x4* QMatrix4x4_new2(uintptr_t param1); +QMatrix4x4* QMatrix4x4_new2(int param1); QMatrix4x4* QMatrix4x4_new3(const float* values); QMatrix4x4* QMatrix4x4_new4(float m11, float m12, float m13, float m14, float m21, float m22, float m23, float m24, float m31, float m32, float m33, float m34, float m41, float m42, float m43, float m44); QMatrix4x4* QMatrix4x4_new5(const float* values, int cols, int rows); diff --git a/qt/gen_qmdiarea.cpp b/qt/gen_qmdiarea.cpp index 2732c1d..0b551ea 100644 --- a/qt/gen_qmdiarea.cpp +++ b/qt/gen_qmdiarea.cpp @@ -55,7 +55,7 @@ QMdiSubWindow* QMdiArea_ActiveSubWindow(const QMdiArea* self) { } struct miqt_array* QMdiArea_SubWindowList(const QMdiArea* self) { - QList _ret = self->subWindowList(); + QList _ret = self->subWindowList(); // Convert QList<> from C++ memory to manually-managed C memory QMdiSubWindow** _arr = static_cast(malloc(sizeof(QMdiSubWindow*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -83,30 +83,30 @@ void QMdiArea_SetBackground(QMdiArea* self, QBrush* background) { self->setBackground(*background); } -uintptr_t QMdiArea_ActivationOrder(const QMdiArea* self) { +int QMdiArea_ActivationOrder(const QMdiArea* self) { QMdiArea::WindowOrder _ret = self->activationOrder(); - return static_cast(_ret); + return static_cast(_ret); } -void QMdiArea_SetActivationOrder(QMdiArea* self, uintptr_t order) { +void QMdiArea_SetActivationOrder(QMdiArea* self, int order) { self->setActivationOrder(static_cast(order)); } -void QMdiArea_SetOption(QMdiArea* self, uintptr_t option) { +void QMdiArea_SetOption(QMdiArea* self, int option) { self->setOption(static_cast(option)); } -bool QMdiArea_TestOption(const QMdiArea* self, uintptr_t opton) { +bool QMdiArea_TestOption(const QMdiArea* self, int opton) { return self->testOption(static_cast(opton)); } -void QMdiArea_SetViewMode(QMdiArea* self, uintptr_t mode) { +void QMdiArea_SetViewMode(QMdiArea* self, int mode) { self->setViewMode(static_cast(mode)); } -uintptr_t QMdiArea_ViewMode(const QMdiArea* self) { +int QMdiArea_ViewMode(const QMdiArea* self) { QMdiArea::ViewMode _ret = self->viewMode(); - return static_cast(_ret); + return static_cast(_ret); } bool QMdiArea_DocumentMode(const QMdiArea* self) { @@ -133,22 +133,22 @@ bool QMdiArea_TabsMovable(const QMdiArea* self) { return self->tabsMovable(); } -void QMdiArea_SetTabShape(QMdiArea* self, uintptr_t shape) { +void QMdiArea_SetTabShape(QMdiArea* self, int shape) { self->setTabShape(static_cast(shape)); } -uintptr_t QMdiArea_TabShape(const QMdiArea* self) { +int QMdiArea_TabShape(const QMdiArea* self) { QTabWidget::TabShape _ret = self->tabShape(); - return static_cast(_ret); + return static_cast(_ret); } -void QMdiArea_SetTabPosition(QMdiArea* self, uintptr_t position) { +void QMdiArea_SetTabPosition(QMdiArea* self, int position) { self->setTabPosition(static_cast(position)); } -uintptr_t QMdiArea_TabPosition(const QMdiArea* self) { +int QMdiArea_TabPosition(const QMdiArea* self) { QTabWidget::TabPosition _ret = self->tabPosition(); - return static_cast(_ret); + return static_cast(_ret); } void QMdiArea_SubWindowActivated(QMdiArea* self, QMdiSubWindow* param1) { @@ -218,8 +218,8 @@ struct miqt_string* QMdiArea_TrUtf83(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_array* QMdiArea_SubWindowList1(const QMdiArea* self, uintptr_t order) { - QList _ret = self->subWindowList(static_cast(order)); +struct miqt_array* QMdiArea_SubWindowList1(const QMdiArea* self, int order) { + QList _ret = self->subWindowList(static_cast(order)); // Convert QList<> from C++ memory to manually-managed C memory QMdiSubWindow** _arr = static_cast(malloc(sizeof(QMdiSubWindow*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -235,7 +235,7 @@ QMdiSubWindow* QMdiArea_AddSubWindow2(QMdiArea* self, QWidget* widget, int flags return self->addSubWindow(widget, static_cast(flags)); } -void QMdiArea_SetOption2(QMdiArea* self, uintptr_t option, bool on) { +void QMdiArea_SetOption2(QMdiArea* self, int option, bool on) { self->setOption(static_cast(option), on); } diff --git a/qt/gen_qmdiarea.go b/qt/gen_qmdiarea.go index fbaca98..42b86de 100644 --- a/qt/gen_qmdiarea.go +++ b/qt/gen_qmdiarea.go @@ -149,19 +149,19 @@ func (this *QMdiArea) ActivationOrder() QMdiArea__WindowOrder { } func (this *QMdiArea) SetActivationOrder(order QMdiArea__WindowOrder) { - C.QMdiArea_SetActivationOrder(this.h, (C.uintptr_t)(order)) + C.QMdiArea_SetActivationOrder(this.h, (C.int)(order)) } func (this *QMdiArea) SetOption(option QMdiArea__AreaOption) { - C.QMdiArea_SetOption(this.h, (C.uintptr_t)(option)) + C.QMdiArea_SetOption(this.h, (C.int)(option)) } func (this *QMdiArea) TestOption(opton QMdiArea__AreaOption) bool { - return (bool)(C.QMdiArea_TestOption(this.h, (C.uintptr_t)(opton))) + return (bool)(C.QMdiArea_TestOption(this.h, (C.int)(opton))) } func (this *QMdiArea) SetViewMode(mode QMdiArea__ViewMode) { - C.QMdiArea_SetViewMode(this.h, (C.uintptr_t)(mode)) + C.QMdiArea_SetViewMode(this.h, (C.int)(mode)) } func (this *QMdiArea) ViewMode() QMdiArea__ViewMode { @@ -193,7 +193,7 @@ func (this *QMdiArea) TabsMovable() bool { } func (this *QMdiArea) SetTabShape(shape QTabWidget__TabShape) { - C.QMdiArea_SetTabShape(this.h, (C.uintptr_t)(shape)) + C.QMdiArea_SetTabShape(this.h, (C.int)(shape)) } func (this *QMdiArea) TabShape() QTabWidget__TabShape { @@ -201,7 +201,7 @@ func (this *QMdiArea) TabShape() QTabWidget__TabShape { } func (this *QMdiArea) SetTabPosition(position QTabWidget__TabPosition) { - C.QMdiArea_SetTabPosition(this.h, (C.uintptr_t)(position)) + C.QMdiArea_SetTabPosition(this.h, (C.int)(position)) } func (this *QMdiArea) TabPosition() QTabWidget__TabPosition { @@ -301,7 +301,7 @@ func QMdiArea_TrUtf83(s string, c string, n int) string { } func (this *QMdiArea) SubWindowList1(order QMdiArea__WindowOrder) []*QMdiSubWindow { - var _ma *C.struct_miqt_array = C.QMdiArea_SubWindowList1(this.h, (C.uintptr_t)(order)) + var _ma *C.struct_miqt_array = C.QMdiArea_SubWindowList1(this.h, (C.int)(order)) _ret := make([]*QMdiSubWindow, int(_ma.len)) _outCast := (*[0xffff]*C.QMdiSubWindow)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -312,11 +312,11 @@ func (this *QMdiArea) SubWindowList1(order QMdiArea__WindowOrder) []*QMdiSubWind } func (this *QMdiArea) AddSubWindow2(widget *QWidget, flags int) *QMdiSubWindow { - return newQMdiSubWindow_U(unsafe.Pointer(C.QMdiArea_AddSubWindow2(this.h, widget.cPointer(), (C.int)(flags)))) + return newQMdiSubWindow_U(unsafe.Pointer(C.QMdiArea_AddSubWindow2(this.h, widget.cPointer(), flags))) } func (this *QMdiArea) SetOption2(option QMdiArea__AreaOption, on bool) { - C.QMdiArea_SetOption2(this.h, (C.uintptr_t)(option), (C.bool)(on)) + C.QMdiArea_SetOption2(this.h, (C.int)(option), (C.bool)(on)) } // Delete this object from C++ memory. diff --git a/qt/gen_qmdiarea.h b/qt/gen_qmdiarea.h index 9f09e81..83f3e16 100644 --- a/qt/gen_qmdiarea.h +++ b/qt/gen_qmdiarea.h @@ -43,22 +43,22 @@ QMdiSubWindow* QMdiArea_AddSubWindow(QMdiArea* self, QWidget* widget); void QMdiArea_RemoveSubWindow(QMdiArea* self, QWidget* widget); QBrush* QMdiArea_Background(const QMdiArea* self); void QMdiArea_SetBackground(QMdiArea* self, QBrush* background); -uintptr_t QMdiArea_ActivationOrder(const QMdiArea* self); -void QMdiArea_SetActivationOrder(QMdiArea* self, uintptr_t order); -void QMdiArea_SetOption(QMdiArea* self, uintptr_t option); -bool QMdiArea_TestOption(const QMdiArea* self, uintptr_t opton); -void QMdiArea_SetViewMode(QMdiArea* self, uintptr_t mode); -uintptr_t QMdiArea_ViewMode(const QMdiArea* self); +int QMdiArea_ActivationOrder(const QMdiArea* self); +void QMdiArea_SetActivationOrder(QMdiArea* self, int order); +void QMdiArea_SetOption(QMdiArea* self, int option); +bool QMdiArea_TestOption(const QMdiArea* self, int opton); +void QMdiArea_SetViewMode(QMdiArea* self, int mode); +int QMdiArea_ViewMode(const QMdiArea* self); bool QMdiArea_DocumentMode(const QMdiArea* self); void QMdiArea_SetDocumentMode(QMdiArea* self, bool enabled); void QMdiArea_SetTabsClosable(QMdiArea* self, bool closable); bool QMdiArea_TabsClosable(const QMdiArea* self); void QMdiArea_SetTabsMovable(QMdiArea* self, bool movable); bool QMdiArea_TabsMovable(const QMdiArea* self); -void QMdiArea_SetTabShape(QMdiArea* self, uintptr_t shape); -uintptr_t QMdiArea_TabShape(const QMdiArea* self); -void QMdiArea_SetTabPosition(QMdiArea* self, uintptr_t position); -uintptr_t QMdiArea_TabPosition(const QMdiArea* self); +void QMdiArea_SetTabShape(QMdiArea* self, int shape); +int QMdiArea_TabShape(const QMdiArea* self); +void QMdiArea_SetTabPosition(QMdiArea* self, int position); +int QMdiArea_TabPosition(const QMdiArea* self); void QMdiArea_SubWindowActivated(QMdiArea* self, QMdiSubWindow* param1); void QMdiArea_connect_SubWindowActivated(QMdiArea* self, void* slot); void QMdiArea_SetActiveSubWindow(QMdiArea* self, QMdiSubWindow* window); @@ -72,9 +72,9 @@ struct miqt_string* QMdiArea_Tr2(const char* s, const char* c); struct miqt_string* QMdiArea_Tr3(const char* s, const char* c, int n); struct miqt_string* QMdiArea_TrUtf82(const char* s, const char* c); struct miqt_string* QMdiArea_TrUtf83(const char* s, const char* c, int n); -struct miqt_array* QMdiArea_SubWindowList1(const QMdiArea* self, uintptr_t order); +struct miqt_array* QMdiArea_SubWindowList1(const QMdiArea* self, int order); QMdiSubWindow* QMdiArea_AddSubWindow2(QMdiArea* self, QWidget* widget, int flags); -void QMdiArea_SetOption2(QMdiArea* self, uintptr_t option, bool on); +void QMdiArea_SetOption2(QMdiArea* self, int option, bool on); void QMdiArea_Delete(QMdiArea* self); #ifdef __cplusplus diff --git a/qt/gen_qmdisubwindow.cpp b/qt/gen_qmdisubwindow.cpp index 3c1e775..b3ca056 100644 --- a/qt/gen_qmdisubwindow.cpp +++ b/qt/gen_qmdisubwindow.cpp @@ -69,11 +69,11 @@ bool QMdiSubWindow_IsShaded(const QMdiSubWindow* self) { return self->isShaded(); } -void QMdiSubWindow_SetOption(QMdiSubWindow* self, uintptr_t option) { +void QMdiSubWindow_SetOption(QMdiSubWindow* self, int option) { self->setOption(static_cast(option)); } -bool QMdiSubWindow_TestOption(const QMdiSubWindow* self, uintptr_t param1) { +bool QMdiSubWindow_TestOption(const QMdiSubWindow* self, int param1) { return self->testOption(static_cast(param1)); } @@ -165,7 +165,7 @@ struct miqt_string* QMdiSubWindow_TrUtf83(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -void QMdiSubWindow_SetOption2(QMdiSubWindow* self, uintptr_t option, bool on) { +void QMdiSubWindow_SetOption2(QMdiSubWindow* self, int option, bool on) { self->setOption(static_cast(option), on); } diff --git a/qt/gen_qmdisubwindow.go b/qt/gen_qmdisubwindow.go index 68bbacc..63adbf9 100644 --- a/qt/gen_qmdisubwindow.go +++ b/qt/gen_qmdisubwindow.go @@ -60,7 +60,7 @@ func NewQMdiSubWindow2(parent *QWidget) *QMdiSubWindow { // NewQMdiSubWindow3 constructs a new QMdiSubWindow object. func NewQMdiSubWindow3(parent *QWidget, flags int) *QMdiSubWindow { - ret := C.QMdiSubWindow_new3(parent.cPointer(), (C.int)(flags)) + ret := C.QMdiSubWindow_new3(parent.cPointer(), flags) return newQMdiSubWindow(ret) } @@ -121,11 +121,11 @@ func (this *QMdiSubWindow) IsShaded() bool { } func (this *QMdiSubWindow) SetOption(option QMdiSubWindow__SubWindowOption) { - C.QMdiSubWindow_SetOption(this.h, (C.uintptr_t)(option)) + C.QMdiSubWindow_SetOption(this.h, (C.int)(option)) } func (this *QMdiSubWindow) TestOption(param1 QMdiSubWindow__SubWindowOption) bool { - return (bool)(C.QMdiSubWindow_TestOption(this.h, (C.uintptr_t)(param1))) + return (bool)(C.QMdiSubWindow_TestOption(this.h, (C.int)(param1))) } func (this *QMdiSubWindow) SetKeyboardSingleStep(step int) { @@ -157,7 +157,7 @@ func (this *QMdiSubWindow) MdiArea() *QMdiArea { } func (this *QMdiSubWindow) WindowStateChanged(oldState int, newState int) { - C.QMdiSubWindow_WindowStateChanged(this.h, (C.int)(oldState), (C.int)(newState)) + C.QMdiSubWindow_WindowStateChanged(this.h, oldState, newState) } func (this *QMdiSubWindow) OnWindowStateChanged(slot func(oldState int, newState int)) { C.QMdiSubWindow_connect_WindowStateChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) @@ -248,7 +248,7 @@ func QMdiSubWindow_TrUtf83(s string, c string, n int) string { } func (this *QMdiSubWindow) SetOption2(option QMdiSubWindow__SubWindowOption, on bool) { - C.QMdiSubWindow_SetOption2(this.h, (C.uintptr_t)(option), (C.bool)(on)) + C.QMdiSubWindow_SetOption2(this.h, (C.int)(option), (C.bool)(on)) } // Delete this object from C++ memory. diff --git a/qt/gen_qmdisubwindow.h b/qt/gen_qmdisubwindow.h index 0dd2486..94d07c8 100644 --- a/qt/gen_qmdisubwindow.h +++ b/qt/gen_qmdisubwindow.h @@ -42,8 +42,8 @@ QWidget* QMdiSubWindow_Widget(const QMdiSubWindow* self); QWidget* QMdiSubWindow_MaximizedButtonsWidget(const QMdiSubWindow* self); QWidget* QMdiSubWindow_MaximizedSystemMenuIconWidget(const QMdiSubWindow* self); bool QMdiSubWindow_IsShaded(const QMdiSubWindow* self); -void QMdiSubWindow_SetOption(QMdiSubWindow* self, uintptr_t option); -bool QMdiSubWindow_TestOption(const QMdiSubWindow* self, uintptr_t param1); +void QMdiSubWindow_SetOption(QMdiSubWindow* self, int option); +bool QMdiSubWindow_TestOption(const QMdiSubWindow* self, int param1); void QMdiSubWindow_SetKeyboardSingleStep(QMdiSubWindow* self, int step); int QMdiSubWindow_KeyboardSingleStep(const QMdiSubWindow* self); void QMdiSubWindow_SetKeyboardPageStep(QMdiSubWindow* self, int step); @@ -61,7 +61,7 @@ struct miqt_string* QMdiSubWindow_Tr2(const char* s, const char* c); struct miqt_string* QMdiSubWindow_Tr3(const char* s, const char* c, int n); struct miqt_string* QMdiSubWindow_TrUtf82(const char* s, const char* c); struct miqt_string* QMdiSubWindow_TrUtf83(const char* s, const char* c, int n); -void QMdiSubWindow_SetOption2(QMdiSubWindow* self, uintptr_t option, bool on); +void QMdiSubWindow_SetOption2(QMdiSubWindow* self, int option, bool on); void QMdiSubWindow_Delete(QMdiSubWindow* self); #ifdef __cplusplus diff --git a/qt/gen_qmenubar.cpp b/qt/gen_qmenubar.cpp index 96661ba..0d6f5e0 100644 --- a/qt/gen_qmenubar.cpp +++ b/qt/gen_qmenubar.cpp @@ -181,11 +181,11 @@ struct miqt_string* QMenuBar_TrUtf83(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -void QMenuBar_SetCornerWidget2(QMenuBar* self, QWidget* w, uintptr_t corner) { +void QMenuBar_SetCornerWidget2(QMenuBar* self, QWidget* w, int corner) { self->setCornerWidget(w, static_cast(corner)); } -QWidget* QMenuBar_CornerWidget1(const QMenuBar* self, uintptr_t corner) { +QWidget* QMenuBar_CornerWidget1(const QMenuBar* self, int corner) { return self->cornerWidget(static_cast(corner)); } diff --git a/qt/gen_qmenubar.go b/qt/gen_qmenubar.go index 27bba0f..93fbcb9 100644 --- a/qt/gen_qmenubar.go +++ b/qt/gen_qmenubar.go @@ -259,11 +259,11 @@ func QMenuBar_TrUtf83(s string, c string, n int) string { } func (this *QMenuBar) SetCornerWidget2(w *QWidget, corner Corner) { - C.QMenuBar_SetCornerWidget2(this.h, w.cPointer(), (C.uintptr_t)(corner)) + C.QMenuBar_SetCornerWidget2(this.h, w.cPointer(), (C.int)(corner)) } func (this *QMenuBar) CornerWidget1(corner Corner) *QWidget { - return newQWidget_U(unsafe.Pointer(C.QMenuBar_CornerWidget1(this.h, (C.uintptr_t)(corner)))) + return newQWidget_U(unsafe.Pointer(C.QMenuBar_CornerWidget1(this.h, (C.int)(corner)))) } // Delete this object from C++ memory. diff --git a/qt/gen_qmenubar.h b/qt/gen_qmenubar.h index 1e306da..754b9f5 100644 --- a/qt/gen_qmenubar.h +++ b/qt/gen_qmenubar.h @@ -70,8 +70,8 @@ struct miqt_string* QMenuBar_Tr2(const char* s, const char* c); struct miqt_string* QMenuBar_Tr3(const char* s, const char* c, int n); struct miqt_string* QMenuBar_TrUtf82(const char* s, const char* c); struct miqt_string* QMenuBar_TrUtf83(const char* s, const char* c, int n); -void QMenuBar_SetCornerWidget2(QMenuBar* self, QWidget* w, uintptr_t corner); -QWidget* QMenuBar_CornerWidget1(const QMenuBar* self, uintptr_t corner); +void QMenuBar_SetCornerWidget2(QMenuBar* self, QWidget* w, int corner); +QWidget* QMenuBar_CornerWidget1(const QMenuBar* self, int corner); void QMenuBar_Delete(QMenuBar* self); #ifdef __cplusplus diff --git a/qt/gen_qmessageauthenticationcode.cpp b/qt/gen_qmessageauthenticationcode.cpp index 905f0e1..aa2f5db 100644 --- a/qt/gen_qmessageauthenticationcode.cpp +++ b/qt/gen_qmessageauthenticationcode.cpp @@ -5,11 +5,11 @@ #include "gen_qmessageauthenticationcode.h" #include "_cgo_export.h" -QMessageAuthenticationCode* QMessageAuthenticationCode_new(uintptr_t method) { +QMessageAuthenticationCode* QMessageAuthenticationCode_new(int method) { return new QMessageAuthenticationCode(static_cast(method)); } -QMessageAuthenticationCode* QMessageAuthenticationCode_new2(uintptr_t method, QByteArray* key) { +QMessageAuthenticationCode* QMessageAuthenticationCode_new2(int method, QByteArray* key) { return new QMessageAuthenticationCode(static_cast(method), *key); } @@ -37,7 +37,7 @@ QByteArray* QMessageAuthenticationCode_Result(const QMessageAuthenticationCode* return new QByteArray(self->result()); } -QByteArray* QMessageAuthenticationCode_Hash(QByteArray* message, QByteArray* key, uintptr_t method) { +QByteArray* QMessageAuthenticationCode_Hash(QByteArray* message, QByteArray* key, int method) { return new QByteArray(QMessageAuthenticationCode::hash(*message, *key, static_cast(method))); } diff --git a/qt/gen_qmessageauthenticationcode.go b/qt/gen_qmessageauthenticationcode.go index 2095e12..2728241 100644 --- a/qt/gen_qmessageauthenticationcode.go +++ b/qt/gen_qmessageauthenticationcode.go @@ -37,13 +37,13 @@ func newQMessageAuthenticationCode_U(h unsafe.Pointer) *QMessageAuthenticationCo // NewQMessageAuthenticationCode constructs a new QMessageAuthenticationCode object. func NewQMessageAuthenticationCode(method QCryptographicHash__Algorithm) *QMessageAuthenticationCode { - ret := C.QMessageAuthenticationCode_new((C.uintptr_t)(method)) + ret := C.QMessageAuthenticationCode_new((C.int)(method)) return newQMessageAuthenticationCode(ret) } // NewQMessageAuthenticationCode2 constructs a new QMessageAuthenticationCode object. func NewQMessageAuthenticationCode2(method QCryptographicHash__Algorithm, key *QByteArray) *QMessageAuthenticationCode { - ret := C.QMessageAuthenticationCode_new2((C.uintptr_t)(method), key.cPointer()) + ret := C.QMessageAuthenticationCode_new2((C.int)(method), key.cPointer()) return newQMessageAuthenticationCode(ret) } @@ -77,7 +77,7 @@ func (this *QMessageAuthenticationCode) Result() *QByteArray { } func QMessageAuthenticationCode_Hash(message *QByteArray, key *QByteArray, method QCryptographicHash__Algorithm) *QByteArray { - _ret := C.QMessageAuthenticationCode_Hash(message.cPointer(), key.cPointer(), (C.uintptr_t)(method)) + _ret := C.QMessageAuthenticationCode_Hash(message.cPointer(), key.cPointer(), (C.int)(method)) _goptr := newQByteArray(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qmessageauthenticationcode.h b/qt/gen_qmessageauthenticationcode.h index 8ec467d..66d8360 100644 --- a/qt/gen_qmessageauthenticationcode.h +++ b/qt/gen_qmessageauthenticationcode.h @@ -23,15 +23,15 @@ typedef struct QIODevice QIODevice; typedef struct QMessageAuthenticationCode QMessageAuthenticationCode; #endif -QMessageAuthenticationCode* QMessageAuthenticationCode_new(uintptr_t method); -QMessageAuthenticationCode* QMessageAuthenticationCode_new2(uintptr_t method, QByteArray* key); +QMessageAuthenticationCode* QMessageAuthenticationCode_new(int method); +QMessageAuthenticationCode* QMessageAuthenticationCode_new2(int method, QByteArray* key); void QMessageAuthenticationCode_Reset(QMessageAuthenticationCode* self); void QMessageAuthenticationCode_SetKey(QMessageAuthenticationCode* self, QByteArray* key); void QMessageAuthenticationCode_AddData(QMessageAuthenticationCode* self, const char* data, int length); void QMessageAuthenticationCode_AddDataWithData(QMessageAuthenticationCode* self, QByteArray* data); bool QMessageAuthenticationCode_AddDataWithDevice(QMessageAuthenticationCode* self, QIODevice* device); QByteArray* QMessageAuthenticationCode_Result(const QMessageAuthenticationCode* self); -QByteArray* QMessageAuthenticationCode_Hash(QByteArray* message, QByteArray* key, uintptr_t method); +QByteArray* QMessageAuthenticationCode_Hash(QByteArray* message, QByteArray* key, int method); void QMessageAuthenticationCode_Delete(QMessageAuthenticationCode* self); #ifdef __cplusplus diff --git a/qt/gen_qmessagebox.cpp b/qt/gen_qmessagebox.cpp index f9e38f9..355ef98 100644 --- a/qt/gen_qmessagebox.cpp +++ b/qt/gen_qmessagebox.cpp @@ -17,13 +17,13 @@ QMessageBox* QMessageBox_new() { return new QMessageBox(); } -QMessageBox* QMessageBox_new2(uintptr_t icon, struct miqt_string* title, struct miqt_string* text) { +QMessageBox* QMessageBox_new2(int icon, struct miqt_string* title, struct miqt_string* text) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString text_QString = QString::fromUtf8(&text->data, text->len); return new QMessageBox(static_cast(icon), title_QString, text_QString); } -QMessageBox* QMessageBox_new3(struct miqt_string* title, struct miqt_string* text, uintptr_t icon, int button0, int button1, int button2) { +QMessageBox* QMessageBox_new3(struct miqt_string* title, struct miqt_string* text, int icon, int button0, int button1, int button2) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString text_QString = QString::fromUtf8(&text->data, text->len); return new QMessageBox(title_QString, text_QString, static_cast(icon), static_cast(button0), static_cast(button1), static_cast(button2)); @@ -33,31 +33,31 @@ QMessageBox* QMessageBox_new4(QWidget* parent) { return new QMessageBox(parent); } -QMessageBox* QMessageBox_new5(uintptr_t icon, struct miqt_string* title, struct miqt_string* text, int buttons) { +QMessageBox* QMessageBox_new5(int icon, struct miqt_string* title, struct miqt_string* text, int buttons) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString text_QString = QString::fromUtf8(&text->data, text->len); return new QMessageBox(static_cast(icon), title_QString, text_QString, static_cast(buttons)); } -QMessageBox* QMessageBox_new6(uintptr_t icon, struct miqt_string* title, struct miqt_string* text, int buttons, QWidget* parent) { +QMessageBox* QMessageBox_new6(int icon, struct miqt_string* title, struct miqt_string* text, int buttons, QWidget* parent) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString text_QString = QString::fromUtf8(&text->data, text->len); return new QMessageBox(static_cast(icon), title_QString, text_QString, static_cast(buttons), parent); } -QMessageBox* QMessageBox_new7(uintptr_t icon, struct miqt_string* title, struct miqt_string* text, int buttons, QWidget* parent, int flags) { +QMessageBox* QMessageBox_new7(int icon, struct miqt_string* title, struct miqt_string* text, int buttons, QWidget* parent, int flags) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString text_QString = QString::fromUtf8(&text->data, text->len); return new QMessageBox(static_cast(icon), title_QString, text_QString, static_cast(buttons), parent, static_cast(flags)); } -QMessageBox* QMessageBox_new8(struct miqt_string* title, struct miqt_string* text, uintptr_t icon, int button0, int button1, int button2, QWidget* parent) { +QMessageBox* QMessageBox_new8(struct miqt_string* title, struct miqt_string* text, int icon, int button0, int button1, int button2, QWidget* parent) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString text_QString = QString::fromUtf8(&text->data, text->len); return new QMessageBox(title_QString, text_QString, static_cast(icon), static_cast(button0), static_cast(button1), static_cast(button2), parent); } -QMessageBox* QMessageBox_new9(struct miqt_string* title, struct miqt_string* text, uintptr_t icon, int button0, int button1, int button2, QWidget* parent, int f) { +QMessageBox* QMessageBox_new9(struct miqt_string* title, struct miqt_string* text, int icon, int button0, int button1, int button2, QWidget* parent, int f) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString text_QString = QString::fromUtf8(&text->data, text->len); return new QMessageBox(title_QString, text_QString, static_cast(icon), static_cast(button0), static_cast(button1), static_cast(button2), parent, static_cast(f)); @@ -81,16 +81,16 @@ struct miqt_string* QMessageBox_TrUtf8(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -void QMessageBox_AddButton(QMessageBox* self, QAbstractButton* button, uintptr_t role) { +void QMessageBox_AddButton(QMessageBox* self, QAbstractButton* button, int role) { self->addButton(button, static_cast(role)); } -QPushButton* QMessageBox_AddButton2(QMessageBox* self, struct miqt_string* text, uintptr_t role) { +QPushButton* QMessageBox_AddButton2(QMessageBox* self, struct miqt_string* text, int role) { QString text_QString = QString::fromUtf8(&text->data, text->len); return self->addButton(text_QString, static_cast(role)); } -QPushButton* QMessageBox_AddButtonWithButton(QMessageBox* self, uintptr_t button) { +QPushButton* QMessageBox_AddButtonWithButton(QMessageBox* self, int button) { return self->addButton(static_cast(button)); } @@ -99,7 +99,7 @@ void QMessageBox_RemoveButton(QMessageBox* self, QAbstractButton* button) { } struct miqt_array* QMessageBox_Buttons(const QMessageBox* self) { - QList _ret = self->buttons(); + QList _ret = self->buttons(); // Convert QList<> from C++ memory to manually-managed C memory QAbstractButton** _arr = static_cast(malloc(sizeof(QAbstractButton*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -111,9 +111,9 @@ struct miqt_array* QMessageBox_Buttons(const QMessageBox* self) { return _out; } -uintptr_t QMessageBox_ButtonRole(const QMessageBox* self, QAbstractButton* button) { +int QMessageBox_ButtonRole(const QMessageBox* self, QAbstractButton* button) { QMessageBox::ButtonRole _ret = self->buttonRole(button); - return static_cast(_ret); + return static_cast(_ret); } void QMessageBox_SetStandardButtons(QMessageBox* self, int buttons) { @@ -125,12 +125,12 @@ int QMessageBox_StandardButtons(const QMessageBox* self) { return static_cast(_ret); } -uintptr_t QMessageBox_StandardButton(const QMessageBox* self, QAbstractButton* button) { +int QMessageBox_StandardButton(const QMessageBox* self, QAbstractButton* button) { QMessageBox::StandardButton _ret = self->standardButton(button); - return static_cast(_ret); + return static_cast(_ret); } -QAbstractButton* QMessageBox_Button(const QMessageBox* self, uintptr_t which) { +QAbstractButton* QMessageBox_Button(const QMessageBox* self, int which) { return self->button(static_cast(which)); } @@ -142,7 +142,7 @@ void QMessageBox_SetDefaultButton(QMessageBox* self, QPushButton* button) { self->setDefaultButton(button); } -void QMessageBox_SetDefaultButtonWithButton(QMessageBox* self, uintptr_t button) { +void QMessageBox_SetDefaultButtonWithButton(QMessageBox* self, int button) { self->setDefaultButton(static_cast(button)); } @@ -154,7 +154,7 @@ void QMessageBox_SetEscapeButton(QMessageBox* self, QAbstractButton* button) { self->setEscapeButton(button); } -void QMessageBox_SetEscapeButtonWithButton(QMessageBox* self, uintptr_t button) { +void QMessageBox_SetEscapeButtonWithButton(QMessageBox* self, int button) { self->setEscapeButton(static_cast(button)); } @@ -174,12 +174,12 @@ void QMessageBox_SetText(QMessageBox* self, struct miqt_string* text) { self->setText(text_QString); } -uintptr_t QMessageBox_Icon(const QMessageBox* self) { +int QMessageBox_Icon(const QMessageBox* self) { QMessageBox::Icon _ret = self->icon(); - return static_cast(_ret); + return static_cast(_ret); } -void QMessageBox_SetIcon(QMessageBox* self, uintptr_t icon) { +void QMessageBox_SetIcon(QMessageBox* self, int icon) { self->setIcon(static_cast(icon)); } @@ -191,12 +191,12 @@ void QMessageBox_SetIconPixmap(QMessageBox* self, QPixmap* pixmap) { self->setIconPixmap(*pixmap); } -uintptr_t QMessageBox_TextFormat(const QMessageBox* self) { +int QMessageBox_TextFormat(const QMessageBox* self) { Qt::TextFormat _ret = self->textFormat(); - return static_cast(_ret); + return static_cast(_ret); } -void QMessageBox_SetTextFormat(QMessageBox* self, uintptr_t format) { +void QMessageBox_SetTextFormat(QMessageBox* self, int format) { self->setTextFormat(static_cast(format)); } @@ -217,32 +217,32 @@ QCheckBox* QMessageBox_CheckBox(const QMessageBox* self) { return self->checkBox(); } -uintptr_t QMessageBox_Information(QWidget* parent, struct miqt_string* title, struct miqt_string* text) { +int QMessageBox_Information(QWidget* parent, struct miqt_string* title, struct miqt_string* text) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString text_QString = QString::fromUtf8(&text->data, text->len); QMessageBox::StandardButton _ret = QMessageBox::information(parent, title_QString, text_QString); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QMessageBox_Question(QWidget* parent, struct miqt_string* title, struct miqt_string* text) { +int QMessageBox_Question(QWidget* parent, struct miqt_string* title, struct miqt_string* text) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString text_QString = QString::fromUtf8(&text->data, text->len); QMessageBox::StandardButton _ret = QMessageBox::question(parent, title_QString, text_QString); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QMessageBox_Warning(QWidget* parent, struct miqt_string* title, struct miqt_string* text) { +int QMessageBox_Warning(QWidget* parent, struct miqt_string* title, struct miqt_string* text) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString text_QString = QString::fromUtf8(&text->data, text->len); QMessageBox::StandardButton _ret = QMessageBox::warning(parent, title_QString, text_QString); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QMessageBox_Critical(QWidget* parent, struct miqt_string* title, struct miqt_string* text) { +int QMessageBox_Critical(QWidget* parent, struct miqt_string* title, struct miqt_string* text) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString text_QString = QString::fromUtf8(&text->data, text->len); QMessageBox::StandardButton _ret = QMessageBox::critical(parent, title_QString, text_QString); - return static_cast(_ret); + return static_cast(_ret); } void QMessageBox_About(QWidget* parent, struct miqt_string* title, struct miqt_string* text) { @@ -268,11 +268,11 @@ int QMessageBox_Information3(QWidget* parent, struct miqt_string* title, struct return QMessageBox::information(parent, title_QString, text_QString, button0Text_QString); } -uintptr_t QMessageBox_Information4(QWidget* parent, struct miqt_string* title, struct miqt_string* text, uintptr_t button0) { +int QMessageBox_Information4(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString text_QString = QString::fromUtf8(&text->data, text->len); QMessageBox::StandardButton _ret = QMessageBox::information(parent, title_QString, text_QString, static_cast(button0)); - return static_cast(_ret); + return static_cast(_ret); } int QMessageBox_Question2(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0) { @@ -288,7 +288,7 @@ int QMessageBox_Question3(QWidget* parent, struct miqt_string* title, struct miq return QMessageBox::question(parent, title_QString, text_QString, button0Text_QString); } -int QMessageBox_Question4(QWidget* parent, struct miqt_string* title, struct miqt_string* text, uintptr_t button0, uintptr_t button1) { +int QMessageBox_Question4(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString text_QString = QString::fromUtf8(&text->data, text->len); return QMessageBox::question(parent, title_QString, text_QString, static_cast(button0), static_cast(button1)); @@ -307,7 +307,7 @@ int QMessageBox_Warning3(QWidget* parent, struct miqt_string* title, struct miqt return QMessageBox::warning(parent, title_QString, text_QString, button0Text_QString); } -int QMessageBox_Warning4(QWidget* parent, struct miqt_string* title, struct miqt_string* text, uintptr_t button0, uintptr_t button1) { +int QMessageBox_Warning4(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString text_QString = QString::fromUtf8(&text->data, text->len); return QMessageBox::warning(parent, title_QString, text_QString, static_cast(button0), static_cast(button1)); @@ -326,7 +326,7 @@ int QMessageBox_Critical3(QWidget* parent, struct miqt_string* title, struct miq return QMessageBox::critical(parent, title_QString, text_QString, button0Text_QString); } -int QMessageBox_Critical4(QWidget* parent, struct miqt_string* title, struct miqt_string* text, uintptr_t button0, uintptr_t button1) { +int QMessageBox_Critical4(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString text_QString = QString::fromUtf8(&text->data, text->len); return QMessageBox::critical(parent, title_QString, text_QString, static_cast(button0), static_cast(button1)); @@ -373,11 +373,11 @@ void QMessageBox_SetWindowTitle(QMessageBox* self, struct miqt_string* title) { self->setWindowTitle(title_QString); } -void QMessageBox_SetWindowModality(QMessageBox* self, uintptr_t windowModality) { +void QMessageBox_SetWindowModality(QMessageBox* self, int windowModality) { self->setWindowModality(static_cast(windowModality)); } -QPixmap* QMessageBox_StandardIcon(uintptr_t icon) { +QPixmap* QMessageBox_StandardIcon(int icon) { return new QPixmap(QMessageBox::standardIcon(static_cast(icon))); } @@ -420,60 +420,60 @@ struct miqt_string* QMessageBox_TrUtf83(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -uintptr_t QMessageBox_Information42(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons) { +int QMessageBox_Information42(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString text_QString = QString::fromUtf8(&text->data, text->len); QMessageBox::StandardButton _ret = QMessageBox::information(parent, title_QString, text_QString, static_cast(buttons)); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QMessageBox_Information5(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons, uintptr_t defaultButton) { +int QMessageBox_Information5(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons, int defaultButton) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString text_QString = QString::fromUtf8(&text->data, text->len); QMessageBox::StandardButton _ret = QMessageBox::information(parent, title_QString, text_QString, static_cast(buttons), static_cast(defaultButton)); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QMessageBox_Question42(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons) { +int QMessageBox_Question42(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString text_QString = QString::fromUtf8(&text->data, text->len); QMessageBox::StandardButton _ret = QMessageBox::question(parent, title_QString, text_QString, static_cast(buttons)); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QMessageBox_Question5(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons, uintptr_t defaultButton) { +int QMessageBox_Question5(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons, int defaultButton) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString text_QString = QString::fromUtf8(&text->data, text->len); QMessageBox::StandardButton _ret = QMessageBox::question(parent, title_QString, text_QString, static_cast(buttons), static_cast(defaultButton)); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QMessageBox_Warning42(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons) { +int QMessageBox_Warning42(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString text_QString = QString::fromUtf8(&text->data, text->len); QMessageBox::StandardButton _ret = QMessageBox::warning(parent, title_QString, text_QString, static_cast(buttons)); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QMessageBox_Warning5(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons, uintptr_t defaultButton) { +int QMessageBox_Warning5(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons, int defaultButton) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString text_QString = QString::fromUtf8(&text->data, text->len); QMessageBox::StandardButton _ret = QMessageBox::warning(parent, title_QString, text_QString, static_cast(buttons), static_cast(defaultButton)); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QMessageBox_Critical42(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons) { +int QMessageBox_Critical42(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString text_QString = QString::fromUtf8(&text->data, text->len); QMessageBox::StandardButton _ret = QMessageBox::critical(parent, title_QString, text_QString, static_cast(buttons)); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QMessageBox_Critical5(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons, uintptr_t defaultButton) { +int QMessageBox_Critical5(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons, int defaultButton) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString text_QString = QString::fromUtf8(&text->data, text->len); QMessageBox::StandardButton _ret = QMessageBox::critical(parent, title_QString, text_QString, static_cast(buttons), static_cast(defaultButton)); - return static_cast(_ret); + return static_cast(_ret); } void QMessageBox_AboutQt2(QWidget* parent, struct miqt_string* title) { @@ -528,11 +528,11 @@ int QMessageBox_Information8(QWidget* parent, struct miqt_string* title, struct return QMessageBox::information(parent, title_QString, text_QString, button0Text_QString, button1Text_QString, button2Text_QString, static_cast(defaultButtonNumber), static_cast(escapeButtonNumber)); } -uintptr_t QMessageBox_Information54(QWidget* parent, struct miqt_string* title, struct miqt_string* text, uintptr_t button0, uintptr_t button1) { +int QMessageBox_Information54(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString text_QString = QString::fromUtf8(&text->data, text->len); QMessageBox::StandardButton _ret = QMessageBox::information(parent, title_QString, text_QString, static_cast(button0), static_cast(button1)); - return static_cast(_ret); + return static_cast(_ret); } int QMessageBox_Question52(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1) { diff --git a/qt/gen_qmessagebox.go b/qt/gen_qmessagebox.go index 9ac7b57..b4e634a 100644 --- a/qt/gen_qmessagebox.go +++ b/qt/gen_qmessagebox.go @@ -107,7 +107,7 @@ func NewQMessageBox2(icon QMessageBox__Icon, title string, text string) *QMessag defer C.free(title_ms) text_ms := miqt_strdupg(text) defer C.free(text_ms) - ret := C.QMessageBox_new2((C.uintptr_t)(icon), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms)) + ret := C.QMessageBox_new2((C.int)(icon), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms)) return newQMessageBox(ret) } @@ -117,7 +117,7 @@ func NewQMessageBox3(title string, text string, icon QMessageBox__Icon, button0 defer C.free(title_ms) text_ms := miqt_strdupg(text) defer C.free(text_ms) - ret := C.QMessageBox_new3((*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.uintptr_t)(icon), (C.int)(button0), (C.int)(button1), (C.int)(button2)) + ret := C.QMessageBox_new3((*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(icon), (C.int)(button0), (C.int)(button1), (C.int)(button2)) return newQMessageBox(ret) } @@ -133,7 +133,7 @@ func NewQMessageBox5(icon QMessageBox__Icon, title string, text string, buttons defer C.free(title_ms) text_ms := miqt_strdupg(text) defer C.free(text_ms) - ret := C.QMessageBox_new5((C.uintptr_t)(icon), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(buttons)) + ret := C.QMessageBox_new5((C.int)(icon), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), buttons) return newQMessageBox(ret) } @@ -143,7 +143,7 @@ func NewQMessageBox6(icon QMessageBox__Icon, title string, text string, buttons defer C.free(title_ms) text_ms := miqt_strdupg(text) defer C.free(text_ms) - ret := C.QMessageBox_new6((C.uintptr_t)(icon), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(buttons), parent.cPointer()) + ret := C.QMessageBox_new6((C.int)(icon), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), buttons, parent.cPointer()) return newQMessageBox(ret) } @@ -153,7 +153,7 @@ func NewQMessageBox7(icon QMessageBox__Icon, title string, text string, buttons defer C.free(title_ms) text_ms := miqt_strdupg(text) defer C.free(text_ms) - ret := C.QMessageBox_new7((C.uintptr_t)(icon), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(buttons), parent.cPointer(), (C.int)(flags)) + ret := C.QMessageBox_new7((C.int)(icon), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), buttons, parent.cPointer(), flags) return newQMessageBox(ret) } @@ -163,7 +163,7 @@ func NewQMessageBox8(title string, text string, icon QMessageBox__Icon, button0 defer C.free(title_ms) text_ms := miqt_strdupg(text) defer C.free(text_ms) - ret := C.QMessageBox_new8((*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.uintptr_t)(icon), (C.int)(button0), (C.int)(button1), (C.int)(button2), parent.cPointer()) + ret := C.QMessageBox_new8((*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(icon), (C.int)(button0), (C.int)(button1), (C.int)(button2), parent.cPointer()) return newQMessageBox(ret) } @@ -173,7 +173,7 @@ func NewQMessageBox9(title string, text string, icon QMessageBox__Icon, button0 defer C.free(title_ms) text_ms := miqt_strdupg(text) defer C.free(text_ms) - ret := C.QMessageBox_new9((*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.uintptr_t)(icon), (C.int)(button0), (C.int)(button1), (C.int)(button2), parent.cPointer(), (C.int)(f)) + ret := C.QMessageBox_new9((*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(icon), (C.int)(button0), (C.int)(button1), (C.int)(button2), parent.cPointer(), f) return newQMessageBox(ret) } @@ -200,17 +200,17 @@ func QMessageBox_TrUtf8(s string) string { } func (this *QMessageBox) AddButton(button *QAbstractButton, role QMessageBox__ButtonRole) { - C.QMessageBox_AddButton(this.h, button.cPointer(), (C.uintptr_t)(role)) + C.QMessageBox_AddButton(this.h, button.cPointer(), (C.int)(role)) } func (this *QMessageBox) AddButton2(text string, role QMessageBox__ButtonRole) *QPushButton { text_ms := miqt_strdupg(text) defer C.free(text_ms) - return newQPushButton_U(unsafe.Pointer(C.QMessageBox_AddButton2(this.h, (*C.struct_miqt_string)(text_ms), (C.uintptr_t)(role)))) + return newQPushButton_U(unsafe.Pointer(C.QMessageBox_AddButton2(this.h, (*C.struct_miqt_string)(text_ms), (C.int)(role)))) } func (this *QMessageBox) AddButtonWithButton(button QMessageBox__StandardButton) *QPushButton { - return newQPushButton_U(unsafe.Pointer(C.QMessageBox_AddButtonWithButton(this.h, (C.uintptr_t)(button)))) + return newQPushButton_U(unsafe.Pointer(C.QMessageBox_AddButtonWithButton(this.h, (C.int)(button)))) } func (this *QMessageBox) RemoveButton(button *QAbstractButton) { @@ -233,7 +233,7 @@ func (this *QMessageBox) ButtonRole(button *QAbstractButton) QMessageBox__Button } func (this *QMessageBox) SetStandardButtons(buttons int) { - C.QMessageBox_SetStandardButtons(this.h, (C.int)(buttons)) + C.QMessageBox_SetStandardButtons(this.h, buttons) } func (this *QMessageBox) StandardButtons() int { @@ -245,7 +245,7 @@ func (this *QMessageBox) StandardButton(button *QAbstractButton) QMessageBox__St } func (this *QMessageBox) Button(which QMessageBox__StandardButton) *QAbstractButton { - return newQAbstractButton_U(unsafe.Pointer(C.QMessageBox_Button(this.h, (C.uintptr_t)(which)))) + return newQAbstractButton_U(unsafe.Pointer(C.QMessageBox_Button(this.h, (C.int)(which)))) } func (this *QMessageBox) DefaultButton() *QPushButton { @@ -257,7 +257,7 @@ func (this *QMessageBox) SetDefaultButton(button *QPushButton) { } func (this *QMessageBox) SetDefaultButtonWithButton(button QMessageBox__StandardButton) { - C.QMessageBox_SetDefaultButtonWithButton(this.h, (C.uintptr_t)(button)) + C.QMessageBox_SetDefaultButtonWithButton(this.h, (C.int)(button)) } func (this *QMessageBox) EscapeButton() *QAbstractButton { @@ -269,7 +269,7 @@ func (this *QMessageBox) SetEscapeButton(button *QAbstractButton) { } func (this *QMessageBox) SetEscapeButtonWithButton(button QMessageBox__StandardButton) { - C.QMessageBox_SetEscapeButtonWithButton(this.h, (C.uintptr_t)(button)) + C.QMessageBox_SetEscapeButtonWithButton(this.h, (C.int)(button)) } func (this *QMessageBox) ClickedButton() *QAbstractButton { @@ -294,7 +294,7 @@ func (this *QMessageBox) Icon() QMessageBox__Icon { } func (this *QMessageBox) SetIcon(icon QMessageBox__Icon) { - C.QMessageBox_SetIcon(this.h, (C.uintptr_t)(icon)) + C.QMessageBox_SetIcon(this.h, (C.int)(icon)) } func (this *QMessageBox) IconPixmap() *QPixmap { @@ -313,11 +313,11 @@ func (this *QMessageBox) TextFormat() TextFormat { } func (this *QMessageBox) SetTextFormat(format TextFormat) { - C.QMessageBox_SetTextFormat(this.h, (C.uintptr_t)(format)) + C.QMessageBox_SetTextFormat(this.h, (C.int)(format)) } func (this *QMessageBox) SetTextInteractionFlags(flags int) { - C.QMessageBox_SetTextInteractionFlags(this.h, (C.int)(flags)) + C.QMessageBox_SetTextInteractionFlags(this.h, flags) } func (this *QMessageBox) TextInteractionFlags() int { @@ -399,7 +399,7 @@ func QMessageBox_Information4(parent *QWidget, title string, text string, button defer C.free(title_ms) text_ms := miqt_strdupg(text) defer C.free(text_ms) - return (QMessageBox__StandardButton)(C.QMessageBox_Information4(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.uintptr_t)(button0))) + return (QMessageBox__StandardButton)(C.QMessageBox_Information4(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(button0))) } func QMessageBox_Question2(parent *QWidget, title string, text string, button0 int) int { @@ -425,7 +425,7 @@ func QMessageBox_Question4(parent *QWidget, title string, text string, button0 Q defer C.free(title_ms) text_ms := miqt_strdupg(text) defer C.free(text_ms) - return (int)(C.QMessageBox_Question4(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.uintptr_t)(button0), (C.uintptr_t)(button1))) + return (int)(C.QMessageBox_Question4(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(button0), (C.int)(button1))) } func QMessageBox_Warning2(parent *QWidget, title string, text string, button0 int, button1 int) int { @@ -451,7 +451,7 @@ func QMessageBox_Warning4(parent *QWidget, title string, text string, button0 QM defer C.free(title_ms) text_ms := miqt_strdupg(text) defer C.free(text_ms) - return (int)(C.QMessageBox_Warning4(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.uintptr_t)(button0), (C.uintptr_t)(button1))) + return (int)(C.QMessageBox_Warning4(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(button0), (C.int)(button1))) } func QMessageBox_Critical2(parent *QWidget, title string, text string, button0 int, button1 int) int { @@ -477,7 +477,7 @@ func QMessageBox_Critical4(parent *QWidget, title string, text string, button0 Q defer C.free(title_ms) text_ms := miqt_strdupg(text) defer C.free(text_ms) - return (int)(C.QMessageBox_Critical4(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.uintptr_t)(button0), (C.uintptr_t)(button1))) + return (int)(C.QMessageBox_Critical4(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(button0), (C.int)(button1))) } func (this *QMessageBox) ButtonText(button int) string { @@ -526,11 +526,11 @@ func (this *QMessageBox) SetWindowTitle(title string) { } func (this *QMessageBox) SetWindowModality(windowModality WindowModality) { - C.QMessageBox_SetWindowModality(this.h, (C.uintptr_t)(windowModality)) + C.QMessageBox_SetWindowModality(this.h, (C.int)(windowModality)) } func QMessageBox_StandardIcon(icon QMessageBox__Icon) *QPixmap { - _ret := C.QMessageBox_StandardIcon((C.uintptr_t)(icon)) + _ret := C.QMessageBox_StandardIcon((C.int)(icon)) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -605,7 +605,7 @@ func QMessageBox_Information42(parent *QWidget, title string, text string, butto defer C.free(title_ms) text_ms := miqt_strdupg(text) defer C.free(text_ms) - return (QMessageBox__StandardButton)(C.QMessageBox_Information42(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(buttons))) + return (QMessageBox__StandardButton)(C.QMessageBox_Information42(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), buttons)) } func QMessageBox_Information5(parent *QWidget, title string, text string, buttons int, defaultButton QMessageBox__StandardButton) QMessageBox__StandardButton { @@ -613,7 +613,7 @@ func QMessageBox_Information5(parent *QWidget, title string, text string, button defer C.free(title_ms) text_ms := miqt_strdupg(text) defer C.free(text_ms) - return (QMessageBox__StandardButton)(C.QMessageBox_Information5(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(buttons), (C.uintptr_t)(defaultButton))) + return (QMessageBox__StandardButton)(C.QMessageBox_Information5(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), buttons, (C.int)(defaultButton))) } func QMessageBox_Question42(parent *QWidget, title string, text string, buttons int) QMessageBox__StandardButton { @@ -621,7 +621,7 @@ func QMessageBox_Question42(parent *QWidget, title string, text string, buttons defer C.free(title_ms) text_ms := miqt_strdupg(text) defer C.free(text_ms) - return (QMessageBox__StandardButton)(C.QMessageBox_Question42(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(buttons))) + return (QMessageBox__StandardButton)(C.QMessageBox_Question42(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), buttons)) } func QMessageBox_Question5(parent *QWidget, title string, text string, buttons int, defaultButton QMessageBox__StandardButton) QMessageBox__StandardButton { @@ -629,7 +629,7 @@ func QMessageBox_Question5(parent *QWidget, title string, text string, buttons i defer C.free(title_ms) text_ms := miqt_strdupg(text) defer C.free(text_ms) - return (QMessageBox__StandardButton)(C.QMessageBox_Question5(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(buttons), (C.uintptr_t)(defaultButton))) + return (QMessageBox__StandardButton)(C.QMessageBox_Question5(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), buttons, (C.int)(defaultButton))) } func QMessageBox_Warning42(parent *QWidget, title string, text string, buttons int) QMessageBox__StandardButton { @@ -637,7 +637,7 @@ func QMessageBox_Warning42(parent *QWidget, title string, text string, buttons i defer C.free(title_ms) text_ms := miqt_strdupg(text) defer C.free(text_ms) - return (QMessageBox__StandardButton)(C.QMessageBox_Warning42(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(buttons))) + return (QMessageBox__StandardButton)(C.QMessageBox_Warning42(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), buttons)) } func QMessageBox_Warning5(parent *QWidget, title string, text string, buttons int, defaultButton QMessageBox__StandardButton) QMessageBox__StandardButton { @@ -645,7 +645,7 @@ func QMessageBox_Warning5(parent *QWidget, title string, text string, buttons in defer C.free(title_ms) text_ms := miqt_strdupg(text) defer C.free(text_ms) - return (QMessageBox__StandardButton)(C.QMessageBox_Warning5(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(buttons), (C.uintptr_t)(defaultButton))) + return (QMessageBox__StandardButton)(C.QMessageBox_Warning5(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), buttons, (C.int)(defaultButton))) } func QMessageBox_Critical42(parent *QWidget, title string, text string, buttons int) QMessageBox__StandardButton { @@ -653,7 +653,7 @@ func QMessageBox_Critical42(parent *QWidget, title string, text string, buttons defer C.free(title_ms) text_ms := miqt_strdupg(text) defer C.free(text_ms) - return (QMessageBox__StandardButton)(C.QMessageBox_Critical42(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(buttons))) + return (QMessageBox__StandardButton)(C.QMessageBox_Critical42(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), buttons)) } func QMessageBox_Critical5(parent *QWidget, title string, text string, buttons int, defaultButton QMessageBox__StandardButton) QMessageBox__StandardButton { @@ -661,7 +661,7 @@ func QMessageBox_Critical5(parent *QWidget, title string, text string, buttons i defer C.free(title_ms) text_ms := miqt_strdupg(text) defer C.free(text_ms) - return (QMessageBox__StandardButton)(C.QMessageBox_Critical5(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(buttons), (C.uintptr_t)(defaultButton))) + return (QMessageBox__StandardButton)(C.QMessageBox_Critical5(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), buttons, (C.int)(defaultButton))) } func QMessageBox_AboutQt2(parent *QWidget, title string) { @@ -745,7 +745,7 @@ func QMessageBox_Information54(parent *QWidget, title string, text string, butto defer C.free(title_ms) text_ms := miqt_strdupg(text) defer C.free(text_ms) - return (QMessageBox__StandardButton)(C.QMessageBox_Information54(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.uintptr_t)(button0), (C.uintptr_t)(button1))) + return (QMessageBox__StandardButton)(C.QMessageBox_Information54(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(button0), (C.int)(button1))) } func QMessageBox_Question52(parent *QWidget, title string, text string, button0 int, button1 int) int { diff --git a/qt/gen_qmessagebox.h b/qt/gen_qmessagebox.h index abbb2cb..ef48c1a 100644 --- a/qt/gen_qmessagebox.h +++ b/qt/gen_qmessagebox.h @@ -32,64 +32,64 @@ typedef struct QWidget QWidget; #endif QMessageBox* QMessageBox_new(); -QMessageBox* QMessageBox_new2(uintptr_t icon, struct miqt_string* title, struct miqt_string* text); -QMessageBox* QMessageBox_new3(struct miqt_string* title, struct miqt_string* text, uintptr_t icon, int button0, int button1, int button2); +QMessageBox* QMessageBox_new2(int icon, struct miqt_string* title, struct miqt_string* text); +QMessageBox* QMessageBox_new3(struct miqt_string* title, struct miqt_string* text, int icon, int button0, int button1, int button2); QMessageBox* QMessageBox_new4(QWidget* parent); -QMessageBox* QMessageBox_new5(uintptr_t icon, struct miqt_string* title, struct miqt_string* text, int buttons); -QMessageBox* QMessageBox_new6(uintptr_t icon, struct miqt_string* title, struct miqt_string* text, int buttons, QWidget* parent); -QMessageBox* QMessageBox_new7(uintptr_t icon, struct miqt_string* title, struct miqt_string* text, int buttons, QWidget* parent, int flags); -QMessageBox* QMessageBox_new8(struct miqt_string* title, struct miqt_string* text, uintptr_t icon, int button0, int button1, int button2, QWidget* parent); -QMessageBox* QMessageBox_new9(struct miqt_string* title, struct miqt_string* text, uintptr_t icon, int button0, int button1, int button2, QWidget* parent, int f); +QMessageBox* QMessageBox_new5(int icon, struct miqt_string* title, struct miqt_string* text, int buttons); +QMessageBox* QMessageBox_new6(int icon, struct miqt_string* title, struct miqt_string* text, int buttons, QWidget* parent); +QMessageBox* QMessageBox_new7(int icon, struct miqt_string* title, struct miqt_string* text, int buttons, QWidget* parent, int flags); +QMessageBox* QMessageBox_new8(struct miqt_string* title, struct miqt_string* text, int icon, int button0, int button1, int button2, QWidget* parent); +QMessageBox* QMessageBox_new9(struct miqt_string* title, struct miqt_string* text, int icon, int button0, int button1, int button2, QWidget* parent, int f); QMetaObject* QMessageBox_MetaObject(const QMessageBox* self); struct miqt_string* QMessageBox_Tr(const char* s); struct miqt_string* QMessageBox_TrUtf8(const char* s); -void QMessageBox_AddButton(QMessageBox* self, QAbstractButton* button, uintptr_t role); -QPushButton* QMessageBox_AddButton2(QMessageBox* self, struct miqt_string* text, uintptr_t role); -QPushButton* QMessageBox_AddButtonWithButton(QMessageBox* self, uintptr_t button); +void QMessageBox_AddButton(QMessageBox* self, QAbstractButton* button, int role); +QPushButton* QMessageBox_AddButton2(QMessageBox* self, struct miqt_string* text, int role); +QPushButton* QMessageBox_AddButtonWithButton(QMessageBox* self, int button); void QMessageBox_RemoveButton(QMessageBox* self, QAbstractButton* button); struct miqt_array* QMessageBox_Buttons(const QMessageBox* self); -uintptr_t QMessageBox_ButtonRole(const QMessageBox* self, QAbstractButton* button); +int QMessageBox_ButtonRole(const QMessageBox* self, QAbstractButton* button); void QMessageBox_SetStandardButtons(QMessageBox* self, int buttons); int QMessageBox_StandardButtons(const QMessageBox* self); -uintptr_t QMessageBox_StandardButton(const QMessageBox* self, QAbstractButton* button); -QAbstractButton* QMessageBox_Button(const QMessageBox* self, uintptr_t which); +int QMessageBox_StandardButton(const QMessageBox* self, QAbstractButton* button); +QAbstractButton* QMessageBox_Button(const QMessageBox* self, int which); QPushButton* QMessageBox_DefaultButton(const QMessageBox* self); void QMessageBox_SetDefaultButton(QMessageBox* self, QPushButton* button); -void QMessageBox_SetDefaultButtonWithButton(QMessageBox* self, uintptr_t button); +void QMessageBox_SetDefaultButtonWithButton(QMessageBox* self, int button); QAbstractButton* QMessageBox_EscapeButton(const QMessageBox* self); void QMessageBox_SetEscapeButton(QMessageBox* self, QAbstractButton* button); -void QMessageBox_SetEscapeButtonWithButton(QMessageBox* self, uintptr_t button); +void QMessageBox_SetEscapeButtonWithButton(QMessageBox* self, int button); QAbstractButton* QMessageBox_ClickedButton(const QMessageBox* self); struct miqt_string* QMessageBox_Text(const QMessageBox* self); void QMessageBox_SetText(QMessageBox* self, struct miqt_string* text); -uintptr_t QMessageBox_Icon(const QMessageBox* self); -void QMessageBox_SetIcon(QMessageBox* self, uintptr_t icon); +int QMessageBox_Icon(const QMessageBox* self); +void QMessageBox_SetIcon(QMessageBox* self, int icon); QPixmap* QMessageBox_IconPixmap(const QMessageBox* self); void QMessageBox_SetIconPixmap(QMessageBox* self, QPixmap* pixmap); -uintptr_t QMessageBox_TextFormat(const QMessageBox* self); -void QMessageBox_SetTextFormat(QMessageBox* self, uintptr_t format); +int QMessageBox_TextFormat(const QMessageBox* self); +void QMessageBox_SetTextFormat(QMessageBox* self, int format); void QMessageBox_SetTextInteractionFlags(QMessageBox* self, int flags); int QMessageBox_TextInteractionFlags(const QMessageBox* self); void QMessageBox_SetCheckBox(QMessageBox* self, QCheckBox* cb); QCheckBox* QMessageBox_CheckBox(const QMessageBox* self); -uintptr_t QMessageBox_Information(QWidget* parent, struct miqt_string* title, struct miqt_string* text); -uintptr_t QMessageBox_Question(QWidget* parent, struct miqt_string* title, struct miqt_string* text); -uintptr_t QMessageBox_Warning(QWidget* parent, struct miqt_string* title, struct miqt_string* text); -uintptr_t QMessageBox_Critical(QWidget* parent, struct miqt_string* title, struct miqt_string* text); +int QMessageBox_Information(QWidget* parent, struct miqt_string* title, struct miqt_string* text); +int QMessageBox_Question(QWidget* parent, struct miqt_string* title, struct miqt_string* text); +int QMessageBox_Warning(QWidget* parent, struct miqt_string* title, struct miqt_string* text); +int QMessageBox_Critical(QWidget* parent, struct miqt_string* title, struct miqt_string* text); void QMessageBox_About(QWidget* parent, struct miqt_string* title, struct miqt_string* text); void QMessageBox_AboutQt(QWidget* parent); int QMessageBox_Information2(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0); int QMessageBox_Information3(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text); -uintptr_t QMessageBox_Information4(QWidget* parent, struct miqt_string* title, struct miqt_string* text, uintptr_t button0); +int QMessageBox_Information4(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0); int QMessageBox_Question2(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0); int QMessageBox_Question3(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text); -int QMessageBox_Question4(QWidget* parent, struct miqt_string* title, struct miqt_string* text, uintptr_t button0, uintptr_t button1); +int QMessageBox_Question4(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1); int QMessageBox_Warning2(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1); int QMessageBox_Warning3(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text); -int QMessageBox_Warning4(QWidget* parent, struct miqt_string* title, struct miqt_string* text, uintptr_t button0, uintptr_t button1); +int QMessageBox_Warning4(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1); int QMessageBox_Critical2(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1); int QMessageBox_Critical3(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text); -int QMessageBox_Critical4(QWidget* parent, struct miqt_string* title, struct miqt_string* text, uintptr_t button0, uintptr_t button1); +int QMessageBox_Critical4(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1); struct miqt_string* QMessageBox_ButtonText(const QMessageBox* self, int button); void QMessageBox_SetButtonText(QMessageBox* self, int button, struct miqt_string* text); struct miqt_string* QMessageBox_InformativeText(const QMessageBox* self); @@ -97,22 +97,22 @@ void QMessageBox_SetInformativeText(QMessageBox* self, struct miqt_string* text) struct miqt_string* QMessageBox_DetailedText(const QMessageBox* self); void QMessageBox_SetDetailedText(QMessageBox* self, struct miqt_string* text); void QMessageBox_SetWindowTitle(QMessageBox* self, struct miqt_string* title); -void QMessageBox_SetWindowModality(QMessageBox* self, uintptr_t windowModality); -QPixmap* QMessageBox_StandardIcon(uintptr_t icon); +void QMessageBox_SetWindowModality(QMessageBox* self, int windowModality); +QPixmap* QMessageBox_StandardIcon(int icon); void QMessageBox_ButtonClicked(QMessageBox* self, QAbstractButton* button); void QMessageBox_connect_ButtonClicked(QMessageBox* self, void* slot); struct miqt_string* QMessageBox_Tr2(const char* s, const char* c); struct miqt_string* QMessageBox_Tr3(const char* s, const char* c, int n); struct miqt_string* QMessageBox_TrUtf82(const char* s, const char* c); struct miqt_string* QMessageBox_TrUtf83(const char* s, const char* c, int n); -uintptr_t QMessageBox_Information42(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons); -uintptr_t QMessageBox_Information5(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons, uintptr_t defaultButton); -uintptr_t QMessageBox_Question42(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons); -uintptr_t QMessageBox_Question5(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons, uintptr_t defaultButton); -uintptr_t QMessageBox_Warning42(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons); -uintptr_t QMessageBox_Warning5(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons, uintptr_t defaultButton); -uintptr_t QMessageBox_Critical42(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons); -uintptr_t QMessageBox_Critical5(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons, uintptr_t defaultButton); +int QMessageBox_Information42(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons); +int QMessageBox_Information5(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons, int defaultButton); +int QMessageBox_Question42(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons); +int QMessageBox_Question5(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons, int defaultButton); +int QMessageBox_Warning42(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons); +int QMessageBox_Warning5(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons, int defaultButton); +int QMessageBox_Critical42(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons); +int QMessageBox_Critical5(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int buttons, int defaultButton); void QMessageBox_AboutQt2(QWidget* parent, struct miqt_string* title); int QMessageBox_Information52(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1); int QMessageBox_Information6(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1, int button2); @@ -120,7 +120,7 @@ int QMessageBox_Information53(QWidget* parent, struct miqt_string* title, struct int QMessageBox_Information62(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text, struct miqt_string* button2Text); int QMessageBox_Information7(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text, struct miqt_string* button2Text, int defaultButtonNumber); int QMessageBox_Information8(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text, struct miqt_string* button2Text, int defaultButtonNumber, int escapeButtonNumber); -uintptr_t QMessageBox_Information54(QWidget* parent, struct miqt_string* title, struct miqt_string* text, uintptr_t button0, uintptr_t button1); +int QMessageBox_Information54(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1); int QMessageBox_Question52(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1); int QMessageBox_Question6(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1, int button2); int QMessageBox_Question53(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text); diff --git a/qt/gen_qmetaobject.cpp b/qt/gen_qmetaobject.cpp index 35e7724..b487f43 100644 --- a/qt/gen_qmetaobject.cpp +++ b/qt/gen_qmetaobject.cpp @@ -79,14 +79,14 @@ const char* QMetaMethod_Tag(const QMetaMethod* self) { return (const char*) self->tag(); } -uintptr_t QMetaMethod_Access(const QMetaMethod* self) { +int QMetaMethod_Access(const QMetaMethod* self) { QMetaMethod::Access _ret = self->access(); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QMetaMethod_MethodType(const QMetaMethod* self) { +int QMetaMethod_MethodType(const QMetaMethod* self) { QMetaMethod::MethodType _ret = self->methodType(); - return static_cast(_ret); + return static_cast(_ret); } int QMetaMethod_Attributes(const QMetaMethod* self) { @@ -105,7 +105,7 @@ QMetaObject* QMetaMethod_EnclosingMetaObject(const QMetaMethod* self) { return (QMetaObject*) self->enclosingMetaObject(); } -bool QMetaMethod_Invoke(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericReturnArgument* returnValue) { +bool QMetaMethod_Invoke(const QMetaMethod* self, QObject* object, int connectionType, QGenericReturnArgument* returnValue) { return self->invoke(object, static_cast(connectionType), *returnValue); } @@ -113,7 +113,7 @@ bool QMetaMethod_Invoke2(const QMetaMethod* self, QObject* object, QGenericRetur return self->invoke(object, *returnValue); } -bool QMetaMethod_Invoke3(const QMetaMethod* self, QObject* object, uintptr_t connectionType) { +bool QMetaMethod_Invoke3(const QMetaMethod* self, QObject* object, int connectionType) { return self->invoke(object, static_cast(connectionType)); } @@ -125,43 +125,43 @@ bool QMetaMethod_IsValid(const QMetaMethod* self) { return self->isValid(); } -bool QMetaMethod_Invoke4(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0) { +bool QMetaMethod_Invoke4(const QMetaMethod* self, QObject* object, int connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0) { return self->invoke(object, static_cast(connectionType), *returnValue, *val0); } -bool QMetaMethod_Invoke5(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1) { +bool QMetaMethod_Invoke5(const QMetaMethod* self, QObject* object, int connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1) { return self->invoke(object, static_cast(connectionType), *returnValue, *val0, *val1); } -bool QMetaMethod_Invoke6(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { +bool QMetaMethod_Invoke6(const QMetaMethod* self, QObject* object, int connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { return self->invoke(object, static_cast(connectionType), *returnValue, *val0, *val1, *val2); } -bool QMetaMethod_Invoke7(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { +bool QMetaMethod_Invoke7(const QMetaMethod* self, QObject* object, int connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { return self->invoke(object, static_cast(connectionType), *returnValue, *val0, *val1, *val2, *val3); } -bool QMetaMethod_Invoke8(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { +bool QMetaMethod_Invoke8(const QMetaMethod* self, QObject* object, int connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { return self->invoke(object, static_cast(connectionType), *returnValue, *val0, *val1, *val2, *val3, *val4); } -bool QMetaMethod_Invoke9(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { +bool QMetaMethod_Invoke9(const QMetaMethod* self, QObject* object, int connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { return self->invoke(object, static_cast(connectionType), *returnValue, *val0, *val1, *val2, *val3, *val4, *val5); } -bool QMetaMethod_Invoke10(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { +bool QMetaMethod_Invoke10(const QMetaMethod* self, QObject* object, int connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { return self->invoke(object, static_cast(connectionType), *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6); } -bool QMetaMethod_Invoke11(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { +bool QMetaMethod_Invoke11(const QMetaMethod* self, QObject* object, int connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { return self->invoke(object, static_cast(connectionType), *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7); } -bool QMetaMethod_Invoke12(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { +bool QMetaMethod_Invoke12(const QMetaMethod* self, QObject* object, int connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { return self->invoke(object, static_cast(connectionType), *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8); } -bool QMetaMethod_Invoke13(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { +bool QMetaMethod_Invoke13(const QMetaMethod* self, QObject* object, int connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { return self->invoke(object, static_cast(connectionType), *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8, *val9); } @@ -205,43 +205,43 @@ bool QMetaMethod_Invoke122(const QMetaMethod* self, QObject* object, QGenericRet return self->invoke(object, *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8, *val9); } -bool QMetaMethod_Invoke33(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericArgument* val0) { +bool QMetaMethod_Invoke33(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0) { return self->invoke(object, static_cast(connectionType), *val0); } -bool QMetaMethod_Invoke43(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericArgument* val0, QGenericArgument* val1) { +bool QMetaMethod_Invoke43(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1) { return self->invoke(object, static_cast(connectionType), *val0, *val1); } -bool QMetaMethod_Invoke53(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { +bool QMetaMethod_Invoke53(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { return self->invoke(object, static_cast(connectionType), *val0, *val1, *val2); } -bool QMetaMethod_Invoke63(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { +bool QMetaMethod_Invoke63(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { return self->invoke(object, static_cast(connectionType), *val0, *val1, *val2, *val3); } -bool QMetaMethod_Invoke73(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { +bool QMetaMethod_Invoke73(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { return self->invoke(object, static_cast(connectionType), *val0, *val1, *val2, *val3, *val4); } -bool QMetaMethod_Invoke83(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { +bool QMetaMethod_Invoke83(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { return self->invoke(object, static_cast(connectionType), *val0, *val1, *val2, *val3, *val4, *val5); } -bool QMetaMethod_Invoke93(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { +bool QMetaMethod_Invoke93(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { return self->invoke(object, static_cast(connectionType), *val0, *val1, *val2, *val3, *val4, *val5, *val6); } -bool QMetaMethod_Invoke103(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { +bool QMetaMethod_Invoke103(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { return self->invoke(object, static_cast(connectionType), *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7); } -bool QMetaMethod_Invoke113(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { +bool QMetaMethod_Invoke113(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { return self->invoke(object, static_cast(connectionType), *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8); } -bool QMetaMethod_Invoke123(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { +bool QMetaMethod_Invoke123(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { return self->invoke(object, static_cast(connectionType), *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8, *val9); } @@ -377,9 +377,9 @@ const char* QMetaProperty_TypeName(const QMetaProperty* self) { return (const char*) self->typeName(); } -uintptr_t QMetaProperty_Type(const QMetaProperty* self) { +int QMetaProperty_Type(const QMetaProperty* self) { QVariant::Type _ret = self->type(); - return static_cast(_ret); + return static_cast(_ret); } int QMetaProperty_UserType(const QMetaProperty* self) { diff --git a/qt/gen_qmetaobject.go b/qt/gen_qmetaobject.go index bf3bcf0..9ab5bf9 100644 --- a/qt/gen_qmetaobject.go +++ b/qt/gen_qmetaobject.go @@ -165,7 +165,7 @@ func (this *QMetaMethod) EnclosingMetaObject() *QMetaObject { } func (this *QMetaMethod) Invoke(object *QObject, connectionType ConnectionType, returnValue QGenericReturnArgument) bool { - return (bool)(C.QMetaMethod_Invoke(this.h, object.cPointer(), (C.uintptr_t)(connectionType), returnValue.cPointer())) + return (bool)(C.QMetaMethod_Invoke(this.h, object.cPointer(), (C.int)(connectionType), returnValue.cPointer())) } func (this *QMetaMethod) Invoke2(object *QObject, returnValue QGenericReturnArgument) bool { @@ -173,7 +173,7 @@ func (this *QMetaMethod) Invoke2(object *QObject, returnValue QGenericReturnArgu } func (this *QMetaMethod) Invoke3(object *QObject, connectionType ConnectionType) bool { - return (bool)(C.QMetaMethod_Invoke3(this.h, object.cPointer(), (C.uintptr_t)(connectionType))) + return (bool)(C.QMetaMethod_Invoke3(this.h, object.cPointer(), (C.int)(connectionType))) } func (this *QMetaMethod) InvokeWithObject(object *QObject) bool { @@ -185,43 +185,43 @@ func (this *QMetaMethod) IsValid() bool { } func (this *QMetaMethod) Invoke4(object *QObject, connectionType ConnectionType, returnValue QGenericReturnArgument, val0 QGenericArgument) bool { - return (bool)(C.QMetaMethod_Invoke4(this.h, object.cPointer(), (C.uintptr_t)(connectionType), returnValue.cPointer(), val0.cPointer())) + return (bool)(C.QMetaMethod_Invoke4(this.h, object.cPointer(), (C.int)(connectionType), returnValue.cPointer(), val0.cPointer())) } func (this *QMetaMethod) Invoke5(object *QObject, connectionType ConnectionType, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument) bool { - return (bool)(C.QMetaMethod_Invoke5(this.h, object.cPointer(), (C.uintptr_t)(connectionType), returnValue.cPointer(), val0.cPointer(), val1.cPointer())) + return (bool)(C.QMetaMethod_Invoke5(this.h, object.cPointer(), (C.int)(connectionType), returnValue.cPointer(), val0.cPointer(), val1.cPointer())) } func (this *QMetaMethod) Invoke6(object *QObject, connectionType ConnectionType, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument) bool { - return (bool)(C.QMetaMethod_Invoke6(this.h, object.cPointer(), (C.uintptr_t)(connectionType), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer())) + return (bool)(C.QMetaMethod_Invoke6(this.h, object.cPointer(), (C.int)(connectionType), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer())) } func (this *QMetaMethod) Invoke7(object *QObject, connectionType ConnectionType, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument) bool { - return (bool)(C.QMetaMethod_Invoke7(this.h, object.cPointer(), (C.uintptr_t)(connectionType), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) + return (bool)(C.QMetaMethod_Invoke7(this.h, object.cPointer(), (C.int)(connectionType), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) } func (this *QMetaMethod) Invoke8(object *QObject, connectionType ConnectionType, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument) bool { - return (bool)(C.QMetaMethod_Invoke8(this.h, object.cPointer(), (C.uintptr_t)(connectionType), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) + return (bool)(C.QMetaMethod_Invoke8(this.h, object.cPointer(), (C.int)(connectionType), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) } func (this *QMetaMethod) Invoke9(object *QObject, connectionType ConnectionType, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument) bool { - return (bool)(C.QMetaMethod_Invoke9(this.h, object.cPointer(), (C.uintptr_t)(connectionType), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) + return (bool)(C.QMetaMethod_Invoke9(this.h, object.cPointer(), (C.int)(connectionType), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) } func (this *QMetaMethod) Invoke10(object *QObject, connectionType ConnectionType, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument) bool { - return (bool)(C.QMetaMethod_Invoke10(this.h, object.cPointer(), (C.uintptr_t)(connectionType), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) + return (bool)(C.QMetaMethod_Invoke10(this.h, object.cPointer(), (C.int)(connectionType), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) } func (this *QMetaMethod) Invoke11(object *QObject, connectionType ConnectionType, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument) bool { - return (bool)(C.QMetaMethod_Invoke11(this.h, object.cPointer(), (C.uintptr_t)(connectionType), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) + return (bool)(C.QMetaMethod_Invoke11(this.h, object.cPointer(), (C.int)(connectionType), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) } func (this *QMetaMethod) Invoke12(object *QObject, connectionType ConnectionType, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument) bool { - return (bool)(C.QMetaMethod_Invoke12(this.h, object.cPointer(), (C.uintptr_t)(connectionType), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) + return (bool)(C.QMetaMethod_Invoke12(this.h, object.cPointer(), (C.int)(connectionType), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) } func (this *QMetaMethod) Invoke13(object *QObject, connectionType ConnectionType, returnValue QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument, val9 QGenericArgument) bool { - return (bool)(C.QMetaMethod_Invoke13(this.h, object.cPointer(), (C.uintptr_t)(connectionType), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) + return (bool)(C.QMetaMethod_Invoke13(this.h, object.cPointer(), (C.int)(connectionType), returnValue.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) } func (this *QMetaMethod) Invoke32(object *QObject, returnValue QGenericReturnArgument, val0 QGenericArgument) bool { @@ -265,43 +265,43 @@ func (this *QMetaMethod) Invoke122(object *QObject, returnValue QGenericReturnAr } func (this *QMetaMethod) Invoke33(object *QObject, connectionType ConnectionType, val0 QGenericArgument) bool { - return (bool)(C.QMetaMethod_Invoke33(this.h, object.cPointer(), (C.uintptr_t)(connectionType), val0.cPointer())) + return (bool)(C.QMetaMethod_Invoke33(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer())) } func (this *QMetaMethod) Invoke43(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument) bool { - return (bool)(C.QMetaMethod_Invoke43(this.h, object.cPointer(), (C.uintptr_t)(connectionType), val0.cPointer(), val1.cPointer())) + return (bool)(C.QMetaMethod_Invoke43(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer())) } func (this *QMetaMethod) Invoke53(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument) bool { - return (bool)(C.QMetaMethod_Invoke53(this.h, object.cPointer(), (C.uintptr_t)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer())) + return (bool)(C.QMetaMethod_Invoke53(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer())) } func (this *QMetaMethod) Invoke63(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument) bool { - return (bool)(C.QMetaMethod_Invoke63(this.h, object.cPointer(), (C.uintptr_t)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) + return (bool)(C.QMetaMethod_Invoke63(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) } func (this *QMetaMethod) Invoke73(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument) bool { - return (bool)(C.QMetaMethod_Invoke73(this.h, object.cPointer(), (C.uintptr_t)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) + return (bool)(C.QMetaMethod_Invoke73(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) } func (this *QMetaMethod) Invoke83(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument) bool { - return (bool)(C.QMetaMethod_Invoke83(this.h, object.cPointer(), (C.uintptr_t)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) + return (bool)(C.QMetaMethod_Invoke83(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) } func (this *QMetaMethod) Invoke93(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument) bool { - return (bool)(C.QMetaMethod_Invoke93(this.h, object.cPointer(), (C.uintptr_t)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) + return (bool)(C.QMetaMethod_Invoke93(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) } func (this *QMetaMethod) Invoke103(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument) bool { - return (bool)(C.QMetaMethod_Invoke103(this.h, object.cPointer(), (C.uintptr_t)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) + return (bool)(C.QMetaMethod_Invoke103(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) } func (this *QMetaMethod) Invoke113(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument) bool { - return (bool)(C.QMetaMethod_Invoke113(this.h, object.cPointer(), (C.uintptr_t)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) + return (bool)(C.QMetaMethod_Invoke113(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) } func (this *QMetaMethod) Invoke123(object *QObject, connectionType ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument, val9 QGenericArgument) bool { - return (bool)(C.QMetaMethod_Invoke123(this.h, object.cPointer(), (C.uintptr_t)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) + return (bool)(C.QMetaMethod_Invoke123(this.h, object.cPointer(), (C.int)(connectionType), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) } func (this *QMetaMethod) Invoke22(object *QObject, val0 QGenericArgument) bool { diff --git a/qt/gen_qmetaobject.h b/qt/gen_qmetaobject.h index 70f92f5..1c59d8c 100644 --- a/qt/gen_qmetaobject.h +++ b/qt/gen_qmetaobject.h @@ -49,27 +49,27 @@ void QMetaMethod_GetParameterTypes(const QMetaMethod* self, int* types); struct miqt_array* QMetaMethod_ParameterTypes(const QMetaMethod* self); struct miqt_array* QMetaMethod_ParameterNames(const QMetaMethod* self); const char* QMetaMethod_Tag(const QMetaMethod* self); -uintptr_t QMetaMethod_Access(const QMetaMethod* self); -uintptr_t QMetaMethod_MethodType(const QMetaMethod* self); +int QMetaMethod_Access(const QMetaMethod* self); +int QMetaMethod_MethodType(const QMetaMethod* self); int QMetaMethod_Attributes(const QMetaMethod* self); int QMetaMethod_MethodIndex(const QMetaMethod* self); int QMetaMethod_Revision(const QMetaMethod* self); QMetaObject* QMetaMethod_EnclosingMetaObject(const QMetaMethod* self); -bool QMetaMethod_Invoke(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericReturnArgument* returnValue); +bool QMetaMethod_Invoke(const QMetaMethod* self, QObject* object, int connectionType, QGenericReturnArgument* returnValue); bool QMetaMethod_Invoke2(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue); -bool QMetaMethod_Invoke3(const QMetaMethod* self, QObject* object, uintptr_t connectionType); +bool QMetaMethod_Invoke3(const QMetaMethod* self, QObject* object, int connectionType); bool QMetaMethod_InvokeWithObject(const QMetaMethod* self, QObject* object); bool QMetaMethod_IsValid(const QMetaMethod* self); -bool QMetaMethod_Invoke4(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0); -bool QMetaMethod_Invoke5(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1); -bool QMetaMethod_Invoke6(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); -bool QMetaMethod_Invoke7(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); -bool QMetaMethod_Invoke8(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); -bool QMetaMethod_Invoke9(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); -bool QMetaMethod_Invoke10(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); -bool QMetaMethod_Invoke11(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); -bool QMetaMethod_Invoke12(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); -bool QMetaMethod_Invoke13(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); +bool QMetaMethod_Invoke4(const QMetaMethod* self, QObject* object, int connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0); +bool QMetaMethod_Invoke5(const QMetaMethod* self, QObject* object, int connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1); +bool QMetaMethod_Invoke6(const QMetaMethod* self, QObject* object, int connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); +bool QMetaMethod_Invoke7(const QMetaMethod* self, QObject* object, int connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); +bool QMetaMethod_Invoke8(const QMetaMethod* self, QObject* object, int connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); +bool QMetaMethod_Invoke9(const QMetaMethod* self, QObject* object, int connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); +bool QMetaMethod_Invoke10(const QMetaMethod* self, QObject* object, int connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); +bool QMetaMethod_Invoke11(const QMetaMethod* self, QObject* object, int connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); +bool QMetaMethod_Invoke12(const QMetaMethod* self, QObject* object, int connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); +bool QMetaMethod_Invoke13(const QMetaMethod* self, QObject* object, int connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); bool QMetaMethod_Invoke32(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0); bool QMetaMethod_Invoke42(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1); bool QMetaMethod_Invoke52(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); @@ -80,16 +80,16 @@ bool QMetaMethod_Invoke92(const QMetaMethod* self, QObject* object, QGenericRetu bool QMetaMethod_Invoke102(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); bool QMetaMethod_Invoke112(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); bool QMetaMethod_Invoke122(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); -bool QMetaMethod_Invoke33(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericArgument* val0); -bool QMetaMethod_Invoke43(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericArgument* val0, QGenericArgument* val1); -bool QMetaMethod_Invoke53(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); -bool QMetaMethod_Invoke63(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); -bool QMetaMethod_Invoke73(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); -bool QMetaMethod_Invoke83(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); -bool QMetaMethod_Invoke93(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); -bool QMetaMethod_Invoke103(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); -bool QMetaMethod_Invoke113(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); -bool QMetaMethod_Invoke123(const QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); +bool QMetaMethod_Invoke33(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0); +bool QMetaMethod_Invoke43(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1); +bool QMetaMethod_Invoke53(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); +bool QMetaMethod_Invoke63(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); +bool QMetaMethod_Invoke73(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); +bool QMetaMethod_Invoke83(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); +bool QMetaMethod_Invoke93(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); +bool QMetaMethod_Invoke103(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); +bool QMetaMethod_Invoke113(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); +bool QMetaMethod_Invoke123(const QMetaMethod* self, QObject* object, int connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); bool QMetaMethod_Invoke22(const QMetaMethod* self, QObject* object, QGenericArgument* val0); bool QMetaMethod_Invoke34(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1); bool QMetaMethod_Invoke44(const QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); @@ -125,7 +125,7 @@ void QMetaEnum_Delete(QMetaEnum* self); QMetaProperty* QMetaProperty_new(); const char* QMetaProperty_Name(const QMetaProperty* self); const char* QMetaProperty_TypeName(const QMetaProperty* self); -uintptr_t QMetaProperty_Type(const QMetaProperty* self); +int QMetaProperty_Type(const QMetaProperty* self); int QMetaProperty_UserType(const QMetaProperty* self); int QMetaProperty_PropertyIndex(const QMetaProperty* self); int QMetaProperty_RelativePropertyIndex(const QMetaProperty* self); diff --git a/qt/gen_qmetatype.cpp b/qt/gen_qmetatype.cpp index 18a8136..9a84aa1 100644 --- a/qt/gen_qmetatype.cpp +++ b/qt/gen_qmetatype.cpp @@ -151,17 +151,19 @@ QtMetaTypePrivate__QSequentialIterableImpl* QtMetaTypePrivate__QSequentialIterab return new QtMetaTypePrivate::QSequentialIterableImpl(*param1); } -uintptr_t QtMetaTypePrivate__QSequentialIterableImpl_IteratorCapabilities(QtMetaTypePrivate__QSequentialIterableImpl* self) { +int QtMetaTypePrivate__QSequentialIterableImpl_IteratorCapabilities(QtMetaTypePrivate__QSequentialIterableImpl* self) { QtMetaTypePrivate::IteratorCapability _ret = self->iteratorCapabilities(); - return static_cast(_ret); + return static_cast(_ret); } unsigned int QtMetaTypePrivate__QSequentialIterableImpl_Revision(QtMetaTypePrivate__QSequentialIterableImpl* self) { - return self->revision(); + uint _ret = self->revision(); + return static_cast(_ret); } unsigned int QtMetaTypePrivate__QSequentialIterableImpl_ContainerCapabilities(QtMetaTypePrivate__QSequentialIterableImpl* self) { - return self->containerCapabilities(); + uint _ret = self->containerCapabilities(); + return static_cast(_ret); } void QtMetaTypePrivate__QSequentialIterableImpl_MoveToBegin(QtMetaTypePrivate__QSequentialIterableImpl* self) { @@ -176,6 +178,12 @@ bool QtMetaTypePrivate__QSequentialIterableImpl_Equal(const QtMetaTypePrivate__Q return self->equal(*other); } +QtMetaTypePrivate__QSequentialIterableImpl* QtMetaTypePrivate__QSequentialIterableImpl_Advance(QtMetaTypePrivate__QSequentialIterableImpl* self, int i) { + QtMetaTypePrivate::QSequentialIterableImpl& _ret = self->advance(static_cast(i)); + // Cast returned reference into pointer + return &_ret; +} + QtMetaTypePrivate__VariantData* QtMetaTypePrivate__QSequentialIterableImpl_GetCurrent(const QtMetaTypePrivate__QSequentialIterableImpl* self) { return new QtMetaTypePrivate::VariantData(self->getCurrent()); } @@ -196,6 +204,10 @@ void QtMetaTypePrivate__QSequentialIterableImpl_Copy(QtMetaTypePrivate__QSequent self->copy(*other); } +void QtMetaTypePrivate__QSequentialIterableImpl_OperatorAssign(QtMetaTypePrivate__QSequentialIterableImpl* self, QtMetaTypePrivate__QSequentialIterableImpl* param1) { + self->operator=(*param1); +} + void QtMetaTypePrivate__QSequentialIterableImpl_Delete(QtMetaTypePrivate__QSequentialIterableImpl* self) { delete self; } @@ -220,6 +232,12 @@ bool QtMetaTypePrivate__QAssociativeIterableImpl_Equal(const QtMetaTypePrivate__ return self->equal(*other); } +QtMetaTypePrivate__QAssociativeIterableImpl* QtMetaTypePrivate__QAssociativeIterableImpl_Advance(QtMetaTypePrivate__QAssociativeIterableImpl* self, int i) { + QtMetaTypePrivate::QAssociativeIterableImpl& _ret = self->advance(static_cast(i)); + // Cast returned reference into pointer + return &_ret; +} + void QtMetaTypePrivate__QAssociativeIterableImpl_DestroyIter(QtMetaTypePrivate__QAssociativeIterableImpl* self) { self->destroyIter(); } @@ -244,6 +262,10 @@ void QtMetaTypePrivate__QAssociativeIterableImpl_Copy(QtMetaTypePrivate__QAssoci self->copy(*other); } +void QtMetaTypePrivate__QAssociativeIterableImpl_OperatorAssign(QtMetaTypePrivate__QAssociativeIterableImpl* self, QtMetaTypePrivate__QAssociativeIterableImpl* param1) { + self->operator=(*param1); +} + void QtMetaTypePrivate__QAssociativeIterableImpl_Delete(QtMetaTypePrivate__QAssociativeIterableImpl* self) { delete self; } diff --git a/qt/gen_qmetatype.go b/qt/gen_qmetatype.go index 25f14c7..4e94932 100644 --- a/qt/gen_qmetatype.go +++ b/qt/gen_qmetatype.go @@ -543,6 +543,10 @@ func (this *QtMetaTypePrivate__QSequentialIterableImpl) Equal(other *QtMetaTypeP return (bool)(C.QtMetaTypePrivate__QSequentialIterableImpl_Equal(this.h, other.cPointer())) } +func (this *QtMetaTypePrivate__QSequentialIterableImpl) Advance(i int) *QtMetaTypePrivate__QSequentialIterableImpl { + return newQtMetaTypePrivate__QSequentialIterableImpl_U(unsafe.Pointer(C.QtMetaTypePrivate__QSequentialIterableImpl_Advance(this.h, (C.int)(i)))) +} + func (this *QtMetaTypePrivate__QSequentialIterableImpl) GetCurrent() *QtMetaTypePrivate__VariantData { _ret := C.QtMetaTypePrivate__QSequentialIterableImpl_GetCurrent(this.h) _goptr := newQtMetaTypePrivate__VariantData(_ret) @@ -569,6 +573,10 @@ func (this *QtMetaTypePrivate__QSequentialIterableImpl) Copy(other *QtMetaTypePr C.QtMetaTypePrivate__QSequentialIterableImpl_Copy(this.h, other.cPointer()) } +func (this *QtMetaTypePrivate__QSequentialIterableImpl) OperatorAssign(param1 *QtMetaTypePrivate__QSequentialIterableImpl) { + C.QtMetaTypePrivate__QSequentialIterableImpl_OperatorAssign(this.h, param1.cPointer()) +} + // Delete this object from C++ memory. func (this *QtMetaTypePrivate__QSequentialIterableImpl) Delete() { C.QtMetaTypePrivate__QSequentialIterableImpl_Delete(this.h) @@ -629,6 +637,10 @@ func (this *QtMetaTypePrivate__QAssociativeIterableImpl) Equal(other *QtMetaType return (bool)(C.QtMetaTypePrivate__QAssociativeIterableImpl_Equal(this.h, other.cPointer())) } +func (this *QtMetaTypePrivate__QAssociativeIterableImpl) Advance(i int) *QtMetaTypePrivate__QAssociativeIterableImpl { + return newQtMetaTypePrivate__QAssociativeIterableImpl_U(unsafe.Pointer(C.QtMetaTypePrivate__QAssociativeIterableImpl_Advance(this.h, (C.int)(i)))) +} + func (this *QtMetaTypePrivate__QAssociativeIterableImpl) DestroyIter() { C.QtMetaTypePrivate__QAssociativeIterableImpl_DestroyIter(this.h) } @@ -659,6 +671,10 @@ func (this *QtMetaTypePrivate__QAssociativeIterableImpl) Copy(other *QtMetaTypeP C.QtMetaTypePrivate__QAssociativeIterableImpl_Copy(this.h, other.cPointer()) } +func (this *QtMetaTypePrivate__QAssociativeIterableImpl) OperatorAssign(param1 *QtMetaTypePrivate__QAssociativeIterableImpl) { + C.QtMetaTypePrivate__QAssociativeIterableImpl_OperatorAssign(this.h, param1.cPointer()) +} + // Delete this object from C++ memory. func (this *QtMetaTypePrivate__QAssociativeIterableImpl) Delete() { C.QtMetaTypePrivate__QAssociativeIterableImpl_Delete(this.h) diff --git a/qt/gen_qmetatype.h b/qt/gen_qmetatype.h index c8fac91..05a43d1 100644 --- a/qt/gen_qmetatype.h +++ b/qt/gen_qmetatype.h @@ -111,17 +111,19 @@ void QtMetaTypePrivate__VectorBoolElements_Delete(QtMetaTypePrivate__VectorBoolE QtMetaTypePrivate__QSequentialIterableImpl* QtMetaTypePrivate__QSequentialIterableImpl_new(); QtMetaTypePrivate__QSequentialIterableImpl* QtMetaTypePrivate__QSequentialIterableImpl_new2(QtMetaTypePrivate__QSequentialIterableImpl* param1); -uintptr_t QtMetaTypePrivate__QSequentialIterableImpl_IteratorCapabilities(QtMetaTypePrivate__QSequentialIterableImpl* self); +int QtMetaTypePrivate__QSequentialIterableImpl_IteratorCapabilities(QtMetaTypePrivate__QSequentialIterableImpl* self); unsigned int QtMetaTypePrivate__QSequentialIterableImpl_Revision(QtMetaTypePrivate__QSequentialIterableImpl* self); unsigned int QtMetaTypePrivate__QSequentialIterableImpl_ContainerCapabilities(QtMetaTypePrivate__QSequentialIterableImpl* self); void QtMetaTypePrivate__QSequentialIterableImpl_MoveToBegin(QtMetaTypePrivate__QSequentialIterableImpl* self); void QtMetaTypePrivate__QSequentialIterableImpl_MoveToEnd(QtMetaTypePrivate__QSequentialIterableImpl* self); bool QtMetaTypePrivate__QSequentialIterableImpl_Equal(const QtMetaTypePrivate__QSequentialIterableImpl* self, QtMetaTypePrivate__QSequentialIterableImpl* other); +QtMetaTypePrivate__QSequentialIterableImpl* QtMetaTypePrivate__QSequentialIterableImpl_Advance(QtMetaTypePrivate__QSequentialIterableImpl* self, int i); QtMetaTypePrivate__VariantData* QtMetaTypePrivate__QSequentialIterableImpl_GetCurrent(const QtMetaTypePrivate__QSequentialIterableImpl* self); QtMetaTypePrivate__VariantData* QtMetaTypePrivate__QSequentialIterableImpl_At(const QtMetaTypePrivate__QSequentialIterableImpl* self, int idx); int QtMetaTypePrivate__QSequentialIterableImpl_Size(const QtMetaTypePrivate__QSequentialIterableImpl* self); void QtMetaTypePrivate__QSequentialIterableImpl_DestroyIter(QtMetaTypePrivate__QSequentialIterableImpl* self); void QtMetaTypePrivate__QSequentialIterableImpl_Copy(QtMetaTypePrivate__QSequentialIterableImpl* self, QtMetaTypePrivate__QSequentialIterableImpl* other); +void QtMetaTypePrivate__QSequentialIterableImpl_OperatorAssign(QtMetaTypePrivate__QSequentialIterableImpl* self, QtMetaTypePrivate__QSequentialIterableImpl* param1); void QtMetaTypePrivate__QSequentialIterableImpl_Delete(QtMetaTypePrivate__QSequentialIterableImpl* self); QtMetaTypePrivate__QAssociativeIterableImpl* QtMetaTypePrivate__QAssociativeIterableImpl_new(); @@ -129,12 +131,14 @@ QtMetaTypePrivate__QAssociativeIterableImpl* QtMetaTypePrivate__QAssociativeIter void QtMetaTypePrivate__QAssociativeIterableImpl_Begin(QtMetaTypePrivate__QAssociativeIterableImpl* self); void QtMetaTypePrivate__QAssociativeIterableImpl_End(QtMetaTypePrivate__QAssociativeIterableImpl* self); bool QtMetaTypePrivate__QAssociativeIterableImpl_Equal(const QtMetaTypePrivate__QAssociativeIterableImpl* self, QtMetaTypePrivate__QAssociativeIterableImpl* other); +QtMetaTypePrivate__QAssociativeIterableImpl* QtMetaTypePrivate__QAssociativeIterableImpl_Advance(QtMetaTypePrivate__QAssociativeIterableImpl* self, int i); void QtMetaTypePrivate__QAssociativeIterableImpl_DestroyIter(QtMetaTypePrivate__QAssociativeIterableImpl* self); QtMetaTypePrivate__VariantData* QtMetaTypePrivate__QAssociativeIterableImpl_GetCurrentKey(const QtMetaTypePrivate__QAssociativeIterableImpl* self); QtMetaTypePrivate__VariantData* QtMetaTypePrivate__QAssociativeIterableImpl_GetCurrentValue(const QtMetaTypePrivate__QAssociativeIterableImpl* self); void QtMetaTypePrivate__QAssociativeIterableImpl_Find(QtMetaTypePrivate__QAssociativeIterableImpl* self, QtMetaTypePrivate__VariantData* key); int QtMetaTypePrivate__QAssociativeIterableImpl_Size(const QtMetaTypePrivate__QAssociativeIterableImpl* self); void QtMetaTypePrivate__QAssociativeIterableImpl_Copy(QtMetaTypePrivate__QAssociativeIterableImpl* self, QtMetaTypePrivate__QAssociativeIterableImpl* other); +void QtMetaTypePrivate__QAssociativeIterableImpl_OperatorAssign(QtMetaTypePrivate__QAssociativeIterableImpl* self, QtMetaTypePrivate__QAssociativeIterableImpl* param1); void QtMetaTypePrivate__QAssociativeIterableImpl_Delete(QtMetaTypePrivate__QAssociativeIterableImpl* self); QtMetaTypePrivate__QPairVariantInterfaceImpl* QtMetaTypePrivate__QPairVariantInterfaceImpl_new(); diff --git a/qt/gen_qmimedatabase.cpp b/qt/gen_qmimedatabase.cpp index 0431870..8ba5b46 100644 --- a/qt/gen_qmimedatabase.cpp +++ b/qt/gen_qmimedatabase.cpp @@ -87,12 +87,12 @@ struct miqt_array* QMimeDatabase_AllMimeTypes(const QMimeDatabase* self) { return _out; } -QMimeType* QMimeDatabase_MimeTypeForFile2(const QMimeDatabase* self, struct miqt_string* fileName, uintptr_t mode) { +QMimeType* QMimeDatabase_MimeTypeForFile2(const QMimeDatabase* self, struct miqt_string* fileName, int mode) { QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); return new QMimeType(self->mimeTypeForFile(fileName_QString, static_cast(mode))); } -QMimeType* QMimeDatabase_MimeTypeForFile22(const QMimeDatabase* self, QFileInfo* fileInfo, uintptr_t mode) { +QMimeType* QMimeDatabase_MimeTypeForFile22(const QMimeDatabase* self, QFileInfo* fileInfo, int mode) { return new QMimeType(self->mimeTypeForFile(*fileInfo, static_cast(mode))); } diff --git a/qt/gen_qmimedatabase.go b/qt/gen_qmimedatabase.go index 66058ce..9387f7e 100644 --- a/qt/gen_qmimedatabase.go +++ b/qt/gen_qmimedatabase.go @@ -155,14 +155,14 @@ func (this *QMimeDatabase) AllMimeTypes() []QMimeType { func (this *QMimeDatabase) MimeTypeForFile2(fileName string, mode QMimeDatabase__MatchMode) *QMimeType { fileName_ms := miqt_strdupg(fileName) defer C.free(fileName_ms) - _ret := C.QMimeDatabase_MimeTypeForFile2(this.h, (*C.struct_miqt_string)(fileName_ms), (C.uintptr_t)(mode)) + _ret := C.QMimeDatabase_MimeTypeForFile2(this.h, (*C.struct_miqt_string)(fileName_ms), (C.int)(mode)) _goptr := newQMimeType(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QMimeDatabase) MimeTypeForFile22(fileInfo *QFileInfo, mode QMimeDatabase__MatchMode) *QMimeType { - _ret := C.QMimeDatabase_MimeTypeForFile22(this.h, fileInfo.cPointer(), (C.uintptr_t)(mode)) + _ret := C.QMimeDatabase_MimeTypeForFile22(this.h, fileInfo.cPointer(), (C.int)(mode)) _goptr := newQMimeType(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qmimedatabase.h b/qt/gen_qmimedatabase.h index fca7a0e..b3a4e57 100644 --- a/qt/gen_qmimedatabase.h +++ b/qt/gen_qmimedatabase.h @@ -41,8 +41,8 @@ QMimeType* QMimeDatabase_MimeTypeForFileNameAndData(const QMimeDatabase* self, s QMimeType* QMimeDatabase_MimeTypeForFileNameAndData2(const QMimeDatabase* self, struct miqt_string* fileName, QByteArray* data); struct miqt_string* QMimeDatabase_SuffixForFileName(const QMimeDatabase* self, struct miqt_string* fileName); struct miqt_array* QMimeDatabase_AllMimeTypes(const QMimeDatabase* self); -QMimeType* QMimeDatabase_MimeTypeForFile2(const QMimeDatabase* self, struct miqt_string* fileName, uintptr_t mode); -QMimeType* QMimeDatabase_MimeTypeForFile22(const QMimeDatabase* self, QFileInfo* fileInfo, uintptr_t mode); +QMimeType* QMimeDatabase_MimeTypeForFile2(const QMimeDatabase* self, struct miqt_string* fileName, int mode); +QMimeType* QMimeDatabase_MimeTypeForFile22(const QMimeDatabase* self, QFileInfo* fileInfo, int mode); void QMimeDatabase_Delete(QMimeDatabase* self); #ifdef __cplusplus diff --git a/qt/gen_qmouseeventtransition.cpp b/qt/gen_qmouseeventtransition.cpp index d17ad1b..4e61154 100644 --- a/qt/gen_qmouseeventtransition.cpp +++ b/qt/gen_qmouseeventtransition.cpp @@ -14,7 +14,7 @@ QMouseEventTransition* QMouseEventTransition_new() { return new QMouseEventTransition(); } -QMouseEventTransition* QMouseEventTransition_new2(QObject* object, uintptr_t typeVal, uintptr_t button) { +QMouseEventTransition* QMouseEventTransition_new2(QObject* object, int typeVal, int button) { return new QMouseEventTransition(object, static_cast(typeVal), static_cast(button)); } @@ -22,7 +22,7 @@ QMouseEventTransition* QMouseEventTransition_new3(QState* sourceState) { return new QMouseEventTransition(sourceState); } -QMouseEventTransition* QMouseEventTransition_new4(QObject* object, uintptr_t typeVal, uintptr_t button, QState* sourceState) { +QMouseEventTransition* QMouseEventTransition_new4(QObject* object, int typeVal, int button, QState* sourceState) { return new QMouseEventTransition(object, static_cast(typeVal), static_cast(button), sourceState); } @@ -44,12 +44,12 @@ struct miqt_string* QMouseEventTransition_TrUtf8(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -uintptr_t QMouseEventTransition_Button(const QMouseEventTransition* self) { +int QMouseEventTransition_Button(const QMouseEventTransition* self) { Qt::MouseButton _ret = self->button(); - return static_cast(_ret); + return static_cast(_ret); } -void QMouseEventTransition_SetButton(QMouseEventTransition* self, uintptr_t button) { +void QMouseEventTransition_SetButton(QMouseEventTransition* self, int button) { self->setButton(static_cast(button)); } diff --git a/qt/gen_qmouseeventtransition.go b/qt/gen_qmouseeventtransition.go index a8e25ed..87e954c 100644 --- a/qt/gen_qmouseeventtransition.go +++ b/qt/gen_qmouseeventtransition.go @@ -44,7 +44,7 @@ func NewQMouseEventTransition() *QMouseEventTransition { // NewQMouseEventTransition2 constructs a new QMouseEventTransition object. func NewQMouseEventTransition2(object *QObject, typeVal QEvent__Type, button MouseButton) *QMouseEventTransition { - ret := C.QMouseEventTransition_new2(object.cPointer(), (C.uintptr_t)(typeVal), (C.uintptr_t)(button)) + ret := C.QMouseEventTransition_new2(object.cPointer(), (C.int)(typeVal), (C.int)(button)) return newQMouseEventTransition(ret) } @@ -56,7 +56,7 @@ func NewQMouseEventTransition3(sourceState *QState) *QMouseEventTransition { // NewQMouseEventTransition4 constructs a new QMouseEventTransition object. func NewQMouseEventTransition4(object *QObject, typeVal QEvent__Type, button MouseButton, sourceState *QState) *QMouseEventTransition { - ret := C.QMouseEventTransition_new4(object.cPointer(), (C.uintptr_t)(typeVal), (C.uintptr_t)(button), sourceState.cPointer()) + ret := C.QMouseEventTransition_new4(object.cPointer(), (C.int)(typeVal), (C.int)(button), sourceState.cPointer()) return newQMouseEventTransition(ret) } @@ -87,7 +87,7 @@ func (this *QMouseEventTransition) Button() MouseButton { } func (this *QMouseEventTransition) SetButton(button MouseButton) { - C.QMouseEventTransition_SetButton(this.h, (C.uintptr_t)(button)) + C.QMouseEventTransition_SetButton(this.h, (C.int)(button)) } func (this *QMouseEventTransition) ModifierMask() int { @@ -95,7 +95,7 @@ func (this *QMouseEventTransition) ModifierMask() int { } func (this *QMouseEventTransition) SetModifierMask(modifiers int) { - C.QMouseEventTransition_SetModifierMask(this.h, (C.int)(modifiers)) + C.QMouseEventTransition_SetModifierMask(this.h, modifiers) } func (this *QMouseEventTransition) HitTestPath() *QPainterPath { diff --git a/qt/gen_qmouseeventtransition.h b/qt/gen_qmouseeventtransition.h index dc6a43e..f7c642d 100644 --- a/qt/gen_qmouseeventtransition.h +++ b/qt/gen_qmouseeventtransition.h @@ -28,14 +28,14 @@ typedef struct QState QState; #endif QMouseEventTransition* QMouseEventTransition_new(); -QMouseEventTransition* QMouseEventTransition_new2(QObject* object, uintptr_t typeVal, uintptr_t button); +QMouseEventTransition* QMouseEventTransition_new2(QObject* object, int typeVal, int button); QMouseEventTransition* QMouseEventTransition_new3(QState* sourceState); -QMouseEventTransition* QMouseEventTransition_new4(QObject* object, uintptr_t typeVal, uintptr_t button, QState* sourceState); +QMouseEventTransition* QMouseEventTransition_new4(QObject* object, int typeVal, int button, QState* sourceState); QMetaObject* QMouseEventTransition_MetaObject(const QMouseEventTransition* self); struct miqt_string* QMouseEventTransition_Tr(const char* s); struct miqt_string* QMouseEventTransition_TrUtf8(const char* s); -uintptr_t QMouseEventTransition_Button(const QMouseEventTransition* self); -void QMouseEventTransition_SetButton(QMouseEventTransition* self, uintptr_t button); +int QMouseEventTransition_Button(const QMouseEventTransition* self); +void QMouseEventTransition_SetButton(QMouseEventTransition* self, int button); int QMouseEventTransition_ModifierMask(const QMouseEventTransition* self); void QMouseEventTransition_SetModifierMask(QMouseEventTransition* self, int modifiers); QPainterPath* QMouseEventTransition_HitTestPath(const QMouseEventTransition* self); diff --git a/qt/gen_qmovie.cpp b/qt/gen_qmovie.cpp index f20c888..7e80d82 100644 --- a/qt/gen_qmovie.cpp +++ b/qt/gen_qmovie.cpp @@ -118,9 +118,9 @@ QColor* QMovie_BackgroundColor(const QMovie* self) { return new QColor(self->backgroundColor()); } -uintptr_t QMovie_State(const QMovie* self) { +int QMovie_State(const QMovie* self) { QMovie::MovieState _ret = self->state(); - return static_cast(_ret); + return static_cast(_ret); } QRect* QMovie_FrameRect(const QMovie* self) { @@ -139,9 +139,9 @@ bool QMovie_IsValid(const QMovie* self) { return self->isValid(); } -uintptr_t QMovie_LastError(const QMovie* self) { +int QMovie_LastError(const QMovie* self) { QImageReader::ImageReaderError _ret = self->lastError(); - return static_cast(_ret); + return static_cast(_ret); } struct miqt_string* QMovie_LastErrorString(const QMovie* self) { @@ -183,12 +183,12 @@ void QMovie_SetScaledSize(QMovie* self, QSize* size) { self->setScaledSize(*size); } -uintptr_t QMovie_CacheMode(const QMovie* self) { +int QMovie_CacheMode(const QMovie* self) { QMovie::CacheMode _ret = self->cacheMode(); - return static_cast(_ret); + return static_cast(_ret); } -void QMovie_SetCacheMode(QMovie* self, uintptr_t mode) { +void QMovie_SetCacheMode(QMovie* self, int mode) { self->setCacheMode(static_cast(mode)); } @@ -228,26 +228,26 @@ void QMovie_connect_Updated(QMovie* self, void* slot) { }); } -void QMovie_StateChanged(QMovie* self, uintptr_t state) { +void QMovie_StateChanged(QMovie* self, int state) { self->stateChanged(static_cast(state)); } void QMovie_connect_StateChanged(QMovie* self, void* slot) { QMovie::connect(self, static_cast(&QMovie::stateChanged), self, [=](QMovie::MovieState state) { QMovie::MovieState state_ret = state; - uintptr_t sigval1 = static_cast(state_ret); + int sigval1 = static_cast(state_ret); miqt_exec_callback_QMovie_StateChanged(slot, sigval1); }); } -void QMovie_Error(QMovie* self, uintptr_t error) { +void QMovie_Error(QMovie* self, int error) { self->error(static_cast(error)); } void QMovie_connect_Error(QMovie* self, void* slot) { QMovie::connect(self, static_cast(&QMovie::error), self, [=](QImageReader::ImageReaderError error) { QImageReader::ImageReaderError error_ret = error; - uintptr_t sigval1 = static_cast(error_ret); + int sigval1 = static_cast(error_ret); miqt_exec_callback_QMovie_Error(slot, sigval1); }); } diff --git a/qt/gen_qmovie.go b/qt/gen_qmovie.go index 014b323..fe45ac3 100644 --- a/qt/gen_qmovie.go +++ b/qt/gen_qmovie.go @@ -265,7 +265,7 @@ func (this *QMovie) CacheMode() QMovie__CacheMode { } func (this *QMovie) SetCacheMode(mode QMovie__CacheMode) { - C.QMovie_SetCacheMode(this.h, (C.uintptr_t)(mode)) + C.QMovie_SetCacheMode(this.h, (C.int)(mode)) } func (this *QMovie) Started() { @@ -326,14 +326,14 @@ func miqt_exec_callback_QMovie_Updated(cb *C.void, rect *C.QRect) { } func (this *QMovie) StateChanged(state QMovie__MovieState) { - C.QMovie_StateChanged(this.h, (C.uintptr_t)(state)) + C.QMovie_StateChanged(this.h, (C.int)(state)) } func (this *QMovie) OnStateChanged(slot func(state QMovie__MovieState)) { C.QMovie_connect_StateChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QMovie_StateChanged -func miqt_exec_callback_QMovie_StateChanged(cb *C.void, state C.uintptr_t) { +func miqt_exec_callback_QMovie_StateChanged(cb *C.void, state C.int) { gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(state QMovie__MovieState)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -346,14 +346,14 @@ func miqt_exec_callback_QMovie_StateChanged(cb *C.void, state C.uintptr_t) { } func (this *QMovie) Error(error QImageReader__ImageReaderError) { - C.QMovie_Error(this.h, (C.uintptr_t)(error)) + C.QMovie_Error(this.h, (C.int)(error)) } func (this *QMovie) OnError(slot func(error QImageReader__ImageReaderError)) { C.QMovie_connect_Error(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QMovie_Error -func miqt_exec_callback_QMovie_Error(cb *C.void, error C.uintptr_t) { +func miqt_exec_callback_QMovie_Error(cb *C.void, error C.int) { gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(error QImageReader__ImageReaderError)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt/gen_qmovie.h b/qt/gen_qmovie.h index f70d4eb..ebd4898 100644 --- a/qt/gen_qmovie.h +++ b/qt/gen_qmovie.h @@ -57,12 +57,12 @@ void QMovie_SetFormat(QMovie* self, QByteArray* format); QByteArray* QMovie_Format(const QMovie* self); void QMovie_SetBackgroundColor(QMovie* self, QColor* color); QColor* QMovie_BackgroundColor(const QMovie* self); -uintptr_t QMovie_State(const QMovie* self); +int QMovie_State(const QMovie* self); QRect* QMovie_FrameRect(const QMovie* self); QImage* QMovie_CurrentImage(const QMovie* self); QPixmap* QMovie_CurrentPixmap(const QMovie* self); bool QMovie_IsValid(const QMovie* self); -uintptr_t QMovie_LastError(const QMovie* self); +int QMovie_LastError(const QMovie* self); struct miqt_string* QMovie_LastErrorString(const QMovie* self); bool QMovie_JumpToFrame(QMovie* self, int frameNumber); int QMovie_LoopCount(const QMovie* self); @@ -72,17 +72,17 @@ int QMovie_CurrentFrameNumber(const QMovie* self); int QMovie_Speed(const QMovie* self); QSize* QMovie_ScaledSize(QMovie* self); void QMovie_SetScaledSize(QMovie* self, QSize* size); -uintptr_t QMovie_CacheMode(const QMovie* self); -void QMovie_SetCacheMode(QMovie* self, uintptr_t mode); +int QMovie_CacheMode(const QMovie* self); +void QMovie_SetCacheMode(QMovie* self, int mode); void QMovie_Started(QMovie* self); void QMovie_connect_Started(QMovie* self, void* slot); void QMovie_Resized(QMovie* self, QSize* size); void QMovie_connect_Resized(QMovie* self, void* slot); void QMovie_Updated(QMovie* self, QRect* rect); void QMovie_connect_Updated(QMovie* self, void* slot); -void QMovie_StateChanged(QMovie* self, uintptr_t state); +void QMovie_StateChanged(QMovie* self, int state); void QMovie_connect_StateChanged(QMovie* self, void* slot); -void QMovie_Error(QMovie* self, uintptr_t error); +void QMovie_Error(QMovie* self, int error); void QMovie_connect_Error(QMovie* self, void* slot); void QMovie_Finished(QMovie* self); void QMovie_connect_Finished(QMovie* self, void* slot); diff --git a/qt/gen_qmutex.cpp b/qt/gen_qmutex.cpp index 60d2068..3941dc3 100644 --- a/qt/gen_qmutex.cpp +++ b/qt/gen_qmutex.cpp @@ -42,7 +42,7 @@ QMutex* QMutex_new() { return new QMutex(); } -QMutex* QMutex_new2(uintptr_t mode) { +QMutex* QMutex_new2(int mode) { return new QMutex(static_cast(mode)); } diff --git a/qt/gen_qmutex.go b/qt/gen_qmutex.go index 19cf3377..53e0a20 100644 --- a/qt/gen_qmutex.go +++ b/qt/gen_qmutex.go @@ -117,7 +117,7 @@ func NewQMutex() *QMutex { // NewQMutex2 constructs a new QMutex object. func NewQMutex2(mode QMutex__RecursionMode) *QMutex { - ret := C.QMutex_new2((C.uintptr_t)(mode)) + ret := C.QMutex_new2((C.int)(mode)) return newQMutex(ret) } diff --git a/qt/gen_qmutex.h b/qt/gen_qmutex.h index 9fa681b..8990dc1 100644 --- a/qt/gen_qmutex.h +++ b/qt/gen_qmutex.h @@ -35,7 +35,7 @@ bool QBasicMutex_IsRecursive2(const QBasicMutex* self); void QBasicMutex_Delete(QBasicMutex* self); QMutex* QMutex_new(); -QMutex* QMutex_new2(uintptr_t mode); +QMutex* QMutex_new2(int mode); void QMutex_Lock(QMutex* self); bool QMutex_TryLock(QMutex* self); void QMutex_Unlock(QMutex* self); diff --git a/qt/gen_qobject.cpp b/qt/gen_qobject.cpp index 9998b4a..d7de926 100644 --- a/qt/gen_qobject.cpp +++ b/qt/gen_qobject.cpp @@ -182,7 +182,8 @@ struct miqt_array* QObject_DynamicPropertyNames(const QObject* self) { } unsigned int QObject_RegisterUserData() { - return QObject::registerUserData(); + uint _ret = QObject::registerUserData(); + return static_cast(_ret); } void QObject_SetUserData(QObject* self, unsigned int id, QObjectUserData* data) { @@ -243,15 +244,15 @@ struct miqt_string* QObject_TrUtf83(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -int QObject_StartTimer2(QObject* self, int interval, uintptr_t timerType) { +int QObject_StartTimer2(QObject* self, int interval, int timerType) { return self->startTimer(static_cast(interval), static_cast(timerType)); } -QMetaObject__Connection* QObject_Connect5(QObject* sender, QMetaMethod* signal, QObject* receiver, QMetaMethod* method, uintptr_t typeVal) { +QMetaObject__Connection* QObject_Connect5(QObject* sender, QMetaMethod* signal, QObject* receiver, QMetaMethod* method, int typeVal) { return new QMetaObject::Connection(QObject::connect(sender, *signal, receiver, *method, static_cast(typeVal))); } -QMetaObject__Connection* QObject_Connect4(const QObject* self, QObject* sender, const char* signal, const char* member, uintptr_t typeVal) { +QMetaObject__Connection* QObject_Connect4(const QObject* self, QObject* sender, const char* signal, const char* member, int typeVal) { return new QMetaObject::Connection(self->connect(sender, signal, member, static_cast(typeVal))); } diff --git a/qt/gen_qobject.go b/qt/gen_qobject.go index 4565c0b..17dd73b 100644 --- a/qt/gen_qobject.go +++ b/qt/gen_qobject.go @@ -351,11 +351,11 @@ func QObject_TrUtf83(s string, c string, n int) string { } func (this *QObject) StartTimer2(interval int, timerType TimerType) int { - return (int)(C.QObject_StartTimer2(this.h, (C.int)(interval), (C.uintptr_t)(timerType))) + return (int)(C.QObject_StartTimer2(this.h, (C.int)(interval), (C.int)(timerType))) } func QObject_Connect5(sender *QObject, signal *QMetaMethod, receiver *QObject, method *QMetaMethod, typeVal ConnectionType) *QMetaObject__Connection { - _ret := C.QObject_Connect5(sender.cPointer(), signal.cPointer(), receiver.cPointer(), method.cPointer(), (C.uintptr_t)(typeVal)) + _ret := C.QObject_Connect5(sender.cPointer(), signal.cPointer(), receiver.cPointer(), method.cPointer(), (C.int)(typeVal)) _goptr := newQMetaObject__Connection(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -366,7 +366,7 @@ func (this *QObject) Connect4(sender *QObject, signal string, member string, typ defer C.free(unsafe.Pointer(signal_Cstring)) member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - _ret := C.QObject_Connect4(this.h, sender.cPointer(), signal_Cstring, member_Cstring, (C.uintptr_t)(typeVal)) + _ret := C.QObject_Connect4(this.h, sender.cPointer(), signal_Cstring, member_Cstring, (C.int)(typeVal)) _goptr := newQMetaObject__Connection(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qobject.h b/qt/gen_qobject.h index 1fa6f5e..94a3b90 100644 --- a/qt/gen_qobject.h +++ b/qt/gen_qobject.h @@ -90,9 +90,9 @@ struct miqt_string* QObject_Tr2(const char* s, const char* c); struct miqt_string* QObject_Tr3(const char* s, const char* c, int n); struct miqt_string* QObject_TrUtf82(const char* s, const char* c); struct miqt_string* QObject_TrUtf83(const char* s, const char* c, int n); -int QObject_StartTimer2(QObject* self, int interval, uintptr_t timerType); -QMetaObject__Connection* QObject_Connect5(QObject* sender, QMetaMethod* signal, QObject* receiver, QMetaMethod* method, uintptr_t typeVal); -QMetaObject__Connection* QObject_Connect4(const QObject* self, QObject* sender, const char* signal, const char* member, uintptr_t typeVal); +int QObject_StartTimer2(QObject* self, int interval, int timerType); +QMetaObject__Connection* QObject_Connect5(QObject* sender, QMetaMethod* signal, QObject* receiver, QMetaMethod* method, int typeVal); +QMetaObject__Connection* QObject_Connect4(const QObject* self, QObject* sender, const char* signal, const char* member, int typeVal); void QObject_Destroyed1(QObject* self, QObject* param1); void QObject_connect_Destroyed1(QObject* self, void* slot); void QObject_Delete(QObject* self); diff --git a/qt/gen_qobjectdefs.cpp b/qt/gen_qobjectdefs.cpp index b1e8f50..ccaadc8 100644 --- a/qt/gen_qobjectdefs.cpp +++ b/qt/gen_qobjectdefs.cpp @@ -207,7 +207,7 @@ void QMetaObject_ConnectSlotsByName(QObject* o) { QMetaObject::connectSlotsByName(o); } -bool QMetaObject_InvokeMethod(QObject* obj, const char* member, uintptr_t param3, QGenericReturnArgument* retVal) { +bool QMetaObject_InvokeMethod(QObject* obj, const char* member, int param3, QGenericReturnArgument* retVal) { return QMetaObject::invokeMethod(obj, member, static_cast(param3), *retVal); } @@ -215,7 +215,7 @@ bool QMetaObject_InvokeMethod2(QObject* obj, const char* member, QGenericReturnA return QMetaObject::invokeMethod(obj, member, *retVal); } -bool QMetaObject_InvokeMethod3(QObject* obj, const char* member, uintptr_t typeVal) { +bool QMetaObject_InvokeMethod3(QObject* obj, const char* member, int typeVal) { return QMetaObject::invokeMethod(obj, member, static_cast(typeVal)); } @@ -242,43 +242,43 @@ QMetaObject__Connection* QMetaObject_Connect6(QObject* sender, int signal_index, return new QMetaObject::Connection(QMetaObject::connect(sender, static_cast(signal_index), receiver, static_cast(method_index), static_cast(typeVal), static_cast(types))); } -bool QMetaObject_InvokeMethod5(QObject* obj, const char* member, uintptr_t param3, QGenericReturnArgument* retVal, QGenericArgument* val0) { +bool QMetaObject_InvokeMethod5(QObject* obj, const char* member, int param3, QGenericReturnArgument* retVal, QGenericArgument* val0) { return QMetaObject::invokeMethod(obj, member, static_cast(param3), *retVal, *val0); } -bool QMetaObject_InvokeMethod6(QObject* obj, const char* member, uintptr_t param3, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1) { +bool QMetaObject_InvokeMethod6(QObject* obj, const char* member, int param3, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1) { return QMetaObject::invokeMethod(obj, member, static_cast(param3), *retVal, *val0, *val1); } -bool QMetaObject_InvokeMethod7(QObject* obj, const char* member, uintptr_t param3, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { +bool QMetaObject_InvokeMethod7(QObject* obj, const char* member, int param3, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { return QMetaObject::invokeMethod(obj, member, static_cast(param3), *retVal, *val0, *val1, *val2); } -bool QMetaObject_InvokeMethod8(QObject* obj, const char* member, uintptr_t param3, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { +bool QMetaObject_InvokeMethod8(QObject* obj, const char* member, int param3, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { return QMetaObject::invokeMethod(obj, member, static_cast(param3), *retVal, *val0, *val1, *val2, *val3); } -bool QMetaObject_InvokeMethod9(QObject* obj, const char* member, uintptr_t param3, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { +bool QMetaObject_InvokeMethod9(QObject* obj, const char* member, int param3, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { return QMetaObject::invokeMethod(obj, member, static_cast(param3), *retVal, *val0, *val1, *val2, *val3, *val4); } -bool QMetaObject_InvokeMethod10(QObject* obj, const char* member, uintptr_t param3, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { +bool QMetaObject_InvokeMethod10(QObject* obj, const char* member, int param3, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { return QMetaObject::invokeMethod(obj, member, static_cast(param3), *retVal, *val0, *val1, *val2, *val3, *val4, *val5); } -bool QMetaObject_InvokeMethod11(QObject* obj, const char* member, uintptr_t param3, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { +bool QMetaObject_InvokeMethod11(QObject* obj, const char* member, int param3, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { return QMetaObject::invokeMethod(obj, member, static_cast(param3), *retVal, *val0, *val1, *val2, *val3, *val4, *val5, *val6); } -bool QMetaObject_InvokeMethod12(QObject* obj, const char* member, uintptr_t param3, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { +bool QMetaObject_InvokeMethod12(QObject* obj, const char* member, int param3, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { return QMetaObject::invokeMethod(obj, member, static_cast(param3), *retVal, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7); } -bool QMetaObject_InvokeMethod13(QObject* obj, const char* member, uintptr_t param3, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { +bool QMetaObject_InvokeMethod13(QObject* obj, const char* member, int param3, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { return QMetaObject::invokeMethod(obj, member, static_cast(param3), *retVal, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8); } -bool QMetaObject_InvokeMethod14(QObject* obj, const char* member, uintptr_t param3, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { +bool QMetaObject_InvokeMethod14(QObject* obj, const char* member, int param3, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { return QMetaObject::invokeMethod(obj, member, static_cast(param3), *retVal, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8, *val9); } @@ -322,43 +322,43 @@ bool QMetaObject_InvokeMethod132(QObject* obj, const char* member, QGenericRetur return QMetaObject::invokeMethod(obj, member, *retVal, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8, *val9); } -bool QMetaObject_InvokeMethod43(QObject* obj, const char* member, uintptr_t typeVal, QGenericArgument* val0) { +bool QMetaObject_InvokeMethod43(QObject* obj, const char* member, int typeVal, QGenericArgument* val0) { return QMetaObject::invokeMethod(obj, member, static_cast(typeVal), *val0); } -bool QMetaObject_InvokeMethod53(QObject* obj, const char* member, uintptr_t typeVal, QGenericArgument* val0, QGenericArgument* val1) { +bool QMetaObject_InvokeMethod53(QObject* obj, const char* member, int typeVal, QGenericArgument* val0, QGenericArgument* val1) { return QMetaObject::invokeMethod(obj, member, static_cast(typeVal), *val0, *val1); } -bool QMetaObject_InvokeMethod63(QObject* obj, const char* member, uintptr_t typeVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { +bool QMetaObject_InvokeMethod63(QObject* obj, const char* member, int typeVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { return QMetaObject::invokeMethod(obj, member, static_cast(typeVal), *val0, *val1, *val2); } -bool QMetaObject_InvokeMethod73(QObject* obj, const char* member, uintptr_t typeVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { +bool QMetaObject_InvokeMethod73(QObject* obj, const char* member, int typeVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { return QMetaObject::invokeMethod(obj, member, static_cast(typeVal), *val0, *val1, *val2, *val3); } -bool QMetaObject_InvokeMethod83(QObject* obj, const char* member, uintptr_t typeVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { +bool QMetaObject_InvokeMethod83(QObject* obj, const char* member, int typeVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { return QMetaObject::invokeMethod(obj, member, static_cast(typeVal), *val0, *val1, *val2, *val3, *val4); } -bool QMetaObject_InvokeMethod93(QObject* obj, const char* member, uintptr_t typeVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { +bool QMetaObject_InvokeMethod93(QObject* obj, const char* member, int typeVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { return QMetaObject::invokeMethod(obj, member, static_cast(typeVal), *val0, *val1, *val2, *val3, *val4, *val5); } -bool QMetaObject_InvokeMethod103(QObject* obj, const char* member, uintptr_t typeVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { +bool QMetaObject_InvokeMethod103(QObject* obj, const char* member, int typeVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { return QMetaObject::invokeMethod(obj, member, static_cast(typeVal), *val0, *val1, *val2, *val3, *val4, *val5, *val6); } -bool QMetaObject_InvokeMethod113(QObject* obj, const char* member, uintptr_t typeVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { +bool QMetaObject_InvokeMethod113(QObject* obj, const char* member, int typeVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { return QMetaObject::invokeMethod(obj, member, static_cast(typeVal), *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7); } -bool QMetaObject_InvokeMethod123(QObject* obj, const char* member, uintptr_t typeVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { +bool QMetaObject_InvokeMethod123(QObject* obj, const char* member, int typeVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { return QMetaObject::invokeMethod(obj, member, static_cast(typeVal), *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8); } -bool QMetaObject_InvokeMethod133(QObject* obj, const char* member, uintptr_t typeVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { +bool QMetaObject_InvokeMethod133(QObject* obj, const char* member, int typeVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { return QMetaObject::invokeMethod(obj, member, static_cast(typeVal), *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8, *val9); } @@ -454,6 +454,10 @@ QMetaObject__Connection* QMetaObject__Connection_new2(QMetaObject__Connection* o return new QMetaObject::Connection(*other); } +void QMetaObject__Connection_OperatorAssign(QMetaObject__Connection* self, QMetaObject__Connection* other) { + self->operator=(*other); +} + void QMetaObject__Connection_Delete(QMetaObject__Connection* self) { delete self; } @@ -474,6 +478,10 @@ QMetaObject* QMetaObject__SuperData_OperatorMinusGreater(const QMetaObject__Supe return (QMetaObject*) self->operator->(); } +void QMetaObject__SuperData_OperatorAssign(QMetaObject__SuperData* self, QMetaObject__SuperData* param1) { + self->operator=(*param1); +} + void QMetaObject__SuperData_Delete(QMetaObject__SuperData* self) { delete self; } diff --git a/qt/gen_qobjectdefs.go b/qt/gen_qobjectdefs.go index c4b307c..315863d 100644 --- a/qt/gen_qobjectdefs.go +++ b/qt/gen_qobjectdefs.go @@ -387,7 +387,7 @@ func QMetaObject_ConnectSlotsByName(o *QObject) { func QMetaObject_InvokeMethod(obj *QObject, member string, param3 ConnectionType, retVal QGenericReturnArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_InvokeMethod(obj.cPointer(), member_Cstring, (C.uintptr_t)(param3), retVal.cPointer())) + return (bool)(C.QMetaObject_InvokeMethod(obj.cPointer(), member_Cstring, (C.int)(param3), retVal.cPointer())) } func QMetaObject_InvokeMethod2(obj *QObject, member string, retVal QGenericReturnArgument) bool { @@ -399,7 +399,7 @@ func QMetaObject_InvokeMethod2(obj *QObject, member string, retVal QGenericRetur func QMetaObject_InvokeMethod3(obj *QObject, member string, typeVal ConnectionType) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_InvokeMethod3(obj.cPointer(), member_Cstring, (C.uintptr_t)(typeVal))) + return (bool)(C.QMetaObject_InvokeMethod3(obj.cPointer(), member_Cstring, (C.int)(typeVal))) } func QMetaObject_InvokeMethod4(obj *QObject, member string) bool { @@ -440,61 +440,61 @@ func QMetaObject_Connect6(sender *QObject, signal_index int, receiver *QObject, func QMetaObject_InvokeMethod5(obj *QObject, member string, param3 ConnectionType, retVal QGenericReturnArgument, val0 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_InvokeMethod5(obj.cPointer(), member_Cstring, (C.uintptr_t)(param3), retVal.cPointer(), val0.cPointer())) + return (bool)(C.QMetaObject_InvokeMethod5(obj.cPointer(), member_Cstring, (C.int)(param3), retVal.cPointer(), val0.cPointer())) } func QMetaObject_InvokeMethod6(obj *QObject, member string, param3 ConnectionType, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_InvokeMethod6(obj.cPointer(), member_Cstring, (C.uintptr_t)(param3), retVal.cPointer(), val0.cPointer(), val1.cPointer())) + return (bool)(C.QMetaObject_InvokeMethod6(obj.cPointer(), member_Cstring, (C.int)(param3), retVal.cPointer(), val0.cPointer(), val1.cPointer())) } func QMetaObject_InvokeMethod7(obj *QObject, member string, param3 ConnectionType, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_InvokeMethod7(obj.cPointer(), member_Cstring, (C.uintptr_t)(param3), retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer())) + return (bool)(C.QMetaObject_InvokeMethod7(obj.cPointer(), member_Cstring, (C.int)(param3), retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer())) } func QMetaObject_InvokeMethod8(obj *QObject, member string, param3 ConnectionType, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_InvokeMethod8(obj.cPointer(), member_Cstring, (C.uintptr_t)(param3), retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) + return (bool)(C.QMetaObject_InvokeMethod8(obj.cPointer(), member_Cstring, (C.int)(param3), retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) } func QMetaObject_InvokeMethod9(obj *QObject, member string, param3 ConnectionType, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_InvokeMethod9(obj.cPointer(), member_Cstring, (C.uintptr_t)(param3), retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) + return (bool)(C.QMetaObject_InvokeMethod9(obj.cPointer(), member_Cstring, (C.int)(param3), retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) } func QMetaObject_InvokeMethod10(obj *QObject, member string, param3 ConnectionType, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_InvokeMethod10(obj.cPointer(), member_Cstring, (C.uintptr_t)(param3), retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) + return (bool)(C.QMetaObject_InvokeMethod10(obj.cPointer(), member_Cstring, (C.int)(param3), retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) } func QMetaObject_InvokeMethod11(obj *QObject, member string, param3 ConnectionType, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_InvokeMethod11(obj.cPointer(), member_Cstring, (C.uintptr_t)(param3), retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) + return (bool)(C.QMetaObject_InvokeMethod11(obj.cPointer(), member_Cstring, (C.int)(param3), retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) } func QMetaObject_InvokeMethod12(obj *QObject, member string, param3 ConnectionType, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_InvokeMethod12(obj.cPointer(), member_Cstring, (C.uintptr_t)(param3), retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) + return (bool)(C.QMetaObject_InvokeMethod12(obj.cPointer(), member_Cstring, (C.int)(param3), retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) } func QMetaObject_InvokeMethod13(obj *QObject, member string, param3 ConnectionType, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_InvokeMethod13(obj.cPointer(), member_Cstring, (C.uintptr_t)(param3), retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) + return (bool)(C.QMetaObject_InvokeMethod13(obj.cPointer(), member_Cstring, (C.int)(param3), retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) } func QMetaObject_InvokeMethod14(obj *QObject, member string, param3 ConnectionType, retVal QGenericReturnArgument, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument, val9 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_InvokeMethod14(obj.cPointer(), member_Cstring, (C.uintptr_t)(param3), retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) + return (bool)(C.QMetaObject_InvokeMethod14(obj.cPointer(), member_Cstring, (C.int)(param3), retVal.cPointer(), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) } func QMetaObject_InvokeMethod42(obj *QObject, member string, retVal QGenericReturnArgument, val0 QGenericArgument) bool { @@ -560,61 +560,61 @@ func QMetaObject_InvokeMethod132(obj *QObject, member string, retVal QGenericRet func QMetaObject_InvokeMethod43(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_InvokeMethod43(obj.cPointer(), member_Cstring, (C.uintptr_t)(typeVal), val0.cPointer())) + return (bool)(C.QMetaObject_InvokeMethod43(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer())) } func QMetaObject_InvokeMethod53(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_InvokeMethod53(obj.cPointer(), member_Cstring, (C.uintptr_t)(typeVal), val0.cPointer(), val1.cPointer())) + return (bool)(C.QMetaObject_InvokeMethod53(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer())) } func QMetaObject_InvokeMethod63(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_InvokeMethod63(obj.cPointer(), member_Cstring, (C.uintptr_t)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer())) + return (bool)(C.QMetaObject_InvokeMethod63(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer())) } func QMetaObject_InvokeMethod73(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_InvokeMethod73(obj.cPointer(), member_Cstring, (C.uintptr_t)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) + return (bool)(C.QMetaObject_InvokeMethod73(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer())) } func QMetaObject_InvokeMethod83(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_InvokeMethod83(obj.cPointer(), member_Cstring, (C.uintptr_t)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) + return (bool)(C.QMetaObject_InvokeMethod83(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer())) } func QMetaObject_InvokeMethod93(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_InvokeMethod93(obj.cPointer(), member_Cstring, (C.uintptr_t)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) + return (bool)(C.QMetaObject_InvokeMethod93(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer())) } func QMetaObject_InvokeMethod103(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_InvokeMethod103(obj.cPointer(), member_Cstring, (C.uintptr_t)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) + return (bool)(C.QMetaObject_InvokeMethod103(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer())) } func QMetaObject_InvokeMethod113(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_InvokeMethod113(obj.cPointer(), member_Cstring, (C.uintptr_t)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) + return (bool)(C.QMetaObject_InvokeMethod113(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer())) } func QMetaObject_InvokeMethod123(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_InvokeMethod123(obj.cPointer(), member_Cstring, (C.uintptr_t)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) + return (bool)(C.QMetaObject_InvokeMethod123(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer())) } func QMetaObject_InvokeMethod133(obj *QObject, member string, typeVal ConnectionType, val0 QGenericArgument, val1 QGenericArgument, val2 QGenericArgument, val3 QGenericArgument, val4 QGenericArgument, val5 QGenericArgument, val6 QGenericArgument, val7 QGenericArgument, val8 QGenericArgument, val9 QGenericArgument) bool { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - return (bool)(C.QMetaObject_InvokeMethod133(obj.cPointer(), member_Cstring, (C.uintptr_t)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) + return (bool)(C.QMetaObject_InvokeMethod133(obj.cPointer(), member_Cstring, (C.int)(typeVal), val0.cPointer(), val1.cPointer(), val2.cPointer(), val3.cPointer(), val4.cPointer(), val5.cPointer(), val6.cPointer(), val7.cPointer(), val8.cPointer(), val9.cPointer())) } func QMetaObject_InvokeMethod32(obj *QObject, member string, val0 QGenericArgument) bool { @@ -765,6 +765,10 @@ func NewQMetaObject__Connection2(other *QMetaObject__Connection) *QMetaObject__C return newQMetaObject__Connection(ret) } +func (this *QMetaObject__Connection) OperatorAssign(other *QMetaObject__Connection) { + C.QMetaObject__Connection_OperatorAssign(this.h, other.cPointer()) +} + // Delete this object from C++ memory. func (this *QMetaObject__Connection) Delete() { C.QMetaObject__Connection_Delete(this.h) @@ -823,6 +827,10 @@ func (this *QMetaObject__SuperData) OperatorMinusGreater() *QMetaObject { return newQMetaObject_U(unsafe.Pointer(C.QMetaObject__SuperData_OperatorMinusGreater(this.h))) } +func (this *QMetaObject__SuperData) OperatorAssign(param1 *QMetaObject__SuperData) { + C.QMetaObject__SuperData_OperatorAssign(this.h, param1.cPointer()) +} + // Delete this object from C++ memory. func (this *QMetaObject__SuperData) Delete() { C.QMetaObject__SuperData_Delete(this.h) diff --git a/qt/gen_qobjectdefs.h b/qt/gen_qobjectdefs.h index b825ac2..53ac6af 100644 --- a/qt/gen_qobjectdefs.h +++ b/qt/gen_qobjectdefs.h @@ -96,24 +96,24 @@ QMetaObject__Connection* QMetaObject_Connect(QObject* sender, int signal_index, bool QMetaObject_Disconnect(QObject* sender, int signal_index, QObject* receiver, int method_index); bool QMetaObject_DisconnectOne(QObject* sender, int signal_index, QObject* receiver, int method_index); void QMetaObject_ConnectSlotsByName(QObject* o); -bool QMetaObject_InvokeMethod(QObject* obj, const char* member, uintptr_t param3, QGenericReturnArgument* retVal); +bool QMetaObject_InvokeMethod(QObject* obj, const char* member, int param3, QGenericReturnArgument* retVal); bool QMetaObject_InvokeMethod2(QObject* obj, const char* member, QGenericReturnArgument* retVal); -bool QMetaObject_InvokeMethod3(QObject* obj, const char* member, uintptr_t typeVal); +bool QMetaObject_InvokeMethod3(QObject* obj, const char* member, int typeVal); bool QMetaObject_InvokeMethod4(QObject* obj, const char* member); QObject* QMetaObject_NewInstance(const QMetaObject* self); struct miqt_string* QMetaObject_Tr3(const QMetaObject* self, const char* s, const char* c, int n); QMetaObject__Connection* QMetaObject_Connect5(QObject* sender, int signal_index, QObject* receiver, int method_index, int typeVal); QMetaObject__Connection* QMetaObject_Connect6(QObject* sender, int signal_index, QObject* receiver, int method_index, int typeVal, int* types); -bool QMetaObject_InvokeMethod5(QObject* obj, const char* member, uintptr_t param3, QGenericReturnArgument* retVal, QGenericArgument* val0); -bool QMetaObject_InvokeMethod6(QObject* obj, const char* member, uintptr_t param3, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1); -bool QMetaObject_InvokeMethod7(QObject* obj, const char* member, uintptr_t param3, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); -bool QMetaObject_InvokeMethod8(QObject* obj, const char* member, uintptr_t param3, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); -bool QMetaObject_InvokeMethod9(QObject* obj, const char* member, uintptr_t param3, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); -bool QMetaObject_InvokeMethod10(QObject* obj, const char* member, uintptr_t param3, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); -bool QMetaObject_InvokeMethod11(QObject* obj, const char* member, uintptr_t param3, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); -bool QMetaObject_InvokeMethod12(QObject* obj, const char* member, uintptr_t param3, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); -bool QMetaObject_InvokeMethod13(QObject* obj, const char* member, uintptr_t param3, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); -bool QMetaObject_InvokeMethod14(QObject* obj, const char* member, uintptr_t param3, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); +bool QMetaObject_InvokeMethod5(QObject* obj, const char* member, int param3, QGenericReturnArgument* retVal, QGenericArgument* val0); +bool QMetaObject_InvokeMethod6(QObject* obj, const char* member, int param3, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1); +bool QMetaObject_InvokeMethod7(QObject* obj, const char* member, int param3, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); +bool QMetaObject_InvokeMethod8(QObject* obj, const char* member, int param3, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); +bool QMetaObject_InvokeMethod9(QObject* obj, const char* member, int param3, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); +bool QMetaObject_InvokeMethod10(QObject* obj, const char* member, int param3, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); +bool QMetaObject_InvokeMethod11(QObject* obj, const char* member, int param3, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); +bool QMetaObject_InvokeMethod12(QObject* obj, const char* member, int param3, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); +bool QMetaObject_InvokeMethod13(QObject* obj, const char* member, int param3, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); +bool QMetaObject_InvokeMethod14(QObject* obj, const char* member, int param3, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); bool QMetaObject_InvokeMethod42(QObject* obj, const char* member, QGenericReturnArgument* retVal, QGenericArgument* val0); bool QMetaObject_InvokeMethod52(QObject* obj, const char* member, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1); bool QMetaObject_InvokeMethod62(QObject* obj, const char* member, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); @@ -124,16 +124,16 @@ bool QMetaObject_InvokeMethod102(QObject* obj, const char* member, QGenericRetur bool QMetaObject_InvokeMethod112(QObject* obj, const char* member, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); bool QMetaObject_InvokeMethod122(QObject* obj, const char* member, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); bool QMetaObject_InvokeMethod132(QObject* obj, const char* member, QGenericReturnArgument* retVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); -bool QMetaObject_InvokeMethod43(QObject* obj, const char* member, uintptr_t typeVal, QGenericArgument* val0); -bool QMetaObject_InvokeMethod53(QObject* obj, const char* member, uintptr_t typeVal, QGenericArgument* val0, QGenericArgument* val1); -bool QMetaObject_InvokeMethod63(QObject* obj, const char* member, uintptr_t typeVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); -bool QMetaObject_InvokeMethod73(QObject* obj, const char* member, uintptr_t typeVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); -bool QMetaObject_InvokeMethod83(QObject* obj, const char* member, uintptr_t typeVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); -bool QMetaObject_InvokeMethod93(QObject* obj, const char* member, uintptr_t typeVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); -bool QMetaObject_InvokeMethod103(QObject* obj, const char* member, uintptr_t typeVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); -bool QMetaObject_InvokeMethod113(QObject* obj, const char* member, uintptr_t typeVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); -bool QMetaObject_InvokeMethod123(QObject* obj, const char* member, uintptr_t typeVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); -bool QMetaObject_InvokeMethod133(QObject* obj, const char* member, uintptr_t typeVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); +bool QMetaObject_InvokeMethod43(QObject* obj, const char* member, int typeVal, QGenericArgument* val0); +bool QMetaObject_InvokeMethod53(QObject* obj, const char* member, int typeVal, QGenericArgument* val0, QGenericArgument* val1); +bool QMetaObject_InvokeMethod63(QObject* obj, const char* member, int typeVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); +bool QMetaObject_InvokeMethod73(QObject* obj, const char* member, int typeVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3); +bool QMetaObject_InvokeMethod83(QObject* obj, const char* member, int typeVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4); +bool QMetaObject_InvokeMethod93(QObject* obj, const char* member, int typeVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5); +bool QMetaObject_InvokeMethod103(QObject* obj, const char* member, int typeVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6); +bool QMetaObject_InvokeMethod113(QObject* obj, const char* member, int typeVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7); +bool QMetaObject_InvokeMethod123(QObject* obj, const char* member, int typeVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8); +bool QMetaObject_InvokeMethod133(QObject* obj, const char* member, int typeVal, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9); bool QMetaObject_InvokeMethod32(QObject* obj, const char* member, QGenericArgument* val0); bool QMetaObject_InvokeMethod44(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1); bool QMetaObject_InvokeMethod54(QObject* obj, const char* member, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2); @@ -158,12 +158,14 @@ void QMetaObject_Delete(QMetaObject* self); QMetaObject__Connection* QMetaObject__Connection_new(); QMetaObject__Connection* QMetaObject__Connection_new2(QMetaObject__Connection* other); +void QMetaObject__Connection_OperatorAssign(QMetaObject__Connection* self, QMetaObject__Connection* other); void QMetaObject__Connection_Delete(QMetaObject__Connection* self); QMetaObject__SuperData* QMetaObject__SuperData_new(); QMetaObject__SuperData* QMetaObject__SuperData_new2(QMetaObject* mo); QMetaObject__SuperData* QMetaObject__SuperData_new3(QMetaObject__SuperData* param1); QMetaObject* QMetaObject__SuperData_OperatorMinusGreater(const QMetaObject__SuperData* self); +void QMetaObject__SuperData_OperatorAssign(QMetaObject__SuperData* self, QMetaObject__SuperData* param1); void QMetaObject__SuperData_Delete(QMetaObject__SuperData* self); #ifdef __cplusplus diff --git a/qt/gen_qoffscreensurface.cpp b/qt/gen_qoffscreensurface.cpp index 1123819..a019f4b 100644 --- a/qt/gen_qoffscreensurface.cpp +++ b/qt/gen_qoffscreensurface.cpp @@ -41,9 +41,9 @@ struct miqt_string* QOffscreenSurface_TrUtf8(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -uintptr_t QOffscreenSurface_SurfaceType(const QOffscreenSurface* self) { +int QOffscreenSurface_SurfaceType(const QOffscreenSurface* self) { QSurface::SurfaceType _ret = self->surfaceType(); - return static_cast(_ret); + return static_cast(_ret); } void QOffscreenSurface_Create(QOffscreenSurface* self) { diff --git a/qt/gen_qoffscreensurface.h b/qt/gen_qoffscreensurface.h index a9ad39e..42d06e6 100644 --- a/qt/gen_qoffscreensurface.h +++ b/qt/gen_qoffscreensurface.h @@ -35,7 +35,7 @@ QOffscreenSurface* QOffscreenSurface_new3(QScreen* screen); QMetaObject* QOffscreenSurface_MetaObject(const QOffscreenSurface* self); struct miqt_string* QOffscreenSurface_Tr(const char* s); struct miqt_string* QOffscreenSurface_TrUtf8(const char* s); -uintptr_t QOffscreenSurface_SurfaceType(const QOffscreenSurface* self); +int QOffscreenSurface_SurfaceType(const QOffscreenSurface* self); void QOffscreenSurface_Create(QOffscreenSurface* self); void QOffscreenSurface_Destroy(QOffscreenSurface* self); bool QOffscreenSurface_IsValid(const QOffscreenSurface* self); diff --git a/qt/gen_qoperatingsystemversion.cpp b/qt/gen_qoperatingsystemversion.cpp index 9ea473f..66b5a87 100644 --- a/qt/gen_qoperatingsystemversion.cpp +++ b/qt/gen_qoperatingsystemversion.cpp @@ -6,15 +6,15 @@ #include "gen_qoperatingsystemversion.h" #include "_cgo_export.h" -QOperatingSystemVersion* QOperatingSystemVersion_new(uintptr_t osType, int vmajor) { +QOperatingSystemVersion* QOperatingSystemVersion_new(int osType, int vmajor) { return new QOperatingSystemVersion(static_cast(osType), static_cast(vmajor)); } -QOperatingSystemVersion* QOperatingSystemVersion_new2(uintptr_t osType, int vmajor, int vminor) { +QOperatingSystemVersion* QOperatingSystemVersion_new2(int osType, int vmajor, int vminor) { return new QOperatingSystemVersion(static_cast(osType), static_cast(vmajor), static_cast(vminor)); } -QOperatingSystemVersion* QOperatingSystemVersion_new3(uintptr_t osType, int vmajor, int vminor, int vmicro) { +QOperatingSystemVersion* QOperatingSystemVersion_new3(int osType, int vmajor, int vminor, int vmicro) { return new QOperatingSystemVersion(static_cast(osType), static_cast(vmajor), static_cast(vminor), static_cast(vmicro)); } @@ -22,9 +22,9 @@ QOperatingSystemVersion* QOperatingSystemVersion_Current() { return new QOperatingSystemVersion(QOperatingSystemVersion::current()); } -uintptr_t QOperatingSystemVersion_CurrentType() { +int QOperatingSystemVersion_CurrentType() { QOperatingSystemVersion::OSType _ret = QOperatingSystemVersion::currentType(); - return static_cast(_ret); + return static_cast(_ret); } int QOperatingSystemVersion_MajorVersion(const QOperatingSystemVersion* self) { @@ -43,9 +43,9 @@ int QOperatingSystemVersion_SegmentCount(const QOperatingSystemVersion* self) { return self->segmentCount(); } -uintptr_t QOperatingSystemVersion_Type(const QOperatingSystemVersion* self) { +int QOperatingSystemVersion_Type(const QOperatingSystemVersion* self) { QOperatingSystemVersion::OSType _ret = self->type(); - return static_cast(_ret); + return static_cast(_ret); } struct miqt_string* QOperatingSystemVersion_Name(const QOperatingSystemVersion* self) { diff --git a/qt/gen_qoperatingsystemversion.go b/qt/gen_qoperatingsystemversion.go index 7ca29d8..1892224 100644 --- a/qt/gen_qoperatingsystemversion.go +++ b/qt/gen_qoperatingsystemversion.go @@ -49,19 +49,19 @@ func newQOperatingSystemVersion_U(h unsafe.Pointer) *QOperatingSystemVersion { // NewQOperatingSystemVersion constructs a new QOperatingSystemVersion object. func NewQOperatingSystemVersion(osType QOperatingSystemVersion__OSType, vmajor int) *QOperatingSystemVersion { - ret := C.QOperatingSystemVersion_new((C.uintptr_t)(osType), (C.int)(vmajor)) + ret := C.QOperatingSystemVersion_new((C.int)(osType), (C.int)(vmajor)) return newQOperatingSystemVersion(ret) } // NewQOperatingSystemVersion2 constructs a new QOperatingSystemVersion object. func NewQOperatingSystemVersion2(osType QOperatingSystemVersion__OSType, vmajor int, vminor int) *QOperatingSystemVersion { - ret := C.QOperatingSystemVersion_new2((C.uintptr_t)(osType), (C.int)(vmajor), (C.int)(vminor)) + ret := C.QOperatingSystemVersion_new2((C.int)(osType), (C.int)(vmajor), (C.int)(vminor)) return newQOperatingSystemVersion(ret) } // NewQOperatingSystemVersion3 constructs a new QOperatingSystemVersion object. func NewQOperatingSystemVersion3(osType QOperatingSystemVersion__OSType, vmajor int, vminor int, vmicro int) *QOperatingSystemVersion { - ret := C.QOperatingSystemVersion_new3((C.uintptr_t)(osType), (C.int)(vmajor), (C.int)(vminor), (C.int)(vmicro)) + ret := C.QOperatingSystemVersion_new3((C.int)(osType), (C.int)(vmajor), (C.int)(vminor), (C.int)(vmicro)) return newQOperatingSystemVersion(ret) } diff --git a/qt/gen_qoperatingsystemversion.h b/qt/gen_qoperatingsystemversion.h index 8651779..bb500b8 100644 --- a/qt/gen_qoperatingsystemversion.h +++ b/qt/gen_qoperatingsystemversion.h @@ -19,16 +19,16 @@ class QOperatingSystemVersion; typedef struct QOperatingSystemVersion QOperatingSystemVersion; #endif -QOperatingSystemVersion* QOperatingSystemVersion_new(uintptr_t osType, int vmajor); -QOperatingSystemVersion* QOperatingSystemVersion_new2(uintptr_t osType, int vmajor, int vminor); -QOperatingSystemVersion* QOperatingSystemVersion_new3(uintptr_t osType, int vmajor, int vminor, int vmicro); +QOperatingSystemVersion* QOperatingSystemVersion_new(int osType, int vmajor); +QOperatingSystemVersion* QOperatingSystemVersion_new2(int osType, int vmajor, int vminor); +QOperatingSystemVersion* QOperatingSystemVersion_new3(int osType, int vmajor, int vminor, int vmicro); QOperatingSystemVersion* QOperatingSystemVersion_Current(); -uintptr_t QOperatingSystemVersion_CurrentType(); +int QOperatingSystemVersion_CurrentType(); int QOperatingSystemVersion_MajorVersion(const QOperatingSystemVersion* self); int QOperatingSystemVersion_MinorVersion(const QOperatingSystemVersion* self); int QOperatingSystemVersion_MicroVersion(const QOperatingSystemVersion* self); int QOperatingSystemVersion_SegmentCount(const QOperatingSystemVersion* self); -uintptr_t QOperatingSystemVersion_Type(const QOperatingSystemVersion* self); +int QOperatingSystemVersion_Type(const QOperatingSystemVersion* self); struct miqt_string* QOperatingSystemVersion_Name(const QOperatingSystemVersion* self); void QOperatingSystemVersion_Delete(QOperatingSystemVersion* self); diff --git a/qt/gen_qpagedpaintdevice.cpp b/qt/gen_qpagedpaintdevice.cpp index 29c92f0..2a2e45e 100644 --- a/qt/gen_qpagedpaintdevice.cpp +++ b/qt/gen_qpagedpaintdevice.cpp @@ -20,7 +20,7 @@ bool QPagedPaintDevice_SetPageSize(QPagedPaintDevice* self, QPageSize* pageSize) return self->setPageSize(*pageSize); } -bool QPagedPaintDevice_SetPageOrientation(QPagedPaintDevice* self, uintptr_t orientation) { +bool QPagedPaintDevice_SetPageOrientation(QPagedPaintDevice* self, int orientation) { return self->setPageOrientation(static_cast(orientation)); } @@ -28,7 +28,7 @@ bool QPagedPaintDevice_SetPageMargins(QPagedPaintDevice* self, QMarginsF* margin return self->setPageMargins(*margins); } -bool QPagedPaintDevice_SetPageMargins2(QPagedPaintDevice* self, QMarginsF* margins, uintptr_t units) { +bool QPagedPaintDevice_SetPageMargins2(QPagedPaintDevice* self, QMarginsF* margins, int units) { return self->setPageMargins(*margins, static_cast(units)); } @@ -36,13 +36,13 @@ QPageLayout* QPagedPaintDevice_PageLayout(const QPagedPaintDevice* self) { return new QPageLayout(self->pageLayout()); } -void QPagedPaintDevice_SetPageSizeWithSize(QPagedPaintDevice* self, uintptr_t size) { +void QPagedPaintDevice_SetPageSizeWithSize(QPagedPaintDevice* self, int size) { self->setPageSize(static_cast(size)); } -uintptr_t QPagedPaintDevice_PageSize(const QPagedPaintDevice* self) { +int QPagedPaintDevice_PageSize(const QPagedPaintDevice* self) { QPagedPaintDevice::PageSize _ret = self->pageSize(); - return static_cast(_ret); + return static_cast(_ret); } void QPagedPaintDevice_SetPageSizeMM(QPagedPaintDevice* self, QSizeF* size) { diff --git a/qt/gen_qpagedpaintdevice.go b/qt/gen_qpagedpaintdevice.go index 0c54ec6..aea5d1b 100644 --- a/qt/gen_qpagedpaintdevice.go +++ b/qt/gen_qpagedpaintdevice.go @@ -189,7 +189,7 @@ func (this *QPagedPaintDevice) SetPageSize(pageSize *QPageSize) bool { } func (this *QPagedPaintDevice) SetPageOrientation(orientation QPageLayout__Orientation) bool { - return (bool)(C.QPagedPaintDevice_SetPageOrientation(this.h, (C.uintptr_t)(orientation))) + return (bool)(C.QPagedPaintDevice_SetPageOrientation(this.h, (C.int)(orientation))) } func (this *QPagedPaintDevice) SetPageMargins(margins *QMarginsF) bool { @@ -197,7 +197,7 @@ func (this *QPagedPaintDevice) SetPageMargins(margins *QMarginsF) bool { } func (this *QPagedPaintDevice) SetPageMargins2(margins *QMarginsF, units QPageLayout__Unit) bool { - return (bool)(C.QPagedPaintDevice_SetPageMargins2(this.h, margins.cPointer(), (C.uintptr_t)(units))) + return (bool)(C.QPagedPaintDevice_SetPageMargins2(this.h, margins.cPointer(), (C.int)(units))) } func (this *QPagedPaintDevice) PageLayout() *QPageLayout { @@ -208,7 +208,7 @@ func (this *QPagedPaintDevice) PageLayout() *QPageLayout { } func (this *QPagedPaintDevice) SetPageSizeWithSize(size QPagedPaintDevice__PageSize) { - C.QPagedPaintDevice_SetPageSizeWithSize(this.h, (C.uintptr_t)(size)) + C.QPagedPaintDevice_SetPageSizeWithSize(this.h, (C.int)(size)) } func (this *QPagedPaintDevice) PageSize() QPagedPaintDevice__PageSize { diff --git a/qt/gen_qpagedpaintdevice.h b/qt/gen_qpagedpaintdevice.h index 3fb9455..bf94cfb 100644 --- a/qt/gen_qpagedpaintdevice.h +++ b/qt/gen_qpagedpaintdevice.h @@ -36,12 +36,12 @@ typedef struct QSizeF QSizeF; bool QPagedPaintDevice_NewPage(QPagedPaintDevice* self); bool QPagedPaintDevice_SetPageLayout(QPagedPaintDevice* self, QPageLayout* pageLayout); bool QPagedPaintDevice_SetPageSize(QPagedPaintDevice* self, QPageSize* pageSize); -bool QPagedPaintDevice_SetPageOrientation(QPagedPaintDevice* self, uintptr_t orientation); +bool QPagedPaintDevice_SetPageOrientation(QPagedPaintDevice* self, int orientation); bool QPagedPaintDevice_SetPageMargins(QPagedPaintDevice* self, QMarginsF* margins); -bool QPagedPaintDevice_SetPageMargins2(QPagedPaintDevice* self, QMarginsF* margins, uintptr_t units); +bool QPagedPaintDevice_SetPageMargins2(QPagedPaintDevice* self, QMarginsF* margins, int units); QPageLayout* QPagedPaintDevice_PageLayout(const QPagedPaintDevice* self); -void QPagedPaintDevice_SetPageSizeWithSize(QPagedPaintDevice* self, uintptr_t size); -uintptr_t QPagedPaintDevice_PageSize(const QPagedPaintDevice* self); +void QPagedPaintDevice_SetPageSizeWithSize(QPagedPaintDevice* self, int size); +int QPagedPaintDevice_PageSize(const QPagedPaintDevice* self); void QPagedPaintDevice_SetPageSizeMM(QPagedPaintDevice* self, QSizeF* size); QSizeF* QPagedPaintDevice_PageSizeMM(const QPagedPaintDevice* self); void QPagedPaintDevice_SetMargins(QPagedPaintDevice* self, QPagedPaintDevice__Margins* margins); diff --git a/qt/gen_qpagelayout.cpp b/qt/gen_qpagelayout.cpp index 7194c6b..f2b1724 100644 --- a/qt/gen_qpagelayout.cpp +++ b/qt/gen_qpagelayout.cpp @@ -12,7 +12,7 @@ QPageLayout* QPageLayout_new() { return new QPageLayout(); } -QPageLayout* QPageLayout_new2(QPageSize* pageSize, uintptr_t orientation, QMarginsF* margins) { +QPageLayout* QPageLayout_new2(QPageSize* pageSize, int orientation, QMarginsF* margins) { return new QPageLayout(*pageSize, static_cast(orientation), *margins); } @@ -20,11 +20,11 @@ QPageLayout* QPageLayout_new3(QPageLayout* other) { return new QPageLayout(*other); } -QPageLayout* QPageLayout_new4(QPageSize* pageSize, uintptr_t orientation, QMarginsF* margins, uintptr_t units) { +QPageLayout* QPageLayout_new4(QPageSize* pageSize, int orientation, QMarginsF* margins, int units) { return new QPageLayout(*pageSize, static_cast(orientation), *margins, static_cast(units)); } -QPageLayout* QPageLayout_new5(QPageSize* pageSize, uintptr_t orientation, QMarginsF* margins, uintptr_t units, QMarginsF* minMargins) { +QPageLayout* QPageLayout_new5(QPageSize* pageSize, int orientation, QMarginsF* margins, int units, QMarginsF* minMargins) { return new QPageLayout(*pageSize, static_cast(orientation), *margins, static_cast(units), *minMargins); } @@ -44,13 +44,13 @@ bool QPageLayout_IsValid(const QPageLayout* self) { return self->isValid(); } -void QPageLayout_SetMode(QPageLayout* self, uintptr_t mode) { +void QPageLayout_SetMode(QPageLayout* self, int mode) { self->setMode(static_cast(mode)); } -uintptr_t QPageLayout_Mode(const QPageLayout* self) { +int QPageLayout_Mode(const QPageLayout* self) { QPageLayout::Mode _ret = self->mode(); - return static_cast(_ret); + return static_cast(_ret); } void QPageLayout_SetPageSize(QPageLayout* self, QPageSize* pageSize) { @@ -61,22 +61,22 @@ QPageSize* QPageLayout_PageSize(const QPageLayout* self) { return new QPageSize(self->pageSize()); } -void QPageLayout_SetOrientation(QPageLayout* self, uintptr_t orientation) { +void QPageLayout_SetOrientation(QPageLayout* self, int orientation) { self->setOrientation(static_cast(orientation)); } -uintptr_t QPageLayout_Orientation(const QPageLayout* self) { +int QPageLayout_Orientation(const QPageLayout* self) { QPageLayout::Orientation _ret = self->orientation(); - return static_cast(_ret); + return static_cast(_ret); } -void QPageLayout_SetUnits(QPageLayout* self, uintptr_t units) { +void QPageLayout_SetUnits(QPageLayout* self, int units) { self->setUnits(static_cast(units)); } -uintptr_t QPageLayout_Units(const QPageLayout* self) { +int QPageLayout_Units(const QPageLayout* self) { QPageLayout::Unit _ret = self->units(); - return static_cast(_ret); + return static_cast(_ret); } bool QPageLayout_SetMargins(QPageLayout* self, QMarginsF* margins) { @@ -103,7 +103,7 @@ QMarginsF* QPageLayout_Margins(const QPageLayout* self) { return new QMarginsF(self->margins()); } -QMarginsF* QPageLayout_MarginsWithUnits(const QPageLayout* self, uintptr_t units) { +QMarginsF* QPageLayout_MarginsWithUnits(const QPageLayout* self, int units) { return new QMarginsF(self->margins(static_cast(units))); } @@ -131,7 +131,7 @@ QRectF* QPageLayout_FullRect(const QPageLayout* self) { return new QRectF(self->fullRect()); } -QRectF* QPageLayout_FullRectWithUnits(const QPageLayout* self, uintptr_t units) { +QRectF* QPageLayout_FullRectWithUnits(const QPageLayout* self, int units) { return new QRectF(self->fullRect(static_cast(units))); } @@ -147,7 +147,7 @@ QRectF* QPageLayout_PaintRect(const QPageLayout* self) { return new QRectF(self->paintRect()); } -QRectF* QPageLayout_PaintRectWithUnits(const QPageLayout* self, uintptr_t units) { +QRectF* QPageLayout_PaintRectWithUnits(const QPageLayout* self, int units) { return new QRectF(self->paintRect(static_cast(units))); } diff --git a/qt/gen_qpagelayout.go b/qt/gen_qpagelayout.go index dc010c7..2edab96 100644 --- a/qt/gen_qpagelayout.go +++ b/qt/gen_qpagelayout.go @@ -68,7 +68,7 @@ func NewQPageLayout() *QPageLayout { // NewQPageLayout2 constructs a new QPageLayout object. func NewQPageLayout2(pageSize *QPageSize, orientation QPageLayout__Orientation, margins *QMarginsF) *QPageLayout { - ret := C.QPageLayout_new2(pageSize.cPointer(), (C.uintptr_t)(orientation), margins.cPointer()) + ret := C.QPageLayout_new2(pageSize.cPointer(), (C.int)(orientation), margins.cPointer()) return newQPageLayout(ret) } @@ -80,13 +80,13 @@ func NewQPageLayout3(other *QPageLayout) *QPageLayout { // NewQPageLayout4 constructs a new QPageLayout object. func NewQPageLayout4(pageSize *QPageSize, orientation QPageLayout__Orientation, margins *QMarginsF, units QPageLayout__Unit) *QPageLayout { - ret := C.QPageLayout_new4(pageSize.cPointer(), (C.uintptr_t)(orientation), margins.cPointer(), (C.uintptr_t)(units)) + ret := C.QPageLayout_new4(pageSize.cPointer(), (C.int)(orientation), margins.cPointer(), (C.int)(units)) return newQPageLayout(ret) } // NewQPageLayout5 constructs a new QPageLayout object. func NewQPageLayout5(pageSize *QPageSize, orientation QPageLayout__Orientation, margins *QMarginsF, units QPageLayout__Unit, minMargins *QMarginsF) *QPageLayout { - ret := C.QPageLayout_new5(pageSize.cPointer(), (C.uintptr_t)(orientation), margins.cPointer(), (C.uintptr_t)(units), minMargins.cPointer()) + ret := C.QPageLayout_new5(pageSize.cPointer(), (C.int)(orientation), margins.cPointer(), (C.int)(units), minMargins.cPointer()) return newQPageLayout(ret) } @@ -107,7 +107,7 @@ func (this *QPageLayout) IsValid() bool { } func (this *QPageLayout) SetMode(mode QPageLayout__Mode) { - C.QPageLayout_SetMode(this.h, (C.uintptr_t)(mode)) + C.QPageLayout_SetMode(this.h, (C.int)(mode)) } func (this *QPageLayout) Mode() QPageLayout__Mode { @@ -126,7 +126,7 @@ func (this *QPageLayout) PageSize() *QPageSize { } func (this *QPageLayout) SetOrientation(orientation QPageLayout__Orientation) { - C.QPageLayout_SetOrientation(this.h, (C.uintptr_t)(orientation)) + C.QPageLayout_SetOrientation(this.h, (C.int)(orientation)) } func (this *QPageLayout) Orientation() QPageLayout__Orientation { @@ -134,7 +134,7 @@ func (this *QPageLayout) Orientation() QPageLayout__Orientation { } func (this *QPageLayout) SetUnits(units QPageLayout__Unit) { - C.QPageLayout_SetUnits(this.h, (C.uintptr_t)(units)) + C.QPageLayout_SetUnits(this.h, (C.int)(units)) } func (this *QPageLayout) Units() QPageLayout__Unit { @@ -169,7 +169,7 @@ func (this *QPageLayout) Margins() *QMarginsF { } func (this *QPageLayout) MarginsWithUnits(units QPageLayout__Unit) *QMarginsF { - _ret := C.QPageLayout_MarginsWithUnits(this.h, (C.uintptr_t)(units)) + _ret := C.QPageLayout_MarginsWithUnits(this.h, (C.int)(units)) _goptr := newQMarginsF(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -215,7 +215,7 @@ func (this *QPageLayout) FullRect() *QRectF { } func (this *QPageLayout) FullRectWithUnits(units QPageLayout__Unit) *QRectF { - _ret := C.QPageLayout_FullRectWithUnits(this.h, (C.uintptr_t)(units)) + _ret := C.QPageLayout_FullRectWithUnits(this.h, (C.int)(units)) _goptr := newQRectF(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -243,7 +243,7 @@ func (this *QPageLayout) PaintRect() *QRectF { } func (this *QPageLayout) PaintRectWithUnits(units QPageLayout__Unit) *QRectF { - _ret := C.QPageLayout_PaintRectWithUnits(this.h, (C.uintptr_t)(units)) + _ret := C.QPageLayout_PaintRectWithUnits(this.h, (C.int)(units)) _goptr := newQRectF(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qpagelayout.h b/qt/gen_qpagelayout.h index a0cdcdf..3fa2a7f 100644 --- a/qt/gen_qpagelayout.h +++ b/qt/gen_qpagelayout.h @@ -30,40 +30,40 @@ typedef struct QRectF QRectF; #endif QPageLayout* QPageLayout_new(); -QPageLayout* QPageLayout_new2(QPageSize* pageSize, uintptr_t orientation, QMarginsF* margins); +QPageLayout* QPageLayout_new2(QPageSize* pageSize, int orientation, QMarginsF* margins); QPageLayout* QPageLayout_new3(QPageLayout* other); -QPageLayout* QPageLayout_new4(QPageSize* pageSize, uintptr_t orientation, QMarginsF* margins, uintptr_t units); -QPageLayout* QPageLayout_new5(QPageSize* pageSize, uintptr_t orientation, QMarginsF* margins, uintptr_t units, QMarginsF* minMargins); +QPageLayout* QPageLayout_new4(QPageSize* pageSize, int orientation, QMarginsF* margins, int units); +QPageLayout* QPageLayout_new5(QPageSize* pageSize, int orientation, QMarginsF* margins, int units, QMarginsF* minMargins); void QPageLayout_OperatorAssign(QPageLayout* self, QPageLayout* other); void QPageLayout_Swap(QPageLayout* self, QPageLayout* other); bool QPageLayout_IsEquivalentTo(const QPageLayout* self, QPageLayout* other); bool QPageLayout_IsValid(const QPageLayout* self); -void QPageLayout_SetMode(QPageLayout* self, uintptr_t mode); -uintptr_t QPageLayout_Mode(const QPageLayout* self); +void QPageLayout_SetMode(QPageLayout* self, int mode); +int QPageLayout_Mode(const QPageLayout* self); void QPageLayout_SetPageSize(QPageLayout* self, QPageSize* pageSize); QPageSize* QPageLayout_PageSize(const QPageLayout* self); -void QPageLayout_SetOrientation(QPageLayout* self, uintptr_t orientation); -uintptr_t QPageLayout_Orientation(const QPageLayout* self); -void QPageLayout_SetUnits(QPageLayout* self, uintptr_t units); -uintptr_t QPageLayout_Units(const QPageLayout* self); +void QPageLayout_SetOrientation(QPageLayout* self, int orientation); +int QPageLayout_Orientation(const QPageLayout* self); +void QPageLayout_SetUnits(QPageLayout* self, int units); +int QPageLayout_Units(const QPageLayout* self); bool QPageLayout_SetMargins(QPageLayout* self, QMarginsF* margins); bool QPageLayout_SetLeftMargin(QPageLayout* self, double leftMargin); bool QPageLayout_SetRightMargin(QPageLayout* self, double rightMargin); bool QPageLayout_SetTopMargin(QPageLayout* self, double topMargin); bool QPageLayout_SetBottomMargin(QPageLayout* self, double bottomMargin); QMarginsF* QPageLayout_Margins(const QPageLayout* self); -QMarginsF* QPageLayout_MarginsWithUnits(const QPageLayout* self, uintptr_t units); +QMarginsF* QPageLayout_MarginsWithUnits(const QPageLayout* self, int units); QMargins* QPageLayout_MarginsPoints(const QPageLayout* self); QMargins* QPageLayout_MarginsPixels(const QPageLayout* self, int resolution); void QPageLayout_SetMinimumMargins(QPageLayout* self, QMarginsF* minMargins); QMarginsF* QPageLayout_MinimumMargins(const QPageLayout* self); QMarginsF* QPageLayout_MaximumMargins(const QPageLayout* self); QRectF* QPageLayout_FullRect(const QPageLayout* self); -QRectF* QPageLayout_FullRectWithUnits(const QPageLayout* self, uintptr_t units); +QRectF* QPageLayout_FullRectWithUnits(const QPageLayout* self, int units); QRect* QPageLayout_FullRectPoints(const QPageLayout* self); QRect* QPageLayout_FullRectPixels(const QPageLayout* self, int resolution); QRectF* QPageLayout_PaintRect(const QPageLayout* self); -QRectF* QPageLayout_PaintRectWithUnits(const QPageLayout* self, uintptr_t units); +QRectF* QPageLayout_PaintRectWithUnits(const QPageLayout* self, int units); QRect* QPageLayout_PaintRectPoints(const QPageLayout* self); QRect* QPageLayout_PaintRectPixels(const QPageLayout* self, int resolution); void QPageLayout_SetPageSize2(QPageLayout* self, QPageSize* pageSize, QMarginsF* minMargins); diff --git a/qt/gen_qpagesize.cpp b/qt/gen_qpagesize.cpp index 29f1365..d33e8f9 100644 --- a/qt/gen_qpagesize.cpp +++ b/qt/gen_qpagesize.cpp @@ -14,7 +14,7 @@ QPageSize* QPageSize_new() { return new QPageSize(); } -QPageSize* QPageSize_new2(uintptr_t pageSizeId) { +QPageSize* QPageSize_new2(int pageSizeId) { return new QPageSize(static_cast(pageSizeId)); } @@ -22,7 +22,7 @@ QPageSize* QPageSize_new3(QSize* pointSize) { return new QPageSize(*pointSize); } -QPageSize* QPageSize_new4(QSizeF* size, uintptr_t units) { +QPageSize* QPageSize_new4(QSizeF* size, int units) { return new QPageSize(*size, static_cast(units)); } @@ -35,17 +35,17 @@ QPageSize* QPageSize_new6(QSize* pointSize, struct miqt_string* name) { return new QPageSize(*pointSize, name_QString); } -QPageSize* QPageSize_new7(QSize* pointSize, struct miqt_string* name, uintptr_t matchPolicy) { +QPageSize* QPageSize_new7(QSize* pointSize, struct miqt_string* name, int matchPolicy) { QString name_QString = QString::fromUtf8(&name->data, name->len); return new QPageSize(*pointSize, name_QString, static_cast(matchPolicy)); } -QPageSize* QPageSize_new8(QSizeF* size, uintptr_t units, struct miqt_string* name) { +QPageSize* QPageSize_new8(QSizeF* size, int units, struct miqt_string* name) { QString name_QString = QString::fromUtf8(&name->data, name->len); return new QPageSize(*size, static_cast(units), name_QString); } -QPageSize* QPageSize_new9(QSizeF* size, uintptr_t units, struct miqt_string* name, uintptr_t matchPolicy) { +QPageSize* QPageSize_new9(QSizeF* size, int units, struct miqt_string* name, int matchPolicy) { QString name_QString = QString::fromUtf8(&name->data, name->len); return new QPageSize(*size, static_cast(units), name_QString, static_cast(matchPolicy)); } @@ -80,9 +80,9 @@ struct miqt_string* QPageSize_Name(const QPageSize* self) { return miqt_strdup(_b.data(), _b.length()); } -uintptr_t QPageSize_Id(const QPageSize* self) { +int QPageSize_Id(const QPageSize* self) { QPageSize::PageSizeId _ret = self->id(); - return static_cast(_ret); + return static_cast(_ret); } int QPageSize_WindowsId(const QPageSize* self) { @@ -93,12 +93,12 @@ QSizeF* QPageSize_DefinitionSize(const QPageSize* self) { return new QSizeF(self->definitionSize()); } -uintptr_t QPageSize_DefinitionUnits(const QPageSize* self) { +int QPageSize_DefinitionUnits(const QPageSize* self) { QPageSize::Unit _ret = self->definitionUnits(); - return static_cast(_ret); + return static_cast(_ret); } -QSizeF* QPageSize_Size(const QPageSize* self, uintptr_t units) { +QSizeF* QPageSize_Size(const QPageSize* self, int units) { return new QSizeF(self->size(static_cast(units))); } @@ -110,7 +110,7 @@ QSize* QPageSize_SizePixels(const QPageSize* self, int resolution) { return new QSize(self->sizePixels(static_cast(resolution))); } -QRectF* QPageSize_Rect(const QPageSize* self, uintptr_t units) { +QRectF* QPageSize_Rect(const QPageSize* self, int units) { return new QRectF(self->rect(static_cast(units))); } @@ -122,68 +122,68 @@ QRect* QPageSize_RectPixels(const QPageSize* self, int resolution) { return new QRect(self->rectPixels(static_cast(resolution))); } -struct miqt_string* QPageSize_KeyWithPageSizeId(uintptr_t pageSizeId) { +struct miqt_string* QPageSize_KeyWithPageSizeId(int pageSizeId) { QString _ret = QPageSize::key(static_cast(pageSizeId)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QPageSize_NameWithPageSizeId(uintptr_t pageSizeId) { +struct miqt_string* QPageSize_NameWithPageSizeId(int pageSizeId) { QString _ret = QPageSize::name(static_cast(pageSizeId)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); } -uintptr_t QPageSize_IdWithPointSize(QSize* pointSize) { +int QPageSize_IdWithPointSize(QSize* pointSize) { QPageSize::PageSizeId _ret = QPageSize::id(*pointSize); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QPageSize_Id2(QSizeF* size, uintptr_t units) { +int QPageSize_Id2(QSizeF* size, int units) { QPageSize::PageSizeId _ret = QPageSize::id(*size, static_cast(units)); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QPageSize_IdWithWindowsId(int windowsId) { +int QPageSize_IdWithWindowsId(int windowsId) { QPageSize::PageSizeId _ret = QPageSize::id(static_cast(windowsId)); - return static_cast(_ret); + return static_cast(_ret); } -int QPageSize_WindowsIdWithPageSizeId(uintptr_t pageSizeId) { +int QPageSize_WindowsIdWithPageSizeId(int pageSizeId) { return QPageSize::windowsId(static_cast(pageSizeId)); } -QSizeF* QPageSize_DefinitionSizeWithPageSizeId(uintptr_t pageSizeId) { +QSizeF* QPageSize_DefinitionSizeWithPageSizeId(int pageSizeId) { return new QSizeF(QPageSize::definitionSize(static_cast(pageSizeId))); } -uintptr_t QPageSize_DefinitionUnitsWithPageSizeId(uintptr_t pageSizeId) { +int QPageSize_DefinitionUnitsWithPageSizeId(int pageSizeId) { QPageSize::Unit _ret = QPageSize::definitionUnits(static_cast(pageSizeId)); - return static_cast(_ret); + return static_cast(_ret); } -QSizeF* QPageSize_Size2(uintptr_t pageSizeId, uintptr_t units) { +QSizeF* QPageSize_Size2(int pageSizeId, int units) { return new QSizeF(QPageSize::size(static_cast(pageSizeId), static_cast(units))); } -QSize* QPageSize_SizePointsWithPageSizeId(uintptr_t pageSizeId) { +QSize* QPageSize_SizePointsWithPageSizeId(int pageSizeId) { return new QSize(QPageSize::sizePoints(static_cast(pageSizeId))); } -QSize* QPageSize_SizePixels2(uintptr_t pageSizeId, int resolution) { +QSize* QPageSize_SizePixels2(int pageSizeId, int resolution) { return new QSize(QPageSize::sizePixels(static_cast(pageSizeId), static_cast(resolution))); } -uintptr_t QPageSize_Id22(QSize* pointSize, uintptr_t matchPolicy) { +int QPageSize_Id22(QSize* pointSize, int matchPolicy) { QPageSize::PageSizeId _ret = QPageSize::id(*pointSize, static_cast(matchPolicy)); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QPageSize_Id3(QSizeF* size, uintptr_t units, uintptr_t matchPolicy) { +int QPageSize_Id3(QSizeF* size, int units, int matchPolicy) { QPageSize::PageSizeId _ret = QPageSize::id(*size, static_cast(units), static_cast(matchPolicy)); - return static_cast(_ret); + return static_cast(_ret); } void QPageSize_Delete(QPageSize* self) { diff --git a/qt/gen_qpagesize.go b/qt/gen_qpagesize.go index 17ee212..8bcbd08 100644 --- a/qt/gen_qpagesize.go +++ b/qt/gen_qpagesize.go @@ -194,7 +194,7 @@ func NewQPageSize() *QPageSize { // NewQPageSize2 constructs a new QPageSize object. func NewQPageSize2(pageSizeId QPageSize__PageSizeId) *QPageSize { - ret := C.QPageSize_new2((C.uintptr_t)(pageSizeId)) + ret := C.QPageSize_new2((C.int)(pageSizeId)) return newQPageSize(ret) } @@ -206,7 +206,7 @@ func NewQPageSize3(pointSize *QSize) *QPageSize { // NewQPageSize4 constructs a new QPageSize object. func NewQPageSize4(size *QSizeF, units QPageSize__Unit) *QPageSize { - ret := C.QPageSize_new4(size.cPointer(), (C.uintptr_t)(units)) + ret := C.QPageSize_new4(size.cPointer(), (C.int)(units)) return newQPageSize(ret) } @@ -228,7 +228,7 @@ func NewQPageSize6(pointSize *QSize, name string) *QPageSize { func NewQPageSize7(pointSize *QSize, name string, matchPolicy QPageSize__SizeMatchPolicy) *QPageSize { name_ms := miqt_strdupg(name) defer C.free(name_ms) - ret := C.QPageSize_new7(pointSize.cPointer(), (*C.struct_miqt_string)(name_ms), (C.uintptr_t)(matchPolicy)) + ret := C.QPageSize_new7(pointSize.cPointer(), (*C.struct_miqt_string)(name_ms), (C.int)(matchPolicy)) return newQPageSize(ret) } @@ -236,7 +236,7 @@ func NewQPageSize7(pointSize *QSize, name string, matchPolicy QPageSize__SizeMat func NewQPageSize8(size *QSizeF, units QPageSize__Unit, name string) *QPageSize { name_ms := miqt_strdupg(name) defer C.free(name_ms) - ret := C.QPageSize_new8(size.cPointer(), (C.uintptr_t)(units), (*C.struct_miqt_string)(name_ms)) + ret := C.QPageSize_new8(size.cPointer(), (C.int)(units), (*C.struct_miqt_string)(name_ms)) return newQPageSize(ret) } @@ -244,7 +244,7 @@ func NewQPageSize8(size *QSizeF, units QPageSize__Unit, name string) *QPageSize func NewQPageSize9(size *QSizeF, units QPageSize__Unit, name string, matchPolicy QPageSize__SizeMatchPolicy) *QPageSize { name_ms := miqt_strdupg(name) defer C.free(name_ms) - ret := C.QPageSize_new9(size.cPointer(), (C.uintptr_t)(units), (*C.struct_miqt_string)(name_ms), (C.uintptr_t)(matchPolicy)) + ret := C.QPageSize_new9(size.cPointer(), (C.int)(units), (*C.struct_miqt_string)(name_ms), (C.int)(matchPolicy)) return newQPageSize(ret) } @@ -298,7 +298,7 @@ func (this *QPageSize) DefinitionUnits() QPageSize__Unit { } func (this *QPageSize) Size(units QPageSize__Unit) *QSizeF { - _ret := C.QPageSize_Size(this.h, (C.uintptr_t)(units)) + _ret := C.QPageSize_Size(this.h, (C.int)(units)) _goptr := newQSizeF(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -319,7 +319,7 @@ func (this *QPageSize) SizePixels(resolution int) *QSize { } func (this *QPageSize) Rect(units QPageSize__Unit) *QRectF { - _ret := C.QPageSize_Rect(this.h, (C.uintptr_t)(units)) + _ret := C.QPageSize_Rect(this.h, (C.int)(units)) _goptr := newQRectF(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -340,14 +340,14 @@ func (this *QPageSize) RectPixels(resolution int) *QRect { } func QPageSize_KeyWithPageSizeId(pageSizeId QPageSize__PageSizeId) string { - var _ms *C.struct_miqt_string = C.QPageSize_KeyWithPageSizeId((C.uintptr_t)(pageSizeId)) + var _ms *C.struct_miqt_string = C.QPageSize_KeyWithPageSizeId((C.int)(pageSizeId)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } func QPageSize_NameWithPageSizeId(pageSizeId QPageSize__PageSizeId) string { - var _ms *C.struct_miqt_string = C.QPageSize_NameWithPageSizeId((C.uintptr_t)(pageSizeId)) + var _ms *C.struct_miqt_string = C.QPageSize_NameWithPageSizeId((C.int)(pageSizeId)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -358,7 +358,7 @@ func QPageSize_IdWithPointSize(pointSize *QSize) QPageSize__PageSizeId { } func QPageSize_Id2(size *QSizeF, units QPageSize__Unit) QPageSize__PageSizeId { - return (QPageSize__PageSizeId)(C.QPageSize_Id2(size.cPointer(), (C.uintptr_t)(units))) + return (QPageSize__PageSizeId)(C.QPageSize_Id2(size.cPointer(), (C.int)(units))) } func QPageSize_IdWithWindowsId(windowsId int) QPageSize__PageSizeId { @@ -366,47 +366,47 @@ func QPageSize_IdWithWindowsId(windowsId int) QPageSize__PageSizeId { } func QPageSize_WindowsIdWithPageSizeId(pageSizeId QPageSize__PageSizeId) int { - return (int)(C.QPageSize_WindowsIdWithPageSizeId((C.uintptr_t)(pageSizeId))) + return (int)(C.QPageSize_WindowsIdWithPageSizeId((C.int)(pageSizeId))) } func QPageSize_DefinitionSizeWithPageSizeId(pageSizeId QPageSize__PageSizeId) *QSizeF { - _ret := C.QPageSize_DefinitionSizeWithPageSizeId((C.uintptr_t)(pageSizeId)) + _ret := C.QPageSize_DefinitionSizeWithPageSizeId((C.int)(pageSizeId)) _goptr := newQSizeF(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QPageSize_DefinitionUnitsWithPageSizeId(pageSizeId QPageSize__PageSizeId) QPageSize__Unit { - return (QPageSize__Unit)(C.QPageSize_DefinitionUnitsWithPageSizeId((C.uintptr_t)(pageSizeId))) + return (QPageSize__Unit)(C.QPageSize_DefinitionUnitsWithPageSizeId((C.int)(pageSizeId))) } func QPageSize_Size2(pageSizeId QPageSize__PageSizeId, units QPageSize__Unit) *QSizeF { - _ret := C.QPageSize_Size2((C.uintptr_t)(pageSizeId), (C.uintptr_t)(units)) + _ret := C.QPageSize_Size2((C.int)(pageSizeId), (C.int)(units)) _goptr := newQSizeF(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QPageSize_SizePointsWithPageSizeId(pageSizeId QPageSize__PageSizeId) *QSize { - _ret := C.QPageSize_SizePointsWithPageSizeId((C.uintptr_t)(pageSizeId)) + _ret := C.QPageSize_SizePointsWithPageSizeId((C.int)(pageSizeId)) _goptr := newQSize(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QPageSize_SizePixels2(pageSizeId QPageSize__PageSizeId, resolution int) *QSize { - _ret := C.QPageSize_SizePixels2((C.uintptr_t)(pageSizeId), (C.int)(resolution)) + _ret := C.QPageSize_SizePixels2((C.int)(pageSizeId), (C.int)(resolution)) _goptr := newQSize(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QPageSize_Id22(pointSize *QSize, matchPolicy QPageSize__SizeMatchPolicy) QPageSize__PageSizeId { - return (QPageSize__PageSizeId)(C.QPageSize_Id22(pointSize.cPointer(), (C.uintptr_t)(matchPolicy))) + return (QPageSize__PageSizeId)(C.QPageSize_Id22(pointSize.cPointer(), (C.int)(matchPolicy))) } func QPageSize_Id3(size *QSizeF, units QPageSize__Unit, matchPolicy QPageSize__SizeMatchPolicy) QPageSize__PageSizeId { - return (QPageSize__PageSizeId)(C.QPageSize_Id3(size.cPointer(), (C.uintptr_t)(units), (C.uintptr_t)(matchPolicy))) + return (QPageSize__PageSizeId)(C.QPageSize_Id3(size.cPointer(), (C.int)(units), (C.int)(matchPolicy))) } // Delete this object from C++ memory. diff --git a/qt/gen_qpagesize.h b/qt/gen_qpagesize.h index 04800d5..0ad82c5 100644 --- a/qt/gen_qpagesize.h +++ b/qt/gen_qpagesize.h @@ -28,43 +28,43 @@ typedef struct QSizeF QSizeF; #endif QPageSize* QPageSize_new(); -QPageSize* QPageSize_new2(uintptr_t pageSizeId); +QPageSize* QPageSize_new2(int pageSizeId); QPageSize* QPageSize_new3(QSize* pointSize); -QPageSize* QPageSize_new4(QSizeF* size, uintptr_t units); +QPageSize* QPageSize_new4(QSizeF* size, int units); QPageSize* QPageSize_new5(QPageSize* other); QPageSize* QPageSize_new6(QSize* pointSize, struct miqt_string* name); -QPageSize* QPageSize_new7(QSize* pointSize, struct miqt_string* name, uintptr_t matchPolicy); -QPageSize* QPageSize_new8(QSizeF* size, uintptr_t units, struct miqt_string* name); -QPageSize* QPageSize_new9(QSizeF* size, uintptr_t units, struct miqt_string* name, uintptr_t matchPolicy); +QPageSize* QPageSize_new7(QSize* pointSize, struct miqt_string* name, int matchPolicy); +QPageSize* QPageSize_new8(QSizeF* size, int units, struct miqt_string* name); +QPageSize* QPageSize_new9(QSizeF* size, int units, struct miqt_string* name, int matchPolicy); void QPageSize_OperatorAssign(QPageSize* self, QPageSize* other); void QPageSize_Swap(QPageSize* self, QPageSize* other); bool QPageSize_IsEquivalentTo(const QPageSize* self, QPageSize* other); bool QPageSize_IsValid(const QPageSize* self); struct miqt_string* QPageSize_Key(const QPageSize* self); struct miqt_string* QPageSize_Name(const QPageSize* self); -uintptr_t QPageSize_Id(const QPageSize* self); +int QPageSize_Id(const QPageSize* self); int QPageSize_WindowsId(const QPageSize* self); QSizeF* QPageSize_DefinitionSize(const QPageSize* self); -uintptr_t QPageSize_DefinitionUnits(const QPageSize* self); -QSizeF* QPageSize_Size(const QPageSize* self, uintptr_t units); +int QPageSize_DefinitionUnits(const QPageSize* self); +QSizeF* QPageSize_Size(const QPageSize* self, int units); QSize* QPageSize_SizePoints(const QPageSize* self); QSize* QPageSize_SizePixels(const QPageSize* self, int resolution); -QRectF* QPageSize_Rect(const QPageSize* self, uintptr_t units); +QRectF* QPageSize_Rect(const QPageSize* self, int units); QRect* QPageSize_RectPoints(const QPageSize* self); QRect* QPageSize_RectPixels(const QPageSize* self, int resolution); -struct miqt_string* QPageSize_KeyWithPageSizeId(uintptr_t pageSizeId); -struct miqt_string* QPageSize_NameWithPageSizeId(uintptr_t pageSizeId); -uintptr_t QPageSize_IdWithPointSize(QSize* pointSize); -uintptr_t QPageSize_Id2(QSizeF* size, uintptr_t units); -uintptr_t QPageSize_IdWithWindowsId(int windowsId); -int QPageSize_WindowsIdWithPageSizeId(uintptr_t pageSizeId); -QSizeF* QPageSize_DefinitionSizeWithPageSizeId(uintptr_t pageSizeId); -uintptr_t QPageSize_DefinitionUnitsWithPageSizeId(uintptr_t pageSizeId); -QSizeF* QPageSize_Size2(uintptr_t pageSizeId, uintptr_t units); -QSize* QPageSize_SizePointsWithPageSizeId(uintptr_t pageSizeId); -QSize* QPageSize_SizePixels2(uintptr_t pageSizeId, int resolution); -uintptr_t QPageSize_Id22(QSize* pointSize, uintptr_t matchPolicy); -uintptr_t QPageSize_Id3(QSizeF* size, uintptr_t units, uintptr_t matchPolicy); +struct miqt_string* QPageSize_KeyWithPageSizeId(int pageSizeId); +struct miqt_string* QPageSize_NameWithPageSizeId(int pageSizeId); +int QPageSize_IdWithPointSize(QSize* pointSize); +int QPageSize_Id2(QSizeF* size, int units); +int QPageSize_IdWithWindowsId(int windowsId); +int QPageSize_WindowsIdWithPageSizeId(int pageSizeId); +QSizeF* QPageSize_DefinitionSizeWithPageSizeId(int pageSizeId); +int QPageSize_DefinitionUnitsWithPageSizeId(int pageSizeId); +QSizeF* QPageSize_Size2(int pageSizeId, int units); +QSize* QPageSize_SizePointsWithPageSizeId(int pageSizeId); +QSize* QPageSize_SizePixels2(int pageSizeId, int resolution); +int QPageSize_Id22(QSize* pointSize, int matchPolicy); +int QPageSize_Id3(QSizeF* size, int units, int matchPolicy); void QPageSize_Delete(QPageSize* self); #ifdef __cplusplus diff --git a/qt/gen_qpaintdevice.cpp b/qt/gen_qpaintdevice.cpp index 603cbe8..db277c7 100644 --- a/qt/gen_qpaintdevice.cpp +++ b/qt/gen_qpaintdevice.cpp @@ -53,7 +53,8 @@ int QPaintDevice_DevicePixelRatio(const QPaintDevice* self) { } double QPaintDevice_DevicePixelRatioF(const QPaintDevice* self) { - return self->devicePixelRatioF(); + qreal _ret = self->devicePixelRatioF(); + return static_cast(_ret); } int QPaintDevice_ColorCount(const QPaintDevice* self) { @@ -65,7 +66,8 @@ int QPaintDevice_Depth(const QPaintDevice* self) { } double QPaintDevice_DevicePixelRatioFScale() { - return QPaintDevice::devicePixelRatioFScale(); + qreal _ret = QPaintDevice::devicePixelRatioFScale(); + return static_cast(_ret); } void QPaintDevice_Delete(QPaintDevice* self) { diff --git a/qt/gen_qpaintengine.cpp b/qt/gen_qpaintengine.cpp index 6a625ea..91a1f8d 100644 --- a/qt/gen_qpaintengine.cpp +++ b/qt/gen_qpaintengine.cpp @@ -26,15 +26,18 @@ #include "_cgo_export.h" double QTextItem_Descent(const QTextItem* self) { - return self->descent(); + qreal _ret = self->descent(); + return static_cast(_ret); } double QTextItem_Ascent(const QTextItem* self) { - return self->ascent(); + qreal _ret = self->ascent(); + return static_cast(_ret); } double QTextItem_Width(const QTextItem* self) { - return self->width(); + qreal _ret = self->width(); + return static_cast(_ret); } int QTextItem_RenderFlags(const QTextItem* self) { @@ -113,11 +116,11 @@ void QPaintEngine_DrawPoints2(QPaintEngine* self, QPoint* points, int pointCount self->drawPoints(points, static_cast(pointCount)); } -void QPaintEngine_DrawPolygon(QPaintEngine* self, QPointF* points, int pointCount, uintptr_t mode) { +void QPaintEngine_DrawPolygon(QPaintEngine* self, QPointF* points, int pointCount, int mode) { self->drawPolygon(points, static_cast(pointCount), static_cast(mode)); } -void QPaintEngine_DrawPolygon2(QPaintEngine* self, QPoint* points, int pointCount, uintptr_t mode) { +void QPaintEngine_DrawPolygon2(QPaintEngine* self, QPoint* points, int pointCount, int mode) { self->drawPolygon(points, static_cast(pointCount), static_cast(mode)); } @@ -165,9 +168,9 @@ QPoint* QPaintEngine_CoordinateOffset(const QPaintEngine* self) { return new QPoint(self->coordinateOffset()); } -uintptr_t QPaintEngine_Type(const QPaintEngine* self) { +int QPaintEngine_Type(const QPaintEngine* self) { QPaintEngine::Type _ret = self->type(); - return static_cast(_ret); + return static_cast(_ret); } void QPaintEngine_FixNegRect(QPaintEngine* self, int* x, int* y, int* w, int* h) { @@ -231,9 +234,9 @@ QBrush* QPaintEngineState_BackgroundBrush(const QPaintEngineState* self) { return new QBrush(self->backgroundBrush()); } -uintptr_t QPaintEngineState_BackgroundMode(const QPaintEngineState* self) { +int QPaintEngineState_BackgroundMode(const QPaintEngineState* self) { Qt::BGMode _ret = self->backgroundMode(); - return static_cast(_ret); + return static_cast(_ret); } QFont* QPaintEngineState_Font(const QPaintEngineState* self) { @@ -248,9 +251,9 @@ QTransform* QPaintEngineState_Transform(const QPaintEngineState* self) { return new QTransform(self->transform()); } -uintptr_t QPaintEngineState_ClipOperation(const QPaintEngineState* self) { +int QPaintEngineState_ClipOperation(const QPaintEngineState* self) { Qt::ClipOperation _ret = self->clipOperation(); - return static_cast(_ret); + return static_cast(_ret); } QRegion* QPaintEngineState_ClipRegion(const QPaintEngineState* self) { @@ -270,13 +273,14 @@ int QPaintEngineState_RenderHints(const QPaintEngineState* self) { return static_cast(_ret); } -uintptr_t QPaintEngineState_CompositionMode(const QPaintEngineState* self) { +int QPaintEngineState_CompositionMode(const QPaintEngineState* self) { QPainter::CompositionMode _ret = self->compositionMode(); - return static_cast(_ret); + return static_cast(_ret); } double QPaintEngineState_Opacity(const QPaintEngineState* self) { - return self->opacity(); + qreal _ret = self->opacity(); + return static_cast(_ret); } QPainter* QPaintEngineState_Painter(const QPaintEngineState* self) { diff --git a/qt/gen_qpaintengine.go b/qt/gen_qpaintengine.go index 947092c..6d0ca6f 100644 --- a/qt/gen_qpaintengine.go +++ b/qt/gen_qpaintengine.go @@ -246,11 +246,11 @@ func (this *QPaintEngine) DrawPoints2(points *QPoint, pointCount int) { } func (this *QPaintEngine) DrawPolygon(points *QPointF, pointCount int, mode QPaintEngine__PolygonDrawMode) { - C.QPaintEngine_DrawPolygon(this.h, points.cPointer(), (C.int)(pointCount), (C.uintptr_t)(mode)) + C.QPaintEngine_DrawPolygon(this.h, points.cPointer(), (C.int)(pointCount), (C.int)(mode)) } func (this *QPaintEngine) DrawPolygon2(points *QPoint, pointCount int, mode QPaintEngine__PolygonDrawMode) { - C.QPaintEngine_DrawPolygon2(this.h, points.cPointer(), (C.int)(pointCount), (C.uintptr_t)(mode)) + C.QPaintEngine_DrawPolygon2(this.h, points.cPointer(), (C.int)(pointCount), (C.int)(mode)) } func (this *QPaintEngine) DrawPixmap(r *QRectF, pm *QPixmap, sr *QRectF) { @@ -315,19 +315,19 @@ func (this *QPaintEngine) FixNegRect(x *int, y *int, w *int, h *int) { } func (this *QPaintEngine) TestDirty(df int) bool { - return (bool)(C.QPaintEngine_TestDirty(this.h, (C.int)(df))) + return (bool)(C.QPaintEngine_TestDirty(this.h, df)) } func (this *QPaintEngine) SetDirty(df int) { - C.QPaintEngine_SetDirty(this.h, (C.int)(df)) + C.QPaintEngine_SetDirty(this.h, df) } func (this *QPaintEngine) ClearDirty(df int) { - C.QPaintEngine_ClearDirty(this.h, (C.int)(df)) + C.QPaintEngine_ClearDirty(this.h, df) } func (this *QPaintEngine) HasFeature(feature int) bool { - return (bool)(C.QPaintEngine_HasFeature(this.h, (C.int)(feature))) + return (bool)(C.QPaintEngine_HasFeature(this.h, feature)) } func (this *QPaintEngine) Painter() *QPainter { @@ -343,7 +343,7 @@ func (this *QPaintEngine) IsExtended() bool { } func (this *QPaintEngine) DrawImage4(r *QRectF, pm *QImage, sr *QRectF, flags int) { - C.QPaintEngine_DrawImage4(this.h, r.cPointer(), pm.cPointer(), sr.cPointer(), (C.int)(flags)) + C.QPaintEngine_DrawImage4(this.h, r.cPointer(), pm.cPointer(), sr.cPointer(), flags) } // Delete this object from C++ memory. diff --git a/qt/gen_qpaintengine.h b/qt/gen_qpaintengine.h index 59f3aee..40264bc 100644 --- a/qt/gen_qpaintengine.h +++ b/qt/gen_qpaintengine.h @@ -79,8 +79,8 @@ void QPaintEngine_DrawEllipseWithQRect(QPaintEngine* self, QRect* r); void QPaintEngine_DrawPath(QPaintEngine* self, QPainterPath* path); void QPaintEngine_DrawPoints(QPaintEngine* self, QPointF* points, int pointCount); void QPaintEngine_DrawPoints2(QPaintEngine* self, QPoint* points, int pointCount); -void QPaintEngine_DrawPolygon(QPaintEngine* self, QPointF* points, int pointCount, uintptr_t mode); -void QPaintEngine_DrawPolygon2(QPaintEngine* self, QPoint* points, int pointCount, uintptr_t mode); +void QPaintEngine_DrawPolygon(QPaintEngine* self, QPointF* points, int pointCount, int mode); +void QPaintEngine_DrawPolygon2(QPaintEngine* self, QPoint* points, int pointCount, int mode); void QPaintEngine_DrawPixmap(QPaintEngine* self, QRectF* r, QPixmap* pm, QRectF* sr); void QPaintEngine_DrawTextItem(QPaintEngine* self, QPointF* p, QTextItem* textItem); void QPaintEngine_DrawTiledPixmap(QPaintEngine* self, QRectF* r, QPixmap* pixmap, QPointF* s); @@ -92,7 +92,7 @@ QRegion* QPaintEngine_SystemClip(const QPaintEngine* self); void QPaintEngine_SetSystemRect(QPaintEngine* self, QRect* rect); QRect* QPaintEngine_SystemRect(const QPaintEngine* self); QPoint* QPaintEngine_CoordinateOffset(const QPaintEngine* self); -uintptr_t QPaintEngine_Type(const QPaintEngine* self); +int QPaintEngine_Type(const QPaintEngine* self); void QPaintEngine_FixNegRect(QPaintEngine* self, int* x, int* y, int* w, int* h); bool QPaintEngine_TestDirty(QPaintEngine* self, int df); void QPaintEngine_SetDirty(QPaintEngine* self, int df); @@ -109,16 +109,16 @@ QPen* QPaintEngineState_Pen(const QPaintEngineState* self); QBrush* QPaintEngineState_Brush(const QPaintEngineState* self); QPointF* QPaintEngineState_BrushOrigin(const QPaintEngineState* self); QBrush* QPaintEngineState_BackgroundBrush(const QPaintEngineState* self); -uintptr_t QPaintEngineState_BackgroundMode(const QPaintEngineState* self); +int QPaintEngineState_BackgroundMode(const QPaintEngineState* self); QFont* QPaintEngineState_Font(const QPaintEngineState* self); QMatrix* QPaintEngineState_Matrix(const QPaintEngineState* self); QTransform* QPaintEngineState_Transform(const QPaintEngineState* self); -uintptr_t QPaintEngineState_ClipOperation(const QPaintEngineState* self); +int QPaintEngineState_ClipOperation(const QPaintEngineState* self); QRegion* QPaintEngineState_ClipRegion(const QPaintEngineState* self); QPainterPath* QPaintEngineState_ClipPath(const QPaintEngineState* self); bool QPaintEngineState_IsClipEnabled(const QPaintEngineState* self); int QPaintEngineState_RenderHints(const QPaintEngineState* self); -uintptr_t QPaintEngineState_CompositionMode(const QPaintEngineState* self); +int QPaintEngineState_CompositionMode(const QPaintEngineState* self); double QPaintEngineState_Opacity(const QPaintEngineState* self); QPainter* QPaintEngineState_Painter(const QPaintEngineState* self); bool QPaintEngineState_BrushNeedsResolving(const QPaintEngineState* self); diff --git a/qt/gen_qpainter.cpp b/qt/gen_qpainter.cpp index aff55ce..159b529 100644 --- a/qt/gen_qpainter.cpp +++ b/qt/gen_qpainter.cpp @@ -61,13 +61,13 @@ void QPainter_InitFrom(QPainter* self, QPaintDevice* device) { self->initFrom(device); } -void QPainter_SetCompositionMode(QPainter* self, uintptr_t mode) { +void QPainter_SetCompositionMode(QPainter* self, int mode) { self->setCompositionMode(static_cast(mode)); } -uintptr_t QPainter_CompositionMode(const QPainter* self) { +int QPainter_CompositionMode(const QPainter* self) { QPainter::CompositionMode _ret = self->compositionMode(); - return static_cast(_ret); + return static_cast(_ret); } QFont* QPainter_Font(const QPainter* self) { @@ -96,7 +96,7 @@ void QPainter_SetPenWithPen(QPainter* self, QPen* pen) { self->setPen(*pen); } -void QPainter_SetPenWithStyle(QPainter* self, uintptr_t style) { +void QPainter_SetPenWithStyle(QPainter* self, int style) { self->setPen(static_cast(style)); } @@ -110,7 +110,7 @@ void QPainter_SetBrush(QPainter* self, QBrush* brush) { self->setBrush(*brush); } -void QPainter_SetBrushWithStyle(QPainter* self, uintptr_t style) { +void QPainter_SetBrushWithStyle(QPainter* self, int style) { self->setBrush(static_cast(style)); } @@ -120,13 +120,13 @@ QBrush* QPainter_Brush(const QPainter* self) { return const_cast(&_ret); } -void QPainter_SetBackgroundMode(QPainter* self, uintptr_t mode) { +void QPainter_SetBackgroundMode(QPainter* self, int mode) { self->setBackgroundMode(static_cast(mode)); } -uintptr_t QPainter_BackgroundMode(const QPainter* self) { +int QPainter_BackgroundMode(const QPainter* self) { Qt::BGMode _ret = self->backgroundMode(); - return static_cast(_ret); + return static_cast(_ret); } QPoint* QPainter_BrushOrigin(const QPainter* self) { @@ -156,7 +156,8 @@ QBrush* QPainter_Background(const QPainter* self) { } double QPainter_Opacity(const QPainter* self) { - return self->opacity(); + qreal _ret = self->opacity(); + return static_cast(_ret); } void QPainter_SetOpacity(QPainter* self, double opacity) { @@ -711,13 +712,13 @@ void QPainter_DrawImage9(QPainter* self, int x, int y, QImage* image) { self->drawImage(static_cast(x), static_cast(y), *image); } -void QPainter_SetLayoutDirection(QPainter* self, uintptr_t direction) { +void QPainter_SetLayoutDirection(QPainter* self, int direction) { self->setLayoutDirection(static_cast(direction)); } -uintptr_t QPainter_LayoutDirection(const QPainter* self) { +int QPainter_LayoutDirection(const QPainter* self) { Qt::LayoutDirection _ret = self->layoutDirection(); - return static_cast(_ret); + return static_cast(_ret); } void QPainter_DrawGlyphRun(QPainter* self, QPointF* position, QGlyphRun* glyphRun) { @@ -832,39 +833,39 @@ void QPainter_FillRect6(QPainter* self, QRect* param1, QColor* color) { self->fillRect(*param1, *color); } -void QPainter_FillRect7(QPainter* self, int x, int y, int w, int h, uintptr_t c) { +void QPainter_FillRect7(QPainter* self, int x, int y, int w, int h, int c) { self->fillRect(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(c)); } -void QPainter_FillRect8(QPainter* self, QRect* r, uintptr_t c) { +void QPainter_FillRect8(QPainter* self, QRect* r, int c) { self->fillRect(*r, static_cast(c)); } -void QPainter_FillRect9(QPainter* self, QRectF* r, uintptr_t c) { +void QPainter_FillRect9(QPainter* self, QRectF* r, int c) { self->fillRect(*r, static_cast(c)); } -void QPainter_FillRect10(QPainter* self, int x, int y, int w, int h, uintptr_t style) { +void QPainter_FillRect10(QPainter* self, int x, int y, int w, int h, int style) { self->fillRect(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(style)); } -void QPainter_FillRect11(QPainter* self, QRect* r, uintptr_t style) { +void QPainter_FillRect11(QPainter* self, QRect* r, int style) { self->fillRect(*r, static_cast(style)); } -void QPainter_FillRect12(QPainter* self, QRectF* r, uintptr_t style) { +void QPainter_FillRect12(QPainter* self, QRectF* r, int style) { self->fillRect(*r, static_cast(style)); } -void QPainter_FillRect13(QPainter* self, int x, int y, int w, int h, uintptr_t preset) { +void QPainter_FillRect13(QPainter* self, int x, int y, int w, int h, int preset) { self->fillRect(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(preset)); } -void QPainter_FillRect14(QPainter* self, QRect* r, uintptr_t preset) { +void QPainter_FillRect14(QPainter* self, QRect* r, int preset) { self->fillRect(*r, static_cast(preset)); } -void QPainter_FillRect15(QPainter* self, QRectF* r, uintptr_t preset) { +void QPainter_FillRect15(QPainter* self, QRectF* r, int preset) { self->fillRect(*r, static_cast(preset)); } @@ -880,7 +881,7 @@ void QPainter_EraseRectWithQRect(QPainter* self, QRect* param1) { self->eraseRect(*param1); } -void QPainter_SetRenderHint(QPainter* self, uintptr_t hint) { +void QPainter_SetRenderHint(QPainter* self, int hint) { self->setRenderHint(static_cast(hint)); } @@ -893,7 +894,7 @@ int QPainter_RenderHints(const QPainter* self) { return static_cast(_ret); } -bool QPainter_TestRenderHint(const QPainter* self, uintptr_t hint) { +bool QPainter_TestRenderHint(const QPainter* self, int hint) { return self->testRenderHint(static_cast(hint)); } @@ -921,23 +922,23 @@ void QPainter_EndNativePainting(QPainter* self) { self->endNativePainting(); } -void QPainter_SetClipRect22(QPainter* self, QRectF* param1, uintptr_t op) { +void QPainter_SetClipRect22(QPainter* self, QRectF* param1, int op) { self->setClipRect(*param1, static_cast(op)); } -void QPainter_SetClipRect23(QPainter* self, QRect* param1, uintptr_t op) { +void QPainter_SetClipRect23(QPainter* self, QRect* param1, int op) { self->setClipRect(*param1, static_cast(op)); } -void QPainter_SetClipRect5(QPainter* self, int x, int y, int w, int h, uintptr_t op) { +void QPainter_SetClipRect5(QPainter* self, int x, int y, int w, int h, int op) { self->setClipRect(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(op)); } -void QPainter_SetClipRegion2(QPainter* self, QRegion* param1, uintptr_t op) { +void QPainter_SetClipRegion2(QPainter* self, QRegion* param1, int op) { self->setClipRegion(*param1, static_cast(op)); } -void QPainter_SetClipPath2(QPainter* self, QPainterPath* path, uintptr_t op) { +void QPainter_SetClipPath2(QPainter* self, QPainterPath* path, int op) { self->setClipPath(*path, static_cast(op)); } @@ -957,23 +958,23 @@ void QPainter_SetWorldTransform2(QPainter* self, QTransform* matrix, bool combin self->setWorldTransform(*matrix, combine); } -void QPainter_DrawPolygon32(QPainter* self, QPointF* points, int pointCount, uintptr_t fillRule) { +void QPainter_DrawPolygon32(QPainter* self, QPointF* points, int pointCount, int fillRule) { self->drawPolygon(points, static_cast(pointCount), static_cast(fillRule)); } -void QPainter_DrawPolygon33(QPainter* self, QPoint* points, int pointCount, uintptr_t fillRule) { +void QPainter_DrawPolygon33(QPainter* self, QPoint* points, int pointCount, int fillRule) { self->drawPolygon(points, static_cast(pointCount), static_cast(fillRule)); } -void QPainter_DrawRoundedRect4(QPainter* self, QRectF* rect, double xRadius, double yRadius, uintptr_t mode) { +void QPainter_DrawRoundedRect4(QPainter* self, QRectF* rect, double xRadius, double yRadius, int mode) { self->drawRoundedRect(*rect, static_cast(xRadius), static_cast(yRadius), static_cast(mode)); } -void QPainter_DrawRoundedRect7(QPainter* self, int x, int y, int w, int h, double xRadius, double yRadius, uintptr_t mode) { +void QPainter_DrawRoundedRect7(QPainter* self, int x, int y, int w, int h, double xRadius, double yRadius, int mode) { self->drawRoundedRect(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(xRadius), static_cast(yRadius), static_cast(mode)); } -void QPainter_DrawRoundedRect42(QPainter* self, QRect* rect, double xRadius, double yRadius, uintptr_t mode) { +void QPainter_DrawRoundedRect42(QPainter* self, QRect* rect, double xRadius, double yRadius, int mode) { self->drawRoundedRect(*rect, static_cast(xRadius), static_cast(yRadius), static_cast(mode)); } @@ -1082,7 +1083,7 @@ QRectF* QPainter_BoundingRect32(QPainter* self, QRectF* rect, struct miqt_string return new QRectF(self->boundingRect(*rect, text_QString, *o)); } -void QPainter_SetRenderHint2(QPainter* self, uintptr_t hint, bool on) { +void QPainter_SetRenderHint2(QPainter* self, int hint, bool on) { self->setRenderHint(static_cast(hint), on); } diff --git a/qt/gen_qpainter.go b/qt/gen_qpainter.go index 1f5b697..78acaf9 100644 --- a/qt/gen_qpainter.go +++ b/qt/gen_qpainter.go @@ -129,7 +129,7 @@ func (this *QPainter) InitFrom(device *QPaintDevice) { } func (this *QPainter) SetCompositionMode(mode QPainter__CompositionMode) { - C.QPainter_SetCompositionMode(this.h, (C.uintptr_t)(mode)) + C.QPainter_SetCompositionMode(this.h, (C.int)(mode)) } func (this *QPainter) CompositionMode() QPainter__CompositionMode { @@ -167,7 +167,7 @@ func (this *QPainter) SetPenWithPen(pen *QPen) { } func (this *QPainter) SetPenWithStyle(style PenStyle) { - C.QPainter_SetPenWithStyle(this.h, (C.uintptr_t)(style)) + C.QPainter_SetPenWithStyle(this.h, (C.int)(style)) } func (this *QPainter) Pen() *QPen { @@ -179,7 +179,7 @@ func (this *QPainter) SetBrush(brush *QBrush) { } func (this *QPainter) SetBrushWithStyle(style BrushStyle) { - C.QPainter_SetBrushWithStyle(this.h, (C.uintptr_t)(style)) + C.QPainter_SetBrushWithStyle(this.h, (C.int)(style)) } func (this *QPainter) Brush() *QBrush { @@ -187,7 +187,7 @@ func (this *QPainter) Brush() *QBrush { } func (this *QPainter) SetBackgroundMode(mode BGMode) { - C.QPainter_SetBackgroundMode(this.h, (C.uintptr_t)(mode)) + C.QPainter_SetBackgroundMode(this.h, (C.int)(mode)) } func (this *QPainter) BackgroundMode() BGMode { @@ -799,7 +799,7 @@ func (this *QPainter) DrawImage9(x int, y int, image *QImage) { } func (this *QPainter) SetLayoutDirection(direction LayoutDirection) { - C.QPainter_SetLayoutDirection(this.h, (C.uintptr_t)(direction)) + C.QPainter_SetLayoutDirection(this.h, (C.int)(direction)) } func (this *QPainter) LayoutDirection() LayoutDirection { @@ -943,39 +943,39 @@ func (this *QPainter) FillRect6(param1 *QRect, color *QColor) { } func (this *QPainter) FillRect7(x int, y int, w int, h int, c GlobalColor) { - C.QPainter_FillRect7(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.uintptr_t)(c)) + C.QPainter_FillRect7(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.int)(c)) } func (this *QPainter) FillRect8(r *QRect, c GlobalColor) { - C.QPainter_FillRect8(this.h, r.cPointer(), (C.uintptr_t)(c)) + C.QPainter_FillRect8(this.h, r.cPointer(), (C.int)(c)) } func (this *QPainter) FillRect9(r *QRectF, c GlobalColor) { - C.QPainter_FillRect9(this.h, r.cPointer(), (C.uintptr_t)(c)) + C.QPainter_FillRect9(this.h, r.cPointer(), (C.int)(c)) } func (this *QPainter) FillRect10(x int, y int, w int, h int, style BrushStyle) { - C.QPainter_FillRect10(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.uintptr_t)(style)) + C.QPainter_FillRect10(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.int)(style)) } func (this *QPainter) FillRect11(r *QRect, style BrushStyle) { - C.QPainter_FillRect11(this.h, r.cPointer(), (C.uintptr_t)(style)) + C.QPainter_FillRect11(this.h, r.cPointer(), (C.int)(style)) } func (this *QPainter) FillRect12(r *QRectF, style BrushStyle) { - C.QPainter_FillRect12(this.h, r.cPointer(), (C.uintptr_t)(style)) + C.QPainter_FillRect12(this.h, r.cPointer(), (C.int)(style)) } func (this *QPainter) FillRect13(x int, y int, w int, h int, preset QGradient__Preset) { - C.QPainter_FillRect13(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.uintptr_t)(preset)) + C.QPainter_FillRect13(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.int)(preset)) } func (this *QPainter) FillRect14(r *QRect, preset QGradient__Preset) { - C.QPainter_FillRect14(this.h, r.cPointer(), (C.uintptr_t)(preset)) + C.QPainter_FillRect14(this.h, r.cPointer(), (C.int)(preset)) } func (this *QPainter) FillRect15(r *QRectF, preset QGradient__Preset) { - C.QPainter_FillRect15(this.h, r.cPointer(), (C.uintptr_t)(preset)) + C.QPainter_FillRect15(this.h, r.cPointer(), (C.int)(preset)) } func (this *QPainter) EraseRect(param1 *QRectF) { @@ -991,11 +991,11 @@ func (this *QPainter) EraseRectWithQRect(param1 *QRect) { } func (this *QPainter) SetRenderHint(hint QPainter__RenderHint) { - C.QPainter_SetRenderHint(this.h, (C.uintptr_t)(hint)) + C.QPainter_SetRenderHint(this.h, (C.int)(hint)) } func (this *QPainter) SetRenderHints(hints int) { - C.QPainter_SetRenderHints(this.h, (C.int)(hints)) + C.QPainter_SetRenderHints(this.h, hints) } func (this *QPainter) RenderHints() int { @@ -1003,7 +1003,7 @@ func (this *QPainter) RenderHints() int { } func (this *QPainter) TestRenderHint(hint QPainter__RenderHint) bool { - return (bool)(C.QPainter_TestRenderHint(this.h, (C.uintptr_t)(hint))) + return (bool)(C.QPainter_TestRenderHint(this.h, (C.int)(hint))) } func (this *QPainter) PaintEngine() *QPaintEngine { @@ -1031,23 +1031,23 @@ func (this *QPainter) EndNativePainting() { } func (this *QPainter) SetClipRect22(param1 *QRectF, op ClipOperation) { - C.QPainter_SetClipRect22(this.h, param1.cPointer(), (C.uintptr_t)(op)) + C.QPainter_SetClipRect22(this.h, param1.cPointer(), (C.int)(op)) } func (this *QPainter) SetClipRect23(param1 *QRect, op ClipOperation) { - C.QPainter_SetClipRect23(this.h, param1.cPointer(), (C.uintptr_t)(op)) + C.QPainter_SetClipRect23(this.h, param1.cPointer(), (C.int)(op)) } func (this *QPainter) SetClipRect5(x int, y int, w int, h int, op ClipOperation) { - C.QPainter_SetClipRect5(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.uintptr_t)(op)) + C.QPainter_SetClipRect5(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.int)(op)) } func (this *QPainter) SetClipRegion2(param1 *QRegion, op ClipOperation) { - C.QPainter_SetClipRegion2(this.h, param1.cPointer(), (C.uintptr_t)(op)) + C.QPainter_SetClipRegion2(this.h, param1.cPointer(), (C.int)(op)) } func (this *QPainter) SetClipPath2(path *QPainterPath, op ClipOperation) { - C.QPainter_SetClipPath2(this.h, path.cPointer(), (C.uintptr_t)(op)) + C.QPainter_SetClipPath2(this.h, path.cPointer(), (C.int)(op)) } func (this *QPainter) SetMatrix2(matrix *QMatrix, combine bool) { @@ -1067,23 +1067,23 @@ func (this *QPainter) SetWorldTransform2(matrix *QTransform, combine bool) { } func (this *QPainter) DrawPolygon32(points *QPointF, pointCount int, fillRule FillRule) { - C.QPainter_DrawPolygon32(this.h, points.cPointer(), (C.int)(pointCount), (C.uintptr_t)(fillRule)) + C.QPainter_DrawPolygon32(this.h, points.cPointer(), (C.int)(pointCount), (C.int)(fillRule)) } func (this *QPainter) DrawPolygon33(points *QPoint, pointCount int, fillRule FillRule) { - C.QPainter_DrawPolygon33(this.h, points.cPointer(), (C.int)(pointCount), (C.uintptr_t)(fillRule)) + C.QPainter_DrawPolygon33(this.h, points.cPointer(), (C.int)(pointCount), (C.int)(fillRule)) } func (this *QPainter) DrawRoundedRect4(rect *QRectF, xRadius float64, yRadius float64, mode SizeMode) { - C.QPainter_DrawRoundedRect4(this.h, rect.cPointer(), (C.double)(xRadius), (C.double)(yRadius), (C.uintptr_t)(mode)) + C.QPainter_DrawRoundedRect4(this.h, rect.cPointer(), (C.double)(xRadius), (C.double)(yRadius), (C.int)(mode)) } func (this *QPainter) DrawRoundedRect7(x int, y int, w int, h int, xRadius float64, yRadius float64, mode SizeMode) { - C.QPainter_DrawRoundedRect7(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.double)(xRadius), (C.double)(yRadius), (C.uintptr_t)(mode)) + C.QPainter_DrawRoundedRect7(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.double)(xRadius), (C.double)(yRadius), (C.int)(mode)) } func (this *QPainter) DrawRoundedRect42(rect *QRect, xRadius float64, yRadius float64, mode SizeMode) { - C.QPainter_DrawRoundedRect42(this.h, rect.cPointer(), (C.double)(xRadius), (C.double)(yRadius), (C.uintptr_t)(mode)) + C.QPainter_DrawRoundedRect42(this.h, rect.cPointer(), (C.double)(xRadius), (C.double)(yRadius), (C.int)(mode)) } func (this *QPainter) DrawRoundRect22(r *QRectF, xround int) { @@ -1127,23 +1127,23 @@ func (this *QPainter) DrawTiledPixmap33(param1 *QRect, param2 *QPixmap, param3 * } func (this *QPainter) DrawPixmapFragments4(fragments *QPainter__PixmapFragment, fragmentCount int, pixmap *QPixmap, hints int) { - C.QPainter_DrawPixmapFragments4(this.h, fragments.cPointer(), (C.int)(fragmentCount), pixmap.cPointer(), (C.int)(hints)) + C.QPainter_DrawPixmapFragments4(this.h, fragments.cPointer(), (C.int)(fragmentCount), pixmap.cPointer(), hints) } func (this *QPainter) DrawImage42(targetRect *QRectF, image *QImage, sourceRect *QRectF, flags int) { - C.QPainter_DrawImage42(this.h, targetRect.cPointer(), image.cPointer(), sourceRect.cPointer(), (C.int)(flags)) + C.QPainter_DrawImage42(this.h, targetRect.cPointer(), image.cPointer(), sourceRect.cPointer(), flags) } func (this *QPainter) DrawImage43(targetRect *QRect, image *QImage, sourceRect *QRect, flags int) { - C.QPainter_DrawImage43(this.h, targetRect.cPointer(), image.cPointer(), sourceRect.cPointer(), (C.int)(flags)) + C.QPainter_DrawImage43(this.h, targetRect.cPointer(), image.cPointer(), sourceRect.cPointer(), flags) } func (this *QPainter) DrawImage44(p *QPointF, image *QImage, sr *QRectF, flags int) { - C.QPainter_DrawImage44(this.h, p.cPointer(), image.cPointer(), sr.cPointer(), (C.int)(flags)) + C.QPainter_DrawImage44(this.h, p.cPointer(), image.cPointer(), sr.cPointer(), flags) } func (this *QPainter) DrawImage45(p *QPoint, image *QImage, sr *QRect, flags int) { - C.QPainter_DrawImage45(this.h, p.cPointer(), image.cPointer(), sr.cPointer(), (C.int)(flags)) + C.QPainter_DrawImage45(this.h, p.cPointer(), image.cPointer(), sr.cPointer(), flags) } func (this *QPainter) DrawImage46(x int, y int, image *QImage, sx int) { @@ -1163,7 +1163,7 @@ func (this *QPainter) DrawImage72(x int, y int, image *QImage, sx int, sy int, s } func (this *QPainter) DrawImage82(x int, y int, image *QImage, sx int, sy int, sw int, sh int, flags int) { - C.QPainter_DrawImage82(this.h, (C.int)(x), (C.int)(y), image.cPointer(), (C.int)(sx), (C.int)(sy), (C.int)(sw), (C.int)(sh), (C.int)(flags)) + C.QPainter_DrawImage82(this.h, (C.int)(x), (C.int)(y), image.cPointer(), (C.int)(sx), (C.int)(sy), (C.int)(sw), (C.int)(sh), flags) } func (this *QPainter) DrawText42(r *QRectF, flags int, text string, br *QRectF) { @@ -1200,11 +1200,11 @@ func (this *QPainter) BoundingRect32(rect *QRectF, text string, o *QTextOption) } func (this *QPainter) SetRenderHint2(hint QPainter__RenderHint, on bool) { - C.QPainter_SetRenderHint2(this.h, (C.uintptr_t)(hint), (C.bool)(on)) + C.QPainter_SetRenderHint2(this.h, (C.int)(hint), (C.bool)(on)) } func (this *QPainter) SetRenderHints2(hints int, on bool) { - C.QPainter_SetRenderHints2(this.h, (C.int)(hints), (C.bool)(on)) + C.QPainter_SetRenderHints2(this.h, hints, (C.bool)(on)) } func QPainter_SetRedirected3(device *QPaintDevice, replacement *QPaintDevice, offset *QPoint) { diff --git a/qt/gen_qpainter.h b/qt/gen_qpainter.h index 15a5c62..b510b16 100644 --- a/qt/gen_qpainter.h +++ b/qt/gen_qpainter.h @@ -82,21 +82,21 @@ bool QPainter_Begin(QPainter* self, QPaintDevice* param1); bool QPainter_End(QPainter* self); bool QPainter_IsActive(const QPainter* self); void QPainter_InitFrom(QPainter* self, QPaintDevice* device); -void QPainter_SetCompositionMode(QPainter* self, uintptr_t mode); -uintptr_t QPainter_CompositionMode(const QPainter* self); +void QPainter_SetCompositionMode(QPainter* self, int mode); +int QPainter_CompositionMode(const QPainter* self); QFont* QPainter_Font(const QPainter* self); void QPainter_SetFont(QPainter* self, QFont* f); QFontMetrics* QPainter_FontMetrics(const QPainter* self); QFontInfo* QPainter_FontInfo(const QPainter* self); void QPainter_SetPen(QPainter* self, QColor* color); void QPainter_SetPenWithPen(QPainter* self, QPen* pen); -void QPainter_SetPenWithStyle(QPainter* self, uintptr_t style); +void QPainter_SetPenWithStyle(QPainter* self, int style); QPen* QPainter_Pen(const QPainter* self); void QPainter_SetBrush(QPainter* self, QBrush* brush); -void QPainter_SetBrushWithStyle(QPainter* self, uintptr_t style); +void QPainter_SetBrushWithStyle(QPainter* self, int style); QBrush* QPainter_Brush(const QPainter* self); -void QPainter_SetBackgroundMode(QPainter* self, uintptr_t mode); -uintptr_t QPainter_BackgroundMode(const QPainter* self); +void QPainter_SetBackgroundMode(QPainter* self, int mode); +int QPainter_BackgroundMode(const QPainter* self); QPoint* QPainter_BrushOrigin(const QPainter* self); void QPainter_SetBrushOrigin(QPainter* self, int x, int y); void QPainter_SetBrushOriginWithBrushOrigin(QPainter* self, QPoint* brushOrigin); @@ -230,8 +230,8 @@ void QPainter_DrawImage6(QPainter* self, QRect* r, QImage* image); void QPainter_DrawImage7(QPainter* self, QPointF* p, QImage* image); void QPainter_DrawImage8(QPainter* self, QPoint* p, QImage* image); void QPainter_DrawImage9(QPainter* self, int x, int y, QImage* image); -void QPainter_SetLayoutDirection(QPainter* self, uintptr_t direction); -uintptr_t QPainter_LayoutDirection(const QPainter* self); +void QPainter_SetLayoutDirection(QPainter* self, int direction); +int QPainter_LayoutDirection(const QPainter* self); void QPainter_DrawGlyphRun(QPainter* self, QPointF* position, QGlyphRun* glyphRun); void QPainter_DrawStaticText(QPainter* self, QPointF* topLeftPosition, QStaticText* staticText); void QPainter_DrawStaticText2(QPainter* self, QPoint* topLeftPosition, QStaticText* staticText); @@ -257,42 +257,42 @@ void QPainter_FillRect3(QPainter* self, QRect* param1, QBrush* param2); void QPainter_FillRect4(QPainter* self, QRectF* param1, QColor* color); void QPainter_FillRect5(QPainter* self, int x, int y, int w, int h, QColor* color); void QPainter_FillRect6(QPainter* self, QRect* param1, QColor* color); -void QPainter_FillRect7(QPainter* self, int x, int y, int w, int h, uintptr_t c); -void QPainter_FillRect8(QPainter* self, QRect* r, uintptr_t c); -void QPainter_FillRect9(QPainter* self, QRectF* r, uintptr_t c); -void QPainter_FillRect10(QPainter* self, int x, int y, int w, int h, uintptr_t style); -void QPainter_FillRect11(QPainter* self, QRect* r, uintptr_t style); -void QPainter_FillRect12(QPainter* self, QRectF* r, uintptr_t style); -void QPainter_FillRect13(QPainter* self, int x, int y, int w, int h, uintptr_t preset); -void QPainter_FillRect14(QPainter* self, QRect* r, uintptr_t preset); -void QPainter_FillRect15(QPainter* self, QRectF* r, uintptr_t preset); +void QPainter_FillRect7(QPainter* self, int x, int y, int w, int h, int c); +void QPainter_FillRect8(QPainter* self, QRect* r, int c); +void QPainter_FillRect9(QPainter* self, QRectF* r, int c); +void QPainter_FillRect10(QPainter* self, int x, int y, int w, int h, int style); +void QPainter_FillRect11(QPainter* self, QRect* r, int style); +void QPainter_FillRect12(QPainter* self, QRectF* r, int style); +void QPainter_FillRect13(QPainter* self, int x, int y, int w, int h, int preset); +void QPainter_FillRect14(QPainter* self, QRect* r, int preset); +void QPainter_FillRect15(QPainter* self, QRectF* r, int preset); void QPainter_EraseRect(QPainter* self, QRectF* param1); void QPainter_EraseRect2(QPainter* self, int x, int y, int w, int h); void QPainter_EraseRectWithQRect(QPainter* self, QRect* param1); -void QPainter_SetRenderHint(QPainter* self, uintptr_t hint); +void QPainter_SetRenderHint(QPainter* self, int hint); void QPainter_SetRenderHints(QPainter* self, int hints); int QPainter_RenderHints(const QPainter* self); -bool QPainter_TestRenderHint(const QPainter* self, uintptr_t hint); +bool QPainter_TestRenderHint(const QPainter* self, int hint); QPaintEngine* QPainter_PaintEngine(const QPainter* self); void QPainter_SetRedirected(QPaintDevice* device, QPaintDevice* replacement); QPaintDevice* QPainter_Redirected(QPaintDevice* device); void QPainter_RestoreRedirected(QPaintDevice* device); void QPainter_BeginNativePainting(QPainter* self); void QPainter_EndNativePainting(QPainter* self); -void QPainter_SetClipRect22(QPainter* self, QRectF* param1, uintptr_t op); -void QPainter_SetClipRect23(QPainter* self, QRect* param1, uintptr_t op); -void QPainter_SetClipRect5(QPainter* self, int x, int y, int w, int h, uintptr_t op); -void QPainter_SetClipRegion2(QPainter* self, QRegion* param1, uintptr_t op); -void QPainter_SetClipPath2(QPainter* self, QPainterPath* path, uintptr_t op); +void QPainter_SetClipRect22(QPainter* self, QRectF* param1, int op); +void QPainter_SetClipRect23(QPainter* self, QRect* param1, int op); +void QPainter_SetClipRect5(QPainter* self, int x, int y, int w, int h, int op); +void QPainter_SetClipRegion2(QPainter* self, QRegion* param1, int op); +void QPainter_SetClipPath2(QPainter* self, QPainterPath* path, int op); void QPainter_SetMatrix2(QPainter* self, QMatrix* matrix, bool combine); void QPainter_SetTransform2(QPainter* self, QTransform* transform, bool combine); void QPainter_SetWorldMatrix2(QPainter* self, QMatrix* matrix, bool combine); void QPainter_SetWorldTransform2(QPainter* self, QTransform* matrix, bool combine); -void QPainter_DrawPolygon32(QPainter* self, QPointF* points, int pointCount, uintptr_t fillRule); -void QPainter_DrawPolygon33(QPainter* self, QPoint* points, int pointCount, uintptr_t fillRule); -void QPainter_DrawRoundedRect4(QPainter* self, QRectF* rect, double xRadius, double yRadius, uintptr_t mode); -void QPainter_DrawRoundedRect7(QPainter* self, int x, int y, int w, int h, double xRadius, double yRadius, uintptr_t mode); -void QPainter_DrawRoundedRect42(QPainter* self, QRect* rect, double xRadius, double yRadius, uintptr_t mode); +void QPainter_DrawPolygon32(QPainter* self, QPointF* points, int pointCount, int fillRule); +void QPainter_DrawPolygon33(QPainter* self, QPoint* points, int pointCount, int fillRule); +void QPainter_DrawRoundedRect4(QPainter* self, QRectF* rect, double xRadius, double yRadius, int mode); +void QPainter_DrawRoundedRect7(QPainter* self, int x, int y, int w, int h, double xRadius, double yRadius, int mode); +void QPainter_DrawRoundedRect42(QPainter* self, QRect* rect, double xRadius, double yRadius, int mode); void QPainter_DrawRoundRect22(QPainter* self, QRectF* r, int xround); void QPainter_DrawRoundRect3(QPainter* self, QRectF* r, int xround, int yround); void QPainter_DrawRoundRect5(QPainter* self, int x, int y, int w, int h, int param5); @@ -318,7 +318,7 @@ void QPainter_DrawText43(QPainter* self, QRect* r, int flags, struct miqt_string void QPainter_DrawText72(QPainter* self, int x, int y, int w, int h, int flags, struct miqt_string* text, QRect* br); void QPainter_DrawText32(QPainter* self, QRectF* r, struct miqt_string* text, QTextOption* o); QRectF* QPainter_BoundingRect32(QPainter* self, QRectF* rect, struct miqt_string* text, QTextOption* o); -void QPainter_SetRenderHint2(QPainter* self, uintptr_t hint, bool on); +void QPainter_SetRenderHint2(QPainter* self, int hint, bool on); void QPainter_SetRenderHints2(QPainter* self, int hints, bool on); void QPainter_SetRedirected3(QPaintDevice* device, QPaintDevice* replacement, QPoint* offset); QPaintDevice* QPainter_Redirected2(QPaintDevice* device, QPoint* offset); diff --git a/qt/gen_qpainterpath.cpp b/qt/gen_qpainterpath.cpp index f88525c..ffd6d1a 100644 --- a/qt/gen_qpainterpath.cpp +++ b/qt/gen_qpainterpath.cpp @@ -204,12 +204,12 @@ QRectF* QPainterPath_ControlPointRect(const QPainterPath* self) { return new QRectF(self->controlPointRect()); } -uintptr_t QPainterPath_FillRule(const QPainterPath* self) { +int QPainterPath_FillRule(const QPainterPath* self) { Qt::FillRule _ret = self->fillRule(); - return static_cast(_ret); + return static_cast(_ret); } -void QPainterPath_SetFillRule(QPainterPath* self, uintptr_t fillRule) { +void QPainterPath_SetFillRule(QPainterPath* self, int fillRule) { self->setFillRule(static_cast(fillRule)); } @@ -234,11 +234,13 @@ void QPainterPath_SetElementPositionAt(QPainterPath* self, int i, double x, doub } double QPainterPath_Length(const QPainterPath* self) { - return self->length(); + qreal _ret = self->length(); + return static_cast(_ret); } double QPainterPath_PercentAtLength(const QPainterPath* self, double t) { - return self->percentAtLength(static_cast(t)); + qreal _ret = self->percentAtLength(static_cast(t)); + return static_cast(_ret); } QPointF* QPainterPath_PointAtPercent(const QPainterPath* self, double t) { @@ -246,11 +248,13 @@ QPointF* QPainterPath_PointAtPercent(const QPainterPath* self, double t) { } double QPainterPath_AngleAtPercent(const QPainterPath* self, double t) { - return self->angleAtPercent(static_cast(t)); + qreal _ret = self->angleAtPercent(static_cast(t)); + return static_cast(_ret); } double QPainterPath_SlopeAtPercent(const QPainterPath* self, double t) { - return self->slopeAtPercent(static_cast(t)); + qreal _ret = self->slopeAtPercent(static_cast(t)); + return static_cast(_ret); } bool QPainterPath_IntersectsWithQPainterPath(const QPainterPath* self, QPainterPath* p) { @@ -325,11 +329,11 @@ QPainterPath* QPainterPath_OperatorMinusAssign(QPainterPath* self, QPainterPath* return &_ret; } -void QPainterPath_AddRoundedRect4(QPainterPath* self, QRectF* rect, double xRadius, double yRadius, uintptr_t mode) { +void QPainterPath_AddRoundedRect4(QPainterPath* self, QRectF* rect, double xRadius, double yRadius, int mode) { self->addRoundedRect(*rect, static_cast(xRadius), static_cast(yRadius), static_cast(mode)); } -void QPainterPath_AddRoundedRect7(QPainterPath* self, double x, double y, double w, double h, double xRadius, double yRadius, uintptr_t mode) { +void QPainterPath_AddRoundedRect7(QPainterPath* self, double x, double y, double w, double h, double xRadius, double yRadius, int mode) { self->addRoundedRect(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(xRadius), static_cast(yRadius), static_cast(mode)); } @@ -350,25 +354,26 @@ void QPainterPathStroker_SetWidth(QPainterPathStroker* self, double width) { } double QPainterPathStroker_Width(const QPainterPathStroker* self) { - return self->width(); + qreal _ret = self->width(); + return static_cast(_ret); } -void QPainterPathStroker_SetCapStyle(QPainterPathStroker* self, uintptr_t style) { +void QPainterPathStroker_SetCapStyle(QPainterPathStroker* self, int style) { self->setCapStyle(static_cast(style)); } -uintptr_t QPainterPathStroker_CapStyle(const QPainterPathStroker* self) { +int QPainterPathStroker_CapStyle(const QPainterPathStroker* self) { Qt::PenCapStyle _ret = self->capStyle(); - return static_cast(_ret); + return static_cast(_ret); } -void QPainterPathStroker_SetJoinStyle(QPainterPathStroker* self, uintptr_t style) { +void QPainterPathStroker_SetJoinStyle(QPainterPathStroker* self, int style) { self->setJoinStyle(static_cast(style)); } -uintptr_t QPainterPathStroker_JoinStyle(const QPainterPathStroker* self) { +int QPainterPathStroker_JoinStyle(const QPainterPathStroker* self) { Qt::PenJoinStyle _ret = self->joinStyle(); - return static_cast(_ret); + return static_cast(_ret); } void QPainterPathStroker_SetMiterLimit(QPainterPathStroker* self, double length) { @@ -376,7 +381,8 @@ void QPainterPathStroker_SetMiterLimit(QPainterPathStroker* self, double length) } double QPainterPathStroker_MiterLimit(const QPainterPathStroker* self) { - return self->miterLimit(); + qreal _ret = self->miterLimit(); + return static_cast(_ret); } void QPainterPathStroker_SetCurveThreshold(QPainterPathStroker* self, double threshold) { @@ -384,10 +390,11 @@ void QPainterPathStroker_SetCurveThreshold(QPainterPathStroker* self, double thr } double QPainterPathStroker_CurveThreshold(const QPainterPathStroker* self) { - return self->curveThreshold(); + qreal _ret = self->curveThreshold(); + return static_cast(_ret); } -void QPainterPathStroker_SetDashPattern(QPainterPathStroker* self, uintptr_t dashPattern) { +void QPainterPathStroker_SetDashPattern(QPainterPathStroker* self, int dashPattern) { self->setDashPattern(static_cast(dashPattern)); } @@ -402,7 +409,7 @@ void QPainterPathStroker_SetDashPatternWithDashPattern(QPainterPathStroker* self } struct miqt_array* QPainterPathStroker_DashPattern(const QPainterPathStroker* self) { - QVector _ret = self->dashPattern(); + QVector _ret = self->dashPattern(); // Convert QList<> from C++ memory to manually-managed C memory double* _arr = static_cast(malloc(sizeof(double) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -419,7 +426,8 @@ void QPainterPathStroker_SetDashOffset(QPainterPathStroker* self, double offset) } double QPainterPathStroker_DashOffset(const QPainterPathStroker* self) { - return self->dashOffset(); + qreal _ret = self->dashOffset(); + return static_cast(_ret); } QPainterPath* QPainterPathStroker_CreateStroke(const QPainterPathStroker* self, QPainterPath* path) { diff --git a/qt/gen_qpainterpath.go b/qt/gen_qpainterpath.go index dc6eaa2..da826a6 100644 --- a/qt/gen_qpainterpath.go +++ b/qt/gen_qpainterpath.go @@ -262,7 +262,7 @@ func (this *QPainterPath) FillRule() FillRule { } func (this *QPainterPath) SetFillRule(fillRule FillRule) { - C.QPainterPath_SetFillRule(this.h, (C.uintptr_t)(fillRule)) + C.QPainterPath_SetFillRule(this.h, (C.int)(fillRule)) } func (this *QPainterPath) IsEmpty() bool { @@ -410,11 +410,11 @@ func (this *QPainterPath) OperatorMinusAssign(other *QPainterPath) *QPainterPath } func (this *QPainterPath) AddRoundedRect4(rect *QRectF, xRadius float64, yRadius float64, mode SizeMode) { - C.QPainterPath_AddRoundedRect4(this.h, rect.cPointer(), (C.double)(xRadius), (C.double)(yRadius), (C.uintptr_t)(mode)) + C.QPainterPath_AddRoundedRect4(this.h, rect.cPointer(), (C.double)(xRadius), (C.double)(yRadius), (C.int)(mode)) } func (this *QPainterPath) AddRoundedRect7(x float64, y float64, w float64, h float64, xRadius float64, yRadius float64, mode SizeMode) { - C.QPainterPath_AddRoundedRect7(this.h, (C.double)(x), (C.double)(y), (C.double)(w), (C.double)(h), (C.double)(xRadius), (C.double)(yRadius), (C.uintptr_t)(mode)) + C.QPainterPath_AddRoundedRect7(this.h, (C.double)(x), (C.double)(y), (C.double)(w), (C.double)(h), (C.double)(xRadius), (C.double)(yRadius), (C.int)(mode)) } // Delete this object from C++ memory. @@ -474,7 +474,7 @@ func (this *QPainterPathStroker) Width() float64 { } func (this *QPainterPathStroker) SetCapStyle(style PenCapStyle) { - C.QPainterPathStroker_SetCapStyle(this.h, (C.uintptr_t)(style)) + C.QPainterPathStroker_SetCapStyle(this.h, (C.int)(style)) } func (this *QPainterPathStroker) CapStyle() PenCapStyle { @@ -482,7 +482,7 @@ func (this *QPainterPathStroker) CapStyle() PenCapStyle { } func (this *QPainterPathStroker) SetJoinStyle(style PenJoinStyle) { - C.QPainterPathStroker_SetJoinStyle(this.h, (C.uintptr_t)(style)) + C.QPainterPathStroker_SetJoinStyle(this.h, (C.int)(style)) } func (this *QPainterPathStroker) JoinStyle() PenJoinStyle { @@ -506,7 +506,7 @@ func (this *QPainterPathStroker) CurveThreshold() float64 { } func (this *QPainterPathStroker) SetDashPattern(dashPattern PenStyle) { - C.QPainterPathStroker_SetDashPattern(this.h, (C.uintptr_t)(dashPattern)) + C.QPainterPathStroker_SetDashPattern(this.h, (C.int)(dashPattern)) } func (this *QPainterPathStroker) SetDashPatternWithDashPattern(dashPattern []float64) { diff --git a/qt/gen_qpainterpath.h b/qt/gen_qpainterpath.h index bdfa167..7b46c58 100644 --- a/qt/gen_qpainterpath.h +++ b/qt/gen_qpainterpath.h @@ -84,8 +84,8 @@ QPainterPath* QPainterPath_Translated(const QPainterPath* self, double dx, doubl QPainterPath* QPainterPath_TranslatedWithOffset(const QPainterPath* self, QPointF* offset); QRectF* QPainterPath_BoundingRect(const QPainterPath* self); QRectF* QPainterPath_ControlPointRect(const QPainterPath* self); -uintptr_t QPainterPath_FillRule(const QPainterPath* self); -void QPainterPath_SetFillRule(QPainterPath* self, uintptr_t fillRule); +int QPainterPath_FillRule(const QPainterPath* self); +void QPainterPath_SetFillRule(QPainterPath* self, int fillRule); bool QPainterPath_IsEmpty(const QPainterPath* self); QPainterPath* QPainterPath_ToReversed(const QPainterPath* self); int QPainterPath_ElementCount(const QPainterPath* self); @@ -113,23 +113,23 @@ void QPainterPath_OperatorBitwiseAndAssign(QPainterPath* self, QPainterPath* oth void QPainterPath_OperatorBitwiseOrAssign(QPainterPath* self, QPainterPath* other); QPainterPath* QPainterPath_OperatorPlusAssign(QPainterPath* self, QPainterPath* other); QPainterPath* QPainterPath_OperatorMinusAssign(QPainterPath* self, QPainterPath* other); -void QPainterPath_AddRoundedRect4(QPainterPath* self, QRectF* rect, double xRadius, double yRadius, uintptr_t mode); -void QPainterPath_AddRoundedRect7(QPainterPath* self, double x, double y, double w, double h, double xRadius, double yRadius, uintptr_t mode); +void QPainterPath_AddRoundedRect4(QPainterPath* self, QRectF* rect, double xRadius, double yRadius, int mode); +void QPainterPath_AddRoundedRect7(QPainterPath* self, double x, double y, double w, double h, double xRadius, double yRadius, int mode); void QPainterPath_Delete(QPainterPath* self); QPainterPathStroker* QPainterPathStroker_new(); QPainterPathStroker* QPainterPathStroker_new2(QPen* pen); void QPainterPathStroker_SetWidth(QPainterPathStroker* self, double width); double QPainterPathStroker_Width(const QPainterPathStroker* self); -void QPainterPathStroker_SetCapStyle(QPainterPathStroker* self, uintptr_t style); -uintptr_t QPainterPathStroker_CapStyle(const QPainterPathStroker* self); -void QPainterPathStroker_SetJoinStyle(QPainterPathStroker* self, uintptr_t style); -uintptr_t QPainterPathStroker_JoinStyle(const QPainterPathStroker* self); +void QPainterPathStroker_SetCapStyle(QPainterPathStroker* self, int style); +int QPainterPathStroker_CapStyle(const QPainterPathStroker* self); +void QPainterPathStroker_SetJoinStyle(QPainterPathStroker* self, int style); +int QPainterPathStroker_JoinStyle(const QPainterPathStroker* self); void QPainterPathStroker_SetMiterLimit(QPainterPathStroker* self, double length); double QPainterPathStroker_MiterLimit(const QPainterPathStroker* self); void QPainterPathStroker_SetCurveThreshold(QPainterPathStroker* self, double threshold); double QPainterPathStroker_CurveThreshold(const QPainterPathStroker* self); -void QPainterPathStroker_SetDashPattern(QPainterPathStroker* self, uintptr_t dashPattern); +void QPainterPathStroker_SetDashPattern(QPainterPathStroker* self, int dashPattern); void QPainterPathStroker_SetDashPatternWithDashPattern(QPainterPathStroker* self, struct miqt_array* /* of double */ dashPattern); struct miqt_array* QPainterPathStroker_DashPattern(const QPainterPathStroker* self); void QPainterPathStroker_SetDashOffset(QPainterPathStroker* self, double offset); diff --git a/qt/gen_qpalette.cpp b/qt/gen_qpalette.cpp index 8e6be86..9ac6a34 100644 --- a/qt/gen_qpalette.cpp +++ b/qt/gen_qpalette.cpp @@ -13,7 +13,7 @@ QPalette* QPalette_new2(QColor* button) { return new QPalette(*button); } -QPalette* QPalette_new3(uintptr_t button) { +QPalette* QPalette_new3(int button) { return new QPalette(static_cast(button)); } @@ -41,62 +41,62 @@ void QPalette_Swap(QPalette* self, QPalette* other) { self->swap(*other); } -uintptr_t QPalette_CurrentColorGroup(const QPalette* self) { +int QPalette_CurrentColorGroup(const QPalette* self) { QPalette::ColorGroup _ret = self->currentColorGroup(); - return static_cast(_ret); + return static_cast(_ret); } -void QPalette_SetCurrentColorGroup(QPalette* self, uintptr_t cg) { +void QPalette_SetCurrentColorGroup(QPalette* self, int cg) { self->setCurrentColorGroup(static_cast(cg)); } -QColor* QPalette_Color(const QPalette* self, uintptr_t cg, uintptr_t cr) { +QColor* QPalette_Color(const QPalette* self, int cg, int cr) { const QColor& _ret = self->color(static_cast(cg), static_cast(cr)); // Cast returned reference into pointer return const_cast(&_ret); } -QBrush* QPalette_Brush(const QPalette* self, uintptr_t cg, uintptr_t cr) { +QBrush* QPalette_Brush(const QPalette* self, int cg, int cr) { const QBrush& _ret = self->brush(static_cast(cg), static_cast(cr)); // Cast returned reference into pointer return const_cast(&_ret); } -void QPalette_SetColor(QPalette* self, uintptr_t cg, uintptr_t cr, QColor* color) { +void QPalette_SetColor(QPalette* self, int cg, int cr, QColor* color) { self->setColor(static_cast(cg), static_cast(cr), *color); } -void QPalette_SetColor2(QPalette* self, uintptr_t cr, QColor* color) { +void QPalette_SetColor2(QPalette* self, int cr, QColor* color) { self->setColor(static_cast(cr), *color); } -void QPalette_SetBrush(QPalette* self, uintptr_t cr, QBrush* brush) { +void QPalette_SetBrush(QPalette* self, int cr, QBrush* brush) { self->setBrush(static_cast(cr), *brush); } -bool QPalette_IsBrushSet(const QPalette* self, uintptr_t cg, uintptr_t cr) { +bool QPalette_IsBrushSet(const QPalette* self, int cg, int cr) { return self->isBrushSet(static_cast(cg), static_cast(cr)); } -void QPalette_SetBrush2(QPalette* self, uintptr_t cg, uintptr_t cr, QBrush* brush) { +void QPalette_SetBrush2(QPalette* self, int cg, int cr, QBrush* brush) { self->setBrush(static_cast(cg), static_cast(cr), *brush); } -void QPalette_SetColorGroup(QPalette* self, uintptr_t cr, QBrush* windowText, QBrush* button, QBrush* light, QBrush* dark, QBrush* mid, QBrush* text, QBrush* bright_text, QBrush* base, QBrush* window) { +void QPalette_SetColorGroup(QPalette* self, int cr, QBrush* windowText, QBrush* button, QBrush* light, QBrush* dark, QBrush* mid, QBrush* text, QBrush* bright_text, QBrush* base, QBrush* window) { self->setColorGroup(static_cast(cr), *windowText, *button, *light, *dark, *mid, *text, *bright_text, *base, *window); } -bool QPalette_IsEqual(const QPalette* self, uintptr_t cr1, uintptr_t cr2) { +bool QPalette_IsEqual(const QPalette* self, int cr1, int cr2) { return self->isEqual(static_cast(cr1), static_cast(cr2)); } -QColor* QPalette_ColorWithCr(const QPalette* self, uintptr_t cr) { +QColor* QPalette_ColorWithCr(const QPalette* self, int cr) { const QColor& _ret = self->color(static_cast(cr)); // Cast returned reference into pointer return const_cast(&_ret); } -QBrush* QPalette_BrushWithCr(const QPalette* self, uintptr_t cr) { +QBrush* QPalette_BrushWithCr(const QPalette* self, int cr) { const QBrush& _ret = self->brush(static_cast(cr)); // Cast returned reference into pointer return const_cast(&_ret); @@ -247,7 +247,8 @@ bool QPalette_IsCopyOf(const QPalette* self, QPalette* p) { } long long QPalette_CacheKey(const QPalette* self) { - return self->cacheKey(); + qint64 _ret = self->cacheKey(); + return static_cast(_ret); } QPalette* QPalette_Resolve(const QPalette* self, QPalette* param1) { @@ -255,7 +256,8 @@ QPalette* QPalette_Resolve(const QPalette* self, QPalette* param1) { } unsigned int QPalette_Resolve2(const QPalette* self) { - return self->resolve(); + uint _ret = self->resolve(); + return static_cast(_ret); } void QPalette_ResolveWithMask(QPalette* self, unsigned int mask) { diff --git a/qt/gen_qpalette.go b/qt/gen_qpalette.go index 08f2056..ce80797 100644 --- a/qt/gen_qpalette.go +++ b/qt/gen_qpalette.go @@ -90,7 +90,7 @@ func NewQPalette2(button *QColor) *QPalette { // NewQPalette3 constructs a new QPalette object. func NewQPalette3(button GlobalColor) *QPalette { - ret := C.QPalette_new3((C.uintptr_t)(button)) + ret := C.QPalette_new3((C.int)(button)) return newQPalette(ret) } @@ -131,51 +131,51 @@ func (this *QPalette) CurrentColorGroup() QPalette__ColorGroup { } func (this *QPalette) SetCurrentColorGroup(cg QPalette__ColorGroup) { - C.QPalette_SetCurrentColorGroup(this.h, (C.uintptr_t)(cg)) + C.QPalette_SetCurrentColorGroup(this.h, (C.int)(cg)) } func (this *QPalette) Color(cg QPalette__ColorGroup, cr QPalette__ColorRole) *QColor { - return newQColor_U(unsafe.Pointer(C.QPalette_Color(this.h, (C.uintptr_t)(cg), (C.uintptr_t)(cr)))) + return newQColor_U(unsafe.Pointer(C.QPalette_Color(this.h, (C.int)(cg), (C.int)(cr)))) } func (this *QPalette) Brush(cg QPalette__ColorGroup, cr QPalette__ColorRole) *QBrush { - return newQBrush_U(unsafe.Pointer(C.QPalette_Brush(this.h, (C.uintptr_t)(cg), (C.uintptr_t)(cr)))) + return newQBrush_U(unsafe.Pointer(C.QPalette_Brush(this.h, (C.int)(cg), (C.int)(cr)))) } func (this *QPalette) SetColor(cg QPalette__ColorGroup, cr QPalette__ColorRole, color *QColor) { - C.QPalette_SetColor(this.h, (C.uintptr_t)(cg), (C.uintptr_t)(cr), color.cPointer()) + C.QPalette_SetColor(this.h, (C.int)(cg), (C.int)(cr), color.cPointer()) } func (this *QPalette) SetColor2(cr QPalette__ColorRole, color *QColor) { - C.QPalette_SetColor2(this.h, (C.uintptr_t)(cr), color.cPointer()) + C.QPalette_SetColor2(this.h, (C.int)(cr), color.cPointer()) } func (this *QPalette) SetBrush(cr QPalette__ColorRole, brush *QBrush) { - C.QPalette_SetBrush(this.h, (C.uintptr_t)(cr), brush.cPointer()) + C.QPalette_SetBrush(this.h, (C.int)(cr), brush.cPointer()) } func (this *QPalette) IsBrushSet(cg QPalette__ColorGroup, cr QPalette__ColorRole) bool { - return (bool)(C.QPalette_IsBrushSet(this.h, (C.uintptr_t)(cg), (C.uintptr_t)(cr))) + return (bool)(C.QPalette_IsBrushSet(this.h, (C.int)(cg), (C.int)(cr))) } func (this *QPalette) SetBrush2(cg QPalette__ColorGroup, cr QPalette__ColorRole, brush *QBrush) { - C.QPalette_SetBrush2(this.h, (C.uintptr_t)(cg), (C.uintptr_t)(cr), brush.cPointer()) + C.QPalette_SetBrush2(this.h, (C.int)(cg), (C.int)(cr), brush.cPointer()) } func (this *QPalette) SetColorGroup(cr QPalette__ColorGroup, windowText *QBrush, button *QBrush, light *QBrush, dark *QBrush, mid *QBrush, text *QBrush, bright_text *QBrush, base *QBrush, window *QBrush) { - C.QPalette_SetColorGroup(this.h, (C.uintptr_t)(cr), windowText.cPointer(), button.cPointer(), light.cPointer(), dark.cPointer(), mid.cPointer(), text.cPointer(), bright_text.cPointer(), base.cPointer(), window.cPointer()) + C.QPalette_SetColorGroup(this.h, (C.int)(cr), windowText.cPointer(), button.cPointer(), light.cPointer(), dark.cPointer(), mid.cPointer(), text.cPointer(), bright_text.cPointer(), base.cPointer(), window.cPointer()) } func (this *QPalette) IsEqual(cr1 QPalette__ColorGroup, cr2 QPalette__ColorGroup) bool { - return (bool)(C.QPalette_IsEqual(this.h, (C.uintptr_t)(cr1), (C.uintptr_t)(cr2))) + return (bool)(C.QPalette_IsEqual(this.h, (C.int)(cr1), (C.int)(cr2))) } func (this *QPalette) ColorWithCr(cr QPalette__ColorRole) *QColor { - return newQColor_U(unsafe.Pointer(C.QPalette_ColorWithCr(this.h, (C.uintptr_t)(cr)))) + return newQColor_U(unsafe.Pointer(C.QPalette_ColorWithCr(this.h, (C.int)(cr)))) } func (this *QPalette) BrushWithCr(cr QPalette__ColorRole) *QBrush { - return newQBrush_U(unsafe.Pointer(C.QPalette_BrushWithCr(this.h, (C.uintptr_t)(cr)))) + return newQBrush_U(unsafe.Pointer(C.QPalette_BrushWithCr(this.h, (C.int)(cr)))) } func (this *QPalette) WindowText() *QBrush { diff --git a/qt/gen_qpalette.h b/qt/gen_qpalette.h index 28b5d3e..0486308 100644 --- a/qt/gen_qpalette.h +++ b/qt/gen_qpalette.h @@ -25,26 +25,26 @@ typedef struct QPalette QPalette; QPalette* QPalette_new(); QPalette* QPalette_new2(QColor* button); -QPalette* QPalette_new3(uintptr_t button); +QPalette* QPalette_new3(int button); QPalette* QPalette_new4(QColor* button, QColor* window); QPalette* QPalette_new5(QBrush* windowText, QBrush* button, QBrush* light, QBrush* dark, QBrush* mid, QBrush* text, QBrush* bright_text, QBrush* base, QBrush* window); QPalette* QPalette_new6(QColor* windowText, QColor* window, QColor* light, QColor* dark, QColor* mid, QColor* text, QColor* base); QPalette* QPalette_new7(QPalette* palette); void QPalette_OperatorAssign(QPalette* self, QPalette* palette); void QPalette_Swap(QPalette* self, QPalette* other); -uintptr_t QPalette_CurrentColorGroup(const QPalette* self); -void QPalette_SetCurrentColorGroup(QPalette* self, uintptr_t cg); -QColor* QPalette_Color(const QPalette* self, uintptr_t cg, uintptr_t cr); -QBrush* QPalette_Brush(const QPalette* self, uintptr_t cg, uintptr_t cr); -void QPalette_SetColor(QPalette* self, uintptr_t cg, uintptr_t cr, QColor* color); -void QPalette_SetColor2(QPalette* self, uintptr_t cr, QColor* color); -void QPalette_SetBrush(QPalette* self, uintptr_t cr, QBrush* brush); -bool QPalette_IsBrushSet(const QPalette* self, uintptr_t cg, uintptr_t cr); -void QPalette_SetBrush2(QPalette* self, uintptr_t cg, uintptr_t cr, QBrush* brush); -void QPalette_SetColorGroup(QPalette* self, uintptr_t cr, QBrush* windowText, QBrush* button, QBrush* light, QBrush* dark, QBrush* mid, QBrush* text, QBrush* bright_text, QBrush* base, QBrush* window); -bool QPalette_IsEqual(const QPalette* self, uintptr_t cr1, uintptr_t cr2); -QColor* QPalette_ColorWithCr(const QPalette* self, uintptr_t cr); -QBrush* QPalette_BrushWithCr(const QPalette* self, uintptr_t cr); +int QPalette_CurrentColorGroup(const QPalette* self); +void QPalette_SetCurrentColorGroup(QPalette* self, int cg); +QColor* QPalette_Color(const QPalette* self, int cg, int cr); +QBrush* QPalette_Brush(const QPalette* self, int cg, int cr); +void QPalette_SetColor(QPalette* self, int cg, int cr, QColor* color); +void QPalette_SetColor2(QPalette* self, int cr, QColor* color); +void QPalette_SetBrush(QPalette* self, int cr, QBrush* brush); +bool QPalette_IsBrushSet(const QPalette* self, int cg, int cr); +void QPalette_SetBrush2(QPalette* self, int cg, int cr, QBrush* brush); +void QPalette_SetColorGroup(QPalette* self, int cr, QBrush* windowText, QBrush* button, QBrush* light, QBrush* dark, QBrush* mid, QBrush* text, QBrush* bright_text, QBrush* base, QBrush* window); +bool QPalette_IsEqual(const QPalette* self, int cr1, int cr2); +QColor* QPalette_ColorWithCr(const QPalette* self, int cr); +QBrush* QPalette_BrushWithCr(const QPalette* self, int cr); QBrush* QPalette_WindowText(const QPalette* self); QBrush* QPalette_Button(const QPalette* self); QBrush* QPalette_Light(const QPalette* self); diff --git a/qt/gen_qpdfwriter.cpp b/qt/gen_qpdfwriter.cpp index 8570c22..12ea26e 100644 --- a/qt/gen_qpdfwriter.cpp +++ b/qt/gen_qpdfwriter.cpp @@ -38,13 +38,13 @@ struct miqt_string* QPdfWriter_TrUtf8(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -void QPdfWriter_SetPdfVersion(QPdfWriter* self, uintptr_t version) { +void QPdfWriter_SetPdfVersion(QPdfWriter* self, int version) { self->setPdfVersion(static_cast(version)); } -uintptr_t QPdfWriter_PdfVersion(const QPdfWriter* self) { +int QPdfWriter_PdfVersion(const QPdfWriter* self) { QPagedPaintDevice::PdfVersion _ret = self->pdfVersion(); - return static_cast(_ret); + return static_cast(_ret); } struct miqt_string* QPdfWriter_Title(const QPdfWriter* self) { @@ -96,7 +96,7 @@ void QPdfWriter_AddFileAttachment(QPdfWriter* self, struct miqt_string* fileName self->addFileAttachment(fileName_QString, *data); } -void QPdfWriter_SetPageSize(QPdfWriter* self, uintptr_t size) { +void QPdfWriter_SetPageSize(QPdfWriter* self, int size) { self->setPageSize(static_cast(size)); } diff --git a/qt/gen_qpdfwriter.go b/qt/gen_qpdfwriter.go index 241c962..fab4869 100644 --- a/qt/gen_qpdfwriter.go +++ b/qt/gen_qpdfwriter.go @@ -74,7 +74,7 @@ func QPdfWriter_TrUtf8(s string) string { } func (this *QPdfWriter) SetPdfVersion(version QPagedPaintDevice__PdfVersion) { - C.QPdfWriter_SetPdfVersion(this.h, (C.uintptr_t)(version)) + C.QPdfWriter_SetPdfVersion(this.h, (C.int)(version)) } func (this *QPdfWriter) PdfVersion() QPagedPaintDevice__PdfVersion { @@ -137,7 +137,7 @@ func (this *QPdfWriter) AddFileAttachment(fileName string, data *QByteArray) { } func (this *QPdfWriter) SetPageSize(size QPagedPaintDevice__PageSize) { - C.QPdfWriter_SetPageSize(this.h, (C.uintptr_t)(size)) + C.QPdfWriter_SetPageSize(this.h, (C.int)(size)) } func (this *QPdfWriter) SetPageSizeMM(size *QSizeF) { diff --git a/qt/gen_qpdfwriter.h b/qt/gen_qpdfwriter.h index d0e957d..81d9208 100644 --- a/qt/gen_qpdfwriter.h +++ b/qt/gen_qpdfwriter.h @@ -38,8 +38,8 @@ QPdfWriter* QPdfWriter_new2(QIODevice* device); QMetaObject* QPdfWriter_MetaObject(const QPdfWriter* self); struct miqt_string* QPdfWriter_Tr(const char* s); struct miqt_string* QPdfWriter_TrUtf8(const char* s); -void QPdfWriter_SetPdfVersion(QPdfWriter* self, uintptr_t version); -uintptr_t QPdfWriter_PdfVersion(const QPdfWriter* self); +void QPdfWriter_SetPdfVersion(QPdfWriter* self, int version); +int QPdfWriter_PdfVersion(const QPdfWriter* self); struct miqt_string* QPdfWriter_Title(const QPdfWriter* self); void QPdfWriter_SetTitle(QPdfWriter* self, struct miqt_string* title); struct miqt_string* QPdfWriter_Creator(const QPdfWriter* self); @@ -50,7 +50,7 @@ int QPdfWriter_Resolution(const QPdfWriter* self); void QPdfWriter_SetDocumentXmpMetadata(QPdfWriter* self, QByteArray* xmpMetadata); QByteArray* QPdfWriter_DocumentXmpMetadata(const QPdfWriter* self); void QPdfWriter_AddFileAttachment(QPdfWriter* self, struct miqt_string* fileName, QByteArray* data); -void QPdfWriter_SetPageSize(QPdfWriter* self, uintptr_t size); +void QPdfWriter_SetPageSize(QPdfWriter* self, int size); void QPdfWriter_SetPageSizeMM(QPdfWriter* self, QSizeF* size); void QPdfWriter_SetMargins(QPdfWriter* self, QPagedPaintDevice__Margins* m); struct miqt_string* QPdfWriter_Tr2(const char* s, const char* c); diff --git a/qt/gen_qpen.cpp b/qt/gen_qpen.cpp index 9fea8ae..46c4750 100644 --- a/qt/gen_qpen.cpp +++ b/qt/gen_qpen.cpp @@ -10,7 +10,7 @@ QPen* QPen_new() { return new QPen(); } -QPen* QPen_new2(uintptr_t param1) { +QPen* QPen_new2(int param1) { return new QPen(static_cast(param1)); } @@ -26,15 +26,15 @@ QPen* QPen_new5(QPen* pen) { return new QPen(*pen); } -QPen* QPen_new6(QBrush* brush, double width, uintptr_t s) { +QPen* QPen_new6(QBrush* brush, double width, int s) { return new QPen(*brush, static_cast(width), static_cast(s)); } -QPen* QPen_new7(QBrush* brush, double width, uintptr_t s, uintptr_t c) { +QPen* QPen_new7(QBrush* brush, double width, int s, int c) { return new QPen(*brush, static_cast(width), static_cast(s), static_cast(c)); } -QPen* QPen_new8(QBrush* brush, double width, uintptr_t s, uintptr_t c, uintptr_t j) { +QPen* QPen_new8(QBrush* brush, double width, int s, int c, int j) { return new QPen(*brush, static_cast(width), static_cast(s), static_cast(c), static_cast(j)); } @@ -46,17 +46,17 @@ void QPen_Swap(QPen* self, QPen* other) { self->swap(*other); } -uintptr_t QPen_Style(const QPen* self) { +int QPen_Style(const QPen* self) { Qt::PenStyle _ret = self->style(); - return static_cast(_ret); + return static_cast(_ret); } -void QPen_SetStyle(QPen* self, uintptr_t style) { +void QPen_SetStyle(QPen* self, int style) { self->setStyle(static_cast(style)); } struct miqt_array* QPen_DashPattern(const QPen* self) { - QVector _ret = self->dashPattern(); + QVector _ret = self->dashPattern(); // Convert QList<> from C++ memory to manually-managed C memory double* _arr = static_cast(malloc(sizeof(double) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -79,7 +79,8 @@ void QPen_SetDashPattern(QPen* self, struct miqt_array* /* of double */ pattern) } double QPen_DashOffset(const QPen* self) { - return self->dashOffset(); + qreal _ret = self->dashOffset(); + return static_cast(_ret); } void QPen_SetDashOffset(QPen* self, double doffset) { @@ -87,7 +88,8 @@ void QPen_SetDashOffset(QPen* self, double doffset) { } double QPen_MiterLimit(const QPen* self) { - return self->miterLimit(); + qreal _ret = self->miterLimit(); + return static_cast(_ret); } void QPen_SetMiterLimit(QPen* self, double limit) { @@ -95,7 +97,8 @@ void QPen_SetMiterLimit(QPen* self, double limit) { } double QPen_WidthF(const QPen* self) { - return self->widthF(); + qreal _ret = self->widthF(); + return static_cast(_ret); } void QPen_SetWidthF(QPen* self, double width) { @@ -130,21 +133,21 @@ bool QPen_IsSolid(const QPen* self) { return self->isSolid(); } -uintptr_t QPen_CapStyle(const QPen* self) { +int QPen_CapStyle(const QPen* self) { Qt::PenCapStyle _ret = self->capStyle(); - return static_cast(_ret); + return static_cast(_ret); } -void QPen_SetCapStyle(QPen* self, uintptr_t pcs) { +void QPen_SetCapStyle(QPen* self, int pcs) { self->setCapStyle(static_cast(pcs)); } -uintptr_t QPen_JoinStyle(const QPen* self) { +int QPen_JoinStyle(const QPen* self) { Qt::PenJoinStyle _ret = self->joinStyle(); - return static_cast(_ret); + return static_cast(_ret); } -void QPen_SetJoinStyle(QPen* self, uintptr_t pcs) { +void QPen_SetJoinStyle(QPen* self, int pcs) { self->setJoinStyle(static_cast(pcs)); } diff --git a/qt/gen_qpen.go b/qt/gen_qpen.go index 954c793..0e6fa08 100644 --- a/qt/gen_qpen.go +++ b/qt/gen_qpen.go @@ -43,7 +43,7 @@ func NewQPen() *QPen { // NewQPen2 constructs a new QPen object. func NewQPen2(param1 PenStyle) *QPen { - ret := C.QPen_new2((C.uintptr_t)(param1)) + ret := C.QPen_new2((C.int)(param1)) return newQPen(ret) } @@ -67,19 +67,19 @@ func NewQPen5(pen *QPen) *QPen { // NewQPen6 constructs a new QPen object. func NewQPen6(brush *QBrush, width float64, s PenStyle) *QPen { - ret := C.QPen_new6(brush.cPointer(), (C.double)(width), (C.uintptr_t)(s)) + ret := C.QPen_new6(brush.cPointer(), (C.double)(width), (C.int)(s)) return newQPen(ret) } // NewQPen7 constructs a new QPen object. func NewQPen7(brush *QBrush, width float64, s PenStyle, c PenCapStyle) *QPen { - ret := C.QPen_new7(brush.cPointer(), (C.double)(width), (C.uintptr_t)(s), (C.uintptr_t)(c)) + ret := C.QPen_new7(brush.cPointer(), (C.double)(width), (C.int)(s), (C.int)(c)) return newQPen(ret) } // NewQPen8 constructs a new QPen object. func NewQPen8(brush *QBrush, width float64, s PenStyle, c PenCapStyle, j PenJoinStyle) *QPen { - ret := C.QPen_new8(brush.cPointer(), (C.double)(width), (C.uintptr_t)(s), (C.uintptr_t)(c), (C.uintptr_t)(j)) + ret := C.QPen_new8(brush.cPointer(), (C.double)(width), (C.int)(s), (C.int)(c), (C.int)(j)) return newQPen(ret) } @@ -96,7 +96,7 @@ func (this *QPen) Style() PenStyle { } func (this *QPen) SetStyle(style PenStyle) { - C.QPen_SetStyle(this.h, (C.uintptr_t)(style)) + C.QPen_SetStyle(this.h, (C.int)(style)) } func (this *QPen) DashPattern() []float64 { @@ -185,7 +185,7 @@ func (this *QPen) CapStyle() PenCapStyle { } func (this *QPen) SetCapStyle(pcs PenCapStyle) { - C.QPen_SetCapStyle(this.h, (C.uintptr_t)(pcs)) + C.QPen_SetCapStyle(this.h, (C.int)(pcs)) } func (this *QPen) JoinStyle() PenJoinStyle { @@ -193,7 +193,7 @@ func (this *QPen) JoinStyle() PenJoinStyle { } func (this *QPen) SetJoinStyle(pcs PenJoinStyle) { - C.QPen_SetJoinStyle(this.h, (C.uintptr_t)(pcs)) + C.QPen_SetJoinStyle(this.h, (C.int)(pcs)) } func (this *QPen) IsCosmetic() bool { diff --git a/qt/gen_qpen.h b/qt/gen_qpen.h index 55d1240..e0af9c4 100644 --- a/qt/gen_qpen.h +++ b/qt/gen_qpen.h @@ -24,17 +24,17 @@ typedef struct QPen QPen; #endif QPen* QPen_new(); -QPen* QPen_new2(uintptr_t param1); +QPen* QPen_new2(int param1); QPen* QPen_new3(QColor* color); QPen* QPen_new4(QBrush* brush, double width); QPen* QPen_new5(QPen* pen); -QPen* QPen_new6(QBrush* brush, double width, uintptr_t s); -QPen* QPen_new7(QBrush* brush, double width, uintptr_t s, uintptr_t c); -QPen* QPen_new8(QBrush* brush, double width, uintptr_t s, uintptr_t c, uintptr_t j); +QPen* QPen_new6(QBrush* brush, double width, int s); +QPen* QPen_new7(QBrush* brush, double width, int s, int c); +QPen* QPen_new8(QBrush* brush, double width, int s, int c, int j); void QPen_OperatorAssign(QPen* self, QPen* pen); void QPen_Swap(QPen* self, QPen* other); -uintptr_t QPen_Style(const QPen* self); -void QPen_SetStyle(QPen* self, uintptr_t style); +int QPen_Style(const QPen* self); +void QPen_SetStyle(QPen* self, int style); struct miqt_array* QPen_DashPattern(const QPen* self); void QPen_SetDashPattern(QPen* self, struct miqt_array* /* of double */ pattern); double QPen_DashOffset(const QPen* self); @@ -50,10 +50,10 @@ void QPen_SetColor(QPen* self, QColor* color); QBrush* QPen_Brush(const QPen* self); void QPen_SetBrush(QPen* self, QBrush* brush); bool QPen_IsSolid(const QPen* self); -uintptr_t QPen_CapStyle(const QPen* self); -void QPen_SetCapStyle(QPen* self, uintptr_t pcs); -uintptr_t QPen_JoinStyle(const QPen* self); -void QPen_SetJoinStyle(QPen* self, uintptr_t pcs); +int QPen_CapStyle(const QPen* self); +void QPen_SetCapStyle(QPen* self, int pcs); +int QPen_JoinStyle(const QPen* self); +void QPen_SetJoinStyle(QPen* self, int pcs); bool QPen_IsCosmetic(const QPen* self); void QPen_SetCosmetic(QPen* self, bool cosmetic); bool QPen_OperatorEqual(const QPen* self, QPen* p); diff --git a/qt/gen_qpicture.cpp b/qt/gen_qpicture.cpp index 5b4f536..d2a060a 100644 --- a/qt/gen_qpicture.cpp +++ b/qt/gen_qpicture.cpp @@ -34,7 +34,8 @@ int QPicture_DevType(const QPicture* self) { } unsigned int QPicture_Size(const QPicture* self) { - return self->size(); + uint _ret = self->size(); + return static_cast(_ret); } const char* QPicture_Data(const QPicture* self) { diff --git a/qt/gen_qpixelformat.cpp b/qt/gen_qpixelformat.cpp index ad9ee46..64e8c9b 100644 --- a/qt/gen_qpixelformat.cpp +++ b/qt/gen_qpixelformat.cpp @@ -7,7 +7,7 @@ QPixelFormat* QPixelFormat_new() { return new QPixelFormat(); } -QPixelFormat* QPixelFormat_new2(uintptr_t colorModel, unsigned char firstSize, unsigned char secondSize, unsigned char thirdSize, unsigned char fourthSize, unsigned char fifthSize, unsigned char alphaSize, uintptr_t alphaUsage, uintptr_t alphaPosition, uintptr_t premultiplied, uintptr_t typeInterpretation) { +QPixelFormat* QPixelFormat_new2(int colorModel, unsigned char firstSize, unsigned char secondSize, unsigned char thirdSize, unsigned char fourthSize, unsigned char fifthSize, unsigned char alphaSize, int alphaUsage, int alphaPosition, int premultiplied, int typeInterpretation) { return new QPixelFormat(static_cast(colorModel), static_cast(firstSize), static_cast(secondSize), static_cast(thirdSize), static_cast(fourthSize), static_cast(fifthSize), static_cast(alphaSize), static_cast(alphaUsage), static_cast(alphaPosition), static_cast(premultiplied), static_cast(typeInterpretation)); } @@ -15,107 +15,122 @@ QPixelFormat* QPixelFormat_new3(QPixelFormat* param1) { return new QPixelFormat(*param1); } -QPixelFormat* QPixelFormat_new4(uintptr_t colorModel, unsigned char firstSize, unsigned char secondSize, unsigned char thirdSize, unsigned char fourthSize, unsigned char fifthSize, unsigned char alphaSize, uintptr_t alphaUsage, uintptr_t alphaPosition, uintptr_t premultiplied, uintptr_t typeInterpretation, uintptr_t byteOrder) { +QPixelFormat* QPixelFormat_new4(int colorModel, unsigned char firstSize, unsigned char secondSize, unsigned char thirdSize, unsigned char fourthSize, unsigned char fifthSize, unsigned char alphaSize, int alphaUsage, int alphaPosition, int premultiplied, int typeInterpretation, int byteOrder) { return new QPixelFormat(static_cast(colorModel), static_cast(firstSize), static_cast(secondSize), static_cast(thirdSize), static_cast(fourthSize), static_cast(fifthSize), static_cast(alphaSize), static_cast(alphaUsage), static_cast(alphaPosition), static_cast(premultiplied), static_cast(typeInterpretation), static_cast(byteOrder)); } -QPixelFormat* QPixelFormat_new5(uintptr_t colorModel, unsigned char firstSize, unsigned char secondSize, unsigned char thirdSize, unsigned char fourthSize, unsigned char fifthSize, unsigned char alphaSize, uintptr_t alphaUsage, uintptr_t alphaPosition, uintptr_t premultiplied, uintptr_t typeInterpretation, uintptr_t byteOrder, unsigned char subEnum) { +QPixelFormat* QPixelFormat_new5(int colorModel, unsigned char firstSize, unsigned char secondSize, unsigned char thirdSize, unsigned char fourthSize, unsigned char fifthSize, unsigned char alphaSize, int alphaUsage, int alphaPosition, int premultiplied, int typeInterpretation, int byteOrder, unsigned char subEnum) { return new QPixelFormat(static_cast(colorModel), static_cast(firstSize), static_cast(secondSize), static_cast(thirdSize), static_cast(fourthSize), static_cast(fifthSize), static_cast(alphaSize), static_cast(alphaUsage), static_cast(alphaPosition), static_cast(premultiplied), static_cast(typeInterpretation), static_cast(byteOrder), static_cast(subEnum)); } -uintptr_t QPixelFormat_ColorModel(const QPixelFormat* self) { +int QPixelFormat_ColorModel(const QPixelFormat* self) { QPixelFormat::ColorModel _ret = self->colorModel(); - return static_cast(_ret); + return static_cast(_ret); } unsigned char QPixelFormat_ChannelCount(const QPixelFormat* self) { - return self->channelCount(); + uchar _ret = self->channelCount(); + return static_cast(_ret); } unsigned char QPixelFormat_RedSize(const QPixelFormat* self) { - return self->redSize(); + uchar _ret = self->redSize(); + return static_cast(_ret); } unsigned char QPixelFormat_GreenSize(const QPixelFormat* self) { - return self->greenSize(); + uchar _ret = self->greenSize(); + return static_cast(_ret); } unsigned char QPixelFormat_BlueSize(const QPixelFormat* self) { - return self->blueSize(); + uchar _ret = self->blueSize(); + return static_cast(_ret); } unsigned char QPixelFormat_CyanSize(const QPixelFormat* self) { - return self->cyanSize(); + uchar _ret = self->cyanSize(); + return static_cast(_ret); } unsigned char QPixelFormat_MagentaSize(const QPixelFormat* self) { - return self->magentaSize(); + uchar _ret = self->magentaSize(); + return static_cast(_ret); } unsigned char QPixelFormat_YellowSize(const QPixelFormat* self) { - return self->yellowSize(); + uchar _ret = self->yellowSize(); + return static_cast(_ret); } unsigned char QPixelFormat_BlackSize(const QPixelFormat* self) { - return self->blackSize(); + uchar _ret = self->blackSize(); + return static_cast(_ret); } unsigned char QPixelFormat_HueSize(const QPixelFormat* self) { - return self->hueSize(); + uchar _ret = self->hueSize(); + return static_cast(_ret); } unsigned char QPixelFormat_SaturationSize(const QPixelFormat* self) { - return self->saturationSize(); + uchar _ret = self->saturationSize(); + return static_cast(_ret); } unsigned char QPixelFormat_LightnessSize(const QPixelFormat* self) { - return self->lightnessSize(); + uchar _ret = self->lightnessSize(); + return static_cast(_ret); } unsigned char QPixelFormat_BrightnessSize(const QPixelFormat* self) { - return self->brightnessSize(); + uchar _ret = self->brightnessSize(); + return static_cast(_ret); } unsigned char QPixelFormat_AlphaSize(const QPixelFormat* self) { - return self->alphaSize(); + uchar _ret = self->alphaSize(); + return static_cast(_ret); } unsigned char QPixelFormat_BitsPerPixel(const QPixelFormat* self) { - return self->bitsPerPixel(); + uchar _ret = self->bitsPerPixel(); + return static_cast(_ret); } -uintptr_t QPixelFormat_AlphaUsage(const QPixelFormat* self) { +int QPixelFormat_AlphaUsage(const QPixelFormat* self) { QPixelFormat::AlphaUsage _ret = self->alphaUsage(); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QPixelFormat_AlphaPosition(const QPixelFormat* self) { +int QPixelFormat_AlphaPosition(const QPixelFormat* self) { QPixelFormat::AlphaPosition _ret = self->alphaPosition(); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QPixelFormat_Premultiplied(const QPixelFormat* self) { +int QPixelFormat_Premultiplied(const QPixelFormat* self) { QPixelFormat::AlphaPremultiplied _ret = self->premultiplied(); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QPixelFormat_TypeInterpretation(const QPixelFormat* self) { +int QPixelFormat_TypeInterpretation(const QPixelFormat* self) { QPixelFormat::TypeInterpretation _ret = self->typeInterpretation(); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QPixelFormat_ByteOrder(const QPixelFormat* self) { +int QPixelFormat_ByteOrder(const QPixelFormat* self) { QPixelFormat::ByteOrder _ret = self->byteOrder(); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QPixelFormat_YuvLayout(const QPixelFormat* self) { +int QPixelFormat_YuvLayout(const QPixelFormat* self) { QPixelFormat::YUVLayout _ret = self->yuvLayout(); - return static_cast(_ret); + return static_cast(_ret); } unsigned char QPixelFormat_SubEnum(const QPixelFormat* self) { - return self->subEnum(); + uchar _ret = self->subEnum(); + return static_cast(_ret); } void QPixelFormat_Delete(QPixelFormat* self) { diff --git a/qt/gen_qpixelformat.go b/qt/gen_qpixelformat.go index b984cd0..8d4fd82 100644 --- a/qt/gen_qpixelformat.go +++ b/qt/gen_qpixelformat.go @@ -116,7 +116,7 @@ func NewQPixelFormat() *QPixelFormat { // NewQPixelFormat2 constructs a new QPixelFormat object. func NewQPixelFormat2(colorModel QPixelFormat__ColorModel, firstSize byte, secondSize byte, thirdSize byte, fourthSize byte, fifthSize byte, alphaSize byte, alphaUsage QPixelFormat__AlphaUsage, alphaPosition QPixelFormat__AlphaPosition, premultiplied QPixelFormat__AlphaPremultiplied, typeInterpretation QPixelFormat__TypeInterpretation) *QPixelFormat { - ret := C.QPixelFormat_new2((C.uintptr_t)(colorModel), (C.uchar)(firstSize), (C.uchar)(secondSize), (C.uchar)(thirdSize), (C.uchar)(fourthSize), (C.uchar)(fifthSize), (C.uchar)(alphaSize), (C.uintptr_t)(alphaUsage), (C.uintptr_t)(alphaPosition), (C.uintptr_t)(premultiplied), (C.uintptr_t)(typeInterpretation)) + ret := C.QPixelFormat_new2((C.int)(colorModel), (C.uchar)(firstSize), (C.uchar)(secondSize), (C.uchar)(thirdSize), (C.uchar)(fourthSize), (C.uchar)(fifthSize), (C.uchar)(alphaSize), (C.int)(alphaUsage), (C.int)(alphaPosition), (C.int)(premultiplied), (C.int)(typeInterpretation)) return newQPixelFormat(ret) } @@ -128,13 +128,13 @@ func NewQPixelFormat3(param1 *QPixelFormat) *QPixelFormat { // NewQPixelFormat4 constructs a new QPixelFormat object. func NewQPixelFormat4(colorModel QPixelFormat__ColorModel, firstSize byte, secondSize byte, thirdSize byte, fourthSize byte, fifthSize byte, alphaSize byte, alphaUsage QPixelFormat__AlphaUsage, alphaPosition QPixelFormat__AlphaPosition, premultiplied QPixelFormat__AlphaPremultiplied, typeInterpretation QPixelFormat__TypeInterpretation, byteOrder QPixelFormat__ByteOrder) *QPixelFormat { - ret := C.QPixelFormat_new4((C.uintptr_t)(colorModel), (C.uchar)(firstSize), (C.uchar)(secondSize), (C.uchar)(thirdSize), (C.uchar)(fourthSize), (C.uchar)(fifthSize), (C.uchar)(alphaSize), (C.uintptr_t)(alphaUsage), (C.uintptr_t)(alphaPosition), (C.uintptr_t)(premultiplied), (C.uintptr_t)(typeInterpretation), (C.uintptr_t)(byteOrder)) + ret := C.QPixelFormat_new4((C.int)(colorModel), (C.uchar)(firstSize), (C.uchar)(secondSize), (C.uchar)(thirdSize), (C.uchar)(fourthSize), (C.uchar)(fifthSize), (C.uchar)(alphaSize), (C.int)(alphaUsage), (C.int)(alphaPosition), (C.int)(premultiplied), (C.int)(typeInterpretation), (C.int)(byteOrder)) return newQPixelFormat(ret) } // NewQPixelFormat5 constructs a new QPixelFormat object. func NewQPixelFormat5(colorModel QPixelFormat__ColorModel, firstSize byte, secondSize byte, thirdSize byte, fourthSize byte, fifthSize byte, alphaSize byte, alphaUsage QPixelFormat__AlphaUsage, alphaPosition QPixelFormat__AlphaPosition, premultiplied QPixelFormat__AlphaPremultiplied, typeInterpretation QPixelFormat__TypeInterpretation, byteOrder QPixelFormat__ByteOrder, subEnum byte) *QPixelFormat { - ret := C.QPixelFormat_new5((C.uintptr_t)(colorModel), (C.uchar)(firstSize), (C.uchar)(secondSize), (C.uchar)(thirdSize), (C.uchar)(fourthSize), (C.uchar)(fifthSize), (C.uchar)(alphaSize), (C.uintptr_t)(alphaUsage), (C.uintptr_t)(alphaPosition), (C.uintptr_t)(premultiplied), (C.uintptr_t)(typeInterpretation), (C.uintptr_t)(byteOrder), (C.uchar)(subEnum)) + ret := C.QPixelFormat_new5((C.int)(colorModel), (C.uchar)(firstSize), (C.uchar)(secondSize), (C.uchar)(thirdSize), (C.uchar)(fourthSize), (C.uchar)(fifthSize), (C.uchar)(alphaSize), (C.int)(alphaUsage), (C.int)(alphaPosition), (C.int)(premultiplied), (C.int)(typeInterpretation), (C.int)(byteOrder), (C.uchar)(subEnum)) return newQPixelFormat(ret) } diff --git a/qt/gen_qpixelformat.h b/qt/gen_qpixelformat.h index 8aeb9aa..fe8cfb6 100644 --- a/qt/gen_qpixelformat.h +++ b/qt/gen_qpixelformat.h @@ -20,11 +20,11 @@ typedef struct QPixelFormat QPixelFormat; #endif QPixelFormat* QPixelFormat_new(); -QPixelFormat* QPixelFormat_new2(uintptr_t colorModel, unsigned char firstSize, unsigned char secondSize, unsigned char thirdSize, unsigned char fourthSize, unsigned char fifthSize, unsigned char alphaSize, uintptr_t alphaUsage, uintptr_t alphaPosition, uintptr_t premultiplied, uintptr_t typeInterpretation); +QPixelFormat* QPixelFormat_new2(int colorModel, unsigned char firstSize, unsigned char secondSize, unsigned char thirdSize, unsigned char fourthSize, unsigned char fifthSize, unsigned char alphaSize, int alphaUsage, int alphaPosition, int premultiplied, int typeInterpretation); QPixelFormat* QPixelFormat_new3(QPixelFormat* param1); -QPixelFormat* QPixelFormat_new4(uintptr_t colorModel, unsigned char firstSize, unsigned char secondSize, unsigned char thirdSize, unsigned char fourthSize, unsigned char fifthSize, unsigned char alphaSize, uintptr_t alphaUsage, uintptr_t alphaPosition, uintptr_t premultiplied, uintptr_t typeInterpretation, uintptr_t byteOrder); -QPixelFormat* QPixelFormat_new5(uintptr_t colorModel, unsigned char firstSize, unsigned char secondSize, unsigned char thirdSize, unsigned char fourthSize, unsigned char fifthSize, unsigned char alphaSize, uintptr_t alphaUsage, uintptr_t alphaPosition, uintptr_t premultiplied, uintptr_t typeInterpretation, uintptr_t byteOrder, unsigned char subEnum); -uintptr_t QPixelFormat_ColorModel(const QPixelFormat* self); +QPixelFormat* QPixelFormat_new4(int colorModel, unsigned char firstSize, unsigned char secondSize, unsigned char thirdSize, unsigned char fourthSize, unsigned char fifthSize, unsigned char alphaSize, int alphaUsage, int alphaPosition, int premultiplied, int typeInterpretation, int byteOrder); +QPixelFormat* QPixelFormat_new5(int colorModel, unsigned char firstSize, unsigned char secondSize, unsigned char thirdSize, unsigned char fourthSize, unsigned char fifthSize, unsigned char alphaSize, int alphaUsage, int alphaPosition, int premultiplied, int typeInterpretation, int byteOrder, unsigned char subEnum); +int QPixelFormat_ColorModel(const QPixelFormat* self); unsigned char QPixelFormat_ChannelCount(const QPixelFormat* self); unsigned char QPixelFormat_RedSize(const QPixelFormat* self); unsigned char QPixelFormat_GreenSize(const QPixelFormat* self); @@ -39,12 +39,12 @@ unsigned char QPixelFormat_LightnessSize(const QPixelFormat* self); unsigned char QPixelFormat_BrightnessSize(const QPixelFormat* self); unsigned char QPixelFormat_AlphaSize(const QPixelFormat* self); unsigned char QPixelFormat_BitsPerPixel(const QPixelFormat* self); -uintptr_t QPixelFormat_AlphaUsage(const QPixelFormat* self); -uintptr_t QPixelFormat_AlphaPosition(const QPixelFormat* self); -uintptr_t QPixelFormat_Premultiplied(const QPixelFormat* self); -uintptr_t QPixelFormat_TypeInterpretation(const QPixelFormat* self); -uintptr_t QPixelFormat_ByteOrder(const QPixelFormat* self); -uintptr_t QPixelFormat_YuvLayout(const QPixelFormat* self); +int QPixelFormat_AlphaUsage(const QPixelFormat* self); +int QPixelFormat_AlphaPosition(const QPixelFormat* self); +int QPixelFormat_Premultiplied(const QPixelFormat* self); +int QPixelFormat_TypeInterpretation(const QPixelFormat* self); +int QPixelFormat_ByteOrder(const QPixelFormat* self); +int QPixelFormat_YuvLayout(const QPixelFormat* self); unsigned char QPixelFormat_SubEnum(const QPixelFormat* self); void QPixelFormat_Delete(QPixelFormat* self); diff --git a/qt/gen_qpixmap.cpp b/qt/gen_qpixmap.cpp index fd574e8..b02d909 100644 --- a/qt/gen_qpixmap.cpp +++ b/qt/gen_qpixmap.cpp @@ -113,7 +113,8 @@ void QPixmap_SetMask(QPixmap* self, QBitmap* mask) { } double QPixmap_DevicePixelRatio(const QPixmap* self) { - return self->devicePixelRatio(); + qreal _ret = self->devicePixelRatio(); + return static_cast(_ret); } void QPixmap_SetDevicePixelRatio(QPixmap* self, double scaleFactor) { @@ -137,7 +138,7 @@ QBitmap* QPixmap_CreateMaskFromColor(const QPixmap* self, QColor* maskColor) { } QPixmap* QPixmap_GrabWindow(uintptr_t param1) { - return new QPixmap(QPixmap::grabWindow(static_cast(param1))); + return new QPixmap(QPixmap::grabWindow(static_cast(param1))); } QPixmap* QPixmap_GrabWidget(QObject* widget, QRect* rect) { @@ -235,7 +236,8 @@ void QPixmap_Scroll2(QPixmap* self, int dx, int dy, QRect* rect) { } long long QPixmap_CacheKey(const QPixmap* self) { - return self->cacheKey(); + qint64 _ret = self->cacheKey(); + return static_cast(_ret); } bool QPixmap_IsDetached(const QPixmap* self) { @@ -266,24 +268,24 @@ QBitmap* QPixmap_CreateHeuristicMask1(const QPixmap* self, bool clipTight) { return new QBitmap(self->createHeuristicMask(clipTight)); } -QBitmap* QPixmap_CreateMaskFromColor2(const QPixmap* self, QColor* maskColor, uintptr_t mode) { +QBitmap* QPixmap_CreateMaskFromColor2(const QPixmap* self, QColor* maskColor, int mode) { return new QBitmap(self->createMaskFromColor(*maskColor, static_cast(mode))); } QPixmap* QPixmap_GrabWindow2(uintptr_t param1, int x) { - return new QPixmap(QPixmap::grabWindow(static_cast(param1), static_cast(x))); + return new QPixmap(QPixmap::grabWindow(static_cast(param1), static_cast(x))); } QPixmap* QPixmap_GrabWindow3(uintptr_t param1, int x, int y) { - return new QPixmap(QPixmap::grabWindow(static_cast(param1), static_cast(x), static_cast(y))); + return new QPixmap(QPixmap::grabWindow(static_cast(param1), static_cast(x), static_cast(y))); } QPixmap* QPixmap_GrabWindow4(uintptr_t param1, int x, int y, int w) { - return new QPixmap(QPixmap::grabWindow(static_cast(param1), static_cast(x), static_cast(y), static_cast(w))); + return new QPixmap(QPixmap::grabWindow(static_cast(param1), static_cast(x), static_cast(y), static_cast(w))); } QPixmap* QPixmap_GrabWindow5(uintptr_t param1, int x, int y, int w, int h) { - return new QPixmap(QPixmap::grabWindow(static_cast(param1), static_cast(x), static_cast(y), static_cast(w), static_cast(h))); + return new QPixmap(QPixmap::grabWindow(static_cast(param1), static_cast(x), static_cast(y), static_cast(w), static_cast(h))); } QPixmap* QPixmap_GrabWidget2(QObject* widget, int x) { @@ -302,35 +304,35 @@ QPixmap* QPixmap_GrabWidget5(QObject* widget, int x, int y, int w, int h) { return new QPixmap(QPixmap::grabWidget(widget, static_cast(x), static_cast(y), static_cast(w), static_cast(h))); } -QPixmap* QPixmap_Scaled3(const QPixmap* self, int w, int h, uintptr_t aspectMode) { +QPixmap* QPixmap_Scaled3(const QPixmap* self, int w, int h, int aspectMode) { return new QPixmap(self->scaled(static_cast(w), static_cast(h), static_cast(aspectMode))); } -QPixmap* QPixmap_Scaled4(const QPixmap* self, int w, int h, uintptr_t aspectMode, uintptr_t mode) { +QPixmap* QPixmap_Scaled4(const QPixmap* self, int w, int h, int aspectMode, int mode) { return new QPixmap(self->scaled(static_cast(w), static_cast(h), static_cast(aspectMode), static_cast(mode))); } -QPixmap* QPixmap_Scaled2(const QPixmap* self, QSize* s, uintptr_t aspectMode) { +QPixmap* QPixmap_Scaled2(const QPixmap* self, QSize* s, int aspectMode) { return new QPixmap(self->scaled(*s, static_cast(aspectMode))); } -QPixmap* QPixmap_Scaled32(const QPixmap* self, QSize* s, uintptr_t aspectMode, uintptr_t mode) { +QPixmap* QPixmap_Scaled32(const QPixmap* self, QSize* s, int aspectMode, int mode) { return new QPixmap(self->scaled(*s, static_cast(aspectMode), static_cast(mode))); } -QPixmap* QPixmap_ScaledToWidth2(const QPixmap* self, int w, uintptr_t mode) { +QPixmap* QPixmap_ScaledToWidth2(const QPixmap* self, int w, int mode) { return new QPixmap(self->scaledToWidth(static_cast(w), static_cast(mode))); } -QPixmap* QPixmap_ScaledToHeight2(const QPixmap* self, int h, uintptr_t mode) { +QPixmap* QPixmap_ScaledToHeight2(const QPixmap* self, int h, int mode) { return new QPixmap(self->scaledToHeight(static_cast(h), static_cast(mode))); } -QPixmap* QPixmap_Transformed2(const QPixmap* self, QMatrix* param1, uintptr_t mode) { +QPixmap* QPixmap_Transformed2(const QPixmap* self, QMatrix* param1, int mode) { return new QPixmap(self->transformed(*param1, static_cast(mode))); } -QPixmap* QPixmap_Transformed22(const QPixmap* self, QTransform* param1, uintptr_t mode) { +QPixmap* QPixmap_Transformed22(const QPixmap* self, QTransform* param1, int mode) { return new QPixmap(self->transformed(*param1, static_cast(mode))); } diff --git a/qt/gen_qpixmap.go b/qt/gen_qpixmap.go index e9339d3..cafd798 100644 --- a/qt/gen_qpixmap.go +++ b/qt/gen_qpixmap.go @@ -84,7 +84,7 @@ func NewQPixmap7(fileName string, format string, flags int) *QPixmap { defer C.free(fileName_ms) format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - ret := C.QPixmap_new7((*C.struct_miqt_string)(fileName_ms), format_Cstring, (C.int)(flags)) + ret := C.QPixmap_new7((*C.struct_miqt_string)(fileName_ms), format_Cstring, flags) return newQPixmap(ret) } @@ -371,7 +371,7 @@ func (this *QPixmap) CreateHeuristicMask1(clipTight bool) *QBitmap { } func (this *QPixmap) CreateMaskFromColor2(maskColor *QColor, mode MaskMode) *QBitmap { - _ret := C.QPixmap_CreateMaskFromColor2(this.h, maskColor.cPointer(), (C.uintptr_t)(mode)) + _ret := C.QPixmap_CreateMaskFromColor2(this.h, maskColor.cPointer(), (C.int)(mode)) _goptr := newQBitmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -434,70 +434,70 @@ func QPixmap_GrabWidget5(widget *QObject, x int, y int, w int, h int) *QPixmap { } func (this *QPixmap) Scaled3(w int, h int, aspectMode AspectRatioMode) *QPixmap { - _ret := C.QPixmap_Scaled3(this.h, (C.int)(w), (C.int)(h), (C.uintptr_t)(aspectMode)) + _ret := C.QPixmap_Scaled3(this.h, (C.int)(w), (C.int)(h), (C.int)(aspectMode)) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QPixmap) Scaled4(w int, h int, aspectMode AspectRatioMode, mode TransformationMode) *QPixmap { - _ret := C.QPixmap_Scaled4(this.h, (C.int)(w), (C.int)(h), (C.uintptr_t)(aspectMode), (C.uintptr_t)(mode)) + _ret := C.QPixmap_Scaled4(this.h, (C.int)(w), (C.int)(h), (C.int)(aspectMode), (C.int)(mode)) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QPixmap) Scaled2(s *QSize, aspectMode AspectRatioMode) *QPixmap { - _ret := C.QPixmap_Scaled2(this.h, s.cPointer(), (C.uintptr_t)(aspectMode)) + _ret := C.QPixmap_Scaled2(this.h, s.cPointer(), (C.int)(aspectMode)) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QPixmap) Scaled32(s *QSize, aspectMode AspectRatioMode, mode TransformationMode) *QPixmap { - _ret := C.QPixmap_Scaled32(this.h, s.cPointer(), (C.uintptr_t)(aspectMode), (C.uintptr_t)(mode)) + _ret := C.QPixmap_Scaled32(this.h, s.cPointer(), (C.int)(aspectMode), (C.int)(mode)) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QPixmap) ScaledToWidth2(w int, mode TransformationMode) *QPixmap { - _ret := C.QPixmap_ScaledToWidth2(this.h, (C.int)(w), (C.uintptr_t)(mode)) + _ret := C.QPixmap_ScaledToWidth2(this.h, (C.int)(w), (C.int)(mode)) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QPixmap) ScaledToHeight2(h int, mode TransformationMode) *QPixmap { - _ret := C.QPixmap_ScaledToHeight2(this.h, (C.int)(h), (C.uintptr_t)(mode)) + _ret := C.QPixmap_ScaledToHeight2(this.h, (C.int)(h), (C.int)(mode)) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QPixmap) Transformed2(param1 *QMatrix, mode TransformationMode) *QPixmap { - _ret := C.QPixmap_Transformed2(this.h, param1.cPointer(), (C.uintptr_t)(mode)) + _ret := C.QPixmap_Transformed2(this.h, param1.cPointer(), (C.int)(mode)) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QPixmap) Transformed22(param1 *QTransform, mode TransformationMode) *QPixmap { - _ret := C.QPixmap_Transformed22(this.h, param1.cPointer(), (C.uintptr_t)(mode)) + _ret := C.QPixmap_Transformed22(this.h, param1.cPointer(), (C.int)(mode)) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QPixmap_FromImage2(image *QImage, flags int) *QPixmap { - _ret := C.QPixmap_FromImage2(image.cPointer(), (C.int)(flags)) + _ret := C.QPixmap_FromImage2(image.cPointer(), flags) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QPixmap_FromImageReader2(imageReader *QImageReader, flags int) *QPixmap { - _ret := C.QPixmap_FromImageReader2(imageReader.cPointer(), (C.int)(flags)) + _ret := C.QPixmap_FromImageReader2(imageReader.cPointer(), flags) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -516,7 +516,7 @@ func (this *QPixmap) Load3(fileName string, format string, flags int) bool { defer C.free(fileName_ms) format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - return (bool)(C.QPixmap_Load3(this.h, (*C.struct_miqt_string)(fileName_ms), format_Cstring, (C.int)(flags))) + return (bool)(C.QPixmap_Load3(this.h, (*C.struct_miqt_string)(fileName_ms), format_Cstring, flags)) } func (this *QPixmap) LoadFromData3(buf *byte, lenVal uint, format string) bool { @@ -528,7 +528,7 @@ func (this *QPixmap) LoadFromData3(buf *byte, lenVal uint, format string) bool { func (this *QPixmap) LoadFromData4(buf *byte, lenVal uint, format string, flags int) bool { format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - return (bool)(C.QPixmap_LoadFromData4(this.h, (*C.uchar)(unsafe.Pointer(buf)), (C.uint)(lenVal), format_Cstring, (C.int)(flags))) + return (bool)(C.QPixmap_LoadFromData4(this.h, (*C.uchar)(unsafe.Pointer(buf)), (C.uint)(lenVal), format_Cstring, flags)) } func (this *QPixmap) LoadFromData2(data *QByteArray, format string) bool { @@ -540,7 +540,7 @@ func (this *QPixmap) LoadFromData2(data *QByteArray, format string) bool { func (this *QPixmap) LoadFromData32(data *QByteArray, format string, flags int) bool { format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - return (bool)(C.QPixmap_LoadFromData32(this.h, data.cPointer(), format_Cstring, (C.int)(flags))) + return (bool)(C.QPixmap_LoadFromData32(this.h, data.cPointer(), format_Cstring, flags)) } func (this *QPixmap) Save2(fileName string, format string) bool { @@ -572,7 +572,7 @@ func (this *QPixmap) Save32(device *QIODevice, format string, quality int) bool } func (this *QPixmap) ConvertFromImage2(img *QImage, flags int) bool { - return (bool)(C.QPixmap_ConvertFromImage2(this.h, img.cPointer(), (C.int)(flags))) + return (bool)(C.QPixmap_ConvertFromImage2(this.h, img.cPointer(), flags)) } func (this *QPixmap) Copy1(rect *QRect) *QPixmap { diff --git a/qt/gen_qpixmap.h b/qt/gen_qpixmap.h index 423089b..60d5bb6 100644 --- a/qt/gen_qpixmap.h +++ b/qt/gen_qpixmap.h @@ -109,7 +109,7 @@ QPaintEngine* QPixmap_PaintEngine(const QPixmap* self); bool QPixmap_OperatorNot(const QPixmap* self); void QPixmap_Fill1(QPixmap* self, QColor* fillColor); QBitmap* QPixmap_CreateHeuristicMask1(const QPixmap* self, bool clipTight); -QBitmap* QPixmap_CreateMaskFromColor2(const QPixmap* self, QColor* maskColor, uintptr_t mode); +QBitmap* QPixmap_CreateMaskFromColor2(const QPixmap* self, QColor* maskColor, int mode); QPixmap* QPixmap_GrabWindow2(uintptr_t param1, int x); QPixmap* QPixmap_GrabWindow3(uintptr_t param1, int x, int y); QPixmap* QPixmap_GrabWindow4(uintptr_t param1, int x, int y, int w); @@ -118,14 +118,14 @@ QPixmap* QPixmap_GrabWidget2(QObject* widget, int x); QPixmap* QPixmap_GrabWidget3(QObject* widget, int x, int y); QPixmap* QPixmap_GrabWidget4(QObject* widget, int x, int y, int w); QPixmap* QPixmap_GrabWidget5(QObject* widget, int x, int y, int w, int h); -QPixmap* QPixmap_Scaled3(const QPixmap* self, int w, int h, uintptr_t aspectMode); -QPixmap* QPixmap_Scaled4(const QPixmap* self, int w, int h, uintptr_t aspectMode, uintptr_t mode); -QPixmap* QPixmap_Scaled2(const QPixmap* self, QSize* s, uintptr_t aspectMode); -QPixmap* QPixmap_Scaled32(const QPixmap* self, QSize* s, uintptr_t aspectMode, uintptr_t mode); -QPixmap* QPixmap_ScaledToWidth2(const QPixmap* self, int w, uintptr_t mode); -QPixmap* QPixmap_ScaledToHeight2(const QPixmap* self, int h, uintptr_t mode); -QPixmap* QPixmap_Transformed2(const QPixmap* self, QMatrix* param1, uintptr_t mode); -QPixmap* QPixmap_Transformed22(const QPixmap* self, QTransform* param1, uintptr_t mode); +QPixmap* QPixmap_Scaled3(const QPixmap* self, int w, int h, int aspectMode); +QPixmap* QPixmap_Scaled4(const QPixmap* self, int w, int h, int aspectMode, int mode); +QPixmap* QPixmap_Scaled2(const QPixmap* self, QSize* s, int aspectMode); +QPixmap* QPixmap_Scaled32(const QPixmap* self, QSize* s, int aspectMode, int mode); +QPixmap* QPixmap_ScaledToWidth2(const QPixmap* self, int w, int mode); +QPixmap* QPixmap_ScaledToHeight2(const QPixmap* self, int h, int mode); +QPixmap* QPixmap_Transformed2(const QPixmap* self, QMatrix* param1, int mode); +QPixmap* QPixmap_Transformed22(const QPixmap* self, QTransform* param1, int mode); QPixmap* QPixmap_FromImage2(QImage* image, int flags); QPixmap* QPixmap_FromImageReader2(QImageReader* imageReader, int flags); bool QPixmap_Load2(QPixmap* self, struct miqt_string* fileName, const char* format); diff --git a/qt/gen_qpixmapcache.cpp b/qt/gen_qpixmapcache.cpp index e2d1d90..3b8eaa9 100644 --- a/qt/gen_qpixmapcache.cpp +++ b/qt/gen_qpixmapcache.cpp @@ -81,6 +81,10 @@ bool QPixmapCache__Key_OperatorNotEqual(const QPixmapCache__Key* self, QPixmapCa return self->operator!=(*key); } +void QPixmapCache__Key_OperatorAssign(QPixmapCache__Key* self, QPixmapCache__Key* other) { + self->operator=(*other); +} + void QPixmapCache__Key_Swap(QPixmapCache__Key* self, QPixmapCache__Key* other) { self->swap(*other); } diff --git a/qt/gen_qpixmapcache.go b/qt/gen_qpixmapcache.go index 3f8d33c..d42425f 100644 --- a/qt/gen_qpixmapcache.go +++ b/qt/gen_qpixmapcache.go @@ -152,6 +152,10 @@ func (this *QPixmapCache__Key) OperatorNotEqual(key *QPixmapCache__Key) bool { return (bool)(C.QPixmapCache__Key_OperatorNotEqual(this.h, key.cPointer())) } +func (this *QPixmapCache__Key) OperatorAssign(other *QPixmapCache__Key) { + C.QPixmapCache__Key_OperatorAssign(this.h, other.cPointer()) +} + func (this *QPixmapCache__Key) Swap(other *QPixmapCache__Key) { C.QPixmapCache__Key_Swap(this.h, other.cPointer()) } diff --git a/qt/gen_qpixmapcache.h b/qt/gen_qpixmapcache.h index a508d19..4f303f0 100644 --- a/qt/gen_qpixmapcache.h +++ b/qt/gen_qpixmapcache.h @@ -45,6 +45,7 @@ QPixmapCache__Key* QPixmapCache__Key_new(); QPixmapCache__Key* QPixmapCache__Key_new2(QPixmapCache__Key* other); bool QPixmapCache__Key_OperatorEqual(const QPixmapCache__Key* self, QPixmapCache__Key* key); bool QPixmapCache__Key_OperatorNotEqual(const QPixmapCache__Key* self, QPixmapCache__Key* key); +void QPixmapCache__Key_OperatorAssign(QPixmapCache__Key* self, QPixmapCache__Key* other); void QPixmapCache__Key_Swap(QPixmapCache__Key* self, QPixmapCache__Key* other); bool QPixmapCache__Key_IsValid(const QPixmapCache__Key* self); void QPixmapCache__Key_Delete(QPixmapCache__Key* self); diff --git a/qt/gen_qplaintextedit.cpp b/qt/gen_qplaintextedit.cpp index a1b628a..6fcb71b 100644 --- a/qt/gen_qplaintextedit.cpp +++ b/qt/gen_qplaintextedit.cpp @@ -158,21 +158,21 @@ int QPlainTextEdit_MaximumBlockCount(const QPlainTextEdit* self) { return self->maximumBlockCount(); } -uintptr_t QPlainTextEdit_LineWrapMode(const QPlainTextEdit* self) { +int QPlainTextEdit_LineWrapMode(const QPlainTextEdit* self) { QPlainTextEdit::LineWrapMode _ret = self->lineWrapMode(); - return static_cast(_ret); + return static_cast(_ret); } -void QPlainTextEdit_SetLineWrapMode(QPlainTextEdit* self, uintptr_t mode) { +void QPlainTextEdit_SetLineWrapMode(QPlainTextEdit* self, int mode) { self->setLineWrapMode(static_cast(mode)); } -uintptr_t QPlainTextEdit_WordWrapMode(const QPlainTextEdit* self) { +int QPlainTextEdit_WordWrapMode(const QPlainTextEdit* self) { QTextOption::WrapMode _ret = self->wordWrapMode(); - return static_cast(_ret); + return static_cast(_ret); } -void QPlainTextEdit_SetWordWrapMode(QPlainTextEdit* self, uintptr_t policy) { +void QPlainTextEdit_SetWordWrapMode(QPlainTextEdit* self, int policy) { self->setWordWrapMode(static_cast(policy)); } @@ -264,7 +264,8 @@ void QPlainTextEdit_SetTabStopWidth(QPlainTextEdit* self, int width) { } double QPlainTextEdit_TabStopDistance(const QPlainTextEdit* self) { - return self->tabStopDistance(); + qreal _ret = self->tabStopDistance(); + return static_cast(_ret); } void QPlainTextEdit_SetTabStopDistance(QPlainTextEdit* self, double distance) { @@ -302,7 +303,7 @@ struct miqt_array* QPlainTextEdit_ExtraSelections(const QPlainTextEdit* self) { return _out; } -void QPlainTextEdit_MoveCursor(QPlainTextEdit* self, uintptr_t operation) { +void QPlainTextEdit_MoveCursor(QPlainTextEdit* self, int operation) { self->moveCursor(static_cast(operation)); } @@ -318,11 +319,11 @@ int QPlainTextEdit_BlockCount(const QPlainTextEdit* self) { return self->blockCount(); } -QVariant* QPlainTextEdit_InputMethodQuery(const QPlainTextEdit* self, uintptr_t property) { +QVariant* QPlainTextEdit_InputMethodQuery(const QPlainTextEdit* self, int property) { return new QVariant(self->inputMethodQuery(static_cast(property))); } -QVariant* QPlainTextEdit_InputMethodQuery2(const QPlainTextEdit* self, uintptr_t query, QVariant* argument) { +QVariant* QPlainTextEdit_InputMethodQuery2(const QPlainTextEdit* self, int query, QVariant* argument) { return new QVariant(self->inputMethodQuery(static_cast(query), *argument)); } @@ -526,7 +527,7 @@ bool QPlainTextEdit_Find24(QPlainTextEdit* self, QRegularExpression* exp, int op return self->find(*exp, static_cast(options)); } -void QPlainTextEdit_MoveCursor2(QPlainTextEdit* self, uintptr_t operation, uintptr_t mode) { +void QPlainTextEdit_MoveCursor2(QPlainTextEdit* self, int operation, int mode) { self->moveCursor(static_cast(operation), static_cast(mode)); } @@ -568,7 +569,7 @@ void QPlainTextDocumentLayout_Draw(QPlainTextDocumentLayout* self, QPainter* par self->draw(param1, *param2); } -int QPlainTextDocumentLayout_HitTest(const QPlainTextDocumentLayout* self, QPointF* param1, uintptr_t param2) { +int QPlainTextDocumentLayout_HitTest(const QPlainTextDocumentLayout* self, QPointF* param1, int param2) { return self->hitTest(*param1, static_cast(param2)); } diff --git a/qt/gen_qplaintextedit.go b/qt/gen_qplaintextedit.go index fee7cc4..f9a0164 100644 --- a/qt/gen_qplaintextedit.go +++ b/qt/gen_qplaintextedit.go @@ -135,7 +135,7 @@ func (this *QPlainTextEdit) SetReadOnly(ro bool) { } func (this *QPlainTextEdit) SetTextInteractionFlags(flags int) { - C.QPlainTextEdit_SetTextInteractionFlags(this.h, (C.int)(flags)) + C.QPlainTextEdit_SetTextInteractionFlags(this.h, flags) } func (this *QPlainTextEdit) TextInteractionFlags() int { @@ -199,7 +199,7 @@ func (this *QPlainTextEdit) LineWrapMode() QPlainTextEdit__LineWrapMode { } func (this *QPlainTextEdit) SetLineWrapMode(mode QPlainTextEdit__LineWrapMode) { - C.QPlainTextEdit_SetLineWrapMode(this.h, (C.uintptr_t)(mode)) + C.QPlainTextEdit_SetLineWrapMode(this.h, (C.int)(mode)) } func (this *QPlainTextEdit) WordWrapMode() QTextOption__WrapMode { @@ -207,7 +207,7 @@ func (this *QPlainTextEdit) WordWrapMode() QTextOption__WrapMode { } func (this *QPlainTextEdit) SetWordWrapMode(policy QTextOption__WrapMode) { - C.QPlainTextEdit_SetWordWrapMode(this.h, (C.uintptr_t)(policy)) + C.QPlainTextEdit_SetWordWrapMode(this.h, (C.int)(policy)) } func (this *QPlainTextEdit) SetBackgroundVisible(visible bool) { @@ -353,7 +353,7 @@ func (this *QPlainTextEdit) ExtraSelections() []QTextEdit__ExtraSelection { } func (this *QPlainTextEdit) MoveCursor(operation QTextCursor__MoveOperation) { - C.QPlainTextEdit_MoveCursor(this.h, (C.uintptr_t)(operation)) + C.QPlainTextEdit_MoveCursor(this.h, (C.int)(operation)) } func (this *QPlainTextEdit) CanPaste() bool { @@ -369,14 +369,14 @@ func (this *QPlainTextEdit) BlockCount() int { } func (this *QPlainTextEdit) InputMethodQuery(property InputMethodQuery) *QVariant { - _ret := C.QPlainTextEdit_InputMethodQuery(this.h, (C.uintptr_t)(property)) + _ret := C.QPlainTextEdit_InputMethodQuery(this.h, (C.int)(property)) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QPlainTextEdit) InputMethodQuery2(query InputMethodQuery, argument QVariant) *QVariant { - _ret := C.QPlainTextEdit_InputMethodQuery2(this.h, (C.uintptr_t)(query), argument.cPointer()) + _ret := C.QPlainTextEdit_InputMethodQuery2(this.h, (C.int)(query), argument.cPointer()) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -665,19 +665,19 @@ func QPlainTextEdit_TrUtf83(s string, c string, n int) string { func (this *QPlainTextEdit) Find22(exp string, options int) bool { exp_ms := miqt_strdupg(exp) defer C.free(exp_ms) - return (bool)(C.QPlainTextEdit_Find22(this.h, (*C.struct_miqt_string)(exp_ms), (C.int)(options))) + return (bool)(C.QPlainTextEdit_Find22(this.h, (*C.struct_miqt_string)(exp_ms), options)) } func (this *QPlainTextEdit) Find23(exp *QRegExp, options int) bool { - return (bool)(C.QPlainTextEdit_Find23(this.h, exp.cPointer(), (C.int)(options))) + return (bool)(C.QPlainTextEdit_Find23(this.h, exp.cPointer(), options)) } func (this *QPlainTextEdit) Find24(exp *QRegularExpression, options int) bool { - return (bool)(C.QPlainTextEdit_Find24(this.h, exp.cPointer(), (C.int)(options))) + return (bool)(C.QPlainTextEdit_Find24(this.h, exp.cPointer(), options)) } func (this *QPlainTextEdit) MoveCursor2(operation QTextCursor__MoveOperation, mode QTextCursor__MoveMode) { - C.QPlainTextEdit_MoveCursor2(this.h, (C.uintptr_t)(operation), (C.uintptr_t)(mode)) + C.QPlainTextEdit_MoveCursor2(this.h, (C.int)(operation), (C.int)(mode)) } func (this *QPlainTextEdit) ZoomIn1(rangeVal int) { @@ -758,7 +758,7 @@ func (this *QPlainTextDocumentLayout) Draw(param1 *QPainter, param2 *QAbstractTe } func (this *QPlainTextDocumentLayout) HitTest(param1 *QPointF, param2 HitTestAccuracy) int { - return (int)(C.QPlainTextDocumentLayout_HitTest(this.h, param1.cPointer(), (C.uintptr_t)(param2))) + return (int)(C.QPlainTextDocumentLayout_HitTest(this.h, param1.cPointer(), (C.int)(param2))) } func (this *QPlainTextDocumentLayout) PageCount() int { diff --git a/qt/gen_qplaintextedit.h b/qt/gen_qplaintextedit.h index 95108fe..67972fd 100644 --- a/qt/gen_qplaintextedit.h +++ b/qt/gen_qplaintextedit.h @@ -99,10 +99,10 @@ bool QPlainTextEdit_IsUndoRedoEnabled(const QPlainTextEdit* self); void QPlainTextEdit_SetUndoRedoEnabled(QPlainTextEdit* self, bool enable); void QPlainTextEdit_SetMaximumBlockCount(QPlainTextEdit* self, int maximum); int QPlainTextEdit_MaximumBlockCount(const QPlainTextEdit* self); -uintptr_t QPlainTextEdit_LineWrapMode(const QPlainTextEdit* self); -void QPlainTextEdit_SetLineWrapMode(QPlainTextEdit* self, uintptr_t mode); -uintptr_t QPlainTextEdit_WordWrapMode(const QPlainTextEdit* self); -void QPlainTextEdit_SetWordWrapMode(QPlainTextEdit* self, uintptr_t policy); +int QPlainTextEdit_LineWrapMode(const QPlainTextEdit* self); +void QPlainTextEdit_SetLineWrapMode(QPlainTextEdit* self, int mode); +int QPlainTextEdit_WordWrapMode(const QPlainTextEdit* self); +void QPlainTextEdit_SetWordWrapMode(QPlainTextEdit* self, int policy); void QPlainTextEdit_SetBackgroundVisible(QPlainTextEdit* self, bool visible); bool QPlainTextEdit_BackgroundVisible(const QPlainTextEdit* self); void QPlainTextEdit_SetCenterOnScroll(QPlainTextEdit* self, bool enabled); @@ -129,12 +129,12 @@ int QPlainTextEdit_CursorWidth(const QPlainTextEdit* self); void QPlainTextEdit_SetCursorWidth(QPlainTextEdit* self, int width); void QPlainTextEdit_SetExtraSelections(QPlainTextEdit* self, struct miqt_array* /* of QTextEdit__ExtraSelection* */ selections); struct miqt_array* QPlainTextEdit_ExtraSelections(const QPlainTextEdit* self); -void QPlainTextEdit_MoveCursor(QPlainTextEdit* self, uintptr_t operation); +void QPlainTextEdit_MoveCursor(QPlainTextEdit* self, int operation); bool QPlainTextEdit_CanPaste(const QPlainTextEdit* self); void QPlainTextEdit_Print(const QPlainTextEdit* self, QPagedPaintDevice* printer); int QPlainTextEdit_BlockCount(const QPlainTextEdit* self); -QVariant* QPlainTextEdit_InputMethodQuery(const QPlainTextEdit* self, uintptr_t property); -QVariant* QPlainTextEdit_InputMethodQuery2(const QPlainTextEdit* self, uintptr_t query, QVariant* argument); +QVariant* QPlainTextEdit_InputMethodQuery(const QPlainTextEdit* self, int property); +QVariant* QPlainTextEdit_InputMethodQuery2(const QPlainTextEdit* self, int query, QVariant* argument); void QPlainTextEdit_SetPlainText(QPlainTextEdit* self, struct miqt_string* text); void QPlainTextEdit_Cut(QPlainTextEdit* self); void QPlainTextEdit_Copy(QPlainTextEdit* self); @@ -174,7 +174,7 @@ struct miqt_string* QPlainTextEdit_TrUtf83(const char* s, const char* c, int n); bool QPlainTextEdit_Find22(QPlainTextEdit* self, struct miqt_string* exp, int options); bool QPlainTextEdit_Find23(QPlainTextEdit* self, QRegExp* exp, int options); bool QPlainTextEdit_Find24(QPlainTextEdit* self, QRegularExpression* exp, int options); -void QPlainTextEdit_MoveCursor2(QPlainTextEdit* self, uintptr_t operation, uintptr_t mode); +void QPlainTextEdit_MoveCursor2(QPlainTextEdit* self, int operation, int mode); void QPlainTextEdit_ZoomIn1(QPlainTextEdit* self, int rangeVal); void QPlainTextEdit_ZoomOut1(QPlainTextEdit* self, int rangeVal); void QPlainTextEdit_Delete(QPlainTextEdit* self); @@ -184,7 +184,7 @@ QMetaObject* QPlainTextDocumentLayout_MetaObject(const QPlainTextDocumentLayout* struct miqt_string* QPlainTextDocumentLayout_Tr(const char* s); struct miqt_string* QPlainTextDocumentLayout_TrUtf8(const char* s); void QPlainTextDocumentLayout_Draw(QPlainTextDocumentLayout* self, QPainter* param1, QAbstractTextDocumentLayout__PaintContext* param2); -int QPlainTextDocumentLayout_HitTest(const QPlainTextDocumentLayout* self, QPointF* param1, uintptr_t param2); +int QPlainTextDocumentLayout_HitTest(const QPlainTextDocumentLayout* self, QPointF* param1, int param2); int QPlainTextDocumentLayout_PageCount(const QPlainTextDocumentLayout* self); QSizeF* QPlainTextDocumentLayout_DocumentSize(const QPlainTextDocumentLayout* self); QRectF* QPlainTextDocumentLayout_FrameBoundingRect(const QPlainTextDocumentLayout* self, QTextFrame* param1); diff --git a/qt/gen_qpluginloader.go b/qt/gen_qpluginloader.go index 7d60df5..4cf6596 100644 --- a/qt/gen_qpluginloader.go +++ b/qt/gen_qpluginloader.go @@ -155,7 +155,7 @@ func (this *QPluginLoader) ErrorString() string { } func (this *QPluginLoader) SetLoadHints(loadHints int) { - C.QPluginLoader_SetLoadHints(this.h, (C.int)(loadHints)) + C.QPluginLoader_SetLoadHints(this.h, loadHints) } func (this *QPluginLoader) LoadHints() int { diff --git a/qt/gen_qpoint.cpp b/qt/gen_qpoint.cpp index 7daf794..3ceaab5 100644 --- a/qt/gen_qpoint.cpp +++ b/qt/gen_qpoint.cpp @@ -105,7 +105,8 @@ QPointF* QPointF_new4(QPointF* param1) { } double QPointF_ManhattanLength(const QPointF* self) { - return self->manhattanLength(); + qreal _ret = self->manhattanLength(); + return static_cast(_ret); } bool QPointF_IsNull(const QPointF* self) { @@ -113,11 +114,13 @@ bool QPointF_IsNull(const QPointF* self) { } double QPointF_X(const QPointF* self) { - return self->x(); + qreal _ret = self->x(); + return static_cast(_ret); } double QPointF_Y(const QPointF* self) { - return self->y(); + qreal _ret = self->y(); + return static_cast(_ret); } void QPointF_SetX(QPointF* self, double x) { @@ -157,7 +160,8 @@ QPointF* QPointF_OperatorDivideAssign(QPointF* self, double c) { } double QPointF_DotProduct(QPointF* p1, QPointF* p2) { - return QPointF::dotProduct(*p1, *p2); + qreal _ret = QPointF::dotProduct(*p1, *p2); + return static_cast(_ret); } QPoint* QPointF_ToPoint(const QPointF* self) { diff --git a/qt/gen_qprocess.cpp b/qt/gen_qprocess.cpp index ca861f2..76cf466 100644 --- a/qt/gen_qprocess.cpp +++ b/qt/gen_qprocess.cpp @@ -214,43 +214,43 @@ void QProcess_SetArguments(QProcess* self, struct miqt_array* /* of struct miqt_ self->setArguments(arguments_QList); } -uintptr_t QProcess_ReadChannelMode(const QProcess* self) { +int QProcess_ReadChannelMode(const QProcess* self) { QProcess::ProcessChannelMode _ret = self->readChannelMode(); - return static_cast(_ret); + return static_cast(_ret); } -void QProcess_SetReadChannelMode(QProcess* self, uintptr_t mode) { +void QProcess_SetReadChannelMode(QProcess* self, int mode) { self->setReadChannelMode(static_cast(mode)); } -uintptr_t QProcess_ProcessChannelMode(const QProcess* self) { +int QProcess_ProcessChannelMode(const QProcess* self) { QProcess::ProcessChannelMode _ret = self->processChannelMode(); - return static_cast(_ret); + return static_cast(_ret); } -void QProcess_SetProcessChannelMode(QProcess* self, uintptr_t mode) { +void QProcess_SetProcessChannelMode(QProcess* self, int mode) { self->setProcessChannelMode(static_cast(mode)); } -uintptr_t QProcess_InputChannelMode(const QProcess* self) { +int QProcess_InputChannelMode(const QProcess* self) { QProcess::InputChannelMode _ret = self->inputChannelMode(); - return static_cast(_ret); + return static_cast(_ret); } -void QProcess_SetInputChannelMode(QProcess* self, uintptr_t mode) { +void QProcess_SetInputChannelMode(QProcess* self, int mode) { self->setInputChannelMode(static_cast(mode)); } -uintptr_t QProcess_ReadChannel(const QProcess* self) { +int QProcess_ReadChannel(const QProcess* self) { QProcess::ProcessChannel _ret = self->readChannel(); - return static_cast(_ret); + return static_cast(_ret); } -void QProcess_SetReadChannel(QProcess* self, uintptr_t channel) { +void QProcess_SetReadChannel(QProcess* self, int channel) { self->setReadChannel(static_cast(channel)); } -void QProcess_CloseReadChannel(QProcess* self, uintptr_t channel) { +void QProcess_CloseReadChannel(QProcess* self, int channel) { self->closeReadChannel(static_cast(channel)); } @@ -324,27 +324,29 @@ QProcessEnvironment* QProcess_ProcessEnvironment(const QProcess* self) { return new QProcessEnvironment(self->processEnvironment()); } -uintptr_t QProcess_Error(const QProcess* self) { +int QProcess_Error(const QProcess* self) { QProcess::ProcessError _ret = self->error(); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QProcess_State(const QProcess* self) { +int QProcess_State(const QProcess* self) { QProcess::ProcessState _ret = self->state(); - return static_cast(_ret); + return static_cast(_ret); } -int64_t QProcess_Pid(const QProcess* self) { +long long QProcess_Pid(const QProcess* self) { #ifdef Q_OS_LINUX - return self->pid(); + Q_PID _ret = self->pid(); + return static_cast(_ret); #else - int64_t _ret_invalidOS; + long long _ret_invalidOS; return _ret_invalidOS; #endif } long long QProcess_ProcessId(const QProcess* self) { - return self->processId(); + qint64 _ret = self->processId(); + return static_cast(_ret); } bool QProcess_WaitForStarted(QProcess* self) { @@ -375,17 +377,19 @@ int QProcess_ExitCode(const QProcess* self) { return self->exitCode(); } -uintptr_t QProcess_ExitStatus(const QProcess* self) { +int QProcess_ExitStatus(const QProcess* self) { QProcess::ExitStatus _ret = self->exitStatus(); - return static_cast(_ret); + return static_cast(_ret); } long long QProcess_BytesAvailable(const QProcess* self) { - return self->bytesAvailable(); + qint64 _ret = self->bytesAvailable(); + return static_cast(_ret); } long long QProcess_BytesToWrite(const QProcess* self) { - return self->bytesToWrite(); + qint64 _ret = self->bytesToWrite(); + return static_cast(_ret); } bool QProcess_IsSequential(const QProcess* self) { @@ -493,7 +497,7 @@ void QProcess_connect_Finished(QProcess* self, void* slot) { }); } -void QProcess_Finished2(QProcess* self, int exitCode, uintptr_t exitStatus) { +void QProcess_Finished2(QProcess* self, int exitCode, int exitStatus) { self->finished(static_cast(exitCode), static_cast(exitStatus)); } @@ -501,31 +505,31 @@ void QProcess_connect_Finished2(QProcess* self, void* slot) { QProcess::connect(self, static_cast(&QProcess::finished), self, [=](int exitCode, QProcess::ExitStatus exitStatus) { int sigval1 = exitCode; QProcess::ExitStatus exitStatus_ret = exitStatus; - uintptr_t sigval2 = static_cast(exitStatus_ret); + int sigval2 = static_cast(exitStatus_ret); miqt_exec_callback_QProcess_Finished2(slot, sigval1, sigval2); }); } -void QProcess_ErrorWithError(QProcess* self, uintptr_t error) { +void QProcess_ErrorWithError(QProcess* self, int error) { self->error(static_cast(error)); } void QProcess_connect_ErrorWithError(QProcess* self, void* slot) { QProcess::connect(self, static_cast(&QProcess::error), self, [=](QProcess::ProcessError error) { QProcess::ProcessError error_ret = error; - uintptr_t sigval1 = static_cast(error_ret); + int sigval1 = static_cast(error_ret); miqt_exec_callback_QProcess_ErrorWithError(slot, sigval1); }); } -void QProcess_ErrorOccurred(QProcess* self, uintptr_t error) { +void QProcess_ErrorOccurred(QProcess* self, int error) { self->errorOccurred(static_cast(error)); } void QProcess_connect_ErrorOccurred(QProcess* self, void* slot) { QProcess::connect(self, static_cast(&QProcess::errorOccurred), self, [=](QProcess::ProcessError error) { QProcess::ProcessError error_ret = error; - uintptr_t sigval1 = static_cast(error_ret); + int sigval1 = static_cast(error_ret); miqt_exec_callback_QProcess_ErrorOccurred(slot, sigval1); }); } diff --git a/qt/gen_qprocess.go b/qt/gen_qprocess.go index 880e200..f70b9ea 100644 --- a/qt/gen_qprocess.go +++ b/qt/gen_qprocess.go @@ -352,7 +352,7 @@ func (this *QProcess) ReadChannelMode() QProcess__ProcessChannelMode { } func (this *QProcess) SetReadChannelMode(mode QProcess__ProcessChannelMode) { - C.QProcess_SetReadChannelMode(this.h, (C.uintptr_t)(mode)) + C.QProcess_SetReadChannelMode(this.h, (C.int)(mode)) } func (this *QProcess) ProcessChannelMode() QProcess__ProcessChannelMode { @@ -360,7 +360,7 @@ func (this *QProcess) ProcessChannelMode() QProcess__ProcessChannelMode { } func (this *QProcess) SetProcessChannelMode(mode QProcess__ProcessChannelMode) { - C.QProcess_SetProcessChannelMode(this.h, (C.uintptr_t)(mode)) + C.QProcess_SetProcessChannelMode(this.h, (C.int)(mode)) } func (this *QProcess) InputChannelMode() QProcess__InputChannelMode { @@ -368,7 +368,7 @@ func (this *QProcess) InputChannelMode() QProcess__InputChannelMode { } func (this *QProcess) SetInputChannelMode(mode QProcess__InputChannelMode) { - C.QProcess_SetInputChannelMode(this.h, (C.uintptr_t)(mode)) + C.QProcess_SetInputChannelMode(this.h, (C.int)(mode)) } func (this *QProcess) ReadChannel() QProcess__ProcessChannel { @@ -376,11 +376,11 @@ func (this *QProcess) ReadChannel() QProcess__ProcessChannel { } func (this *QProcess) SetReadChannel(channel QProcess__ProcessChannel) { - C.QProcess_SetReadChannel(this.h, (C.uintptr_t)(channel)) + C.QProcess_SetReadChannel(this.h, (C.int)(channel)) } func (this *QProcess) CloseReadChannel(channel QProcess__ProcessChannel) { - C.QProcess_CloseReadChannel(this.h, (C.uintptr_t)(channel)) + C.QProcess_CloseReadChannel(this.h, (C.int)(channel)) } func (this *QProcess) CloseWriteChannel() { @@ -655,14 +655,14 @@ func miqt_exec_callback_QProcess_Finished(cb *C.void, exitCode C.int) { } func (this *QProcess) Finished2(exitCode int, exitStatus QProcess__ExitStatus) { - C.QProcess_Finished2(this.h, (C.int)(exitCode), (C.uintptr_t)(exitStatus)) + C.QProcess_Finished2(this.h, (C.int)(exitCode), (C.int)(exitStatus)) } func (this *QProcess) OnFinished2(slot func(exitCode int, exitStatus QProcess__ExitStatus)) { C.QProcess_connect_Finished2(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QProcess_Finished2 -func miqt_exec_callback_QProcess_Finished2(cb *C.void, exitCode C.int, exitStatus C.uintptr_t) { +func miqt_exec_callback_QProcess_Finished2(cb *C.void, exitCode C.int, exitStatus C.int) { gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(exitCode int, exitStatus QProcess__ExitStatus)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -677,14 +677,14 @@ func miqt_exec_callback_QProcess_Finished2(cb *C.void, exitCode C.int, exitStatu } func (this *QProcess) ErrorWithError(error QProcess__ProcessError) { - C.QProcess_ErrorWithError(this.h, (C.uintptr_t)(error)) + C.QProcess_ErrorWithError(this.h, (C.int)(error)) } func (this *QProcess) OnErrorWithError(slot func(error QProcess__ProcessError)) { C.QProcess_connect_ErrorWithError(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QProcess_ErrorWithError -func miqt_exec_callback_QProcess_ErrorWithError(cb *C.void, error C.uintptr_t) { +func miqt_exec_callback_QProcess_ErrorWithError(cb *C.void, error C.int) { gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(error QProcess__ProcessError)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -697,14 +697,14 @@ func miqt_exec_callback_QProcess_ErrorWithError(cb *C.void, error C.uintptr_t) { } func (this *QProcess) ErrorOccurred(error QProcess__ProcessError) { - C.QProcess_ErrorOccurred(this.h, (C.uintptr_t)(error)) + C.QProcess_ErrorOccurred(this.h, (C.int)(error)) } func (this *QProcess) OnErrorOccurred(slot func(error QProcess__ProcessError)) { C.QProcess_connect_ErrorOccurred(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QProcess_ErrorOccurred -func miqt_exec_callback_QProcess_ErrorOccurred(cb *C.void, error C.uintptr_t) { +func miqt_exec_callback_QProcess_ErrorOccurred(cb *C.void, error C.int) { gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(error QProcess__ProcessError)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -773,17 +773,17 @@ func (this *QProcess) Start3(program string, arguments []string, mode int) { } arguments_ma := &C.struct_miqt_array{len: C.size_t(len(arguments)), data: unsafe.Pointer(arguments_CArray)} defer runtime.KeepAlive(unsafe.Pointer(arguments_ma)) - C.QProcess_Start3(this.h, (*C.struct_miqt_string)(program_ms), arguments_ma, (C.int)(mode)) + C.QProcess_Start3(this.h, (*C.struct_miqt_string)(program_ms), arguments_ma, mode) } func (this *QProcess) Start22(command string, mode int) { command_ms := miqt_strdupg(command) defer C.free(command_ms) - C.QProcess_Start22(this.h, (*C.struct_miqt_string)(command_ms), (C.int)(mode)) + C.QProcess_Start22(this.h, (*C.struct_miqt_string)(command_ms), mode) } func (this *QProcess) Start1(mode int) { - C.QProcess_Start1(this.h, (C.int)(mode)) + C.QProcess_Start1(this.h, mode) } func (this *QProcess) StartDetached1(pid *int64) bool { @@ -791,19 +791,19 @@ func (this *QProcess) StartDetached1(pid *int64) bool { } func (this *QProcess) Open1(mode int) bool { - return (bool)(C.QProcess_Open1(this.h, (C.int)(mode))) + return (bool)(C.QProcess_Open1(this.h, mode)) } func (this *QProcess) SetStandardOutputFile2(fileName string, mode int) { fileName_ms := miqt_strdupg(fileName) defer C.free(fileName_ms) - C.QProcess_SetStandardOutputFile2(this.h, (*C.struct_miqt_string)(fileName_ms), (C.int)(mode)) + C.QProcess_SetStandardOutputFile2(this.h, (*C.struct_miqt_string)(fileName_ms), mode) } func (this *QProcess) SetStandardErrorFile2(fileName string, mode int) { fileName_ms := miqt_strdupg(fileName) defer C.free(fileName_ms) - C.QProcess_SetStandardErrorFile2(this.h, (*C.struct_miqt_string)(fileName_ms), (C.int)(mode)) + C.QProcess_SetStandardErrorFile2(this.h, (*C.struct_miqt_string)(fileName_ms), mode) } func (this *QProcess) WaitForStarted1(msecs int) bool { diff --git a/qt/gen_qprocess.h b/qt/gen_qprocess.h index 43152ae..2e642fd 100644 --- a/qt/gen_qprocess.h +++ b/qt/gen_qprocess.h @@ -60,15 +60,15 @@ struct miqt_string* QProcess_Program(const QProcess* self); void QProcess_SetProgram(QProcess* self, struct miqt_string* program); struct miqt_array* QProcess_Arguments(const QProcess* self); void QProcess_SetArguments(QProcess* self, struct miqt_array* /* of struct miqt_string* */ arguments); -uintptr_t QProcess_ReadChannelMode(const QProcess* self); -void QProcess_SetReadChannelMode(QProcess* self, uintptr_t mode); -uintptr_t QProcess_ProcessChannelMode(const QProcess* self); -void QProcess_SetProcessChannelMode(QProcess* self, uintptr_t mode); -uintptr_t QProcess_InputChannelMode(const QProcess* self); -void QProcess_SetInputChannelMode(QProcess* self, uintptr_t mode); -uintptr_t QProcess_ReadChannel(const QProcess* self); -void QProcess_SetReadChannel(QProcess* self, uintptr_t channel); -void QProcess_CloseReadChannel(QProcess* self, uintptr_t channel); +int QProcess_ReadChannelMode(const QProcess* self); +void QProcess_SetReadChannelMode(QProcess* self, int mode); +int QProcess_ProcessChannelMode(const QProcess* self); +void QProcess_SetProcessChannelMode(QProcess* self, int mode); +int QProcess_InputChannelMode(const QProcess* self); +void QProcess_SetInputChannelMode(QProcess* self, int mode); +int QProcess_ReadChannel(const QProcess* self); +void QProcess_SetReadChannel(QProcess* self, int channel); +void QProcess_CloseReadChannel(QProcess* self, int channel); void QProcess_CloseWriteChannel(QProcess* self); void QProcess_SetStandardInputFile(QProcess* self, struct miqt_string* fileName); void QProcess_SetStandardOutputFile(QProcess* self, struct miqt_string* fileName); @@ -80,9 +80,9 @@ void QProcess_SetEnvironment(QProcess* self, struct miqt_array* /* of struct miq struct miqt_array* QProcess_Environment(const QProcess* self); void QProcess_SetProcessEnvironment(QProcess* self, QProcessEnvironment* environment); QProcessEnvironment* QProcess_ProcessEnvironment(const QProcess* self); -uintptr_t QProcess_Error(const QProcess* self); -uintptr_t QProcess_State(const QProcess* self); -int64_t QProcess_Pid(const QProcess* self); +int QProcess_Error(const QProcess* self); +int QProcess_State(const QProcess* self); +long long QProcess_Pid(const QProcess* self); long long QProcess_ProcessId(const QProcess* self); bool QProcess_WaitForStarted(QProcess* self); bool QProcess_WaitForReadyRead(QProcess* self); @@ -91,7 +91,7 @@ bool QProcess_WaitForFinished(QProcess* self); QByteArray* QProcess_ReadAllStandardOutput(QProcess* self); QByteArray* QProcess_ReadAllStandardError(QProcess* self); int QProcess_ExitCode(const QProcess* self); -uintptr_t QProcess_ExitStatus(const QProcess* self); +int QProcess_ExitStatus(const QProcess* self); long long QProcess_BytesAvailable(const QProcess* self); long long QProcess_BytesToWrite(const QProcess* self); bool QProcess_IsSequential(const QProcess* self); @@ -109,11 +109,11 @@ void QProcess_Terminate(QProcess* self); void QProcess_Kill(QProcess* self); void QProcess_Finished(QProcess* self, int exitCode); void QProcess_connect_Finished(QProcess* self, void* slot); -void QProcess_Finished2(QProcess* self, int exitCode, uintptr_t exitStatus); +void QProcess_Finished2(QProcess* self, int exitCode, int exitStatus); void QProcess_connect_Finished2(QProcess* self, void* slot); -void QProcess_ErrorWithError(QProcess* self, uintptr_t error); +void QProcess_ErrorWithError(QProcess* self, int error); void QProcess_connect_ErrorWithError(QProcess* self, void* slot); -void QProcess_ErrorOccurred(QProcess* self, uintptr_t error); +void QProcess_ErrorOccurred(QProcess* self, int error); void QProcess_connect_ErrorOccurred(QProcess* self, void* slot); struct miqt_string* QProcess_Tr2(const char* s, const char* c); struct miqt_string* QProcess_Tr3(const char* s, const char* c, int n); diff --git a/qt/gen_qprogressbar.cpp b/qt/gen_qprogressbar.cpp index 89d1fcc..c765245 100644 --- a/qt/gen_qprogressbar.cpp +++ b/qt/gen_qprogressbar.cpp @@ -79,9 +79,9 @@ QSize* QProgressBar_MinimumSizeHint(const QProgressBar* self) { return new QSize(self->minimumSizeHint()); } -uintptr_t QProgressBar_Orientation(const QProgressBar* self) { +int QProgressBar_Orientation(const QProgressBar* self) { Qt::Orientation _ret = self->orientation(); - return static_cast(_ret); + return static_cast(_ret); } void QProgressBar_SetInvertedAppearance(QProgressBar* self, bool invert) { @@ -92,13 +92,13 @@ bool QProgressBar_InvertedAppearance(const QProgressBar* self) { return self->invertedAppearance(); } -void QProgressBar_SetTextDirection(QProgressBar* self, uintptr_t textDirection) { +void QProgressBar_SetTextDirection(QProgressBar* self, int textDirection) { self->setTextDirection(static_cast(textDirection)); } -uintptr_t QProgressBar_TextDirection(const QProgressBar* self) { +int QProgressBar_TextDirection(const QProgressBar* self) { QProgressBar::Direction _ret = self->textDirection(); - return static_cast(_ret); + return static_cast(_ret); } void QProgressBar_SetFormat(QProgressBar* self, struct miqt_string* format) { @@ -137,7 +137,7 @@ void QProgressBar_SetValue(QProgressBar* self, int value) { self->setValue(static_cast(value)); } -void QProgressBar_SetOrientation(QProgressBar* self, uintptr_t orientation) { +void QProgressBar_SetOrientation(QProgressBar* self, int orientation) { self->setOrientation(static_cast(orientation)); } diff --git a/qt/gen_qprogressbar.go b/qt/gen_qprogressbar.go index c6526b8..cb5c2f9 100644 --- a/qt/gen_qprogressbar.go +++ b/qt/gen_qprogressbar.go @@ -110,7 +110,7 @@ func (this *QProgressBar) Alignment() int { } func (this *QProgressBar) SetAlignment(alignment int) { - C.QProgressBar_SetAlignment(this.h, (C.int)(alignment)) + C.QProgressBar_SetAlignment(this.h, alignment) } func (this *QProgressBar) SizeHint() *QSize { @@ -140,7 +140,7 @@ func (this *QProgressBar) InvertedAppearance() bool { } func (this *QProgressBar) SetTextDirection(textDirection QProgressBar__Direction) { - C.QProgressBar_SetTextDirection(this.h, (C.uintptr_t)(textDirection)) + C.QProgressBar_SetTextDirection(this.h, (C.int)(textDirection)) } func (this *QProgressBar) TextDirection() QProgressBar__Direction { @@ -185,7 +185,7 @@ func (this *QProgressBar) SetValue(value int) { } func (this *QProgressBar) SetOrientation(orientation Orientation) { - C.QProgressBar_SetOrientation(this.h, (C.uintptr_t)(orientation)) + C.QProgressBar_SetOrientation(this.h, (C.int)(orientation)) } func (this *QProgressBar) ValueChanged(value int) { diff --git a/qt/gen_qprogressbar.h b/qt/gen_qprogressbar.h index 7eef54f..a0d551f 100644 --- a/qt/gen_qprogressbar.h +++ b/qt/gen_qprogressbar.h @@ -40,11 +40,11 @@ int QProgressBar_Alignment(const QProgressBar* self); void QProgressBar_SetAlignment(QProgressBar* self, int alignment); QSize* QProgressBar_SizeHint(const QProgressBar* self); QSize* QProgressBar_MinimumSizeHint(const QProgressBar* self); -uintptr_t QProgressBar_Orientation(const QProgressBar* self); +int QProgressBar_Orientation(const QProgressBar* self); void QProgressBar_SetInvertedAppearance(QProgressBar* self, bool invert); bool QProgressBar_InvertedAppearance(const QProgressBar* self); -void QProgressBar_SetTextDirection(QProgressBar* self, uintptr_t textDirection); -uintptr_t QProgressBar_TextDirection(const QProgressBar* self); +void QProgressBar_SetTextDirection(QProgressBar* self, int textDirection); +int QProgressBar_TextDirection(const QProgressBar* self); void QProgressBar_SetFormat(QProgressBar* self, struct miqt_string* format); void QProgressBar_ResetFormat(QProgressBar* self); struct miqt_string* QProgressBar_Format(const QProgressBar* self); @@ -53,7 +53,7 @@ void QProgressBar_SetRange(QProgressBar* self, int minimum, int maximum); void QProgressBar_SetMinimum(QProgressBar* self, int minimum); void QProgressBar_SetMaximum(QProgressBar* self, int maximum); void QProgressBar_SetValue(QProgressBar* self, int value); -void QProgressBar_SetOrientation(QProgressBar* self, uintptr_t orientation); +void QProgressBar_SetOrientation(QProgressBar* self, int orientation); void QProgressBar_ValueChanged(QProgressBar* self, int value); void QProgressBar_connect_ValueChanged(QProgressBar* self, void* slot); struct miqt_string* QProgressBar_Tr2(const char* s, const char* c); diff --git a/qt/gen_qprogressdialog.go b/qt/gen_qprogressdialog.go index 210b2c6..6f76bf3 100644 --- a/qt/gen_qprogressdialog.go +++ b/qt/gen_qprogressdialog.go @@ -61,7 +61,7 @@ func NewQProgressDialog3(parent *QWidget) *QProgressDialog { // NewQProgressDialog4 constructs a new QProgressDialog object. func NewQProgressDialog4(parent *QWidget, flags int) *QProgressDialog { - ret := C.QProgressDialog_new4(parent.cPointer(), (C.int)(flags)) + ret := C.QProgressDialog_new4(parent.cPointer(), flags) return newQProgressDialog(ret) } @@ -81,7 +81,7 @@ func NewQProgressDialog6(labelText string, cancelButtonText string, minimum int, defer C.free(labelText_ms) cancelButtonText_ms := miqt_strdupg(cancelButtonText) defer C.free(cancelButtonText_ms) - ret := C.QProgressDialog_new6((*C.struct_miqt_string)(labelText_ms), (*C.struct_miqt_string)(cancelButtonText_ms), (C.int)(minimum), (C.int)(maximum), parent.cPointer(), (C.int)(flags)) + ret := C.QProgressDialog_new6((*C.struct_miqt_string)(labelText_ms), (*C.struct_miqt_string)(cancelButtonText_ms), (C.int)(minimum), (C.int)(maximum), parent.cPointer(), flags) return newQProgressDialog(ret) } diff --git a/qt/gen_qproxystyle.cpp b/qt/gen_qproxystyle.cpp index 7852249..c493ddd 100644 --- a/qt/gen_qproxystyle.cpp +++ b/qt/gen_qproxystyle.cpp @@ -60,15 +60,15 @@ void QProxyStyle_SetBaseStyle(QProxyStyle* self, QStyle* style) { self->setBaseStyle(style); } -void QProxyStyle_DrawPrimitive(const QProxyStyle* self, uintptr_t element, QStyleOption* option, QPainter* painter) { +void QProxyStyle_DrawPrimitive(const QProxyStyle* self, int element, QStyleOption* option, QPainter* painter) { self->drawPrimitive(static_cast(element), option, painter); } -void QProxyStyle_DrawControl(const QProxyStyle* self, uintptr_t element, QStyleOption* option, QPainter* painter) { +void QProxyStyle_DrawControl(const QProxyStyle* self, int element, QStyleOption* option, QPainter* painter) { self->drawControl(static_cast(element), option, painter); } -void QProxyStyle_DrawComplexControl(const QProxyStyle* self, uintptr_t control, QStyleOptionComplex* option, QPainter* painter) { +void QProxyStyle_DrawComplexControl(const QProxyStyle* self, int control, QStyleOptionComplex* option, QPainter* painter) { self->drawComplexControl(static_cast(control), option, painter); } @@ -81,15 +81,15 @@ void QProxyStyle_DrawItemPixmap(const QProxyStyle* self, QPainter* painter, QRec self->drawItemPixmap(painter, *rect, static_cast(alignment), *pixmap); } -QSize* QProxyStyle_SizeFromContents(const QProxyStyle* self, uintptr_t typeVal, QStyleOption* option, QSize* size, QWidget* widget) { +QSize* QProxyStyle_SizeFromContents(const QProxyStyle* self, int typeVal, QStyleOption* option, QSize* size, QWidget* widget) { return new QSize(self->sizeFromContents(static_cast(typeVal), option, *size, widget)); } -QRect* QProxyStyle_SubElementRect(const QProxyStyle* self, uintptr_t element, QStyleOption* option, QWidget* widget) { +QRect* QProxyStyle_SubElementRect(const QProxyStyle* self, int element, QStyleOption* option, QWidget* widget) { return new QRect(self->subElementRect(static_cast(element), option, widget)); } -QRect* QProxyStyle_SubControlRect(const QProxyStyle* self, uintptr_t cc, QStyleOptionComplex* opt, uintptr_t sc, QWidget* widget) { +QRect* QProxyStyle_SubControlRect(const QProxyStyle* self, int cc, QStyleOptionComplex* opt, int sc, QWidget* widget) { return new QRect(self->subControlRect(static_cast(cc), opt, static_cast(sc), widget)); } @@ -102,32 +102,32 @@ QRect* QProxyStyle_ItemPixmapRect(const QProxyStyle* self, QRect* r, int flags, return new QRect(self->itemPixmapRect(*r, static_cast(flags), *pixmap)); } -uintptr_t QProxyStyle_HitTestComplexControl(const QProxyStyle* self, uintptr_t control, QStyleOptionComplex* option, QPoint* pos) { +int QProxyStyle_HitTestComplexControl(const QProxyStyle* self, int control, QStyleOptionComplex* option, QPoint* pos) { QStyle::SubControl _ret = self->hitTestComplexControl(static_cast(control), option, *pos); - return static_cast(_ret); + return static_cast(_ret); } -int QProxyStyle_StyleHint(const QProxyStyle* self, uintptr_t hint) { +int QProxyStyle_StyleHint(const QProxyStyle* self, int hint) { return self->styleHint(static_cast(hint)); } -int QProxyStyle_PixelMetric(const QProxyStyle* self, uintptr_t metric) { +int QProxyStyle_PixelMetric(const QProxyStyle* self, int metric) { return self->pixelMetric(static_cast(metric)); } -int QProxyStyle_LayoutSpacing(const QProxyStyle* self, uintptr_t control1, uintptr_t control2, uintptr_t orientation) { +int QProxyStyle_LayoutSpacing(const QProxyStyle* self, int control1, int control2, int orientation) { return self->layoutSpacing(static_cast(control1), static_cast(control2), static_cast(orientation)); } -QIcon* QProxyStyle_StandardIcon(const QProxyStyle* self, uintptr_t standardIcon) { +QIcon* QProxyStyle_StandardIcon(const QProxyStyle* self, int standardIcon) { return new QIcon(self->standardIcon(static_cast(standardIcon))); } -QPixmap* QProxyStyle_StandardPixmap(const QProxyStyle* self, uintptr_t standardPixmap, QStyleOption* opt) { +QPixmap* QProxyStyle_StandardPixmap(const QProxyStyle* self, int standardPixmap, QStyleOption* opt) { return new QPixmap(self->standardPixmap(static_cast(standardPixmap), opt)); } -QPixmap* QProxyStyle_GeneratedIconPixmap(const QProxyStyle* self, uintptr_t iconMode, QPixmap* pixmap, QStyleOption* opt) { +QPixmap* QProxyStyle_GeneratedIconPixmap(const QProxyStyle* self, int iconMode, QPixmap* pixmap, QStyleOption* opt) { return new QPixmap(self->generatedIconPixmap(static_cast(iconMode), *pixmap, opt)); } @@ -183,65 +183,65 @@ struct miqt_string* QProxyStyle_TrUtf83(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -void QProxyStyle_DrawPrimitive4(const QProxyStyle* self, uintptr_t element, QStyleOption* option, QPainter* painter, QWidget* widget) { +void QProxyStyle_DrawPrimitive4(const QProxyStyle* self, int element, QStyleOption* option, QPainter* painter, QWidget* widget) { self->drawPrimitive(static_cast(element), option, painter, widget); } -void QProxyStyle_DrawControl4(const QProxyStyle* self, uintptr_t element, QStyleOption* option, QPainter* painter, QWidget* widget) { +void QProxyStyle_DrawControl4(const QProxyStyle* self, int element, QStyleOption* option, QPainter* painter, QWidget* widget) { self->drawControl(static_cast(element), option, painter, widget); } -void QProxyStyle_DrawComplexControl4(const QProxyStyle* self, uintptr_t control, QStyleOptionComplex* option, QPainter* painter, QWidget* widget) { +void QProxyStyle_DrawComplexControl4(const QProxyStyle* self, int control, QStyleOptionComplex* option, QPainter* painter, QWidget* widget) { self->drawComplexControl(static_cast(control), option, painter, widget); } -void QProxyStyle_DrawItemText7(const QProxyStyle* self, QPainter* painter, QRect* rect, int flags, QPalette* pal, bool enabled, struct miqt_string* text, uintptr_t textRole) { +void QProxyStyle_DrawItemText7(const QProxyStyle* self, QPainter* painter, QRect* rect, int flags, QPalette* pal, bool enabled, struct miqt_string* text, int textRole) { QString text_QString = QString::fromUtf8(&text->data, text->len); self->drawItemText(painter, *rect, static_cast(flags), *pal, enabled, text_QString, static_cast(textRole)); } -uintptr_t QProxyStyle_HitTestComplexControl4(const QProxyStyle* self, uintptr_t control, QStyleOptionComplex* option, QPoint* pos, QWidget* widget) { +int QProxyStyle_HitTestComplexControl4(const QProxyStyle* self, int control, QStyleOptionComplex* option, QPoint* pos, QWidget* widget) { QStyle::SubControl _ret = self->hitTestComplexControl(static_cast(control), option, *pos, widget); - return static_cast(_ret); + return static_cast(_ret); } -int QProxyStyle_StyleHint2(const QProxyStyle* self, uintptr_t hint, QStyleOption* option) { +int QProxyStyle_StyleHint2(const QProxyStyle* self, int hint, QStyleOption* option) { return self->styleHint(static_cast(hint), option); } -int QProxyStyle_StyleHint3(const QProxyStyle* self, uintptr_t hint, QStyleOption* option, QWidget* widget) { +int QProxyStyle_StyleHint3(const QProxyStyle* self, int hint, QStyleOption* option, QWidget* widget) { return self->styleHint(static_cast(hint), option, widget); } -int QProxyStyle_StyleHint4(const QProxyStyle* self, uintptr_t hint, QStyleOption* option, QWidget* widget, QStyleHintReturn* returnData) { +int QProxyStyle_StyleHint4(const QProxyStyle* self, int hint, QStyleOption* option, QWidget* widget, QStyleHintReturn* returnData) { return self->styleHint(static_cast(hint), option, widget, returnData); } -int QProxyStyle_PixelMetric2(const QProxyStyle* self, uintptr_t metric, QStyleOption* option) { +int QProxyStyle_PixelMetric2(const QProxyStyle* self, int metric, QStyleOption* option) { return self->pixelMetric(static_cast(metric), option); } -int QProxyStyle_PixelMetric3(const QProxyStyle* self, uintptr_t metric, QStyleOption* option, QWidget* widget) { +int QProxyStyle_PixelMetric3(const QProxyStyle* self, int metric, QStyleOption* option, QWidget* widget) { return self->pixelMetric(static_cast(metric), option, widget); } -int QProxyStyle_LayoutSpacing4(const QProxyStyle* self, uintptr_t control1, uintptr_t control2, uintptr_t orientation, QStyleOption* option) { +int QProxyStyle_LayoutSpacing4(const QProxyStyle* self, int control1, int control2, int orientation, QStyleOption* option) { return self->layoutSpacing(static_cast(control1), static_cast(control2), static_cast(orientation), option); } -int QProxyStyle_LayoutSpacing5(const QProxyStyle* self, uintptr_t control1, uintptr_t control2, uintptr_t orientation, QStyleOption* option, QWidget* widget) { +int QProxyStyle_LayoutSpacing5(const QProxyStyle* self, int control1, int control2, int orientation, QStyleOption* option, QWidget* widget) { return self->layoutSpacing(static_cast(control1), static_cast(control2), static_cast(orientation), option, widget); } -QIcon* QProxyStyle_StandardIcon2(const QProxyStyle* self, uintptr_t standardIcon, QStyleOption* option) { +QIcon* QProxyStyle_StandardIcon2(const QProxyStyle* self, int standardIcon, QStyleOption* option) { return new QIcon(self->standardIcon(static_cast(standardIcon), option)); } -QIcon* QProxyStyle_StandardIcon3(const QProxyStyle* self, uintptr_t standardIcon, QStyleOption* option, QWidget* widget) { +QIcon* QProxyStyle_StandardIcon3(const QProxyStyle* self, int standardIcon, QStyleOption* option, QWidget* widget) { return new QIcon(self->standardIcon(static_cast(standardIcon), option, widget)); } -QPixmap* QProxyStyle_StandardPixmap3(const QProxyStyle* self, uintptr_t standardPixmap, QStyleOption* opt, QWidget* widget) { +QPixmap* QProxyStyle_StandardPixmap3(const QProxyStyle* self, int standardPixmap, QStyleOption* opt, QWidget* widget) { return new QPixmap(self->standardPixmap(static_cast(standardPixmap), opt, widget)); } diff --git a/qt/gen_qproxystyle.go b/qt/gen_qproxystyle.go index 6b3abba..e5e8187 100644 --- a/qt/gen_qproxystyle.go +++ b/qt/gen_qproxystyle.go @@ -87,15 +87,15 @@ func (this *QProxyStyle) SetBaseStyle(style *QStyle) { } func (this *QProxyStyle) DrawPrimitive(element QStyle__PrimitiveElement, option *QStyleOption, painter *QPainter) { - C.QProxyStyle_DrawPrimitive(this.h, (C.uintptr_t)(element), option.cPointer(), painter.cPointer()) + C.QProxyStyle_DrawPrimitive(this.h, (C.int)(element), option.cPointer(), painter.cPointer()) } func (this *QProxyStyle) DrawControl(element QStyle__ControlElement, option *QStyleOption, painter *QPainter) { - C.QProxyStyle_DrawControl(this.h, (C.uintptr_t)(element), option.cPointer(), painter.cPointer()) + C.QProxyStyle_DrawControl(this.h, (C.int)(element), option.cPointer(), painter.cPointer()) } func (this *QProxyStyle) DrawComplexControl(control QStyle__ComplexControl, option *QStyleOptionComplex, painter *QPainter) { - C.QProxyStyle_DrawComplexControl(this.h, (C.uintptr_t)(control), option.cPointer(), painter.cPointer()) + C.QProxyStyle_DrawComplexControl(this.h, (C.int)(control), option.cPointer(), painter.cPointer()) } func (this *QProxyStyle) DrawItemText(painter *QPainter, rect *QRect, flags int, pal *QPalette, enabled bool, text string) { @@ -109,21 +109,21 @@ func (this *QProxyStyle) DrawItemPixmap(painter *QPainter, rect *QRect, alignmen } func (this *QProxyStyle) SizeFromContents(typeVal QStyle__ContentsType, option *QStyleOption, size *QSize, widget *QWidget) *QSize { - _ret := C.QProxyStyle_SizeFromContents(this.h, (C.uintptr_t)(typeVal), option.cPointer(), size.cPointer(), widget.cPointer()) + _ret := C.QProxyStyle_SizeFromContents(this.h, (C.int)(typeVal), option.cPointer(), size.cPointer(), widget.cPointer()) _goptr := newQSize(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QProxyStyle) SubElementRect(element QStyle__SubElement, option *QStyleOption, widget *QWidget) *QRect { - _ret := C.QProxyStyle_SubElementRect(this.h, (C.uintptr_t)(element), option.cPointer(), widget.cPointer()) + _ret := C.QProxyStyle_SubElementRect(this.h, (C.int)(element), option.cPointer(), widget.cPointer()) _goptr := newQRect(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QProxyStyle) SubControlRect(cc QStyle__ComplexControl, opt *QStyleOptionComplex, sc QStyle__SubControl, widget *QWidget) *QRect { - _ret := C.QProxyStyle_SubControlRect(this.h, (C.uintptr_t)(cc), opt.cPointer(), (C.uintptr_t)(sc), widget.cPointer()) + _ret := C.QProxyStyle_SubControlRect(this.h, (C.int)(cc), opt.cPointer(), (C.int)(sc), widget.cPointer()) _goptr := newQRect(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -146,37 +146,37 @@ func (this *QProxyStyle) ItemPixmapRect(r *QRect, flags int, pixmap *QPixmap) *Q } func (this *QProxyStyle) HitTestComplexControl(control QStyle__ComplexControl, option *QStyleOptionComplex, pos *QPoint) QStyle__SubControl { - return (QStyle__SubControl)(C.QProxyStyle_HitTestComplexControl(this.h, (C.uintptr_t)(control), option.cPointer(), pos.cPointer())) + return (QStyle__SubControl)(C.QProxyStyle_HitTestComplexControl(this.h, (C.int)(control), option.cPointer(), pos.cPointer())) } func (this *QProxyStyle) StyleHint(hint QStyle__StyleHint) int { - return (int)(C.QProxyStyle_StyleHint(this.h, (C.uintptr_t)(hint))) + return (int)(C.QProxyStyle_StyleHint(this.h, (C.int)(hint))) } func (this *QProxyStyle) PixelMetric(metric QStyle__PixelMetric) int { - return (int)(C.QProxyStyle_PixelMetric(this.h, (C.uintptr_t)(metric))) + return (int)(C.QProxyStyle_PixelMetric(this.h, (C.int)(metric))) } func (this *QProxyStyle) LayoutSpacing(control1 QSizePolicy__ControlType, control2 QSizePolicy__ControlType, orientation Orientation) int { - return (int)(C.QProxyStyle_LayoutSpacing(this.h, (C.uintptr_t)(control1), (C.uintptr_t)(control2), (C.uintptr_t)(orientation))) + return (int)(C.QProxyStyle_LayoutSpacing(this.h, (C.int)(control1), (C.int)(control2), (C.int)(orientation))) } func (this *QProxyStyle) StandardIcon(standardIcon QStyle__StandardPixmap) *QIcon { - _ret := C.QProxyStyle_StandardIcon(this.h, (C.uintptr_t)(standardIcon)) + _ret := C.QProxyStyle_StandardIcon(this.h, (C.int)(standardIcon)) _goptr := newQIcon(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QProxyStyle) StandardPixmap(standardPixmap QStyle__StandardPixmap, opt *QStyleOption) *QPixmap { - _ret := C.QProxyStyle_StandardPixmap(this.h, (C.uintptr_t)(standardPixmap), opt.cPointer()) + _ret := C.QProxyStyle_StandardPixmap(this.h, (C.int)(standardPixmap), opt.cPointer()) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QProxyStyle) GeneratedIconPixmap(iconMode QIcon__Mode, pixmap *QPixmap, opt *QStyleOption) *QPixmap { - _ret := C.QProxyStyle_GeneratedIconPixmap(this.h, (C.uintptr_t)(iconMode), pixmap.cPointer(), opt.cPointer()) + _ret := C.QProxyStyle_GeneratedIconPixmap(this.h, (C.int)(iconMode), pixmap.cPointer(), opt.cPointer()) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -254,71 +254,71 @@ func QProxyStyle_TrUtf83(s string, c string, n int) string { } func (this *QProxyStyle) DrawPrimitive4(element QStyle__PrimitiveElement, option *QStyleOption, painter *QPainter, widget *QWidget) { - C.QProxyStyle_DrawPrimitive4(this.h, (C.uintptr_t)(element), option.cPointer(), painter.cPointer(), widget.cPointer()) + C.QProxyStyle_DrawPrimitive4(this.h, (C.int)(element), option.cPointer(), painter.cPointer(), widget.cPointer()) } func (this *QProxyStyle) DrawControl4(element QStyle__ControlElement, option *QStyleOption, painter *QPainter, widget *QWidget) { - C.QProxyStyle_DrawControl4(this.h, (C.uintptr_t)(element), option.cPointer(), painter.cPointer(), widget.cPointer()) + C.QProxyStyle_DrawControl4(this.h, (C.int)(element), option.cPointer(), painter.cPointer(), widget.cPointer()) } func (this *QProxyStyle) DrawComplexControl4(control QStyle__ComplexControl, option *QStyleOptionComplex, painter *QPainter, widget *QWidget) { - C.QProxyStyle_DrawComplexControl4(this.h, (C.uintptr_t)(control), option.cPointer(), painter.cPointer(), widget.cPointer()) + C.QProxyStyle_DrawComplexControl4(this.h, (C.int)(control), option.cPointer(), painter.cPointer(), widget.cPointer()) } func (this *QProxyStyle) DrawItemText7(painter *QPainter, rect *QRect, flags int, pal *QPalette, enabled bool, text string, textRole QPalette__ColorRole) { text_ms := miqt_strdupg(text) defer C.free(text_ms) - C.QProxyStyle_DrawItemText7(this.h, painter.cPointer(), rect.cPointer(), (C.int)(flags), pal.cPointer(), (C.bool)(enabled), (*C.struct_miqt_string)(text_ms), (C.uintptr_t)(textRole)) + C.QProxyStyle_DrawItemText7(this.h, painter.cPointer(), rect.cPointer(), (C.int)(flags), pal.cPointer(), (C.bool)(enabled), (*C.struct_miqt_string)(text_ms), (C.int)(textRole)) } func (this *QProxyStyle) HitTestComplexControl4(control QStyle__ComplexControl, option *QStyleOptionComplex, pos *QPoint, widget *QWidget) QStyle__SubControl { - return (QStyle__SubControl)(C.QProxyStyle_HitTestComplexControl4(this.h, (C.uintptr_t)(control), option.cPointer(), pos.cPointer(), widget.cPointer())) + return (QStyle__SubControl)(C.QProxyStyle_HitTestComplexControl4(this.h, (C.int)(control), option.cPointer(), pos.cPointer(), widget.cPointer())) } func (this *QProxyStyle) StyleHint2(hint QStyle__StyleHint, option *QStyleOption) int { - return (int)(C.QProxyStyle_StyleHint2(this.h, (C.uintptr_t)(hint), option.cPointer())) + return (int)(C.QProxyStyle_StyleHint2(this.h, (C.int)(hint), option.cPointer())) } func (this *QProxyStyle) StyleHint3(hint QStyle__StyleHint, option *QStyleOption, widget *QWidget) int { - return (int)(C.QProxyStyle_StyleHint3(this.h, (C.uintptr_t)(hint), option.cPointer(), widget.cPointer())) + return (int)(C.QProxyStyle_StyleHint3(this.h, (C.int)(hint), option.cPointer(), widget.cPointer())) } func (this *QProxyStyle) StyleHint4(hint QStyle__StyleHint, option *QStyleOption, widget *QWidget, returnData *QStyleHintReturn) int { - return (int)(C.QProxyStyle_StyleHint4(this.h, (C.uintptr_t)(hint), option.cPointer(), widget.cPointer(), returnData.cPointer())) + return (int)(C.QProxyStyle_StyleHint4(this.h, (C.int)(hint), option.cPointer(), widget.cPointer(), returnData.cPointer())) } func (this *QProxyStyle) PixelMetric2(metric QStyle__PixelMetric, option *QStyleOption) int { - return (int)(C.QProxyStyle_PixelMetric2(this.h, (C.uintptr_t)(metric), option.cPointer())) + return (int)(C.QProxyStyle_PixelMetric2(this.h, (C.int)(metric), option.cPointer())) } func (this *QProxyStyle) PixelMetric3(metric QStyle__PixelMetric, option *QStyleOption, widget *QWidget) int { - return (int)(C.QProxyStyle_PixelMetric3(this.h, (C.uintptr_t)(metric), option.cPointer(), widget.cPointer())) + return (int)(C.QProxyStyle_PixelMetric3(this.h, (C.int)(metric), option.cPointer(), widget.cPointer())) } func (this *QProxyStyle) LayoutSpacing4(control1 QSizePolicy__ControlType, control2 QSizePolicy__ControlType, orientation Orientation, option *QStyleOption) int { - return (int)(C.QProxyStyle_LayoutSpacing4(this.h, (C.uintptr_t)(control1), (C.uintptr_t)(control2), (C.uintptr_t)(orientation), option.cPointer())) + return (int)(C.QProxyStyle_LayoutSpacing4(this.h, (C.int)(control1), (C.int)(control2), (C.int)(orientation), option.cPointer())) } func (this *QProxyStyle) LayoutSpacing5(control1 QSizePolicy__ControlType, control2 QSizePolicy__ControlType, orientation Orientation, option *QStyleOption, widget *QWidget) int { - return (int)(C.QProxyStyle_LayoutSpacing5(this.h, (C.uintptr_t)(control1), (C.uintptr_t)(control2), (C.uintptr_t)(orientation), option.cPointer(), widget.cPointer())) + return (int)(C.QProxyStyle_LayoutSpacing5(this.h, (C.int)(control1), (C.int)(control2), (C.int)(orientation), option.cPointer(), widget.cPointer())) } func (this *QProxyStyle) StandardIcon2(standardIcon QStyle__StandardPixmap, option *QStyleOption) *QIcon { - _ret := C.QProxyStyle_StandardIcon2(this.h, (C.uintptr_t)(standardIcon), option.cPointer()) + _ret := C.QProxyStyle_StandardIcon2(this.h, (C.int)(standardIcon), option.cPointer()) _goptr := newQIcon(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QProxyStyle) StandardIcon3(standardIcon QStyle__StandardPixmap, option *QStyleOption, widget *QWidget) *QIcon { - _ret := C.QProxyStyle_StandardIcon3(this.h, (C.uintptr_t)(standardIcon), option.cPointer(), widget.cPointer()) + _ret := C.QProxyStyle_StandardIcon3(this.h, (C.int)(standardIcon), option.cPointer(), widget.cPointer()) _goptr := newQIcon(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QProxyStyle) StandardPixmap3(standardPixmap QStyle__StandardPixmap, opt *QStyleOption, widget *QWidget) *QPixmap { - _ret := C.QProxyStyle_StandardPixmap3(this.h, (C.uintptr_t)(standardPixmap), opt.cPointer(), widget.cPointer()) + _ret := C.QProxyStyle_StandardPixmap3(this.h, (C.int)(standardPixmap), opt.cPointer(), widget.cPointer()) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qproxystyle.h b/qt/gen_qproxystyle.h index a1f02f7..e36c05a 100644 --- a/qt/gen_qproxystyle.h +++ b/qt/gen_qproxystyle.h @@ -57,23 +57,23 @@ struct miqt_string* QProxyStyle_Tr(const char* s); struct miqt_string* QProxyStyle_TrUtf8(const char* s); QStyle* QProxyStyle_BaseStyle(const QProxyStyle* self); void QProxyStyle_SetBaseStyle(QProxyStyle* self, QStyle* style); -void QProxyStyle_DrawPrimitive(const QProxyStyle* self, uintptr_t element, QStyleOption* option, QPainter* painter); -void QProxyStyle_DrawControl(const QProxyStyle* self, uintptr_t element, QStyleOption* option, QPainter* painter); -void QProxyStyle_DrawComplexControl(const QProxyStyle* self, uintptr_t control, QStyleOptionComplex* option, QPainter* painter); +void QProxyStyle_DrawPrimitive(const QProxyStyle* self, int element, QStyleOption* option, QPainter* painter); +void QProxyStyle_DrawControl(const QProxyStyle* self, int element, QStyleOption* option, QPainter* painter); +void QProxyStyle_DrawComplexControl(const QProxyStyle* self, int control, QStyleOptionComplex* option, QPainter* painter); void QProxyStyle_DrawItemText(const QProxyStyle* self, QPainter* painter, QRect* rect, int flags, QPalette* pal, bool enabled, struct miqt_string* text); void QProxyStyle_DrawItemPixmap(const QProxyStyle* self, QPainter* painter, QRect* rect, int alignment, QPixmap* pixmap); -QSize* QProxyStyle_SizeFromContents(const QProxyStyle* self, uintptr_t typeVal, QStyleOption* option, QSize* size, QWidget* widget); -QRect* QProxyStyle_SubElementRect(const QProxyStyle* self, uintptr_t element, QStyleOption* option, QWidget* widget); -QRect* QProxyStyle_SubControlRect(const QProxyStyle* self, uintptr_t cc, QStyleOptionComplex* opt, uintptr_t sc, QWidget* widget); +QSize* QProxyStyle_SizeFromContents(const QProxyStyle* self, int typeVal, QStyleOption* option, QSize* size, QWidget* widget); +QRect* QProxyStyle_SubElementRect(const QProxyStyle* self, int element, QStyleOption* option, QWidget* widget); +QRect* QProxyStyle_SubControlRect(const QProxyStyle* self, int cc, QStyleOptionComplex* opt, int sc, QWidget* widget); QRect* QProxyStyle_ItemTextRect(const QProxyStyle* self, QFontMetrics* fm, QRect* r, int flags, bool enabled, struct miqt_string* text); QRect* QProxyStyle_ItemPixmapRect(const QProxyStyle* self, QRect* r, int flags, QPixmap* pixmap); -uintptr_t QProxyStyle_HitTestComplexControl(const QProxyStyle* self, uintptr_t control, QStyleOptionComplex* option, QPoint* pos); -int QProxyStyle_StyleHint(const QProxyStyle* self, uintptr_t hint); -int QProxyStyle_PixelMetric(const QProxyStyle* self, uintptr_t metric); -int QProxyStyle_LayoutSpacing(const QProxyStyle* self, uintptr_t control1, uintptr_t control2, uintptr_t orientation); -QIcon* QProxyStyle_StandardIcon(const QProxyStyle* self, uintptr_t standardIcon); -QPixmap* QProxyStyle_StandardPixmap(const QProxyStyle* self, uintptr_t standardPixmap, QStyleOption* opt); -QPixmap* QProxyStyle_GeneratedIconPixmap(const QProxyStyle* self, uintptr_t iconMode, QPixmap* pixmap, QStyleOption* opt); +int QProxyStyle_HitTestComplexControl(const QProxyStyle* self, int control, QStyleOptionComplex* option, QPoint* pos); +int QProxyStyle_StyleHint(const QProxyStyle* self, int hint); +int QProxyStyle_PixelMetric(const QProxyStyle* self, int metric); +int QProxyStyle_LayoutSpacing(const QProxyStyle* self, int control1, int control2, int orientation); +QIcon* QProxyStyle_StandardIcon(const QProxyStyle* self, int standardIcon); +QPixmap* QProxyStyle_StandardPixmap(const QProxyStyle* self, int standardPixmap, QStyleOption* opt); +QPixmap* QProxyStyle_GeneratedIconPixmap(const QProxyStyle* self, int iconMode, QPixmap* pixmap, QStyleOption* opt); QPalette* QProxyStyle_StandardPalette(const QProxyStyle* self); void QProxyStyle_Polish(QProxyStyle* self, QWidget* widget); void QProxyStyle_PolishWithPal(QProxyStyle* self, QPalette* pal); @@ -84,21 +84,21 @@ struct miqt_string* QProxyStyle_Tr2(const char* s, const char* c); struct miqt_string* QProxyStyle_Tr3(const char* s, const char* c, int n); struct miqt_string* QProxyStyle_TrUtf82(const char* s, const char* c); struct miqt_string* QProxyStyle_TrUtf83(const char* s, const char* c, int n); -void QProxyStyle_DrawPrimitive4(const QProxyStyle* self, uintptr_t element, QStyleOption* option, QPainter* painter, QWidget* widget); -void QProxyStyle_DrawControl4(const QProxyStyle* self, uintptr_t element, QStyleOption* option, QPainter* painter, QWidget* widget); -void QProxyStyle_DrawComplexControl4(const QProxyStyle* self, uintptr_t control, QStyleOptionComplex* option, QPainter* painter, QWidget* widget); -void QProxyStyle_DrawItemText7(const QProxyStyle* self, QPainter* painter, QRect* rect, int flags, QPalette* pal, bool enabled, struct miqt_string* text, uintptr_t textRole); -uintptr_t QProxyStyle_HitTestComplexControl4(const QProxyStyle* self, uintptr_t control, QStyleOptionComplex* option, QPoint* pos, QWidget* widget); -int QProxyStyle_StyleHint2(const QProxyStyle* self, uintptr_t hint, QStyleOption* option); -int QProxyStyle_StyleHint3(const QProxyStyle* self, uintptr_t hint, QStyleOption* option, QWidget* widget); -int QProxyStyle_StyleHint4(const QProxyStyle* self, uintptr_t hint, QStyleOption* option, QWidget* widget, QStyleHintReturn* returnData); -int QProxyStyle_PixelMetric2(const QProxyStyle* self, uintptr_t metric, QStyleOption* option); -int QProxyStyle_PixelMetric3(const QProxyStyle* self, uintptr_t metric, QStyleOption* option, QWidget* widget); -int QProxyStyle_LayoutSpacing4(const QProxyStyle* self, uintptr_t control1, uintptr_t control2, uintptr_t orientation, QStyleOption* option); -int QProxyStyle_LayoutSpacing5(const QProxyStyle* self, uintptr_t control1, uintptr_t control2, uintptr_t orientation, QStyleOption* option, QWidget* widget); -QIcon* QProxyStyle_StandardIcon2(const QProxyStyle* self, uintptr_t standardIcon, QStyleOption* option); -QIcon* QProxyStyle_StandardIcon3(const QProxyStyle* self, uintptr_t standardIcon, QStyleOption* option, QWidget* widget); -QPixmap* QProxyStyle_StandardPixmap3(const QProxyStyle* self, uintptr_t standardPixmap, QStyleOption* opt, QWidget* widget); +void QProxyStyle_DrawPrimitive4(const QProxyStyle* self, int element, QStyleOption* option, QPainter* painter, QWidget* widget); +void QProxyStyle_DrawControl4(const QProxyStyle* self, int element, QStyleOption* option, QPainter* painter, QWidget* widget); +void QProxyStyle_DrawComplexControl4(const QProxyStyle* self, int control, QStyleOptionComplex* option, QPainter* painter, QWidget* widget); +void QProxyStyle_DrawItemText7(const QProxyStyle* self, QPainter* painter, QRect* rect, int flags, QPalette* pal, bool enabled, struct miqt_string* text, int textRole); +int QProxyStyle_HitTestComplexControl4(const QProxyStyle* self, int control, QStyleOptionComplex* option, QPoint* pos, QWidget* widget); +int QProxyStyle_StyleHint2(const QProxyStyle* self, int hint, QStyleOption* option); +int QProxyStyle_StyleHint3(const QProxyStyle* self, int hint, QStyleOption* option, QWidget* widget); +int QProxyStyle_StyleHint4(const QProxyStyle* self, int hint, QStyleOption* option, QWidget* widget, QStyleHintReturn* returnData); +int QProxyStyle_PixelMetric2(const QProxyStyle* self, int metric, QStyleOption* option); +int QProxyStyle_PixelMetric3(const QProxyStyle* self, int metric, QStyleOption* option, QWidget* widget); +int QProxyStyle_LayoutSpacing4(const QProxyStyle* self, int control1, int control2, int orientation, QStyleOption* option); +int QProxyStyle_LayoutSpacing5(const QProxyStyle* self, int control1, int control2, int orientation, QStyleOption* option, QWidget* widget); +QIcon* QProxyStyle_StandardIcon2(const QProxyStyle* self, int standardIcon, QStyleOption* option); +QIcon* QProxyStyle_StandardIcon3(const QProxyStyle* self, int standardIcon, QStyleOption* option, QWidget* widget); +QPixmap* QProxyStyle_StandardPixmap3(const QProxyStyle* self, int standardPixmap, QStyleOption* opt, QWidget* widget); void QProxyStyle_Delete(QProxyStyle* self); #ifdef __cplusplus diff --git a/qt/gen_qquaternion.cpp b/qt/gen_qquaternion.cpp index 6e8a71b..6353632 100644 --- a/qt/gen_qquaternion.cpp +++ b/qt/gen_qquaternion.cpp @@ -9,7 +9,7 @@ QQuaternion* QQuaternion_new() { return new QQuaternion(); } -QQuaternion* QQuaternion_new2(uintptr_t param1) { +QQuaternion* QQuaternion_new2(int param1) { return new QQuaternion(static_cast(param1)); } diff --git a/qt/gen_qquaternion.go b/qt/gen_qquaternion.go index 56580c6..5df9cda 100644 --- a/qt/gen_qquaternion.go +++ b/qt/gen_qquaternion.go @@ -43,7 +43,7 @@ func NewQQuaternion() *QQuaternion { // NewQQuaternion2 constructs a new QQuaternion object. func NewQQuaternion2(param1 Initialization) *QQuaternion { - ret := C.QQuaternion_new2((C.uintptr_t)(param1)) + ret := C.QQuaternion_new2((C.int)(param1)) return newQQuaternion(ret) } diff --git a/qt/gen_qquaternion.h b/qt/gen_qquaternion.h index b186c68..b3146c0 100644 --- a/qt/gen_qquaternion.h +++ b/qt/gen_qquaternion.h @@ -24,7 +24,7 @@ typedef struct QVector4D QVector4D; #endif QQuaternion* QQuaternion_new(); -QQuaternion* QQuaternion_new2(uintptr_t param1); +QQuaternion* QQuaternion_new2(int param1); QQuaternion* QQuaternion_new3(float scalar, float xpos, float ypos, float zpos); QQuaternion* QQuaternion_new4(float scalar, QVector3D* vector); QQuaternion* QQuaternion_new5(QVector4D* vector); diff --git a/qt/gen_qrandom.cpp b/qt/gen_qrandom.cpp index de20c25..9ee9a22 100644 --- a/qt/gen_qrandom.cpp +++ b/qt/gen_qrandom.cpp @@ -29,11 +29,13 @@ void QRandomGenerator_OperatorAssign(QRandomGenerator* self, QRandomGenerator* o } unsigned int QRandomGenerator_Generate(QRandomGenerator* self) { - return self->generate(); + quint32 _ret = self->generate(); + return static_cast(_ret); } unsigned long long QRandomGenerator_Generate64(QRandomGenerator* self) { - return self->generate64(); + quint64 _ret = self->generate64(); + return static_cast(_ret); } double QRandomGenerator_GenerateDouble(QRandomGenerator* self) { @@ -45,11 +47,13 @@ double QRandomGenerator_Bounded(QRandomGenerator* self, double highest) { } unsigned int QRandomGenerator_BoundedWithHighest(QRandomGenerator* self, unsigned int highest) { - return self->bounded(static_cast(highest)); + quint32 _ret = self->bounded(static_cast(highest)); + return static_cast(_ret); } unsigned int QRandomGenerator_Bounded2(QRandomGenerator* self, unsigned int lowest, unsigned int highest) { - return self->bounded(static_cast(lowest), static_cast(highest)); + quint32 _ret = self->bounded(static_cast(lowest), static_cast(highest)); + return static_cast(_ret); } int QRandomGenerator_Bounded3(QRandomGenerator* self, int highest) { @@ -64,8 +68,9 @@ void QRandomGenerator_Generate2(QRandomGenerator* self, unsigned int* begin, uns self->generate(static_cast(begin), static_cast(end)); } -uint32_t QRandomGenerator_OperatorCall(QRandomGenerator* self) { - return self->operator()(); +unsigned int QRandomGenerator_OperatorCall(QRandomGenerator* self) { + QRandomGenerator::result_type _ret = self->operator()(); + return static_cast(_ret); } void QRandomGenerator_Seed(QRandomGenerator* self) { @@ -76,12 +81,14 @@ void QRandomGenerator_Discard(QRandomGenerator* self, unsigned long long z) { self->discard(static_cast(z)); } -uint32_t QRandomGenerator_Min() { - return QRandomGenerator::min(); +unsigned int QRandomGenerator_Min() { + QRandomGenerator::result_type _ret = QRandomGenerator::min(); + return static_cast(_ret); } -uint32_t QRandomGenerator_Max() { - return QRandomGenerator::max(); +unsigned int QRandomGenerator_Max() { + QRandomGenerator::result_type _ret = QRandomGenerator::max(); + return static_cast(_ret); } QRandomGenerator* QRandomGenerator_System() { @@ -129,23 +136,27 @@ QRandomGenerator64* QRandomGenerator64_new6(unsigned int seedValue) { } unsigned long long QRandomGenerator64_Generate(QRandomGenerator64* self) { - return self->generate(); + quint64 _ret = self->generate(); + return static_cast(_ret); } -uint64_t QRandomGenerator64_OperatorCall(QRandomGenerator64* self) { - return self->operator()(); +unsigned long long QRandomGenerator64_OperatorCall(QRandomGenerator64* self) { + QRandomGenerator64::result_type _ret = self->operator()(); + return static_cast(_ret); } void QRandomGenerator64_Discard(QRandomGenerator64* self, unsigned long long z) { self->discard(static_cast(z)); } -uint64_t QRandomGenerator64_Min() { - return QRandomGenerator64::min(); +unsigned long long QRandomGenerator64_Min() { + QRandomGenerator64::result_type _ret = QRandomGenerator64::min(); + return static_cast(_ret); } -uint64_t QRandomGenerator64_Max() { - return QRandomGenerator64::max(); +unsigned long long QRandomGenerator64_Max() { + QRandomGenerator64::result_type _ret = QRandomGenerator64::max(); + return static_cast(_ret); } QRandomGenerator64* QRandomGenerator64_System() { diff --git a/qt/gen_qrandom.go b/qt/gen_qrandom.go index 07a2133..f88017f 100644 --- a/qt/gen_qrandom.go +++ b/qt/gen_qrandom.go @@ -105,8 +105,8 @@ func (this *QRandomGenerator) Generate2(begin *uint, end *uint) { C.QRandomGenerator_Generate2(this.h, (*C.uint)(unsafe.Pointer(begin)), (*C.uint)(unsafe.Pointer(end))) } -func (this *QRandomGenerator) OperatorCall() uint32 { - return (uint32)(C.QRandomGenerator_OperatorCall(this.h)) +func (this *QRandomGenerator) OperatorCall() uint { + return (uint)(C.QRandomGenerator_OperatorCall(this.h)) } func (this *QRandomGenerator) Seed() { @@ -117,12 +117,12 @@ func (this *QRandomGenerator) Discard(z uint64) { C.QRandomGenerator_Discard(this.h, (C.ulonglong)(z)) } -func QRandomGenerator_Min() uint32 { - return (uint32)(C.QRandomGenerator_Min()) +func QRandomGenerator_Min() uint { + return (uint)(C.QRandomGenerator_Min()) } -func QRandomGenerator_Max() uint32 { - return (uint32)(C.QRandomGenerator_Max()) +func QRandomGenerator_Max() uint { + return (uint)(C.QRandomGenerator_Max()) } func QRandomGenerator_System() *QRandomGenerator { diff --git a/qt/gen_qrandom.h b/qt/gen_qrandom.h index 541bbc3..3410c67 100644 --- a/qt/gen_qrandom.h +++ b/qt/gen_qrandom.h @@ -36,11 +36,11 @@ unsigned int QRandomGenerator_Bounded2(QRandomGenerator* self, unsigned int lowe int QRandomGenerator_Bounded3(QRandomGenerator* self, int highest); int QRandomGenerator_Bounded4(QRandomGenerator* self, int lowest, int highest); void QRandomGenerator_Generate2(QRandomGenerator* self, unsigned int* begin, unsigned int* end); -uint32_t QRandomGenerator_OperatorCall(QRandomGenerator* self); +unsigned int QRandomGenerator_OperatorCall(QRandomGenerator* self); void QRandomGenerator_Seed(QRandomGenerator* self); void QRandomGenerator_Discard(QRandomGenerator* self, unsigned long long z); -uint32_t QRandomGenerator_Min(); -uint32_t QRandomGenerator_Max(); +unsigned int QRandomGenerator_Min(); +unsigned int QRandomGenerator_Max(); QRandomGenerator* QRandomGenerator_System(); QRandomGenerator* QRandomGenerator_Global(); QRandomGenerator* QRandomGenerator_SecurelySeeded(); @@ -54,10 +54,10 @@ QRandomGenerator64* QRandomGenerator64_new4(QRandomGenerator* other); QRandomGenerator64* QRandomGenerator64_new5(QRandomGenerator64* param1); QRandomGenerator64* QRandomGenerator64_new6(unsigned int seedValue); unsigned long long QRandomGenerator64_Generate(QRandomGenerator64* self); -uint64_t QRandomGenerator64_OperatorCall(QRandomGenerator64* self); +unsigned long long QRandomGenerator64_OperatorCall(QRandomGenerator64* self); void QRandomGenerator64_Discard(QRandomGenerator64* self, unsigned long long z); -uint64_t QRandomGenerator64_Min(); -uint64_t QRandomGenerator64_Max(); +unsigned long long QRandomGenerator64_Min(); +unsigned long long QRandomGenerator64_Max(); QRandomGenerator64* QRandomGenerator64_System(); QRandomGenerator64* QRandomGenerator64_Global(); QRandomGenerator64* QRandomGenerator64_SecurelySeeded(); diff --git a/qt/gen_qrawfont.cpp b/qt/gen_qrawfont.cpp index 045fda0..d703bbc 100644 --- a/qt/gen_qrawfont.cpp +++ b/qt/gen_qrawfont.cpp @@ -32,12 +32,12 @@ QRawFont* QRawFont_new4(QRawFont* other) { return new QRawFont(*other); } -QRawFont* QRawFont_new5(struct miqt_string* fileName, double pixelSize, uintptr_t hintingPreference) { +QRawFont* QRawFont_new5(struct miqt_string* fileName, double pixelSize, int hintingPreference) { QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); return new QRawFont(fileName_QString, static_cast(pixelSize), static_cast(hintingPreference)); } -QRawFont* QRawFont_new6(QByteArray* fontData, double pixelSize, uintptr_t hintingPreference) { +QRawFont* QRawFont_new6(QByteArray* fontData, double pixelSize, int hintingPreference) { return new QRawFont(*fontData, static_cast(pixelSize), static_cast(hintingPreference)); } @@ -75,9 +75,9 @@ struct miqt_string* QRawFont_StyleName(const QRawFont* self) { return miqt_strdup(_b.data(), _b.length()); } -uintptr_t QRawFont_Style(const QRawFont* self) { +int QRawFont_Style(const QRawFont* self) { QFont::Style _ret = self->style(); - return static_cast(_ret); + return static_cast(_ret); } int QRawFont_Weight(const QRawFont* self) { @@ -86,7 +86,7 @@ int QRawFont_Weight(const QRawFont* self) { struct miqt_array* QRawFont_GlyphIndexesForString(const QRawFont* self, struct miqt_string* text) { QString text_QString = QString::fromUtf8(&text->data, text->len); - QVector _ret = self->glyphIndexesForString(text_QString); + QVector _ret = self->glyphIndexesForString(text_QString); // Convert QList<> from C++ memory to manually-managed C memory unsigned int* _arr = static_cast(malloc(sizeof(unsigned int) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -165,60 +165,71 @@ void QRawFont_SetPixelSize(QRawFont* self, double pixelSize) { } double QRawFont_PixelSize(const QRawFont* self) { - return self->pixelSize(); + qreal _ret = self->pixelSize(); + return static_cast(_ret); } -uintptr_t QRawFont_HintingPreference(const QRawFont* self) { +int QRawFont_HintingPreference(const QRawFont* self) { QFont::HintingPreference _ret = self->hintingPreference(); - return static_cast(_ret); + return static_cast(_ret); } double QRawFont_Ascent(const QRawFont* self) { - return self->ascent(); + qreal _ret = self->ascent(); + return static_cast(_ret); } double QRawFont_CapHeight(const QRawFont* self) { - return self->capHeight(); + qreal _ret = self->capHeight(); + return static_cast(_ret); } double QRawFont_Descent(const QRawFont* self) { - return self->descent(); + qreal _ret = self->descent(); + return static_cast(_ret); } double QRawFont_Leading(const QRawFont* self) { - return self->leading(); + qreal _ret = self->leading(); + return static_cast(_ret); } double QRawFont_XHeight(const QRawFont* self) { - return self->xHeight(); + qreal _ret = self->xHeight(); + return static_cast(_ret); } double QRawFont_AverageCharWidth(const QRawFont* self) { - return self->averageCharWidth(); + qreal _ret = self->averageCharWidth(); + return static_cast(_ret); } double QRawFont_MaxCharWidth(const QRawFont* self) { - return self->maxCharWidth(); + qreal _ret = self->maxCharWidth(); + return static_cast(_ret); } double QRawFont_LineThickness(const QRawFont* self) { - return self->lineThickness(); + qreal _ret = self->lineThickness(); + return static_cast(_ret); } double QRawFont_UnderlinePosition(const QRawFont* self) { - return self->underlinePosition(); + qreal _ret = self->underlinePosition(); + return static_cast(_ret); } double QRawFont_UnitsPerEm(const QRawFont* self) { - return self->unitsPerEm(); + qreal _ret = self->unitsPerEm(); + return static_cast(_ret); } -void QRawFont_LoadFromFile(QRawFont* self, struct miqt_string* fileName, double pixelSize, uintptr_t hintingPreference) { +void QRawFont_LoadFromFile(QRawFont* self, struct miqt_string* fileName, double pixelSize, int hintingPreference) { QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); self->loadFromFile(fileName_QString, static_cast(pixelSize), static_cast(hintingPreference)); } -void QRawFont_LoadFromData(QRawFont* self, QByteArray* fontData, double pixelSize, uintptr_t hintingPreference) { +void QRawFont_LoadFromData(QRawFont* self, QByteArray* fontData, double pixelSize, int hintingPreference) { self->loadFromData(*fontData, static_cast(pixelSize), static_cast(hintingPreference)); } @@ -233,10 +244,10 @@ bool QRawFont_SupportsCharacterWithCharacter(const QRawFont* self, QChar* charac struct miqt_array* QRawFont_SupportedWritingSystems(const QRawFont* self) { QList _ret = self->supportedWritingSystems(); // Convert QList<> from C++ memory to manually-managed C memory - uintptr_t* _arr = static_cast(malloc(sizeof(uintptr_t) * _ret.length())); + int* _arr = static_cast(malloc(sizeof(int) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QFontDatabase::WritingSystem _lv_ret = _ret[i]; - _arr[i] = static_cast(_lv_ret); + _arr[i] = static_cast(_lv_ret); } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -252,15 +263,15 @@ QRawFont* QRawFont_FromFont(QFont* font) { return new QRawFont(QRawFont::fromFont(*font)); } -QImage* QRawFont_AlphaMapForGlyph2(const QRawFont* self, unsigned int glyphIndex, uintptr_t antialiasingType) { +QImage* QRawFont_AlphaMapForGlyph2(const QRawFont* self, unsigned int glyphIndex, int antialiasingType) { return new QImage(self->alphaMapForGlyph(static_cast(glyphIndex), static_cast(antialiasingType))); } -QImage* QRawFont_AlphaMapForGlyph3(const QRawFont* self, unsigned int glyphIndex, uintptr_t antialiasingType, QTransform* transform) { +QImage* QRawFont_AlphaMapForGlyph3(const QRawFont* self, unsigned int glyphIndex, int antialiasingType, QTransform* transform) { return new QImage(self->alphaMapForGlyph(static_cast(glyphIndex), static_cast(antialiasingType), *transform)); } -QRawFont* QRawFont_FromFont2(QFont* font, uintptr_t writingSystem) { +QRawFont* QRawFont_FromFont2(QFont* font, int writingSystem) { return new QRawFont(QRawFont::fromFont(*font, static_cast(writingSystem))); } diff --git a/qt/gen_qrawfont.go b/qt/gen_qrawfont.go index 3066fba..1e493b4 100644 --- a/qt/gen_qrawfont.go +++ b/qt/gen_qrawfont.go @@ -80,13 +80,13 @@ func NewQRawFont4(other *QRawFont) *QRawFont { func NewQRawFont5(fileName string, pixelSize float64, hintingPreference QFont__HintingPreference) *QRawFont { fileName_ms := miqt_strdupg(fileName) defer C.free(fileName_ms) - ret := C.QRawFont_new5((*C.struct_miqt_string)(fileName_ms), (C.double)(pixelSize), (C.uintptr_t)(hintingPreference)) + ret := C.QRawFont_new5((*C.struct_miqt_string)(fileName_ms), (C.double)(pixelSize), (C.int)(hintingPreference)) return newQRawFont(ret) } // NewQRawFont6 constructs a new QRawFont object. func NewQRawFont6(fontData *QByteArray, pixelSize float64, hintingPreference QFont__HintingPreference) *QRawFont { - ret := C.QRawFont_new6(fontData.cPointer(), (C.double)(pixelSize), (C.uintptr_t)(hintingPreference)) + ret := C.QRawFont_new6(fontData.cPointer(), (C.double)(pixelSize), (C.int)(hintingPreference)) return newQRawFont(ret) } @@ -176,7 +176,7 @@ func (this *QRawFont) AdvancesForGlyphIndexes2(glyphIndexes []uint, layoutFlags } glyphIndexes_ma := &C.struct_miqt_array{len: C.size_t(len(glyphIndexes)), data: unsafe.Pointer(glyphIndexes_CArray)} defer runtime.KeepAlive(unsafe.Pointer(glyphIndexes_ma)) - var _ma *C.struct_miqt_array = C.QRawFont_AdvancesForGlyphIndexes2(this.h, glyphIndexes_ma, (C.int)(layoutFlags)) + var _ma *C.struct_miqt_array = C.QRawFont_AdvancesForGlyphIndexes2(this.h, glyphIndexes_ma, layoutFlags) _ret := make([]QPointF, int(_ma.len)) _outCast := (*[0xffff]*C.QPointF)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -198,7 +198,7 @@ func (this *QRawFont) AdvancesForGlyphIndexes3(glyphIndexes *uint, advances *QPo } func (this *QRawFont) AdvancesForGlyphIndexes4(glyphIndexes *uint, advances *QPointF, numGlyphs int, layoutFlags int) bool { - return (bool)(C.QRawFont_AdvancesForGlyphIndexes4(this.h, (*C.uint)(unsafe.Pointer(glyphIndexes)), advances.cPointer(), (C.int)(numGlyphs), (C.int)(layoutFlags))) + return (bool)(C.QRawFont_AdvancesForGlyphIndexes4(this.h, (*C.uint)(unsafe.Pointer(glyphIndexes)), advances.cPointer(), (C.int)(numGlyphs), layoutFlags)) } func (this *QRawFont) AlphaMapForGlyph(glyphIndex uint) *QImage { @@ -277,11 +277,11 @@ func (this *QRawFont) UnitsPerEm() float64 { func (this *QRawFont) LoadFromFile(fileName string, pixelSize float64, hintingPreference QFont__HintingPreference) { fileName_ms := miqt_strdupg(fileName) defer C.free(fileName_ms) - C.QRawFont_LoadFromFile(this.h, (*C.struct_miqt_string)(fileName_ms), (C.double)(pixelSize), (C.uintptr_t)(hintingPreference)) + C.QRawFont_LoadFromFile(this.h, (*C.struct_miqt_string)(fileName_ms), (C.double)(pixelSize), (C.int)(hintingPreference)) } func (this *QRawFont) LoadFromData(fontData *QByteArray, pixelSize float64, hintingPreference QFont__HintingPreference) { - C.QRawFont_LoadFromData(this.h, fontData.cPointer(), (C.double)(pixelSize), (C.uintptr_t)(hintingPreference)) + C.QRawFont_LoadFromData(this.h, fontData.cPointer(), (C.double)(pixelSize), (C.int)(hintingPreference)) } func (this *QRawFont) SupportsCharacter(ucs4 uint) bool { @@ -295,7 +295,7 @@ func (this *QRawFont) SupportsCharacterWithCharacter(character QChar) bool { func (this *QRawFont) SupportedWritingSystems() []QFontDatabase__WritingSystem { var _ma *C.struct_miqt_array = C.QRawFont_SupportedWritingSystems(this.h) _ret := make([]QFontDatabase__WritingSystem, int(_ma.len)) - _outCast := (*[0xffff]C.uintptr_t)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.int)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { _ret[i] = (QFontDatabase__WritingSystem)(_outCast[i]) } @@ -320,21 +320,21 @@ func QRawFont_FromFont(font *QFont) *QRawFont { } func (this *QRawFont) AlphaMapForGlyph2(glyphIndex uint, antialiasingType QRawFont__AntialiasingType) *QImage { - _ret := C.QRawFont_AlphaMapForGlyph2(this.h, (C.uint)(glyphIndex), (C.uintptr_t)(antialiasingType)) + _ret := C.QRawFont_AlphaMapForGlyph2(this.h, (C.uint)(glyphIndex), (C.int)(antialiasingType)) _goptr := newQImage(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QRawFont) AlphaMapForGlyph3(glyphIndex uint, antialiasingType QRawFont__AntialiasingType, transform *QTransform) *QImage { - _ret := C.QRawFont_AlphaMapForGlyph3(this.h, (C.uint)(glyphIndex), (C.uintptr_t)(antialiasingType), transform.cPointer()) + _ret := C.QRawFont_AlphaMapForGlyph3(this.h, (C.uint)(glyphIndex), (C.int)(antialiasingType), transform.cPointer()) _goptr := newQImage(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QRawFont_FromFont2(font *QFont, writingSystem QFontDatabase__WritingSystem) *QRawFont { - _ret := C.QRawFont_FromFont2(font.cPointer(), (C.uintptr_t)(writingSystem)) + _ret := C.QRawFont_FromFont2(font.cPointer(), (C.int)(writingSystem)) _goptr := newQRawFont(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qrawfont.h b/qt/gen_qrawfont.h index 43d79ad..8101e90 100644 --- a/qt/gen_qrawfont.h +++ b/qt/gen_qrawfont.h @@ -39,8 +39,8 @@ QRawFont* QRawFont_new(); QRawFont* QRawFont_new2(struct miqt_string* fileName, double pixelSize); QRawFont* QRawFont_new3(QByteArray* fontData, double pixelSize); QRawFont* QRawFont_new4(QRawFont* other); -QRawFont* QRawFont_new5(struct miqt_string* fileName, double pixelSize, uintptr_t hintingPreference); -QRawFont* QRawFont_new6(QByteArray* fontData, double pixelSize, uintptr_t hintingPreference); +QRawFont* QRawFont_new5(struct miqt_string* fileName, double pixelSize, int hintingPreference); +QRawFont* QRawFont_new6(QByteArray* fontData, double pixelSize, int hintingPreference); void QRawFont_OperatorAssign(QRawFont* self, QRawFont* other); void QRawFont_Swap(QRawFont* self, QRawFont* other); bool QRawFont_IsValid(const QRawFont* self); @@ -48,7 +48,7 @@ bool QRawFont_OperatorEqual(const QRawFont* self, QRawFont* other); bool QRawFont_OperatorNotEqual(const QRawFont* self, QRawFont* other); struct miqt_string* QRawFont_FamilyName(const QRawFont* self); struct miqt_string* QRawFont_StyleName(const QRawFont* self); -uintptr_t QRawFont_Style(const QRawFont* self); +int QRawFont_Style(const QRawFont* self); int QRawFont_Weight(const QRawFont* self); struct miqt_array* QRawFont_GlyphIndexesForString(const QRawFont* self, struct miqt_string* text); struct miqt_array* QRawFont_AdvancesForGlyphIndexes(const QRawFont* self, struct miqt_array* /* of unsigned int */ glyphIndexes); @@ -61,7 +61,7 @@ QPainterPath* QRawFont_PathForGlyph(const QRawFont* self, unsigned int glyphInde QRectF* QRawFont_BoundingRect(const QRawFont* self, unsigned int glyphIndex); void QRawFont_SetPixelSize(QRawFont* self, double pixelSize); double QRawFont_PixelSize(const QRawFont* self); -uintptr_t QRawFont_HintingPreference(const QRawFont* self); +int QRawFont_HintingPreference(const QRawFont* self); double QRawFont_Ascent(const QRawFont* self); double QRawFont_CapHeight(const QRawFont* self); double QRawFont_Descent(const QRawFont* self); @@ -72,16 +72,16 @@ double QRawFont_MaxCharWidth(const QRawFont* self); double QRawFont_LineThickness(const QRawFont* self); double QRawFont_UnderlinePosition(const QRawFont* self); double QRawFont_UnitsPerEm(const QRawFont* self); -void QRawFont_LoadFromFile(QRawFont* self, struct miqt_string* fileName, double pixelSize, uintptr_t hintingPreference); -void QRawFont_LoadFromData(QRawFont* self, QByteArray* fontData, double pixelSize, uintptr_t hintingPreference); +void QRawFont_LoadFromFile(QRawFont* self, struct miqt_string* fileName, double pixelSize, int hintingPreference); +void QRawFont_LoadFromData(QRawFont* self, QByteArray* fontData, double pixelSize, int hintingPreference); bool QRawFont_SupportsCharacter(const QRawFont* self, unsigned int ucs4); bool QRawFont_SupportsCharacterWithCharacter(const QRawFont* self, QChar* character); struct miqt_array* QRawFont_SupportedWritingSystems(const QRawFont* self); QByteArray* QRawFont_FontTable(const QRawFont* self, const char* tagName); QRawFont* QRawFont_FromFont(QFont* font); -QImage* QRawFont_AlphaMapForGlyph2(const QRawFont* self, unsigned int glyphIndex, uintptr_t antialiasingType); -QImage* QRawFont_AlphaMapForGlyph3(const QRawFont* self, unsigned int glyphIndex, uintptr_t antialiasingType, QTransform* transform); -QRawFont* QRawFont_FromFont2(QFont* font, uintptr_t writingSystem); +QImage* QRawFont_AlphaMapForGlyph2(const QRawFont* self, unsigned int glyphIndex, int antialiasingType); +QImage* QRawFont_AlphaMapForGlyph3(const QRawFont* self, unsigned int glyphIndex, int antialiasingType, QTransform* transform); +QRawFont* QRawFont_FromFont2(QFont* font, int writingSystem); void QRawFont_Delete(QRawFont* self); #ifdef __cplusplus diff --git a/qt/gen_qreadwritelock.cpp b/qt/gen_qreadwritelock.cpp index 1159819..162faa6 100644 --- a/qt/gen_qreadwritelock.cpp +++ b/qt/gen_qreadwritelock.cpp @@ -9,7 +9,7 @@ QReadWriteLock* QReadWriteLock_new() { return new QReadWriteLock(); } -QReadWriteLock* QReadWriteLock_new2(uintptr_t recursionMode) { +QReadWriteLock* QReadWriteLock_new2(int recursionMode) { return new QReadWriteLock(static_cast(recursionMode)); } diff --git a/qt/gen_qreadwritelock.go b/qt/gen_qreadwritelock.go index 7775459..e961e91 100644 --- a/qt/gen_qreadwritelock.go +++ b/qt/gen_qreadwritelock.go @@ -50,7 +50,7 @@ func NewQReadWriteLock() *QReadWriteLock { // NewQReadWriteLock2 constructs a new QReadWriteLock object. func NewQReadWriteLock2(recursionMode QReadWriteLock__RecursionMode) *QReadWriteLock { - ret := C.QReadWriteLock_new2((C.uintptr_t)(recursionMode)) + ret := C.QReadWriteLock_new2((C.int)(recursionMode)) return newQReadWriteLock(ret) } diff --git a/qt/gen_qreadwritelock.h b/qt/gen_qreadwritelock.h index 528094f..8db9528 100644 --- a/qt/gen_qreadwritelock.h +++ b/qt/gen_qreadwritelock.h @@ -24,7 +24,7 @@ typedef struct QWriteLocker QWriteLocker; #endif QReadWriteLock* QReadWriteLock_new(); -QReadWriteLock* QReadWriteLock_new2(uintptr_t recursionMode); +QReadWriteLock* QReadWriteLock_new2(int recursionMode); void QReadWriteLock_LockForRead(QReadWriteLock* self); bool QReadWriteLock_TryLockForRead(QReadWriteLock* self); bool QReadWriteLock_TryLockForReadWithTimeout(QReadWriteLock* self, int timeout); diff --git a/qt/gen_qrect.cpp b/qt/gen_qrect.cpp index 47e5445..e0f21f1 100644 --- a/qt/gen_qrect.cpp +++ b/qt/gen_qrect.cpp @@ -359,27 +359,33 @@ QRectF* QRectF_Normalized(const QRectF* self) { } double QRectF_Left(const QRectF* self) { - return self->left(); + qreal _ret = self->left(); + return static_cast(_ret); } double QRectF_Top(const QRectF* self) { - return self->top(); + qreal _ret = self->top(); + return static_cast(_ret); } double QRectF_Right(const QRectF* self) { - return self->right(); + qreal _ret = self->right(); + return static_cast(_ret); } double QRectF_Bottom(const QRectF* self) { - return self->bottom(); + qreal _ret = self->bottom(); + return static_cast(_ret); } double QRectF_X(const QRectF* self) { - return self->x(); + qreal _ret = self->x(); + return static_cast(_ret); } double QRectF_Y(const QRectF* self) { - return self->y(); + qreal _ret = self->y(); + return static_cast(_ret); } void QRectF_SetLeft(QRectF* self, double pos) { @@ -535,11 +541,13 @@ QSizeF* QRectF_Size(const QRectF* self) { } double QRectF_Width(const QRectF* self) { - return self->width(); + qreal _ret = self->width(); + return static_cast(_ret); } double QRectF_Height(const QRectF* self) { - return self->height(); + qreal _ret = self->height(); + return static_cast(_ret); } void QRectF_SetWidth(QRectF* self, double w) { diff --git a/qt/gen_qregexp.cpp b/qt/gen_qregexp.cpp index 27f63dd..5988b8a 100644 --- a/qt/gen_qregexp.cpp +++ b/qt/gen_qregexp.cpp @@ -20,12 +20,12 @@ QRegExp* QRegExp_new3(QRegExp* rx) { return new QRegExp(*rx); } -QRegExp* QRegExp_new4(struct miqt_string* pattern, uintptr_t cs) { +QRegExp* QRegExp_new4(struct miqt_string* pattern, int cs) { QString pattern_QString = QString::fromUtf8(&pattern->data, pattern->len); return new QRegExp(pattern_QString, static_cast(cs)); } -QRegExp* QRegExp_new5(struct miqt_string* pattern, uintptr_t cs, uintptr_t syntax) { +QRegExp* QRegExp_new5(struct miqt_string* pattern, int cs, int syntax) { QString pattern_QString = QString::fromUtf8(&pattern->data, pattern->len); return new QRegExp(pattern_QString, static_cast(cs), static_cast(syntax)); } @@ -66,21 +66,21 @@ void QRegExp_SetPattern(QRegExp* self, struct miqt_string* pattern) { self->setPattern(pattern_QString); } -uintptr_t QRegExp_CaseSensitivity(const QRegExp* self) { +int QRegExp_CaseSensitivity(const QRegExp* self) { Qt::CaseSensitivity _ret = self->caseSensitivity(); - return static_cast(_ret); + return static_cast(_ret); } -void QRegExp_SetCaseSensitivity(QRegExp* self, uintptr_t cs) { +void QRegExp_SetCaseSensitivity(QRegExp* self, int cs) { self->setCaseSensitivity(static_cast(cs)); } -uintptr_t QRegExp_PatternSyntax(const QRegExp* self) { +int QRegExp_PatternSyntax(const QRegExp* self) { QRegExp::PatternSyntax _ret = self->patternSyntax(); - return static_cast(_ret); + return static_cast(_ret); } -void QRegExp_SetPatternSyntax(QRegExp* self, uintptr_t syntax) { +void QRegExp_SetPatternSyntax(QRegExp* self, int syntax) { self->setPatternSyntax(static_cast(syntax)); } @@ -196,7 +196,7 @@ int QRegExp_IndexIn2(const QRegExp* self, struct miqt_string* str, int offset) { return self->indexIn(str_QString, static_cast(offset)); } -int QRegExp_IndexIn3(const QRegExp* self, struct miqt_string* str, int offset, uintptr_t caretMode) { +int QRegExp_IndexIn3(const QRegExp* self, struct miqt_string* str, int offset, int caretMode) { QString str_QString = QString::fromUtf8(&str->data, str->len); return self->indexIn(str_QString, static_cast(offset), static_cast(caretMode)); } @@ -206,7 +206,7 @@ int QRegExp_LastIndexIn2(const QRegExp* self, struct miqt_string* str, int offse return self->lastIndexIn(str_QString, static_cast(offset)); } -int QRegExp_LastIndexIn3(const QRegExp* self, struct miqt_string* str, int offset, uintptr_t caretMode) { +int QRegExp_LastIndexIn3(const QRegExp* self, struct miqt_string* str, int offset, int caretMode) { QString str_QString = QString::fromUtf8(&str->data, str->len); return self->lastIndexIn(str_QString, static_cast(offset), static_cast(caretMode)); } diff --git a/qt/gen_qregexp.go b/qt/gen_qregexp.go index 227a4c1..2037734 100644 --- a/qt/gen_qregexp.go +++ b/qt/gen_qregexp.go @@ -78,7 +78,7 @@ func NewQRegExp3(rx *QRegExp) *QRegExp { func NewQRegExp4(pattern string, cs CaseSensitivity) *QRegExp { pattern_ms := miqt_strdupg(pattern) defer C.free(pattern_ms) - ret := C.QRegExp_new4((*C.struct_miqt_string)(pattern_ms), (C.uintptr_t)(cs)) + ret := C.QRegExp_new4((*C.struct_miqt_string)(pattern_ms), (C.int)(cs)) return newQRegExp(ret) } @@ -86,7 +86,7 @@ func NewQRegExp4(pattern string, cs CaseSensitivity) *QRegExp { func NewQRegExp5(pattern string, cs CaseSensitivity, syntax QRegExp__PatternSyntax) *QRegExp { pattern_ms := miqt_strdupg(pattern) defer C.free(pattern_ms) - ret := C.QRegExp_new5((*C.struct_miqt_string)(pattern_ms), (C.uintptr_t)(cs), (C.uintptr_t)(syntax)) + ret := C.QRegExp_new5((*C.struct_miqt_string)(pattern_ms), (C.int)(cs), (C.int)(syntax)) return newQRegExp(ret) } @@ -132,7 +132,7 @@ func (this *QRegExp) CaseSensitivity() CaseSensitivity { } func (this *QRegExp) SetCaseSensitivity(cs CaseSensitivity) { - C.QRegExp_SetCaseSensitivity(this.h, (C.uintptr_t)(cs)) + C.QRegExp_SetCaseSensitivity(this.h, (C.int)(cs)) } func (this *QRegExp) PatternSyntax() QRegExp__PatternSyntax { @@ -140,7 +140,7 @@ func (this *QRegExp) PatternSyntax() QRegExp__PatternSyntax { } func (this *QRegExp) SetPatternSyntax(syntax QRegExp__PatternSyntax) { - C.QRegExp_SetPatternSyntax(this.h, (C.uintptr_t)(syntax)) + C.QRegExp_SetPatternSyntax(this.h, (C.int)(syntax)) } func (this *QRegExp) IsMinimal() bool { @@ -259,7 +259,7 @@ func (this *QRegExp) IndexIn2(str string, offset int) int { func (this *QRegExp) IndexIn3(str string, offset int, caretMode QRegExp__CaretMode) int { str_ms := miqt_strdupg(str) defer C.free(str_ms) - return (int)(C.QRegExp_IndexIn3(this.h, (*C.struct_miqt_string)(str_ms), (C.int)(offset), (C.uintptr_t)(caretMode))) + return (int)(C.QRegExp_IndexIn3(this.h, (*C.struct_miqt_string)(str_ms), (C.int)(offset), (C.int)(caretMode))) } func (this *QRegExp) LastIndexIn2(str string, offset int) int { @@ -271,7 +271,7 @@ func (this *QRegExp) LastIndexIn2(str string, offset int) int { func (this *QRegExp) LastIndexIn3(str string, offset int, caretMode QRegExp__CaretMode) int { str_ms := miqt_strdupg(str) defer C.free(str_ms) - return (int)(C.QRegExp_LastIndexIn3(this.h, (*C.struct_miqt_string)(str_ms), (C.int)(offset), (C.uintptr_t)(caretMode))) + return (int)(C.QRegExp_LastIndexIn3(this.h, (*C.struct_miqt_string)(str_ms), (C.int)(offset), (C.int)(caretMode))) } func (this *QRegExp) Cap1(nth int) string { diff --git a/qt/gen_qregexp.h b/qt/gen_qregexp.h index f63b6f6..7bf4872 100644 --- a/qt/gen_qregexp.h +++ b/qt/gen_qregexp.h @@ -22,8 +22,8 @@ typedef struct QRegExp QRegExp; QRegExp* QRegExp_new(); QRegExp* QRegExp_new2(struct miqt_string* pattern); QRegExp* QRegExp_new3(QRegExp* rx); -QRegExp* QRegExp_new4(struct miqt_string* pattern, uintptr_t cs); -QRegExp* QRegExp_new5(struct miqt_string* pattern, uintptr_t cs, uintptr_t syntax); +QRegExp* QRegExp_new4(struct miqt_string* pattern, int cs); +QRegExp* QRegExp_new5(struct miqt_string* pattern, int cs, int syntax); void QRegExp_OperatorAssign(QRegExp* self, QRegExp* rx); void QRegExp_Swap(QRegExp* self, QRegExp* other); bool QRegExp_OperatorEqual(const QRegExp* self, QRegExp* rx); @@ -32,10 +32,10 @@ bool QRegExp_IsEmpty(const QRegExp* self); bool QRegExp_IsValid(const QRegExp* self); struct miqt_string* QRegExp_Pattern(const QRegExp* self); void QRegExp_SetPattern(QRegExp* self, struct miqt_string* pattern); -uintptr_t QRegExp_CaseSensitivity(const QRegExp* self); -void QRegExp_SetCaseSensitivity(QRegExp* self, uintptr_t cs); -uintptr_t QRegExp_PatternSyntax(const QRegExp* self); -void QRegExp_SetPatternSyntax(QRegExp* self, uintptr_t syntax); +int QRegExp_CaseSensitivity(const QRegExp* self); +void QRegExp_SetCaseSensitivity(QRegExp* self, int cs); +int QRegExp_PatternSyntax(const QRegExp* self); +void QRegExp_SetPatternSyntax(QRegExp* self, int syntax); bool QRegExp_IsMinimal(const QRegExp* self); void QRegExp_SetMinimal(QRegExp* self, bool minimal); bool QRegExp_ExactMatch(const QRegExp* self, struct miqt_string* str); @@ -53,9 +53,9 @@ struct miqt_string* QRegExp_ErrorString(const QRegExp* self); struct miqt_string* QRegExp_ErrorString2(QRegExp* self); struct miqt_string* QRegExp_Escape(struct miqt_string* str); int QRegExp_IndexIn2(const QRegExp* self, struct miqt_string* str, int offset); -int QRegExp_IndexIn3(const QRegExp* self, struct miqt_string* str, int offset, uintptr_t caretMode); +int QRegExp_IndexIn3(const QRegExp* self, struct miqt_string* str, int offset, int caretMode); int QRegExp_LastIndexIn2(const QRegExp* self, struct miqt_string* str, int offset); -int QRegExp_LastIndexIn3(const QRegExp* self, struct miqt_string* str, int offset, uintptr_t caretMode); +int QRegExp_LastIndexIn3(const QRegExp* self, struct miqt_string* str, int offset, int caretMode); struct miqt_string* QRegExp_Cap1(const QRegExp* self, int nth); struct miqt_string* QRegExp_Cap1WithNth(QRegExp* self, int nth); int QRegExp_Pos1(const QRegExp* self, int nth); diff --git a/qt/gen_qregion.cpp b/qt/gen_qregion.cpp index ee65235..b1eb9cb 100644 --- a/qt/gen_qregion.cpp +++ b/qt/gen_qregion.cpp @@ -27,11 +27,11 @@ QRegion* QRegion_new5(QBitmap* bitmap) { return new QRegion(*bitmap); } -QRegion* QRegion_new6(int x, int y, int w, int h, uintptr_t t) { +QRegion* QRegion_new6(int x, int y, int w, int h, int t) { return new QRegion(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(t)); } -QRegion* QRegion_new7(QRect* r, uintptr_t t) { +QRegion* QRegion_new7(QRect* r, int t) { return new QRegion(*r, static_cast(t)); } @@ -52,19 +52,23 @@ bool QRegion_IsNull(const QRegion* self) { } QRect* QRegion_Begin(const QRegion* self) { - return (QRect*) self->begin(); + const QRegion::const_iterator* _ret = self->begin(); + return static_cast(_ret); } QRect* QRegion_Cbegin(const QRegion* self) { - return (QRect*) self->cbegin(); + const QRegion::const_iterator* _ret = self->cbegin(); + return static_cast(_ret); } QRect* QRegion_End(const QRegion* self) { - return (QRect*) self->end(); + const QRegion::const_iterator* _ret = self->end(); + return static_cast(_ret); } QRect* QRegion_Cend(const QRegion* self) { - return (QRect*) self->cend(); + const QRegion::const_iterator* _ret = self->cend(); + return static_cast(_ret); } bool QRegion_Contains(const QRegion* self, QPoint* p) { diff --git a/qt/gen_qregion.go b/qt/gen_qregion.go index 99347f1..f431a7b 100644 --- a/qt/gen_qregion.go +++ b/qt/gen_qregion.go @@ -74,13 +74,13 @@ func NewQRegion5(bitmap *QBitmap) *QRegion { // NewQRegion6 constructs a new QRegion object. func NewQRegion6(x int, y int, w int, h int, t QRegion__RegionType) *QRegion { - ret := C.QRegion_new6((C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.uintptr_t)(t)) + ret := C.QRegion_new6((C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.int)(t)) return newQRegion(ret) } // NewQRegion7 constructs a new QRegion object. func NewQRegion7(r *QRect, t QRegion__RegionType) *QRegion { - ret := C.QRegion_new7(r.cPointer(), (C.uintptr_t)(t)) + ret := C.QRegion_new7(r.cPointer(), (C.int)(t)) return newQRegion(ret) } diff --git a/qt/gen_qregion.h b/qt/gen_qregion.h index bf33f8d..7d2ecd5 100644 --- a/qt/gen_qregion.h +++ b/qt/gen_qregion.h @@ -30,8 +30,8 @@ QRegion* QRegion_new2(int x, int y, int w, int h); QRegion* QRegion_new3(QRect* r); QRegion* QRegion_new4(QRegion* region); QRegion* QRegion_new5(QBitmap* bitmap); -QRegion* QRegion_new6(int x, int y, int w, int h, uintptr_t t); -QRegion* QRegion_new7(QRect* r, uintptr_t t); +QRegion* QRegion_new6(int x, int y, int w, int h, int t); +QRegion* QRegion_new7(QRect* r, int t); void QRegion_OperatorAssign(QRegion* self, QRegion* param1); void QRegion_Swap(QRegion* self, QRegion* other); bool QRegion_IsEmpty(const QRegion* self); diff --git a/qt/gen_qregularexpression.cpp b/qt/gen_qregularexpression.cpp index e23e917..59ac612 100644 --- a/qt/gen_qregularexpression.cpp +++ b/qt/gen_qregularexpression.cpp @@ -142,12 +142,12 @@ QRegularExpressionMatch* QRegularExpression_Match2(const QRegularExpression* sel return new QRegularExpressionMatch(self->match(subject_QString, static_cast(offset))); } -QRegularExpressionMatch* QRegularExpression_Match3(const QRegularExpression* self, struct miqt_string* subject, int offset, uintptr_t matchType) { +QRegularExpressionMatch* QRegularExpression_Match3(const QRegularExpression* self, struct miqt_string* subject, int offset, int matchType) { QString subject_QString = QString::fromUtf8(&subject->data, subject->len); return new QRegularExpressionMatch(self->match(subject_QString, static_cast(offset), static_cast(matchType))); } -QRegularExpressionMatch* QRegularExpression_Match4(const QRegularExpression* self, struct miqt_string* subject, int offset, uintptr_t matchType, int matchOptions) { +QRegularExpressionMatch* QRegularExpression_Match4(const QRegularExpression* self, struct miqt_string* subject, int offset, int matchType, int matchOptions) { QString subject_QString = QString::fromUtf8(&subject->data, subject->len); return new QRegularExpressionMatch(self->match(subject_QString, static_cast(offset), static_cast(matchType), static_cast(matchOptions))); } @@ -157,12 +157,12 @@ QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch2(const QRegularE return new QRegularExpressionMatchIterator(self->globalMatch(subject_QString, static_cast(offset))); } -QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch3(const QRegularExpression* self, struct miqt_string* subject, int offset, uintptr_t matchType) { +QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch3(const QRegularExpression* self, struct miqt_string* subject, int offset, int matchType) { QString subject_QString = QString::fromUtf8(&subject->data, subject->len); return new QRegularExpressionMatchIterator(self->globalMatch(subject_QString, static_cast(offset), static_cast(matchType))); } -QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch4(const QRegularExpression* self, struct miqt_string* subject, int offset, uintptr_t matchType, int matchOptions) { +QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch4(const QRegularExpression* self, struct miqt_string* subject, int offset, int matchType, int matchOptions) { QString subject_QString = QString::fromUtf8(&subject->data, subject->len); return new QRegularExpressionMatchIterator(self->globalMatch(subject_QString, static_cast(offset), static_cast(matchType), static_cast(matchOptions))); } @@ -191,9 +191,9 @@ QRegularExpression* QRegularExpressionMatch_RegularExpression(const QRegularExpr return new QRegularExpression(self->regularExpression()); } -uintptr_t QRegularExpressionMatch_MatchType(const QRegularExpressionMatch* self) { +int QRegularExpressionMatch_MatchType(const QRegularExpressionMatch* self) { QRegularExpression::MatchType _ret = self->matchType(); - return static_cast(_ret); + return static_cast(_ret); } int QRegularExpressionMatch_MatchOptions(const QRegularExpressionMatch* self) { @@ -334,9 +334,9 @@ QRegularExpression* QRegularExpressionMatchIterator_RegularExpression(const QReg return new QRegularExpression(self->regularExpression()); } -uintptr_t QRegularExpressionMatchIterator_MatchType(const QRegularExpressionMatchIterator* self) { +int QRegularExpressionMatchIterator_MatchType(const QRegularExpressionMatchIterator* self) { QRegularExpression::MatchType _ret = self->matchType(); - return static_cast(_ret); + return static_cast(_ret); } int QRegularExpressionMatchIterator_MatchOptions(const QRegularExpressionMatchIterator* self) { diff --git a/qt/gen_qregularexpression.go b/qt/gen_qregularexpression.go index 5010ca7..88c2c2e 100644 --- a/qt/gen_qregularexpression.go +++ b/qt/gen_qregularexpression.go @@ -91,7 +91,7 @@ func NewQRegularExpression3(re *QRegularExpression) *QRegularExpression { func NewQRegularExpression4(pattern string, options int) *QRegularExpression { pattern_ms := miqt_strdupg(pattern) defer C.free(pattern_ms) - ret := C.QRegularExpression_new4((*C.struct_miqt_string)(pattern_ms), (C.int)(options)) + ret := C.QRegularExpression_new4((*C.struct_miqt_string)(pattern_ms), options) return newQRegularExpression(ret) } @@ -100,7 +100,7 @@ func (this *QRegularExpression) PatternOptions() int { } func (this *QRegularExpression) SetPatternOptions(options int) { - C.QRegularExpression_SetPatternOptions(this.h, (C.int)(options)) + C.QRegularExpression_SetPatternOptions(this.h, options) } func (this *QRegularExpression) OperatorAssign(re *QRegularExpression) { @@ -226,7 +226,7 @@ func (this *QRegularExpression) Match2(subject string, offset int) *QRegularExpr func (this *QRegularExpression) Match3(subject string, offset int, matchType QRegularExpression__MatchType) *QRegularExpressionMatch { subject_ms := miqt_strdupg(subject) defer C.free(subject_ms) - _ret := C.QRegularExpression_Match3(this.h, (*C.struct_miqt_string)(subject_ms), (C.int)(offset), (C.uintptr_t)(matchType)) + _ret := C.QRegularExpression_Match3(this.h, (*C.struct_miqt_string)(subject_ms), (C.int)(offset), (C.int)(matchType)) _goptr := newQRegularExpressionMatch(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -235,7 +235,7 @@ func (this *QRegularExpression) Match3(subject string, offset int, matchType QRe func (this *QRegularExpression) Match4(subject string, offset int, matchType QRegularExpression__MatchType, matchOptions int) *QRegularExpressionMatch { subject_ms := miqt_strdupg(subject) defer C.free(subject_ms) - _ret := C.QRegularExpression_Match4(this.h, (*C.struct_miqt_string)(subject_ms), (C.int)(offset), (C.uintptr_t)(matchType), (C.int)(matchOptions)) + _ret := C.QRegularExpression_Match4(this.h, (*C.struct_miqt_string)(subject_ms), (C.int)(offset), (C.int)(matchType), matchOptions) _goptr := newQRegularExpressionMatch(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -253,7 +253,7 @@ func (this *QRegularExpression) GlobalMatch2(subject string, offset int) *QRegul func (this *QRegularExpression) GlobalMatch3(subject string, offset int, matchType QRegularExpression__MatchType) *QRegularExpressionMatchIterator { subject_ms := miqt_strdupg(subject) defer C.free(subject_ms) - _ret := C.QRegularExpression_GlobalMatch3(this.h, (*C.struct_miqt_string)(subject_ms), (C.int)(offset), (C.uintptr_t)(matchType)) + _ret := C.QRegularExpression_GlobalMatch3(this.h, (*C.struct_miqt_string)(subject_ms), (C.int)(offset), (C.int)(matchType)) _goptr := newQRegularExpressionMatchIterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -262,7 +262,7 @@ func (this *QRegularExpression) GlobalMatch3(subject string, offset int, matchTy func (this *QRegularExpression) GlobalMatch4(subject string, offset int, matchType QRegularExpression__MatchType, matchOptions int) *QRegularExpressionMatchIterator { subject_ms := miqt_strdupg(subject) defer C.free(subject_ms) - _ret := C.QRegularExpression_GlobalMatch4(this.h, (*C.struct_miqt_string)(subject_ms), (C.int)(offset), (C.uintptr_t)(matchType), (C.int)(matchOptions)) + _ret := C.QRegularExpression_GlobalMatch4(this.h, (*C.struct_miqt_string)(subject_ms), (C.int)(offset), (C.int)(matchType), matchOptions) _goptr := newQRegularExpressionMatchIterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qregularexpression.h b/qt/gen_qregularexpression.h index 931d530..500cfb1 100644 --- a/qt/gen_qregularexpression.h +++ b/qt/gen_qregularexpression.h @@ -47,11 +47,11 @@ struct miqt_string* QRegularExpression_AnchoredPattern(struct miqt_string* expre bool QRegularExpression_OperatorEqual(const QRegularExpression* self, QRegularExpression* re); bool QRegularExpression_OperatorNotEqual(const QRegularExpression* self, QRegularExpression* re); QRegularExpressionMatch* QRegularExpression_Match2(const QRegularExpression* self, struct miqt_string* subject, int offset); -QRegularExpressionMatch* QRegularExpression_Match3(const QRegularExpression* self, struct miqt_string* subject, int offset, uintptr_t matchType); -QRegularExpressionMatch* QRegularExpression_Match4(const QRegularExpression* self, struct miqt_string* subject, int offset, uintptr_t matchType, int matchOptions); +QRegularExpressionMatch* QRegularExpression_Match3(const QRegularExpression* self, struct miqt_string* subject, int offset, int matchType); +QRegularExpressionMatch* QRegularExpression_Match4(const QRegularExpression* self, struct miqt_string* subject, int offset, int matchType, int matchOptions); QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch2(const QRegularExpression* self, struct miqt_string* subject, int offset); -QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch3(const QRegularExpression* self, struct miqt_string* subject, int offset, uintptr_t matchType); -QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch4(const QRegularExpression* self, struct miqt_string* subject, int offset, uintptr_t matchType, int matchOptions); +QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch3(const QRegularExpression* self, struct miqt_string* subject, int offset, int matchType); +QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch4(const QRegularExpression* self, struct miqt_string* subject, int offset, int matchType, int matchOptions); void QRegularExpression_Delete(QRegularExpression* self); QRegularExpressionMatch* QRegularExpressionMatch_new(); @@ -59,7 +59,7 @@ QRegularExpressionMatch* QRegularExpressionMatch_new2(QRegularExpressionMatch* m void QRegularExpressionMatch_OperatorAssign(QRegularExpressionMatch* self, QRegularExpressionMatch* match); void QRegularExpressionMatch_Swap(QRegularExpressionMatch* self, QRegularExpressionMatch* other); QRegularExpression* QRegularExpressionMatch_RegularExpression(const QRegularExpressionMatch* self); -uintptr_t QRegularExpressionMatch_MatchType(const QRegularExpressionMatch* self); +int QRegularExpressionMatch_MatchType(const QRegularExpressionMatch* self); int QRegularExpressionMatch_MatchOptions(const QRegularExpressionMatch* self); bool QRegularExpressionMatch_HasMatch(const QRegularExpressionMatch* self); bool QRegularExpressionMatch_HasPartialMatch(const QRegularExpressionMatch* self); @@ -89,7 +89,7 @@ bool QRegularExpressionMatchIterator_HasNext(const QRegularExpressionMatchIterat QRegularExpressionMatch* QRegularExpressionMatchIterator_Next(QRegularExpressionMatchIterator* self); QRegularExpressionMatch* QRegularExpressionMatchIterator_PeekNext(const QRegularExpressionMatchIterator* self); QRegularExpression* QRegularExpressionMatchIterator_RegularExpression(const QRegularExpressionMatchIterator* self); -uintptr_t QRegularExpressionMatchIterator_MatchType(const QRegularExpressionMatchIterator* self); +int QRegularExpressionMatchIterator_MatchType(const QRegularExpressionMatchIterator* self); int QRegularExpressionMatchIterator_MatchOptions(const QRegularExpressionMatchIterator* self); void QRegularExpressionMatchIterator_Delete(QRegularExpressionMatchIterator* self); diff --git a/qt/gen_qresource.cpp b/qt/gen_qresource.cpp index f7774d5..8f58f83 100644 --- a/qt/gen_qresource.cpp +++ b/qt/gen_qresource.cpp @@ -55,21 +55,24 @@ bool QResource_IsValid(const QResource* self) { return self->isValid(); } -uintptr_t QResource_CompressionAlgorithm(const QResource* self) { +int QResource_CompressionAlgorithm(const QResource* self) { QResource::Compression _ret = self->compressionAlgorithm(); - return static_cast(_ret); + return static_cast(_ret); } long long QResource_Size(const QResource* self) { - return self->size(); + qint64 _ret = self->size(); + return static_cast(_ret); } const unsigned char* QResource_Data(const QResource* self) { - return (const unsigned char*) self->data(); + const uchar* _ret = self->data(); + return static_cast(_ret); } long long QResource_UncompressedSize(const QResource* self) { - return self->uncompressedSize(); + qint64 _ret = self->uncompressedSize(); + return static_cast(_ret); } QByteArray* QResource_UncompressedData(const QResource* self) { diff --git a/qt/gen_qresource.h b/qt/gen_qresource.h index 15d316e..79fbc63 100644 --- a/qt/gen_qresource.h +++ b/qt/gen_qresource.h @@ -34,7 +34,7 @@ struct miqt_string* QResource_AbsoluteFilePath(const QResource* self); void QResource_SetLocale(QResource* self, QLocale* locale); QLocale* QResource_Locale(const QResource* self); bool QResource_IsValid(const QResource* self); -uintptr_t QResource_CompressionAlgorithm(const QResource* self); +int QResource_CompressionAlgorithm(const QResource* self); long long QResource_Size(const QResource* self); const unsigned char* QResource_Data(const QResource* self); long long QResource_UncompressedSize(const QResource* self); diff --git a/qt/gen_qresultstore.cpp b/qt/gen_qresultstore.cpp index 4d4855d..d3310b8 100644 --- a/qt/gen_qresultstore.cpp +++ b/qt/gen_qresultstore.cpp @@ -113,6 +113,10 @@ int QtPrivate__ResultStoreBase_AddCanceledResult(QtPrivate__ResultStoreBase* sel return self->addCanceledResult(static_cast(index)); } +void QtPrivate__ResultStoreBase_OperatorAssign(QtPrivate__ResultStoreBase* self, QtPrivate__ResultStoreBase* param1) { + self->operator=(*param1); +} + void QtPrivate__ResultStoreBase_Delete(QtPrivate__ResultStoreBase* self) { delete self; } diff --git a/qt/gen_qresultstore.go b/qt/gen_qresultstore.go index 36e22be..30760c1 100644 --- a/qt/gen_qresultstore.go +++ b/qt/gen_qresultstore.go @@ -227,6 +227,10 @@ func (this *QtPrivate__ResultStoreBase) AddCanceledResult(index int) int { return (int)(C.QtPrivate__ResultStoreBase_AddCanceledResult(this.h, (C.int)(index))) } +func (this *QtPrivate__ResultStoreBase) OperatorAssign(param1 *QtPrivate__ResultStoreBase) { + C.QtPrivate__ResultStoreBase_OperatorAssign(this.h, param1.cPointer()) +} + // Delete this object from C++ memory. func (this *QtPrivate__ResultStoreBase) Delete() { C.QtPrivate__ResultStoreBase_Delete(this.h) diff --git a/qt/gen_qresultstore.h b/qt/gen_qresultstore.h index 24a8f26..81e1fdf 100644 --- a/qt/gen_qresultstore.h +++ b/qt/gen_qresultstore.h @@ -64,6 +64,7 @@ QtPrivate__ResultIteratorBase* QtPrivate__ResultStoreBase_ResultAt(const QtPriva bool QtPrivate__ResultStoreBase_Contains(const QtPrivate__ResultStoreBase* self, int index); int QtPrivate__ResultStoreBase_Count(const QtPrivate__ResultStoreBase* self); int QtPrivate__ResultStoreBase_AddCanceledResult(QtPrivate__ResultStoreBase* self, int index); +void QtPrivate__ResultStoreBase_OperatorAssign(QtPrivate__ResultStoreBase* self, QtPrivate__ResultStoreBase* param1); void QtPrivate__ResultStoreBase_Delete(QtPrivate__ResultStoreBase* self); #ifdef __cplusplus diff --git a/qt/gen_qrgba64.cpp b/qt/gen_qrgba64.cpp index e2e269b..f0edc8f 100644 --- a/qt/gen_qrgba64.cpp +++ b/qt/gen_qrgba64.cpp @@ -36,19 +36,23 @@ bool QRgba64_IsTransparent(const QRgba64* self) { } uint16_t QRgba64_Red(const QRgba64* self) { - return self->red(); + quint16 _ret = self->red(); + return static_cast(_ret); } uint16_t QRgba64_Green(const QRgba64* self) { - return self->green(); + quint16 _ret = self->green(); + return static_cast(_ret); } uint16_t QRgba64_Blue(const QRgba64* self) { - return self->blue(); + quint16 _ret = self->blue(); + return static_cast(_ret); } uint16_t QRgba64_Alpha(const QRgba64* self) { - return self->alpha(); + quint16 _ret = self->alpha(); + return static_cast(_ret); } void QRgba64_SetRed(QRgba64* self, uint16_t _red) { @@ -68,27 +72,33 @@ void QRgba64_SetAlpha(QRgba64* self, uint16_t _alpha) { } unsigned char QRgba64_Red8(const QRgba64* self) { - return self->red8(); + quint8 _ret = self->red8(); + return static_cast(_ret); } unsigned char QRgba64_Green8(const QRgba64* self) { - return self->green8(); + quint8 _ret = self->green8(); + return static_cast(_ret); } unsigned char QRgba64_Blue8(const QRgba64* self) { - return self->blue8(); + quint8 _ret = self->blue8(); + return static_cast(_ret); } unsigned char QRgba64_Alpha8(const QRgba64* self) { - return self->alpha8(); + quint8 _ret = self->alpha8(); + return static_cast(_ret); } unsigned int QRgba64_ToArgb32(const QRgba64* self) { - return self->toArgb32(); + uint _ret = self->toArgb32(); + return static_cast(_ret); } uint16_t QRgba64_ToRgb16(const QRgba64* self) { - return self->toRgb16(); + ushort _ret = self->toRgb16(); + return static_cast(_ret); } QRgba64* QRgba64_Premultiplied(const QRgba64* self) { diff --git a/qt/gen_qrubberband.cpp b/qt/gen_qrubberband.cpp index a8d3388..a807b56 100644 --- a/qt/gen_qrubberband.cpp +++ b/qt/gen_qrubberband.cpp @@ -11,11 +11,11 @@ #include "gen_qrubberband.h" #include "_cgo_export.h" -QRubberBand* QRubberBand_new(uintptr_t param1) { +QRubberBand* QRubberBand_new(int param1) { return new QRubberBand(static_cast(param1)); } -QRubberBand* QRubberBand_new2(uintptr_t param1, QWidget* param2) { +QRubberBand* QRubberBand_new2(int param1, QWidget* param2) { return new QRubberBand(static_cast(param1), param2); } @@ -37,9 +37,9 @@ struct miqt_string* QRubberBand_TrUtf8(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -uintptr_t QRubberBand_Shape(const QRubberBand* self) { +int QRubberBand_Shape(const QRubberBand* self) { QRubberBand::Shape _ret = self->shape(); - return static_cast(_ret); + return static_cast(_ret); } void QRubberBand_SetGeometry(QRubberBand* self, QRect* r) { diff --git a/qt/gen_qrubberband.go b/qt/gen_qrubberband.go index b6168ed..7b2535e 100644 --- a/qt/gen_qrubberband.go +++ b/qt/gen_qrubberband.go @@ -45,13 +45,13 @@ func newQRubberBand_U(h unsafe.Pointer) *QRubberBand { // NewQRubberBand constructs a new QRubberBand object. func NewQRubberBand(param1 QRubberBand__Shape) *QRubberBand { - ret := C.QRubberBand_new((C.uintptr_t)(param1)) + ret := C.QRubberBand_new((C.int)(param1)) return newQRubberBand(ret) } // NewQRubberBand2 constructs a new QRubberBand object. func NewQRubberBand2(param1 QRubberBand__Shape, param2 *QWidget) *QRubberBand { - ret := C.QRubberBand_new2((C.uintptr_t)(param1), param2.cPointer()) + ret := C.QRubberBand_new2((C.int)(param1), param2.cPointer()) return newQRubberBand(ret) } diff --git a/qt/gen_qrubberband.h b/qt/gen_qrubberband.h index 0f6496e..f86dee6 100644 --- a/qt/gen_qrubberband.h +++ b/qt/gen_qrubberband.h @@ -29,12 +29,12 @@ typedef struct QSize QSize; typedef struct QWidget QWidget; #endif -QRubberBand* QRubberBand_new(uintptr_t param1); -QRubberBand* QRubberBand_new2(uintptr_t param1, QWidget* param2); +QRubberBand* QRubberBand_new(int param1); +QRubberBand* QRubberBand_new2(int param1, QWidget* param2); QMetaObject* QRubberBand_MetaObject(const QRubberBand* self); struct miqt_string* QRubberBand_Tr(const char* s); struct miqt_string* QRubberBand_TrUtf8(const char* s); -uintptr_t QRubberBand_Shape(const QRubberBand* self); +int QRubberBand_Shape(const QRubberBand* self); void QRubberBand_SetGeometry(QRubberBand* self, QRect* r); void QRubberBand_SetGeometry2(QRubberBand* self, int x, int y, int w, int h); void QRubberBand_Move(QRubberBand* self, int x, int y); diff --git a/qt/gen_qsavefile.go b/qt/gen_qsavefile.go index 37f5f6e..475c6a5 100644 --- a/qt/gen_qsavefile.go +++ b/qt/gen_qsavefile.go @@ -100,7 +100,7 @@ func (this *QSaveFile) SetFileName(name string) { } func (this *QSaveFile) Open(flags int) bool { - return (bool)(C.QSaveFile_Open(this.h, (C.int)(flags))) + return (bool)(C.QSaveFile_Open(this.h, flags)) } func (this *QSaveFile) Commit() bool { diff --git a/qt/gen_qscreen.cpp b/qt/gen_qscreen.cpp index 152a87d..ae65658 100644 --- a/qt/gen_qscreen.cpp +++ b/qt/gen_qscreen.cpp @@ -77,31 +77,38 @@ QSizeF* QScreen_PhysicalSize(const QScreen* self) { } double QScreen_PhysicalDotsPerInchX(const QScreen* self) { - return self->physicalDotsPerInchX(); + qreal _ret = self->physicalDotsPerInchX(); + return static_cast(_ret); } double QScreen_PhysicalDotsPerInchY(const QScreen* self) { - return self->physicalDotsPerInchY(); + qreal _ret = self->physicalDotsPerInchY(); + return static_cast(_ret); } double QScreen_PhysicalDotsPerInch(const QScreen* self) { - return self->physicalDotsPerInch(); + qreal _ret = self->physicalDotsPerInch(); + return static_cast(_ret); } double QScreen_LogicalDotsPerInchX(const QScreen* self) { - return self->logicalDotsPerInchX(); + qreal _ret = self->logicalDotsPerInchX(); + return static_cast(_ret); } double QScreen_LogicalDotsPerInchY(const QScreen* self) { - return self->logicalDotsPerInchY(); + qreal _ret = self->logicalDotsPerInchY(); + return static_cast(_ret); } double QScreen_LogicalDotsPerInch(const QScreen* self) { - return self->logicalDotsPerInch(); + qreal _ret = self->logicalDotsPerInch(); + return static_cast(_ret); } double QScreen_DevicePixelRatio(const QScreen* self) { - return self->devicePixelRatio(); + qreal _ret = self->devicePixelRatio(); + return static_cast(_ret); } QSize* QScreen_AvailableSize(const QScreen* self) { @@ -113,7 +120,7 @@ QRect* QScreen_AvailableGeometry(const QScreen* self) { } struct miqt_array* QScreen_VirtualSiblings(const QScreen* self) { - QList _ret = self->virtualSiblings(); + QList _ret = self->virtualSiblings(); // Convert QList<> from C++ memory to manually-managed C memory QScreen** _arr = static_cast(malloc(sizeof(QScreen*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -145,19 +152,19 @@ QRect* QScreen_AvailableVirtualGeometry(const QScreen* self) { return new QRect(self->availableVirtualGeometry()); } -uintptr_t QScreen_PrimaryOrientation(const QScreen* self) { +int QScreen_PrimaryOrientation(const QScreen* self) { Qt::ScreenOrientation _ret = self->primaryOrientation(); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QScreen_Orientation(const QScreen* self) { +int QScreen_Orientation(const QScreen* self) { Qt::ScreenOrientation _ret = self->orientation(); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QScreen_NativeOrientation(const QScreen* self) { +int QScreen_NativeOrientation(const QScreen* self) { Qt::ScreenOrientation _ret = self->nativeOrientation(); - return static_cast(_ret); + return static_cast(_ret); } int QScreen_OrientationUpdateMask(const QScreen* self) { @@ -169,32 +176,33 @@ void QScreen_SetOrientationUpdateMask(QScreen* self, int mask) { self->setOrientationUpdateMask(static_cast(mask)); } -int QScreen_AngleBetween(const QScreen* self, uintptr_t a, uintptr_t b) { +int QScreen_AngleBetween(const QScreen* self, int a, int b) { return self->angleBetween(static_cast(a), static_cast(b)); } -QTransform* QScreen_TransformBetween(const QScreen* self, uintptr_t a, uintptr_t b, QRect* target) { +QTransform* QScreen_TransformBetween(const QScreen* self, int a, int b, QRect* target) { return new QTransform(self->transformBetween(static_cast(a), static_cast(b), *target)); } -QRect* QScreen_MapBetween(const QScreen* self, uintptr_t a, uintptr_t b, QRect* rect) { +QRect* QScreen_MapBetween(const QScreen* self, int a, int b, QRect* rect) { return new QRect(self->mapBetween(static_cast(a), static_cast(b), *rect)); } -bool QScreen_IsPortrait(const QScreen* self, uintptr_t orientation) { +bool QScreen_IsPortrait(const QScreen* self, int orientation) { return self->isPortrait(static_cast(orientation)); } -bool QScreen_IsLandscape(const QScreen* self, uintptr_t orientation) { +bool QScreen_IsLandscape(const QScreen* self, int orientation) { return self->isLandscape(static_cast(orientation)); } QPixmap* QScreen_GrabWindow(QScreen* self, uintptr_t window) { - return new QPixmap(self->grabWindow(static_cast(window))); + return new QPixmap(self->grabWindow(static_cast(window))); } double QScreen_RefreshRate(const QScreen* self) { - return self->refreshRate(); + qreal _ret = self->refreshRate(); + return static_cast(_ret); } void QScreen_GeometryChanged(QScreen* self, QRect* geometry) { @@ -242,7 +250,8 @@ void QScreen_PhysicalDotsPerInchChanged(QScreen* self, double dpi) { void QScreen_connect_PhysicalDotsPerInchChanged(QScreen* self, void* slot) { QScreen::connect(self, static_cast(&QScreen::physicalDotsPerInchChanged), self, [=](qreal dpi) { - double sigval1 = dpi; + qreal dpi_ret = dpi; + double sigval1 = static_cast(dpi_ret); miqt_exec_callback_QScreen_PhysicalDotsPerInchChanged(slot, sigval1); }); } @@ -253,7 +262,8 @@ void QScreen_LogicalDotsPerInchChanged(QScreen* self, double dpi) { void QScreen_connect_LogicalDotsPerInchChanged(QScreen* self, void* slot) { QScreen::connect(self, static_cast(&QScreen::logicalDotsPerInchChanged), self, [=](qreal dpi) { - double sigval1 = dpi; + qreal dpi_ret = dpi; + double sigval1 = static_cast(dpi_ret); miqt_exec_callback_QScreen_LogicalDotsPerInchChanged(slot, sigval1); }); } @@ -271,26 +281,26 @@ void QScreen_connect_VirtualGeometryChanged(QScreen* self, void* slot) { }); } -void QScreen_PrimaryOrientationChanged(QScreen* self, uintptr_t orientation) { +void QScreen_PrimaryOrientationChanged(QScreen* self, int orientation) { self->primaryOrientationChanged(static_cast(orientation)); } void QScreen_connect_PrimaryOrientationChanged(QScreen* self, void* slot) { QScreen::connect(self, static_cast(&QScreen::primaryOrientationChanged), self, [=](Qt::ScreenOrientation orientation) { Qt::ScreenOrientation orientation_ret = orientation; - uintptr_t sigval1 = static_cast(orientation_ret); + int sigval1 = static_cast(orientation_ret); miqt_exec_callback_QScreen_PrimaryOrientationChanged(slot, sigval1); }); } -void QScreen_OrientationChanged(QScreen* self, uintptr_t orientation) { +void QScreen_OrientationChanged(QScreen* self, int orientation) { self->orientationChanged(static_cast(orientation)); } void QScreen_connect_OrientationChanged(QScreen* self, void* slot) { QScreen::connect(self, static_cast(&QScreen::orientationChanged), self, [=](Qt::ScreenOrientation orientation) { Qt::ScreenOrientation orientation_ret = orientation; - uintptr_t sigval1 = static_cast(orientation_ret); + int sigval1 = static_cast(orientation_ret); miqt_exec_callback_QScreen_OrientationChanged(slot, sigval1); }); } @@ -301,7 +311,8 @@ void QScreen_RefreshRateChanged(QScreen* self, double refreshRate) { void QScreen_connect_RefreshRateChanged(QScreen* self, void* slot) { QScreen::connect(self, static_cast(&QScreen::refreshRateChanged), self, [=](qreal refreshRate) { - double sigval1 = refreshRate; + qreal refreshRate_ret = refreshRate; + double sigval1 = static_cast(refreshRate_ret); miqt_exec_callback_QScreen_RefreshRateChanged(slot, sigval1); }); } @@ -335,19 +346,19 @@ struct miqt_string* QScreen_TrUtf83(const char* s, const char* c, int n) { } QPixmap* QScreen_GrabWindow2(QScreen* self, uintptr_t window, int x) { - return new QPixmap(self->grabWindow(static_cast(window), static_cast(x))); + return new QPixmap(self->grabWindow(static_cast(window), static_cast(x))); } QPixmap* QScreen_GrabWindow3(QScreen* self, uintptr_t window, int x, int y) { - return new QPixmap(self->grabWindow(static_cast(window), static_cast(x), static_cast(y))); + return new QPixmap(self->grabWindow(static_cast(window), static_cast(x), static_cast(y))); } QPixmap* QScreen_GrabWindow4(QScreen* self, uintptr_t window, int x, int y, int w) { - return new QPixmap(self->grabWindow(static_cast(window), static_cast(x), static_cast(y), static_cast(w))); + return new QPixmap(self->grabWindow(static_cast(window), static_cast(x), static_cast(y), static_cast(w))); } QPixmap* QScreen_GrabWindow5(QScreen* self, uintptr_t window, int x, int y, int w, int h) { - return new QPixmap(self->grabWindow(static_cast(window), static_cast(x), static_cast(y), static_cast(w), static_cast(h))); + return new QPixmap(self->grabWindow(static_cast(window), static_cast(x), static_cast(y), static_cast(w), static_cast(h))); } void QScreen_Delete(QScreen* self) { diff --git a/qt/gen_qscreen.go b/qt/gen_qscreen.go index 7fa1f7b..a4deaf5 100644 --- a/qt/gen_qscreen.go +++ b/qt/gen_qscreen.go @@ -214,33 +214,33 @@ func (this *QScreen) OrientationUpdateMask() int { } func (this *QScreen) SetOrientationUpdateMask(mask int) { - C.QScreen_SetOrientationUpdateMask(this.h, (C.int)(mask)) + C.QScreen_SetOrientationUpdateMask(this.h, mask) } func (this *QScreen) AngleBetween(a ScreenOrientation, b ScreenOrientation) int { - return (int)(C.QScreen_AngleBetween(this.h, (C.uintptr_t)(a), (C.uintptr_t)(b))) + return (int)(C.QScreen_AngleBetween(this.h, (C.int)(a), (C.int)(b))) } func (this *QScreen) TransformBetween(a ScreenOrientation, b ScreenOrientation, target *QRect) *QTransform { - _ret := C.QScreen_TransformBetween(this.h, (C.uintptr_t)(a), (C.uintptr_t)(b), target.cPointer()) + _ret := C.QScreen_TransformBetween(this.h, (C.int)(a), (C.int)(b), target.cPointer()) _goptr := newQTransform(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QScreen) MapBetween(a ScreenOrientation, b ScreenOrientation, rect *QRect) *QRect { - _ret := C.QScreen_MapBetween(this.h, (C.uintptr_t)(a), (C.uintptr_t)(b), rect.cPointer()) + _ret := C.QScreen_MapBetween(this.h, (C.int)(a), (C.int)(b), rect.cPointer()) _goptr := newQRect(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QScreen) IsPortrait(orientation ScreenOrientation) bool { - return (bool)(C.QScreen_IsPortrait(this.h, (C.uintptr_t)(orientation))) + return (bool)(C.QScreen_IsPortrait(this.h, (C.int)(orientation))) } func (this *QScreen) IsLandscape(orientation ScreenOrientation) bool { - return (bool)(C.QScreen_IsLandscape(this.h, (C.uintptr_t)(orientation))) + return (bool)(C.QScreen_IsLandscape(this.h, (C.int)(orientation))) } func (this *QScreen) GrabWindow(window uintptr) *QPixmap { @@ -375,14 +375,14 @@ func miqt_exec_callback_QScreen_VirtualGeometryChanged(cb *C.void, rect *C.QRect } func (this *QScreen) PrimaryOrientationChanged(orientation ScreenOrientation) { - C.QScreen_PrimaryOrientationChanged(this.h, (C.uintptr_t)(orientation)) + C.QScreen_PrimaryOrientationChanged(this.h, (C.int)(orientation)) } func (this *QScreen) OnPrimaryOrientationChanged(slot func(orientation ScreenOrientation)) { C.QScreen_connect_PrimaryOrientationChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QScreen_PrimaryOrientationChanged -func miqt_exec_callback_QScreen_PrimaryOrientationChanged(cb *C.void, orientation C.uintptr_t) { +func miqt_exec_callback_QScreen_PrimaryOrientationChanged(cb *C.void, orientation C.int) { gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(orientation ScreenOrientation)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -395,14 +395,14 @@ func miqt_exec_callback_QScreen_PrimaryOrientationChanged(cb *C.void, orientatio } func (this *QScreen) OrientationChanged(orientation ScreenOrientation) { - C.QScreen_OrientationChanged(this.h, (C.uintptr_t)(orientation)) + C.QScreen_OrientationChanged(this.h, (C.int)(orientation)) } func (this *QScreen) OnOrientationChanged(slot func(orientation ScreenOrientation)) { C.QScreen_connect_OrientationChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QScreen_OrientationChanged -func miqt_exec_callback_QScreen_OrientationChanged(cb *C.void, orientation C.uintptr_t) { +func miqt_exec_callback_QScreen_OrientationChanged(cb *C.void, orientation C.int) { gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(orientation ScreenOrientation)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt/gen_qscreen.h b/qt/gen_qscreen.h index 5f8e234..13c641e7 100644 --- a/qt/gen_qscreen.h +++ b/qt/gen_qscreen.h @@ -59,16 +59,16 @@ QSize* QScreen_VirtualSize(const QScreen* self); QRect* QScreen_VirtualGeometry(const QScreen* self); QSize* QScreen_AvailableVirtualSize(const QScreen* self); QRect* QScreen_AvailableVirtualGeometry(const QScreen* self); -uintptr_t QScreen_PrimaryOrientation(const QScreen* self); -uintptr_t QScreen_Orientation(const QScreen* self); -uintptr_t QScreen_NativeOrientation(const QScreen* self); +int QScreen_PrimaryOrientation(const QScreen* self); +int QScreen_Orientation(const QScreen* self); +int QScreen_NativeOrientation(const QScreen* self); int QScreen_OrientationUpdateMask(const QScreen* self); void QScreen_SetOrientationUpdateMask(QScreen* self, int mask); -int QScreen_AngleBetween(const QScreen* self, uintptr_t a, uintptr_t b); -QTransform* QScreen_TransformBetween(const QScreen* self, uintptr_t a, uintptr_t b, QRect* target); -QRect* QScreen_MapBetween(const QScreen* self, uintptr_t a, uintptr_t b, QRect* rect); -bool QScreen_IsPortrait(const QScreen* self, uintptr_t orientation); -bool QScreen_IsLandscape(const QScreen* self, uintptr_t orientation); +int QScreen_AngleBetween(const QScreen* self, int a, int b); +QTransform* QScreen_TransformBetween(const QScreen* self, int a, int b, QRect* target); +QRect* QScreen_MapBetween(const QScreen* self, int a, int b, QRect* rect); +bool QScreen_IsPortrait(const QScreen* self, int orientation); +bool QScreen_IsLandscape(const QScreen* self, int orientation); QPixmap* QScreen_GrabWindow(QScreen* self, uintptr_t window); double QScreen_RefreshRate(const QScreen* self); void QScreen_GeometryChanged(QScreen* self, QRect* geometry); @@ -83,9 +83,9 @@ void QScreen_LogicalDotsPerInchChanged(QScreen* self, double dpi); void QScreen_connect_LogicalDotsPerInchChanged(QScreen* self, void* slot); void QScreen_VirtualGeometryChanged(QScreen* self, QRect* rect); void QScreen_connect_VirtualGeometryChanged(QScreen* self, void* slot); -void QScreen_PrimaryOrientationChanged(QScreen* self, uintptr_t orientation); +void QScreen_PrimaryOrientationChanged(QScreen* self, int orientation); void QScreen_connect_PrimaryOrientationChanged(QScreen* self, void* slot); -void QScreen_OrientationChanged(QScreen* self, uintptr_t orientation); +void QScreen_OrientationChanged(QScreen* self, int orientation); void QScreen_connect_OrientationChanged(QScreen* self, void* slot); void QScreen_RefreshRateChanged(QScreen* self, double refreshRate); void QScreen_connect_RefreshRateChanged(QScreen* self, void* slot); diff --git a/qt/gen_qscrollarea.go b/qt/gen_qscrollarea.go index b71d626..6d9ff84 100644 --- a/qt/gen_qscrollarea.go +++ b/qt/gen_qscrollarea.go @@ -106,7 +106,7 @@ func (this *QScrollArea) Alignment() int { } func (this *QScrollArea) SetAlignment(alignment int) { - C.QScrollArea_SetAlignment(this.h, (C.int)(alignment)) + C.QScrollArea_SetAlignment(this.h, alignment) } func (this *QScrollArea) EnsureVisible(x int, y int) { diff --git a/qt/gen_qscrollbar.cpp b/qt/gen_qscrollbar.cpp index 4243bcd..9c48b9a 100644 --- a/qt/gen_qscrollbar.cpp +++ b/qt/gen_qscrollbar.cpp @@ -14,7 +14,7 @@ QScrollBar* QScrollBar_new() { return new QScrollBar(); } -QScrollBar* QScrollBar_new2(uintptr_t param1) { +QScrollBar* QScrollBar_new2(int param1) { return new QScrollBar(static_cast(param1)); } @@ -22,7 +22,7 @@ QScrollBar* QScrollBar_new3(QWidget* parent) { return new QScrollBar(parent); } -QScrollBar* QScrollBar_new4(uintptr_t param1, QWidget* parent) { +QScrollBar* QScrollBar_new4(int param1, QWidget* parent) { return new QScrollBar(static_cast(param1), parent); } diff --git a/qt/gen_qscrollbar.go b/qt/gen_qscrollbar.go index ea86c62..6f90819 100644 --- a/qt/gen_qscrollbar.go +++ b/qt/gen_qscrollbar.go @@ -44,7 +44,7 @@ func NewQScrollBar() *QScrollBar { // NewQScrollBar2 constructs a new QScrollBar object. func NewQScrollBar2(param1 Orientation) *QScrollBar { - ret := C.QScrollBar_new2((C.uintptr_t)(param1)) + ret := C.QScrollBar_new2((C.int)(param1)) return newQScrollBar(ret) } @@ -56,7 +56,7 @@ func NewQScrollBar3(parent *QWidget) *QScrollBar { // NewQScrollBar4 constructs a new QScrollBar object. func NewQScrollBar4(param1 Orientation, parent *QWidget) *QScrollBar { - ret := C.QScrollBar_new4((C.uintptr_t)(param1), parent.cPointer()) + ret := C.QScrollBar_new4((C.int)(param1), parent.cPointer()) return newQScrollBar(ret) } diff --git a/qt/gen_qscrollbar.h b/qt/gen_qscrollbar.h index 43b17e6..12d918f 100644 --- a/qt/gen_qscrollbar.h +++ b/qt/gen_qscrollbar.h @@ -28,9 +28,9 @@ typedef struct QWidget QWidget; #endif QScrollBar* QScrollBar_new(); -QScrollBar* QScrollBar_new2(uintptr_t param1); +QScrollBar* QScrollBar_new2(int param1); QScrollBar* QScrollBar_new3(QWidget* parent); -QScrollBar* QScrollBar_new4(uintptr_t param1, QWidget* parent); +QScrollBar* QScrollBar_new4(int param1, QWidget* parent); QMetaObject* QScrollBar_MetaObject(const QScrollBar* self); struct miqt_string* QScrollBar_Tr(const char* s); struct miqt_string* QScrollBar_TrUtf8(const char* s); diff --git a/qt/gen_qscroller.cpp b/qt/gen_qscroller.cpp index a16aa42..5600382 100644 --- a/qt/gen_qscroller.cpp +++ b/qt/gen_qscroller.cpp @@ -42,14 +42,14 @@ QScroller* QScroller_ScrollerWithTarget(QObject* target) { return (QScroller*) QScroller::scroller(target); } -uintptr_t QScroller_GrabGesture(QObject* target) { +int QScroller_GrabGesture(QObject* target) { Qt::GestureType _ret = QScroller::grabGesture(target); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QScroller_GrabbedGesture(QObject* target) { +int QScroller_GrabbedGesture(QObject* target) { Qt::GestureType _ret = QScroller::grabbedGesture(target); - return static_cast(_ret); + return static_cast(_ret); } void QScroller_UngrabGesture(QObject* target) { @@ -57,7 +57,7 @@ void QScroller_UngrabGesture(QObject* target) { } struct miqt_array* QScroller_ActiveScrollers() { - QList _ret = QScroller::activeScrollers(); + QList _ret = QScroller::activeScrollers(); // Convert QList<> from C++ memory to manually-managed C memory QScroller** _arr = static_cast(malloc(sizeof(QScroller*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -73,12 +73,12 @@ QObject* QScroller_Target(const QScroller* self) { return self->target(); } -uintptr_t QScroller_State(const QScroller* self) { +int QScroller_State(const QScroller* self) { QScroller::State _ret = self->state(); - return static_cast(_ret); + return static_cast(_ret); } -bool QScroller_HandleInput(QScroller* self, uintptr_t input, QPointF* position) { +bool QScroller_HandleInput(QScroller* self, int input, QPointF* position) { return self->handleInput(static_cast(input), *position); } @@ -154,14 +154,14 @@ void QScroller_ResendPrepareEvent(QScroller* self) { self->resendPrepareEvent(); } -void QScroller_StateChanged(QScroller* self, uintptr_t newstate) { +void QScroller_StateChanged(QScroller* self, int newstate) { self->stateChanged(static_cast(newstate)); } void QScroller_connect_StateChanged(QScroller* self, void* slot) { QScroller::connect(self, static_cast(&QScroller::stateChanged), self, [=](QScroller::State newstate) { QScroller::State newstate_ret = newstate; - uintptr_t sigval1 = static_cast(newstate_ret); + int sigval1 = static_cast(newstate_ret); miqt_exec_callback_QScroller_StateChanged(slot, sigval1); }); } @@ -207,12 +207,12 @@ struct miqt_string* QScroller_TrUtf83(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -uintptr_t QScroller_GrabGesture2(QObject* target, uintptr_t gestureType) { +int QScroller_GrabGesture2(QObject* target, int gestureType) { Qt::GestureType _ret = QScroller::grabGesture(target, static_cast(gestureType)); - return static_cast(_ret); + return static_cast(_ret); } -bool QScroller_HandleInput3(QScroller* self, uintptr_t input, QPointF* position, long long timestamp) { +bool QScroller_HandleInput3(QScroller* self, int input, QPointF* position, long long timestamp) { return self->handleInput(static_cast(input), *position, static_cast(timestamp)); } diff --git a/qt/gen_qscroller.go b/qt/gen_qscroller.go index 7952fbe..6ff291b 100644 --- a/qt/gen_qscroller.go +++ b/qt/gen_qscroller.go @@ -129,7 +129,7 @@ func (this *QScroller) State() QScroller__State { } func (this *QScroller) HandleInput(input QScroller__Input, position *QPointF) bool { - return (bool)(C.QScroller_HandleInput(this.h, (C.uintptr_t)(input), position.cPointer())) + return (bool)(C.QScroller_HandleInput(this.h, (C.int)(input), position.cPointer())) } func (this *QScroller) Stop() { @@ -221,14 +221,14 @@ func (this *QScroller) ResendPrepareEvent() { } func (this *QScroller) StateChanged(newstate QScroller__State) { - C.QScroller_StateChanged(this.h, (C.uintptr_t)(newstate)) + C.QScroller_StateChanged(this.h, (C.int)(newstate)) } func (this *QScroller) OnStateChanged(slot func(newstate QScroller__State)) { C.QScroller_connect_StateChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QScroller_StateChanged -func miqt_exec_callback_QScroller_StateChanged(cb *C.void, newstate C.uintptr_t) { +func miqt_exec_callback_QScroller_StateChanged(cb *C.void, newstate C.int) { gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(newstate QScroller__State)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -305,9 +305,9 @@ func QScroller_TrUtf83(s string, c string, n int) string { } func QScroller_GrabGesture2(target *QObject, gestureType QScroller__ScrollerGestureType) GestureType { - return (GestureType)(C.QScroller_GrabGesture2(target.cPointer(), (C.uintptr_t)(gestureType))) + return (GestureType)(C.QScroller_GrabGesture2(target.cPointer(), (C.int)(gestureType))) } func (this *QScroller) HandleInput3(input QScroller__Input, position *QPointF, timestamp int64) bool { - return (bool)(C.QScroller_HandleInput3(this.h, (C.uintptr_t)(input), position.cPointer(), (C.longlong)(timestamp))) + return (bool)(C.QScroller_HandleInput3(this.h, (C.int)(input), position.cPointer(), (C.longlong)(timestamp))) } diff --git a/qt/gen_qscroller.h b/qt/gen_qscroller.h index 4965a2f..961244d 100644 --- a/qt/gen_qscroller.h +++ b/qt/gen_qscroller.h @@ -35,13 +35,13 @@ struct miqt_string* QScroller_TrUtf8(const char* s); bool QScroller_HasScroller(QObject* target); QScroller* QScroller_Scroller(QObject* target); QScroller* QScroller_ScrollerWithTarget(QObject* target); -uintptr_t QScroller_GrabGesture(QObject* target); -uintptr_t QScroller_GrabbedGesture(QObject* target); +int QScroller_GrabGesture(QObject* target); +int QScroller_GrabbedGesture(QObject* target); void QScroller_UngrabGesture(QObject* target); struct miqt_array* QScroller_ActiveScrollers(); QObject* QScroller_Target(const QScroller* self); -uintptr_t QScroller_State(const QScroller* self); -bool QScroller_HandleInput(QScroller* self, uintptr_t input, QPointF* position); +int QScroller_State(const QScroller* self); +bool QScroller_HandleInput(QScroller* self, int input, QPointF* position); void QScroller_Stop(QScroller* self); QPointF* QScroller_Velocity(const QScroller* self); QPointF* QScroller_FinalPosition(const QScroller* self); @@ -57,7 +57,7 @@ void QScroller_ScrollTo2(QScroller* self, QPointF* pos, int scrollTime); void QScroller_EnsureVisible(QScroller* self, QRectF* rect, double xmargin, double ymargin); void QScroller_EnsureVisible2(QScroller* self, QRectF* rect, double xmargin, double ymargin, int scrollTime); void QScroller_ResendPrepareEvent(QScroller* self); -void QScroller_StateChanged(QScroller* self, uintptr_t newstate); +void QScroller_StateChanged(QScroller* self, int newstate); void QScroller_connect_StateChanged(QScroller* self, void* slot); void QScroller_ScrollerPropertiesChanged(QScroller* self, QScrollerProperties* param1); void QScroller_connect_ScrollerPropertiesChanged(QScroller* self, void* slot); @@ -65,8 +65,8 @@ struct miqt_string* QScroller_Tr2(const char* s, const char* c); struct miqt_string* QScroller_Tr3(const char* s, const char* c, int n); struct miqt_string* QScroller_TrUtf82(const char* s, const char* c); struct miqt_string* QScroller_TrUtf83(const char* s, const char* c, int n); -uintptr_t QScroller_GrabGesture2(QObject* target, uintptr_t gestureType); -bool QScroller_HandleInput3(QScroller* self, uintptr_t input, QPointF* position, long long timestamp); +int QScroller_GrabGesture2(QObject* target, int gestureType); +bool QScroller_HandleInput3(QScroller* self, int input, QPointF* position, long long timestamp); #ifdef __cplusplus } /* extern C */ diff --git a/qt/gen_qscrollerproperties.cpp b/qt/gen_qscrollerproperties.cpp index 6b9d7da..9736ce4 100644 --- a/qt/gen_qscrollerproperties.cpp +++ b/qt/gen_qscrollerproperties.cpp @@ -32,11 +32,11 @@ void QScrollerProperties_UnsetDefaultScrollerProperties() { QScrollerProperties::unsetDefaultScrollerProperties(); } -QVariant* QScrollerProperties_ScrollMetric(const QScrollerProperties* self, uintptr_t metric) { +QVariant* QScrollerProperties_ScrollMetric(const QScrollerProperties* self, int metric) { return new QVariant(self->scrollMetric(static_cast(metric))); } -void QScrollerProperties_SetScrollMetric(QScrollerProperties* self, uintptr_t metric, QVariant* value) { +void QScrollerProperties_SetScrollMetric(QScrollerProperties* self, int metric, QVariant* value) { self->setScrollMetric(static_cast(metric), *value); } diff --git a/qt/gen_qscrollerproperties.go b/qt/gen_qscrollerproperties.go index 7f21272..067abd6 100644 --- a/qt/gen_qscrollerproperties.go +++ b/qt/gen_qscrollerproperties.go @@ -111,14 +111,14 @@ func QScrollerProperties_UnsetDefaultScrollerProperties() { } func (this *QScrollerProperties) ScrollMetric(metric QScrollerProperties__ScrollMetric) *QVariant { - _ret := C.QScrollerProperties_ScrollMetric(this.h, (C.uintptr_t)(metric)) + _ret := C.QScrollerProperties_ScrollMetric(this.h, (C.int)(metric)) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QScrollerProperties) SetScrollMetric(metric QScrollerProperties__ScrollMetric, value *QVariant) { - C.QScrollerProperties_SetScrollMetric(this.h, (C.uintptr_t)(metric), value.cPointer()) + C.QScrollerProperties_SetScrollMetric(this.h, (C.int)(metric), value.cPointer()) } // Delete this object from C++ memory. diff --git a/qt/gen_qscrollerproperties.h b/qt/gen_qscrollerproperties.h index 4aa356a..5a2bf49 100644 --- a/qt/gen_qscrollerproperties.h +++ b/qt/gen_qscrollerproperties.h @@ -28,8 +28,8 @@ bool QScrollerProperties_OperatorEqual(const QScrollerProperties* self, QScrolle bool QScrollerProperties_OperatorNotEqual(const QScrollerProperties* self, QScrollerProperties* sp); void QScrollerProperties_SetDefaultScrollerProperties(QScrollerProperties* sp); void QScrollerProperties_UnsetDefaultScrollerProperties(); -QVariant* QScrollerProperties_ScrollMetric(const QScrollerProperties* self, uintptr_t metric); -void QScrollerProperties_SetScrollMetric(QScrollerProperties* self, uintptr_t metric, QVariant* value); +QVariant* QScrollerProperties_ScrollMetric(const QScrollerProperties* self, int metric); +void QScrollerProperties_SetScrollMetric(QScrollerProperties* self, int metric, QVariant* value); void QScrollerProperties_Delete(QScrollerProperties* self); #ifdef __cplusplus diff --git a/qt/gen_qsessionmanager.cpp b/qt/gen_qsessionmanager.cpp index 744fe94..c90b231 100644 --- a/qt/gen_qsessionmanager.cpp +++ b/qt/gen_qsessionmanager.cpp @@ -56,13 +56,13 @@ void QSessionManager_Cancel(QSessionManager* self) { self->cancel(); } -void QSessionManager_SetRestartHint(QSessionManager* self, uintptr_t restartHint) { +void QSessionManager_SetRestartHint(QSessionManager* self, int restartHint) { self->setRestartHint(static_cast(restartHint)); } -uintptr_t QSessionManager_RestartHint(const QSessionManager* self) { +int QSessionManager_RestartHint(const QSessionManager* self) { QSessionManager::RestartHint _ret = self->restartHint(); - return static_cast(_ret); + return static_cast(_ret); } void QSessionManager_SetRestartCommand(QSessionManager* self, struct miqt_array* /* of struct miqt_string* */ restartCommand) { diff --git a/qt/gen_qsessionmanager.go b/qt/gen_qsessionmanager.go index 5c6e0cc..b238dd2 100644 --- a/qt/gen_qsessionmanager.go +++ b/qt/gen_qsessionmanager.go @@ -98,7 +98,7 @@ func (this *QSessionManager) Cancel() { } func (this *QSessionManager) SetRestartHint(restartHint QSessionManager__RestartHint) { - C.QSessionManager_SetRestartHint(this.h, (C.uintptr_t)(restartHint)) + C.QSessionManager_SetRestartHint(this.h, (C.int)(restartHint)) } func (this *QSessionManager) RestartHint() QSessionManager__RestartHint { diff --git a/qt/gen_qsessionmanager.h b/qt/gen_qsessionmanager.h index 4edb339..63b7cc2 100644 --- a/qt/gen_qsessionmanager.h +++ b/qt/gen_qsessionmanager.h @@ -30,8 +30,8 @@ bool QSessionManager_AllowsInteraction(QSessionManager* self); bool QSessionManager_AllowsErrorInteraction(QSessionManager* self); void QSessionManager_Release(QSessionManager* self); void QSessionManager_Cancel(QSessionManager* self); -void QSessionManager_SetRestartHint(QSessionManager* self, uintptr_t restartHint); -uintptr_t QSessionManager_RestartHint(const QSessionManager* self); +void QSessionManager_SetRestartHint(QSessionManager* self, int restartHint); +int QSessionManager_RestartHint(const QSessionManager* self); void QSessionManager_SetRestartCommand(QSessionManager* self, struct miqt_array* /* of struct miqt_string* */ restartCommand); struct miqt_array* QSessionManager_RestartCommand(const QSessionManager* self); void QSessionManager_SetDiscardCommand(QSessionManager* self, struct miqt_array* /* of struct miqt_string* */ discardCommand); diff --git a/qt/gen_qsettings.cpp b/qt/gen_qsettings.cpp index f683d44..686f43c 100644 --- a/qt/gen_qsettings.cpp +++ b/qt/gen_qsettings.cpp @@ -16,17 +16,17 @@ QSettings* QSettings_new(struct miqt_string* organization) { return new QSettings(organization_QString); } -QSettings* QSettings_new2(uintptr_t scope, struct miqt_string* organization) { +QSettings* QSettings_new2(int scope, struct miqt_string* organization) { QString organization_QString = QString::fromUtf8(&organization->data, organization->len); return new QSettings(static_cast(scope), organization_QString); } -QSettings* QSettings_new3(uintptr_t format, uintptr_t scope, struct miqt_string* organization) { +QSettings* QSettings_new3(int format, int scope, struct miqt_string* organization) { QString organization_QString = QString::fromUtf8(&organization->data, organization->len); return new QSettings(static_cast(format), static_cast(scope), organization_QString); } -QSettings* QSettings_new4(struct miqt_string* fileName, uintptr_t format) { +QSettings* QSettings_new4(struct miqt_string* fileName, int format) { QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); return new QSettings(fileName_QString, static_cast(format)); } @@ -35,7 +35,7 @@ QSettings* QSettings_new5() { return new QSettings(); } -QSettings* QSettings_new6(uintptr_t scope) { +QSettings* QSettings_new6(int scope) { return new QSettings(static_cast(scope)); } @@ -51,31 +51,31 @@ QSettings* QSettings_new8(struct miqt_string* organization, struct miqt_string* return new QSettings(organization_QString, application_QString, parent); } -QSettings* QSettings_new9(uintptr_t scope, struct miqt_string* organization, struct miqt_string* application) { +QSettings* QSettings_new9(int scope, struct miqt_string* organization, struct miqt_string* application) { QString organization_QString = QString::fromUtf8(&organization->data, organization->len); QString application_QString = QString::fromUtf8(&application->data, application->len); return new QSettings(static_cast(scope), organization_QString, application_QString); } -QSettings* QSettings_new10(uintptr_t scope, struct miqt_string* organization, struct miqt_string* application, QObject* parent) { +QSettings* QSettings_new10(int scope, struct miqt_string* organization, struct miqt_string* application, QObject* parent) { QString organization_QString = QString::fromUtf8(&organization->data, organization->len); QString application_QString = QString::fromUtf8(&application->data, application->len); return new QSettings(static_cast(scope), organization_QString, application_QString, parent); } -QSettings* QSettings_new11(uintptr_t format, uintptr_t scope, struct miqt_string* organization, struct miqt_string* application) { +QSettings* QSettings_new11(int format, int scope, struct miqt_string* organization, struct miqt_string* application) { QString organization_QString = QString::fromUtf8(&organization->data, organization->len); QString application_QString = QString::fromUtf8(&application->data, application->len); return new QSettings(static_cast(format), static_cast(scope), organization_QString, application_QString); } -QSettings* QSettings_new12(uintptr_t format, uintptr_t scope, struct miqt_string* organization, struct miqt_string* application, QObject* parent) { +QSettings* QSettings_new12(int format, int scope, struct miqt_string* organization, struct miqt_string* application, QObject* parent) { QString organization_QString = QString::fromUtf8(&organization->data, organization->len); QString application_QString = QString::fromUtf8(&application->data, application->len); return new QSettings(static_cast(format), static_cast(scope), organization_QString, application_QString, parent); } -QSettings* QSettings_new13(struct miqt_string* fileName, uintptr_t format, QObject* parent) { +QSettings* QSettings_new13(struct miqt_string* fileName, int format, QObject* parent) { QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); return new QSettings(fileName_QString, static_cast(format), parent); } @@ -84,7 +84,7 @@ QSettings* QSettings_new14(QObject* parent) { return new QSettings(parent); } -QSettings* QSettings_new15(uintptr_t scope, QObject* parent) { +QSettings* QSettings_new15(int scope, QObject* parent) { return new QSettings(static_cast(scope), parent); } @@ -114,9 +114,9 @@ void QSettings_Sync(QSettings* self) { self->sync(); } -uintptr_t QSettings_Status(const QSettings* self) { +int QSettings_Status(const QSettings* self) { QSettings::Status _ret = self->status(); - return static_cast(_ret); + return static_cast(_ret); } bool QSettings_IsAtomicSyncRequired(const QSettings* self) { @@ -248,14 +248,14 @@ struct miqt_string* QSettings_FileName(const QSettings* self) { return miqt_strdup(_b.data(), _b.length()); } -uintptr_t QSettings_Format(const QSettings* self) { +int QSettings_Format(const QSettings* self) { QSettings::Format _ret = self->format(); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QSettings_Scope(const QSettings* self) { +int QSettings_Scope(const QSettings* self) { QSettings::Scope _ret = self->scope(); - return static_cast(_ret); + return static_cast(_ret); } struct miqt_string* QSettings_OrganizationName(const QSettings* self) { @@ -284,13 +284,13 @@ QTextCodec* QSettings_IniCodec(const QSettings* self) { return self->iniCodec(); } -void QSettings_SetDefaultFormat(uintptr_t format) { +void QSettings_SetDefaultFormat(int format) { QSettings::setDefaultFormat(static_cast(format)); } -uintptr_t QSettings_DefaultFormat() { +int QSettings_DefaultFormat() { QSettings::Format _ret = QSettings::defaultFormat(); - return static_cast(_ret); + return static_cast(_ret); } void QSettings_SetSystemIniPath(struct miqt_string* dir) { @@ -303,7 +303,7 @@ void QSettings_SetUserIniPath(struct miqt_string* dir) { QSettings::setUserIniPath(dir_QString); } -void QSettings_SetPath(uintptr_t format, uintptr_t scope, struct miqt_string* path) { +void QSettings_SetPath(int format, int scope, struct miqt_string* path) { QString path_QString = QString::fromUtf8(&path->data, path->len); QSettings::setPath(static_cast(format), static_cast(scope), path_QString); } diff --git a/qt/gen_qsettings.go b/qt/gen_qsettings.go index edaf190..cf611ee 100644 --- a/qt/gen_qsettings.go +++ b/qt/gen_qsettings.go @@ -87,7 +87,7 @@ func NewQSettings(organization string) *QSettings { func NewQSettings2(scope QSettings__Scope, organization string) *QSettings { organization_ms := miqt_strdupg(organization) defer C.free(organization_ms) - ret := C.QSettings_new2((C.uintptr_t)(scope), (*C.struct_miqt_string)(organization_ms)) + ret := C.QSettings_new2((C.int)(scope), (*C.struct_miqt_string)(organization_ms)) return newQSettings(ret) } @@ -95,7 +95,7 @@ func NewQSettings2(scope QSettings__Scope, organization string) *QSettings { func NewQSettings3(format QSettings__Format, scope QSettings__Scope, organization string) *QSettings { organization_ms := miqt_strdupg(organization) defer C.free(organization_ms) - ret := C.QSettings_new3((C.uintptr_t)(format), (C.uintptr_t)(scope), (*C.struct_miqt_string)(organization_ms)) + ret := C.QSettings_new3((C.int)(format), (C.int)(scope), (*C.struct_miqt_string)(organization_ms)) return newQSettings(ret) } @@ -103,7 +103,7 @@ func NewQSettings3(format QSettings__Format, scope QSettings__Scope, organizatio func NewQSettings4(fileName string, format QSettings__Format) *QSettings { fileName_ms := miqt_strdupg(fileName) defer C.free(fileName_ms) - ret := C.QSettings_new4((*C.struct_miqt_string)(fileName_ms), (C.uintptr_t)(format)) + ret := C.QSettings_new4((*C.struct_miqt_string)(fileName_ms), (C.int)(format)) return newQSettings(ret) } @@ -115,7 +115,7 @@ func NewQSettings5() *QSettings { // NewQSettings6 constructs a new QSettings object. func NewQSettings6(scope QSettings__Scope) *QSettings { - ret := C.QSettings_new6((C.uintptr_t)(scope)) + ret := C.QSettings_new6((C.int)(scope)) return newQSettings(ret) } @@ -145,7 +145,7 @@ func NewQSettings9(scope QSettings__Scope, organization string, application stri defer C.free(organization_ms) application_ms := miqt_strdupg(application) defer C.free(application_ms) - ret := C.QSettings_new9((C.uintptr_t)(scope), (*C.struct_miqt_string)(organization_ms), (*C.struct_miqt_string)(application_ms)) + ret := C.QSettings_new9((C.int)(scope), (*C.struct_miqt_string)(organization_ms), (*C.struct_miqt_string)(application_ms)) return newQSettings(ret) } @@ -155,7 +155,7 @@ func NewQSettings10(scope QSettings__Scope, organization string, application str defer C.free(organization_ms) application_ms := miqt_strdupg(application) defer C.free(application_ms) - ret := C.QSettings_new10((C.uintptr_t)(scope), (*C.struct_miqt_string)(organization_ms), (*C.struct_miqt_string)(application_ms), parent.cPointer()) + ret := C.QSettings_new10((C.int)(scope), (*C.struct_miqt_string)(organization_ms), (*C.struct_miqt_string)(application_ms), parent.cPointer()) return newQSettings(ret) } @@ -165,7 +165,7 @@ func NewQSettings11(format QSettings__Format, scope QSettings__Scope, organizati defer C.free(organization_ms) application_ms := miqt_strdupg(application) defer C.free(application_ms) - ret := C.QSettings_new11((C.uintptr_t)(format), (C.uintptr_t)(scope), (*C.struct_miqt_string)(organization_ms), (*C.struct_miqt_string)(application_ms)) + ret := C.QSettings_new11((C.int)(format), (C.int)(scope), (*C.struct_miqt_string)(organization_ms), (*C.struct_miqt_string)(application_ms)) return newQSettings(ret) } @@ -175,7 +175,7 @@ func NewQSettings12(format QSettings__Format, scope QSettings__Scope, organizati defer C.free(organization_ms) application_ms := miqt_strdupg(application) defer C.free(application_ms) - ret := C.QSettings_new12((C.uintptr_t)(format), (C.uintptr_t)(scope), (*C.struct_miqt_string)(organization_ms), (*C.struct_miqt_string)(application_ms), parent.cPointer()) + ret := C.QSettings_new12((C.int)(format), (C.int)(scope), (*C.struct_miqt_string)(organization_ms), (*C.struct_miqt_string)(application_ms), parent.cPointer()) return newQSettings(ret) } @@ -183,7 +183,7 @@ func NewQSettings12(format QSettings__Format, scope QSettings__Scope, organizati func NewQSettings13(fileName string, format QSettings__Format, parent *QObject) *QSettings { fileName_ms := miqt_strdupg(fileName) defer C.free(fileName_ms) - ret := C.QSettings_new13((*C.struct_miqt_string)(fileName_ms), (C.uintptr_t)(format), parent.cPointer()) + ret := C.QSettings_new13((*C.struct_miqt_string)(fileName_ms), (C.int)(format), parent.cPointer()) return newQSettings(ret) } @@ -195,7 +195,7 @@ func NewQSettings14(parent *QObject) *QSettings { // NewQSettings15 constructs a new QSettings object. func NewQSettings15(scope QSettings__Scope, parent *QObject) *QSettings { - ret := C.QSettings_new15((C.uintptr_t)(scope), parent.cPointer()) + ret := C.QSettings_new15((C.int)(scope), parent.cPointer()) return newQSettings(ret) } @@ -403,7 +403,7 @@ func (this *QSettings) IniCodec() *QTextCodec { } func QSettings_SetDefaultFormat(format QSettings__Format) { - C.QSettings_SetDefaultFormat((C.uintptr_t)(format)) + C.QSettings_SetDefaultFormat((C.int)(format)) } func QSettings_DefaultFormat() QSettings__Format { @@ -425,7 +425,7 @@ func QSettings_SetUserIniPath(dir string) { func QSettings_SetPath(format QSettings__Format, scope QSettings__Scope, path string) { path_ms := miqt_strdupg(path) defer C.free(path_ms) - C.QSettings_SetPath((C.uintptr_t)(format), (C.uintptr_t)(scope), (*C.struct_miqt_string)(path_ms)) + C.QSettings_SetPath((C.int)(format), (C.int)(scope), (*C.struct_miqt_string)(path_ms)) } func QSettings_Tr2(s string, c string) string { diff --git a/qt/gen_qsettings.h b/qt/gen_qsettings.h index 0061655..2c2f474 100644 --- a/qt/gen_qsettings.h +++ b/qt/gen_qsettings.h @@ -28,26 +28,26 @@ typedef struct QVariant QVariant; #endif QSettings* QSettings_new(struct miqt_string* organization); -QSettings* QSettings_new2(uintptr_t scope, struct miqt_string* organization); -QSettings* QSettings_new3(uintptr_t format, uintptr_t scope, struct miqt_string* organization); -QSettings* QSettings_new4(struct miqt_string* fileName, uintptr_t format); +QSettings* QSettings_new2(int scope, struct miqt_string* organization); +QSettings* QSettings_new3(int format, int scope, struct miqt_string* organization); +QSettings* QSettings_new4(struct miqt_string* fileName, int format); QSettings* QSettings_new5(); -QSettings* QSettings_new6(uintptr_t scope); +QSettings* QSettings_new6(int scope); QSettings* QSettings_new7(struct miqt_string* organization, struct miqt_string* application); QSettings* QSettings_new8(struct miqt_string* organization, struct miqt_string* application, QObject* parent); -QSettings* QSettings_new9(uintptr_t scope, struct miqt_string* organization, struct miqt_string* application); -QSettings* QSettings_new10(uintptr_t scope, struct miqt_string* organization, struct miqt_string* application, QObject* parent); -QSettings* QSettings_new11(uintptr_t format, uintptr_t scope, struct miqt_string* organization, struct miqt_string* application); -QSettings* QSettings_new12(uintptr_t format, uintptr_t scope, struct miqt_string* organization, struct miqt_string* application, QObject* parent); -QSettings* QSettings_new13(struct miqt_string* fileName, uintptr_t format, QObject* parent); +QSettings* QSettings_new9(int scope, struct miqt_string* organization, struct miqt_string* application); +QSettings* QSettings_new10(int scope, struct miqt_string* organization, struct miqt_string* application, QObject* parent); +QSettings* QSettings_new11(int format, int scope, struct miqt_string* organization, struct miqt_string* application); +QSettings* QSettings_new12(int format, int scope, struct miqt_string* organization, struct miqt_string* application, QObject* parent); +QSettings* QSettings_new13(struct miqt_string* fileName, int format, QObject* parent); QSettings* QSettings_new14(QObject* parent); -QSettings* QSettings_new15(uintptr_t scope, QObject* parent); +QSettings* QSettings_new15(int scope, QObject* parent); QMetaObject* QSettings_MetaObject(const QSettings* self); struct miqt_string* QSettings_Tr(const char* s); struct miqt_string* QSettings_TrUtf8(const char* s); void QSettings_Clear(QSettings* self); void QSettings_Sync(QSettings* self); -uintptr_t QSettings_Status(const QSettings* self); +int QSettings_Status(const QSettings* self); bool QSettings_IsAtomicSyncRequired(const QSettings* self); void QSettings_SetAtomicSyncRequired(QSettings* self, bool enable); void QSettings_BeginGroup(QSettings* self, struct miqt_string* prefix); @@ -68,18 +68,18 @@ bool QSettings_Contains(const QSettings* self, struct miqt_string* key); void QSettings_SetFallbacksEnabled(QSettings* self, bool b); bool QSettings_FallbacksEnabled(const QSettings* self); struct miqt_string* QSettings_FileName(const QSettings* self); -uintptr_t QSettings_Format(const QSettings* self); -uintptr_t QSettings_Scope(const QSettings* self); +int QSettings_Format(const QSettings* self); +int QSettings_Scope(const QSettings* self); struct miqt_string* QSettings_OrganizationName(const QSettings* self); struct miqt_string* QSettings_ApplicationName(const QSettings* self); void QSettings_SetIniCodec(QSettings* self, QTextCodec* codec); void QSettings_SetIniCodecWithCodecName(QSettings* self, const char* codecName); QTextCodec* QSettings_IniCodec(const QSettings* self); -void QSettings_SetDefaultFormat(uintptr_t format); -uintptr_t QSettings_DefaultFormat(); +void QSettings_SetDefaultFormat(int format); +int QSettings_DefaultFormat(); void QSettings_SetSystemIniPath(struct miqt_string* dir); void QSettings_SetUserIniPath(struct miqt_string* dir); -void QSettings_SetPath(uintptr_t format, uintptr_t scope, struct miqt_string* path); +void QSettings_SetPath(int format, int scope, struct miqt_string* path); struct miqt_string* QSettings_Tr2(const char* s, const char* c); struct miqt_string* QSettings_Tr3(const char* s, const char* c, int n); struct miqt_string* QSettings_TrUtf82(const char* s, const char* c); diff --git a/qt/gen_qsharedmemory.cpp b/qt/gen_qsharedmemory.cpp index a605754..1caf0cb 100644 --- a/qt/gen_qsharedmemory.cpp +++ b/qt/gen_qsharedmemory.cpp @@ -96,9 +96,9 @@ bool QSharedMemory_Unlock(QSharedMemory* self) { return self->unlock(); } -uintptr_t QSharedMemory_Error(const QSharedMemory* self) { +int QSharedMemory_Error(const QSharedMemory* self) { QSharedMemory::SharedMemoryError _ret = self->error(); - return static_cast(_ret); + return static_cast(_ret); } struct miqt_string* QSharedMemory_ErrorString(const QSharedMemory* self) { @@ -136,11 +136,11 @@ struct miqt_string* QSharedMemory_TrUtf83(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -bool QSharedMemory_Create2(QSharedMemory* self, int size, uintptr_t mode) { +bool QSharedMemory_Create2(QSharedMemory* self, int size, int mode) { return self->create(static_cast(size), static_cast(mode)); } -bool QSharedMemory_Attach1(QSharedMemory* self, uintptr_t mode) { +bool QSharedMemory_Attach1(QSharedMemory* self, int mode) { return self->attach(static_cast(mode)); } diff --git a/qt/gen_qsharedmemory.go b/qt/gen_qsharedmemory.go index 5d135e2..c956f63 100644 --- a/qt/gen_qsharedmemory.go +++ b/qt/gen_qsharedmemory.go @@ -217,11 +217,11 @@ func QSharedMemory_TrUtf83(s string, c string, n int) string { } func (this *QSharedMemory) Create2(size int, mode QSharedMemory__AccessMode) bool { - return (bool)(C.QSharedMemory_Create2(this.h, (C.int)(size), (C.uintptr_t)(mode))) + return (bool)(C.QSharedMemory_Create2(this.h, (C.int)(size), (C.int)(mode))) } func (this *QSharedMemory) Attach1(mode QSharedMemory__AccessMode) bool { - return (bool)(C.QSharedMemory_Attach1(this.h, (C.uintptr_t)(mode))) + return (bool)(C.QSharedMemory_Attach1(this.h, (C.int)(mode))) } // Delete this object from C++ memory. diff --git a/qt/gen_qsharedmemory.h b/qt/gen_qsharedmemory.h index e7a146d..fe63265 100644 --- a/qt/gen_qsharedmemory.h +++ b/qt/gen_qsharedmemory.h @@ -41,14 +41,14 @@ bool QSharedMemory_IsAttached(const QSharedMemory* self); bool QSharedMemory_Detach(QSharedMemory* self); bool QSharedMemory_Lock(QSharedMemory* self); bool QSharedMemory_Unlock(QSharedMemory* self); -uintptr_t QSharedMemory_Error(const QSharedMemory* self); +int QSharedMemory_Error(const QSharedMemory* self); struct miqt_string* QSharedMemory_ErrorString(const QSharedMemory* self); struct miqt_string* QSharedMemory_Tr2(const char* s, const char* c); struct miqt_string* QSharedMemory_Tr3(const char* s, const char* c, int n); struct miqt_string* QSharedMemory_TrUtf82(const char* s, const char* c); struct miqt_string* QSharedMemory_TrUtf83(const char* s, const char* c, int n); -bool QSharedMemory_Create2(QSharedMemory* self, int size, uintptr_t mode); -bool QSharedMemory_Attach1(QSharedMemory* self, uintptr_t mode); +bool QSharedMemory_Create2(QSharedMemory* self, int size, int mode); +bool QSharedMemory_Attach1(QSharedMemory* self, int mode); void QSharedMemory_Delete(QSharedMemory* self); #ifdef __cplusplus diff --git a/qt/gen_qshortcut.cpp b/qt/gen_qshortcut.cpp index a1764c7..500b578 100644 --- a/qt/gen_qshortcut.cpp +++ b/qt/gen_qshortcut.cpp @@ -25,7 +25,7 @@ QShortcut* QShortcut_new4(QKeySequence* key, QWidget* parent, const char* member return new QShortcut(*key, parent, member, ambiguousMember); } -QShortcut* QShortcut_new5(QKeySequence* key, QWidget* parent, const char* member, const char* ambiguousMember, uintptr_t shortcutContext) { +QShortcut* QShortcut_new5(QKeySequence* key, QWidget* parent, const char* member, const char* ambiguousMember, int shortcutContext) { return new QShortcut(*key, parent, member, ambiguousMember, static_cast(shortcutContext)); } @@ -63,13 +63,13 @@ bool QShortcut_IsEnabled(const QShortcut* self) { return self->isEnabled(); } -void QShortcut_SetContext(QShortcut* self, uintptr_t context) { +void QShortcut_SetContext(QShortcut* self, int context) { self->setContext(static_cast(context)); } -uintptr_t QShortcut_Context(const QShortcut* self) { +int QShortcut_Context(const QShortcut* self) { Qt::ShortcutContext _ret = self->context(); - return static_cast(_ret); + return static_cast(_ret); } void QShortcut_SetWhatsThis(QShortcut* self, struct miqt_string* text) { diff --git a/qt/gen_qshortcut.go b/qt/gen_qshortcut.go index fedb46f..5eba8d7 100644 --- a/qt/gen_qshortcut.go +++ b/qt/gen_qshortcut.go @@ -73,7 +73,7 @@ func NewQShortcut5(key *QKeySequence, parent *QWidget, member string, ambiguousM defer C.free(unsafe.Pointer(member_Cstring)) ambiguousMember_Cstring := C.CString(ambiguousMember) defer C.free(unsafe.Pointer(ambiguousMember_Cstring)) - ret := C.QShortcut_new5(key.cPointer(), parent.cPointer(), member_Cstring, ambiguousMember_Cstring, (C.uintptr_t)(shortcutContext)) + ret := C.QShortcut_new5(key.cPointer(), parent.cPointer(), member_Cstring, ambiguousMember_Cstring, (C.int)(shortcutContext)) return newQShortcut(ret) } @@ -119,7 +119,7 @@ func (this *QShortcut) IsEnabled() bool { } func (this *QShortcut) SetContext(context ShortcutContext) { - C.QShortcut_SetContext(this.h, (C.uintptr_t)(context)) + C.QShortcut_SetContext(this.h, (C.int)(context)) } func (this *QShortcut) Context() ShortcutContext { diff --git a/qt/gen_qshortcut.h b/qt/gen_qshortcut.h index 2d8b567..fb5a9ed 100644 --- a/qt/gen_qshortcut.h +++ b/qt/gen_qshortcut.h @@ -29,7 +29,7 @@ QShortcut* QShortcut_new(QWidget* parent); QShortcut* QShortcut_new2(QKeySequence* key, QWidget* parent); QShortcut* QShortcut_new3(QKeySequence* key, QWidget* parent, const char* member); QShortcut* QShortcut_new4(QKeySequence* key, QWidget* parent, const char* member, const char* ambiguousMember); -QShortcut* QShortcut_new5(QKeySequence* key, QWidget* parent, const char* member, const char* ambiguousMember, uintptr_t shortcutContext); +QShortcut* QShortcut_new5(QKeySequence* key, QWidget* parent, const char* member, const char* ambiguousMember, int shortcutContext); QMetaObject* QShortcut_MetaObject(const QShortcut* self); struct miqt_string* QShortcut_Tr(const char* s); struct miqt_string* QShortcut_TrUtf8(const char* s); @@ -37,8 +37,8 @@ void QShortcut_SetKey(QShortcut* self, QKeySequence* key); QKeySequence* QShortcut_Key(const QShortcut* self); void QShortcut_SetEnabled(QShortcut* self, bool enable); bool QShortcut_IsEnabled(const QShortcut* self); -void QShortcut_SetContext(QShortcut* self, uintptr_t context); -uintptr_t QShortcut_Context(const QShortcut* self); +void QShortcut_SetContext(QShortcut* self, int context); +int QShortcut_Context(const QShortcut* self); void QShortcut_SetWhatsThis(QShortcut* self, struct miqt_string* text); struct miqt_string* QShortcut_WhatsThis(const QShortcut* self); void QShortcut_SetAutoRepeat(QShortcut* self, bool on); diff --git a/qt/gen_qsize.cpp b/qt/gen_qsize.cpp index d5048e8..0d740dd 100644 --- a/qt/gen_qsize.cpp +++ b/qt/gen_qsize.cpp @@ -54,19 +54,19 @@ QSize* QSize_Transposed(const QSize* self) { return new QSize(self->transposed()); } -void QSize_Scale(QSize* self, int w, int h, uintptr_t mode) { +void QSize_Scale(QSize* self, int w, int h, int mode) { self->scale(static_cast(w), static_cast(h), static_cast(mode)); } -void QSize_Scale2(QSize* self, QSize* s, uintptr_t mode) { +void QSize_Scale2(QSize* self, QSize* s, int mode) { self->scale(*s, static_cast(mode)); } -QSize* QSize_Scaled(const QSize* self, int w, int h, uintptr_t mode) { +QSize* QSize_Scaled(const QSize* self, int w, int h, int mode) { return new QSize(self->scaled(static_cast(w), static_cast(h), static_cast(mode))); } -QSize* QSize_Scaled2(const QSize* self, QSize* s, uintptr_t mode) { +QSize* QSize_Scaled2(const QSize* self, QSize* s, int mode) { return new QSize(self->scaled(*s, static_cast(mode))); } @@ -143,11 +143,13 @@ bool QSizeF_IsValid(const QSizeF* self) { } double QSizeF_Width(const QSizeF* self) { - return self->width(); + qreal _ret = self->width(); + return static_cast(_ret); } double QSizeF_Height(const QSizeF* self) { - return self->height(); + qreal _ret = self->height(); + return static_cast(_ret); } void QSizeF_SetWidth(QSizeF* self, double w) { @@ -166,19 +168,19 @@ QSizeF* QSizeF_Transposed(const QSizeF* self) { return new QSizeF(self->transposed()); } -void QSizeF_Scale(QSizeF* self, double w, double h, uintptr_t mode) { +void QSizeF_Scale(QSizeF* self, double w, double h, int mode) { self->scale(static_cast(w), static_cast(h), static_cast(mode)); } -void QSizeF_Scale2(QSizeF* self, QSizeF* s, uintptr_t mode) { +void QSizeF_Scale2(QSizeF* self, QSizeF* s, int mode) { self->scale(*s, static_cast(mode)); } -QSizeF* QSizeF_Scaled(const QSizeF* self, double w, double h, uintptr_t mode) { +QSizeF* QSizeF_Scaled(const QSizeF* self, double w, double h, int mode) { return new QSizeF(self->scaled(static_cast(w), static_cast(h), static_cast(mode))); } -QSizeF* QSizeF_Scaled2(const QSizeF* self, QSizeF* s, uintptr_t mode) { +QSizeF* QSizeF_Scaled2(const QSizeF* self, QSizeF* s, int mode) { return new QSizeF(self->scaled(*s, static_cast(mode))); } diff --git a/qt/gen_qsize.go b/qt/gen_qsize.go index bf975be..1ee353e 100644 --- a/qt/gen_qsize.go +++ b/qt/gen_qsize.go @@ -93,22 +93,22 @@ func (this *QSize) Transposed() *QSize { } func (this *QSize) Scale(w int, h int, mode AspectRatioMode) { - C.QSize_Scale(this.h, (C.int)(w), (C.int)(h), (C.uintptr_t)(mode)) + C.QSize_Scale(this.h, (C.int)(w), (C.int)(h), (C.int)(mode)) } func (this *QSize) Scale2(s *QSize, mode AspectRatioMode) { - C.QSize_Scale2(this.h, s.cPointer(), (C.uintptr_t)(mode)) + C.QSize_Scale2(this.h, s.cPointer(), (C.int)(mode)) } func (this *QSize) Scaled(w int, h int, mode AspectRatioMode) *QSize { - _ret := C.QSize_Scaled(this.h, (C.int)(w), (C.int)(h), (C.uintptr_t)(mode)) + _ret := C.QSize_Scaled(this.h, (C.int)(w), (C.int)(h), (C.int)(mode)) _goptr := newQSize(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QSize) Scaled2(s *QSize, mode AspectRatioMode) *QSize { - _ret := C.QSize_Scaled2(this.h, s.cPointer(), (C.uintptr_t)(mode)) + _ret := C.QSize_Scaled2(this.h, s.cPointer(), (C.int)(mode)) _goptr := newQSize(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -258,22 +258,22 @@ func (this *QSizeF) Transposed() *QSizeF { } func (this *QSizeF) Scale(w float64, h float64, mode AspectRatioMode) { - C.QSizeF_Scale(this.h, (C.double)(w), (C.double)(h), (C.uintptr_t)(mode)) + C.QSizeF_Scale(this.h, (C.double)(w), (C.double)(h), (C.int)(mode)) } func (this *QSizeF) Scale2(s *QSizeF, mode AspectRatioMode) { - C.QSizeF_Scale2(this.h, s.cPointer(), (C.uintptr_t)(mode)) + C.QSizeF_Scale2(this.h, s.cPointer(), (C.int)(mode)) } func (this *QSizeF) Scaled(w float64, h float64, mode AspectRatioMode) *QSizeF { - _ret := C.QSizeF_Scaled(this.h, (C.double)(w), (C.double)(h), (C.uintptr_t)(mode)) + _ret := C.QSizeF_Scaled(this.h, (C.double)(w), (C.double)(h), (C.int)(mode)) _goptr := newQSizeF(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QSizeF) Scaled2(s *QSizeF, mode AspectRatioMode) *QSizeF { - _ret := C.QSizeF_Scaled2(this.h, s.cPointer(), (C.uintptr_t)(mode)) + _ret := C.QSizeF_Scaled2(this.h, s.cPointer(), (C.int)(mode)) _goptr := newQSizeF(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qsize.h b/qt/gen_qsize.h index f0d4249..4fcddd7 100644 --- a/qt/gen_qsize.h +++ b/qt/gen_qsize.h @@ -37,10 +37,10 @@ void QSize_SetWidth(QSize* self, int w); void QSize_SetHeight(QSize* self, int h); void QSize_Transpose(QSize* self); QSize* QSize_Transposed(const QSize* self); -void QSize_Scale(QSize* self, int w, int h, uintptr_t mode); -void QSize_Scale2(QSize* self, QSize* s, uintptr_t mode); -QSize* QSize_Scaled(const QSize* self, int w, int h, uintptr_t mode); -QSize* QSize_Scaled2(const QSize* self, QSize* s, uintptr_t mode); +void QSize_Scale(QSize* self, int w, int h, int mode); +void QSize_Scale2(QSize* self, QSize* s, int mode); +QSize* QSize_Scaled(const QSize* self, int w, int h, int mode); +QSize* QSize_Scaled2(const QSize* self, QSize* s, int mode); QSize* QSize_ExpandedTo(const QSize* self, QSize* param1); QSize* QSize_BoundedTo(const QSize* self, QSize* param1); QSize* QSize_GrownBy(const QSize* self, QMargins* m); @@ -64,10 +64,10 @@ void QSizeF_SetWidth(QSizeF* self, double w); void QSizeF_SetHeight(QSizeF* self, double h); void QSizeF_Transpose(QSizeF* self); QSizeF* QSizeF_Transposed(const QSizeF* self); -void QSizeF_Scale(QSizeF* self, double w, double h, uintptr_t mode); -void QSizeF_Scale2(QSizeF* self, QSizeF* s, uintptr_t mode); -QSizeF* QSizeF_Scaled(const QSizeF* self, double w, double h, uintptr_t mode); -QSizeF* QSizeF_Scaled2(const QSizeF* self, QSizeF* s, uintptr_t mode); +void QSizeF_Scale(QSizeF* self, double w, double h, int mode); +void QSizeF_Scale2(QSizeF* self, QSizeF* s, int mode); +QSizeF* QSizeF_Scaled(const QSizeF* self, double w, double h, int mode); +QSizeF* QSizeF_Scaled2(const QSizeF* self, QSizeF* s, int mode); QSizeF* QSizeF_ExpandedTo(const QSizeF* self, QSizeF* param1); QSizeF* QSizeF_BoundedTo(const QSizeF* self, QSizeF* param1); QSizeF* QSizeF_GrownBy(const QSizeF* self, QMarginsF* m); diff --git a/qt/gen_qsizepolicy.cpp b/qt/gen_qsizepolicy.cpp index 88668f5..f35730f 100644 --- a/qt/gen_qsizepolicy.cpp +++ b/qt/gen_qsizepolicy.cpp @@ -7,7 +7,7 @@ QSizePolicy* QSizePolicy_new() { return new QSizePolicy(); } -QSizePolicy* QSizePolicy_new2(uintptr_t horizontal, uintptr_t vertical) { +QSizePolicy* QSizePolicy_new2(int horizontal, int vertical) { return new QSizePolicy(static_cast(horizontal), static_cast(vertical)); } @@ -15,34 +15,34 @@ QSizePolicy* QSizePolicy_new3(QSizePolicy* param1) { return new QSizePolicy(*param1); } -QSizePolicy* QSizePolicy_new4(uintptr_t horizontal, uintptr_t vertical, uintptr_t typeVal) { +QSizePolicy* QSizePolicy_new4(int horizontal, int vertical, int typeVal) { return new QSizePolicy(static_cast(horizontal), static_cast(vertical), static_cast(typeVal)); } -uintptr_t QSizePolicy_HorizontalPolicy(const QSizePolicy* self) { +int QSizePolicy_HorizontalPolicy(const QSizePolicy* self) { QSizePolicy::Policy _ret = self->horizontalPolicy(); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QSizePolicy_VerticalPolicy(const QSizePolicy* self) { +int QSizePolicy_VerticalPolicy(const QSizePolicy* self) { QSizePolicy::Policy _ret = self->verticalPolicy(); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QSizePolicy_ControlType(const QSizePolicy* self) { +int QSizePolicy_ControlType(const QSizePolicy* self) { QSizePolicy::ControlType _ret = self->controlType(); - return static_cast(_ret); + return static_cast(_ret); } -void QSizePolicy_SetHorizontalPolicy(QSizePolicy* self, uintptr_t d) { +void QSizePolicy_SetHorizontalPolicy(QSizePolicy* self, int d) { self->setHorizontalPolicy(static_cast(d)); } -void QSizePolicy_SetVerticalPolicy(QSizePolicy* self, uintptr_t d) { +void QSizePolicy_SetVerticalPolicy(QSizePolicy* self, int d) { self->setVerticalPolicy(static_cast(d)); } -void QSizePolicy_SetControlType(QSizePolicy* self, uintptr_t typeVal) { +void QSizePolicy_SetControlType(QSizePolicy* self, int typeVal) { self->setControlType(static_cast(typeVal)); } diff --git a/qt/gen_qsizepolicy.go b/qt/gen_qsizepolicy.go index f9ef6e2..75fefaf 100644 --- a/qt/gen_qsizepolicy.go +++ b/qt/gen_qsizepolicy.go @@ -84,7 +84,7 @@ func NewQSizePolicy() *QSizePolicy { // NewQSizePolicy2 constructs a new QSizePolicy object. func NewQSizePolicy2(horizontal QSizePolicy__Policy, vertical QSizePolicy__Policy) *QSizePolicy { - ret := C.QSizePolicy_new2((C.uintptr_t)(horizontal), (C.uintptr_t)(vertical)) + ret := C.QSizePolicy_new2((C.int)(horizontal), (C.int)(vertical)) return newQSizePolicy(ret) } @@ -96,7 +96,7 @@ func NewQSizePolicy3(param1 *QSizePolicy) *QSizePolicy { // NewQSizePolicy4 constructs a new QSizePolicy object. func NewQSizePolicy4(horizontal QSizePolicy__Policy, vertical QSizePolicy__Policy, typeVal QSizePolicy__ControlType) *QSizePolicy { - ret := C.QSizePolicy_new4((C.uintptr_t)(horizontal), (C.uintptr_t)(vertical), (C.uintptr_t)(typeVal)) + ret := C.QSizePolicy_new4((C.int)(horizontal), (C.int)(vertical), (C.int)(typeVal)) return newQSizePolicy(ret) } @@ -113,15 +113,15 @@ func (this *QSizePolicy) ControlType() QSizePolicy__ControlType { } func (this *QSizePolicy) SetHorizontalPolicy(d QSizePolicy__Policy) { - C.QSizePolicy_SetHorizontalPolicy(this.h, (C.uintptr_t)(d)) + C.QSizePolicy_SetHorizontalPolicy(this.h, (C.int)(d)) } func (this *QSizePolicy) SetVerticalPolicy(d QSizePolicy__Policy) { - C.QSizePolicy_SetVerticalPolicy(this.h, (C.uintptr_t)(d)) + C.QSizePolicy_SetVerticalPolicy(this.h, (C.int)(d)) } func (this *QSizePolicy) SetControlType(typeVal QSizePolicy__ControlType) { - C.QSizePolicy_SetControlType(this.h, (C.uintptr_t)(typeVal)) + C.QSizePolicy_SetControlType(this.h, (C.int)(typeVal)) } func (this *QSizePolicy) ExpandingDirections() int { diff --git a/qt/gen_qsizepolicy.h b/qt/gen_qsizepolicy.h index 5f5662d..f312b88 100644 --- a/qt/gen_qsizepolicy.h +++ b/qt/gen_qsizepolicy.h @@ -20,15 +20,15 @@ typedef struct QSizePolicy QSizePolicy; #endif QSizePolicy* QSizePolicy_new(); -QSizePolicy* QSizePolicy_new2(uintptr_t horizontal, uintptr_t vertical); +QSizePolicy* QSizePolicy_new2(int horizontal, int vertical); QSizePolicy* QSizePolicy_new3(QSizePolicy* param1); -QSizePolicy* QSizePolicy_new4(uintptr_t horizontal, uintptr_t vertical, uintptr_t typeVal); -uintptr_t QSizePolicy_HorizontalPolicy(const QSizePolicy* self); -uintptr_t QSizePolicy_VerticalPolicy(const QSizePolicy* self); -uintptr_t QSizePolicy_ControlType(const QSizePolicy* self); -void QSizePolicy_SetHorizontalPolicy(QSizePolicy* self, uintptr_t d); -void QSizePolicy_SetVerticalPolicy(QSizePolicy* self, uintptr_t d); -void QSizePolicy_SetControlType(QSizePolicy* self, uintptr_t typeVal); +QSizePolicy* QSizePolicy_new4(int horizontal, int vertical, int typeVal); +int QSizePolicy_HorizontalPolicy(const QSizePolicy* self); +int QSizePolicy_VerticalPolicy(const QSizePolicy* self); +int QSizePolicy_ControlType(const QSizePolicy* self); +void QSizePolicy_SetHorizontalPolicy(QSizePolicy* self, int d); +void QSizePolicy_SetVerticalPolicy(QSizePolicy* self, int d); +void QSizePolicy_SetControlType(QSizePolicy* self, int typeVal); int QSizePolicy_ExpandingDirections(const QSizePolicy* self); void QSizePolicy_SetHeightForWidth(QSizePolicy* self, bool b); bool QSizePolicy_HasHeightForWidth(const QSizePolicy* self); diff --git a/qt/gen_qslider.cpp b/qt/gen_qslider.cpp index acd6b8a..b0d82f4 100644 --- a/qt/gen_qslider.cpp +++ b/qt/gen_qslider.cpp @@ -14,7 +14,7 @@ QSlider* QSlider_new() { return new QSlider(); } -QSlider* QSlider_new2(uintptr_t orientation) { +QSlider* QSlider_new2(int orientation) { return new QSlider(static_cast(orientation)); } @@ -22,7 +22,7 @@ QSlider* QSlider_new3(QWidget* parent) { return new QSlider(parent); } -QSlider* QSlider_new4(uintptr_t orientation, QWidget* parent) { +QSlider* QSlider_new4(int orientation, QWidget* parent) { return new QSlider(static_cast(orientation), parent); } @@ -52,13 +52,13 @@ QSize* QSlider_MinimumSizeHint(const QSlider* self) { return new QSize(self->minimumSizeHint()); } -void QSlider_SetTickPosition(QSlider* self, uintptr_t position) { +void QSlider_SetTickPosition(QSlider* self, int position) { self->setTickPosition(static_cast(position)); } -uintptr_t QSlider_TickPosition(const QSlider* self) { +int QSlider_TickPosition(const QSlider* self) { QSlider::TickPosition _ret = self->tickPosition(); - return static_cast(_ret); + return static_cast(_ret); } void QSlider_SetTickInterval(QSlider* self, int ti) { diff --git a/qt/gen_qslider.go b/qt/gen_qslider.go index fe2b04b..cd58bef 100644 --- a/qt/gen_qslider.go +++ b/qt/gen_qslider.go @@ -55,7 +55,7 @@ func NewQSlider() *QSlider { // NewQSlider2 constructs a new QSlider object. func NewQSlider2(orientation Orientation) *QSlider { - ret := C.QSlider_new2((C.uintptr_t)(orientation)) + ret := C.QSlider_new2((C.int)(orientation)) return newQSlider(ret) } @@ -67,7 +67,7 @@ func NewQSlider3(parent *QWidget) *QSlider { // NewQSlider4 constructs a new QSlider object. func NewQSlider4(orientation Orientation, parent *QWidget) *QSlider { - ret := C.QSlider_new4((C.uintptr_t)(orientation), parent.cPointer()) + ret := C.QSlider_new4((C.int)(orientation), parent.cPointer()) return newQSlider(ret) } @@ -108,7 +108,7 @@ func (this *QSlider) MinimumSizeHint() *QSize { } func (this *QSlider) SetTickPosition(position QSlider__TickPosition) { - C.QSlider_SetTickPosition(this.h, (C.uintptr_t)(position)) + C.QSlider_SetTickPosition(this.h, (C.int)(position)) } func (this *QSlider) TickPosition() QSlider__TickPosition { diff --git a/qt/gen_qslider.h b/qt/gen_qslider.h index 6916b2d..53dc399 100644 --- a/qt/gen_qslider.h +++ b/qt/gen_qslider.h @@ -28,16 +28,16 @@ typedef struct QWidget QWidget; #endif QSlider* QSlider_new(); -QSlider* QSlider_new2(uintptr_t orientation); +QSlider* QSlider_new2(int orientation); QSlider* QSlider_new3(QWidget* parent); -QSlider* QSlider_new4(uintptr_t orientation, QWidget* parent); +QSlider* QSlider_new4(int orientation, QWidget* parent); QMetaObject* QSlider_MetaObject(const QSlider* self); struct miqt_string* QSlider_Tr(const char* s); struct miqt_string* QSlider_TrUtf8(const char* s); QSize* QSlider_SizeHint(const QSlider* self); QSize* QSlider_MinimumSizeHint(const QSlider* self); -void QSlider_SetTickPosition(QSlider* self, uintptr_t position); -uintptr_t QSlider_TickPosition(const QSlider* self); +void QSlider_SetTickPosition(QSlider* self, int position); +int QSlider_TickPosition(const QSlider* self); void QSlider_SetTickInterval(QSlider* self, int ti); int QSlider_TickInterval(const QSlider* self); bool QSlider_Event(QSlider* self, QEvent* event); diff --git a/qt/gen_qsocketnotifier.cpp b/qt/gen_qsocketnotifier.cpp index 50f0985..49c6f32 100644 --- a/qt/gen_qsocketnotifier.cpp +++ b/qt/gen_qsocketnotifier.cpp @@ -9,12 +9,12 @@ #include "gen_qsocketnotifier.h" #include "_cgo_export.h" -QSocketNotifier* QSocketNotifier_new(uintptr_t socket, uintptr_t param2) { - return new QSocketNotifier(static_cast(socket), static_cast(param2)); +QSocketNotifier* QSocketNotifier_new(intptr_t socket, int param2) { + return new QSocketNotifier(socket, static_cast(param2)); } -QSocketNotifier* QSocketNotifier_new2(uintptr_t socket, uintptr_t param2, QObject* parent) { - return new QSocketNotifier(static_cast(socket), static_cast(param2), parent); +QSocketNotifier* QSocketNotifier_new2(intptr_t socket, int param2, QObject* parent) { + return new QSocketNotifier(socket, static_cast(param2), parent); } QMetaObject* QSocketNotifier_MetaObject(const QSocketNotifier* self) { @@ -35,13 +35,14 @@ struct miqt_string* QSocketNotifier_TrUtf8(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -ptrdiff_t QSocketNotifier_Socket(const QSocketNotifier* self) { - return self->socket(); +intptr_t QSocketNotifier_Socket(const QSocketNotifier* self) { + qintptr _ret = self->socket(); + return static_cast(_ret); } -uintptr_t QSocketNotifier_Type(const QSocketNotifier* self) { +int QSocketNotifier_Type(const QSocketNotifier* self) { QSocketNotifier::Type _ret = self->type(); - return static_cast(_ret); + return static_cast(_ret); } bool QSocketNotifier_IsEnabled(const QSocketNotifier* self) { @@ -92,7 +93,7 @@ QSocketDescriptor* QSocketDescriptor_new2(QSocketDescriptor* param1) { return new QSocketDescriptor(*param1); } -QSocketDescriptor* QSocketDescriptor_new3(uintptr_t descriptor) { +QSocketDescriptor* QSocketDescriptor_new3(int descriptor) { #ifdef Q_OS_LINUX return new QSocketDescriptor(static_cast(descriptor)); #else diff --git a/qt/gen_qsocketnotifier.go b/qt/gen_qsocketnotifier.go index 757a704..a4742de 100644 --- a/qt/gen_qsocketnotifier.go +++ b/qt/gen_qsocketnotifier.go @@ -46,13 +46,13 @@ func newQSocketNotifier_U(h unsafe.Pointer) *QSocketNotifier { // NewQSocketNotifier constructs a new QSocketNotifier object. func NewQSocketNotifier(socket uintptr, param2 QSocketNotifier__Type) *QSocketNotifier { - ret := C.QSocketNotifier_new((C.uintptr_t)(socket), (C.uintptr_t)(param2)) + ret := C.QSocketNotifier_new(socket, (C.int)(param2)) return newQSocketNotifier(ret) } // NewQSocketNotifier2 constructs a new QSocketNotifier object. func NewQSocketNotifier2(socket uintptr, param2 QSocketNotifier__Type, parent *QObject) *QSocketNotifier { - ret := C.QSocketNotifier_new2((C.uintptr_t)(socket), (C.uintptr_t)(param2), parent.cPointer()) + ret := C.QSocketNotifier_new2(socket, (C.int)(param2), parent.cPointer()) return newQSocketNotifier(ret) } @@ -78,8 +78,8 @@ func QSocketNotifier_TrUtf8(s string) string { return _ret } -func (this *QSocketNotifier) Socket() uint64 { - return (uint64)(C.QSocketNotifier_Socket(this.h)) +func (this *QSocketNotifier) Socket() uintptr { + return (uintptr)(C.QSocketNotifier_Socket(this.h)) } func (this *QSocketNotifier) Type() QSocketNotifier__Type { @@ -187,9 +187,9 @@ func NewQSocketDescriptor2(param1 *QSocketDescriptor) *QSocketDescriptor { } // NewQSocketDescriptor3 constructs a new QSocketDescriptor object. -func NewQSocketDescriptor3(descriptor uintptr) *QSocketDescriptor { +func NewQSocketDescriptor3(descriptor QSocketNotifier__Type) *QSocketDescriptor { if runtime.GOOS == "linux" { - ret := C.QSocketDescriptor_new3((C.uintptr_t)(descriptor)) + ret := C.QSocketDescriptor_new3((C.int)(descriptor)) return newQSocketDescriptor(ret) } else { panic("Unsupported OS") diff --git a/qt/gen_qsocketnotifier.h b/qt/gen_qsocketnotifier.h index a353489..0cef2b7 100644 --- a/qt/gen_qsocketnotifier.h +++ b/qt/gen_qsocketnotifier.h @@ -25,13 +25,13 @@ typedef struct QSocketDescriptor QSocketDescriptor; typedef struct QSocketNotifier QSocketNotifier; #endif -QSocketNotifier* QSocketNotifier_new(uintptr_t socket, uintptr_t param2); -QSocketNotifier* QSocketNotifier_new2(uintptr_t socket, uintptr_t param2, QObject* parent); +QSocketNotifier* QSocketNotifier_new(intptr_t socket, int param2); +QSocketNotifier* QSocketNotifier_new2(intptr_t socket, int param2, QObject* parent); QMetaObject* QSocketNotifier_MetaObject(const QSocketNotifier* self); struct miqt_string* QSocketNotifier_Tr(const char* s); struct miqt_string* QSocketNotifier_TrUtf8(const char* s); -ptrdiff_t QSocketNotifier_Socket(const QSocketNotifier* self); -uintptr_t QSocketNotifier_Type(const QSocketNotifier* self); +intptr_t QSocketNotifier_Socket(const QSocketNotifier* self); +int QSocketNotifier_Type(const QSocketNotifier* self); bool QSocketNotifier_IsEnabled(const QSocketNotifier* self); void QSocketNotifier_SetEnabled(QSocketNotifier* self, bool enabled); struct miqt_string* QSocketNotifier_Tr2(const char* s, const char* c); @@ -42,7 +42,7 @@ void QSocketNotifier_Delete(QSocketNotifier* self); QSocketDescriptor* QSocketDescriptor_new(); QSocketDescriptor* QSocketDescriptor_new2(QSocketDescriptor* param1); -QSocketDescriptor* QSocketDescriptor_new3(uintptr_t descriptor); +QSocketDescriptor* QSocketDescriptor_new3(int descriptor); bool QSocketDescriptor_IsValid(const QSocketDescriptor* self); void QSocketDescriptor_Delete(QSocketDescriptor* self); diff --git a/qt/gen_qsortfilterproxymodel.cpp b/qt/gen_qsortfilterproxymodel.cpp index df6e16c..40c4be7 100644 --- a/qt/gen_qsortfilterproxymodel.cpp +++ b/qt/gen_qsortfilterproxymodel.cpp @@ -70,21 +70,21 @@ void QSortFilterProxyModel_SetFilterKeyColumn(QSortFilterProxyModel* self, int c self->setFilterKeyColumn(static_cast(column)); } -uintptr_t QSortFilterProxyModel_FilterCaseSensitivity(const QSortFilterProxyModel* self) { +int QSortFilterProxyModel_FilterCaseSensitivity(const QSortFilterProxyModel* self) { Qt::CaseSensitivity _ret = self->filterCaseSensitivity(); - return static_cast(_ret); + return static_cast(_ret); } -void QSortFilterProxyModel_SetFilterCaseSensitivity(QSortFilterProxyModel* self, uintptr_t cs) { +void QSortFilterProxyModel_SetFilterCaseSensitivity(QSortFilterProxyModel* self, int cs) { self->setFilterCaseSensitivity(static_cast(cs)); } -uintptr_t QSortFilterProxyModel_SortCaseSensitivity(const QSortFilterProxyModel* self) { +int QSortFilterProxyModel_SortCaseSensitivity(const QSortFilterProxyModel* self) { Qt::CaseSensitivity _ret = self->sortCaseSensitivity(); - return static_cast(_ret); + return static_cast(_ret); } -void QSortFilterProxyModel_SetSortCaseSensitivity(QSortFilterProxyModel* self, uintptr_t cs) { +void QSortFilterProxyModel_SetSortCaseSensitivity(QSortFilterProxyModel* self, int cs) { self->setSortCaseSensitivity(static_cast(cs)); } @@ -100,9 +100,9 @@ int QSortFilterProxyModel_SortColumn(const QSortFilterProxyModel* self) { return self->sortColumn(); } -uintptr_t QSortFilterProxyModel_SortOrder(const QSortFilterProxyModel* self) { +int QSortFilterProxyModel_SortOrder(const QSortFilterProxyModel* self) { Qt::SortOrder _ret = self->sortOrder(); - return static_cast(_ret); + return static_cast(_ret); } bool QSortFilterProxyModel_DynamicSortFilter(const QSortFilterProxyModel* self) { @@ -205,11 +205,11 @@ bool QSortFilterProxyModel_SetData(QSortFilterProxyModel* self, QModelIndex* ind return self->setData(*index, *value); } -QVariant* QSortFilterProxyModel_HeaderData(const QSortFilterProxyModel* self, int section, uintptr_t orientation) { +QVariant* QSortFilterProxyModel_HeaderData(const QSortFilterProxyModel* self, int section, int orientation) { return new QVariant(self->headerData(static_cast(section), static_cast(orientation))); } -bool QSortFilterProxyModel_SetHeaderData(QSortFilterProxyModel* self, int section, uintptr_t orientation, QVariant* value) { +bool QSortFilterProxyModel_SetHeaderData(QSortFilterProxyModel* self, int section, int orientation, QVariant* value) { return self->setHeaderData(static_cast(section), static_cast(orientation), *value); } @@ -223,7 +223,7 @@ QMimeData* QSortFilterProxyModel_MimeData(const QSortFilterProxyModel* self, str return self->mimeData(indexes_QList); } -bool QSortFilterProxyModel_DropMimeData(QSortFilterProxyModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent) { +bool QSortFilterProxyModel_DropMimeData(QSortFilterProxyModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent) { return self->dropMimeData(data, static_cast(action), static_cast(row), static_cast(column), *parent); } @@ -313,26 +313,26 @@ void QSortFilterProxyModel_connect_DynamicSortFilterChanged(QSortFilterProxyMode }); } -void QSortFilterProxyModel_FilterCaseSensitivityChanged(QSortFilterProxyModel* self, uintptr_t filterCaseSensitivity) { +void QSortFilterProxyModel_FilterCaseSensitivityChanged(QSortFilterProxyModel* self, int filterCaseSensitivity) { self->filterCaseSensitivityChanged(static_cast(filterCaseSensitivity)); } void QSortFilterProxyModel_connect_FilterCaseSensitivityChanged(QSortFilterProxyModel* self, void* slot) { QSortFilterProxyModel::connect(self, static_cast(&QSortFilterProxyModel::filterCaseSensitivityChanged), self, [=](Qt::CaseSensitivity filterCaseSensitivity) { Qt::CaseSensitivity filterCaseSensitivity_ret = filterCaseSensitivity; - uintptr_t sigval1 = static_cast(filterCaseSensitivity_ret); + int sigval1 = static_cast(filterCaseSensitivity_ret); miqt_exec_callback_QSortFilterProxyModel_FilterCaseSensitivityChanged(slot, sigval1); }); } -void QSortFilterProxyModel_SortCaseSensitivityChanged(QSortFilterProxyModel* self, uintptr_t sortCaseSensitivity) { +void QSortFilterProxyModel_SortCaseSensitivityChanged(QSortFilterProxyModel* self, int sortCaseSensitivity) { self->sortCaseSensitivityChanged(static_cast(sortCaseSensitivity)); } void QSortFilterProxyModel_connect_SortCaseSensitivityChanged(QSortFilterProxyModel* self, void* slot) { QSortFilterProxyModel::connect(self, static_cast(&QSortFilterProxyModel::sortCaseSensitivityChanged), self, [=](Qt::CaseSensitivity sortCaseSensitivity) { Qt::CaseSensitivity sortCaseSensitivity_ret = sortCaseSensitivity; - uintptr_t sigval1 = static_cast(sortCaseSensitivity_ret); + int sigval1 = static_cast(sortCaseSensitivity_ret); miqt_exec_callback_QSortFilterProxyModel_SortCaseSensitivityChanged(slot, sigval1); }); } @@ -433,11 +433,11 @@ bool QSortFilterProxyModel_SetData3(QSortFilterProxyModel* self, QModelIndex* in return self->setData(*index, *value, static_cast(role)); } -QVariant* QSortFilterProxyModel_HeaderData3(const QSortFilterProxyModel* self, int section, uintptr_t orientation, int role) { +QVariant* QSortFilterProxyModel_HeaderData3(const QSortFilterProxyModel* self, int section, int orientation, int role) { return new QVariant(self->headerData(static_cast(section), static_cast(orientation), static_cast(role))); } -bool QSortFilterProxyModel_SetHeaderData4(QSortFilterProxyModel* self, int section, uintptr_t orientation, QVariant* value, int role) { +bool QSortFilterProxyModel_SetHeaderData4(QSortFilterProxyModel* self, int section, int orientation, QVariant* value, int role) { return self->setHeaderData(static_cast(section), static_cast(orientation), *value, static_cast(role)); } @@ -483,7 +483,7 @@ struct miqt_array* QSortFilterProxyModel_Match5(const QSortFilterProxyModel* sel return _out; } -void QSortFilterProxyModel_Sort2(QSortFilterProxyModel* self, int column, uintptr_t order) { +void QSortFilterProxyModel_Sort2(QSortFilterProxyModel* self, int column, int order) { self->sort(static_cast(column), static_cast(order)); } diff --git a/qt/gen_qsortfilterproxymodel.go b/qt/gen_qsortfilterproxymodel.go index 0cabfd5..8a10a36 100644 --- a/qt/gen_qsortfilterproxymodel.go +++ b/qt/gen_qsortfilterproxymodel.go @@ -116,7 +116,7 @@ func (this *QSortFilterProxyModel) FilterCaseSensitivity() CaseSensitivity { } func (this *QSortFilterProxyModel) SetFilterCaseSensitivity(cs CaseSensitivity) { - C.QSortFilterProxyModel_SetFilterCaseSensitivity(this.h, (C.uintptr_t)(cs)) + C.QSortFilterProxyModel_SetFilterCaseSensitivity(this.h, (C.int)(cs)) } func (this *QSortFilterProxyModel) SortCaseSensitivity() CaseSensitivity { @@ -124,7 +124,7 @@ func (this *QSortFilterProxyModel) SortCaseSensitivity() CaseSensitivity { } func (this *QSortFilterProxyModel) SetSortCaseSensitivity(cs CaseSensitivity) { - C.QSortFilterProxyModel_SetSortCaseSensitivity(this.h, (C.uintptr_t)(cs)) + C.QSortFilterProxyModel_SetSortCaseSensitivity(this.h, (C.int)(cs)) } func (this *QSortFilterProxyModel) IsSortLocaleAware() bool { @@ -260,14 +260,14 @@ func (this *QSortFilterProxyModel) SetData(index *QModelIndex, value *QVariant) } func (this *QSortFilterProxyModel) HeaderData(section int, orientation Orientation) *QVariant { - _ret := C.QSortFilterProxyModel_HeaderData(this.h, (C.int)(section), (C.uintptr_t)(orientation)) + _ret := C.QSortFilterProxyModel_HeaderData(this.h, (C.int)(section), (C.int)(orientation)) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QSortFilterProxyModel) SetHeaderData(section int, orientation Orientation, value *QVariant) bool { - return (bool)(C.QSortFilterProxyModel_SetHeaderData(this.h, (C.int)(section), (C.uintptr_t)(orientation), value.cPointer())) + return (bool)(C.QSortFilterProxyModel_SetHeaderData(this.h, (C.int)(section), (C.int)(orientation), value.cPointer())) } func (this *QSortFilterProxyModel) MimeData(indexes []QModelIndex) *QMimeData { @@ -283,7 +283,7 @@ func (this *QSortFilterProxyModel) MimeData(indexes []QModelIndex) *QMimeData { } func (this *QSortFilterProxyModel) DropMimeData(data *QMimeData, action DropAction, row int, column int, parent *QModelIndex) bool { - return (bool)(C.QSortFilterProxyModel_DropMimeData(this.h, data.cPointer(), (C.uintptr_t)(action), (C.int)(row), (C.int)(column), parent.cPointer())) + return (bool)(C.QSortFilterProxyModel_DropMimeData(this.h, data.cPointer(), (C.int)(action), (C.int)(row), (C.int)(column), parent.cPointer())) } func (this *QSortFilterProxyModel) InsertRows(row int, count int) bool { @@ -385,14 +385,14 @@ func miqt_exec_callback_QSortFilterProxyModel_DynamicSortFilterChanged(cb *C.voi } func (this *QSortFilterProxyModel) FilterCaseSensitivityChanged(filterCaseSensitivity CaseSensitivity) { - C.QSortFilterProxyModel_FilterCaseSensitivityChanged(this.h, (C.uintptr_t)(filterCaseSensitivity)) + C.QSortFilterProxyModel_FilterCaseSensitivityChanged(this.h, (C.int)(filterCaseSensitivity)) } func (this *QSortFilterProxyModel) OnFilterCaseSensitivityChanged(slot func(filterCaseSensitivity CaseSensitivity)) { C.QSortFilterProxyModel_connect_FilterCaseSensitivityChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QSortFilterProxyModel_FilterCaseSensitivityChanged -func miqt_exec_callback_QSortFilterProxyModel_FilterCaseSensitivityChanged(cb *C.void, filterCaseSensitivity C.uintptr_t) { +func miqt_exec_callback_QSortFilterProxyModel_FilterCaseSensitivityChanged(cb *C.void, filterCaseSensitivity C.int) { gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(filterCaseSensitivity CaseSensitivity)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -405,14 +405,14 @@ func miqt_exec_callback_QSortFilterProxyModel_FilterCaseSensitivityChanged(cb *C } func (this *QSortFilterProxyModel) SortCaseSensitivityChanged(sortCaseSensitivity CaseSensitivity) { - C.QSortFilterProxyModel_SortCaseSensitivityChanged(this.h, (C.uintptr_t)(sortCaseSensitivity)) + C.QSortFilterProxyModel_SortCaseSensitivityChanged(this.h, (C.int)(sortCaseSensitivity)) } func (this *QSortFilterProxyModel) OnSortCaseSensitivityChanged(slot func(sortCaseSensitivity CaseSensitivity)) { C.QSortFilterProxyModel_connect_SortCaseSensitivityChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QSortFilterProxyModel_SortCaseSensitivityChanged -func miqt_exec_callback_QSortFilterProxyModel_SortCaseSensitivityChanged(cb *C.void, sortCaseSensitivity C.uintptr_t) { +func miqt_exec_callback_QSortFilterProxyModel_SortCaseSensitivityChanged(cb *C.void, sortCaseSensitivity C.int) { gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(sortCaseSensitivity CaseSensitivity)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -579,14 +579,14 @@ func (this *QSortFilterProxyModel) SetData3(index *QModelIndex, value *QVariant, } func (this *QSortFilterProxyModel) HeaderData3(section int, orientation Orientation, role int) *QVariant { - _ret := C.QSortFilterProxyModel_HeaderData3(this.h, (C.int)(section), (C.uintptr_t)(orientation), (C.int)(role)) + _ret := C.QSortFilterProxyModel_HeaderData3(this.h, (C.int)(section), (C.int)(orientation), (C.int)(role)) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QSortFilterProxyModel) SetHeaderData4(section int, orientation Orientation, value *QVariant, role int) bool { - return (bool)(C.QSortFilterProxyModel_SetHeaderData4(this.h, (C.int)(section), (C.uintptr_t)(orientation), value.cPointer(), (C.int)(role))) + return (bool)(C.QSortFilterProxyModel_SetHeaderData4(this.h, (C.int)(section), (C.int)(orientation), value.cPointer(), (C.int)(role))) } func (this *QSortFilterProxyModel) InsertRows3(row int, count int, parent *QModelIndex) bool { @@ -620,7 +620,7 @@ func (this *QSortFilterProxyModel) Match4(start *QModelIndex, role int, value *Q } func (this *QSortFilterProxyModel) Match5(start *QModelIndex, role int, value *QVariant, hits int, flags int) []QModelIndex { - var _ma *C.struct_miqt_array = C.QSortFilterProxyModel_Match5(this.h, start.cPointer(), (C.int)(role), value.cPointer(), (C.int)(hits), (C.int)(flags)) + var _ma *C.struct_miqt_array = C.QSortFilterProxyModel_Match5(this.h, start.cPointer(), (C.int)(role), value.cPointer(), (C.int)(hits), flags) _ret := make([]QModelIndex, int(_ma.len)) _outCast := (*[0xffff]*C.QModelIndex)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -634,7 +634,7 @@ func (this *QSortFilterProxyModel) Match5(start *QModelIndex, role int, value *Q } func (this *QSortFilterProxyModel) Sort2(column int, order SortOrder) { - C.QSortFilterProxyModel_Sort2(this.h, (C.int)(column), (C.uintptr_t)(order)) + C.QSortFilterProxyModel_Sort2(this.h, (C.int)(column), (C.int)(order)) } // Delete this object from C++ memory. diff --git a/qt/gen_qsortfilterproxymodel.h b/qt/gen_qsortfilterproxymodel.h index 96d3f4b..5410526 100644 --- a/qt/gen_qsortfilterproxymodel.h +++ b/qt/gen_qsortfilterproxymodel.h @@ -49,14 +49,14 @@ QRegExp* QSortFilterProxyModel_FilterRegExp(const QSortFilterProxyModel* self); QRegularExpression* QSortFilterProxyModel_FilterRegularExpression(const QSortFilterProxyModel* self); int QSortFilterProxyModel_FilterKeyColumn(const QSortFilterProxyModel* self); void QSortFilterProxyModel_SetFilterKeyColumn(QSortFilterProxyModel* self, int column); -uintptr_t QSortFilterProxyModel_FilterCaseSensitivity(const QSortFilterProxyModel* self); -void QSortFilterProxyModel_SetFilterCaseSensitivity(QSortFilterProxyModel* self, uintptr_t cs); -uintptr_t QSortFilterProxyModel_SortCaseSensitivity(const QSortFilterProxyModel* self); -void QSortFilterProxyModel_SetSortCaseSensitivity(QSortFilterProxyModel* self, uintptr_t cs); +int QSortFilterProxyModel_FilterCaseSensitivity(const QSortFilterProxyModel* self); +void QSortFilterProxyModel_SetFilterCaseSensitivity(QSortFilterProxyModel* self, int cs); +int QSortFilterProxyModel_SortCaseSensitivity(const QSortFilterProxyModel* self); +void QSortFilterProxyModel_SetSortCaseSensitivity(QSortFilterProxyModel* self, int cs); bool QSortFilterProxyModel_IsSortLocaleAware(const QSortFilterProxyModel* self); void QSortFilterProxyModel_SetSortLocaleAware(QSortFilterProxyModel* self, bool on); int QSortFilterProxyModel_SortColumn(const QSortFilterProxyModel* self); -uintptr_t QSortFilterProxyModel_SortOrder(const QSortFilterProxyModel* self); +int QSortFilterProxyModel_SortOrder(const QSortFilterProxyModel* self); bool QSortFilterProxyModel_DynamicSortFilter(const QSortFilterProxyModel* self); void QSortFilterProxyModel_SetDynamicSortFilter(QSortFilterProxyModel* self, bool enable); int QSortFilterProxyModel_SortRole(const QSortFilterProxyModel* self); @@ -81,10 +81,10 @@ int QSortFilterProxyModel_ColumnCount(const QSortFilterProxyModel* self); bool QSortFilterProxyModel_HasChildren(const QSortFilterProxyModel* self); QVariant* QSortFilterProxyModel_Data(const QSortFilterProxyModel* self, QModelIndex* index); bool QSortFilterProxyModel_SetData(QSortFilterProxyModel* self, QModelIndex* index, QVariant* value); -QVariant* QSortFilterProxyModel_HeaderData(const QSortFilterProxyModel* self, int section, uintptr_t orientation); -bool QSortFilterProxyModel_SetHeaderData(QSortFilterProxyModel* self, int section, uintptr_t orientation, QVariant* value); +QVariant* QSortFilterProxyModel_HeaderData(const QSortFilterProxyModel* self, int section, int orientation); +bool QSortFilterProxyModel_SetHeaderData(QSortFilterProxyModel* self, int section, int orientation, QVariant* value); QMimeData* QSortFilterProxyModel_MimeData(const QSortFilterProxyModel* self, struct miqt_array* /* of QModelIndex* */ indexes); -bool QSortFilterProxyModel_DropMimeData(QSortFilterProxyModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent); +bool QSortFilterProxyModel_DropMimeData(QSortFilterProxyModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent); bool QSortFilterProxyModel_InsertRows(QSortFilterProxyModel* self, int row, int count); bool QSortFilterProxyModel_InsertColumns(QSortFilterProxyModel* self, int column, int count); bool QSortFilterProxyModel_RemoveRows(QSortFilterProxyModel* self, int row, int count); @@ -100,9 +100,9 @@ struct miqt_array* QSortFilterProxyModel_MimeTypes(const QSortFilterProxyModel* int QSortFilterProxyModel_SupportedDropActions(const QSortFilterProxyModel* self); void QSortFilterProxyModel_DynamicSortFilterChanged(QSortFilterProxyModel* self, bool dynamicSortFilter); void QSortFilterProxyModel_connect_DynamicSortFilterChanged(QSortFilterProxyModel* self, void* slot); -void QSortFilterProxyModel_FilterCaseSensitivityChanged(QSortFilterProxyModel* self, uintptr_t filterCaseSensitivity); +void QSortFilterProxyModel_FilterCaseSensitivityChanged(QSortFilterProxyModel* self, int filterCaseSensitivity); void QSortFilterProxyModel_connect_FilterCaseSensitivityChanged(QSortFilterProxyModel* self, void* slot); -void QSortFilterProxyModel_SortCaseSensitivityChanged(QSortFilterProxyModel* self, uintptr_t sortCaseSensitivity); +void QSortFilterProxyModel_SortCaseSensitivityChanged(QSortFilterProxyModel* self, int sortCaseSensitivity); void QSortFilterProxyModel_connect_SortCaseSensitivityChanged(QSortFilterProxyModel* self, void* slot); void QSortFilterProxyModel_SortLocaleAwareChanged(QSortFilterProxyModel* self, bool sortLocaleAware); void QSortFilterProxyModel_connect_SortLocaleAwareChanged(QSortFilterProxyModel* self, void* slot); @@ -122,15 +122,15 @@ int QSortFilterProxyModel_ColumnCount1(const QSortFilterProxyModel* self, QModel bool QSortFilterProxyModel_HasChildren1(const QSortFilterProxyModel* self, QModelIndex* parent); QVariant* QSortFilterProxyModel_Data2(const QSortFilterProxyModel* self, QModelIndex* index, int role); bool QSortFilterProxyModel_SetData3(QSortFilterProxyModel* self, QModelIndex* index, QVariant* value, int role); -QVariant* QSortFilterProxyModel_HeaderData3(const QSortFilterProxyModel* self, int section, uintptr_t orientation, int role); -bool QSortFilterProxyModel_SetHeaderData4(QSortFilterProxyModel* self, int section, uintptr_t orientation, QVariant* value, int role); +QVariant* QSortFilterProxyModel_HeaderData3(const QSortFilterProxyModel* self, int section, int orientation, int role); +bool QSortFilterProxyModel_SetHeaderData4(QSortFilterProxyModel* self, int section, int orientation, QVariant* value, int role); bool QSortFilterProxyModel_InsertRows3(QSortFilterProxyModel* self, int row, int count, QModelIndex* parent); bool QSortFilterProxyModel_InsertColumns3(QSortFilterProxyModel* self, int column, int count, QModelIndex* parent); bool QSortFilterProxyModel_RemoveRows3(QSortFilterProxyModel* self, int row, int count, QModelIndex* parent); bool QSortFilterProxyModel_RemoveColumns3(QSortFilterProxyModel* self, int column, int count, QModelIndex* parent); struct miqt_array* QSortFilterProxyModel_Match4(const QSortFilterProxyModel* self, QModelIndex* start, int role, QVariant* value, int hits); struct miqt_array* QSortFilterProxyModel_Match5(const QSortFilterProxyModel* self, QModelIndex* start, int role, QVariant* value, int hits, int flags); -void QSortFilterProxyModel_Sort2(QSortFilterProxyModel* self, int column, uintptr_t order); +void QSortFilterProxyModel_Sort2(QSortFilterProxyModel* self, int column, int order); void QSortFilterProxyModel_Delete(QSortFilterProxyModel* self); #ifdef __cplusplus diff --git a/qt/gen_qspinbox.cpp b/qt/gen_qspinbox.cpp index 6bd6544..77deba1 100644 --- a/qt/gen_qspinbox.cpp +++ b/qt/gen_qspinbox.cpp @@ -98,12 +98,12 @@ void QSpinBox_SetRange(QSpinBox* self, int min, int max) { self->setRange(static_cast(min), static_cast(max)); } -uintptr_t QSpinBox_StepType(const QSpinBox* self) { +int QSpinBox_StepType(const QSpinBox* self) { QAbstractSpinBox::StepType _ret = self->stepType(); - return static_cast(_ret); + return static_cast(_ret); } -void QSpinBox_SetStepType(QSpinBox* self, uintptr_t stepType) { +void QSpinBox_SetStepType(QSpinBox* self, int stepType) { self->setStepType(static_cast(stepType)); } @@ -281,12 +281,12 @@ void QDoubleSpinBox_SetRange(QDoubleSpinBox* self, double min, double max) { self->setRange(static_cast(min), static_cast(max)); } -uintptr_t QDoubleSpinBox_StepType(const QDoubleSpinBox* self) { +int QDoubleSpinBox_StepType(const QDoubleSpinBox* self) { QAbstractSpinBox::StepType _ret = self->stepType(); - return static_cast(_ret); + return static_cast(_ret); } -void QDoubleSpinBox_SetStepType(QDoubleSpinBox* self, uintptr_t stepType) { +void QDoubleSpinBox_SetStepType(QDoubleSpinBox* self, int stepType) { self->setStepType(static_cast(stepType)); } @@ -298,10 +298,10 @@ void QDoubleSpinBox_SetDecimals(QDoubleSpinBox* self, int prec) { self->setDecimals(static_cast(prec)); } -uintptr_t QDoubleSpinBox_Validate(const QDoubleSpinBox* self, struct miqt_string* input, int* pos) { +int QDoubleSpinBox_Validate(const QDoubleSpinBox* self, struct miqt_string* input, int* pos) { QString input_QString = QString::fromUtf8(&input->data, input->len); QValidator::State _ret = self->validate(input_QString, static_cast(*pos)); - return static_cast(_ret); + return static_cast(_ret); } double QDoubleSpinBox_ValueFromText(const QDoubleSpinBox* self, struct miqt_string* text) { diff --git a/qt/gen_qspinbox.go b/qt/gen_qspinbox.go index 74750a3..3556bbe 100644 --- a/qt/gen_qspinbox.go +++ b/qt/gen_qspinbox.go @@ -141,7 +141,7 @@ func (this *QSpinBox) StepType() QAbstractSpinBox__StepType { } func (this *QSpinBox) SetStepType(stepType QAbstractSpinBox__StepType) { - C.QSpinBox_SetStepType(this.h, (C.uintptr_t)(stepType)) + C.QSpinBox_SetStepType(this.h, (C.int)(stepType)) } func (this *QSpinBox) DisplayIntegerBase() int { @@ -411,7 +411,7 @@ func (this *QDoubleSpinBox) StepType() QAbstractSpinBox__StepType { } func (this *QDoubleSpinBox) SetStepType(stepType QAbstractSpinBox__StepType) { - C.QDoubleSpinBox_SetStepType(this.h, (C.uintptr_t)(stepType)) + C.QDoubleSpinBox_SetStepType(this.h, (C.int)(stepType)) } func (this *QDoubleSpinBox) Decimals() int { diff --git a/qt/gen_qspinbox.h b/qt/gen_qspinbox.h index 3cad44f..95c4100 100644 --- a/qt/gen_qspinbox.h +++ b/qt/gen_qspinbox.h @@ -43,8 +43,8 @@ void QSpinBox_SetMinimum(QSpinBox* self, int min); int QSpinBox_Maximum(const QSpinBox* self); void QSpinBox_SetMaximum(QSpinBox* self, int max); void QSpinBox_SetRange(QSpinBox* self, int min, int max); -uintptr_t QSpinBox_StepType(const QSpinBox* self); -void QSpinBox_SetStepType(QSpinBox* self, uintptr_t stepType); +int QSpinBox_StepType(const QSpinBox* self); +void QSpinBox_SetStepType(QSpinBox* self, int stepType); int QSpinBox_DisplayIntegerBase(const QSpinBox* self); void QSpinBox_SetDisplayIntegerBase(QSpinBox* self, int base); void QSpinBox_SetValue(QSpinBox* self, int val); @@ -78,11 +78,11 @@ void QDoubleSpinBox_SetMinimum(QDoubleSpinBox* self, double min); double QDoubleSpinBox_Maximum(const QDoubleSpinBox* self); void QDoubleSpinBox_SetMaximum(QDoubleSpinBox* self, double max); void QDoubleSpinBox_SetRange(QDoubleSpinBox* self, double min, double max); -uintptr_t QDoubleSpinBox_StepType(const QDoubleSpinBox* self); -void QDoubleSpinBox_SetStepType(QDoubleSpinBox* self, uintptr_t stepType); +int QDoubleSpinBox_StepType(const QDoubleSpinBox* self); +void QDoubleSpinBox_SetStepType(QDoubleSpinBox* self, int stepType); int QDoubleSpinBox_Decimals(const QDoubleSpinBox* self); void QDoubleSpinBox_SetDecimals(QDoubleSpinBox* self, int prec); -uintptr_t QDoubleSpinBox_Validate(const QDoubleSpinBox* self, struct miqt_string* input, int* pos); +int QDoubleSpinBox_Validate(const QDoubleSpinBox* self, struct miqt_string* input, int* pos); double QDoubleSpinBox_ValueFromText(const QDoubleSpinBox* self, struct miqt_string* text); struct miqt_string* QDoubleSpinBox_TextFromValue(const QDoubleSpinBox* self, double val); void QDoubleSpinBox_Fixup(const QDoubleSpinBox* self, struct miqt_string* str); diff --git a/qt/gen_qsplashscreen.go b/qt/gen_qsplashscreen.go index 5ea71e4..4e8561a 100644 --- a/qt/gen_qsplashscreen.go +++ b/qt/gen_qsplashscreen.go @@ -63,7 +63,7 @@ func NewQSplashScreen4(pixmap *QPixmap) *QSplashScreen { // NewQSplashScreen5 constructs a new QSplashScreen object. func NewQSplashScreen5(pixmap *QPixmap, f int) *QSplashScreen { - ret := C.QSplashScreen_new5(pixmap.cPointer(), (C.int)(f)) + ret := C.QSplashScreen_new5(pixmap.cPointer(), f) return newQSplashScreen(ret) } @@ -75,7 +75,7 @@ func NewQSplashScreen6(screen *QScreen, pixmap *QPixmap) *QSplashScreen { // NewQSplashScreen7 constructs a new QSplashScreen object. func NewQSplashScreen7(screen *QScreen, pixmap *QPixmap, f int) *QSplashScreen { - ret := C.QSplashScreen_new7(screen.cPointer(), pixmap.cPointer(), (C.int)(f)) + ret := C.QSplashScreen_new7(screen.cPointer(), pixmap.cPointer(), f) return newQSplashScreen(ret) } @@ -87,7 +87,7 @@ func NewQSplashScreen8(parent *QWidget, pixmap *QPixmap) *QSplashScreen { // NewQSplashScreen9 constructs a new QSplashScreen object. func NewQSplashScreen9(parent *QWidget, pixmap *QPixmap, f int) *QSplashScreen { - ret := C.QSplashScreen_new9(parent.cPointer(), pixmap.cPointer(), (C.int)(f)) + ret := C.QSplashScreen_new9(parent.cPointer(), pixmap.cPointer(), f) return newQSplashScreen(ret) } diff --git a/qt/gen_qsplitter.cpp b/qt/gen_qsplitter.cpp index ca1f097..5d8870f 100644 --- a/qt/gen_qsplitter.cpp +++ b/qt/gen_qsplitter.cpp @@ -16,7 +16,7 @@ QSplitter* QSplitter_new() { return new QSplitter(); } -QSplitter* QSplitter_new2(uintptr_t param1) { +QSplitter* QSplitter_new2(int param1) { return new QSplitter(static_cast(param1)); } @@ -24,7 +24,7 @@ QSplitter* QSplitter_new3(QWidget* parent) { return new QSplitter(parent); } -QSplitter* QSplitter_new4(uintptr_t param1, QWidget* parent) { +QSplitter* QSplitter_new4(int param1, QWidget* parent) { return new QSplitter(static_cast(param1), parent); } @@ -58,13 +58,13 @@ QWidget* QSplitter_ReplaceWidget(QSplitter* self, int index, QWidget* widget) { return self->replaceWidget(static_cast(index), widget); } -void QSplitter_SetOrientation(QSplitter* self, uintptr_t orientation) { +void QSplitter_SetOrientation(QSplitter* self, int orientation) { self->setOrientation(static_cast(orientation)); } -uintptr_t QSplitter_Orientation(const QSplitter* self) { +int QSplitter_Orientation(const QSplitter* self) { Qt::Orientation _ret = self->orientation(); - return static_cast(_ret); + return static_cast(_ret); } void QSplitter_SetChildrenCollapsible(QSplitter* self, bool childrenCollapsible) { @@ -214,7 +214,7 @@ void QSplitter_Delete(QSplitter* self) { delete self; } -QSplitterHandle* QSplitterHandle_new(uintptr_t o, QSplitter* parent) { +QSplitterHandle* QSplitterHandle_new(int o, QSplitter* parent) { return new QSplitterHandle(static_cast(o), parent); } @@ -236,13 +236,13 @@ struct miqt_string* QSplitterHandle_TrUtf8(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -void QSplitterHandle_SetOrientation(QSplitterHandle* self, uintptr_t o) { +void QSplitterHandle_SetOrientation(QSplitterHandle* self, int o) { self->setOrientation(static_cast(o)); } -uintptr_t QSplitterHandle_Orientation(const QSplitterHandle* self) { +int QSplitterHandle_Orientation(const QSplitterHandle* self) { Qt::Orientation _ret = self->orientation(); - return static_cast(_ret); + return static_cast(_ret); } bool QSplitterHandle_OpaqueResize(const QSplitterHandle* self) { diff --git a/qt/gen_qsplitter.go b/qt/gen_qsplitter.go index 6df9093..5a4dbc3 100644 --- a/qt/gen_qsplitter.go +++ b/qt/gen_qsplitter.go @@ -45,7 +45,7 @@ func NewQSplitter() *QSplitter { // NewQSplitter2 constructs a new QSplitter object. func NewQSplitter2(param1 Orientation) *QSplitter { - ret := C.QSplitter_new2((C.uintptr_t)(param1)) + ret := C.QSplitter_new2((C.int)(param1)) return newQSplitter(ret) } @@ -57,7 +57,7 @@ func NewQSplitter3(parent *QWidget) *QSplitter { // NewQSplitter4 constructs a new QSplitter object. func NewQSplitter4(param1 Orientation, parent *QWidget) *QSplitter { - ret := C.QSplitter_new4((C.uintptr_t)(param1), parent.cPointer()) + ret := C.QSplitter_new4((C.int)(param1), parent.cPointer()) return newQSplitter(ret) } @@ -96,7 +96,7 @@ func (this *QSplitter) ReplaceWidget(index int, widget *QWidget) *QWidget { } func (this *QSplitter) SetOrientation(orientation Orientation) { - C.QSplitter_SetOrientation(this.h, (C.uintptr_t)(orientation)) + C.QSplitter_SetOrientation(this.h, (C.int)(orientation)) } func (this *QSplitter) Orientation() Orientation { @@ -320,7 +320,7 @@ func newQSplitterHandle_U(h unsafe.Pointer) *QSplitterHandle { // NewQSplitterHandle constructs a new QSplitterHandle object. func NewQSplitterHandle(o Orientation, parent *QSplitter) *QSplitterHandle { - ret := C.QSplitterHandle_new((C.uintptr_t)(o), parent.cPointer()) + ret := C.QSplitterHandle_new((C.int)(o), parent.cPointer()) return newQSplitterHandle(ret) } @@ -347,7 +347,7 @@ func QSplitterHandle_TrUtf8(s string) string { } func (this *QSplitterHandle) SetOrientation(o Orientation) { - C.QSplitterHandle_SetOrientation(this.h, (C.uintptr_t)(o)) + C.QSplitterHandle_SetOrientation(this.h, (C.int)(o)) } func (this *QSplitterHandle) Orientation() Orientation { diff --git a/qt/gen_qsplitter.h b/qt/gen_qsplitter.h index ffac4fe..c77e5fa 100644 --- a/qt/gen_qsplitter.h +++ b/qt/gen_qsplitter.h @@ -30,17 +30,17 @@ typedef struct QWidget QWidget; #endif QSplitter* QSplitter_new(); -QSplitter* QSplitter_new2(uintptr_t param1); +QSplitter* QSplitter_new2(int param1); QSplitter* QSplitter_new3(QWidget* parent); -QSplitter* QSplitter_new4(uintptr_t param1, QWidget* parent); +QSplitter* QSplitter_new4(int param1, QWidget* parent); QMetaObject* QSplitter_MetaObject(const QSplitter* self); struct miqt_string* QSplitter_Tr(const char* s); struct miqt_string* QSplitter_TrUtf8(const char* s); void QSplitter_AddWidget(QSplitter* self, QWidget* widget); void QSplitter_InsertWidget(QSplitter* self, int index, QWidget* widget); QWidget* QSplitter_ReplaceWidget(QSplitter* self, int index, QWidget* widget); -void QSplitter_SetOrientation(QSplitter* self, uintptr_t orientation); -uintptr_t QSplitter_Orientation(const QSplitter* self); +void QSplitter_SetOrientation(QSplitter* self, int orientation); +int QSplitter_Orientation(const QSplitter* self); void QSplitter_SetChildrenCollapsible(QSplitter* self, bool childrenCollapsible); bool QSplitter_ChildrenCollapsible(const QSplitter* self); void QSplitter_SetCollapsible(QSplitter* self, int index, bool param2); @@ -71,12 +71,12 @@ struct miqt_string* QSplitter_TrUtf83(const char* s, const char* c, int n); void QSplitter_SetOpaqueResize1(QSplitter* self, bool opaque); void QSplitter_Delete(QSplitter* self); -QSplitterHandle* QSplitterHandle_new(uintptr_t o, QSplitter* parent); +QSplitterHandle* QSplitterHandle_new(int o, QSplitter* parent); QMetaObject* QSplitterHandle_MetaObject(const QSplitterHandle* self); struct miqt_string* QSplitterHandle_Tr(const char* s); struct miqt_string* QSplitterHandle_TrUtf8(const char* s); -void QSplitterHandle_SetOrientation(QSplitterHandle* self, uintptr_t o); -uintptr_t QSplitterHandle_Orientation(const QSplitterHandle* self); +void QSplitterHandle_SetOrientation(QSplitterHandle* self, int o); +int QSplitterHandle_Orientation(const QSplitterHandle* self); bool QSplitterHandle_OpaqueResize(const QSplitterHandle* self); QSplitter* QSplitterHandle_Splitter(const QSplitterHandle* self); QSize* QSplitterHandle_SizeHint(const QSplitterHandle* self); diff --git a/qt/gen_qstackedlayout.cpp b/qt/gen_qstackedlayout.cpp index 14e1f91..cb61c49 100644 --- a/qt/gen_qstackedlayout.cpp +++ b/qt/gen_qstackedlayout.cpp @@ -66,12 +66,12 @@ int QStackedLayout_Count(const QStackedLayout* self) { return self->count(); } -uintptr_t QStackedLayout_StackingMode(const QStackedLayout* self) { +int QStackedLayout_StackingMode(const QStackedLayout* self) { QStackedLayout::StackingMode _ret = self->stackingMode(); - return static_cast(_ret); + return static_cast(_ret); } -void QStackedLayout_SetStackingMode(QStackedLayout* self, uintptr_t stackingMode) { +void QStackedLayout_SetStackingMode(QStackedLayout* self, int stackingMode) { self->setStackingMode(static_cast(stackingMode)); } diff --git a/qt/gen_qstackedlayout.go b/qt/gen_qstackedlayout.go index dd4c319..7127d5f 100644 --- a/qt/gen_qstackedlayout.go +++ b/qt/gen_qstackedlayout.go @@ -113,7 +113,7 @@ func (this *QStackedLayout) StackingMode() QStackedLayout__StackingMode { } func (this *QStackedLayout) SetStackingMode(stackingMode QStackedLayout__StackingMode) { - C.QStackedLayout_SetStackingMode(this.h, (C.uintptr_t)(stackingMode)) + C.QStackedLayout_SetStackingMode(this.h, (C.int)(stackingMode)) } func (this *QStackedLayout) AddItem(item *QLayoutItem) { diff --git a/qt/gen_qstackedlayout.h b/qt/gen_qstackedlayout.h index db170d8..78ef7f1 100644 --- a/qt/gen_qstackedlayout.h +++ b/qt/gen_qstackedlayout.h @@ -43,8 +43,8 @@ QWidget* QStackedLayout_CurrentWidget(const QStackedLayout* self); int QStackedLayout_CurrentIndex(const QStackedLayout* self); QWidget* QStackedLayout_Widget(const QStackedLayout* self, int param1); int QStackedLayout_Count(const QStackedLayout* self); -uintptr_t QStackedLayout_StackingMode(const QStackedLayout* self); -void QStackedLayout_SetStackingMode(QStackedLayout* self, uintptr_t stackingMode); +int QStackedLayout_StackingMode(const QStackedLayout* self); +void QStackedLayout_SetStackingMode(QStackedLayout* self, int stackingMode); void QStackedLayout_AddItem(QStackedLayout* self, QLayoutItem* item); QSize* QStackedLayout_SizeHint(const QStackedLayout* self); QSize* QStackedLayout_MinimumSize(const QStackedLayout* self); diff --git a/qt/gen_qstandarditemmodel.cpp b/qt/gen_qstandarditemmodel.cpp index f800220..a0f9ec6 100644 --- a/qt/gen_qstandarditemmodel.cpp +++ b/qt/gen_qstandarditemmodel.cpp @@ -149,12 +149,12 @@ void QStandardItem_SetForeground(QStandardItem* self, QBrush* brush) { self->setForeground(*brush); } -uintptr_t QStandardItem_CheckState(const QStandardItem* self) { +int QStandardItem_CheckState(const QStandardItem* self) { Qt::CheckState _ret = self->checkState(); - return static_cast(_ret); + return static_cast(_ret); } -void QStandardItem_SetCheckState(QStandardItem* self, uintptr_t checkState) { +void QStandardItem_SetCheckState(QStandardItem* self, int checkState) { self->setCheckState(static_cast(checkState)); } @@ -412,7 +412,7 @@ QStandardItem* QStandardItem_TakeChild(QStandardItem* self, int row) { } struct miqt_array* QStandardItem_TakeRow(QStandardItem* self, int row) { - QList _ret = self->takeRow(static_cast(row)); + QList _ret = self->takeRow(static_cast(row)); // Convert QList<> from C++ memory to manually-managed C memory QStandardItem** _arr = static_cast(malloc(sizeof(QStandardItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -425,7 +425,7 @@ struct miqt_array* QStandardItem_TakeRow(QStandardItem* self, int row) { } struct miqt_array* QStandardItem_TakeColumn(QStandardItem* self, int column) { - QList _ret = self->takeColumn(static_cast(column)); + QList _ret = self->takeColumn(static_cast(column)); // Convert QList<> from C++ memory to manually-managed C memory QStandardItem** _arr = static_cast(malloc(sizeof(QStandardItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -477,7 +477,7 @@ QStandardItem* QStandardItem_TakeChild2(QStandardItem* self, int row, int column return self->takeChild(static_cast(row), static_cast(column)); } -void QStandardItem_SortChildren2(QStandardItem* self, int column, uintptr_t order) { +void QStandardItem_SortChildren2(QStandardItem* self, int column, int order) { self->sortChildren(static_cast(column), static_cast(order)); } @@ -555,11 +555,11 @@ bool QStandardItemModel_ClearItemData(QStandardItemModel* self, QModelIndex* ind return self->clearItemData(*index); } -QVariant* QStandardItemModel_HeaderData(const QStandardItemModel* self, int section, uintptr_t orientation) { +QVariant* QStandardItemModel_HeaderData(const QStandardItemModel* self, int section, int orientation) { return new QVariant(self->headerData(static_cast(section), static_cast(orientation))); } -bool QStandardItemModel_SetHeaderData(QStandardItemModel* self, int section, uintptr_t orientation, QVariant* value) { +bool QStandardItemModel_SetHeaderData(QStandardItemModel* self, int section, int orientation, QVariant* value) { return self->setHeaderData(static_cast(section), static_cast(orientation), *value); } @@ -728,7 +728,7 @@ QStandardItem* QStandardItemModel_TakeItem(QStandardItemModel* self, int row) { } struct miqt_array* QStandardItemModel_TakeRow(QStandardItemModel* self, int row) { - QList _ret = self->takeRow(static_cast(row)); + QList _ret = self->takeRow(static_cast(row)); // Convert QList<> from C++ memory to manually-managed C memory QStandardItem** _arr = static_cast(malloc(sizeof(QStandardItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -741,7 +741,7 @@ struct miqt_array* QStandardItemModel_TakeRow(QStandardItemModel* self, int row) } struct miqt_array* QStandardItemModel_TakeColumn(QStandardItemModel* self, int column) { - QList _ret = self->takeColumn(static_cast(column)); + QList _ret = self->takeColumn(static_cast(column)); // Convert QList<> from C++ memory to manually-managed C memory QStandardItem** _arr = static_cast(malloc(sizeof(QStandardItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -771,7 +771,7 @@ void QStandardItemModel_SetItemPrototype(QStandardItemModel* self, QStandardItem struct miqt_array* QStandardItemModel_FindItems(const QStandardItemModel* self, struct miqt_string* text) { QString text_QString = QString::fromUtf8(&text->data, text->len); - QList _ret = self->findItems(text_QString); + QList _ret = self->findItems(text_QString); // Convert QList<> from C++ memory to manually-managed C memory QStandardItem** _arr = static_cast(malloc(sizeof(QStandardItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -817,7 +817,7 @@ QMimeData* QStandardItemModel_MimeData(const QStandardItemModel* self, struct mi return self->mimeData(indexes_QList); } -bool QStandardItemModel_DropMimeData(QStandardItemModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent) { +bool QStandardItemModel_DropMimeData(QStandardItemModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent) { return self->dropMimeData(data, static_cast(action), static_cast(row), static_cast(column), *parent); } @@ -884,11 +884,11 @@ bool QStandardItemModel_SetData3(QStandardItemModel* self, QModelIndex* index, Q return self->setData(*index, *value, static_cast(role)); } -QVariant* QStandardItemModel_HeaderData3(const QStandardItemModel* self, int section, uintptr_t orientation, int role) { +QVariant* QStandardItemModel_HeaderData3(const QStandardItemModel* self, int section, int orientation, int role) { return new QVariant(self->headerData(static_cast(section), static_cast(orientation), static_cast(role))); } -bool QStandardItemModel_SetHeaderData4(QStandardItemModel* self, int section, uintptr_t orientation, QVariant* value, int role) { +bool QStandardItemModel_SetHeaderData4(QStandardItemModel* self, int section, int orientation, QVariant* value, int role) { return self->setHeaderData(static_cast(section), static_cast(orientation), *value, static_cast(role)); } @@ -908,7 +908,7 @@ bool QStandardItemModel_RemoveColumns3(QStandardItemModel* self, int column, int return self->removeColumns(static_cast(column), static_cast(count), *parent); } -void QStandardItemModel_Sort2(QStandardItemModel* self, int column, uintptr_t order) { +void QStandardItemModel_Sort2(QStandardItemModel* self, int column, int order) { self->sort(static_cast(column), static_cast(order)); } @@ -930,7 +930,7 @@ QStandardItem* QStandardItemModel_TakeItem2(QStandardItemModel* self, int row, i struct miqt_array* QStandardItemModel_FindItems2(const QStandardItemModel* self, struct miqt_string* text, int flags) { QString text_QString = QString::fromUtf8(&text->data, text->len); - QList _ret = self->findItems(text_QString, static_cast(flags)); + QList _ret = self->findItems(text_QString, static_cast(flags)); // Convert QList<> from C++ memory to manually-managed C memory QStandardItem** _arr = static_cast(malloc(sizeof(QStandardItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -944,7 +944,7 @@ struct miqt_array* QStandardItemModel_FindItems2(const QStandardItemModel* self, struct miqt_array* QStandardItemModel_FindItems3(const QStandardItemModel* self, struct miqt_string* text, int flags, int column) { QString text_QString = QString::fromUtf8(&text->data, text->len); - QList _ret = self->findItems(text_QString, static_cast(flags), static_cast(column)); + QList _ret = self->findItems(text_QString, static_cast(flags), static_cast(column)); // Convert QList<> from C++ memory to manually-managed C memory QStandardItem** _arr = static_cast(malloc(sizeof(QStandardItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { diff --git a/qt/gen_qstandarditemmodel.go b/qt/gen_qstandarditemmodel.go index 60ef518..de261c5 100644 --- a/qt/gen_qstandarditemmodel.go +++ b/qt/gen_qstandarditemmodel.go @@ -182,7 +182,7 @@ func (this *QStandardItem) TextAlignment() int { } func (this *QStandardItem) SetTextAlignment(textAlignment int) { - C.QStandardItem_SetTextAlignment(this.h, (C.int)(textAlignment)) + C.QStandardItem_SetTextAlignment(this.h, textAlignment) } func (this *QStandardItem) Background() *QBrush { @@ -212,7 +212,7 @@ func (this *QStandardItem) CheckState() CheckState { } func (this *QStandardItem) SetCheckState(checkState CheckState) { - C.QStandardItem_SetCheckState(this.h, (C.uintptr_t)(checkState)) + C.QStandardItem_SetCheckState(this.h, (C.int)(checkState)) } func (this *QStandardItem) AccessibleText() string { @@ -246,7 +246,7 @@ func (this *QStandardItem) Flags() int { } func (this *QStandardItem) SetFlags(flags int) { - C.QStandardItem_SetFlags(this.h, (C.int)(flags)) + C.QStandardItem_SetFlags(this.h, flags) } func (this *QStandardItem) IsEnabled() bool { @@ -550,7 +550,7 @@ func (this *QStandardItem) TakeChild2(row int, column int) *QStandardItem { } func (this *QStandardItem) SortChildren2(column int, order SortOrder) { - C.QStandardItem_SortChildren2(this.h, (C.int)(column), (C.uintptr_t)(order)) + C.QStandardItem_SortChildren2(this.h, (C.int)(column), (C.int)(order)) } // Delete this object from C++ memory. @@ -685,14 +685,14 @@ func (this *QStandardItemModel) ClearItemData(index *QModelIndex) bool { } func (this *QStandardItemModel) HeaderData(section int, orientation Orientation) *QVariant { - _ret := C.QStandardItemModel_HeaderData(this.h, (C.int)(section), (C.uintptr_t)(orientation)) + _ret := C.QStandardItemModel_HeaderData(this.h, (C.int)(section), (C.int)(orientation)) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QStandardItemModel) SetHeaderData(section int, orientation Orientation, value *QVariant) bool { - return (bool)(C.QStandardItemModel_SetHeaderData(this.h, (C.int)(section), (C.uintptr_t)(orientation), value.cPointer())) + return (bool)(C.QStandardItemModel_SetHeaderData(this.h, (C.int)(section), (C.int)(orientation), value.cPointer())) } func (this *QStandardItemModel) InsertRows(row int, count int) bool { @@ -960,7 +960,7 @@ func (this *QStandardItemModel) MimeData(indexes []QModelIndex) *QMimeData { } func (this *QStandardItemModel) DropMimeData(data *QMimeData, action DropAction, row int, column int, parent *QModelIndex) bool { - return (bool)(C.QStandardItemModel_DropMimeData(this.h, data.cPointer(), (C.uintptr_t)(action), (C.int)(row), (C.int)(column), parent.cPointer())) + return (bool)(C.QStandardItemModel_DropMimeData(this.h, data.cPointer(), (C.int)(action), (C.int)(row), (C.int)(column), parent.cPointer())) } func (this *QStandardItemModel) ItemChanged(item *QStandardItem) { @@ -1058,14 +1058,14 @@ func (this *QStandardItemModel) SetData3(index *QModelIndex, value *QVariant, ro } func (this *QStandardItemModel) HeaderData3(section int, orientation Orientation, role int) *QVariant { - _ret := C.QStandardItemModel_HeaderData3(this.h, (C.int)(section), (C.uintptr_t)(orientation), (C.int)(role)) + _ret := C.QStandardItemModel_HeaderData3(this.h, (C.int)(section), (C.int)(orientation), (C.int)(role)) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QStandardItemModel) SetHeaderData4(section int, orientation Orientation, value *QVariant, role int) bool { - return (bool)(C.QStandardItemModel_SetHeaderData4(this.h, (C.int)(section), (C.uintptr_t)(orientation), value.cPointer(), (C.int)(role))) + return (bool)(C.QStandardItemModel_SetHeaderData4(this.h, (C.int)(section), (C.int)(orientation), value.cPointer(), (C.int)(role))) } func (this *QStandardItemModel) InsertRows3(row int, count int, parent *QModelIndex) bool { @@ -1085,7 +1085,7 @@ func (this *QStandardItemModel) RemoveColumns3(column int, count int, parent *QM } func (this *QStandardItemModel) Sort2(column int, order SortOrder) { - C.QStandardItemModel_Sort2(this.h, (C.int)(column), (C.uintptr_t)(order)) + C.QStandardItemModel_Sort2(this.h, (C.int)(column), (C.int)(order)) } func (this *QStandardItemModel) Item2(row int, column int) *QStandardItem { @@ -1107,7 +1107,7 @@ func (this *QStandardItemModel) TakeItem2(row int, column int) *QStandardItem { func (this *QStandardItemModel) FindItems2(text string, flags int) []*QStandardItem { text_ms := miqt_strdupg(text) defer C.free(text_ms) - var _ma *C.struct_miqt_array = C.QStandardItemModel_FindItems2(this.h, (*C.struct_miqt_string)(text_ms), (C.int)(flags)) + var _ma *C.struct_miqt_array = C.QStandardItemModel_FindItems2(this.h, (*C.struct_miqt_string)(text_ms), flags) _ret := make([]*QStandardItem, int(_ma.len)) _outCast := (*[0xffff]*C.QStandardItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -1120,7 +1120,7 @@ func (this *QStandardItemModel) FindItems2(text string, flags int) []*QStandardI func (this *QStandardItemModel) FindItems3(text string, flags int, column int) []*QStandardItem { text_ms := miqt_strdupg(text) defer C.free(text_ms) - var _ma *C.struct_miqt_array = C.QStandardItemModel_FindItems3(this.h, (*C.struct_miqt_string)(text_ms), (C.int)(flags), (C.int)(column)) + var _ma *C.struct_miqt_array = C.QStandardItemModel_FindItems3(this.h, (*C.struct_miqt_string)(text_ms), flags, (C.int)(column)) _ret := make([]*QStandardItem, int(_ma.len)) _outCast := (*[0xffff]*C.QStandardItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { diff --git a/qt/gen_qstandarditemmodel.h b/qt/gen_qstandarditemmodel.h index 569326e..a1434aa 100644 --- a/qt/gen_qstandarditemmodel.h +++ b/qt/gen_qstandarditemmodel.h @@ -69,8 +69,8 @@ QBrush* QStandardItem_Background(const QStandardItem* self); void QStandardItem_SetBackground(QStandardItem* self, QBrush* brush); QBrush* QStandardItem_Foreground(const QStandardItem* self); void QStandardItem_SetForeground(QStandardItem* self, QBrush* brush); -uintptr_t QStandardItem_CheckState(const QStandardItem* self); -void QStandardItem_SetCheckState(QStandardItem* self, uintptr_t checkState); +int QStandardItem_CheckState(const QStandardItem* self); +void QStandardItem_SetCheckState(QStandardItem* self, int checkState); struct miqt_string* QStandardItem_AccessibleText(const QStandardItem* self); void QStandardItem_SetAccessibleText(QStandardItem* self, struct miqt_string* accessibleText); struct miqt_string* QStandardItem_AccessibleDescription(const QStandardItem* self); @@ -135,7 +135,7 @@ QVariant* QStandardItem_Data1(const QStandardItem* self, int role); void QStandardItem_SetData2(QStandardItem* self, QVariant* value, int role); QStandardItem* QStandardItem_Child2(const QStandardItem* self, int row, int column); QStandardItem* QStandardItem_TakeChild2(QStandardItem* self, int row, int column); -void QStandardItem_SortChildren2(QStandardItem* self, int column, uintptr_t order); +void QStandardItem_SortChildren2(QStandardItem* self, int column, int order); void QStandardItem_Delete(QStandardItem* self); QStandardItemModel* QStandardItemModel_new(); @@ -154,8 +154,8 @@ QModelIndex* QStandardItemModel_Sibling(const QStandardItemModel* self, int row, QVariant* QStandardItemModel_Data(const QStandardItemModel* self, QModelIndex* index); bool QStandardItemModel_SetData(QStandardItemModel* self, QModelIndex* index, QVariant* value); bool QStandardItemModel_ClearItemData(QStandardItemModel* self, QModelIndex* index); -QVariant* QStandardItemModel_HeaderData(const QStandardItemModel* self, int section, uintptr_t orientation); -bool QStandardItemModel_SetHeaderData(QStandardItemModel* self, int section, uintptr_t orientation, QVariant* value); +QVariant* QStandardItemModel_HeaderData(const QStandardItemModel* self, int section, int orientation); +bool QStandardItemModel_SetHeaderData(QStandardItemModel* self, int section, int orientation, QVariant* value); bool QStandardItemModel_InsertRows(QStandardItemModel* self, int row, int count); bool QStandardItemModel_InsertColumns(QStandardItemModel* self, int column, int count); bool QStandardItemModel_RemoveRows(QStandardItemModel* self, int row, int count); @@ -198,7 +198,7 @@ int QStandardItemModel_SortRole(const QStandardItemModel* self); void QStandardItemModel_SetSortRole(QStandardItemModel* self, int role); struct miqt_array* QStandardItemModel_MimeTypes(const QStandardItemModel* self); QMimeData* QStandardItemModel_MimeData(const QStandardItemModel* self, struct miqt_array* /* of QModelIndex* */ indexes); -bool QStandardItemModel_DropMimeData(QStandardItemModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent); +bool QStandardItemModel_DropMimeData(QStandardItemModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent); void QStandardItemModel_ItemChanged(QStandardItemModel* self, QStandardItem* item); void QStandardItemModel_connect_ItemChanged(QStandardItemModel* self, void* slot); struct miqt_string* QStandardItemModel_Tr2(const char* s, const char* c); @@ -211,13 +211,13 @@ int QStandardItemModel_ColumnCount1(const QStandardItemModel* self, QModelIndex* bool QStandardItemModel_HasChildren1(const QStandardItemModel* self, QModelIndex* parent); QVariant* QStandardItemModel_Data2(const QStandardItemModel* self, QModelIndex* index, int role); bool QStandardItemModel_SetData3(QStandardItemModel* self, QModelIndex* index, QVariant* value, int role); -QVariant* QStandardItemModel_HeaderData3(const QStandardItemModel* self, int section, uintptr_t orientation, int role); -bool QStandardItemModel_SetHeaderData4(QStandardItemModel* self, int section, uintptr_t orientation, QVariant* value, int role); +QVariant* QStandardItemModel_HeaderData3(const QStandardItemModel* self, int section, int orientation, int role); +bool QStandardItemModel_SetHeaderData4(QStandardItemModel* self, int section, int orientation, QVariant* value, int role); bool QStandardItemModel_InsertRows3(QStandardItemModel* self, int row, int count, QModelIndex* parent); bool QStandardItemModel_InsertColumns3(QStandardItemModel* self, int column, int count, QModelIndex* parent); bool QStandardItemModel_RemoveRows3(QStandardItemModel* self, int row, int count, QModelIndex* parent); bool QStandardItemModel_RemoveColumns3(QStandardItemModel* self, int column, int count, QModelIndex* parent); -void QStandardItemModel_Sort2(QStandardItemModel* self, int column, uintptr_t order); +void QStandardItemModel_Sort2(QStandardItemModel* self, int column, int order); QStandardItem* QStandardItemModel_Item2(const QStandardItemModel* self, int row, int column); bool QStandardItemModel_InsertRow22(QStandardItemModel* self, int row, QModelIndex* parent); bool QStandardItemModel_InsertColumn2(QStandardItemModel* self, int column, QModelIndex* parent); diff --git a/qt/gen_qstandardpaths.cpp b/qt/gen_qstandardpaths.cpp index 6170cd3..4812099 100644 --- a/qt/gen_qstandardpaths.cpp +++ b/qt/gen_qstandardpaths.cpp @@ -7,14 +7,14 @@ #include "gen_qstandardpaths.h" #include "_cgo_export.h" -struct miqt_string* QStandardPaths_WritableLocation(uintptr_t typeVal) { +struct miqt_string* QStandardPaths_WritableLocation(int typeVal) { QString _ret = QStandardPaths::writableLocation(static_cast(typeVal)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); } -struct miqt_array* QStandardPaths_StandardLocations(uintptr_t typeVal) { +struct miqt_array* QStandardPaths_StandardLocations(int typeVal) { QStringList _ret = QStandardPaths::standardLocations(static_cast(typeVal)); // Convert QList<> from C++ memory to manually-managed C memory struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); @@ -30,7 +30,7 @@ struct miqt_array* QStandardPaths_StandardLocations(uintptr_t typeVal) { return _out; } -struct miqt_string* QStandardPaths_Locate(uintptr_t typeVal, struct miqt_string* fileName) { +struct miqt_string* QStandardPaths_Locate(int typeVal, struct miqt_string* fileName) { QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); QString _ret = QStandardPaths::locate(static_cast(typeVal), fileName_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -38,7 +38,7 @@ struct miqt_string* QStandardPaths_Locate(uintptr_t typeVal, struct miqt_string* return miqt_strdup(_b.data(), _b.length()); } -struct miqt_array* QStandardPaths_LocateAll(uintptr_t typeVal, struct miqt_string* fileName) { +struct miqt_array* QStandardPaths_LocateAll(int typeVal, struct miqt_string* fileName) { QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); QStringList _ret = QStandardPaths::locateAll(static_cast(typeVal), fileName_QString); // Convert QList<> from C++ memory to manually-managed C memory @@ -55,7 +55,7 @@ struct miqt_array* QStandardPaths_LocateAll(uintptr_t typeVal, struct miqt_strin return _out; } -struct miqt_string* QStandardPaths_DisplayName(uintptr_t typeVal) { +struct miqt_string* QStandardPaths_DisplayName(int typeVal) { QString _ret = QStandardPaths::displayName(static_cast(typeVal)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -82,7 +82,7 @@ bool QStandardPaths_IsTestModeEnabled() { return QStandardPaths::isTestModeEnabled(); } -struct miqt_string* QStandardPaths_Locate3(uintptr_t typeVal, struct miqt_string* fileName, int options) { +struct miqt_string* QStandardPaths_Locate3(int typeVal, struct miqt_string* fileName, int options) { QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); QString _ret = QStandardPaths::locate(static_cast(typeVal), fileName_QString, static_cast(options)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -90,7 +90,7 @@ struct miqt_string* QStandardPaths_Locate3(uintptr_t typeVal, struct miqt_string return miqt_strdup(_b.data(), _b.length()); } -struct miqt_array* QStandardPaths_LocateAll3(uintptr_t typeVal, struct miqt_string* fileName, int options) { +struct miqt_array* QStandardPaths_LocateAll3(int typeVal, struct miqt_string* fileName, int options) { QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); QStringList _ret = QStandardPaths::locateAll(static_cast(typeVal), fileName_QString, static_cast(options)); // Convert QList<> from C++ memory to manually-managed C memory diff --git a/qt/gen_qstandardpaths.go b/qt/gen_qstandardpaths.go index b99edce..1f3b9e2 100644 --- a/qt/gen_qstandardpaths.go +++ b/qt/gen_qstandardpaths.go @@ -68,14 +68,14 @@ func newQStandardPaths_U(h unsafe.Pointer) *QStandardPaths { } func QStandardPaths_WritableLocation(typeVal QStandardPaths__StandardLocation) string { - var _ms *C.struct_miqt_string = C.QStandardPaths_WritableLocation((C.uintptr_t)(typeVal)) + var _ms *C.struct_miqt_string = C.QStandardPaths_WritableLocation((C.int)(typeVal)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } func QStandardPaths_StandardLocations(typeVal QStandardPaths__StandardLocation) []string { - var _ma *C.struct_miqt_array = C.QStandardPaths_StandardLocations((C.uintptr_t)(typeVal)) + var _ma *C.struct_miqt_array = C.QStandardPaths_StandardLocations((C.int)(typeVal)) _ret := make([]string, int(_ma.len)) _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -91,7 +91,7 @@ func QStandardPaths_StandardLocations(typeVal QStandardPaths__StandardLocation) func QStandardPaths_Locate(typeVal QStandardPaths__StandardLocation, fileName string) string { fileName_ms := miqt_strdupg(fileName) defer C.free(fileName_ms) - var _ms *C.struct_miqt_string = C.QStandardPaths_Locate((C.uintptr_t)(typeVal), (*C.struct_miqt_string)(fileName_ms)) + var _ms *C.struct_miqt_string = C.QStandardPaths_Locate((C.int)(typeVal), (*C.struct_miqt_string)(fileName_ms)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -100,7 +100,7 @@ func QStandardPaths_Locate(typeVal QStandardPaths__StandardLocation, fileName st func QStandardPaths_LocateAll(typeVal QStandardPaths__StandardLocation, fileName string) []string { fileName_ms := miqt_strdupg(fileName) defer C.free(fileName_ms) - var _ma *C.struct_miqt_array = C.QStandardPaths_LocateAll((C.uintptr_t)(typeVal), (*C.struct_miqt_string)(fileName_ms)) + var _ma *C.struct_miqt_array = C.QStandardPaths_LocateAll((C.int)(typeVal), (*C.struct_miqt_string)(fileName_ms)) _ret := make([]string, int(_ma.len)) _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -114,7 +114,7 @@ func QStandardPaths_LocateAll(typeVal QStandardPaths__StandardLocation, fileName } func QStandardPaths_DisplayName(typeVal QStandardPaths__StandardLocation) string { - var _ms *C.struct_miqt_string = C.QStandardPaths_DisplayName((C.uintptr_t)(typeVal)) + var _ms *C.struct_miqt_string = C.QStandardPaths_DisplayName((C.int)(typeVal)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -144,7 +144,7 @@ func QStandardPaths_IsTestModeEnabled() bool { func QStandardPaths_Locate3(typeVal QStandardPaths__StandardLocation, fileName string, options int) string { fileName_ms := miqt_strdupg(fileName) defer C.free(fileName_ms) - var _ms *C.struct_miqt_string = C.QStandardPaths_Locate3((C.uintptr_t)(typeVal), (*C.struct_miqt_string)(fileName_ms), (C.int)(options)) + var _ms *C.struct_miqt_string = C.QStandardPaths_Locate3((C.int)(typeVal), (*C.struct_miqt_string)(fileName_ms), options) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -153,7 +153,7 @@ func QStandardPaths_Locate3(typeVal QStandardPaths__StandardLocation, fileName s func QStandardPaths_LocateAll3(typeVal QStandardPaths__StandardLocation, fileName string, options int) []string { fileName_ms := miqt_strdupg(fileName) defer C.free(fileName_ms) - var _ma *C.struct_miqt_array = C.QStandardPaths_LocateAll3((C.uintptr_t)(typeVal), (*C.struct_miqt_string)(fileName_ms), (C.int)(options)) + var _ma *C.struct_miqt_array = C.QStandardPaths_LocateAll3((C.int)(typeVal), (*C.struct_miqt_string)(fileName_ms), options) _ret := make([]string, int(_ma.len)) _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { diff --git a/qt/gen_qstandardpaths.h b/qt/gen_qstandardpaths.h index 8dc0439..c5c5066 100644 --- a/qt/gen_qstandardpaths.h +++ b/qt/gen_qstandardpaths.h @@ -19,17 +19,17 @@ class QStandardPaths; typedef struct QStandardPaths QStandardPaths; #endif -struct miqt_string* QStandardPaths_WritableLocation(uintptr_t typeVal); -struct miqt_array* QStandardPaths_StandardLocations(uintptr_t typeVal); -struct miqt_string* QStandardPaths_Locate(uintptr_t typeVal, struct miqt_string* fileName); -struct miqt_array* QStandardPaths_LocateAll(uintptr_t typeVal, struct miqt_string* fileName); -struct miqt_string* QStandardPaths_DisplayName(uintptr_t typeVal); +struct miqt_string* QStandardPaths_WritableLocation(int typeVal); +struct miqt_array* QStandardPaths_StandardLocations(int typeVal); +struct miqt_string* QStandardPaths_Locate(int typeVal, struct miqt_string* fileName); +struct miqt_array* QStandardPaths_LocateAll(int typeVal, struct miqt_string* fileName); +struct miqt_string* QStandardPaths_DisplayName(int typeVal); struct miqt_string* QStandardPaths_FindExecutable(struct miqt_string* executableName); void QStandardPaths_EnableTestMode(bool testMode); void QStandardPaths_SetTestModeEnabled(bool testMode); bool QStandardPaths_IsTestModeEnabled(); -struct miqt_string* QStandardPaths_Locate3(uintptr_t typeVal, struct miqt_string* fileName, int options); -struct miqt_array* QStandardPaths_LocateAll3(uintptr_t typeVal, struct miqt_string* fileName, int options); +struct miqt_string* QStandardPaths_Locate3(int typeVal, struct miqt_string* fileName, int options); +struct miqt_array* QStandardPaths_LocateAll3(int typeVal, struct miqt_string* fileName, int options); struct miqt_string* QStandardPaths_FindExecutable2(struct miqt_string* executableName, struct miqt_array* /* of struct miqt_string* */ paths); #ifdef __cplusplus diff --git a/qt/gen_qstate.cpp b/qt/gen_qstate.cpp index c634229..a26ac72 100644 --- a/qt/gen_qstate.cpp +++ b/qt/gen_qstate.cpp @@ -17,7 +17,7 @@ QState* QState_new() { return new QState(); } -QState* QState_new2(uintptr_t childMode) { +QState* QState_new2(int childMode) { return new QState(static_cast(childMode)); } @@ -25,7 +25,7 @@ QState* QState_new3(QState* parent) { return new QState(parent); } -QState* QState_new4(uintptr_t childMode, QState* parent) { +QState* QState_new4(int childMode, QState* parent) { return new QState(static_cast(childMode), parent); } @@ -72,7 +72,7 @@ void QState_RemoveTransition(QState* self, QAbstractTransition* transition) { } struct miqt_array* QState_Transitions(const QState* self) { - QList _ret = self->transitions(); + QList _ret = self->transitions(); // Convert QList<> from C++ memory to manually-managed C memory QAbstractTransition** _arr = static_cast(malloc(sizeof(QAbstractTransition*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -92,12 +92,12 @@ void QState_SetInitialState(QState* self, QAbstractState* state) { self->setInitialState(state); } -uintptr_t QState_ChildMode(const QState* self) { +int QState_ChildMode(const QState* self) { QState::ChildMode _ret = self->childMode(); - return static_cast(_ret); + return static_cast(_ret); } -void QState_SetChildMode(QState* self, uintptr_t mode) { +void QState_SetChildMode(QState* self, int mode) { self->setChildMode(static_cast(mode)); } diff --git a/qt/gen_qstate.go b/qt/gen_qstate.go index 7a141e4..80da6d8 100644 --- a/qt/gen_qstate.go +++ b/qt/gen_qstate.go @@ -58,7 +58,7 @@ func NewQState() *QState { // NewQState2 constructs a new QState object. func NewQState2(childMode QState__ChildMode) *QState { - ret := C.QState_new2((C.uintptr_t)(childMode)) + ret := C.QState_new2((C.int)(childMode)) return newQState(ret) } @@ -70,7 +70,7 @@ func NewQState3(parent *QState) *QState { // NewQState4 constructs a new QState object. func NewQState4(childMode QState__ChildMode, parent *QState) *QState { - ret := C.QState_new4((C.uintptr_t)(childMode), parent.cPointer()) + ret := C.QState_new4((C.int)(childMode), parent.cPointer()) return newQState(ret) } @@ -146,7 +146,7 @@ func (this *QState) ChildMode() QState__ChildMode { } func (this *QState) SetChildMode(mode QState__ChildMode) { - C.QState_SetChildMode(this.h, (C.uintptr_t)(mode)) + C.QState_SetChildMode(this.h, (C.int)(mode)) } func (this *QState) AssignProperty(object *QObject, name string, value *QVariant) { diff --git a/qt/gen_qstate.h b/qt/gen_qstate.h index 9cf7051..ebf46b1 100644 --- a/qt/gen_qstate.h +++ b/qt/gen_qstate.h @@ -32,9 +32,9 @@ typedef struct QVariant QVariant; #endif QState* QState_new(); -QState* QState_new2(uintptr_t childMode); +QState* QState_new2(int childMode); QState* QState_new3(QState* parent); -QState* QState_new4(uintptr_t childMode, QState* parent); +QState* QState_new4(int childMode, QState* parent); QMetaObject* QState_MetaObject(const QState* self); struct miqt_string* QState_Tr(const char* s); struct miqt_string* QState_TrUtf8(const char* s); @@ -47,8 +47,8 @@ void QState_RemoveTransition(QState* self, QAbstractTransition* transition); struct miqt_array* QState_Transitions(const QState* self); QAbstractState* QState_InitialState(const QState* self); void QState_SetInitialState(QState* self, QAbstractState* state); -uintptr_t QState_ChildMode(const QState* self); -void QState_SetChildMode(QState* self, uintptr_t mode); +int QState_ChildMode(const QState* self); +void QState_SetChildMode(QState* self, int mode); void QState_AssignProperty(QState* self, QObject* object, const char* name, QVariant* value); struct miqt_string* QState_Tr2(const char* s, const char* c); struct miqt_string* QState_Tr3(const char* s, const char* c, int n); diff --git a/qt/gen_qstatemachine.cpp b/qt/gen_qstatemachine.cpp index c97a722..d221652 100644 --- a/qt/gen_qstatemachine.cpp +++ b/qt/gen_qstatemachine.cpp @@ -18,7 +18,7 @@ QStateMachine* QStateMachine_new() { return new QStateMachine(); } -QStateMachine* QStateMachine_new2(uintptr_t childMode) { +QStateMachine* QStateMachine_new2(int childMode) { return new QStateMachine(static_cast(childMode)); } @@ -26,7 +26,7 @@ QStateMachine* QStateMachine_new3(QObject* parent) { return new QStateMachine(parent); } -QStateMachine* QStateMachine_new4(uintptr_t childMode, QObject* parent) { +QStateMachine* QStateMachine_new4(int childMode, QObject* parent) { return new QStateMachine(static_cast(childMode), parent); } @@ -56,9 +56,9 @@ void QStateMachine_RemoveState(QStateMachine* self, QAbstractState* state) { self->removeState(state); } -uintptr_t QStateMachine_Error(const QStateMachine* self) { +int QStateMachine_Error(const QStateMachine* self) { QStateMachine::Error _ret = self->error(); - return static_cast(_ret); + return static_cast(_ret); } struct miqt_string* QStateMachine_ErrorString(const QStateMachine* self) { @@ -89,7 +89,7 @@ void QStateMachine_AddDefaultAnimation(QStateMachine* self, QAbstractAnimation* } struct miqt_array* QStateMachine_DefaultAnimations(const QStateMachine* self) { - QList _ret = self->defaultAnimations(); + QList _ret = self->defaultAnimations(); // Convert QList<> from C++ memory to manually-managed C memory QAbstractAnimation** _arr = static_cast(malloc(sizeof(QAbstractAnimation*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -105,12 +105,12 @@ void QStateMachine_RemoveDefaultAnimation(QStateMachine* self, QAbstractAnimatio self->removeDefaultAnimation(animation); } -uintptr_t QStateMachine_GlobalRestorePolicy(const QStateMachine* self) { +int QStateMachine_GlobalRestorePolicy(const QStateMachine* self) { QState::RestorePolicy _ret = self->globalRestorePolicy(); - return static_cast(_ret); + return static_cast(_ret); } -void QStateMachine_SetGlobalRestorePolicy(QStateMachine* self, uintptr_t restorePolicy) { +void QStateMachine_SetGlobalRestorePolicy(QStateMachine* self, int restorePolicy) { self->setGlobalRestorePolicy(static_cast(restorePolicy)); } @@ -195,7 +195,7 @@ struct miqt_string* QStateMachine_TrUtf83(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -void QStateMachine_PostEvent2(QStateMachine* self, QEvent* event, uintptr_t priority) { +void QStateMachine_PostEvent2(QStateMachine* self, QEvent* event, int priority) { self->postEvent(event, static_cast(priority)); } diff --git a/qt/gen_qstatemachine.go b/qt/gen_qstatemachine.go index 016eaae..5feb7bc 100644 --- a/qt/gen_qstatemachine.go +++ b/qt/gen_qstatemachine.go @@ -62,7 +62,7 @@ func NewQStateMachine() *QStateMachine { // NewQStateMachine2 constructs a new QStateMachine object. func NewQStateMachine2(childMode QState__ChildMode) *QStateMachine { - ret := C.QStateMachine_new2((C.uintptr_t)(childMode)) + ret := C.QStateMachine_new2((C.int)(childMode)) return newQStateMachine(ret) } @@ -74,7 +74,7 @@ func NewQStateMachine3(parent *QObject) *QStateMachine { // NewQStateMachine4 constructs a new QStateMachine object. func NewQStateMachine4(childMode QState__ChildMode, parent *QObject) *QStateMachine { - ret := C.QStateMachine_new4((C.uintptr_t)(childMode), parent.cPointer()) + ret := C.QStateMachine_new4((C.int)(childMode), parent.cPointer()) return newQStateMachine(ret) } @@ -159,7 +159,7 @@ func (this *QStateMachine) GlobalRestorePolicy() QState__RestorePolicy { } func (this *QStateMachine) SetGlobalRestorePolicy(restorePolicy QState__RestorePolicy) { - C.QStateMachine_SetGlobalRestorePolicy(this.h, (C.uintptr_t)(restorePolicy)) + C.QStateMachine_SetGlobalRestorePolicy(this.h, (C.int)(restorePolicy)) } func (this *QStateMachine) PostEvent(event *QEvent) { @@ -267,7 +267,7 @@ func QStateMachine_TrUtf83(s string, c string, n int) string { } func (this *QStateMachine) PostEvent2(event *QEvent, priority QStateMachine__EventPriority) { - C.QStateMachine_PostEvent2(this.h, event.cPointer(), (C.uintptr_t)(priority)) + C.QStateMachine_PostEvent2(this.h, event.cPointer(), (C.int)(priority)) } // Delete this object from C++ memory. diff --git a/qt/gen_qstatemachine.h b/qt/gen_qstatemachine.h index e9f73e3..e9357d1 100644 --- a/qt/gen_qstatemachine.h +++ b/qt/gen_qstatemachine.h @@ -42,15 +42,15 @@ typedef struct QStateMachine__WrappedEvent QStateMachine__WrappedEvent; #endif QStateMachine* QStateMachine_new(); -QStateMachine* QStateMachine_new2(uintptr_t childMode); +QStateMachine* QStateMachine_new2(int childMode); QStateMachine* QStateMachine_new3(QObject* parent); -QStateMachine* QStateMachine_new4(uintptr_t childMode, QObject* parent); +QStateMachine* QStateMachine_new4(int childMode, QObject* parent); QMetaObject* QStateMachine_MetaObject(const QStateMachine* self); struct miqt_string* QStateMachine_Tr(const char* s); struct miqt_string* QStateMachine_TrUtf8(const char* s); void QStateMachine_AddState(QStateMachine* self, QAbstractState* state); void QStateMachine_RemoveState(QStateMachine* self, QAbstractState* state); -uintptr_t QStateMachine_Error(const QStateMachine* self); +int QStateMachine_Error(const QStateMachine* self); struct miqt_string* QStateMachine_ErrorString(const QStateMachine* self); void QStateMachine_ClearError(QStateMachine* self); bool QStateMachine_IsRunning(const QStateMachine* self); @@ -59,8 +59,8 @@ void QStateMachine_SetAnimated(QStateMachine* self, bool enabled); void QStateMachine_AddDefaultAnimation(QStateMachine* self, QAbstractAnimation* animation); struct miqt_array* QStateMachine_DefaultAnimations(const QStateMachine* self); void QStateMachine_RemoveDefaultAnimation(QStateMachine* self, QAbstractAnimation* animation); -uintptr_t QStateMachine_GlobalRestorePolicy(const QStateMachine* self); -void QStateMachine_SetGlobalRestorePolicy(QStateMachine* self, uintptr_t restorePolicy); +int QStateMachine_GlobalRestorePolicy(const QStateMachine* self); +void QStateMachine_SetGlobalRestorePolicy(QStateMachine* self, int restorePolicy); void QStateMachine_PostEvent(QStateMachine* self, QEvent* event); int QStateMachine_PostDelayedEvent(QStateMachine* self, QEvent* event, int delay); bool QStateMachine_CancelDelayedEvent(QStateMachine* self, int id); @@ -75,7 +75,7 @@ struct miqt_string* QStateMachine_Tr2(const char* s, const char* c); struct miqt_string* QStateMachine_Tr3(const char* s, const char* c, int n); struct miqt_string* QStateMachine_TrUtf82(const char* s, const char* c); struct miqt_string* QStateMachine_TrUtf83(const char* s, const char* c, int n); -void QStateMachine_PostEvent2(QStateMachine* self, QEvent* event, uintptr_t priority); +void QStateMachine_PostEvent2(QStateMachine* self, QEvent* event, int priority); void QStateMachine_Delete(QStateMachine* self); QStateMachine__SignalEvent* QStateMachine__SignalEvent_new(QStateMachine__SignalEvent* param1); diff --git a/qt/gen_qstatictext.cpp b/qt/gen_qstatictext.cpp index eed8acc..610cea2 100644 --- a/qt/gen_qstatictext.cpp +++ b/qt/gen_qstatictext.cpp @@ -43,13 +43,13 @@ struct miqt_string* QStaticText_Text(const QStaticText* self) { return miqt_strdup(_b.data(), _b.length()); } -void QStaticText_SetTextFormat(QStaticText* self, uintptr_t textFormat) { +void QStaticText_SetTextFormat(QStaticText* self, int textFormat) { self->setTextFormat(static_cast(textFormat)); } -uintptr_t QStaticText_TextFormat(const QStaticText* self) { +int QStaticText_TextFormat(const QStaticText* self) { Qt::TextFormat _ret = self->textFormat(); - return static_cast(_ret); + return static_cast(_ret); } void QStaticText_SetTextWidth(QStaticText* self, double textWidth) { @@ -57,7 +57,8 @@ void QStaticText_SetTextWidth(QStaticText* self, double textWidth) { } double QStaticText_TextWidth(const QStaticText* self) { - return self->textWidth(); + qreal _ret = self->textWidth(); + return static_cast(_ret); } void QStaticText_SetTextOption(QStaticText* self, QTextOption* textOption) { @@ -76,13 +77,13 @@ void QStaticText_Prepare(QStaticText* self) { self->prepare(); } -void QStaticText_SetPerformanceHint(QStaticText* self, uintptr_t performanceHint) { +void QStaticText_SetPerformanceHint(QStaticText* self, int performanceHint) { self->setPerformanceHint(static_cast(performanceHint)); } -uintptr_t QStaticText_PerformanceHint(const QStaticText* self) { +int QStaticText_PerformanceHint(const QStaticText* self) { QStaticText::PerformanceHint _ret = self->performanceHint(); - return static_cast(_ret); + return static_cast(_ret); } bool QStaticText_OperatorEqual(const QStaticText* self, QStaticText* param1) { diff --git a/qt/gen_qstatictext.go b/qt/gen_qstatictext.go index 30d1b46..7dc82c0 100644 --- a/qt/gen_qstatictext.go +++ b/qt/gen_qstatictext.go @@ -84,7 +84,7 @@ func (this *QStaticText) Text() string { } func (this *QStaticText) SetTextFormat(textFormat TextFormat) { - C.QStaticText_SetTextFormat(this.h, (C.uintptr_t)(textFormat)) + C.QStaticText_SetTextFormat(this.h, (C.int)(textFormat)) } func (this *QStaticText) TextFormat() TextFormat { @@ -122,7 +122,7 @@ func (this *QStaticText) Prepare() { } func (this *QStaticText) SetPerformanceHint(performanceHint QStaticText__PerformanceHint) { - C.QStaticText_SetPerformanceHint(this.h, (C.uintptr_t)(performanceHint)) + C.QStaticText_SetPerformanceHint(this.h, (C.int)(performanceHint)) } func (this *QStaticText) PerformanceHint() QStaticText__PerformanceHint { diff --git a/qt/gen_qstatictext.h b/qt/gen_qstatictext.h index 2bea8a5..5c374ff 100644 --- a/qt/gen_qstatictext.h +++ b/qt/gen_qstatictext.h @@ -34,16 +34,16 @@ void QStaticText_OperatorAssign(QStaticText* self, QStaticText* param1); void QStaticText_Swap(QStaticText* self, QStaticText* other); void QStaticText_SetText(QStaticText* self, struct miqt_string* text); struct miqt_string* QStaticText_Text(const QStaticText* self); -void QStaticText_SetTextFormat(QStaticText* self, uintptr_t textFormat); -uintptr_t QStaticText_TextFormat(const QStaticText* self); +void QStaticText_SetTextFormat(QStaticText* self, int textFormat); +int QStaticText_TextFormat(const QStaticText* self); void QStaticText_SetTextWidth(QStaticText* self, double textWidth); double QStaticText_TextWidth(const QStaticText* self); void QStaticText_SetTextOption(QStaticText* self, QTextOption* textOption); QTextOption* QStaticText_TextOption(const QStaticText* self); QSizeF* QStaticText_Size(const QStaticText* self); void QStaticText_Prepare(QStaticText* self); -void QStaticText_SetPerformanceHint(QStaticText* self, uintptr_t performanceHint); -uintptr_t QStaticText_PerformanceHint(const QStaticText* self); +void QStaticText_SetPerformanceHint(QStaticText* self, int performanceHint); +int QStaticText_PerformanceHint(const QStaticText* self); bool QStaticText_OperatorEqual(const QStaticText* self, QStaticText* param1); bool QStaticText_OperatorNotEqual(const QStaticText* self, QStaticText* param1); void QStaticText_Prepare1(QStaticText* self, QTransform* matrix); diff --git a/qt/gen_qstorageinfo.cpp b/qt/gen_qstorageinfo.cpp index 2959ecf..bb060e7 100644 --- a/qt/gen_qstorageinfo.cpp +++ b/qt/gen_qstorageinfo.cpp @@ -73,15 +73,18 @@ struct miqt_string* QStorageInfo_DisplayName(const QStorageInfo* self) { } long long QStorageInfo_BytesTotal(const QStorageInfo* self) { - return self->bytesTotal(); + qint64 _ret = self->bytesTotal(); + return static_cast(_ret); } long long QStorageInfo_BytesFree(const QStorageInfo* self) { - return self->bytesFree(); + qint64 _ret = self->bytesFree(); + return static_cast(_ret); } long long QStorageInfo_BytesAvailable(const QStorageInfo* self) { - return self->bytesAvailable(); + qint64 _ret = self->bytesAvailable(); + return static_cast(_ret); } int QStorageInfo_BlockSize(const QStorageInfo* self) { diff --git a/qt/gen_qstringlistmodel.cpp b/qt/gen_qstringlistmodel.cpp index 5b24907..7b08685 100644 --- a/qt/gen_qstringlistmodel.cpp +++ b/qt/gen_qstringlistmodel.cpp @@ -176,7 +176,7 @@ bool QStringListModel_RemoveRows3(QStringListModel* self, int row, int count, QM return self->removeRows(static_cast(row), static_cast(count), *parent); } -void QStringListModel_Sort2(QStringListModel* self, int column, uintptr_t order) { +void QStringListModel_Sort2(QStringListModel* self, int column, int order) { self->sort(static_cast(column), static_cast(order)); } diff --git a/qt/gen_qstringlistmodel.go b/qt/gen_qstringlistmodel.go index bd491f3..772402c 100644 --- a/qt/gen_qstringlistmodel.go +++ b/qt/gen_qstringlistmodel.go @@ -244,7 +244,7 @@ func (this *QStringListModel) RemoveRows3(row int, count int, parent *QModelInde } func (this *QStringListModel) Sort2(column int, order SortOrder) { - C.QStringListModel_Sort2(this.h, (C.int)(column), (C.uintptr_t)(order)) + C.QStringListModel_Sort2(this.h, (C.int)(column), (C.int)(order)) } // Delete this object from C++ memory. diff --git a/qt/gen_qstringlistmodel.h b/qt/gen_qstringlistmodel.h index ce84cdd..e2f24b6 100644 --- a/qt/gen_qstringlistmodel.h +++ b/qt/gen_qstringlistmodel.h @@ -55,7 +55,7 @@ QVariant* QStringListModel_Data2(const QStringListModel* self, QModelIndex* inde bool QStringListModel_SetData3(QStringListModel* self, QModelIndex* index, QVariant* value, int role); bool QStringListModel_InsertRows3(QStringListModel* self, int row, int count, QModelIndex* parent); bool QStringListModel_RemoveRows3(QStringListModel* self, int row, int count, QModelIndex* parent); -void QStringListModel_Sort2(QStringListModel* self, int column, uintptr_t order); +void QStringListModel_Sort2(QStringListModel* self, int column, int order); void QStringListModel_Delete(QStringListModel* self); #ifdef __cplusplus diff --git a/qt/gen_qstringmatcher.cpp b/qt/gen_qstringmatcher.cpp index f976861..8f54245 100644 --- a/qt/gen_qstringmatcher.cpp +++ b/qt/gen_qstringmatcher.cpp @@ -24,12 +24,12 @@ QStringMatcher* QStringMatcher_new4(QStringMatcher* other) { return new QStringMatcher(*other); } -QStringMatcher* QStringMatcher_new5(struct miqt_string* pattern, uintptr_t cs) { +QStringMatcher* QStringMatcher_new5(struct miqt_string* pattern, int cs) { QString pattern_QString = QString::fromUtf8(&pattern->data, pattern->len); return new QStringMatcher(pattern_QString, static_cast(cs)); } -QStringMatcher* QStringMatcher_new6(QChar* uc, int lenVal, uintptr_t cs) { +QStringMatcher* QStringMatcher_new6(QChar* uc, int lenVal, int cs) { return new QStringMatcher(uc, static_cast(lenVal), static_cast(cs)); } @@ -42,7 +42,7 @@ void QStringMatcher_SetPattern(QStringMatcher* self, struct miqt_string* pattern self->setPattern(pattern_QString); } -void QStringMatcher_SetCaseSensitivity(QStringMatcher* self, uintptr_t cs) { +void QStringMatcher_SetCaseSensitivity(QStringMatcher* self, int cs) { self->setCaseSensitivity(static_cast(cs)); } @@ -62,9 +62,9 @@ struct miqt_string* QStringMatcher_Pattern(const QStringMatcher* self) { return miqt_strdup(_b.data(), _b.length()); } -uintptr_t QStringMatcher_CaseSensitivity(const QStringMatcher* self) { +int QStringMatcher_CaseSensitivity(const QStringMatcher* self) { Qt::CaseSensitivity _ret = self->caseSensitivity(); - return static_cast(_ret); + return static_cast(_ret); } int QStringMatcher_IndexIn22(const QStringMatcher* self, struct miqt_string* str, int from) { diff --git a/qt/gen_qstringmatcher.go b/qt/gen_qstringmatcher.go index 2b6a1e5..8fd8634 100644 --- a/qt/gen_qstringmatcher.go +++ b/qt/gen_qstringmatcher.go @@ -65,13 +65,13 @@ func NewQStringMatcher4(other *QStringMatcher) *QStringMatcher { func NewQStringMatcher5(pattern string, cs CaseSensitivity) *QStringMatcher { pattern_ms := miqt_strdupg(pattern) defer C.free(pattern_ms) - ret := C.QStringMatcher_new5((*C.struct_miqt_string)(pattern_ms), (C.uintptr_t)(cs)) + ret := C.QStringMatcher_new5((*C.struct_miqt_string)(pattern_ms), (C.int)(cs)) return newQStringMatcher(ret) } // NewQStringMatcher6 constructs a new QStringMatcher object. func NewQStringMatcher6(uc *QChar, lenVal int, cs CaseSensitivity) *QStringMatcher { - ret := C.QStringMatcher_new6(uc.cPointer(), (C.int)(lenVal), (C.uintptr_t)(cs)) + ret := C.QStringMatcher_new6(uc.cPointer(), (C.int)(lenVal), (C.int)(cs)) return newQStringMatcher(ret) } @@ -86,7 +86,7 @@ func (this *QStringMatcher) SetPattern(pattern string) { } func (this *QStringMatcher) SetCaseSensitivity(cs CaseSensitivity) { - C.QStringMatcher_SetCaseSensitivity(this.h, (C.uintptr_t)(cs)) + C.QStringMatcher_SetCaseSensitivity(this.h, (C.int)(cs)) } func (this *QStringMatcher) IndexIn(str string) int { diff --git a/qt/gen_qstringmatcher.h b/qt/gen_qstringmatcher.h index 8078a3b..1325f8b 100644 --- a/qt/gen_qstringmatcher.h +++ b/qt/gen_qstringmatcher.h @@ -25,15 +25,15 @@ QStringMatcher* QStringMatcher_new(); QStringMatcher* QStringMatcher_new2(struct miqt_string* pattern); QStringMatcher* QStringMatcher_new3(QChar* uc, int lenVal); QStringMatcher* QStringMatcher_new4(QStringMatcher* other); -QStringMatcher* QStringMatcher_new5(struct miqt_string* pattern, uintptr_t cs); -QStringMatcher* QStringMatcher_new6(QChar* uc, int lenVal, uintptr_t cs); +QStringMatcher* QStringMatcher_new5(struct miqt_string* pattern, int cs); +QStringMatcher* QStringMatcher_new6(QChar* uc, int lenVal, int cs); void QStringMatcher_OperatorAssign(QStringMatcher* self, QStringMatcher* other); void QStringMatcher_SetPattern(QStringMatcher* self, struct miqt_string* pattern); -void QStringMatcher_SetCaseSensitivity(QStringMatcher* self, uintptr_t cs); +void QStringMatcher_SetCaseSensitivity(QStringMatcher* self, int cs); int QStringMatcher_IndexIn(const QStringMatcher* self, struct miqt_string* str); int QStringMatcher_IndexIn2(const QStringMatcher* self, QChar* str, int length); struct miqt_string* QStringMatcher_Pattern(const QStringMatcher* self); -uintptr_t QStringMatcher_CaseSensitivity(const QStringMatcher* self); +int QStringMatcher_CaseSensitivity(const QStringMatcher* self); int QStringMatcher_IndexIn22(const QStringMatcher* self, struct miqt_string* str, int from); int QStringMatcher_IndexIn3(const QStringMatcher* self, QChar* str, int length, int from); void QStringMatcher_Delete(QStringMatcher* self); diff --git a/qt/gen_qstringview.cpp b/qt/gen_qstringview.cpp index 69b8692..2d9ddeb 100644 --- a/qt/gen_qstringview.cpp +++ b/qt/gen_qstringview.cpp @@ -24,6 +24,11 @@ size_t QStringView_Size(const QStringView* self) { return self->size(); } +QChar* QStringView_Data(const QStringView* self) { + const QStringView::const_pointer* _ret = self->data(); + return static_cast(_ret); +} + QChar* QStringView_OperatorSubscript(const QStringView* self, size_t n) { return new QChar(self->operator[](static_cast(n))); } @@ -41,7 +46,7 @@ QByteArray* QStringView_ToLocal8Bit(const QStringView* self) { } struct miqt_array* QStringView_ToUcs4(const QStringView* self) { - QVector _ret = self->toUcs4(); + QVector _ret = self->toUcs4(); // Convert QList<> from C++ memory to manually-managed C memory unsigned int* _arr = static_cast(malloc(sizeof(unsigned int) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -69,7 +74,7 @@ int QStringView_CompareWithQChar(const QStringView* self, QChar* c) { return self->compare(*c); } -int QStringView_Compare2(const QStringView* self, QChar* c, uintptr_t cs) { +int QStringView_Compare2(const QStringView* self, QChar* c, int cs) { return self->compare(*c, static_cast(cs)); } @@ -77,7 +82,7 @@ bool QStringView_StartsWithWithQChar(const QStringView* self, QChar* c) { return self->startsWith(*c); } -bool QStringView_StartsWith2(const QStringView* self, QChar* c, uintptr_t cs) { +bool QStringView_StartsWith2(const QStringView* self, QChar* c, int cs) { return self->startsWith(*c, static_cast(cs)); } @@ -85,7 +90,7 @@ bool QStringView_EndsWithWithQChar(const QStringView* self, QChar* c) { return self->endsWith(*c); } -bool QStringView_EndsWith2(const QStringView* self, QChar* c, uintptr_t cs) { +bool QStringView_EndsWith2(const QStringView* self, QChar* c, int cs) { return self->endsWith(*c, static_cast(cs)); } @@ -118,7 +123,8 @@ int16_t QStringView_ToShort(const QStringView* self) { } uint16_t QStringView_ToUShort(const QStringView* self) { - return self->toUShort(); + ushort _ret = self->toUShort(); + return static_cast(_ret); } int QStringView_ToInt(const QStringView* self) { @@ -126,7 +132,8 @@ int QStringView_ToInt(const QStringView* self) { } unsigned int QStringView_ToUInt(const QStringView* self) { - return self->toUInt(); + uint _ret = self->toUInt(); + return static_cast(_ret); } long QStringView_ToLong(const QStringView* self) { @@ -134,15 +141,18 @@ long QStringView_ToLong(const QStringView* self) { } unsigned long QStringView_ToULong(const QStringView* self) { - return self->toULong(); + ulong _ret = self->toULong(); + return static_cast(_ret); } -int64_t QStringView_ToLongLong(const QStringView* self) { - return self->toLongLong(); +long long QStringView_ToLongLong(const QStringView* self) { + qlonglong _ret = self->toLongLong(); + return static_cast(_ret); } -uint64_t QStringView_ToULongLong(const QStringView* self) { - return self->toULongLong(); +unsigned long long QStringView_ToULongLong(const QStringView* self) { + qulonglong _ret = self->toULongLong(); + return static_cast(_ret); } float QStringView_ToFloat(const QStringView* self) { @@ -153,6 +163,26 @@ double QStringView_ToDouble(const QStringView* self) { return self->toDouble(); } +QChar* QStringView_Begin(const QStringView* self) { + const QStringView::const_iterator* _ret = self->begin(); + return static_cast(_ret); +} + +QChar* QStringView_End(const QStringView* self) { + const QStringView::const_iterator* _ret = self->end(); + return static_cast(_ret); +} + +QChar* QStringView_Cbegin(const QStringView* self) { + const QStringView::const_iterator* _ret = self->cbegin(); + return static_cast(_ret); +} + +QChar* QStringView_Cend(const QStringView* self) { + const QStringView::const_iterator* _ret = self->cend(); + return static_cast(_ret); +} + bool QStringView_Empty(const QStringView* self) { return self->empty(); } @@ -189,15 +219,15 @@ size_t QStringView_IndexOf2(const QStringView* self, QChar* c, size_t from) { return self->indexOf(*c, static_cast(from)); } -size_t QStringView_IndexOf3(const QStringView* self, QChar* c, size_t from, uintptr_t cs) { +size_t QStringView_IndexOf3(const QStringView* self, QChar* c, size_t from, int cs) { return self->indexOf(*c, static_cast(from), static_cast(cs)); } -bool QStringView_Contains2(const QStringView* self, QChar* c, uintptr_t cs) { +bool QStringView_Contains2(const QStringView* self, QChar* c, int cs) { return self->contains(*c, static_cast(cs)); } -size_t QStringView_Count2(const QStringView* self, QChar* c, uintptr_t cs) { +size_t QStringView_Count2(const QStringView* self, QChar* c, int cs) { return self->count(*c, static_cast(cs)); } @@ -205,7 +235,7 @@ size_t QStringView_LastIndexOf2(const QStringView* self, QChar* c, size_t from) return self->lastIndexOf(*c, static_cast(from)); } -size_t QStringView_LastIndexOf3(const QStringView* self, QChar* c, size_t from, uintptr_t cs) { +size_t QStringView_LastIndexOf3(const QStringView* self, QChar* c, size_t from, int cs) { return self->lastIndexOf(*c, static_cast(from), static_cast(cs)); } @@ -218,11 +248,13 @@ int16_t QStringView_ToShort2(const QStringView* self, bool* ok, int base) { } uint16_t QStringView_ToUShort1(const QStringView* self, bool* ok) { - return self->toUShort(ok); + ushort _ret = self->toUShort(ok); + return static_cast(_ret); } uint16_t QStringView_ToUShort2(const QStringView* self, bool* ok, int base) { - return self->toUShort(ok, static_cast(base)); + ushort _ret = self->toUShort(ok, static_cast(base)); + return static_cast(_ret); } int QStringView_ToInt1(const QStringView* self, bool* ok) { @@ -234,11 +266,13 @@ int QStringView_ToInt2(const QStringView* self, bool* ok, int base) { } unsigned int QStringView_ToUInt1(const QStringView* self, bool* ok) { - return self->toUInt(ok); + uint _ret = self->toUInt(ok); + return static_cast(_ret); } unsigned int QStringView_ToUInt2(const QStringView* self, bool* ok, int base) { - return self->toUInt(ok, static_cast(base)); + uint _ret = self->toUInt(ok, static_cast(base)); + return static_cast(_ret); } long QStringView_ToLong1(const QStringView* self, bool* ok) { @@ -250,27 +284,33 @@ long QStringView_ToLong2(const QStringView* self, bool* ok, int base) { } unsigned long QStringView_ToULong1(const QStringView* self, bool* ok) { - return self->toULong(ok); + ulong _ret = self->toULong(ok); + return static_cast(_ret); } unsigned long QStringView_ToULong2(const QStringView* self, bool* ok, int base) { - return self->toULong(ok, static_cast(base)); + ulong _ret = self->toULong(ok, static_cast(base)); + return static_cast(_ret); } -int64_t QStringView_ToLongLong1(const QStringView* self, bool* ok) { - return self->toLongLong(ok); +long long QStringView_ToLongLong1(const QStringView* self, bool* ok) { + qlonglong _ret = self->toLongLong(ok); + return static_cast(_ret); } -int64_t QStringView_ToLongLong2(const QStringView* self, bool* ok, int base) { - return self->toLongLong(ok, static_cast(base)); +long long QStringView_ToLongLong2(const QStringView* self, bool* ok, int base) { + qlonglong _ret = self->toLongLong(ok, static_cast(base)); + return static_cast(_ret); } -uint64_t QStringView_ToULongLong1(const QStringView* self, bool* ok) { - return self->toULongLong(ok); +unsigned long long QStringView_ToULongLong1(const QStringView* self, bool* ok) { + qulonglong _ret = self->toULongLong(ok); + return static_cast(_ret); } -uint64_t QStringView_ToULongLong2(const QStringView* self, bool* ok, int base) { - return self->toULongLong(ok, static_cast(base)); +unsigned long long QStringView_ToULongLong2(const QStringView* self, bool* ok, int base) { + qulonglong _ret = self->toULongLong(ok, static_cast(base)); + return static_cast(_ret); } float QStringView_ToFloat1(const QStringView* self, bool* ok) { diff --git a/qt/gen_qstringview.go b/qt/gen_qstringview.go index f000e36..e60ea1d 100644 --- a/qt/gen_qstringview.go +++ b/qt/gen_qstringview.go @@ -52,6 +52,10 @@ func (this *QStringView) Size() uint64 { return (uint64)(C.QStringView_Size(this.h)) } +func (this *QStringView) Data() *QChar { + return newQChar_U(unsafe.Pointer(C.QStringView_Data(this.h))) +} + func (this *QStringView) OperatorSubscript(n uint64) *QChar { _ret := C.QStringView_OperatorSubscript(this.h, (C.size_t)(n)) _goptr := newQChar(_ret) @@ -111,7 +115,7 @@ func (this *QStringView) CompareWithQChar(c QChar) int { } func (this *QStringView) Compare2(c QChar, cs CaseSensitivity) int { - return (int)(C.QStringView_Compare2(this.h, c.cPointer(), (C.uintptr_t)(cs))) + return (int)(C.QStringView_Compare2(this.h, c.cPointer(), (C.int)(cs))) } func (this *QStringView) StartsWithWithQChar(c QChar) bool { @@ -119,7 +123,7 @@ func (this *QStringView) StartsWithWithQChar(c QChar) bool { } func (this *QStringView) StartsWith2(c QChar, cs CaseSensitivity) bool { - return (bool)(C.QStringView_StartsWith2(this.h, c.cPointer(), (C.uintptr_t)(cs))) + return (bool)(C.QStringView_StartsWith2(this.h, c.cPointer(), (C.int)(cs))) } func (this *QStringView) EndsWithWithQChar(c QChar) bool { @@ -127,7 +131,7 @@ func (this *QStringView) EndsWithWithQChar(c QChar) bool { } func (this *QStringView) EndsWith2(c QChar, cs CaseSensitivity) bool { - return (bool)(C.QStringView_EndsWith2(this.h, c.cPointer(), (C.uintptr_t)(cs))) + return (bool)(C.QStringView_EndsWith2(this.h, c.cPointer(), (C.int)(cs))) } func (this *QStringView) IndexOf(c QChar) uint64 { @@ -194,6 +198,22 @@ func (this *QStringView) ToDouble() float64 { return (float64)(C.QStringView_ToDouble(this.h)) } +func (this *QStringView) Begin() *QChar { + return newQChar_U(unsafe.Pointer(C.QStringView_Begin(this.h))) +} + +func (this *QStringView) End() *QChar { + return newQChar_U(unsafe.Pointer(C.QStringView_End(this.h))) +} + +func (this *QStringView) Cbegin() *QChar { + return newQChar_U(unsafe.Pointer(C.QStringView_Cbegin(this.h))) +} + +func (this *QStringView) Cend() *QChar { + return newQChar_U(unsafe.Pointer(C.QStringView_Cend(this.h))) +} + func (this *QStringView) Empty() bool { return (bool)(C.QStringView_Empty(this.h)) } @@ -243,15 +263,15 @@ func (this *QStringView) IndexOf2(c QChar, from uint64) uint64 { } func (this *QStringView) IndexOf3(c QChar, from uint64, cs CaseSensitivity) uint64 { - return (uint64)(C.QStringView_IndexOf3(this.h, c.cPointer(), (C.size_t)(from), (C.uintptr_t)(cs))) + return (uint64)(C.QStringView_IndexOf3(this.h, c.cPointer(), (C.size_t)(from), (C.int)(cs))) } func (this *QStringView) Contains2(c QChar, cs CaseSensitivity) bool { - return (bool)(C.QStringView_Contains2(this.h, c.cPointer(), (C.uintptr_t)(cs))) + return (bool)(C.QStringView_Contains2(this.h, c.cPointer(), (C.int)(cs))) } func (this *QStringView) Count2(c QChar, cs CaseSensitivity) uint64 { - return (uint64)(C.QStringView_Count2(this.h, c.cPointer(), (C.uintptr_t)(cs))) + return (uint64)(C.QStringView_Count2(this.h, c.cPointer(), (C.int)(cs))) } func (this *QStringView) LastIndexOf2(c QChar, from uint64) uint64 { @@ -259,7 +279,7 @@ func (this *QStringView) LastIndexOf2(c QChar, from uint64) uint64 { } func (this *QStringView) LastIndexOf3(c QChar, from uint64, cs CaseSensitivity) uint64 { - return (uint64)(C.QStringView_LastIndexOf3(this.h, c.cPointer(), (C.size_t)(from), (C.uintptr_t)(cs))) + return (uint64)(C.QStringView_LastIndexOf3(this.h, c.cPointer(), (C.size_t)(from), (C.int)(cs))) } func (this *QStringView) ToShort1(ok *bool) int16 { diff --git a/qt/gen_qstringview.h b/qt/gen_qstringview.h index 75866be..0afb452 100644 --- a/qt/gen_qstringview.h +++ b/qt/gen_qstringview.h @@ -26,6 +26,7 @@ typedef struct QStringView QStringView; QStringView* QStringView_new(); struct miqt_string* QStringView_ToString(const QStringView* self); size_t QStringView_Size(const QStringView* self); +QChar* QStringView_Data(const QStringView* self); QChar* QStringView_OperatorSubscript(const QStringView* self, size_t n); QByteArray* QStringView_ToLatin1(const QStringView* self); QByteArray* QStringView_ToUtf8(const QStringView* self); @@ -35,11 +36,11 @@ QChar* QStringView_At(const QStringView* self, size_t n); void QStringView_Truncate(QStringView* self, size_t n); void QStringView_Chop(QStringView* self, size_t n); int QStringView_CompareWithQChar(const QStringView* self, QChar* c); -int QStringView_Compare2(const QStringView* self, QChar* c, uintptr_t cs); +int QStringView_Compare2(const QStringView* self, QChar* c, int cs); bool QStringView_StartsWithWithQChar(const QStringView* self, QChar* c); -bool QStringView_StartsWith2(const QStringView* self, QChar* c, uintptr_t cs); +bool QStringView_StartsWith2(const QStringView* self, QChar* c, int cs); bool QStringView_EndsWithWithQChar(const QStringView* self, QChar* c); -bool QStringView_EndsWith2(const QStringView* self, QChar* c, uintptr_t cs); +bool QStringView_EndsWith2(const QStringView* self, QChar* c, int cs); size_t QStringView_IndexOf(const QStringView* self, QChar* c); bool QStringView_Contains(const QStringView* self, QChar* c); size_t QStringView_Count(const QStringView* self, QChar* c); @@ -52,10 +53,14 @@ int QStringView_ToInt(const QStringView* self); unsigned int QStringView_ToUInt(const QStringView* self); long QStringView_ToLong(const QStringView* self); unsigned long QStringView_ToULong(const QStringView* self); -int64_t QStringView_ToLongLong(const QStringView* self); -uint64_t QStringView_ToULongLong(const QStringView* self); +long long QStringView_ToLongLong(const QStringView* self); +unsigned long long QStringView_ToULongLong(const QStringView* self); float QStringView_ToFloat(const QStringView* self); double QStringView_ToDouble(const QStringView* self); +QChar* QStringView_Begin(const QStringView* self); +QChar* QStringView_End(const QStringView* self); +QChar* QStringView_Cbegin(const QStringView* self); +QChar* QStringView_Cend(const QStringView* self); bool QStringView_Empty(const QStringView* self); QChar* QStringView_Front(const QStringView* self); QChar* QStringView_Back(const QStringView* self); @@ -65,11 +70,11 @@ int QStringView_Length(const QStringView* self); QChar* QStringView_First(const QStringView* self); QChar* QStringView_Last(const QStringView* self); size_t QStringView_IndexOf2(const QStringView* self, QChar* c, size_t from); -size_t QStringView_IndexOf3(const QStringView* self, QChar* c, size_t from, uintptr_t cs); -bool QStringView_Contains2(const QStringView* self, QChar* c, uintptr_t cs); -size_t QStringView_Count2(const QStringView* self, QChar* c, uintptr_t cs); +size_t QStringView_IndexOf3(const QStringView* self, QChar* c, size_t from, int cs); +bool QStringView_Contains2(const QStringView* self, QChar* c, int cs); +size_t QStringView_Count2(const QStringView* self, QChar* c, int cs); size_t QStringView_LastIndexOf2(const QStringView* self, QChar* c, size_t from); -size_t QStringView_LastIndexOf3(const QStringView* self, QChar* c, size_t from, uintptr_t cs); +size_t QStringView_LastIndexOf3(const QStringView* self, QChar* c, size_t from, int cs); int16_t QStringView_ToShort1(const QStringView* self, bool* ok); int16_t QStringView_ToShort2(const QStringView* self, bool* ok, int base); uint16_t QStringView_ToUShort1(const QStringView* self, bool* ok); @@ -82,10 +87,10 @@ long QStringView_ToLong1(const QStringView* self, bool* ok); long QStringView_ToLong2(const QStringView* self, bool* ok, int base); unsigned long QStringView_ToULong1(const QStringView* self, bool* ok); unsigned long QStringView_ToULong2(const QStringView* self, bool* ok, int base); -int64_t QStringView_ToLongLong1(const QStringView* self, bool* ok); -int64_t QStringView_ToLongLong2(const QStringView* self, bool* ok, int base); -uint64_t QStringView_ToULongLong1(const QStringView* self, bool* ok); -uint64_t QStringView_ToULongLong2(const QStringView* self, bool* ok, int base); +long long QStringView_ToLongLong1(const QStringView* self, bool* ok); +long long QStringView_ToLongLong2(const QStringView* self, bool* ok, int base); +unsigned long long QStringView_ToULongLong1(const QStringView* self, bool* ok); +unsigned long long QStringView_ToULongLong2(const QStringView* self, bool* ok, int base); float QStringView_ToFloat1(const QStringView* self, bool* ok); double QStringView_ToDouble1(const QStringView* self, bool* ok); void QStringView_Delete(QStringView* self); diff --git a/qt/gen_qstyle.cpp b/qt/gen_qstyle.cpp index 8948b03..b5ab154 100644 --- a/qt/gen_qstyle.cpp +++ b/qt/gen_qstyle.cpp @@ -80,60 +80,60 @@ QPalette* QStyle_StandardPalette(const QStyle* self) { return new QPalette(self->standardPalette()); } -void QStyle_DrawPrimitive(const QStyle* self, uintptr_t pe, QStyleOption* opt, QPainter* p) { +void QStyle_DrawPrimitive(const QStyle* self, int pe, QStyleOption* opt, QPainter* p) { self->drawPrimitive(static_cast(pe), opt, p); } -void QStyle_DrawControl(const QStyle* self, uintptr_t element, QStyleOption* opt, QPainter* p) { +void QStyle_DrawControl(const QStyle* self, int element, QStyleOption* opt, QPainter* p) { self->drawControl(static_cast(element), opt, p); } -QRect* QStyle_SubElementRect(const QStyle* self, uintptr_t subElement, QStyleOption* option) { +QRect* QStyle_SubElementRect(const QStyle* self, int subElement, QStyleOption* option) { return new QRect(self->subElementRect(static_cast(subElement), option)); } -void QStyle_DrawComplexControl(const QStyle* self, uintptr_t cc, QStyleOptionComplex* opt, QPainter* p) { +void QStyle_DrawComplexControl(const QStyle* self, int cc, QStyleOptionComplex* opt, QPainter* p) { self->drawComplexControl(static_cast(cc), opt, p); } -uintptr_t QStyle_HitTestComplexControl(const QStyle* self, uintptr_t cc, QStyleOptionComplex* opt, QPoint* pt) { +int QStyle_HitTestComplexControl(const QStyle* self, int cc, QStyleOptionComplex* opt, QPoint* pt) { QStyle::SubControl _ret = self->hitTestComplexControl(static_cast(cc), opt, *pt); - return static_cast(_ret); + return static_cast(_ret); } -QRect* QStyle_SubControlRect(const QStyle* self, uintptr_t cc, QStyleOptionComplex* opt, uintptr_t sc) { +QRect* QStyle_SubControlRect(const QStyle* self, int cc, QStyleOptionComplex* opt, int sc) { return new QRect(self->subControlRect(static_cast(cc), opt, static_cast(sc))); } -int QStyle_PixelMetric(const QStyle* self, uintptr_t metric) { +int QStyle_PixelMetric(const QStyle* self, int metric) { return self->pixelMetric(static_cast(metric)); } -QSize* QStyle_SizeFromContents(const QStyle* self, uintptr_t ct, QStyleOption* opt, QSize* contentsSize) { +QSize* QStyle_SizeFromContents(const QStyle* self, int ct, QStyleOption* opt, QSize* contentsSize) { return new QSize(self->sizeFromContents(static_cast(ct), opt, *contentsSize)); } -int QStyle_StyleHint(const QStyle* self, uintptr_t stylehint) { +int QStyle_StyleHint(const QStyle* self, int stylehint) { return self->styleHint(static_cast(stylehint)); } -QPixmap* QStyle_StandardPixmap(const QStyle* self, uintptr_t standardPixmap) { +QPixmap* QStyle_StandardPixmap(const QStyle* self, int standardPixmap) { return new QPixmap(self->standardPixmap(static_cast(standardPixmap))); } -QIcon* QStyle_StandardIcon(const QStyle* self, uintptr_t standardIcon) { +QIcon* QStyle_StandardIcon(const QStyle* self, int standardIcon) { return new QIcon(self->standardIcon(static_cast(standardIcon))); } -QPixmap* QStyle_GeneratedIconPixmap(const QStyle* self, uintptr_t iconMode, QPixmap* pixmap, QStyleOption* opt) { +QPixmap* QStyle_GeneratedIconPixmap(const QStyle* self, int iconMode, QPixmap* pixmap, QStyleOption* opt) { return new QPixmap(self->generatedIconPixmap(static_cast(iconMode), *pixmap, opt)); } -QRect* QStyle_VisualRect(uintptr_t direction, QRect* boundingRect, QRect* logicalRect) { +QRect* QStyle_VisualRect(int direction, QRect* boundingRect, QRect* logicalRect) { return new QRect(QStyle::visualRect(static_cast(direction), *boundingRect, *logicalRect)); } -QPoint* QStyle_VisualPos(uintptr_t direction, QRect* boundingRect, QPoint* logicalPos) { +QPoint* QStyle_VisualPos(int direction, QRect* boundingRect, QPoint* logicalPos) { return new QPoint(QStyle::visualPos(static_cast(direction), *boundingRect, *logicalPos)); } @@ -145,20 +145,20 @@ int QStyle_SliderValueFromPosition(int min, int max, int pos, int space) { return QStyle::sliderValueFromPosition(static_cast(min), static_cast(max), static_cast(pos), static_cast(space)); } -int QStyle_VisualAlignment(uintptr_t direction, int alignment) { +int QStyle_VisualAlignment(int direction, int alignment) { Qt::Alignment _ret = QStyle::visualAlignment(static_cast(direction), static_cast(alignment)); return static_cast(_ret); } -QRect* QStyle_AlignedRect(uintptr_t direction, int alignment, QSize* size, QRect* rectangle) { +QRect* QStyle_AlignedRect(int direction, int alignment, QSize* size, QRect* rectangle) { return new QRect(QStyle::alignedRect(static_cast(direction), static_cast(alignment), *size, *rectangle)); } -int QStyle_LayoutSpacing(const QStyle* self, uintptr_t control1, uintptr_t control2, uintptr_t orientation) { +int QStyle_LayoutSpacing(const QStyle* self, int control1, int control2, int orientation) { return self->layoutSpacing(static_cast(control1), static_cast(control2), static_cast(orientation)); } -int QStyle_CombinedLayoutSpacing(const QStyle* self, int controls1, int controls2, uintptr_t orientation) { +int QStyle_CombinedLayoutSpacing(const QStyle* self, int controls1, int controls2, int orientation) { return self->combinedLayoutSpacing(static_cast(controls1), static_cast(controls2), static_cast(orientation)); } @@ -194,73 +194,73 @@ struct miqt_string* QStyle_TrUtf83(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -void QStyle_DrawItemText7(const QStyle* self, QPainter* painter, QRect* rect, int flags, QPalette* pal, bool enabled, struct miqt_string* text, uintptr_t textRole) { +void QStyle_DrawItemText7(const QStyle* self, QPainter* painter, QRect* rect, int flags, QPalette* pal, bool enabled, struct miqt_string* text, int textRole) { QString text_QString = QString::fromUtf8(&text->data, text->len); self->drawItemText(painter, *rect, static_cast(flags), *pal, enabled, text_QString, static_cast(textRole)); } -void QStyle_DrawPrimitive4(const QStyle* self, uintptr_t pe, QStyleOption* opt, QPainter* p, QWidget* w) { +void QStyle_DrawPrimitive4(const QStyle* self, int pe, QStyleOption* opt, QPainter* p, QWidget* w) { self->drawPrimitive(static_cast(pe), opt, p, w); } -void QStyle_DrawControl4(const QStyle* self, uintptr_t element, QStyleOption* opt, QPainter* p, QWidget* w) { +void QStyle_DrawControl4(const QStyle* self, int element, QStyleOption* opt, QPainter* p, QWidget* w) { self->drawControl(static_cast(element), opt, p, w); } -QRect* QStyle_SubElementRect3(const QStyle* self, uintptr_t subElement, QStyleOption* option, QWidget* widget) { +QRect* QStyle_SubElementRect3(const QStyle* self, int subElement, QStyleOption* option, QWidget* widget) { return new QRect(self->subElementRect(static_cast(subElement), option, widget)); } -void QStyle_DrawComplexControl4(const QStyle* self, uintptr_t cc, QStyleOptionComplex* opt, QPainter* p, QWidget* widget) { +void QStyle_DrawComplexControl4(const QStyle* self, int cc, QStyleOptionComplex* opt, QPainter* p, QWidget* widget) { self->drawComplexControl(static_cast(cc), opt, p, widget); } -uintptr_t QStyle_HitTestComplexControl4(const QStyle* self, uintptr_t cc, QStyleOptionComplex* opt, QPoint* pt, QWidget* widget) { +int QStyle_HitTestComplexControl4(const QStyle* self, int cc, QStyleOptionComplex* opt, QPoint* pt, QWidget* widget) { QStyle::SubControl _ret = self->hitTestComplexControl(static_cast(cc), opt, *pt, widget); - return static_cast(_ret); + return static_cast(_ret); } -QRect* QStyle_SubControlRect4(const QStyle* self, uintptr_t cc, QStyleOptionComplex* opt, uintptr_t sc, QWidget* widget) { +QRect* QStyle_SubControlRect4(const QStyle* self, int cc, QStyleOptionComplex* opt, int sc, QWidget* widget) { return new QRect(self->subControlRect(static_cast(cc), opt, static_cast(sc), widget)); } -int QStyle_PixelMetric2(const QStyle* self, uintptr_t metric, QStyleOption* option) { +int QStyle_PixelMetric2(const QStyle* self, int metric, QStyleOption* option) { return self->pixelMetric(static_cast(metric), option); } -int QStyle_PixelMetric3(const QStyle* self, uintptr_t metric, QStyleOption* option, QWidget* widget) { +int QStyle_PixelMetric3(const QStyle* self, int metric, QStyleOption* option, QWidget* widget) { return self->pixelMetric(static_cast(metric), option, widget); } -QSize* QStyle_SizeFromContents4(const QStyle* self, uintptr_t ct, QStyleOption* opt, QSize* contentsSize, QWidget* w) { +QSize* QStyle_SizeFromContents4(const QStyle* self, int ct, QStyleOption* opt, QSize* contentsSize, QWidget* w) { return new QSize(self->sizeFromContents(static_cast(ct), opt, *contentsSize, w)); } -int QStyle_StyleHint2(const QStyle* self, uintptr_t stylehint, QStyleOption* opt) { +int QStyle_StyleHint2(const QStyle* self, int stylehint, QStyleOption* opt) { return self->styleHint(static_cast(stylehint), opt); } -int QStyle_StyleHint3(const QStyle* self, uintptr_t stylehint, QStyleOption* opt, QWidget* widget) { +int QStyle_StyleHint3(const QStyle* self, int stylehint, QStyleOption* opt, QWidget* widget) { return self->styleHint(static_cast(stylehint), opt, widget); } -int QStyle_StyleHint4(const QStyle* self, uintptr_t stylehint, QStyleOption* opt, QWidget* widget, QStyleHintReturn* returnData) { +int QStyle_StyleHint4(const QStyle* self, int stylehint, QStyleOption* opt, QWidget* widget, QStyleHintReturn* returnData) { return self->styleHint(static_cast(stylehint), opt, widget, returnData); } -QPixmap* QStyle_StandardPixmap2(const QStyle* self, uintptr_t standardPixmap, QStyleOption* opt) { +QPixmap* QStyle_StandardPixmap2(const QStyle* self, int standardPixmap, QStyleOption* opt) { return new QPixmap(self->standardPixmap(static_cast(standardPixmap), opt)); } -QPixmap* QStyle_StandardPixmap3(const QStyle* self, uintptr_t standardPixmap, QStyleOption* opt, QWidget* widget) { +QPixmap* QStyle_StandardPixmap3(const QStyle* self, int standardPixmap, QStyleOption* opt, QWidget* widget) { return new QPixmap(self->standardPixmap(static_cast(standardPixmap), opt, widget)); } -QIcon* QStyle_StandardIcon2(const QStyle* self, uintptr_t standardIcon, QStyleOption* option) { +QIcon* QStyle_StandardIcon2(const QStyle* self, int standardIcon, QStyleOption* option) { return new QIcon(self->standardIcon(static_cast(standardIcon), option)); } -QIcon* QStyle_StandardIcon3(const QStyle* self, uintptr_t standardIcon, QStyleOption* option, QWidget* widget) { +QIcon* QStyle_StandardIcon3(const QStyle* self, int standardIcon, QStyleOption* option, QWidget* widget) { return new QIcon(self->standardIcon(static_cast(standardIcon), option, widget)); } @@ -272,19 +272,19 @@ int QStyle_SliderValueFromPosition5(int min, int max, int pos, int space, bool u return QStyle::sliderValueFromPosition(static_cast(min), static_cast(max), static_cast(pos), static_cast(space), upsideDown); } -int QStyle_LayoutSpacing4(const QStyle* self, uintptr_t control1, uintptr_t control2, uintptr_t orientation, QStyleOption* option) { +int QStyle_LayoutSpacing4(const QStyle* self, int control1, int control2, int orientation, QStyleOption* option) { return self->layoutSpacing(static_cast(control1), static_cast(control2), static_cast(orientation), option); } -int QStyle_LayoutSpacing5(const QStyle* self, uintptr_t control1, uintptr_t control2, uintptr_t orientation, QStyleOption* option, QWidget* widget) { +int QStyle_LayoutSpacing5(const QStyle* self, int control1, int control2, int orientation, QStyleOption* option, QWidget* widget) { return self->layoutSpacing(static_cast(control1), static_cast(control2), static_cast(orientation), option, widget); } -int QStyle_CombinedLayoutSpacing4(const QStyle* self, int controls1, int controls2, uintptr_t orientation, QStyleOption* option) { +int QStyle_CombinedLayoutSpacing4(const QStyle* self, int controls1, int controls2, int orientation, QStyleOption* option) { return self->combinedLayoutSpacing(static_cast(controls1), static_cast(controls2), static_cast(orientation), option); } -int QStyle_CombinedLayoutSpacing5(const QStyle* self, int controls1, int controls2, uintptr_t orientation, QStyleOption* option, QWidget* widget) { +int QStyle_CombinedLayoutSpacing5(const QStyle* self, int controls1, int controls2, int orientation, QStyleOption* option, QWidget* widget) { return self->combinedLayoutSpacing(static_cast(controls1), static_cast(controls2), static_cast(orientation), option, widget); } diff --git a/qt/gen_qstyle.go b/qt/gen_qstyle.go index 869ab39..b591d42 100644 --- a/qt/gen_qstyle.go +++ b/qt/gen_qstyle.go @@ -735,80 +735,80 @@ func (this *QStyle) StandardPalette() *QPalette { } func (this *QStyle) DrawPrimitive(pe QStyle__PrimitiveElement, opt *QStyleOption, p *QPainter) { - C.QStyle_DrawPrimitive(this.h, (C.uintptr_t)(pe), opt.cPointer(), p.cPointer()) + C.QStyle_DrawPrimitive(this.h, (C.int)(pe), opt.cPointer(), p.cPointer()) } func (this *QStyle) DrawControl(element QStyle__ControlElement, opt *QStyleOption, p *QPainter) { - C.QStyle_DrawControl(this.h, (C.uintptr_t)(element), opt.cPointer(), p.cPointer()) + C.QStyle_DrawControl(this.h, (C.int)(element), opt.cPointer(), p.cPointer()) } func (this *QStyle) SubElementRect(subElement QStyle__SubElement, option *QStyleOption) *QRect { - _ret := C.QStyle_SubElementRect(this.h, (C.uintptr_t)(subElement), option.cPointer()) + _ret := C.QStyle_SubElementRect(this.h, (C.int)(subElement), option.cPointer()) _goptr := newQRect(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QStyle) DrawComplexControl(cc QStyle__ComplexControl, opt *QStyleOptionComplex, p *QPainter) { - C.QStyle_DrawComplexControl(this.h, (C.uintptr_t)(cc), opt.cPointer(), p.cPointer()) + C.QStyle_DrawComplexControl(this.h, (C.int)(cc), opt.cPointer(), p.cPointer()) } func (this *QStyle) HitTestComplexControl(cc QStyle__ComplexControl, opt *QStyleOptionComplex, pt *QPoint) QStyle__SubControl { - return (QStyle__SubControl)(C.QStyle_HitTestComplexControl(this.h, (C.uintptr_t)(cc), opt.cPointer(), pt.cPointer())) + return (QStyle__SubControl)(C.QStyle_HitTestComplexControl(this.h, (C.int)(cc), opt.cPointer(), pt.cPointer())) } func (this *QStyle) SubControlRect(cc QStyle__ComplexControl, opt *QStyleOptionComplex, sc QStyle__SubControl) *QRect { - _ret := C.QStyle_SubControlRect(this.h, (C.uintptr_t)(cc), opt.cPointer(), (C.uintptr_t)(sc)) + _ret := C.QStyle_SubControlRect(this.h, (C.int)(cc), opt.cPointer(), (C.int)(sc)) _goptr := newQRect(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QStyle) PixelMetric(metric QStyle__PixelMetric) int { - return (int)(C.QStyle_PixelMetric(this.h, (C.uintptr_t)(metric))) + return (int)(C.QStyle_PixelMetric(this.h, (C.int)(metric))) } func (this *QStyle) SizeFromContents(ct QStyle__ContentsType, opt *QStyleOption, contentsSize *QSize) *QSize { - _ret := C.QStyle_SizeFromContents(this.h, (C.uintptr_t)(ct), opt.cPointer(), contentsSize.cPointer()) + _ret := C.QStyle_SizeFromContents(this.h, (C.int)(ct), opt.cPointer(), contentsSize.cPointer()) _goptr := newQSize(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QStyle) StyleHint(stylehint QStyle__StyleHint) int { - return (int)(C.QStyle_StyleHint(this.h, (C.uintptr_t)(stylehint))) + return (int)(C.QStyle_StyleHint(this.h, (C.int)(stylehint))) } func (this *QStyle) StandardPixmap(standardPixmap QStyle__StandardPixmap) *QPixmap { - _ret := C.QStyle_StandardPixmap(this.h, (C.uintptr_t)(standardPixmap)) + _ret := C.QStyle_StandardPixmap(this.h, (C.int)(standardPixmap)) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QStyle) StandardIcon(standardIcon QStyle__StandardPixmap) *QIcon { - _ret := C.QStyle_StandardIcon(this.h, (C.uintptr_t)(standardIcon)) + _ret := C.QStyle_StandardIcon(this.h, (C.int)(standardIcon)) _goptr := newQIcon(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QStyle) GeneratedIconPixmap(iconMode QIcon__Mode, pixmap *QPixmap, opt *QStyleOption) *QPixmap { - _ret := C.QStyle_GeneratedIconPixmap(this.h, (C.uintptr_t)(iconMode), pixmap.cPointer(), opt.cPointer()) + _ret := C.QStyle_GeneratedIconPixmap(this.h, (C.int)(iconMode), pixmap.cPointer(), opt.cPointer()) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QStyle_VisualRect(direction LayoutDirection, boundingRect *QRect, logicalRect *QRect) *QRect { - _ret := C.QStyle_VisualRect((C.uintptr_t)(direction), boundingRect.cPointer(), logicalRect.cPointer()) + _ret := C.QStyle_VisualRect((C.int)(direction), boundingRect.cPointer(), logicalRect.cPointer()) _goptr := newQRect(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QStyle_VisualPos(direction LayoutDirection, boundingRect *QRect, logicalPos *QPoint) *QPoint { - _ret := C.QStyle_VisualPos((C.uintptr_t)(direction), boundingRect.cPointer(), logicalPos.cPointer()) + _ret := C.QStyle_VisualPos((C.int)(direction), boundingRect.cPointer(), logicalPos.cPointer()) _goptr := newQPoint(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -823,22 +823,22 @@ func QStyle_SliderValueFromPosition(min int, max int, pos int, space int) int { } func QStyle_VisualAlignment(direction LayoutDirection, alignment int) int { - return (int)(C.QStyle_VisualAlignment((C.uintptr_t)(direction), (C.int)(alignment))) + return (int)(C.QStyle_VisualAlignment((C.int)(direction), alignment)) } func QStyle_AlignedRect(direction LayoutDirection, alignment int, size *QSize, rectangle *QRect) *QRect { - _ret := C.QStyle_AlignedRect((C.uintptr_t)(direction), (C.int)(alignment), size.cPointer(), rectangle.cPointer()) + _ret := C.QStyle_AlignedRect((C.int)(direction), alignment, size.cPointer(), rectangle.cPointer()) _goptr := newQRect(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QStyle) LayoutSpacing(control1 QSizePolicy__ControlType, control2 QSizePolicy__ControlType, orientation Orientation) int { - return (int)(C.QStyle_LayoutSpacing(this.h, (C.uintptr_t)(control1), (C.uintptr_t)(control2), (C.uintptr_t)(orientation))) + return (int)(C.QStyle_LayoutSpacing(this.h, (C.int)(control1), (C.int)(control2), (C.int)(orientation))) } func (this *QStyle) CombinedLayoutSpacing(controls1 int, controls2 int, orientation Orientation) int { - return (int)(C.QStyle_CombinedLayoutSpacing(this.h, (C.int)(controls1), (C.int)(controls2), (C.uintptr_t)(orientation))) + return (int)(C.QStyle_CombinedLayoutSpacing(this.h, controls1, controls2, (C.int)(orientation))) } func (this *QStyle) Proxy() *QStyle { @@ -892,89 +892,89 @@ func QStyle_TrUtf83(s string, c string, n int) string { func (this *QStyle) DrawItemText7(painter *QPainter, rect *QRect, flags int, pal *QPalette, enabled bool, text string, textRole QPalette__ColorRole) { text_ms := miqt_strdupg(text) defer C.free(text_ms) - C.QStyle_DrawItemText7(this.h, painter.cPointer(), rect.cPointer(), (C.int)(flags), pal.cPointer(), (C.bool)(enabled), (*C.struct_miqt_string)(text_ms), (C.uintptr_t)(textRole)) + C.QStyle_DrawItemText7(this.h, painter.cPointer(), rect.cPointer(), (C.int)(flags), pal.cPointer(), (C.bool)(enabled), (*C.struct_miqt_string)(text_ms), (C.int)(textRole)) } func (this *QStyle) DrawPrimitive4(pe QStyle__PrimitiveElement, opt *QStyleOption, p *QPainter, w *QWidget) { - C.QStyle_DrawPrimitive4(this.h, (C.uintptr_t)(pe), opt.cPointer(), p.cPointer(), w.cPointer()) + C.QStyle_DrawPrimitive4(this.h, (C.int)(pe), opt.cPointer(), p.cPointer(), w.cPointer()) } func (this *QStyle) DrawControl4(element QStyle__ControlElement, opt *QStyleOption, p *QPainter, w *QWidget) { - C.QStyle_DrawControl4(this.h, (C.uintptr_t)(element), opt.cPointer(), p.cPointer(), w.cPointer()) + C.QStyle_DrawControl4(this.h, (C.int)(element), opt.cPointer(), p.cPointer(), w.cPointer()) } func (this *QStyle) SubElementRect3(subElement QStyle__SubElement, option *QStyleOption, widget *QWidget) *QRect { - _ret := C.QStyle_SubElementRect3(this.h, (C.uintptr_t)(subElement), option.cPointer(), widget.cPointer()) + _ret := C.QStyle_SubElementRect3(this.h, (C.int)(subElement), option.cPointer(), widget.cPointer()) _goptr := newQRect(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QStyle) DrawComplexControl4(cc QStyle__ComplexControl, opt *QStyleOptionComplex, p *QPainter, widget *QWidget) { - C.QStyle_DrawComplexControl4(this.h, (C.uintptr_t)(cc), opt.cPointer(), p.cPointer(), widget.cPointer()) + C.QStyle_DrawComplexControl4(this.h, (C.int)(cc), opt.cPointer(), p.cPointer(), widget.cPointer()) } func (this *QStyle) HitTestComplexControl4(cc QStyle__ComplexControl, opt *QStyleOptionComplex, pt *QPoint, widget *QWidget) QStyle__SubControl { - return (QStyle__SubControl)(C.QStyle_HitTestComplexControl4(this.h, (C.uintptr_t)(cc), opt.cPointer(), pt.cPointer(), widget.cPointer())) + return (QStyle__SubControl)(C.QStyle_HitTestComplexControl4(this.h, (C.int)(cc), opt.cPointer(), pt.cPointer(), widget.cPointer())) } func (this *QStyle) SubControlRect4(cc QStyle__ComplexControl, opt *QStyleOptionComplex, sc QStyle__SubControl, widget *QWidget) *QRect { - _ret := C.QStyle_SubControlRect4(this.h, (C.uintptr_t)(cc), opt.cPointer(), (C.uintptr_t)(sc), widget.cPointer()) + _ret := C.QStyle_SubControlRect4(this.h, (C.int)(cc), opt.cPointer(), (C.int)(sc), widget.cPointer()) _goptr := newQRect(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QStyle) PixelMetric2(metric QStyle__PixelMetric, option *QStyleOption) int { - return (int)(C.QStyle_PixelMetric2(this.h, (C.uintptr_t)(metric), option.cPointer())) + return (int)(C.QStyle_PixelMetric2(this.h, (C.int)(metric), option.cPointer())) } func (this *QStyle) PixelMetric3(metric QStyle__PixelMetric, option *QStyleOption, widget *QWidget) int { - return (int)(C.QStyle_PixelMetric3(this.h, (C.uintptr_t)(metric), option.cPointer(), widget.cPointer())) + return (int)(C.QStyle_PixelMetric3(this.h, (C.int)(metric), option.cPointer(), widget.cPointer())) } func (this *QStyle) SizeFromContents4(ct QStyle__ContentsType, opt *QStyleOption, contentsSize *QSize, w *QWidget) *QSize { - _ret := C.QStyle_SizeFromContents4(this.h, (C.uintptr_t)(ct), opt.cPointer(), contentsSize.cPointer(), w.cPointer()) + _ret := C.QStyle_SizeFromContents4(this.h, (C.int)(ct), opt.cPointer(), contentsSize.cPointer(), w.cPointer()) _goptr := newQSize(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QStyle) StyleHint2(stylehint QStyle__StyleHint, opt *QStyleOption) int { - return (int)(C.QStyle_StyleHint2(this.h, (C.uintptr_t)(stylehint), opt.cPointer())) + return (int)(C.QStyle_StyleHint2(this.h, (C.int)(stylehint), opt.cPointer())) } func (this *QStyle) StyleHint3(stylehint QStyle__StyleHint, opt *QStyleOption, widget *QWidget) int { - return (int)(C.QStyle_StyleHint3(this.h, (C.uintptr_t)(stylehint), opt.cPointer(), widget.cPointer())) + return (int)(C.QStyle_StyleHint3(this.h, (C.int)(stylehint), opt.cPointer(), widget.cPointer())) } func (this *QStyle) StyleHint4(stylehint QStyle__StyleHint, opt *QStyleOption, widget *QWidget, returnData *QStyleHintReturn) int { - return (int)(C.QStyle_StyleHint4(this.h, (C.uintptr_t)(stylehint), opt.cPointer(), widget.cPointer(), returnData.cPointer())) + return (int)(C.QStyle_StyleHint4(this.h, (C.int)(stylehint), opt.cPointer(), widget.cPointer(), returnData.cPointer())) } func (this *QStyle) StandardPixmap2(standardPixmap QStyle__StandardPixmap, opt *QStyleOption) *QPixmap { - _ret := C.QStyle_StandardPixmap2(this.h, (C.uintptr_t)(standardPixmap), opt.cPointer()) + _ret := C.QStyle_StandardPixmap2(this.h, (C.int)(standardPixmap), opt.cPointer()) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QStyle) StandardPixmap3(standardPixmap QStyle__StandardPixmap, opt *QStyleOption, widget *QWidget) *QPixmap { - _ret := C.QStyle_StandardPixmap3(this.h, (C.uintptr_t)(standardPixmap), opt.cPointer(), widget.cPointer()) + _ret := C.QStyle_StandardPixmap3(this.h, (C.int)(standardPixmap), opt.cPointer(), widget.cPointer()) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QStyle) StandardIcon2(standardIcon QStyle__StandardPixmap, option *QStyleOption) *QIcon { - _ret := C.QStyle_StandardIcon2(this.h, (C.uintptr_t)(standardIcon), option.cPointer()) + _ret := C.QStyle_StandardIcon2(this.h, (C.int)(standardIcon), option.cPointer()) _goptr := newQIcon(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QStyle) StandardIcon3(standardIcon QStyle__StandardPixmap, option *QStyleOption, widget *QWidget) *QIcon { - _ret := C.QStyle_StandardIcon3(this.h, (C.uintptr_t)(standardIcon), option.cPointer(), widget.cPointer()) + _ret := C.QStyle_StandardIcon3(this.h, (C.int)(standardIcon), option.cPointer(), widget.cPointer()) _goptr := newQIcon(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -989,19 +989,19 @@ func QStyle_SliderValueFromPosition5(min int, max int, pos int, space int, upsid } func (this *QStyle) LayoutSpacing4(control1 QSizePolicy__ControlType, control2 QSizePolicy__ControlType, orientation Orientation, option *QStyleOption) int { - return (int)(C.QStyle_LayoutSpacing4(this.h, (C.uintptr_t)(control1), (C.uintptr_t)(control2), (C.uintptr_t)(orientation), option.cPointer())) + return (int)(C.QStyle_LayoutSpacing4(this.h, (C.int)(control1), (C.int)(control2), (C.int)(orientation), option.cPointer())) } func (this *QStyle) LayoutSpacing5(control1 QSizePolicy__ControlType, control2 QSizePolicy__ControlType, orientation Orientation, option *QStyleOption, widget *QWidget) int { - return (int)(C.QStyle_LayoutSpacing5(this.h, (C.uintptr_t)(control1), (C.uintptr_t)(control2), (C.uintptr_t)(orientation), option.cPointer(), widget.cPointer())) + return (int)(C.QStyle_LayoutSpacing5(this.h, (C.int)(control1), (C.int)(control2), (C.int)(orientation), option.cPointer(), widget.cPointer())) } func (this *QStyle) CombinedLayoutSpacing4(controls1 int, controls2 int, orientation Orientation, option *QStyleOption) int { - return (int)(C.QStyle_CombinedLayoutSpacing4(this.h, (C.int)(controls1), (C.int)(controls2), (C.uintptr_t)(orientation), option.cPointer())) + return (int)(C.QStyle_CombinedLayoutSpacing4(this.h, controls1, controls2, (C.int)(orientation), option.cPointer())) } func (this *QStyle) CombinedLayoutSpacing5(controls1 int, controls2 int, orientation Orientation, option *QStyleOption, widget *QWidget) int { - return (int)(C.QStyle_CombinedLayoutSpacing5(this.h, (C.int)(controls1), (C.int)(controls2), (C.uintptr_t)(orientation), option.cPointer(), widget.cPointer())) + return (int)(C.QStyle_CombinedLayoutSpacing5(this.h, controls1, controls2, (C.int)(orientation), option.cPointer(), widget.cPointer())) } // Delete this object from C++ memory. diff --git a/qt/gen_qstyle.h b/qt/gen_qstyle.h index 46daeaf..53d0830 100644 --- a/qt/gen_qstyle.h +++ b/qt/gen_qstyle.h @@ -60,54 +60,54 @@ QRect* QStyle_ItemPixmapRect(const QStyle* self, QRect* r, int flags, QPixmap* p void QStyle_DrawItemText(const QStyle* self, QPainter* painter, QRect* rect, int flags, QPalette* pal, bool enabled, struct miqt_string* text); void QStyle_DrawItemPixmap(const QStyle* self, QPainter* painter, QRect* rect, int alignment, QPixmap* pixmap); QPalette* QStyle_StandardPalette(const QStyle* self); -void QStyle_DrawPrimitive(const QStyle* self, uintptr_t pe, QStyleOption* opt, QPainter* p); -void QStyle_DrawControl(const QStyle* self, uintptr_t element, QStyleOption* opt, QPainter* p); -QRect* QStyle_SubElementRect(const QStyle* self, uintptr_t subElement, QStyleOption* option); -void QStyle_DrawComplexControl(const QStyle* self, uintptr_t cc, QStyleOptionComplex* opt, QPainter* p); -uintptr_t QStyle_HitTestComplexControl(const QStyle* self, uintptr_t cc, QStyleOptionComplex* opt, QPoint* pt); -QRect* QStyle_SubControlRect(const QStyle* self, uintptr_t cc, QStyleOptionComplex* opt, uintptr_t sc); -int QStyle_PixelMetric(const QStyle* self, uintptr_t metric); -QSize* QStyle_SizeFromContents(const QStyle* self, uintptr_t ct, QStyleOption* opt, QSize* contentsSize); -int QStyle_StyleHint(const QStyle* self, uintptr_t stylehint); -QPixmap* QStyle_StandardPixmap(const QStyle* self, uintptr_t standardPixmap); -QIcon* QStyle_StandardIcon(const QStyle* self, uintptr_t standardIcon); -QPixmap* QStyle_GeneratedIconPixmap(const QStyle* self, uintptr_t iconMode, QPixmap* pixmap, QStyleOption* opt); -QRect* QStyle_VisualRect(uintptr_t direction, QRect* boundingRect, QRect* logicalRect); -QPoint* QStyle_VisualPos(uintptr_t direction, QRect* boundingRect, QPoint* logicalPos); +void QStyle_DrawPrimitive(const QStyle* self, int pe, QStyleOption* opt, QPainter* p); +void QStyle_DrawControl(const QStyle* self, int element, QStyleOption* opt, QPainter* p); +QRect* QStyle_SubElementRect(const QStyle* self, int subElement, QStyleOption* option); +void QStyle_DrawComplexControl(const QStyle* self, int cc, QStyleOptionComplex* opt, QPainter* p); +int QStyle_HitTestComplexControl(const QStyle* self, int cc, QStyleOptionComplex* opt, QPoint* pt); +QRect* QStyle_SubControlRect(const QStyle* self, int cc, QStyleOptionComplex* opt, int sc); +int QStyle_PixelMetric(const QStyle* self, int metric); +QSize* QStyle_SizeFromContents(const QStyle* self, int ct, QStyleOption* opt, QSize* contentsSize); +int QStyle_StyleHint(const QStyle* self, int stylehint); +QPixmap* QStyle_StandardPixmap(const QStyle* self, int standardPixmap); +QIcon* QStyle_StandardIcon(const QStyle* self, int standardIcon); +QPixmap* QStyle_GeneratedIconPixmap(const QStyle* self, int iconMode, QPixmap* pixmap, QStyleOption* opt); +QRect* QStyle_VisualRect(int direction, QRect* boundingRect, QRect* logicalRect); +QPoint* QStyle_VisualPos(int direction, QRect* boundingRect, QPoint* logicalPos); int QStyle_SliderPositionFromValue(int min, int max, int val, int space); int QStyle_SliderValueFromPosition(int min, int max, int pos, int space); -int QStyle_VisualAlignment(uintptr_t direction, int alignment); -QRect* QStyle_AlignedRect(uintptr_t direction, int alignment, QSize* size, QRect* rectangle); -int QStyle_LayoutSpacing(const QStyle* self, uintptr_t control1, uintptr_t control2, uintptr_t orientation); -int QStyle_CombinedLayoutSpacing(const QStyle* self, int controls1, int controls2, uintptr_t orientation); +int QStyle_VisualAlignment(int direction, int alignment); +QRect* QStyle_AlignedRect(int direction, int alignment, QSize* size, QRect* rectangle); +int QStyle_LayoutSpacing(const QStyle* self, int control1, int control2, int orientation); +int QStyle_CombinedLayoutSpacing(const QStyle* self, int controls1, int controls2, int orientation); QStyle* QStyle_Proxy(const QStyle* self); struct miqt_string* QStyle_Tr2(const char* s, const char* c); struct miqt_string* QStyle_Tr3(const char* s, const char* c, int n); struct miqt_string* QStyle_TrUtf82(const char* s, const char* c); struct miqt_string* QStyle_TrUtf83(const char* s, const char* c, int n); -void QStyle_DrawItemText7(const QStyle* self, QPainter* painter, QRect* rect, int flags, QPalette* pal, bool enabled, struct miqt_string* text, uintptr_t textRole); -void QStyle_DrawPrimitive4(const QStyle* self, uintptr_t pe, QStyleOption* opt, QPainter* p, QWidget* w); -void QStyle_DrawControl4(const QStyle* self, uintptr_t element, QStyleOption* opt, QPainter* p, QWidget* w); -QRect* QStyle_SubElementRect3(const QStyle* self, uintptr_t subElement, QStyleOption* option, QWidget* widget); -void QStyle_DrawComplexControl4(const QStyle* self, uintptr_t cc, QStyleOptionComplex* opt, QPainter* p, QWidget* widget); -uintptr_t QStyle_HitTestComplexControl4(const QStyle* self, uintptr_t cc, QStyleOptionComplex* opt, QPoint* pt, QWidget* widget); -QRect* QStyle_SubControlRect4(const QStyle* self, uintptr_t cc, QStyleOptionComplex* opt, uintptr_t sc, QWidget* widget); -int QStyle_PixelMetric2(const QStyle* self, uintptr_t metric, QStyleOption* option); -int QStyle_PixelMetric3(const QStyle* self, uintptr_t metric, QStyleOption* option, QWidget* widget); -QSize* QStyle_SizeFromContents4(const QStyle* self, uintptr_t ct, QStyleOption* opt, QSize* contentsSize, QWidget* w); -int QStyle_StyleHint2(const QStyle* self, uintptr_t stylehint, QStyleOption* opt); -int QStyle_StyleHint3(const QStyle* self, uintptr_t stylehint, QStyleOption* opt, QWidget* widget); -int QStyle_StyleHint4(const QStyle* self, uintptr_t stylehint, QStyleOption* opt, QWidget* widget, QStyleHintReturn* returnData); -QPixmap* QStyle_StandardPixmap2(const QStyle* self, uintptr_t standardPixmap, QStyleOption* opt); -QPixmap* QStyle_StandardPixmap3(const QStyle* self, uintptr_t standardPixmap, QStyleOption* opt, QWidget* widget); -QIcon* QStyle_StandardIcon2(const QStyle* self, uintptr_t standardIcon, QStyleOption* option); -QIcon* QStyle_StandardIcon3(const QStyle* self, uintptr_t standardIcon, QStyleOption* option, QWidget* widget); +void QStyle_DrawItemText7(const QStyle* self, QPainter* painter, QRect* rect, int flags, QPalette* pal, bool enabled, struct miqt_string* text, int textRole); +void QStyle_DrawPrimitive4(const QStyle* self, int pe, QStyleOption* opt, QPainter* p, QWidget* w); +void QStyle_DrawControl4(const QStyle* self, int element, QStyleOption* opt, QPainter* p, QWidget* w); +QRect* QStyle_SubElementRect3(const QStyle* self, int subElement, QStyleOption* option, QWidget* widget); +void QStyle_DrawComplexControl4(const QStyle* self, int cc, QStyleOptionComplex* opt, QPainter* p, QWidget* widget); +int QStyle_HitTestComplexControl4(const QStyle* self, int cc, QStyleOptionComplex* opt, QPoint* pt, QWidget* widget); +QRect* QStyle_SubControlRect4(const QStyle* self, int cc, QStyleOptionComplex* opt, int sc, QWidget* widget); +int QStyle_PixelMetric2(const QStyle* self, int metric, QStyleOption* option); +int QStyle_PixelMetric3(const QStyle* self, int metric, QStyleOption* option, QWidget* widget); +QSize* QStyle_SizeFromContents4(const QStyle* self, int ct, QStyleOption* opt, QSize* contentsSize, QWidget* w); +int QStyle_StyleHint2(const QStyle* self, int stylehint, QStyleOption* opt); +int QStyle_StyleHint3(const QStyle* self, int stylehint, QStyleOption* opt, QWidget* widget); +int QStyle_StyleHint4(const QStyle* self, int stylehint, QStyleOption* opt, QWidget* widget, QStyleHintReturn* returnData); +QPixmap* QStyle_StandardPixmap2(const QStyle* self, int standardPixmap, QStyleOption* opt); +QPixmap* QStyle_StandardPixmap3(const QStyle* self, int standardPixmap, QStyleOption* opt, QWidget* widget); +QIcon* QStyle_StandardIcon2(const QStyle* self, int standardIcon, QStyleOption* option); +QIcon* QStyle_StandardIcon3(const QStyle* self, int standardIcon, QStyleOption* option, QWidget* widget); int QStyle_SliderPositionFromValue5(int min, int max, int val, int space, bool upsideDown); int QStyle_SliderValueFromPosition5(int min, int max, int pos, int space, bool upsideDown); -int QStyle_LayoutSpacing4(const QStyle* self, uintptr_t control1, uintptr_t control2, uintptr_t orientation, QStyleOption* option); -int QStyle_LayoutSpacing5(const QStyle* self, uintptr_t control1, uintptr_t control2, uintptr_t orientation, QStyleOption* option, QWidget* widget); -int QStyle_CombinedLayoutSpacing4(const QStyle* self, int controls1, int controls2, uintptr_t orientation, QStyleOption* option); -int QStyle_CombinedLayoutSpacing5(const QStyle* self, int controls1, int controls2, uintptr_t orientation, QStyleOption* option, QWidget* widget); +int QStyle_LayoutSpacing4(const QStyle* self, int control1, int control2, int orientation, QStyleOption* option); +int QStyle_LayoutSpacing5(const QStyle* self, int control1, int control2, int orientation, QStyleOption* option, QWidget* widget); +int QStyle_CombinedLayoutSpacing4(const QStyle* self, int controls1, int controls2, int orientation, QStyleOption* option); +int QStyle_CombinedLayoutSpacing5(const QStyle* self, int controls1, int controls2, int orientation, QStyleOption* option, QWidget* widget); void QStyle_Delete(QStyle* self); #ifdef __cplusplus diff --git a/qt/gen_qstylehints.cpp b/qt/gen_qstylehints.cpp index 0ddf120..3793e6a 100644 --- a/qt/gen_qstylehints.cpp +++ b/qt/gen_qstylehints.cpp @@ -115,7 +115,8 @@ QChar* QStyleHints_PasswordMaskCharacter(const QStyleHints* self) { } double QStyleHints_FontSmoothingGamma(const QStyleHints* self) { - return self->fontSmoothingGamma(); + qreal _ret = self->fontSmoothingGamma(); + return static_cast(_ret); } bool QStyleHints_UseRtlExtensions(const QStyleHints* self) { @@ -126,12 +127,12 @@ bool QStyleHints_SetFocusOnTouchRelease(const QStyleHints* self) { return self->setFocusOnTouchRelease(); } -uintptr_t QStyleHints_TabFocusBehavior(const QStyleHints* self) { +int QStyleHints_TabFocusBehavior(const QStyleHints* self) { Qt::TabFocusBehavior _ret = self->tabFocusBehavior(); - return static_cast(_ret); + return static_cast(_ret); } -void QStyleHints_SetTabFocusBehavior(QStyleHints* self, uintptr_t tabFocusBehavior) { +void QStyleHints_SetTabFocusBehavior(QStyleHints* self, int tabFocusBehavior) { self->setTabFocusBehavior(static_cast(tabFocusBehavior)); } @@ -229,14 +230,14 @@ void QStyleHints_connect_StartDragTimeChanged(QStyleHints* self, void* slot) { }); } -void QStyleHints_TabFocusBehaviorChanged(QStyleHints* self, uintptr_t tabFocusBehavior) { +void QStyleHints_TabFocusBehaviorChanged(QStyleHints* self, int tabFocusBehavior) { self->tabFocusBehaviorChanged(static_cast(tabFocusBehavior)); } void QStyleHints_connect_TabFocusBehaviorChanged(QStyleHints* self, void* slot) { QStyleHints::connect(self, static_cast(&QStyleHints::tabFocusBehaviorChanged), self, [=](Qt::TabFocusBehavior tabFocusBehavior) { Qt::TabFocusBehavior tabFocusBehavior_ret = tabFocusBehavior; - uintptr_t sigval1 = static_cast(tabFocusBehavior_ret); + int sigval1 = static_cast(tabFocusBehavior_ret); miqt_exec_callback_QStyleHints_TabFocusBehaviorChanged(slot, sigval1); }); } diff --git a/qt/gen_qstylehints.go b/qt/gen_qstylehints.go index b7b7e88..f217ed9 100644 --- a/qt/gen_qstylehints.go +++ b/qt/gen_qstylehints.go @@ -167,7 +167,7 @@ func (this *QStyleHints) TabFocusBehavior() TabFocusBehavior { } func (this *QStyleHints) SetTabFocusBehavior(tabFocusBehavior TabFocusBehavior) { - C.QStyleHints_SetTabFocusBehavior(this.h, (C.uintptr_t)(tabFocusBehavior)) + C.QStyleHints_SetTabFocusBehavior(this.h, (C.int)(tabFocusBehavior)) } func (this *QStyleHints) SingleClickActivation() bool { @@ -319,14 +319,14 @@ func miqt_exec_callback_QStyleHints_StartDragTimeChanged(cb *C.void, startDragTi } func (this *QStyleHints) TabFocusBehaviorChanged(tabFocusBehavior TabFocusBehavior) { - C.QStyleHints_TabFocusBehaviorChanged(this.h, (C.uintptr_t)(tabFocusBehavior)) + C.QStyleHints_TabFocusBehaviorChanged(this.h, (C.int)(tabFocusBehavior)) } func (this *QStyleHints) OnTabFocusBehaviorChanged(slot func(tabFocusBehavior TabFocusBehavior)) { C.QStyleHints_connect_TabFocusBehaviorChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QStyleHints_TabFocusBehaviorChanged -func miqt_exec_callback_QStyleHints_TabFocusBehaviorChanged(cb *C.void, tabFocusBehavior C.uintptr_t) { +func miqt_exec_callback_QStyleHints_TabFocusBehaviorChanged(cb *C.void, tabFocusBehavior C.int) { gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(tabFocusBehavior TabFocusBehavior)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt/gen_qstylehints.h b/qt/gen_qstylehints.h index e815bcf..0473b0b 100644 --- a/qt/gen_qstylehints.h +++ b/qt/gen_qstylehints.h @@ -51,8 +51,8 @@ QChar* QStyleHints_PasswordMaskCharacter(const QStyleHints* self); double QStyleHints_FontSmoothingGamma(const QStyleHints* self); bool QStyleHints_UseRtlExtensions(const QStyleHints* self); bool QStyleHints_SetFocusOnTouchRelease(const QStyleHints* self); -uintptr_t QStyleHints_TabFocusBehavior(const QStyleHints* self); -void QStyleHints_SetTabFocusBehavior(QStyleHints* self, uintptr_t tabFocusBehavior); +int QStyleHints_TabFocusBehavior(const QStyleHints* self); +void QStyleHints_SetTabFocusBehavior(QStyleHints* self, int tabFocusBehavior); bool QStyleHints_SingleClickActivation(const QStyleHints* self); bool QStyleHints_UseHoverEffects(const QStyleHints* self); void QStyleHints_SetUseHoverEffects(QStyleHints* self, bool useHoverEffects); @@ -72,7 +72,7 @@ void QStyleHints_StartDragDistanceChanged(QStyleHints* self, int startDragDistan void QStyleHints_connect_StartDragDistanceChanged(QStyleHints* self, void* slot); void QStyleHints_StartDragTimeChanged(QStyleHints* self, int startDragTime); void QStyleHints_connect_StartDragTimeChanged(QStyleHints* self, void* slot); -void QStyleHints_TabFocusBehaviorChanged(QStyleHints* self, uintptr_t tabFocusBehavior); +void QStyleHints_TabFocusBehaviorChanged(QStyleHints* self, int tabFocusBehavior); void QStyleHints_connect_TabFocusBehaviorChanged(QStyleHints* self, void* slot); void QStyleHints_UseHoverEffectsChanged(QStyleHints* self, bool useHoverEffects); void QStyleHints_connect_UseHoverEffectsChanged(QStyleHints* self, void* slot); diff --git a/qt/gen_qstyleoption.cpp b/qt/gen_qstyleoption.cpp index 44d8990..693ec20 100644 --- a/qt/gen_qstyleoption.cpp +++ b/qt/gen_qstyleoption.cpp @@ -361,7 +361,8 @@ QStyleOptionGraphicsItem* QStyleOptionGraphicsItem_new2(QStyleOptionGraphicsItem } double QStyleOptionGraphicsItem_LevelOfDetailFromTransform(QTransform* worldTransform) { - return QStyleOptionGraphicsItem::levelOfDetailFromTransform(*worldTransform); + qreal _ret = QStyleOptionGraphicsItem::levelOfDetailFromTransform(*worldTransform); + return static_cast(_ret); } void QStyleOptionGraphicsItem_Delete(QStyleOptionGraphicsItem* self) { diff --git a/qt/gen_qstylepainter.cpp b/qt/gen_qstylepainter.cpp index 227a980..0dd00a0 100644 --- a/qt/gen_qstylepainter.cpp +++ b/qt/gen_qstylepainter.cpp @@ -34,15 +34,15 @@ bool QStylePainter_Begin2(QStylePainter* self, QPaintDevice* pd, QWidget* w) { return self->begin(pd, w); } -void QStylePainter_DrawPrimitive(QStylePainter* self, uintptr_t pe, QStyleOption* opt) { +void QStylePainter_DrawPrimitive(QStylePainter* self, int pe, QStyleOption* opt) { self->drawPrimitive(static_cast(pe), *opt); } -void QStylePainter_DrawControl(QStylePainter* self, uintptr_t ce, QStyleOption* opt) { +void QStylePainter_DrawControl(QStylePainter* self, int ce, QStyleOption* opt) { self->drawControl(static_cast(ce), *opt); } -void QStylePainter_DrawComplexControl(QStylePainter* self, uintptr_t cc, QStyleOptionComplex* opt) { +void QStylePainter_DrawComplexControl(QStylePainter* self, int cc, QStyleOptionComplex* opt) { self->drawComplexControl(static_cast(cc), *opt); } @@ -59,7 +59,7 @@ QStyle* QStylePainter_Style(const QStylePainter* self) { return self->style(); } -void QStylePainter_DrawItemText6(QStylePainter* self, QRect* r, int flags, QPalette* pal, bool enabled, struct miqt_string* text, uintptr_t textRole) { +void QStylePainter_DrawItemText6(QStylePainter* self, QRect* r, int flags, QPalette* pal, bool enabled, struct miqt_string* text, int textRole) { QString text_QString = QString::fromUtf8(&text->data, text->len); self->drawItemText(*r, static_cast(flags), *pal, enabled, text_QString, static_cast(textRole)); } diff --git a/qt/gen_qstylepainter.go b/qt/gen_qstylepainter.go index d0660a7..af69b43 100644 --- a/qt/gen_qstylepainter.go +++ b/qt/gen_qstylepainter.go @@ -63,15 +63,15 @@ func (this *QStylePainter) Begin2(pd *QPaintDevice, w *QWidget) bool { } func (this *QStylePainter) DrawPrimitive(pe QStyle__PrimitiveElement, opt *QStyleOption) { - C.QStylePainter_DrawPrimitive(this.h, (C.uintptr_t)(pe), opt.cPointer()) + C.QStylePainter_DrawPrimitive(this.h, (C.int)(pe), opt.cPointer()) } func (this *QStylePainter) DrawControl(ce QStyle__ControlElement, opt *QStyleOption) { - C.QStylePainter_DrawControl(this.h, (C.uintptr_t)(ce), opt.cPointer()) + C.QStylePainter_DrawControl(this.h, (C.int)(ce), opt.cPointer()) } func (this *QStylePainter) DrawComplexControl(cc QStyle__ComplexControl, opt *QStyleOptionComplex) { - C.QStylePainter_DrawComplexControl(this.h, (C.uintptr_t)(cc), opt.cPointer()) + C.QStylePainter_DrawComplexControl(this.h, (C.int)(cc), opt.cPointer()) } func (this *QStylePainter) DrawItemText(r *QRect, flags int, pal *QPalette, enabled bool, text string) { @@ -91,7 +91,7 @@ func (this *QStylePainter) Style() *QStyle { func (this *QStylePainter) DrawItemText6(r *QRect, flags int, pal *QPalette, enabled bool, text string, textRole QPalette__ColorRole) { text_ms := miqt_strdupg(text) defer C.free(text_ms) - C.QStylePainter_DrawItemText6(this.h, r.cPointer(), (C.int)(flags), pal.cPointer(), (C.bool)(enabled), (*C.struct_miqt_string)(text_ms), (C.uintptr_t)(textRole)) + C.QStylePainter_DrawItemText6(this.h, r.cPointer(), (C.int)(flags), pal.cPointer(), (C.bool)(enabled), (*C.struct_miqt_string)(text_ms), (C.int)(textRole)) } // Delete this object from C++ memory. diff --git a/qt/gen_qstylepainter.h b/qt/gen_qstylepainter.h index 586e964..2a7a765 100644 --- a/qt/gen_qstylepainter.h +++ b/qt/gen_qstylepainter.h @@ -40,13 +40,13 @@ QStylePainter* QStylePainter_new2(QWidget* w); QStylePainter* QStylePainter_new3(QPaintDevice* pd, QWidget* w); bool QStylePainter_Begin(QStylePainter* self, QWidget* w); bool QStylePainter_Begin2(QStylePainter* self, QPaintDevice* pd, QWidget* w); -void QStylePainter_DrawPrimitive(QStylePainter* self, uintptr_t pe, QStyleOption* opt); -void QStylePainter_DrawControl(QStylePainter* self, uintptr_t ce, QStyleOption* opt); -void QStylePainter_DrawComplexControl(QStylePainter* self, uintptr_t cc, QStyleOptionComplex* opt); +void QStylePainter_DrawPrimitive(QStylePainter* self, int pe, QStyleOption* opt); +void QStylePainter_DrawControl(QStylePainter* self, int ce, QStyleOption* opt); +void QStylePainter_DrawComplexControl(QStylePainter* self, int cc, QStyleOptionComplex* opt); void QStylePainter_DrawItemText(QStylePainter* self, QRect* r, int flags, QPalette* pal, bool enabled, struct miqt_string* text); void QStylePainter_DrawItemPixmap(QStylePainter* self, QRect* r, int flags, QPixmap* pixmap); QStyle* QStylePainter_Style(const QStylePainter* self); -void QStylePainter_DrawItemText6(QStylePainter* self, QRect* r, int flags, QPalette* pal, bool enabled, struct miqt_string* text, uintptr_t textRole); +void QStylePainter_DrawItemText6(QStylePainter* self, QRect* r, int flags, QPalette* pal, bool enabled, struct miqt_string* text, int textRole); void QStylePainter_Delete(QStylePainter* self); #ifdef __cplusplus diff --git a/qt/gen_qsurface.cpp b/qt/gen_qsurface.cpp index d2fe673..61fdcd0 100644 --- a/qt/gen_qsurface.cpp +++ b/qt/gen_qsurface.cpp @@ -5,18 +5,18 @@ #include "gen_qsurface.h" #include "_cgo_export.h" -uintptr_t QSurface_SurfaceClass(const QSurface* self) { +int QSurface_SurfaceClass(const QSurface* self) { QSurface::SurfaceClass _ret = self->surfaceClass(); - return static_cast(_ret); + return static_cast(_ret); } QSurfaceFormat* QSurface_Format(const QSurface* self) { return new QSurfaceFormat(self->format()); } -uintptr_t QSurface_SurfaceType(const QSurface* self) { +int QSurface_SurfaceType(const QSurface* self) { QSurface::SurfaceType _ret = self->surfaceType(); - return static_cast(_ret); + return static_cast(_ret); } bool QSurface_SupportsOpenGL(const QSurface* self) { diff --git a/qt/gen_qsurface.h b/qt/gen_qsurface.h index e666fe3..9ea19c7 100644 --- a/qt/gen_qsurface.h +++ b/qt/gen_qsurface.h @@ -23,9 +23,9 @@ typedef struct QSurface QSurface; typedef struct QSurfaceFormat QSurfaceFormat; #endif -uintptr_t QSurface_SurfaceClass(const QSurface* self); +int QSurface_SurfaceClass(const QSurface* self); QSurfaceFormat* QSurface_Format(const QSurface* self); -uintptr_t QSurface_SurfaceType(const QSurface* self); +int QSurface_SurfaceType(const QSurface* self); bool QSurface_SupportsOpenGL(const QSurface* self); QSize* QSurface_Size(const QSurface* self); void QSurface_Delete(QSurface* self); diff --git a/qt/gen_qsurfaceformat.cpp b/qt/gen_qsurfaceformat.cpp index 827f5a6..10044f2 100644 --- a/qt/gen_qsurfaceformat.cpp +++ b/qt/gen_qsurfaceformat.cpp @@ -75,35 +75,35 @@ int QSurfaceFormat_Samples(const QSurfaceFormat* self) { return self->samples(); } -void QSurfaceFormat_SetSwapBehavior(QSurfaceFormat* self, uintptr_t behavior) { +void QSurfaceFormat_SetSwapBehavior(QSurfaceFormat* self, int behavior) { self->setSwapBehavior(static_cast(behavior)); } -uintptr_t QSurfaceFormat_SwapBehavior(const QSurfaceFormat* self) { +int QSurfaceFormat_SwapBehavior(const QSurfaceFormat* self) { QSurfaceFormat::SwapBehavior _ret = self->swapBehavior(); - return static_cast(_ret); + return static_cast(_ret); } bool QSurfaceFormat_HasAlpha(const QSurfaceFormat* self) { return self->hasAlpha(); } -void QSurfaceFormat_SetProfile(QSurfaceFormat* self, uintptr_t profile) { +void QSurfaceFormat_SetProfile(QSurfaceFormat* self, int profile) { self->setProfile(static_cast(profile)); } -uintptr_t QSurfaceFormat_Profile(const QSurfaceFormat* self) { +int QSurfaceFormat_Profile(const QSurfaceFormat* self) { QSurfaceFormat::OpenGLContextProfile _ret = self->profile(); - return static_cast(_ret); + return static_cast(_ret); } -void QSurfaceFormat_SetRenderableType(QSurfaceFormat* self, uintptr_t typeVal) { +void QSurfaceFormat_SetRenderableType(QSurfaceFormat* self, int typeVal) { self->setRenderableType(static_cast(typeVal)); } -uintptr_t QSurfaceFormat_RenderableType(const QSurfaceFormat* self) { +int QSurfaceFormat_RenderableType(const QSurfaceFormat* self) { QSurfaceFormat::RenderableType _ret = self->renderableType(); - return static_cast(_ret); + return static_cast(_ret); } void QSurfaceFormat_SetMajorVersion(QSurfaceFormat* self, int majorVersion) { @@ -146,11 +146,11 @@ void QSurfaceFormat_SetOptions(QSurfaceFormat* self, int options) { self->setOptions(static_cast(options)); } -void QSurfaceFormat_SetOptionWithOption(QSurfaceFormat* self, uintptr_t option) { +void QSurfaceFormat_SetOptionWithOption(QSurfaceFormat* self, int option) { self->setOption(static_cast(option)); } -bool QSurfaceFormat_TestOptionWithOption(const QSurfaceFormat* self, uintptr_t option) { +bool QSurfaceFormat_TestOptionWithOption(const QSurfaceFormat* self, int option) { return self->testOption(static_cast(option)); } @@ -167,12 +167,12 @@ void QSurfaceFormat_SetSwapInterval(QSurfaceFormat* self, int interval) { self->setSwapInterval(static_cast(interval)); } -uintptr_t QSurfaceFormat_ColorSpace(const QSurfaceFormat* self) { +int QSurfaceFormat_ColorSpace(const QSurfaceFormat* self) { QSurfaceFormat::ColorSpace _ret = self->colorSpace(); - return static_cast(_ret); + return static_cast(_ret); } -void QSurfaceFormat_SetColorSpace(QSurfaceFormat* self, uintptr_t colorSpace) { +void QSurfaceFormat_SetColorSpace(QSurfaceFormat* self, int colorSpace) { self->setColorSpace(static_cast(colorSpace)); } @@ -184,7 +184,7 @@ QSurfaceFormat* QSurfaceFormat_DefaultFormat() { return new QSurfaceFormat(QSurfaceFormat::defaultFormat()); } -void QSurfaceFormat_SetOption2(QSurfaceFormat* self, uintptr_t option, bool on) { +void QSurfaceFormat_SetOption2(QSurfaceFormat* self, int option, bool on) { self->setOption(static_cast(option), on); } diff --git a/qt/gen_qsurfaceformat.go b/qt/gen_qsurfaceformat.go index d86dec5..8b76948 100644 --- a/qt/gen_qsurfaceformat.go +++ b/qt/gen_qsurfaceformat.go @@ -85,7 +85,7 @@ func NewQSurfaceFormat() *QSurfaceFormat { // NewQSurfaceFormat2 constructs a new QSurfaceFormat object. func NewQSurfaceFormat2(options int) *QSurfaceFormat { - ret := C.QSurfaceFormat_new2((C.int)(options)) + ret := C.QSurfaceFormat_new2(options) return newQSurfaceFormat(ret) } @@ -156,7 +156,7 @@ func (this *QSurfaceFormat) Samples() int { } func (this *QSurfaceFormat) SetSwapBehavior(behavior QSurfaceFormat__SwapBehavior) { - C.QSurfaceFormat_SetSwapBehavior(this.h, (C.uintptr_t)(behavior)) + C.QSurfaceFormat_SetSwapBehavior(this.h, (C.int)(behavior)) } func (this *QSurfaceFormat) SwapBehavior() QSurfaceFormat__SwapBehavior { @@ -168,7 +168,7 @@ func (this *QSurfaceFormat) HasAlpha() bool { } func (this *QSurfaceFormat) SetProfile(profile QSurfaceFormat__OpenGLContextProfile) { - C.QSurfaceFormat_SetProfile(this.h, (C.uintptr_t)(profile)) + C.QSurfaceFormat_SetProfile(this.h, (C.int)(profile)) } func (this *QSurfaceFormat) Profile() QSurfaceFormat__OpenGLContextProfile { @@ -176,7 +176,7 @@ func (this *QSurfaceFormat) Profile() QSurfaceFormat__OpenGLContextProfile { } func (this *QSurfaceFormat) SetRenderableType(typeVal QSurfaceFormat__RenderableType) { - C.QSurfaceFormat_SetRenderableType(this.h, (C.uintptr_t)(typeVal)) + C.QSurfaceFormat_SetRenderableType(this.h, (C.int)(typeVal)) } func (this *QSurfaceFormat) RenderableType() QSurfaceFormat__RenderableType { @@ -212,23 +212,23 @@ func (this *QSurfaceFormat) SetStereo(enable bool) { } func (this *QSurfaceFormat) SetOption(opt int) { - C.QSurfaceFormat_SetOption(this.h, (C.int)(opt)) + C.QSurfaceFormat_SetOption(this.h, opt) } func (this *QSurfaceFormat) TestOption(opt int) bool { - return (bool)(C.QSurfaceFormat_TestOption(this.h, (C.int)(opt))) + return (bool)(C.QSurfaceFormat_TestOption(this.h, opt)) } func (this *QSurfaceFormat) SetOptions(options int) { - C.QSurfaceFormat_SetOptions(this.h, (C.int)(options)) + C.QSurfaceFormat_SetOptions(this.h, options) } func (this *QSurfaceFormat) SetOptionWithOption(option QSurfaceFormat__FormatOption) { - C.QSurfaceFormat_SetOptionWithOption(this.h, (C.uintptr_t)(option)) + C.QSurfaceFormat_SetOptionWithOption(this.h, (C.int)(option)) } func (this *QSurfaceFormat) TestOptionWithOption(option QSurfaceFormat__FormatOption) bool { - return (bool)(C.QSurfaceFormat_TestOptionWithOption(this.h, (C.uintptr_t)(option))) + return (bool)(C.QSurfaceFormat_TestOptionWithOption(this.h, (C.int)(option))) } func (this *QSurfaceFormat) Options() int { @@ -248,7 +248,7 @@ func (this *QSurfaceFormat) ColorSpace() QSurfaceFormat__ColorSpace { } func (this *QSurfaceFormat) SetColorSpace(colorSpace QSurfaceFormat__ColorSpace) { - C.QSurfaceFormat_SetColorSpace(this.h, (C.uintptr_t)(colorSpace)) + C.QSurfaceFormat_SetColorSpace(this.h, (C.int)(colorSpace)) } func QSurfaceFormat_SetDefaultFormat(format *QSurfaceFormat) { @@ -263,7 +263,7 @@ func QSurfaceFormat_DefaultFormat() *QSurfaceFormat { } func (this *QSurfaceFormat) SetOption2(option QSurfaceFormat__FormatOption, on bool) { - C.QSurfaceFormat_SetOption2(this.h, (C.uintptr_t)(option), (C.bool)(on)) + C.QSurfaceFormat_SetOption2(this.h, (C.int)(option), (C.bool)(on)) } // Delete this object from C++ memory. diff --git a/qt/gen_qsurfaceformat.h b/qt/gen_qsurfaceformat.h index 85a601d..9b93ebd 100644 --- a/qt/gen_qsurfaceformat.h +++ b/qt/gen_qsurfaceformat.h @@ -37,13 +37,13 @@ void QSurfaceFormat_SetAlphaBufferSize(QSurfaceFormat* self, int size); int QSurfaceFormat_AlphaBufferSize(const QSurfaceFormat* self); void QSurfaceFormat_SetSamples(QSurfaceFormat* self, int numSamples); int QSurfaceFormat_Samples(const QSurfaceFormat* self); -void QSurfaceFormat_SetSwapBehavior(QSurfaceFormat* self, uintptr_t behavior); -uintptr_t QSurfaceFormat_SwapBehavior(const QSurfaceFormat* self); +void QSurfaceFormat_SetSwapBehavior(QSurfaceFormat* self, int behavior); +int QSurfaceFormat_SwapBehavior(const QSurfaceFormat* self); bool QSurfaceFormat_HasAlpha(const QSurfaceFormat* self); -void QSurfaceFormat_SetProfile(QSurfaceFormat* self, uintptr_t profile); -uintptr_t QSurfaceFormat_Profile(const QSurfaceFormat* self); -void QSurfaceFormat_SetRenderableType(QSurfaceFormat* self, uintptr_t typeVal); -uintptr_t QSurfaceFormat_RenderableType(const QSurfaceFormat* self); +void QSurfaceFormat_SetProfile(QSurfaceFormat* self, int profile); +int QSurfaceFormat_Profile(const QSurfaceFormat* self); +void QSurfaceFormat_SetRenderableType(QSurfaceFormat* self, int typeVal); +int QSurfaceFormat_RenderableType(const QSurfaceFormat* self); void QSurfaceFormat_SetMajorVersion(QSurfaceFormat* self, int majorVersion); int QSurfaceFormat_MajorVersion(const QSurfaceFormat* self); void QSurfaceFormat_SetMinorVersion(QSurfaceFormat* self, int minorVersion); @@ -54,16 +54,16 @@ void QSurfaceFormat_SetStereo(QSurfaceFormat* self, bool enable); void QSurfaceFormat_SetOption(QSurfaceFormat* self, int opt); bool QSurfaceFormat_TestOption(const QSurfaceFormat* self, int opt); void QSurfaceFormat_SetOptions(QSurfaceFormat* self, int options); -void QSurfaceFormat_SetOptionWithOption(QSurfaceFormat* self, uintptr_t option); -bool QSurfaceFormat_TestOptionWithOption(const QSurfaceFormat* self, uintptr_t option); +void QSurfaceFormat_SetOptionWithOption(QSurfaceFormat* self, int option); +bool QSurfaceFormat_TestOptionWithOption(const QSurfaceFormat* self, int option); int QSurfaceFormat_Options(const QSurfaceFormat* self); int QSurfaceFormat_SwapInterval(const QSurfaceFormat* self); void QSurfaceFormat_SetSwapInterval(QSurfaceFormat* self, int interval); -uintptr_t QSurfaceFormat_ColorSpace(const QSurfaceFormat* self); -void QSurfaceFormat_SetColorSpace(QSurfaceFormat* self, uintptr_t colorSpace); +int QSurfaceFormat_ColorSpace(const QSurfaceFormat* self); +void QSurfaceFormat_SetColorSpace(QSurfaceFormat* self, int colorSpace); void QSurfaceFormat_SetDefaultFormat(QSurfaceFormat* format); QSurfaceFormat* QSurfaceFormat_DefaultFormat(); -void QSurfaceFormat_SetOption2(QSurfaceFormat* self, uintptr_t option, bool on); +void QSurfaceFormat_SetOption2(QSurfaceFormat* self, int option, bool on); void QSurfaceFormat_Delete(QSurfaceFormat* self); #ifdef __cplusplus diff --git a/qt/gen_qsystemsemaphore.cpp b/qt/gen_qsystemsemaphore.cpp index be6dd18..3e71a7b 100644 --- a/qt/gen_qsystemsemaphore.cpp +++ b/qt/gen_qsystemsemaphore.cpp @@ -16,7 +16,7 @@ QSystemSemaphore* QSystemSemaphore_new2(struct miqt_string* key, int initialValu return new QSystemSemaphore(key_QString, static_cast(initialValue)); } -QSystemSemaphore* QSystemSemaphore_new3(struct miqt_string* key, int initialValue, uintptr_t mode) { +QSystemSemaphore* QSystemSemaphore_new3(struct miqt_string* key, int initialValue, int mode) { QString key_QString = QString::fromUtf8(&key->data, key->len); return new QSystemSemaphore(key_QString, static_cast(initialValue), static_cast(mode)); } @@ -41,9 +41,9 @@ bool QSystemSemaphore_Release(QSystemSemaphore* self) { return self->release(); } -uintptr_t QSystemSemaphore_Error(const QSystemSemaphore* self) { +int QSystemSemaphore_Error(const QSystemSemaphore* self) { QSystemSemaphore::SystemSemaphoreError _ret = self->error(); - return static_cast(_ret); + return static_cast(_ret); } struct miqt_string* QSystemSemaphore_ErrorString(const QSystemSemaphore* self) { @@ -58,7 +58,7 @@ void QSystemSemaphore_SetKey2(QSystemSemaphore* self, struct miqt_string* key, i self->setKey(key_QString, static_cast(initialValue)); } -void QSystemSemaphore_SetKey3(QSystemSemaphore* self, struct miqt_string* key, int initialValue, uintptr_t mode) { +void QSystemSemaphore_SetKey3(QSystemSemaphore* self, struct miqt_string* key, int initialValue, int mode) { QString key_QString = QString::fromUtf8(&key->data, key->len); self->setKey(key_QString, static_cast(initialValue), static_cast(mode)); } diff --git a/qt/gen_qsystemsemaphore.go b/qt/gen_qsystemsemaphore.go index 71ac87a..0902436 100644 --- a/qt/gen_qsystemsemaphore.go +++ b/qt/gen_qsystemsemaphore.go @@ -74,7 +74,7 @@ func NewQSystemSemaphore2(key string, initialValue int) *QSystemSemaphore { func NewQSystemSemaphore3(key string, initialValue int, mode QSystemSemaphore__AccessMode) *QSystemSemaphore { key_ms := miqt_strdupg(key) defer C.free(key_ms) - ret := C.QSystemSemaphore_new3((*C.struct_miqt_string)(key_ms), (C.int)(initialValue), (C.uintptr_t)(mode)) + ret := C.QSystemSemaphore_new3((*C.struct_miqt_string)(key_ms), (C.int)(initialValue), (C.int)(mode)) return newQSystemSemaphore(ret) } @@ -119,7 +119,7 @@ func (this *QSystemSemaphore) SetKey2(key string, initialValue int) { func (this *QSystemSemaphore) SetKey3(key string, initialValue int, mode QSystemSemaphore__AccessMode) { key_ms := miqt_strdupg(key) defer C.free(key_ms) - C.QSystemSemaphore_SetKey3(this.h, (*C.struct_miqt_string)(key_ms), (C.int)(initialValue), (C.uintptr_t)(mode)) + C.QSystemSemaphore_SetKey3(this.h, (*C.struct_miqt_string)(key_ms), (C.int)(initialValue), (C.int)(mode)) } func (this *QSystemSemaphore) Release1(n int) bool { diff --git a/qt/gen_qsystemsemaphore.h b/qt/gen_qsystemsemaphore.h index e2d9e87..77f71ac 100644 --- a/qt/gen_qsystemsemaphore.h +++ b/qt/gen_qsystemsemaphore.h @@ -21,15 +21,15 @@ typedef struct QSystemSemaphore QSystemSemaphore; QSystemSemaphore* QSystemSemaphore_new(struct miqt_string* key); QSystemSemaphore* QSystemSemaphore_new2(struct miqt_string* key, int initialValue); -QSystemSemaphore* QSystemSemaphore_new3(struct miqt_string* key, int initialValue, uintptr_t mode); +QSystemSemaphore* QSystemSemaphore_new3(struct miqt_string* key, int initialValue, int mode); void QSystemSemaphore_SetKey(QSystemSemaphore* self, struct miqt_string* key); struct miqt_string* QSystemSemaphore_Key(const QSystemSemaphore* self); bool QSystemSemaphore_Acquire(QSystemSemaphore* self); bool QSystemSemaphore_Release(QSystemSemaphore* self); -uintptr_t QSystemSemaphore_Error(const QSystemSemaphore* self); +int QSystemSemaphore_Error(const QSystemSemaphore* self); struct miqt_string* QSystemSemaphore_ErrorString(const QSystemSemaphore* self); void QSystemSemaphore_SetKey2(QSystemSemaphore* self, struct miqt_string* key, int initialValue); -void QSystemSemaphore_SetKey3(QSystemSemaphore* self, struct miqt_string* key, int initialValue, uintptr_t mode); +void QSystemSemaphore_SetKey3(QSystemSemaphore* self, struct miqt_string* key, int initialValue, int mode); bool QSystemSemaphore_Release1(QSystemSemaphore* self, int n); void QSystemSemaphore_Delete(QSystemSemaphore* self); diff --git a/qt/gen_qsystemtrayicon.cpp b/qt/gen_qsystemtrayicon.cpp index 878fd96..9e1c001 100644 --- a/qt/gen_qsystemtrayicon.cpp +++ b/qt/gen_qsystemtrayicon.cpp @@ -113,14 +113,14 @@ void QSystemTrayIcon_ShowMessage2(QSystemTrayIcon* self, struct miqt_string* tit self->showMessage(title_QString, msg_QString); } -void QSystemTrayIcon_Activated(QSystemTrayIcon* self, uintptr_t reason) { +void QSystemTrayIcon_Activated(QSystemTrayIcon* self, int reason) { self->activated(static_cast(reason)); } void QSystemTrayIcon_connect_Activated(QSystemTrayIcon* self, void* slot) { QSystemTrayIcon::connect(self, static_cast(&QSystemTrayIcon::activated), self, [=](QSystemTrayIcon::ActivationReason reason) { QSystemTrayIcon::ActivationReason reason_ret = reason; - uintptr_t sigval1 = static_cast(reason_ret); + int sigval1 = static_cast(reason_ret); miqt_exec_callback_QSystemTrayIcon_Activated(slot, sigval1); }); } @@ -169,13 +169,13 @@ void QSystemTrayIcon_ShowMessage4(QSystemTrayIcon* self, struct miqt_string* tit self->showMessage(title_QString, msg_QString, *icon, static_cast(msecs)); } -void QSystemTrayIcon_ShowMessage3(QSystemTrayIcon* self, struct miqt_string* title, struct miqt_string* msg, uintptr_t icon) { +void QSystemTrayIcon_ShowMessage3(QSystemTrayIcon* self, struct miqt_string* title, struct miqt_string* msg, int icon) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString msg_QString = QString::fromUtf8(&msg->data, msg->len); self->showMessage(title_QString, msg_QString, static_cast(icon)); } -void QSystemTrayIcon_ShowMessage42(QSystemTrayIcon* self, struct miqt_string* title, struct miqt_string* msg, uintptr_t icon, int msecs) { +void QSystemTrayIcon_ShowMessage42(QSystemTrayIcon* self, struct miqt_string* title, struct miqt_string* msg, int icon, int msecs) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString msg_QString = QString::fromUtf8(&msg->data, msg->len); self->showMessage(title_QString, msg_QString, static_cast(icon), static_cast(msecs)); diff --git a/qt/gen_qsystemtrayicon.go b/qt/gen_qsystemtrayicon.go index f52498d..bd66aa8 100644 --- a/qt/gen_qsystemtrayicon.go +++ b/qt/gen_qsystemtrayicon.go @@ -182,14 +182,14 @@ func (this *QSystemTrayIcon) ShowMessage2(title string, msg string) { } func (this *QSystemTrayIcon) Activated(reason QSystemTrayIcon__ActivationReason) { - C.QSystemTrayIcon_Activated(this.h, (C.uintptr_t)(reason)) + C.QSystemTrayIcon_Activated(this.h, (C.int)(reason)) } func (this *QSystemTrayIcon) OnActivated(slot func(reason QSystemTrayIcon__ActivationReason)) { C.QSystemTrayIcon_connect_Activated(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QSystemTrayIcon_Activated -func miqt_exec_callback_QSystemTrayIcon_Activated(cb *C.void, reason C.uintptr_t) { +func miqt_exec_callback_QSystemTrayIcon_Activated(cb *C.void, reason C.int) { gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(reason QSystemTrayIcon__ActivationReason)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -275,7 +275,7 @@ func (this *QSystemTrayIcon) ShowMessage3(title string, msg string, icon QSystem defer C.free(title_ms) msg_ms := miqt_strdupg(msg) defer C.free(msg_ms) - C.QSystemTrayIcon_ShowMessage3(this.h, (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(msg_ms), (C.uintptr_t)(icon)) + C.QSystemTrayIcon_ShowMessage3(this.h, (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(msg_ms), (C.int)(icon)) } func (this *QSystemTrayIcon) ShowMessage42(title string, msg string, icon QSystemTrayIcon__MessageIcon, msecs int) { @@ -283,7 +283,7 @@ func (this *QSystemTrayIcon) ShowMessage42(title string, msg string, icon QSyste defer C.free(title_ms) msg_ms := miqt_strdupg(msg) defer C.free(msg_ms) - C.QSystemTrayIcon_ShowMessage42(this.h, (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(msg_ms), (C.uintptr_t)(icon), (C.int)(msecs)) + C.QSystemTrayIcon_ShowMessage42(this.h, (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(msg_ms), (C.int)(icon), (C.int)(msecs)) } // Delete this object from C++ memory. diff --git a/qt/gen_qsystemtrayicon.h b/qt/gen_qsystemtrayicon.h index 837f11c..9c02c59 100644 --- a/qt/gen_qsystemtrayicon.h +++ b/qt/gen_qsystemtrayicon.h @@ -51,7 +51,7 @@ void QSystemTrayIcon_Show(QSystemTrayIcon* self); void QSystemTrayIcon_Hide(QSystemTrayIcon* self); void QSystemTrayIcon_ShowMessage(QSystemTrayIcon* self, struct miqt_string* title, struct miqt_string* msg, QIcon* icon); void QSystemTrayIcon_ShowMessage2(QSystemTrayIcon* self, struct miqt_string* title, struct miqt_string* msg); -void QSystemTrayIcon_Activated(QSystemTrayIcon* self, uintptr_t reason); +void QSystemTrayIcon_Activated(QSystemTrayIcon* self, int reason); void QSystemTrayIcon_connect_Activated(QSystemTrayIcon* self, void* slot); void QSystemTrayIcon_MessageClicked(QSystemTrayIcon* self); void QSystemTrayIcon_connect_MessageClicked(QSystemTrayIcon* self, void* slot); @@ -60,8 +60,8 @@ struct miqt_string* QSystemTrayIcon_Tr3(const char* s, const char* c, int n); struct miqt_string* QSystemTrayIcon_TrUtf82(const char* s, const char* c); struct miqt_string* QSystemTrayIcon_TrUtf83(const char* s, const char* c, int n); void QSystemTrayIcon_ShowMessage4(QSystemTrayIcon* self, struct miqt_string* title, struct miqt_string* msg, QIcon* icon, int msecs); -void QSystemTrayIcon_ShowMessage3(QSystemTrayIcon* self, struct miqt_string* title, struct miqt_string* msg, uintptr_t icon); -void QSystemTrayIcon_ShowMessage42(QSystemTrayIcon* self, struct miqt_string* title, struct miqt_string* msg, uintptr_t icon, int msecs); +void QSystemTrayIcon_ShowMessage3(QSystemTrayIcon* self, struct miqt_string* title, struct miqt_string* msg, int icon); +void QSystemTrayIcon_ShowMessage42(QSystemTrayIcon* self, struct miqt_string* title, struct miqt_string* msg, int icon, int msecs); void QSystemTrayIcon_Delete(QSystemTrayIcon* self); #ifdef __cplusplus diff --git a/qt/gen_qtabbar.cpp b/qt/gen_qtabbar.cpp index db03317..6f26f7a 100644 --- a/qt/gen_qtabbar.cpp +++ b/qt/gen_qtabbar.cpp @@ -40,12 +40,12 @@ struct miqt_string* QTabBar_TrUtf8(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -uintptr_t QTabBar_Shape(const QTabBar* self) { +int QTabBar_Shape(const QTabBar* self) { QTabBar::Shape _ret = self->shape(); - return static_cast(_ret); + return static_cast(_ret); } -void QTabBar_SetShape(QTabBar* self, uintptr_t shape) { +void QTabBar_SetShape(QTabBar* self, int shape) { self->setShape(static_cast(shape)); } @@ -121,12 +121,12 @@ void QTabBar_SetTabIcon(QTabBar* self, int index, QIcon* icon) { self->setTabIcon(static_cast(index), *icon); } -uintptr_t QTabBar_ElideMode(const QTabBar* self) { +int QTabBar_ElideMode(const QTabBar* self) { Qt::TextElideMode _ret = self->elideMode(); - return static_cast(_ret); + return static_cast(_ret); } -void QTabBar_SetElideMode(QTabBar* self, uintptr_t mode) { +void QTabBar_SetElideMode(QTabBar* self, int mode) { self->setElideMode(static_cast(mode)); } @@ -218,20 +218,20 @@ void QTabBar_SetTabsClosable(QTabBar* self, bool closable) { self->setTabsClosable(closable); } -void QTabBar_SetTabButton(QTabBar* self, int index, uintptr_t position, QWidget* widget) { +void QTabBar_SetTabButton(QTabBar* self, int index, int position, QWidget* widget) { self->setTabButton(static_cast(index), static_cast(position), widget); } -QWidget* QTabBar_TabButton(const QTabBar* self, int index, uintptr_t position) { +QWidget* QTabBar_TabButton(const QTabBar* self, int index, int position) { return self->tabButton(static_cast(index), static_cast(position)); } -uintptr_t QTabBar_SelectionBehaviorOnRemove(const QTabBar* self) { +int QTabBar_SelectionBehaviorOnRemove(const QTabBar* self) { QTabBar::SelectionBehavior _ret = self->selectionBehaviorOnRemove(); - return static_cast(_ret); + return static_cast(_ret); } -void QTabBar_SetSelectionBehaviorOnRemove(QTabBar* self, uintptr_t behavior) { +void QTabBar_SetSelectionBehaviorOnRemove(QTabBar* self, int behavior) { self->setSelectionBehaviorOnRemove(static_cast(behavior)); } diff --git a/qt/gen_qtabbar.go b/qt/gen_qtabbar.go index 2386678..5b04dfc 100644 --- a/qt/gen_qtabbar.go +++ b/qt/gen_qtabbar.go @@ -104,7 +104,7 @@ func (this *QTabBar) Shape() QTabBar__Shape { } func (this *QTabBar) SetShape(shape QTabBar__Shape) { - C.QTabBar_SetShape(this.h, (C.uintptr_t)(shape)) + C.QTabBar_SetShape(this.h, (C.int)(shape)) } func (this *QTabBar) AddTab(text string) int { @@ -195,7 +195,7 @@ func (this *QTabBar) ElideMode() TextElideMode { } func (this *QTabBar) SetElideMode(mode TextElideMode) { - C.QTabBar_SetElideMode(this.h, (C.uintptr_t)(mode)) + C.QTabBar_SetElideMode(this.h, (C.int)(mode)) } func (this *QTabBar) SetTabToolTip(index int, tip string) { @@ -304,11 +304,11 @@ func (this *QTabBar) SetTabsClosable(closable bool) { } func (this *QTabBar) SetTabButton(index int, position QTabBar__ButtonPosition, widget *QWidget) { - C.QTabBar_SetTabButton(this.h, (C.int)(index), (C.uintptr_t)(position), widget.cPointer()) + C.QTabBar_SetTabButton(this.h, (C.int)(index), (C.int)(position), widget.cPointer()) } func (this *QTabBar) TabButton(index int, position QTabBar__ButtonPosition) *QWidget { - return newQWidget_U(unsafe.Pointer(C.QTabBar_TabButton(this.h, (C.int)(index), (C.uintptr_t)(position)))) + return newQWidget_U(unsafe.Pointer(C.QTabBar_TabButton(this.h, (C.int)(index), (C.int)(position)))) } func (this *QTabBar) SelectionBehaviorOnRemove() QTabBar__SelectionBehavior { @@ -316,7 +316,7 @@ func (this *QTabBar) SelectionBehaviorOnRemove() QTabBar__SelectionBehavior { } func (this *QTabBar) SetSelectionBehaviorOnRemove(behavior QTabBar__SelectionBehavior) { - C.QTabBar_SetSelectionBehaviorOnRemove(this.h, (C.uintptr_t)(behavior)) + C.QTabBar_SetSelectionBehaviorOnRemove(this.h, (C.int)(behavior)) } func (this *QTabBar) Expanding() bool { diff --git a/qt/gen_qtabbar.h b/qt/gen_qtabbar.h index e61ae9e..0e1ffa8 100644 --- a/qt/gen_qtabbar.h +++ b/qt/gen_qtabbar.h @@ -40,8 +40,8 @@ QTabBar* QTabBar_new2(QWidget* parent); QMetaObject* QTabBar_MetaObject(const QTabBar* self); struct miqt_string* QTabBar_Tr(const char* s); struct miqt_string* QTabBar_TrUtf8(const char* s); -uintptr_t QTabBar_Shape(const QTabBar* self); -void QTabBar_SetShape(QTabBar* self, uintptr_t shape); +int QTabBar_Shape(const QTabBar* self); +void QTabBar_SetShape(QTabBar* self, int shape); int QTabBar_AddTab(QTabBar* self, struct miqt_string* text); int QTabBar_AddTab2(QTabBar* self, QIcon* icon, struct miqt_string* text); int QTabBar_InsertTab(QTabBar* self, int index, struct miqt_string* text); @@ -58,8 +58,8 @@ QColor* QTabBar_TabTextColor(const QTabBar* self, int index); void QTabBar_SetTabTextColor(QTabBar* self, int index, QColor* color); QIcon* QTabBar_TabIcon(const QTabBar* self, int index); void QTabBar_SetTabIcon(QTabBar* self, int index, QIcon* icon); -uintptr_t QTabBar_ElideMode(const QTabBar* self); -void QTabBar_SetElideMode(QTabBar* self, uintptr_t mode); +int QTabBar_ElideMode(const QTabBar* self); +void QTabBar_SetElideMode(QTabBar* self, int mode); void QTabBar_SetTabToolTip(QTabBar* self, int index, struct miqt_string* tip); struct miqt_string* QTabBar_TabToolTip(const QTabBar* self, int index); void QTabBar_SetTabWhatsThis(QTabBar* self, int index, struct miqt_string* text); @@ -80,10 +80,10 @@ bool QTabBar_UsesScrollButtons(const QTabBar* self); void QTabBar_SetUsesScrollButtons(QTabBar* self, bool useButtons); bool QTabBar_TabsClosable(const QTabBar* self); void QTabBar_SetTabsClosable(QTabBar* self, bool closable); -void QTabBar_SetTabButton(QTabBar* self, int index, uintptr_t position, QWidget* widget); -QWidget* QTabBar_TabButton(const QTabBar* self, int index, uintptr_t position); -uintptr_t QTabBar_SelectionBehaviorOnRemove(const QTabBar* self); -void QTabBar_SetSelectionBehaviorOnRemove(QTabBar* self, uintptr_t behavior); +void QTabBar_SetTabButton(QTabBar* self, int index, int position, QWidget* widget); +QWidget* QTabBar_TabButton(const QTabBar* self, int index, int position); +int QTabBar_SelectionBehaviorOnRemove(const QTabBar* self); +void QTabBar_SetSelectionBehaviorOnRemove(QTabBar* self, int behavior); bool QTabBar_Expanding(const QTabBar* self); void QTabBar_SetExpanding(QTabBar* self, bool enabled); bool QTabBar_IsMovable(const QTabBar* self); diff --git a/qt/gen_qtableview.cpp b/qt/gen_qtableview.cpp index 878a89a..a97949c 100644 --- a/qt/gen_qtableview.cpp +++ b/qt/gen_qtableview.cpp @@ -132,12 +132,12 @@ bool QTableView_ShowGrid(const QTableView* self) { return self->showGrid(); } -uintptr_t QTableView_GridStyle(const QTableView* self) { +int QTableView_GridStyle(const QTableView* self) { Qt::PenStyle _ret = self->gridStyle(); - return static_cast(_ret); + return static_cast(_ret); } -void QTableView_SetGridStyle(QTableView* self, uintptr_t style) { +void QTableView_SetGridStyle(QTableView* self, int style) { self->setGridStyle(static_cast(style)); } @@ -229,7 +229,7 @@ void QTableView_SortByColumn(QTableView* self, int column) { self->sortByColumn(static_cast(column)); } -void QTableView_SortByColumn2(QTableView* self, int column, uintptr_t order) { +void QTableView_SortByColumn2(QTableView* self, int column, int order) { self->sortByColumn(static_cast(column), static_cast(order)); } @@ -265,7 +265,7 @@ struct miqt_string* QTableView_TrUtf83(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -void QTableView_ScrollTo2(QTableView* self, QModelIndex* index, uintptr_t hint) { +void QTableView_ScrollTo2(QTableView* self, QModelIndex* index, int hint) { self->scrollTo(*index, static_cast(hint)); } diff --git a/qt/gen_qtableview.go b/qt/gen_qtableview.go index 9e28d9d..76178e9 100644 --- a/qt/gen_qtableview.go +++ b/qt/gen_qtableview.go @@ -167,7 +167,7 @@ func (this *QTableView) GridStyle() PenStyle { } func (this *QTableView) SetGridStyle(style PenStyle) { - C.QTableView_SetGridStyle(this.h, (C.uintptr_t)(style)) + C.QTableView_SetGridStyle(this.h, (C.int)(style)) } func (this *QTableView) SetWordWrap(on bool) { @@ -265,7 +265,7 @@ func (this *QTableView) SortByColumn(column int) { } func (this *QTableView) SortByColumn2(column int, order SortOrder) { - C.QTableView_SortByColumn2(this.h, (C.int)(column), (C.uintptr_t)(order)) + C.QTableView_SortByColumn2(this.h, (C.int)(column), (C.int)(order)) } func (this *QTableView) SetShowGrid(show bool) { @@ -317,7 +317,7 @@ func QTableView_TrUtf83(s string, c string, n int) string { } func (this *QTableView) ScrollTo2(index *QModelIndex, hint QAbstractItemView__ScrollHint) { - C.QTableView_ScrollTo2(this.h, index.cPointer(), (C.uintptr_t)(hint)) + C.QTableView_ScrollTo2(this.h, index.cPointer(), (C.int)(hint)) } // Delete this object from C++ memory. diff --git a/qt/gen_qtableview.h b/qt/gen_qtableview.h index b9ced45..74fafef 100644 --- a/qt/gen_qtableview.h +++ b/qt/gen_qtableview.h @@ -63,8 +63,8 @@ void QTableView_SetColumnHidden(QTableView* self, int column, bool hide); void QTableView_SetSortingEnabled(QTableView* self, bool enable); bool QTableView_IsSortingEnabled(const QTableView* self); bool QTableView_ShowGrid(const QTableView* self); -uintptr_t QTableView_GridStyle(const QTableView* self); -void QTableView_SetGridStyle(QTableView* self, uintptr_t style); +int QTableView_GridStyle(const QTableView* self); +void QTableView_SetGridStyle(QTableView* self, int style); void QTableView_SetWordWrap(QTableView* self, bool on); bool QTableView_WordWrap(const QTableView* self); void QTableView_SetCornerButtonEnabled(QTableView* self, bool enable); @@ -87,13 +87,13 @@ void QTableView_ResizeRowsToContents(QTableView* self); void QTableView_ResizeColumnToContents(QTableView* self, int column); void QTableView_ResizeColumnsToContents(QTableView* self); void QTableView_SortByColumn(QTableView* self, int column); -void QTableView_SortByColumn2(QTableView* self, int column, uintptr_t order); +void QTableView_SortByColumn2(QTableView* self, int column, int order); void QTableView_SetShowGrid(QTableView* self, bool show); struct miqt_string* QTableView_Tr2(const char* s, const char* c); struct miqt_string* QTableView_Tr3(const char* s, const char* c, int n); struct miqt_string* QTableView_TrUtf82(const char* s, const char* c); struct miqt_string* QTableView_TrUtf83(const char* s, const char* c, int n); -void QTableView_ScrollTo2(QTableView* self, QModelIndex* index, uintptr_t hint); +void QTableView_ScrollTo2(QTableView* self, QModelIndex* index, int hint); void QTableView_Delete(QTableView* self); #ifdef __cplusplus diff --git a/qt/gen_qtablewidget.cpp b/qt/gen_qtablewidget.cpp index fd8e125..5eb4574 100644 --- a/qt/gen_qtablewidget.cpp +++ b/qt/gen_qtablewidget.cpp @@ -233,12 +233,12 @@ void QTableWidgetItem_SetForeground(QTableWidgetItem* self, QBrush* brush) { self->setForeground(*brush); } -uintptr_t QTableWidgetItem_CheckState(const QTableWidgetItem* self) { +int QTableWidgetItem_CheckState(const QTableWidgetItem* self) { Qt::CheckState _ret = self->checkState(); - return static_cast(_ret); + return static_cast(_ret); } -void QTableWidgetItem_SetCheckState(QTableWidgetItem* self, uintptr_t state) { +void QTableWidgetItem_SetCheckState(QTableWidgetItem* self, int state) { self->setCheckState(static_cast(state)); } @@ -492,7 +492,7 @@ struct miqt_array* QTableWidget_SelectedRanges(const QTableWidget* self) { } struct miqt_array* QTableWidget_SelectedItems(const QTableWidget* self) { - QList _ret = self->selectedItems(); + QList _ret = self->selectedItems(); // Convert QList<> from C++ memory to manually-managed C memory QTableWidgetItem** _arr = static_cast(malloc(sizeof(QTableWidgetItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -506,7 +506,7 @@ struct miqt_array* QTableWidget_SelectedItems(const QTableWidget* self) { struct miqt_array* QTableWidget_FindItems(const QTableWidget* self, struct miqt_string* text, int flags) { QString text_QString = QString::fromUtf8(&text->data, text->len); - QList _ret = self->findItems(text_QString, static_cast(flags)); + QList _ret = self->findItems(text_QString, static_cast(flags)); // Convert QList<> from C++ memory to manually-managed C memory QTableWidgetItem** _arr = static_cast(malloc(sizeof(QTableWidgetItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -776,11 +776,11 @@ struct miqt_string* QTableWidget_TrUtf83(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -void QTableWidget_SortItems2(QTableWidget* self, int column, uintptr_t order) { +void QTableWidget_SortItems2(QTableWidget* self, int column, int order) { self->sortItems(static_cast(column), static_cast(order)); } -void QTableWidget_ScrollToItem2(QTableWidget* self, QTableWidgetItem* item, uintptr_t hint) { +void QTableWidget_ScrollToItem2(QTableWidget* self, QTableWidgetItem* item, int hint) { self->scrollToItem(item, static_cast(hint)); } diff --git a/qt/gen_qtablewidget.go b/qt/gen_qtablewidget.go index 3cd1ef8..bf90ab1 100644 --- a/qt/gen_qtablewidget.go +++ b/qt/gen_qtablewidget.go @@ -204,7 +204,7 @@ func (this *QTableWidgetItem) Flags() int { } func (this *QTableWidgetItem) SetFlags(flags int) { - C.QTableWidgetItem_SetFlags(this.h, (C.int)(flags)) + C.QTableWidgetItem_SetFlags(this.h, flags) } func (this *QTableWidgetItem) Text() string { @@ -338,7 +338,7 @@ func (this *QTableWidgetItem) CheckState() CheckState { } func (this *QTableWidgetItem) SetCheckState(state CheckState) { - C.QTableWidgetItem_SetCheckState(this.h, (C.uintptr_t)(state)) + C.QTableWidgetItem_SetCheckState(this.h, (C.int)(state)) } func (this *QTableWidgetItem) SizeHint() *QSize { @@ -571,7 +571,7 @@ func (this *QTableWidget) SetCurrentItem(item *QTableWidgetItem) { } func (this *QTableWidget) SetCurrentItem2(item *QTableWidgetItem, command int) { - C.QTableWidget_SetCurrentItem2(this.h, item.cPointer(), (C.int)(command)) + C.QTableWidget_SetCurrentItem2(this.h, item.cPointer(), command) } func (this *QTableWidget) SetCurrentCell(row int, column int) { @@ -579,7 +579,7 @@ func (this *QTableWidget) SetCurrentCell(row int, column int) { } func (this *QTableWidget) SetCurrentCell2(row int, column int, command int) { - C.QTableWidget_SetCurrentCell2(this.h, (C.int)(row), (C.int)(column), (C.int)(command)) + C.QTableWidget_SetCurrentCell2(this.h, (C.int)(row), (C.int)(column), command) } func (this *QTableWidget) SortItems(column int) { @@ -662,7 +662,7 @@ func (this *QTableWidget) SelectedItems() []*QTableWidgetItem { func (this *QTableWidget) FindItems(text string, flags int) []*QTableWidgetItem { text_ms := miqt_strdupg(text) defer C.free(text_ms) - var _ma *C.struct_miqt_array = C.QTableWidget_FindItems(this.h, (*C.struct_miqt_string)(text_ms), (C.int)(flags)) + var _ma *C.struct_miqt_array = C.QTableWidget_FindItems(this.h, (*C.struct_miqt_string)(text_ms), flags) _ret := make([]*QTableWidgetItem, int(_ma.len)) _outCast := (*[0xffff]*C.QTableWidgetItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -1092,11 +1092,11 @@ func QTableWidget_TrUtf83(s string, c string, n int) string { } func (this *QTableWidget) SortItems2(column int, order SortOrder) { - C.QTableWidget_SortItems2(this.h, (C.int)(column), (C.uintptr_t)(order)) + C.QTableWidget_SortItems2(this.h, (C.int)(column), (C.int)(order)) } func (this *QTableWidget) ScrollToItem2(item *QTableWidgetItem, hint QAbstractItemView__ScrollHint) { - C.QTableWidget_ScrollToItem2(this.h, item.cPointer(), (C.uintptr_t)(hint)) + C.QTableWidget_ScrollToItem2(this.h, item.cPointer(), (C.int)(hint)) } // Delete this object from C++ memory. diff --git a/qt/gen_qtablewidget.h b/qt/gen_qtablewidget.h index d056b36..6ee2f9a 100644 --- a/qt/gen_qtablewidget.h +++ b/qt/gen_qtablewidget.h @@ -94,8 +94,8 @@ QColor* QTableWidgetItem_TextColor(const QTableWidgetItem* self); void QTableWidgetItem_SetTextColor(QTableWidgetItem* self, QColor* color); QBrush* QTableWidgetItem_Foreground(const QTableWidgetItem* self); void QTableWidgetItem_SetForeground(QTableWidgetItem* self, QBrush* brush); -uintptr_t QTableWidgetItem_CheckState(const QTableWidgetItem* self); -void QTableWidgetItem_SetCheckState(QTableWidgetItem* self, uintptr_t state); +int QTableWidgetItem_CheckState(const QTableWidgetItem* self); +void QTableWidgetItem_SetCheckState(QTableWidgetItem* self, int state); QSize* QTableWidgetItem_SizeHint(const QTableWidgetItem* self); void QTableWidgetItem_SetSizeHint(QTableWidgetItem* self, QSize* size); QVariant* QTableWidgetItem_Data(const QTableWidgetItem* self, int role); @@ -202,8 +202,8 @@ struct miqt_string* QTableWidget_Tr2(const char* s, const char* c); struct miqt_string* QTableWidget_Tr3(const char* s, const char* c, int n); struct miqt_string* QTableWidget_TrUtf82(const char* s, const char* c); struct miqt_string* QTableWidget_TrUtf83(const char* s, const char* c, int n); -void QTableWidget_SortItems2(QTableWidget* self, int column, uintptr_t order); -void QTableWidget_ScrollToItem2(QTableWidget* self, QTableWidgetItem* item, uintptr_t hint); +void QTableWidget_SortItems2(QTableWidget* self, int column, int order); +void QTableWidget_ScrollToItem2(QTableWidget* self, QTableWidgetItem* item, int hint); void QTableWidget_Delete(QTableWidget* self); #ifdef __cplusplus diff --git a/qt/gen_qtabwidget.cpp b/qt/gen_qtabwidget.cpp index 6ef95a4..73b5650 100644 --- a/qt/gen_qtabwidget.cpp +++ b/qt/gen_qtabwidget.cpp @@ -141,12 +141,12 @@ int QTabWidget_Count(const QTabWidget* self) { return self->count(); } -uintptr_t QTabWidget_TabPosition(const QTabWidget* self) { +int QTabWidget_TabPosition(const QTabWidget* self) { QTabWidget::TabPosition _ret = self->tabPosition(); - return static_cast(_ret); + return static_cast(_ret); } -void QTabWidget_SetTabPosition(QTabWidget* self, uintptr_t position) { +void QTabWidget_SetTabPosition(QTabWidget* self, int position) { self->setTabPosition(static_cast(position)); } @@ -166,12 +166,12 @@ void QTabWidget_SetMovable(QTabWidget* self, bool movable) { self->setMovable(movable); } -uintptr_t QTabWidget_TabShape(const QTabWidget* self) { +int QTabWidget_TabShape(const QTabWidget* self) { QTabWidget::TabShape _ret = self->tabShape(); - return static_cast(_ret); + return static_cast(_ret); } -void QTabWidget_SetTabShape(QTabWidget* self, uintptr_t s) { +void QTabWidget_SetTabShape(QTabWidget* self, int s) { self->setTabShape(static_cast(s)); } @@ -199,12 +199,12 @@ QWidget* QTabWidget_CornerWidget(const QTabWidget* self) { return self->cornerWidget(); } -uintptr_t QTabWidget_ElideMode(const QTabWidget* self) { +int QTabWidget_ElideMode(const QTabWidget* self) { Qt::TextElideMode _ret = self->elideMode(); - return static_cast(_ret); + return static_cast(_ret); } -void QTabWidget_SetElideMode(QTabWidget* self, uintptr_t mode) { +void QTabWidget_SetElideMode(QTabWidget* self, int mode) { self->setElideMode(static_cast(mode)); } @@ -328,11 +328,11 @@ struct miqt_string* QTabWidget_TrUtf83(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -void QTabWidget_SetCornerWidget2(QTabWidget* self, QWidget* w, uintptr_t corner) { +void QTabWidget_SetCornerWidget2(QTabWidget* self, QWidget* w, int corner) { self->setCornerWidget(w, static_cast(corner)); } -QWidget* QTabWidget_CornerWidget1(const QTabWidget* self, uintptr_t corner) { +QWidget* QTabWidget_CornerWidget1(const QTabWidget* self, int corner) { return self->cornerWidget(static_cast(corner)); } diff --git a/qt/gen_qtabwidget.go b/qt/gen_qtabwidget.go index 8ec36fa..5b619a3 100644 --- a/qt/gen_qtabwidget.go +++ b/qt/gen_qtabwidget.go @@ -206,7 +206,7 @@ func (this *QTabWidget) TabPosition() QTabWidget__TabPosition { } func (this *QTabWidget) SetTabPosition(position QTabWidget__TabPosition) { - C.QTabWidget_SetTabPosition(this.h, (C.uintptr_t)(position)) + C.QTabWidget_SetTabPosition(this.h, (C.int)(position)) } func (this *QTabWidget) TabsClosable() bool { @@ -230,7 +230,7 @@ func (this *QTabWidget) TabShape() QTabWidget__TabShape { } func (this *QTabWidget) SetTabShape(s QTabWidget__TabShape) { - C.QTabWidget_SetTabShape(this.h, (C.uintptr_t)(s)) + C.QTabWidget_SetTabShape(this.h, (C.int)(s)) } func (this *QTabWidget) SizeHint() *QSize { @@ -268,7 +268,7 @@ func (this *QTabWidget) ElideMode() TextElideMode { } func (this *QTabWidget) SetElideMode(mode TextElideMode) { - C.QTabWidget_SetElideMode(this.h, (C.uintptr_t)(mode)) + C.QTabWidget_SetElideMode(this.h, (C.int)(mode)) } func (this *QTabWidget) IconSize() *QSize { @@ -447,11 +447,11 @@ func QTabWidget_TrUtf83(s string, c string, n int) string { } func (this *QTabWidget) SetCornerWidget2(w *QWidget, corner Corner) { - C.QTabWidget_SetCornerWidget2(this.h, w.cPointer(), (C.uintptr_t)(corner)) + C.QTabWidget_SetCornerWidget2(this.h, w.cPointer(), (C.int)(corner)) } func (this *QTabWidget) CornerWidget1(corner Corner) *QWidget { - return newQWidget_U(unsafe.Pointer(C.QTabWidget_CornerWidget1(this.h, (C.uintptr_t)(corner)))) + return newQWidget_U(unsafe.Pointer(C.QTabWidget_CornerWidget1(this.h, (C.int)(corner)))) } // Delete this object from C++ memory. diff --git a/qt/gen_qtabwidget.h b/qt/gen_qtabwidget.h index 53f21e4..df6b207 100644 --- a/qt/gen_qtabwidget.h +++ b/qt/gen_qtabwidget.h @@ -56,22 +56,22 @@ QWidget* QTabWidget_CurrentWidget(const QTabWidget* self); QWidget* QTabWidget_Widget(const QTabWidget* self, int index); int QTabWidget_IndexOf(const QTabWidget* self, QWidget* widget); int QTabWidget_Count(const QTabWidget* self); -uintptr_t QTabWidget_TabPosition(const QTabWidget* self); -void QTabWidget_SetTabPosition(QTabWidget* self, uintptr_t position); +int QTabWidget_TabPosition(const QTabWidget* self); +void QTabWidget_SetTabPosition(QTabWidget* self, int position); bool QTabWidget_TabsClosable(const QTabWidget* self); void QTabWidget_SetTabsClosable(QTabWidget* self, bool closeable); bool QTabWidget_IsMovable(const QTabWidget* self); void QTabWidget_SetMovable(QTabWidget* self, bool movable); -uintptr_t QTabWidget_TabShape(const QTabWidget* self); -void QTabWidget_SetTabShape(QTabWidget* self, uintptr_t s); +int QTabWidget_TabShape(const QTabWidget* self); +void QTabWidget_SetTabShape(QTabWidget* self, int s); QSize* QTabWidget_SizeHint(const QTabWidget* self); QSize* QTabWidget_MinimumSizeHint(const QTabWidget* self); int QTabWidget_HeightForWidth(const QTabWidget* self, int width); bool QTabWidget_HasHeightForWidth(const QTabWidget* self); void QTabWidget_SetCornerWidget(QTabWidget* self, QWidget* w); QWidget* QTabWidget_CornerWidget(const QTabWidget* self); -uintptr_t QTabWidget_ElideMode(const QTabWidget* self); -void QTabWidget_SetElideMode(QTabWidget* self, uintptr_t mode); +int QTabWidget_ElideMode(const QTabWidget* self); +void QTabWidget_SetElideMode(QTabWidget* self, int mode); QSize* QTabWidget_IconSize(const QTabWidget* self); void QTabWidget_SetIconSize(QTabWidget* self, QSize* size); bool QTabWidget_UsesScrollButtons(const QTabWidget* self); @@ -96,8 +96,8 @@ struct miqt_string* QTabWidget_Tr2(const char* s, const char* c); struct miqt_string* QTabWidget_Tr3(const char* s, const char* c, int n); struct miqt_string* QTabWidget_TrUtf82(const char* s, const char* c); struct miqt_string* QTabWidget_TrUtf83(const char* s, const char* c, int n); -void QTabWidget_SetCornerWidget2(QTabWidget* self, QWidget* w, uintptr_t corner); -QWidget* QTabWidget_CornerWidget1(const QTabWidget* self, uintptr_t corner); +void QTabWidget_SetCornerWidget2(QTabWidget* self, QWidget* w, int corner); +QWidget* QTabWidget_CornerWidget1(const QTabWidget* self, int corner); void QTabWidget_Delete(QTabWidget* self); #ifdef __cplusplus diff --git a/qt/gen_qtextboundaryfinder.cpp b/qt/gen_qtextboundaryfinder.cpp index 79365c9..998f87b 100644 --- a/qt/gen_qtextboundaryfinder.cpp +++ b/qt/gen_qtextboundaryfinder.cpp @@ -15,20 +15,20 @@ QTextBoundaryFinder* QTextBoundaryFinder_new2(QTextBoundaryFinder* other) { return new QTextBoundaryFinder(*other); } -QTextBoundaryFinder* QTextBoundaryFinder_new3(uintptr_t typeVal, struct miqt_string* stringVal) { +QTextBoundaryFinder* QTextBoundaryFinder_new3(int typeVal, struct miqt_string* stringVal) { QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); return new QTextBoundaryFinder(static_cast(typeVal), stringVal_QString); } -QTextBoundaryFinder* QTextBoundaryFinder_new4(uintptr_t typeVal, QChar* chars, int length) { +QTextBoundaryFinder* QTextBoundaryFinder_new4(int typeVal, QChar* chars, int length) { return new QTextBoundaryFinder(static_cast(typeVal), chars, static_cast(length)); } -QTextBoundaryFinder* QTextBoundaryFinder_new5(uintptr_t typeVal, QChar* chars, int length, unsigned char* buffer) { +QTextBoundaryFinder* QTextBoundaryFinder_new5(int typeVal, QChar* chars, int length, unsigned char* buffer) { return new QTextBoundaryFinder(static_cast(typeVal), chars, static_cast(length), static_cast(buffer)); } -QTextBoundaryFinder* QTextBoundaryFinder_new6(uintptr_t typeVal, QChar* chars, int length, unsigned char* buffer, int bufferSize) { +QTextBoundaryFinder* QTextBoundaryFinder_new6(int typeVal, QChar* chars, int length, unsigned char* buffer, int bufferSize) { return new QTextBoundaryFinder(static_cast(typeVal), chars, static_cast(length), static_cast(buffer), static_cast(bufferSize)); } @@ -40,9 +40,9 @@ bool QTextBoundaryFinder_IsValid(const QTextBoundaryFinder* self) { return self->isValid(); } -uintptr_t QTextBoundaryFinder_Type(const QTextBoundaryFinder* self) { +int QTextBoundaryFinder_Type(const QTextBoundaryFinder* self) { QTextBoundaryFinder::BoundaryType _ret = self->type(); - return static_cast(_ret); + return static_cast(_ret); } struct miqt_string* QTextBoundaryFinder_String(const QTextBoundaryFinder* self) { diff --git a/qt/gen_qtextboundaryfinder.go b/qt/gen_qtextboundaryfinder.go index 58430c4..ed0ef6c 100644 --- a/qt/gen_qtextboundaryfinder.go +++ b/qt/gen_qtextboundaryfinder.go @@ -71,25 +71,25 @@ func NewQTextBoundaryFinder2(other *QTextBoundaryFinder) *QTextBoundaryFinder { func NewQTextBoundaryFinder3(typeVal QTextBoundaryFinder__BoundaryType, stringVal string) *QTextBoundaryFinder { stringVal_ms := miqt_strdupg(stringVal) defer C.free(stringVal_ms) - ret := C.QTextBoundaryFinder_new3((C.uintptr_t)(typeVal), (*C.struct_miqt_string)(stringVal_ms)) + ret := C.QTextBoundaryFinder_new3((C.int)(typeVal), (*C.struct_miqt_string)(stringVal_ms)) return newQTextBoundaryFinder(ret) } // NewQTextBoundaryFinder4 constructs a new QTextBoundaryFinder object. func NewQTextBoundaryFinder4(typeVal QTextBoundaryFinder__BoundaryType, chars *QChar, length int) *QTextBoundaryFinder { - ret := C.QTextBoundaryFinder_new4((C.uintptr_t)(typeVal), chars.cPointer(), (C.int)(length)) + ret := C.QTextBoundaryFinder_new4((C.int)(typeVal), chars.cPointer(), (C.int)(length)) return newQTextBoundaryFinder(ret) } // NewQTextBoundaryFinder5 constructs a new QTextBoundaryFinder object. func NewQTextBoundaryFinder5(typeVal QTextBoundaryFinder__BoundaryType, chars *QChar, length int, buffer *byte) *QTextBoundaryFinder { - ret := C.QTextBoundaryFinder_new5((C.uintptr_t)(typeVal), chars.cPointer(), (C.int)(length), (*C.uchar)(unsafe.Pointer(buffer))) + ret := C.QTextBoundaryFinder_new5((C.int)(typeVal), chars.cPointer(), (C.int)(length), (*C.uchar)(unsafe.Pointer(buffer))) return newQTextBoundaryFinder(ret) } // NewQTextBoundaryFinder6 constructs a new QTextBoundaryFinder object. func NewQTextBoundaryFinder6(typeVal QTextBoundaryFinder__BoundaryType, chars *QChar, length int, buffer *byte, bufferSize int) *QTextBoundaryFinder { - ret := C.QTextBoundaryFinder_new6((C.uintptr_t)(typeVal), chars.cPointer(), (C.int)(length), (*C.uchar)(unsafe.Pointer(buffer)), (C.int)(bufferSize)) + ret := C.QTextBoundaryFinder_new6((C.int)(typeVal), chars.cPointer(), (C.int)(length), (*C.uchar)(unsafe.Pointer(buffer)), (C.int)(bufferSize)) return newQTextBoundaryFinder(ret) } diff --git a/qt/gen_qtextboundaryfinder.h b/qt/gen_qtextboundaryfinder.h index e8a2230..d978bb4 100644 --- a/qt/gen_qtextboundaryfinder.h +++ b/qt/gen_qtextboundaryfinder.h @@ -23,13 +23,13 @@ typedef struct QTextBoundaryFinder QTextBoundaryFinder; QTextBoundaryFinder* QTextBoundaryFinder_new(); QTextBoundaryFinder* QTextBoundaryFinder_new2(QTextBoundaryFinder* other); -QTextBoundaryFinder* QTextBoundaryFinder_new3(uintptr_t typeVal, struct miqt_string* stringVal); -QTextBoundaryFinder* QTextBoundaryFinder_new4(uintptr_t typeVal, QChar* chars, int length); -QTextBoundaryFinder* QTextBoundaryFinder_new5(uintptr_t typeVal, QChar* chars, int length, unsigned char* buffer); -QTextBoundaryFinder* QTextBoundaryFinder_new6(uintptr_t typeVal, QChar* chars, int length, unsigned char* buffer, int bufferSize); +QTextBoundaryFinder* QTextBoundaryFinder_new3(int typeVal, struct miqt_string* stringVal); +QTextBoundaryFinder* QTextBoundaryFinder_new4(int typeVal, QChar* chars, int length); +QTextBoundaryFinder* QTextBoundaryFinder_new5(int typeVal, QChar* chars, int length, unsigned char* buffer); +QTextBoundaryFinder* QTextBoundaryFinder_new6(int typeVal, QChar* chars, int length, unsigned char* buffer, int bufferSize); void QTextBoundaryFinder_OperatorAssign(QTextBoundaryFinder* self, QTextBoundaryFinder* other); bool QTextBoundaryFinder_IsValid(const QTextBoundaryFinder* self); -uintptr_t QTextBoundaryFinder_Type(const QTextBoundaryFinder* self); +int QTextBoundaryFinder_Type(const QTextBoundaryFinder* self); struct miqt_string* QTextBoundaryFinder_String(const QTextBoundaryFinder* self); void QTextBoundaryFinder_ToStart(QTextBoundaryFinder* self); void QTextBoundaryFinder_ToEnd(QTextBoundaryFinder* self); diff --git a/qt/gen_qtextbrowser.cpp b/qt/gen_qtextbrowser.cpp index 7ad9720..3dffc22 100644 --- a/qt/gen_qtextbrowser.cpp +++ b/qt/gen_qtextbrowser.cpp @@ -41,9 +41,9 @@ QUrl* QTextBrowser_Source(const QTextBrowser* self) { return new QUrl(self->source()); } -uintptr_t QTextBrowser_SourceType(const QTextBrowser* self) { +int QTextBrowser_SourceType(const QTextBrowser* self) { QTextDocument::ResourceType _ret = self->sourceType(); - return static_cast(_ret); + return static_cast(_ret); } struct miqt_array* QTextBrowser_SearchPaths(const QTextBrowser* self) { @@ -128,7 +128,7 @@ void QTextBrowser_SetSource(QTextBrowser* self, QUrl* name) { self->setSource(*name); } -void QTextBrowser_SetSource2(QTextBrowser* self, QUrl* name, uintptr_t typeVal) { +void QTextBrowser_SetSource2(QTextBrowser* self, QUrl* name, int typeVal) { self->setSource(*name, static_cast(typeVal)); } diff --git a/qt/gen_qtextbrowser.go b/qt/gen_qtextbrowser.go index 4b8a7e6..ba166eb 100644 --- a/qt/gen_qtextbrowser.go +++ b/qt/gen_qtextbrowser.go @@ -172,7 +172,7 @@ func (this *QTextBrowser) SetSource(name *QUrl) { } func (this *QTextBrowser) SetSource2(name *QUrl, typeVal QTextDocument__ResourceType) { - C.QTextBrowser_SetSource2(this.h, name.cPointer(), (C.uintptr_t)(typeVal)) + C.QTextBrowser_SetSource2(this.h, name.cPointer(), (C.int)(typeVal)) } func (this *QTextBrowser) Backward() { diff --git a/qt/gen_qtextbrowser.h b/qt/gen_qtextbrowser.h index a24c468..d4d7468 100644 --- a/qt/gen_qtextbrowser.h +++ b/qt/gen_qtextbrowser.h @@ -33,7 +33,7 @@ QMetaObject* QTextBrowser_MetaObject(const QTextBrowser* self); struct miqt_string* QTextBrowser_Tr(const char* s); struct miqt_string* QTextBrowser_TrUtf8(const char* s); QUrl* QTextBrowser_Source(const QTextBrowser* self); -uintptr_t QTextBrowser_SourceType(const QTextBrowser* self); +int QTextBrowser_SourceType(const QTextBrowser* self); struct miqt_array* QTextBrowser_SearchPaths(const QTextBrowser* self); void QTextBrowser_SetSearchPaths(QTextBrowser* self, struct miqt_array* /* of struct miqt_string* */ paths); QVariant* QTextBrowser_LoadResource(QTextBrowser* self, int typeVal, QUrl* name); @@ -49,7 +49,7 @@ void QTextBrowser_SetOpenExternalLinks(QTextBrowser* self, bool open); bool QTextBrowser_OpenLinks(const QTextBrowser* self); void QTextBrowser_SetOpenLinks(QTextBrowser* self, bool open); void QTextBrowser_SetSource(QTextBrowser* self, QUrl* name); -void QTextBrowser_SetSource2(QTextBrowser* self, QUrl* name, uintptr_t typeVal); +void QTextBrowser_SetSource2(QTextBrowser* self, QUrl* name, int typeVal); void QTextBrowser_Backward(QTextBrowser* self); void QTextBrowser_Forward(QTextBrowser* self); void QTextBrowser_Home(QTextBrowser* self); diff --git a/qt/gen_qtextcodec.go b/qt/gen_qtextcodec.go index 847e3e8..8bb1f98 100644 --- a/qt/gen_qtextcodec.go +++ b/qt/gen_qtextcodec.go @@ -208,11 +208,11 @@ func (this *QTextCodec) FromUnicode3(in *QChar, length int, state *QTextCodec__C } func (this *QTextCodec) MakeDecoder1(flags int) *QTextDecoder { - return newQTextDecoder_U(unsafe.Pointer(C.QTextCodec_MakeDecoder1(this.h, (C.int)(flags)))) + return newQTextDecoder_U(unsafe.Pointer(C.QTextCodec_MakeDecoder1(this.h, flags))) } func (this *QTextCodec) MakeEncoder1(flags int) *QTextEncoder { - return newQTextEncoder_U(unsafe.Pointer(C.QTextCodec_MakeEncoder1(this.h, (C.int)(flags)))) + return newQTextEncoder_U(unsafe.Pointer(C.QTextCodec_MakeEncoder1(this.h, flags))) } type QTextEncoder struct { @@ -245,7 +245,7 @@ func NewQTextEncoder(codec *QTextCodec) *QTextEncoder { // NewQTextEncoder2 constructs a new QTextEncoder object. func NewQTextEncoder2(codec *QTextCodec, flags int) *QTextEncoder { - ret := C.QTextEncoder_new2(codec.cPointer(), (C.int)(flags)) + ret := C.QTextEncoder_new2(codec.cPointer(), flags) return newQTextEncoder(ret) } @@ -313,7 +313,7 @@ func NewQTextDecoder(codec *QTextCodec) *QTextDecoder { // NewQTextDecoder2 constructs a new QTextDecoder object. func NewQTextDecoder2(codec *QTextCodec, flags int) *QTextDecoder { - ret := C.QTextDecoder_new2(codec.cPointer(), (C.int)(flags)) + ret := C.QTextDecoder_new2(codec.cPointer(), flags) return newQTextDecoder(ret) } @@ -385,7 +385,7 @@ func NewQTextCodec__ConverterState() *QTextCodec__ConverterState { // NewQTextCodec__ConverterState2 constructs a new QTextCodec::ConverterState object. func NewQTextCodec__ConverterState2(f int) *QTextCodec__ConverterState { - ret := C.QTextCodec__ConverterState_new2((C.int)(f)) + ret := C.QTextCodec__ConverterState_new2(f) return newQTextCodec__ConverterState(ret) } diff --git a/qt/gen_qtextcursor.cpp b/qt/gen_qtextcursor.cpp index 508ffc5..525cb5a 100644 --- a/qt/gen_qtextcursor.cpp +++ b/qt/gen_qtextcursor.cpp @@ -77,7 +77,7 @@ void QTextCursor_InsertText2(QTextCursor* self, struct miqt_string* text, QTextC self->insertText(text_QString, *format); } -bool QTextCursor_MovePosition(QTextCursor* self, uintptr_t op) { +bool QTextCursor_MovePosition(QTextCursor* self, int op) { return self->movePosition(static_cast(op)); } @@ -113,7 +113,7 @@ void QTextCursor_DeletePreviousChar(QTextCursor* self) { self->deletePreviousChar(); } -void QTextCursor_Select(QTextCursor* self, uintptr_t selection) { +void QTextCursor_Select(QTextCursor* self, int selection) { self->select(static_cast(selection)); } @@ -228,7 +228,7 @@ QTextList* QTextCursor_InsertList(QTextCursor* self, QTextListFormat* format) { return self->insertList(*format); } -QTextList* QTextCursor_InsertListWithStyle(QTextCursor* self, uintptr_t style) { +QTextList* QTextCursor_InsertListWithStyle(QTextCursor* self, int style) { return self->insertList(static_cast(style)); } @@ -236,7 +236,7 @@ QTextList* QTextCursor_CreateList(QTextCursor* self, QTextListFormat* format) { return self->createList(*format); } -QTextList* QTextCursor_CreateListWithStyle(QTextCursor* self, uintptr_t style) { +QTextList* QTextCursor_CreateListWithStyle(QTextCursor* self, int style) { return self->createList(static_cast(style)); } @@ -273,7 +273,7 @@ void QTextCursor_InsertHtml(QTextCursor* self, struct miqt_string* html) { self->insertHtml(html_QString); } -void QTextCursor_InsertImage(QTextCursor* self, QTextImageFormat* format, uintptr_t alignment) { +void QTextCursor_InsertImage(QTextCursor* self, QTextImageFormat* format, int alignment) { self->insertImage(*format, static_cast(alignment)); } @@ -342,15 +342,15 @@ QTextDocument* QTextCursor_Document(const QTextCursor* self) { return self->document(); } -void QTextCursor_SetPosition2(QTextCursor* self, int pos, uintptr_t mode) { +void QTextCursor_SetPosition2(QTextCursor* self, int pos, int mode) { self->setPosition(static_cast(pos), static_cast(mode)); } -bool QTextCursor_MovePosition2(QTextCursor* self, uintptr_t op, uintptr_t param2) { +bool QTextCursor_MovePosition2(QTextCursor* self, int op, int param2) { return self->movePosition(static_cast(op), static_cast(param2)); } -bool QTextCursor_MovePosition3(QTextCursor* self, uintptr_t op, uintptr_t param2, int n) { +bool QTextCursor_MovePosition3(QTextCursor* self, int op, int param2, int n) { return self->movePosition(static_cast(op), static_cast(param2), static_cast(n)); } diff --git a/qt/gen_qtextcursor.go b/qt/gen_qtextcursor.go index 2138cf1..c2855b4 100644 --- a/qt/gen_qtextcursor.go +++ b/qt/gen_qtextcursor.go @@ -152,7 +152,7 @@ func (this *QTextCursor) InsertText2(text string, format *QTextCharFormat) { } func (this *QTextCursor) MovePosition(op QTextCursor__MoveOperation) bool { - return (bool)(C.QTextCursor_MovePosition(this.h, (C.uintptr_t)(op))) + return (bool)(C.QTextCursor_MovePosition(this.h, (C.int)(op))) } func (this *QTextCursor) VisualNavigation() bool { @@ -188,7 +188,7 @@ func (this *QTextCursor) DeletePreviousChar() { } func (this *QTextCursor) Select(selection QTextCursor__SelectionType) { - C.QTextCursor_Select(this.h, (C.uintptr_t)(selection)) + C.QTextCursor_Select(this.h, (C.int)(selection)) } func (this *QTextCursor) HasSelection() bool { @@ -318,7 +318,7 @@ func (this *QTextCursor) InsertList(format *QTextListFormat) *QTextList { } func (this *QTextCursor) InsertListWithStyle(style QTextListFormat__Style) *QTextList { - return newQTextList_U(unsafe.Pointer(C.QTextCursor_InsertListWithStyle(this.h, (C.uintptr_t)(style)))) + return newQTextList_U(unsafe.Pointer(C.QTextCursor_InsertListWithStyle(this.h, (C.int)(style)))) } func (this *QTextCursor) CreateList(format *QTextListFormat) *QTextList { @@ -326,7 +326,7 @@ func (this *QTextCursor) CreateList(format *QTextListFormat) *QTextList { } func (this *QTextCursor) CreateListWithStyle(style QTextListFormat__Style) *QTextList { - return newQTextList_U(unsafe.Pointer(C.QTextCursor_CreateListWithStyle(this.h, (C.uintptr_t)(style)))) + return newQTextList_U(unsafe.Pointer(C.QTextCursor_CreateListWithStyle(this.h, (C.int)(style)))) } func (this *QTextCursor) CurrentList() *QTextList { @@ -364,7 +364,7 @@ func (this *QTextCursor) InsertHtml(html string) { } func (this *QTextCursor) InsertImage(format *QTextImageFormat, alignment QTextFrameFormat__Position) { - C.QTextCursor_InsertImage(this.h, format.cPointer(), (C.uintptr_t)(alignment)) + C.QTextCursor_InsertImage(this.h, format.cPointer(), (C.int)(alignment)) } func (this *QTextCursor) InsertImageWithFormat(format *QTextImageFormat) { @@ -434,15 +434,15 @@ func (this *QTextCursor) Document() *QTextDocument { } func (this *QTextCursor) SetPosition2(pos int, mode QTextCursor__MoveMode) { - C.QTextCursor_SetPosition2(this.h, (C.int)(pos), (C.uintptr_t)(mode)) + C.QTextCursor_SetPosition2(this.h, (C.int)(pos), (C.int)(mode)) } func (this *QTextCursor) MovePosition2(op QTextCursor__MoveOperation, param2 QTextCursor__MoveMode) bool { - return (bool)(C.QTextCursor_MovePosition2(this.h, (C.uintptr_t)(op), (C.uintptr_t)(param2))) + return (bool)(C.QTextCursor_MovePosition2(this.h, (C.int)(op), (C.int)(param2))) } func (this *QTextCursor) MovePosition3(op QTextCursor__MoveOperation, param2 QTextCursor__MoveMode, n int) bool { - return (bool)(C.QTextCursor_MovePosition3(this.h, (C.uintptr_t)(op), (C.uintptr_t)(param2), (C.int)(n))) + return (bool)(C.QTextCursor_MovePosition3(this.h, (C.int)(op), (C.int)(param2), (C.int)(n))) } func (this *QTextCursor) InsertImage2(image *QImage, name string) { diff --git a/qt/gen_qtextcursor.h b/qt/gen_qtextcursor.h index 5f39701..0375461 100644 --- a/qt/gen_qtextcursor.h +++ b/qt/gen_qtextcursor.h @@ -59,7 +59,7 @@ int QTextCursor_PositionInBlock(const QTextCursor* self); int QTextCursor_Anchor(const QTextCursor* self); void QTextCursor_InsertText(QTextCursor* self, struct miqt_string* text); void QTextCursor_InsertText2(QTextCursor* self, struct miqt_string* text, QTextCharFormat* format); -bool QTextCursor_MovePosition(QTextCursor* self, uintptr_t op); +bool QTextCursor_MovePosition(QTextCursor* self, int op); bool QTextCursor_VisualNavigation(const QTextCursor* self); void QTextCursor_SetVisualNavigation(QTextCursor* self, bool b); void QTextCursor_SetVerticalMovementX(QTextCursor* self, int x); @@ -68,7 +68,7 @@ void QTextCursor_SetKeepPositionOnInsert(QTextCursor* self, bool b); bool QTextCursor_KeepPositionOnInsert(const QTextCursor* self); void QTextCursor_DeleteChar(QTextCursor* self); void QTextCursor_DeletePreviousChar(QTextCursor* self); -void QTextCursor_Select(QTextCursor* self, uintptr_t selection); +void QTextCursor_Select(QTextCursor* self, int selection); bool QTextCursor_HasSelection(const QTextCursor* self); bool QTextCursor_HasComplexSelection(const QTextCursor* self); void QTextCursor_RemoveSelectedText(QTextCursor* self); @@ -96,9 +96,9 @@ void QTextCursor_InsertBlock(QTextCursor* self); void QTextCursor_InsertBlockWithFormat(QTextCursor* self, QTextBlockFormat* format); void QTextCursor_InsertBlock2(QTextCursor* self, QTextBlockFormat* format, QTextCharFormat* charFormat); QTextList* QTextCursor_InsertList(QTextCursor* self, QTextListFormat* format); -QTextList* QTextCursor_InsertListWithStyle(QTextCursor* self, uintptr_t style); +QTextList* QTextCursor_InsertListWithStyle(QTextCursor* self, int style); QTextList* QTextCursor_CreateList(QTextCursor* self, QTextListFormat* format); -QTextList* QTextCursor_CreateListWithStyle(QTextCursor* self, uintptr_t style); +QTextList* QTextCursor_CreateListWithStyle(QTextCursor* self, int style); QTextList* QTextCursor_CurrentList(const QTextCursor* self); QTextTable* QTextCursor_InsertTable(QTextCursor* self, int rows, int cols, QTextTableFormat* format); QTextTable* QTextCursor_InsertTable2(QTextCursor* self, int rows, int cols); @@ -107,7 +107,7 @@ QTextFrame* QTextCursor_InsertFrame(QTextCursor* self, QTextFrameFormat* format) QTextFrame* QTextCursor_CurrentFrame(const QTextCursor* self); void QTextCursor_InsertFragment(QTextCursor* self, QTextDocumentFragment* fragment); void QTextCursor_InsertHtml(QTextCursor* self, struct miqt_string* html); -void QTextCursor_InsertImage(QTextCursor* self, QTextImageFormat* format, uintptr_t alignment); +void QTextCursor_InsertImage(QTextCursor* self, QTextImageFormat* format, int alignment); void QTextCursor_InsertImageWithFormat(QTextCursor* self, QTextImageFormat* format); void QTextCursor_InsertImageWithName(QTextCursor* self, struct miqt_string* name); void QTextCursor_InsertImageWithImage(QTextCursor* self, QImage* image); @@ -124,9 +124,9 @@ bool QTextCursor_IsCopyOf(const QTextCursor* self, QTextCursor* other); int QTextCursor_BlockNumber(const QTextCursor* self); int QTextCursor_ColumnNumber(const QTextCursor* self); QTextDocument* QTextCursor_Document(const QTextCursor* self); -void QTextCursor_SetPosition2(QTextCursor* self, int pos, uintptr_t mode); -bool QTextCursor_MovePosition2(QTextCursor* self, uintptr_t op, uintptr_t param2); -bool QTextCursor_MovePosition3(QTextCursor* self, uintptr_t op, uintptr_t param2, int n); +void QTextCursor_SetPosition2(QTextCursor* self, int pos, int mode); +bool QTextCursor_MovePosition2(QTextCursor* self, int op, int param2); +bool QTextCursor_MovePosition3(QTextCursor* self, int op, int param2, int n); void QTextCursor_InsertImage2(QTextCursor* self, QImage* image, struct miqt_string* name); void QTextCursor_Delete(QTextCursor* self); diff --git a/qt/gen_qtextdocument.cpp b/qt/gen_qtextdocument.cpp index f6c6f37..b93d5cb 100644 --- a/qt/gen_qtextdocument.cpp +++ b/qt/gen_qtextdocument.cpp @@ -128,12 +128,12 @@ QAbstractTextDocumentLayout* QTextDocument_DocumentLayout(const QTextDocument* s return self->documentLayout(); } -void QTextDocument_SetMetaInformation(QTextDocument* self, uintptr_t info, struct miqt_string* param2) { +void QTextDocument_SetMetaInformation(QTextDocument* self, int info, struct miqt_string* param2) { QString param2_QString = QString::fromUtf8(¶m2->data, param2->len); self->setMetaInformation(static_cast(info), param2_QString); } -struct miqt_string* QTextDocument_MetaInformation(const QTextDocument* self, uintptr_t info) { +struct miqt_string* QTextDocument_MetaInformation(const QTextDocument* self, int info) { QString _ret = self->metaInformation(static_cast(info)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -327,15 +327,18 @@ void QTextDocument_SetTextWidth(QTextDocument* self, double width) { } double QTextDocument_TextWidth(const QTextDocument* self) { - return self->textWidth(); + qreal _ret = self->textWidth(); + return static_cast(_ret); } double QTextDocument_IdealWidth(const QTextDocument* self) { - return self->idealWidth(); + qreal _ret = self->idealWidth(); + return static_cast(_ret); } double QTextDocument_IndentWidth(const QTextDocument* self) { - return self->indentWidth(); + qreal _ret = self->indentWidth(); + return static_cast(_ret); } void QTextDocument_SetIndentWidth(QTextDocument* self, double width) { @@ -343,7 +346,8 @@ void QTextDocument_SetIndentWidth(QTextDocument* self, double width) { } double QTextDocument_DocumentMargin(const QTextDocument* self) { - return self->documentMargin(); + qreal _ret = self->documentMargin(); + return static_cast(_ret); } void QTextDocument_SetDocumentMargin(QTextDocument* self, double margin) { @@ -418,12 +422,12 @@ void QTextDocument_SetBaseUrl(QTextDocument* self, QUrl* url) { self->setBaseUrl(*url); } -uintptr_t QTextDocument_DefaultCursorMoveStyle(const QTextDocument* self) { +int QTextDocument_DefaultCursorMoveStyle(const QTextDocument* self) { Qt::CursorMoveStyle _ret = self->defaultCursorMoveStyle(); - return static_cast(_ret); + return static_cast(_ret); } -void QTextDocument_SetDefaultCursorMoveStyle(QTextDocument* self, uintptr_t style) { +void QTextDocument_SetDefaultCursorMoveStyle(QTextDocument* self, int style) { self->setDefaultCursorMoveStyle(static_cast(style)); } @@ -650,7 +654,7 @@ void QTextDocument_DrawContents2(QTextDocument* self, QPainter* painter, QRectF* self->drawContents(painter, *rect); } -void QTextDocument_ClearUndoRedoStacks1(QTextDocument* self, uintptr_t historyToClear) { +void QTextDocument_ClearUndoRedoStacks1(QTextDocument* self, int historyToClear) { self->clearUndoRedoStacks(static_cast(historyToClear)); } diff --git a/qt/gen_qtextdocument.go b/qt/gen_qtextdocument.go index 3ed719d..a9737cd 100644 --- a/qt/gen_qtextdocument.go +++ b/qt/gen_qtextdocument.go @@ -228,11 +228,11 @@ func (this *QTextDocument) DocumentLayout() *QAbstractTextDocumentLayout { func (this *QTextDocument) SetMetaInformation(info QTextDocument__MetaInformation, param2 string) { param2_ms := miqt_strdupg(param2) defer C.free(param2_ms) - C.QTextDocument_SetMetaInformation(this.h, (C.uintptr_t)(info), (*C.struct_miqt_string)(param2_ms)) + C.QTextDocument_SetMetaInformation(this.h, (C.int)(info), (*C.struct_miqt_string)(param2_ms)) } func (this *QTextDocument) MetaInformation(info QTextDocument__MetaInformation) string { - var _ms *C.struct_miqt_string = C.QTextDocument_MetaInformation(this.h, (C.uintptr_t)(info)) + var _ms *C.struct_miqt_string = C.QTextDocument_MetaInformation(this.h, (C.int)(info)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -588,7 +588,7 @@ func (this *QTextDocument) DefaultCursorMoveStyle() CursorMoveStyle { } func (this *QTextDocument) SetDefaultCursorMoveStyle(style CursorMoveStyle) { - C.QTextDocument_SetDefaultCursorMoveStyle(this.h, (C.uintptr_t)(style)) + C.QTextDocument_SetDefaultCursorMoveStyle(this.h, (C.int)(style)) } func (this *QTextDocument) ContentsChange(from int, charsRemoved int, charsAdded int) { @@ -858,7 +858,7 @@ func (this *QTextDocument) ToHtml1(encoding *QByteArray) string { } func (this *QTextDocument) ToMarkdown1(features int) string { - var _ms *C.struct_miqt_string = C.QTextDocument_ToMarkdown1(this.h, (C.int)(features)) + var _ms *C.struct_miqt_string = C.QTextDocument_ToMarkdown1(this.h, features) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -867,7 +867,7 @@ func (this *QTextDocument) ToMarkdown1(features int) string { func (this *QTextDocument) SetMarkdown2(markdown string, features int) { markdown_ms := miqt_strdupg(markdown) defer C.free(markdown_ms) - C.QTextDocument_SetMarkdown2(this.h, (*C.struct_miqt_string)(markdown_ms), (C.int)(features)) + C.QTextDocument_SetMarkdown2(this.h, (*C.struct_miqt_string)(markdown_ms), features) } func (this *QTextDocument) Find22(subString string, from int) *QTextCursor { @@ -882,7 +882,7 @@ func (this *QTextDocument) Find22(subString string, from int) *QTextCursor { func (this *QTextDocument) Find32(subString string, from int, options int) *QTextCursor { subString_ms := miqt_strdupg(subString) defer C.free(subString_ms) - _ret := C.QTextDocument_Find32(this.h, (*C.struct_miqt_string)(subString_ms), (C.int)(from), (C.int)(options)) + _ret := C.QTextDocument_Find32(this.h, (*C.struct_miqt_string)(subString_ms), (C.int)(from), options) _goptr := newQTextCursor(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -891,7 +891,7 @@ func (this *QTextDocument) Find32(subString string, from int, options int) *QTex func (this *QTextDocument) Find33(subString string, cursor *QTextCursor, options int) *QTextCursor { subString_ms := miqt_strdupg(subString) defer C.free(subString_ms) - _ret := C.QTextDocument_Find33(this.h, (*C.struct_miqt_string)(subString_ms), cursor.cPointer(), (C.int)(options)) + _ret := C.QTextDocument_Find33(this.h, (*C.struct_miqt_string)(subString_ms), cursor.cPointer(), options) _goptr := newQTextCursor(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -905,14 +905,14 @@ func (this *QTextDocument) Find23(expr *QRegExp, from int) *QTextCursor { } func (this *QTextDocument) Find34(expr *QRegExp, from int, options int) *QTextCursor { - _ret := C.QTextDocument_Find34(this.h, expr.cPointer(), (C.int)(from), (C.int)(options)) + _ret := C.QTextDocument_Find34(this.h, expr.cPointer(), (C.int)(from), options) _goptr := newQTextCursor(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QTextDocument) Find35(expr *QRegExp, cursor *QTextCursor, options int) *QTextCursor { - _ret := C.QTextDocument_Find35(this.h, expr.cPointer(), cursor.cPointer(), (C.int)(options)) + _ret := C.QTextDocument_Find35(this.h, expr.cPointer(), cursor.cPointer(), options) _goptr := newQTextCursor(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -926,14 +926,14 @@ func (this *QTextDocument) Find24(expr *QRegularExpression, from int) *QTextCurs } func (this *QTextDocument) Find36(expr *QRegularExpression, from int, options int) *QTextCursor { - _ret := C.QTextDocument_Find36(this.h, expr.cPointer(), (C.int)(from), (C.int)(options)) + _ret := C.QTextDocument_Find36(this.h, expr.cPointer(), (C.int)(from), options) _goptr := newQTextCursor(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QTextDocument) Find37(expr *QRegularExpression, cursor *QTextCursor, options int) *QTextCursor { - _ret := C.QTextDocument_Find37(this.h, expr.cPointer(), cursor.cPointer(), (C.int)(options)) + _ret := C.QTextDocument_Find37(this.h, expr.cPointer(), cursor.cPointer(), options) _goptr := newQTextCursor(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -944,7 +944,7 @@ func (this *QTextDocument) DrawContents2(painter *QPainter, rect *QRectF) { } func (this *QTextDocument) ClearUndoRedoStacks1(historyToClear QTextDocument__Stacks) { - C.QTextDocument_ClearUndoRedoStacks1(this.h, (C.uintptr_t)(historyToClear)) + C.QTextDocument_ClearUndoRedoStacks1(this.h, (C.int)(historyToClear)) } func (this *QTextDocument) SetModified1(m bool) { diff --git a/qt/gen_qtextdocument.h b/qt/gen_qtextdocument.h index 4a36197..45dafd5 100644 --- a/qt/gen_qtextdocument.h +++ b/qt/gen_qtextdocument.h @@ -85,8 +85,8 @@ int QTextDocument_AvailableRedoSteps(const QTextDocument* self); int QTextDocument_Revision(const QTextDocument* self); void QTextDocument_SetDocumentLayout(QTextDocument* self, QAbstractTextDocumentLayout* layout); QAbstractTextDocumentLayout* QTextDocument_DocumentLayout(const QTextDocument* self); -void QTextDocument_SetMetaInformation(QTextDocument* self, uintptr_t info, struct miqt_string* param2); -struct miqt_string* QTextDocument_MetaInformation(const QTextDocument* self, uintptr_t info); +void QTextDocument_SetMetaInformation(QTextDocument* self, int info, struct miqt_string* param2); +struct miqt_string* QTextDocument_MetaInformation(const QTextDocument* self, int info); struct miqt_string* QTextDocument_ToHtml(const QTextDocument* self); void QTextDocument_SetHtml(QTextDocument* self, struct miqt_string* html); struct miqt_string* QTextDocument_ToMarkdown(const QTextDocument* self); @@ -149,8 +149,8 @@ QTextOption* QTextDocument_DefaultTextOption(const QTextDocument* self); void QTextDocument_SetDefaultTextOption(QTextDocument* self, QTextOption* option); QUrl* QTextDocument_BaseUrl(const QTextDocument* self); void QTextDocument_SetBaseUrl(QTextDocument* self, QUrl* url); -uintptr_t QTextDocument_DefaultCursorMoveStyle(const QTextDocument* self); -void QTextDocument_SetDefaultCursorMoveStyle(QTextDocument* self, uintptr_t style); +int QTextDocument_DefaultCursorMoveStyle(const QTextDocument* self); +void QTextDocument_SetDefaultCursorMoveStyle(QTextDocument* self, int style); void QTextDocument_ContentsChange(QTextDocument* self, int from, int charsRemoved, int charsAdded); void QTextDocument_connect_ContentsChange(QTextDocument* self, void* slot); void QTextDocument_ContentsChanged(QTextDocument* self); @@ -193,7 +193,7 @@ QTextCursor* QTextDocument_Find24(const QTextDocument* self, QRegularExpression* QTextCursor* QTextDocument_Find36(const QTextDocument* self, QRegularExpression* expr, int from, int options); QTextCursor* QTextDocument_Find37(const QTextDocument* self, QRegularExpression* expr, QTextCursor* cursor, int options); void QTextDocument_DrawContents2(QTextDocument* self, QPainter* painter, QRectF* rect); -void QTextDocument_ClearUndoRedoStacks1(QTextDocument* self, uintptr_t historyToClear); +void QTextDocument_ClearUndoRedoStacks1(QTextDocument* self, int historyToClear); void QTextDocument_SetModified1(QTextDocument* self, bool m); void QTextDocument_Delete(QTextDocument* self); diff --git a/qt/gen_qtextedit.cpp b/qt/gen_qtextedit.cpp index 3c44eaa..34fa1ce 100644 --- a/qt/gen_qtextedit.cpp +++ b/qt/gen_qtextedit.cpp @@ -105,7 +105,8 @@ int QTextEdit_TextInteractionFlags(const QTextEdit* self) { } double QTextEdit_FontPointSize(const QTextEdit* self) { - return self->fontPointSize(); + qreal _ret = self->fontPointSize(); + return static_cast(_ret); } struct miqt_string* QTextEdit_FontFamily(const QTextEdit* self) { @@ -193,12 +194,12 @@ void QTextEdit_SetUndoRedoEnabled(QTextEdit* self, bool enable) { self->setUndoRedoEnabled(enable); } -uintptr_t QTextEdit_LineWrapMode(const QTextEdit* self) { +int QTextEdit_LineWrapMode(const QTextEdit* self) { QTextEdit::LineWrapMode _ret = self->lineWrapMode(); - return static_cast(_ret); + return static_cast(_ret); } -void QTextEdit_SetLineWrapMode(QTextEdit* self, uintptr_t mode) { +void QTextEdit_SetLineWrapMode(QTextEdit* self, int mode) { self->setLineWrapMode(static_cast(mode)); } @@ -210,12 +211,12 @@ void QTextEdit_SetLineWrapColumnOrWidth(QTextEdit* self, int w) { self->setLineWrapColumnOrWidth(static_cast(w)); } -uintptr_t QTextEdit_WordWrapMode(const QTextEdit* self) { +int QTextEdit_WordWrapMode(const QTextEdit* self) { QTextOption::WrapMode _ret = self->wordWrapMode(); - return static_cast(_ret); + return static_cast(_ret); } -void QTextEdit_SetWordWrapMode(QTextEdit* self, uintptr_t policy) { +void QTextEdit_SetWordWrapMode(QTextEdit* self, int policy) { self->setWordWrapMode(static_cast(policy)); } @@ -305,7 +306,8 @@ void QTextEdit_SetTabStopWidth(QTextEdit* self, int width) { } double QTextEdit_TabStopDistance(const QTextEdit* self) { - return self->tabStopDistance(); + qreal _ret = self->tabStopDistance(); + return static_cast(_ret); } void QTextEdit_SetTabStopDistance(QTextEdit* self, double distance) { @@ -351,7 +353,7 @@ struct miqt_array* QTextEdit_ExtraSelections(const QTextEdit* self) { return _out; } -void QTextEdit_MoveCursor(QTextEdit* self, uintptr_t operation) { +void QTextEdit_MoveCursor(QTextEdit* self, int operation) { self->moveCursor(static_cast(operation)); } @@ -363,11 +365,11 @@ void QTextEdit_Print(const QTextEdit* self, QPagedPaintDevice* printer) { self->print(printer); } -QVariant* QTextEdit_InputMethodQuery(const QTextEdit* self, uintptr_t property) { +QVariant* QTextEdit_InputMethodQuery(const QTextEdit* self, int property) { return new QVariant(self->inputMethodQuery(static_cast(property))); } -QVariant* QTextEdit_InputMethodQuery2(const QTextEdit* self, uintptr_t query, QVariant* argument) { +QVariant* QTextEdit_InputMethodQuery2(const QTextEdit* self, int query, QVariant* argument) { return new QVariant(self->inputMethodQuery(static_cast(query), *argument)); } @@ -608,7 +610,7 @@ struct miqt_string* QTextEdit_ToMarkdown1(const QTextEdit* self, int features) { return miqt_strdup(_b.data(), _b.length()); } -void QTextEdit_MoveCursor2(QTextEdit* self, uintptr_t operation, uintptr_t mode) { +void QTextEdit_MoveCursor2(QTextEdit* self, int operation, int mode) { self->moveCursor(static_cast(operation), static_cast(mode)); } @@ -628,6 +630,10 @@ QTextEdit__ExtraSelection* QTextEdit__ExtraSelection_new(QTextEdit__ExtraSelecti return new QTextEdit::ExtraSelection(*param1); } +void QTextEdit__ExtraSelection_OperatorAssign(QTextEdit__ExtraSelection* self, QTextEdit__ExtraSelection* param1) { + self->operator=(*param1); +} + void QTextEdit__ExtraSelection_Delete(QTextEdit__ExtraSelection* self) { delete self; } diff --git a/qt/gen_qtextedit.go b/qt/gen_qtextedit.go index 9816bd6..1d46e01 100644 --- a/qt/gen_qtextedit.go +++ b/qt/gen_qtextedit.go @@ -145,7 +145,7 @@ func (this *QTextEdit) SetReadOnly(ro bool) { } func (this *QTextEdit) SetTextInteractionFlags(flags int) { - C.QTextEdit_SetTextInteractionFlags(this.h, (C.int)(flags)) + C.QTextEdit_SetTextInteractionFlags(this.h, flags) } func (this *QTextEdit) TextInteractionFlags() int { @@ -220,7 +220,7 @@ func (this *QTextEdit) AutoFormatting() int { } func (this *QTextEdit) SetAutoFormatting(features int) { - C.QTextEdit_SetAutoFormatting(this.h, (C.int)(features)) + C.QTextEdit_SetAutoFormatting(this.h, features) } func (this *QTextEdit) TabChangesFocus() bool { @@ -257,7 +257,7 @@ func (this *QTextEdit) LineWrapMode() QTextEdit__LineWrapMode { } func (this *QTextEdit) SetLineWrapMode(mode QTextEdit__LineWrapMode) { - C.QTextEdit_SetLineWrapMode(this.h, (C.uintptr_t)(mode)) + C.QTextEdit_SetLineWrapMode(this.h, (C.int)(mode)) } func (this *QTextEdit) LineWrapColumnOrWidth() int { @@ -273,7 +273,7 @@ func (this *QTextEdit) WordWrapMode() QTextOption__WrapMode { } func (this *QTextEdit) SetWordWrapMode(policy QTextOption__WrapMode) { - C.QTextEdit_SetWordWrapMode(this.h, (C.uintptr_t)(policy)) + C.QTextEdit_SetWordWrapMode(this.h, (C.int)(policy)) } func (this *QTextEdit) Find(exp string) bool { @@ -425,7 +425,7 @@ func (this *QTextEdit) ExtraSelections() []QTextEdit__ExtraSelection { } func (this *QTextEdit) MoveCursor(operation QTextCursor__MoveOperation) { - C.QTextEdit_MoveCursor(this.h, (C.uintptr_t)(operation)) + C.QTextEdit_MoveCursor(this.h, (C.int)(operation)) } func (this *QTextEdit) CanPaste() bool { @@ -437,14 +437,14 @@ func (this *QTextEdit) Print(printer *QPagedPaintDevice) { } func (this *QTextEdit) InputMethodQuery(property InputMethodQuery) *QVariant { - _ret := C.QTextEdit_InputMethodQuery(this.h, (C.uintptr_t)(property)) + _ret := C.QTextEdit_InputMethodQuery(this.h, (C.int)(property)) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QTextEdit) InputMethodQuery2(query InputMethodQuery, argument QVariant) *QVariant { - _ret := C.QTextEdit_InputMethodQuery2(this.h, (C.uintptr_t)(query), argument.cPointer()) + _ret := C.QTextEdit_InputMethodQuery2(this.h, (C.int)(query), argument.cPointer()) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -485,7 +485,7 @@ func (this *QTextEdit) SetCurrentFont(f *QFont) { } func (this *QTextEdit) SetAlignment(a int) { - C.QTextEdit_SetAlignment(this.h, (C.int)(a)) + C.QTextEdit_SetAlignment(this.h, a) } func (this *QTextEdit) SetPlainText(text string) { @@ -750,26 +750,26 @@ func QTextEdit_TrUtf83(s string, c string, n int) string { func (this *QTextEdit) Find22(exp string, options int) bool { exp_ms := miqt_strdupg(exp) defer C.free(exp_ms) - return (bool)(C.QTextEdit_Find22(this.h, (*C.struct_miqt_string)(exp_ms), (C.int)(options))) + return (bool)(C.QTextEdit_Find22(this.h, (*C.struct_miqt_string)(exp_ms), options)) } func (this *QTextEdit) Find23(exp *QRegExp, options int) bool { - return (bool)(C.QTextEdit_Find23(this.h, exp.cPointer(), (C.int)(options))) + return (bool)(C.QTextEdit_Find23(this.h, exp.cPointer(), options)) } func (this *QTextEdit) Find24(exp *QRegularExpression, options int) bool { - return (bool)(C.QTextEdit_Find24(this.h, exp.cPointer(), (C.int)(options))) + return (bool)(C.QTextEdit_Find24(this.h, exp.cPointer(), options)) } func (this *QTextEdit) ToMarkdown1(features int) string { - var _ms *C.struct_miqt_string = C.QTextEdit_ToMarkdown1(this.h, (C.int)(features)) + var _ms *C.struct_miqt_string = C.QTextEdit_ToMarkdown1(this.h, features) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } func (this *QTextEdit) MoveCursor2(operation QTextCursor__MoveOperation, mode QTextCursor__MoveMode) { - C.QTextEdit_MoveCursor2(this.h, (C.uintptr_t)(operation), (C.uintptr_t)(mode)) + C.QTextEdit_MoveCursor2(this.h, (C.int)(operation), (C.int)(mode)) } func (this *QTextEdit) ZoomIn1(rangeVal int) { @@ -822,6 +822,10 @@ func NewQTextEdit__ExtraSelection(param1 *QTextEdit__ExtraSelection) *QTextEdit_ return newQTextEdit__ExtraSelection(ret) } +func (this *QTextEdit__ExtraSelection) OperatorAssign(param1 *QTextEdit__ExtraSelection) { + C.QTextEdit__ExtraSelection_OperatorAssign(this.h, param1.cPointer()) +} + // Delete this object from C++ memory. func (this *QTextEdit__ExtraSelection) Delete() { C.QTextEdit__ExtraSelection_Delete(this.h) diff --git a/qt/gen_qtextedit.h b/qt/gen_qtextedit.h index 78093d3..7438ac6 100644 --- a/qt/gen_qtextedit.h +++ b/qt/gen_qtextedit.h @@ -92,12 +92,12 @@ void QTextEdit_SetDocumentTitle(QTextEdit* self, struct miqt_string* title); struct miqt_string* QTextEdit_DocumentTitle(const QTextEdit* self); bool QTextEdit_IsUndoRedoEnabled(const QTextEdit* self); void QTextEdit_SetUndoRedoEnabled(QTextEdit* self, bool enable); -uintptr_t QTextEdit_LineWrapMode(const QTextEdit* self); -void QTextEdit_SetLineWrapMode(QTextEdit* self, uintptr_t mode); +int QTextEdit_LineWrapMode(const QTextEdit* self); +void QTextEdit_SetLineWrapMode(QTextEdit* self, int mode); int QTextEdit_LineWrapColumnOrWidth(const QTextEdit* self); void QTextEdit_SetLineWrapColumnOrWidth(QTextEdit* self, int w); -uintptr_t QTextEdit_WordWrapMode(const QTextEdit* self); -void QTextEdit_SetWordWrapMode(QTextEdit* self, uintptr_t policy); +int QTextEdit_WordWrapMode(const QTextEdit* self); +void QTextEdit_SetWordWrapMode(QTextEdit* self, int policy); bool QTextEdit_Find(QTextEdit* self, struct miqt_string* exp); bool QTextEdit_FindWithExp(QTextEdit* self, QRegExp* exp); bool QTextEdit_Find2(QTextEdit* self, QRegularExpression* exp); @@ -124,11 +124,11 @@ bool QTextEdit_AcceptRichText(const QTextEdit* self); void QTextEdit_SetAcceptRichText(QTextEdit* self, bool accept); void QTextEdit_SetExtraSelections(QTextEdit* self, struct miqt_array* /* of QTextEdit__ExtraSelection* */ selections); struct miqt_array* QTextEdit_ExtraSelections(const QTextEdit* self); -void QTextEdit_MoveCursor(QTextEdit* self, uintptr_t operation); +void QTextEdit_MoveCursor(QTextEdit* self, int operation); bool QTextEdit_CanPaste(const QTextEdit* self); void QTextEdit_Print(const QTextEdit* self, QPagedPaintDevice* printer); -QVariant* QTextEdit_InputMethodQuery(const QTextEdit* self, uintptr_t property); -QVariant* QTextEdit_InputMethodQuery2(const QTextEdit* self, uintptr_t query, QVariant* argument); +QVariant* QTextEdit_InputMethodQuery(const QTextEdit* self, int property); +QVariant* QTextEdit_InputMethodQuery2(const QTextEdit* self, int query, QVariant* argument); void QTextEdit_SetFontPointSize(QTextEdit* self, double s); void QTextEdit_SetFontFamily(QTextEdit* self, struct miqt_string* fontFamily); void QTextEdit_SetFontWeight(QTextEdit* self, int w); @@ -177,12 +177,13 @@ bool QTextEdit_Find22(QTextEdit* self, struct miqt_string* exp, int options); bool QTextEdit_Find23(QTextEdit* self, QRegExp* exp, int options); bool QTextEdit_Find24(QTextEdit* self, QRegularExpression* exp, int options); struct miqt_string* QTextEdit_ToMarkdown1(const QTextEdit* self, int features); -void QTextEdit_MoveCursor2(QTextEdit* self, uintptr_t operation, uintptr_t mode); +void QTextEdit_MoveCursor2(QTextEdit* self, int operation, int mode); void QTextEdit_ZoomIn1(QTextEdit* self, int rangeVal); void QTextEdit_ZoomOut1(QTextEdit* self, int rangeVal); void QTextEdit_Delete(QTextEdit* self); QTextEdit__ExtraSelection* QTextEdit__ExtraSelection_new(QTextEdit__ExtraSelection* param1); +void QTextEdit__ExtraSelection_OperatorAssign(QTextEdit__ExtraSelection* self, QTextEdit__ExtraSelection* param1); void QTextEdit__ExtraSelection_Delete(QTextEdit__ExtraSelection* self); #ifdef __cplusplus diff --git a/qt/gen_qtextformat.cpp b/qt/gen_qtextformat.cpp index 485f207..7570bf5 100644 --- a/qt/gen_qtextformat.cpp +++ b/qt/gen_qtextformat.cpp @@ -25,7 +25,7 @@ QTextLength* QTextLength_new() { return new QTextLength(); } -QTextLength* QTextLength_new2(uintptr_t typeVal, double value) { +QTextLength* QTextLength_new2(int typeVal, double value) { return new QTextLength(static_cast(typeVal), static_cast(value)); } @@ -33,17 +33,19 @@ QTextLength* QTextLength_new3(QTextLength* param1) { return new QTextLength(*param1); } -uintptr_t QTextLength_Type(const QTextLength* self) { +int QTextLength_Type(const QTextLength* self) { QTextLength::Type _ret = self->type(); - return static_cast(_ret); + return static_cast(_ret); } double QTextLength_Value(const QTextLength* self, double maximumLength) { - return self->value(static_cast(maximumLength)); + qreal _ret = self->value(static_cast(maximumLength)); + return static_cast(_ret); } double QTextLength_RawValue(const QTextLength* self) { - return self->rawValue(); + qreal _ret = self->rawValue(); + return static_cast(_ret); } bool QTextLength_OperatorEqual(const QTextLength* self, QTextLength* other) { @@ -127,7 +129,8 @@ int QTextFormat_IntProperty(const QTextFormat* self, int propertyId) { } double QTextFormat_DoubleProperty(const QTextFormat* self, int propertyId) { - return self->doubleProperty(static_cast(propertyId)); + qreal _ret = self->doubleProperty(static_cast(propertyId)); + return static_cast(_ret); } struct miqt_string* QTextFormat_StringProperty(const QTextFormat* self, int propertyId) { @@ -252,13 +255,13 @@ bool QTextFormat_OperatorNotEqual(const QTextFormat* self, QTextFormat* rhs) { return self->operator!=(*rhs); } -void QTextFormat_SetLayoutDirection(QTextFormat* self, uintptr_t direction) { +void QTextFormat_SetLayoutDirection(QTextFormat* self, int direction) { self->setLayoutDirection(static_cast(direction)); } -uintptr_t QTextFormat_LayoutDirection(const QTextFormat* self) { +int QTextFormat_LayoutDirection(const QTextFormat* self) { Qt::LayoutDirection _ret = self->layoutDirection(); - return static_cast(_ret); + return static_cast(_ret); } void QTextFormat_SetBackground(QTextFormat* self, QBrush* brush) { @@ -301,7 +304,7 @@ bool QTextCharFormat_IsValid(const QTextCharFormat* self) { return self->isValid(); } -void QTextCharFormat_SetFont(QTextCharFormat* self, QFont* font, uintptr_t behavior) { +void QTextCharFormat_SetFont(QTextCharFormat* self, QFont* font, int behavior) { self->setFont(*font, static_cast(behavior)); } @@ -354,7 +357,8 @@ void QTextCharFormat_SetFontPointSize(QTextCharFormat* self, double size) { } double QTextCharFormat_FontPointSize(const QTextCharFormat* self) { - return self->fontPointSize(); + qreal _ret = self->fontPointSize(); + return static_cast(_ret); } void QTextCharFormat_SetFontWeight(QTextCharFormat* self, int weight) { @@ -373,22 +377,22 @@ bool QTextCharFormat_FontItalic(const QTextCharFormat* self) { return self->fontItalic(); } -void QTextCharFormat_SetFontCapitalization(QTextCharFormat* self, uintptr_t capitalization) { +void QTextCharFormat_SetFontCapitalization(QTextCharFormat* self, int capitalization) { self->setFontCapitalization(static_cast(capitalization)); } -uintptr_t QTextCharFormat_FontCapitalization(const QTextCharFormat* self) { +int QTextCharFormat_FontCapitalization(const QTextCharFormat* self) { QFont::Capitalization _ret = self->fontCapitalization(); - return static_cast(_ret); + return static_cast(_ret); } -void QTextCharFormat_SetFontLetterSpacingType(QTextCharFormat* self, uintptr_t letterSpacingType) { +void QTextCharFormat_SetFontLetterSpacingType(QTextCharFormat* self, int letterSpacingType) { self->setFontLetterSpacingType(static_cast(letterSpacingType)); } -uintptr_t QTextCharFormat_FontLetterSpacingType(const QTextCharFormat* self) { +int QTextCharFormat_FontLetterSpacingType(const QTextCharFormat* self) { QFont::SpacingType _ret = self->fontLetterSpacingType(); - return static_cast(_ret); + return static_cast(_ret); } void QTextCharFormat_SetFontLetterSpacing(QTextCharFormat* self, double spacing) { @@ -396,7 +400,8 @@ void QTextCharFormat_SetFontLetterSpacing(QTextCharFormat* self, double spacing) } double QTextCharFormat_FontLetterSpacing(const QTextCharFormat* self) { - return self->fontLetterSpacing(); + qreal _ret = self->fontLetterSpacing(); + return static_cast(_ret); } void QTextCharFormat_SetFontWordSpacing(QTextCharFormat* self, double spacing) { @@ -404,7 +409,8 @@ void QTextCharFormat_SetFontWordSpacing(QTextCharFormat* self, double spacing) { } double QTextCharFormat_FontWordSpacing(const QTextCharFormat* self) { - return self->fontWordSpacing(); + qreal _ret = self->fontWordSpacing(); + return static_cast(_ret); } void QTextCharFormat_SetFontUnderline(QTextCharFormat* self, bool underline) { @@ -455,31 +461,31 @@ int QTextCharFormat_FontStretch(const QTextCharFormat* self) { return self->fontStretch(); } -void QTextCharFormat_SetFontStyleHint(QTextCharFormat* self, uintptr_t hint) { +void QTextCharFormat_SetFontStyleHint(QTextCharFormat* self, int hint) { self->setFontStyleHint(static_cast(hint)); } -void QTextCharFormat_SetFontStyleStrategy(QTextCharFormat* self, uintptr_t strategy) { +void QTextCharFormat_SetFontStyleStrategy(QTextCharFormat* self, int strategy) { self->setFontStyleStrategy(static_cast(strategy)); } -uintptr_t QTextCharFormat_FontStyleHint(const QTextCharFormat* self) { +int QTextCharFormat_FontStyleHint(const QTextCharFormat* self) { QFont::StyleHint _ret = self->fontStyleHint(); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QTextCharFormat_FontStyleStrategy(const QTextCharFormat* self) { +int QTextCharFormat_FontStyleStrategy(const QTextCharFormat* self) { QFont::StyleStrategy _ret = self->fontStyleStrategy(); - return static_cast(_ret); + return static_cast(_ret); } -void QTextCharFormat_SetFontHintingPreference(QTextCharFormat* self, uintptr_t hintingPreference) { +void QTextCharFormat_SetFontHintingPreference(QTextCharFormat* self, int hintingPreference) { self->setFontHintingPreference(static_cast(hintingPreference)); } -uintptr_t QTextCharFormat_FontHintingPreference(const QTextCharFormat* self) { +int QTextCharFormat_FontHintingPreference(const QTextCharFormat* self) { QFont::HintingPreference _ret = self->fontHintingPreference(); - return static_cast(_ret); + return static_cast(_ret); } void QTextCharFormat_SetFontKerning(QTextCharFormat* self, bool enable) { @@ -490,22 +496,22 @@ bool QTextCharFormat_FontKerning(const QTextCharFormat* self) { return self->fontKerning(); } -void QTextCharFormat_SetUnderlineStyle(QTextCharFormat* self, uintptr_t style) { +void QTextCharFormat_SetUnderlineStyle(QTextCharFormat* self, int style) { self->setUnderlineStyle(static_cast(style)); } -uintptr_t QTextCharFormat_UnderlineStyle(const QTextCharFormat* self) { +int QTextCharFormat_UnderlineStyle(const QTextCharFormat* self) { QTextCharFormat::UnderlineStyle _ret = self->underlineStyle(); - return static_cast(_ret); + return static_cast(_ret); } -void QTextCharFormat_SetVerticalAlignment(QTextCharFormat* self, uintptr_t alignment) { +void QTextCharFormat_SetVerticalAlignment(QTextCharFormat* self, int alignment) { self->setVerticalAlignment(static_cast(alignment)); } -uintptr_t QTextCharFormat_VerticalAlignment(const QTextCharFormat* self) { +int QTextCharFormat_VerticalAlignment(const QTextCharFormat* self) { QTextCharFormat::VerticalAlignment _ret = self->verticalAlignment(); - return static_cast(_ret); + return static_cast(_ret); } void QTextCharFormat_SetTextOutline(QTextCharFormat* self, QPen* pen) { @@ -603,7 +609,7 @@ int QTextCharFormat_TableCellColumnSpan(const QTextCharFormat* self) { return self->tableCellColumnSpan(); } -void QTextCharFormat_SetFontStyleHint2(QTextCharFormat* self, uintptr_t hint, uintptr_t strategy) { +void QTextCharFormat_SetFontStyleHint2(QTextCharFormat* self, int hint, int strategy) { self->setFontStyleHint(static_cast(hint), static_cast(strategy)); } @@ -637,7 +643,8 @@ void QTextBlockFormat_SetTopMargin(QTextBlockFormat* self, double margin) { } double QTextBlockFormat_TopMargin(const QTextBlockFormat* self) { - return self->topMargin(); + qreal _ret = self->topMargin(); + return static_cast(_ret); } void QTextBlockFormat_SetBottomMargin(QTextBlockFormat* self, double margin) { @@ -645,7 +652,8 @@ void QTextBlockFormat_SetBottomMargin(QTextBlockFormat* self, double margin) { } double QTextBlockFormat_BottomMargin(const QTextBlockFormat* self) { - return self->bottomMargin(); + qreal _ret = self->bottomMargin(); + return static_cast(_ret); } void QTextBlockFormat_SetLeftMargin(QTextBlockFormat* self, double margin) { @@ -653,7 +661,8 @@ void QTextBlockFormat_SetLeftMargin(QTextBlockFormat* self, double margin) { } double QTextBlockFormat_LeftMargin(const QTextBlockFormat* self) { - return self->leftMargin(); + qreal _ret = self->leftMargin(); + return static_cast(_ret); } void QTextBlockFormat_SetRightMargin(QTextBlockFormat* self, double margin) { @@ -661,7 +670,8 @@ void QTextBlockFormat_SetRightMargin(QTextBlockFormat* self, double margin) { } double QTextBlockFormat_RightMargin(const QTextBlockFormat* self) { - return self->rightMargin(); + qreal _ret = self->rightMargin(); + return static_cast(_ret); } void QTextBlockFormat_SetTextIndent(QTextBlockFormat* self, double aindent) { @@ -669,7 +679,8 @@ void QTextBlockFormat_SetTextIndent(QTextBlockFormat* self, double aindent) { } double QTextBlockFormat_TextIndent(const QTextBlockFormat* self) { - return self->textIndent(); + qreal _ret = self->textIndent(); + return static_cast(_ret); } void QTextBlockFormat_SetIndent(QTextBlockFormat* self, int indent) { @@ -693,11 +704,13 @@ void QTextBlockFormat_SetLineHeight(QTextBlockFormat* self, double height, int h } double QTextBlockFormat_LineHeight(const QTextBlockFormat* self, double scriptLineHeight, double scaling) { - return self->lineHeight(static_cast(scriptLineHeight), static_cast(scaling)); + qreal _ret = self->lineHeight(static_cast(scriptLineHeight), static_cast(scaling)); + return static_cast(_ret); } double QTextBlockFormat_LineHeight2(const QTextBlockFormat* self) { - return self->lineHeight(); + qreal _ret = self->lineHeight(); + return static_cast(_ret); } int QTextBlockFormat_LineHeightType(const QTextBlockFormat* self) { @@ -744,13 +757,13 @@ struct miqt_array* QTextBlockFormat_TabPositions(const QTextBlockFormat* self) { return _out; } -void QTextBlockFormat_SetMarker(QTextBlockFormat* self, uintptr_t marker) { +void QTextBlockFormat_SetMarker(QTextBlockFormat* self, int marker) { self->setMarker(static_cast(marker)); } -uintptr_t QTextBlockFormat_Marker(const QTextBlockFormat* self) { +int QTextBlockFormat_Marker(const QTextBlockFormat* self) { QTextBlockFormat::MarkerType _ret = self->marker(); - return static_cast(_ret); + return static_cast(_ret); } void QTextBlockFormat_Delete(QTextBlockFormat* self) { @@ -769,13 +782,13 @@ bool QTextListFormat_IsValid(const QTextListFormat* self) { return self->isValid(); } -void QTextListFormat_SetStyle(QTextListFormat* self, uintptr_t style) { +void QTextListFormat_SetStyle(QTextListFormat* self, int style) { self->setStyle(static_cast(style)); } -uintptr_t QTextListFormat_Style(const QTextListFormat* self) { +int QTextListFormat_Style(const QTextListFormat* self) { QTextListFormat::Style _ret = self->style(); - return static_cast(_ret); + return static_cast(_ret); } void QTextListFormat_SetIndent(QTextListFormat* self, int indent) { @@ -839,7 +852,8 @@ void QTextImageFormat_SetWidth(QTextImageFormat* self, double width) { } double QTextImageFormat_Width(const QTextImageFormat* self) { - return self->width(); + qreal _ret = self->width(); + return static_cast(_ret); } void QTextImageFormat_SetHeight(QTextImageFormat* self, double height) { @@ -847,7 +861,8 @@ void QTextImageFormat_SetHeight(QTextImageFormat* self, double height) { } double QTextImageFormat_Height(const QTextImageFormat* self) { - return self->height(); + qreal _ret = self->height(); + return static_cast(_ret); } void QTextImageFormat_SetQuality(QTextImageFormat* self) { @@ -878,13 +893,13 @@ bool QTextFrameFormat_IsValid(const QTextFrameFormat* self) { return self->isValid(); } -void QTextFrameFormat_SetPosition(QTextFrameFormat* self, uintptr_t f) { +void QTextFrameFormat_SetPosition(QTextFrameFormat* self, int f) { self->setPosition(static_cast(f)); } -uintptr_t QTextFrameFormat_Position(const QTextFrameFormat* self) { +int QTextFrameFormat_Position(const QTextFrameFormat* self) { QTextFrameFormat::Position _ret = self->position(); - return static_cast(_ret); + return static_cast(_ret); } void QTextFrameFormat_SetBorder(QTextFrameFormat* self, double border) { @@ -892,7 +907,8 @@ void QTextFrameFormat_SetBorder(QTextFrameFormat* self, double border) { } double QTextFrameFormat_Border(const QTextFrameFormat* self) { - return self->border(); + qreal _ret = self->border(); + return static_cast(_ret); } void QTextFrameFormat_SetBorderBrush(QTextFrameFormat* self, QBrush* brush) { @@ -903,13 +919,13 @@ QBrush* QTextFrameFormat_BorderBrush(const QTextFrameFormat* self) { return new QBrush(self->borderBrush()); } -void QTextFrameFormat_SetBorderStyle(QTextFrameFormat* self, uintptr_t style) { +void QTextFrameFormat_SetBorderStyle(QTextFrameFormat* self, int style) { self->setBorderStyle(static_cast(style)); } -uintptr_t QTextFrameFormat_BorderStyle(const QTextFrameFormat* self) { +int QTextFrameFormat_BorderStyle(const QTextFrameFormat* self) { QTextFrameFormat::BorderStyle _ret = self->borderStyle(); - return static_cast(_ret); + return static_cast(_ret); } void QTextFrameFormat_SetMargin(QTextFrameFormat* self, double margin) { @@ -917,7 +933,8 @@ void QTextFrameFormat_SetMargin(QTextFrameFormat* self, double margin) { } double QTextFrameFormat_Margin(const QTextFrameFormat* self) { - return self->margin(); + qreal _ret = self->margin(); + return static_cast(_ret); } void QTextFrameFormat_SetTopMargin(QTextFrameFormat* self, double margin) { @@ -925,7 +942,8 @@ void QTextFrameFormat_SetTopMargin(QTextFrameFormat* self, double margin) { } double QTextFrameFormat_TopMargin(const QTextFrameFormat* self) { - return self->topMargin(); + qreal _ret = self->topMargin(); + return static_cast(_ret); } void QTextFrameFormat_SetBottomMargin(QTextFrameFormat* self, double margin) { @@ -933,7 +951,8 @@ void QTextFrameFormat_SetBottomMargin(QTextFrameFormat* self, double margin) { } double QTextFrameFormat_BottomMargin(const QTextFrameFormat* self) { - return self->bottomMargin(); + qreal _ret = self->bottomMargin(); + return static_cast(_ret); } void QTextFrameFormat_SetLeftMargin(QTextFrameFormat* self, double margin) { @@ -941,7 +960,8 @@ void QTextFrameFormat_SetLeftMargin(QTextFrameFormat* self, double margin) { } double QTextFrameFormat_LeftMargin(const QTextFrameFormat* self) { - return self->leftMargin(); + qreal _ret = self->leftMargin(); + return static_cast(_ret); } void QTextFrameFormat_SetRightMargin(QTextFrameFormat* self, double margin) { @@ -949,7 +969,8 @@ void QTextFrameFormat_SetRightMargin(QTextFrameFormat* self, double margin) { } double QTextFrameFormat_RightMargin(const QTextFrameFormat* self) { - return self->rightMargin(); + qreal _ret = self->rightMargin(); + return static_cast(_ret); } void QTextFrameFormat_SetPadding(QTextFrameFormat* self, double padding) { @@ -957,7 +978,8 @@ void QTextFrameFormat_SetPadding(QTextFrameFormat* self, double padding) { } double QTextFrameFormat_Padding(const QTextFrameFormat* self) { - return self->padding(); + qreal _ret = self->padding(); + return static_cast(_ret); } void QTextFrameFormat_SetWidth(QTextFrameFormat* self, double width) { @@ -1041,7 +1063,8 @@ void QTextTableFormat_ClearColumnWidthConstraints(QTextTableFormat* self) { } double QTextTableFormat_CellSpacing(const QTextTableFormat* self) { - return self->cellSpacing(); + qreal _ret = self->cellSpacing(); + return static_cast(_ret); } void QTextTableFormat_SetCellSpacing(QTextTableFormat* self, double spacing) { @@ -1049,7 +1072,8 @@ void QTextTableFormat_SetCellSpacing(QTextTableFormat* self, double spacing) { } double QTextTableFormat_CellPadding(const QTextTableFormat* self) { - return self->cellPadding(); + qreal _ret = self->cellPadding(); + return static_cast(_ret); } void QTextTableFormat_SetCellPadding(QTextTableFormat* self, double padding) { @@ -1098,7 +1122,8 @@ void QTextTableCellFormat_SetTopPadding(QTextTableCellFormat* self, double paddi } double QTextTableCellFormat_TopPadding(const QTextTableCellFormat* self) { - return self->topPadding(); + qreal _ret = self->topPadding(); + return static_cast(_ret); } void QTextTableCellFormat_SetBottomPadding(QTextTableCellFormat* self, double padding) { @@ -1106,7 +1131,8 @@ void QTextTableCellFormat_SetBottomPadding(QTextTableCellFormat* self, double pa } double QTextTableCellFormat_BottomPadding(const QTextTableCellFormat* self) { - return self->bottomPadding(); + qreal _ret = self->bottomPadding(); + return static_cast(_ret); } void QTextTableCellFormat_SetLeftPadding(QTextTableCellFormat* self, double padding) { @@ -1114,7 +1140,8 @@ void QTextTableCellFormat_SetLeftPadding(QTextTableCellFormat* self, double padd } double QTextTableCellFormat_LeftPadding(const QTextTableCellFormat* self) { - return self->leftPadding(); + qreal _ret = self->leftPadding(); + return static_cast(_ret); } void QTextTableCellFormat_SetRightPadding(QTextTableCellFormat* self, double padding) { @@ -1122,7 +1149,8 @@ void QTextTableCellFormat_SetRightPadding(QTextTableCellFormat* self, double pad } double QTextTableCellFormat_RightPadding(const QTextTableCellFormat* self) { - return self->rightPadding(); + qreal _ret = self->rightPadding(); + return static_cast(_ret); } void QTextTableCellFormat_SetPadding(QTextTableCellFormat* self, double padding) { @@ -1134,7 +1162,8 @@ void QTextTableCellFormat_SetTopBorder(QTextTableCellFormat* self, double width) } double QTextTableCellFormat_TopBorder(const QTextTableCellFormat* self) { - return self->topBorder(); + qreal _ret = self->topBorder(); + return static_cast(_ret); } void QTextTableCellFormat_SetBottomBorder(QTextTableCellFormat* self, double width) { @@ -1142,7 +1171,8 @@ void QTextTableCellFormat_SetBottomBorder(QTextTableCellFormat* self, double wid } double QTextTableCellFormat_BottomBorder(const QTextTableCellFormat* self) { - return self->bottomBorder(); + qreal _ret = self->bottomBorder(); + return static_cast(_ret); } void QTextTableCellFormat_SetLeftBorder(QTextTableCellFormat* self, double width) { @@ -1150,7 +1180,8 @@ void QTextTableCellFormat_SetLeftBorder(QTextTableCellFormat* self, double width } double QTextTableCellFormat_LeftBorder(const QTextTableCellFormat* self) { - return self->leftBorder(); + qreal _ret = self->leftBorder(); + return static_cast(_ret); } void QTextTableCellFormat_SetRightBorder(QTextTableCellFormat* self, double width) { @@ -1158,50 +1189,51 @@ void QTextTableCellFormat_SetRightBorder(QTextTableCellFormat* self, double widt } double QTextTableCellFormat_RightBorder(const QTextTableCellFormat* self) { - return self->rightBorder(); + qreal _ret = self->rightBorder(); + return static_cast(_ret); } void QTextTableCellFormat_SetBorder(QTextTableCellFormat* self, double width) { self->setBorder(static_cast(width)); } -void QTextTableCellFormat_SetTopBorderStyle(QTextTableCellFormat* self, uintptr_t style) { +void QTextTableCellFormat_SetTopBorderStyle(QTextTableCellFormat* self, int style) { self->setTopBorderStyle(static_cast(style)); } -uintptr_t QTextTableCellFormat_TopBorderStyle(const QTextTableCellFormat* self) { +int QTextTableCellFormat_TopBorderStyle(const QTextTableCellFormat* self) { QTextFrameFormat::BorderStyle _ret = self->topBorderStyle(); - return static_cast(_ret); + return static_cast(_ret); } -void QTextTableCellFormat_SetBottomBorderStyle(QTextTableCellFormat* self, uintptr_t style) { +void QTextTableCellFormat_SetBottomBorderStyle(QTextTableCellFormat* self, int style) { self->setBottomBorderStyle(static_cast(style)); } -uintptr_t QTextTableCellFormat_BottomBorderStyle(const QTextTableCellFormat* self) { +int QTextTableCellFormat_BottomBorderStyle(const QTextTableCellFormat* self) { QTextFrameFormat::BorderStyle _ret = self->bottomBorderStyle(); - return static_cast(_ret); + return static_cast(_ret); } -void QTextTableCellFormat_SetLeftBorderStyle(QTextTableCellFormat* self, uintptr_t style) { +void QTextTableCellFormat_SetLeftBorderStyle(QTextTableCellFormat* self, int style) { self->setLeftBorderStyle(static_cast(style)); } -uintptr_t QTextTableCellFormat_LeftBorderStyle(const QTextTableCellFormat* self) { +int QTextTableCellFormat_LeftBorderStyle(const QTextTableCellFormat* self) { QTextFrameFormat::BorderStyle _ret = self->leftBorderStyle(); - return static_cast(_ret); + return static_cast(_ret); } -void QTextTableCellFormat_SetRightBorderStyle(QTextTableCellFormat* self, uintptr_t style) { +void QTextTableCellFormat_SetRightBorderStyle(QTextTableCellFormat* self, int style) { self->setRightBorderStyle(static_cast(style)); } -uintptr_t QTextTableCellFormat_RightBorderStyle(const QTextTableCellFormat* self) { +int QTextTableCellFormat_RightBorderStyle(const QTextTableCellFormat* self) { QTextFrameFormat::BorderStyle _ret = self->rightBorderStyle(); - return static_cast(_ret); + return static_cast(_ret); } -void QTextTableCellFormat_SetBorderStyle(QTextTableCellFormat* self, uintptr_t style) { +void QTextTableCellFormat_SetBorderStyle(QTextTableCellFormat* self, int style) { self->setBorderStyle(static_cast(style)); } diff --git a/qt/gen_qtextformat.go b/qt/gen_qtextformat.go index 61c8371..7ab650a 100644 --- a/qt/gen_qtextformat.go +++ b/qt/gen_qtextformat.go @@ -279,7 +279,7 @@ func NewQTextLength() *QTextLength { // NewQTextLength2 constructs a new QTextLength object. func NewQTextLength2(typeVal QTextLength__Type, value float64) *QTextLength { - ret := C.QTextLength_new2((C.uintptr_t)(typeVal), (C.double)(value)) + ret := C.QTextLength_new2((C.int)(typeVal), (C.double)(value)) return newQTextLength(ret) } @@ -585,7 +585,7 @@ func (this *QTextFormat) OperatorNotEqual(rhs *QTextFormat) bool { } func (this *QTextFormat) SetLayoutDirection(direction LayoutDirection) { - C.QTextFormat_SetLayoutDirection(this.h, (C.uintptr_t)(direction)) + C.QTextFormat_SetLayoutDirection(this.h, (C.int)(direction)) } func (this *QTextFormat) LayoutDirection() LayoutDirection { @@ -676,7 +676,7 @@ func (this *QTextCharFormat) IsValid() bool { } func (this *QTextCharFormat) SetFont(font *QFont, behavior QTextCharFormat__FontPropertiesInheritanceBehavior) { - C.QTextCharFormat_SetFont(this.h, font.cPointer(), (C.uintptr_t)(behavior)) + C.QTextCharFormat_SetFont(this.h, font.cPointer(), (C.int)(behavior)) } func (this *QTextCharFormat) SetFontWithFont(font *QFont) { @@ -762,7 +762,7 @@ func (this *QTextCharFormat) FontItalic() bool { } func (this *QTextCharFormat) SetFontCapitalization(capitalization QFont__Capitalization) { - C.QTextCharFormat_SetFontCapitalization(this.h, (C.uintptr_t)(capitalization)) + C.QTextCharFormat_SetFontCapitalization(this.h, (C.int)(capitalization)) } func (this *QTextCharFormat) FontCapitalization() QFont__Capitalization { @@ -770,7 +770,7 @@ func (this *QTextCharFormat) FontCapitalization() QFont__Capitalization { } func (this *QTextCharFormat) SetFontLetterSpacingType(letterSpacingType QFont__SpacingType) { - C.QTextCharFormat_SetFontLetterSpacingType(this.h, (C.uintptr_t)(letterSpacingType)) + C.QTextCharFormat_SetFontLetterSpacingType(this.h, (C.int)(letterSpacingType)) } func (this *QTextCharFormat) FontLetterSpacingType() QFont__SpacingType { @@ -845,11 +845,11 @@ func (this *QTextCharFormat) FontStretch() int { } func (this *QTextCharFormat) SetFontStyleHint(hint QFont__StyleHint) { - C.QTextCharFormat_SetFontStyleHint(this.h, (C.uintptr_t)(hint)) + C.QTextCharFormat_SetFontStyleHint(this.h, (C.int)(hint)) } func (this *QTextCharFormat) SetFontStyleStrategy(strategy QFont__StyleStrategy) { - C.QTextCharFormat_SetFontStyleStrategy(this.h, (C.uintptr_t)(strategy)) + C.QTextCharFormat_SetFontStyleStrategy(this.h, (C.int)(strategy)) } func (this *QTextCharFormat) FontStyleHint() QFont__StyleHint { @@ -861,7 +861,7 @@ func (this *QTextCharFormat) FontStyleStrategy() QFont__StyleStrategy { } func (this *QTextCharFormat) SetFontHintingPreference(hintingPreference QFont__HintingPreference) { - C.QTextCharFormat_SetFontHintingPreference(this.h, (C.uintptr_t)(hintingPreference)) + C.QTextCharFormat_SetFontHintingPreference(this.h, (C.int)(hintingPreference)) } func (this *QTextCharFormat) FontHintingPreference() QFont__HintingPreference { @@ -877,7 +877,7 @@ func (this *QTextCharFormat) FontKerning() bool { } func (this *QTextCharFormat) SetUnderlineStyle(style QTextCharFormat__UnderlineStyle) { - C.QTextCharFormat_SetUnderlineStyle(this.h, (C.uintptr_t)(style)) + C.QTextCharFormat_SetUnderlineStyle(this.h, (C.int)(style)) } func (this *QTextCharFormat) UnderlineStyle() QTextCharFormat__UnderlineStyle { @@ -885,7 +885,7 @@ func (this *QTextCharFormat) UnderlineStyle() QTextCharFormat__UnderlineStyle { } func (this *QTextCharFormat) SetVerticalAlignment(alignment QTextCharFormat__VerticalAlignment) { - C.QTextCharFormat_SetVerticalAlignment(this.h, (C.uintptr_t)(alignment)) + C.QTextCharFormat_SetVerticalAlignment(this.h, (C.int)(alignment)) } func (this *QTextCharFormat) VerticalAlignment() QTextCharFormat__VerticalAlignment { @@ -995,7 +995,7 @@ func (this *QTextCharFormat) TableCellColumnSpan() int { } func (this *QTextCharFormat) SetFontStyleHint2(hint QFont__StyleHint, strategy QFont__StyleStrategy) { - C.QTextCharFormat_SetFontStyleHint2(this.h, (C.uintptr_t)(hint), (C.uintptr_t)(strategy)) + C.QTextCharFormat_SetFontStyleHint2(this.h, (C.int)(hint), (C.int)(strategy)) } // Delete this object from C++ memory. @@ -1052,7 +1052,7 @@ func (this *QTextBlockFormat) IsValid() bool { } func (this *QTextBlockFormat) SetAlignment(alignment int) { - C.QTextBlockFormat_SetAlignment(this.h, (C.int)(alignment)) + C.QTextBlockFormat_SetAlignment(this.h, alignment) } func (this *QTextBlockFormat) Alignment() int { @@ -1140,7 +1140,7 @@ func (this *QTextBlockFormat) NonBreakableLines() bool { } func (this *QTextBlockFormat) SetPageBreakPolicy(flags int) { - C.QTextBlockFormat_SetPageBreakPolicy(this.h, (C.int)(flags)) + C.QTextBlockFormat_SetPageBreakPolicy(this.h, flags) } func (this *QTextBlockFormat) PageBreakPolicy() int { @@ -1174,7 +1174,7 @@ func (this *QTextBlockFormat) TabPositions() []QTextOption__Tab { } func (this *QTextBlockFormat) SetMarker(marker QTextBlockFormat__MarkerType) { - C.QTextBlockFormat_SetMarker(this.h, (C.uintptr_t)(marker)) + C.QTextBlockFormat_SetMarker(this.h, (C.int)(marker)) } func (this *QTextBlockFormat) Marker() QTextBlockFormat__MarkerType { @@ -1235,7 +1235,7 @@ func (this *QTextListFormat) IsValid() bool { } func (this *QTextListFormat) SetStyle(style QTextListFormat__Style) { - C.QTextListFormat_SetStyle(this.h, (C.uintptr_t)(style)) + C.QTextListFormat_SetStyle(this.h, (C.int)(style)) } func (this *QTextListFormat) Style() QTextListFormat__Style { @@ -1418,7 +1418,7 @@ func (this *QTextFrameFormat) IsValid() bool { } func (this *QTextFrameFormat) SetPosition(f QTextFrameFormat__Position) { - C.QTextFrameFormat_SetPosition(this.h, (C.uintptr_t)(f)) + C.QTextFrameFormat_SetPosition(this.h, (C.int)(f)) } func (this *QTextFrameFormat) Position() QTextFrameFormat__Position { @@ -1445,7 +1445,7 @@ func (this *QTextFrameFormat) BorderBrush() *QBrush { } func (this *QTextFrameFormat) SetBorderStyle(style QTextFrameFormat__BorderStyle) { - C.QTextFrameFormat_SetBorderStyle(this.h, (C.uintptr_t)(style)) + C.QTextFrameFormat_SetBorderStyle(this.h, (C.int)(style)) } func (this *QTextFrameFormat) BorderStyle() QTextFrameFormat__BorderStyle { @@ -1531,7 +1531,7 @@ func (this *QTextFrameFormat) Height() *QTextLength { } func (this *QTextFrameFormat) SetPageBreakPolicy(flags int) { - C.QTextFrameFormat_SetPageBreakPolicy(this.h, (C.int)(flags)) + C.QTextFrameFormat_SetPageBreakPolicy(this.h, flags) } func (this *QTextFrameFormat) PageBreakPolicy() int { @@ -1640,7 +1640,7 @@ func (this *QTextTableFormat) SetCellPadding(padding float64) { } func (this *QTextTableFormat) SetAlignment(alignment int) { - C.QTextTableFormat_SetAlignment(this.h, (C.int)(alignment)) + C.QTextTableFormat_SetAlignment(this.h, alignment) } func (this *QTextTableFormat) Alignment() int { @@ -1783,7 +1783,7 @@ func (this *QTextTableCellFormat) SetBorder(width float64) { } func (this *QTextTableCellFormat) SetTopBorderStyle(style QTextFrameFormat__BorderStyle) { - C.QTextTableCellFormat_SetTopBorderStyle(this.h, (C.uintptr_t)(style)) + C.QTextTableCellFormat_SetTopBorderStyle(this.h, (C.int)(style)) } func (this *QTextTableCellFormat) TopBorderStyle() QTextFrameFormat__BorderStyle { @@ -1791,7 +1791,7 @@ func (this *QTextTableCellFormat) TopBorderStyle() QTextFrameFormat__BorderStyle } func (this *QTextTableCellFormat) SetBottomBorderStyle(style QTextFrameFormat__BorderStyle) { - C.QTextTableCellFormat_SetBottomBorderStyle(this.h, (C.uintptr_t)(style)) + C.QTextTableCellFormat_SetBottomBorderStyle(this.h, (C.int)(style)) } func (this *QTextTableCellFormat) BottomBorderStyle() QTextFrameFormat__BorderStyle { @@ -1799,7 +1799,7 @@ func (this *QTextTableCellFormat) BottomBorderStyle() QTextFrameFormat__BorderSt } func (this *QTextTableCellFormat) SetLeftBorderStyle(style QTextFrameFormat__BorderStyle) { - C.QTextTableCellFormat_SetLeftBorderStyle(this.h, (C.uintptr_t)(style)) + C.QTextTableCellFormat_SetLeftBorderStyle(this.h, (C.int)(style)) } func (this *QTextTableCellFormat) LeftBorderStyle() QTextFrameFormat__BorderStyle { @@ -1807,7 +1807,7 @@ func (this *QTextTableCellFormat) LeftBorderStyle() QTextFrameFormat__BorderStyl } func (this *QTextTableCellFormat) SetRightBorderStyle(style QTextFrameFormat__BorderStyle) { - C.QTextTableCellFormat_SetRightBorderStyle(this.h, (C.uintptr_t)(style)) + C.QTextTableCellFormat_SetRightBorderStyle(this.h, (C.int)(style)) } func (this *QTextTableCellFormat) RightBorderStyle() QTextFrameFormat__BorderStyle { @@ -1815,7 +1815,7 @@ func (this *QTextTableCellFormat) RightBorderStyle() QTextFrameFormat__BorderSty } func (this *QTextTableCellFormat) SetBorderStyle(style QTextFrameFormat__BorderStyle) { - C.QTextTableCellFormat_SetBorderStyle(this.h, (C.uintptr_t)(style)) + C.QTextTableCellFormat_SetBorderStyle(this.h, (C.int)(style)) } func (this *QTextTableCellFormat) SetTopBorderBrush(brush *QBrush) { diff --git a/qt/gen_qtextformat.h b/qt/gen_qtextformat.h index c3c2d98..77d1847 100644 --- a/qt/gen_qtextformat.h +++ b/qt/gen_qtextformat.h @@ -52,9 +52,9 @@ typedef struct QVariant QVariant; #endif QTextLength* QTextLength_new(); -QTextLength* QTextLength_new2(uintptr_t typeVal, double value); +QTextLength* QTextLength_new2(int typeVal, double value); QTextLength* QTextLength_new3(QTextLength* param1); -uintptr_t QTextLength_Type(const QTextLength* self); +int QTextLength_Type(const QTextLength* self); double QTextLength_Value(const QTextLength* self, double maximumLength); double QTextLength_RawValue(const QTextLength* self); bool QTextLength_OperatorEqual(const QTextLength* self, QTextLength* other); @@ -105,8 +105,8 @@ QTextImageFormat* QTextFormat_ToImageFormat(const QTextFormat* self); QTextTableCellFormat* QTextFormat_ToTableCellFormat(const QTextFormat* self); bool QTextFormat_OperatorEqual(const QTextFormat* self, QTextFormat* rhs); bool QTextFormat_OperatorNotEqual(const QTextFormat* self, QTextFormat* rhs); -void QTextFormat_SetLayoutDirection(QTextFormat* self, uintptr_t direction); -uintptr_t QTextFormat_LayoutDirection(const QTextFormat* self); +void QTextFormat_SetLayoutDirection(QTextFormat* self, int direction); +int QTextFormat_LayoutDirection(const QTextFormat* self); void QTextFormat_SetBackground(QTextFormat* self, QBrush* brush); QBrush* QTextFormat_Background(const QTextFormat* self); void QTextFormat_ClearBackground(QTextFormat* self); @@ -118,7 +118,7 @@ void QTextFormat_Delete(QTextFormat* self); QTextCharFormat* QTextCharFormat_new(); QTextCharFormat* QTextCharFormat_new2(QTextCharFormat* param1); bool QTextCharFormat_IsValid(const QTextCharFormat* self); -void QTextCharFormat_SetFont(QTextCharFormat* self, QFont* font, uintptr_t behavior); +void QTextCharFormat_SetFont(QTextCharFormat* self, QFont* font, int behavior); void QTextCharFormat_SetFontWithFont(QTextCharFormat* self, QFont* font); QFont* QTextCharFormat_Font(const QTextCharFormat* self); void QTextCharFormat_SetFontFamily(QTextCharFormat* self, struct miqt_string* family); @@ -133,10 +133,10 @@ void QTextCharFormat_SetFontWeight(QTextCharFormat* self, int weight); int QTextCharFormat_FontWeight(const QTextCharFormat* self); void QTextCharFormat_SetFontItalic(QTextCharFormat* self, bool italic); bool QTextCharFormat_FontItalic(const QTextCharFormat* self); -void QTextCharFormat_SetFontCapitalization(QTextCharFormat* self, uintptr_t capitalization); -uintptr_t QTextCharFormat_FontCapitalization(const QTextCharFormat* self); -void QTextCharFormat_SetFontLetterSpacingType(QTextCharFormat* self, uintptr_t letterSpacingType); -uintptr_t QTextCharFormat_FontLetterSpacingType(const QTextCharFormat* self); +void QTextCharFormat_SetFontCapitalization(QTextCharFormat* self, int capitalization); +int QTextCharFormat_FontCapitalization(const QTextCharFormat* self); +void QTextCharFormat_SetFontLetterSpacingType(QTextCharFormat* self, int letterSpacingType); +int QTextCharFormat_FontLetterSpacingType(const QTextCharFormat* self); void QTextCharFormat_SetFontLetterSpacing(QTextCharFormat* self, double spacing); double QTextCharFormat_FontLetterSpacing(const QTextCharFormat* self); void QTextCharFormat_SetFontWordSpacing(QTextCharFormat* self, double spacing); @@ -153,18 +153,18 @@ void QTextCharFormat_SetFontFixedPitch(QTextCharFormat* self, bool fixedPitch); bool QTextCharFormat_FontFixedPitch(const QTextCharFormat* self); void QTextCharFormat_SetFontStretch(QTextCharFormat* self, int factor); int QTextCharFormat_FontStretch(const QTextCharFormat* self); -void QTextCharFormat_SetFontStyleHint(QTextCharFormat* self, uintptr_t hint); -void QTextCharFormat_SetFontStyleStrategy(QTextCharFormat* self, uintptr_t strategy); -uintptr_t QTextCharFormat_FontStyleHint(const QTextCharFormat* self); -uintptr_t QTextCharFormat_FontStyleStrategy(const QTextCharFormat* self); -void QTextCharFormat_SetFontHintingPreference(QTextCharFormat* self, uintptr_t hintingPreference); -uintptr_t QTextCharFormat_FontHintingPreference(const QTextCharFormat* self); +void QTextCharFormat_SetFontStyleHint(QTextCharFormat* self, int hint); +void QTextCharFormat_SetFontStyleStrategy(QTextCharFormat* self, int strategy); +int QTextCharFormat_FontStyleHint(const QTextCharFormat* self); +int QTextCharFormat_FontStyleStrategy(const QTextCharFormat* self); +void QTextCharFormat_SetFontHintingPreference(QTextCharFormat* self, int hintingPreference); +int QTextCharFormat_FontHintingPreference(const QTextCharFormat* self); void QTextCharFormat_SetFontKerning(QTextCharFormat* self, bool enable); bool QTextCharFormat_FontKerning(const QTextCharFormat* self); -void QTextCharFormat_SetUnderlineStyle(QTextCharFormat* self, uintptr_t style); -uintptr_t QTextCharFormat_UnderlineStyle(const QTextCharFormat* self); -void QTextCharFormat_SetVerticalAlignment(QTextCharFormat* self, uintptr_t alignment); -uintptr_t QTextCharFormat_VerticalAlignment(const QTextCharFormat* self); +void QTextCharFormat_SetUnderlineStyle(QTextCharFormat* self, int style); +int QTextCharFormat_UnderlineStyle(const QTextCharFormat* self); +void QTextCharFormat_SetVerticalAlignment(QTextCharFormat* self, int alignment); +int QTextCharFormat_VerticalAlignment(const QTextCharFormat* self); void QTextCharFormat_SetTextOutline(QTextCharFormat* self, QPen* pen); QPen* QTextCharFormat_TextOutline(const QTextCharFormat* self); void QTextCharFormat_SetToolTip(QTextCharFormat* self, struct miqt_string* tip); @@ -181,7 +181,7 @@ void QTextCharFormat_SetTableCellRowSpan(QTextCharFormat* self, int tableCellRow int QTextCharFormat_TableCellRowSpan(const QTextCharFormat* self); void QTextCharFormat_SetTableCellColumnSpan(QTextCharFormat* self, int tableCellColumnSpan); int QTextCharFormat_TableCellColumnSpan(const QTextCharFormat* self); -void QTextCharFormat_SetFontStyleHint2(QTextCharFormat* self, uintptr_t hint, uintptr_t strategy); +void QTextCharFormat_SetFontStyleHint2(QTextCharFormat* self, int hint, int strategy); void QTextCharFormat_Delete(QTextCharFormat* self); QTextBlockFormat* QTextBlockFormat_new(); @@ -213,15 +213,15 @@ void QTextBlockFormat_SetPageBreakPolicy(QTextBlockFormat* self, int flags); int QTextBlockFormat_PageBreakPolicy(const QTextBlockFormat* self); void QTextBlockFormat_SetTabPositions(QTextBlockFormat* self, struct miqt_array* /* of QTextOption__Tab* */ tabs); struct miqt_array* QTextBlockFormat_TabPositions(const QTextBlockFormat* self); -void QTextBlockFormat_SetMarker(QTextBlockFormat* self, uintptr_t marker); -uintptr_t QTextBlockFormat_Marker(const QTextBlockFormat* self); +void QTextBlockFormat_SetMarker(QTextBlockFormat* self, int marker); +int QTextBlockFormat_Marker(const QTextBlockFormat* self); void QTextBlockFormat_Delete(QTextBlockFormat* self); QTextListFormat* QTextListFormat_new(); QTextListFormat* QTextListFormat_new2(QTextListFormat* param1); bool QTextListFormat_IsValid(const QTextListFormat* self); -void QTextListFormat_SetStyle(QTextListFormat* self, uintptr_t style); -uintptr_t QTextListFormat_Style(const QTextListFormat* self); +void QTextListFormat_SetStyle(QTextListFormat* self, int style); +int QTextListFormat_Style(const QTextListFormat* self); void QTextListFormat_SetIndent(QTextListFormat* self, int indent); int QTextListFormat_Indent(const QTextListFormat* self); void QTextListFormat_SetNumberPrefix(QTextListFormat* self, struct miqt_string* numberPrefix); @@ -246,14 +246,14 @@ void QTextImageFormat_Delete(QTextImageFormat* self); QTextFrameFormat* QTextFrameFormat_new(); QTextFrameFormat* QTextFrameFormat_new2(QTextFrameFormat* param1); bool QTextFrameFormat_IsValid(const QTextFrameFormat* self); -void QTextFrameFormat_SetPosition(QTextFrameFormat* self, uintptr_t f); -uintptr_t QTextFrameFormat_Position(const QTextFrameFormat* self); +void QTextFrameFormat_SetPosition(QTextFrameFormat* self, int f); +int QTextFrameFormat_Position(const QTextFrameFormat* self); void QTextFrameFormat_SetBorder(QTextFrameFormat* self, double border); double QTextFrameFormat_Border(const QTextFrameFormat* self); void QTextFrameFormat_SetBorderBrush(QTextFrameFormat* self, QBrush* brush); QBrush* QTextFrameFormat_BorderBrush(const QTextFrameFormat* self); -void QTextFrameFormat_SetBorderStyle(QTextFrameFormat* self, uintptr_t style); -uintptr_t QTextFrameFormat_BorderStyle(const QTextFrameFormat* self); +void QTextFrameFormat_SetBorderStyle(QTextFrameFormat* self, int style); +int QTextFrameFormat_BorderStyle(const QTextFrameFormat* self); void QTextFrameFormat_SetMargin(QTextFrameFormat* self, double margin); double QTextFrameFormat_Margin(const QTextFrameFormat* self); void QTextFrameFormat_SetTopMargin(QTextFrameFormat* self, double margin); @@ -315,15 +315,15 @@ double QTextTableCellFormat_LeftBorder(const QTextTableCellFormat* self); void QTextTableCellFormat_SetRightBorder(QTextTableCellFormat* self, double width); double QTextTableCellFormat_RightBorder(const QTextTableCellFormat* self); void QTextTableCellFormat_SetBorder(QTextTableCellFormat* self, double width); -void QTextTableCellFormat_SetTopBorderStyle(QTextTableCellFormat* self, uintptr_t style); -uintptr_t QTextTableCellFormat_TopBorderStyle(const QTextTableCellFormat* self); -void QTextTableCellFormat_SetBottomBorderStyle(QTextTableCellFormat* self, uintptr_t style); -uintptr_t QTextTableCellFormat_BottomBorderStyle(const QTextTableCellFormat* self); -void QTextTableCellFormat_SetLeftBorderStyle(QTextTableCellFormat* self, uintptr_t style); -uintptr_t QTextTableCellFormat_LeftBorderStyle(const QTextTableCellFormat* self); -void QTextTableCellFormat_SetRightBorderStyle(QTextTableCellFormat* self, uintptr_t style); -uintptr_t QTextTableCellFormat_RightBorderStyle(const QTextTableCellFormat* self); -void QTextTableCellFormat_SetBorderStyle(QTextTableCellFormat* self, uintptr_t style); +void QTextTableCellFormat_SetTopBorderStyle(QTextTableCellFormat* self, int style); +int QTextTableCellFormat_TopBorderStyle(const QTextTableCellFormat* self); +void QTextTableCellFormat_SetBottomBorderStyle(QTextTableCellFormat* self, int style); +int QTextTableCellFormat_BottomBorderStyle(const QTextTableCellFormat* self); +void QTextTableCellFormat_SetLeftBorderStyle(QTextTableCellFormat* self, int style); +int QTextTableCellFormat_LeftBorderStyle(const QTextTableCellFormat* self); +void QTextTableCellFormat_SetRightBorderStyle(QTextTableCellFormat* self, int style); +int QTextTableCellFormat_RightBorderStyle(const QTextTableCellFormat* self); +void QTextTableCellFormat_SetBorderStyle(QTextTableCellFormat* self, int style); void QTextTableCellFormat_SetTopBorderBrush(QTextTableCellFormat* self, QBrush* brush); QBrush* QTextTableCellFormat_TopBorderBrush(const QTextTableCellFormat* self); void QTextTableCellFormat_SetBottomBorderBrush(QTextTableCellFormat* self, QBrush* brush); diff --git a/qt/gen_qtextlayout.cpp b/qt/gen_qtextlayout.cpp index 5a37339..2942f0c 100644 --- a/qt/gen_qtextlayout.cpp +++ b/qt/gen_qtextlayout.cpp @@ -33,24 +33,28 @@ QRectF* QTextInlineObject_Rect(const QTextInlineObject* self) { } double QTextInlineObject_Width(const QTextInlineObject* self) { - return self->width(); + qreal _ret = self->width(); + return static_cast(_ret); } double QTextInlineObject_Ascent(const QTextInlineObject* self) { - return self->ascent(); + qreal _ret = self->ascent(); + return static_cast(_ret); } double QTextInlineObject_Descent(const QTextInlineObject* self) { - return self->descent(); + qreal _ret = self->descent(); + return static_cast(_ret); } double QTextInlineObject_Height(const QTextInlineObject* self) { - return self->height(); + qreal _ret = self->height(); + return static_cast(_ret); } -uintptr_t QTextInlineObject_TextDirection(const QTextInlineObject* self) { +int QTextInlineObject_TextDirection(const QTextInlineObject* self) { Qt::LayoutDirection _ret = self->textDirection(); - return static_cast(_ret); + return static_cast(_ret); } void QTextInlineObject_SetWidth(QTextInlineObject* self, double w) { @@ -216,13 +220,13 @@ bool QTextLayout_CacheEnabled(const QTextLayout* self) { return self->cacheEnabled(); } -void QTextLayout_SetCursorMoveStyle(QTextLayout* self, uintptr_t style) { +void QTextLayout_SetCursorMoveStyle(QTextLayout* self, int style) { self->setCursorMoveStyle(static_cast(style)); } -uintptr_t QTextLayout_CursorMoveStyle(const QTextLayout* self) { +int QTextLayout_CursorMoveStyle(const QTextLayout* self) { Qt::CursorMoveStyle _ret = self->cursorMoveStyle(); - return static_cast(_ret); + return static_cast(_ret); } void QTextLayout_BeginLayout(QTextLayout* self) { @@ -298,11 +302,13 @@ QRectF* QTextLayout_BoundingRect(const QTextLayout* self) { } double QTextLayout_MinimumWidth(const QTextLayout* self) { - return self->minimumWidth(); + qreal _ret = self->minimumWidth(); + return static_cast(_ret); } double QTextLayout_MaximumWidth(const QTextLayout* self) { - return self->maximumWidth(); + qreal _ret = self->maximumWidth(); + return static_cast(_ret); } struct miqt_array* QTextLayout_GlyphRuns(const QTextLayout* self) { @@ -322,11 +328,11 @@ void QTextLayout_SetFlags(QTextLayout* self, int flags) { self->setFlags(static_cast(flags)); } -int QTextLayout_NextCursorPosition2(const QTextLayout* self, int oldPos, uintptr_t mode) { +int QTextLayout_NextCursorPosition2(const QTextLayout* self, int oldPos, int mode) { return self->nextCursorPosition(static_cast(oldPos), static_cast(mode)); } -int QTextLayout_PreviousCursorPosition2(const QTextLayout* self, int oldPos, uintptr_t mode) { +int QTextLayout_PreviousCursorPosition2(const QTextLayout* self, int oldPos, int mode) { return self->previousCursorPosition(static_cast(oldPos), static_cast(mode)); } @@ -393,31 +399,38 @@ QRectF* QTextLine_Rect(const QTextLine* self) { } double QTextLine_X(const QTextLine* self) { - return self->x(); + qreal _ret = self->x(); + return static_cast(_ret); } double QTextLine_Y(const QTextLine* self) { - return self->y(); + qreal _ret = self->y(); + return static_cast(_ret); } double QTextLine_Width(const QTextLine* self) { - return self->width(); + qreal _ret = self->width(); + return static_cast(_ret); } double QTextLine_Ascent(const QTextLine* self) { - return self->ascent(); + qreal _ret = self->ascent(); + return static_cast(_ret); } double QTextLine_Descent(const QTextLine* self) { - return self->descent(); + qreal _ret = self->descent(); + return static_cast(_ret); } double QTextLine_Height(const QTextLine* self) { - return self->height(); + qreal _ret = self->height(); + return static_cast(_ret); } double QTextLine_Leading(const QTextLine* self) { - return self->leading(); + qreal _ret = self->leading(); + return static_cast(_ret); } void QTextLine_SetLeadingIncluded(QTextLine* self, bool included) { @@ -429,11 +442,13 @@ bool QTextLine_LeadingIncluded(const QTextLine* self) { } double QTextLine_NaturalTextWidth(const QTextLine* self) { - return self->naturalTextWidth(); + qreal _ret = self->naturalTextWidth(); + return static_cast(_ret); } double QTextLine_HorizontalAdvance(const QTextLine* self) { - return self->horizontalAdvance(); + qreal _ret = self->horizontalAdvance(); + return static_cast(_ret); } QRectF* QTextLine_NaturalTextRect(const QTextLine* self) { @@ -441,11 +456,13 @@ QRectF* QTextLine_NaturalTextRect(const QTextLine* self) { } double QTextLine_CursorToX(const QTextLine* self, int* cursorPos) { - return self->cursorToX(static_cast(cursorPos)); + qreal _ret = self->cursorToX(static_cast(cursorPos)); + return static_cast(_ret); } double QTextLine_CursorToXWithCursorPos(const QTextLine* self, int cursorPos) { - return self->cursorToX(static_cast(cursorPos)); + qreal _ret = self->cursorToX(static_cast(cursorPos)); + return static_cast(_ret); } int QTextLine_XToCursor(const QTextLine* self, double x) { @@ -501,15 +518,17 @@ struct miqt_array* QTextLine_GlyphRuns(const QTextLine* self) { return _out; } -double QTextLine_CursorToX2(const QTextLine* self, int* cursorPos, uintptr_t edge) { - return self->cursorToX(static_cast(cursorPos), static_cast(edge)); +double QTextLine_CursorToX2(const QTextLine* self, int* cursorPos, int edge) { + qreal _ret = self->cursorToX(static_cast(cursorPos), static_cast(edge)); + return static_cast(_ret); } -double QTextLine_CursorToX22(const QTextLine* self, int cursorPos, uintptr_t edge) { - return self->cursorToX(static_cast(cursorPos), static_cast(edge)); +double QTextLine_CursorToX22(const QTextLine* self, int cursorPos, int edge) { + qreal _ret = self->cursorToX(static_cast(cursorPos), static_cast(edge)); + return static_cast(_ret); } -int QTextLine_XToCursor2(const QTextLine* self, double x, uintptr_t param2) { +int QTextLine_XToCursor2(const QTextLine* self, double x, int param2) { return self->xToCursor(static_cast(x), static_cast(param2)); } diff --git a/qt/gen_qtextlayout.go b/qt/gen_qtextlayout.go index 46ca4c5..a5f20ed 100644 --- a/qt/gen_qtextlayout.go +++ b/qt/gen_qtextlayout.go @@ -314,7 +314,7 @@ func (this *QTextLayout) CacheEnabled() bool { } func (this *QTextLayout) SetCursorMoveStyle(style CursorMoveStyle) { - C.QTextLayout_SetCursorMoveStyle(this.h, (C.uintptr_t)(style)) + C.QTextLayout_SetCursorMoveStyle(this.h, (C.int)(style)) } func (this *QTextLayout) CursorMoveStyle() CursorMoveStyle { @@ -435,11 +435,11 @@ func (this *QTextLayout) SetFlags(flags int) { } func (this *QTextLayout) NextCursorPosition2(oldPos int, mode QTextLayout__CursorMode) int { - return (int)(C.QTextLayout_NextCursorPosition2(this.h, (C.int)(oldPos), (C.uintptr_t)(mode))) + return (int)(C.QTextLayout_NextCursorPosition2(this.h, (C.int)(oldPos), (C.int)(mode))) } func (this *QTextLayout) PreviousCursorPosition2(oldPos int, mode QTextLayout__CursorMode) int { - return (int)(C.QTextLayout_PreviousCursorPosition2(this.h, (C.int)(oldPos), (C.uintptr_t)(mode))) + return (int)(C.QTextLayout_PreviousCursorPosition2(this.h, (C.int)(oldPos), (C.int)(mode))) } func (this *QTextLayout) Draw3(p *QPainter, pos *QPointF, selections []QTextLayout__FormatRange) { @@ -664,15 +664,15 @@ func (this *QTextLine) GlyphRuns() []QGlyphRun { } func (this *QTextLine) CursorToX2(cursorPos *int, edge QTextLine__Edge) float64 { - return (float64)(C.QTextLine_CursorToX2(this.h, (*C.int)(unsafe.Pointer(cursorPos)), (C.uintptr_t)(edge))) + return (float64)(C.QTextLine_CursorToX2(this.h, (*C.int)(unsafe.Pointer(cursorPos)), (C.int)(edge))) } func (this *QTextLine) CursorToX22(cursorPos int, edge QTextLine__Edge) float64 { - return (float64)(C.QTextLine_CursorToX22(this.h, (C.int)(cursorPos), (C.uintptr_t)(edge))) + return (float64)(C.QTextLine_CursorToX22(this.h, (C.int)(cursorPos), (C.int)(edge))) } func (this *QTextLine) XToCursor2(x float64, param2 QTextLine__CursorPosition) int { - return (int)(C.QTextLine_XToCursor2(this.h, (C.double)(x), (C.uintptr_t)(param2))) + return (int)(C.QTextLine_XToCursor2(this.h, (C.double)(x), (C.int)(param2))) } func (this *QTextLine) Draw3(p *QPainter, point *QPointF, selection *QTextLayout__FormatRange) { diff --git a/qt/gen_qtextlayout.h b/qt/gen_qtextlayout.h index 38343e7..a080307 100644 --- a/qt/gen_qtextlayout.h +++ b/qt/gen_qtextlayout.h @@ -56,7 +56,7 @@ double QTextInlineObject_Width(const QTextInlineObject* self); double QTextInlineObject_Ascent(const QTextInlineObject* self); double QTextInlineObject_Descent(const QTextInlineObject* self); double QTextInlineObject_Height(const QTextInlineObject* self); -uintptr_t QTextInlineObject_TextDirection(const QTextInlineObject* self); +int QTextInlineObject_TextDirection(const QTextInlineObject* self); void QTextInlineObject_SetWidth(QTextInlineObject* self, double w); void QTextInlineObject_SetAscent(QTextInlineObject* self, double a); void QTextInlineObject_SetDescent(QTextInlineObject* self, double d); @@ -88,8 +88,8 @@ struct miqt_array* QTextLayout_Formats(const QTextLayout* self); void QTextLayout_ClearFormats(QTextLayout* self); void QTextLayout_SetCacheEnabled(QTextLayout* self, bool enable); bool QTextLayout_CacheEnabled(const QTextLayout* self); -void QTextLayout_SetCursorMoveStyle(QTextLayout* self, uintptr_t style); -uintptr_t QTextLayout_CursorMoveStyle(const QTextLayout* self); +void QTextLayout_SetCursorMoveStyle(QTextLayout* self, int style); +int QTextLayout_CursorMoveStyle(const QTextLayout* self); void QTextLayout_BeginLayout(QTextLayout* self); void QTextLayout_EndLayout(QTextLayout* self); void QTextLayout_ClearLayout(QTextLayout* self); @@ -112,8 +112,8 @@ double QTextLayout_MinimumWidth(const QTextLayout* self); double QTextLayout_MaximumWidth(const QTextLayout* self); struct miqt_array* QTextLayout_GlyphRuns(const QTextLayout* self); void QTextLayout_SetFlags(QTextLayout* self, int flags); -int QTextLayout_NextCursorPosition2(const QTextLayout* self, int oldPos, uintptr_t mode); -int QTextLayout_PreviousCursorPosition2(const QTextLayout* self, int oldPos, uintptr_t mode); +int QTextLayout_NextCursorPosition2(const QTextLayout* self, int oldPos, int mode); +int QTextLayout_PreviousCursorPosition2(const QTextLayout* self, int oldPos, int mode); void QTextLayout_Draw3(const QTextLayout* self, QPainter* p, QPointF* pos, struct miqt_array* /* of QTextLayout__FormatRange* */ selections); void QTextLayout_Draw4(const QTextLayout* self, QPainter* p, QPointF* pos, struct miqt_array* /* of QTextLayout__FormatRange* */ selections, QRectF* clip); struct miqt_array* QTextLayout_GlyphRuns1(const QTextLayout* self, int from); @@ -148,9 +148,9 @@ int QTextLine_TextLength(const QTextLine* self); int QTextLine_LineNumber(const QTextLine* self); void QTextLine_Draw(const QTextLine* self, QPainter* p, QPointF* point); struct miqt_array* QTextLine_GlyphRuns(const QTextLine* self); -double QTextLine_CursorToX2(const QTextLine* self, int* cursorPos, uintptr_t edge); -double QTextLine_CursorToX22(const QTextLine* self, int cursorPos, uintptr_t edge); -int QTextLine_XToCursor2(const QTextLine* self, double x, uintptr_t param2); +double QTextLine_CursorToX2(const QTextLine* self, int* cursorPos, int edge); +double QTextLine_CursorToX22(const QTextLine* self, int cursorPos, int edge); +int QTextLine_XToCursor2(const QTextLine* self, double x, int param2); void QTextLine_Draw3(const QTextLine* self, QPainter* p, QPointF* point, QTextLayout__FormatRange* selection); struct miqt_array* QTextLine_GlyphRuns1(const QTextLine* self, int from); struct miqt_array* QTextLine_GlyphRuns2(const QTextLine* self, int from, int length); diff --git a/qt/gen_qtextobject.cpp b/qt/gen_qtextobject.cpp index 029a2e4..3cf21d2 100644 --- a/qt/gen_qtextobject.cpp +++ b/qt/gen_qtextobject.cpp @@ -197,7 +197,7 @@ void QTextFrame_SetLayoutData(QTextFrame* self, QTextFrameLayoutData* data) { } struct miqt_array* QTextFrame_ChildFrames(const QTextFrame* self) { - QList _ret = self->childFrames(); + QList _ret = self->childFrames(); // Convert QList<> from C++ memory to manually-managed C memory QTextFrame** _arr = static_cast(malloc(sizeof(QTextFrame*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -325,9 +325,9 @@ int QTextBlock_CharFormatIndex(const QTextBlock* self) { return self->charFormatIndex(); } -uintptr_t QTextBlock_TextDirection(const QTextBlock* self) { +int QTextBlock_TextDirection(const QTextBlock* self) { Qt::LayoutDirection _ret = self->textDirection(); - return static_cast(_ret); + return static_cast(_ret); } struct miqt_string* QTextBlock_Text(const QTextBlock* self) { @@ -536,6 +536,10 @@ QTextFrame__iterator* QTextFrame__iterator_new2(QTextFrame__iterator* o) { return new QTextFrame::iterator(*o); } +void QTextFrame__iterator_OperatorAssign(QTextFrame__iterator* self, QTextFrame__iterator* o) { + self->operator=(*o); +} + QTextFrame* QTextFrame__iterator_ParentFrame(const QTextFrame__iterator* self) { return self->parentFrame(); } @@ -560,11 +564,23 @@ bool QTextFrame__iterator_OperatorNotEqual(const QTextFrame__iterator* self, QTe return self->operator!=(*o); } -QTextFrame__iterator* QTextFrame__iterator_OperatorPlusPlus(QTextFrame__iterator* self, int param1) { +QTextFrame__iterator* QTextFrame__iterator_OperatorPlusPlus(QTextFrame__iterator* self) { + QTextFrame::iterator& _ret = self->operator++(); + // Cast returned reference into pointer + return &_ret; +} + +QTextFrame__iterator* QTextFrame__iterator_OperatorPlusPlusWithInt(QTextFrame__iterator* self, int param1) { return new QTextFrame::iterator(self->operator++(static_cast(param1))); } -QTextFrame__iterator* QTextFrame__iterator_OperatorMinusMinus(QTextFrame__iterator* self, int param1) { +QTextFrame__iterator* QTextFrame__iterator_OperatorMinusMinus(QTextFrame__iterator* self) { + QTextFrame::iterator& _ret = self->operator--(); + // Cast returned reference into pointer + return &_ret; +} + +QTextFrame__iterator* QTextFrame__iterator_OperatorMinusMinusWithInt(QTextFrame__iterator* self, int param1) { return new QTextFrame::iterator(self->operator--(static_cast(param1))); } @@ -580,6 +596,10 @@ QTextBlock__iterator* QTextBlock__iterator_new2(QTextBlock__iterator* o) { return new QTextBlock::iterator(*o); } +void QTextBlock__iterator_OperatorAssign(QTextBlock__iterator* self, QTextBlock__iterator* o) { + self->operator=(*o); +} + QTextFragment* QTextBlock__iterator_Fragment(const QTextBlock__iterator* self) { return new QTextFragment(self->fragment()); } @@ -596,11 +616,23 @@ bool QTextBlock__iterator_OperatorNotEqual(const QTextBlock__iterator* self, QTe return self->operator!=(*o); } -QTextBlock__iterator* QTextBlock__iterator_OperatorPlusPlus(QTextBlock__iterator* self, int param1) { +QTextBlock__iterator* QTextBlock__iterator_OperatorPlusPlus(QTextBlock__iterator* self) { + QTextBlock::iterator& _ret = self->operator++(); + // Cast returned reference into pointer + return &_ret; +} + +QTextBlock__iterator* QTextBlock__iterator_OperatorPlusPlusWithInt(QTextBlock__iterator* self, int param1) { return new QTextBlock::iterator(self->operator++(static_cast(param1))); } -QTextBlock__iterator* QTextBlock__iterator_OperatorMinusMinus(QTextBlock__iterator* self, int param1) { +QTextBlock__iterator* QTextBlock__iterator_OperatorMinusMinus(QTextBlock__iterator* self) { + QTextBlock::iterator& _ret = self->operator--(); + // Cast returned reference into pointer + return &_ret; +} + +QTextBlock__iterator* QTextBlock__iterator_OperatorMinusMinusWithInt(QTextBlock__iterator* self, int param1) { return new QTextBlock::iterator(self->operator--(static_cast(param1))); } diff --git a/qt/gen_qtextobject.go b/qt/gen_qtextobject.go index 5dff399..4297684 100644 --- a/qt/gen_qtextobject.go +++ b/qt/gen_qtextobject.go @@ -866,6 +866,10 @@ func NewQTextFrame__iterator2(o *QTextFrame__iterator) *QTextFrame__iterator { return newQTextFrame__iterator(ret) } +func (this *QTextFrame__iterator) OperatorAssign(o *QTextFrame__iterator) { + C.QTextFrame__iterator_OperatorAssign(this.h, o.cPointer()) +} + func (this *QTextFrame__iterator) ParentFrame() *QTextFrame { return newQTextFrame_U(unsafe.Pointer(C.QTextFrame__iterator_ParentFrame(this.h))) } @@ -893,15 +897,23 @@ func (this *QTextFrame__iterator) OperatorNotEqual(o *QTextFrame__iterator) bool return (bool)(C.QTextFrame__iterator_OperatorNotEqual(this.h, o.cPointer())) } -func (this *QTextFrame__iterator) OperatorPlusPlus(param1 int) *QTextFrame__iterator { - _ret := C.QTextFrame__iterator_OperatorPlusPlus(this.h, (C.int)(param1)) +func (this *QTextFrame__iterator) OperatorPlusPlus() *QTextFrame__iterator { + return newQTextFrame__iterator_U(unsafe.Pointer(C.QTextFrame__iterator_OperatorPlusPlus(this.h))) +} + +func (this *QTextFrame__iterator) OperatorPlusPlusWithInt(param1 int) *QTextFrame__iterator { + _ret := C.QTextFrame__iterator_OperatorPlusPlusWithInt(this.h, (C.int)(param1)) _goptr := newQTextFrame__iterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QTextFrame__iterator) OperatorMinusMinus(param1 int) *QTextFrame__iterator { - _ret := C.QTextFrame__iterator_OperatorMinusMinus(this.h, (C.int)(param1)) +func (this *QTextFrame__iterator) OperatorMinusMinus() *QTextFrame__iterator { + return newQTextFrame__iterator_U(unsafe.Pointer(C.QTextFrame__iterator_OperatorMinusMinus(this.h))) +} + +func (this *QTextFrame__iterator) OperatorMinusMinusWithInt(param1 int) *QTextFrame__iterator { + _ret := C.QTextFrame__iterator_OperatorMinusMinusWithInt(this.h, (C.int)(param1)) _goptr := newQTextFrame__iterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -955,6 +967,10 @@ func NewQTextBlock__iterator2(o *QTextBlock__iterator) *QTextBlock__iterator { return newQTextBlock__iterator(ret) } +func (this *QTextBlock__iterator) OperatorAssign(o *QTextBlock__iterator) { + C.QTextBlock__iterator_OperatorAssign(this.h, o.cPointer()) +} + func (this *QTextBlock__iterator) Fragment() *QTextFragment { _ret := C.QTextBlock__iterator_Fragment(this.h) _goptr := newQTextFragment(_ret) @@ -974,15 +990,23 @@ func (this *QTextBlock__iterator) OperatorNotEqual(o *QTextBlock__iterator) bool return (bool)(C.QTextBlock__iterator_OperatorNotEqual(this.h, o.cPointer())) } -func (this *QTextBlock__iterator) OperatorPlusPlus(param1 int) *QTextBlock__iterator { - _ret := C.QTextBlock__iterator_OperatorPlusPlus(this.h, (C.int)(param1)) +func (this *QTextBlock__iterator) OperatorPlusPlus() *QTextBlock__iterator { + return newQTextBlock__iterator_U(unsafe.Pointer(C.QTextBlock__iterator_OperatorPlusPlus(this.h))) +} + +func (this *QTextBlock__iterator) OperatorPlusPlusWithInt(param1 int) *QTextBlock__iterator { + _ret := C.QTextBlock__iterator_OperatorPlusPlusWithInt(this.h, (C.int)(param1)) _goptr := newQTextBlock__iterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QTextBlock__iterator) OperatorMinusMinus(param1 int) *QTextBlock__iterator { - _ret := C.QTextBlock__iterator_OperatorMinusMinus(this.h, (C.int)(param1)) +func (this *QTextBlock__iterator) OperatorMinusMinus() *QTextBlock__iterator { + return newQTextBlock__iterator_U(unsafe.Pointer(C.QTextBlock__iterator_OperatorMinusMinus(this.h))) +} + +func (this *QTextBlock__iterator) OperatorMinusMinusWithInt(param1 int) *QTextBlock__iterator { + _ret := C.QTextBlock__iterator_OperatorMinusMinusWithInt(this.h, (C.int)(param1)) _goptr := newQTextBlock__iterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qtextobject.h b/qt/gen_qtextobject.h index cac1a02..5483088 100644 --- a/qt/gen_qtextobject.h +++ b/qt/gen_qtextobject.h @@ -133,7 +133,7 @@ QTextBlockFormat* QTextBlock_BlockFormat(const QTextBlock* self); int QTextBlock_BlockFormatIndex(const QTextBlock* self); QTextCharFormat* QTextBlock_CharFormat(const QTextBlock* self); int QTextBlock_CharFormatIndex(const QTextBlock* self); -uintptr_t QTextBlock_TextDirection(const QTextBlock* self); +int QTextBlock_TextDirection(const QTextBlock* self); struct miqt_string* QTextBlock_Text(const QTextBlock* self); struct miqt_array* QTextBlock_TextFormats(const QTextBlock* self); QTextDocument* QTextBlock_Document(const QTextBlock* self); @@ -177,24 +177,30 @@ void QTextFragment_Delete(QTextFragment* self); QTextFrame__iterator* QTextFrame__iterator_new(); QTextFrame__iterator* QTextFrame__iterator_new2(QTextFrame__iterator* o); +void QTextFrame__iterator_OperatorAssign(QTextFrame__iterator* self, QTextFrame__iterator* o); QTextFrame* QTextFrame__iterator_ParentFrame(const QTextFrame__iterator* self); QTextFrame* QTextFrame__iterator_CurrentFrame(const QTextFrame__iterator* self); QTextBlock* QTextFrame__iterator_CurrentBlock(const QTextFrame__iterator* self); bool QTextFrame__iterator_AtEnd(const QTextFrame__iterator* self); bool QTextFrame__iterator_OperatorEqual(const QTextFrame__iterator* self, QTextFrame__iterator* o); bool QTextFrame__iterator_OperatorNotEqual(const QTextFrame__iterator* self, QTextFrame__iterator* o); -QTextFrame__iterator* QTextFrame__iterator_OperatorPlusPlus(QTextFrame__iterator* self, int param1); -QTextFrame__iterator* QTextFrame__iterator_OperatorMinusMinus(QTextFrame__iterator* self, int param1); +QTextFrame__iterator* QTextFrame__iterator_OperatorPlusPlus(QTextFrame__iterator* self); +QTextFrame__iterator* QTextFrame__iterator_OperatorPlusPlusWithInt(QTextFrame__iterator* self, int param1); +QTextFrame__iterator* QTextFrame__iterator_OperatorMinusMinus(QTextFrame__iterator* self); +QTextFrame__iterator* QTextFrame__iterator_OperatorMinusMinusWithInt(QTextFrame__iterator* self, int param1); void QTextFrame__iterator_Delete(QTextFrame__iterator* self); QTextBlock__iterator* QTextBlock__iterator_new(); QTextBlock__iterator* QTextBlock__iterator_new2(QTextBlock__iterator* o); +void QTextBlock__iterator_OperatorAssign(QTextBlock__iterator* self, QTextBlock__iterator* o); QTextFragment* QTextBlock__iterator_Fragment(const QTextBlock__iterator* self); bool QTextBlock__iterator_AtEnd(const QTextBlock__iterator* self); bool QTextBlock__iterator_OperatorEqual(const QTextBlock__iterator* self, QTextBlock__iterator* o); bool QTextBlock__iterator_OperatorNotEqual(const QTextBlock__iterator* self, QTextBlock__iterator* o); -QTextBlock__iterator* QTextBlock__iterator_OperatorPlusPlus(QTextBlock__iterator* self, int param1); -QTextBlock__iterator* QTextBlock__iterator_OperatorMinusMinus(QTextBlock__iterator* self, int param1); +QTextBlock__iterator* QTextBlock__iterator_OperatorPlusPlus(QTextBlock__iterator* self); +QTextBlock__iterator* QTextBlock__iterator_OperatorPlusPlusWithInt(QTextBlock__iterator* self, int param1); +QTextBlock__iterator* QTextBlock__iterator_OperatorMinusMinus(QTextBlock__iterator* self); +QTextBlock__iterator* QTextBlock__iterator_OperatorMinusMinusWithInt(QTextBlock__iterator* self, int param1); void QTextBlock__iterator_Delete(QTextBlock__iterator* self); #ifdef __cplusplus diff --git a/qt/gen_qtextoption.cpp b/qt/gen_qtextoption.cpp index 9f7a4d1..b1ac162 100644 --- a/qt/gen_qtextoption.cpp +++ b/qt/gen_qtextoption.cpp @@ -31,22 +31,22 @@ int QTextOption_Alignment(const QTextOption* self) { return static_cast(_ret); } -void QTextOption_SetTextDirection(QTextOption* self, uintptr_t aDirection) { +void QTextOption_SetTextDirection(QTextOption* self, int aDirection) { self->setTextDirection(static_cast(aDirection)); } -uintptr_t QTextOption_TextDirection(const QTextOption* self) { +int QTextOption_TextDirection(const QTextOption* self) { Qt::LayoutDirection _ret = self->textDirection(); - return static_cast(_ret); + return static_cast(_ret); } -void QTextOption_SetWrapMode(QTextOption* self, uintptr_t wrap) { +void QTextOption_SetWrapMode(QTextOption* self, int wrap) { self->setWrapMode(static_cast(wrap)); } -uintptr_t QTextOption_WrapMode(const QTextOption* self) { +int QTextOption_WrapMode(const QTextOption* self) { QTextOption::WrapMode _ret = self->wrapMode(); - return static_cast(_ret); + return static_cast(_ret); } void QTextOption_SetFlags(QTextOption* self, int flags) { @@ -63,7 +63,8 @@ void QTextOption_SetTabStop(QTextOption* self, double tabStop) { } double QTextOption_TabStop(const QTextOption* self) { - return self->tabStop(); + qreal _ret = self->tabStop(); + return static_cast(_ret); } void QTextOption_SetTabStopDistance(QTextOption* self, double tabStopDistance) { @@ -71,7 +72,8 @@ void QTextOption_SetTabStopDistance(QTextOption* self, double tabStopDistance) { } double QTextOption_TabStopDistance(const QTextOption* self) { - return self->tabStopDistance(); + qreal _ret = self->tabStopDistance(); + return static_cast(_ret); } void QTextOption_SetTabArray(QTextOption* self, struct miqt_array* /* of double */ tabStops) { @@ -85,7 +87,7 @@ void QTextOption_SetTabArray(QTextOption* self, struct miqt_array* /* of double } struct miqt_array* QTextOption_TabArray(const QTextOption* self) { - QList _ret = self->tabArray(); + QList _ret = self->tabArray(); // Convert QList<> from C++ memory to manually-managed C memory double* _arr = static_cast(malloc(sizeof(double) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -136,7 +138,7 @@ QTextOption__Tab* QTextOption__Tab_new() { return new QTextOption::Tab(); } -QTextOption__Tab* QTextOption__Tab_new2(double pos, uintptr_t tabType) { +QTextOption__Tab* QTextOption__Tab_new2(double pos, int tabType) { return new QTextOption::Tab(static_cast(pos), static_cast(tabType)); } @@ -144,7 +146,7 @@ QTextOption__Tab* QTextOption__Tab_new3(QTextOption__Tab* param1) { return new QTextOption::Tab(*param1); } -QTextOption__Tab* QTextOption__Tab_new4(double pos, uintptr_t tabType, QChar* delim) { +QTextOption__Tab* QTextOption__Tab_new4(double pos, int tabType, QChar* delim) { return new QTextOption::Tab(static_cast(pos), static_cast(tabType), *delim); } diff --git a/qt/gen_qtextoption.go b/qt/gen_qtextoption.go index 118b674..456fb3f 100644 --- a/qt/gen_qtextoption.go +++ b/qt/gen_qtextoption.go @@ -73,7 +73,7 @@ func NewQTextOption() *QTextOption { // NewQTextOption2 constructs a new QTextOption object. func NewQTextOption2(alignment int) *QTextOption { - ret := C.QTextOption_new2((C.int)(alignment)) + ret := C.QTextOption_new2(alignment) return newQTextOption(ret) } @@ -88,7 +88,7 @@ func (this *QTextOption) OperatorAssign(o *QTextOption) { } func (this *QTextOption) SetAlignment(alignment int) { - C.QTextOption_SetAlignment(this.h, (C.int)(alignment)) + C.QTextOption_SetAlignment(this.h, alignment) } func (this *QTextOption) Alignment() int { @@ -96,7 +96,7 @@ func (this *QTextOption) Alignment() int { } func (this *QTextOption) SetTextDirection(aDirection LayoutDirection) { - C.QTextOption_SetTextDirection(this.h, (C.uintptr_t)(aDirection)) + C.QTextOption_SetTextDirection(this.h, (C.int)(aDirection)) } func (this *QTextOption) TextDirection() LayoutDirection { @@ -104,7 +104,7 @@ func (this *QTextOption) TextDirection() LayoutDirection { } func (this *QTextOption) SetWrapMode(wrap QTextOption__WrapMode) { - C.QTextOption_SetWrapMode(this.h, (C.uintptr_t)(wrap)) + C.QTextOption_SetWrapMode(this.h, (C.int)(wrap)) } func (this *QTextOption) WrapMode() QTextOption__WrapMode { @@ -112,7 +112,7 @@ func (this *QTextOption) WrapMode() QTextOption__WrapMode { } func (this *QTextOption) SetFlags(flags int) { - C.QTextOption_SetFlags(this.h, (C.int)(flags)) + C.QTextOption_SetFlags(this.h, flags) } func (this *QTextOption) Flags() int { @@ -236,7 +236,7 @@ func NewQTextOption__Tab() *QTextOption__Tab { // NewQTextOption__Tab2 constructs a new QTextOption::Tab object. func NewQTextOption__Tab2(pos float64, tabType QTextOption__TabType) *QTextOption__Tab { - ret := C.QTextOption__Tab_new2((C.double)(pos), (C.uintptr_t)(tabType)) + ret := C.QTextOption__Tab_new2((C.double)(pos), (C.int)(tabType)) return newQTextOption__Tab(ret) } @@ -248,7 +248,7 @@ func NewQTextOption__Tab3(param1 *QTextOption__Tab) *QTextOption__Tab { // NewQTextOption__Tab4 constructs a new QTextOption::Tab object. func NewQTextOption__Tab4(pos float64, tabType QTextOption__TabType, delim QChar) *QTextOption__Tab { - ret := C.QTextOption__Tab_new4((C.double)(pos), (C.uintptr_t)(tabType), delim.cPointer()) + ret := C.QTextOption__Tab_new4((C.double)(pos), (C.int)(tabType), delim.cPointer()) return newQTextOption__Tab(ret) } diff --git a/qt/gen_qtextoption.h b/qt/gen_qtextoption.h index 184e80d..31f59aa 100644 --- a/qt/gen_qtextoption.h +++ b/qt/gen_qtextoption.h @@ -33,10 +33,10 @@ QTextOption* QTextOption_new3(QTextOption* o); void QTextOption_OperatorAssign(QTextOption* self, QTextOption* o); void QTextOption_SetAlignment(QTextOption* self, int alignment); int QTextOption_Alignment(const QTextOption* self); -void QTextOption_SetTextDirection(QTextOption* self, uintptr_t aDirection); -uintptr_t QTextOption_TextDirection(const QTextOption* self); -void QTextOption_SetWrapMode(QTextOption* self, uintptr_t wrap); -uintptr_t QTextOption_WrapMode(const QTextOption* self); +void QTextOption_SetTextDirection(QTextOption* self, int aDirection); +int QTextOption_TextDirection(const QTextOption* self); +void QTextOption_SetWrapMode(QTextOption* self, int wrap); +int QTextOption_WrapMode(const QTextOption* self); void QTextOption_SetFlags(QTextOption* self, int flags); int QTextOption_Flags(const QTextOption* self); void QTextOption_SetTabStop(QTextOption* self, double tabStop); @@ -52,9 +52,9 @@ bool QTextOption_UseDesignMetrics(const QTextOption* self); void QTextOption_Delete(QTextOption* self); QTextOption__Tab* QTextOption__Tab_new(); -QTextOption__Tab* QTextOption__Tab_new2(double pos, uintptr_t tabType); +QTextOption__Tab* QTextOption__Tab_new2(double pos, int tabType); QTextOption__Tab* QTextOption__Tab_new3(QTextOption__Tab* param1); -QTextOption__Tab* QTextOption__Tab_new4(double pos, uintptr_t tabType, QChar* delim); +QTextOption__Tab* QTextOption__Tab_new4(double pos, int tabType, QChar* delim); bool QTextOption__Tab_OperatorEqual(const QTextOption__Tab* self, QTextOption__Tab* other); bool QTextOption__Tab_OperatorNotEqual(const QTextOption__Tab* self, QTextOption__Tab* other); void QTextOption__Tab_Delete(QTextOption__Tab* self); diff --git a/qt/gen_qtextstream.cpp b/qt/gen_qtextstream.cpp index b255ef2..f3571a0 100644 --- a/qt/gen_qtextstream.cpp +++ b/qt/gen_qtextstream.cpp @@ -86,12 +86,12 @@ struct miqt_string* QTextStream_String(const QTextStream* self) { return miqt_strdup(_b.data(), _b.length()); } -uintptr_t QTextStream_Status(const QTextStream* self) { +int QTextStream_Status(const QTextStream* self) { QTextStream::Status _ret = self->status(); - return static_cast(_ret); + return static_cast(_ret); } -void QTextStream_SetStatus(QTextStream* self, uintptr_t status) { +void QTextStream_SetStatus(QTextStream* self, int status) { self->setStatus(static_cast(status)); } @@ -116,7 +116,8 @@ bool QTextStream_Seek(QTextStream* self, long long pos) { } long long QTextStream_Pos(const QTextStream* self) { - return self->pos(); + qint64 _ret = self->pos(); + return static_cast(_ret); } void QTextStream_SkipWhiteSpace(QTextStream* self) { @@ -144,13 +145,13 @@ struct miqt_string* QTextStream_Read(QTextStream* self, long long maxlen) { return miqt_strdup(_b.data(), _b.length()); } -void QTextStream_SetFieldAlignment(QTextStream* self, uintptr_t alignment) { +void QTextStream_SetFieldAlignment(QTextStream* self, int alignment) { self->setFieldAlignment(static_cast(alignment)); } -uintptr_t QTextStream_FieldAlignment(const QTextStream* self) { +int QTextStream_FieldAlignment(const QTextStream* self) { QTextStream::FieldAlignment _ret = self->fieldAlignment(); - return static_cast(_ret); + return static_cast(_ret); } void QTextStream_SetPadChar(QTextStream* self, QChar* ch) { @@ -186,13 +187,13 @@ int QTextStream_IntegerBase(const QTextStream* self) { return self->integerBase(); } -void QTextStream_SetRealNumberNotation(QTextStream* self, uintptr_t notation) { +void QTextStream_SetRealNumberNotation(QTextStream* self, int notation) { self->setRealNumberNotation(static_cast(notation)); } -uintptr_t QTextStream_RealNumberNotation(const QTextStream* self) { +int QTextStream_RealNumberNotation(const QTextStream* self) { QTextStream::RealNumberNotation _ret = self->realNumberNotation(); - return static_cast(_ret); + return static_cast(_ret); } void QTextStream_SetRealNumberPrecision(QTextStream* self, int precision) { @@ -251,14 +252,14 @@ QTextStream* QTextStream_OperatorShiftRightWithUnsignedlong(QTextStream* self, u return &_ret; } -QTextStream* QTextStream_OperatorShiftRightWithQlonglong(QTextStream* self, int64_t* i) { - QTextStream& _ret = self->operator>>((qlonglong&)(*i)); +QTextStream* QTextStream_OperatorShiftRightWithQlonglong(QTextStream* self, long long* i) { + QTextStream& _ret = self->operator>>(static_cast(*i)); // Cast returned reference into pointer return &_ret; } -QTextStream* QTextStream_OperatorShiftRightWithQulonglong(QTextStream* self, uint64_t* i) { - QTextStream& _ret = self->operator>>((qulonglong&)(*i)); +QTextStream* QTextStream_OperatorShiftRightWithQulonglong(QTextStream* self, unsigned long long* i) { + QTextStream& _ret = self->operator>>(static_cast(*i)); // Cast returned reference into pointer return &_ret; } @@ -342,14 +343,14 @@ QTextStream* QTextStream_OperatorShiftLeftWithUnsignedlong(QTextStream* self, un return &_ret; } -QTextStream* QTextStream_OperatorShiftLeftWithQlonglong(QTextStream* self, int64_t i) { - QTextStream& _ret = self->operator<<((qlonglong)(i)); +QTextStream* QTextStream_OperatorShiftLeftWithQlonglong(QTextStream* self, long long i) { + QTextStream& _ret = self->operator<<(static_cast(i)); // Cast returned reference into pointer return &_ret; } -QTextStream* QTextStream_OperatorShiftLeftWithQulonglong(QTextStream* self, uint64_t i) { - QTextStream& _ret = self->operator<<((qulonglong)(i)); +QTextStream* QTextStream_OperatorShiftLeftWithQulonglong(QTextStream* self, unsigned long long i) { + QTextStream& _ret = self->operator<<(static_cast(i)); // Cast returned reference into pointer return &_ret; } diff --git a/qt/gen_qtextstream.go b/qt/gen_qtextstream.go index 0b748b2..08e7a5d 100644 --- a/qt/gen_qtextstream.go +++ b/qt/gen_qtextstream.go @@ -97,13 +97,13 @@ func NewQTextStream4(array *QByteArray) *QTextStream { // NewQTextStream5 constructs a new QTextStream object. func NewQTextStream5(array *QByteArray, openMode int) *QTextStream { - ret := C.QTextStream_new5(array.cPointer(), (C.int)(openMode)) + ret := C.QTextStream_new5(array.cPointer(), openMode) return newQTextStream(ret) } // NewQTextStream6 constructs a new QTextStream object. func NewQTextStream6(array *QByteArray, openMode int) *QTextStream { - ret := C.QTextStream_new6(array.cPointer(), (C.int)(openMode)) + ret := C.QTextStream_new6(array.cPointer(), openMode) return newQTextStream(ret) } @@ -168,7 +168,7 @@ func (this *QTextStream) Status() QTextStream__Status { } func (this *QTextStream) SetStatus(status QTextStream__Status) { - C.QTextStream_SetStatus(this.h, (C.uintptr_t)(status)) + C.QTextStream_SetStatus(this.h, (C.int)(status)) } func (this *QTextStream) ResetStatus() { @@ -221,7 +221,7 @@ func (this *QTextStream) Read(maxlen int64) string { } func (this *QTextStream) SetFieldAlignment(alignment QTextStream__FieldAlignment) { - C.QTextStream_SetFieldAlignment(this.h, (C.uintptr_t)(alignment)) + C.QTextStream_SetFieldAlignment(this.h, (C.int)(alignment)) } func (this *QTextStream) FieldAlignment() QTextStream__FieldAlignment { @@ -248,7 +248,7 @@ func (this *QTextStream) FieldWidth() int { } func (this *QTextStream) SetNumberFlags(flags int) { - C.QTextStream_SetNumberFlags(this.h, (C.int)(flags)) + C.QTextStream_SetNumberFlags(this.h, flags) } func (this *QTextStream) NumberFlags() int { @@ -264,7 +264,7 @@ func (this *QTextStream) IntegerBase() int { } func (this *QTextStream) SetRealNumberNotation(notation QTextStream__RealNumberNotation) { - C.QTextStream_SetRealNumberNotation(this.h, (C.uintptr_t)(notation)) + C.QTextStream_SetRealNumberNotation(this.h, (C.int)(notation)) } func (this *QTextStream) RealNumberNotation() QTextStream__RealNumberNotation { @@ -312,11 +312,11 @@ func (this *QTextStream) OperatorShiftRightWithUnsignedlong(i *uint64) *QTextStr } func (this *QTextStream) OperatorShiftRightWithQlonglong(i *int64) *QTextStream { - return newQTextStream_U(unsafe.Pointer(C.QTextStream_OperatorShiftRightWithQlonglong(this.h, (*C.int64_t)(unsafe.Pointer(i))))) + return newQTextStream_U(unsafe.Pointer(C.QTextStream_OperatorShiftRightWithQlonglong(this.h, (*C.longlong)(unsafe.Pointer(i))))) } func (this *QTextStream) OperatorShiftRightWithQulonglong(i *uint64) *QTextStream { - return newQTextStream_U(unsafe.Pointer(C.QTextStream_OperatorShiftRightWithQulonglong(this.h, (*C.uint64_t)(unsafe.Pointer(i))))) + return newQTextStream_U(unsafe.Pointer(C.QTextStream_OperatorShiftRightWithQulonglong(this.h, (*C.ulonglong)(unsafe.Pointer(i))))) } func (this *QTextStream) OperatorShiftRightWithFloat(f *float32) *QTextStream { @@ -376,11 +376,11 @@ func (this *QTextStream) OperatorShiftLeftWithUnsignedlong(i uint64) *QTextStrea } func (this *QTextStream) OperatorShiftLeftWithQlonglong(i int64) *QTextStream { - return newQTextStream_U(unsafe.Pointer(C.QTextStream_OperatorShiftLeftWithQlonglong(this.h, (C.int64_t)(i)))) + return newQTextStream_U(unsafe.Pointer(C.QTextStream_OperatorShiftLeftWithQlonglong(this.h, (C.longlong)(i)))) } func (this *QTextStream) OperatorShiftLeftWithQulonglong(i uint64) *QTextStream { - return newQTextStream_U(unsafe.Pointer(C.QTextStream_OperatorShiftLeftWithQulonglong(this.h, (C.uint64_t)(i)))) + return newQTextStream_U(unsafe.Pointer(C.QTextStream_OperatorShiftLeftWithQulonglong(this.h, (C.ulonglong)(i)))) } func (this *QTextStream) OperatorShiftLeftWithFloat(f float32) *QTextStream { diff --git a/qt/gen_qtextstream.h b/qt/gen_qtextstream.h index 56610be..7596223 100644 --- a/qt/gen_qtextstream.h +++ b/qt/gen_qtextstream.h @@ -47,8 +47,8 @@ QLocale* QTextStream_Locale(const QTextStream* self); void QTextStream_SetDevice(QTextStream* self, QIODevice* device); QIODevice* QTextStream_Device(const QTextStream* self); struct miqt_string* QTextStream_String(const QTextStream* self); -uintptr_t QTextStream_Status(const QTextStream* self); -void QTextStream_SetStatus(QTextStream* self, uintptr_t status); +int QTextStream_Status(const QTextStream* self); +void QTextStream_SetStatus(QTextStream* self, int status); void QTextStream_ResetStatus(QTextStream* self); bool QTextStream_AtEnd(const QTextStream* self); void QTextStream_Reset(QTextStream* self); @@ -59,8 +59,8 @@ void QTextStream_SkipWhiteSpace(QTextStream* self); struct miqt_string* QTextStream_ReadLine(QTextStream* self); struct miqt_string* QTextStream_ReadAll(QTextStream* self); struct miqt_string* QTextStream_Read(QTextStream* self, long long maxlen); -void QTextStream_SetFieldAlignment(QTextStream* self, uintptr_t alignment); -uintptr_t QTextStream_FieldAlignment(const QTextStream* self); +void QTextStream_SetFieldAlignment(QTextStream* self, int alignment); +int QTextStream_FieldAlignment(const QTextStream* self); void QTextStream_SetPadChar(QTextStream* self, QChar* ch); QChar* QTextStream_PadChar(const QTextStream* self); void QTextStream_SetFieldWidth(QTextStream* self, int width); @@ -69,8 +69,8 @@ void QTextStream_SetNumberFlags(QTextStream* self, int flags); int QTextStream_NumberFlags(const QTextStream* self); void QTextStream_SetIntegerBase(QTextStream* self, int base); int QTextStream_IntegerBase(const QTextStream* self); -void QTextStream_SetRealNumberNotation(QTextStream* self, uintptr_t notation); -uintptr_t QTextStream_RealNumberNotation(const QTextStream* self); +void QTextStream_SetRealNumberNotation(QTextStream* self, int notation); +int QTextStream_RealNumberNotation(const QTextStream* self); void QTextStream_SetRealNumberPrecision(QTextStream* self, int precision); int QTextStream_RealNumberPrecision(const QTextStream* self); QTextStream* QTextStream_OperatorShiftRight(QTextStream* self, QChar* ch); @@ -81,8 +81,8 @@ QTextStream* QTextStream_OperatorShiftRightWithInt(QTextStream* self, int* i); QTextStream* QTextStream_OperatorShiftRightWithUnsignedint(QTextStream* self, unsigned int* i); QTextStream* QTextStream_OperatorShiftRightWithLong(QTextStream* self, long* i); QTextStream* QTextStream_OperatorShiftRightWithUnsignedlong(QTextStream* self, unsigned long* i); -QTextStream* QTextStream_OperatorShiftRightWithQlonglong(QTextStream* self, int64_t* i); -QTextStream* QTextStream_OperatorShiftRightWithQulonglong(QTextStream* self, uint64_t* i); +QTextStream* QTextStream_OperatorShiftRightWithQlonglong(QTextStream* self, long long* i); +QTextStream* QTextStream_OperatorShiftRightWithQulonglong(QTextStream* self, unsigned long long* i); QTextStream* QTextStream_OperatorShiftRightWithFloat(QTextStream* self, float* f); QTextStream* QTextStream_OperatorShiftRightWithDouble(QTextStream* self, double* f); QTextStream* QTextStream_OperatorShiftRightWithQString(QTextStream* self, struct miqt_string* s); @@ -96,8 +96,8 @@ QTextStream* QTextStream_OperatorShiftLeftWithInt(QTextStream* self, int i); QTextStream* QTextStream_OperatorShiftLeftWithUnsignedint(QTextStream* self, unsigned int i); QTextStream* QTextStream_OperatorShiftLeftWithLong(QTextStream* self, long i); QTextStream* QTextStream_OperatorShiftLeftWithUnsignedlong(QTextStream* self, unsigned long i); -QTextStream* QTextStream_OperatorShiftLeftWithQlonglong(QTextStream* self, int64_t i); -QTextStream* QTextStream_OperatorShiftLeftWithQulonglong(QTextStream* self, uint64_t i); +QTextStream* QTextStream_OperatorShiftLeftWithQlonglong(QTextStream* self, long long i); +QTextStream* QTextStream_OperatorShiftLeftWithQulonglong(QTextStream* self, unsigned long long i); QTextStream* QTextStream_OperatorShiftLeftWithFloat(QTextStream* self, float f); QTextStream* QTextStream_OperatorShiftLeftWithDouble(QTextStream* self, double f); QTextStream* QTextStream_OperatorShiftLeftWithQString(QTextStream* self, struct miqt_string* s); diff --git a/qt/gen_qthread.cpp b/qt/gen_qthread.cpp index 624f239..5da5269 100644 --- a/qt/gen_qthread.cpp +++ b/qt/gen_qthread.cpp @@ -49,13 +49,13 @@ void QThread_YieldCurrentThread() { QThread::yieldCurrentThread(); } -void QThread_SetPriority(QThread* self, uintptr_t priority) { +void QThread_SetPriority(QThread* self, int priority) { self->setPriority(static_cast(priority)); } -uintptr_t QThread_Priority(const QThread* self) { +int QThread_Priority(const QThread* self) { QThread::Priority _ret = self->priority(); - return static_cast(_ret); + return static_cast(_ret); } bool QThread_IsFinished(const QThread* self) { @@ -79,7 +79,8 @@ void QThread_SetStackSize(QThread* self, unsigned int stackSize) { } unsigned int QThread_StackSize(const QThread* self) { - return self->stackSize(); + uint _ret = self->stackSize(); + return static_cast(_ret); } void QThread_Exit(QThread* self) { @@ -166,7 +167,7 @@ void QThread_Exit1(QThread* self, int retcode) { self->exit(static_cast(retcode)); } -void QThread_Start1(QThread* self, uintptr_t param1) { +void QThread_Start1(QThread* self, int param1) { self->start(static_cast(param1)); } diff --git a/qt/gen_qthread.go b/qt/gen_qthread.go index cf8078f..8bd41de 100644 --- a/qt/gen_qthread.go +++ b/qt/gen_qthread.go @@ -96,7 +96,7 @@ func QThread_YieldCurrentThread() { } func (this *QThread) SetPriority(priority QThread__Priority) { - C.QThread_SetPriority(this.h, (C.uintptr_t)(priority)) + C.QThread_SetPriority(this.h, (C.int)(priority)) } func (this *QThread) Priority() QThread__Priority { @@ -228,7 +228,7 @@ func (this *QThread) Exit1(retcode int) { } func (this *QThread) Start1(param1 QThread__Priority) { - C.QThread_Start1(this.h, (C.uintptr_t)(param1)) + C.QThread_Start1(this.h, (C.int)(param1)) } func (this *QThread) Wait1(deadline QDeadlineTimer) bool { diff --git a/qt/gen_qthread.h b/qt/gen_qthread.h index e2a5e39..b46a1f5 100644 --- a/qt/gen_qthread.h +++ b/qt/gen_qthread.h @@ -37,8 +37,8 @@ struct miqt_string* QThread_TrUtf8(const char* s); QThread* QThread_CurrentThread(); int QThread_IdealThreadCount(); void QThread_YieldCurrentThread(); -void QThread_SetPriority(QThread* self, uintptr_t priority); -uintptr_t QThread_Priority(const QThread* self); +void QThread_SetPriority(QThread* self, int priority); +int QThread_Priority(const QThread* self); bool QThread_IsFinished(const QThread* self); bool QThread_IsRunning(const QThread* self); void QThread_RequestInterruption(QThread* self); @@ -63,7 +63,7 @@ struct miqt_string* QThread_Tr3(const char* s, const char* c, int n); struct miqt_string* QThread_TrUtf82(const char* s, const char* c); struct miqt_string* QThread_TrUtf83(const char* s, const char* c, int n); void QThread_Exit1(QThread* self, int retcode); -void QThread_Start1(QThread* self, uintptr_t param1); +void QThread_Start1(QThread* self, int param1); bool QThread_Wait1(QThread* self, QDeadlineTimer* deadline); void QThread_Delete(QThread* self); diff --git a/qt/gen_qthreadpool.cpp b/qt/gen_qthreadpool.cpp index 5df1e6c..f1b253c 100644 --- a/qt/gen_qthreadpool.cpp +++ b/qt/gen_qthreadpool.cpp @@ -73,7 +73,8 @@ void QThreadPool_SetStackSize(QThreadPool* self, unsigned int stackSize) { } unsigned int QThreadPool_StackSize(const QThreadPool* self) { - return self->stackSize(); + uint _ret = self->stackSize(); + return static_cast(_ret); } void QThreadPool_ReserveThread(QThreadPool* self) { diff --git a/qt/gen_qtimeline.cpp b/qt/gen_qtimeline.cpp index bab86d5..294da8a 100644 --- a/qt/gen_qtimeline.cpp +++ b/qt/gen_qtimeline.cpp @@ -39,9 +39,9 @@ struct miqt_string* QTimeLine_TrUtf8(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -uintptr_t QTimeLine_State(const QTimeLine* self) { +int QTimeLine_State(const QTimeLine* self) { QTimeLine::State _ret = self->state(); - return static_cast(_ret); + return static_cast(_ret); } int QTimeLine_LoopCount(const QTimeLine* self) { @@ -52,12 +52,12 @@ void QTimeLine_SetLoopCount(QTimeLine* self, int count) { self->setLoopCount(static_cast(count)); } -uintptr_t QTimeLine_Direction(const QTimeLine* self) { +int QTimeLine_Direction(const QTimeLine* self) { QTimeLine::Direction _ret = self->direction(); - return static_cast(_ret); + return static_cast(_ret); } -void QTimeLine_SetDirection(QTimeLine* self, uintptr_t direction) { +void QTimeLine_SetDirection(QTimeLine* self, int direction) { self->setDirection(static_cast(direction)); } @@ -97,12 +97,12 @@ void QTimeLine_SetUpdateInterval(QTimeLine* self, int interval) { self->setUpdateInterval(static_cast(interval)); } -uintptr_t QTimeLine_CurveShape(const QTimeLine* self) { +int QTimeLine_CurveShape(const QTimeLine* self) { QTimeLine::CurveShape _ret = self->curveShape(); - return static_cast(_ret); + return static_cast(_ret); } -void QTimeLine_SetCurveShape(QTimeLine* self, uintptr_t shape) { +void QTimeLine_SetCurveShape(QTimeLine* self, int shape) { self->setCurveShape(static_cast(shape)); } @@ -123,7 +123,8 @@ int QTimeLine_CurrentFrame(const QTimeLine* self) { } double QTimeLine_CurrentValue(const QTimeLine* self) { - return self->currentValue(); + qreal _ret = self->currentValue(); + return static_cast(_ret); } int QTimeLine_FrameForTime(const QTimeLine* self, int msec) { @@ -131,7 +132,8 @@ int QTimeLine_FrameForTime(const QTimeLine* self, int msec) { } double QTimeLine_ValueForTime(const QTimeLine* self, int msec) { - return self->valueForTime(static_cast(msec)); + qreal _ret = self->valueForTime(static_cast(msec)); + return static_cast(_ret); } void QTimeLine_Start(QTimeLine* self) { diff --git a/qt/gen_qtimeline.go b/qt/gen_qtimeline.go index 78ec294..fb04a5f 100644 --- a/qt/gen_qtimeline.go +++ b/qt/gen_qtimeline.go @@ -119,7 +119,7 @@ func (this *QTimeLine) Direction() QTimeLine__Direction { } func (this *QTimeLine) SetDirection(direction QTimeLine__Direction) { - C.QTimeLine_SetDirection(this.h, (C.uintptr_t)(direction)) + C.QTimeLine_SetDirection(this.h, (C.int)(direction)) } func (this *QTimeLine) Duration() int { @@ -163,7 +163,7 @@ func (this *QTimeLine) CurveShape() QTimeLine__CurveShape { } func (this *QTimeLine) SetCurveShape(shape QTimeLine__CurveShape) { - C.QTimeLine_SetCurveShape(this.h, (C.uintptr_t)(shape)) + C.QTimeLine_SetCurveShape(this.h, (C.int)(shape)) } func (this *QTimeLine) EasingCurve() *QEasingCurve { diff --git a/qt/gen_qtimeline.h b/qt/gen_qtimeline.h index b6d9618..4bdb9ae 100644 --- a/qt/gen_qtimeline.h +++ b/qt/gen_qtimeline.h @@ -31,11 +31,11 @@ QTimeLine* QTimeLine_new3(int duration, QObject* parent); QMetaObject* QTimeLine_MetaObject(const QTimeLine* self); struct miqt_string* QTimeLine_Tr(const char* s); struct miqt_string* QTimeLine_TrUtf8(const char* s); -uintptr_t QTimeLine_State(const QTimeLine* self); +int QTimeLine_State(const QTimeLine* self); int QTimeLine_LoopCount(const QTimeLine* self); void QTimeLine_SetLoopCount(QTimeLine* self, int count); -uintptr_t QTimeLine_Direction(const QTimeLine* self); -void QTimeLine_SetDirection(QTimeLine* self, uintptr_t direction); +int QTimeLine_Direction(const QTimeLine* self); +void QTimeLine_SetDirection(QTimeLine* self, int direction); int QTimeLine_Duration(const QTimeLine* self); void QTimeLine_SetDuration(QTimeLine* self, int duration); int QTimeLine_StartFrame(const QTimeLine* self); @@ -45,8 +45,8 @@ void QTimeLine_SetEndFrame(QTimeLine* self, int frame); void QTimeLine_SetFrameRange(QTimeLine* self, int startFrame, int endFrame); int QTimeLine_UpdateInterval(const QTimeLine* self); void QTimeLine_SetUpdateInterval(QTimeLine* self, int interval); -uintptr_t QTimeLine_CurveShape(const QTimeLine* self); -void QTimeLine_SetCurveShape(QTimeLine* self, uintptr_t shape); +int QTimeLine_CurveShape(const QTimeLine* self); +void QTimeLine_SetCurveShape(QTimeLine* self, int shape); QEasingCurve* QTimeLine_EasingCurve(const QTimeLine* self); void QTimeLine_SetEasingCurve(QTimeLine* self, QEasingCurve* curve); int QTimeLine_CurrentTime(const QTimeLine* self); diff --git a/qt/gen_qtimer.cpp b/qt/gen_qtimer.cpp index 17dddd6..3494f88 100644 --- a/qt/gen_qtimer.cpp +++ b/qt/gen_qtimer.cpp @@ -54,13 +54,13 @@ int QTimer_RemainingTime(const QTimer* self) { return self->remainingTime(); } -void QTimer_SetTimerType(QTimer* self, uintptr_t atype) { +void QTimer_SetTimerType(QTimer* self, int atype) { self->setTimerType(static_cast(atype)); } -uintptr_t QTimer_TimerType(const QTimer* self) { +int QTimer_TimerType(const QTimer* self) { Qt::TimerType _ret = self->timerType(); - return static_cast(_ret); + return static_cast(_ret); } void QTimer_SetSingleShot(QTimer* self, bool singleShot) { diff --git a/qt/gen_qtimer.go b/qt/gen_qtimer.go index e02a9e1..2143e31 100644 --- a/qt/gen_qtimer.go +++ b/qt/gen_qtimer.go @@ -91,7 +91,7 @@ func (this *QTimer) RemainingTime() int { } func (this *QTimer) SetTimerType(atype TimerType) { - C.QTimer_SetTimerType(this.h, (C.uintptr_t)(atype)) + C.QTimer_SetTimerType(this.h, (C.int)(atype)) } func (this *QTimer) TimerType() TimerType { diff --git a/qt/gen_qtimer.h b/qt/gen_qtimer.h index 0840508..4c1e3f7 100644 --- a/qt/gen_qtimer.h +++ b/qt/gen_qtimer.h @@ -33,8 +33,8 @@ int QTimer_TimerId(const QTimer* self); void QTimer_SetInterval(QTimer* self, int msec); int QTimer_Interval(const QTimer* self); int QTimer_RemainingTime(const QTimer* self); -void QTimer_SetTimerType(QTimer* self, uintptr_t atype); -uintptr_t QTimer_TimerType(const QTimer* self); +void QTimer_SetTimerType(QTimer* self, int atype); +int QTimer_TimerType(const QTimer* self); void QTimer_SetSingleShot(QTimer* self, bool singleShot); bool QTimer_IsSingleShot(const QTimer* self); void QTimer_Start(QTimer* self, int msec); diff --git a/qt/gen_qtimezone.cpp b/qt/gen_qtimezone.cpp index c2e9082..84fb402 100644 --- a/qt/gen_qtimezone.cpp +++ b/qt/gen_qtimezone.cpp @@ -33,13 +33,13 @@ QTimeZone* QTimeZone_new5(QTimeZone* other) { return new QTimeZone(*other); } -QTimeZone* QTimeZone_new6(QByteArray* zoneId, int offsetSeconds, struct miqt_string* name, struct miqt_string* abbreviation, uintptr_t country) { +QTimeZone* QTimeZone_new6(QByteArray* zoneId, int offsetSeconds, struct miqt_string* name, struct miqt_string* abbreviation, int country) { QString name_QString = QString::fromUtf8(&name->data, name->len); QString abbreviation_QString = QString::fromUtf8(&abbreviation->data, abbreviation->len); return new QTimeZone(*zoneId, static_cast(offsetSeconds), name_QString, abbreviation_QString, static_cast(country)); } -QTimeZone* QTimeZone_new7(QByteArray* zoneId, int offsetSeconds, struct miqt_string* name, struct miqt_string* abbreviation, uintptr_t country, struct miqt_string* comment) { +QTimeZone* QTimeZone_new7(QByteArray* zoneId, int offsetSeconds, struct miqt_string* name, struct miqt_string* abbreviation, int country, struct miqt_string* comment) { QString name_QString = QString::fromUtf8(&name->data, name->len); QString abbreviation_QString = QString::fromUtf8(&abbreviation->data, abbreviation->len); QString comment_QString = QString::fromUtf8(&comment->data, comment->len); @@ -70,9 +70,9 @@ QByteArray* QTimeZone_Id(const QTimeZone* self) { return new QByteArray(self->id()); } -uintptr_t QTimeZone_Country(const QTimeZone* self) { +int QTimeZone_Country(const QTimeZone* self) { QLocale::Country _ret = self->country(); - return static_cast(_ret); + return static_cast(_ret); } struct miqt_string* QTimeZone_Comment(const QTimeZone* self) { @@ -89,7 +89,7 @@ struct miqt_string* QTimeZone_DisplayName(const QTimeZone* self, QDateTime* atDa return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTimeZone_DisplayNameWithTimeType(const QTimeZone* self, uintptr_t timeType) { +struct miqt_string* QTimeZone_DisplayNameWithTimeType(const QTimeZone* self, int timeType) { QString _ret = self->displayName(static_cast(timeType)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -181,7 +181,7 @@ struct miqt_array* QTimeZone_AvailableTimeZoneIds() { return _out; } -struct miqt_array* QTimeZone_AvailableTimeZoneIdsWithCountry(uintptr_t country) { +struct miqt_array* QTimeZone_AvailableTimeZoneIdsWithCountry(int country) { QList _ret = QTimeZone::availableTimeZoneIds(static_cast(country)); // Convert QList<> from C++ memory to manually-managed C memory QByteArray** _arr = static_cast(malloc(sizeof(QByteArray*) * _ret.length())); @@ -215,7 +215,7 @@ QByteArray* QTimeZone_WindowsIdToDefaultIanaId(QByteArray* windowsId) { return new QByteArray(QTimeZone::windowsIdToDefaultIanaId(*windowsId)); } -QByteArray* QTimeZone_WindowsIdToDefaultIanaId2(QByteArray* windowsId, uintptr_t country) { +QByteArray* QTimeZone_WindowsIdToDefaultIanaId2(QByteArray* windowsId, int country) { return new QByteArray(QTimeZone::windowsIdToDefaultIanaId(*windowsId, static_cast(country))); } @@ -232,7 +232,7 @@ struct miqt_array* QTimeZone_WindowsIdToIanaIds(QByteArray* windowsId) { return _out; } -struct miqt_array* QTimeZone_WindowsIdToIanaIds2(QByteArray* windowsId, uintptr_t country) { +struct miqt_array* QTimeZone_WindowsIdToIanaIds2(QByteArray* windowsId, int country) { QList _ret = QTimeZone::windowsIdToIanaIds(*windowsId, static_cast(country)); // Convert QList<> from C++ memory to manually-managed C memory QByteArray** _arr = static_cast(malloc(sizeof(QByteArray*) * _ret.length())); @@ -245,28 +245,28 @@ struct miqt_array* QTimeZone_WindowsIdToIanaIds2(QByteArray* windowsId, uintptr_ return _out; } -struct miqt_string* QTimeZone_DisplayName2(const QTimeZone* self, QDateTime* atDateTime, uintptr_t nameType) { +struct miqt_string* QTimeZone_DisplayName2(const QTimeZone* self, QDateTime* atDateTime, int nameType) { QString _ret = self->displayName(*atDateTime, static_cast(nameType)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTimeZone_DisplayName3(const QTimeZone* self, QDateTime* atDateTime, uintptr_t nameType, QLocale* locale) { +struct miqt_string* QTimeZone_DisplayName3(const QTimeZone* self, QDateTime* atDateTime, int nameType, QLocale* locale) { QString _ret = self->displayName(*atDateTime, static_cast(nameType), *locale); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTimeZone_DisplayName22(const QTimeZone* self, uintptr_t timeType, uintptr_t nameType) { +struct miqt_string* QTimeZone_DisplayName22(const QTimeZone* self, int timeType, int nameType) { QString _ret = self->displayName(static_cast(timeType), static_cast(nameType)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTimeZone_DisplayName32(const QTimeZone* self, uintptr_t timeType, uintptr_t nameType, QLocale* locale) { +struct miqt_string* QTimeZone_DisplayName32(const QTimeZone* self, int timeType, int nameType, QLocale* locale) { QString _ret = self->displayName(static_cast(timeType), static_cast(nameType), *locale); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -281,6 +281,10 @@ QTimeZone__OffsetData* QTimeZone__OffsetData_new(QTimeZone__OffsetData* param1) return new QTimeZone::OffsetData(*param1); } +void QTimeZone__OffsetData_OperatorAssign(QTimeZone__OffsetData* self, QTimeZone__OffsetData* param1) { + self->operator=(*param1); +} + void QTimeZone__OffsetData_Delete(QTimeZone__OffsetData* self) { delete self; } diff --git a/qt/gen_qtimezone.go b/qt/gen_qtimezone.go index 7dd879d..d956faa 100644 --- a/qt/gen_qtimezone.go +++ b/qt/gen_qtimezone.go @@ -99,7 +99,7 @@ func NewQTimeZone6(zoneId *QByteArray, offsetSeconds int, name string, abbreviat defer C.free(name_ms) abbreviation_ms := miqt_strdupg(abbreviation) defer C.free(abbreviation_ms) - ret := C.QTimeZone_new6(zoneId.cPointer(), (C.int)(offsetSeconds), (*C.struct_miqt_string)(name_ms), (*C.struct_miqt_string)(abbreviation_ms), (C.uintptr_t)(country)) + ret := C.QTimeZone_new6(zoneId.cPointer(), (C.int)(offsetSeconds), (*C.struct_miqt_string)(name_ms), (*C.struct_miqt_string)(abbreviation_ms), (C.int)(country)) return newQTimeZone(ret) } @@ -111,7 +111,7 @@ func NewQTimeZone7(zoneId *QByteArray, offsetSeconds int, name string, abbreviat defer C.free(abbreviation_ms) comment_ms := miqt_strdupg(comment) defer C.free(comment_ms) - ret := C.QTimeZone_new7(zoneId.cPointer(), (C.int)(offsetSeconds), (*C.struct_miqt_string)(name_ms), (*C.struct_miqt_string)(abbreviation_ms), (C.uintptr_t)(country), (*C.struct_miqt_string)(comment_ms)) + ret := C.QTimeZone_new7(zoneId.cPointer(), (C.int)(offsetSeconds), (*C.struct_miqt_string)(name_ms), (*C.struct_miqt_string)(abbreviation_ms), (C.int)(country), (*C.struct_miqt_string)(comment_ms)) return newQTimeZone(ret) } @@ -161,7 +161,7 @@ func (this *QTimeZone) DisplayName(atDateTime *QDateTime) string { } func (this *QTimeZone) DisplayNameWithTimeType(timeType QTimeZone__TimeType) string { - var _ms *C.struct_miqt_string = C.QTimeZone_DisplayNameWithTimeType(this.h, (C.uintptr_t)(timeType)) + var _ms *C.struct_miqt_string = C.QTimeZone_DisplayNameWithTimeType(this.h, (C.int)(timeType)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -273,7 +273,7 @@ func QTimeZone_AvailableTimeZoneIds() []QByteArray { } func QTimeZone_AvailableTimeZoneIdsWithCountry(country QLocale__Country) []QByteArray { - var _ma *C.struct_miqt_array = C.QTimeZone_AvailableTimeZoneIdsWithCountry((C.uintptr_t)(country)) + var _ma *C.struct_miqt_array = C.QTimeZone_AvailableTimeZoneIdsWithCountry((C.int)(country)) _ret := make([]QByteArray, int(_ma.len)) _outCast := (*[0xffff]*C.QByteArray)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -315,7 +315,7 @@ func QTimeZone_WindowsIdToDefaultIanaId(windowsId *QByteArray) *QByteArray { } func QTimeZone_WindowsIdToDefaultIanaId2(windowsId *QByteArray, country QLocale__Country) *QByteArray { - _ret := C.QTimeZone_WindowsIdToDefaultIanaId2(windowsId.cPointer(), (C.uintptr_t)(country)) + _ret := C.QTimeZone_WindowsIdToDefaultIanaId2(windowsId.cPointer(), (C.int)(country)) _goptr := newQByteArray(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -336,7 +336,7 @@ func QTimeZone_WindowsIdToIanaIds(windowsId *QByteArray) []QByteArray { } func QTimeZone_WindowsIdToIanaIds2(windowsId *QByteArray, country QLocale__Country) []QByteArray { - var _ma *C.struct_miqt_array = C.QTimeZone_WindowsIdToIanaIds2(windowsId.cPointer(), (C.uintptr_t)(country)) + var _ma *C.struct_miqt_array = C.QTimeZone_WindowsIdToIanaIds2(windowsId.cPointer(), (C.int)(country)) _ret := make([]QByteArray, int(_ma.len)) _outCast := (*[0xffff]*C.QByteArray)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -350,28 +350,28 @@ func QTimeZone_WindowsIdToIanaIds2(windowsId *QByteArray, country QLocale__Count } func (this *QTimeZone) DisplayName2(atDateTime *QDateTime, nameType QTimeZone__NameType) string { - var _ms *C.struct_miqt_string = C.QTimeZone_DisplayName2(this.h, atDateTime.cPointer(), (C.uintptr_t)(nameType)) + var _ms *C.struct_miqt_string = C.QTimeZone_DisplayName2(this.h, atDateTime.cPointer(), (C.int)(nameType)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } func (this *QTimeZone) DisplayName3(atDateTime *QDateTime, nameType QTimeZone__NameType, locale *QLocale) string { - var _ms *C.struct_miqt_string = C.QTimeZone_DisplayName3(this.h, atDateTime.cPointer(), (C.uintptr_t)(nameType), locale.cPointer()) + var _ms *C.struct_miqt_string = C.QTimeZone_DisplayName3(this.h, atDateTime.cPointer(), (C.int)(nameType), locale.cPointer()) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } func (this *QTimeZone) DisplayName22(timeType QTimeZone__TimeType, nameType QTimeZone__NameType) string { - var _ms *C.struct_miqt_string = C.QTimeZone_DisplayName22(this.h, (C.uintptr_t)(timeType), (C.uintptr_t)(nameType)) + var _ms *C.struct_miqt_string = C.QTimeZone_DisplayName22(this.h, (C.int)(timeType), (C.int)(nameType)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } func (this *QTimeZone) DisplayName32(timeType QTimeZone__TimeType, nameType QTimeZone__NameType, locale *QLocale) string { - var _ms *C.struct_miqt_string = C.QTimeZone_DisplayName32(this.h, (C.uintptr_t)(timeType), (C.uintptr_t)(nameType), locale.cPointer()) + var _ms *C.struct_miqt_string = C.QTimeZone_DisplayName32(this.h, (C.int)(timeType), (C.int)(nameType), locale.cPointer()) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -419,6 +419,10 @@ func NewQTimeZone__OffsetData(param1 *QTimeZone__OffsetData) *QTimeZone__OffsetD return newQTimeZone__OffsetData(ret) } +func (this *QTimeZone__OffsetData) OperatorAssign(param1 *QTimeZone__OffsetData) { + C.QTimeZone__OffsetData_OperatorAssign(this.h, param1.cPointer()) +} + // Delete this object from C++ memory. func (this *QTimeZone__OffsetData) Delete() { C.QTimeZone__OffsetData_Delete(this.h) diff --git a/qt/gen_qtimezone.h b/qt/gen_qtimezone.h index 2b08248..c3cf9a0 100644 --- a/qt/gen_qtimezone.h +++ b/qt/gen_qtimezone.h @@ -36,18 +36,18 @@ QTimeZone* QTimeZone_new2(QByteArray* ianaId); QTimeZone* QTimeZone_new3(int offsetSeconds); QTimeZone* QTimeZone_new4(QByteArray* zoneId, int offsetSeconds, struct miqt_string* name, struct miqt_string* abbreviation); QTimeZone* QTimeZone_new5(QTimeZone* other); -QTimeZone* QTimeZone_new6(QByteArray* zoneId, int offsetSeconds, struct miqt_string* name, struct miqt_string* abbreviation, uintptr_t country); -QTimeZone* QTimeZone_new7(QByteArray* zoneId, int offsetSeconds, struct miqt_string* name, struct miqt_string* abbreviation, uintptr_t country, struct miqt_string* comment); +QTimeZone* QTimeZone_new6(QByteArray* zoneId, int offsetSeconds, struct miqt_string* name, struct miqt_string* abbreviation, int country); +QTimeZone* QTimeZone_new7(QByteArray* zoneId, int offsetSeconds, struct miqt_string* name, struct miqt_string* abbreviation, int country, struct miqt_string* comment); void QTimeZone_OperatorAssign(QTimeZone* self, QTimeZone* other); void QTimeZone_Swap(QTimeZone* self, QTimeZone* other); bool QTimeZone_OperatorEqual(const QTimeZone* self, QTimeZone* other); bool QTimeZone_OperatorNotEqual(const QTimeZone* self, QTimeZone* other); bool QTimeZone_IsValid(const QTimeZone* self); QByteArray* QTimeZone_Id(const QTimeZone* self); -uintptr_t QTimeZone_Country(const QTimeZone* self); +int QTimeZone_Country(const QTimeZone* self); struct miqt_string* QTimeZone_Comment(const QTimeZone* self); struct miqt_string* QTimeZone_DisplayName(const QTimeZone* self, QDateTime* atDateTime); -struct miqt_string* QTimeZone_DisplayNameWithTimeType(const QTimeZone* self, uintptr_t timeType); +struct miqt_string* QTimeZone_DisplayNameWithTimeType(const QTimeZone* self, int timeType); struct miqt_string* QTimeZone_Abbreviation(const QTimeZone* self, QDateTime* atDateTime); int QTimeZone_OffsetFromUtc(const QTimeZone* self, QDateTime* atDateTime); int QTimeZone_StandardTimeOffset(const QTimeZone* self, QDateTime* atDateTime); @@ -64,20 +64,21 @@ QTimeZone* QTimeZone_SystemTimeZone(); QTimeZone* QTimeZone_Utc(); bool QTimeZone_IsTimeZoneIdAvailable(QByteArray* ianaId); struct miqt_array* QTimeZone_AvailableTimeZoneIds(); -struct miqt_array* QTimeZone_AvailableTimeZoneIdsWithCountry(uintptr_t country); +struct miqt_array* QTimeZone_AvailableTimeZoneIdsWithCountry(int country); struct miqt_array* QTimeZone_AvailableTimeZoneIdsWithOffsetSeconds(int offsetSeconds); QByteArray* QTimeZone_IanaIdToWindowsId(QByteArray* ianaId); QByteArray* QTimeZone_WindowsIdToDefaultIanaId(QByteArray* windowsId); -QByteArray* QTimeZone_WindowsIdToDefaultIanaId2(QByteArray* windowsId, uintptr_t country); +QByteArray* QTimeZone_WindowsIdToDefaultIanaId2(QByteArray* windowsId, int country); struct miqt_array* QTimeZone_WindowsIdToIanaIds(QByteArray* windowsId); -struct miqt_array* QTimeZone_WindowsIdToIanaIds2(QByteArray* windowsId, uintptr_t country); -struct miqt_string* QTimeZone_DisplayName2(const QTimeZone* self, QDateTime* atDateTime, uintptr_t nameType); -struct miqt_string* QTimeZone_DisplayName3(const QTimeZone* self, QDateTime* atDateTime, uintptr_t nameType, QLocale* locale); -struct miqt_string* QTimeZone_DisplayName22(const QTimeZone* self, uintptr_t timeType, uintptr_t nameType); -struct miqt_string* QTimeZone_DisplayName32(const QTimeZone* self, uintptr_t timeType, uintptr_t nameType, QLocale* locale); +struct miqt_array* QTimeZone_WindowsIdToIanaIds2(QByteArray* windowsId, int country); +struct miqt_string* QTimeZone_DisplayName2(const QTimeZone* self, QDateTime* atDateTime, int nameType); +struct miqt_string* QTimeZone_DisplayName3(const QTimeZone* self, QDateTime* atDateTime, int nameType, QLocale* locale); +struct miqt_string* QTimeZone_DisplayName22(const QTimeZone* self, int timeType, int nameType); +struct miqt_string* QTimeZone_DisplayName32(const QTimeZone* self, int timeType, int nameType, QLocale* locale); void QTimeZone_Delete(QTimeZone* self); QTimeZone__OffsetData* QTimeZone__OffsetData_new(QTimeZone__OffsetData* param1); +void QTimeZone__OffsetData_OperatorAssign(QTimeZone__OffsetData* self, QTimeZone__OffsetData* param1); void QTimeZone__OffsetData_Delete(QTimeZone__OffsetData* self); #ifdef __cplusplus diff --git a/qt/gen_qtoolbar.cpp b/qt/gen_qtoolbar.cpp index 665f11d..abaf1de 100644 --- a/qt/gen_qtoolbar.cpp +++ b/qt/gen_qtoolbar.cpp @@ -66,17 +66,17 @@ int QToolBar_AllowedAreas(const QToolBar* self) { return static_cast(_ret); } -bool QToolBar_IsAreaAllowed(const QToolBar* self, uintptr_t area) { +bool QToolBar_IsAreaAllowed(const QToolBar* self, int area) { return self->isAreaAllowed(static_cast(area)); } -void QToolBar_SetOrientation(QToolBar* self, uintptr_t orientation) { +void QToolBar_SetOrientation(QToolBar* self, int orientation) { self->setOrientation(static_cast(orientation)); } -uintptr_t QToolBar_Orientation(const QToolBar* self) { +int QToolBar_Orientation(const QToolBar* self) { Qt::Orientation _ret = self->orientation(); - return static_cast(_ret); + return static_cast(_ret); } void QToolBar_Clear(QToolBar* self) { @@ -129,9 +129,9 @@ QSize* QToolBar_IconSize(const QToolBar* self) { return new QSize(self->iconSize()); } -uintptr_t QToolBar_ToolButtonStyle(const QToolBar* self) { +int QToolBar_ToolButtonStyle(const QToolBar* self) { Qt::ToolButtonStyle _ret = self->toolButtonStyle(); - return static_cast(_ret); + return static_cast(_ret); } QWidget* QToolBar_WidgetForAction(const QToolBar* self, QAction* action) { @@ -154,7 +154,7 @@ void QToolBar_SetIconSize(QToolBar* self, QSize* iconSize) { self->setIconSize(*iconSize); } -void QToolBar_SetToolButtonStyle(QToolBar* self, uintptr_t toolButtonStyle) { +void QToolBar_SetToolButtonStyle(QToolBar* self, int toolButtonStyle) { self->setToolButtonStyle(static_cast(toolButtonStyle)); } @@ -192,14 +192,14 @@ void QToolBar_connect_AllowedAreasChanged(QToolBar* self, void* slot) { }); } -void QToolBar_OrientationChanged(QToolBar* self, uintptr_t orientation) { +void QToolBar_OrientationChanged(QToolBar* self, int orientation) { self->orientationChanged(static_cast(orientation)); } void QToolBar_connect_OrientationChanged(QToolBar* self, void* slot) { QToolBar::connect(self, static_cast(&QToolBar::orientationChanged), self, [=](Qt::Orientation orientation) { Qt::Orientation orientation_ret = orientation; - uintptr_t sigval1 = static_cast(orientation_ret); + int sigval1 = static_cast(orientation_ret); miqt_exec_callback_QToolBar_OrientationChanged(slot, sigval1); }); } @@ -217,14 +217,14 @@ void QToolBar_connect_IconSizeChanged(QToolBar* self, void* slot) { }); } -void QToolBar_ToolButtonStyleChanged(QToolBar* self, uintptr_t toolButtonStyle) { +void QToolBar_ToolButtonStyleChanged(QToolBar* self, int toolButtonStyle) { self->toolButtonStyleChanged(static_cast(toolButtonStyle)); } void QToolBar_connect_ToolButtonStyleChanged(QToolBar* self, void* slot) { QToolBar::connect(self, static_cast(&QToolBar::toolButtonStyleChanged), self, [=](Qt::ToolButtonStyle toolButtonStyle) { Qt::ToolButtonStyle toolButtonStyle_ret = toolButtonStyle; - uintptr_t sigval1 = static_cast(toolButtonStyle_ret); + int sigval1 = static_cast(toolButtonStyle_ret); miqt_exec_callback_QToolBar_ToolButtonStyleChanged(slot, sigval1); }); } diff --git a/qt/gen_qtoolbar.go b/qt/gen_qtoolbar.go index 31ecea6..52d68a9 100644 --- a/qt/gen_qtoolbar.go +++ b/qt/gen_qtoolbar.go @@ -96,7 +96,7 @@ func (this *QToolBar) IsMovable() bool { } func (this *QToolBar) SetAllowedAreas(areas int) { - C.QToolBar_SetAllowedAreas(this.h, (C.int)(areas)) + C.QToolBar_SetAllowedAreas(this.h, areas) } func (this *QToolBar) AllowedAreas() int { @@ -104,11 +104,11 @@ func (this *QToolBar) AllowedAreas() int { } func (this *QToolBar) IsAreaAllowed(area ToolBarArea) bool { - return (bool)(C.QToolBar_IsAreaAllowed(this.h, (C.uintptr_t)(area))) + return (bool)(C.QToolBar_IsAreaAllowed(this.h, (C.int)(area))) } func (this *QToolBar) SetOrientation(orientation Orientation) { - C.QToolBar_SetOrientation(this.h, (C.uintptr_t)(orientation)) + C.QToolBar_SetOrientation(this.h, (C.int)(orientation)) } func (this *QToolBar) Orientation() Orientation { @@ -198,7 +198,7 @@ func (this *QToolBar) SetIconSize(iconSize *QSize) { } func (this *QToolBar) SetToolButtonStyle(toolButtonStyle ToolButtonStyle) { - C.QToolBar_SetToolButtonStyle(this.h, (C.uintptr_t)(toolButtonStyle)) + C.QToolBar_SetToolButtonStyle(this.h, (C.int)(toolButtonStyle)) } func (this *QToolBar) ActionTriggered(action *QAction) { @@ -242,7 +242,7 @@ func miqt_exec_callback_QToolBar_MovableChanged(cb *C.void, movable C.bool) { } func (this *QToolBar) AllowedAreasChanged(allowedAreas int) { - C.QToolBar_AllowedAreasChanged(this.h, (C.int)(allowedAreas)) + C.QToolBar_AllowedAreasChanged(this.h, allowedAreas) } func (this *QToolBar) OnAllowedAreasChanged(slot func(allowedAreas int)) { C.QToolBar_connect_AllowedAreasChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) @@ -262,14 +262,14 @@ func miqt_exec_callback_QToolBar_AllowedAreasChanged(cb *C.void, allowedAreas C. } func (this *QToolBar) OrientationChanged(orientation Orientation) { - C.QToolBar_OrientationChanged(this.h, (C.uintptr_t)(orientation)) + C.QToolBar_OrientationChanged(this.h, (C.int)(orientation)) } func (this *QToolBar) OnOrientationChanged(slot func(orientation Orientation)) { C.QToolBar_connect_OrientationChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QToolBar_OrientationChanged -func miqt_exec_callback_QToolBar_OrientationChanged(cb *C.void, orientation C.uintptr_t) { +func miqt_exec_callback_QToolBar_OrientationChanged(cb *C.void, orientation C.int) { gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(orientation Orientation)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -302,14 +302,14 @@ func miqt_exec_callback_QToolBar_IconSizeChanged(cb *C.void, iconSize *C.QSize) } func (this *QToolBar) ToolButtonStyleChanged(toolButtonStyle ToolButtonStyle) { - C.QToolBar_ToolButtonStyleChanged(this.h, (C.uintptr_t)(toolButtonStyle)) + C.QToolBar_ToolButtonStyleChanged(this.h, (C.int)(toolButtonStyle)) } func (this *QToolBar) OnToolButtonStyleChanged(slot func(toolButtonStyle ToolButtonStyle)) { C.QToolBar_connect_ToolButtonStyleChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QToolBar_ToolButtonStyleChanged -func miqt_exec_callback_QToolBar_ToolButtonStyleChanged(cb *C.void, toolButtonStyle C.uintptr_t) { +func miqt_exec_callback_QToolBar_ToolButtonStyleChanged(cb *C.void, toolButtonStyle C.int) { gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(toolButtonStyle ToolButtonStyle)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt/gen_qtoolbar.h b/qt/gen_qtoolbar.h index 93a887e..6cb67d4 100644 --- a/qt/gen_qtoolbar.h +++ b/qt/gen_qtoolbar.h @@ -44,9 +44,9 @@ void QToolBar_SetMovable(QToolBar* self, bool movable); bool QToolBar_IsMovable(const QToolBar* self); void QToolBar_SetAllowedAreas(QToolBar* self, int areas); int QToolBar_AllowedAreas(const QToolBar* self); -bool QToolBar_IsAreaAllowed(const QToolBar* self, uintptr_t area); -void QToolBar_SetOrientation(QToolBar* self, uintptr_t orientation); -uintptr_t QToolBar_Orientation(const QToolBar* self); +bool QToolBar_IsAreaAllowed(const QToolBar* self, int area); +void QToolBar_SetOrientation(QToolBar* self, int orientation); +int QToolBar_Orientation(const QToolBar* self); void QToolBar_Clear(QToolBar* self); QAction* QToolBar_AddAction(QToolBar* self, struct miqt_string* text); QAction* QToolBar_AddAction2(QToolBar* self, QIcon* icon, struct miqt_string* text); @@ -59,24 +59,24 @@ QAction* QToolBar_ActionAt(const QToolBar* self, QPoint* p); QAction* QToolBar_ActionAt2(const QToolBar* self, int x, int y); QAction* QToolBar_ToggleViewAction(const QToolBar* self); QSize* QToolBar_IconSize(const QToolBar* self); -uintptr_t QToolBar_ToolButtonStyle(const QToolBar* self); +int QToolBar_ToolButtonStyle(const QToolBar* self); QWidget* QToolBar_WidgetForAction(const QToolBar* self, QAction* action); bool QToolBar_IsFloatable(const QToolBar* self); void QToolBar_SetFloatable(QToolBar* self, bool floatable); bool QToolBar_IsFloating(const QToolBar* self); void QToolBar_SetIconSize(QToolBar* self, QSize* iconSize); -void QToolBar_SetToolButtonStyle(QToolBar* self, uintptr_t toolButtonStyle); +void QToolBar_SetToolButtonStyle(QToolBar* self, int toolButtonStyle); void QToolBar_ActionTriggered(QToolBar* self, QAction* action); void QToolBar_connect_ActionTriggered(QToolBar* self, void* slot); void QToolBar_MovableChanged(QToolBar* self, bool movable); void QToolBar_connect_MovableChanged(QToolBar* self, void* slot); void QToolBar_AllowedAreasChanged(QToolBar* self, int allowedAreas); void QToolBar_connect_AllowedAreasChanged(QToolBar* self, void* slot); -void QToolBar_OrientationChanged(QToolBar* self, uintptr_t orientation); +void QToolBar_OrientationChanged(QToolBar* self, int orientation); void QToolBar_connect_OrientationChanged(QToolBar* self, void* slot); void QToolBar_IconSizeChanged(QToolBar* self, QSize* iconSize); void QToolBar_connect_IconSizeChanged(QToolBar* self, void* slot); -void QToolBar_ToolButtonStyleChanged(QToolBar* self, uintptr_t toolButtonStyle); +void QToolBar_ToolButtonStyleChanged(QToolBar* self, int toolButtonStyle); void QToolBar_connect_ToolButtonStyleChanged(QToolBar* self, void* slot); void QToolBar_TopLevelChanged(QToolBar* self, bool topLevel); void QToolBar_connect_TopLevelChanged(QToolBar* self, void* slot); diff --git a/qt/gen_qtoolbox.go b/qt/gen_qtoolbox.go index 9455356..0585854 100644 --- a/qt/gen_qtoolbox.go +++ b/qt/gen_qtoolbox.go @@ -51,7 +51,7 @@ func NewQToolBox2(parent *QWidget) *QToolBox { // NewQToolBox3 constructs a new QToolBox object. func NewQToolBox3(parent *QWidget, f int) *QToolBox { - ret := C.QToolBox_new3(parent.cPointer(), (C.int)(f)) + ret := C.QToolBox_new3(parent.cPointer(), f) return newQToolBox(ret) } diff --git a/qt/gen_qtoolbutton.cpp b/qt/gen_qtoolbutton.cpp index 97aac62..2f75abc 100644 --- a/qt/gen_qtoolbutton.cpp +++ b/qt/gen_qtoolbutton.cpp @@ -45,17 +45,17 @@ QSize* QToolButton_MinimumSizeHint(const QToolButton* self) { return new QSize(self->minimumSizeHint()); } -uintptr_t QToolButton_ToolButtonStyle(const QToolButton* self) { +int QToolButton_ToolButtonStyle(const QToolButton* self) { Qt::ToolButtonStyle _ret = self->toolButtonStyle(); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QToolButton_ArrowType(const QToolButton* self) { +int QToolButton_ArrowType(const QToolButton* self) { Qt::ArrowType _ret = self->arrowType(); - return static_cast(_ret); + return static_cast(_ret); } -void QToolButton_SetArrowType(QToolButton* self, uintptr_t typeVal) { +void QToolButton_SetArrowType(QToolButton* self, int typeVal) { self->setArrowType(static_cast(typeVal)); } @@ -67,13 +67,13 @@ QMenu* QToolButton_Menu(const QToolButton* self) { return self->menu(); } -void QToolButton_SetPopupMode(QToolButton* self, uintptr_t mode) { +void QToolButton_SetPopupMode(QToolButton* self, int mode) { self->setPopupMode(static_cast(mode)); } -uintptr_t QToolButton_PopupMode(const QToolButton* self) { +int QToolButton_PopupMode(const QToolButton* self) { QToolButton::ToolButtonPopupMode _ret = self->popupMode(); - return static_cast(_ret); + return static_cast(_ret); } QAction* QToolButton_DefaultAction(const QToolButton* self) { @@ -92,7 +92,7 @@ void QToolButton_ShowMenu(QToolButton* self) { self->showMenu(); } -void QToolButton_SetToolButtonStyle(QToolButton* self, uintptr_t style) { +void QToolButton_SetToolButtonStyle(QToolButton* self, int style) { self->setToolButtonStyle(static_cast(style)); } diff --git a/qt/gen_qtoolbutton.go b/qt/gen_qtoolbutton.go index 3cfcff6..3881754 100644 --- a/qt/gen_qtoolbutton.go +++ b/qt/gen_qtoolbutton.go @@ -102,7 +102,7 @@ func (this *QToolButton) ArrowType() ArrowType { } func (this *QToolButton) SetArrowType(typeVal ArrowType) { - C.QToolButton_SetArrowType(this.h, (C.uintptr_t)(typeVal)) + C.QToolButton_SetArrowType(this.h, (C.int)(typeVal)) } func (this *QToolButton) SetMenu(menu *QMenu) { @@ -114,7 +114,7 @@ func (this *QToolButton) Menu() *QMenu { } func (this *QToolButton) SetPopupMode(mode QToolButton__ToolButtonPopupMode) { - C.QToolButton_SetPopupMode(this.h, (C.uintptr_t)(mode)) + C.QToolButton_SetPopupMode(this.h, (C.int)(mode)) } func (this *QToolButton) PopupMode() QToolButton__ToolButtonPopupMode { @@ -138,7 +138,7 @@ func (this *QToolButton) ShowMenu() { } func (this *QToolButton) SetToolButtonStyle(style ToolButtonStyle) { - C.QToolButton_SetToolButtonStyle(this.h, (C.uintptr_t)(style)) + C.QToolButton_SetToolButtonStyle(this.h, (C.int)(style)) } func (this *QToolButton) SetDefaultAction(defaultAction *QAction) { diff --git a/qt/gen_qtoolbutton.h b/qt/gen_qtoolbutton.h index 88379ff..f6436d6 100644 --- a/qt/gen_qtoolbutton.h +++ b/qt/gen_qtoolbutton.h @@ -36,18 +36,18 @@ struct miqt_string* QToolButton_Tr(const char* s); struct miqt_string* QToolButton_TrUtf8(const char* s); QSize* QToolButton_SizeHint(const QToolButton* self); QSize* QToolButton_MinimumSizeHint(const QToolButton* self); -uintptr_t QToolButton_ToolButtonStyle(const QToolButton* self); -uintptr_t QToolButton_ArrowType(const QToolButton* self); -void QToolButton_SetArrowType(QToolButton* self, uintptr_t typeVal); +int QToolButton_ToolButtonStyle(const QToolButton* self); +int QToolButton_ArrowType(const QToolButton* self); +void QToolButton_SetArrowType(QToolButton* self, int typeVal); void QToolButton_SetMenu(QToolButton* self, QMenu* menu); QMenu* QToolButton_Menu(const QToolButton* self); -void QToolButton_SetPopupMode(QToolButton* self, uintptr_t mode); -uintptr_t QToolButton_PopupMode(const QToolButton* self); +void QToolButton_SetPopupMode(QToolButton* self, int mode); +int QToolButton_PopupMode(const QToolButton* self); QAction* QToolButton_DefaultAction(const QToolButton* self); void QToolButton_SetAutoRaise(QToolButton* self, bool enable); bool QToolButton_AutoRaise(const QToolButton* self); void QToolButton_ShowMenu(QToolButton* self); -void QToolButton_SetToolButtonStyle(QToolButton* self, uintptr_t style); +void QToolButton_SetToolButtonStyle(QToolButton* self, int style); void QToolButton_SetDefaultAction(QToolButton* self, QAction* defaultAction); void QToolButton_Triggered(QToolButton* self, QAction* param1); void QToolButton_connect_Triggered(QToolButton* self, void* slot); diff --git a/qt/gen_qtouchdevice.cpp b/qt/gen_qtouchdevice.cpp index 99c2eb0..09c598f 100644 --- a/qt/gen_qtouchdevice.cpp +++ b/qt/gen_qtouchdevice.cpp @@ -12,7 +12,7 @@ QTouchDevice* QTouchDevice_new() { } struct miqt_array* QTouchDevice_Devices() { - QList _ret = QTouchDevice::devices(); + QList _ret = QTouchDevice::devices(); // Convert QList<> from C++ memory to manually-managed C memory QTouchDevice** _arr = static_cast(malloc(sizeof(QTouchDevice*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -31,9 +31,9 @@ struct miqt_string* QTouchDevice_Name(const QTouchDevice* self) { return miqt_strdup(_b.data(), _b.length()); } -uintptr_t QTouchDevice_Type(const QTouchDevice* self) { +int QTouchDevice_Type(const QTouchDevice* self) { QTouchDevice::DeviceType _ret = self->type(); - return static_cast(_ret); + return static_cast(_ret); } int QTouchDevice_Capabilities(const QTouchDevice* self) { @@ -50,7 +50,7 @@ void QTouchDevice_SetName(QTouchDevice* self, struct miqt_string* name) { self->setName(name_QString); } -void QTouchDevice_SetType(QTouchDevice* self, uintptr_t devType) { +void QTouchDevice_SetType(QTouchDevice* self, int devType) { self->setType(static_cast(devType)); } diff --git a/qt/gen_qtouchdevice.go b/qt/gen_qtouchdevice.go index 81ba843..e46a3b6 100644 --- a/qt/gen_qtouchdevice.go +++ b/qt/gen_qtouchdevice.go @@ -97,11 +97,11 @@ func (this *QTouchDevice) SetName(name string) { } func (this *QTouchDevice) SetType(devType QTouchDevice__DeviceType) { - C.QTouchDevice_SetType(this.h, (C.uintptr_t)(devType)) + C.QTouchDevice_SetType(this.h, (C.int)(devType)) } func (this *QTouchDevice) SetCapabilities(caps int) { - C.QTouchDevice_SetCapabilities(this.h, (C.int)(caps)) + C.QTouchDevice_SetCapabilities(this.h, caps) } func (this *QTouchDevice) SetMaximumTouchPoints(max int) { diff --git a/qt/gen_qtouchdevice.h b/qt/gen_qtouchdevice.h index 027139a..c658d9f 100644 --- a/qt/gen_qtouchdevice.h +++ b/qt/gen_qtouchdevice.h @@ -22,11 +22,11 @@ typedef struct QTouchDevice QTouchDevice; QTouchDevice* QTouchDevice_new(); struct miqt_array* QTouchDevice_Devices(); struct miqt_string* QTouchDevice_Name(const QTouchDevice* self); -uintptr_t QTouchDevice_Type(const QTouchDevice* self); +int QTouchDevice_Type(const QTouchDevice* self); int QTouchDevice_Capabilities(const QTouchDevice* self); int QTouchDevice_MaximumTouchPoints(const QTouchDevice* self); void QTouchDevice_SetName(QTouchDevice* self, struct miqt_string* name); -void QTouchDevice_SetType(QTouchDevice* self, uintptr_t devType); +void QTouchDevice_SetType(QTouchDevice* self, int devType); void QTouchDevice_SetCapabilities(QTouchDevice* self, int caps); void QTouchDevice_SetMaximumTouchPoints(QTouchDevice* self, int max); void QTouchDevice_Delete(QTouchDevice* self); diff --git a/qt/gen_qtransform.cpp b/qt/gen_qtransform.cpp index 31d506a..97647c4 100644 --- a/qt/gen_qtransform.cpp +++ b/qt/gen_qtransform.cpp @@ -12,7 +12,7 @@ #include "gen_qtransform.h" #include "_cgo_export.h" -QTransform* QTransform_new(uintptr_t param1) { +QTransform* QTransform_new(int param1) { return new QTransform(static_cast(param1)); } @@ -68,61 +68,74 @@ bool QTransform_IsTranslating(const QTransform* self) { return self->isTranslating(); } -uintptr_t QTransform_Type(const QTransform* self) { +int QTransform_Type(const QTransform* self) { QTransform::TransformationType _ret = self->type(); - return static_cast(_ret); + return static_cast(_ret); } double QTransform_Determinant(const QTransform* self) { - return self->determinant(); + qreal _ret = self->determinant(); + return static_cast(_ret); } double QTransform_Det(const QTransform* self) { - return self->det(); + qreal _ret = self->det(); + return static_cast(_ret); } double QTransform_M11(const QTransform* self) { - return self->m11(); + qreal _ret = self->m11(); + return static_cast(_ret); } double QTransform_M12(const QTransform* self) { - return self->m12(); + qreal _ret = self->m12(); + return static_cast(_ret); } double QTransform_M13(const QTransform* self) { - return self->m13(); + qreal _ret = self->m13(); + return static_cast(_ret); } double QTransform_M21(const QTransform* self) { - return self->m21(); + qreal _ret = self->m21(); + return static_cast(_ret); } double QTransform_M22(const QTransform* self) { - return self->m22(); + qreal _ret = self->m22(); + return static_cast(_ret); } double QTransform_M23(const QTransform* self) { - return self->m23(); + qreal _ret = self->m23(); + return static_cast(_ret); } double QTransform_M31(const QTransform* self) { - return self->m31(); + qreal _ret = self->m31(); + return static_cast(_ret); } double QTransform_M32(const QTransform* self) { - return self->m32(); + qreal _ret = self->m32(); + return static_cast(_ret); } double QTransform_M33(const QTransform* self) { - return self->m33(); + qreal _ret = self->m33(); + return static_cast(_ret); } double QTransform_Dx(const QTransform* self) { - return self->dx(); + qreal _ret = self->dx(); + return static_cast(_ret); } double QTransform_Dy(const QTransform* self) { - return self->dy(); + qreal _ret = self->dy(); + return static_cast(_ret); } void QTransform_SetMatrix(QTransform* self, double m11, double m12, double m13, double m21, double m22, double m23, double m31, double m32, double m33) { @@ -275,13 +288,13 @@ QTransform* QTransform_Inverted1(const QTransform* self, bool* invertible) { return new QTransform(self->inverted(invertible)); } -QTransform* QTransform_Rotate2(QTransform* self, double a, uintptr_t axis) { +QTransform* QTransform_Rotate2(QTransform* self, double a, int axis) { QTransform& _ret = self->rotate(static_cast(a), static_cast(axis)); // Cast returned reference into pointer return &_ret; } -QTransform* QTransform_RotateRadians2(QTransform* self, double a, uintptr_t axis) { +QTransform* QTransform_RotateRadians2(QTransform* self, double a, int axis) { QTransform& _ret = self->rotateRadians(static_cast(a), static_cast(axis)); // Cast returned reference into pointer return &_ret; diff --git a/qt/gen_qtransform.go b/qt/gen_qtransform.go index f6b1c8a..eeeecbd 100644 --- a/qt/gen_qtransform.go +++ b/qt/gen_qtransform.go @@ -48,7 +48,7 @@ func newQTransform_U(h unsafe.Pointer) *QTransform { // NewQTransform constructs a new QTransform object. func NewQTransform(param1 Initialization) *QTransform { - ret := C.QTransform_new((C.uintptr_t)(param1)) + ret := C.QTransform_new((C.int)(param1)) return newQTransform(ret) } @@ -346,11 +346,11 @@ func (this *QTransform) Inverted1(invertible *bool) *QTransform { } func (this *QTransform) Rotate2(a float64, axis Axis) *QTransform { - return newQTransform_U(unsafe.Pointer(C.QTransform_Rotate2(this.h, (C.double)(a), (C.uintptr_t)(axis)))) + return newQTransform_U(unsafe.Pointer(C.QTransform_Rotate2(this.h, (C.double)(a), (C.int)(axis)))) } func (this *QTransform) RotateRadians2(a float64, axis Axis) *QTransform { - return newQTransform_U(unsafe.Pointer(C.QTransform_RotateRadians2(this.h, (C.double)(a), (C.uintptr_t)(axis)))) + return newQTransform_U(unsafe.Pointer(C.QTransform_RotateRadians2(this.h, (C.double)(a), (C.int)(axis)))) } // Delete this object from C++ memory. diff --git a/qt/gen_qtransform.h b/qt/gen_qtransform.h index d9424bf..d736a88 100644 --- a/qt/gen_qtransform.h +++ b/qt/gen_qtransform.h @@ -37,7 +37,7 @@ typedef struct QRegion QRegion; typedef struct QTransform QTransform; #endif -QTransform* QTransform_new(uintptr_t param1); +QTransform* QTransform_new(int param1); QTransform* QTransform_new2(); QTransform* QTransform_new3(double h11, double h12, double h13, double h21, double h22, double h23, double h31, double h32); QTransform* QTransform_new4(double h11, double h12, double h21, double h22, double dx, double dy); @@ -51,7 +51,7 @@ bool QTransform_IsInvertible(const QTransform* self); bool QTransform_IsScaling(const QTransform* self); bool QTransform_IsRotating(const QTransform* self); bool QTransform_IsTranslating(const QTransform* self); -uintptr_t QTransform_Type(const QTransform* self); +int QTransform_Type(const QTransform* self); double QTransform_Determinant(const QTransform* self); double QTransform_Det(const QTransform* self); double QTransform_M11(const QTransform* self); @@ -97,8 +97,8 @@ QTransform* QTransform_OperatorMinusAssign(QTransform* self, double div); QTransform* QTransform_FromTranslate(double dx, double dy); QTransform* QTransform_FromScale(double dx, double dy); QTransform* QTransform_Inverted1(const QTransform* self, bool* invertible); -QTransform* QTransform_Rotate2(QTransform* self, double a, uintptr_t axis); -QTransform* QTransform_RotateRadians2(QTransform* self, double a, uintptr_t axis); +QTransform* QTransform_Rotate2(QTransform* self, double a, int axis); +QTransform* QTransform_RotateRadians2(QTransform* self, double a, int axis); void QTransform_Delete(QTransform* self); #ifdef __cplusplus diff --git a/qt/gen_qtransposeproxymodel.cpp b/qt/gen_qtransposeproxymodel.cpp index 3a4efc4..e33092b 100644 --- a/qt/gen_qtransposeproxymodel.cpp +++ b/qt/gen_qtransposeproxymodel.cpp @@ -50,11 +50,11 @@ int QTransposeProxyModel_ColumnCount(const QTransposeProxyModel* self) { return self->columnCount(); } -QVariant* QTransposeProxyModel_HeaderData(const QTransposeProxyModel* self, int section, uintptr_t orientation) { +QVariant* QTransposeProxyModel_HeaderData(const QTransposeProxyModel* self, int section, int orientation) { return new QVariant(self->headerData(static_cast(section), static_cast(orientation))); } -bool QTransposeProxyModel_SetHeaderData(QTransposeProxyModel* self, int section, uintptr_t orientation, QVariant* value) { +bool QTransposeProxyModel_SetHeaderData(QTransposeProxyModel* self, int section, int orientation, QVariant* value) { return self->setHeaderData(static_cast(section), static_cast(orientation), *value); } @@ -142,11 +142,11 @@ int QTransposeProxyModel_ColumnCount1(const QTransposeProxyModel* self, QModelIn return self->columnCount(*parent); } -QVariant* QTransposeProxyModel_HeaderData3(const QTransposeProxyModel* self, int section, uintptr_t orientation, int role) { +QVariant* QTransposeProxyModel_HeaderData3(const QTransposeProxyModel* self, int section, int orientation, int role) { return new QVariant(self->headerData(static_cast(section), static_cast(orientation), static_cast(role))); } -bool QTransposeProxyModel_SetHeaderData4(QTransposeProxyModel* self, int section, uintptr_t orientation, QVariant* value, int role) { +bool QTransposeProxyModel_SetHeaderData4(QTransposeProxyModel* self, int section, int orientation, QVariant* value, int role) { return self->setHeaderData(static_cast(section), static_cast(orientation), *value, static_cast(role)); } @@ -170,7 +170,7 @@ bool QTransposeProxyModel_RemoveColumns3(QTransposeProxyModel* self, int column, return self->removeColumns(static_cast(column), static_cast(count), *parent); } -void QTransposeProxyModel_Sort2(QTransposeProxyModel* self, int column, uintptr_t order) { +void QTransposeProxyModel_Sort2(QTransposeProxyModel* self, int column, int order) { self->sort(static_cast(column), static_cast(order)); } diff --git a/qt/gen_qtransposeproxymodel.go b/qt/gen_qtransposeproxymodel.go index 4f18bbc..54fe5b0 100644 --- a/qt/gen_qtransposeproxymodel.go +++ b/qt/gen_qtransposeproxymodel.go @@ -83,14 +83,14 @@ func (this *QTransposeProxyModel) ColumnCount() int { } func (this *QTransposeProxyModel) HeaderData(section int, orientation Orientation) *QVariant { - _ret := C.QTransposeProxyModel_HeaderData(this.h, (C.int)(section), (C.uintptr_t)(orientation)) + _ret := C.QTransposeProxyModel_HeaderData(this.h, (C.int)(section), (C.int)(orientation)) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QTransposeProxyModel) SetHeaderData(section int, orientation Orientation, value *QVariant) bool { - return (bool)(C.QTransposeProxyModel_SetHeaderData(this.h, (C.int)(section), (C.uintptr_t)(orientation), value.cPointer())) + return (bool)(C.QTransposeProxyModel_SetHeaderData(this.h, (C.int)(section), (C.int)(orientation), value.cPointer())) } func (this *QTransposeProxyModel) Span(index *QModelIndex) *QSize { @@ -209,14 +209,14 @@ func (this *QTransposeProxyModel) ColumnCount1(parent *QModelIndex) int { } func (this *QTransposeProxyModel) HeaderData3(section int, orientation Orientation, role int) *QVariant { - _ret := C.QTransposeProxyModel_HeaderData3(this.h, (C.int)(section), (C.uintptr_t)(orientation), (C.int)(role)) + _ret := C.QTransposeProxyModel_HeaderData3(this.h, (C.int)(section), (C.int)(orientation), (C.int)(role)) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func (this *QTransposeProxyModel) SetHeaderData4(section int, orientation Orientation, value *QVariant, role int) bool { - return (bool)(C.QTransposeProxyModel_SetHeaderData4(this.h, (C.int)(section), (C.uintptr_t)(orientation), value.cPointer(), (C.int)(role))) + return (bool)(C.QTransposeProxyModel_SetHeaderData4(this.h, (C.int)(section), (C.int)(orientation), value.cPointer(), (C.int)(role))) } func (this *QTransposeProxyModel) Index3(row int, column int, parent *QModelIndex) *QModelIndex { @@ -243,7 +243,7 @@ func (this *QTransposeProxyModel) RemoveColumns3(column int, count int, parent * } func (this *QTransposeProxyModel) Sort2(column int, order SortOrder) { - C.QTransposeProxyModel_Sort2(this.h, (C.int)(column), (C.uintptr_t)(order)) + C.QTransposeProxyModel_Sort2(this.h, (C.int)(column), (C.int)(order)) } // Delete this object from C++ memory. diff --git a/qt/gen_qtransposeproxymodel.h b/qt/gen_qtransposeproxymodel.h index 1029d1e..304a401 100644 --- a/qt/gen_qtransposeproxymodel.h +++ b/qt/gen_qtransposeproxymodel.h @@ -39,8 +39,8 @@ struct miqt_string* QTransposeProxyModel_TrUtf8(const char* s); void QTransposeProxyModel_SetSourceModel(QTransposeProxyModel* self, QAbstractItemModel* newSourceModel); int QTransposeProxyModel_RowCount(const QTransposeProxyModel* self); int QTransposeProxyModel_ColumnCount(const QTransposeProxyModel* self); -QVariant* QTransposeProxyModel_HeaderData(const QTransposeProxyModel* self, int section, uintptr_t orientation); -bool QTransposeProxyModel_SetHeaderData(QTransposeProxyModel* self, int section, uintptr_t orientation, QVariant* value); +QVariant* QTransposeProxyModel_HeaderData(const QTransposeProxyModel* self, int section, int orientation); +bool QTransposeProxyModel_SetHeaderData(QTransposeProxyModel* self, int section, int orientation, QVariant* value); QSize* QTransposeProxyModel_Span(const QTransposeProxyModel* self, QModelIndex* index); QModelIndex* QTransposeProxyModel_MapFromSource(const QTransposeProxyModel* self, QModelIndex* sourceIndex); QModelIndex* QTransposeProxyModel_MapToSource(const QTransposeProxyModel* self, QModelIndex* proxyIndex); @@ -59,14 +59,14 @@ struct miqt_string* QTransposeProxyModel_TrUtf82(const char* s, const char* c); struct miqt_string* QTransposeProxyModel_TrUtf83(const char* s, const char* c, int n); int QTransposeProxyModel_RowCount1(const QTransposeProxyModel* self, QModelIndex* parent); int QTransposeProxyModel_ColumnCount1(const QTransposeProxyModel* self, QModelIndex* parent); -QVariant* QTransposeProxyModel_HeaderData3(const QTransposeProxyModel* self, int section, uintptr_t orientation, int role); -bool QTransposeProxyModel_SetHeaderData4(QTransposeProxyModel* self, int section, uintptr_t orientation, QVariant* value, int role); +QVariant* QTransposeProxyModel_HeaderData3(const QTransposeProxyModel* self, int section, int orientation, int role); +bool QTransposeProxyModel_SetHeaderData4(QTransposeProxyModel* self, int section, int orientation, QVariant* value, int role); QModelIndex* QTransposeProxyModel_Index3(const QTransposeProxyModel* self, int row, int column, QModelIndex* parent); bool QTransposeProxyModel_InsertRows3(QTransposeProxyModel* self, int row, int count, QModelIndex* parent); bool QTransposeProxyModel_RemoveRows3(QTransposeProxyModel* self, int row, int count, QModelIndex* parent); bool QTransposeProxyModel_InsertColumns3(QTransposeProxyModel* self, int column, int count, QModelIndex* parent); bool QTransposeProxyModel_RemoveColumns3(QTransposeProxyModel* self, int column, int count, QModelIndex* parent); -void QTransposeProxyModel_Sort2(QTransposeProxyModel* self, int column, uintptr_t order); +void QTransposeProxyModel_Sort2(QTransposeProxyModel* self, int column, int order); void QTransposeProxyModel_Delete(QTransposeProxyModel* self); #ifdef __cplusplus diff --git a/qt/gen_qtreeview.cpp b/qt/gen_qtreeview.cpp index 09f6411..c90d1a9 100644 --- a/qt/gen_qtreeview.cpp +++ b/qt/gen_qtreeview.cpp @@ -300,7 +300,7 @@ void QTreeView_SortByColumn(QTreeView* self, int column) { self->sortByColumn(static_cast(column)); } -void QTreeView_SortByColumn2(QTreeView* self, int column, uintptr_t order) { +void QTreeView_SortByColumn2(QTreeView* self, int column, int order) { self->sortByColumn(static_cast(column), static_cast(order)); } @@ -348,7 +348,7 @@ struct miqt_string* QTreeView_TrUtf83(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -void QTreeView_ScrollTo2(QTreeView* self, QModelIndex* index, uintptr_t hint) { +void QTreeView_ScrollTo2(QTreeView* self, QModelIndex* index, int hint) { self->scrollTo(*index, static_cast(hint)); } diff --git a/qt/gen_qtreeview.go b/qt/gen_qtreeview.go index 2368080..b5f7f83 100644 --- a/qt/gen_qtreeview.go +++ b/qt/gen_qtreeview.go @@ -358,7 +358,7 @@ func (this *QTreeView) SortByColumn(column int) { } func (this *QTreeView) SortByColumn2(column int, order SortOrder) { - C.QTreeView_SortByColumn2(this.h, (C.int)(column), (C.uintptr_t)(order)) + C.QTreeView_SortByColumn2(this.h, (C.int)(column), (C.int)(order)) } func (this *QTreeView) ExpandAll() { @@ -422,7 +422,7 @@ func QTreeView_TrUtf83(s string, c string, n int) string { } func (this *QTreeView) ScrollTo2(index *QModelIndex, hint QAbstractItemView__ScrollHint) { - C.QTreeView_ScrollTo2(this.h, index.cPointer(), (C.uintptr_t)(hint)) + C.QTreeView_ScrollTo2(this.h, index.cPointer(), (C.int)(hint)) } func (this *QTreeView) DataChanged3(topLeft *QModelIndex, bottomRight *QModelIndex, roles []int) { diff --git a/qt/gen_qtreeview.h b/qt/gen_qtreeview.h index 863a502..e019c79 100644 --- a/qt/gen_qtreeview.h +++ b/qt/gen_qtreeview.h @@ -102,7 +102,7 @@ void QTreeView_Expand(QTreeView* self, QModelIndex* index); void QTreeView_Collapse(QTreeView* self, QModelIndex* index); void QTreeView_ResizeColumnToContents(QTreeView* self, int column); void QTreeView_SortByColumn(QTreeView* self, int column); -void QTreeView_SortByColumn2(QTreeView* self, int column, uintptr_t order); +void QTreeView_SortByColumn2(QTreeView* self, int column, int order); void QTreeView_ExpandAll(QTreeView* self); void QTreeView_ExpandRecursively(QTreeView* self, QModelIndex* index); void QTreeView_CollapseAll(QTreeView* self); @@ -111,7 +111,7 @@ struct miqt_string* QTreeView_Tr2(const char* s, const char* c); struct miqt_string* QTreeView_Tr3(const char* s, const char* c, int n); struct miqt_string* QTreeView_TrUtf82(const char* s, const char* c); struct miqt_string* QTreeView_TrUtf83(const char* s, const char* c, int n); -void QTreeView_ScrollTo2(QTreeView* self, QModelIndex* index, uintptr_t hint); +void QTreeView_ScrollTo2(QTreeView* self, QModelIndex* index, int hint); void QTreeView_DataChanged3(QTreeView* self, QModelIndex* topLeft, QModelIndex* bottomRight, struct miqt_array* /* of int */ roles); void QTreeView_ExpandRecursively2(QTreeView* self, QModelIndex* index, int depth); void QTreeView_Delete(QTreeView* self); diff --git a/qt/gen_qtreewidget.cpp b/qt/gen_qtreewidget.cpp index fe5d48d..d29f2e8 100644 --- a/qt/gen_qtreewidget.cpp +++ b/qt/gen_qtreewidget.cpp @@ -178,13 +178,13 @@ bool QTreeWidgetItem_IsDisabled(const QTreeWidgetItem* self) { return self->isDisabled(); } -void QTreeWidgetItem_SetChildIndicatorPolicy(QTreeWidgetItem* self, uintptr_t policy) { +void QTreeWidgetItem_SetChildIndicatorPolicy(QTreeWidgetItem* self, int policy) { self->setChildIndicatorPolicy(static_cast(policy)); } -uintptr_t QTreeWidgetItem_ChildIndicatorPolicy(const QTreeWidgetItem* self) { +int QTreeWidgetItem_ChildIndicatorPolicy(const QTreeWidgetItem* self) { QTreeWidgetItem::ChildIndicatorPolicy _ret = self->childIndicatorPolicy(); - return static_cast(_ret); + return static_cast(_ret); } int QTreeWidgetItem_Flags(const QTreeWidgetItem* self) { @@ -300,12 +300,12 @@ void QTreeWidgetItem_SetForeground(QTreeWidgetItem* self, int column, QBrush* br self->setForeground(static_cast(column), *brush); } -uintptr_t QTreeWidgetItem_CheckState(const QTreeWidgetItem* self, int column) { +int QTreeWidgetItem_CheckState(const QTreeWidgetItem* self, int column) { Qt::CheckState _ret = self->checkState(static_cast(column)); - return static_cast(_ret); + return static_cast(_ret); } -void QTreeWidgetItem_SetCheckState(QTreeWidgetItem* self, int column, uintptr_t state) { +void QTreeWidgetItem_SetCheckState(QTreeWidgetItem* self, int column, int state) { self->setCheckState(static_cast(column), static_cast(state)); } @@ -398,7 +398,7 @@ void QTreeWidgetItem_InsertChildren(QTreeWidgetItem* self, int index, struct miq } struct miqt_array* QTreeWidgetItem_TakeChildren(QTreeWidgetItem* self) { - QList _ret = self->takeChildren(); + QList _ret = self->takeChildren(); // Convert QList<> from C++ memory to manually-managed C memory QTreeWidgetItem** _arr = static_cast(malloc(sizeof(QTreeWidgetItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -414,7 +414,7 @@ int QTreeWidgetItem_Type(const QTreeWidgetItem* self) { return self->type(); } -void QTreeWidgetItem_SortChildren(QTreeWidgetItem* self, int column, uintptr_t order) { +void QTreeWidgetItem_SortChildren(QTreeWidgetItem* self, int column, int order) { self->sortChildren(static_cast(column), static_cast(order)); } @@ -564,7 +564,7 @@ int QTreeWidget_SortColumn(const QTreeWidget* self) { return self->sortColumn(); } -void QTreeWidget_SortItems(QTreeWidget* self, int column, uintptr_t order) { +void QTreeWidget_SortItems(QTreeWidget* self, int column, int order) { self->sortItems(static_cast(column), static_cast(order)); } @@ -605,7 +605,7 @@ void QTreeWidget_SetItemSelected(QTreeWidget* self, QTreeWidgetItem* item, bool } struct miqt_array* QTreeWidget_SelectedItems(const QTreeWidget* self) { - QList _ret = self->selectedItems(); + QList _ret = self->selectedItems(); // Convert QList<> from C++ memory to manually-managed C memory QTreeWidgetItem** _arr = static_cast(malloc(sizeof(QTreeWidgetItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -619,7 +619,7 @@ struct miqt_array* QTreeWidget_SelectedItems(const QTreeWidget* self) { struct miqt_array* QTreeWidget_FindItems(const QTreeWidget* self, struct miqt_string* text, int flags) { QString text_QString = QString::fromUtf8(&text->data, text->len); - QList _ret = self->findItems(text_QString, static_cast(flags)); + QList _ret = self->findItems(text_QString, static_cast(flags)); // Convert QList<> from C++ memory to manually-managed C memory QTreeWidgetItem** _arr = static_cast(malloc(sizeof(QTreeWidgetItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -845,7 +845,7 @@ bool QTreeWidget_IsPersistentEditorOpen2(const QTreeWidget* self, QTreeWidgetIte struct miqt_array* QTreeWidget_FindItems3(const QTreeWidget* self, struct miqt_string* text, int flags, int column) { QString text_QString = QString::fromUtf8(&text->data, text->len); - QList _ret = self->findItems(text_QString, static_cast(flags), static_cast(column)); + QList _ret = self->findItems(text_QString, static_cast(flags), static_cast(column)); // Convert QList<> from C++ memory to manually-managed C memory QTreeWidgetItem** _arr = static_cast(malloc(sizeof(QTreeWidgetItem*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -857,7 +857,7 @@ struct miqt_array* QTreeWidget_FindItems3(const QTreeWidget* self, struct miqt_s return _out; } -void QTreeWidget_ScrollToItem2(QTreeWidget* self, QTreeWidgetItem* item, uintptr_t hint) { +void QTreeWidget_ScrollToItem2(QTreeWidget* self, QTreeWidgetItem* item, int hint) { self->scrollToItem(item, static_cast(hint)); } diff --git a/qt/gen_qtreewidget.go b/qt/gen_qtreewidget.go index ae60a6d..72eeba7 100644 --- a/qt/gen_qtreewidget.go +++ b/qt/gen_qtreewidget.go @@ -262,7 +262,7 @@ func (this *QTreeWidgetItem) IsDisabled() bool { } func (this *QTreeWidgetItem) SetChildIndicatorPolicy(policy QTreeWidgetItem__ChildIndicatorPolicy) { - C.QTreeWidgetItem_SetChildIndicatorPolicy(this.h, (C.uintptr_t)(policy)) + C.QTreeWidgetItem_SetChildIndicatorPolicy(this.h, (C.int)(policy)) } func (this *QTreeWidgetItem) ChildIndicatorPolicy() QTreeWidgetItem__ChildIndicatorPolicy { @@ -274,7 +274,7 @@ func (this *QTreeWidgetItem) Flags() int { } func (this *QTreeWidgetItem) SetFlags(flags int) { - C.QTreeWidgetItem_SetFlags(this.h, (C.int)(flags)) + C.QTreeWidgetItem_SetFlags(this.h, flags) } func (this *QTreeWidgetItem) Text(column int) string { @@ -408,7 +408,7 @@ func (this *QTreeWidgetItem) CheckState(column int) CheckState { } func (this *QTreeWidgetItem) SetCheckState(column int, state CheckState) { - C.QTreeWidgetItem_SetCheckState(this.h, (C.int)(column), (C.uintptr_t)(state)) + C.QTreeWidgetItem_SetCheckState(this.h, (C.int)(column), (C.int)(state)) } func (this *QTreeWidgetItem) SizeHint(column int) *QSize { @@ -525,7 +525,7 @@ func (this *QTreeWidgetItem) Type() int { } func (this *QTreeWidgetItem) SortChildren(column int, order SortOrder) { - C.QTreeWidgetItem_SortChildren(this.h, (C.int)(column), (C.uintptr_t)(order)) + C.QTreeWidgetItem_SortChildren(this.h, (C.int)(column), (C.int)(order)) } // Delete this object from C++ memory. @@ -704,7 +704,7 @@ func (this *QTreeWidget) SetCurrentItem2(item *QTreeWidgetItem, column int) { } func (this *QTreeWidget) SetCurrentItem3(item *QTreeWidgetItem, column int, command int) { - C.QTreeWidget_SetCurrentItem3(this.h, item.cPointer(), (C.int)(column), (C.int)(command)) + C.QTreeWidget_SetCurrentItem3(this.h, item.cPointer(), (C.int)(column), command) } func (this *QTreeWidget) ItemAt(p *QPoint) *QTreeWidgetItem { @@ -727,7 +727,7 @@ func (this *QTreeWidget) SortColumn() int { } func (this *QTreeWidget) SortItems(column int, order SortOrder) { - C.QTreeWidget_SortItems(this.h, (C.int)(column), (C.uintptr_t)(order)) + C.QTreeWidget_SortItems(this.h, (C.int)(column), (C.int)(order)) } func (this *QTreeWidget) EditItem(item *QTreeWidgetItem) { @@ -780,7 +780,7 @@ func (this *QTreeWidget) SelectedItems() []*QTreeWidgetItem { func (this *QTreeWidget) FindItems(text string, flags int) []*QTreeWidgetItem { text_ms := miqt_strdupg(text) defer C.free(text_ms) - var _ma *C.struct_miqt_array = C.QTreeWidget_FindItems(this.h, (*C.struct_miqt_string)(text_ms), (C.int)(flags)) + var _ma *C.struct_miqt_array = C.QTreeWidget_FindItems(this.h, (*C.struct_miqt_string)(text_ms), flags) _ret := make([]*QTreeWidgetItem, int(_ma.len)) _outCast := (*[0xffff]*C.QTreeWidgetItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -1109,7 +1109,7 @@ func (this *QTreeWidget) IsPersistentEditorOpen2(item *QTreeWidgetItem, column i func (this *QTreeWidget) FindItems3(text string, flags int, column int) []*QTreeWidgetItem { text_ms := miqt_strdupg(text) defer C.free(text_ms) - var _ma *C.struct_miqt_array = C.QTreeWidget_FindItems3(this.h, (*C.struct_miqt_string)(text_ms), (C.int)(flags), (C.int)(column)) + var _ma *C.struct_miqt_array = C.QTreeWidget_FindItems3(this.h, (*C.struct_miqt_string)(text_ms), flags, (C.int)(column)) _ret := make([]*QTreeWidgetItem, int(_ma.len)) _outCast := (*[0xffff]*C.QTreeWidgetItem)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -1120,7 +1120,7 @@ func (this *QTreeWidget) FindItems3(text string, flags int, column int) []*QTree } func (this *QTreeWidget) ScrollToItem2(item *QTreeWidgetItem, hint QAbstractItemView__ScrollHint) { - C.QTreeWidget_ScrollToItem2(this.h, item.cPointer(), (C.uintptr_t)(hint)) + C.QTreeWidget_ScrollToItem2(this.h, item.cPointer(), (C.int)(hint)) } // Delete this object from C++ memory. diff --git a/qt/gen_qtreewidget.h b/qt/gen_qtreewidget.h index 3e34377..86b3412 100644 --- a/qt/gen_qtreewidget.h +++ b/qt/gen_qtreewidget.h @@ -74,8 +74,8 @@ void QTreeWidgetItem_SetFirstColumnSpanned(QTreeWidgetItem* self, bool span); bool QTreeWidgetItem_IsFirstColumnSpanned(const QTreeWidgetItem* self); void QTreeWidgetItem_SetDisabled(QTreeWidgetItem* self, bool disabled); bool QTreeWidgetItem_IsDisabled(const QTreeWidgetItem* self); -void QTreeWidgetItem_SetChildIndicatorPolicy(QTreeWidgetItem* self, uintptr_t policy); -uintptr_t QTreeWidgetItem_ChildIndicatorPolicy(const QTreeWidgetItem* self); +void QTreeWidgetItem_SetChildIndicatorPolicy(QTreeWidgetItem* self, int policy); +int QTreeWidgetItem_ChildIndicatorPolicy(const QTreeWidgetItem* self); int QTreeWidgetItem_Flags(const QTreeWidgetItem* self); void QTreeWidgetItem_SetFlags(QTreeWidgetItem* self, int flags); struct miqt_string* QTreeWidgetItem_Text(const QTreeWidgetItem* self, int column); @@ -100,8 +100,8 @@ QColor* QTreeWidgetItem_TextColor(const QTreeWidgetItem* self, int column); void QTreeWidgetItem_SetTextColor(QTreeWidgetItem* self, int column, QColor* color); QBrush* QTreeWidgetItem_Foreground(const QTreeWidgetItem* self, int column); void QTreeWidgetItem_SetForeground(QTreeWidgetItem* self, int column, QBrush* brush); -uintptr_t QTreeWidgetItem_CheckState(const QTreeWidgetItem* self, int column); -void QTreeWidgetItem_SetCheckState(QTreeWidgetItem* self, int column, uintptr_t state); +int QTreeWidgetItem_CheckState(const QTreeWidgetItem* self, int column); +void QTreeWidgetItem_SetCheckState(QTreeWidgetItem* self, int column, int state); QSize* QTreeWidgetItem_SizeHint(const QTreeWidgetItem* self, int column); void QTreeWidgetItem_SetSizeHint(QTreeWidgetItem* self, int column, QSize* size); QVariant* QTreeWidgetItem_Data(const QTreeWidgetItem* self, int column, int role); @@ -123,7 +123,7 @@ void QTreeWidgetItem_AddChildren(QTreeWidgetItem* self, struct miqt_array* /* of void QTreeWidgetItem_InsertChildren(QTreeWidgetItem* self, int index, struct miqt_array* /* of QTreeWidgetItem* */ children); struct miqt_array* QTreeWidgetItem_TakeChildren(QTreeWidgetItem* self); int QTreeWidgetItem_Type(const QTreeWidgetItem* self); -void QTreeWidgetItem_SortChildren(QTreeWidgetItem* self, int column, uintptr_t order); +void QTreeWidgetItem_SortChildren(QTreeWidgetItem* self, int column, int order); void QTreeWidgetItem_Delete(QTreeWidgetItem* self); QTreeWidget* QTreeWidget_new(); @@ -155,7 +155,7 @@ QTreeWidgetItem* QTreeWidget_ItemAt(const QTreeWidget* self, QPoint* p); QTreeWidgetItem* QTreeWidget_ItemAt2(const QTreeWidget* self, int x, int y); QRect* QTreeWidget_VisualItemRect(const QTreeWidget* self, QTreeWidgetItem* item); int QTreeWidget_SortColumn(const QTreeWidget* self); -void QTreeWidget_SortItems(QTreeWidget* self, int column, uintptr_t order); +void QTreeWidget_SortItems(QTreeWidget* self, int column, int order); void QTreeWidget_EditItem(QTreeWidget* self, QTreeWidgetItem* item); void QTreeWidget_OpenPersistentEditor(QTreeWidget* self, QTreeWidgetItem* item); void QTreeWidget_ClosePersistentEditor(QTreeWidget* self, QTreeWidgetItem* item); @@ -209,7 +209,7 @@ void QTreeWidget_OpenPersistentEditor2(QTreeWidget* self, QTreeWidgetItem* item, void QTreeWidget_ClosePersistentEditor2(QTreeWidget* self, QTreeWidgetItem* item, int column); bool QTreeWidget_IsPersistentEditorOpen2(const QTreeWidget* self, QTreeWidgetItem* item, int column); struct miqt_array* QTreeWidget_FindItems3(const QTreeWidget* self, struct miqt_string* text, int flags, int column); -void QTreeWidget_ScrollToItem2(QTreeWidget* self, QTreeWidgetItem* item, uintptr_t hint); +void QTreeWidget_ScrollToItem2(QTreeWidget* self, QTreeWidgetItem* item, int hint); void QTreeWidget_Delete(QTreeWidget* self); #ifdef __cplusplus diff --git a/qt/gen_qtreewidgetitemiterator.go b/qt/gen_qtreewidgetitemiterator.go index c2f8d66..c629322 100644 --- a/qt/gen_qtreewidgetitemiterator.go +++ b/qt/gen_qtreewidgetitemiterator.go @@ -80,13 +80,13 @@ func NewQTreeWidgetItemIterator3(item *QTreeWidgetItem) *QTreeWidgetItemIterator // NewQTreeWidgetItemIterator4 constructs a new QTreeWidgetItemIterator object. func NewQTreeWidgetItemIterator4(widget *QTreeWidget, flags int) *QTreeWidgetItemIterator { - ret := C.QTreeWidgetItemIterator_new4(widget.cPointer(), (C.int)(flags)) + ret := C.QTreeWidgetItemIterator_new4(widget.cPointer(), flags) return newQTreeWidgetItemIterator(ret) } // NewQTreeWidgetItemIterator5 constructs a new QTreeWidgetItemIterator object. func NewQTreeWidgetItemIterator5(item *QTreeWidgetItem, flags int) *QTreeWidgetItemIterator { - ret := C.QTreeWidgetItemIterator_new5(item.cPointer(), (C.int)(flags)) + ret := C.QTreeWidgetItemIterator_new5(item.cPointer(), flags) return newQTreeWidgetItemIterator(ret) } diff --git a/qt/gen_qundogroup.cpp b/qt/gen_qundogroup.cpp index 76a60dd..8baf4cd 100644 --- a/qt/gen_qundogroup.cpp +++ b/qt/gen_qundogroup.cpp @@ -46,7 +46,7 @@ void QUndoGroup_RemoveStack(QUndoGroup* self, QUndoStack* stack) { } struct miqt_array* QUndoGroup_Stacks(const QUndoGroup* self) { - QList _ret = self->stacks(); + QList _ret = self->stacks(); // Convert QList<> from C++ memory to manually-managed C memory QUndoStack** _arr = static_cast(malloc(sizeof(QUndoStack*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { diff --git a/qt/gen_qurl.cpp b/qt/gen_qurl.cpp index 66b1ea6..92299b0 100644 --- a/qt/gen_qurl.cpp +++ b/qt/gen_qurl.cpp @@ -22,7 +22,7 @@ QUrl* QUrl_new3(struct miqt_string* url) { return new QUrl(url_QString); } -QUrl* QUrl_new4(struct miqt_string* url, uintptr_t mode) { +QUrl* QUrl_new4(struct miqt_string* url, int mode) { QString url_QString = QString::fromUtf8(&url->data, url->len); return new QUrl(url_QString, static_cast(mode)); } @@ -387,12 +387,12 @@ void QUrl_SetIdnWhitelist(struct miqt_array* /* of struct miqt_string* */ idnWhi QUrl::setIdnWhitelist(idnWhitelist_QList); } -void QUrl_SetUrl2(QUrl* self, struct miqt_string* url, uintptr_t mode) { +void QUrl_SetUrl2(QUrl* self, struct miqt_string* url, int mode) { QString url_QString = QString::fromUtf8(&url->data, url->len); self->setUrl(url_QString, static_cast(mode)); } -QUrl* QUrl_FromEncoded2(QByteArray* url, uintptr_t mode) { +QUrl* QUrl_FromEncoded2(QByteArray* url, int mode) { return new QUrl(QUrl::fromEncoded(*url, static_cast(mode))); } @@ -402,7 +402,7 @@ QUrl* QUrl_FromUserInput3(struct miqt_string* userInput, struct miqt_string* wor return new QUrl(QUrl::fromUserInput(userInput_QString, workingDirectory_QString, static_cast(options))); } -void QUrl_SetAuthority2(QUrl* self, struct miqt_string* authority, uintptr_t mode) { +void QUrl_SetAuthority2(QUrl* self, struct miqt_string* authority, int mode) { QString authority_QString = QString::fromUtf8(&authority->data, authority->len); self->setAuthority(authority_QString, static_cast(mode)); } @@ -414,7 +414,7 @@ struct miqt_string* QUrl_Authority1(const QUrl* self, int options) { return miqt_strdup(_b.data(), _b.length()); } -void QUrl_SetUserInfo2(QUrl* self, struct miqt_string* userInfo, uintptr_t mode) { +void QUrl_SetUserInfo2(QUrl* self, struct miqt_string* userInfo, int mode) { QString userInfo_QString = QString::fromUtf8(&userInfo->data, userInfo->len); self->setUserInfo(userInfo_QString, static_cast(mode)); } @@ -426,7 +426,7 @@ struct miqt_string* QUrl_UserInfo1(const QUrl* self, int options) { return miqt_strdup(_b.data(), _b.length()); } -void QUrl_SetUserName2(QUrl* self, struct miqt_string* userName, uintptr_t mode) { +void QUrl_SetUserName2(QUrl* self, struct miqt_string* userName, int mode) { QString userName_QString = QString::fromUtf8(&userName->data, userName->len); self->setUserName(userName_QString, static_cast(mode)); } @@ -438,7 +438,7 @@ struct miqt_string* QUrl_UserName1(const QUrl* self, int options) { return miqt_strdup(_b.data(), _b.length()); } -void QUrl_SetPassword2(QUrl* self, struct miqt_string* password, uintptr_t mode) { +void QUrl_SetPassword2(QUrl* self, struct miqt_string* password, int mode) { QString password_QString = QString::fromUtf8(&password->data, password->len); self->setPassword(password_QString, static_cast(mode)); } @@ -450,7 +450,7 @@ struct miqt_string* QUrl_Password1(const QUrl* self, int param1) { return miqt_strdup(_b.data(), _b.length()); } -void QUrl_SetHost2(QUrl* self, struct miqt_string* host, uintptr_t mode) { +void QUrl_SetHost2(QUrl* self, struct miqt_string* host, int mode) { QString host_QString = QString::fromUtf8(&host->data, host->len); self->setHost(host_QString, static_cast(mode)); } @@ -473,7 +473,7 @@ int QUrl_Port1(const QUrl* self, int defaultPort) { return self->port(static_cast(defaultPort)); } -void QUrl_SetPath2(QUrl* self, struct miqt_string* path, uintptr_t mode) { +void QUrl_SetPath2(QUrl* self, struct miqt_string* path, int mode) { QString path_QString = QString::fromUtf8(&path->data, path->len); self->setPath(path_QString, static_cast(mode)); } @@ -492,7 +492,7 @@ struct miqt_string* QUrl_FileName1(const QUrl* self, int options) { return miqt_strdup(_b.data(), _b.length()); } -void QUrl_SetQuery2(QUrl* self, struct miqt_string* query, uintptr_t mode) { +void QUrl_SetQuery2(QUrl* self, struct miqt_string* query, int mode) { QString query_QString = QString::fromUtf8(&query->data, query->len); self->setQuery(query_QString, static_cast(mode)); } @@ -511,7 +511,7 @@ struct miqt_string* QUrl_Fragment1(const QUrl* self, int options) { return miqt_strdup(_b.data(), _b.length()); } -void QUrl_SetFragment2(QUrl* self, struct miqt_string* fragment, uintptr_t mode) { +void QUrl_SetFragment2(QUrl* self, struct miqt_string* fragment, int mode) { QString fragment_QString = QString::fromUtf8(&fragment->data, fragment->len); self->setFragment(fragment_QString, static_cast(mode)); } @@ -526,7 +526,7 @@ QByteArray* QUrl_ToPercentEncoding3(struct miqt_string* param1, QByteArray* excl return new QByteArray(QUrl::toPercentEncoding(param1_QString, *exclude, *include)); } -struct miqt_array* QUrl_FromStringList2(struct miqt_array* /* of struct miqt_string* */ uris, uintptr_t mode) { +struct miqt_array* QUrl_FromStringList2(struct miqt_array* /* of struct miqt_string* */ uris, int mode) { QList uris_QList; uris_QList.reserve(uris->len); struct miqt_string** uris_arr = static_cast(uris->data); diff --git a/qt/gen_qurl.go b/qt/gen_qurl.go index 34329ab..db2c6f2 100644 --- a/qt/gen_qurl.go +++ b/qt/gen_qurl.go @@ -105,7 +105,7 @@ func NewQUrl3(url string) *QUrl { func NewQUrl4(url string, mode QUrl__ParsingMode) *QUrl { url_ms := miqt_strdupg(url) defer C.free(url_ms) - ret := C.QUrl_new4((*C.struct_miqt_string)(url_ms), (C.uintptr_t)(mode)) + ret := C.QUrl_new4((*C.struct_miqt_string)(url_ms), (C.int)(mode)) return newQUrl(ret) } @@ -518,11 +518,11 @@ func QUrl_SetIdnWhitelist(idnWhitelist []string) { func (this *QUrl) SetUrl2(url string, mode QUrl__ParsingMode) { url_ms := miqt_strdupg(url) defer C.free(url_ms) - C.QUrl_SetUrl2(this.h, (*C.struct_miqt_string)(url_ms), (C.uintptr_t)(mode)) + C.QUrl_SetUrl2(this.h, (*C.struct_miqt_string)(url_ms), (C.int)(mode)) } func QUrl_FromEncoded2(url *QByteArray, mode QUrl__ParsingMode) *QUrl { - _ret := C.QUrl_FromEncoded2(url.cPointer(), (C.uintptr_t)(mode)) + _ret := C.QUrl_FromEncoded2(url.cPointer(), (C.int)(mode)) _goptr := newQUrl(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -533,7 +533,7 @@ func QUrl_FromUserInput3(userInput string, workingDirectory string, options int) defer C.free(userInput_ms) workingDirectory_ms := miqt_strdupg(workingDirectory) defer C.free(workingDirectory_ms) - _ret := C.QUrl_FromUserInput3((*C.struct_miqt_string)(userInput_ms), (*C.struct_miqt_string)(workingDirectory_ms), (C.int)(options)) + _ret := C.QUrl_FromUserInput3((*C.struct_miqt_string)(userInput_ms), (*C.struct_miqt_string)(workingDirectory_ms), options) _goptr := newQUrl(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -542,11 +542,11 @@ func QUrl_FromUserInput3(userInput string, workingDirectory string, options int) func (this *QUrl) SetAuthority2(authority string, mode QUrl__ParsingMode) { authority_ms := miqt_strdupg(authority) defer C.free(authority_ms) - C.QUrl_SetAuthority2(this.h, (*C.struct_miqt_string)(authority_ms), (C.uintptr_t)(mode)) + C.QUrl_SetAuthority2(this.h, (*C.struct_miqt_string)(authority_ms), (C.int)(mode)) } func (this *QUrl) Authority1(options int) string { - var _ms *C.struct_miqt_string = C.QUrl_Authority1(this.h, (C.int)(options)) + var _ms *C.struct_miqt_string = C.QUrl_Authority1(this.h, options) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -555,11 +555,11 @@ func (this *QUrl) Authority1(options int) string { func (this *QUrl) SetUserInfo2(userInfo string, mode QUrl__ParsingMode) { userInfo_ms := miqt_strdupg(userInfo) defer C.free(userInfo_ms) - C.QUrl_SetUserInfo2(this.h, (*C.struct_miqt_string)(userInfo_ms), (C.uintptr_t)(mode)) + C.QUrl_SetUserInfo2(this.h, (*C.struct_miqt_string)(userInfo_ms), (C.int)(mode)) } func (this *QUrl) UserInfo1(options int) string { - var _ms *C.struct_miqt_string = C.QUrl_UserInfo1(this.h, (C.int)(options)) + var _ms *C.struct_miqt_string = C.QUrl_UserInfo1(this.h, options) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -568,11 +568,11 @@ func (this *QUrl) UserInfo1(options int) string { func (this *QUrl) SetUserName2(userName string, mode QUrl__ParsingMode) { userName_ms := miqt_strdupg(userName) defer C.free(userName_ms) - C.QUrl_SetUserName2(this.h, (*C.struct_miqt_string)(userName_ms), (C.uintptr_t)(mode)) + C.QUrl_SetUserName2(this.h, (*C.struct_miqt_string)(userName_ms), (C.int)(mode)) } func (this *QUrl) UserName1(options int) string { - var _ms *C.struct_miqt_string = C.QUrl_UserName1(this.h, (C.int)(options)) + var _ms *C.struct_miqt_string = C.QUrl_UserName1(this.h, options) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -581,11 +581,11 @@ func (this *QUrl) UserName1(options int) string { func (this *QUrl) SetPassword2(password string, mode QUrl__ParsingMode) { password_ms := miqt_strdupg(password) defer C.free(password_ms) - C.QUrl_SetPassword2(this.h, (*C.struct_miqt_string)(password_ms), (C.uintptr_t)(mode)) + C.QUrl_SetPassword2(this.h, (*C.struct_miqt_string)(password_ms), (C.int)(mode)) } func (this *QUrl) Password1(param1 int) string { - var _ms *C.struct_miqt_string = C.QUrl_Password1(this.h, (C.int)(param1)) + var _ms *C.struct_miqt_string = C.QUrl_Password1(this.h, param1) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -594,18 +594,18 @@ func (this *QUrl) Password1(param1 int) string { func (this *QUrl) SetHost2(host string, mode QUrl__ParsingMode) { host_ms := miqt_strdupg(host) defer C.free(host_ms) - C.QUrl_SetHost2(this.h, (*C.struct_miqt_string)(host_ms), (C.uintptr_t)(mode)) + C.QUrl_SetHost2(this.h, (*C.struct_miqt_string)(host_ms), (C.int)(mode)) } func (this *QUrl) Host1(param1 int) string { - var _ms *C.struct_miqt_string = C.QUrl_Host1(this.h, (C.int)(param1)) + var _ms *C.struct_miqt_string = C.QUrl_Host1(this.h, param1) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } func (this *QUrl) TopLevelDomain1(options int) string { - var _ms *C.struct_miqt_string = C.QUrl_TopLevelDomain1(this.h, (C.int)(options)) + var _ms *C.struct_miqt_string = C.QUrl_TopLevelDomain1(this.h, options) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -618,18 +618,18 @@ func (this *QUrl) Port1(defaultPort int) int { func (this *QUrl) SetPath2(path string, mode QUrl__ParsingMode) { path_ms := miqt_strdupg(path) defer C.free(path_ms) - C.QUrl_SetPath2(this.h, (*C.struct_miqt_string)(path_ms), (C.uintptr_t)(mode)) + C.QUrl_SetPath2(this.h, (*C.struct_miqt_string)(path_ms), (C.int)(mode)) } func (this *QUrl) Path1(options int) string { - var _ms *C.struct_miqt_string = C.QUrl_Path1(this.h, (C.int)(options)) + var _ms *C.struct_miqt_string = C.QUrl_Path1(this.h, options) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } func (this *QUrl) FileName1(options int) string { - var _ms *C.struct_miqt_string = C.QUrl_FileName1(this.h, (C.int)(options)) + var _ms *C.struct_miqt_string = C.QUrl_FileName1(this.h, options) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -638,18 +638,18 @@ func (this *QUrl) FileName1(options int) string { func (this *QUrl) SetQuery2(query string, mode QUrl__ParsingMode) { query_ms := miqt_strdupg(query) defer C.free(query_ms) - C.QUrl_SetQuery2(this.h, (*C.struct_miqt_string)(query_ms), (C.uintptr_t)(mode)) + C.QUrl_SetQuery2(this.h, (*C.struct_miqt_string)(query_ms), (C.int)(mode)) } func (this *QUrl) Query1(param1 int) string { - var _ms *C.struct_miqt_string = C.QUrl_Query1(this.h, (C.int)(param1)) + var _ms *C.struct_miqt_string = C.QUrl_Query1(this.h, param1) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } func (this *QUrl) Fragment1(options int) string { - var _ms *C.struct_miqt_string = C.QUrl_Fragment1(this.h, (C.int)(options)) + var _ms *C.struct_miqt_string = C.QUrl_Fragment1(this.h, options) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -658,7 +658,7 @@ func (this *QUrl) Fragment1(options int) string { func (this *QUrl) SetFragment2(fragment string, mode QUrl__ParsingMode) { fragment_ms := miqt_strdupg(fragment) defer C.free(fragment_ms) - C.QUrl_SetFragment2(this.h, (*C.struct_miqt_string)(fragment_ms), (C.uintptr_t)(mode)) + C.QUrl_SetFragment2(this.h, (*C.struct_miqt_string)(fragment_ms), (C.int)(mode)) } func QUrl_ToPercentEncoding2(param1 string, exclude *QByteArray) *QByteArray { @@ -690,7 +690,7 @@ func QUrl_FromStringList2(uris []string, mode QUrl__ParsingMode) []QUrl { } uris_ma := &C.struct_miqt_array{len: C.size_t(len(uris)), data: unsafe.Pointer(uris_CArray)} defer runtime.KeepAlive(unsafe.Pointer(uris_ma)) - var _ma *C.struct_miqt_array = C.QUrl_FromStringList2(uris_ma, (C.uintptr_t)(mode)) + var _ma *C.struct_miqt_array = C.QUrl_FromStringList2(uris_ma, (C.int)(mode)) _ret := make([]QUrl, int(_ma.len)) _outCast := (*[0xffff]*C.QUrl)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { diff --git a/qt/gen_qurl.h b/qt/gen_qurl.h index 4d40f71..d691e2b 100644 --- a/qt/gen_qurl.h +++ b/qt/gen_qurl.h @@ -26,7 +26,7 @@ typedef struct QUrlQuery QUrlQuery; QUrl* QUrl_new(); QUrl* QUrl_new2(QUrl* copyVal); QUrl* QUrl_new3(struct miqt_string* url); -QUrl* QUrl_new4(struct miqt_string* url, uintptr_t mode); +QUrl* QUrl_new4(struct miqt_string* url, int mode); void QUrl_OperatorAssign(QUrl* self, QUrl* copyVal); void QUrl_OperatorAssignWithUrl(QUrl* self, struct miqt_string* url); void QUrl_Swap(QUrl* self, QUrl* other); @@ -86,31 +86,31 @@ struct miqt_array* QUrl_IdnWhitelist(); struct miqt_array* QUrl_ToStringList(struct miqt_array* /* of QUrl* */ uris); struct miqt_array* QUrl_FromStringList(struct miqt_array* /* of struct miqt_string* */ uris); void QUrl_SetIdnWhitelist(struct miqt_array* /* of struct miqt_string* */ idnWhitelist); -void QUrl_SetUrl2(QUrl* self, struct miqt_string* url, uintptr_t mode); -QUrl* QUrl_FromEncoded2(QByteArray* url, uintptr_t mode); +void QUrl_SetUrl2(QUrl* self, struct miqt_string* url, int mode); +QUrl* QUrl_FromEncoded2(QByteArray* url, int mode); QUrl* QUrl_FromUserInput3(struct miqt_string* userInput, struct miqt_string* workingDirectory, int options); -void QUrl_SetAuthority2(QUrl* self, struct miqt_string* authority, uintptr_t mode); +void QUrl_SetAuthority2(QUrl* self, struct miqt_string* authority, int mode); struct miqt_string* QUrl_Authority1(const QUrl* self, int options); -void QUrl_SetUserInfo2(QUrl* self, struct miqt_string* userInfo, uintptr_t mode); +void QUrl_SetUserInfo2(QUrl* self, struct miqt_string* userInfo, int mode); struct miqt_string* QUrl_UserInfo1(const QUrl* self, int options); -void QUrl_SetUserName2(QUrl* self, struct miqt_string* userName, uintptr_t mode); +void QUrl_SetUserName2(QUrl* self, struct miqt_string* userName, int mode); struct miqt_string* QUrl_UserName1(const QUrl* self, int options); -void QUrl_SetPassword2(QUrl* self, struct miqt_string* password, uintptr_t mode); +void QUrl_SetPassword2(QUrl* self, struct miqt_string* password, int mode); struct miqt_string* QUrl_Password1(const QUrl* self, int param1); -void QUrl_SetHost2(QUrl* self, struct miqt_string* host, uintptr_t mode); +void QUrl_SetHost2(QUrl* self, struct miqt_string* host, int mode); struct miqt_string* QUrl_Host1(const QUrl* self, int param1); struct miqt_string* QUrl_TopLevelDomain1(const QUrl* self, int options); int QUrl_Port1(const QUrl* self, int defaultPort); -void QUrl_SetPath2(QUrl* self, struct miqt_string* path, uintptr_t mode); +void QUrl_SetPath2(QUrl* self, struct miqt_string* path, int mode); struct miqt_string* QUrl_Path1(const QUrl* self, int options); struct miqt_string* QUrl_FileName1(const QUrl* self, int options); -void QUrl_SetQuery2(QUrl* self, struct miqt_string* query, uintptr_t mode); +void QUrl_SetQuery2(QUrl* self, struct miqt_string* query, int mode); struct miqt_string* QUrl_Query1(const QUrl* self, int param1); struct miqt_string* QUrl_Fragment1(const QUrl* self, int options); -void QUrl_SetFragment2(QUrl* self, struct miqt_string* fragment, uintptr_t mode); +void QUrl_SetFragment2(QUrl* self, struct miqt_string* fragment, int mode); QByteArray* QUrl_ToPercentEncoding2(struct miqt_string* param1, QByteArray* exclude); QByteArray* QUrl_ToPercentEncoding3(struct miqt_string* param1, QByteArray* exclude, QByteArray* include); -struct miqt_array* QUrl_FromStringList2(struct miqt_array* /* of struct miqt_string* */ uris, uintptr_t mode); +struct miqt_array* QUrl_FromStringList2(struct miqt_array* /* of struct miqt_string* */ uris, int mode); void QUrl_Delete(QUrl* self); #ifdef __cplusplus diff --git a/qt/gen_qurlquery.go b/qt/gen_qurlquery.go index 7a4d422..ad7a86f 100644 --- a/qt/gen_qurlquery.go +++ b/qt/gen_qurlquery.go @@ -193,14 +193,14 @@ func QUrlQuery_DefaultQueryPairDelimiter() *QChar { } func (this *QUrlQuery) Query1(encoding int) string { - var _ms *C.struct_miqt_string = C.QUrlQuery_Query1(this.h, (C.int)(encoding)) + var _ms *C.struct_miqt_string = C.QUrlQuery_Query1(this.h, encoding) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } func (this *QUrlQuery) ToString1(encoding int) string { - var _ms *C.struct_miqt_string = C.QUrlQuery_ToString1(this.h, (C.int)(encoding)) + var _ms *C.struct_miqt_string = C.QUrlQuery_ToString1(this.h, encoding) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -209,7 +209,7 @@ func (this *QUrlQuery) ToString1(encoding int) string { func (this *QUrlQuery) QueryItemValue2(key string, encoding int) string { key_ms := miqt_strdupg(key) defer C.free(key_ms) - var _ms *C.struct_miqt_string = C.QUrlQuery_QueryItemValue2(this.h, (*C.struct_miqt_string)(key_ms), (C.int)(encoding)) + var _ms *C.struct_miqt_string = C.QUrlQuery_QueryItemValue2(this.h, (*C.struct_miqt_string)(key_ms), encoding) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -218,7 +218,7 @@ func (this *QUrlQuery) QueryItemValue2(key string, encoding int) string { func (this *QUrlQuery) AllQueryItemValues2(key string, encoding int) []string { key_ms := miqt_strdupg(key) defer C.free(key_ms) - var _ma *C.struct_miqt_array = C.QUrlQuery_AllQueryItemValues2(this.h, (*C.struct_miqt_string)(key_ms), (C.int)(encoding)) + var _ma *C.struct_miqt_array = C.QUrlQuery_AllQueryItemValues2(this.h, (*C.struct_miqt_string)(key_ms), encoding) _ret := make([]string, int(_ma.len)) _outCast := (*[0xffff]*C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { diff --git a/qt/gen_quuid.cpp b/qt/gen_quuid.cpp index 7452d03..dbd950d 100644 --- a/qt/gen_quuid.cpp +++ b/qt/gen_quuid.cpp @@ -39,7 +39,7 @@ struct miqt_string* QUuid_ToString(const QUuid* self) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QUuid_ToStringWithMode(const QUuid* self, uintptr_t mode) { +struct miqt_string* QUuid_ToStringWithMode(const QUuid* self, int mode) { QString _ret = self->toString(static_cast(mode)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -50,7 +50,7 @@ QByteArray* QUuid_ToByteArray(const QUuid* self) { return new QByteArray(self->toByteArray()); } -QByteArray* QUuid_ToByteArrayWithMode(const QUuid* self, uintptr_t mode) { +QByteArray* QUuid_ToByteArrayWithMode(const QUuid* self, int mode) { return new QByteArray(self->toByteArray(static_cast(mode))); } @@ -104,14 +104,14 @@ QUuid* QUuid_CreateUuidV52(QUuid* ns, struct miqt_string* baseData) { return new QUuid(QUuid::createUuidV5(*ns, baseData_QString)); } -uintptr_t QUuid_Variant(const QUuid* self) { +int QUuid_Variant(const QUuid* self) { QUuid::Variant _ret = self->variant(); - return static_cast(_ret); + return static_cast(_ret); } -uintptr_t QUuid_Version(const QUuid* self) { +int QUuid_Version(const QUuid* self) { QUuid::Version _ret = self->version(); - return static_cast(_ret); + return static_cast(_ret); } void QUuid_Delete(QUuid* self) { diff --git a/qt/gen_quuid.go b/qt/gen_quuid.go index deaf2df..e623d32 100644 --- a/qt/gen_quuid.go +++ b/qt/gen_quuid.go @@ -113,7 +113,7 @@ func (this *QUuid) ToString() string { } func (this *QUuid) ToStringWithMode(mode QUuid__StringFormat) string { - var _ms *C.struct_miqt_string = C.QUuid_ToStringWithMode(this.h, (C.uintptr_t)(mode)) + var _ms *C.struct_miqt_string = C.QUuid_ToStringWithMode(this.h, (C.int)(mode)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -127,7 +127,7 @@ func (this *QUuid) ToByteArray() *QByteArray { } func (this *QUuid) ToByteArrayWithMode(mode QUuid__StringFormat) *QByteArray { - _ret := C.QUuid_ToByteArrayWithMode(this.h, (C.uintptr_t)(mode)) + _ret := C.QUuid_ToByteArrayWithMode(this.h, (C.int)(mode)) _goptr := newQByteArray(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_quuid.h b/qt/gen_quuid.h index e8aa9ca..9a4fac6 100644 --- a/qt/gen_quuid.h +++ b/qt/gen_quuid.h @@ -28,9 +28,9 @@ QUuid* QUuid_new4(const char* param1); QUuid* QUuid_new5(QByteArray* param1); QUuid* QUuid_new6(QUuid* param1); struct miqt_string* QUuid_ToString(const QUuid* self); -struct miqt_string* QUuid_ToStringWithMode(const QUuid* self, uintptr_t mode); +struct miqt_string* QUuid_ToStringWithMode(const QUuid* self, int mode); QByteArray* QUuid_ToByteArray(const QUuid* self); -QByteArray* QUuid_ToByteArrayWithMode(const QUuid* self, uintptr_t mode); +QByteArray* QUuid_ToByteArrayWithMode(const QUuid* self, int mode); QByteArray* QUuid_ToRfc4122(const QUuid* self); QUuid* QUuid_FromRfc4122(QByteArray* param1); bool QUuid_IsNull(const QUuid* self); @@ -43,8 +43,8 @@ QUuid* QUuid_CreateUuidV3(QUuid* ns, QByteArray* baseData); QUuid* QUuid_CreateUuidV5(QUuid* ns, QByteArray* baseData); QUuid* QUuid_CreateUuidV32(QUuid* ns, struct miqt_string* baseData); QUuid* QUuid_CreateUuidV52(QUuid* ns, struct miqt_string* baseData); -uintptr_t QUuid_Variant(const QUuid* self); -uintptr_t QUuid_Version(const QUuid* self); +int QUuid_Variant(const QUuid* self); +int QUuid_Version(const QUuid* self); void QUuid_Delete(QUuid* self); #ifdef __cplusplus diff --git a/qt/gen_qvalidator.cpp b/qt/gen_qvalidator.cpp index c9f0e24..5f179d4 100644 --- a/qt/gen_qvalidator.cpp +++ b/qt/gen_qvalidator.cpp @@ -41,10 +41,10 @@ QLocale* QValidator_Locale(const QValidator* self) { return new QLocale(self->locale()); } -uintptr_t QValidator_Validate(const QValidator* self, struct miqt_string* param1, int* param2) { +int QValidator_Validate(const QValidator* self, struct miqt_string* param1, int* param2) { QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); QValidator::State _ret = self->validate(param1_QString, static_cast(*param2)); - return static_cast(_ret); + return static_cast(_ret); } void QValidator_Fixup(const QValidator* self, struct miqt_string* param1) { @@ -128,10 +128,10 @@ struct miqt_string* QIntValidator_TrUtf8(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -uintptr_t QIntValidator_Validate(const QIntValidator* self, struct miqt_string* param1, int* param2) { +int QIntValidator_Validate(const QIntValidator* self, struct miqt_string* param1, int* param2) { QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); QValidator::State _ret = self->validate(param1_QString, static_cast(*param2)); - return static_cast(_ret); + return static_cast(_ret); } void QIntValidator_Fixup(const QIntValidator* self, struct miqt_string* input) { @@ -247,10 +247,10 @@ struct miqt_string* QDoubleValidator_TrUtf8(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -uintptr_t QDoubleValidator_Validate(const QDoubleValidator* self, struct miqt_string* param1, int* param2) { +int QDoubleValidator_Validate(const QDoubleValidator* self, struct miqt_string* param1, int* param2) { QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); QValidator::State _ret = self->validate(param1_QString, static_cast(*param2)); - return static_cast(_ret); + return static_cast(_ret); } void QDoubleValidator_SetRange(QDoubleValidator* self, double bottom, double top) { @@ -269,7 +269,7 @@ void QDoubleValidator_SetDecimals(QDoubleValidator* self, int decimals) { self->setDecimals(static_cast(decimals)); } -void QDoubleValidator_SetNotation(QDoubleValidator* self, uintptr_t notation) { +void QDoubleValidator_SetNotation(QDoubleValidator* self, int notation) { self->setNotation(static_cast(notation)); } @@ -285,9 +285,9 @@ int QDoubleValidator_Decimals(const QDoubleValidator* self) { return self->decimals(); } -uintptr_t QDoubleValidator_Notation(const QDoubleValidator* self) { +int QDoubleValidator_Notation(const QDoubleValidator* self) { QDoubleValidator::Notation _ret = self->notation(); - return static_cast(_ret); + return static_cast(_ret); } void QDoubleValidator_BottomChanged(QDoubleValidator* self, double bottom) { @@ -323,14 +323,14 @@ void QDoubleValidator_connect_DecimalsChanged(QDoubleValidator* self, void* slot }); } -void QDoubleValidator_NotationChanged(QDoubleValidator* self, uintptr_t notation) { +void QDoubleValidator_NotationChanged(QDoubleValidator* self, int notation) { self->notationChanged(static_cast(notation)); } void QDoubleValidator_connect_NotationChanged(QDoubleValidator* self, void* slot) { QDoubleValidator::connect(self, static_cast(&QDoubleValidator::notationChanged), self, [=](QDoubleValidator::Notation notation) { QDoubleValidator::Notation notation_ret = notation; - uintptr_t sigval1 = static_cast(notation_ret); + int sigval1 = static_cast(notation_ret); miqt_exec_callback_QDoubleValidator_NotationChanged(slot, sigval1); }); } @@ -405,10 +405,10 @@ struct miqt_string* QRegExpValidator_TrUtf8(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -uintptr_t QRegExpValidator_Validate(const QRegExpValidator* self, struct miqt_string* input, int* pos) { +int QRegExpValidator_Validate(const QRegExpValidator* self, struct miqt_string* input, int* pos) { QString input_QString = QString::fromUtf8(&input->data, input->len); QValidator::State _ret = self->validate(input_QString, static_cast(*pos)); - return static_cast(_ret); + return static_cast(_ret); } void QRegExpValidator_SetRegExp(QRegExpValidator* self, QRegExp* rx) { @@ -500,10 +500,10 @@ struct miqt_string* QRegularExpressionValidator_TrUtf8(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -uintptr_t QRegularExpressionValidator_Validate(const QRegularExpressionValidator* self, struct miqt_string* input, int* pos) { +int QRegularExpressionValidator_Validate(const QRegularExpressionValidator* self, struct miqt_string* input, int* pos) { QString input_QString = QString::fromUtf8(&input->data, input->len); QValidator::State _ret = self->validate(input_QString, static_cast(*pos)); - return static_cast(_ret); + return static_cast(_ret); } QRegularExpression* QRegularExpressionValidator_RegularExpression(const QRegularExpressionValidator* self) { diff --git a/qt/gen_qvalidator.go b/qt/gen_qvalidator.go index 1092241..b14f6f2 100644 --- a/qt/gen_qvalidator.go +++ b/qt/gen_qvalidator.go @@ -463,7 +463,7 @@ func (this *QDoubleValidator) SetDecimals(decimals int) { } func (this *QDoubleValidator) SetNotation(notation QDoubleValidator__Notation) { - C.QDoubleValidator_SetNotation(this.h, (C.uintptr_t)(notation)) + C.QDoubleValidator_SetNotation(this.h, (C.int)(notation)) } func (this *QDoubleValidator) Bottom() float64 { @@ -543,14 +543,14 @@ func miqt_exec_callback_QDoubleValidator_DecimalsChanged(cb *C.void, decimals C. } func (this *QDoubleValidator) NotationChanged(notation QDoubleValidator__Notation) { - C.QDoubleValidator_NotationChanged(this.h, (C.uintptr_t)(notation)) + C.QDoubleValidator_NotationChanged(this.h, (C.int)(notation)) } func (this *QDoubleValidator) OnNotationChanged(slot func(notation QDoubleValidator__Notation)) { C.QDoubleValidator_connect_NotationChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QDoubleValidator_NotationChanged -func miqt_exec_callback_QDoubleValidator_NotationChanged(cb *C.void, notation C.uintptr_t) { +func miqt_exec_callback_QDoubleValidator_NotationChanged(cb *C.void, notation C.int) { gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(notation QDoubleValidator__Notation)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt/gen_qvalidator.h b/qt/gen_qvalidator.h index ee544bb..c582241 100644 --- a/qt/gen_qvalidator.h +++ b/qt/gen_qvalidator.h @@ -42,7 +42,7 @@ struct miqt_string* QValidator_Tr(const char* s); struct miqt_string* QValidator_TrUtf8(const char* s); void QValidator_SetLocale(QValidator* self, QLocale* locale); QLocale* QValidator_Locale(const QValidator* self); -uintptr_t QValidator_Validate(const QValidator* self, struct miqt_string* param1, int* param2); +int QValidator_Validate(const QValidator* self, struct miqt_string* param1, int* param2); void QValidator_Fixup(const QValidator* self, struct miqt_string* param1); void QValidator_Changed(QValidator* self); void QValidator_connect_Changed(QValidator* self, void* slot); @@ -59,7 +59,7 @@ QIntValidator* QIntValidator_new4(int bottom, int top, QObject* parent); QMetaObject* QIntValidator_MetaObject(const QIntValidator* self); struct miqt_string* QIntValidator_Tr(const char* s); struct miqt_string* QIntValidator_TrUtf8(const char* s); -uintptr_t QIntValidator_Validate(const QIntValidator* self, struct miqt_string* param1, int* param2); +int QIntValidator_Validate(const QIntValidator* self, struct miqt_string* param1, int* param2); void QIntValidator_Fixup(const QIntValidator* self, struct miqt_string* input); void QIntValidator_SetBottom(QIntValidator* self, int bottom); void QIntValidator_SetTop(QIntValidator* self, int top); @@ -83,23 +83,23 @@ QDoubleValidator* QDoubleValidator_new4(double bottom, double top, int decimals, QMetaObject* QDoubleValidator_MetaObject(const QDoubleValidator* self); struct miqt_string* QDoubleValidator_Tr(const char* s); struct miqt_string* QDoubleValidator_TrUtf8(const char* s); -uintptr_t QDoubleValidator_Validate(const QDoubleValidator* self, struct miqt_string* param1, int* param2); +int QDoubleValidator_Validate(const QDoubleValidator* self, struct miqt_string* param1, int* param2); void QDoubleValidator_SetRange(QDoubleValidator* self, double bottom, double top); void QDoubleValidator_SetBottom(QDoubleValidator* self, double bottom); void QDoubleValidator_SetTop(QDoubleValidator* self, double top); void QDoubleValidator_SetDecimals(QDoubleValidator* self, int decimals); -void QDoubleValidator_SetNotation(QDoubleValidator* self, uintptr_t notation); +void QDoubleValidator_SetNotation(QDoubleValidator* self, int notation); double QDoubleValidator_Bottom(const QDoubleValidator* self); double QDoubleValidator_Top(const QDoubleValidator* self); int QDoubleValidator_Decimals(const QDoubleValidator* self); -uintptr_t QDoubleValidator_Notation(const QDoubleValidator* self); +int QDoubleValidator_Notation(const QDoubleValidator* self); void QDoubleValidator_BottomChanged(QDoubleValidator* self, double bottom); void QDoubleValidator_connect_BottomChanged(QDoubleValidator* self, void* slot); void QDoubleValidator_TopChanged(QDoubleValidator* self, double top); void QDoubleValidator_connect_TopChanged(QDoubleValidator* self, void* slot); void QDoubleValidator_DecimalsChanged(QDoubleValidator* self, int decimals); void QDoubleValidator_connect_DecimalsChanged(QDoubleValidator* self, void* slot); -void QDoubleValidator_NotationChanged(QDoubleValidator* self, uintptr_t notation); +void QDoubleValidator_NotationChanged(QDoubleValidator* self, int notation); void QDoubleValidator_connect_NotationChanged(QDoubleValidator* self, void* slot); struct miqt_string* QDoubleValidator_Tr2(const char* s, const char* c); struct miqt_string* QDoubleValidator_Tr3(const char* s, const char* c, int n); @@ -115,7 +115,7 @@ QRegExpValidator* QRegExpValidator_new4(QRegExp* rx, QObject* parent); QMetaObject* QRegExpValidator_MetaObject(const QRegExpValidator* self); struct miqt_string* QRegExpValidator_Tr(const char* s); struct miqt_string* QRegExpValidator_TrUtf8(const char* s); -uintptr_t QRegExpValidator_Validate(const QRegExpValidator* self, struct miqt_string* input, int* pos); +int QRegExpValidator_Validate(const QRegExpValidator* self, struct miqt_string* input, int* pos); void QRegExpValidator_SetRegExp(QRegExpValidator* self, QRegExp* rx); QRegExp* QRegExpValidator_RegExp(const QRegExpValidator* self); void QRegExpValidator_RegExpChanged(QRegExpValidator* self, QRegExp* regExp); @@ -133,7 +133,7 @@ QRegularExpressionValidator* QRegularExpressionValidator_new4(QRegularExpression QMetaObject* QRegularExpressionValidator_MetaObject(const QRegularExpressionValidator* self); struct miqt_string* QRegularExpressionValidator_Tr(const char* s); struct miqt_string* QRegularExpressionValidator_TrUtf8(const char* s); -uintptr_t QRegularExpressionValidator_Validate(const QRegularExpressionValidator* self, struct miqt_string* input, int* pos); +int QRegularExpressionValidator_Validate(const QRegularExpressionValidator* self, struct miqt_string* input, int* pos); QRegularExpression* QRegularExpressionValidator_RegularExpression(const QRegularExpressionValidator* self); void QRegularExpressionValidator_SetRegularExpression(QRegularExpressionValidator* self, QRegularExpression* re); void QRegularExpressionValidator_RegularExpressionChanged(QRegularExpressionValidator* self, QRegularExpression* re); diff --git a/qt/gen_qvariant.cpp b/qt/gen_qvariant.cpp index d0bfe29..bddda84 100644 --- a/qt/gen_qvariant.cpp +++ b/qt/gen_qvariant.cpp @@ -47,7 +47,7 @@ QVariant* QVariant_new() { return new QVariant(); } -QVariant* QVariant_new2(uintptr_t typeVal) { +QVariant* QVariant_new2(int typeVal) { return new QVariant(static_cast(typeVal)); } @@ -67,12 +67,12 @@ QVariant* QVariant_new6(unsigned int ui) { return new QVariant(static_cast(ui)); } -QVariant* QVariant_new7(int64_t ll) { - return new QVariant((qlonglong)(ll)); +QVariant* QVariant_new7(long long ll) { + return new QVariant(static_cast(ll)); } -QVariant* QVariant_new8(uint64_t ull) { - return new QVariant((qulonglong)(ull)); +QVariant* QVariant_new8(unsigned long long ull) { + return new QVariant(static_cast(ull)); } QVariant* QVariant_new9(bool b) { @@ -219,9 +219,9 @@ void QVariant_Swap(QVariant* self, QVariant* other) { self->swap(*other); } -uintptr_t QVariant_Type(const QVariant* self) { +int QVariant_Type(const QVariant* self) { QVariant::Type _ret = self->type(); - return static_cast(_ret); + return static_cast(_ret); } int QVariant_UserType(const QVariant* self) { @@ -265,15 +265,18 @@ int QVariant_ToInt(const QVariant* self) { } unsigned int QVariant_ToUInt(const QVariant* self) { - return self->toUInt(); + uint _ret = self->toUInt(); + return static_cast(_ret); } -int64_t QVariant_ToLongLong(const QVariant* self) { - return self->toLongLong(); +long long QVariant_ToLongLong(const QVariant* self) { + qlonglong _ret = self->toLongLong(); + return static_cast(_ret); } -uint64_t QVariant_ToULongLong(const QVariant* self) { - return self->toULongLong(); +unsigned long long QVariant_ToULongLong(const QVariant* self) { + qulonglong _ret = self->toULongLong(); + return static_cast(_ret); } bool QVariant_ToBool(const QVariant* self) { @@ -289,7 +292,8 @@ float QVariant_ToFloat(const QVariant* self) { } double QVariant_ToReal(const QVariant* self) { - return self->toReal(); + qreal _ret = self->toReal(); + return static_cast(_ret); } QByteArray* QVariant_ToByteArray(const QVariant* self) { @@ -431,9 +435,9 @@ const char* QVariant_TypeToName(int typeId) { return (const char*) QVariant::typeToName(static_cast(typeId)); } -uintptr_t QVariant_NameToType(const char* name) { +int QVariant_NameToType(const char* name) { QVariant::Type _ret = QVariant::nameToType(name); - return static_cast(_ret); + return static_cast(_ret); } bool QVariant_OperatorEqual(const QVariant* self, QVariant* v) { @@ -465,15 +469,18 @@ int QVariant_ToInt1(const QVariant* self, bool* ok) { } unsigned int QVariant_ToUInt1(const QVariant* self, bool* ok) { - return self->toUInt(ok); + uint _ret = self->toUInt(ok); + return static_cast(_ret); } -int64_t QVariant_ToLongLong1(const QVariant* self, bool* ok) { - return self->toLongLong(ok); +long long QVariant_ToLongLong1(const QVariant* self, bool* ok) { + qlonglong _ret = self->toLongLong(ok); + return static_cast(_ret); } -uint64_t QVariant_ToULongLong1(const QVariant* self, bool* ok) { - return self->toULongLong(ok); +unsigned long long QVariant_ToULongLong1(const QVariant* self, bool* ok) { + qulonglong _ret = self->toULongLong(ok); + return static_cast(_ret); } double QVariant_ToDouble1(const QVariant* self, bool* ok) { @@ -485,7 +492,8 @@ float QVariant_ToFloat1(const QVariant* self, bool* ok) { } double QVariant_ToReal1(const QVariant* self, bool* ok) { - return self->toReal(ok); + qreal _ret = self->toReal(ok); + return static_cast(_ret); } void QVariant_Delete(QVariant* self) { @@ -580,6 +588,10 @@ QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_new(QSe return new QSequentialIterable::const_iterator(*other); } +void QSequentialIterable__const_iterator_OperatorAssign(QSequentialIterable__const_iterator* self, QSequentialIterable__const_iterator* other) { + self->operator=(*other); +} + QVariant* QSequentialIterable__const_iterator_OperatorMultiply(const QSequentialIterable__const_iterator* self) { return new QVariant(self->operator*()); } @@ -592,14 +604,38 @@ bool QSequentialIterable__const_iterator_OperatorNotEqual(const QSequentialItera return self->operator!=(*o); } -QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_OperatorPlusPlus(QSequentialIterable__const_iterator* self, int param1) { +QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_OperatorPlusPlus(QSequentialIterable__const_iterator* self) { + QSequentialIterable::const_iterator& _ret = self->operator++(); + // Cast returned reference into pointer + return &_ret; +} + +QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_OperatorPlusPlusWithInt(QSequentialIterable__const_iterator* self, int param1) { return new QSequentialIterable::const_iterator(self->operator++(static_cast(param1))); } -QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_OperatorMinusMinus(QSequentialIterable__const_iterator* self, int param1) { +QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_OperatorMinusMinus(QSequentialIterable__const_iterator* self) { + QSequentialIterable::const_iterator& _ret = self->operator--(); + // Cast returned reference into pointer + return &_ret; +} + +QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_OperatorMinusMinusWithInt(QSequentialIterable__const_iterator* self, int param1) { return new QSequentialIterable::const_iterator(self->operator--(static_cast(param1))); } +QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_OperatorPlusAssign(QSequentialIterable__const_iterator* self, int j) { + QSequentialIterable::const_iterator& _ret = self->operator+=(static_cast(j)); + // Cast returned reference into pointer + return &_ret; +} + +QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_OperatorMinusAssign(QSequentialIterable__const_iterator* self, int j) { + QSequentialIterable::const_iterator& _ret = self->operator-=(static_cast(j)); + // Cast returned reference into pointer + return &_ret; +} + QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_OperatorPlus(const QSequentialIterable__const_iterator* self, int j) { return new QSequentialIterable::const_iterator(self->operator+(static_cast(j))); } @@ -616,6 +652,10 @@ QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_new(Q return new QAssociativeIterable::const_iterator(*other); } +void QAssociativeIterable__const_iterator_OperatorAssign(QAssociativeIterable__const_iterator* self, QAssociativeIterable__const_iterator* other) { + self->operator=(*other); +} + QVariant* QAssociativeIterable__const_iterator_Key(const QAssociativeIterable__const_iterator* self) { return new QVariant(self->key()); } @@ -636,14 +676,38 @@ bool QAssociativeIterable__const_iterator_OperatorNotEqual(const QAssociativeIte return self->operator!=(*o); } -QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_OperatorPlusPlus(QAssociativeIterable__const_iterator* self, int param1) { +QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_OperatorPlusPlus(QAssociativeIterable__const_iterator* self) { + QAssociativeIterable::const_iterator& _ret = self->operator++(); + // Cast returned reference into pointer + return &_ret; +} + +QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_OperatorPlusPlusWithInt(QAssociativeIterable__const_iterator* self, int param1) { return new QAssociativeIterable::const_iterator(self->operator++(static_cast(param1))); } -QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_OperatorMinusMinus(QAssociativeIterable__const_iterator* self, int param1) { +QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_OperatorMinusMinus(QAssociativeIterable__const_iterator* self) { + QAssociativeIterable::const_iterator& _ret = self->operator--(); + // Cast returned reference into pointer + return &_ret; +} + +QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_OperatorMinusMinusWithInt(QAssociativeIterable__const_iterator* self, int param1) { return new QAssociativeIterable::const_iterator(self->operator--(static_cast(param1))); } +QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_OperatorPlusAssign(QAssociativeIterable__const_iterator* self, int j) { + QAssociativeIterable::const_iterator& _ret = self->operator+=(static_cast(j)); + // Cast returned reference into pointer + return &_ret; +} + +QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_OperatorMinusAssign(QAssociativeIterable__const_iterator* self, int j) { + QAssociativeIterable::const_iterator& _ret = self->operator-=(static_cast(j)); + // Cast returned reference into pointer + return &_ret; +} + QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_OperatorPlus(const QAssociativeIterable__const_iterator* self, int j) { return new QAssociativeIterable::const_iterator(self->operator+(static_cast(j))); } diff --git a/qt/gen_qvariant.go b/qt/gen_qvariant.go index 1f7ac3a..028d814 100644 --- a/qt/gen_qvariant.go +++ b/qt/gen_qvariant.go @@ -110,7 +110,7 @@ func NewQVariant() *QVariant { // NewQVariant2 constructs a new QVariant object. func NewQVariant2(typeVal QVariant__Type) *QVariant { - ret := C.QVariant_new2((C.uintptr_t)(typeVal)) + ret := C.QVariant_new2((C.int)(typeVal)) return newQVariant(ret) } @@ -140,13 +140,13 @@ func NewQVariant6(ui uint) *QVariant { // NewQVariant7 constructs a new QVariant object. func NewQVariant7(ll int64) *QVariant { - ret := C.QVariant_new7((C.int64_t)(ll)) + ret := C.QVariant_new7((C.longlong)(ll)) return newQVariant(ret) } // NewQVariant8 constructs a new QVariant object. func NewQVariant8(ull uint64) *QVariant { - ret := C.QVariant_new8((C.uint64_t)(ull)) + ret := C.QVariant_new8((C.ulonglong)(ull)) return newQVariant(ret) } @@ -1030,6 +1030,10 @@ func NewQSequentialIterable__const_iterator(other *QSequentialIterable__const_it return newQSequentialIterable__const_iterator(ret) } +func (this *QSequentialIterable__const_iterator) OperatorAssign(other *QSequentialIterable__const_iterator) { + C.QSequentialIterable__const_iterator_OperatorAssign(this.h, other.cPointer()) +} + func (this *QSequentialIterable__const_iterator) OperatorMultiply() *QVariant { _ret := C.QSequentialIterable__const_iterator_OperatorMultiply(this.h) _goptr := newQVariant(_ret) @@ -1045,20 +1049,36 @@ func (this *QSequentialIterable__const_iterator) OperatorNotEqual(o *QSequential return (bool)(C.QSequentialIterable__const_iterator_OperatorNotEqual(this.h, o.cPointer())) } -func (this *QSequentialIterable__const_iterator) OperatorPlusPlus(param1 int) *QSequentialIterable__const_iterator { - _ret := C.QSequentialIterable__const_iterator_OperatorPlusPlus(this.h, (C.int)(param1)) +func (this *QSequentialIterable__const_iterator) OperatorPlusPlus() *QSequentialIterable__const_iterator { + return newQSequentialIterable__const_iterator_U(unsafe.Pointer(C.QSequentialIterable__const_iterator_OperatorPlusPlus(this.h))) +} + +func (this *QSequentialIterable__const_iterator) OperatorPlusPlusWithInt(param1 int) *QSequentialIterable__const_iterator { + _ret := C.QSequentialIterable__const_iterator_OperatorPlusPlusWithInt(this.h, (C.int)(param1)) _goptr := newQSequentialIterable__const_iterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QSequentialIterable__const_iterator) OperatorMinusMinus(param1 int) *QSequentialIterable__const_iterator { - _ret := C.QSequentialIterable__const_iterator_OperatorMinusMinus(this.h, (C.int)(param1)) +func (this *QSequentialIterable__const_iterator) OperatorMinusMinus() *QSequentialIterable__const_iterator { + return newQSequentialIterable__const_iterator_U(unsafe.Pointer(C.QSequentialIterable__const_iterator_OperatorMinusMinus(this.h))) +} + +func (this *QSequentialIterable__const_iterator) OperatorMinusMinusWithInt(param1 int) *QSequentialIterable__const_iterator { + _ret := C.QSequentialIterable__const_iterator_OperatorMinusMinusWithInt(this.h, (C.int)(param1)) _goptr := newQSequentialIterable__const_iterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } +func (this *QSequentialIterable__const_iterator) OperatorPlusAssign(j int) *QSequentialIterable__const_iterator { + return newQSequentialIterable__const_iterator_U(unsafe.Pointer(C.QSequentialIterable__const_iterator_OperatorPlusAssign(this.h, (C.int)(j)))) +} + +func (this *QSequentialIterable__const_iterator) OperatorMinusAssign(j int) *QSequentialIterable__const_iterator { + return newQSequentialIterable__const_iterator_U(unsafe.Pointer(C.QSequentialIterable__const_iterator_OperatorMinusAssign(this.h, (C.int)(j)))) +} + func (this *QSequentialIterable__const_iterator) OperatorPlus(j int) *QSequentialIterable__const_iterator { _ret := C.QSequentialIterable__const_iterator_OperatorPlus(this.h, (C.int)(j)) _goptr := newQSequentialIterable__const_iterator(_ret) @@ -1115,6 +1135,10 @@ func NewQAssociativeIterable__const_iterator(other *QAssociativeIterable__const_ return newQAssociativeIterable__const_iterator(ret) } +func (this *QAssociativeIterable__const_iterator) OperatorAssign(other *QAssociativeIterable__const_iterator) { + C.QAssociativeIterable__const_iterator_OperatorAssign(this.h, other.cPointer()) +} + func (this *QAssociativeIterable__const_iterator) Key() *QVariant { _ret := C.QAssociativeIterable__const_iterator_Key(this.h) _goptr := newQVariant(_ret) @@ -1144,20 +1168,36 @@ func (this *QAssociativeIterable__const_iterator) OperatorNotEqual(o *QAssociati return (bool)(C.QAssociativeIterable__const_iterator_OperatorNotEqual(this.h, o.cPointer())) } -func (this *QAssociativeIterable__const_iterator) OperatorPlusPlus(param1 int) *QAssociativeIterable__const_iterator { - _ret := C.QAssociativeIterable__const_iterator_OperatorPlusPlus(this.h, (C.int)(param1)) +func (this *QAssociativeIterable__const_iterator) OperatorPlusPlus() *QAssociativeIterable__const_iterator { + return newQAssociativeIterable__const_iterator_U(unsafe.Pointer(C.QAssociativeIterable__const_iterator_OperatorPlusPlus(this.h))) +} + +func (this *QAssociativeIterable__const_iterator) OperatorPlusPlusWithInt(param1 int) *QAssociativeIterable__const_iterator { + _ret := C.QAssociativeIterable__const_iterator_OperatorPlusPlusWithInt(this.h, (C.int)(param1)) _goptr := newQAssociativeIterable__const_iterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QAssociativeIterable__const_iterator) OperatorMinusMinus(param1 int) *QAssociativeIterable__const_iterator { - _ret := C.QAssociativeIterable__const_iterator_OperatorMinusMinus(this.h, (C.int)(param1)) +func (this *QAssociativeIterable__const_iterator) OperatorMinusMinus() *QAssociativeIterable__const_iterator { + return newQAssociativeIterable__const_iterator_U(unsafe.Pointer(C.QAssociativeIterable__const_iterator_OperatorMinusMinus(this.h))) +} + +func (this *QAssociativeIterable__const_iterator) OperatorMinusMinusWithInt(param1 int) *QAssociativeIterable__const_iterator { + _ret := C.QAssociativeIterable__const_iterator_OperatorMinusMinusWithInt(this.h, (C.int)(param1)) _goptr := newQAssociativeIterable__const_iterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } +func (this *QAssociativeIterable__const_iterator) OperatorPlusAssign(j int) *QAssociativeIterable__const_iterator { + return newQAssociativeIterable__const_iterator_U(unsafe.Pointer(C.QAssociativeIterable__const_iterator_OperatorPlusAssign(this.h, (C.int)(j)))) +} + +func (this *QAssociativeIterable__const_iterator) OperatorMinusAssign(j int) *QAssociativeIterable__const_iterator { + return newQAssociativeIterable__const_iterator_U(unsafe.Pointer(C.QAssociativeIterable__const_iterator_OperatorMinusAssign(this.h, (C.int)(j)))) +} + func (this *QAssociativeIterable__const_iterator) OperatorPlus(j int) *QAssociativeIterable__const_iterator { _ret := C.QAssociativeIterable__const_iterator_OperatorPlus(this.h, (C.int)(j)) _goptr := newQAssociativeIterable__const_iterator(_ret) diff --git a/qt/gen_qvariant.h b/qt/gen_qvariant.h index c915a6a..00ee6e7 100644 --- a/qt/gen_qvariant.h +++ b/qt/gen_qvariant.h @@ -116,13 +116,13 @@ typedef struct QtMetaTypePrivate__QSequentialIterableImpl QtMetaTypePrivate__QSe #endif QVariant* QVariant_new(); -QVariant* QVariant_new2(uintptr_t typeVal); +QVariant* QVariant_new2(int typeVal); QVariant* QVariant_new3(QVariant* other); QVariant* QVariant_new4(QDataStream* s); QVariant* QVariant_new5(int i); QVariant* QVariant_new6(unsigned int ui); -QVariant* QVariant_new7(int64_t ll); -QVariant* QVariant_new8(uint64_t ull); +QVariant* QVariant_new7(long long ll); +QVariant* QVariant_new8(unsigned long long ull); QVariant* QVariant_new9(bool b); QVariant* QVariant_new10(double d); QVariant* QVariant_new11(float f); @@ -157,7 +157,7 @@ QVariant* QVariant_new39(QModelIndex* modelIndex); QVariant* QVariant_new40(QPersistentModelIndex* modelIndex); void QVariant_OperatorAssign(QVariant* self, QVariant* other); void QVariant_Swap(QVariant* self, QVariant* other); -uintptr_t QVariant_Type(const QVariant* self); +int QVariant_Type(const QVariant* self); int QVariant_UserType(const QVariant* self); const char* QVariant_TypeName(const QVariant* self); bool QVariant_CanConvert(const QVariant* self, int targetTypeId); @@ -169,8 +169,8 @@ void QVariant_Detach(QVariant* self); bool QVariant_IsDetached(const QVariant* self); int QVariant_ToInt(const QVariant* self); unsigned int QVariant_ToUInt(const QVariant* self); -int64_t QVariant_ToLongLong(const QVariant* self); -uint64_t QVariant_ToULongLong(const QVariant* self); +long long QVariant_ToLongLong(const QVariant* self); +unsigned long long QVariant_ToULongLong(const QVariant* self); bool QVariant_ToBool(const QVariant* self); double QVariant_ToDouble(const QVariant* self); float QVariant_ToFloat(const QVariant* self); @@ -206,7 +206,7 @@ QPersistentModelIndex* QVariant_ToPersistentModelIndex(const QVariant* self); void QVariant_Load(QVariant* self, QDataStream* ds); void QVariant_Save(const QVariant* self, QDataStream* ds); const char* QVariant_TypeToName(int typeId); -uintptr_t QVariant_NameToType(const char* name); +int QVariant_NameToType(const char* name); bool QVariant_OperatorEqual(const QVariant* self, QVariant* v); bool QVariant_OperatorNotEqual(const QVariant* self, QVariant* v); bool QVariant_OperatorLesser(const QVariant* self, QVariant* v); @@ -215,8 +215,8 @@ bool QVariant_OperatorGreater(const QVariant* self, QVariant* v); bool QVariant_OperatorGreaterOrEqual(const QVariant* self, QVariant* v); int QVariant_ToInt1(const QVariant* self, bool* ok); unsigned int QVariant_ToUInt1(const QVariant* self, bool* ok); -int64_t QVariant_ToLongLong1(const QVariant* self, bool* ok); -uint64_t QVariant_ToULongLong1(const QVariant* self, bool* ok); +long long QVariant_ToLongLong1(const QVariant* self, bool* ok); +unsigned long long QVariant_ToULongLong1(const QVariant* self, bool* ok); double QVariant_ToDouble1(const QVariant* self, bool* ok); float QVariant_ToFloat1(const QVariant* self, bool* ok); double QVariant_ToReal1(const QVariant* self, bool* ok); @@ -249,23 +249,33 @@ void QVariant__PrivateShared_Delete(QVariant__PrivateShared* self); void QVariant__Handler_Delete(QVariant__Handler* self); QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_new(QSequentialIterable__const_iterator* other); +void QSequentialIterable__const_iterator_OperatorAssign(QSequentialIterable__const_iterator* self, QSequentialIterable__const_iterator* other); QVariant* QSequentialIterable__const_iterator_OperatorMultiply(const QSequentialIterable__const_iterator* self); bool QSequentialIterable__const_iterator_OperatorEqual(const QSequentialIterable__const_iterator* self, QSequentialIterable__const_iterator* o); bool QSequentialIterable__const_iterator_OperatorNotEqual(const QSequentialIterable__const_iterator* self, QSequentialIterable__const_iterator* o); -QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_OperatorPlusPlus(QSequentialIterable__const_iterator* self, int param1); -QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_OperatorMinusMinus(QSequentialIterable__const_iterator* self, int param1); +QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_OperatorPlusPlus(QSequentialIterable__const_iterator* self); +QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_OperatorPlusPlusWithInt(QSequentialIterable__const_iterator* self, int param1); +QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_OperatorMinusMinus(QSequentialIterable__const_iterator* self); +QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_OperatorMinusMinusWithInt(QSequentialIterable__const_iterator* self, int param1); +QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_OperatorPlusAssign(QSequentialIterable__const_iterator* self, int j); +QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_OperatorMinusAssign(QSequentialIterable__const_iterator* self, int j); QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_OperatorPlus(const QSequentialIterable__const_iterator* self, int j); QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_OperatorMinus(const QSequentialIterable__const_iterator* self, int j); void QSequentialIterable__const_iterator_Delete(QSequentialIterable__const_iterator* self); QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_new(QAssociativeIterable__const_iterator* other); +void QAssociativeIterable__const_iterator_OperatorAssign(QAssociativeIterable__const_iterator* self, QAssociativeIterable__const_iterator* other); QVariant* QAssociativeIterable__const_iterator_Key(const QAssociativeIterable__const_iterator* self); QVariant* QAssociativeIterable__const_iterator_Value(const QAssociativeIterable__const_iterator* self); QVariant* QAssociativeIterable__const_iterator_OperatorMultiply(const QAssociativeIterable__const_iterator* self); bool QAssociativeIterable__const_iterator_OperatorEqual(const QAssociativeIterable__const_iterator* self, QAssociativeIterable__const_iterator* o); bool QAssociativeIterable__const_iterator_OperatorNotEqual(const QAssociativeIterable__const_iterator* self, QAssociativeIterable__const_iterator* o); -QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_OperatorPlusPlus(QAssociativeIterable__const_iterator* self, int param1); -QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_OperatorMinusMinus(QAssociativeIterable__const_iterator* self, int param1); +QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_OperatorPlusPlus(QAssociativeIterable__const_iterator* self); +QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_OperatorPlusPlusWithInt(QAssociativeIterable__const_iterator* self, int param1); +QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_OperatorMinusMinus(QAssociativeIterable__const_iterator* self); +QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_OperatorMinusMinusWithInt(QAssociativeIterable__const_iterator* self, int param1); +QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_OperatorPlusAssign(QAssociativeIterable__const_iterator* self, int j); +QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_OperatorMinusAssign(QAssociativeIterable__const_iterator* self, int j); QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_OperatorPlus(const QAssociativeIterable__const_iterator* self, int j); QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_OperatorMinus(const QAssociativeIterable__const_iterator* self, int j); void QAssociativeIterable__const_iterator_Delete(QAssociativeIterable__const_iterator* self); diff --git a/qt/gen_qvector2d.cpp b/qt/gen_qvector2d.cpp index 77ef258..4b77651 100644 --- a/qt/gen_qvector2d.cpp +++ b/qt/gen_qvector2d.cpp @@ -11,7 +11,7 @@ QVector2D* QVector2D_new() { return new QVector2D(); } -QVector2D* QVector2D_new2(uintptr_t param1) { +QVector2D* QVector2D_new2(int param1) { return new QVector2D(static_cast(param1)); } diff --git a/qt/gen_qvector2d.go b/qt/gen_qvector2d.go index 2c48b20..c1f7d7e 100644 --- a/qt/gen_qvector2d.go +++ b/qt/gen_qvector2d.go @@ -43,7 +43,7 @@ func NewQVector2D() *QVector2D { // NewQVector2D2 constructs a new QVector2D object. func NewQVector2D2(param1 Initialization) *QVector2D { - ret := C.QVector2D_new2((C.uintptr_t)(param1)) + ret := C.QVector2D_new2((C.int)(param1)) return newQVector2D(ret) } diff --git a/qt/gen_qvector2d.h b/qt/gen_qvector2d.h index a89679a..3824253 100644 --- a/qt/gen_qvector2d.h +++ b/qt/gen_qvector2d.h @@ -28,7 +28,7 @@ typedef struct QVector4D QVector4D; #endif QVector2D* QVector2D_new(); -QVector2D* QVector2D_new2(uintptr_t param1); +QVector2D* QVector2D_new2(int param1); QVector2D* QVector2D_new3(float xpos, float ypos); QVector2D* QVector2D_new4(QPoint* point); QVector2D* QVector2D_new5(QPointF* point); diff --git a/qt/gen_qvector3d.cpp b/qt/gen_qvector3d.cpp index e96090b..9081d6f 100644 --- a/qt/gen_qvector3d.cpp +++ b/qt/gen_qvector3d.cpp @@ -13,7 +13,7 @@ QVector3D* QVector3D_new() { return new QVector3D(); } -QVector3D* QVector3D_new2(uintptr_t param1) { +QVector3D* QVector3D_new2(int param1) { return new QVector3D(static_cast(param1)); } diff --git a/qt/gen_qvector3d.go b/qt/gen_qvector3d.go index 135f8d5..0e7c060 100644 --- a/qt/gen_qvector3d.go +++ b/qt/gen_qvector3d.go @@ -43,7 +43,7 @@ func NewQVector3D() *QVector3D { // NewQVector3D2 constructs a new QVector3D object. func NewQVector3D2(param1 Initialization) *QVector3D { - ret := C.QVector3D_new2((C.uintptr_t)(param1)) + ret := C.QVector3D_new2((C.int)(param1)) return newQVector3D(ret) } diff --git a/qt/gen_qvector3d.h b/qt/gen_qvector3d.h index 7db7733..0e0c70f 100644 --- a/qt/gen_qvector3d.h +++ b/qt/gen_qvector3d.h @@ -32,7 +32,7 @@ typedef struct QVector4D QVector4D; #endif QVector3D* QVector3D_new(); -QVector3D* QVector3D_new2(uintptr_t param1); +QVector3D* QVector3D_new2(int param1); QVector3D* QVector3D_new3(float xpos, float ypos, float zpos); QVector3D* QVector3D_new4(QPoint* point); QVector3D* QVector3D_new5(QPointF* point); diff --git a/qt/gen_qvector4d.cpp b/qt/gen_qvector4d.cpp index 44c026a..47e95a9 100644 --- a/qt/gen_qvector4d.cpp +++ b/qt/gen_qvector4d.cpp @@ -11,7 +11,7 @@ QVector4D* QVector4D_new() { return new QVector4D(); } -QVector4D* QVector4D_new2(uintptr_t param1) { +QVector4D* QVector4D_new2(int param1) { return new QVector4D(static_cast(param1)); } diff --git a/qt/gen_qvector4d.go b/qt/gen_qvector4d.go index b2bdf79..b503046 100644 --- a/qt/gen_qvector4d.go +++ b/qt/gen_qvector4d.go @@ -43,7 +43,7 @@ func NewQVector4D() *QVector4D { // NewQVector4D2 constructs a new QVector4D object. func NewQVector4D2(param1 Initialization) *QVector4D { - ret := C.QVector4D_new2((C.uintptr_t)(param1)) + ret := C.QVector4D_new2((C.int)(param1)) return newQVector4D(ret) } diff --git a/qt/gen_qvector4d.h b/qt/gen_qvector4d.h index 6af12ff..a0b862b 100644 --- a/qt/gen_qvector4d.h +++ b/qt/gen_qvector4d.h @@ -28,7 +28,7 @@ typedef struct QVector4D QVector4D; #endif QVector4D* QVector4D_new(); -QVector4D* QVector4D_new2(uintptr_t param1); +QVector4D* QVector4D_new2(int param1); QVector4D* QVector4D_new3(float xpos, float ypos, float zpos, float wpos); QVector4D* QVector4D_new4(QPoint* point); QVector4D* QVector4D_new5(QPointF* point); diff --git a/qt/gen_qwidget.cpp b/qt/gen_qwidget.cpp index 1585aa1..80330c8 100644 --- a/qt/gen_qwidget.cpp +++ b/qt/gen_qwidget.cpp @@ -85,7 +85,8 @@ int QWidget_DevType(const QWidget* self) { } uintptr_t QWidget_WinId(const QWidget* self) { - return self->winId(); + WId _ret = self->winId(); + return static_cast(_ret); } void QWidget_CreateWinId(QWidget* self) { @@ -93,11 +94,13 @@ void QWidget_CreateWinId(QWidget* self) { } uintptr_t QWidget_InternalWinId(const QWidget* self) { - return self->internalWinId(); + WId _ret = self->internalWinId(); + return static_cast(_ret); } uintptr_t QWidget_EffectiveWinId(const QWidget* self) { - return self->effectiveWinId(); + WId _ret = self->effectiveWinId(); + return static_cast(_ret); } QStyle* QWidget_Style(const QWidget* self) { @@ -120,12 +123,12 @@ bool QWidget_IsModal(const QWidget* self) { return self->isModal(); } -uintptr_t QWidget_WindowModality(const QWidget* self) { +int QWidget_WindowModality(const QWidget* self) { Qt::WindowModality _ret = self->windowModality(); - return static_cast(_ret); + return static_cast(_ret); } -void QWidget_SetWindowModality(QWidget* self, uintptr_t windowModality) { +void QWidget_SetWindowModality(QWidget* self, int windowModality) { self->setWindowModality(static_cast(windowModality)); } @@ -349,22 +352,22 @@ void QWidget_SetPalette(QWidget* self, QPalette* palette) { self->setPalette(*palette); } -void QWidget_SetBackgroundRole(QWidget* self, uintptr_t backgroundRole) { +void QWidget_SetBackgroundRole(QWidget* self, int backgroundRole) { self->setBackgroundRole(static_cast(backgroundRole)); } -uintptr_t QWidget_BackgroundRole(const QWidget* self) { +int QWidget_BackgroundRole(const QWidget* self) { QPalette::ColorRole _ret = self->backgroundRole(); - return static_cast(_ret); + return static_cast(_ret); } -void QWidget_SetForegroundRole(QWidget* self, uintptr_t foregroundRole) { +void QWidget_SetForegroundRole(QWidget* self, int foregroundRole) { self->setForegroundRole(static_cast(foregroundRole)); } -uintptr_t QWidget_ForegroundRole(const QWidget* self) { +int QWidget_ForegroundRole(const QWidget* self) { QPalette::ColorRole _ret = self->foregroundRole(); - return static_cast(_ret); + return static_cast(_ret); } QFont* QWidget_Font(const QWidget* self) { @@ -453,11 +456,11 @@ void QWidget_SetGraphicsEffect(QWidget* self, QGraphicsEffect* effect) { self->setGraphicsEffect(effect); } -void QWidget_GrabGesture(QWidget* self, uintptr_t typeVal) { +void QWidget_GrabGesture(QWidget* self, int typeVal) { self->grabGesture(static_cast(typeVal)); } -void QWidget_UngrabGesture(QWidget* self, uintptr_t typeVal) { +void QWidget_UngrabGesture(QWidget* self, int typeVal) { self->ungrabGesture(static_cast(typeVal)); } @@ -534,7 +537,8 @@ void QWidget_SetWindowOpacity(QWidget* self, double level) { } double QWidget_WindowOpacity(const QWidget* self) { - return self->windowOpacity(); + qreal _ret = self->windowOpacity(); + return static_cast(_ret); } bool QWidget_IsWindowModified(const QWidget* self) { @@ -609,13 +613,13 @@ void QWidget_SetAccessibleDescription(QWidget* self, struct miqt_string* descrip self->setAccessibleDescription(description_QString); } -void QWidget_SetLayoutDirection(QWidget* self, uintptr_t direction) { +void QWidget_SetLayoutDirection(QWidget* self, int direction) { self->setLayoutDirection(static_cast(direction)); } -uintptr_t QWidget_LayoutDirection(const QWidget* self) { +int QWidget_LayoutDirection(const QWidget* self) { Qt::LayoutDirection _ret = self->layoutDirection(); - return static_cast(_ret); + return static_cast(_ret); } void QWidget_UnsetLayoutDirection(QWidget* self) { @@ -658,16 +662,16 @@ void QWidget_ClearFocus(QWidget* self) { self->clearFocus(); } -void QWidget_SetFocusWithReason(QWidget* self, uintptr_t reason) { +void QWidget_SetFocusWithReason(QWidget* self, int reason) { self->setFocus(static_cast(reason)); } -uintptr_t QWidget_FocusPolicy(const QWidget* self) { +int QWidget_FocusPolicy(const QWidget* self) { Qt::FocusPolicy _ret = self->focusPolicy(); - return static_cast(_ret); + return static_cast(_ret); } -void QWidget_SetFocusPolicy(QWidget* self, uintptr_t policy) { +void QWidget_SetFocusPolicy(QWidget* self, int policy) { self->setFocusPolicy(static_cast(policy)); } @@ -687,12 +691,12 @@ QWidget* QWidget_FocusProxy(const QWidget* self) { return self->focusProxy(); } -uintptr_t QWidget_ContextMenuPolicy(const QWidget* self) { +int QWidget_ContextMenuPolicy(const QWidget* self) { Qt::ContextMenuPolicy _ret = self->contextMenuPolicy(); - return static_cast(_ret); + return static_cast(_ret); } -void QWidget_SetContextMenuPolicy(QWidget* self, uintptr_t policy) { +void QWidget_SetContextMenuPolicy(QWidget* self, int policy) { self->setContextMenuPolicy(static_cast(policy)); } @@ -921,7 +925,7 @@ void QWidget_SetSizePolicy(QWidget* self, QSizePolicy* sizePolicy) { self->setSizePolicy(*sizePolicy); } -void QWidget_SetSizePolicy2(QWidget* self, uintptr_t horizontal, uintptr_t vertical) { +void QWidget_SetSizePolicy2(QWidget* self, int horizontal, int vertical) { self->setSizePolicy(static_cast(horizontal), static_cast(vertical)); } @@ -1038,7 +1042,7 @@ void QWidget_RemoveAction(QWidget* self, QAction* action) { } struct miqt_array* QWidget_Actions(const QWidget* self) { - QList _ret = self->actions(); + QList _ret = self->actions(); // Convert QList<> from C++ memory to manually-managed C memory QAction** _arr = static_cast(malloc(sizeof(QAction*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -1063,7 +1067,7 @@ int QWidget_WindowFlags(const QWidget* self) { return static_cast(_ret); } -void QWidget_SetWindowFlag(QWidget* self, uintptr_t param1) { +void QWidget_SetWindowFlag(QWidget* self, int param1) { self->setWindowFlag(static_cast(param1)); } @@ -1071,9 +1075,9 @@ void QWidget_OverrideWindowFlags(QWidget* self, int typeVal) { self->overrideWindowFlags(static_cast(typeVal)); } -uintptr_t QWidget_WindowType(const QWidget* self) { +int QWidget_WindowType(const QWidget* self) { Qt::WindowType _ret = self->windowType(); - return static_cast(_ret); + return static_cast(_ret); } QWidget* QWidget_Find(uintptr_t param1) { @@ -1088,11 +1092,11 @@ QWidget* QWidget_ChildAtWithQPoint(const QWidget* self, QPoint* p) { return self->childAt(*p); } -void QWidget_SetAttribute(QWidget* self, uintptr_t param1) { +void QWidget_SetAttribute(QWidget* self, int param1) { self->setAttribute(static_cast(param1)); } -bool QWidget_TestAttribute(const QWidget* self, uintptr_t param1) { +bool QWidget_TestAttribute(const QWidget* self, int param1) { return self->testAttribute(static_cast(param1)); } @@ -1188,7 +1192,7 @@ void QWidget_connect_CustomContextMenuRequested(QWidget* self, void* slot) { }); } -QVariant* QWidget_InputMethodQuery(const QWidget* self, uintptr_t param1) { +QVariant* QWidget_InputMethodQuery(const QWidget* self, int param1) { return new QVariant(self->inputMethodQuery(static_cast(param1))); } @@ -1257,11 +1261,11 @@ QPixmap* QWidget_Grab1(QWidget* self, QRect* rectangle) { return new QPixmap(self->grab(*rectangle)); } -void QWidget_GrabGesture2(QWidget* self, uintptr_t typeVal, int flags) { +void QWidget_GrabGesture2(QWidget* self, int typeVal, int flags) { self->grabGesture(static_cast(typeVal), static_cast(flags)); } -int QWidget_GrabShortcut2(QWidget* self, QKeySequence* key, uintptr_t context) { +int QWidget_GrabShortcut2(QWidget* self, QKeySequence* key, int context) { return self->grabShortcut(*key, static_cast(context)); } @@ -1273,11 +1277,11 @@ void QWidget_SetShortcutAutoRepeat2(QWidget* self, int id, bool enable) { self->setShortcutAutoRepeat(static_cast(id), enable); } -void QWidget_SetWindowFlag2(QWidget* self, uintptr_t param1, bool on) { +void QWidget_SetWindowFlag2(QWidget* self, int param1, bool on) { self->setWindowFlag(static_cast(param1), on); } -void QWidget_SetAttribute2(QWidget* self, uintptr_t param1, bool on) { +void QWidget_SetAttribute2(QWidget* self, int param1, bool on) { self->setAttribute(static_cast(param1), on); } diff --git a/qt/gen_qwidget.go b/qt/gen_qwidget.go index c79e220..23f9271 100644 --- a/qt/gen_qwidget.go +++ b/qt/gen_qwidget.go @@ -106,7 +106,7 @@ func NewQWidget2(parent *QWidget) *QWidget { // NewQWidget3 constructs a new QWidget object. func NewQWidget3(parent *QWidget, f int) *QWidget { - ret := C.QWidget_new3(parent.cPointer(), (C.int)(f)) + ret := C.QWidget_new3(parent.cPointer(), f) return newQWidget(ret) } @@ -177,7 +177,7 @@ func (this *QWidget) WindowModality() WindowModality { } func (this *QWidget) SetWindowModality(windowModality WindowModality) { - C.QWidget_SetWindowModality(this.h, (C.uintptr_t)(windowModality)) + C.QWidget_SetWindowModality(this.h, (C.int)(windowModality)) } func (this *QWidget) IsEnabled() bool { @@ -451,7 +451,7 @@ func (this *QWidget) SetPalette(palette *QPalette) { } func (this *QWidget) SetBackgroundRole(backgroundRole QPalette__ColorRole) { - C.QWidget_SetBackgroundRole(this.h, (C.uintptr_t)(backgroundRole)) + C.QWidget_SetBackgroundRole(this.h, (C.int)(backgroundRole)) } func (this *QWidget) BackgroundRole() QPalette__ColorRole { @@ -459,7 +459,7 @@ func (this *QWidget) BackgroundRole() QPalette__ColorRole { } func (this *QWidget) SetForegroundRole(foregroundRole QPalette__ColorRole) { - C.QWidget_SetForegroundRole(this.h, (C.uintptr_t)(foregroundRole)) + C.QWidget_SetForegroundRole(this.h, (C.int)(foregroundRole)) } func (this *QWidget) ForegroundRole() QPalette__ColorRole { @@ -566,11 +566,11 @@ func (this *QWidget) SetGraphicsEffect(effect *QGraphicsEffect) { } func (this *QWidget) GrabGesture(typeVal GestureType) { - C.QWidget_GrabGesture(this.h, (C.uintptr_t)(typeVal)) + C.QWidget_GrabGesture(this.h, (C.int)(typeVal)) } func (this *QWidget) UngrabGesture(typeVal GestureType) { - C.QWidget_UngrabGesture(this.h, (C.uintptr_t)(typeVal)) + C.QWidget_UngrabGesture(this.h, (C.int)(typeVal)) } func (this *QWidget) SetWindowTitle(windowTitle string) { @@ -735,7 +735,7 @@ func (this *QWidget) SetAccessibleDescription(description string) { } func (this *QWidget) SetLayoutDirection(direction LayoutDirection) { - C.QWidget_SetLayoutDirection(this.h, (C.uintptr_t)(direction)) + C.QWidget_SetLayoutDirection(this.h, (C.int)(direction)) } func (this *QWidget) LayoutDirection() LayoutDirection { @@ -786,7 +786,7 @@ func (this *QWidget) ClearFocus() { } func (this *QWidget) SetFocusWithReason(reason FocusReason) { - C.QWidget_SetFocusWithReason(this.h, (C.uintptr_t)(reason)) + C.QWidget_SetFocusWithReason(this.h, (C.int)(reason)) } func (this *QWidget) FocusPolicy() FocusPolicy { @@ -794,7 +794,7 @@ func (this *QWidget) FocusPolicy() FocusPolicy { } func (this *QWidget) SetFocusPolicy(policy FocusPolicy) { - C.QWidget_SetFocusPolicy(this.h, (C.uintptr_t)(policy)) + C.QWidget_SetFocusPolicy(this.h, (C.int)(policy)) } func (this *QWidget) HasFocus() bool { @@ -818,7 +818,7 @@ func (this *QWidget) ContextMenuPolicy() ContextMenuPolicy { } func (this *QWidget) SetContextMenuPolicy(policy ContextMenuPolicy) { - C.QWidget_SetContextMenuPolicy(this.h, (C.uintptr_t)(policy)) + C.QWidget_SetContextMenuPolicy(this.h, (C.int)(policy)) } func (this *QWidget) GrabMouse() { @@ -1025,11 +1025,11 @@ func (this *QWidget) WindowState() int { } func (this *QWidget) SetWindowState(state int) { - C.QWidget_SetWindowState(this.h, (C.int)(state)) + C.QWidget_SetWindowState(this.h, state) } func (this *QWidget) OverrideWindowState(state int) { - C.QWidget_OverrideWindowState(this.h, (C.int)(state)) + C.QWidget_OverrideWindowState(this.h, state) } func (this *QWidget) SizeHint() *QSize { @@ -1058,7 +1058,7 @@ func (this *QWidget) SetSizePolicy(sizePolicy QSizePolicy) { } func (this *QWidget) SetSizePolicy2(horizontal QSizePolicy__Policy, vertical QSizePolicy__Policy) { - C.QWidget_SetSizePolicy2(this.h, (C.uintptr_t)(horizontal), (C.uintptr_t)(vertical)) + C.QWidget_SetSizePolicy2(this.h, (C.int)(horizontal), (C.int)(vertical)) } func (this *QWidget) HeightForWidth(param1 int) int { @@ -1119,7 +1119,7 @@ func (this *QWidget) SetParent(parent *QWidget) { } func (this *QWidget) SetParent2(parent *QWidget, f int) { - C.QWidget_SetParent2(this.h, parent.cPointer(), (C.int)(f)) + C.QWidget_SetParent2(this.h, parent.cPointer(), f) } func (this *QWidget) Scroll(dx int, dy int) { @@ -1202,7 +1202,7 @@ func (this *QWidget) ParentWidget() *QWidget { } func (this *QWidget) SetWindowFlags(typeVal int) { - C.QWidget_SetWindowFlags(this.h, (C.int)(typeVal)) + C.QWidget_SetWindowFlags(this.h, typeVal) } func (this *QWidget) WindowFlags() int { @@ -1210,11 +1210,11 @@ func (this *QWidget) WindowFlags() int { } func (this *QWidget) SetWindowFlag(param1 WindowType) { - C.QWidget_SetWindowFlag(this.h, (C.uintptr_t)(param1)) + C.QWidget_SetWindowFlag(this.h, (C.int)(param1)) } func (this *QWidget) OverrideWindowFlags(typeVal int) { - C.QWidget_OverrideWindowFlags(this.h, (C.int)(typeVal)) + C.QWidget_OverrideWindowFlags(this.h, typeVal) } func (this *QWidget) WindowType() WindowType { @@ -1234,11 +1234,11 @@ func (this *QWidget) ChildAtWithQPoint(p *QPoint) *QWidget { } func (this *QWidget) SetAttribute(param1 WidgetAttribute) { - C.QWidget_SetAttribute(this.h, (C.uintptr_t)(param1)) + C.QWidget_SetAttribute(this.h, (C.int)(param1)) } func (this *QWidget) TestAttribute(param1 WidgetAttribute) bool { - return (bool)(C.QWidget_TestAttribute(this.h, (C.uintptr_t)(param1))) + return (bool)(C.QWidget_TestAttribute(this.h, (C.int)(param1))) } func (this *QWidget) PaintEngine() *QPaintEngine { @@ -1368,7 +1368,7 @@ func miqt_exec_callback_QWidget_CustomContextMenuRequested(cb *C.void, pos *C.QP } func (this *QWidget) InputMethodQuery(param1 InputMethodQuery) *QVariant { - _ret := C.QWidget_InputMethodQuery(this.h, (C.uintptr_t)(param1)) + _ret := C.QWidget_InputMethodQuery(this.h, (C.int)(param1)) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -1379,7 +1379,7 @@ func (this *QWidget) InputMethodHints() int { } func (this *QWidget) SetInputMethodHints(hints int) { - C.QWidget_SetInputMethodHints(this.h, (C.int)(hints)) + C.QWidget_SetInputMethodHints(this.h, hints) } func QWidget_Tr2(s string, c string) string { @@ -1435,7 +1435,7 @@ func (this *QWidget) Render3(target *QPaintDevice, targetOffset *QPoint, sourceR } func (this *QWidget) Render4(target *QPaintDevice, targetOffset *QPoint, sourceRegion *QRegion, renderFlags int) { - C.QWidget_Render4(this.h, target.cPointer(), targetOffset.cPointer(), sourceRegion.cPointer(), (C.int)(renderFlags)) + C.QWidget_Render4(this.h, target.cPointer(), targetOffset.cPointer(), sourceRegion.cPointer(), renderFlags) } func (this *QWidget) Render22(painter *QPainter, targetOffset *QPoint) { @@ -1447,7 +1447,7 @@ func (this *QWidget) Render32(painter *QPainter, targetOffset *QPoint, sourceReg } func (this *QWidget) Render42(painter *QPainter, targetOffset *QPoint, sourceRegion *QRegion, renderFlags int) { - C.QWidget_Render42(this.h, painter.cPointer(), targetOffset.cPointer(), sourceRegion.cPointer(), (C.int)(renderFlags)) + C.QWidget_Render42(this.h, painter.cPointer(), targetOffset.cPointer(), sourceRegion.cPointer(), renderFlags) } func (this *QWidget) Grab1(rectangle *QRect) *QPixmap { @@ -1458,11 +1458,11 @@ func (this *QWidget) Grab1(rectangle *QRect) *QPixmap { } func (this *QWidget) GrabGesture2(typeVal GestureType, flags int) { - C.QWidget_GrabGesture2(this.h, (C.uintptr_t)(typeVal), (C.int)(flags)) + C.QWidget_GrabGesture2(this.h, (C.int)(typeVal), flags) } func (this *QWidget) GrabShortcut2(key *QKeySequence, context ShortcutContext) int { - return (int)(C.QWidget_GrabShortcut2(this.h, key.cPointer(), (C.uintptr_t)(context))) + return (int)(C.QWidget_GrabShortcut2(this.h, key.cPointer(), (C.int)(context))) } func (this *QWidget) SetShortcutEnabled2(id int, enable bool) { @@ -1474,11 +1474,11 @@ func (this *QWidget) SetShortcutAutoRepeat2(id int, enable bool) { } func (this *QWidget) SetWindowFlag2(param1 WindowType, on bool) { - C.QWidget_SetWindowFlag2(this.h, (C.uintptr_t)(param1), (C.bool)(on)) + C.QWidget_SetWindowFlag2(this.h, (C.int)(param1), (C.bool)(on)) } func (this *QWidget) SetAttribute2(param1 WidgetAttribute, on bool) { - C.QWidget_SetAttribute2(this.h, (C.uintptr_t)(param1), (C.bool)(on)) + C.QWidget_SetAttribute2(this.h, (C.int)(param1), (C.bool)(on)) } func QWidget_CreateWindowContainer2(window *QWindow, parent *QWidget) *QWidget { @@ -1486,7 +1486,7 @@ func QWidget_CreateWindowContainer2(window *QWindow, parent *QWidget) *QWidget { } func QWidget_CreateWindowContainer3(window *QWindow, parent *QWidget, flags int) *QWidget { - return newQWidget_U(unsafe.Pointer(C.QWidget_CreateWindowContainer3(window.cPointer(), parent.cPointer(), (C.int)(flags)))) + return newQWidget_U(unsafe.Pointer(C.QWidget_CreateWindowContainer3(window.cPointer(), parent.cPointer(), flags))) } // Delete this object from C++ memory. diff --git a/qt/gen_qwidget.h b/qt/gen_qwidget.h index ed8517f..47affb3 100644 --- a/qt/gen_qwidget.h +++ b/qt/gen_qwidget.h @@ -101,8 +101,8 @@ void QWidget_SetStyle(QWidget* self, QStyle* style); bool QWidget_IsTopLevel(const QWidget* self); bool QWidget_IsWindow(const QWidget* self); bool QWidget_IsModal(const QWidget* self); -uintptr_t QWidget_WindowModality(const QWidget* self); -void QWidget_SetWindowModality(QWidget* self, uintptr_t windowModality); +int QWidget_WindowModality(const QWidget* self); +void QWidget_SetWindowModality(QWidget* self, int windowModality); bool QWidget_IsEnabled(const QWidget* self); bool QWidget_IsEnabledTo(const QWidget* self, QWidget* param1); bool QWidget_IsEnabledToTLW(const QWidget* self); @@ -157,10 +157,10 @@ QWidget* QWidget_NativeParentWidget(const QWidget* self); QWidget* QWidget_TopLevelWidget(const QWidget* self); QPalette* QWidget_Palette(const QWidget* self); void QWidget_SetPalette(QWidget* self, QPalette* palette); -void QWidget_SetBackgroundRole(QWidget* self, uintptr_t backgroundRole); -uintptr_t QWidget_BackgroundRole(const QWidget* self); -void QWidget_SetForegroundRole(QWidget* self, uintptr_t foregroundRole); -uintptr_t QWidget_ForegroundRole(const QWidget* self); +void QWidget_SetBackgroundRole(QWidget* self, int backgroundRole); +int QWidget_BackgroundRole(const QWidget* self); +void QWidget_SetForegroundRole(QWidget* self, int foregroundRole); +int QWidget_ForegroundRole(const QWidget* self); QFont* QWidget_Font(const QWidget* self); void QWidget_SetFont(QWidget* self, QFont* font); QFontMetrics* QWidget_FontMetrics(const QWidget* self); @@ -182,8 +182,8 @@ void QWidget_RenderWithPainter(QWidget* self, QPainter* painter); QPixmap* QWidget_Grab(QWidget* self); QGraphicsEffect* QWidget_GraphicsEffect(const QWidget* self); void QWidget_SetGraphicsEffect(QWidget* self, QGraphicsEffect* effect); -void QWidget_GrabGesture(QWidget* self, uintptr_t typeVal); -void QWidget_UngrabGesture(QWidget* self, uintptr_t typeVal); +void QWidget_GrabGesture(QWidget* self, int typeVal); +void QWidget_UngrabGesture(QWidget* self, int typeVal); void QWidget_SetWindowTitle(QWidget* self, struct miqt_string* windowTitle); void QWidget_SetStyleSheet(QWidget* self, struct miqt_string* styleSheet); struct miqt_string* QWidget_StyleSheet(const QWidget* self); @@ -211,8 +211,8 @@ struct miqt_string* QWidget_AccessibleName(const QWidget* self); void QWidget_SetAccessibleName(QWidget* self, struct miqt_string* name); struct miqt_string* QWidget_AccessibleDescription(const QWidget* self); void QWidget_SetAccessibleDescription(QWidget* self, struct miqt_string* description); -void QWidget_SetLayoutDirection(QWidget* self, uintptr_t direction); -uintptr_t QWidget_LayoutDirection(const QWidget* self); +void QWidget_SetLayoutDirection(QWidget* self, int direction); +int QWidget_LayoutDirection(const QWidget* self); void QWidget_UnsetLayoutDirection(QWidget* self); void QWidget_SetLocale(QWidget* self, QLocale* locale); QLocale* QWidget_Locale(const QWidget* self); @@ -223,15 +223,15 @@ void QWidget_SetFocus(QWidget* self); bool QWidget_IsActiveWindow(const QWidget* self); void QWidget_ActivateWindow(QWidget* self); void QWidget_ClearFocus(QWidget* self); -void QWidget_SetFocusWithReason(QWidget* self, uintptr_t reason); -uintptr_t QWidget_FocusPolicy(const QWidget* self); -void QWidget_SetFocusPolicy(QWidget* self, uintptr_t policy); +void QWidget_SetFocusWithReason(QWidget* self, int reason); +int QWidget_FocusPolicy(const QWidget* self); +void QWidget_SetFocusPolicy(QWidget* self, int policy); bool QWidget_HasFocus(const QWidget* self); void QWidget_SetTabOrder(QWidget* param1, QWidget* param2); void QWidget_SetFocusProxy(QWidget* self, QWidget* focusProxy); QWidget* QWidget_FocusProxy(const QWidget* self); -uintptr_t QWidget_ContextMenuPolicy(const QWidget* self); -void QWidget_SetContextMenuPolicy(QWidget* self, uintptr_t policy); +int QWidget_ContextMenuPolicy(const QWidget* self); +void QWidget_SetContextMenuPolicy(QWidget* self, int policy); void QWidget_GrabMouse(QWidget* self); void QWidget_GrabMouseWithQCursor(QWidget* self, QCursor* param1); void QWidget_ReleaseMouse(QWidget* self); @@ -288,7 +288,7 @@ QSize* QWidget_SizeHint(const QWidget* self); QSize* QWidget_MinimumSizeHint(const QWidget* self); QSizePolicy* QWidget_SizePolicy(const QWidget* self); void QWidget_SetSizePolicy(QWidget* self, QSizePolicy* sizePolicy); -void QWidget_SetSizePolicy2(QWidget* self, uintptr_t horizontal, uintptr_t vertical); +void QWidget_SetSizePolicy2(QWidget* self, int horizontal, int vertical); int QWidget_HeightForWidth(const QWidget* self, int param1); bool QWidget_HasHeightForWidth(const QWidget* self); QRegion* QWidget_VisibleRegion(const QWidget* self); @@ -318,14 +318,14 @@ struct miqt_array* QWidget_Actions(const QWidget* self); QWidget* QWidget_ParentWidget(const QWidget* self); void QWidget_SetWindowFlags(QWidget* self, int typeVal); int QWidget_WindowFlags(const QWidget* self); -void QWidget_SetWindowFlag(QWidget* self, uintptr_t param1); +void QWidget_SetWindowFlag(QWidget* self, int param1); void QWidget_OverrideWindowFlags(QWidget* self, int typeVal); -uintptr_t QWidget_WindowType(const QWidget* self); +int QWidget_WindowType(const QWidget* self); QWidget* QWidget_Find(uintptr_t param1); QWidget* QWidget_ChildAt(const QWidget* self, int x, int y); QWidget* QWidget_ChildAtWithQPoint(const QWidget* self, QPoint* p); -void QWidget_SetAttribute(QWidget* self, uintptr_t param1); -bool QWidget_TestAttribute(const QWidget* self, uintptr_t param1); +void QWidget_SetAttribute(QWidget* self, int param1); +bool QWidget_TestAttribute(const QWidget* self, int param1); QPaintEngine* QWidget_PaintEngine(const QWidget* self); void QWidget_EnsurePolished(const QWidget* self); bool QWidget_IsAncestorOf(const QWidget* self, QWidget* child); @@ -343,7 +343,7 @@ void QWidget_WindowIconTextChanged(QWidget* self, struct miqt_string* iconText); void QWidget_connect_WindowIconTextChanged(QWidget* self, void* slot); void QWidget_CustomContextMenuRequested(QWidget* self, QPoint* pos); void QWidget_connect_CustomContextMenuRequested(QWidget* self, void* slot); -QVariant* QWidget_InputMethodQuery(const QWidget* self, uintptr_t param1); +QVariant* QWidget_InputMethodQuery(const QWidget* self, int param1); int QWidget_InputMethodHints(const QWidget* self); void QWidget_SetInputMethodHints(QWidget* self, int hints); struct miqt_string* QWidget_Tr2(const char* s, const char* c); @@ -357,12 +357,12 @@ void QWidget_Render22(QWidget* self, QPainter* painter, QPoint* targetOffset); void QWidget_Render32(QWidget* self, QPainter* painter, QPoint* targetOffset, QRegion* sourceRegion); void QWidget_Render42(QWidget* self, QPainter* painter, QPoint* targetOffset, QRegion* sourceRegion, int renderFlags); QPixmap* QWidget_Grab1(QWidget* self, QRect* rectangle); -void QWidget_GrabGesture2(QWidget* self, uintptr_t typeVal, int flags); -int QWidget_GrabShortcut2(QWidget* self, QKeySequence* key, uintptr_t context); +void QWidget_GrabGesture2(QWidget* self, int typeVal, int flags); +int QWidget_GrabShortcut2(QWidget* self, QKeySequence* key, int context); void QWidget_SetShortcutEnabled2(QWidget* self, int id, bool enable); void QWidget_SetShortcutAutoRepeat2(QWidget* self, int id, bool enable); -void QWidget_SetWindowFlag2(QWidget* self, uintptr_t param1, bool on); -void QWidget_SetAttribute2(QWidget* self, uintptr_t param1, bool on); +void QWidget_SetWindowFlag2(QWidget* self, int param1, bool on); +void QWidget_SetAttribute2(QWidget* self, int param1, bool on); QWidget* QWidget_CreateWindowContainer2(QWindow* window, QWidget* parent); QWidget* QWidget_CreateWindowContainer3(QWindow* window, QWidget* parent, int flags); void QWidget_Delete(QWidget* self); diff --git a/qt/gen_qwindow.cpp b/qt/gen_qwindow.cpp index c2bb4a8..92406cd 100644 --- a/qt/gen_qwindow.cpp +++ b/qt/gen_qwindow.cpp @@ -48,25 +48,25 @@ struct miqt_string* QWindow_TrUtf8(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -void QWindow_SetSurfaceType(QWindow* self, uintptr_t surfaceType) { +void QWindow_SetSurfaceType(QWindow* self, int surfaceType) { self->setSurfaceType(static_cast(surfaceType)); } -uintptr_t QWindow_SurfaceType(const QWindow* self) { +int QWindow_SurfaceType(const QWindow* self) { QSurface::SurfaceType _ret = self->surfaceType(); - return static_cast(_ret); + return static_cast(_ret); } bool QWindow_IsVisible(const QWindow* self) { return self->isVisible(); } -uintptr_t QWindow_Visibility(const QWindow* self) { +int QWindow_Visibility(const QWindow* self) { QWindow::Visibility _ret = self->visibility(); - return static_cast(_ret); + return static_cast(_ret); } -void QWindow_SetVisibility(QWindow* self, uintptr_t v) { +void QWindow_SetVisibility(QWindow* self, int v) { self->setVisibility(static_cast(v)); } @@ -75,10 +75,11 @@ void QWindow_Create(QWindow* self) { } uintptr_t QWindow_WinId(const QWindow* self) { - return self->winId(); + WId _ret = self->winId(); + return static_cast(_ret); } -QWindow* QWindow_Parent(const QWindow* self, uintptr_t mode) { +QWindow* QWindow_Parent(const QWindow* self, int mode) { return self->parent(static_cast(mode)); } @@ -98,12 +99,12 @@ bool QWindow_IsModal(const QWindow* self) { return self->isModal(); } -uintptr_t QWindow_Modality(const QWindow* self) { +int QWindow_Modality(const QWindow* self) { Qt::WindowModality _ret = self->modality(); - return static_cast(_ret); + return static_cast(_ret); } -void QWindow_SetModality(QWindow* self, uintptr_t modality) { +void QWindow_SetModality(QWindow* self, int modality) { self->setModality(static_cast(modality)); } @@ -128,13 +129,13 @@ int QWindow_Flags(const QWindow* self) { return static_cast(_ret); } -void QWindow_SetFlag(QWindow* self, uintptr_t param1) { +void QWindow_SetFlag(QWindow* self, int param1) { self->setFlag(static_cast(param1)); } -uintptr_t QWindow_Type(const QWindow* self) { +int QWindow_Type(const QWindow* self) { Qt::WindowType _ret = self->type(); - return static_cast(_ret); + return static_cast(_ret); } struct miqt_string* QWindow_Title(const QWindow* self) { @@ -149,7 +150,8 @@ void QWindow_SetOpacity(QWindow* self, double level) { } double QWindow_Opacity(const QWindow* self) { - return self->opacity(); + qreal _ret = self->opacity(); + return static_cast(_ret); } void QWindow_SetMask(QWindow* self, QRegion* region) { @@ -164,22 +166,23 @@ bool QWindow_IsActive(const QWindow* self) { return self->isActive(); } -void QWindow_ReportContentOrientationChange(QWindow* self, uintptr_t orientation) { +void QWindow_ReportContentOrientationChange(QWindow* self, int orientation) { self->reportContentOrientationChange(static_cast(orientation)); } -uintptr_t QWindow_ContentOrientation(const QWindow* self) { +int QWindow_ContentOrientation(const QWindow* self) { Qt::ScreenOrientation _ret = self->contentOrientation(); - return static_cast(_ret); + return static_cast(_ret); } double QWindow_DevicePixelRatio(const QWindow* self) { - return self->devicePixelRatio(); + qreal _ret = self->devicePixelRatio(); + return static_cast(_ret); } -uintptr_t QWindow_WindowState(const QWindow* self) { +int QWindow_WindowState(const QWindow* self) { Qt::WindowState _ret = self->windowState(); - return static_cast(_ret); + return static_cast(_ret); } int QWindow_WindowStates(const QWindow* self) { @@ -187,7 +190,7 @@ int QWindow_WindowStates(const QWindow* self) { return static_cast(_ret); } -void QWindow_SetWindowState(QWindow* self, uintptr_t state) { +void QWindow_SetWindowState(QWindow* self, int state) { self->setWindowState(static_cast(state)); } @@ -507,26 +510,26 @@ void QWindow_connect_ScreenChanged(QWindow* self, void* slot) { }); } -void QWindow_ModalityChanged(QWindow* self, uintptr_t modality) { +void QWindow_ModalityChanged(QWindow* self, int modality) { self->modalityChanged(static_cast(modality)); } void QWindow_connect_ModalityChanged(QWindow* self, void* slot) { QWindow::connect(self, static_cast(&QWindow::modalityChanged), self, [=](Qt::WindowModality modality) { Qt::WindowModality modality_ret = modality; - uintptr_t sigval1 = static_cast(modality_ret); + int sigval1 = static_cast(modality_ret); miqt_exec_callback_QWindow_ModalityChanged(slot, sigval1); }); } -void QWindow_WindowStateChanged(QWindow* self, uintptr_t windowState) { +void QWindow_WindowStateChanged(QWindow* self, int windowState) { self->windowStateChanged(static_cast(windowState)); } void QWindow_connect_WindowStateChanged(QWindow* self, void* slot) { QWindow::connect(self, static_cast(&QWindow::windowStateChanged), self, [=](Qt::WindowState windowState) { Qt::WindowState windowState_ret = windowState; - uintptr_t sigval1 = static_cast(windowState_ret); + int sigval1 = static_cast(windowState_ret); miqt_exec_callback_QWindow_WindowStateChanged(slot, sigval1); }); } @@ -645,14 +648,14 @@ void QWindow_connect_VisibleChanged(QWindow* self, void* slot) { }); } -void QWindow_VisibilityChanged(QWindow* self, uintptr_t visibility) { +void QWindow_VisibilityChanged(QWindow* self, int visibility) { self->visibilityChanged(static_cast(visibility)); } void QWindow_connect_VisibilityChanged(QWindow* self, void* slot) { QWindow::connect(self, static_cast(&QWindow::visibilityChanged), self, [=](QWindow::Visibility visibility) { QWindow::Visibility visibility_ret = visibility; - uintptr_t sigval1 = static_cast(visibility_ret); + int sigval1 = static_cast(visibility_ret); miqt_exec_callback_QWindow_VisibilityChanged(slot, sigval1); }); } @@ -667,14 +670,14 @@ void QWindow_connect_ActiveChanged(QWindow* self, void* slot) { }); } -void QWindow_ContentOrientationChanged(QWindow* self, uintptr_t orientation) { +void QWindow_ContentOrientationChanged(QWindow* self, int orientation) { self->contentOrientationChanged(static_cast(orientation)); } void QWindow_connect_ContentOrientationChanged(QWindow* self, void* slot) { QWindow::connect(self, static_cast(&QWindow::contentOrientationChanged), self, [=](Qt::ScreenOrientation orientation) { Qt::ScreenOrientation orientation_ret = orientation; - uintptr_t sigval1 = static_cast(orientation_ret); + int sigval1 = static_cast(orientation_ret); miqt_exec_callback_QWindow_ContentOrientationChanged(slot, sigval1); }); } @@ -696,7 +699,8 @@ void QWindow_OpacityChanged(QWindow* self, double opacity) { void QWindow_connect_OpacityChanged(QWindow* self, void* slot) { QWindow::connect(self, static_cast(&QWindow::opacityChanged), self, [=](qreal opacity) { - double sigval1 = opacity; + qreal opacity_ret = opacity; + double sigval1 = static_cast(opacity_ret); miqt_exec_callback_QWindow_OpacityChanged(slot, sigval1); }); } @@ -740,11 +744,11 @@ struct miqt_string* QWindow_TrUtf83(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -void QWindow_SetFlag2(QWindow* self, uintptr_t param1, bool on) { +void QWindow_SetFlag2(QWindow* self, int param1, bool on) { self->setFlag(static_cast(param1), on); } -bool QWindow_IsAncestorOf2(const QWindow* self, QWindow* child, uintptr_t mode) { +bool QWindow_IsAncestorOf2(const QWindow* self, QWindow* child, int mode) { return self->isAncestorOf(child, static_cast(mode)); } diff --git a/qt/gen_qwindow.go b/qt/gen_qwindow.go index cb98d13..0cbe66c 100644 --- a/qt/gen_qwindow.go +++ b/qt/gen_qwindow.go @@ -97,7 +97,7 @@ func QWindow_TrUtf8(s string) string { } func (this *QWindow) SetSurfaceType(surfaceType QSurface__SurfaceType) { - C.QWindow_SetSurfaceType(this.h, (C.uintptr_t)(surfaceType)) + C.QWindow_SetSurfaceType(this.h, (C.int)(surfaceType)) } func (this *QWindow) SurfaceType() QSurface__SurfaceType { @@ -113,7 +113,7 @@ func (this *QWindow) Visibility() QWindow__Visibility { } func (this *QWindow) SetVisibility(v QWindow__Visibility) { - C.QWindow_SetVisibility(this.h, (C.uintptr_t)(v)) + C.QWindow_SetVisibility(this.h, (C.int)(v)) } func (this *QWindow) Create() { @@ -125,7 +125,7 @@ func (this *QWindow) WinId() uintptr { } func (this *QWindow) Parent(mode QWindow__AncestorMode) *QWindow { - return newQWindow_U(unsafe.Pointer(C.QWindow_Parent(this.h, (C.uintptr_t)(mode)))) + return newQWindow_U(unsafe.Pointer(C.QWindow_Parent(this.h, (C.int)(mode)))) } func (this *QWindow) Parent2() *QWindow { @@ -149,7 +149,7 @@ func (this *QWindow) Modality() WindowModality { } func (this *QWindow) SetModality(modality WindowModality) { - C.QWindow_SetModality(this.h, (C.uintptr_t)(modality)) + C.QWindow_SetModality(this.h, (C.int)(modality)) } func (this *QWindow) SetFormat(format *QSurfaceFormat) { @@ -171,7 +171,7 @@ func (this *QWindow) RequestedFormat() *QSurfaceFormat { } func (this *QWindow) SetFlags(flags int) { - C.QWindow_SetFlags(this.h, (C.int)(flags)) + C.QWindow_SetFlags(this.h, flags) } func (this *QWindow) Flags() int { @@ -179,7 +179,7 @@ func (this *QWindow) Flags() int { } func (this *QWindow) SetFlag(param1 WindowType) { - C.QWindow_SetFlag(this.h, (C.uintptr_t)(param1)) + C.QWindow_SetFlag(this.h, (C.int)(param1)) } func (this *QWindow) Type() WindowType { @@ -217,7 +217,7 @@ func (this *QWindow) IsActive() bool { } func (this *QWindow) ReportContentOrientationChange(orientation ScreenOrientation) { - C.QWindow_ReportContentOrientationChange(this.h, (C.uintptr_t)(orientation)) + C.QWindow_ReportContentOrientationChange(this.h, (C.int)(orientation)) } func (this *QWindow) ContentOrientation() ScreenOrientation { @@ -237,11 +237,11 @@ func (this *QWindow) WindowStates() int { } func (this *QWindow) SetWindowState(state WindowState) { - C.QWindow_SetWindowState(this.h, (C.uintptr_t)(state)) + C.QWindow_SetWindowState(this.h, (C.int)(state)) } func (this *QWindow) SetWindowStates(states int) { - C.QWindow_SetWindowStates(this.h, (C.int)(states)) + C.QWindow_SetWindowStates(this.h, states) } func (this *QWindow) SetTransientParent(parent *QWindow) { @@ -528,7 +528,7 @@ func (this *QWindow) Lower() { } func (this *QWindow) StartSystemResize(edges int) bool { - return (bool)(C.QWindow_StartSystemResize(this.h, (C.int)(edges))) + return (bool)(C.QWindow_StartSystemResize(this.h, edges)) } func (this *QWindow) StartSystemMove() bool { @@ -610,14 +610,14 @@ func miqt_exec_callback_QWindow_ScreenChanged(cb *C.void, screen *C.QScreen) { } func (this *QWindow) ModalityChanged(modality WindowModality) { - C.QWindow_ModalityChanged(this.h, (C.uintptr_t)(modality)) + C.QWindow_ModalityChanged(this.h, (C.int)(modality)) } func (this *QWindow) OnModalityChanged(slot func(modality WindowModality)) { C.QWindow_connect_ModalityChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QWindow_ModalityChanged -func miqt_exec_callback_QWindow_ModalityChanged(cb *C.void, modality C.uintptr_t) { +func miqt_exec_callback_QWindow_ModalityChanged(cb *C.void, modality C.int) { gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(modality WindowModality)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -630,14 +630,14 @@ func miqt_exec_callback_QWindow_ModalityChanged(cb *C.void, modality C.uintptr_t } func (this *QWindow) WindowStateChanged(windowState WindowState) { - C.QWindow_WindowStateChanged(this.h, (C.uintptr_t)(windowState)) + C.QWindow_WindowStateChanged(this.h, (C.int)(windowState)) } func (this *QWindow) OnWindowStateChanged(slot func(windowState WindowState)) { C.QWindow_connect_WindowStateChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QWindow_WindowStateChanged -func miqt_exec_callback_QWindow_WindowStateChanged(cb *C.void, windowState C.uintptr_t) { +func miqt_exec_callback_QWindow_WindowStateChanged(cb *C.void, windowState C.int) { gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(windowState WindowState)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -855,14 +855,14 @@ func miqt_exec_callback_QWindow_VisibleChanged(cb *C.void, arg C.bool) { } func (this *QWindow) VisibilityChanged(visibility QWindow__Visibility) { - C.QWindow_VisibilityChanged(this.h, (C.uintptr_t)(visibility)) + C.QWindow_VisibilityChanged(this.h, (C.int)(visibility)) } func (this *QWindow) OnVisibilityChanged(slot func(visibility QWindow__Visibility)) { C.QWindow_connect_VisibilityChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QWindow_VisibilityChanged -func miqt_exec_callback_QWindow_VisibilityChanged(cb *C.void, visibility C.uintptr_t) { +func miqt_exec_callback_QWindow_VisibilityChanged(cb *C.void, visibility C.int) { gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(visibility QWindow__Visibility)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -892,14 +892,14 @@ func miqt_exec_callback_QWindow_ActiveChanged(cb *C.void) { } func (this *QWindow) ContentOrientationChanged(orientation ScreenOrientation) { - C.QWindow_ContentOrientationChanged(this.h, (C.uintptr_t)(orientation)) + C.QWindow_ContentOrientationChanged(this.h, (C.int)(orientation)) } func (this *QWindow) OnContentOrientationChanged(slot func(orientation ScreenOrientation)) { C.QWindow_connect_ContentOrientationChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QWindow_ContentOrientationChanged -func miqt_exec_callback_QWindow_ContentOrientationChanged(cb *C.void, orientation C.uintptr_t) { +func miqt_exec_callback_QWindow_ContentOrientationChanged(cb *C.void, orientation C.int) { gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(orientation ScreenOrientation)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -1016,11 +1016,11 @@ func QWindow_TrUtf83(s string, c string, n int) string { } func (this *QWindow) SetFlag2(param1 WindowType, on bool) { - C.QWindow_SetFlag2(this.h, (C.uintptr_t)(param1), (C.bool)(on)) + C.QWindow_SetFlag2(this.h, (C.int)(param1), (C.bool)(on)) } func (this *QWindow) IsAncestorOf2(child *QWindow, mode QWindow__AncestorMode) bool { - return (bool)(C.QWindow_IsAncestorOf2(this.h, child.cPointer(), (C.uintptr_t)(mode))) + return (bool)(C.QWindow_IsAncestorOf2(this.h, child.cPointer(), (C.int)(mode))) } // Delete this object from C++ memory. diff --git a/qt/gen_qwindow.h b/qt/gen_qwindow.h index c865eb9..119aeaf 100644 --- a/qt/gen_qwindow.h +++ b/qt/gen_qwindow.h @@ -49,39 +49,39 @@ QWindow* QWindow_new3(QScreen* screen); QMetaObject* QWindow_MetaObject(const QWindow* self); struct miqt_string* QWindow_Tr(const char* s); struct miqt_string* QWindow_TrUtf8(const char* s); -void QWindow_SetSurfaceType(QWindow* self, uintptr_t surfaceType); -uintptr_t QWindow_SurfaceType(const QWindow* self); +void QWindow_SetSurfaceType(QWindow* self, int surfaceType); +int QWindow_SurfaceType(const QWindow* self); bool QWindow_IsVisible(const QWindow* self); -uintptr_t QWindow_Visibility(const QWindow* self); -void QWindow_SetVisibility(QWindow* self, uintptr_t v); +int QWindow_Visibility(const QWindow* self); +void QWindow_SetVisibility(QWindow* self, int v); void QWindow_Create(QWindow* self); uintptr_t QWindow_WinId(const QWindow* self); -QWindow* QWindow_Parent(const QWindow* self, uintptr_t mode); +QWindow* QWindow_Parent(const QWindow* self, int mode); QWindow* QWindow_Parent2(const QWindow* self); void QWindow_SetParent(QWindow* self, QWindow* parent); bool QWindow_IsTopLevel(const QWindow* self); bool QWindow_IsModal(const QWindow* self); -uintptr_t QWindow_Modality(const QWindow* self); -void QWindow_SetModality(QWindow* self, uintptr_t modality); +int QWindow_Modality(const QWindow* self); +void QWindow_SetModality(QWindow* self, int modality); void QWindow_SetFormat(QWindow* self, QSurfaceFormat* format); QSurfaceFormat* QWindow_Format(const QWindow* self); QSurfaceFormat* QWindow_RequestedFormat(const QWindow* self); void QWindow_SetFlags(QWindow* self, int flags); int QWindow_Flags(const QWindow* self); -void QWindow_SetFlag(QWindow* self, uintptr_t param1); -uintptr_t QWindow_Type(const QWindow* self); +void QWindow_SetFlag(QWindow* self, int param1); +int QWindow_Type(const QWindow* self); struct miqt_string* QWindow_Title(const QWindow* self); void QWindow_SetOpacity(QWindow* self, double level); double QWindow_Opacity(const QWindow* self); void QWindow_SetMask(QWindow* self, QRegion* region); QRegion* QWindow_Mask(const QWindow* self); bool QWindow_IsActive(const QWindow* self); -void QWindow_ReportContentOrientationChange(QWindow* self, uintptr_t orientation); -uintptr_t QWindow_ContentOrientation(const QWindow* self); +void QWindow_ReportContentOrientationChange(QWindow* self, int orientation); +int QWindow_ContentOrientation(const QWindow* self); double QWindow_DevicePixelRatio(const QWindow* self); -uintptr_t QWindow_WindowState(const QWindow* self); +int QWindow_WindowState(const QWindow* self); int QWindow_WindowStates(const QWindow* self); -void QWindow_SetWindowState(QWindow* self, uintptr_t state); +void QWindow_SetWindowState(QWindow* self, int state); void QWindow_SetWindowStates(QWindow* self, int states); void QWindow_SetTransientParent(QWindow* self, QWindow* parent); QWindow* QWindow_TransientParent(const QWindow* self); @@ -159,9 +159,9 @@ void QWindow_Alert(QWindow* self, int msec); void QWindow_RequestUpdate(QWindow* self); void QWindow_ScreenChanged(QWindow* self, QScreen* screen); void QWindow_connect_ScreenChanged(QWindow* self, void* slot); -void QWindow_ModalityChanged(QWindow* self, uintptr_t modality); +void QWindow_ModalityChanged(QWindow* self, int modality); void QWindow_connect_ModalityChanged(QWindow* self, void* slot); -void QWindow_WindowStateChanged(QWindow* self, uintptr_t windowState); +void QWindow_WindowStateChanged(QWindow* self, int windowState); void QWindow_connect_WindowStateChanged(QWindow* self, void* slot); void QWindow_WindowTitleChanged(QWindow* self, struct miqt_string* title); void QWindow_connect_WindowTitleChanged(QWindow* self, void* slot); @@ -183,11 +183,11 @@ void QWindow_MaximumHeightChanged(QWindow* self, int arg); void QWindow_connect_MaximumHeightChanged(QWindow* self, void* slot); void QWindow_VisibleChanged(QWindow* self, bool arg); void QWindow_connect_VisibleChanged(QWindow* self, void* slot); -void QWindow_VisibilityChanged(QWindow* self, uintptr_t visibility); +void QWindow_VisibilityChanged(QWindow* self, int visibility); void QWindow_connect_VisibilityChanged(QWindow* self, void* slot); void QWindow_ActiveChanged(QWindow* self); void QWindow_connect_ActiveChanged(QWindow* self, void* slot); -void QWindow_ContentOrientationChanged(QWindow* self, uintptr_t orientation); +void QWindow_ContentOrientationChanged(QWindow* self, int orientation); void QWindow_connect_ContentOrientationChanged(QWindow* self, void* slot); void QWindow_FocusObjectChanged(QWindow* self, QObject* object); void QWindow_connect_FocusObjectChanged(QWindow* self, void* slot); @@ -199,8 +199,8 @@ struct miqt_string* QWindow_Tr2(const char* s, const char* c); struct miqt_string* QWindow_Tr3(const char* s, const char* c, int n); struct miqt_string* QWindow_TrUtf82(const char* s, const char* c); struct miqt_string* QWindow_TrUtf83(const char* s, const char* c, int n); -void QWindow_SetFlag2(QWindow* self, uintptr_t param1, bool on); -bool QWindow_IsAncestorOf2(const QWindow* self, QWindow* child, uintptr_t mode); +void QWindow_SetFlag2(QWindow* self, int param1, bool on); +bool QWindow_IsAncestorOf2(const QWindow* self, QWindow* child, int mode); void QWindow_Delete(QWindow* self); #ifdef __cplusplus diff --git a/qt/gen_qwizard.cpp b/qt/gen_qwizard.cpp index 4e00e93..cc061e4 100644 --- a/qt/gen_qwizard.cpp +++ b/qt/gen_qwizard.cpp @@ -137,20 +137,20 @@ QVariant* QWizard_Field(const QWizard* self, struct miqt_string* name) { return new QVariant(self->field(name_QString)); } -void QWizard_SetWizardStyle(QWizard* self, uintptr_t style) { +void QWizard_SetWizardStyle(QWizard* self, int style) { self->setWizardStyle(static_cast(style)); } -uintptr_t QWizard_WizardStyle(const QWizard* self) { +int QWizard_WizardStyle(const QWizard* self) { QWizard::WizardStyle _ret = self->wizardStyle(); - return static_cast(_ret); + return static_cast(_ret); } -void QWizard_SetOption(QWizard* self, uintptr_t option) { +void QWizard_SetOption(QWizard* self, int option) { self->setOption(static_cast(option)); } -bool QWizard_TestOption(const QWizard* self, uintptr_t option) { +bool QWizard_TestOption(const QWizard* self, int option) { return self->testOption(static_cast(option)); } @@ -193,29 +193,29 @@ QAbstractButton* QWizard_Button(const QWizard* self, int which) { return self->button(static_cast(which)); } -void QWizard_SetTitleFormat(QWizard* self, uintptr_t format) { +void QWizard_SetTitleFormat(QWizard* self, int format) { self->setTitleFormat(static_cast(format)); } -uintptr_t QWizard_TitleFormat(const QWizard* self) { +int QWizard_TitleFormat(const QWizard* self) { Qt::TextFormat _ret = self->titleFormat(); - return static_cast(_ret); + return static_cast(_ret); } -void QWizard_SetSubTitleFormat(QWizard* self, uintptr_t format) { +void QWizard_SetSubTitleFormat(QWizard* self, int format) { self->setSubTitleFormat(static_cast(format)); } -uintptr_t QWizard_SubTitleFormat(const QWizard* self) { +int QWizard_SubTitleFormat(const QWizard* self) { Qt::TextFormat _ret = self->subTitleFormat(); - return static_cast(_ret); + return static_cast(_ret); } -void QWizard_SetPixmap(QWizard* self, uintptr_t which, QPixmap* pixmap) { +void QWizard_SetPixmap(QWizard* self, int which, QPixmap* pixmap) { self->setPixmap(static_cast(which), *pixmap); } -QPixmap* QWizard_Pixmap(const QWizard* self, uintptr_t which) { +QPixmap* QWizard_Pixmap(const QWizard* self, int which) { return new QPixmap(self->pixmap(static_cast(which))); } @@ -333,7 +333,7 @@ struct miqt_string* QWizard_TrUtf83(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -void QWizard_SetOption2(QWizard* self, uintptr_t option, bool on) { +void QWizard_SetOption2(QWizard* self, int option, bool on) { self->setOption(static_cast(option), on); } @@ -391,11 +391,11 @@ struct miqt_string* QWizardPage_SubTitle(const QWizardPage* self) { return miqt_strdup(_b.data(), _b.length()); } -void QWizardPage_SetPixmap(QWizardPage* self, uintptr_t which, QPixmap* pixmap) { +void QWizardPage_SetPixmap(QWizardPage* self, int which, QPixmap* pixmap) { self->setPixmap(static_cast(which), *pixmap); } -QPixmap* QWizardPage_Pixmap(const QWizardPage* self, uintptr_t which) { +QPixmap* QWizardPage_Pixmap(const QWizardPage* self, int which) { return new QPixmap(self->pixmap(static_cast(which))); } diff --git a/qt/gen_qwizard.go b/qt/gen_qwizard.go index fff4ae6..001d26f 100644 --- a/qt/gen_qwizard.go +++ b/qt/gen_qwizard.go @@ -111,7 +111,7 @@ func NewQWizard2(parent *QWidget) *QWizard { // NewQWizard3 constructs a new QWizard object. func NewQWizard3(parent *QWidget, flags int) *QWizard { - ret := C.QWizard_new3(parent.cPointer(), (C.int)(flags)) + ret := C.QWizard_new3(parent.cPointer(), flags) return newQWizard(ret) } @@ -230,7 +230,7 @@ func (this *QWizard) Field(name string) *QVariant { } func (this *QWizard) SetWizardStyle(style QWizard__WizardStyle) { - C.QWizard_SetWizardStyle(this.h, (C.uintptr_t)(style)) + C.QWizard_SetWizardStyle(this.h, (C.int)(style)) } func (this *QWizard) WizardStyle() QWizard__WizardStyle { @@ -238,15 +238,15 @@ func (this *QWizard) WizardStyle() QWizard__WizardStyle { } func (this *QWizard) SetOption(option QWizard__WizardOption) { - C.QWizard_SetOption(this.h, (C.uintptr_t)(option)) + C.QWizard_SetOption(this.h, (C.int)(option)) } func (this *QWizard) TestOption(option QWizard__WizardOption) bool { - return (bool)(C.QWizard_TestOption(this.h, (C.uintptr_t)(option))) + return (bool)(C.QWizard_TestOption(this.h, (C.int)(option))) } func (this *QWizard) SetOptions(options int) { - C.QWizard_SetOptions(this.h, (C.int)(options)) + C.QWizard_SetOptions(this.h, options) } func (this *QWizard) Options() int { @@ -287,7 +287,7 @@ func (this *QWizard) Button(which int) *QAbstractButton { } func (this *QWizard) SetTitleFormat(format TextFormat) { - C.QWizard_SetTitleFormat(this.h, (C.uintptr_t)(format)) + C.QWizard_SetTitleFormat(this.h, (C.int)(format)) } func (this *QWizard) TitleFormat() TextFormat { @@ -295,7 +295,7 @@ func (this *QWizard) TitleFormat() TextFormat { } func (this *QWizard) SetSubTitleFormat(format TextFormat) { - C.QWizard_SetSubTitleFormat(this.h, (C.uintptr_t)(format)) + C.QWizard_SetSubTitleFormat(this.h, (C.int)(format)) } func (this *QWizard) SubTitleFormat() TextFormat { @@ -303,11 +303,11 @@ func (this *QWizard) SubTitleFormat() TextFormat { } func (this *QWizard) SetPixmap(which QWizard__WizardPixmap, pixmap *QPixmap) { - C.QWizard_SetPixmap(this.h, (C.uintptr_t)(which), pixmap.cPointer()) + C.QWizard_SetPixmap(this.h, (C.int)(which), pixmap.cPointer()) } func (this *QWizard) Pixmap(which QWizard__WizardPixmap) *QPixmap { - _ret := C.QWizard_Pixmap(this.h, (C.uintptr_t)(which)) + _ret := C.QWizard_Pixmap(this.h, (C.int)(which)) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -496,7 +496,7 @@ func QWizard_TrUtf83(s string, c string, n int) string { } func (this *QWizard) SetOption2(option QWizard__WizardOption, on bool) { - C.QWizard_SetOption2(this.h, (C.uintptr_t)(option), (C.bool)(on)) + C.QWizard_SetOption2(this.h, (C.int)(option), (C.bool)(on)) } // Delete this object from C++ memory. @@ -597,11 +597,11 @@ func (this *QWizardPage) SubTitle() string { } func (this *QWizardPage) SetPixmap(which QWizard__WizardPixmap, pixmap *QPixmap) { - C.QWizardPage_SetPixmap(this.h, (C.uintptr_t)(which), pixmap.cPointer()) + C.QWizardPage_SetPixmap(this.h, (C.int)(which), pixmap.cPointer()) } func (this *QWizardPage) Pixmap(which QWizard__WizardPixmap) *QPixmap { - _ret := C.QWizardPage_Pixmap(this.h, (C.uintptr_t)(which)) + _ret := C.QWizardPage_Pixmap(this.h, (C.int)(which)) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qwizard.h b/qt/gen_qwizard.h index ab9fef8..b0d3dbf 100644 --- a/qt/gen_qwizard.h +++ b/qt/gen_qwizard.h @@ -55,10 +55,10 @@ bool QWizard_ValidateCurrentPage(QWizard* self); int QWizard_NextId(const QWizard* self); void QWizard_SetField(QWizard* self, struct miqt_string* name, QVariant* value); QVariant* QWizard_Field(const QWizard* self, struct miqt_string* name); -void QWizard_SetWizardStyle(QWizard* self, uintptr_t style); -uintptr_t QWizard_WizardStyle(const QWizard* self); -void QWizard_SetOption(QWizard* self, uintptr_t option); -bool QWizard_TestOption(const QWizard* self, uintptr_t option); +void QWizard_SetWizardStyle(QWizard* self, int style); +int QWizard_WizardStyle(const QWizard* self); +void QWizard_SetOption(QWizard* self, int option); +bool QWizard_TestOption(const QWizard* self, int option); void QWizard_SetOptions(QWizard* self, int options); int QWizard_Options(const QWizard* self); void QWizard_SetButtonText(QWizard* self, int which, struct miqt_string* text); @@ -66,12 +66,12 @@ struct miqt_string* QWizard_ButtonText(const QWizard* self, int which); void QWizard_SetButtonLayout(QWizard* self, struct miqt_array* /* of int */ layout); void QWizard_SetButton(QWizard* self, int which, QAbstractButton* button); QAbstractButton* QWizard_Button(const QWizard* self, int which); -void QWizard_SetTitleFormat(QWizard* self, uintptr_t format); -uintptr_t QWizard_TitleFormat(const QWizard* self); -void QWizard_SetSubTitleFormat(QWizard* self, uintptr_t format); -uintptr_t QWizard_SubTitleFormat(const QWizard* self); -void QWizard_SetPixmap(QWizard* self, uintptr_t which, QPixmap* pixmap); -QPixmap* QWizard_Pixmap(const QWizard* self, uintptr_t which); +void QWizard_SetTitleFormat(QWizard* self, int format); +int QWizard_TitleFormat(const QWizard* self); +void QWizard_SetSubTitleFormat(QWizard* self, int format); +int QWizard_SubTitleFormat(const QWizard* self); +void QWizard_SetPixmap(QWizard* self, int which, QPixmap* pixmap); +QPixmap* QWizard_Pixmap(const QWizard* self, int which); void QWizard_SetSideWidget(QWizard* self, QWidget* widget); QWidget* QWizard_SideWidget(const QWizard* self); void QWizard_SetDefaultProperty(QWizard* self, const char* className, const char* property, const char* changedSignal); @@ -94,7 +94,7 @@ struct miqt_string* QWizard_Tr2(const char* s, const char* c); struct miqt_string* QWizard_Tr3(const char* s, const char* c, int n); struct miqt_string* QWizard_TrUtf82(const char* s, const char* c); struct miqt_string* QWizard_TrUtf83(const char* s, const char* c, int n); -void QWizard_SetOption2(QWizard* self, uintptr_t option, bool on); +void QWizard_SetOption2(QWizard* self, int option, bool on); void QWizard_Delete(QWizard* self); QWizardPage* QWizardPage_new(); @@ -106,8 +106,8 @@ void QWizardPage_SetTitle(QWizardPage* self, struct miqt_string* title); struct miqt_string* QWizardPage_Title(const QWizardPage* self); void QWizardPage_SetSubTitle(QWizardPage* self, struct miqt_string* subTitle); struct miqt_string* QWizardPage_SubTitle(const QWizardPage* self); -void QWizardPage_SetPixmap(QWizardPage* self, uintptr_t which, QPixmap* pixmap); -QPixmap* QWizardPage_Pixmap(const QWizardPage* self, uintptr_t which); +void QWizardPage_SetPixmap(QWizardPage* self, int which, QPixmap* pixmap); +QPixmap* QWizardPage_Pixmap(const QWizardPage* self, int which); void QWizardPage_SetFinalPage(QWizardPage* self, bool finalPage); bool QWizardPage_IsFinalPage(const QWizardPage* self); void QWizardPage_SetCommitPage(QWizardPage* self, bool commitPage); diff --git a/qt/gen_qxmlstream.cpp b/qt/gen_qxmlstream.cpp index 55a4d02..2cf12f9 100644 --- a/qt/gen_qxmlstream.cpp +++ b/qt/gen_qxmlstream.cpp @@ -255,9 +255,9 @@ bool QXmlStreamReader_AtEnd(const QXmlStreamReader* self) { return self->atEnd(); } -uintptr_t QXmlStreamReader_ReadNext(QXmlStreamReader* self) { +int QXmlStreamReader_ReadNext(QXmlStreamReader* self) { QXmlStreamReader::TokenType _ret = self->readNext(); - return static_cast(_ret); + return static_cast(_ret); } bool QXmlStreamReader_ReadNextStartElement(QXmlStreamReader* self) { @@ -268,9 +268,9 @@ void QXmlStreamReader_SkipCurrentElement(QXmlStreamReader* self) { self->skipCurrentElement(); } -uintptr_t QXmlStreamReader_TokenType(const QXmlStreamReader* self) { +int QXmlStreamReader_TokenType(const QXmlStreamReader* self) { QXmlStreamReader::TokenType _ret = self->tokenType(); - return static_cast(_ret); + return static_cast(_ret); } struct miqt_string* QXmlStreamReader_TokenString(const QXmlStreamReader* self) { @@ -337,15 +337,18 @@ bool QXmlStreamReader_IsStandaloneDocument(const QXmlStreamReader* self) { } long long QXmlStreamReader_LineNumber(const QXmlStreamReader* self) { - return self->lineNumber(); + qint64 _ret = self->lineNumber(); + return static_cast(_ret); } long long QXmlStreamReader_ColumnNumber(const QXmlStreamReader* self) { - return self->columnNumber(); + qint64 _ret = self->columnNumber(); + return static_cast(_ret); } long long QXmlStreamReader_CharacterOffset(const QXmlStreamReader* self) { - return self->characterOffset(); + qint64 _ret = self->characterOffset(); + return static_cast(_ret); } struct miqt_string* QXmlStreamReader_ReadElementText(QXmlStreamReader* self) { @@ -427,9 +430,9 @@ struct miqt_string* QXmlStreamReader_ErrorString(const QXmlStreamReader* self) { return miqt_strdup(_b.data(), _b.length()); } -uintptr_t QXmlStreamReader_Error(const QXmlStreamReader* self) { +int QXmlStreamReader_Error(const QXmlStreamReader* self) { QXmlStreamReader::Error _ret = self->error(); - return static_cast(_ret); + return static_cast(_ret); } bool QXmlStreamReader_HasError(const QXmlStreamReader* self) { @@ -444,7 +447,7 @@ QXmlStreamEntityResolver* QXmlStreamReader_EntityResolver(const QXmlStreamReader return self->entityResolver(); } -struct miqt_string* QXmlStreamReader_ReadElementText1(QXmlStreamReader* self, uintptr_t behaviour) { +struct miqt_string* QXmlStreamReader_ReadElementText1(QXmlStreamReader* self, int behaviour) { QString _ret = self->readElementText(static_cast(behaviour)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); diff --git a/qt/gen_qxmlstream.go b/qt/gen_qxmlstream.go index 7e2db54..f083a55 100644 --- a/qt/gen_qxmlstream.go +++ b/qt/gen_qxmlstream.go @@ -746,7 +746,7 @@ func (this *QXmlStreamReader) EntityResolver() *QXmlStreamEntityResolver { } func (this *QXmlStreamReader) ReadElementText1(behaviour QXmlStreamReader__ReadElementTextBehaviour) string { - var _ms *C.struct_miqt_string = C.QXmlStreamReader_ReadElementText1(this.h, (C.uintptr_t)(behaviour)) + var _ms *C.struct_miqt_string = C.QXmlStreamReader_ReadElementText1(this.h, (C.int)(behaviour)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret diff --git a/qt/gen_qxmlstream.h b/qt/gen_qxmlstream.h index daeae2e..34c0285 100644 --- a/qt/gen_qxmlstream.h +++ b/qt/gen_qxmlstream.h @@ -99,10 +99,10 @@ void QXmlStreamReader_AddDataWithData(QXmlStreamReader* self, struct miqt_string void QXmlStreamReader_AddData2(QXmlStreamReader* self, const char* data); void QXmlStreamReader_Clear(QXmlStreamReader* self); bool QXmlStreamReader_AtEnd(const QXmlStreamReader* self); -uintptr_t QXmlStreamReader_ReadNext(QXmlStreamReader* self); +int QXmlStreamReader_ReadNext(QXmlStreamReader* self); bool QXmlStreamReader_ReadNextStartElement(QXmlStreamReader* self); void QXmlStreamReader_SkipCurrentElement(QXmlStreamReader* self); -uintptr_t QXmlStreamReader_TokenType(const QXmlStreamReader* self); +int QXmlStreamReader_TokenType(const QXmlStreamReader* self); struct miqt_string* QXmlStreamReader_TokenString(const QXmlStreamReader* self); void QXmlStreamReader_SetNamespaceProcessing(QXmlStreamReader* self, bool namespaceProcessing); bool QXmlStreamReader_NamespaceProcessing(const QXmlStreamReader* self); @@ -131,11 +131,11 @@ int QXmlStreamReader_EntityExpansionLimit(const QXmlStreamReader* self); void QXmlStreamReader_SetEntityExpansionLimit(QXmlStreamReader* self, int limit); void QXmlStreamReader_RaiseError(QXmlStreamReader* self); struct miqt_string* QXmlStreamReader_ErrorString(const QXmlStreamReader* self); -uintptr_t QXmlStreamReader_Error(const QXmlStreamReader* self); +int QXmlStreamReader_Error(const QXmlStreamReader* self); bool QXmlStreamReader_HasError(const QXmlStreamReader* self); void QXmlStreamReader_SetEntityResolver(QXmlStreamReader* self, QXmlStreamEntityResolver* resolver); QXmlStreamEntityResolver* QXmlStreamReader_EntityResolver(const QXmlStreamReader* self); -struct miqt_string* QXmlStreamReader_ReadElementText1(QXmlStreamReader* self, uintptr_t behaviour); +struct miqt_string* QXmlStreamReader_ReadElementText1(QXmlStreamReader* self, int behaviour); void QXmlStreamReader_RaiseError1(QXmlStreamReader* self, struct miqt_string* message); void QXmlStreamReader_Delete(QXmlStreamReader* self);