From ffe0a0aed3f704311d7d70ebca80aa7d7f613dcd Mon Sep 17 00:00:00 2001 From: mappu Date: Fri, 11 Oct 2024 18:48:16 +1300 Subject: [PATCH] qt: rebuild for qt6 (experimental) --- qt/gen_qabstractanimation.cpp | 51 - qt/gen_qabstractanimation.go | 70 - qt/gen_qabstractanimation.h | 8 - qt/gen_qabstractbutton.cpp | 25 - qt/gen_qabstractbutton.go | 35 - qt/gen_qabstractbutton.h | 4 - qt/gen_qabstracteventdispatcher.cpp | 41 +- qt/gen_qabstracteventdispatcher.go | 51 +- qt/gen_qabstracteventdispatcher.h | 11 +- qt/gen_qabstractfileiconprovider.cpp | 42 + qt/gen_qabstractfileiconprovider.go | 103 + qt/gen_qabstractfileiconprovider.h | 38 + qt/gen_qabstractitemdelegate.cpp | 32 +- qt/gen_qabstractitemdelegate.go | 40 - qt/gen_qabstractitemdelegate.h | 6 - qt/gen_qabstractitemmodel.cpp | 193 +- qt/gen_qabstractitemmodel.go | 287 ++- qt/gen_qabstractitemmodel.h | 43 +- qt/gen_qabstractitemview.cpp | 25 +- qt/gen_qabstractitemview.go | 35 +- qt/gen_qabstractitemview.h | 4 +- qt/gen_qabstractnativeeventfilter.cpp | 4 +- qt/gen_qabstractnativeeventfilter.go | 4 +- qt/gen_qabstractnativeeventfilter.h | 2 +- qt/gen_qabstractproxymodel.cpp | 25 +- qt/gen_qabstractproxymodel.go | 35 +- qt/gen_qabstractproxymodel.h | 4 +- qt/gen_qabstractscrollarea.cpp | 21 - qt/gen_qabstractscrollarea.go | 31 - qt/gen_qabstractscrollarea.h | 3 - qt/gen_qabstractslider.cpp | 21 - qt/gen_qabstractslider.go | 31 - qt/gen_qabstractslider.h | 3 - qt/gen_qabstractspinbox.cpp | 21 - qt/gen_qabstractspinbox.go | 31 - qt/gen_qabstractspinbox.h | 3 - qt/gen_qabstractstate.cpp | 88 - qt/gen_qabstractstate.go | 156 -- qt/gen_qabstractstate.h | 47 - qt/gen_qabstracttextdocumentlayout.cpp | 21 - qt/gen_qabstracttextdocumentlayout.go | 31 - qt/gen_qabstracttextdocumentlayout.h | 3 - qt/gen_qabstracttransition.cpp | 137 -- qt/gen_qabstracttransition.go | 196 -- qt/gen_qabstracttransition.h | 57 - qt/gen_qaccessible.cpp | 140 +- qt/gen_qaccessible.go | 478 +--- qt/gen_qaccessible.h | 44 +- qt/gen_qaccessible_base.cpp | 84 + qt/gen_qaccessible_base.go | 386 ++++ qt/gen_qaccessible_base.h | 65 + qt/gen_qaccessiblebridge.cpp | 21 - qt/gen_qaccessiblebridge.go | 31 - qt/gen_qaccessiblebridge.h | 3 - qt/gen_qaccessibleplugin.cpp | 21 - qt/gen_qaccessibleplugin.go | 31 - qt/gen_qaccessibleplugin.h | 3 - qt/gen_qaction.cpp | 115 +- qt/gen_qaction.go | 139 +- qt/gen_qaction.h | 26 +- qt/gen_qactiongroup.cpp | 21 - qt/gen_qactiongroup.go | 31 - qt/gen_qactiongroup.h | 3 - qt/gen_qanimationgroup.cpp | 21 - qt/gen_qanimationgroup.go | 31 - qt/gen_qanimationgroup.h | 3 - qt/gen_qanystringview.cpp | 93 + qt/gen_qanystringview.go | 143 ++ qt/gen_qanystringview.h | 50 + qt/gen_qapplication.cpp | 52 - qt/gen_qapplication.go | 73 - qt/gen_qapplication.h | 16 - qt/gen_qarraydata.cpp | 58 +- qt/gen_qarraydata.go | 73 +- qt/gen_qarraydata.h | 21 +- qt/gen_qbasictimer.cpp | 10 +- qt/gen_qbasictimer.go | 14 +- qt/gen_qbasictimer.h | 4 +- qt/gen_qbindingstorage.cpp | 31 + qt/gen_qbindingstorage.go | 104 + qt/gen_qbindingstorage.h | 38 + qt/gen_qbitarray.cpp | 89 +- qt/gen_qbitarray.go | 87 +- qt/gen_qbitarray.h | 38 +- qt/gen_qbitmap.cpp | 21 +- qt/gen_qbitmap.go | 24 +- qt/gen_qbitmap.h | 12 +- qt/gen_qboxlayout.cpp | 63 - qt/gen_qboxlayout.go | 93 - qt/gen_qboxlayout.h | 9 - qt/gen_qbrush.cpp | 15 - qt/gen_qbrush.go | 12 - qt/gen_qbrush.h | 5 - qt/gen_qbuffer.cpp | 23 +- qt/gen_qbuffer.go | 33 +- qt/gen_qbuffer.h | 3 - qt/gen_qbuttongroup.cpp | 66 - qt/gen_qbuttongroup.go | 113 - qt/gen_qbuttongroup.h | 11 - qt/gen_qbytearray.cpp | 614 +++--- qt/gen_qbytearray.go | 791 +++---- qt/gen_qbytearray.h | 227 +- qt/gen_qbytearraymatcher.cpp | 39 +- qt/gen_qbytearraymatcher.go | 64 +- qt/gen_qbytearraymatcher.h | 17 +- qt/gen_qbytearrayview.cpp | 343 +++ qt/gen_qbytearrayview.go | 381 ++++ qt/gen_qbytearrayview.h | 105 + qt/gen_qcalendar.cpp | 26 + qt/gen_qcalendar.go | 62 + qt/gen_qcalendar.h | 15 + qt/gen_qcalendarwidget.cpp | 33 +- qt/gen_qcalendarwidget.go | 65 +- qt/gen_qcalendarwidget.h | 3 - qt/gen_qcborarray.cpp | 21 +- qt/gen_qcborarray.go | 16 +- qt/gen_qcborarray.h | 13 +- qt/gen_qcbormap.cpp | 17 +- qt/gen_qcbormap.go | 20 +- qt/gen_qcbormap.h | 9 +- qt/gen_qcborvalue.cpp | 322 ++- qt/gen_qcborvalue.go | 427 +++- qt/gen_qcborvalue.h | 86 +- qt/gen_qchar.cpp | 182 -- qt/gen_qchar.go | 181 +- qt/gen_qchar.h | 40 - qt/gen_qcheckbox.cpp | 21 - qt/gen_qcheckbox.go | 31 - qt/gen_qcheckbox.h | 3 - qt/gen_qclipboard.cpp | 21 - qt/gen_qclipboard.go | 31 - qt/gen_qclipboard.h | 3 - qt/gen_qcollator.cpp | 4 +- qt/gen_qcollator.go | 4 +- qt/gen_qcollator.h | 2 +- qt/gen_qcolor.cpp | 261 +-- qt/gen_qcolor.go | 257 +-- qt/gen_qcolor.h | 113 +- qt/gen_qcolordialog.cpp | 41 - qt/gen_qcolordialog.go | 47 - qt/gen_qcolordialog.h | 7 - qt/gen_qcolormap.cpp | 2 +- qt/gen_qcolormap.go | 8 +- qt/gen_qcolorspace.cpp | 134 +- qt/gen_qcolorspace.go | 177 +- qt/gen_qcolorspace.h | 18 +- qt/gen_qcolortransform.cpp | 4 + qt/gen_qcolortransform.go | 4 + qt/gen_qcolortransform.h | 1 + qt/gen_qcolumnview.cpp | 21 - qt/gen_qcolumnview.go | 31 - qt/gen_qcolumnview.h | 3 - qt/gen_qcombobox.cpp | 83 - qt/gen_qcombobox.go | 125 +- qt/gen_qcombobox.h | 13 - qt/gen_qcommandlineoption.cpp | 8 - qt/gen_qcommandlineoption.go | 8 - qt/gen_qcommandlineoption.h | 2 - qt/gen_qcommandlineparser.cpp | 33 +- qt/gen_qcommandlineparser.go | 43 +- qt/gen_qcommandlineparser.h | 6 +- qt/gen_qcommandlinkbutton.cpp | 39 +- qt/gen_qcommandlinkbutton.go | 53 +- qt/gen_qcommandlinkbutton.h | 11 +- qt/gen_qcommonstyle.cpp | 21 - qt/gen_qcommonstyle.go | 31 - qt/gen_qcommonstyle.h | 3 - qt/gen_qcompare.cpp | 13 + qt/gen_qcompare.go | 71 + qt/gen_qcompare.h | 29 + qt/gen_qcompleter.cpp | 21 - qt/gen_qcompleter.go | 31 - qt/gen_qcompleter.h | 3 - qt/gen_qconcatenatetablesproxymodel.cpp | 21 - qt/gen_qconcatenatetablesproxymodel.go | 31 - qt/gen_qconcatenatetablesproxymodel.h | 3 - qt/gen_qcontainerfwd.cpp | 4 - qt/gen_qcontiguouscache.cpp | 4 +- qt/gen_qcontiguouscache.go | 4 +- qt/gen_qcontiguouscache.h | 2 +- qt/gen_qcoreapplication.cpp | 59 +- qt/gen_qcoreapplication.go | 89 +- qt/gen_qcoreapplication.h | 11 +- qt/gen_qcoreevent.cpp | 40 +- qt/gen_qcoreevent.go | 53 +- qt/gen_qcoreevent.h | 14 +- qt/gen_qcryptographichash.cpp | 13 +- qt/gen_qcryptographichash.go | 23 +- qt/gen_qcryptographichash.h | 9 +- qt/gen_qcursor.cpp | 20 +- qt/gen_qcursor.go | 30 +- qt/gen_qcursor.h | 8 +- qt/gen_qdatastream.cpp | 26 +- qt/gen_qdatastream.go | 38 +- qt/gen_qdatastream.h | 9 +- qt/gen_qdatawidgetmapper.cpp | 21 - qt/gen_qdatawidgetmapper.go | 31 - qt/gen_qdatawidgetmapper.h | 3 - qt/gen_qdatetime.cpp | 348 +-- qt/gen_qdatetime.go | 414 +--- qt/gen_qdatetime.h | 95 +- qt/gen_qdatetimeedit.cpp | 87 +- qt/gen_qdatetimeedit.go | 169 +- qt/gen_qdatetimeedit.h | 9 - qt/gen_qdebug.cpp | 7 + qt/gen_qdebug.go | 7 +- qt/gen_qdebug.h | 3 + qt/gen_qdesktopwidget.cpp | 181 -- qt/gen_qdesktopwidget.go | 299 --- qt/gen_qdesktopwidget.h | 70 - qt/gen_qdial.cpp | 21 - qt/gen_qdial.go | 31 - qt/gen_qdial.h | 3 - qt/gen_qdialog.cpp | 42 - qt/gen_qdialog.go | 51 - qt/gen_qdialog.h | 8 - qt/gen_qdialogbuttonbox.cpp | 21 - qt/gen_qdialogbuttonbox.go | 33 +- qt/gen_qdialogbuttonbox.h | 3 - qt/gen_qdir.cpp | 15 +- qt/gen_qdir.go | 18 +- qt/gen_qdir.h | 3 +- qt/gen_qdiriterator.cpp | 4 + qt/gen_qdiriterator.go | 7 + qt/gen_qdiriterator.h | 1 + qt/gen_qdirmodel.cpp | 343 --- qt/gen_qdirmodel.go | 453 ---- qt/gen_qdirmodel.h | 104 - qt/gen_qdockwidget.cpp | 21 - qt/gen_qdockwidget.go | 32 - qt/gen_qdockwidget.h | 3 - qt/gen_qdrag.cpp | 31 - qt/gen_qdrag.go | 39 - qt/gen_qdrag.h | 5 - qt/gen_qeasingcurve.cpp | 2 +- qt/gen_qeasingcurve.go | 8 +- qt/gen_qelapsedtimer.cpp | 8 - qt/gen_qelapsedtimer.go | 13 +- qt/gen_qelapsedtimer.h | 2 - qt/gen_qerrormessage.cpp | 21 - qt/gen_qerrormessage.go | 31 - qt/gen_qerrormessage.h | 3 - qt/gen_qevent.cpp | 1140 ++++------ qt/gen_qevent.go | 1517 ++++++------- qt/gen_qevent.h | 362 ++-- qt/gen_qeventloop.cpp | 29 +- qt/gen_qeventloop.go | 40 +- qt/gen_qeventloop.h | 5 +- qt/gen_qeventpoint.cpp | 217 ++ qt/gen_qeventpoint.go | 350 +++ qt/gen_qeventpoint.h | 87 + qt/gen_qeventtransition.cpp | 98 - qt/gen_qeventtransition.go | 163 -- qt/gen_qeventtransition.h | 50 - qt/gen_qexception.cpp | 33 +- qt/gen_qexception.go | 73 +- qt/gen_qexception.h | 16 +- qt/gen_qfile.cpp | 54 +- qt/gen_qfile.go | 67 +- qt/gen_qfile.h | 10 +- qt/gen_qfiledevice.cpp | 21 - qt/gen_qfiledevice.go | 39 +- qt/gen_qfiledevice.h | 3 - qt/gen_qfiledialog.cpp | 59 +- qt/gen_qfiledialog.go | 79 +- qt/gen_qfiledialog.h | 19 +- qt/gen_qfileiconprovider.cpp | 21 +- qt/gen_qfileiconprovider.go | 38 +- qt/gen_qfileiconprovider.h | 3 - qt/gen_qfileinfo.cpp | 26 +- qt/gen_qfileinfo.go | 27 +- qt/gen_qfileinfo.h | 13 +- qt/gen_qfileselector.cpp | 21 - qt/gen_qfileselector.go | 31 - qt/gen_qfileselector.h | 3 - qt/gen_qfilesystemmodel.cpp | 27 +- qt/gen_qfilesystemmodel.go | 37 +- qt/gen_qfilesystemmodel.h | 11 +- qt/gen_qfilesystemwatcher.cpp | 21 - qt/gen_qfilesystemwatcher.go | 31 - qt/gen_qfilesystemwatcher.h | 3 - qt/gen_qfinalstate.cpp | 72 - qt/gen_qfinalstate.go | 135 -- qt/gen_qfinalstate.h | 42 - qt/gen_qfloat16.cpp | 6 +- qt/gen_qfloat16.go | 10 +- qt/gen_qfloat16.h | 3 +- qt/gen_qfocusframe.cpp | 21 - qt/gen_qfocusframe.go | 31 - qt/gen_qfocusframe.h | 3 - qt/gen_qfont.cpp | 99 +- qt/gen_qfont.go | 139 +- qt/gen_qfont.h | 17 +- qt/gen_qfontcombobox.cpp | 52 +- qt/gen_qfontcombobox.go | 67 +- qt/gen_qfontcombobox.h | 8 +- qt/gen_qfontdatabase.cpp | 100 +- qt/gen_qfontdatabase.go | 100 +- qt/gen_qfontdatabase.h | 49 +- qt/gen_qfontdialog.cpp | 21 - qt/gen_qfontdialog.go | 31 - qt/gen_qfontdialog.h | 3 - qt/gen_qfontinfo.cpp | 4 +- qt/gen_qfontinfo.go | 4 +- qt/gen_qfontinfo.h | 2 +- qt/gen_qfontmetrics.cpp | 79 +- qt/gen_qfontmetrics.go | 110 +- qt/gen_qfontmetrics.h | 27 +- qt/gen_qformlayout.cpp | 45 +- qt/gen_qformlayout.go | 55 +- qt/gen_qformlayout.h | 9 +- qt/gen_qframe.cpp | 21 - qt/gen_qframe.go | 31 - qt/gen_qframe.h | 3 - qt/gen_qfutureinterface.cpp | 86 +- qt/gen_qfutureinterface.go | 92 +- qt/gen_qfutureinterface.h | 37 +- qt/gen_qfuturewatcher.cpp | 69 +- qt/gen_qfuturewatcher.go | 93 +- qt/gen_qfuturewatcher.h | 14 +- qt/gen_qgenericplugin.cpp | 21 - qt/gen_qgenericplugin.go | 31 - qt/gen_qgenericplugin.h | 3 - qt/gen_qgesture.cpp | 126 -- qt/gen_qgesture.go | 186 -- qt/gen_qgesture.h | 18 - qt/gen_qglyphrun.cpp | 8 +- qt/gen_qglyphrun.go | 8 +- qt/gen_qgraphicsanchorlayout.cpp | 21 - qt/gen_qgraphicsanchorlayout.go | 31 - qt/gen_qgraphicsanchorlayout.h | 3 - qt/gen_qgraphicseffect.cpp | 105 - qt/gen_qgraphicseffect.go | 155 -- qt/gen_qgraphicseffect.h | 15 - qt/gen_qgraphicsitem.cpp | 63 - qt/gen_qgraphicsitem.go | 89 - qt/gen_qgraphicsitem.h | 13 - qt/gen_qgraphicsitemanimation.cpp | 30 - qt/gen_qgraphicsitemanimation.go | 42 - qt/gen_qgraphicsitemanimation.h | 7 - qt/gen_qgraphicslayoutitem.cpp | 4 + qt/gen_qgraphicslayoutitem.go | 4 + qt/gen_qgraphicslayoutitem.h | 1 + qt/gen_qgraphicsproxywidget.cpp | 21 - qt/gen_qgraphicsproxywidget.go | 31 - qt/gen_qgraphicsproxywidget.h | 3 - qt/gen_qgraphicsscene.cpp | 91 +- qt/gen_qgraphicsscene.go | 95 +- qt/gen_qgraphicsscene.h | 15 +- qt/gen_qgraphicssceneevent.cpp | 34 + qt/gen_qgraphicssceneevent.go | 35 + qt/gen_qgraphicssceneevent.h | 8 + qt/gen_qgraphicstransform.cpp | 63 - qt/gen_qgraphicstransform.go | 93 - qt/gen_qgraphicstransform.h | 9 - qt/gen_qgraphicsview.cpp | 38 - qt/gen_qgraphicsview.go | 57 +- qt/gen_qgraphicsview.h | 9 - qt/gen_qgraphicswidget.cpp | 21 - qt/gen_qgraphicswidget.go | 31 - qt/gen_qgraphicswidget.h | 3 - qt/gen_qgridlayout.cpp | 29 +- qt/gen_qgridlayout.go | 39 +- qt/gen_qgridlayout.h | 7 +- qt/gen_qgroupbox.cpp | 21 - qt/gen_qgroupbox.go | 31 - qt/gen_qgroupbox.h | 3 - qt/gen_qguiapplication.cpp | 49 +- qt/gen_qguiapplication.go | 73 +- qt/gen_qguiapplication.h | 9 +- qt/gen_qguiapplication_platform.cpp | 5 + qt/gen_qguiapplication_platform.go | 35 + qt/gen_qguiapplication_platform.h | 31 + qt/gen_qhash.cpp | 45 +- qt/gen_qhash.go | 94 +- qt/gen_qhash.h | 29 +- qt/gen_qhashfunctions.cpp | 33 +- qt/gen_qhashfunctions.go | 75 +- qt/gen_qhashfunctions.h | 11 +- qt/gen_qheaderview.cpp | 40 +- qt/gen_qheaderview.go | 59 +- qt/gen_qheaderview.h | 7 +- qt/gen_qhistorystate.cpp | 107 - qt/gen_qhistorystate.go | 178 -- qt/gen_qhistorystate.h | 54 - qt/gen_qicon.cpp | 20 +- qt/gen_qicon.go | 37 +- qt/gen_qicon.h | 11 +- qt/gen_qiconengine.cpp | 23 +- qt/gen_qiconengine.go | 52 +- qt/gen_qiconengine.h | 20 +- qt/gen_qiconengineplugin.cpp | 21 - qt/gen_qiconengineplugin.go | 31 - qt/gen_qiconengineplugin.h | 3 - qt/gen_qidentityproxymodel.cpp | 21 - qt/gen_qidentityproxymodel.go | 31 - qt/gen_qidentityproxymodel.h | 3 - qt/gen_qimage.cpp | 108 +- qt/gen_qimage.go | 208 +- qt/gen_qimage.h | 43 +- qt/gen_qimageiohandler.cpp | 30 +- qt/gen_qimageiohandler.go | 43 +- qt/gen_qimageiohandler.h | 7 +- qt/gen_qimagereader.cpp | 37 +- qt/gen_qimagereader.go | 47 +- qt/gen_qimagereader.h | 7 +- qt/gen_qimagewriter.cpp | 41 - qt/gen_qimagewriter.go | 52 - qt/gen_qimagewriter.h | 7 - qt/gen_qinputdevice.cpp | 160 ++ qt/gen_qinputdevice.go | 267 +++ qt/gen_qinputdevice.h | 58 + qt/gen_qinputdialog.cpp | 33 +- qt/gen_qinputdialog.go | 47 +- qt/gen_qinputdialog.h | 5 +- qt/gen_qinputmethod.cpp | 21 - qt/gen_qinputmethod.go | 33 +- qt/gen_qinputmethod.h | 3 - qt/gen_qiodevice.cpp | 25 +- qt/gen_qiodevice.go | 55 +- qt/gen_qiodevice.h | 3 - qt/gen_qiodevicebase.cpp | 5 + qt/gen_qiodevicebase.go | 50 + qt/{gen_qlinkedlist.h => gen_qiodevicebase.h} | 10 +- qt/gen_qitemdelegate.cpp | 21 - qt/gen_qitemdelegate.go | 31 - qt/gen_qitemdelegate.h | 3 - qt/gen_qitemselectionmodel.cpp | 37 +- qt/gen_qitemselectionmodel.go | 51 +- qt/gen_qitemselectionmodel.h | 11 +- qt/gen_qjsonarray.cpp | 133 +- qt/gen_qjsonarray.go | 134 +- qt/gen_qjsonarray.h | 67 +- qt/gen_qjsondocument.cpp | 36 +- qt/gen_qjsondocument.go | 69 +- qt/gen_qjsondocument.h | 10 +- qt/gen_qjsonobject.cpp | 112 +- qt/gen_qjsonobject.go | 112 +- qt/gen_qjsonobject.h | 55 +- qt/gen_qjsonvalue.cpp | 245 ++- qt/gen_qjsonvalue.go | 360 ++-- qt/gen_qjsonvalue.h | 67 +- qt/gen_qkeyeventtransition.cpp | 98 - qt/gen_qkeyeventtransition.go | 163 -- qt/gen_qkeyeventtransition.h | 50 - qt/gen_qkeysequence.cpp | 33 +- qt/gen_qkeysequence.go | 59 +- qt/gen_qkeysequence.h | 20 +- qt/gen_qkeysequenceedit.cpp | 29 +- qt/gen_qkeysequenceedit.go | 39 +- qt/gen_qkeysequenceedit.h | 5 +- qt/gen_qlabel.cpp | 37 +- qt/gen_qlabel.go | 57 +- qt/gen_qlabel.h | 11 +- qt/gen_qlayout.cpp | 37 +- qt/gen_qlayout.go | 47 +- qt/gen_qlayout.h | 7 +- qt/gen_qlayoutitem.cpp | 8 +- qt/gen_qlayoutitem.go | 4 + qt/gen_qlayoutitem.h | 5 +- qt/gen_qlcdnumber.cpp | 21 - qt/gen_qlcdnumber.go | 31 - qt/gen_qlcdnumber.h | 3 - qt/gen_qlibrary.cpp | 21 - qt/gen_qlibrary.go | 31 - qt/gen_qlibrary.h | 3 - qt/gen_qlibraryinfo.cpp | 30 +- qt/gen_qlibraryinfo.go | 64 +- qt/gen_qlibraryinfo.h | 8 +- qt/gen_qline.cpp | 23 +- qt/gen_qline.go | 31 +- qt/gen_qline.h | 6 +- qt/gen_qlineedit.cpp | 30 +- qt/gen_qlineedit.go | 39 +- qt/gen_qlineedit.h | 7 +- qt/gen_qlinkedlist.cpp | 13 - qt/gen_qlinkedlist.go | 56 - qt/gen_qlistview.cpp | 21 - qt/gen_qlistview.go | 31 - qt/gen_qlistview.h | 3 - qt/gen_qlistwidget.cpp | 70 +- qt/gen_qlistwidget.go | 83 +- qt/gen_qlistwidget.h | 25 +- qt/gen_qlocale.cpp | 284 +-- qt/gen_qlocale.go | 1914 +++++++++-------- qt/gen_qlocale.h | 104 +- qt/gen_qlockfile.cpp | 7 + qt/gen_qlockfile.go | 7 + qt/gen_qlockfile.h | 1 + qt/gen_qmainwindow.cpp | 21 - qt/gen_qmainwindow.go | 31 - qt/gen_qmainwindow.h | 3 - qt/gen_qmap.cpp | 91 - qt/gen_qmap.go | 177 -- qt/gen_qmap.h | 51 - qt/gen_qmargins.cpp | 20 +- qt/gen_qmargins.go | 23 +- qt/gen_qmargins.h | 9 +- qt/gen_qmatrix.cpp | 178 -- qt/gen_qmatrix.go | 235 -- qt/gen_qmatrix.h | 80 - qt/gen_qmatrix4x4.cpp | 20 +- qt/gen_qmatrix4x4.go | 37 +- qt/gen_qmatrix4x4.h | 8 +- qt/gen_qmdiarea.cpp | 21 - qt/gen_qmdiarea.go | 31 - qt/gen_qmdiarea.h | 3 - qt/gen_qmdisubwindow.cpp | 21 - qt/gen_qmdisubwindow.go | 31 - qt/gen_qmdisubwindow.h | 3 - qt/gen_qmenu.cpp | 35 +- qt/gen_qmenu.go | 47 +- qt/gen_qmenu.h | 6 +- qt/gen_qmenubar.cpp | 26 - qt/gen_qmenubar.go | 37 - qt/gen_qmenubar.h | 4 - qt/gen_qmessageauthenticationcode.cpp | 4 +- qt/gen_qmessageauthenticationcode.go | 4 +- qt/gen_qmessageauthenticationcode.h | 2 +- qt/gen_qmessagebox.cpp | 105 +- qt/gen_qmessagebox.go | 151 +- qt/gen_qmessagebox.h | 33 +- qt/gen_qmetacontainer.cpp | 398 ++++ qt/gen_qmetacontainer.go | 649 ++++++ qt/gen_qmetacontainer.h | 152 ++ qt/gen_qmetaobject.cpp | 66 +- qt/gen_qmetaobject.go | 79 +- qt/gen_qmetaobject.h | 20 +- qt/gen_qmetatype.cpp | 354 ++- qt/gen_qmetatype.go | 740 ++----- qt/gen_qmetatype.h | 159 +- qt/gen_qmimedata.cpp | 21 - qt/gen_qmimedata.go | 31 - qt/gen_qmimedata.h | 3 - qt/gen_qmouseeventtransition.cpp | 108 - qt/gen_qmouseeventtransition.go | 174 -- qt/gen_qmouseeventtransition.h | 54 - qt/gen_qmovie.cpp | 21 - qt/gen_qmovie.go | 31 - qt/gen_qmovie.h | 3 - qt/gen_qmutex.cpp | 75 +- qt/gen_qmutex.go | 121 +- qt/gen_qmutex.h | 23 +- qt/gen_qnamespace.cpp | 64 + qt/gen_qnamespace.go | 387 ++-- qt/gen_qnamespace.h | 25 + qt/gen_qobject.cpp | 66 +- qt/gen_qobject.go | 103 +- qt/gen_qobject.h | 26 +- qt/gen_qobjectcleanuphandler.cpp | 21 - qt/gen_qobjectcleanuphandler.go | 31 - qt/gen_qobjectcleanuphandler.h | 3 - qt/gen_qobjectdefs.cpp | 31 + qt/gen_qobjectdefs.go | 114 +- qt/gen_qobjectdefs.h | 19 + qt/gen_qoffscreensurface.cpp | 41 +- qt/gen_qoffscreensurface.go | 51 +- qt/gen_qoffscreensurface.h | 11 +- qt/gen_qoperatingsystemversion.cpp | 88 +- qt/gen_qoperatingsystemversion.go | 172 +- qt/gen_qoperatingsystemversion.h | 29 +- qt/gen_qpagedpaintdevice.cpp | 36 +- qt/gen_qpagedpaintdevice.go | 201 +- qt/gen_qpagedpaintdevice.h | 22 +- qt/gen_qpageranges.cpp | 103 + qt/gen_qpageranges.go | 184 ++ qt/gen_qpageranges.h | 54 + qt/gen_qpagesize.go | 64 +- qt/gen_qpaintdevice.cpp | 5 +- qt/gen_qpaintdevice.go | 4 +- qt/gen_qpaintdevice.h | 2 +- qt/gen_qpaintdevicewindow.cpp | 21 - qt/gen_qpaintdevicewindow.go | 31 - qt/gen_qpaintdevicewindow.h | 3 - qt/gen_qpaintengine.cpp | 18 +- qt/gen_qpaintengine.go | 51 +- qt/gen_qpaintengine.h | 8 +- qt/gen_qpainter.cpp | 123 +- qt/gen_qpainter.go | 120 +- qt/gen_qpainter.h | 28 - qt/gen_qpainterpath.cpp | 24 +- qt/gen_qpainterpath.go | 23 - qt/gen_qpainterpath.h | 5 - qt/gen_qpalette.cpp | 26 +- qt/gen_qpalette.go | 22 +- qt/gen_qpalette.h | 8 +- qt/gen_qparallelanimationgroup.cpp | 21 - qt/gen_qparallelanimationgroup.go | 31 - qt/gen_qparallelanimationgroup.h | 3 - qt/gen_qpauseanimation.cpp | 21 - qt/gen_qpauseanimation.go | 31 - qt/gen_qpauseanimation.h | 3 - qt/gen_qpdfwriter.cpp | 35 - qt/gen_qpdfwriter.go | 43 - qt/gen_qpdfwriter.h | 14 - qt/gen_qpen.cpp | 4 +- qt/gen_qpicture.cpp | 226 -- qt/gen_qpicture.go | 291 --- qt/gen_qpicture.h | 42 - qt/gen_qpictureformatplugin.cpp | 81 - qt/gen_qpictureformatplugin.go | 145 -- qt/gen_qpictureformatplugin.h | 43 - qt/gen_qpixmap.cpp | 79 +- qt/gen_qpixmap.go | 119 +- qt/gen_qpixmap.h | 33 +- qt/gen_qpixmapcache.cpp | 14 +- qt/gen_qpixmapcache.go | 20 +- qt/gen_qpixmapcache.h | 6 +- qt/gen_qplaintextedit.cpp | 65 +- qt/gen_qplaintextedit.go | 88 +- qt/gen_qplaintextedit.h | 18 +- qt/gen_qplugin.cpp | 41 + qt/gen_qplugin.go | 172 ++ qt/gen_qplugin.h | 33 + qt/gen_qpluginloader.cpp | 23 +- qt/gen_qpluginloader.go | 39 +- qt/gen_qpluginloader.h | 3 - qt/gen_qpoint.cpp | 4 + qt/gen_qpoint.go | 7 + qt/gen_qpoint.h | 1 + qt/gen_qpointingdevice.cpp | 161 ++ qt/gen_qpointingdevice.go | 299 +++ qt/gen_qpointingdevice.h | 68 + qt/gen_qprocess.cpp | 234 +- qt/gen_qprocess.go | 309 ++- qt/gen_qprocess.h | 36 +- qt/gen_qprogressbar.cpp | 21 - qt/gen_qprogressbar.go | 31 - qt/gen_qprogressbar.h | 3 - qt/gen_qprogressdialog.cpp | 21 - qt/gen_qprogressdialog.go | 31 - qt/gen_qprogressdialog.h | 3 - qt/gen_qproperty.cpp | 185 ++ qt/gen_qproperty.go | 516 +++++ qt/gen_qproperty.h | 95 + qt/gen_qpropertyanimation.cpp | 21 - qt/gen_qpropertyanimation.go | 31 - qt/gen_qpropertyanimation.h | 3 - qt/gen_qpropertyprivate.cpp | 90 + qt/gen_qpropertyprivate.go | 351 +++ qt/gen_qpropertyprivate.h | 95 + qt/gen_qproxystyle.cpp | 21 - qt/gen_qproxystyle.go | 31 - qt/gen_qproxystyle.h | 3 - qt/gen_qpushbutton.cpp | 21 - qt/gen_qpushbutton.go | 31 - qt/gen_qpushbutton.h | 3 - qt/gen_qquaternion.cpp | 4 - qt/gen_qquaternion.go | 7 - qt/gen_qquaternion.h | 1 - qt/gen_qradiobutton.cpp | 21 - qt/gen_qradiobutton.go | 31 - qt/gen_qradiobutton.h | 3 - qt/gen_qrandom.cpp | 40 + qt/gen_qrandom.go | 32 + qt/gen_qrandom.h | 8 + qt/gen_qrasterwindow.cpp | 21 - qt/gen_qrasterwindow.go | 31 - qt/gen_qrasterwindow.h | 3 - qt/gen_qrawfont.cpp | 10 +- qt/gen_qrawfont.go | 16 +- qt/gen_qrect.cpp | 8 + qt/gen_qrect.go | 14 + qt/gen_qrect.h | 2 + qt/gen_qrefcount.cpp | 8 - qt/gen_qrefcount.go | 8 - qt/gen_qrefcount.h | 2 - qt/gen_qregexp.cpp | 239 -- qt/gen_qregexp.go | 311 --- qt/gen_qregexp.h | 69 - qt/gen_qregion.cpp | 14 - qt/gen_qregion.go | 14 - qt/gen_qregion.h | 1 - qt/gen_qregularexpression.cpp | 119 +- qt/gen_qregularexpression.go | 203 +- qt/gen_qregularexpression.h | 55 +- qt/gen_qresource.cpp | 26 - qt/gen_qresource.go | 24 - qt/gen_qresource.h | 3 - qt/gen_qresultstore.cpp | 36 +- qt/gen_qresultstore.go | 50 +- qt/gen_qresultstore.h | 9 +- qt/gen_qrgbafloat.cpp | 4 + ...gen_qcontainerfwd.go => gen_qrgbafloat.go} | 2 +- qt/{gen_qcontainerfwd.h => gen_qrgbafloat.h} | 4 +- qt/gen_qrubberband.cpp | 21 - qt/gen_qrubberband.go | 31 - qt/gen_qrubberband.h | 3 - qt/gen_qrunnable.cpp | 8 +- qt/gen_qrunnable.go | 8 +- qt/gen_qrunnable.h | 3 +- qt/gen_qsavefile.cpp | 23 +- qt/gen_qsavefile.go | 33 +- qt/gen_qsavefile.h | 3 - qt/gen_qscopedpointer.cpp | 4 + qt/gen_qscopedpointer.go | 4 + qt/gen_qscopedpointer.h | 1 + qt/gen_qscreen.cpp | 34 +- qt/gen_qscreen.go | 46 +- qt/gen_qscreen.h | 8 +- qt/gen_qscrollarea.cpp | 21 - qt/gen_qscrollarea.go | 31 - qt/gen_qscrollarea.h | 3 - qt/gen_qscrollbar.cpp | 21 - qt/gen_qscrollbar.go | 31 - qt/gen_qscrollbar.h | 3 - qt/gen_qscroller.cpp | 21 - qt/gen_qscroller.go | 31 - qt/gen_qscroller.h | 3 - qt/gen_qsemaphore.cpp | 4 + qt/gen_qsemaphore.go | 4 + qt/gen_qsemaphore.h | 1 + qt/gen_qsequentialanimationgroup.cpp | 21 - qt/gen_qsequentialanimationgroup.go | 31 - qt/gen_qsequentialanimationgroup.h | 3 - qt/gen_qsessionmanager.cpp | 21 - qt/gen_qsessionmanager.go | 31 - qt/gen_qsessionmanager.h | 3 - qt/gen_qsettings.cpp | 94 +- qt/gen_qsettings.go | 121 +- qt/gen_qsettings.h | 30 +- qt/gen_qshareddata.cpp | 9 + qt/gen_qshareddata.go | 42 + qt/gen_qshareddata.h | 5 + qt/gen_qsharedmemory.cpp | 34 +- qt/gen_qsharedmemory.go | 43 +- qt/gen_qsharedmemory.h | 9 +- qt/gen_qshortcut.cpp | 103 +- qt/gen_qshortcut.go | 145 +- qt/gen_qshortcut.h | 29 +- qt/gen_qsignalmapper.cpp | 91 +- qt/gen_qsignalmapper.go | 148 +- qt/gen_qsignalmapper.h | 19 +- qt/gen_qsignaltransition.cpp | 98 - qt/gen_qsignaltransition.go | 170 -- qt/gen_qsignaltransition.h | 52 - qt/gen_qsize.cpp | 4 + qt/gen_qsize.go | 7 + qt/gen_qsize.h | 1 + qt/gen_qsizegrip.cpp | 21 - qt/gen_qsizegrip.go | 31 - qt/gen_qsizegrip.h | 3 - qt/gen_qslider.cpp | 21 - qt/gen_qslider.go | 31 - qt/gen_qslider.h | 3 - qt/gen_qsocketnotifier.cpp | 37 +- qt/gen_qsocketnotifier.go | 55 +- qt/gen_qsocketnotifier.h | 11 +- qt/gen_qsortfilterproxymodel.cpp | 50 +- qt/gen_qsortfilterproxymodel.go | 72 +- qt/gen_qsortfilterproxymodel.h | 13 +- qt/gen_qspinbox.cpp | 72 - qt/gen_qspinbox.go | 112 - qt/gen_qspinbox.h | 10 - qt/gen_qsplashscreen.cpp | 41 +- qt/gen_qsplashscreen.go | 65 +- qt/gen_qsplashscreen.h | 14 +- qt/gen_qsplitter.cpp | 42 - qt/gen_qsplitter.go | 62 - qt/gen_qsplitter.h | 6 - qt/gen_qstackedlayout.cpp | 21 - qt/gen_qstackedlayout.go | 31 - qt/gen_qstackedlayout.h | 3 - qt/gen_qstackedwidget.cpp | 21 - qt/gen_qstackedwidget.go | 31 - qt/gen_qstackedwidget.h | 3 - qt/gen_qstandarditemmodel.cpp | 42 +- qt/gen_qstandarditemmodel.go | 54 +- qt/gen_qstandarditemmodel.h | 10 +- qt/gen_qstandardpaths.cpp | 4 - qt/gen_qstandardpaths.go | 9 +- qt/gen_qstandardpaths.h | 1 - qt/gen_qstate.cpp | 143 -- qt/gen_qstate.go | 220 -- qt/gen_qstate.h | 64 - qt/gen_qstatemachine.cpp | 246 --- qt/gen_qstatemachine.go | 399 ---- qt/gen_qstatemachine.h | 97 - qt/gen_qstatusbar.cpp | 21 - qt/gen_qstatusbar.go | 31 - qt/gen_qstatusbar.h | 3 - qt/gen_qstringconverter.cpp | 74 + qt/gen_qstringconverter.go | 175 ++ qt/gen_qstringconverter.h | 50 + qt/gen_qstringconverter_base.cpp | 55 + qt/gen_qstringconverter_base.go | 175 ++ qt/gen_qstringconverter_base.h | 49 + qt/gen_qstringfwd.cpp | 4 + qt/gen_qstringfwd.go | 9 + qt/gen_qstringfwd.h | 24 + qt/gen_qstringlistmodel.cpp | 25 +- qt/gen_qstringlistmodel.go | 35 +- qt/gen_qstringlistmodel.h | 4 +- qt/gen_qstringliteral.cpp | 5 - qt/gen_qstringliteral.go | 41 - qt/gen_qstringliteral.h | 4 - qt/gen_qstringmatcher.cpp | 28 +- qt/gen_qstringmatcher.go | 24 +- qt/gen_qstringmatcher.h | 12 +- qt/gen_qstringtokenizer.cpp | 9 + qt/gen_qstringtokenizer.go | 41 + qt/gen_qstringtokenizer.h | 28 + qt/gen_qstringview.cpp | 77 +- qt/gen_qstringview.go | 68 +- qt/gen_qstringview.h | 26 +- qt/gen_qstyle.cpp | 18 +- qt/gen_qstyle.go | 248 +-- qt/gen_qstyle.h | 4 +- qt/gen_qstyleditemdelegate.cpp | 21 - qt/gen_qstyleditemdelegate.go | 31 - qt/gen_qstyleditemdelegate.h | 3 - qt/gen_qstylehints.cpp | 21 - qt/gen_qstylehints.go | 31 - qt/gen_qstylehints.h | 3 - qt/gen_qstyleoption.cpp | 34 +- qt/gen_qstyleoption.go | 140 +- qt/gen_qstyleoption.h | 14 +- qt/gen_qstyleplugin.cpp | 21 - qt/gen_qstyleplugin.go | 31 - qt/gen_qstyleplugin.h | 3 - qt/gen_qsurface.go | 1 + qt/gen_qsurfaceformat.cpp | 26 +- qt/gen_qsurfaceformat.go | 29 +- qt/gen_qsurfaceformat.h | 13 +- qt/gen_qsyntaxhighlighter.cpp | 21 - qt/gen_qsyntaxhighlighter.go | 31 - qt/gen_qsyntaxhighlighter.h | 3 - qt/gen_qsystemsemaphore.cpp | 21 + qt/gen_qsystemsemaphore.go | 31 + qt/gen_qsystemsemaphore.h | 3 + qt/gen_qsystemtrayicon.cpp | 21 - qt/gen_qsystemtrayicon.go | 31 - qt/gen_qsystemtrayicon.h | 3 - qt/gen_qtabbar.cpp | 21 - qt/gen_qtabbar.go | 31 - qt/gen_qtabbar.h | 3 - qt/gen_qtableview.cpp | 27 +- qt/gen_qtableview.go | 39 +- qt/gen_qtableview.h | 6 +- qt/gen_qtablewidget.cpp | 77 +- qt/gen_qtablewidget.go | 93 +- qt/gen_qtablewidget.h | 22 +- qt/gen_qtabwidget.cpp | 21 - qt/gen_qtabwidget.go | 31 - qt/gen_qtabwidget.h | 3 - qt/gen_qtemporarydir.cpp | 4 + qt/gen_qtemporarydir.go | 4 + qt/gen_qtemporarydir.h | 1 + qt/gen_qtemporaryfile.cpp | 30 - qt/gen_qtemporaryfile.go | 41 - qt/gen_qtemporaryfile.h | 5 - qt/gen_qtestsupport_gui.cpp | 61 + qt/gen_qtestsupport_gui.go | 86 + qt/gen_qtestsupport_gui.h | 45 + qt/gen_qtestsupport_widgets.cpp | 65 + qt/gen_qtestsupport_widgets.go | 93 + qt/gen_qtestsupport_widgets.h | 46 + qt/gen_qtextboundaryfinder.cpp | 31 +- qt/gen_qtextboundaryfinder.go | 28 +- qt/gen_qtextboundaryfinder.h | 14 +- qt/gen_qtextbrowser.cpp | 40 +- qt/gen_qtextbrowser.go | 60 +- qt/gen_qtextbrowser.h | 7 +- qt/gen_qtextcodec.cpp | 234 -- qt/gen_qtextcodec.go | 404 ---- qt/gen_qtextcodec.h | 87 - qt/gen_qtextcursor.cpp | 10 + qt/gen_qtextcursor.go | 12 + qt/gen_qtextcursor.h | 2 + qt/gen_qtextdocument.cpp | 97 +- qt/gen_qtextdocument.go | 126 +- qt/gen_qtextdocument.h | 31 +- qt/gen_qtextdocumentfragment.cpp | 35 +- qt/gen_qtextdocumentfragment.go | 42 +- qt/gen_qtextdocumentfragment.h | 8 +- qt/gen_qtextdocumentwriter.cpp | 9 - qt/gen_qtextdocumentwriter.go | 8 - qt/gen_qtextdocumentwriter.h | 4 - qt/gen_qtextedit.cpp | 44 +- qt/gen_qtextedit.go | 57 +- qt/gen_qtextedit.h | 15 +- qt/gen_qtextformat.cpp | 67 +- qt/gen_qtextformat.go | 91 +- qt/gen_qtextformat.h | 16 +- qt/gen_qtextlayout.cpp | 51 +- qt/gen_qtextlayout.go | 56 +- qt/gen_qtextlayout.h | 8 +- qt/gen_qtextlist.cpp | 25 - qt/gen_qtextlist.go | 35 - qt/gen_qtextlist.h | 4 - qt/gen_qtextobject.cpp | 81 +- qt/gen_qtextobject.go | 117 +- qt/gen_qtextobject.h | 15 +- qt/gen_qtextoption.cpp | 15 +- qt/gen_qtextoption.go | 18 +- qt/gen_qtextoption.h | 5 +- qt/gen_qtextstream.cpp | 18 +- qt/gen_qtextstream.go | 21 +- qt/gen_qtextstream.h | 7 +- qt/gen_qtexttable.cpp | 21 - qt/gen_qtexttable.go | 31 - qt/gen_qtexttable.h | 3 - qt/gen_qthread.cpp | 33 +- qt/gen_qthread.go | 43 +- qt/gen_qthread.h | 7 +- qt/gen_qthreadpool.cpp | 38 +- qt/gen_qthreadpool.go | 47 +- qt/gen_qthreadpool.h | 7 +- qt/gen_qtimeline.cpp | 30 - qt/gen_qtimeline.go | 50 - qt/gen_qtimeline.h | 5 - qt/gen_qtimer.cpp | 21 - qt/gen_qtimer.go | 31 - qt/gen_qtimer.h | 3 - qt/gen_qtimezone.cpp | 29 +- qt/gen_qtimezone.go | 32 +- qt/gen_qtimezone.h | 13 +- qt/gen_qtoolbar.cpp | 32 - qt/gen_qtoolbar.go | 43 - qt/gen_qtoolbar.h | 7 - qt/gen_qtoolbox.cpp | 21 - qt/gen_qtoolbox.go | 31 - qt/gen_qtoolbox.h | 3 - qt/gen_qtoolbutton.cpp | 21 - qt/gen_qtoolbutton.go | 31 - qt/gen_qtoolbutton.h | 3 - qt/gen_qtooltip.cpp | 22 +- qt/gen_qtooltip.go | 28 +- qt/gen_qtooltip.h | 6 +- qt/gen_qtouchdevice.cpp | 68 - qt/gen_qtouchdevice.go | 123 -- qt/gen_qtouchdevice.h | 38 - qt/gen_qtransform.cpp | 26 +- qt/gen_qtransform.go | 28 +- qt/gen_qtransform.h | 10 +- qt/gen_qtranslator.cpp | 21 - qt/gen_qtranslator.go | 31 - qt/gen_qtranslator.h | 3 - qt/gen_qtransposeproxymodel.cpp | 21 - qt/gen_qtransposeproxymodel.go | 31 - qt/gen_qtransposeproxymodel.h | 3 - qt/gen_qtreeview.cpp | 29 +- qt/gen_qtreeview.go | 39 +- qt/gen_qtreeview.h | 6 +- qt/gen_qtreewidget.cpp | 83 +- qt/gen_qtreewidget.go | 103 +- qt/gen_qtreewidget.h | 24 +- qt/gen_qundogroup.cpp | 21 - qt/gen_qundogroup.go | 31 - qt/gen_qundogroup.h | 3 - qt/gen_qundostack.cpp | 21 - qt/gen_qundostack.go | 31 - qt/gen_qundostack.h | 3 - qt/gen_qundoview.cpp | 21 - qt/gen_qundoview.go | 31 - qt/gen_qundoview.h | 3 - qt/gen_qurl.cpp | 66 +- qt/gen_qurl.go | 93 +- qt/gen_qurl.h | 28 +- qt/gen_qurlquery.cpp | 16 +- qt/gen_qurlquery.go | 22 +- qt/gen_qurlquery.h | 10 +- qt/gen_qutf8stringview.cpp | 14 + qt/gen_qutf8stringview.go | 86 + qt/gen_qutf8stringview.h | 40 + qt/gen_quuid.cpp | 41 +- qt/gen_quuid.go | 57 +- qt/gen_quuid.h | 17 +- qt/gen_qvalidator.cpp | 200 +- qt/gen_qvalidator.go | 309 +-- qt/gen_qvalidator.h | 40 +- qt/gen_qvariant.cpp | 391 +--- qt/gen_qvariant.go | 781 ++----- qt/gen_qvariant.h | 214 +- qt/gen_qvariantanimation.cpp | 21 - qt/gen_qvariantanimation.go | 31 - qt/gen_qvariantanimation.h | 3 - qt/gen_qvarlengtharray.cpp | 18 + qt/gen_qvarlengtharray.go | 47 + qt/gen_qvarlengtharray.h | 30 + qt/gen_qvector2d.cpp | 149 -- qt/gen_qvector2d.go | 205 -- qt/gen_qvector2d.h | 67 - qt/gen_qvector3d.cpp | 191 -- qt/gen_qvector3d.go | 262 --- qt/gen_qvector3d.h | 81 - qt/gen_qvector4d.cpp | 173 -- qt/gen_qvector4d.go | 239 -- qt/gen_qvector4d.h | 73 - qt/gen_qvectornd.cpp | 495 +++++ qt/gen_qvectornd.go | 678 ++++++ qt/gen_qvectornd.h | 153 ++ qt/gen_qversionnumber.cpp | 67 +- qt/gen_qversionnumber.go | 101 +- qt/gen_qversionnumber.h | 23 +- qt/gen_qwidget.cpp | 90 +- qt/gen_qwidget.go | 121 +- qt/gen_qwidget.h | 30 +- qt/gen_qwidgetaction.cpp | 21 - qt/gen_qwidgetaction.go | 31 - qt/gen_qwidgetaction.h | 3 - qt/gen_qwindow.cpp | 40 +- qt/gen_qwindow.go | 59 +- qt/gen_qwindow.h | 15 +- qt/gen_qwizard.cpp | 59 +- qt/gen_qwizard.go | 77 +- qt/gen_qwizard.h | 8 +- qt/gen_qxmlstream.cpp | 94 +- qt/gen_qxmlstream.go | 153 +- qt/gen_qxmlstream.h | 36 +- 1010 files changed, 23638 insertions(+), 37552 deletions(-) create mode 100644 qt/gen_qabstractfileiconprovider.cpp create mode 100644 qt/gen_qabstractfileiconprovider.go create mode 100644 qt/gen_qabstractfileiconprovider.h delete mode 100644 qt/gen_qabstractstate.cpp delete mode 100644 qt/gen_qabstractstate.go delete mode 100644 qt/gen_qabstractstate.h delete mode 100644 qt/gen_qabstracttransition.cpp delete mode 100644 qt/gen_qabstracttransition.go delete mode 100644 qt/gen_qabstracttransition.h create mode 100644 qt/gen_qaccessible_base.cpp create mode 100644 qt/gen_qaccessible_base.go create mode 100644 qt/gen_qaccessible_base.h create mode 100644 qt/gen_qanystringview.cpp create mode 100644 qt/gen_qanystringview.go create mode 100644 qt/gen_qanystringview.h create mode 100644 qt/gen_qbindingstorage.cpp create mode 100644 qt/gen_qbindingstorage.go create mode 100644 qt/gen_qbindingstorage.h create mode 100644 qt/gen_qbytearrayview.cpp create mode 100644 qt/gen_qbytearrayview.go create mode 100644 qt/gen_qbytearrayview.h create mode 100644 qt/gen_qcompare.cpp create mode 100644 qt/gen_qcompare.go create mode 100644 qt/gen_qcompare.h delete mode 100644 qt/gen_qcontainerfwd.cpp delete mode 100644 qt/gen_qdesktopwidget.cpp delete mode 100644 qt/gen_qdesktopwidget.go delete mode 100644 qt/gen_qdesktopwidget.h delete mode 100644 qt/gen_qdirmodel.cpp delete mode 100644 qt/gen_qdirmodel.go delete mode 100644 qt/gen_qdirmodel.h create mode 100644 qt/gen_qeventpoint.cpp create mode 100644 qt/gen_qeventpoint.go create mode 100644 qt/gen_qeventpoint.h delete mode 100644 qt/gen_qeventtransition.cpp delete mode 100644 qt/gen_qeventtransition.go delete mode 100644 qt/gen_qeventtransition.h delete mode 100644 qt/gen_qfinalstate.cpp delete mode 100644 qt/gen_qfinalstate.go delete mode 100644 qt/gen_qfinalstate.h create mode 100644 qt/gen_qguiapplication_platform.cpp create mode 100644 qt/gen_qguiapplication_platform.go create mode 100644 qt/gen_qguiapplication_platform.h delete mode 100644 qt/gen_qhistorystate.cpp delete mode 100644 qt/gen_qhistorystate.go delete mode 100644 qt/gen_qhistorystate.h create mode 100644 qt/gen_qinputdevice.cpp create mode 100644 qt/gen_qinputdevice.go create mode 100644 qt/gen_qinputdevice.h create mode 100644 qt/gen_qiodevicebase.cpp create mode 100644 qt/gen_qiodevicebase.go rename qt/{gen_qlinkedlist.h => gen_qiodevicebase.h} (55%) delete mode 100644 qt/gen_qkeyeventtransition.cpp delete mode 100644 qt/gen_qkeyeventtransition.go delete mode 100644 qt/gen_qkeyeventtransition.h delete mode 100644 qt/gen_qlinkedlist.cpp delete mode 100644 qt/gen_qlinkedlist.go delete mode 100644 qt/gen_qmap.cpp delete mode 100644 qt/gen_qmap.go delete mode 100644 qt/gen_qmap.h delete mode 100644 qt/gen_qmatrix.cpp delete mode 100644 qt/gen_qmatrix.go delete mode 100644 qt/gen_qmatrix.h create mode 100644 qt/gen_qmetacontainer.cpp create mode 100644 qt/gen_qmetacontainer.go create mode 100644 qt/gen_qmetacontainer.h delete mode 100644 qt/gen_qmouseeventtransition.cpp delete mode 100644 qt/gen_qmouseeventtransition.go delete mode 100644 qt/gen_qmouseeventtransition.h create mode 100644 qt/gen_qpageranges.cpp create mode 100644 qt/gen_qpageranges.go create mode 100644 qt/gen_qpageranges.h delete mode 100644 qt/gen_qpictureformatplugin.cpp delete mode 100644 qt/gen_qpictureformatplugin.go delete mode 100644 qt/gen_qpictureformatplugin.h create mode 100644 qt/gen_qpointingdevice.cpp create mode 100644 qt/gen_qpointingdevice.go create mode 100644 qt/gen_qpointingdevice.h create mode 100644 qt/gen_qproperty.cpp create mode 100644 qt/gen_qproperty.go create mode 100644 qt/gen_qproperty.h create mode 100644 qt/gen_qpropertyprivate.cpp create mode 100644 qt/gen_qpropertyprivate.go create mode 100644 qt/gen_qpropertyprivate.h delete mode 100644 qt/gen_qregexp.cpp delete mode 100644 qt/gen_qregexp.go delete mode 100644 qt/gen_qregexp.h create mode 100644 qt/gen_qrgbafloat.cpp rename qt/{gen_qcontainerfwd.go => gen_qrgbafloat.go} (62%) rename qt/{gen_qcontainerfwd.h => gen_qrgbafloat.h} (82%) delete mode 100644 qt/gen_qsignaltransition.cpp delete mode 100644 qt/gen_qsignaltransition.go delete mode 100644 qt/gen_qsignaltransition.h delete mode 100644 qt/gen_qstate.cpp delete mode 100644 qt/gen_qstate.go delete mode 100644 qt/gen_qstate.h delete mode 100644 qt/gen_qstatemachine.cpp delete mode 100644 qt/gen_qstatemachine.go delete mode 100644 qt/gen_qstatemachine.h create mode 100644 qt/gen_qstringconverter.cpp create mode 100644 qt/gen_qstringconverter.go create mode 100644 qt/gen_qstringconverter.h create mode 100644 qt/gen_qstringconverter_base.cpp create mode 100644 qt/gen_qstringconverter_base.go create mode 100644 qt/gen_qstringconverter_base.h create mode 100644 qt/gen_qstringfwd.cpp create mode 100644 qt/gen_qstringfwd.go create mode 100644 qt/gen_qstringfwd.h create mode 100644 qt/gen_qstringtokenizer.cpp create mode 100644 qt/gen_qstringtokenizer.go create mode 100644 qt/gen_qstringtokenizer.h create mode 100644 qt/gen_qtestsupport_gui.cpp create mode 100644 qt/gen_qtestsupport_gui.go create mode 100644 qt/gen_qtestsupport_gui.h create mode 100644 qt/gen_qtestsupport_widgets.cpp create mode 100644 qt/gen_qtestsupport_widgets.go create mode 100644 qt/gen_qtestsupport_widgets.h delete mode 100644 qt/gen_qtextcodec.cpp delete mode 100644 qt/gen_qtextcodec.go delete mode 100644 qt/gen_qtextcodec.h delete mode 100644 qt/gen_qtouchdevice.cpp delete mode 100644 qt/gen_qtouchdevice.go delete mode 100644 qt/gen_qtouchdevice.h create mode 100644 qt/gen_qutf8stringview.cpp create mode 100644 qt/gen_qutf8stringview.go create mode 100644 qt/gen_qutf8stringview.h create mode 100644 qt/gen_qvarlengtharray.cpp create mode 100644 qt/gen_qvarlengtharray.go create mode 100644 qt/gen_qvarlengtharray.h delete mode 100644 qt/gen_qvector2d.cpp delete mode 100644 qt/gen_qvector2d.go delete mode 100644 qt/gen_qvector2d.h delete mode 100644 qt/gen_qvector3d.cpp delete mode 100644 qt/gen_qvector3d.go delete mode 100644 qt/gen_qvector3d.h delete mode 100644 qt/gen_qvector4d.cpp delete mode 100644 qt/gen_qvector4d.go delete mode 100644 qt/gen_qvector4d.h create mode 100644 qt/gen_qvectornd.cpp create mode 100644 qt/gen_qvectornd.go create mode 100644 qt/gen_qvectornd.h diff --git a/qt/gen_qabstractanimation.cpp b/qt/gen_qabstractanimation.cpp index 4a70573..5c3623c 100644 --- a/qt/gen_qabstractanimation.cpp +++ b/qt/gen_qabstractanimation.cpp @@ -25,13 +25,6 @@ struct miqt_string* QAbstractAnimation_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAbstractAnimation_TrUtf8(const char* s) { - QString _ret = QAbstractAnimation::trUtf8(s); - // 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()); -} - int QAbstractAnimation_State(const QAbstractAnimation* self) { QAbstractAnimation::State _ret = self->state(); return static_cast(_ret); @@ -163,20 +156,6 @@ struct miqt_string* QAbstractAnimation_Tr3(const char* s, const char* c, int n) return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAbstractAnimation_TrUtf82(const char* s, const char* c) { - QString _ret = QAbstractAnimation::trUtf8(s, c); - // 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* QAbstractAnimation_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QAbstractAnimation::trUtf8(s, c, static_cast(n)); - // 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 QAbstractAnimation_Start1(QAbstractAnimation* self, int policy) { self->start(static_cast(policy)); } @@ -208,13 +187,6 @@ struct miqt_string* QAnimationDriver_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAnimationDriver_TrUtf8(const char* s) { - QString _ret = QAnimationDriver::trUtf8(s); - // 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 QAnimationDriver_Advance(QAnimationDriver* self) { self->advance(); } @@ -236,15 +208,6 @@ long long QAnimationDriver_Elapsed(const QAnimationDriver* self) { return static_cast(_ret); } -void QAnimationDriver_SetStartTime(QAnimationDriver* self, long long startTime) { - self->setStartTime(static_cast(startTime)); -} - -long long QAnimationDriver_StartTime(const QAnimationDriver* self) { - qint64 _ret = self->startTime(); - return static_cast(_ret); -} - void QAnimationDriver_Started(QAnimationDriver* self) { self->started(); } @@ -279,20 +242,6 @@ struct miqt_string* QAnimationDriver_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAnimationDriver_TrUtf82(const char* s, const char* c) { - QString _ret = QAnimationDriver::trUtf8(s, c); - // 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* QAnimationDriver_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QAnimationDriver::trUtf8(s, c, static_cast(n)); - // 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 QAnimationDriver_Delete(QAnimationDriver* self) { delete self; } diff --git a/qt/gen_qabstractanimation.go b/qt/gen_qabstractanimation.go index 9357509..cc846a2 100644 --- a/qt/gen_qabstractanimation.go +++ b/qt/gen_qabstractanimation.go @@ -78,15 +78,6 @@ func QAbstractAnimation_Tr(s string) string { return _ret } -func QAbstractAnimation_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractAnimation_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QAbstractAnimation) State() QAbstractAnimation__State { return (QAbstractAnimation__State)(C.QAbstractAnimation_State(this.h)) } @@ -256,28 +247,6 @@ func QAbstractAnimation_Tr3(s string, c string, n int) string { return _ret } -func QAbstractAnimation_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractAnimation_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QAbstractAnimation_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractAnimation_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QAbstractAnimation) Start1(policy QAbstractAnimation__DeletionPolicy) { C.QAbstractAnimation_Start1(this.h, (C.int)(policy)) } @@ -350,15 +319,6 @@ func QAnimationDriver_Tr(s string) string { return _ret } -func QAnimationDriver_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAnimationDriver_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QAnimationDriver) Advance() { C.QAnimationDriver_Advance(this.h) } @@ -379,14 +339,6 @@ func (this *QAnimationDriver) Elapsed() int64 { return (int64)(C.QAnimationDriver_Elapsed(this.h)) } -func (this *QAnimationDriver) SetStartTime(startTime int64) { - C.QAnimationDriver_SetStartTime(this.h, (C.longlong)(startTime)) -} - -func (this *QAnimationDriver) StartTime() int64 { - return (int64)(C.QAnimationDriver_StartTime(this.h)) -} - func (this *QAnimationDriver) Started() { C.QAnimationDriver_Started(this.h) } @@ -443,28 +395,6 @@ func QAnimationDriver_Tr3(s string, c string, n int) string { return _ret } -func QAnimationDriver_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAnimationDriver_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QAnimationDriver_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAnimationDriver_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QAnimationDriver) Delete() { C.QAnimationDriver_Delete(this.h) diff --git a/qt/gen_qabstractanimation.h b/qt/gen_qabstractanimation.h index 5a5e171..e6328c2 100644 --- a/qt/gen_qabstractanimation.h +++ b/qt/gen_qabstractanimation.h @@ -30,7 +30,6 @@ typedef struct QObject QObject; QMetaObject* QAbstractAnimation_MetaObject(const QAbstractAnimation* self); void* QAbstractAnimation_Metacast(QAbstractAnimation* self, const char* param1); struct miqt_string* QAbstractAnimation_Tr(const char* s); -struct miqt_string* QAbstractAnimation_TrUtf8(const char* s); int QAbstractAnimation_State(const QAbstractAnimation* self); QAnimationGroup* QAbstractAnimation_Group(const QAbstractAnimation* self); int QAbstractAnimation_Direction(const QAbstractAnimation* self); @@ -58,8 +57,6 @@ void QAbstractAnimation_Stop(QAbstractAnimation* self); void QAbstractAnimation_SetCurrentTime(QAbstractAnimation* self, int msecs); 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, int policy); void QAbstractAnimation_Delete(QAbstractAnimation* self); @@ -68,22 +65,17 @@ QAnimationDriver* QAnimationDriver_new2(QObject* parent); QMetaObject* QAnimationDriver_MetaObject(const QAnimationDriver* self); void* QAnimationDriver_Metacast(QAnimationDriver* self, const char* param1); struct miqt_string* QAnimationDriver_Tr(const char* s); -struct miqt_string* QAnimationDriver_TrUtf8(const char* s); void QAnimationDriver_Advance(QAnimationDriver* self); void QAnimationDriver_Install(QAnimationDriver* self); void QAnimationDriver_Uninstall(QAnimationDriver* self); bool QAnimationDriver_IsRunning(const QAnimationDriver* self); long long QAnimationDriver_Elapsed(const QAnimationDriver* self); -void QAnimationDriver_SetStartTime(QAnimationDriver* self, long long startTime); -long long QAnimationDriver_StartTime(const QAnimationDriver* self); void QAnimationDriver_Started(QAnimationDriver* self); void QAnimationDriver_connect_Started(QAnimationDriver* self, void* slot); void QAnimationDriver_Stopped(QAnimationDriver* self); void QAnimationDriver_connect_Stopped(QAnimationDriver* self, void* slot); struct miqt_string* QAnimationDriver_Tr2(const char* s, const char* c); struct miqt_string* QAnimationDriver_Tr3(const char* s, const char* c, int n); -struct miqt_string* QAnimationDriver_TrUtf82(const char* s, const char* c); -struct miqt_string* QAnimationDriver_TrUtf83(const char* s, const char* c, int n); void QAnimationDriver_Delete(QAnimationDriver* self); #ifdef __cplusplus diff --git a/qt/gen_qabstractbutton.cpp b/qt/gen_qabstractbutton.cpp index 8105db7..9300fe4 100644 --- a/qt/gen_qabstractbutton.cpp +++ b/qt/gen_qabstractbutton.cpp @@ -26,13 +26,6 @@ struct miqt_string* QAbstractButton_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAbstractButton_TrUtf8(const char* s) { - QString _ret = QAbstractButton::trUtf8(s); - // 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 QAbstractButton_SetText(QAbstractButton* self, struct miqt_string* text) { QString text_QString = QString::fromUtf8(&text->data, text->len); self->setText(text_QString); @@ -196,24 +189,6 @@ struct miqt_string* QAbstractButton_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAbstractButton_TrUtf82(const char* s, const char* c) { - QString _ret = QAbstractButton::trUtf8(s, c); - // 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* QAbstractButton_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QAbstractButton::trUtf8(s, c, static_cast(n)); - // 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 QAbstractButton_AnimateClick1(QAbstractButton* self, int msec) { - self->animateClick(static_cast(msec)); -} - void QAbstractButton_Clicked1(QAbstractButton* self, bool checked) { self->clicked(checked); } diff --git a/qt/gen_qabstractbutton.go b/qt/gen_qabstractbutton.go index 64d9eb3..e8ecd20 100644 --- a/qt/gen_qabstractbutton.go +++ b/qt/gen_qabstractbutton.go @@ -56,15 +56,6 @@ func QAbstractButton_Tr(s string) string { return _ret } -func QAbstractButton_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractButton_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QAbstractButton) SetText(text string) { text_ms := miqt_strdupg(text) defer C.free(text_ms) @@ -276,32 +267,6 @@ func QAbstractButton_Tr3(s string, c string, n int) string { return _ret } -func QAbstractButton_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractButton_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QAbstractButton_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractButton_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QAbstractButton) AnimateClick1(msec int) { - C.QAbstractButton_AnimateClick1(this.h, (C.int)(msec)) -} - func (this *QAbstractButton) Clicked1(checked bool) { C.QAbstractButton_Clicked1(this.h, (C.bool)(checked)) } diff --git a/qt/gen_qabstractbutton.h b/qt/gen_qabstractbutton.h index 2f01ab5..29296b6 100644 --- a/qt/gen_qabstractbutton.h +++ b/qt/gen_qabstractbutton.h @@ -32,7 +32,6 @@ typedef struct QSize QSize; QMetaObject* QAbstractButton_MetaObject(const QAbstractButton* self); void* QAbstractButton_Metacast(QAbstractButton* self, const char* param1); struct miqt_string* QAbstractButton_Tr(const char* s); -struct miqt_string* QAbstractButton_TrUtf8(const char* s); void QAbstractButton_SetText(QAbstractButton* self, struct miqt_string* text); struct miqt_string* QAbstractButton_Text(const QAbstractButton* self); void QAbstractButton_SetIcon(QAbstractButton* self, QIcon* icon); @@ -69,9 +68,6 @@ void QAbstractButton_Toggled(QAbstractButton* self, bool checked); void QAbstractButton_connect_Toggled(QAbstractButton* self, void* slot); struct miqt_string* QAbstractButton_Tr2(const char* s, const char* c); struct miqt_string* QAbstractButton_Tr3(const char* s, const char* c, int n); -struct miqt_string* QAbstractButton_TrUtf82(const char* s, const char* c); -struct miqt_string* QAbstractButton_TrUtf83(const char* s, const char* c, int n); -void QAbstractButton_AnimateClick1(QAbstractButton* self, int msec); void QAbstractButton_Clicked1(QAbstractButton* self, bool checked); void QAbstractButton_connect_Clicked1(QAbstractButton* self, void* slot); void QAbstractButton_Delete(QAbstractButton* self); diff --git a/qt/gen_qabstracteventdispatcher.cpp b/qt/gen_qabstracteventdispatcher.cpp index 8ad79dc..5c66663 100644 --- a/qt/gen_qabstracteventdispatcher.cpp +++ b/qt/gen_qabstracteventdispatcher.cpp @@ -29,13 +29,6 @@ struct miqt_string* QAbstractEventDispatcher_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAbstractEventDispatcher_TrUtf8(const char* s) { - QString _ret = QAbstractEventDispatcher::trUtf8(s); - // 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()); -} - QAbstractEventDispatcher* QAbstractEventDispatcher_Instance() { return QAbstractEventDispatcher::instance(); } @@ -44,10 +37,6 @@ bool QAbstractEventDispatcher_ProcessEvents(QAbstractEventDispatcher* self, int return self->processEvents(static_cast(flags)); } -bool QAbstractEventDispatcher_HasPendingEvents(QAbstractEventDispatcher* self) { - return self->hasPendingEvents(); -} - void QAbstractEventDispatcher_RegisterSocketNotifier(QAbstractEventDispatcher* self, QSocketNotifier* notifier) { self->registerSocketNotifier(notifier); } @@ -56,12 +45,12 @@ void QAbstractEventDispatcher_UnregisterSocketNotifier(QAbstractEventDispatcher* self->unregisterSocketNotifier(notifier); } -int QAbstractEventDispatcher_RegisterTimer(QAbstractEventDispatcher* self, int interval, int timerType, QObject* object) { - return self->registerTimer(static_cast(interval), static_cast(timerType), object); +int QAbstractEventDispatcher_RegisterTimer(QAbstractEventDispatcher* self, long long interval, int timerType, QObject* object) { + return self->registerTimer(static_cast(interval), static_cast(timerType), 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); +void QAbstractEventDispatcher_RegisterTimer2(QAbstractEventDispatcher* self, int timerId, long long interval, int timerType, QObject* object) { + self->registerTimer(static_cast(timerId), static_cast(interval), static_cast(timerType), object); } bool QAbstractEventDispatcher_UnregisterTimer(QAbstractEventDispatcher* self, int timerId) { @@ -97,10 +86,6 @@ void QAbstractEventDispatcher_Interrupt(QAbstractEventDispatcher* self) { self->interrupt(); } -void QAbstractEventDispatcher_Flush(QAbstractEventDispatcher* self) { - self->flush(); -} - void QAbstractEventDispatcher_StartingUp(QAbstractEventDispatcher* self) { self->startingUp(); } @@ -117,8 +102,8 @@ void QAbstractEventDispatcher_RemoveNativeEventFilter(QAbstractEventDispatcher* self->removeNativeEventFilter(filterObj); } -bool QAbstractEventDispatcher_FilterNativeEvent(QAbstractEventDispatcher* self, QByteArray* eventType, void* message, long* result) { - return self->filterNativeEvent(*eventType, message, static_cast(result)); +bool QAbstractEventDispatcher_FilterNativeEvent(QAbstractEventDispatcher* self, QByteArray* eventType, void* message, intptr_t* result) { + return self->filterNativeEvent(*eventType, message, (qintptr*)(result)); } void QAbstractEventDispatcher_AboutToBlock(QAbstractEventDispatcher* self) { @@ -155,20 +140,6 @@ struct miqt_string* QAbstractEventDispatcher_Tr3(const char* s, const char* c, i return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAbstractEventDispatcher_TrUtf82(const char* s, const char* c) { - QString _ret = QAbstractEventDispatcher::trUtf8(s, c); - // 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* QAbstractEventDispatcher_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QAbstractEventDispatcher::trUtf8(s, c, static_cast(n)); - // 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()); -} - QAbstractEventDispatcher* QAbstractEventDispatcher_Instance1(QThread* thread) { return QAbstractEventDispatcher::instance(thread); } diff --git a/qt/gen_qabstracteventdispatcher.go b/qt/gen_qabstracteventdispatcher.go index 60d54be..1032d2c 100644 --- a/qt/gen_qabstracteventdispatcher.go +++ b/qt/gen_qabstracteventdispatcher.go @@ -56,15 +56,6 @@ func QAbstractEventDispatcher_Tr(s string) string { return _ret } -func QAbstractEventDispatcher_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractEventDispatcher_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func QAbstractEventDispatcher_Instance() *QAbstractEventDispatcher { return newQAbstractEventDispatcher_U(unsafe.Pointer(C.QAbstractEventDispatcher_Instance())) } @@ -73,10 +64,6 @@ func (this *QAbstractEventDispatcher) ProcessEvents(flags QEventLoop__ProcessEve return (bool)(C.QAbstractEventDispatcher_ProcessEvents(this.h, (C.int)(flags))) } -func (this *QAbstractEventDispatcher) HasPendingEvents() bool { - return (bool)(C.QAbstractEventDispatcher_HasPendingEvents(this.h)) -} - func (this *QAbstractEventDispatcher) RegisterSocketNotifier(notifier *QSocketNotifier) { C.QAbstractEventDispatcher_RegisterSocketNotifier(this.h, notifier.cPointer()) } @@ -85,12 +72,12 @@ func (this *QAbstractEventDispatcher) UnregisterSocketNotifier(notifier *QSocket C.QAbstractEventDispatcher_UnregisterSocketNotifier(this.h, notifier.cPointer()) } -func (this *QAbstractEventDispatcher) RegisterTimer(interval int, timerType TimerType, object *QObject) int { - return (int)(C.QAbstractEventDispatcher_RegisterTimer(this.h, (C.int)(interval), (C.int)(timerType), object.cPointer())) +func (this *QAbstractEventDispatcher) RegisterTimer(interval int64, timerType TimerType, object *QObject) int { + return (int)(C.QAbstractEventDispatcher_RegisterTimer(this.h, (C.longlong)(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.int)(timerType), object.cPointer()) +func (this *QAbstractEventDispatcher) RegisterTimer2(timerId int, interval int64, timerType TimerType, object *QObject) { + C.QAbstractEventDispatcher_RegisterTimer2(this.h, (C.int)(timerId), (C.longlong)(interval), (C.int)(timerType), object.cPointer()) } func (this *QAbstractEventDispatcher) UnregisterTimer(timerId int) bool { @@ -127,10 +114,6 @@ func (this *QAbstractEventDispatcher) Interrupt() { C.QAbstractEventDispatcher_Interrupt(this.h) } -func (this *QAbstractEventDispatcher) Flush() { - C.QAbstractEventDispatcher_Flush(this.h) -} - func (this *QAbstractEventDispatcher) StartingUp() { C.QAbstractEventDispatcher_StartingUp(this.h) } @@ -147,8 +130,8 @@ func (this *QAbstractEventDispatcher) RemoveNativeEventFilter(filterObj *QAbstra C.QAbstractEventDispatcher_RemoveNativeEventFilter(this.h, filterObj.cPointer()) } -func (this *QAbstractEventDispatcher) FilterNativeEvent(eventType *QByteArray, message unsafe.Pointer, result *int64) bool { - return (bool)(C.QAbstractEventDispatcher_FilterNativeEvent(this.h, eventType.cPointer(), message, (*C.long)(unsafe.Pointer(result)))) +func (this *QAbstractEventDispatcher) FilterNativeEvent(eventType *QByteArray, message unsafe.Pointer, result *uintptr) bool { + return (bool)(C.QAbstractEventDispatcher_FilterNativeEvent(this.h, eventType.cPointer(), message, (*C.intptr_t)(unsafe.Pointer(result)))) } func (this *QAbstractEventDispatcher) AboutToBlock() { @@ -207,28 +190,6 @@ func QAbstractEventDispatcher_Tr3(s string, c string, n int) string { return _ret } -func QAbstractEventDispatcher_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractEventDispatcher_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QAbstractEventDispatcher_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractEventDispatcher_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func QAbstractEventDispatcher_Instance1(thread *QThread) *QAbstractEventDispatcher { return newQAbstractEventDispatcher_U(unsafe.Pointer(C.QAbstractEventDispatcher_Instance1(thread.cPointer()))) } diff --git a/qt/gen_qabstracteventdispatcher.h b/qt/gen_qabstracteventdispatcher.h index bb01f57..cbd98fe 100644 --- a/qt/gen_qabstracteventdispatcher.h +++ b/qt/gen_qabstracteventdispatcher.h @@ -40,34 +40,29 @@ typedef struct QThread QThread; QMetaObject* QAbstractEventDispatcher_MetaObject(const QAbstractEventDispatcher* self); void* QAbstractEventDispatcher_Metacast(QAbstractEventDispatcher* self, const char* param1); struct miqt_string* QAbstractEventDispatcher_Tr(const char* s); -struct miqt_string* QAbstractEventDispatcher_TrUtf8(const char* s); QAbstractEventDispatcher* QAbstractEventDispatcher_Instance(); bool QAbstractEventDispatcher_ProcessEvents(QAbstractEventDispatcher* self, int flags); -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, int timerType, QObject* object); -void QAbstractEventDispatcher_RegisterTimer2(QAbstractEventDispatcher* self, int timerId, int interval, int timerType, QObject* object); +int QAbstractEventDispatcher_RegisterTimer(QAbstractEventDispatcher* self, long long interval, int timerType, QObject* object); +void QAbstractEventDispatcher_RegisterTimer2(QAbstractEventDispatcher* self, int timerId, long long 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); int QAbstractEventDispatcher_RemainingTime(QAbstractEventDispatcher* self, int timerId); void QAbstractEventDispatcher_WakeUp(QAbstractEventDispatcher* self); void QAbstractEventDispatcher_Interrupt(QAbstractEventDispatcher* self); -void QAbstractEventDispatcher_Flush(QAbstractEventDispatcher* self); void QAbstractEventDispatcher_StartingUp(QAbstractEventDispatcher* self); void QAbstractEventDispatcher_ClosingDown(QAbstractEventDispatcher* self); void QAbstractEventDispatcher_InstallNativeEventFilter(QAbstractEventDispatcher* self, QAbstractNativeEventFilter* filterObj); void QAbstractEventDispatcher_RemoveNativeEventFilter(QAbstractEventDispatcher* self, QAbstractNativeEventFilter* filterObj); -bool QAbstractEventDispatcher_FilterNativeEvent(QAbstractEventDispatcher* self, QByteArray* eventType, void* message, long* result); +bool QAbstractEventDispatcher_FilterNativeEvent(QAbstractEventDispatcher* self, QByteArray* eventType, void* message, intptr_t* result); void QAbstractEventDispatcher_AboutToBlock(QAbstractEventDispatcher* self); void QAbstractEventDispatcher_connect_AboutToBlock(QAbstractEventDispatcher* self, void* slot); void QAbstractEventDispatcher_Awake(QAbstractEventDispatcher* self); void QAbstractEventDispatcher_connect_Awake(QAbstractEventDispatcher* self, void* slot); struct miqt_string* QAbstractEventDispatcher_Tr2(const char* s, const char* c); struct miqt_string* QAbstractEventDispatcher_Tr3(const char* s, const char* c, int n); -struct miqt_string* QAbstractEventDispatcher_TrUtf82(const char* s, const char* c); -struct miqt_string* QAbstractEventDispatcher_TrUtf83(const char* s, const char* c, int n); QAbstractEventDispatcher* QAbstractEventDispatcher_Instance1(QThread* thread); void QAbstractEventDispatcher_Delete(QAbstractEventDispatcher* self); diff --git a/qt/gen_qabstractfileiconprovider.cpp b/qt/gen_qabstractfileiconprovider.cpp new file mode 100644 index 0000000..3ded207 --- /dev/null +++ b/qt/gen_qabstractfileiconprovider.cpp @@ -0,0 +1,42 @@ +#include +#include +#include +#include +#include +#include +#include "qabstractfileiconprovider.h" +#include "gen_qabstractfileiconprovider.h" +#include "_cgo_export.h" + +QAbstractFileIconProvider* QAbstractFileIconProvider_new() { + return new QAbstractFileIconProvider(); +} + +QIcon* QAbstractFileIconProvider_Icon(const QAbstractFileIconProvider* self, int param1) { + return new QIcon(self->icon(static_cast(param1))); +} + +QIcon* QAbstractFileIconProvider_IconWithQFileInfo(const QAbstractFileIconProvider* self, QFileInfo* param1) { + return new QIcon(self->icon(*param1)); +} + +struct miqt_string* QAbstractFileIconProvider_Type(const QAbstractFileIconProvider* self, QFileInfo* param1) { + QString _ret = self->type(*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()); +} + +void QAbstractFileIconProvider_SetOptions(QAbstractFileIconProvider* self, int options) { + self->setOptions(static_cast(options)); +} + +int QAbstractFileIconProvider_Options(const QAbstractFileIconProvider* self) { + QAbstractFileIconProvider::Options _ret = self->options(); + return static_cast(_ret); +} + +void QAbstractFileIconProvider_Delete(QAbstractFileIconProvider* self) { + delete self; +} + diff --git a/qt/gen_qabstractfileiconprovider.go b/qt/gen_qabstractfileiconprovider.go new file mode 100644 index 0000000..843e360 --- /dev/null +++ b/qt/gen_qabstractfileiconprovider.go @@ -0,0 +1,103 @@ +package qt + +/* + +#include "gen_qabstractfileiconprovider.h" +#include + +*/ +import "C" + +import ( + "runtime" + "unsafe" +) + +type QAbstractFileIconProvider__IconType int + +const ( + QAbstractFileIconProvider__Computer QAbstractFileIconProvider__IconType = 0 + QAbstractFileIconProvider__Desktop QAbstractFileIconProvider__IconType = 1 + QAbstractFileIconProvider__Trashcan QAbstractFileIconProvider__IconType = 2 + QAbstractFileIconProvider__Network QAbstractFileIconProvider__IconType = 3 + QAbstractFileIconProvider__Drive QAbstractFileIconProvider__IconType = 4 + QAbstractFileIconProvider__Folder QAbstractFileIconProvider__IconType = 5 + QAbstractFileIconProvider__File QAbstractFileIconProvider__IconType = 6 +) + +type QAbstractFileIconProvider__Option int + +const ( + QAbstractFileIconProvider__DontUseCustomDirectoryIcons QAbstractFileIconProvider__Option = 1 +) + +type QAbstractFileIconProvider struct { + h *C.QAbstractFileIconProvider +} + +func (this *QAbstractFileIconProvider) cPointer() *C.QAbstractFileIconProvider { + if this == nil { + return nil + } + return this.h +} + +func newQAbstractFileIconProvider(h *C.QAbstractFileIconProvider) *QAbstractFileIconProvider { + if h == nil { + return nil + } + return &QAbstractFileIconProvider{h: h} +} + +func newQAbstractFileIconProvider_U(h unsafe.Pointer) *QAbstractFileIconProvider { + return newQAbstractFileIconProvider((*C.QAbstractFileIconProvider)(h)) +} + +// NewQAbstractFileIconProvider constructs a new QAbstractFileIconProvider object. +func NewQAbstractFileIconProvider() *QAbstractFileIconProvider { + ret := C.QAbstractFileIconProvider_new() + return newQAbstractFileIconProvider(ret) +} + +func (this *QAbstractFileIconProvider) Icon(param1 QAbstractFileIconProvider__IconType) *QIcon { + _ret := C.QAbstractFileIconProvider_Icon(this.h, (C.int)(param1)) + _goptr := newQIcon(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QAbstractFileIconProvider) IconWithQFileInfo(param1 *QFileInfo) *QIcon { + _ret := C.QAbstractFileIconProvider_IconWithQFileInfo(this.h, param1.cPointer()) + _goptr := newQIcon(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QAbstractFileIconProvider) Type(param1 *QFileInfo) string { + var _ms *C.struct_miqt_string = C.QAbstractFileIconProvider_Type(this.h, param1.cPointer()) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + +func (this *QAbstractFileIconProvider) SetOptions(options QAbstractFileIconProvider__Option) { + C.QAbstractFileIconProvider_SetOptions(this.h, (C.int)(options)) +} + +func (this *QAbstractFileIconProvider) Options() QAbstractFileIconProvider__Option { + return (QAbstractFileIconProvider__Option)(C.QAbstractFileIconProvider_Options(this.h)) +} + +// Delete this object from C++ memory. +func (this *QAbstractFileIconProvider) Delete() { + C.QAbstractFileIconProvider_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QAbstractFileIconProvider) GoGC() { + runtime.SetFinalizer(this, func(this *QAbstractFileIconProvider) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} diff --git a/qt/gen_qabstractfileiconprovider.h b/qt/gen_qabstractfileiconprovider.h new file mode 100644 index 0000000..52e747a --- /dev/null +++ b/qt/gen_qabstractfileiconprovider.h @@ -0,0 +1,38 @@ +#ifndef GEN_QABSTRACTFILEICONPROVIDER_H +#define GEN_QABSTRACTFILEICONPROVIDER_H + +#include +#include +#include + +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + +#include "binding.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +class QAbstractFileIconProvider; +class QFileInfo; +class QIcon; +#else +typedef struct QAbstractFileIconProvider QAbstractFileIconProvider; +typedef struct QFileInfo QFileInfo; +typedef struct QIcon QIcon; +#endif + +QAbstractFileIconProvider* QAbstractFileIconProvider_new(); +QIcon* QAbstractFileIconProvider_Icon(const QAbstractFileIconProvider* self, int param1); +QIcon* QAbstractFileIconProvider_IconWithQFileInfo(const QAbstractFileIconProvider* self, QFileInfo* param1); +struct miqt_string* QAbstractFileIconProvider_Type(const QAbstractFileIconProvider* self, QFileInfo* param1); +void QAbstractFileIconProvider_SetOptions(QAbstractFileIconProvider* self, int options); +int QAbstractFileIconProvider_Options(const QAbstractFileIconProvider* self); +void QAbstractFileIconProvider_Delete(QAbstractFileIconProvider* self); + +#ifdef __cplusplus +} /* extern C */ +#endif + +#endif diff --git a/qt/gen_qabstractitemdelegate.cpp b/qt/gen_qabstractitemdelegate.cpp index ec564d5..176f3ed 100644 --- a/qt/gen_qabstractitemdelegate.cpp +++ b/qt/gen_qabstractitemdelegate.cpp @@ -2,7 +2,6 @@ #include #include #include -#include #include #include #include @@ -33,13 +32,6 @@ struct miqt_string* QAbstractItemDelegate_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAbstractItemDelegate_TrUtf8(const char* s) { - QString _ret = QAbstractItemDelegate::trUtf8(s); - // 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 QAbstractItemDelegate_Paint(const QAbstractItemDelegate* self, QPainter* painter, QStyleOptionViewItem* option, QModelIndex* index) { self->paint(painter, *option, *index); } @@ -72,20 +64,12 @@ bool QAbstractItemDelegate_EditorEvent(QAbstractItemDelegate* self, QEvent* even return self->editorEvent(event, model, *option, *index); } -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 - QByteArray _b = _ret.toUtf8(); - return miqt_strdup(_b.data(), _b.length()); -} - bool QAbstractItemDelegate_HelpEvent(QAbstractItemDelegate* self, QHelpEvent* event, QAbstractItemView* view, QStyleOptionViewItem* option, QModelIndex* index) { return self->helpEvent(event, view, *option, *index); } struct miqt_array* QAbstractItemDelegate_PaintingRoles(const QAbstractItemDelegate* self) { - QVector _ret = self->paintingRoles(); + QList _ret = self->paintingRoles(); // Convert QList<> from C++ memory to manually-managed C memory int* _arr = static_cast(malloc(sizeof(int) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -146,20 +130,6 @@ struct miqt_string* QAbstractItemDelegate_Tr3(const char* s, const char* c, int return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAbstractItemDelegate_TrUtf82(const char* s, const char* c) { - QString _ret = QAbstractItemDelegate::trUtf8(s, c); - // 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* QAbstractItemDelegate_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QAbstractItemDelegate::trUtf8(s, c, static_cast(n)); - // 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 QAbstractItemDelegate_CloseEditor2(QAbstractItemDelegate* self, QWidget* editor, int hint) { self->closeEditor(editor, static_cast(hint)); } diff --git a/qt/gen_qabstractitemdelegate.go b/qt/gen_qabstractitemdelegate.go index 1fe3305..f0af70b 100644 --- a/qt/gen_qabstractitemdelegate.go +++ b/qt/gen_qabstractitemdelegate.go @@ -66,15 +66,6 @@ func QAbstractItemDelegate_Tr(s string) string { return _ret } -func QAbstractItemDelegate_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractItemDelegate_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QAbstractItemDelegate) Paint(painter *QPainter, option *QStyleOptionViewItem, index *QModelIndex) { C.QAbstractItemDelegate_Paint(this.h, painter.cPointer(), option.cPointer(), index.cPointer()) } @@ -110,15 +101,6 @@ func (this *QAbstractItemDelegate) EditorEvent(event *QEvent, model *QAbstractIt return (bool)(C.QAbstractItemDelegate_EditorEvent(this.h, event.cPointer(), model.cPointer(), option.cPointer(), index.cPointer())) } -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.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 -} - func (this *QAbstractItemDelegate) HelpEvent(event *QHelpEvent, view *QAbstractItemView, option *QStyleOptionViewItem, index *QModelIndex) bool { return (bool)(C.QAbstractItemDelegate_HelpEvent(this.h, event.cPointer(), view.cPointer(), option.cPointer(), index.cPointer())) } @@ -216,28 +198,6 @@ func QAbstractItemDelegate_Tr3(s string, c string, n int) string { return _ret } -func QAbstractItemDelegate_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractItemDelegate_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QAbstractItemDelegate_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractItemDelegate_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QAbstractItemDelegate) CloseEditor2(editor *QWidget, hint QAbstractItemDelegate__EndEditHint) { C.QAbstractItemDelegate_CloseEditor2(this.h, editor.cPointer(), (C.int)(hint)) } diff --git a/qt/gen_qabstractitemdelegate.h b/qt/gen_qabstractitemdelegate.h index 04e05e0..fcf51c2 100644 --- a/qt/gen_qabstractitemdelegate.h +++ b/qt/gen_qabstractitemdelegate.h @@ -18,7 +18,6 @@ class QAbstractItemDelegate; class QAbstractItemModel; class QAbstractItemView; class QEvent; -class QFontMetrics; class QHelpEvent; class QMetaObject; class QModelIndex; @@ -31,7 +30,6 @@ typedef struct QAbstractItemDelegate QAbstractItemDelegate; typedef struct QAbstractItemModel QAbstractItemModel; typedef struct QAbstractItemView QAbstractItemView; typedef struct QEvent QEvent; -typedef struct QFontMetrics QFontMetrics; typedef struct QHelpEvent QHelpEvent; typedef struct QMetaObject QMetaObject; typedef struct QModelIndex QModelIndex; @@ -44,7 +42,6 @@ typedef struct QWidget QWidget; QMetaObject* QAbstractItemDelegate_MetaObject(const QAbstractItemDelegate* self); void* QAbstractItemDelegate_Metacast(QAbstractItemDelegate* self, const char* param1); struct miqt_string* QAbstractItemDelegate_Tr(const char* s); -struct miqt_string* QAbstractItemDelegate_TrUtf8(const char* s); void QAbstractItemDelegate_Paint(const QAbstractItemDelegate* self, QPainter* painter, QStyleOptionViewItem* option, QModelIndex* index); QSize* QAbstractItemDelegate_SizeHint(const QAbstractItemDelegate* self, QStyleOptionViewItem* option, QModelIndex* index); QWidget* QAbstractItemDelegate_CreateEditor(const QAbstractItemDelegate* self, QWidget* parent, QStyleOptionViewItem* option, QModelIndex* index); @@ -53,7 +50,6 @@ 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, 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); @@ -64,8 +60,6 @@ void QAbstractItemDelegate_SizeHintChanged(QAbstractItemDelegate* self, QModelIn void QAbstractItemDelegate_connect_SizeHintChanged(QAbstractItemDelegate* self, void* slot); struct miqt_string* QAbstractItemDelegate_Tr2(const char* s, const char* c); struct miqt_string* QAbstractItemDelegate_Tr3(const char* s, const char* c, int n); -struct miqt_string* QAbstractItemDelegate_TrUtf82(const char* s, const char* c); -struct miqt_string* QAbstractItemDelegate_TrUtf83(const char* s, const char* c, int n); void QAbstractItemDelegate_CloseEditor2(QAbstractItemDelegate* self, QWidget* editor, int hint); void QAbstractItemDelegate_connect_CloseEditor2(QAbstractItemDelegate* self, void* slot); void QAbstractItemDelegate_Delete(QAbstractItemDelegate* self); diff --git a/qt/gen_qabstractitemmodel.cpp b/qt/gen_qabstractitemmodel.cpp index c180a0a..b99b4dd 100644 --- a/qt/gen_qabstractitemmodel.cpp +++ b/qt/gen_qabstractitemmodel.cpp @@ -5,6 +5,8 @@ #include #include #include +#include +#include #include #include #include @@ -15,6 +17,94 @@ #include "gen_qabstractitemmodel.h" #include "_cgo_export.h" +QModelRoleData* QModelRoleData_new(int role) { + return new QModelRoleData(static_cast(role)); +} + +QModelRoleData* QModelRoleData_new2(QModelRoleData* param1) { + return new QModelRoleData(*param1); +} + +int QModelRoleData_Role(const QModelRoleData* self) { + return self->role(); +} + +QVariant* QModelRoleData_Data(QModelRoleData* self) { + QVariant& _ret = self->data(); + // Cast returned reference into pointer + return &_ret; +} + +QVariant* QModelRoleData_Data2(const QModelRoleData* self) { + const QVariant& _ret = self->data(); + // Cast returned reference into pointer + return const_cast(&_ret); +} + +void QModelRoleData_ClearData(QModelRoleData* self) { + self->clearData(); +} + +void QModelRoleData_OperatorAssign(QModelRoleData* self, QModelRoleData* param1) { + self->operator=(*param1); +} + +void QModelRoleData_Delete(QModelRoleData* self) { + delete self; +} + +QModelRoleDataSpan* QModelRoleDataSpan_new() { + return new QModelRoleDataSpan(); +} + +QModelRoleDataSpan* QModelRoleDataSpan_new2(QModelRoleData* modelRoleData) { + return new QModelRoleDataSpan(*modelRoleData); +} + +QModelRoleDataSpan* QModelRoleDataSpan_new3(QModelRoleData* modelRoleData, ptrdiff_t lenVal) { + return new QModelRoleDataSpan(modelRoleData, (qsizetype)(lenVal)); +} + +QModelRoleDataSpan* QModelRoleDataSpan_new4(QModelRoleDataSpan* param1) { + return new QModelRoleDataSpan(*param1); +} + +ptrdiff_t QModelRoleDataSpan_Size(const QModelRoleDataSpan* self) { + qsizetype _ret = self->size(); + return static_cast(_ret); +} + +ptrdiff_t QModelRoleDataSpan_Length(const QModelRoleDataSpan* self) { + qsizetype _ret = self->length(); + return static_cast(_ret); +} + +QModelRoleData* QModelRoleDataSpan_Data(const QModelRoleDataSpan* self) { + return self->data(); +} + +QModelRoleData* QModelRoleDataSpan_Begin(const QModelRoleDataSpan* self) { + return self->begin(); +} + +QModelRoleData* QModelRoleDataSpan_End(const QModelRoleDataSpan* self) { + return self->end(); +} + +QModelRoleData* QModelRoleDataSpan_OperatorSubscript(const QModelRoleDataSpan* self, ptrdiff_t index) { + QModelRoleData& _ret = self->operator[]((qsizetype)(index)); + // Cast returned reference into pointer + return &_ret; +} + +QVariant* QModelRoleDataSpan_DataForRole(const QModelRoleDataSpan* self, int role) { + return self->dataForRole(static_cast(role)); +} + +void QModelRoleDataSpan_Delete(QModelRoleDataSpan* self) { + delete self; +} + QModelIndex* QModelIndex_new() { return new QModelIndex(); } @@ -40,6 +130,10 @@ void* QModelIndex_InternalPointer(const QModelIndex* self) { return self->internalPointer(); } +const void* QModelIndex_ConstInternalPointer(const QModelIndex* self) { + return (const void*) self->constInternalPointer(); +} + QModelIndex* QModelIndex_Parent(const QModelIndex* self) { return new QModelIndex(self->parent()); } @@ -56,14 +150,14 @@ QModelIndex* QModelIndex_SiblingAtRow(const QModelIndex* self, int row) { return new QModelIndex(self->siblingAtRow(static_cast(row))); } -QModelIndex* QModelIndex_Child(const QModelIndex* self, int row, int column) { - return new QModelIndex(self->child(static_cast(row), static_cast(column))); -} - QVariant* QModelIndex_Data(const QModelIndex* self) { return new QVariant(self->data()); } +void QModelIndex_MultiData(const QModelIndex* self, QModelRoleDataSpan* roleDataSpan) { + self->multiData(*roleDataSpan); +} + int QModelIndex_Flags(const QModelIndex* self) { Qt::ItemFlags _ret = self->flags(); return static_cast(_ret); @@ -153,6 +247,10 @@ void* QPersistentModelIndex_InternalPointer(const QPersistentModelIndex* self) { return self->internalPointer(); } +const void* QPersistentModelIndex_ConstInternalPointer(const QPersistentModelIndex* self) { + return (const void*) self->constInternalPointer(); +} + uintptr_t QPersistentModelIndex_InternalId(const QPersistentModelIndex* self) { quintptr _ret = self->internalId(); return static_cast(_ret); @@ -166,14 +264,14 @@ QModelIndex* QPersistentModelIndex_Sibling(const QPersistentModelIndex* self, in return new QModelIndex(self->sibling(static_cast(row), static_cast(column))); } -QModelIndex* QPersistentModelIndex_Child(const QPersistentModelIndex* self, int row, int column) { - return new QModelIndex(self->child(static_cast(row), static_cast(column))); -} - QVariant* QPersistentModelIndex_Data(const QPersistentModelIndex* self) { return new QVariant(self->data()); } +void QPersistentModelIndex_MultiData(const QPersistentModelIndex* self, QModelRoleDataSpan* roleDataSpan) { + self->multiData(*roleDataSpan); +} + int QPersistentModelIndex_Flags(const QPersistentModelIndex* self) { Qt::ItemFlags _ret = self->flags(); return static_cast(_ret); @@ -210,13 +308,6 @@ struct miqt_string* QAbstractItemModel_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAbstractItemModel_TrUtf8(const char* s) { - QString _ret = QAbstractItemModel::trUtf8(s); - // 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()); -} - bool QAbstractItemModel_HasIndex(const QAbstractItemModel* self, int row, int column) { return self->hasIndex(static_cast(row), static_cast(column)); } @@ -261,6 +352,10 @@ bool QAbstractItemModel_SetHeaderData(QAbstractItemModel* self, int section, int return self->setHeaderData(static_cast(section), static_cast(orientation), *value); } +bool QAbstractItemModel_ClearItemData(QAbstractItemModel* self, QModelIndex* index) { + return self->clearItemData(*index); +} + struct miqt_array* QAbstractItemModel_MimeTypes(const QAbstractItemModel* self) { QStringList _ret = self->mimeTypes(); // Convert QList<> from C++ memory to manually-managed C memory @@ -395,12 +490,16 @@ bool QAbstractItemModel_CheckIndex(const QAbstractItemModel* self, QModelIndex* return self->checkIndex(*index); } +void QAbstractItemModel_MultiData(const QAbstractItemModel* self, QModelIndex* index, QModelRoleDataSpan* roleDataSpan) { + self->multiData(*index, *roleDataSpan); +} + void QAbstractItemModel_DataChanged(QAbstractItemModel* self, QModelIndex* topLeft, QModelIndex* bottomRight) { self->dataChanged(*topLeft, *bottomRight); } void QAbstractItemModel_connect_DataChanged(QAbstractItemModel* self, void* slot) { - QAbstractItemModel::connect(self, static_cast&)>(&QAbstractItemModel::dataChanged), self, [=](const QModelIndex& topLeft, const QModelIndex& bottomRight) { + QAbstractItemModel::connect(self, static_cast&)>(&QAbstractItemModel::dataChanged), self, [=](const QModelIndex& topLeft, const QModelIndex& bottomRight) { const QModelIndex& topLeft_ret = topLeft; // Cast returned reference into pointer QModelIndex* sigval1 = const_cast(&topLeft_ret); @@ -467,20 +566,6 @@ struct miqt_string* QAbstractItemModel_Tr3(const char* s, const char* c, int n) return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAbstractItemModel_TrUtf82(const char* s, const char* c) { - QString _ret = QAbstractItemModel::trUtf8(s, c); - // 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* QAbstractItemModel_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QAbstractItemModel::trUtf8(s, c, static_cast(n)); - // 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()); -} - bool QAbstractItemModel_HasIndex3(const QAbstractItemModel* self, int row, int column, QModelIndex* parent) { return self->hasIndex(static_cast(row), static_cast(column), *parent); } @@ -584,7 +669,7 @@ bool QAbstractItemModel_CheckIndex2(const QAbstractItemModel* self, QModelIndex* } void QAbstractItemModel_DataChanged3(QAbstractItemModel* self, QModelIndex* topLeft, QModelIndex* bottomRight, struct miqt_array* /* of int */ roles) { - QVector roles_QList; + QList roles_QList; roles_QList.reserve(roles->len); int* roles_arr = static_cast(roles->data); for(size_t i = 0; i < roles->len; ++i) { @@ -594,14 +679,14 @@ void QAbstractItemModel_DataChanged3(QAbstractItemModel* self, QModelIndex* topL } void QAbstractItemModel_connect_DataChanged3(QAbstractItemModel* self, void* slot) { - QAbstractItemModel::connect(self, static_cast&)>(&QAbstractItemModel::dataChanged), self, [=](const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector& roles) { + QAbstractItemModel::connect(self, static_cast&)>(&QAbstractItemModel::dataChanged), self, [=](const QModelIndex& topLeft, const QModelIndex& bottomRight, const QList& roles) { const QModelIndex& topLeft_ret = topLeft; // Cast returned reference into pointer QModelIndex* sigval1 = const_cast(&topLeft_ret); const QModelIndex& bottomRight_ret = bottomRight; // Cast returned reference into pointer QModelIndex* sigval2 = const_cast(&bottomRight_ret); - const QVector& roles_ret = roles; + const QList& roles_ret = roles; // Convert QList<> from C++ memory to manually-managed C memory int* roles_arr = static_cast(malloc(sizeof(int) * roles_ret.length())); for (size_t i = 0, e = roles_ret.length(); i < e; ++i) { @@ -742,13 +827,6 @@ struct miqt_string* QAbstractTableModel_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAbstractTableModel_TrUtf8(const char* s) { - QString _ret = QAbstractTableModel::trUtf8(s); - // 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()); -} - QModelIndex* QAbstractTableModel_Index(const QAbstractTableModel* self, int row, int column) { return new QModelIndex(self->index(static_cast(row), static_cast(column))); } @@ -780,20 +858,6 @@ struct miqt_string* QAbstractTableModel_Tr3(const char* s, const char* c, int n) return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAbstractTableModel_TrUtf82(const char* s, const char* c) { - QString _ret = QAbstractTableModel::trUtf8(s, c); - // 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* QAbstractTableModel_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QAbstractTableModel::trUtf8(s, c, static_cast(n)); - // 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()); -} - QModelIndex* QAbstractTableModel_Index3(const QAbstractTableModel* self, int row, int column, QModelIndex* parent) { return new QModelIndex(self->index(static_cast(row), static_cast(column), *parent)); } @@ -817,13 +881,6 @@ struct miqt_string* QAbstractListModel_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAbstractListModel_TrUtf8(const char* s) { - QString _ret = QAbstractListModel::trUtf8(s); - // 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()); -} - QModelIndex* QAbstractListModel_Index(const QAbstractListModel* self, int row) { return new QModelIndex(self->index(static_cast(row))); } @@ -855,20 +912,6 @@ struct miqt_string* QAbstractListModel_Tr3(const char* s, const char* c, int n) return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAbstractListModel_TrUtf82(const char* s, const char* c) { - QString _ret = QAbstractListModel::trUtf8(s, c); - // 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* QAbstractListModel_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QAbstractListModel::trUtf8(s, c, static_cast(n)); - // 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()); -} - QModelIndex* QAbstractListModel_Index2(const QAbstractListModel* self, int row, int column) { return new QModelIndex(self->index(static_cast(row), static_cast(column))); } diff --git a/qt/gen_qabstractitemmodel.go b/qt/gen_qabstractitemmodel.go index 04a323c..5f8a68d 100644 --- a/qt/gen_qabstractitemmodel.go +++ b/qt/gen_qabstractitemmodel.go @@ -31,6 +31,162 @@ const ( QAbstractItemModel__ParentIsInvalid QAbstractItemModel__CheckIndexOption = 4 ) +type QModelRoleData struct { + h *C.QModelRoleData +} + +func (this *QModelRoleData) cPointer() *C.QModelRoleData { + if this == nil { + return nil + } + return this.h +} + +func newQModelRoleData(h *C.QModelRoleData) *QModelRoleData { + if h == nil { + return nil + } + return &QModelRoleData{h: h} +} + +func newQModelRoleData_U(h unsafe.Pointer) *QModelRoleData { + return newQModelRoleData((*C.QModelRoleData)(h)) +} + +// NewQModelRoleData constructs a new QModelRoleData object. +func NewQModelRoleData(role int) *QModelRoleData { + ret := C.QModelRoleData_new((C.int)(role)) + return newQModelRoleData(ret) +} + +// NewQModelRoleData2 constructs a new QModelRoleData object. +func NewQModelRoleData2(param1 *QModelRoleData) *QModelRoleData { + ret := C.QModelRoleData_new2(param1.cPointer()) + return newQModelRoleData(ret) +} + +func (this *QModelRoleData) Role() int { + return (int)(C.QModelRoleData_Role(this.h)) +} + +func (this *QModelRoleData) Data() *QVariant { + return newQVariant_U(unsafe.Pointer(C.QModelRoleData_Data(this.h))) +} + +func (this *QModelRoleData) Data2() *QVariant { + return newQVariant_U(unsafe.Pointer(C.QModelRoleData_Data2(this.h))) +} + +func (this *QModelRoleData) ClearData() { + C.QModelRoleData_ClearData(this.h) +} + +func (this *QModelRoleData) OperatorAssign(param1 *QModelRoleData) { + C.QModelRoleData_OperatorAssign(this.h, param1.cPointer()) +} + +// Delete this object from C++ memory. +func (this *QModelRoleData) Delete() { + C.QModelRoleData_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QModelRoleData) GoGC() { + runtime.SetFinalizer(this, func(this *QModelRoleData) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + +type QModelRoleDataSpan struct { + h *C.QModelRoleDataSpan +} + +func (this *QModelRoleDataSpan) cPointer() *C.QModelRoleDataSpan { + if this == nil { + return nil + } + return this.h +} + +func newQModelRoleDataSpan(h *C.QModelRoleDataSpan) *QModelRoleDataSpan { + if h == nil { + return nil + } + return &QModelRoleDataSpan{h: h} +} + +func newQModelRoleDataSpan_U(h unsafe.Pointer) *QModelRoleDataSpan { + return newQModelRoleDataSpan((*C.QModelRoleDataSpan)(h)) +} + +// NewQModelRoleDataSpan constructs a new QModelRoleDataSpan object. +func NewQModelRoleDataSpan() *QModelRoleDataSpan { + ret := C.QModelRoleDataSpan_new() + return newQModelRoleDataSpan(ret) +} + +// NewQModelRoleDataSpan2 constructs a new QModelRoleDataSpan object. +func NewQModelRoleDataSpan2(modelRoleData *QModelRoleData) *QModelRoleDataSpan { + ret := C.QModelRoleDataSpan_new2(modelRoleData.cPointer()) + return newQModelRoleDataSpan(ret) +} + +// NewQModelRoleDataSpan3 constructs a new QModelRoleDataSpan object. +func NewQModelRoleDataSpan3(modelRoleData *QModelRoleData, lenVal int64) *QModelRoleDataSpan { + ret := C.QModelRoleDataSpan_new3(modelRoleData.cPointer(), (C.ptrdiff_t)(lenVal)) + return newQModelRoleDataSpan(ret) +} + +// NewQModelRoleDataSpan4 constructs a new QModelRoleDataSpan object. +func NewQModelRoleDataSpan4(param1 *QModelRoleDataSpan) *QModelRoleDataSpan { + ret := C.QModelRoleDataSpan_new4(param1.cPointer()) + return newQModelRoleDataSpan(ret) +} + +func (this *QModelRoleDataSpan) Size() int64 { + return (int64)(C.QModelRoleDataSpan_Size(this.h)) +} + +func (this *QModelRoleDataSpan) Length() int64 { + return (int64)(C.QModelRoleDataSpan_Length(this.h)) +} + +func (this *QModelRoleDataSpan) Data() *QModelRoleData { + return newQModelRoleData_U(unsafe.Pointer(C.QModelRoleDataSpan_Data(this.h))) +} + +func (this *QModelRoleDataSpan) Begin() *QModelRoleData { + return newQModelRoleData_U(unsafe.Pointer(C.QModelRoleDataSpan_Begin(this.h))) +} + +func (this *QModelRoleDataSpan) End() *QModelRoleData { + return newQModelRoleData_U(unsafe.Pointer(C.QModelRoleDataSpan_End(this.h))) +} + +func (this *QModelRoleDataSpan) OperatorSubscript(index int64) *QModelRoleData { + return newQModelRoleData_U(unsafe.Pointer(C.QModelRoleDataSpan_OperatorSubscript(this.h, (C.ptrdiff_t)(index)))) +} + +func (this *QModelRoleDataSpan) DataForRole(role int) *QVariant { + return newQVariant_U(unsafe.Pointer(C.QModelRoleDataSpan_DataForRole(this.h, (C.int)(role)))) +} + +// Delete this object from C++ memory. +func (this *QModelRoleDataSpan) Delete() { + C.QModelRoleDataSpan_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QModelRoleDataSpan) GoGC() { + runtime.SetFinalizer(this, func(this *QModelRoleDataSpan) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + type QModelIndex struct { h *C.QModelIndex } @@ -81,6 +237,10 @@ func (this *QModelIndex) InternalPointer() unsafe.Pointer { return C.QModelIndex_InternalPointer(this.h) } +func (this *QModelIndex) ConstInternalPointer() unsafe.Pointer { + return C.QModelIndex_ConstInternalPointer(this.h) +} + func (this *QModelIndex) Parent() *QModelIndex { _ret := C.QModelIndex_Parent(this.h) _goptr := newQModelIndex(_ret) @@ -109,13 +269,6 @@ func (this *QModelIndex) SiblingAtRow(row int) *QModelIndex { return _goptr } -func (this *QModelIndex) Child(row int, column int) *QModelIndex { - _ret := C.QModelIndex_Child(this.h, (C.int)(row), (C.int)(column)) - _goptr := newQModelIndex(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - func (this *QModelIndex) Data() *QVariant { _ret := C.QModelIndex_Data(this.h) _goptr := newQVariant(_ret) @@ -123,6 +276,10 @@ func (this *QModelIndex) Data() *QVariant { return _goptr } +func (this *QModelIndex) MultiData(roleDataSpan QModelRoleDataSpan) { + C.QModelIndex_MultiData(this.h, roleDataSpan.cPointer()) +} + func (this *QModelIndex) Flags() ItemFlag { return (ItemFlag)(C.QModelIndex_Flags(this.h)) } @@ -252,6 +409,10 @@ func (this *QPersistentModelIndex) InternalPointer() unsafe.Pointer { return C.QPersistentModelIndex_InternalPointer(this.h) } +func (this *QPersistentModelIndex) ConstInternalPointer() unsafe.Pointer { + return C.QPersistentModelIndex_ConstInternalPointer(this.h) +} + func (this *QPersistentModelIndex) InternalId() uintptr { return (uintptr)(C.QPersistentModelIndex_InternalId(this.h)) } @@ -270,13 +431,6 @@ func (this *QPersistentModelIndex) Sibling(row int, column int) *QModelIndex { return _goptr } -func (this *QPersistentModelIndex) Child(row int, column int) *QModelIndex { - _ret := C.QPersistentModelIndex_Child(this.h, (C.int)(row), (C.int)(column)) - _goptr := newQModelIndex(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - func (this *QPersistentModelIndex) Data() *QVariant { _ret := C.QPersistentModelIndex_Data(this.h) _goptr := newQVariant(_ret) @@ -284,6 +438,10 @@ func (this *QPersistentModelIndex) Data() *QVariant { return _goptr } +func (this *QPersistentModelIndex) MultiData(roleDataSpan QModelRoleDataSpan) { + C.QPersistentModelIndex_MultiData(this.h, roleDataSpan.cPointer()) +} + func (this *QPersistentModelIndex) Flags() ItemFlag { return (ItemFlag)(C.QPersistentModelIndex_Flags(this.h)) } @@ -359,15 +517,6 @@ func QAbstractItemModel_Tr(s string) string { return _ret } -func QAbstractItemModel_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractItemModel_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QAbstractItemModel) HasIndex(row int, column int) bool { return (bool)(C.QAbstractItemModel_HasIndex(this.h, (C.int)(row), (C.int)(column))) } @@ -427,6 +576,10 @@ func (this *QAbstractItemModel) SetHeaderData(section int, orientation Orientati return (bool)(C.QAbstractItemModel_SetHeaderData(this.h, (C.int)(section), (C.int)(orientation), value.cPointer())) } +func (this *QAbstractItemModel) ClearItemData(index *QModelIndex) bool { + return (bool)(C.QAbstractItemModel_ClearItemData(this.h, index.cPointer())) +} + func (this *QAbstractItemModel) MimeTypes() []string { var _ma *C.struct_miqt_array = C.QAbstractItemModel_MimeTypes(this.h) _ret := make([]string, int(_ma.len)) @@ -565,6 +718,10 @@ func (this *QAbstractItemModel) CheckIndex(index *QModelIndex) bool { return (bool)(C.QAbstractItemModel_CheckIndex(this.h, index.cPointer())) } +func (this *QAbstractItemModel) MultiData(index *QModelIndex, roleDataSpan QModelRoleDataSpan) { + C.QAbstractItemModel_MultiData(this.h, index.cPointer(), roleDataSpan.cPointer()) +} + func (this *QAbstractItemModel) DataChanged(topLeft *QModelIndex, bottomRight *QModelIndex) { C.QAbstractItemModel_DataChanged(this.h, topLeft.cPointer(), bottomRight.cPointer()) } @@ -674,28 +831,6 @@ func QAbstractItemModel_Tr3(s string, c string, n int) string { return _ret } -func QAbstractItemModel_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractItemModel_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QAbstractItemModel_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractItemModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QAbstractItemModel) HasIndex3(row int, column int, parent *QModelIndex) bool { return (bool)(C.QAbstractItemModel_HasIndex3(this.h, (C.int)(row), (C.int)(column), parent.cPointer())) } @@ -1058,15 +1193,6 @@ func QAbstractTableModel_Tr(s string) string { return _ret } -func QAbstractTableModel_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractTableModel_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QAbstractTableModel) Index(row int, column int) *QModelIndex { _ret := C.QAbstractTableModel_Index(this.h, (C.int)(row), (C.int)(column)) _goptr := newQModelIndex(_ret) @@ -1111,28 +1237,6 @@ func QAbstractTableModel_Tr3(s string, c string, n int) string { return _ret } -func QAbstractTableModel_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractTableModel_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QAbstractTableModel_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractTableModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QAbstractTableModel) Index3(row int, column int, parent *QModelIndex) *QModelIndex { _ret := C.QAbstractTableModel_Index3(this.h, (C.int)(row), (C.int)(column), parent.cPointer()) _goptr := newQModelIndex(_ret) @@ -1196,15 +1300,6 @@ func QAbstractListModel_Tr(s string) string { return _ret } -func QAbstractListModel_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractListModel_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QAbstractListModel) Index(row int) *QModelIndex { _ret := C.QAbstractListModel_Index(this.h, (C.int)(row)) _goptr := newQModelIndex(_ret) @@ -1249,28 +1344,6 @@ func QAbstractListModel_Tr3(s string, c string, n int) string { return _ret } -func QAbstractListModel_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractListModel_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QAbstractListModel_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractListModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QAbstractListModel) Index2(row int, column int) *QModelIndex { _ret := C.QAbstractListModel_Index2(this.h, (C.int)(row), (C.int)(column)) _goptr := newQModelIndex(_ret) diff --git a/qt/gen_qabstractitemmodel.h b/qt/gen_qabstractitemmodel.h index 9e6529c..c912035 100644 --- a/qt/gen_qabstractitemmodel.h +++ b/qt/gen_qabstractitemmodel.h @@ -20,6 +20,8 @@ class QAbstractTableModel; class QMetaObject; class QMimeData; class QModelIndex; +class QModelRoleData; +class QModelRoleDataSpan; class QPersistentModelIndex; class QSize; class QVariant; @@ -30,23 +32,48 @@ typedef struct QAbstractTableModel QAbstractTableModel; typedef struct QMetaObject QMetaObject; typedef struct QMimeData QMimeData; typedef struct QModelIndex QModelIndex; +typedef struct QModelRoleData QModelRoleData; +typedef struct QModelRoleDataSpan QModelRoleDataSpan; typedef struct QPersistentModelIndex QPersistentModelIndex; typedef struct QSize QSize; typedef struct QVariant QVariant; #endif +QModelRoleData* QModelRoleData_new(int role); +QModelRoleData* QModelRoleData_new2(QModelRoleData* param1); +int QModelRoleData_Role(const QModelRoleData* self); +QVariant* QModelRoleData_Data(QModelRoleData* self); +QVariant* QModelRoleData_Data2(const QModelRoleData* self); +void QModelRoleData_ClearData(QModelRoleData* self); +void QModelRoleData_OperatorAssign(QModelRoleData* self, QModelRoleData* param1); +void QModelRoleData_Delete(QModelRoleData* self); + +QModelRoleDataSpan* QModelRoleDataSpan_new(); +QModelRoleDataSpan* QModelRoleDataSpan_new2(QModelRoleData* modelRoleData); +QModelRoleDataSpan* QModelRoleDataSpan_new3(QModelRoleData* modelRoleData, ptrdiff_t lenVal); +QModelRoleDataSpan* QModelRoleDataSpan_new4(QModelRoleDataSpan* param1); +ptrdiff_t QModelRoleDataSpan_Size(const QModelRoleDataSpan* self); +ptrdiff_t QModelRoleDataSpan_Length(const QModelRoleDataSpan* self); +QModelRoleData* QModelRoleDataSpan_Data(const QModelRoleDataSpan* self); +QModelRoleData* QModelRoleDataSpan_Begin(const QModelRoleDataSpan* self); +QModelRoleData* QModelRoleDataSpan_End(const QModelRoleDataSpan* self); +QModelRoleData* QModelRoleDataSpan_OperatorSubscript(const QModelRoleDataSpan* self, ptrdiff_t index); +QVariant* QModelRoleDataSpan_DataForRole(const QModelRoleDataSpan* self, int role); +void QModelRoleDataSpan_Delete(QModelRoleDataSpan* self); + QModelIndex* QModelIndex_new(); QModelIndex* QModelIndex_new2(QModelIndex* param1); int QModelIndex_Row(const QModelIndex* self); int QModelIndex_Column(const QModelIndex* self); uintptr_t QModelIndex_InternalId(const QModelIndex* self); void* QModelIndex_InternalPointer(const QModelIndex* self); +const void* QModelIndex_ConstInternalPointer(const QModelIndex* self); QModelIndex* QModelIndex_Parent(const QModelIndex* self); QModelIndex* QModelIndex_Sibling(const QModelIndex* self, int row, int column); QModelIndex* QModelIndex_SiblingAtColumn(const QModelIndex* self, int column); QModelIndex* QModelIndex_SiblingAtRow(const QModelIndex* self, int row); -QModelIndex* QModelIndex_Child(const QModelIndex* self, int row, int column); QVariant* QModelIndex_Data(const QModelIndex* self); +void QModelIndex_MultiData(const QModelIndex* self, QModelRoleDataSpan* roleDataSpan); int QModelIndex_Flags(const QModelIndex* self); QAbstractItemModel* QModelIndex_Model(const QModelIndex* self); bool QModelIndex_IsValid(const QModelIndex* self); @@ -70,11 +97,12 @@ void QPersistentModelIndex_OperatorAssignWithOther(QPersistentModelIndex* self, int QPersistentModelIndex_Row(const QPersistentModelIndex* self); int QPersistentModelIndex_Column(const QPersistentModelIndex* self); void* QPersistentModelIndex_InternalPointer(const QPersistentModelIndex* self); +const void* QPersistentModelIndex_ConstInternalPointer(const QPersistentModelIndex* self); uintptr_t QPersistentModelIndex_InternalId(const QPersistentModelIndex* self); QModelIndex* QPersistentModelIndex_Parent(const QPersistentModelIndex* self); QModelIndex* QPersistentModelIndex_Sibling(const QPersistentModelIndex* self, int row, int column); -QModelIndex* QPersistentModelIndex_Child(const QPersistentModelIndex* self, int row, int column); QVariant* QPersistentModelIndex_Data(const QPersistentModelIndex* self); +void QPersistentModelIndex_MultiData(const QPersistentModelIndex* self, QModelRoleDataSpan* roleDataSpan); int QPersistentModelIndex_Flags(const QPersistentModelIndex* self); QAbstractItemModel* QPersistentModelIndex_Model(const QPersistentModelIndex* self); bool QPersistentModelIndex_IsValid(const QPersistentModelIndex* self); @@ -84,7 +112,6 @@ void QPersistentModelIndex_Delete(QPersistentModelIndex* self); QMetaObject* QAbstractItemModel_MetaObject(const QAbstractItemModel* self); void* QAbstractItemModel_Metacast(QAbstractItemModel* self, const char* param1); struct miqt_string* QAbstractItemModel_Tr(const char* s); -struct miqt_string* QAbstractItemModel_TrUtf8(const char* s); bool QAbstractItemModel_HasIndex(const QAbstractItemModel* self, int row, int column); QModelIndex* QAbstractItemModel_Index(const QAbstractItemModel* self, int row, int column); QModelIndex* QAbstractItemModel_Parent(const QAbstractItemModel* self, QModelIndex* child); @@ -96,6 +123,7 @@ QVariant* QAbstractItemModel_Data(const QAbstractItemModel* self, QModelIndex* i bool QAbstractItemModel_SetData(QAbstractItemModel* self, QModelIndex* index, QVariant* value); QVariant* QAbstractItemModel_HeaderData(const QAbstractItemModel* self, int section, int orientation); bool QAbstractItemModel_SetHeaderData(QAbstractItemModel* self, int section, int orientation, QVariant* value); +bool QAbstractItemModel_ClearItemData(QAbstractItemModel* self, QModelIndex* index); 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, int action, int row, int column, QModelIndex* parent); @@ -122,6 +150,7 @@ QModelIndex* QAbstractItemModel_Buddy(const QAbstractItemModel* self, QModelInde struct miqt_array* QAbstractItemModel_Match(const QAbstractItemModel* self, QModelIndex* start, int role, QVariant* value); QSize* QAbstractItemModel_Span(const QAbstractItemModel* self, QModelIndex* index); bool QAbstractItemModel_CheckIndex(const QAbstractItemModel* self, QModelIndex* index); +void QAbstractItemModel_MultiData(const QAbstractItemModel* self, QModelIndex* index, QModelRoleDataSpan* roleDataSpan); void QAbstractItemModel_DataChanged(QAbstractItemModel* self, QModelIndex* topLeft, QModelIndex* bottomRight); void QAbstractItemModel_connect_DataChanged(QAbstractItemModel* self, void* slot); void QAbstractItemModel_HeaderDataChanged(QAbstractItemModel* self, int orientation, int first, int last); @@ -134,8 +163,6 @@ bool QAbstractItemModel_Submit(QAbstractItemModel* self); void QAbstractItemModel_Revert(QAbstractItemModel* self); struct miqt_string* QAbstractItemModel_Tr2(const char* s, const char* c); struct miqt_string* QAbstractItemModel_Tr3(const char* s, const char* c, int n); -struct miqt_string* QAbstractItemModel_TrUtf82(const char* s, const char* c); -struct miqt_string* QAbstractItemModel_TrUtf83(const char* s, const char* c, int n); bool QAbstractItemModel_HasIndex3(const QAbstractItemModel* self, int row, int column, QModelIndex* parent); QModelIndex* QAbstractItemModel_Index3(const QAbstractItemModel* self, int row, int column, QModelIndex* parent); int QAbstractItemModel_RowCount1(const QAbstractItemModel* self, QModelIndex* parent); @@ -172,30 +199,24 @@ void QAbstractItemModel_Delete(QAbstractItemModel* self); QMetaObject* QAbstractTableModel_MetaObject(const QAbstractTableModel* self); void* QAbstractTableModel_Metacast(QAbstractTableModel* self, const char* param1); 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, 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); -struct miqt_string* QAbstractTableModel_TrUtf82(const char* s, const char* c); -struct miqt_string* QAbstractTableModel_TrUtf83(const char* s, const char* c, int n); QModelIndex* QAbstractTableModel_Index3(const QAbstractTableModel* self, int row, int column, QModelIndex* parent); void QAbstractTableModel_Delete(QAbstractTableModel* self); QMetaObject* QAbstractListModel_MetaObject(const QAbstractListModel* self); void* QAbstractListModel_Metacast(QAbstractListModel* self, const char* param1); 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, 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); -struct miqt_string* QAbstractListModel_TrUtf82(const char* s, const char* c); -struct miqt_string* QAbstractListModel_TrUtf83(const char* s, const char* c, int n); QModelIndex* QAbstractListModel_Index2(const QAbstractListModel* self, int row, int column); QModelIndex* QAbstractListModel_Index3(const QAbstractListModel* self, int row, int column, QModelIndex* parent); void QAbstractListModel_Delete(QAbstractListModel* self); diff --git a/qt/gen_qabstractitemview.cpp b/qt/gen_qabstractitemview.cpp index e3302ab..8c0d570 100644 --- a/qt/gen_qabstractitemview.cpp +++ b/qt/gen_qabstractitemview.cpp @@ -31,13 +31,6 @@ struct miqt_string* QAbstractItemView_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAbstractItemView_TrUtf8(const char* s) { - QString _ret = QAbstractItemView::trUtf8(s); - // 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 QAbstractItemView_SetModel(QAbstractItemView* self, QAbstractItemModel* model) { self->setModel(model); } @@ -283,6 +276,10 @@ QAbstractItemDelegate* QAbstractItemView_ItemDelegateWithIndex(const QAbstractIt return self->itemDelegate(*index); } +QAbstractItemDelegate* QAbstractItemView_ItemDelegateForIndex(const QAbstractItemView* self, QModelIndex* index) { + return self->itemDelegateForIndex(*index); +} + QVariant* QAbstractItemView_InputMethodQuery(const QAbstractItemView* self, int query) { return new QVariant(self->inputMethodQuery(static_cast(query))); } @@ -429,20 +426,6 @@ struct miqt_string* QAbstractItemView_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAbstractItemView_TrUtf82(const char* s, const char* c) { - QString _ret = QAbstractItemView::trUtf8(s, c); - // 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* QAbstractItemView_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QAbstractItemView::trUtf8(s, c, static_cast(n)); - // 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 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 0e4fe2a..9925981 100644 --- a/qt/gen_qabstractitemview.go +++ b/qt/gen_qabstractitemview.go @@ -112,15 +112,6 @@ func QAbstractItemView_Tr(s string) string { return _ret } -func QAbstractItemView_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractItemView_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QAbstractItemView) SetModel(model *QAbstractItemModel) { C.QAbstractItemView_SetModel(this.h, model.cPointer()) } @@ -377,6 +368,10 @@ func (this *QAbstractItemView) ItemDelegateWithIndex(index *QModelIndex) *QAbstr return newQAbstractItemDelegate_U(unsafe.Pointer(C.QAbstractItemView_ItemDelegateWithIndex(this.h, index.cPointer()))) } +func (this *QAbstractItemView) ItemDelegateForIndex(index *QModelIndex) *QAbstractItemDelegate { + return newQAbstractItemDelegate_U(unsafe.Pointer(C.QAbstractItemView_ItemDelegateForIndex(this.h, index.cPointer()))) +} + func (this *QAbstractItemView) InputMethodQuery(query InputMethodQuery) *QVariant { _ret := C.QAbstractItemView_InputMethodQuery(this.h, (C.int)(query)) _goptr := newQVariant(_ret) @@ -583,28 +578,6 @@ func QAbstractItemView_Tr3(s string, c string, n int) string { return _ret } -func QAbstractItemView_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractItemView_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QAbstractItemView_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractItemView_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QAbstractItemView) ScrollTo2(index *QModelIndex, hint QAbstractItemView__ScrollHint) { C.QAbstractItemView_ScrollTo2(this.h, index.cPointer(), (C.int)(hint)) } diff --git a/qt/gen_qabstractitemview.h b/qt/gen_qabstractitemview.h index fe663ec..b266c57 100644 --- a/qt/gen_qabstractitemview.h +++ b/qt/gen_qabstractitemview.h @@ -42,7 +42,6 @@ typedef struct QWidget QWidget; QMetaObject* QAbstractItemView_MetaObject(const QAbstractItemView* self); void* QAbstractItemView_Metacast(QAbstractItemView* self, const char* param1); struct miqt_string* QAbstractItemView_Tr(const char* s); -struct miqt_string* QAbstractItemView_TrUtf8(const char* s); void QAbstractItemView_SetModel(QAbstractItemView* self, QAbstractItemModel* model); QAbstractItemModel* QAbstractItemView_Model(const QAbstractItemView* self); void QAbstractItemView_SetSelectionModel(QAbstractItemView* self, QItemSelectionModel* selectionModel); @@ -102,6 +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); +QAbstractItemDelegate* QAbstractItemView_ItemDelegateForIndex(const QAbstractItemView* self, QModelIndex* index); QVariant* QAbstractItemView_InputMethodQuery(const QAbstractItemView* self, int query); void QAbstractItemView_Reset(QAbstractItemView* self); void QAbstractItemView_SetRootIndex(QAbstractItemView* self, QModelIndex* index); @@ -129,8 +129,6 @@ void QAbstractItemView_IconSizeChanged(QAbstractItemView* self, QSize* size); void QAbstractItemView_connect_IconSizeChanged(QAbstractItemView* self, void* slot); struct miqt_string* QAbstractItemView_Tr2(const char* s, const char* c); struct miqt_string* QAbstractItemView_Tr3(const char* s, const char* c, int n); -struct miqt_string* QAbstractItemView_TrUtf82(const char* s, const char* c); -struct miqt_string* QAbstractItemView_TrUtf83(const char* s, const char* c, int n); void QAbstractItemView_ScrollTo2(QAbstractItemView* self, QModelIndex* index, int hint); void QAbstractItemView_Delete(QAbstractItemView* self); diff --git a/qt/gen_qabstractnativeeventfilter.cpp b/qt/gen_qabstractnativeeventfilter.cpp index 2ebca07..409f39d 100644 --- a/qt/gen_qabstractnativeeventfilter.cpp +++ b/qt/gen_qabstractnativeeventfilter.cpp @@ -4,8 +4,8 @@ #include "gen_qabstractnativeeventfilter.h" #include "_cgo_export.h" -bool QAbstractNativeEventFilter_NativeEventFilter(QAbstractNativeEventFilter* self, QByteArray* eventType, void* message, long* result) { - return self->nativeEventFilter(*eventType, message, static_cast(result)); +bool QAbstractNativeEventFilter_NativeEventFilter(QAbstractNativeEventFilter* self, QByteArray* eventType, void* message, intptr_t* result) { + return self->nativeEventFilter(*eventType, message, (qintptr*)(result)); } void QAbstractNativeEventFilter_Delete(QAbstractNativeEventFilter* self) { diff --git a/qt/gen_qabstractnativeeventfilter.go b/qt/gen_qabstractnativeeventfilter.go index 9bf041c..e17ce10 100644 --- a/qt/gen_qabstractnativeeventfilter.go +++ b/qt/gen_qabstractnativeeventfilter.go @@ -35,8 +35,8 @@ func newQAbstractNativeEventFilter_U(h unsafe.Pointer) *QAbstractNativeEventFilt return newQAbstractNativeEventFilter((*C.QAbstractNativeEventFilter)(h)) } -func (this *QAbstractNativeEventFilter) NativeEventFilter(eventType *QByteArray, message unsafe.Pointer, result *int64) bool { - return (bool)(C.QAbstractNativeEventFilter_NativeEventFilter(this.h, eventType.cPointer(), message, (*C.long)(unsafe.Pointer(result)))) +func (this *QAbstractNativeEventFilter) NativeEventFilter(eventType *QByteArray, message unsafe.Pointer, result *uintptr) bool { + return (bool)(C.QAbstractNativeEventFilter_NativeEventFilter(this.h, eventType.cPointer(), message, (*C.intptr_t)(unsafe.Pointer(result)))) } // Delete this object from C++ memory. diff --git a/qt/gen_qabstractnativeeventfilter.h b/qt/gen_qabstractnativeeventfilter.h index df23208..96b2ef9 100644 --- a/qt/gen_qabstractnativeeventfilter.h +++ b/qt/gen_qabstractnativeeventfilter.h @@ -21,7 +21,7 @@ typedef struct QAbstractNativeEventFilter QAbstractNativeEventFilter; typedef struct QByteArray QByteArray; #endif -bool QAbstractNativeEventFilter_NativeEventFilter(QAbstractNativeEventFilter* self, QByteArray* eventType, void* message, long* result); +bool QAbstractNativeEventFilter_NativeEventFilter(QAbstractNativeEventFilter* self, QByteArray* eventType, void* message, intptr_t* result); void QAbstractNativeEventFilter_Delete(QAbstractNativeEventFilter* self); #ifdef __cplusplus diff --git a/qt/gen_qabstractproxymodel.cpp b/qt/gen_qabstractproxymodel.cpp index 747c6bd..0024c28 100644 --- a/qt/gen_qabstractproxymodel.cpp +++ b/qt/gen_qabstractproxymodel.cpp @@ -28,13 +28,6 @@ struct miqt_string* QAbstractProxyModel_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAbstractProxyModel_TrUtf8(const char* s) { - QString _ret = QAbstractProxyModel::trUtf8(s); - // 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 QAbstractProxyModel_SetSourceModel(QAbstractProxyModel* self, QAbstractItemModel* sourceModel) { self->setSourceModel(sourceModel); } @@ -80,6 +73,10 @@ bool QAbstractProxyModel_SetHeaderData(QAbstractProxyModel* self, int section, i return self->setHeaderData(static_cast(section), static_cast(orientation), *value); } +bool QAbstractProxyModel_ClearItemData(QAbstractProxyModel* self, QModelIndex* index) { + return self->clearItemData(*index); +} + QModelIndex* QAbstractProxyModel_Buddy(const QAbstractProxyModel* self, QModelIndex* index) { return new QModelIndex(self->buddy(*index)); } @@ -166,20 +163,6 @@ struct miqt_string* QAbstractProxyModel_Tr3(const char* s, const char* c, int n) return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAbstractProxyModel_TrUtf82(const char* s, const char* c) { - QString _ret = QAbstractProxyModel::trUtf8(s, c); - // 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* QAbstractProxyModel_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QAbstractProxyModel::trUtf8(s, c, static_cast(n)); - // 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()); -} - QVariant* QAbstractProxyModel_Data2(const QAbstractProxyModel* self, QModelIndex* proxyIndex, int role) { return new QVariant(self->data(*proxyIndex, static_cast(role))); } diff --git a/qt/gen_qabstractproxymodel.go b/qt/gen_qabstractproxymodel.go index 6a81995..3635381 100644 --- a/qt/gen_qabstractproxymodel.go +++ b/qt/gen_qabstractproxymodel.go @@ -55,15 +55,6 @@ func QAbstractProxyModel_Tr(s string) string { return _ret } -func QAbstractProxyModel_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractProxyModel_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QAbstractProxyModel) SetSourceModel(sourceModel *QAbstractItemModel) { C.QAbstractProxyModel_SetSourceModel(this.h, sourceModel.cPointer()) } @@ -120,6 +111,10 @@ func (this *QAbstractProxyModel) SetHeaderData(section int, orientation Orientat return (bool)(C.QAbstractProxyModel_SetHeaderData(this.h, (C.int)(section), (C.int)(orientation), value.cPointer())) } +func (this *QAbstractProxyModel) ClearItemData(index *QModelIndex) bool { + return (bool)(C.QAbstractProxyModel_ClearItemData(this.h, index.cPointer())) +} + func (this *QAbstractProxyModel) Buddy(index *QModelIndex) *QModelIndex { _ret := C.QAbstractProxyModel_Buddy(this.h, index.cPointer()) _goptr := newQModelIndex(_ret) @@ -221,28 +216,6 @@ func QAbstractProxyModel_Tr3(s string, c string, n int) string { return _ret } -func QAbstractProxyModel_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractProxyModel_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QAbstractProxyModel_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractProxyModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QAbstractProxyModel) Data2(proxyIndex *QModelIndex, role int) *QVariant { _ret := C.QAbstractProxyModel_Data2(this.h, proxyIndex.cPointer(), (C.int)(role)) _goptr := newQVariant(_ret) diff --git a/qt/gen_qabstractproxymodel.h b/qt/gen_qabstractproxymodel.h index 3c771f3..e948d2c 100644 --- a/qt/gen_qabstractproxymodel.h +++ b/qt/gen_qabstractproxymodel.h @@ -34,7 +34,6 @@ typedef struct QVariant QVariant; QMetaObject* QAbstractProxyModel_MetaObject(const QAbstractProxyModel* self); void* QAbstractProxyModel_Metacast(QAbstractProxyModel* self, const char* param1); struct miqt_string* QAbstractProxyModel_Tr(const char* s); -struct miqt_string* QAbstractProxyModel_TrUtf8(const char* s); void QAbstractProxyModel_SetSourceModel(QAbstractProxyModel* self, QAbstractItemModel* sourceModel); QAbstractItemModel* QAbstractProxyModel_SourceModel(const QAbstractProxyModel* self); QModelIndex* QAbstractProxyModel_MapToSource(const QAbstractProxyModel* self, QModelIndex* proxyIndex); @@ -46,6 +45,7 @@ QVariant* QAbstractProxyModel_HeaderData(const QAbstractProxyModel* self, int se int QAbstractProxyModel_Flags(const QAbstractProxyModel* self, QModelIndex* index); bool QAbstractProxyModel_SetData(QAbstractProxyModel* self, QModelIndex* index, QVariant* value); bool QAbstractProxyModel_SetHeaderData(QAbstractProxyModel* self, int section, int orientation, QVariant* value); +bool QAbstractProxyModel_ClearItemData(QAbstractProxyModel* self, QModelIndex* index); QModelIndex* QAbstractProxyModel_Buddy(const QAbstractProxyModel* self, QModelIndex* index); bool QAbstractProxyModel_CanFetchMore(const QAbstractProxyModel* self, QModelIndex* parent); void QAbstractProxyModel_FetchMore(QAbstractProxyModel* self, QModelIndex* parent); @@ -61,8 +61,6 @@ int QAbstractProxyModel_SupportedDragActions(const QAbstractProxyModel* self); int QAbstractProxyModel_SupportedDropActions(const QAbstractProxyModel* self); struct miqt_string* QAbstractProxyModel_Tr2(const char* s, const char* c); 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, int orientation, int role); bool QAbstractProxyModel_SetData3(QAbstractProxyModel* self, QModelIndex* index, QVariant* value, int role); diff --git a/qt/gen_qabstractscrollarea.cpp b/qt/gen_qabstractscrollarea.cpp index 9d0e4ac..8c2ee36 100644 --- a/qt/gen_qabstractscrollarea.cpp +++ b/qt/gen_qabstractscrollarea.cpp @@ -34,13 +34,6 @@ struct miqt_string* QAbstractScrollArea_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAbstractScrollArea_TrUtf8(const char* s) { - QString _ret = QAbstractScrollArea::trUtf8(s); - // 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()); -} - int QAbstractScrollArea_VerticalScrollBarPolicy(const QAbstractScrollArea* self) { Qt::ScrollBarPolicy _ret = self->verticalScrollBarPolicy(); return static_cast(_ret); @@ -147,20 +140,6 @@ struct miqt_string* QAbstractScrollArea_Tr3(const char* s, const char* c, int n) return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAbstractScrollArea_TrUtf82(const char* s, const char* c) { - QString _ret = QAbstractScrollArea::trUtf8(s, c); - // 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* QAbstractScrollArea_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QAbstractScrollArea::trUtf8(s, c, static_cast(n)); - // 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 QAbstractScrollArea_Delete(QAbstractScrollArea* self) { delete self; } diff --git a/qt/gen_qabstractscrollarea.go b/qt/gen_qabstractscrollarea.go index a673b02..2e41240 100644 --- a/qt/gen_qabstractscrollarea.go +++ b/qt/gen_qabstractscrollarea.go @@ -75,15 +75,6 @@ func QAbstractScrollArea_Tr(s string) string { return _ret } -func QAbstractScrollArea_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractScrollArea_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QAbstractScrollArea) VerticalScrollBarPolicy() ScrollBarPolicy { return (ScrollBarPolicy)(C.QAbstractScrollArea_VerticalScrollBarPolicy(this.h)) } @@ -202,28 +193,6 @@ func QAbstractScrollArea_Tr3(s string, c string, n int) string { return _ret } -func QAbstractScrollArea_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractScrollArea_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QAbstractScrollArea_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractScrollArea_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QAbstractScrollArea) Delete() { C.QAbstractScrollArea_Delete(this.h) diff --git a/qt/gen_qabstractscrollarea.h b/qt/gen_qabstractscrollarea.h index b43978f..8bee9a3 100644 --- a/qt/gen_qabstractscrollarea.h +++ b/qt/gen_qabstractscrollarea.h @@ -32,7 +32,6 @@ QAbstractScrollArea* QAbstractScrollArea_new2(QWidget* parent); QMetaObject* QAbstractScrollArea_MetaObject(const QAbstractScrollArea* self); void* QAbstractScrollArea_Metacast(QAbstractScrollArea* self, const char* param1); struct miqt_string* QAbstractScrollArea_Tr(const char* s); -struct miqt_string* QAbstractScrollArea_TrUtf8(const char* s); int QAbstractScrollArea_VerticalScrollBarPolicy(const QAbstractScrollArea* self); void QAbstractScrollArea_SetVerticalScrollBarPolicy(QAbstractScrollArea* self, int verticalScrollBarPolicy); QScrollBar* QAbstractScrollArea_VerticalScrollBar(const QAbstractScrollArea* self); @@ -55,8 +54,6 @@ 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); -struct miqt_string* QAbstractScrollArea_TrUtf83(const char* s, const char* c, int n); void QAbstractScrollArea_Delete(QAbstractScrollArea* self); #ifdef __cplusplus diff --git a/qt/gen_qabstractslider.cpp b/qt/gen_qabstractslider.cpp index c16f0ae..2511850 100644 --- a/qt/gen_qabstractslider.cpp +++ b/qt/gen_qabstractslider.cpp @@ -31,13 +31,6 @@ struct miqt_string* QAbstractSlider_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAbstractSlider_TrUtf8(const char* s) { - QString _ret = QAbstractSlider::trUtf8(s); - // 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()); -} - int QAbstractSlider_Orientation(const QAbstractSlider* self) { Qt::Orientation _ret = self->orientation(); return static_cast(_ret); @@ -214,20 +207,6 @@ struct miqt_string* QAbstractSlider_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAbstractSlider_TrUtf82(const char* s, const char* c) { - QString _ret = QAbstractSlider::trUtf8(s, c); - // 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* QAbstractSlider_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QAbstractSlider::trUtf8(s, c, static_cast(n)); - // 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 QAbstractSlider_Delete(QAbstractSlider* self) { delete self; } diff --git a/qt/gen_qabstractslider.go b/qt/gen_qabstractslider.go index 1c8e3f3..853fab9 100644 --- a/qt/gen_qabstractslider.go +++ b/qt/gen_qabstractslider.go @@ -81,15 +81,6 @@ func QAbstractSlider_Tr(s string) string { return _ret } -func QAbstractSlider_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractSlider_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QAbstractSlider) Orientation() Orientation { return (Orientation)(C.QAbstractSlider_Orientation(this.h)) } @@ -324,28 +315,6 @@ func QAbstractSlider_Tr3(s string, c string, n int) string { return _ret } -func QAbstractSlider_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractSlider_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QAbstractSlider_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractSlider_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QAbstractSlider) Delete() { C.QAbstractSlider_Delete(this.h) diff --git a/qt/gen_qabstractslider.h b/qt/gen_qabstractslider.h index b477f84..318467b 100644 --- a/qt/gen_qabstractslider.h +++ b/qt/gen_qabstractslider.h @@ -28,7 +28,6 @@ QAbstractSlider* QAbstractSlider_new2(QWidget* parent); QMetaObject* QAbstractSlider_MetaObject(const QAbstractSlider* self); void* QAbstractSlider_Metacast(QAbstractSlider* self, const char* param1); struct miqt_string* QAbstractSlider_Tr(const char* s); -struct miqt_string* QAbstractSlider_TrUtf8(const char* s); int QAbstractSlider_Orientation(const QAbstractSlider* self); void QAbstractSlider_SetMinimum(QAbstractSlider* self, int minimum); int QAbstractSlider_Minimum(const QAbstractSlider* self); @@ -67,8 +66,6 @@ void QAbstractSlider_ActionTriggered(QAbstractSlider* self, int action); void QAbstractSlider_connect_ActionTriggered(QAbstractSlider* self, void* slot); struct miqt_string* QAbstractSlider_Tr2(const char* s, const char* c); struct miqt_string* QAbstractSlider_Tr3(const char* s, const char* c, int n); -struct miqt_string* QAbstractSlider_TrUtf82(const char* s, const char* c); -struct miqt_string* QAbstractSlider_TrUtf83(const char* s, const char* c, int n); void QAbstractSlider_Delete(QAbstractSlider* self); #ifdef __cplusplus diff --git a/qt/gen_qabstractspinbox.cpp b/qt/gen_qabstractspinbox.cpp index e7979a1..b65b636 100644 --- a/qt/gen_qabstractspinbox.cpp +++ b/qt/gen_qabstractspinbox.cpp @@ -34,13 +34,6 @@ struct miqt_string* QAbstractSpinBox_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAbstractSpinBox_TrUtf8(const char* s) { - QString _ret = QAbstractSpinBox::trUtf8(s); - // 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()); -} - int QAbstractSpinBox_ButtonSymbols(const QAbstractSpinBox* self) { QAbstractSpinBox::ButtonSymbols _ret = self->buttonSymbols(); return static_cast(_ret); @@ -214,20 +207,6 @@ struct miqt_string* QAbstractSpinBox_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAbstractSpinBox_TrUtf82(const char* s, const char* c) { - QString _ret = QAbstractSpinBox::trUtf8(s, c); - // 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* QAbstractSpinBox_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QAbstractSpinBox::trUtf8(s, c, static_cast(n)); - // 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 QAbstractSpinBox_Delete(QAbstractSpinBox* self) { delete self; } diff --git a/qt/gen_qabstractspinbox.go b/qt/gen_qabstractspinbox.go index 15d1bee..fe852a7 100644 --- a/qt/gen_qabstractspinbox.go +++ b/qt/gen_qabstractspinbox.go @@ -98,15 +98,6 @@ func QAbstractSpinBox_Tr(s string) string { return _ret } -func QAbstractSpinBox_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractSpinBox_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QAbstractSpinBox) ButtonSymbols() QAbstractSpinBox__ButtonSymbols { return (QAbstractSpinBox__ButtonSymbols)(C.QAbstractSpinBox_ButtonSymbols(this.h)) } @@ -303,28 +294,6 @@ func QAbstractSpinBox_Tr3(s string, c string, n int) string { return _ret } -func QAbstractSpinBox_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractSpinBox_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QAbstractSpinBox_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractSpinBox_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QAbstractSpinBox) Delete() { C.QAbstractSpinBox_Delete(this.h) diff --git a/qt/gen_qabstractspinbox.h b/qt/gen_qabstractspinbox.h index 74f314b..11d321a 100644 --- a/qt/gen_qabstractspinbox.h +++ b/qt/gen_qabstractspinbox.h @@ -34,7 +34,6 @@ QAbstractSpinBox* QAbstractSpinBox_new2(QWidget* parent); QMetaObject* QAbstractSpinBox_MetaObject(const QAbstractSpinBox* self); void* QAbstractSpinBox_Metacast(QAbstractSpinBox* self, const char* param1); struct miqt_string* QAbstractSpinBox_Tr(const char* s); -struct miqt_string* QAbstractSpinBox_TrUtf8(const char* s); int QAbstractSpinBox_ButtonSymbols(const QAbstractSpinBox* self); void QAbstractSpinBox_SetButtonSymbols(QAbstractSpinBox* self, int bs); void QAbstractSpinBox_SetCorrectionMode(QAbstractSpinBox* self, int cm); @@ -73,8 +72,6 @@ void QAbstractSpinBox_EditingFinished(QAbstractSpinBox* self); void QAbstractSpinBox_connect_EditingFinished(QAbstractSpinBox* self, void* slot); struct miqt_string* QAbstractSpinBox_Tr2(const char* s, const char* c); struct miqt_string* QAbstractSpinBox_Tr3(const char* s, const char* c, int n); -struct miqt_string* QAbstractSpinBox_TrUtf82(const char* s, const char* c); -struct miqt_string* QAbstractSpinBox_TrUtf83(const char* s, const char* c, int n); void QAbstractSpinBox_Delete(QAbstractSpinBox* self); #ifdef __cplusplus diff --git a/qt/gen_qabstractstate.cpp b/qt/gen_qabstractstate.cpp deleted file mode 100644 index 35c9a95..0000000 --- a/qt/gen_qabstractstate.cpp +++ /dev/null @@ -1,88 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include "qabstractstate.h" -#include "gen_qabstractstate.h" -#include "_cgo_export.h" - -QMetaObject* QAbstractState_MetaObject(const QAbstractState* self) { - return (QMetaObject*) self->metaObject(); -} - -void* QAbstractState_Metacast(QAbstractState* self, const char* param1) { - return self->qt_metacast(param1); -} - -struct miqt_string* QAbstractState_Tr(const char* s) { - QString _ret = QAbstractState::tr(s); - // 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* QAbstractState_TrUtf8(const char* s) { - QString _ret = QAbstractState::trUtf8(s); - // 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()); -} - -QState* QAbstractState_ParentState(const QAbstractState* self) { - return self->parentState(); -} - -QStateMachine* QAbstractState_Machine(const QAbstractState* self) { - return self->machine(); -} - -bool QAbstractState_Active(const QAbstractState* self) { - return self->active(); -} - -void QAbstractState_ActiveChanged(QAbstractState* self, bool active) { - self->activeChanged(active); -} - -void QAbstractState_connect_ActiveChanged(QAbstractState* self, void* slot) { - QAbstractState::connect(self, static_cast(&QAbstractState::activeChanged), self, [=](bool active) { - bool sigval1 = active; - miqt_exec_callback_QAbstractState_ActiveChanged(slot, sigval1); - }); -} - -struct miqt_string* QAbstractState_Tr2(const char* s, const char* c) { - QString _ret = QAbstractState::tr(s, c); - // 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* QAbstractState_Tr3(const char* s, const char* c, int n) { - QString _ret = QAbstractState::tr(s, c, static_cast(n)); - // 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* QAbstractState_TrUtf82(const char* s, const char* c) { - QString _ret = QAbstractState::trUtf8(s, c); - // 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* QAbstractState_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QAbstractState::trUtf8(s, c, static_cast(n)); - // 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 QAbstractState_Delete(QAbstractState* self) { - delete self; -} - diff --git a/qt/gen_qabstractstate.go b/qt/gen_qabstractstate.go deleted file mode 100644 index a1b6e24..0000000 --- a/qt/gen_qabstractstate.go +++ /dev/null @@ -1,156 +0,0 @@ -package qt - -/* - -#include "gen_qabstractstate.h" -#include - -*/ -import "C" - -import ( - "runtime" - "runtime/cgo" - "unsafe" -) - -type QAbstractState struct { - h *C.QAbstractState - *QObject -} - -func (this *QAbstractState) cPointer() *C.QAbstractState { - if this == nil { - return nil - } - return this.h -} - -func newQAbstractState(h *C.QAbstractState) *QAbstractState { - if h == nil { - return nil - } - return &QAbstractState{h: h, QObject: newQObject_U(unsafe.Pointer(h))} -} - -func newQAbstractState_U(h unsafe.Pointer) *QAbstractState { - return newQAbstractState((*C.QAbstractState)(h)) -} - -func (this *QAbstractState) MetaObject() *QMetaObject { - return newQMetaObject_U(unsafe.Pointer(C.QAbstractState_MetaObject(this.h))) -} - -func (this *QAbstractState) Metacast(param1 string) unsafe.Pointer { - param1_Cstring := C.CString(param1) - defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QAbstractState_Metacast(this.h, param1_Cstring) -} - -func QAbstractState_Tr(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractState_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QAbstractState_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractState_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QAbstractState) ParentState() *QState { - return newQState_U(unsafe.Pointer(C.QAbstractState_ParentState(this.h))) -} - -func (this *QAbstractState) Machine() *QStateMachine { - return newQStateMachine_U(unsafe.Pointer(C.QAbstractState_Machine(this.h))) -} - -func (this *QAbstractState) Active() bool { - return (bool)(C.QAbstractState_Active(this.h)) -} - -func (this *QAbstractState) ActiveChanged(active bool) { - C.QAbstractState_ActiveChanged(this.h, (C.bool)(active)) -} -func (this *QAbstractState) OnActiveChanged(slot func(active bool)) { - C.QAbstractState_connect_ActiveChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) -} - -//export miqt_exec_callback_QAbstractState_ActiveChanged -func miqt_exec_callback_QAbstractState_ActiveChanged(cb *C.void, active C.bool) { - gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(active bool)) - if !ok { - panic("miqt: callback of non-callback type (heap corruption?)") - } - - // Convert all CABI parameters to Go parameters - slotval1 := (bool)(active) - - gofunc(slotval1) -} - -func QAbstractState_Tr2(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractState_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QAbstractState_Tr3(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractState_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QAbstractState_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractState_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QAbstractState_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractState_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -// Delete this object from C++ memory. -func (this *QAbstractState) Delete() { - C.QAbstractState_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QAbstractState) GoGC() { - runtime.SetFinalizer(this, func(this *QAbstractState) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} diff --git a/qt/gen_qabstractstate.h b/qt/gen_qabstractstate.h deleted file mode 100644 index f9d35c7..0000000 --- a/qt/gen_qabstractstate.h +++ /dev/null @@ -1,47 +0,0 @@ -#ifndef GEN_QABSTRACTSTATE_H -#define GEN_QABSTRACTSTATE_H - -#include -#include -#include - -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - -#include "binding.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __cplusplus -class QAbstractState; -class QMetaObject; -class QState; -class QStateMachine; -#else -typedef struct QAbstractState QAbstractState; -typedef struct QMetaObject QMetaObject; -typedef struct QState QState; -typedef struct QStateMachine QStateMachine; -#endif - -QMetaObject* QAbstractState_MetaObject(const QAbstractState* self); -void* QAbstractState_Metacast(QAbstractState* self, const char* param1); -struct miqt_string* QAbstractState_Tr(const char* s); -struct miqt_string* QAbstractState_TrUtf8(const char* s); -QState* QAbstractState_ParentState(const QAbstractState* self); -QStateMachine* QAbstractState_Machine(const QAbstractState* self); -bool QAbstractState_Active(const QAbstractState* self); -void QAbstractState_ActiveChanged(QAbstractState* self, bool active); -void QAbstractState_connect_ActiveChanged(QAbstractState* self, void* slot); -struct miqt_string* QAbstractState_Tr2(const char* s, const char* c); -struct miqt_string* QAbstractState_Tr3(const char* s, const char* c, int n); -struct miqt_string* QAbstractState_TrUtf82(const char* s, const char* c); -struct miqt_string* QAbstractState_TrUtf83(const char* s, const char* c, int n); -void QAbstractState_Delete(QAbstractState* self); - -#ifdef __cplusplus -} /* extern C */ -#endif - -#endif diff --git a/qt/gen_qabstracttextdocumentlayout.cpp b/qt/gen_qabstracttextdocumentlayout.cpp index 1d1d164..680fefc 100644 --- a/qt/gen_qabstracttextdocumentlayout.cpp +++ b/qt/gen_qabstracttextdocumentlayout.cpp @@ -35,13 +35,6 @@ struct miqt_string* QAbstractTextDocumentLayout_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAbstractTextDocumentLayout_TrUtf8(const char* s) { - QString _ret = QAbstractTextDocumentLayout::trUtf8(s); - // 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 QAbstractTextDocumentLayout_Draw(QAbstractTextDocumentLayout* self, QPainter* painter, QAbstractTextDocumentLayout__PaintContext* context) { self->draw(painter, *context); } @@ -173,20 +166,6 @@ struct miqt_string* QAbstractTextDocumentLayout_Tr3(const char* s, const char* c return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAbstractTextDocumentLayout_TrUtf82(const char* s, const char* c) { - QString _ret = QAbstractTextDocumentLayout::trUtf8(s, c); - // 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* QAbstractTextDocumentLayout_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QAbstractTextDocumentLayout::trUtf8(s, c, static_cast(n)); - // 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 QAbstractTextDocumentLayout_UnregisterHandler2(QAbstractTextDocumentLayout* self, int objectType, QObject* component) { self->unregisterHandler(static_cast(objectType), component); } diff --git a/qt/gen_qabstracttextdocumentlayout.go b/qt/gen_qabstracttextdocumentlayout.go index 255e9ba..ad9d2f9 100644 --- a/qt/gen_qabstracttextdocumentlayout.go +++ b/qt/gen_qabstracttextdocumentlayout.go @@ -56,15 +56,6 @@ func QAbstractTextDocumentLayout_Tr(s string) string { return _ret } -func QAbstractTextDocumentLayout_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractTextDocumentLayout_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QAbstractTextDocumentLayout) Draw(painter *QPainter, context *QAbstractTextDocumentLayout__PaintContext) { C.QAbstractTextDocumentLayout_Draw(this.h, painter.cPointer(), context.cPointer()) } @@ -249,28 +240,6 @@ func QAbstractTextDocumentLayout_Tr3(s string, c string, n int) string { return _ret } -func QAbstractTextDocumentLayout_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractTextDocumentLayout_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QAbstractTextDocumentLayout_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractTextDocumentLayout_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QAbstractTextDocumentLayout) UnregisterHandler2(objectType int, component *QObject) { C.QAbstractTextDocumentLayout_UnregisterHandler2(this.h, (C.int)(objectType), component.cPointer()) } diff --git a/qt/gen_qabstracttextdocumentlayout.h b/qt/gen_qabstracttextdocumentlayout.h index 78d3df7..a80664b 100644 --- a/qt/gen_qabstracttextdocumentlayout.h +++ b/qt/gen_qabstracttextdocumentlayout.h @@ -58,7 +58,6 @@ typedef struct QTextObjectInterface QTextObjectInterface; QMetaObject* QAbstractTextDocumentLayout_MetaObject(const QAbstractTextDocumentLayout* self); void* QAbstractTextDocumentLayout_Metacast(QAbstractTextDocumentLayout* self, const char* param1); 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, int accuracy); struct miqt_string* QAbstractTextDocumentLayout_AnchorAt(const QAbstractTextDocumentLayout* self, QPointF* pos); @@ -85,8 +84,6 @@ void QAbstractTextDocumentLayout_PageCountChanged(QAbstractTextDocumentLayout* s void QAbstractTextDocumentLayout_connect_PageCountChanged(QAbstractTextDocumentLayout* self, void* slot); struct miqt_string* QAbstractTextDocumentLayout_Tr2(const char* s, const char* c); struct miqt_string* QAbstractTextDocumentLayout_Tr3(const char* s, const char* c, int n); -struct miqt_string* QAbstractTextDocumentLayout_TrUtf82(const char* s, const char* c); -struct miqt_string* QAbstractTextDocumentLayout_TrUtf83(const char* s, const char* c, int n); void QAbstractTextDocumentLayout_UnregisterHandler2(QAbstractTextDocumentLayout* self, int objectType, QObject* component); void QAbstractTextDocumentLayout_Update1(QAbstractTextDocumentLayout* self, QRectF* param1); void QAbstractTextDocumentLayout_connect_Update1(QAbstractTextDocumentLayout* self, void* slot); diff --git a/qt/gen_qabstracttransition.cpp b/qt/gen_qabstracttransition.cpp deleted file mode 100644 index a854190..0000000 --- a/qt/gen_qabstracttransition.cpp +++ /dev/null @@ -1,137 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "qabstracttransition.h" -#include "gen_qabstracttransition.h" -#include "_cgo_export.h" - -QMetaObject* QAbstractTransition_MetaObject(const QAbstractTransition* self) { - return (QMetaObject*) self->metaObject(); -} - -void* QAbstractTransition_Metacast(QAbstractTransition* self, const char* param1) { - return self->qt_metacast(param1); -} - -struct miqt_string* QAbstractTransition_Tr(const char* s) { - QString _ret = QAbstractTransition::tr(s); - // 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* QAbstractTransition_TrUtf8(const char* s) { - QString _ret = QAbstractTransition::trUtf8(s); - // 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()); -} - -QState* QAbstractTransition_SourceState(const QAbstractTransition* self) { - return self->sourceState(); -} - -QAbstractState* QAbstractTransition_TargetState(const QAbstractTransition* self) { - return self->targetState(); -} - -void QAbstractTransition_SetTargetState(QAbstractTransition* self, QAbstractState* target) { - self->setTargetState(target); -} - -struct miqt_array* QAbstractTransition_TargetStates(const QAbstractTransition* self) { - 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) { - _arr[i] = _ret[i]; - } - struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); - _out->len = _ret.length(); - _out->data = static_cast(_arr); - return _out; -} - -void QAbstractTransition_SetTargetStates(QAbstractTransition* self, struct miqt_array* /* of QAbstractState* */ targets) { - QList targets_QList; - targets_QList.reserve(targets->len); - QAbstractState** targets_arr = static_cast(targets->data); - for(size_t i = 0; i < targets->len; ++i) { - targets_QList.push_back(targets_arr[i]); - } - self->setTargetStates(targets_QList); -} - -int QAbstractTransition_TransitionType(const QAbstractTransition* self) { - QAbstractTransition::TransitionType _ret = self->transitionType(); - return static_cast(_ret); -} - -void QAbstractTransition_SetTransitionType(QAbstractTransition* self, int typeVal) { - self->setTransitionType(static_cast(typeVal)); -} - -QStateMachine* QAbstractTransition_Machine(const QAbstractTransition* self) { - return self->machine(); -} - -void QAbstractTransition_AddAnimation(QAbstractTransition* self, QAbstractAnimation* animation) { - self->addAnimation(animation); -} - -void QAbstractTransition_RemoveAnimation(QAbstractTransition* self, QAbstractAnimation* animation) { - self->removeAnimation(animation); -} - -struct miqt_array* QAbstractTransition_Animations(const QAbstractTransition* self) { - 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) { - _arr[i] = _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* QAbstractTransition_Tr2(const char* s, const char* c) { - QString _ret = QAbstractTransition::tr(s, c); - // 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* QAbstractTransition_Tr3(const char* s, const char* c, int n) { - QString _ret = QAbstractTransition::tr(s, c, static_cast(n)); - // 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* QAbstractTransition_TrUtf82(const char* s, const char* c) { - QString _ret = QAbstractTransition::trUtf8(s, c); - // 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* QAbstractTransition_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QAbstractTransition::trUtf8(s, c, static_cast(n)); - // 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 QAbstractTransition_Delete(QAbstractTransition* self) { - delete self; -} - diff --git a/qt/gen_qabstracttransition.go b/qt/gen_qabstracttransition.go deleted file mode 100644 index aeb5ffe..0000000 --- a/qt/gen_qabstracttransition.go +++ /dev/null @@ -1,196 +0,0 @@ -package qt - -/* - -#include "gen_qabstracttransition.h" -#include - -*/ -import "C" - -import ( - "runtime" - "unsafe" -) - -type QAbstractTransition__TransitionType int - -const ( - QAbstractTransition__ExternalTransition QAbstractTransition__TransitionType = 0 - QAbstractTransition__InternalTransition QAbstractTransition__TransitionType = 1 -) - -type QAbstractTransition struct { - h *C.QAbstractTransition - *QObject -} - -func (this *QAbstractTransition) cPointer() *C.QAbstractTransition { - if this == nil { - return nil - } - return this.h -} - -func newQAbstractTransition(h *C.QAbstractTransition) *QAbstractTransition { - if h == nil { - return nil - } - return &QAbstractTransition{h: h, QObject: newQObject_U(unsafe.Pointer(h))} -} - -func newQAbstractTransition_U(h unsafe.Pointer) *QAbstractTransition { - return newQAbstractTransition((*C.QAbstractTransition)(h)) -} - -func (this *QAbstractTransition) MetaObject() *QMetaObject { - return newQMetaObject_U(unsafe.Pointer(C.QAbstractTransition_MetaObject(this.h))) -} - -func (this *QAbstractTransition) Metacast(param1 string) unsafe.Pointer { - param1_Cstring := C.CString(param1) - defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QAbstractTransition_Metacast(this.h, param1_Cstring) -} - -func QAbstractTransition_Tr(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractTransition_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QAbstractTransition_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractTransition_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QAbstractTransition) SourceState() *QState { - return newQState_U(unsafe.Pointer(C.QAbstractTransition_SourceState(this.h))) -} - -func (this *QAbstractTransition) TargetState() *QAbstractState { - return newQAbstractState_U(unsafe.Pointer(C.QAbstractTransition_TargetState(this.h))) -} - -func (this *QAbstractTransition) SetTargetState(target *QAbstractState) { - C.QAbstractTransition_SetTargetState(this.h, target.cPointer()) -} - -func (this *QAbstractTransition) TargetStates() []*QAbstractState { - var _ma *C.struct_miqt_array = C.QAbstractTransition_TargetStates(this.h) - _ret := make([]*QAbstractState, int(_ma.len)) - _outCast := (*[0xffff]*C.QAbstractState)(unsafe.Pointer(_ma.data)) // hey ya - for i := 0; i < int(_ma.len); i++ { - _ret[i] = newQAbstractState_U(unsafe.Pointer(_outCast[i])) - } - C.free(unsafe.Pointer(_ma)) - return _ret -} - -func (this *QAbstractTransition) SetTargetStates(targets []*QAbstractState) { - // For the C ABI, malloc a C array of raw pointers - targets_CArray := (*[0xffff]*C.QAbstractState)(C.malloc(C.size_t(8 * len(targets)))) - defer C.free(unsafe.Pointer(targets_CArray)) - for i := range targets { - targets_CArray[i] = targets[i].cPointer() - } - targets_ma := &C.struct_miqt_array{len: C.size_t(len(targets)), data: unsafe.Pointer(targets_CArray)} - defer runtime.KeepAlive(unsafe.Pointer(targets_ma)) - C.QAbstractTransition_SetTargetStates(this.h, targets_ma) -} - -func (this *QAbstractTransition) TransitionType() QAbstractTransition__TransitionType { - return (QAbstractTransition__TransitionType)(C.QAbstractTransition_TransitionType(this.h)) -} - -func (this *QAbstractTransition) SetTransitionType(typeVal QAbstractTransition__TransitionType) { - C.QAbstractTransition_SetTransitionType(this.h, (C.int)(typeVal)) -} - -func (this *QAbstractTransition) Machine() *QStateMachine { - return newQStateMachine_U(unsafe.Pointer(C.QAbstractTransition_Machine(this.h))) -} - -func (this *QAbstractTransition) AddAnimation(animation *QAbstractAnimation) { - C.QAbstractTransition_AddAnimation(this.h, animation.cPointer()) -} - -func (this *QAbstractTransition) RemoveAnimation(animation *QAbstractAnimation) { - C.QAbstractTransition_RemoveAnimation(this.h, animation.cPointer()) -} - -func (this *QAbstractTransition) Animations() []*QAbstractAnimation { - var _ma *C.struct_miqt_array = C.QAbstractTransition_Animations(this.h) - _ret := make([]*QAbstractAnimation, int(_ma.len)) - _outCast := (*[0xffff]*C.QAbstractAnimation)(unsafe.Pointer(_ma.data)) // hey ya - for i := 0; i < int(_ma.len); i++ { - _ret[i] = newQAbstractAnimation_U(unsafe.Pointer(_outCast[i])) - } - C.free(unsafe.Pointer(_ma)) - return _ret -} - -func QAbstractTransition_Tr2(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractTransition_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QAbstractTransition_Tr3(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractTransition_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QAbstractTransition_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractTransition_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QAbstractTransition_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAbstractTransition_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -// Delete this object from C++ memory. -func (this *QAbstractTransition) Delete() { - C.QAbstractTransition_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QAbstractTransition) GoGC() { - runtime.SetFinalizer(this, func(this *QAbstractTransition) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} diff --git a/qt/gen_qabstracttransition.h b/qt/gen_qabstracttransition.h deleted file mode 100644 index 5f72dd1..0000000 --- a/qt/gen_qabstracttransition.h +++ /dev/null @@ -1,57 +0,0 @@ -#ifndef GEN_QABSTRACTTRANSITION_H -#define GEN_QABSTRACTTRANSITION_H - -#include -#include -#include - -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - -#include "binding.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __cplusplus -class QAbstractAnimation; -class QAbstractState; -class QAbstractTransition; -class QMetaObject; -class QState; -class QStateMachine; -#else -typedef struct QAbstractAnimation QAbstractAnimation; -typedef struct QAbstractState QAbstractState; -typedef struct QAbstractTransition QAbstractTransition; -typedef struct QMetaObject QMetaObject; -typedef struct QState QState; -typedef struct QStateMachine QStateMachine; -#endif - -QMetaObject* QAbstractTransition_MetaObject(const QAbstractTransition* self); -void* QAbstractTransition_Metacast(QAbstractTransition* self, const char* param1); -struct miqt_string* QAbstractTransition_Tr(const char* s); -struct miqt_string* QAbstractTransition_TrUtf8(const char* s); -QState* QAbstractTransition_SourceState(const QAbstractTransition* self); -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); -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); -struct miqt_array* QAbstractTransition_Animations(const QAbstractTransition* self); -struct miqt_string* QAbstractTransition_Tr2(const char* s, const char* c); -struct miqt_string* QAbstractTransition_Tr3(const char* s, const char* c, int n); -struct miqt_string* QAbstractTransition_TrUtf82(const char* s, const char* c); -struct miqt_string* QAbstractTransition_TrUtf83(const char* s, const char* c, int n); -void QAbstractTransition_Delete(QAbstractTransition* self); - -#ifdef __cplusplus -} /* extern C */ -#endif - -#endif diff --git a/qt/gen_qaccessible.cpp b/qt/gen_qaccessible.cpp index 954101f..9286bc8 100644 --- a/qt/gen_qaccessible.cpp +++ b/qt/gen_qaccessible.cpp @@ -1,9 +1,8 @@ -#include -#define WORKAROUND_INNER_CLASS_DEFINITION_QAccessible__ActivationObserver #define WORKAROUND_INNER_CLASS_DEFINITION_QAccessible__State #include #include #include +#include #include #include #include @@ -33,60 +32,6 @@ #include "gen_qaccessible.h" #include "_cgo_export.h" -void QAccessible_InstallActivationObserver(QAccessible__ActivationObserver* param1) { - QAccessible::installActivationObserver(param1); -} - -void QAccessible_RemoveActivationObserver(QAccessible__ActivationObserver* param1) { - QAccessible::removeActivationObserver(param1); -} - -QAccessibleInterface* QAccessible_QueryAccessibleInterface(QObject* param1) { - return QAccessible::queryAccessibleInterface(param1); -} - -unsigned int QAccessible_UniqueId(QAccessibleInterface* iface) { - QAccessible::Id _ret = QAccessible::uniqueId(iface); - return static_cast(_ret); -} - -QAccessibleInterface* QAccessible_AccessibleInterface(unsigned int uniqueId) { - return QAccessible::accessibleInterface(static_cast(uniqueId)); -} - -unsigned int QAccessible_RegisterAccessibleInterface(QAccessibleInterface* iface) { - QAccessible::Id _ret = QAccessible::registerAccessibleInterface(iface); - return static_cast(_ret); -} - -void QAccessible_DeleteAccessibleInterface(unsigned int uniqueId) { - QAccessible::deleteAccessibleInterface(static_cast(uniqueId)); -} - -void QAccessible_UpdateAccessibility(QAccessibleEvent* event) { - QAccessible::updateAccessibility(event); -} - -bool QAccessible_IsActive() { - return QAccessible::isActive(); -} - -void QAccessible_SetActive(bool active) { - QAccessible::setActive(active); -} - -void QAccessible_SetRootObject(QObject* object) { - QAccessible::setRootObject(object); -} - -void QAccessible_Cleanup() { - QAccessible::cleanup(); -} - -void QAccessible_Delete(QAccessible* self) { - delete self; -} - bool QAccessibleInterface_IsValid(const QAccessibleInterface* self) { return self->isValid(); } @@ -184,6 +129,10 @@ QAccessibleTableCellInterface* QAccessibleInterface_TableCellInterface(QAccessib return self->tableCellInterface(); } +QAccessibleHyperlinkInterface* QAccessibleInterface_HyperlinkInterface(QAccessibleInterface* self) { + return self->hyperlinkInterface(); +} + void QAccessibleInterface_VirtualHook(QAccessibleInterface* self, int id, void* data) { self->virtual_hook(static_cast(id), data); } @@ -511,13 +460,6 @@ struct miqt_string* QAccessibleActionInterface_Tr(const char* sourceText) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAccessibleActionInterface_TrUtf8(const char* sourceText) { - QString _ret = QAccessibleActionInterface::trUtf8(sourceText); - // 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* QAccessibleActionInterface_ActionNames(const QAccessibleActionInterface* self) { QStringList _ret = self->actionNames(); // Convert QList<> from C++ memory to manually-managed C memory @@ -674,20 +616,6 @@ struct miqt_string* QAccessibleActionInterface_Tr3(const char* sourceText, const return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAccessibleActionInterface_TrUtf82(const char* sourceText, const char* disambiguation) { - QString _ret = QAccessibleActionInterface::trUtf8(sourceText, disambiguation); - // 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* QAccessibleActionInterface_TrUtf83(const char* sourceText, const char* disambiguation, int n) { - QString _ret = QAccessibleActionInterface::trUtf8(sourceText, disambiguation, static_cast(n)); - // 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 QAccessibleActionInterface_Delete(QAccessibleActionInterface* self) { delete self; } @@ -715,6 +643,40 @@ void QAccessibleImageInterface_Delete(QAccessibleImageInterface* self) { delete self; } +struct miqt_string* QAccessibleHyperlinkInterface_Anchor(const QAccessibleHyperlinkInterface* self) { + QString _ret = self->anchor(); + // 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* QAccessibleHyperlinkInterface_AnchorTarget(const QAccessibleHyperlinkInterface* self) { + QString _ret = self->anchorTarget(); + // 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()); +} + +int QAccessibleHyperlinkInterface_StartIndex(const QAccessibleHyperlinkInterface* self) { + return self->startIndex(); +} + +int QAccessibleHyperlinkInterface_EndIndex(const QAccessibleHyperlinkInterface* self) { + return self->endIndex(); +} + +bool QAccessibleHyperlinkInterface_IsValid(const QAccessibleHyperlinkInterface* self) { + return self->isValid(); +} + +void QAccessibleHyperlinkInterface_OperatorAssign(QAccessibleHyperlinkInterface* self, QAccessibleHyperlinkInterface* param1) { + self->operator=(*param1); +} + +void QAccessibleHyperlinkInterface_Delete(QAccessibleHyperlinkInterface* self) { + delete self; +} + QAccessibleEvent* QAccessibleEvent_new(QObject* obj, int typ) { return new QAccessibleEvent(obj, static_cast(typ)); } @@ -970,27 +932,3 @@ void QAccessibleTableModelChangeEvent_Delete(QAccessibleTableModelChangeEvent* s delete self; } -QAccessible__State* QAccessible__State_new() { - return new QAccessible::State(); -} - -QAccessible__State* QAccessible__State_new2(QAccessible__State* param1) { - return new QAccessible::State(*param1); -} - -void QAccessible__State_Delete(QAccessible__State* self) { - delete self; -} - -void QAccessible__ActivationObserver_AccessibilityActiveChanged(QAccessible__ActivationObserver* self, bool active) { - 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 5eff4e2..fc04b07 100644 --- a/qt/gen_qaccessible.go +++ b/qt/gen_qaccessible.go @@ -13,207 +13,6 @@ import ( "unsafe" ) -type QAccessible__Event int - -const ( - QAccessible__SoundPlayed QAccessible__Event = 1 - QAccessible__Alert QAccessible__Event = 2 - QAccessible__ForegroundChanged QAccessible__Event = 3 - QAccessible__MenuStart QAccessible__Event = 4 - QAccessible__MenuEnd QAccessible__Event = 5 - QAccessible__PopupMenuStart QAccessible__Event = 6 - QAccessible__PopupMenuEnd QAccessible__Event = 7 - QAccessible__ContextHelpStart QAccessible__Event = 12 - QAccessible__ContextHelpEnd QAccessible__Event = 13 - QAccessible__DragDropStart QAccessible__Event = 14 - QAccessible__DragDropEnd QAccessible__Event = 15 - QAccessible__DialogStart QAccessible__Event = 16 - QAccessible__DialogEnd QAccessible__Event = 17 - QAccessible__ScrollingStart QAccessible__Event = 18 - QAccessible__ScrollingEnd QAccessible__Event = 19 - QAccessible__MenuCommand QAccessible__Event = 24 - QAccessible__ActionChanged QAccessible__Event = 257 - QAccessible__ActiveDescendantChanged QAccessible__Event = 258 - QAccessible__AttributeChanged QAccessible__Event = 259 - QAccessible__DocumentContentChanged QAccessible__Event = 260 - QAccessible__DocumentLoadComplete QAccessible__Event = 261 - QAccessible__DocumentLoadStopped QAccessible__Event = 262 - QAccessible__DocumentReload QAccessible__Event = 263 - QAccessible__HyperlinkEndIndexChanged QAccessible__Event = 264 - QAccessible__HyperlinkNumberOfAnchorsChanged QAccessible__Event = 265 - QAccessible__HyperlinkSelectedLinkChanged QAccessible__Event = 266 - QAccessible__HypertextLinkActivated QAccessible__Event = 267 - QAccessible__HypertextLinkSelected QAccessible__Event = 268 - QAccessible__HyperlinkStartIndexChanged QAccessible__Event = 269 - QAccessible__HypertextChanged QAccessible__Event = 270 - QAccessible__HypertextNLinksChanged QAccessible__Event = 271 - QAccessible__ObjectAttributeChanged QAccessible__Event = 272 - QAccessible__PageChanged QAccessible__Event = 273 - QAccessible__SectionChanged QAccessible__Event = 274 - QAccessible__TableCaptionChanged QAccessible__Event = 275 - QAccessible__TableColumnDescriptionChanged QAccessible__Event = 276 - QAccessible__TableColumnHeaderChanged QAccessible__Event = 277 - QAccessible__TableModelChanged QAccessible__Event = 278 - QAccessible__TableRowDescriptionChanged QAccessible__Event = 279 - QAccessible__TableRowHeaderChanged QAccessible__Event = 280 - QAccessible__TableSummaryChanged QAccessible__Event = 281 - QAccessible__TextAttributeChanged QAccessible__Event = 282 - QAccessible__TextCaretMoved QAccessible__Event = 283 - QAccessible__TextColumnChanged QAccessible__Event = 285 - QAccessible__TextInserted QAccessible__Event = 286 - QAccessible__TextRemoved QAccessible__Event = 287 - QAccessible__TextUpdated QAccessible__Event = 288 - QAccessible__TextSelectionChanged QAccessible__Event = 289 - QAccessible__VisibleDataChanged QAccessible__Event = 290 - QAccessible__ObjectCreated QAccessible__Event = 32768 - QAccessible__ObjectDestroyed QAccessible__Event = 32769 - QAccessible__ObjectShow QAccessible__Event = 32770 - QAccessible__ObjectHide QAccessible__Event = 32771 - QAccessible__ObjectReorder QAccessible__Event = 32772 - QAccessible__Focus QAccessible__Event = 32773 - QAccessible__Selection QAccessible__Event = 32774 - QAccessible__SelectionAdd QAccessible__Event = 32775 - QAccessible__SelectionRemove QAccessible__Event = 32776 - QAccessible__SelectionWithin QAccessible__Event = 32777 - QAccessible__StateChanged QAccessible__Event = 32778 - QAccessible__LocationChanged QAccessible__Event = 32779 - QAccessible__NameChanged QAccessible__Event = 32780 - QAccessible__DescriptionChanged QAccessible__Event = 32781 - QAccessible__ValueChanged QAccessible__Event = 32782 - QAccessible__ParentChanged QAccessible__Event = 32783 - QAccessible__HelpChanged QAccessible__Event = 32928 - QAccessible__DefaultActionChanged QAccessible__Event = 32944 - QAccessible__AcceleratorChanged QAccessible__Event = 32960 - QAccessible__InvalidEvent QAccessible__Event = 32961 -) - -type QAccessible__Role int - -const ( - QAccessible__NoRole QAccessible__Role = 0 - QAccessible__TitleBar QAccessible__Role = 1 - QAccessible__MenuBar QAccessible__Role = 2 - QAccessible__ScrollBar QAccessible__Role = 3 - QAccessible__Grip QAccessible__Role = 4 - QAccessible__Sound QAccessible__Role = 5 - QAccessible__Cursor QAccessible__Role = 6 - QAccessible__Caret QAccessible__Role = 7 - QAccessible__AlertMessage QAccessible__Role = 8 - QAccessible__Window QAccessible__Role = 9 - QAccessible__Client QAccessible__Role = 10 - QAccessible__PopupMenu QAccessible__Role = 11 - QAccessible__MenuItem QAccessible__Role = 12 - QAccessible__ToolTip QAccessible__Role = 13 - QAccessible__Application QAccessible__Role = 14 - QAccessible__Document QAccessible__Role = 15 - QAccessible__Pane QAccessible__Role = 16 - QAccessible__Chart QAccessible__Role = 17 - QAccessible__Dialog QAccessible__Role = 18 - QAccessible__Border QAccessible__Role = 19 - QAccessible__Grouping QAccessible__Role = 20 - QAccessible__Separator QAccessible__Role = 21 - QAccessible__ToolBar QAccessible__Role = 22 - QAccessible__StatusBar QAccessible__Role = 23 - QAccessible__Table QAccessible__Role = 24 - QAccessible__ColumnHeader QAccessible__Role = 25 - QAccessible__RowHeader QAccessible__Role = 26 - QAccessible__Column QAccessible__Role = 27 - QAccessible__Row QAccessible__Role = 28 - QAccessible__Cell QAccessible__Role = 29 - QAccessible__Link QAccessible__Role = 30 - QAccessible__HelpBalloon QAccessible__Role = 31 - QAccessible__Assistant QAccessible__Role = 32 - QAccessible__List QAccessible__Role = 33 - QAccessible__ListItem QAccessible__Role = 34 - QAccessible__Tree QAccessible__Role = 35 - QAccessible__TreeItem QAccessible__Role = 36 - QAccessible__PageTab QAccessible__Role = 37 - QAccessible__PropertyPage QAccessible__Role = 38 - QAccessible__Indicator QAccessible__Role = 39 - QAccessible__Graphic QAccessible__Role = 40 - QAccessible__StaticText QAccessible__Role = 41 - QAccessible__EditableText QAccessible__Role = 42 - QAccessible__Button QAccessible__Role = 43 - QAccessible__PushButton QAccessible__Role = 43 - QAccessible__CheckBox QAccessible__Role = 44 - QAccessible__RadioButton QAccessible__Role = 45 - QAccessible__ComboBox QAccessible__Role = 46 - QAccessible__ProgressBar QAccessible__Role = 48 - QAccessible__Dial QAccessible__Role = 49 - QAccessible__HotkeyField QAccessible__Role = 50 - QAccessible__Slider QAccessible__Role = 51 - QAccessible__SpinBox QAccessible__Role = 52 - QAccessible__Canvas QAccessible__Role = 53 - QAccessible__Animation QAccessible__Role = 54 - QAccessible__Equation QAccessible__Role = 55 - QAccessible__ButtonDropDown QAccessible__Role = 56 - QAccessible__ButtonMenu QAccessible__Role = 57 - QAccessible__ButtonDropGrid QAccessible__Role = 58 - QAccessible__Whitespace QAccessible__Role = 59 - QAccessible__PageTabList QAccessible__Role = 60 - QAccessible__Clock QAccessible__Role = 61 - QAccessible__Splitter QAccessible__Role = 62 - QAccessible__LayeredPane QAccessible__Role = 128 - QAccessible__Terminal QAccessible__Role = 129 - QAccessible__Desktop QAccessible__Role = 130 - QAccessible__Paragraph QAccessible__Role = 131 - QAccessible__WebDocument QAccessible__Role = 132 - QAccessible__Section QAccessible__Role = 133 - QAccessible__Notification QAccessible__Role = 134 - QAccessible__ColorChooser QAccessible__Role = 1028 - QAccessible__Footer QAccessible__Role = 1038 - QAccessible__Form QAccessible__Role = 1040 - QAccessible__Heading QAccessible__Role = 1044 - QAccessible__Note QAccessible__Role = 1051 - QAccessible__ComplementaryContent QAccessible__Role = 1068 - QAccessible__UserRole QAccessible__Role = 65535 -) - -type QAccessible__Text int - -const ( - QAccessible__Name QAccessible__Text = 0 - QAccessible__Description QAccessible__Text = 1 - QAccessible__Value QAccessible__Text = 2 - QAccessible__Help QAccessible__Text = 3 - QAccessible__Accelerator QAccessible__Text = 4 - QAccessible__DebugDescription QAccessible__Text = 5 - QAccessible__UserText QAccessible__Text = 65535 -) - -type QAccessible__RelationFlag int - -const ( - QAccessible__Label QAccessible__RelationFlag = 1 - QAccessible__Labelled QAccessible__RelationFlag = 2 - QAccessible__Controller QAccessible__RelationFlag = 4 - QAccessible__Controlled QAccessible__RelationFlag = 8 - QAccessible__AllRelations QAccessible__RelationFlag = 4294967295 -) - -type QAccessible__InterfaceType int - -const ( - QAccessible__TextInterface QAccessible__InterfaceType = 0 - QAccessible__EditableTextInterface QAccessible__InterfaceType = 1 - QAccessible__ValueInterface QAccessible__InterfaceType = 2 - QAccessible__ActionInterface QAccessible__InterfaceType = 3 - QAccessible__ImageInterface QAccessible__InterfaceType = 4 - QAccessible__TableInterface QAccessible__InterfaceType = 5 - QAccessible__TableCellInterface QAccessible__InterfaceType = 6 -) - -type QAccessible__TextBoundaryType int - -const ( - QAccessible__CharBoundary QAccessible__TextBoundaryType = 0 - QAccessible__WordBoundary QAccessible__TextBoundaryType = 1 - QAccessible__SentenceBoundary QAccessible__TextBoundaryType = 2 - QAccessible__ParagraphBoundary QAccessible__TextBoundaryType = 3 - QAccessible__LineBoundary QAccessible__TextBoundaryType = 4 - QAccessible__NoBoundary QAccessible__TextBoundaryType = 5 -) - type QAccessibleTableModelChangeEvent__ModelChangeType int const ( @@ -225,90 +24,6 @@ const ( QAccessibleTableModelChangeEvent__ColumnsRemoved QAccessibleTableModelChangeEvent__ModelChangeType = 5 ) -type QAccessible struct { - h *C.QAccessible -} - -func (this *QAccessible) cPointer() *C.QAccessible { - if this == nil { - return nil - } - return this.h -} - -func newQAccessible(h *C.QAccessible) *QAccessible { - if h == nil { - return nil - } - return &QAccessible{h: h} -} - -func newQAccessible_U(h unsafe.Pointer) *QAccessible { - return newQAccessible((*C.QAccessible)(h)) -} - -func QAccessible_InstallActivationObserver(param1 *QAccessible__ActivationObserver) { - C.QAccessible_InstallActivationObserver(param1.cPointer()) -} - -func QAccessible_RemoveActivationObserver(param1 *QAccessible__ActivationObserver) { - C.QAccessible_RemoveActivationObserver(param1.cPointer()) -} - -func QAccessible_QueryAccessibleInterface(param1 *QObject) *QAccessibleInterface { - return newQAccessibleInterface_U(unsafe.Pointer(C.QAccessible_QueryAccessibleInterface(param1.cPointer()))) -} - -func QAccessible_UniqueId(iface *QAccessibleInterface) uint { - return (uint)(C.QAccessible_UniqueId(iface.cPointer())) -} - -func QAccessible_AccessibleInterface(uniqueId uint) *QAccessibleInterface { - return newQAccessibleInterface_U(unsafe.Pointer(C.QAccessible_AccessibleInterface((C.uint)(uniqueId)))) -} - -func QAccessible_RegisterAccessibleInterface(iface *QAccessibleInterface) uint { - return (uint)(C.QAccessible_RegisterAccessibleInterface(iface.cPointer())) -} - -func QAccessible_DeleteAccessibleInterface(uniqueId uint) { - C.QAccessible_DeleteAccessibleInterface((C.uint)(uniqueId)) -} - -func QAccessible_UpdateAccessibility(event *QAccessibleEvent) { - C.QAccessible_UpdateAccessibility(event.cPointer()) -} - -func QAccessible_IsActive() bool { - return (bool)(C.QAccessible_IsActive()) -} - -func QAccessible_SetActive(active bool) { - C.QAccessible_SetActive((C.bool)(active)) -} - -func QAccessible_SetRootObject(object *QObject) { - C.QAccessible_SetRootObject(object.cPointer()) -} - -func QAccessible_Cleanup() { - C.QAccessible_Cleanup() -} - -// Delete this object from C++ memory. -func (this *QAccessible) Delete() { - C.QAccessible_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QAccessible) GoGC() { - runtime.SetFinalizer(this, func(this *QAccessible) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} - type QAccessibleInterface struct { h *C.QAccessibleInterface } @@ -440,6 +155,10 @@ func (this *QAccessibleInterface) TableCellInterface() *QAccessibleTableCellInte return newQAccessibleTableCellInterface_U(unsafe.Pointer(C.QAccessibleInterface_TableCellInterface(this.h))) } +func (this *QAccessibleInterface) HyperlinkInterface() *QAccessibleHyperlinkInterface { + return newQAccessibleHyperlinkInterface_U(unsafe.Pointer(C.QAccessibleInterface_HyperlinkInterface(this.h))) +} + func (this *QAccessibleInterface) VirtualHook(id int, data unsafe.Pointer) { C.QAccessibleInterface_VirtualHook(this.h, (C.int)(id), data) } @@ -958,15 +677,6 @@ func QAccessibleActionInterface_Tr(sourceText string) string { return _ret } -func QAccessibleActionInterface_TrUtf8(sourceText string) string { - sourceText_Cstring := C.CString(sourceText) - defer C.free(unsafe.Pointer(sourceText_Cstring)) - var _ms *C.struct_miqt_string = C.QAccessibleActionInterface_TrUtf8(sourceText_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QAccessibleActionInterface) ActionNames() []string { var _ma *C.struct_miqt_array = C.QAccessibleActionInterface_ActionNames(this.h) _ret := make([]string, int(_ma.len)) @@ -1131,28 +841,6 @@ func QAccessibleActionInterface_Tr3(sourceText string, disambiguation string, n return _ret } -func QAccessibleActionInterface_TrUtf82(sourceText string, disambiguation string) string { - sourceText_Cstring := C.CString(sourceText) - defer C.free(unsafe.Pointer(sourceText_Cstring)) - disambiguation_Cstring := C.CString(disambiguation) - defer C.free(unsafe.Pointer(disambiguation_Cstring)) - var _ms *C.struct_miqt_string = C.QAccessibleActionInterface_TrUtf82(sourceText_Cstring, disambiguation_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QAccessibleActionInterface_TrUtf83(sourceText string, disambiguation string, n int) string { - sourceText_Cstring := C.CString(sourceText) - defer C.free(unsafe.Pointer(sourceText_Cstring)) - disambiguation_Cstring := C.CString(disambiguation) - defer C.free(unsafe.Pointer(disambiguation_Cstring)) - var _ms *C.struct_miqt_string = C.QAccessibleActionInterface_TrUtf83(sourceText_Cstring, disambiguation_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QAccessibleActionInterface) Delete() { C.QAccessibleActionInterface_Delete(this.h) @@ -1228,6 +916,72 @@ func (this *QAccessibleImageInterface) GoGC() { }) } +type QAccessibleHyperlinkInterface struct { + h *C.QAccessibleHyperlinkInterface +} + +func (this *QAccessibleHyperlinkInterface) cPointer() *C.QAccessibleHyperlinkInterface { + if this == nil { + return nil + } + return this.h +} + +func newQAccessibleHyperlinkInterface(h *C.QAccessibleHyperlinkInterface) *QAccessibleHyperlinkInterface { + if h == nil { + return nil + } + return &QAccessibleHyperlinkInterface{h: h} +} + +func newQAccessibleHyperlinkInterface_U(h unsafe.Pointer) *QAccessibleHyperlinkInterface { + return newQAccessibleHyperlinkInterface((*C.QAccessibleHyperlinkInterface)(h)) +} + +func (this *QAccessibleHyperlinkInterface) Anchor() string { + var _ms *C.struct_miqt_string = C.QAccessibleHyperlinkInterface_Anchor(this.h) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + +func (this *QAccessibleHyperlinkInterface) AnchorTarget() string { + var _ms *C.struct_miqt_string = C.QAccessibleHyperlinkInterface_AnchorTarget(this.h) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + +func (this *QAccessibleHyperlinkInterface) StartIndex() int { + return (int)(C.QAccessibleHyperlinkInterface_StartIndex(this.h)) +} + +func (this *QAccessibleHyperlinkInterface) EndIndex() int { + return (int)(C.QAccessibleHyperlinkInterface_EndIndex(this.h)) +} + +func (this *QAccessibleHyperlinkInterface) IsValid() bool { + return (bool)(C.QAccessibleHyperlinkInterface_IsValid(this.h)) +} + +func (this *QAccessibleHyperlinkInterface) OperatorAssign(param1 *QAccessibleHyperlinkInterface) { + C.QAccessibleHyperlinkInterface_OperatorAssign(this.h, param1.cPointer()) +} + +// Delete this object from C++ memory. +func (this *QAccessibleHyperlinkInterface) Delete() { + C.QAccessibleHyperlinkInterface_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QAccessibleHyperlinkInterface) GoGC() { + runtime.SetFinalizer(this, func(this *QAccessibleHyperlinkInterface) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + type QAccessibleEvent struct { h *C.QAccessibleEvent } @@ -1825,95 +1579,3 @@ func (this *QAccessibleTableModelChangeEvent) GoGC() { runtime.KeepAlive(this.h) }) } - -type QAccessible__State struct { - h *C.QAccessible__State -} - -func (this *QAccessible__State) cPointer() *C.QAccessible__State { - if this == nil { - return nil - } - return this.h -} - -func newQAccessible__State(h *C.QAccessible__State) *QAccessible__State { - if h == nil { - return nil - } - return &QAccessible__State{h: h} -} - -func newQAccessible__State_U(h unsafe.Pointer) *QAccessible__State { - return newQAccessible__State((*C.QAccessible__State)(h)) -} - -// NewQAccessible__State constructs a new QAccessible::State object. -func NewQAccessible__State() *QAccessible__State { - ret := C.QAccessible__State_new() - return newQAccessible__State(ret) -} - -// NewQAccessible__State2 constructs a new QAccessible::State object. -func NewQAccessible__State2(param1 *QAccessible__State) *QAccessible__State { - ret := C.QAccessible__State_new2(param1.cPointer()) - return newQAccessible__State(ret) -} - -// Delete this object from C++ memory. -func (this *QAccessible__State) Delete() { - C.QAccessible__State_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QAccessible__State) GoGC() { - runtime.SetFinalizer(this, func(this *QAccessible__State) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} - -type QAccessible__ActivationObserver struct { - h *C.QAccessible__ActivationObserver -} - -func (this *QAccessible__ActivationObserver) cPointer() *C.QAccessible__ActivationObserver { - if this == nil { - return nil - } - return this.h -} - -func newQAccessible__ActivationObserver(h *C.QAccessible__ActivationObserver) *QAccessible__ActivationObserver { - if h == nil { - return nil - } - return &QAccessible__ActivationObserver{h: h} -} - -func newQAccessible__ActivationObserver_U(h unsafe.Pointer) *QAccessible__ActivationObserver { - return newQAccessible__ActivationObserver((*C.QAccessible__ActivationObserver)(h)) -} - -func (this *QAccessible__ActivationObserver) AccessibilityActiveChanged(active bool) { - 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) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QAccessible__ActivationObserver) GoGC() { - runtime.SetFinalizer(this, func(this *QAccessible__ActivationObserver) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} diff --git a/qt/gen_qaccessible.h b/qt/gen_qaccessible.h index 165b605..70c1898 100644 --- a/qt/gen_qaccessible.h +++ b/qt/gen_qaccessible.h @@ -14,12 +14,6 @@ extern "C" { #endif #ifdef __cplusplus -class QAccessible; -#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QAccessible__ActivationObserver) -typedef QAccessible::ActivationObserver QAccessible__ActivationObserver; -#else -class QAccessible__ActivationObserver; -#endif #if defined(WORKAROUND_INNER_CLASS_DEFINITION_QAccessible__State) typedef QAccessible::State QAccessible__State; #else @@ -28,6 +22,7 @@ class QAccessible__State; class QAccessibleActionInterface; class QAccessibleEditableTextInterface; class QAccessibleEvent; +class QAccessibleHyperlinkInterface; class QAccessibleImageInterface; class QAccessibleInterface; class QAccessibleStateChangeEvent; @@ -50,12 +45,11 @@ class QSize; class QVariant; class QWindow; #else -typedef struct QAccessible QAccessible; -typedef struct QAccessible__ActivationObserver QAccessible__ActivationObserver; typedef struct QAccessible__State QAccessible__State; typedef struct QAccessibleActionInterface QAccessibleActionInterface; typedef struct QAccessibleEditableTextInterface QAccessibleEditableTextInterface; typedef struct QAccessibleEvent QAccessibleEvent; +typedef struct QAccessibleHyperlinkInterface QAccessibleHyperlinkInterface; typedef struct QAccessibleImageInterface QAccessibleImageInterface; typedef struct QAccessibleInterface QAccessibleInterface; typedef struct QAccessibleStateChangeEvent QAccessibleStateChangeEvent; @@ -79,20 +73,6 @@ typedef struct QVariant QVariant; typedef struct QWindow QWindow; #endif -void QAccessible_InstallActivationObserver(QAccessible__ActivationObserver* param1); -void QAccessible_RemoveActivationObserver(QAccessible__ActivationObserver* param1); -QAccessibleInterface* QAccessible_QueryAccessibleInterface(QObject* param1); -unsigned int QAccessible_UniqueId(QAccessibleInterface* iface); -QAccessibleInterface* QAccessible_AccessibleInterface(unsigned int uniqueId); -unsigned int QAccessible_RegisterAccessibleInterface(QAccessibleInterface* iface); -void QAccessible_DeleteAccessibleInterface(unsigned int uniqueId); -void QAccessible_UpdateAccessibility(QAccessibleEvent* event); -bool QAccessible_IsActive(); -void QAccessible_SetActive(bool active); -void QAccessible_SetRootObject(QObject* object); -void QAccessible_Cleanup(); -void QAccessible_Delete(QAccessible* self); - bool QAccessibleInterface_IsValid(const QAccessibleInterface* self); QObject* QAccessibleInterface_Object(const QAccessibleInterface* self); QWindow* QAccessibleInterface_Window(const QAccessibleInterface* self); @@ -116,6 +96,7 @@ QAccessibleActionInterface* QAccessibleInterface_ActionInterface(QAccessibleInte QAccessibleImageInterface* QAccessibleInterface_ImageInterface(QAccessibleInterface* self); QAccessibleTableInterface* QAccessibleInterface_TableInterface(QAccessibleInterface* self); QAccessibleTableCellInterface* QAccessibleInterface_TableCellInterface(QAccessibleInterface* self); +QAccessibleHyperlinkInterface* QAccessibleInterface_HyperlinkInterface(QAccessibleInterface* self); void QAccessibleInterface_VirtualHook(QAccessibleInterface* self, int id, void* data); void* QAccessibleInterface_InterfaceCast(QAccessibleInterface* self, int param1); @@ -186,7 +167,6 @@ void QAccessibleTableInterface_ModelChange(QAccessibleTableInterface* self, QAcc void QAccessibleTableInterface_Delete(QAccessibleTableInterface* self); struct miqt_string* QAccessibleActionInterface_Tr(const char* sourceText); -struct miqt_string* QAccessibleActionInterface_TrUtf8(const char* sourceText); struct miqt_array* QAccessibleActionInterface_ActionNames(const QAccessibleActionInterface* self); struct miqt_string* QAccessibleActionInterface_LocalizedActionName(const QAccessibleActionInterface* self, struct miqt_string* name); struct miqt_string* QAccessibleActionInterface_LocalizedActionDescription(const QAccessibleActionInterface* self, struct miqt_string* name); @@ -207,8 +187,6 @@ struct miqt_string* QAccessibleActionInterface_PreviousPageAction(); void QAccessibleActionInterface_OperatorAssign(QAccessibleActionInterface* self, QAccessibleActionInterface* param1); struct miqt_string* QAccessibleActionInterface_Tr2(const char* sourceText, const char* disambiguation); struct miqt_string* QAccessibleActionInterface_Tr3(const char* sourceText, const char* disambiguation, int n); -struct miqt_string* QAccessibleActionInterface_TrUtf82(const char* sourceText, const char* disambiguation); -struct miqt_string* QAccessibleActionInterface_TrUtf83(const char* sourceText, const char* disambiguation, int n); void QAccessibleActionInterface_Delete(QAccessibleActionInterface* self); struct miqt_string* QAccessibleImageInterface_ImageDescription(const QAccessibleImageInterface* self); @@ -217,6 +195,14 @@ QPoint* QAccessibleImageInterface_ImagePosition(const QAccessibleImageInterface* void QAccessibleImageInterface_OperatorAssign(QAccessibleImageInterface* self, QAccessibleImageInterface* param1); void QAccessibleImageInterface_Delete(QAccessibleImageInterface* self); +struct miqt_string* QAccessibleHyperlinkInterface_Anchor(const QAccessibleHyperlinkInterface* self); +struct miqt_string* QAccessibleHyperlinkInterface_AnchorTarget(const QAccessibleHyperlinkInterface* self); +int QAccessibleHyperlinkInterface_StartIndex(const QAccessibleHyperlinkInterface* self); +int QAccessibleHyperlinkInterface_EndIndex(const QAccessibleHyperlinkInterface* self); +bool QAccessibleHyperlinkInterface_IsValid(const QAccessibleHyperlinkInterface* self); +void QAccessibleHyperlinkInterface_OperatorAssign(QAccessibleHyperlinkInterface* self, QAccessibleHyperlinkInterface* param1); +void QAccessibleHyperlinkInterface_Delete(QAccessibleHyperlinkInterface* self); + QAccessibleEvent* QAccessibleEvent_new(QObject* obj, int typ); QAccessibleEvent* QAccessibleEvent_new2(QAccessibleInterface* iface, int typ); int QAccessibleEvent_Type(const QAccessibleEvent* self); @@ -284,14 +270,6 @@ int QAccessibleTableModelChangeEvent_LastRow(const QAccessibleTableModelChangeEv int QAccessibleTableModelChangeEvent_LastColumn(const QAccessibleTableModelChangeEvent* self); void QAccessibleTableModelChangeEvent_Delete(QAccessibleTableModelChangeEvent* self); -QAccessible__State* QAccessible__State_new(); -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 } /* extern C */ #endif diff --git a/qt/gen_qaccessible_base.cpp b/qt/gen_qaccessible_base.cpp new file mode 100644 index 0000000..6a889cb --- /dev/null +++ b/qt/gen_qaccessible_base.cpp @@ -0,0 +1,84 @@ +#include +#define WORKAROUND_INNER_CLASS_DEFINITION_QAccessible__ActivationObserver +#define WORKAROUND_INNER_CLASS_DEFINITION_QAccessible__State +#include +#include +#include +#include "qaccessible_base.h" +#include "gen_qaccessible_base.h" +#include "_cgo_export.h" + +void QAccessible_InstallActivationObserver(QAccessible__ActivationObserver* param1) { + QAccessible::installActivationObserver(param1); +} + +void QAccessible_RemoveActivationObserver(QAccessible__ActivationObserver* param1) { + QAccessible::removeActivationObserver(param1); +} + +QAccessibleInterface* QAccessible_QueryAccessibleInterface(QObject* param1) { + return QAccessible::queryAccessibleInterface(param1); +} + +unsigned int QAccessible_UniqueId(QAccessibleInterface* iface) { + QAccessible::Id _ret = QAccessible::uniqueId(iface); + return static_cast(_ret); +} + +QAccessibleInterface* QAccessible_AccessibleInterface(unsigned int uniqueId) { + return QAccessible::accessibleInterface(static_cast(uniqueId)); +} + +unsigned int QAccessible_RegisterAccessibleInterface(QAccessibleInterface* iface) { + QAccessible::Id _ret = QAccessible::registerAccessibleInterface(iface); + return static_cast(_ret); +} + +void QAccessible_DeleteAccessibleInterface(unsigned int uniqueId) { + QAccessible::deleteAccessibleInterface(static_cast(uniqueId)); +} + +void QAccessible_UpdateAccessibility(QAccessibleEvent* event) { + QAccessible::updateAccessibility(event); +} + +bool QAccessible_IsActive() { + return QAccessible::isActive(); +} + +void QAccessible_SetActive(bool active) { + QAccessible::setActive(active); +} + +void QAccessible_SetRootObject(QObject* object) { + QAccessible::setRootObject(object); +} + +void QAccessible_Cleanup() { + QAccessible::cleanup(); +} + +void QAccessible_Delete(QAccessible* self) { + delete self; +} + +QAccessible__State* QAccessible__State_new() { + return new QAccessible::State(); +} + +void QAccessible__State_Delete(QAccessible__State* self) { + delete self; +} + +void QAccessible__ActivationObserver_AccessibilityActiveChanged(QAccessible__ActivationObserver* self, bool active) { + 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_base.go b/qt/gen_qaccessible_base.go new file mode 100644 index 0000000..55fd00b --- /dev/null +++ b/qt/gen_qaccessible_base.go @@ -0,0 +1,386 @@ +package qt + +/* + +#include "gen_qaccessible_base.h" +#include + +*/ +import "C" + +import ( + "runtime" + "unsafe" +) + +type QAccessible__Event int + +const ( + QAccessible__SoundPlayed QAccessible__Event = 1 + QAccessible__Alert QAccessible__Event = 2 + QAccessible__ForegroundChanged QAccessible__Event = 3 + QAccessible__MenuStart QAccessible__Event = 4 + QAccessible__MenuEnd QAccessible__Event = 5 + QAccessible__PopupMenuStart QAccessible__Event = 6 + QAccessible__PopupMenuEnd QAccessible__Event = 7 + QAccessible__ContextHelpStart QAccessible__Event = 12 + QAccessible__ContextHelpEnd QAccessible__Event = 13 + QAccessible__DragDropStart QAccessible__Event = 14 + QAccessible__DragDropEnd QAccessible__Event = 15 + QAccessible__DialogStart QAccessible__Event = 16 + QAccessible__DialogEnd QAccessible__Event = 17 + QAccessible__ScrollingStart QAccessible__Event = 18 + QAccessible__ScrollingEnd QAccessible__Event = 19 + QAccessible__MenuCommand QAccessible__Event = 24 + QAccessible__ActionChanged QAccessible__Event = 257 + QAccessible__ActiveDescendantChanged QAccessible__Event = 258 + QAccessible__AttributeChanged QAccessible__Event = 259 + QAccessible__DocumentContentChanged QAccessible__Event = 260 + QAccessible__DocumentLoadComplete QAccessible__Event = 261 + QAccessible__DocumentLoadStopped QAccessible__Event = 262 + QAccessible__DocumentReload QAccessible__Event = 263 + QAccessible__HyperlinkEndIndexChanged QAccessible__Event = 264 + QAccessible__HyperlinkNumberOfAnchorsChanged QAccessible__Event = 265 + QAccessible__HyperlinkSelectedLinkChanged QAccessible__Event = 266 + QAccessible__HypertextLinkActivated QAccessible__Event = 267 + QAccessible__HypertextLinkSelected QAccessible__Event = 268 + QAccessible__HyperlinkStartIndexChanged QAccessible__Event = 269 + QAccessible__HypertextChanged QAccessible__Event = 270 + QAccessible__HypertextNLinksChanged QAccessible__Event = 271 + QAccessible__ObjectAttributeChanged QAccessible__Event = 272 + QAccessible__PageChanged QAccessible__Event = 273 + QAccessible__SectionChanged QAccessible__Event = 274 + QAccessible__TableCaptionChanged QAccessible__Event = 275 + QAccessible__TableColumnDescriptionChanged QAccessible__Event = 276 + QAccessible__TableColumnHeaderChanged QAccessible__Event = 277 + QAccessible__TableModelChanged QAccessible__Event = 278 + QAccessible__TableRowDescriptionChanged QAccessible__Event = 279 + QAccessible__TableRowHeaderChanged QAccessible__Event = 280 + QAccessible__TableSummaryChanged QAccessible__Event = 281 + QAccessible__TextAttributeChanged QAccessible__Event = 282 + QAccessible__TextCaretMoved QAccessible__Event = 283 + QAccessible__TextColumnChanged QAccessible__Event = 285 + QAccessible__TextInserted QAccessible__Event = 286 + QAccessible__TextRemoved QAccessible__Event = 287 + QAccessible__TextUpdated QAccessible__Event = 288 + QAccessible__TextSelectionChanged QAccessible__Event = 289 + QAccessible__VisibleDataChanged QAccessible__Event = 290 + QAccessible__ObjectCreated QAccessible__Event = 32768 + QAccessible__ObjectDestroyed QAccessible__Event = 32769 + QAccessible__ObjectShow QAccessible__Event = 32770 + QAccessible__ObjectHide QAccessible__Event = 32771 + QAccessible__ObjectReorder QAccessible__Event = 32772 + QAccessible__Focus QAccessible__Event = 32773 + QAccessible__Selection QAccessible__Event = 32774 + QAccessible__SelectionAdd QAccessible__Event = 32775 + QAccessible__SelectionRemove QAccessible__Event = 32776 + QAccessible__SelectionWithin QAccessible__Event = 32777 + QAccessible__StateChanged QAccessible__Event = 32778 + QAccessible__LocationChanged QAccessible__Event = 32779 + QAccessible__NameChanged QAccessible__Event = 32780 + QAccessible__DescriptionChanged QAccessible__Event = 32781 + QAccessible__ValueChanged QAccessible__Event = 32782 + QAccessible__ParentChanged QAccessible__Event = 32783 + QAccessible__HelpChanged QAccessible__Event = 32928 + QAccessible__DefaultActionChanged QAccessible__Event = 32944 + QAccessible__AcceleratorChanged QAccessible__Event = 32960 + QAccessible__InvalidEvent QAccessible__Event = 32961 +) + +type QAccessible__Role int + +const ( + QAccessible__NoRole QAccessible__Role = 0 + QAccessible__TitleBar QAccessible__Role = 1 + QAccessible__MenuBar QAccessible__Role = 2 + QAccessible__ScrollBar QAccessible__Role = 3 + QAccessible__Grip QAccessible__Role = 4 + QAccessible__Sound QAccessible__Role = 5 + QAccessible__Cursor QAccessible__Role = 6 + QAccessible__Caret QAccessible__Role = 7 + QAccessible__AlertMessage QAccessible__Role = 8 + QAccessible__Window QAccessible__Role = 9 + QAccessible__Client QAccessible__Role = 10 + QAccessible__PopupMenu QAccessible__Role = 11 + QAccessible__MenuItem QAccessible__Role = 12 + QAccessible__ToolTip QAccessible__Role = 13 + QAccessible__Application QAccessible__Role = 14 + QAccessible__Document QAccessible__Role = 15 + QAccessible__Pane QAccessible__Role = 16 + QAccessible__Chart QAccessible__Role = 17 + QAccessible__Dialog QAccessible__Role = 18 + QAccessible__Border QAccessible__Role = 19 + QAccessible__Grouping QAccessible__Role = 20 + QAccessible__Separator QAccessible__Role = 21 + QAccessible__ToolBar QAccessible__Role = 22 + QAccessible__StatusBar QAccessible__Role = 23 + QAccessible__Table QAccessible__Role = 24 + QAccessible__ColumnHeader QAccessible__Role = 25 + QAccessible__RowHeader QAccessible__Role = 26 + QAccessible__Column QAccessible__Role = 27 + QAccessible__Row QAccessible__Role = 28 + QAccessible__Cell QAccessible__Role = 29 + QAccessible__Link QAccessible__Role = 30 + QAccessible__HelpBalloon QAccessible__Role = 31 + QAccessible__Assistant QAccessible__Role = 32 + QAccessible__List QAccessible__Role = 33 + QAccessible__ListItem QAccessible__Role = 34 + QAccessible__Tree QAccessible__Role = 35 + QAccessible__TreeItem QAccessible__Role = 36 + QAccessible__PageTab QAccessible__Role = 37 + QAccessible__PropertyPage QAccessible__Role = 38 + QAccessible__Indicator QAccessible__Role = 39 + QAccessible__Graphic QAccessible__Role = 40 + QAccessible__StaticText QAccessible__Role = 41 + QAccessible__EditableText QAccessible__Role = 42 + QAccessible__Button QAccessible__Role = 43 + QAccessible__PushButton QAccessible__Role = 43 + QAccessible__CheckBox QAccessible__Role = 44 + QAccessible__RadioButton QAccessible__Role = 45 + QAccessible__ComboBox QAccessible__Role = 46 + QAccessible__ProgressBar QAccessible__Role = 48 + QAccessible__Dial QAccessible__Role = 49 + QAccessible__HotkeyField QAccessible__Role = 50 + QAccessible__Slider QAccessible__Role = 51 + QAccessible__SpinBox QAccessible__Role = 52 + QAccessible__Canvas QAccessible__Role = 53 + QAccessible__Animation QAccessible__Role = 54 + QAccessible__Equation QAccessible__Role = 55 + QAccessible__ButtonDropDown QAccessible__Role = 56 + QAccessible__ButtonMenu QAccessible__Role = 57 + QAccessible__ButtonDropGrid QAccessible__Role = 58 + QAccessible__Whitespace QAccessible__Role = 59 + QAccessible__PageTabList QAccessible__Role = 60 + QAccessible__Clock QAccessible__Role = 61 + QAccessible__Splitter QAccessible__Role = 62 + QAccessible__LayeredPane QAccessible__Role = 128 + QAccessible__Terminal QAccessible__Role = 129 + QAccessible__Desktop QAccessible__Role = 130 + QAccessible__Paragraph QAccessible__Role = 131 + QAccessible__WebDocument QAccessible__Role = 132 + QAccessible__Section QAccessible__Role = 133 + QAccessible__Notification QAccessible__Role = 134 + QAccessible__ColorChooser QAccessible__Role = 1028 + QAccessible__Footer QAccessible__Role = 1038 + QAccessible__Form QAccessible__Role = 1040 + QAccessible__Heading QAccessible__Role = 1044 + QAccessible__Note QAccessible__Role = 1051 + QAccessible__ComplementaryContent QAccessible__Role = 1068 + QAccessible__UserRole QAccessible__Role = 65535 +) + +type QAccessible__Text int + +const ( + QAccessible__Name QAccessible__Text = 0 + QAccessible__Description QAccessible__Text = 1 + QAccessible__Value QAccessible__Text = 2 + QAccessible__Help QAccessible__Text = 3 + QAccessible__Accelerator QAccessible__Text = 4 + QAccessible__DebugDescription QAccessible__Text = 5 + QAccessible__UserText QAccessible__Text = 65535 +) + +type QAccessible__RelationFlag int + +const ( + QAccessible__Label QAccessible__RelationFlag = 1 + QAccessible__Labelled QAccessible__RelationFlag = 2 + QAccessible__Controller QAccessible__RelationFlag = 4 + QAccessible__Controlled QAccessible__RelationFlag = 8 + QAccessible__AllRelations QAccessible__RelationFlag = 4294967295 +) + +type QAccessible__InterfaceType int + +const ( + QAccessible__TextInterface QAccessible__InterfaceType = 0 + QAccessible__EditableTextInterface QAccessible__InterfaceType = 1 + QAccessible__ValueInterface QAccessible__InterfaceType = 2 + QAccessible__ActionInterface QAccessible__InterfaceType = 3 + QAccessible__ImageInterface QAccessible__InterfaceType = 4 + QAccessible__TableInterface QAccessible__InterfaceType = 5 + QAccessible__TableCellInterface QAccessible__InterfaceType = 6 + QAccessible__HyperlinkInterface QAccessible__InterfaceType = 7 +) + +type QAccessible__TextBoundaryType int + +const ( + QAccessible__CharBoundary QAccessible__TextBoundaryType = 0 + QAccessible__WordBoundary QAccessible__TextBoundaryType = 1 + QAccessible__SentenceBoundary QAccessible__TextBoundaryType = 2 + QAccessible__ParagraphBoundary QAccessible__TextBoundaryType = 3 + QAccessible__LineBoundary QAccessible__TextBoundaryType = 4 + QAccessible__NoBoundary QAccessible__TextBoundaryType = 5 +) + +type QAccessible struct { + h *C.QAccessible +} + +func (this *QAccessible) cPointer() *C.QAccessible { + if this == nil { + return nil + } + return this.h +} + +func newQAccessible(h *C.QAccessible) *QAccessible { + if h == nil { + return nil + } + return &QAccessible{h: h} +} + +func newQAccessible_U(h unsafe.Pointer) *QAccessible { + return newQAccessible((*C.QAccessible)(h)) +} + +func QAccessible_InstallActivationObserver(param1 *QAccessible__ActivationObserver) { + C.QAccessible_InstallActivationObserver(param1.cPointer()) +} + +func QAccessible_RemoveActivationObserver(param1 *QAccessible__ActivationObserver) { + C.QAccessible_RemoveActivationObserver(param1.cPointer()) +} + +func QAccessible_QueryAccessibleInterface(param1 *QObject) *QAccessibleInterface { + return newQAccessibleInterface_U(unsafe.Pointer(C.QAccessible_QueryAccessibleInterface(param1.cPointer()))) +} + +func QAccessible_UniqueId(iface *QAccessibleInterface) uint { + return (uint)(C.QAccessible_UniqueId(iface.cPointer())) +} + +func QAccessible_AccessibleInterface(uniqueId uint) *QAccessibleInterface { + return newQAccessibleInterface_U(unsafe.Pointer(C.QAccessible_AccessibleInterface((C.uint)(uniqueId)))) +} + +func QAccessible_RegisterAccessibleInterface(iface *QAccessibleInterface) uint { + return (uint)(C.QAccessible_RegisterAccessibleInterface(iface.cPointer())) +} + +func QAccessible_DeleteAccessibleInterface(uniqueId uint) { + C.QAccessible_DeleteAccessibleInterface((C.uint)(uniqueId)) +} + +func QAccessible_UpdateAccessibility(event *QAccessibleEvent) { + C.QAccessible_UpdateAccessibility(event.cPointer()) +} + +func QAccessible_IsActive() bool { + return (bool)(C.QAccessible_IsActive()) +} + +func QAccessible_SetActive(active bool) { + C.QAccessible_SetActive((C.bool)(active)) +} + +func QAccessible_SetRootObject(object *QObject) { + C.QAccessible_SetRootObject(object.cPointer()) +} + +func QAccessible_Cleanup() { + C.QAccessible_Cleanup() +} + +// Delete this object from C++ memory. +func (this *QAccessible) Delete() { + C.QAccessible_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QAccessible) GoGC() { + runtime.SetFinalizer(this, func(this *QAccessible) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + +type QAccessible__State struct { + h *C.QAccessible__State +} + +func (this *QAccessible__State) cPointer() *C.QAccessible__State { + if this == nil { + return nil + } + return this.h +} + +func newQAccessible__State(h *C.QAccessible__State) *QAccessible__State { + if h == nil { + return nil + } + return &QAccessible__State{h: h} +} + +func newQAccessible__State_U(h unsafe.Pointer) *QAccessible__State { + return newQAccessible__State((*C.QAccessible__State)(h)) +} + +// NewQAccessible__State constructs a new QAccessible::State object. +func NewQAccessible__State() *QAccessible__State { + ret := C.QAccessible__State_new() + return newQAccessible__State(ret) +} + +// Delete this object from C++ memory. +func (this *QAccessible__State) Delete() { + C.QAccessible__State_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QAccessible__State) GoGC() { + runtime.SetFinalizer(this, func(this *QAccessible__State) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + +type QAccessible__ActivationObserver struct { + h *C.QAccessible__ActivationObserver +} + +func (this *QAccessible__ActivationObserver) cPointer() *C.QAccessible__ActivationObserver { + if this == nil { + return nil + } + return this.h +} + +func newQAccessible__ActivationObserver(h *C.QAccessible__ActivationObserver) *QAccessible__ActivationObserver { + if h == nil { + return nil + } + return &QAccessible__ActivationObserver{h: h} +} + +func newQAccessible__ActivationObserver_U(h unsafe.Pointer) *QAccessible__ActivationObserver { + return newQAccessible__ActivationObserver((*C.QAccessible__ActivationObserver)(h)) +} + +func (this *QAccessible__ActivationObserver) AccessibilityActiveChanged(active bool) { + 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) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QAccessible__ActivationObserver) GoGC() { + runtime.SetFinalizer(this, func(this *QAccessible__ActivationObserver) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} diff --git a/qt/gen_qaccessible_base.h b/qt/gen_qaccessible_base.h new file mode 100644 index 0000000..991c585 --- /dev/null +++ b/qt/gen_qaccessible_base.h @@ -0,0 +1,65 @@ +#ifndef GEN_QACCESSIBLE_BASE_H +#define GEN_QACCESSIBLE_BASE_H + +#include +#include +#include + +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + +#include "binding.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +class QAccessible; +#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QAccessible__ActivationObserver) +typedef QAccessible::ActivationObserver QAccessible__ActivationObserver; +#else +class QAccessible__ActivationObserver; +#endif +#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QAccessible__State) +typedef QAccessible::State QAccessible__State; +#else +class QAccessible__State; +#endif +class QAccessibleEvent; +class QAccessibleInterface; +class QObject; +#else +typedef struct QAccessible QAccessible; +typedef struct QAccessible__ActivationObserver QAccessible__ActivationObserver; +typedef struct QAccessible__State QAccessible__State; +typedef struct QAccessibleEvent QAccessibleEvent; +typedef struct QAccessibleInterface QAccessibleInterface; +typedef struct QObject QObject; +#endif + +void QAccessible_InstallActivationObserver(QAccessible__ActivationObserver* param1); +void QAccessible_RemoveActivationObserver(QAccessible__ActivationObserver* param1); +QAccessibleInterface* QAccessible_QueryAccessibleInterface(QObject* param1); +unsigned int QAccessible_UniqueId(QAccessibleInterface* iface); +QAccessibleInterface* QAccessible_AccessibleInterface(unsigned int uniqueId); +unsigned int QAccessible_RegisterAccessibleInterface(QAccessibleInterface* iface); +void QAccessible_DeleteAccessibleInterface(unsigned int uniqueId); +void QAccessible_UpdateAccessibility(QAccessibleEvent* event); +bool QAccessible_IsActive(); +void QAccessible_SetActive(bool active); +void QAccessible_SetRootObject(QObject* object); +void QAccessible_Cleanup(); +void QAccessible_Delete(QAccessible* self); + +QAccessible__State* QAccessible__State_new(); +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 +} /* extern C */ +#endif + +#endif diff --git a/qt/gen_qaccessiblebridge.cpp b/qt/gen_qaccessiblebridge.cpp index 61dd518..dbea48d 100644 --- a/qt/gen_qaccessiblebridge.cpp +++ b/qt/gen_qaccessiblebridge.cpp @@ -41,13 +41,6 @@ struct miqt_string* QAccessibleBridgePlugin_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAccessibleBridgePlugin_TrUtf8(const char* s) { - QString _ret = QAccessibleBridgePlugin::trUtf8(s); - // 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()); -} - QAccessibleBridge* QAccessibleBridgePlugin_Create(QAccessibleBridgePlugin* self, struct miqt_string* key) { QString key_QString = QString::fromUtf8(&key->data, key->len); return self->create(key_QString); @@ -67,20 +60,6 @@ struct miqt_string* QAccessibleBridgePlugin_Tr3(const char* s, const char* c, in return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAccessibleBridgePlugin_TrUtf82(const char* s, const char* c) { - QString _ret = QAccessibleBridgePlugin::trUtf8(s, c); - // 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* QAccessibleBridgePlugin_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QAccessibleBridgePlugin::trUtf8(s, c, static_cast(n)); - // 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 QAccessibleBridgePlugin_Delete(QAccessibleBridgePlugin* self) { delete self; } diff --git a/qt/gen_qaccessiblebridge.go b/qt/gen_qaccessiblebridge.go index 068284a..21bf292 100644 --- a/qt/gen_qaccessiblebridge.go +++ b/qt/gen_qaccessiblebridge.go @@ -103,15 +103,6 @@ func QAccessibleBridgePlugin_Tr(s string) string { return _ret } -func QAccessibleBridgePlugin_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAccessibleBridgePlugin_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QAccessibleBridgePlugin) Create(key string) *QAccessibleBridge { key_ms := miqt_strdupg(key) defer C.free(key_ms) @@ -140,28 +131,6 @@ func QAccessibleBridgePlugin_Tr3(s string, c string, n int) string { return _ret } -func QAccessibleBridgePlugin_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAccessibleBridgePlugin_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QAccessibleBridgePlugin_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAccessibleBridgePlugin_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QAccessibleBridgePlugin) Delete() { C.QAccessibleBridgePlugin_Delete(this.h) diff --git a/qt/gen_qaccessiblebridge.h b/qt/gen_qaccessiblebridge.h index 95fda7a..63b21df 100644 --- a/qt/gen_qaccessiblebridge.h +++ b/qt/gen_qaccessiblebridge.h @@ -35,12 +35,9 @@ void QAccessibleBridge_Delete(QAccessibleBridge* self); QMetaObject* QAccessibleBridgePlugin_MetaObject(const QAccessibleBridgePlugin* self); void* QAccessibleBridgePlugin_Metacast(QAccessibleBridgePlugin* self, const char* param1); struct miqt_string* QAccessibleBridgePlugin_Tr(const char* s); -struct miqt_string* QAccessibleBridgePlugin_TrUtf8(const char* s); QAccessibleBridge* QAccessibleBridgePlugin_Create(QAccessibleBridgePlugin* self, struct miqt_string* key); struct miqt_string* QAccessibleBridgePlugin_Tr2(const char* s, const char* c); struct miqt_string* QAccessibleBridgePlugin_Tr3(const char* s, const char* c, int n); -struct miqt_string* QAccessibleBridgePlugin_TrUtf82(const char* s, const char* c); -struct miqt_string* QAccessibleBridgePlugin_TrUtf83(const char* s, const char* c, int n); void QAccessibleBridgePlugin_Delete(QAccessibleBridgePlugin* self); #ifdef __cplusplus diff --git a/qt/gen_qaccessibleplugin.cpp b/qt/gen_qaccessibleplugin.cpp index f8dd955..13c641e3 100644 --- a/qt/gen_qaccessibleplugin.cpp +++ b/qt/gen_qaccessibleplugin.cpp @@ -24,13 +24,6 @@ struct miqt_string* QAccessiblePlugin_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAccessiblePlugin_TrUtf8(const char* s) { - QString _ret = QAccessiblePlugin::trUtf8(s); - // 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()); -} - QAccessibleInterface* QAccessiblePlugin_Create(QAccessiblePlugin* self, struct miqt_string* key, QObject* object) { QString key_QString = QString::fromUtf8(&key->data, key->len); return self->create(key_QString, object); @@ -50,20 +43,6 @@ struct miqt_string* QAccessiblePlugin_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAccessiblePlugin_TrUtf82(const char* s, const char* c) { - QString _ret = QAccessiblePlugin::trUtf8(s, c); - // 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* QAccessiblePlugin_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QAccessiblePlugin::trUtf8(s, c, static_cast(n)); - // 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 QAccessiblePlugin_Delete(QAccessiblePlugin* self) { delete self; } diff --git a/qt/gen_qaccessibleplugin.go b/qt/gen_qaccessibleplugin.go index f5875bd..90d8cbe 100644 --- a/qt/gen_qaccessibleplugin.go +++ b/qt/gen_qaccessibleplugin.go @@ -55,15 +55,6 @@ func QAccessiblePlugin_Tr(s string) string { return _ret } -func QAccessiblePlugin_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAccessiblePlugin_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QAccessiblePlugin) Create(key string, object *QObject) *QAccessibleInterface { key_ms := miqt_strdupg(key) defer C.free(key_ms) @@ -92,28 +83,6 @@ func QAccessiblePlugin_Tr3(s string, c string, n int) string { return _ret } -func QAccessiblePlugin_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAccessiblePlugin_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QAccessiblePlugin_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAccessiblePlugin_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QAccessiblePlugin) Delete() { C.QAccessiblePlugin_Delete(this.h) diff --git a/qt/gen_qaccessibleplugin.h b/qt/gen_qaccessibleplugin.h index d260f47..d28e9f5 100644 --- a/qt/gen_qaccessibleplugin.h +++ b/qt/gen_qaccessibleplugin.h @@ -28,12 +28,9 @@ typedef struct QObject QObject; QMetaObject* QAccessiblePlugin_MetaObject(const QAccessiblePlugin* self); void* QAccessiblePlugin_Metacast(QAccessiblePlugin* self, const char* param1); struct miqt_string* QAccessiblePlugin_Tr(const char* s); -struct miqt_string* QAccessiblePlugin_TrUtf8(const char* s); QAccessibleInterface* QAccessiblePlugin_Create(QAccessiblePlugin* self, struct miqt_string* key, QObject* object); struct miqt_string* QAccessiblePlugin_Tr2(const char* s, const char* c); struct miqt_string* QAccessiblePlugin_Tr3(const char* s, const char* c, int n); -struct miqt_string* QAccessiblePlugin_TrUtf82(const char* s, const char* c); -struct miqt_string* QAccessiblePlugin_TrUtf83(const char* s, const char* c, int n); void QAccessiblePlugin_Delete(QAccessiblePlugin* self); #ifdef __cplusplus diff --git a/qt/gen_qaction.cpp b/qt/gen_qaction.cpp index 475e577..5967fc8 100644 --- a/qt/gen_qaction.cpp +++ b/qt/gen_qaction.cpp @@ -1,18 +1,15 @@ #include #include #include -#include #include #include #include -#include #include #include #include #include #include #include -#include #include "qaction.h" #include "gen_qaction.h" #include "_cgo_export.h" @@ -60,11 +57,17 @@ struct miqt_string* QAction_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAction_TrUtf8(const char* s) { - QString _ret = QAction::trUtf8(s); - // 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* QAction_AssociatedObjects(const QAction* self) { + QList _ret = self->associatedObjects(); + // Convert QList<> from C++ memory to manually-managed C memory + QObject** _arr = static_cast(malloc(sizeof(QObject*) * _ret.length())); + for (size_t i = 0, e = _ret.length(); i < e; ++i) { + _arr[i] = _ret[i]; + } + struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); + _out->len = _ret.length(); + _out->data = static_cast(_arr); + return _out; } void QAction_SetActionGroup(QAction* self, QActionGroup* group) { @@ -152,14 +155,6 @@ int QAction_Priority(const QAction* self) { return static_cast(_ret); } -QMenu* QAction_Menu(const QAction* self) { - return self->menu(); -} - -void QAction_SetMenu(QAction* self, QMenu* menu) { - self->setMenu(menu); -} - void QAction_SetSeparator(QAction* self, bool b) { self->setSeparator(b); } @@ -260,10 +255,6 @@ void QAction_Activate(QAction* self, int event) { self->activate(static_cast(event)); } -bool QAction_ShowStatusText(QAction* self) { - return self->showStatusText(); -} - void QAction_SetMenuRole(QAction* self, int menuRole) { self->setMenuRole(static_cast(menuRole)); } @@ -289,34 +280,8 @@ bool QAction_IsShortcutVisibleInContextMenu(const QAction* self) { return self->isShortcutVisibleInContextMenu(); } -QWidget* QAction_ParentWidget(const QAction* self) { - return self->parentWidget(); -} - -struct miqt_array* QAction_AssociatedWidgets(const QAction* self) { - 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) { - _arr[i] = _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_array* QAction_AssociatedGraphicsWidgets(const QAction* self) { - 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) { - _arr[i] = _ret[i]; - } - struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); - _out->len = _ret.length(); - _out->data = static_cast(_arr); - return _out; +bool QAction_ShowStatusText(QAction* self) { + return self->showStatusText(); } void QAction_Trigger(QAction* self) { @@ -339,6 +304,10 @@ void QAction_SetEnabled(QAction* self, bool enabled) { self->setEnabled(enabled); } +void QAction_ResetEnabled(QAction* self) { + self->resetEnabled(); +} + void QAction_SetDisabled(QAction* self, bool b) { self->setDisabled(b); } @@ -357,6 +326,38 @@ void QAction_connect_Changed(QAction* self, void* slot) { }); } +void QAction_EnabledChanged(QAction* self, bool enabled) { + self->enabledChanged(enabled); +} + +void QAction_connect_EnabledChanged(QAction* self, void* slot) { + QAction::connect(self, static_cast(&QAction::enabledChanged), self, [=](bool enabled) { + bool sigval1 = enabled; + miqt_exec_callback_QAction_EnabledChanged(slot, sigval1); + }); +} + +void QAction_CheckableChanged(QAction* self, bool checkable) { + self->checkableChanged(checkable); +} + +void QAction_connect_CheckableChanged(QAction* self, void* slot) { + QAction::connect(self, static_cast(&QAction::checkableChanged), self, [=](bool checkable) { + bool sigval1 = checkable; + miqt_exec_callback_QAction_CheckableChanged(slot, sigval1); + }); +} + +void QAction_VisibleChanged(QAction* self) { + self->visibleChanged(); +} + +void QAction_connect_VisibleChanged(QAction* self, void* slot) { + QAction::connect(self, static_cast(&QAction::visibleChanged), self, [=]() { + miqt_exec_callback_QAction_VisibleChanged(slot); + }); +} + void QAction_Triggered(QAction* self) { self->triggered(); } @@ -402,22 +403,8 @@ struct miqt_string* QAction_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAction_TrUtf82(const char* s, const char* c) { - QString _ret = QAction::trUtf8(s, c); - // 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* QAction_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QAction::trUtf8(s, c, static_cast(n)); - // 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()); -} - -bool QAction_ShowStatusText1(QAction* self, QWidget* widget) { - return self->showStatusText(widget); +bool QAction_ShowStatusText1(QAction* self, QObject* object) { + return self->showStatusText(object); } void QAction_Triggered1(QAction* self, bool checked) { diff --git a/qt/gen_qaction.go b/qt/gen_qaction.go index dc99d66..888eb41 100644 --- a/qt/gen_qaction.go +++ b/qt/gen_qaction.go @@ -127,12 +127,14 @@ func QAction_Tr(s string) string { return _ret } -func QAction_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAction_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) +func (this *QAction) AssociatedObjects() []*QObject { + var _ma *C.struct_miqt_array = C.QAction_AssociatedObjects(this.h) + _ret := make([]*QObject, int(_ma.len)) + _outCast := (*[0xffff]*C.QObject)(unsafe.Pointer(_ma.data)) // hey ya + for i := 0; i < int(_ma.len); i++ { + _ret[i] = newQObject_U(unsafe.Pointer(_outCast[i])) + } + C.free(unsafe.Pointer(_ma)) return _ret } @@ -228,14 +230,6 @@ func (this *QAction) Priority() QAction__Priority { return (QAction__Priority)(C.QAction_Priority(this.h)) } -func (this *QAction) Menu() *QMenu { - return newQMenu_U(unsafe.Pointer(C.QAction_Menu(this.h))) -} - -func (this *QAction) SetMenu(menu *QMenu) { - C.QAction_SetMenu(this.h, menu.cPointer()) -} - func (this *QAction) SetSeparator(b bool) { C.QAction_SetSeparator(this.h, (C.bool)(b)) } @@ -347,10 +341,6 @@ func (this *QAction) Activate(event QAction__ActionEvent) { C.QAction_Activate(this.h, (C.int)(event)) } -func (this *QAction) ShowStatusText() bool { - return (bool)(C.QAction_ShowStatusText(this.h)) -} - func (this *QAction) SetMenuRole(menuRole QAction__MenuRole) { C.QAction_SetMenuRole(this.h, (C.int)(menuRole)) } @@ -375,30 +365,8 @@ func (this *QAction) IsShortcutVisibleInContextMenu() bool { return (bool)(C.QAction_IsShortcutVisibleInContextMenu(this.h)) } -func (this *QAction) ParentWidget() *QWidget { - return newQWidget_U(unsafe.Pointer(C.QAction_ParentWidget(this.h))) -} - -func (this *QAction) AssociatedWidgets() []*QWidget { - var _ma *C.struct_miqt_array = C.QAction_AssociatedWidgets(this.h) - _ret := make([]*QWidget, int(_ma.len)) - _outCast := (*[0xffff]*C.QWidget)(unsafe.Pointer(_ma.data)) // hey ya - for i := 0; i < int(_ma.len); i++ { - _ret[i] = newQWidget_U(unsafe.Pointer(_outCast[i])) - } - C.free(unsafe.Pointer(_ma)) - return _ret -} - -func (this *QAction) AssociatedGraphicsWidgets() []*QGraphicsWidget { - var _ma *C.struct_miqt_array = C.QAction_AssociatedGraphicsWidgets(this.h) - _ret := make([]*QGraphicsWidget, int(_ma.len)) - _outCast := (*[0xffff]*C.QGraphicsWidget)(unsafe.Pointer(_ma.data)) // hey ya - for i := 0; i < int(_ma.len); i++ { - _ret[i] = newQGraphicsWidget_U(unsafe.Pointer(_outCast[i])) - } - C.free(unsafe.Pointer(_ma)) - return _ret +func (this *QAction) ShowStatusText() bool { + return (bool)(C.QAction_ShowStatusText(this.h)) } func (this *QAction) Trigger() { @@ -421,6 +389,10 @@ func (this *QAction) SetEnabled(enabled bool) { C.QAction_SetEnabled(this.h, (C.bool)(enabled)) } +func (this *QAction) ResetEnabled() { + C.QAction_ResetEnabled(this.h) +} + func (this *QAction) SetDisabled(b bool) { C.QAction_SetDisabled(this.h, (C.bool)(b)) } @@ -446,6 +418,63 @@ func miqt_exec_callback_QAction_Changed(cb *C.void) { gofunc() } +func (this *QAction) EnabledChanged(enabled bool) { + C.QAction_EnabledChanged(this.h, (C.bool)(enabled)) +} +func (this *QAction) OnEnabledChanged(slot func(enabled bool)) { + C.QAction_connect_EnabledChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) +} + +//export miqt_exec_callback_QAction_EnabledChanged +func miqt_exec_callback_QAction_EnabledChanged(cb *C.void, enabled C.bool) { + gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(enabled bool)) + if !ok { + panic("miqt: callback of non-callback type (heap corruption?)") + } + + // Convert all CABI parameters to Go parameters + slotval1 := (bool)(enabled) + + gofunc(slotval1) +} + +func (this *QAction) CheckableChanged(checkable bool) { + C.QAction_CheckableChanged(this.h, (C.bool)(checkable)) +} +func (this *QAction) OnCheckableChanged(slot func(checkable bool)) { + C.QAction_connect_CheckableChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) +} + +//export miqt_exec_callback_QAction_CheckableChanged +func miqt_exec_callback_QAction_CheckableChanged(cb *C.void, checkable C.bool) { + gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(checkable bool)) + if !ok { + panic("miqt: callback of non-callback type (heap corruption?)") + } + + // Convert all CABI parameters to Go parameters + slotval1 := (bool)(checkable) + + gofunc(slotval1) +} + +func (this *QAction) VisibleChanged() { + C.QAction_VisibleChanged(this.h) +} +func (this *QAction) OnVisibleChanged(slot func()) { + C.QAction_connect_VisibleChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) +} + +//export miqt_exec_callback_QAction_VisibleChanged +func miqt_exec_callback_QAction_VisibleChanged(cb *C.void) { + gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func()) + if !ok { + panic("miqt: callback of non-callback type (heap corruption?)") + } + + gofunc() +} + func (this *QAction) Triggered() { C.QAction_Triggered(this.h) } @@ -522,30 +551,8 @@ func QAction_Tr3(s string, c string, n int) string { return _ret } -func QAction_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAction_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QAction_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAction_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QAction) ShowStatusText1(widget *QWidget) bool { - return (bool)(C.QAction_ShowStatusText1(this.h, widget.cPointer())) +func (this *QAction) ShowStatusText1(object *QObject) bool { + return (bool)(C.QAction_ShowStatusText1(this.h, object.cPointer())) } func (this *QAction) Triggered1(checked bool) { diff --git a/qt/gen_qaction.h b/qt/gen_qaction.h index 4d07586..510b12e 100644 --- a/qt/gen_qaction.h +++ b/qt/gen_qaction.h @@ -17,26 +17,20 @@ extern "C" { class QAction; class QActionGroup; class QFont; -class QGraphicsWidget; class QIcon; class QKeySequence; -class QMenu; class QMetaObject; class QObject; class QVariant; -class QWidget; #else typedef struct QAction QAction; typedef struct QActionGroup QActionGroup; typedef struct QFont QFont; -typedef struct QGraphicsWidget QGraphicsWidget; typedef struct QIcon QIcon; typedef struct QKeySequence QKeySequence; -typedef struct QMenu QMenu; typedef struct QMetaObject QMetaObject; typedef struct QObject QObject; typedef struct QVariant QVariant; -typedef struct QWidget QWidget; #endif QAction* QAction_new(); @@ -48,7 +42,7 @@ QAction* QAction_new6(QIcon* icon, struct miqt_string* text, QObject* parent); QMetaObject* QAction_MetaObject(const QAction* self); void* QAction_Metacast(QAction* self, const char* param1); struct miqt_string* QAction_Tr(const char* s); -struct miqt_string* QAction_TrUtf8(const char* s); +struct miqt_array* QAction_AssociatedObjects(const QAction* self); void QAction_SetActionGroup(QAction* self, QActionGroup* group); QActionGroup* QAction_ActionGroup(const QAction* self); void QAction_SetIcon(QAction* self, QIcon* icon); @@ -65,8 +59,6 @@ void QAction_SetWhatsThis(QAction* self, struct miqt_string* what); struct miqt_string* QAction_WhatsThis(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); bool QAction_IsSeparator(const QAction* self); void QAction_SetShortcut(QAction* self, QKeySequence* shortcut); @@ -88,25 +80,29 @@ bool QAction_IsChecked(const QAction* self); bool QAction_IsEnabled(const QAction* self); bool QAction_IsVisible(const QAction* self); void QAction_Activate(QAction* self, int event); -bool QAction_ShowStatusText(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); bool QAction_IsShortcutVisibleInContextMenu(const QAction* self); -QWidget* QAction_ParentWidget(const QAction* self); -struct miqt_array* QAction_AssociatedWidgets(const QAction* self); -struct miqt_array* QAction_AssociatedGraphicsWidgets(const QAction* self); +bool QAction_ShowStatusText(QAction* self); void QAction_Trigger(QAction* self); void QAction_Hover(QAction* self); void QAction_SetChecked(QAction* self, bool checked); void QAction_Toggle(QAction* self); void QAction_SetEnabled(QAction* self, bool enabled); +void QAction_ResetEnabled(QAction* self); void QAction_SetDisabled(QAction* self, bool b); void QAction_SetVisible(QAction* self, bool visible); void QAction_Changed(QAction* self); void QAction_connect_Changed(QAction* self, void* slot); +void QAction_EnabledChanged(QAction* self, bool enabled); +void QAction_connect_EnabledChanged(QAction* self, void* slot); +void QAction_CheckableChanged(QAction* self, bool checkable); +void QAction_connect_CheckableChanged(QAction* self, void* slot); +void QAction_VisibleChanged(QAction* self); +void QAction_connect_VisibleChanged(QAction* self, void* slot); void QAction_Triggered(QAction* self); void QAction_connect_Triggered(QAction* self, void* slot); void QAction_Hovered(QAction* self); @@ -115,9 +111,7 @@ void QAction_Toggled(QAction* self, bool param1); void QAction_connect_Toggled(QAction* self, void* slot); struct miqt_string* QAction_Tr2(const char* s, const char* c); struct miqt_string* QAction_Tr3(const char* s, const char* c, int n); -struct miqt_string* QAction_TrUtf82(const char* s, const char* c); -struct miqt_string* QAction_TrUtf83(const char* s, const char* c, int n); -bool QAction_ShowStatusText1(QAction* self, QWidget* widget); +bool QAction_ShowStatusText1(QAction* self, QObject* object); void QAction_Triggered1(QAction* self, bool checked); void QAction_connect_Triggered1(QAction* self, void* slot); void QAction_Delete(QAction* self); diff --git a/qt/gen_qactiongroup.cpp b/qt/gen_qactiongroup.cpp index 62c274e..46f2f17 100644 --- a/qt/gen_qactiongroup.cpp +++ b/qt/gen_qactiongroup.cpp @@ -30,13 +30,6 @@ struct miqt_string* QActionGroup_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QActionGroup_TrUtf8(const char* s) { - QString _ret = QActionGroup::trUtf8(s); - // 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()); -} - QAction* QActionGroup_AddAction(QActionGroup* self, QAction* a) { return self->addAction(a); } @@ -145,20 +138,6 @@ struct miqt_string* QActionGroup_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QActionGroup_TrUtf82(const char* s, const char* c) { - QString _ret = QActionGroup::trUtf8(s, c); - // 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* QActionGroup_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QActionGroup::trUtf8(s, c, static_cast(n)); - // 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 QActionGroup_Delete(QActionGroup* self) { delete self; } diff --git a/qt/gen_qactiongroup.go b/qt/gen_qactiongroup.go index a5a4738..8005f7b 100644 --- a/qt/gen_qactiongroup.go +++ b/qt/gen_qactiongroup.go @@ -70,15 +70,6 @@ func QActionGroup_Tr(s string) string { return _ret } -func QActionGroup_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QActionGroup_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QActionGroup) AddAction(a *QAction) *QAction { return newQAction_U(unsafe.Pointer(C.QActionGroup_AddAction(this.h, a.cPointer()))) } @@ -212,28 +203,6 @@ func QActionGroup_Tr3(s string, c string, n int) string { return _ret } -func QActionGroup_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QActionGroup_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QActionGroup_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QActionGroup_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QActionGroup) Delete() { C.QActionGroup_Delete(this.h) diff --git a/qt/gen_qactiongroup.h b/qt/gen_qactiongroup.h index f941a02..31b7a14 100644 --- a/qt/gen_qactiongroup.h +++ b/qt/gen_qactiongroup.h @@ -31,7 +31,6 @@ QActionGroup* QActionGroup_new(QObject* parent); QMetaObject* QActionGroup_MetaObject(const QActionGroup* self); void* QActionGroup_Metacast(QActionGroup* self, const char* param1); struct miqt_string* QActionGroup_Tr(const char* s); -struct miqt_string* QActionGroup_TrUtf8(const char* s); QAction* QActionGroup_AddAction(QActionGroup* self, QAction* a); QAction* QActionGroup_AddActionWithText(QActionGroup* self, struct miqt_string* text); QAction* QActionGroup_AddAction2(QActionGroup* self, QIcon* icon, struct miqt_string* text); @@ -53,8 +52,6 @@ void QActionGroup_Hovered(QActionGroup* self, QAction* param1); void QActionGroup_connect_Hovered(QActionGroup* self, void* slot); struct miqt_string* QActionGroup_Tr2(const char* s, const char* c); struct miqt_string* QActionGroup_Tr3(const char* s, const char* c, int n); -struct miqt_string* QActionGroup_TrUtf82(const char* s, const char* c); -struct miqt_string* QActionGroup_TrUtf83(const char* s, const char* c, int n); void QActionGroup_Delete(QActionGroup* self); #ifdef __cplusplus diff --git a/qt/gen_qanimationgroup.cpp b/qt/gen_qanimationgroup.cpp index 437acb7..ca4db8c 100644 --- a/qt/gen_qanimationgroup.cpp +++ b/qt/gen_qanimationgroup.cpp @@ -23,13 +23,6 @@ struct miqt_string* QAnimationGroup_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAnimationGroup_TrUtf8(const char* s) { - QString _ret = QAnimationGroup::trUtf8(s); - // 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()); -} - QAbstractAnimation* QAnimationGroup_AnimationAt(const QAnimationGroup* self, int index) { return self->animationAt(static_cast(index)); } @@ -76,20 +69,6 @@ struct miqt_string* QAnimationGroup_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QAnimationGroup_TrUtf82(const char* s, const char* c) { - QString _ret = QAnimationGroup::trUtf8(s, c); - // 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* QAnimationGroup_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QAnimationGroup::trUtf8(s, c, static_cast(n)); - // 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 QAnimationGroup_Delete(QAnimationGroup* self) { delete self; } diff --git a/qt/gen_qanimationgroup.go b/qt/gen_qanimationgroup.go index aa298ae..f1cbb43 100644 --- a/qt/gen_qanimationgroup.go +++ b/qt/gen_qanimationgroup.go @@ -55,15 +55,6 @@ func QAnimationGroup_Tr(s string) string { return _ret } -func QAnimationGroup_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QAnimationGroup_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QAnimationGroup) AnimationAt(index int) *QAbstractAnimation { return newQAbstractAnimation_U(unsafe.Pointer(C.QAnimationGroup_AnimationAt(this.h, (C.int)(index)))) } @@ -118,28 +109,6 @@ func QAnimationGroup_Tr3(s string, c string, n int) string { return _ret } -func QAnimationGroup_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAnimationGroup_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QAnimationGroup_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QAnimationGroup_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QAnimationGroup) Delete() { C.QAnimationGroup_Delete(this.h) diff --git a/qt/gen_qanimationgroup.h b/qt/gen_qanimationgroup.h index 6e1cd9b..7e97d9a 100644 --- a/qt/gen_qanimationgroup.h +++ b/qt/gen_qanimationgroup.h @@ -26,7 +26,6 @@ typedef struct QMetaObject QMetaObject; QMetaObject* QAnimationGroup_MetaObject(const QAnimationGroup* self); void* QAnimationGroup_Metacast(QAnimationGroup* self, const char* param1); struct miqt_string* QAnimationGroup_Tr(const char* s); -struct miqt_string* QAnimationGroup_TrUtf8(const char* s); QAbstractAnimation* QAnimationGroup_AnimationAt(const QAnimationGroup* self, int index); int QAnimationGroup_AnimationCount(const QAnimationGroup* self); int QAnimationGroup_IndexOfAnimation(const QAnimationGroup* self, QAbstractAnimation* animation); @@ -37,8 +36,6 @@ QAbstractAnimation* QAnimationGroup_TakeAnimation(QAnimationGroup* self, int ind void QAnimationGroup_Clear(QAnimationGroup* self); struct miqt_string* QAnimationGroup_Tr2(const char* s, const char* c); struct miqt_string* QAnimationGroup_Tr3(const char* s, const char* c, int n); -struct miqt_string* QAnimationGroup_TrUtf82(const char* s, const char* c); -struct miqt_string* QAnimationGroup_TrUtf83(const char* s, const char* c, int n); void QAnimationGroup_Delete(QAnimationGroup* self); #ifdef __cplusplus diff --git a/qt/gen_qanystringview.cpp b/qt/gen_qanystringview.cpp new file mode 100644 index 0000000..a4f9ea5 --- /dev/null +++ b/qt/gen_qanystringview.cpp @@ -0,0 +1,93 @@ +#include +#include +#include +#include +#include +#include +#include "qanystringview.h" +#include "gen_qanystringview.h" +#include "_cgo_export.h" + +QAnyStringView* QAnyStringView_new() { + return new QAnyStringView(); +} + +QAnyStringView* QAnyStringView_new2(QByteArray* str) { + return new QAnyStringView(*str); +} + +QAnyStringView* QAnyStringView_new3(struct miqt_string* str) { + QString str_QString = QString::fromUtf8(&str->data, str->len); + return new QAnyStringView(str_QString); +} + +QAnyStringView* QAnyStringView_new4(QChar* c) { + return new QAnyStringView(*c); +} + +QAnyStringView* QAnyStringView_new5(QAnyStringView* param1) { + return new QAnyStringView(*param1); +} + +struct miqt_string* QAnyStringView_ToString(const QAnyStringView* self) { + QString _ret = self->toString(); + // 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()); +} + +ptrdiff_t QAnyStringView_Size(const QAnyStringView* self) { + qsizetype _ret = self->size(); + return static_cast(_ret); +} + +const void* QAnyStringView_Data(const QAnyStringView* self) { + return (const void*) self->data(); +} + +int QAnyStringView_Compare(QAnyStringView* lhs, QAnyStringView* rhs) { + return QAnyStringView::compare(*lhs, *rhs); +} + +bool QAnyStringView_Equal(QAnyStringView* lhs, QAnyStringView* rhs) { + return QAnyStringView::equal(*lhs, *rhs); +} + +QChar* QAnyStringView_Front(const QAnyStringView* self) { + return new QChar(self->front()); +} + +QChar* QAnyStringView_Back(const QAnyStringView* self) { + return new QChar(self->back()); +} + +bool QAnyStringView_Empty(const QAnyStringView* self) { + return self->empty(); +} + +ptrdiff_t QAnyStringView_SizeBytes(const QAnyStringView* self) { + qsizetype _ret = self->size_bytes(); + return static_cast(_ret); +} + +bool QAnyStringView_IsNull(const QAnyStringView* self) { + return self->isNull(); +} + +bool QAnyStringView_IsEmpty(const QAnyStringView* self) { + return self->isEmpty(); +} + +ptrdiff_t QAnyStringView_Length(const QAnyStringView* self) { + qsizetype _ret = self->length(); + return static_cast(_ret); +} + +int QAnyStringView_Compare3(QAnyStringView* lhs, QAnyStringView* rhs, int cs) { + return QAnyStringView::compare(*lhs, *rhs, static_cast(cs)); +} + +void QAnyStringView_Delete(QAnyStringView* self) { + delete self; +} + diff --git a/qt/gen_qanystringview.go b/qt/gen_qanystringview.go new file mode 100644 index 0000000..cfb8236 --- /dev/null +++ b/qt/gen_qanystringview.go @@ -0,0 +1,143 @@ +package qt + +/* + +#include "gen_qanystringview.h" +#include + +*/ +import "C" + +import ( + "runtime" + "unsafe" +) + +type QAnyStringView struct { + h *C.QAnyStringView +} + +func (this *QAnyStringView) cPointer() *C.QAnyStringView { + if this == nil { + return nil + } + return this.h +} + +func newQAnyStringView(h *C.QAnyStringView) *QAnyStringView { + if h == nil { + return nil + } + return &QAnyStringView{h: h} +} + +func newQAnyStringView_U(h unsafe.Pointer) *QAnyStringView { + return newQAnyStringView((*C.QAnyStringView)(h)) +} + +// NewQAnyStringView constructs a new QAnyStringView object. +func NewQAnyStringView() *QAnyStringView { + ret := C.QAnyStringView_new() + return newQAnyStringView(ret) +} + +// NewQAnyStringView2 constructs a new QAnyStringView object. +func NewQAnyStringView2(str *QByteArray) *QAnyStringView { + ret := C.QAnyStringView_new2(str.cPointer()) + return newQAnyStringView(ret) +} + +// NewQAnyStringView3 constructs a new QAnyStringView object. +func NewQAnyStringView3(str string) *QAnyStringView { + str_ms := miqt_strdupg(str) + defer C.free(str_ms) + ret := C.QAnyStringView_new3((*C.struct_miqt_string)(str_ms)) + return newQAnyStringView(ret) +} + +// NewQAnyStringView4 constructs a new QAnyStringView object. +func NewQAnyStringView4(c *QChar) *QAnyStringView { + ret := C.QAnyStringView_new4(c.cPointer()) + return newQAnyStringView(ret) +} + +// NewQAnyStringView5 constructs a new QAnyStringView object. +func NewQAnyStringView5(param1 *QAnyStringView) *QAnyStringView { + ret := C.QAnyStringView_new5(param1.cPointer()) + return newQAnyStringView(ret) +} + +func (this *QAnyStringView) ToString() string { + var _ms *C.struct_miqt_string = C.QAnyStringView_ToString(this.h) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + +func (this *QAnyStringView) Size() int64 { + return (int64)(C.QAnyStringView_Size(this.h)) +} + +func (this *QAnyStringView) Data() unsafe.Pointer { + return C.QAnyStringView_Data(this.h) +} + +func QAnyStringView_Compare(lhs QAnyStringView, rhs QAnyStringView) int { + return (int)(C.QAnyStringView_Compare(lhs.cPointer(), rhs.cPointer())) +} + +func QAnyStringView_Equal(lhs QAnyStringView, rhs QAnyStringView) bool { + return (bool)(C.QAnyStringView_Equal(lhs.cPointer(), rhs.cPointer())) +} + +func (this *QAnyStringView) Front() *QChar { + _ret := C.QAnyStringView_Front(this.h) + _goptr := newQChar(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QAnyStringView) Back() *QChar { + _ret := C.QAnyStringView_Back(this.h) + _goptr := newQChar(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QAnyStringView) Empty() bool { + return (bool)(C.QAnyStringView_Empty(this.h)) +} + +func (this *QAnyStringView) SizeBytes() int64 { + return (int64)(C.QAnyStringView_SizeBytes(this.h)) +} + +func (this *QAnyStringView) IsNull() bool { + return (bool)(C.QAnyStringView_IsNull(this.h)) +} + +func (this *QAnyStringView) IsEmpty() bool { + return (bool)(C.QAnyStringView_IsEmpty(this.h)) +} + +func (this *QAnyStringView) Length() int64 { + return (int64)(C.QAnyStringView_Length(this.h)) +} + +func QAnyStringView_Compare3(lhs QAnyStringView, rhs QAnyStringView, cs CaseSensitivity) int { + return (int)(C.QAnyStringView_Compare3(lhs.cPointer(), rhs.cPointer(), (C.int)(cs))) +} + +// Delete this object from C++ memory. +func (this *QAnyStringView) Delete() { + C.QAnyStringView_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QAnyStringView) GoGC() { + runtime.SetFinalizer(this, func(this *QAnyStringView) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} diff --git a/qt/gen_qanystringview.h b/qt/gen_qanystringview.h new file mode 100644 index 0000000..6d92e0a --- /dev/null +++ b/qt/gen_qanystringview.h @@ -0,0 +1,50 @@ +#ifndef GEN_QANYSTRINGVIEW_H +#define GEN_QANYSTRINGVIEW_H + +#include +#include +#include + +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + +#include "binding.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +class QAnyStringView; +class QByteArray; +class QChar; +#else +typedef struct QAnyStringView QAnyStringView; +typedef struct QByteArray QByteArray; +typedef struct QChar QChar; +#endif + +QAnyStringView* QAnyStringView_new(); +QAnyStringView* QAnyStringView_new2(QByteArray* str); +QAnyStringView* QAnyStringView_new3(struct miqt_string* str); +QAnyStringView* QAnyStringView_new4(QChar* c); +QAnyStringView* QAnyStringView_new5(QAnyStringView* param1); +struct miqt_string* QAnyStringView_ToString(const QAnyStringView* self); +ptrdiff_t QAnyStringView_Size(const QAnyStringView* self); +const void* QAnyStringView_Data(const QAnyStringView* self); +int QAnyStringView_Compare(QAnyStringView* lhs, QAnyStringView* rhs); +bool QAnyStringView_Equal(QAnyStringView* lhs, QAnyStringView* rhs); +QChar* QAnyStringView_Front(const QAnyStringView* self); +QChar* QAnyStringView_Back(const QAnyStringView* self); +bool QAnyStringView_Empty(const QAnyStringView* self); +ptrdiff_t QAnyStringView_SizeBytes(const QAnyStringView* self); +bool QAnyStringView_IsNull(const QAnyStringView* self); +bool QAnyStringView_IsEmpty(const QAnyStringView* self); +ptrdiff_t QAnyStringView_Length(const QAnyStringView* self); +int QAnyStringView_Compare3(QAnyStringView* lhs, QAnyStringView* rhs, int cs); +void QAnyStringView_Delete(QAnyStringView* self); + +#ifdef __cplusplus +} /* extern C */ +#endif + +#endif diff --git a/qt/gen_qapplication.cpp b/qt/gen_qapplication.cpp index 90ac3a4..fe6d979 100644 --- a/qt/gen_qapplication.cpp +++ b/qt/gen_qapplication.cpp @@ -1,15 +1,12 @@ #include -#include #include #include #include -#include #include #include #include #include #include -#include #include #include #include @@ -42,13 +39,6 @@ struct miqt_string* QApplication_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QApplication_TrUtf8(const char* s) { - QString _ret = QApplication::trUtf8(s); - // 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()); -} - QStyle* QApplication_Style() { return QApplication::style(); } @@ -62,14 +52,6 @@ QStyle* QApplication_SetStyleWithStyle(struct miqt_string* style) { return QApplication::setStyle(style_QString); } -int QApplication_ColorSpec() { - return QApplication::colorSpec(); -} - -void QApplication_SetColorSpec(int colorSpec) { - QApplication::setColorSpec(static_cast(colorSpec)); -} - QPalette* QApplication_Palette(QWidget* param1) { return new QPalette(QApplication::palette(param1)); } @@ -102,14 +84,6 @@ QFontMetrics* QApplication_FontMetrics() { return new QFontMetrics(QApplication::fontMetrics()); } -void QApplication_SetWindowIcon(QIcon* icon) { - QApplication::setWindowIcon(*icon); -} - -QIcon* QApplication_WindowIcon() { - return new QIcon(QApplication::windowIcon()); -} - struct miqt_array* QApplication_AllWidgets() { QWidgetList _ret = QApplication::allWidgets(); // Convert QList<> from C++ memory to manually-managed C memory @@ -136,10 +110,6 @@ struct miqt_array* QApplication_TopLevelWidgets() { return _out; } -QDesktopWidget* QApplication_Desktop() { - return QApplication::desktop(); -} - QWidget* QApplication_ActivePopupWidget() { return QApplication::activePopupWidget(); } @@ -216,14 +186,6 @@ int QApplication_WheelScrollLines() { return QApplication::wheelScrollLines(); } -void QApplication_SetGlobalStrut(QSize* globalStrut) { - QApplication::setGlobalStrut(*globalStrut); -} - -QSize* QApplication_GlobalStrut() { - return new QSize(QApplication::globalStrut()); -} - void QApplication_SetStartDragTime(int ms) { QApplication::setStartDragTime(static_cast(ms)); } @@ -310,20 +272,6 @@ struct miqt_string* QApplication_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QApplication_TrUtf82(const char* s, const char* c) { - QString _ret = QApplication::trUtf8(s, c); - // 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* QApplication_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QApplication::trUtf8(s, c, static_cast(n)); - // 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 QApplication_SetPalette2(QPalette* param1, const char* className) { QApplication::setPalette(*param1, className); } diff --git a/qt/gen_qapplication.go b/qt/gen_qapplication.go index 4d56597..55375e5 100644 --- a/qt/gen_qapplication.go +++ b/qt/gen_qapplication.go @@ -14,14 +14,6 @@ import ( "unsafe" ) -type QApplication__ColorSpec int - -const ( - QApplication__NormalColor QApplication__ColorSpec = 0 - QApplication__CustomColor QApplication__ColorSpec = 1 - QApplication__ManyColor QApplication__ColorSpec = 2 -) - type QApplication struct { h *C.QApplication *QGuiApplication @@ -90,15 +82,6 @@ func QApplication_Tr(s string) string { return _ret } -func QApplication_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QApplication_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func QApplication_Style() *QStyle { return newQStyle_U(unsafe.Pointer(C.QApplication_Style())) } @@ -113,14 +96,6 @@ func QApplication_SetStyleWithStyle(style string) *QStyle { return newQStyle_U(unsafe.Pointer(C.QApplication_SetStyleWithStyle((*C.struct_miqt_string)(style_ms)))) } -func QApplication_ColorSpec() int { - return (int)(C.QApplication_ColorSpec()) -} - -func QApplication_SetColorSpec(colorSpec int) { - C.QApplication_SetColorSpec((C.int)(colorSpec)) -} - func QApplication_Palette(param1 *QWidget) *QPalette { _ret := C.QApplication_Palette(param1.cPointer()) _goptr := newQPalette(_ret) @@ -175,17 +150,6 @@ func QApplication_FontMetrics() *QFontMetrics { return _goptr } -func QApplication_SetWindowIcon(icon *QIcon) { - C.QApplication_SetWindowIcon(icon.cPointer()) -} - -func QApplication_WindowIcon() *QIcon { - _ret := C.QApplication_WindowIcon() - _goptr := newQIcon(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - func QApplication_AllWidgets() []*QWidget { var _ma *C.struct_miqt_array = C.QApplication_AllWidgets() _ret := make([]*QWidget, int(_ma.len)) @@ -208,10 +172,6 @@ func QApplication_TopLevelWidgets() []*QWidget { return _ret } -func QApplication_Desktop() *QDesktopWidget { - return newQDesktopWidget_U(unsafe.Pointer(C.QApplication_Desktop())) -} - func QApplication_ActivePopupWidget() *QWidget { return newQWidget_U(unsafe.Pointer(C.QApplication_ActivePopupWidget())) } @@ -288,17 +248,6 @@ func QApplication_WheelScrollLines() int { return (int)(C.QApplication_WheelScrollLines()) } -func QApplication_SetGlobalStrut(globalStrut *QSize) { - C.QApplication_SetGlobalStrut(globalStrut.cPointer()) -} - -func QApplication_GlobalStrut() *QSize { - _ret := C.QApplication_GlobalStrut() - _goptr := newQSize(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - func QApplication_SetStartDragTime(ms int) { C.QApplication_SetStartDragTime((C.int)(ms)) } @@ -403,28 +352,6 @@ func QApplication_Tr3(s string, c string, n int) string { return _ret } -func QApplication_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QApplication_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QApplication_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QApplication_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func QApplication_SetPalette2(param1 *QPalette, className string) { className_Cstring := C.CString(className) defer C.free(unsafe.Pointer(className_Cstring)) diff --git a/qt/gen_qapplication.h b/qt/gen_qapplication.h index 82f3577..9c76f4f 100644 --- a/qt/gen_qapplication.h +++ b/qt/gen_qapplication.h @@ -15,30 +15,24 @@ extern "C" { #ifdef __cplusplus class QApplication; -class QDesktopWidget; class QEvent; class QFont; class QFontMetrics; -class QIcon; class QMetaObject; class QObject; class QPalette; class QPoint; -class QSize; class QStyle; class QWidget; #else typedef struct QApplication QApplication; -typedef struct QDesktopWidget QDesktopWidget; typedef struct QEvent QEvent; typedef struct QFont QFont; typedef struct QFontMetrics QFontMetrics; -typedef struct QIcon QIcon; typedef struct QMetaObject QMetaObject; typedef struct QObject QObject; typedef struct QPalette QPalette; typedef struct QPoint QPoint; -typedef struct QSize QSize; typedef struct QStyle QStyle; typedef struct QWidget QWidget; #endif @@ -48,12 +42,9 @@ QApplication* QApplication_new2(int* argc, char** argv, int param3); QMetaObject* QApplication_MetaObject(const QApplication* self); void* QApplication_Metacast(QApplication* self, const char* param1); struct miqt_string* QApplication_Tr(const char* s); -struct miqt_string* QApplication_TrUtf8(const char* s); QStyle* QApplication_Style(); void QApplication_SetStyle(QStyle* style); QStyle* QApplication_SetStyleWithStyle(struct miqt_string* style); -int QApplication_ColorSpec(); -void QApplication_SetColorSpec(int colorSpec); QPalette* QApplication_Palette(QWidget* param1); QPalette* QApplication_PaletteWithClassName(const char* className); void QApplication_SetPalette(QPalette* param1); @@ -62,11 +53,8 @@ QFont* QApplication_FontWithQWidget(QWidget* param1); QFont* QApplication_FontWithClassName(const char* className); void QApplication_SetFont(QFont* param1); QFontMetrics* QApplication_FontMetrics(); -void QApplication_SetWindowIcon(QIcon* icon); -QIcon* QApplication_WindowIcon(); struct miqt_array* QApplication_AllWidgets(); struct miqt_array* QApplication_TopLevelWidgets(); -QDesktopWidget* QApplication_Desktop(); QWidget* QApplication_ActivePopupWidget(); QWidget* QApplication_ActiveModalWidget(); QWidget* QApplication_FocusWidget(); @@ -86,8 +74,6 @@ void QApplication_SetKeyboardInputInterval(int keyboardInputInterval); int QApplication_KeyboardInputInterval(); void QApplication_SetWheelScrollLines(int wheelScrollLines); int QApplication_WheelScrollLines(); -void QApplication_SetGlobalStrut(QSize* globalStrut); -QSize* QApplication_GlobalStrut(); void QApplication_SetStartDragTime(int ms); int QApplication_StartDragTime(); void QApplication_SetStartDragDistance(int l); @@ -106,8 +92,6 @@ void QApplication_CloseAllWindows(); void QApplication_AboutQt(); struct miqt_string* QApplication_Tr2(const char* s, const char* c); struct miqt_string* QApplication_Tr3(const char* s, const char* c, int n); -struct miqt_string* QApplication_TrUtf82(const char* s, const char* c); -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); diff --git a/qt/gen_qarraydata.cpp b/qt/gen_qarraydata.cpp index 8f5d80b..9965fa5 100644 --- a/qt/gen_qarraydata.cpp +++ b/qt/gen_qarraydata.cpp @@ -4,65 +4,45 @@ #include "gen_qarraydata.h" #include "_cgo_export.h" -void* QArrayData_Data(QArrayData* self) { - return self->data(); +ptrdiff_t QArrayData_AllocatedCapacity(QArrayData* self) { + qsizetype _ret = self->allocatedCapacity(); + return static_cast(_ret); } -const void* QArrayData_Data2(const QArrayData* self) { - return (const void*) self->data(); +ptrdiff_t QArrayData_ConstAllocatedCapacity(const QArrayData* self) { + qsizetype _ret = self->constAllocatedCapacity(); + return static_cast(_ret); } -bool QArrayData_IsMutable(const QArrayData* self) { - return self->isMutable(); +bool QArrayData_Ref(QArrayData* self) { + return self->ref(); } -size_t QArrayData_DetachCapacity(const QArrayData* self, size_t newSize) { - return self->detachCapacity(static_cast(newSize)); +bool QArrayData_Deref(QArrayData* self) { + return self->deref(); } -int QArrayData_DetachFlags(const QArrayData* self) { - QArrayData::AllocationOptions _ret = self->detachFlags(); - return static_cast(_ret); +bool QArrayData_IsShared(const QArrayData* self) { + return self->isShared(); } -int QArrayData_CloneFlags(const QArrayData* self) { - QArrayData::AllocationOptions _ret = self->cloneFlags(); - return static_cast(_ret); +bool QArrayData_NeedsDetach(const QArrayData* self) { + return self->needsDetach(); } -QArrayData* QArrayData_Allocate(size_t objectSize, size_t alignment, size_t capacity) { - return QArrayData::allocate(static_cast(objectSize), static_cast(alignment), static_cast(capacity)); +ptrdiff_t QArrayData_DetachCapacity(const QArrayData* self, ptrdiff_t newSize) { + qsizetype _ret = self->detachCapacity((qsizetype)(newSize)); + return static_cast(_ret); } -QArrayData* QArrayData_ReallocateUnaligned(QArrayData* data, size_t objectSize, size_t newCapacity) { - return QArrayData::reallocateUnaligned(data, static_cast(objectSize), static_cast(newCapacity)); -} - -void QArrayData_Deallocate(QArrayData* data, size_t objectSize, size_t alignment) { - QArrayData::deallocate(data, static_cast(objectSize), static_cast(alignment)); -} - -QArrayData* QArrayData_SharedNull() { - return QArrayData::sharedNull(); -} - -QArrayData* QArrayData_Allocate4(size_t objectSize, size_t alignment, size_t capacity, int options) { - return QArrayData::allocate(static_cast(objectSize), static_cast(alignment), static_cast(capacity), static_cast(options)); -} - -QArrayData* QArrayData_ReallocateUnaligned4(QArrayData* data, size_t objectSize, size_t newCapacity, int newOptions) { - return QArrayData::reallocateUnaligned(data, static_cast(objectSize), static_cast(newCapacity), static_cast(newOptions)); +void QArrayData_Deallocate(QArrayData* data, ptrdiff_t objectSize, ptrdiff_t alignment) { + QArrayData::deallocate(data, (qsizetype)(objectSize), (qsizetype)(alignment)); } void QArrayData_Delete(QArrayData* self) { delete self; } -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); -} - void QtPrivate__QContainerImplHelper_Delete(QtPrivate__QContainerImplHelper* self) { delete self; } diff --git a/qt/gen_qarraydata.go b/qt/gen_qarraydata.go index a362ec1..c67bb0d 100644 --- a/qt/gen_qarraydata.go +++ b/qt/gen_qarraydata.go @@ -16,11 +16,22 @@ import ( type QArrayData__AllocationOption int const ( - QArrayData__CapacityReserved QArrayData__AllocationOption = 1 - QArrayData__Unsharable QArrayData__AllocationOption = 2 - QArrayData__RawData QArrayData__AllocationOption = 4 - QArrayData__Grow QArrayData__AllocationOption = 8 - QArrayData__Default QArrayData__AllocationOption = 0 + QArrayData__Grow QArrayData__AllocationOption = 0 + QArrayData__KeepSize QArrayData__AllocationOption = 1 +) + +type QArrayData__GrowthPosition int + +const ( + QArrayData__GrowsAtEnd QArrayData__GrowthPosition = 0 + QArrayData__GrowsAtBeginning QArrayData__GrowthPosition = 1 +) + +type QArrayData__ArrayOption int + +const ( + QArrayData__ArrayOptionDefault QArrayData__ArrayOption = 0 + QArrayData__CapacityReserved QArrayData__ArrayOption = 1 ) type QtPrivate__QContainerImplHelper__CutResult int @@ -54,52 +65,36 @@ func newQArrayData_U(h unsafe.Pointer) *QArrayData { return newQArrayData((*C.QArrayData)(h)) } -func (this *QArrayData) Data() unsafe.Pointer { - return C.QArrayData_Data(this.h) +func (this *QArrayData) AllocatedCapacity() int64 { + return (int64)(C.QArrayData_AllocatedCapacity(this.h)) } -func (this *QArrayData) Data2() unsafe.Pointer { - return C.QArrayData_Data2(this.h) +func (this *QArrayData) ConstAllocatedCapacity() int64 { + return (int64)(C.QArrayData_ConstAllocatedCapacity(this.h)) } -func (this *QArrayData) IsMutable() bool { - return (bool)(C.QArrayData_IsMutable(this.h)) +func (this *QArrayData) Ref() bool { + return (bool)(C.QArrayData_Ref(this.h)) } -func (this *QArrayData) DetachCapacity(newSize uint64) uint64 { - return (uint64)(C.QArrayData_DetachCapacity(this.h, (C.size_t)(newSize))) +func (this *QArrayData) Deref() bool { + return (bool)(C.QArrayData_Deref(this.h)) } -func (this *QArrayData) DetachFlags() QArrayData__AllocationOption { - return (QArrayData__AllocationOption)(C.QArrayData_DetachFlags(this.h)) +func (this *QArrayData) IsShared() bool { + return (bool)(C.QArrayData_IsShared(this.h)) } -func (this *QArrayData) CloneFlags() QArrayData__AllocationOption { - return (QArrayData__AllocationOption)(C.QArrayData_CloneFlags(this.h)) +func (this *QArrayData) NeedsDetach() bool { + return (bool)(C.QArrayData_NeedsDetach(this.h)) } -func QArrayData_Allocate(objectSize uint64, alignment uint64, capacity uint64) *QArrayData { - return newQArrayData_U(unsafe.Pointer(C.QArrayData_Allocate((C.size_t)(objectSize), (C.size_t)(alignment), (C.size_t)(capacity)))) +func (this *QArrayData) DetachCapacity(newSize int64) int64 { + return (int64)(C.QArrayData_DetachCapacity(this.h, (C.ptrdiff_t)(newSize))) } -func QArrayData_ReallocateUnaligned(data *QArrayData, objectSize uint64, newCapacity uint64) *QArrayData { - return newQArrayData_U(unsafe.Pointer(C.QArrayData_ReallocateUnaligned(data.cPointer(), (C.size_t)(objectSize), (C.size_t)(newCapacity)))) -} - -func QArrayData_Deallocate(data *QArrayData, objectSize uint64, alignment uint64) { - C.QArrayData_Deallocate(data.cPointer(), (C.size_t)(objectSize), (C.size_t)(alignment)) -} - -func QArrayData_SharedNull() *QArrayData { - return newQArrayData_U(unsafe.Pointer(C.QArrayData_SharedNull())) -} - -func QArrayData_Allocate4(objectSize uint64, alignment uint64, capacity uint64, options QArrayData__AllocationOption) *QArrayData { - return newQArrayData_U(unsafe.Pointer(C.QArrayData_Allocate4((C.size_t)(objectSize), (C.size_t)(alignment), (C.size_t)(capacity), (C.int)(options)))) -} - -func QArrayData_ReallocateUnaligned4(data *QArrayData, objectSize uint64, newCapacity uint64, newOptions QArrayData__AllocationOption) *QArrayData { - return newQArrayData_U(unsafe.Pointer(C.QArrayData_ReallocateUnaligned4(data.cPointer(), (C.size_t)(objectSize), (C.size_t)(newCapacity), (C.int)(newOptions)))) +func QArrayData_Deallocate(data *QArrayData, objectSize int64, alignment int64) { + C.QArrayData_Deallocate(data.cPointer(), (C.ptrdiff_t)(objectSize), (C.ptrdiff_t)(alignment)) } // Delete this object from C++ memory. @@ -138,10 +133,6 @@ func newQtPrivate__QContainerImplHelper_U(h unsafe.Pointer) *QtPrivate__QContain return newQtPrivate__QContainerImplHelper((*C.QtPrivate__QContainerImplHelper)(h)) } -func QtPrivate__QContainerImplHelper_Mid(originalLength int, position *int, length *int) QtPrivate__QContainerImplHelper__CutResult { - return (QtPrivate__QContainerImplHelper__CutResult)(C.QtPrivate__QContainerImplHelper_Mid((C.int)(originalLength), (*C.int)(unsafe.Pointer(position)), (*C.int)(unsafe.Pointer(length)))) -} - // Delete this object from C++ memory. func (this *QtPrivate__QContainerImplHelper) Delete() { C.QtPrivate__QContainerImplHelper_Delete(this.h) diff --git a/qt/gen_qarraydata.h b/qt/gen_qarraydata.h index 5c69e29..2abdc95 100644 --- a/qt/gen_qarraydata.h +++ b/qt/gen_qarraydata.h @@ -25,21 +25,16 @@ typedef struct QArrayData QArrayData; typedef struct QtPrivate__QContainerImplHelper QtPrivate__QContainerImplHelper; #endif -void* QArrayData_Data(QArrayData* self); -const void* QArrayData_Data2(const QArrayData* self); -bool QArrayData_IsMutable(const QArrayData* self); -size_t QArrayData_DetachCapacity(const QArrayData* self, size_t newSize); -int QArrayData_DetachFlags(const QArrayData* self); -int QArrayData_CloneFlags(const QArrayData* self); -QArrayData* QArrayData_Allocate(size_t objectSize, size_t alignment, size_t capacity); -QArrayData* QArrayData_ReallocateUnaligned(QArrayData* data, size_t objectSize, size_t newCapacity); -void QArrayData_Deallocate(QArrayData* data, size_t objectSize, size_t alignment); -QArrayData* QArrayData_SharedNull(); -QArrayData* QArrayData_Allocate4(size_t objectSize, size_t alignment, size_t capacity, int options); -QArrayData* QArrayData_ReallocateUnaligned4(QArrayData* data, size_t objectSize, size_t newCapacity, int newOptions); +ptrdiff_t QArrayData_AllocatedCapacity(QArrayData* self); +ptrdiff_t QArrayData_ConstAllocatedCapacity(const QArrayData* self); +bool QArrayData_Ref(QArrayData* self); +bool QArrayData_Deref(QArrayData* self); +bool QArrayData_IsShared(const QArrayData* self); +bool QArrayData_NeedsDetach(const QArrayData* self); +ptrdiff_t QArrayData_DetachCapacity(const QArrayData* self, ptrdiff_t newSize); +void QArrayData_Deallocate(QArrayData* data, ptrdiff_t objectSize, ptrdiff_t alignment); void QArrayData_Delete(QArrayData* self); -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 ce34b34..d728dd1 100644 --- a/qt/gen_qbasictimer.cpp +++ b/qt/gen_qbasictimer.cpp @@ -4,18 +4,10 @@ #include "gen_qbasictimer.h" #include "_cgo_export.h" -QBasicTimer* QBasicTimer_new(QBasicTimer* param1) { - return new QBasicTimer(*param1); -} - -QBasicTimer* QBasicTimer_new2() { +QBasicTimer* QBasicTimer_new() { return new QBasicTimer(); } -void QBasicTimer_OperatorAssign(QBasicTimer* self, QBasicTimer* param1) { - self->operator=(*param1); -} - void QBasicTimer_Swap(QBasicTimer* self, QBasicTimer* other) { self->swap(*other); } diff --git a/qt/gen_qbasictimer.go b/qt/gen_qbasictimer.go index 8121cf4..b53241c 100644 --- a/qt/gen_qbasictimer.go +++ b/qt/gen_qbasictimer.go @@ -36,21 +36,11 @@ func newQBasicTimer_U(h unsafe.Pointer) *QBasicTimer { } // NewQBasicTimer constructs a new QBasicTimer object. -func NewQBasicTimer(param1 *QBasicTimer) *QBasicTimer { - ret := C.QBasicTimer_new(param1.cPointer()) +func NewQBasicTimer() *QBasicTimer { + ret := C.QBasicTimer_new() return newQBasicTimer(ret) } -// NewQBasicTimer2 constructs a new QBasicTimer object. -func NewQBasicTimer2() *QBasicTimer { - ret := C.QBasicTimer_new2() - return newQBasicTimer(ret) -} - -func (this *QBasicTimer) OperatorAssign(param1 *QBasicTimer) { - C.QBasicTimer_OperatorAssign(this.h, param1.cPointer()) -} - func (this *QBasicTimer) Swap(other *QBasicTimer) { C.QBasicTimer_Swap(this.h, other.cPointer()) } diff --git a/qt/gen_qbasictimer.h b/qt/gen_qbasictimer.h index c103750..c2231f2 100644 --- a/qt/gen_qbasictimer.h +++ b/qt/gen_qbasictimer.h @@ -21,9 +21,7 @@ typedef struct QBasicTimer QBasicTimer; typedef struct QObject QObject; #endif -QBasicTimer* QBasicTimer_new(QBasicTimer* param1); -QBasicTimer* QBasicTimer_new2(); -void QBasicTimer_OperatorAssign(QBasicTimer* self, QBasicTimer* param1); +QBasicTimer* QBasicTimer_new(); void QBasicTimer_Swap(QBasicTimer* self, QBasicTimer* other); bool QBasicTimer_IsActive(const QBasicTimer* self); int QBasicTimer_TimerId(const QBasicTimer* self); diff --git a/qt/gen_qbindingstorage.cpp b/qt/gen_qbindingstorage.cpp new file mode 100644 index 0000000..5739ac9 --- /dev/null +++ b/qt/gen_qbindingstorage.cpp @@ -0,0 +1,31 @@ +#include +#include +#include +#include "qbindingstorage.h" +#include "gen_qbindingstorage.h" +#include "_cgo_export.h" + +void QBindingStatus_Delete(QBindingStatus* self) { + delete self; +} + +QBindingStorage* QBindingStorage_new() { + return new QBindingStorage(); +} + +bool QBindingStorage_IsEmpty(QBindingStorage* self) { + return self->isEmpty(); +} + +bool QBindingStorage_IsValid(const QBindingStorage* self) { + return self->isValid(); +} + +void QBindingStorage_RegisterDependency(const QBindingStorage* self, QUntypedPropertyData* data) { + self->registerDependency(data); +} + +void QBindingStorage_Delete(QBindingStorage* self) { + delete self; +} + diff --git a/qt/gen_qbindingstorage.go b/qt/gen_qbindingstorage.go new file mode 100644 index 0000000..39a5189 --- /dev/null +++ b/qt/gen_qbindingstorage.go @@ -0,0 +1,104 @@ +package qt + +/* + +#include "gen_qbindingstorage.h" +#include + +*/ +import "C" + +import ( + "runtime" + "unsafe" +) + +type QBindingStatus struct { + h *C.QBindingStatus +} + +func (this *QBindingStatus) cPointer() *C.QBindingStatus { + if this == nil { + return nil + } + return this.h +} + +func newQBindingStatus(h *C.QBindingStatus) *QBindingStatus { + if h == nil { + return nil + } + return &QBindingStatus{h: h} +} + +func newQBindingStatus_U(h unsafe.Pointer) *QBindingStatus { + return newQBindingStatus((*C.QBindingStatus)(h)) +} + +// Delete this object from C++ memory. +func (this *QBindingStatus) Delete() { + C.QBindingStatus_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QBindingStatus) GoGC() { + runtime.SetFinalizer(this, func(this *QBindingStatus) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + +type QBindingStorage struct { + h *C.QBindingStorage +} + +func (this *QBindingStorage) cPointer() *C.QBindingStorage { + if this == nil { + return nil + } + return this.h +} + +func newQBindingStorage(h *C.QBindingStorage) *QBindingStorage { + if h == nil { + return nil + } + return &QBindingStorage{h: h} +} + +func newQBindingStorage_U(h unsafe.Pointer) *QBindingStorage { + return newQBindingStorage((*C.QBindingStorage)(h)) +} + +// NewQBindingStorage constructs a new QBindingStorage object. +func NewQBindingStorage() *QBindingStorage { + ret := C.QBindingStorage_new() + return newQBindingStorage(ret) +} + +func (this *QBindingStorage) IsEmpty() bool { + return (bool)(C.QBindingStorage_IsEmpty(this.h)) +} + +func (this *QBindingStorage) IsValid() bool { + return (bool)(C.QBindingStorage_IsValid(this.h)) +} + +func (this *QBindingStorage) RegisterDependency(data *QUntypedPropertyData) { + C.QBindingStorage_RegisterDependency(this.h, data.cPointer()) +} + +// Delete this object from C++ memory. +func (this *QBindingStorage) Delete() { + C.QBindingStorage_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QBindingStorage) GoGC() { + runtime.SetFinalizer(this, func(this *QBindingStorage) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} diff --git a/qt/gen_qbindingstorage.h b/qt/gen_qbindingstorage.h new file mode 100644 index 0000000..ba97cf0 --- /dev/null +++ b/qt/gen_qbindingstorage.h @@ -0,0 +1,38 @@ +#ifndef GEN_QBINDINGSTORAGE_H +#define GEN_QBINDINGSTORAGE_H + +#include +#include +#include + +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + +#include "binding.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +class QBindingStatus; +class QBindingStorage; +class QUntypedPropertyData; +#else +typedef struct QBindingStatus QBindingStatus; +typedef struct QBindingStorage QBindingStorage; +typedef struct QUntypedPropertyData QUntypedPropertyData; +#endif + +void QBindingStatus_Delete(QBindingStatus* self); + +QBindingStorage* QBindingStorage_new(); +bool QBindingStorage_IsEmpty(QBindingStorage* self); +bool QBindingStorage_IsValid(const QBindingStorage* self); +void QBindingStorage_RegisterDependency(const QBindingStorage* self, QUntypedPropertyData* data); +void QBindingStorage_Delete(QBindingStorage* self); + +#ifdef __cplusplus +} /* extern C */ +#endif + +#endif diff --git a/qt/gen_qbitarray.cpp b/qt/gen_qbitarray.cpp index 7c8dc90..c867832 100644 --- a/qt/gen_qbitarray.cpp +++ b/qt/gen_qbitarray.cpp @@ -8,16 +8,16 @@ QBitArray* QBitArray_new() { return new QBitArray(); } -QBitArray* QBitArray_new2(int size) { - return new QBitArray(static_cast(size)); +QBitArray* QBitArray_new2(ptrdiff_t size) { + return new QBitArray((qsizetype)(size)); } QBitArray* QBitArray_new3(QBitArray* other) { return new QBitArray(*other); } -QBitArray* QBitArray_new4(int size, bool val) { - return new QBitArray(static_cast(size), val); +QBitArray* QBitArray_new4(ptrdiff_t size, bool val) { + return new QBitArray((qsizetype)(size), val); } void QBitArray_OperatorAssign(QBitArray* self, QBitArray* other) { @@ -28,16 +28,19 @@ void QBitArray_Swap(QBitArray* self, QBitArray* other) { self->swap(*other); } -int QBitArray_Size(const QBitArray* self) { - return self->size(); +ptrdiff_t QBitArray_Size(const QBitArray* self) { + qsizetype _ret = self->size(); + return static_cast(_ret); } -int QBitArray_Count(const QBitArray* self) { - return self->count(); +ptrdiff_t QBitArray_Count(const QBitArray* self) { + qsizetype _ret = self->count(); + return static_cast(_ret); } -int QBitArray_CountWithOn(const QBitArray* self, bool on) { - return self->count(on); +ptrdiff_t QBitArray_CountWithOn(const QBitArray* self, bool on) { + qsizetype _ret = self->count(on); + return static_cast(_ret); } bool QBitArray_IsEmpty(const QBitArray* self) { @@ -48,8 +51,8 @@ bool QBitArray_IsNull(const QBitArray* self) { return self->isNull(); } -void QBitArray_Resize(QBitArray* self, int size) { - self->resize(static_cast(size)); +void QBitArray_Resize(QBitArray* self, ptrdiff_t size) { + self->resize((qsizetype)(size)); } void QBitArray_Detach(QBitArray* self) { @@ -64,44 +67,36 @@ void QBitArray_Clear(QBitArray* self) { self->clear(); } -bool QBitArray_TestBit(const QBitArray* self, int i) { - return self->testBit(static_cast(i)); +bool QBitArray_TestBit(const QBitArray* self, ptrdiff_t i) { + return self->testBit((qsizetype)(i)); } -void QBitArray_SetBit(QBitArray* self, int i) { - self->setBit(static_cast(i)); +void QBitArray_SetBit(QBitArray* self, ptrdiff_t i) { + self->setBit((qsizetype)(i)); } -void QBitArray_SetBit2(QBitArray* self, int i, bool val) { - self->setBit(static_cast(i), val); +void QBitArray_SetBit2(QBitArray* self, ptrdiff_t i, bool val) { + self->setBit((qsizetype)(i), val); } -void QBitArray_ClearBit(QBitArray* self, int i) { - self->clearBit(static_cast(i)); +void QBitArray_ClearBit(QBitArray* self, ptrdiff_t i) { + self->clearBit((qsizetype)(i)); } -bool QBitArray_ToggleBit(QBitArray* self, int i) { - return self->toggleBit(static_cast(i)); +bool QBitArray_ToggleBit(QBitArray* self, ptrdiff_t i) { + return self->toggleBit((qsizetype)(i)); } -bool QBitArray_At(const QBitArray* self, int i) { - return self->at(static_cast(i)); +bool QBitArray_At(const QBitArray* self, ptrdiff_t i) { + return self->at((qsizetype)(i)); } -QBitRef* QBitArray_OperatorSubscript(QBitArray* self, int i) { - return new QBitRef(self->operator[](static_cast(i))); +QBitRef* QBitArray_OperatorSubscript(QBitArray* self, ptrdiff_t i) { + return new QBitRef(self->operator[]((qsizetype)(i))); } -bool QBitArray_OperatorSubscriptWithInt(const QBitArray* self, int i) { - return self->operator[](static_cast(i)); -} - -QBitRef* QBitArray_OperatorSubscriptWithUint(QBitArray* self, unsigned int i) { - return new QBitRef(self->operator[](static_cast(i))); -} - -bool QBitArray_OperatorSubscript2(const QBitArray* self, unsigned int i) { - return self->operator[](static_cast(i)); +bool QBitArray_OperatorSubscriptWithQsizetype(const QBitArray* self, ptrdiff_t i) { + return self->operator[]((qsizetype)(i)); } void QBitArray_OperatorBitwiseAndAssign(QBitArray* self, QBitArray* param1) { @@ -132,12 +127,12 @@ bool QBitArray_Fill(QBitArray* self, bool val) { return self->fill(val); } -void QBitArray_Fill2(QBitArray* self, bool val, int first, int last) { - self->fill(val, static_cast(first), static_cast(last)); +void QBitArray_Fill2(QBitArray* self, bool val, ptrdiff_t first, ptrdiff_t last) { + self->fill(val, (qsizetype)(first), (qsizetype)(last)); } -void QBitArray_Truncate(QBitArray* self, int pos) { - self->truncate(static_cast(pos)); +void QBitArray_Truncate(QBitArray* self, ptrdiff_t pos) { + self->truncate((qsizetype)(pos)); } const char* QBitArray_Bits(const QBitArray* self) { @@ -148,8 +143,18 @@ QBitArray* QBitArray_FromBits(const char* data, ptrdiff_t lenVal) { return new QBitArray(QBitArray::fromBits(data, (qsizetype)(lenVal))); } -bool QBitArray_Fill22(QBitArray* self, bool val, int size) { - return self->fill(val, static_cast(size)); +unsigned int QBitArray_ToUInt32(const QBitArray* self, int endianness) { + quint32 _ret = self->toUInt32(static_cast(endianness)); + return static_cast(_ret); +} + +bool QBitArray_Fill22(QBitArray* self, bool val, ptrdiff_t size) { + return self->fill(val, (qsizetype)(size)); +} + +unsigned int QBitArray_ToUInt322(const QBitArray* self, int endianness, bool* ok) { + quint32 _ret = self->toUInt32(static_cast(endianness), ok); + return static_cast(_ret); } void QBitArray_Delete(QBitArray* self) { diff --git a/qt/gen_qbitarray.go b/qt/gen_qbitarray.go index 742c631..24a2d87 100644 --- a/qt/gen_qbitarray.go +++ b/qt/gen_qbitarray.go @@ -42,8 +42,8 @@ func NewQBitArray() *QBitArray { } // NewQBitArray2 constructs a new QBitArray object. -func NewQBitArray2(size int) *QBitArray { - ret := C.QBitArray_new2((C.int)(size)) +func NewQBitArray2(size int64) *QBitArray { + ret := C.QBitArray_new2((C.ptrdiff_t)(size)) return newQBitArray(ret) } @@ -54,8 +54,8 @@ func NewQBitArray3(other *QBitArray) *QBitArray { } // NewQBitArray4 constructs a new QBitArray object. -func NewQBitArray4(size int, val bool) *QBitArray { - ret := C.QBitArray_new4((C.int)(size), (C.bool)(val)) +func NewQBitArray4(size int64, val bool) *QBitArray { + ret := C.QBitArray_new4((C.ptrdiff_t)(size), (C.bool)(val)) return newQBitArray(ret) } @@ -67,16 +67,16 @@ func (this *QBitArray) Swap(other *QBitArray) { C.QBitArray_Swap(this.h, other.cPointer()) } -func (this *QBitArray) Size() int { - return (int)(C.QBitArray_Size(this.h)) +func (this *QBitArray) Size() int64 { + return (int64)(C.QBitArray_Size(this.h)) } -func (this *QBitArray) Count() int { - return (int)(C.QBitArray_Count(this.h)) +func (this *QBitArray) Count() int64 { + return (int64)(C.QBitArray_Count(this.h)) } -func (this *QBitArray) CountWithOn(on bool) int { - return (int)(C.QBitArray_CountWithOn(this.h, (C.bool)(on))) +func (this *QBitArray) CountWithOn(on bool) int64 { + return (int64)(C.QBitArray_CountWithOn(this.h, (C.bool)(on))) } func (this *QBitArray) IsEmpty() bool { @@ -87,8 +87,8 @@ func (this *QBitArray) IsNull() bool { return (bool)(C.QBitArray_IsNull(this.h)) } -func (this *QBitArray) Resize(size int) { - C.QBitArray_Resize(this.h, (C.int)(size)) +func (this *QBitArray) Resize(size int64) { + C.QBitArray_Resize(this.h, (C.ptrdiff_t)(size)) } func (this *QBitArray) Detach() { @@ -103,50 +103,39 @@ func (this *QBitArray) Clear() { C.QBitArray_Clear(this.h) } -func (this *QBitArray) TestBit(i int) bool { - return (bool)(C.QBitArray_TestBit(this.h, (C.int)(i))) +func (this *QBitArray) TestBit(i int64) bool { + return (bool)(C.QBitArray_TestBit(this.h, (C.ptrdiff_t)(i))) } -func (this *QBitArray) SetBit(i int) { - C.QBitArray_SetBit(this.h, (C.int)(i)) +func (this *QBitArray) SetBit(i int64) { + C.QBitArray_SetBit(this.h, (C.ptrdiff_t)(i)) } -func (this *QBitArray) SetBit2(i int, val bool) { - C.QBitArray_SetBit2(this.h, (C.int)(i), (C.bool)(val)) +func (this *QBitArray) SetBit2(i int64, val bool) { + C.QBitArray_SetBit2(this.h, (C.ptrdiff_t)(i), (C.bool)(val)) } -func (this *QBitArray) ClearBit(i int) { - C.QBitArray_ClearBit(this.h, (C.int)(i)) +func (this *QBitArray) ClearBit(i int64) { + C.QBitArray_ClearBit(this.h, (C.ptrdiff_t)(i)) } -func (this *QBitArray) ToggleBit(i int) bool { - return (bool)(C.QBitArray_ToggleBit(this.h, (C.int)(i))) +func (this *QBitArray) ToggleBit(i int64) bool { + return (bool)(C.QBitArray_ToggleBit(this.h, (C.ptrdiff_t)(i))) } -func (this *QBitArray) At(i int) bool { - return (bool)(C.QBitArray_At(this.h, (C.int)(i))) +func (this *QBitArray) At(i int64) bool { + return (bool)(C.QBitArray_At(this.h, (C.ptrdiff_t)(i))) } -func (this *QBitArray) OperatorSubscript(i int) *QBitRef { - _ret := C.QBitArray_OperatorSubscript(this.h, (C.int)(i)) +func (this *QBitArray) OperatorSubscript(i int64) *QBitRef { + _ret := C.QBitArray_OperatorSubscript(this.h, (C.ptrdiff_t)(i)) _goptr := newQBitRef(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QBitArray) OperatorSubscriptWithInt(i int) bool { - return (bool)(C.QBitArray_OperatorSubscriptWithInt(this.h, (C.int)(i))) -} - -func (this *QBitArray) OperatorSubscriptWithUint(i uint) *QBitRef { - _ret := C.QBitArray_OperatorSubscriptWithUint(this.h, (C.uint)(i)) - _goptr := newQBitRef(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QBitArray) OperatorSubscript2(i uint) bool { - return (bool)(C.QBitArray_OperatorSubscript2(this.h, (C.uint)(i))) +func (this *QBitArray) OperatorSubscriptWithQsizetype(i int64) bool { + return (bool)(C.QBitArray_OperatorSubscriptWithQsizetype(this.h, (C.ptrdiff_t)(i))) } func (this *QBitArray) OperatorBitwiseAndAssign(param1 *QBitArray) { @@ -180,12 +169,12 @@ func (this *QBitArray) Fill(val bool) bool { return (bool)(C.QBitArray_Fill(this.h, (C.bool)(val))) } -func (this *QBitArray) Fill2(val bool, first int, last int) { - C.QBitArray_Fill2(this.h, (C.bool)(val), (C.int)(first), (C.int)(last)) +func (this *QBitArray) Fill2(val bool, first int64, last int64) { + C.QBitArray_Fill2(this.h, (C.bool)(val), (C.ptrdiff_t)(first), (C.ptrdiff_t)(last)) } -func (this *QBitArray) Truncate(pos int) { - C.QBitArray_Truncate(this.h, (C.int)(pos)) +func (this *QBitArray) Truncate(pos int64) { + C.QBitArray_Truncate(this.h, (C.ptrdiff_t)(pos)) } func (this *QBitArray) Bits() unsafe.Pointer { @@ -202,8 +191,16 @@ func QBitArray_FromBits(data string, lenVal int64) *QBitArray { return _goptr } -func (this *QBitArray) Fill22(val bool, size int) bool { - return (bool)(C.QBitArray_Fill22(this.h, (C.bool)(val), (C.int)(size))) +func (this *QBitArray) ToUInt32(endianness QSysInfo__Endian) uint { + return (uint)(C.QBitArray_ToUInt32(this.h, (C.int)(endianness))) +} + +func (this *QBitArray) Fill22(val bool, size int64) bool { + return (bool)(C.QBitArray_Fill22(this.h, (C.bool)(val), (C.ptrdiff_t)(size))) +} + +func (this *QBitArray) ToUInt322(endianness QSysInfo__Endian, ok *bool) uint { + return (uint)(C.QBitArray_ToUInt322(this.h, (C.int)(endianness), (*C.bool)(unsafe.Pointer(ok)))) } // Delete this object from C++ memory. diff --git a/qt/gen_qbitarray.h b/qt/gen_qbitarray.h index c6b79fc..64194b1 100644 --- a/qt/gen_qbitarray.h +++ b/qt/gen_qbitarray.h @@ -22,30 +22,28 @@ typedef struct QBitRef QBitRef; #endif QBitArray* QBitArray_new(); -QBitArray* QBitArray_new2(int size); +QBitArray* QBitArray_new2(ptrdiff_t size); QBitArray* QBitArray_new3(QBitArray* other); -QBitArray* QBitArray_new4(int size, bool val); +QBitArray* QBitArray_new4(ptrdiff_t size, bool val); void QBitArray_OperatorAssign(QBitArray* self, QBitArray* other); void QBitArray_Swap(QBitArray* self, QBitArray* other); -int QBitArray_Size(const QBitArray* self); -int QBitArray_Count(const QBitArray* self); -int QBitArray_CountWithOn(const QBitArray* self, bool on); +ptrdiff_t QBitArray_Size(const QBitArray* self); +ptrdiff_t QBitArray_Count(const QBitArray* self); +ptrdiff_t QBitArray_CountWithOn(const QBitArray* self, bool on); bool QBitArray_IsEmpty(const QBitArray* self); bool QBitArray_IsNull(const QBitArray* self); -void QBitArray_Resize(QBitArray* self, int size); +void QBitArray_Resize(QBitArray* self, ptrdiff_t size); void QBitArray_Detach(QBitArray* self); bool QBitArray_IsDetached(const QBitArray* self); void QBitArray_Clear(QBitArray* self); -bool QBitArray_TestBit(const QBitArray* self, int i); -void QBitArray_SetBit(QBitArray* self, int i); -void QBitArray_SetBit2(QBitArray* self, int i, bool val); -void QBitArray_ClearBit(QBitArray* self, int i); -bool QBitArray_ToggleBit(QBitArray* self, int i); -bool QBitArray_At(const QBitArray* self, int i); -QBitRef* QBitArray_OperatorSubscript(QBitArray* self, int i); -bool QBitArray_OperatorSubscriptWithInt(const QBitArray* self, int i); -QBitRef* QBitArray_OperatorSubscriptWithUint(QBitArray* self, unsigned int i); -bool QBitArray_OperatorSubscript2(const QBitArray* self, unsigned int i); +bool QBitArray_TestBit(const QBitArray* self, ptrdiff_t i); +void QBitArray_SetBit(QBitArray* self, ptrdiff_t i); +void QBitArray_SetBit2(QBitArray* self, ptrdiff_t i, bool val); +void QBitArray_ClearBit(QBitArray* self, ptrdiff_t i); +bool QBitArray_ToggleBit(QBitArray* self, ptrdiff_t i); +bool QBitArray_At(const QBitArray* self, ptrdiff_t i); +QBitRef* QBitArray_OperatorSubscript(QBitArray* self, ptrdiff_t i); +bool QBitArray_OperatorSubscriptWithQsizetype(const QBitArray* self, ptrdiff_t i); void QBitArray_OperatorBitwiseAndAssign(QBitArray* self, QBitArray* param1); void QBitArray_OperatorBitwiseOrAssign(QBitArray* self, QBitArray* param1); void QBitArray_OperatorBitwiseNotAssign(QBitArray* self, QBitArray* param1); @@ -53,11 +51,13 @@ QBitArray* QBitArray_OperatorBitwiseXor(const QBitArray* self); bool QBitArray_OperatorEqual(const QBitArray* self, QBitArray* other); bool QBitArray_OperatorNotEqual(const QBitArray* self, QBitArray* other); bool QBitArray_Fill(QBitArray* self, bool val); -void QBitArray_Fill2(QBitArray* self, bool val, int first, int last); -void QBitArray_Truncate(QBitArray* self, int pos); +void QBitArray_Fill2(QBitArray* self, bool val, ptrdiff_t first, ptrdiff_t last); +void QBitArray_Truncate(QBitArray* self, ptrdiff_t pos); const char* QBitArray_Bits(const QBitArray* self); QBitArray* QBitArray_FromBits(const char* data, ptrdiff_t lenVal); -bool QBitArray_Fill22(QBitArray* self, bool val, int size); +unsigned int QBitArray_ToUInt32(const QBitArray* self, int endianness); +bool QBitArray_Fill22(QBitArray* self, bool val, ptrdiff_t size); +unsigned int QBitArray_ToUInt322(const QBitArray* self, int endianness, bool* ok); void QBitArray_Delete(QBitArray* self); QBitRef* QBitRef_new(QBitRef* param1); diff --git a/qt/gen_qbitmap.cpp b/qt/gen_qbitmap.cpp index 0c82676..cb7cb7f 100644 --- a/qt/gen_qbitmap.cpp +++ b/qt/gen_qbitmap.cpp @@ -1,6 +1,5 @@ #include #include -#include #include #include #include @@ -32,8 +31,8 @@ QBitmap* QBitmap_new5(struct miqt_string* fileName) { return new QBitmap(fileName_QString); } -QBitmap* QBitmap_new6(QBitmap* other) { - return new QBitmap(*other); +QBitmap* QBitmap_new6(QBitmap* param1) { + return new QBitmap(*param1); } QBitmap* QBitmap_new7(struct miqt_string* fileName, const char* format) { @@ -41,11 +40,7 @@ QBitmap* QBitmap_new7(struct miqt_string* fileName, const char* format) { return new QBitmap(fileName_QString, format); } -void QBitmap_OperatorAssign(QBitmap* self, QBitmap* other) { - self->operator=(*other); -} - -void QBitmap_OperatorAssignWithQPixmap(QBitmap* self, QPixmap* param1) { +void QBitmap_OperatorAssign(QBitmap* self, QPixmap* param1) { self->operator=(*param1); } @@ -65,14 +60,18 @@ QBitmap* QBitmap_FromData(QSize* size, const unsigned char* bits) { return new QBitmap(QBitmap::fromData(*size, static_cast(bits))); } -QBitmap* QBitmap_Transformed(const QBitmap* self, QMatrix* param1) { - return new QBitmap(self->transformed(*param1)); +QBitmap* QBitmap_FromPixmap(QPixmap* pixmap) { + return new QBitmap(QBitmap::fromPixmap(*pixmap)); } -QBitmap* QBitmap_TransformedWithMatrix(const QBitmap* self, QTransform* matrix) { +QBitmap* QBitmap_Transformed(const QBitmap* self, QTransform* matrix) { return new QBitmap(self->transformed(*matrix)); } +void QBitmap_OperatorAssignWithQBitmap(QBitmap* self, QBitmap* param1) { + self->operator=(*param1); +} + QBitmap* QBitmap_FromImage2(QImage* image, int flags) { return new QBitmap(QBitmap::fromImage(*image, static_cast(flags))); } diff --git a/qt/gen_qbitmap.go b/qt/gen_qbitmap.go index 890d0c5..30c34fe 100644 --- a/qt/gen_qbitmap.go +++ b/qt/gen_qbitmap.go @@ -69,8 +69,8 @@ func NewQBitmap5(fileName string) *QBitmap { } // NewQBitmap6 constructs a new QBitmap object. -func NewQBitmap6(other *QBitmap) *QBitmap { - ret := C.QBitmap_new6(other.cPointer()) +func NewQBitmap6(param1 *QBitmap) *QBitmap { + ret := C.QBitmap_new6(param1.cPointer()) return newQBitmap(ret) } @@ -84,12 +84,8 @@ func NewQBitmap7(fileName string, format string) *QBitmap { return newQBitmap(ret) } -func (this *QBitmap) OperatorAssign(other *QBitmap) { - C.QBitmap_OperatorAssign(this.h, other.cPointer()) -} - -func (this *QBitmap) OperatorAssignWithQPixmap(param1 *QPixmap) { - C.QBitmap_OperatorAssignWithQPixmap(this.h, param1.cPointer()) +func (this *QBitmap) OperatorAssign(param1 *QPixmap) { + C.QBitmap_OperatorAssign(this.h, param1.cPointer()) } func (this *QBitmap) Swap(other *QBitmap) { @@ -114,20 +110,24 @@ func QBitmap_FromData(size *QSize, bits *byte) *QBitmap { return _goptr } -func (this *QBitmap) Transformed(param1 *QMatrix) *QBitmap { - _ret := C.QBitmap_Transformed(this.h, param1.cPointer()) +func QBitmap_FromPixmap(pixmap *QPixmap) *QBitmap { + _ret := C.QBitmap_FromPixmap(pixmap.cPointer()) _goptr := newQBitmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QBitmap) TransformedWithMatrix(matrix *QTransform) *QBitmap { - _ret := C.QBitmap_TransformedWithMatrix(this.h, matrix.cPointer()) +func (this *QBitmap) Transformed(matrix *QTransform) *QBitmap { + _ret := C.QBitmap_Transformed(this.h, matrix.cPointer()) _goptr := newQBitmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } +func (this *QBitmap) OperatorAssignWithQBitmap(param1 *QBitmap) { + C.QBitmap_OperatorAssignWithQBitmap(this.h, param1.cPointer()) +} + func QBitmap_FromImage2(image *QImage, flags ImageConversionFlag) *QBitmap { _ret := C.QBitmap_FromImage2(image.cPointer(), (C.int)(flags)) _goptr := newQBitmap(_ret) diff --git a/qt/gen_qbitmap.h b/qt/gen_qbitmap.h index 2ef28ea..755bc40 100644 --- a/qt/gen_qbitmap.h +++ b/qt/gen_qbitmap.h @@ -16,14 +16,12 @@ extern "C" { #ifdef __cplusplus class QBitmap; class QImage; -class QMatrix; class QPixmap; class QSize; class QTransform; #else typedef struct QBitmap QBitmap; typedef struct QImage QImage; -typedef struct QMatrix QMatrix; typedef struct QPixmap QPixmap; typedef struct QSize QSize; typedef struct QTransform QTransform; @@ -34,16 +32,16 @@ QBitmap* QBitmap_new2(QPixmap* param1); QBitmap* QBitmap_new3(int w, int h); QBitmap* QBitmap_new4(QSize* param1); QBitmap* QBitmap_new5(struct miqt_string* fileName); -QBitmap* QBitmap_new6(QBitmap* other); +QBitmap* QBitmap_new6(QBitmap* param1); QBitmap* QBitmap_new7(struct miqt_string* fileName, const char* format); -void QBitmap_OperatorAssign(QBitmap* self, QBitmap* other); -void QBitmap_OperatorAssignWithQPixmap(QBitmap* self, QPixmap* param1); +void QBitmap_OperatorAssign(QBitmap* self, QPixmap* param1); void QBitmap_Swap(QBitmap* self, QBitmap* other); void QBitmap_Clear(QBitmap* self); QBitmap* QBitmap_FromImage(QImage* image); 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_FromPixmap(QPixmap* pixmap); +QBitmap* QBitmap_Transformed(const QBitmap* self, QTransform* matrix); +void QBitmap_OperatorAssignWithQBitmap(QBitmap* self, QBitmap* param1); QBitmap* QBitmap_FromImage2(QImage* image, int flags); QBitmap* QBitmap_FromData3(QSize* size, const unsigned char* bits, int monoFormat); void QBitmap_Delete(QBitmap* self); diff --git a/qt/gen_qboxlayout.cpp b/qt/gen_qboxlayout.cpp index cb4a448..a138a50 100644 --- a/qt/gen_qboxlayout.cpp +++ b/qt/gen_qboxlayout.cpp @@ -38,13 +38,6 @@ struct miqt_string* QBoxLayout_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QBoxLayout_TrUtf8(const char* s) { - QString _ret = QBoxLayout::trUtf8(s); - // 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()); -} - int QBoxLayout_Direction(const QBoxLayout* self) { QBoxLayout::Direction _ret = self->direction(); return static_cast(_ret); @@ -193,20 +186,6 @@ struct miqt_string* QBoxLayout_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QBoxLayout_TrUtf82(const char* s, const char* c) { - QString _ret = QBoxLayout::trUtf8(s, c); - // 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* QBoxLayout_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QBoxLayout::trUtf8(s, c, static_cast(n)); - // 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 QBoxLayout_AddStretch1(QBoxLayout* self, int stretch) { self->addStretch(static_cast(stretch)); } @@ -266,13 +245,6 @@ struct miqt_string* QHBoxLayout_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QHBoxLayout_TrUtf8(const char* s) { - QString _ret = QHBoxLayout::trUtf8(s); - // 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* QHBoxLayout_Tr2(const char* s, const char* c) { QString _ret = QHBoxLayout::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -287,20 +259,6 @@ struct miqt_string* QHBoxLayout_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QHBoxLayout_TrUtf82(const char* s, const char* c) { - QString _ret = QHBoxLayout::trUtf8(s, c); - // 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* QHBoxLayout_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QHBoxLayout::trUtf8(s, c, static_cast(n)); - // 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 QHBoxLayout_Delete(QHBoxLayout* self) { delete self; } @@ -328,13 +286,6 @@ struct miqt_string* QVBoxLayout_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QVBoxLayout_TrUtf8(const char* s) { - QString _ret = QVBoxLayout::trUtf8(s); - // 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* QVBoxLayout_Tr2(const char* s, const char* c) { QString _ret = QVBoxLayout::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -349,20 +300,6 @@ struct miqt_string* QVBoxLayout_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QVBoxLayout_TrUtf82(const char* s, const char* c) { - QString _ret = QVBoxLayout::trUtf8(s, c); - // 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* QVBoxLayout_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QVBoxLayout::trUtf8(s, c, static_cast(n)); - // 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 QVBoxLayout_Delete(QVBoxLayout* self) { delete self; } diff --git a/qt/gen_qboxlayout.go b/qt/gen_qboxlayout.go index f0955e0..5f5c3da 100644 --- a/qt/gen_qboxlayout.go +++ b/qt/gen_qboxlayout.go @@ -78,15 +78,6 @@ func QBoxLayout_Tr(s string) string { return _ret } -func QBoxLayout_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QBoxLayout_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QBoxLayout) Direction() QBoxLayout__Direction { return (QBoxLayout__Direction)(C.QBoxLayout_Direction(this.h)) } @@ -250,28 +241,6 @@ func QBoxLayout_Tr3(s string, c string, n int) string { return _ret } -func QBoxLayout_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QBoxLayout_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QBoxLayout_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QBoxLayout_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QBoxLayout) AddStretch1(stretch int) { C.QBoxLayout_AddStretch1(this.h, (C.int)(stretch)) } @@ -372,15 +341,6 @@ func QHBoxLayout_Tr(s string) string { return _ret } -func QHBoxLayout_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QHBoxLayout_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func QHBoxLayout_Tr2(s string, c string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) @@ -403,28 +363,6 @@ func QHBoxLayout_Tr3(s string, c string, n int) string { return _ret } -func QHBoxLayout_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QHBoxLayout_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QHBoxLayout_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QHBoxLayout_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QHBoxLayout) Delete() { C.QHBoxLayout_Delete(this.h) @@ -493,15 +431,6 @@ func QVBoxLayout_Tr(s string) string { return _ret } -func QVBoxLayout_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QVBoxLayout_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func QVBoxLayout_Tr2(s string, c string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) @@ -524,28 +453,6 @@ func QVBoxLayout_Tr3(s string, c string, n int) string { return _ret } -func QVBoxLayout_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QVBoxLayout_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QVBoxLayout_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QVBoxLayout_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QVBoxLayout) Delete() { C.QVBoxLayout_Delete(this.h) diff --git a/qt/gen_qboxlayout.h b/qt/gen_qboxlayout.h index fbcaf60..7b8e508 100644 --- a/qt/gen_qboxlayout.h +++ b/qt/gen_qboxlayout.h @@ -42,7 +42,6 @@ QBoxLayout* QBoxLayout_new2(int param1, QWidget* parent); QMetaObject* QBoxLayout_MetaObject(const QBoxLayout* self); void* QBoxLayout_Metacast(QBoxLayout* self, const char* param1); struct miqt_string* QBoxLayout_Tr(const char* s); -struct miqt_string* QBoxLayout_TrUtf8(const char* s); int QBoxLayout_Direction(const QBoxLayout* self); void QBoxLayout_SetDirection(QBoxLayout* self, int direction); void QBoxLayout_AddSpacing(QBoxLayout* self, int size); @@ -78,8 +77,6 @@ int QBoxLayout_Count(const QBoxLayout* self); void QBoxLayout_SetGeometry(QBoxLayout* self, QRect* geometry); struct miqt_string* QBoxLayout_Tr2(const char* s, const char* c); struct miqt_string* QBoxLayout_Tr3(const char* s, const char* c, int n); -struct miqt_string* QBoxLayout_TrUtf82(const char* s, const char* c); -struct miqt_string* QBoxLayout_TrUtf83(const char* s, const char* c, int n); void QBoxLayout_AddStretch1(QBoxLayout* self, int stretch); void QBoxLayout_AddWidget2(QBoxLayout* self, QWidget* param1, int stretch); void QBoxLayout_AddWidget3(QBoxLayout* self, QWidget* param1, int stretch, int alignment); @@ -95,11 +92,8 @@ QHBoxLayout* QHBoxLayout_new2(QWidget* parent); QMetaObject* QHBoxLayout_MetaObject(const QHBoxLayout* self); void* QHBoxLayout_Metacast(QHBoxLayout* self, const char* param1); struct miqt_string* QHBoxLayout_Tr(const char* s); -struct miqt_string* QHBoxLayout_TrUtf8(const char* s); struct miqt_string* QHBoxLayout_Tr2(const char* s, const char* c); struct miqt_string* QHBoxLayout_Tr3(const char* s, const char* c, int n); -struct miqt_string* QHBoxLayout_TrUtf82(const char* s, const char* c); -struct miqt_string* QHBoxLayout_TrUtf83(const char* s, const char* c, int n); void QHBoxLayout_Delete(QHBoxLayout* self); QVBoxLayout* QVBoxLayout_new(); @@ -107,11 +101,8 @@ QVBoxLayout* QVBoxLayout_new2(QWidget* parent); QMetaObject* QVBoxLayout_MetaObject(const QVBoxLayout* self); void* QVBoxLayout_Metacast(QVBoxLayout* self, const char* param1); struct miqt_string* QVBoxLayout_Tr(const char* s); -struct miqt_string* QVBoxLayout_TrUtf8(const char* s); struct miqt_string* QVBoxLayout_Tr2(const char* s, const char* c); struct miqt_string* QVBoxLayout_Tr3(const char* s, const char* c, int n); -struct miqt_string* QVBoxLayout_TrUtf82(const char* s, const char* c); -struct miqt_string* QVBoxLayout_TrUtf83(const char* s, const char* c, int n); void QVBoxLayout_Delete(QVBoxLayout* self); #ifdef __cplusplus diff --git a/qt/gen_qbrush.cpp b/qt/gen_qbrush.cpp index 6d431d8..1ab735a 100644 --- a/qt/gen_qbrush.cpp +++ b/qt/gen_qbrush.cpp @@ -6,7 +6,6 @@ #define WORKAROUND_INNER_CLASS_DEFINITION_QGradient__QGradientData #include #include -#include #include #include #include @@ -80,16 +79,6 @@ void QBrush_SetStyle(QBrush* self, int style) { self->setStyle(static_cast(style)); } -QMatrix* QBrush_Matrix(const QBrush* self) { - const QMatrix& _ret = self->matrix(); - // Cast returned reference into pointer - return const_cast(&_ret); -} - -void QBrush_SetMatrix(QBrush* self, QMatrix* mat) { - self->setMatrix(*mat); -} - QTransform* QBrush_Transform(const QBrush* self) { return new QTransform(self->transform()); } @@ -400,10 +389,6 @@ 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 33fe7f3..a625e45 100644 --- a/qt/gen_qbrush.go +++ b/qt/gen_qbrush.go @@ -330,14 +330,6 @@ func (this *QBrush) SetStyle(style BrushStyle) { C.QBrush_SetStyle(this.h, (C.int)(style)) } -func (this *QBrush) Matrix() *QMatrix { - return newQMatrix_U(unsafe.Pointer(C.QBrush_Matrix(this.h))) -} - -func (this *QBrush) SetMatrix(mat *QMatrix) { - C.QBrush_SetMatrix(this.h, mat.cPointer()) -} - func (this *QBrush) Transform() *QTransform { _ret := C.QBrush_Transform(this.h) _goptr := newQTransform(_ret) @@ -899,10 +891,6 @@ 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 206a638..e86c573 100644 --- a/qt/gen_qbrush.h +++ b/qt/gen_qbrush.h @@ -26,7 +26,6 @@ class QGradient__QGradientData; #endif class QImage; class QLinearGradient; -class QMatrix; class QPixmap; class QPointF; class QRadialGradient; @@ -40,7 +39,6 @@ typedef struct QGradient QGradient; typedef struct QGradient__QGradientData QGradient__QGradientData; typedef struct QImage QImage; typedef struct QLinearGradient QLinearGradient; -typedef struct QMatrix QMatrix; typedef struct QPixmap QPixmap; typedef struct QPointF QPointF; typedef struct QRadialGradient QRadialGradient; @@ -63,8 +61,6 @@ void QBrush_OperatorAssign(QBrush* self, QBrush* brush); void QBrush_Swap(QBrush* self, QBrush* other); 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); void QBrush_SetTransform(QBrush* self, QTransform* transform); QPixmap* QBrush_Texture(const QBrush* self); @@ -146,7 +142,6 @@ 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 51fdeef..802b7d1 100644 --- a/qt/gen_qbuffer.cpp +++ b/qt/gen_qbuffer.cpp @@ -40,13 +40,6 @@ struct miqt_string* QBuffer_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QBuffer_TrUtf8(const char* s) { - QString _ret = QBuffer::trUtf8(s); - // 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()); -} - QByteArray* QBuffer_Buffer(QBuffer* self) { QByteArray& _ret = self->buffer(); // Cast returned reference into pointer @@ -78,7 +71,7 @@ QByteArray* QBuffer_Data(const QBuffer* self) { } bool QBuffer_Open(QBuffer* self, int openMode) { - return self->open(static_cast(openMode)); + return self->open(static_cast(openMode)); } void QBuffer_Close(QBuffer* self) { @@ -121,20 +114,6 @@ struct miqt_string* QBuffer_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QBuffer_TrUtf82(const char* s, const char* c) { - QString _ret = QBuffer::trUtf8(s, c); - // 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* QBuffer_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QBuffer::trUtf8(s, c, static_cast(n)); - // 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 QBuffer_Delete(QBuffer* self) { delete self; } diff --git a/qt/gen_qbuffer.go b/qt/gen_qbuffer.go index d342537..dc3ff43 100644 --- a/qt/gen_qbuffer.go +++ b/qt/gen_qbuffer.go @@ -79,15 +79,6 @@ func QBuffer_Tr(s string) string { return _ret } -func QBuffer_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QBuffer_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QBuffer) Buffer() *QByteArray { return newQByteArray_U(unsafe.Pointer(C.QBuffer_Buffer(this.h))) } @@ -114,7 +105,7 @@ func (this *QBuffer) Data() *QByteArray { return newQByteArray_U(unsafe.Pointer(C.QBuffer_Data(this.h))) } -func (this *QBuffer) Open(openMode QIODevice__OpenModeFlag) bool { +func (this *QBuffer) Open(openMode QIODeviceBase__OpenModeFlag) bool { return (bool)(C.QBuffer_Open(this.h, (C.int)(openMode))) } @@ -164,28 +155,6 @@ func QBuffer_Tr3(s string, c string, n int) string { return _ret } -func QBuffer_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QBuffer_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QBuffer_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QBuffer_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QBuffer) Delete() { C.QBuffer_Delete(this.h) diff --git a/qt/gen_qbuffer.h b/qt/gen_qbuffer.h index 6a2943d..c1614f2 100644 --- a/qt/gen_qbuffer.h +++ b/qt/gen_qbuffer.h @@ -32,7 +32,6 @@ QBuffer* QBuffer_new4(QByteArray* buf, QObject* parent); QMetaObject* QBuffer_MetaObject(const QBuffer* self); void* QBuffer_Metacast(QBuffer* self, const char* param1); struct miqt_string* QBuffer_Tr(const char* s); -struct miqt_string* QBuffer_TrUtf8(const char* s); QByteArray* QBuffer_Buffer(QBuffer* self); QByteArray* QBuffer_Buffer2(const QBuffer* self); void QBuffer_SetBuffer(QBuffer* self, QByteArray* a); @@ -48,8 +47,6 @@ bool QBuffer_AtEnd(const QBuffer* self); bool QBuffer_CanReadLine(const QBuffer* self); struct miqt_string* QBuffer_Tr2(const char* s, const char* c); struct miqt_string* QBuffer_Tr3(const char* s, const char* c, int n); -struct miqt_string* QBuffer_TrUtf82(const char* s, const char* c); -struct miqt_string* QBuffer_TrUtf83(const char* s, const char* c, int n); void QBuffer_Delete(QBuffer* self); #ifdef __cplusplus diff --git a/qt/gen_qbuttongroup.cpp b/qt/gen_qbuttongroup.cpp index f73bc25..e32bcde 100644 --- a/qt/gen_qbuttongroup.cpp +++ b/qt/gen_qbuttongroup.cpp @@ -33,13 +33,6 @@ struct miqt_string* QButtonGroup_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QButtonGroup_TrUtf8(const char* s) { - QString _ret = QButtonGroup::trUtf8(s); - // 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 QButtonGroup_SetExclusive(QButtonGroup* self, bool exclusive) { self->setExclusive(exclusive); } @@ -179,51 +172,6 @@ void QButtonGroup_connect_IdToggled(QButtonGroup* self, void* slot) { }); } -void QButtonGroup_ButtonClickedWithInt(QButtonGroup* self, int param1) { - self->buttonClicked(static_cast(param1)); -} - -void QButtonGroup_connect_ButtonClickedWithInt(QButtonGroup* self, void* slot) { - QButtonGroup::connect(self, static_cast(&QButtonGroup::buttonClicked), self, [=](int param1) { - int sigval1 = param1; - miqt_exec_callback_QButtonGroup_ButtonClickedWithInt(slot, sigval1); - }); -} - -void QButtonGroup_ButtonPressedWithInt(QButtonGroup* self, int param1) { - self->buttonPressed(static_cast(param1)); -} - -void QButtonGroup_connect_ButtonPressedWithInt(QButtonGroup* self, void* slot) { - QButtonGroup::connect(self, static_cast(&QButtonGroup::buttonPressed), self, [=](int param1) { - int sigval1 = param1; - miqt_exec_callback_QButtonGroup_ButtonPressedWithInt(slot, sigval1); - }); -} - -void QButtonGroup_ButtonReleasedWithInt(QButtonGroup* self, int param1) { - self->buttonReleased(static_cast(param1)); -} - -void QButtonGroup_connect_ButtonReleasedWithInt(QButtonGroup* self, void* slot) { - QButtonGroup::connect(self, static_cast(&QButtonGroup::buttonReleased), self, [=](int param1) { - int sigval1 = param1; - miqt_exec_callback_QButtonGroup_ButtonReleasedWithInt(slot, sigval1); - }); -} - -void QButtonGroup_ButtonToggled2(QButtonGroup* self, int param1, bool param2) { - self->buttonToggled(static_cast(param1), param2); -} - -void QButtonGroup_connect_ButtonToggled2(QButtonGroup* self, void* slot) { - QButtonGroup::connect(self, static_cast(&QButtonGroup::buttonToggled), self, [=](int param1, bool param2) { - int sigval1 = param1; - bool sigval2 = param2; - miqt_exec_callback_QButtonGroup_ButtonToggled2(slot, sigval1, sigval2); - }); -} - struct miqt_string* QButtonGroup_Tr2(const char* s, const char* c) { QString _ret = QButtonGroup::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -238,20 +186,6 @@ struct miqt_string* QButtonGroup_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QButtonGroup_TrUtf82(const char* s, const char* c) { - QString _ret = QButtonGroup::trUtf8(s, c); - // 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* QButtonGroup_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QButtonGroup::trUtf8(s, c, static_cast(n)); - // 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 QButtonGroup_AddButton2(QButtonGroup* self, QAbstractButton* param1, int id) { self->addButton(param1, static_cast(id)); } diff --git a/qt/gen_qbuttongroup.go b/qt/gen_qbuttongroup.go index 8c01848..bcf5be9 100644 --- a/qt/gen_qbuttongroup.go +++ b/qt/gen_qbuttongroup.go @@ -68,15 +68,6 @@ func QButtonGroup_Tr(s string) string { return _ret } -func QButtonGroup_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QButtonGroup_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QButtonGroup) SetExclusive(exclusive bool) { C.QButtonGroup_SetExclusive(this.h, (C.bool)(exclusive)) } @@ -287,88 +278,6 @@ func miqt_exec_callback_QButtonGroup_IdToggled(cb *C.void, param1 C.int, param2 gofunc(slotval1, slotval2) } -func (this *QButtonGroup) ButtonClickedWithInt(param1 int) { - C.QButtonGroup_ButtonClickedWithInt(this.h, (C.int)(param1)) -} -func (this *QButtonGroup) OnButtonClickedWithInt(slot func(param1 int)) { - C.QButtonGroup_connect_ButtonClickedWithInt(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) -} - -//export miqt_exec_callback_QButtonGroup_ButtonClickedWithInt -func miqt_exec_callback_QButtonGroup_ButtonClickedWithInt(cb *C.void, param1 C.int) { - gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 int)) - if !ok { - panic("miqt: callback of non-callback type (heap corruption?)") - } - - // Convert all CABI parameters to Go parameters - slotval1 := (int)(param1) - - gofunc(slotval1) -} - -func (this *QButtonGroup) ButtonPressedWithInt(param1 int) { - C.QButtonGroup_ButtonPressedWithInt(this.h, (C.int)(param1)) -} -func (this *QButtonGroup) OnButtonPressedWithInt(slot func(param1 int)) { - C.QButtonGroup_connect_ButtonPressedWithInt(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) -} - -//export miqt_exec_callback_QButtonGroup_ButtonPressedWithInt -func miqt_exec_callback_QButtonGroup_ButtonPressedWithInt(cb *C.void, param1 C.int) { - gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 int)) - if !ok { - panic("miqt: callback of non-callback type (heap corruption?)") - } - - // Convert all CABI parameters to Go parameters - slotval1 := (int)(param1) - - gofunc(slotval1) -} - -func (this *QButtonGroup) ButtonReleasedWithInt(param1 int) { - C.QButtonGroup_ButtonReleasedWithInt(this.h, (C.int)(param1)) -} -func (this *QButtonGroup) OnButtonReleasedWithInt(slot func(param1 int)) { - C.QButtonGroup_connect_ButtonReleasedWithInt(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) -} - -//export miqt_exec_callback_QButtonGroup_ButtonReleasedWithInt -func miqt_exec_callback_QButtonGroup_ButtonReleasedWithInt(cb *C.void, param1 C.int) { - gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 int)) - if !ok { - panic("miqt: callback of non-callback type (heap corruption?)") - } - - // Convert all CABI parameters to Go parameters - slotval1 := (int)(param1) - - gofunc(slotval1) -} - -func (this *QButtonGroup) ButtonToggled2(param1 int, param2 bool) { - C.QButtonGroup_ButtonToggled2(this.h, (C.int)(param1), (C.bool)(param2)) -} -func (this *QButtonGroup) OnButtonToggled2(slot func(param1 int, param2 bool)) { - C.QButtonGroup_connect_ButtonToggled2(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) -} - -//export miqt_exec_callback_QButtonGroup_ButtonToggled2 -func miqt_exec_callback_QButtonGroup_ButtonToggled2(cb *C.void, param1 C.int, param2 C.bool) { - gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 int, param2 bool)) - if !ok { - panic("miqt: callback of non-callback type (heap corruption?)") - } - - // Convert all CABI parameters to Go parameters - slotval1 := (int)(param1) - - slotval2 := (bool)(param2) - - gofunc(slotval1, slotval2) -} - func QButtonGroup_Tr2(s string, c string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) @@ -391,28 +300,6 @@ func QButtonGroup_Tr3(s string, c string, n int) string { return _ret } -func QButtonGroup_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QButtonGroup_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QButtonGroup_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QButtonGroup_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QButtonGroup) AddButton2(param1 *QAbstractButton, id int) { C.QButtonGroup_AddButton2(this.h, param1.cPointer(), (C.int)(id)) } diff --git a/qt/gen_qbuttongroup.h b/qt/gen_qbuttongroup.h index 72a475a..d027a3e 100644 --- a/qt/gen_qbuttongroup.h +++ b/qt/gen_qbuttongroup.h @@ -30,7 +30,6 @@ QButtonGroup* QButtonGroup_new2(QObject* parent); QMetaObject* QButtonGroup_MetaObject(const QButtonGroup* self); void* QButtonGroup_Metacast(QButtonGroup* self, const char* param1); struct miqt_string* QButtonGroup_Tr(const char* s); -struct miqt_string* QButtonGroup_TrUtf8(const char* s); void QButtonGroup_SetExclusive(QButtonGroup* self, bool exclusive); bool QButtonGroup_Exclusive(const QButtonGroup* self); void QButtonGroup_AddButton(QButtonGroup* self, QAbstractButton* param1); @@ -57,18 +56,8 @@ void QButtonGroup_IdReleased(QButtonGroup* self, int param1); void QButtonGroup_connect_IdReleased(QButtonGroup* self, void* slot); void QButtonGroup_IdToggled(QButtonGroup* self, int param1, bool param2); void QButtonGroup_connect_IdToggled(QButtonGroup* self, void* slot); -void QButtonGroup_ButtonClickedWithInt(QButtonGroup* self, int param1); -void QButtonGroup_connect_ButtonClickedWithInt(QButtonGroup* self, void* slot); -void QButtonGroup_ButtonPressedWithInt(QButtonGroup* self, int param1); -void QButtonGroup_connect_ButtonPressedWithInt(QButtonGroup* self, void* slot); -void QButtonGroup_ButtonReleasedWithInt(QButtonGroup* self, int param1); -void QButtonGroup_connect_ButtonReleasedWithInt(QButtonGroup* self, void* slot); -void QButtonGroup_ButtonToggled2(QButtonGroup* self, int param1, bool param2); -void QButtonGroup_connect_ButtonToggled2(QButtonGroup* self, void* slot); struct miqt_string* QButtonGroup_Tr2(const char* s, const char* c); struct miqt_string* QButtonGroup_Tr3(const char* s, const char* c, int n); -struct miqt_string* QButtonGroup_TrUtf82(const char* s, const char* c); -struct miqt_string* QButtonGroup_TrUtf83(const char* s, const char* c, int n); void QButtonGroup_AddButton2(QButtonGroup* self, QAbstractButton* param1, int id); void QButtonGroup_Delete(QButtonGroup* self); diff --git a/qt/gen_qbytearray.cpp b/qt/gen_qbytearray.cpp index ec77736..6662340 100644 --- a/qt/gen_qbytearray.cpp +++ b/qt/gen_qbytearray.cpp @@ -1,7 +1,6 @@ #include #define WORKAROUND_INNER_CLASS_DEFINITION_QByteArray__FromBase64Result -#include -#include +#include #include #include #include @@ -10,18 +9,6 @@ #include "gen_qbytearray.h" #include "_cgo_export.h" -QByteArrayDataPtr* QByteArrayDataPtr_new() { - return new QByteArrayDataPtr(); -} - -QByteArrayDataPtr* QByteArrayDataPtr_new2(QByteArrayDataPtr* param1) { - return new QByteArrayDataPtr(*param1); -} - -void QByteArrayDataPtr_Delete(QByteArrayDataPtr* self) { - delete self; -} - QByteArray* QByteArray_new() { return new QByteArray(); } @@ -30,24 +17,20 @@ QByteArray* QByteArray_new2(const char* param1) { return new QByteArray(param1); } -QByteArray* QByteArray_new3(int size, char c) { - return new QByteArray(static_cast(size), static_cast(c)); +QByteArray* QByteArray_new3(ptrdiff_t size, char c) { + return new QByteArray((qsizetype)(size), static_cast(c)); } -QByteArray* QByteArray_new4(int size, int param2) { - return new QByteArray(static_cast(size), static_cast(param2)); +QByteArray* QByteArray_new4(ptrdiff_t size, int param2) { + return new QByteArray((qsizetype)(size), static_cast(param2)); } QByteArray* QByteArray_new5(QByteArray* param1) { return new QByteArray(*param1); } -QByteArray* QByteArray_new6(QByteArrayDataPtr* dd) { - return new QByteArray(*dd); -} - -QByteArray* QByteArray_new7(const char* param1, int size) { - return new QByteArray(param1, static_cast(size)); +QByteArray* QByteArray_new6(const char* param1, ptrdiff_t size) { + return new QByteArray(param1, (qsizetype)(size)); } void QByteArray_OperatorAssign(QByteArray* self, QByteArray* param1) { @@ -62,16 +45,16 @@ void QByteArray_Swap(QByteArray* self, QByteArray* other) { self->swap(*other); } -int QByteArray_Size(const QByteArray* self) { - return self->size(); -} - bool QByteArray_IsEmpty(const QByteArray* self) { return self->isEmpty(); } -void QByteArray_Resize(QByteArray* self, int size) { - self->resize(static_cast(size)); +void QByteArray_Resize(QByteArray* self, ptrdiff_t size) { + self->resize((qsizetype)(size)); +} + +void QByteArray_Resize2(QByteArray* self, ptrdiff_t size, char c) { + self->resize((qsizetype)(size), static_cast(c)); } QByteArray* QByteArray_Fill(QByteArray* self, char c) { @@ -80,12 +63,13 @@ QByteArray* QByteArray_Fill(QByteArray* self, char c) { return &_ret; } -int QByteArray_Capacity(const QByteArray* self) { - return self->capacity(); +ptrdiff_t QByteArray_Capacity(const QByteArray* self) { + qsizetype _ret = self->capacity(); + return static_cast(_ret); } -void QByteArray_Reserve(QByteArray* self, int size) { - self->reserve(static_cast(size)); +void QByteArray_Reserve(QByteArray* self, ptrdiff_t size) { + self->reserve((qsizetype)(size)); } void QByteArray_Squeeze(QByteArray* self) { @@ -120,136 +104,115 @@ void QByteArray_Clear(QByteArray* self) { self->clear(); } -char QByteArray_At(const QByteArray* self, int i) { - return self->at(static_cast(i)); +char QByteArray_At(const QByteArray* self, ptrdiff_t i) { + return self->at((qsizetype)(i)); } -char QByteArray_OperatorSubscript(const QByteArray* self, int i) { - return self->operator[](static_cast(i)); -} - -char QByteArray_OperatorSubscriptWithUint(const QByteArray* self, unsigned int i) { - return self->operator[](static_cast(i)); -} - -QByteRef* QByteArray_OperatorSubscriptWithInt(QByteArray* self, int i) { - return new QByteRef(self->operator[](static_cast(i))); -} - -QByteRef* QByteArray_OperatorSubscript2(QByteArray* self, unsigned int i) { - return new QByteRef(self->operator[](static_cast(i))); +char QByteArray_OperatorSubscript(const QByteArray* self, ptrdiff_t i) { + return self->operator[]((qsizetype)(i)); } char QByteArray_Front(const QByteArray* self) { return self->front(); } -QByteRef* QByteArray_Front2(QByteArray* self) { - return new QByteRef(self->front()); -} - char QByteArray_Back(const QByteArray* self) { return self->back(); } -QByteRef* QByteArray_Back2(QByteArray* self) { - return new QByteRef(self->back()); +ptrdiff_t QByteArray_IndexOf(const QByteArray* self, char c) { + qsizetype _ret = self->indexOf(static_cast(c)); + return static_cast(_ret); } -int QByteArray_IndexOf(const QByteArray* self, char c) { - return self->indexOf(static_cast(c)); +ptrdiff_t QByteArray_IndexOfWithBv(const QByteArray* self, QByteArrayView* bv) { + qsizetype _ret = self->indexOf(*bv); + return static_cast(_ret); } -int QByteArray_IndexOfWithChar(const QByteArray* self, const char* c) { - return self->indexOf(c); +ptrdiff_t QByteArray_LastIndexOf(const QByteArray* self, char c) { + qsizetype _ret = self->lastIndexOf(static_cast(c)); + return static_cast(_ret); } -int QByteArray_IndexOfWithQByteArray(const QByteArray* self, QByteArray* a) { - return self->indexOf(*a); +ptrdiff_t QByteArray_LastIndexOfWithBv(const QByteArray* self, QByteArrayView* bv) { + qsizetype _ret = self->lastIndexOf(*bv); + return static_cast(_ret); } -int QByteArray_LastIndexOf(const QByteArray* self, char c) { - return self->lastIndexOf(static_cast(c)); -} - -int QByteArray_LastIndexOfWithChar(const QByteArray* self, const char* c) { - return self->lastIndexOf(c); -} - -int QByteArray_LastIndexOfWithQByteArray(const QByteArray* self, QByteArray* a) { - return self->lastIndexOf(*a); +ptrdiff_t QByteArray_LastIndexOf2(const QByteArray* self, QByteArrayView* bv, ptrdiff_t from) { + qsizetype _ret = self->lastIndexOf(*bv, (qsizetype)(from)); + return static_cast(_ret); } bool QByteArray_Contains(const QByteArray* self, char c) { return self->contains(static_cast(c)); } -bool QByteArray_ContainsWithChar(const QByteArray* self, const char* a) { - return self->contains(a); +bool QByteArray_ContainsWithBv(const QByteArray* self, QByteArrayView* bv) { + return self->contains(*bv); } -bool QByteArray_ContainsWithQByteArray(const QByteArray* self, QByteArray* a) { - return self->contains(*a); +ptrdiff_t QByteArray_Count(const QByteArray* self, char c) { + qsizetype _ret = self->count(static_cast(c)); + return static_cast(_ret); } -int QByteArray_Count(const QByteArray* self, char c) { - return self->count(static_cast(c)); +ptrdiff_t QByteArray_CountWithBv(const QByteArray* self, QByteArrayView* bv) { + qsizetype _ret = self->count(*bv); + return static_cast(_ret); } -int QByteArray_CountWithChar(const QByteArray* self, const char* a) { - return self->count(a); -} - -int QByteArray_CountWithQByteArray(const QByteArray* self, QByteArray* a) { - return self->count(*a); -} - -int QByteArray_Compare(const QByteArray* self, const char* c) { - return self->compare(c); -} - -int QByteArray_CompareWithQByteArray(const QByteArray* self, QByteArray* a) { +int QByteArray_Compare(const QByteArray* self, QByteArrayView* a) { return self->compare(*a); } -QByteArray* QByteArray_Left(const QByteArray* self, int lenVal) { - return new QByteArray(self->left(static_cast(lenVal))); +QByteArray* QByteArray_Left(const QByteArray* self, ptrdiff_t lenVal) { + return new QByteArray(self->left((qsizetype)(lenVal))); } -QByteArray* QByteArray_Right(const QByteArray* self, int lenVal) { - return new QByteArray(self->right(static_cast(lenVal))); +QByteArray* QByteArray_Right(const QByteArray* self, ptrdiff_t lenVal) { + return new QByteArray(self->right((qsizetype)(lenVal))); } -QByteArray* QByteArray_Mid(const QByteArray* self, int index) { - return new QByteArray(self->mid(static_cast(index))); +QByteArray* QByteArray_Mid(const QByteArray* self, ptrdiff_t index) { + return new QByteArray(self->mid((qsizetype)(index))); } -QByteArray* QByteArray_Chopped(const QByteArray* self, int lenVal) { - return new QByteArray(self->chopped(static_cast(lenVal))); +QByteArray* QByteArray_First(const QByteArray* self, ptrdiff_t n) { + return new QByteArray(self->first((qsizetype)(n))); } -bool QByteArray_StartsWith(const QByteArray* self, QByteArray* a) { - return self->startsWith(*a); +QByteArray* QByteArray_Last(const QByteArray* self, ptrdiff_t n) { + return new QByteArray(self->last((qsizetype)(n))); +} + +QByteArray* QByteArray_Sliced(const QByteArray* self, ptrdiff_t pos) { + return new QByteArray(self->sliced((qsizetype)(pos))); +} + +QByteArray* QByteArray_Sliced2(const QByteArray* self, ptrdiff_t pos, ptrdiff_t n) { + return new QByteArray(self->sliced((qsizetype)(pos), (qsizetype)(n))); +} + +QByteArray* QByteArray_Chopped(const QByteArray* self, ptrdiff_t lenVal) { + return new QByteArray(self->chopped((qsizetype)(lenVal))); +} + +bool QByteArray_StartsWith(const QByteArray* self, QByteArrayView* bv) { + return self->startsWith(*bv); } bool QByteArray_StartsWithWithChar(const QByteArray* self, char c) { return self->startsWith(static_cast(c)); } -bool QByteArray_StartsWith2(const QByteArray* self, const char* c) { - return self->startsWith(c); -} - -bool QByteArray_EndsWith(const QByteArray* self, QByteArray* a) { - return self->endsWith(*a); -} - -bool QByteArray_EndsWithWithChar(const QByteArray* self, char c) { +bool QByteArray_EndsWith(const QByteArray* self, char c) { return self->endsWith(static_cast(c)); } -bool QByteArray_EndsWith2(const QByteArray* self, const char* c) { - return self->endsWith(c); +bool QByteArray_EndsWithWithBv(const QByteArray* self, QByteArrayView* bv) { + return self->endsWith(*bv); } bool QByteArray_IsUpper(const QByteArray* self) { @@ -260,12 +223,16 @@ bool QByteArray_IsLower(const QByteArray* self) { return self->isLower(); } -void QByteArray_Truncate(QByteArray* self, int pos) { - self->truncate(static_cast(pos)); +bool QByteArray_IsValidUtf8(const QByteArray* self) { + return self->isValidUtf8(); } -void QByteArray_Chop(QByteArray* self, int n) { - self->chop(static_cast(n)); +void QByteArray_Truncate(QByteArray* self, ptrdiff_t pos) { + self->truncate((qsizetype)(pos)); +} + +void QByteArray_Chop(QByteArray* self, ptrdiff_t n) { + self->chop((qsizetype)(n)); } QByteArray* QByteArray_ToLower(const QByteArray* self) { @@ -284,12 +251,12 @@ QByteArray* QByteArray_Simplified(const QByteArray* self) { return new QByteArray(self->simplified()); } -QByteArray* QByteArray_LeftJustified(const QByteArray* self, int width) { - return new QByteArray(self->leftJustified(static_cast(width))); +QByteArray* QByteArray_LeftJustified(const QByteArray* self, ptrdiff_t width) { + return new QByteArray(self->leftJustified((qsizetype)(width))); } -QByteArray* QByteArray_RightJustified(const QByteArray* self, int width) { - return new QByteArray(self->rightJustified(static_cast(width))); +QByteArray* QByteArray_RightJustified(const QByteArray* self, ptrdiff_t width) { + return new QByteArray(self->rightJustified((qsizetype)(width))); } QByteArray* QByteArray_Prepend(QByteArray* self, char c) { @@ -298,8 +265,8 @@ QByteArray* QByteArray_Prepend(QByteArray* self, char c) { return &_ret; } -QByteArray* QByteArray_Prepend2(QByteArray* self, int count, char c) { - QByteArray& _ret = self->prepend(static_cast(count), static_cast(c)); +QByteArray* QByteArray_Prepend2(QByteArray* self, ptrdiff_t count, char c) { + QByteArray& _ret = self->prepend((qsizetype)(count), static_cast(c)); // Cast returned reference into pointer return &_ret; } @@ -310,8 +277,8 @@ QByteArray* QByteArray_PrependWithChar(QByteArray* self, const char* s) { return &_ret; } -QByteArray* QByteArray_Prepend3(QByteArray* self, const char* s, int lenVal) { - QByteArray& _ret = self->prepend(s, static_cast(lenVal)); +QByteArray* QByteArray_Prepend3(QByteArray* self, const char* s, ptrdiff_t lenVal) { + QByteArray& _ret = self->prepend(s, (qsizetype)(lenVal)); // Cast returned reference into pointer return &_ret; } @@ -322,14 +289,20 @@ QByteArray* QByteArray_PrependWithQByteArray(QByteArray* self, QByteArray* a) { return &_ret; } +QByteArray* QByteArray_PrependWithQByteArrayView(QByteArray* self, QByteArrayView* a) { + QByteArray& _ret = self->prepend(*a); + // Cast returned reference into pointer + return &_ret; +} + QByteArray* QByteArray_Append(QByteArray* self, char c) { QByteArray& _ret = self->append(static_cast(c)); // Cast returned reference into pointer return &_ret; } -QByteArray* QByteArray_Append2(QByteArray* self, int count, char c) { - QByteArray& _ret = self->append(static_cast(count), static_cast(c)); +QByteArray* QByteArray_Append2(QByteArray* self, ptrdiff_t count, char c) { + QByteArray& _ret = self->append((qsizetype)(count), static_cast(c)); // Cast returned reference into pointer return &_ret; } @@ -340,8 +313,8 @@ QByteArray* QByteArray_AppendWithChar(QByteArray* self, const char* s) { return &_ret; } -QByteArray* QByteArray_Append3(QByteArray* self, const char* s, int lenVal) { - QByteArray& _ret = self->append(s, static_cast(lenVal)); +QByteArray* QByteArray_Append3(QByteArray* self, const char* s, ptrdiff_t lenVal) { + QByteArray& _ret = self->append(s, (qsizetype)(lenVal)); // Cast returned reference into pointer return &_ret; } @@ -352,103 +325,85 @@ QByteArray* QByteArray_AppendWithQByteArray(QByteArray* self, QByteArray* a) { return &_ret; } -QByteArray* QByteArray_Insert(QByteArray* self, int i, char c) { - QByteArray& _ret = self->insert(static_cast(i), static_cast(c)); +QByteArray* QByteArray_AppendWithQByteArrayView(QByteArray* self, QByteArrayView* a) { + QByteArray& _ret = self->append(*a); // Cast returned reference into pointer return &_ret; } -QByteArray* QByteArray_Insert2(QByteArray* self, int i, int count, char c) { - QByteArray& _ret = self->insert(static_cast(i), static_cast(count), static_cast(c)); +QByteArray* QByteArray_Insert(QByteArray* self, ptrdiff_t i, QByteArrayView* data) { + QByteArray& _ret = self->insert((qsizetype)(i), *data); // Cast returned reference into pointer return &_ret; } -QByteArray* QByteArray_Insert3(QByteArray* self, int i, const char* s) { - QByteArray& _ret = self->insert(static_cast(i), s); +QByteArray* QByteArray_Insert2(QByteArray* self, ptrdiff_t i, const char* s) { + QByteArray& _ret = self->insert((qsizetype)(i), s); // Cast returned reference into pointer return &_ret; } -QByteArray* QByteArray_Insert4(QByteArray* self, int i, const char* s, int lenVal) { - QByteArray& _ret = self->insert(static_cast(i), s, static_cast(lenVal)); +QByteArray* QByteArray_Insert3(QByteArray* self, ptrdiff_t i, QByteArray* data) { + QByteArray& _ret = self->insert((qsizetype)(i), *data); // Cast returned reference into pointer return &_ret; } -QByteArray* QByteArray_Insert5(QByteArray* self, int i, QByteArray* a) { - QByteArray& _ret = self->insert(static_cast(i), *a); +QByteArray* QByteArray_Insert4(QByteArray* self, ptrdiff_t i, ptrdiff_t count, char c) { + QByteArray& _ret = self->insert((qsizetype)(i), (qsizetype)(count), static_cast(c)); // Cast returned reference into pointer return &_ret; } -QByteArray* QByteArray_Remove(QByteArray* self, int index, int lenVal) { - QByteArray& _ret = self->remove(static_cast(index), static_cast(lenVal)); +QByteArray* QByteArray_Insert5(QByteArray* self, ptrdiff_t i, char c) { + QByteArray& _ret = self->insert((qsizetype)(i), static_cast(c)); // Cast returned reference into pointer return &_ret; } -QByteArray* QByteArray_Replace(QByteArray* self, int index, int lenVal, const char* s) { - QByteArray& _ret = self->replace(static_cast(index), static_cast(lenVal), s); +QByteArray* QByteArray_Insert6(QByteArray* self, ptrdiff_t i, const char* s, ptrdiff_t lenVal) { + QByteArray& _ret = self->insert((qsizetype)(i), s, (qsizetype)(lenVal)); // Cast returned reference into pointer return &_ret; } -QByteArray* QByteArray_Replace2(QByteArray* self, int index, int lenVal, const char* s, int alen) { - QByteArray& _ret = self->replace(static_cast(index), static_cast(lenVal), s, static_cast(alen)); +QByteArray* QByteArray_Remove(QByteArray* self, ptrdiff_t index, ptrdiff_t lenVal) { + QByteArray& _ret = self->remove((qsizetype)(index), (qsizetype)(lenVal)); // Cast returned reference into pointer return &_ret; } -QByteArray* QByteArray_Replace3(QByteArray* self, int index, int lenVal, QByteArray* s) { - QByteArray& _ret = self->replace(static_cast(index), static_cast(lenVal), *s); +QByteArray* QByteArray_Replace(QByteArray* self, ptrdiff_t index, ptrdiff_t lenVal, const char* s, ptrdiff_t alen) { + QByteArray& _ret = self->replace((qsizetype)(index), (qsizetype)(lenVal), s, (qsizetype)(alen)); // Cast returned reference into pointer return &_ret; } -QByteArray* QByteArray_Replace4(QByteArray* self, char before, const char* after) { - QByteArray& _ret = self->replace(static_cast(before), after); +QByteArray* QByteArray_Replace2(QByteArray* self, ptrdiff_t index, ptrdiff_t lenVal, QByteArrayView* s) { + QByteArray& _ret = self->replace((qsizetype)(index), (qsizetype)(lenVal), *s); // Cast returned reference into pointer return &_ret; } -QByteArray* QByteArray_Replace5(QByteArray* self, char before, QByteArray* after) { +QByteArray* QByteArray_Replace3(QByteArray* self, char before, QByteArrayView* after) { QByteArray& _ret = self->replace(static_cast(before), *after); // Cast returned reference into pointer return &_ret; } -QByteArray* QByteArray_Replace6(QByteArray* self, const char* before, const char* after) { - QByteArray& _ret = self->replace(before, after); +QByteArray* QByteArray_Replace4(QByteArray* self, const char* before, ptrdiff_t bsize, const char* after, ptrdiff_t asize) { + QByteArray& _ret = self->replace(before, (qsizetype)(bsize), after, (qsizetype)(asize)); // Cast returned reference into pointer return &_ret; } -QByteArray* QByteArray_Replace7(QByteArray* self, const char* before, int bsize, const char* after, int asize) { - QByteArray& _ret = self->replace(before, static_cast(bsize), after, static_cast(asize)); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_Replace8(QByteArray* self, QByteArray* before, QByteArray* after) { +QByteArray* QByteArray_Replace5(QByteArray* self, QByteArrayView* before, QByteArrayView* after) { QByteArray& _ret = self->replace(*before, *after); // Cast returned reference into pointer return &_ret; } -QByteArray* QByteArray_Replace9(QByteArray* self, QByteArray* before, const char* after) { - QByteArray& _ret = self->replace(*before, after); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_Replace10(QByteArray* self, const char* before, QByteArray* after) { - QByteArray& _ret = self->replace(before, *after); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_Replace11(QByteArray* self, char before, char after) { +QByteArray* QByteArray_Replace6(QByteArray* self, char before, char after) { QByteArray& _ret = self->replace(static_cast(before), static_cast(after)); // Cast returned reference into pointer return &_ret; @@ -472,6 +427,12 @@ QByteArray* QByteArray_OperatorPlusAssignWithQByteArray(QByteArray* self, QByteA return &_ret; } +QByteArray* QByteArray_OperatorPlusAssignWithQByteArrayView(QByteArray* self, QByteArrayView* a) { + QByteArray& _ret = self->operator+=(*a); + // Cast returned reference into pointer + return &_ret; +} + struct miqt_array* QByteArray_Split(const QByteArray* self, char sep) { QList _ret = self->split(static_cast(sep)); // Convert QList<> from C++ memory to manually-managed C memory @@ -485,60 +446,8 @@ struct miqt_array* QByteArray_Split(const QByteArray* self, char sep) { return _out; } -QByteArray* QByteArray_Repeated(const QByteArray* self, int times) { - return new QByteArray(self->repeated(static_cast(times))); -} - -QByteArray* QByteArray_AppendWithQString(QByteArray* self, struct miqt_string* s) { - QString s_QString = QString::fromUtf8(&s->data, s->len); - QByteArray& _ret = self->append(s_QString); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_Insert6(QByteArray* self, int i, struct miqt_string* s) { - QString s_QString = QString::fromUtf8(&s->data, s->len); - QByteArray& _ret = self->insert(static_cast(i), s_QString); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_Replace12(QByteArray* self, struct miqt_string* before, const char* after) { - QString before_QString = QString::fromUtf8(&before->data, before->len); - QByteArray& _ret = self->replace(before_QString, after); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_Replace13(QByteArray* self, char c, struct miqt_string* after) { - QString after_QString = QString::fromUtf8(&after->data, after->len); - QByteArray& _ret = self->replace(static_cast(c), after_QString); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_Replace14(QByteArray* self, struct miqt_string* before, QByteArray* after) { - QString before_QString = QString::fromUtf8(&before->data, before->len); - QByteArray& _ret = self->replace(before_QString, *after); - // Cast returned reference into pointer - return &_ret; -} - -QByteArray* QByteArray_OperatorPlusAssignWithQString(QByteArray* self, struct miqt_string* s) { - QString s_QString = QString::fromUtf8(&s->data, s->len); - QByteArray& _ret = self->operator+=(s_QString); - // Cast returned reference into pointer - return &_ret; -} - -int QByteArray_IndexOfWithQString(const QByteArray* self, struct miqt_string* s) { - QString s_QString = QString::fromUtf8(&s->data, s->len); - return self->indexOf(s_QString); -} - -int QByteArray_LastIndexOfWithQString(const QByteArray* self, struct miqt_string* s) { - QString s_QString = QString::fromUtf8(&s->data, s->len); - return self->lastIndexOf(s_QString); +QByteArray* QByteArray_Repeated(const QByteArray* self, ptrdiff_t times) { + return new QByteArray(self->repeated((qsizetype)(times))); } bool QByteArray_OperatorEqual(const QByteArray* self, struct miqt_string* s2) { @@ -616,11 +525,7 @@ double QByteArray_ToDouble(const QByteArray* self) { return self->toDouble(); } -QByteArray* QByteArray_ToBase64(const QByteArray* self, int options) { - return new QByteArray(self->toBase64(static_cast(options))); -} - -QByteArray* QByteArray_ToBase642(const QByteArray* self) { +QByteArray* QByteArray_ToBase64(const QByteArray* self) { return new QByteArray(self->toBase64()); } @@ -628,14 +533,14 @@ QByteArray* QByteArray_ToHex(const QByteArray* self) { return new QByteArray(self->toHex()); } -QByteArray* QByteArray_ToHexWithSeparator(const QByteArray* self, char separator) { - return new QByteArray(self->toHex(static_cast(separator))); -} - QByteArray* QByteArray_ToPercentEncoding(const QByteArray* self) { return new QByteArray(self->toPercentEncoding()); } +QByteArray* QByteArray_PercentDecoded(const QByteArray* self) { + return new QByteArray(self->percentDecoded()); +} + QByteArray* QByteArray_SetNum(QByteArray* self, int16_t param1) { QByteArray& _ret = self->setNum(static_cast(param1)); // Cast returned reference into pointer @@ -660,6 +565,18 @@ QByteArray* QByteArray_SetNumWithUint(QByteArray* self, unsigned int param1) { return &_ret; } +QByteArray* QByteArray_SetNumWithLong(QByteArray* self, long param1) { + QByteArray& _ret = self->setNum(static_cast(param1)); + // Cast returned reference into pointer + return &_ret; +} + +QByteArray* QByteArray_SetNumWithUlong(QByteArray* self, unsigned long param1) { + QByteArray& _ret = self->setNum(static_cast(param1)); + // Cast returned reference into pointer + return &_ret; +} + QByteArray* QByteArray_SetNumWithQlonglong(QByteArray* self, long long param1) { QByteArray& _ret = self->setNum(static_cast(param1)); // Cast returned reference into pointer @@ -684,8 +601,8 @@ QByteArray* QByteArray_SetNumWithDouble(QByteArray* self, double param1) { return &_ret; } -QByteArray* QByteArray_SetRawData(QByteArray* self, const char* a, unsigned int n) { - QByteArray& _ret = self->setRawData(a, static_cast(n)); +QByteArray* QByteArray_SetRawData(QByteArray* self, const char* a, ptrdiff_t n) { + QByteArray& _ret = self->setRawData(a, (qsizetype)(n)); // Cast returned reference into pointer return &_ret; } @@ -698,6 +615,14 @@ QByteArray* QByteArray_NumberWithUint(unsigned int param1) { return new QByteArray(QByteArray::number(static_cast(param1))); } +QByteArray* QByteArray_NumberWithLong(long param1) { + return new QByteArray(QByteArray::number(static_cast(param1))); +} + +QByteArray* QByteArray_NumberWithUlong(unsigned long param1) { + return new QByteArray(QByteArray::number(static_cast(param1))); +} + QByteArray* QByteArray_NumberWithQlonglong(long long param1) { return new QByteArray(QByteArray::number(static_cast(param1))); } @@ -710,19 +635,15 @@ QByteArray* QByteArray_NumberWithDouble(double param1) { return new QByteArray(QByteArray::number(static_cast(param1))); } -QByteArray* QByteArray_FromRawData(const char* param1, int size) { - return new QByteArray(QByteArray::fromRawData(param1, static_cast(size))); +QByteArray* QByteArray_FromRawData(const char* data, ptrdiff_t size) { + return new QByteArray(QByteArray::fromRawData(data, (qsizetype)(size))); } QByteArray__FromBase64Result* QByteArray_FromBase64Encoding(QByteArray* base64) { return new QByteArray::FromBase64Result(QByteArray::fromBase64Encoding(*base64)); } -QByteArray* QByteArray_FromBase64(QByteArray* base64, int options) { - return new QByteArray(QByteArray::fromBase64(*base64, static_cast(options))); -} - -QByteArray* QByteArray_FromBase64WithBase64(QByteArray* base64) { +QByteArray* QByteArray_FromBase64(QByteArray* base64) { return new QByteArray(QByteArray::fromBase64(*base64)); } @@ -778,14 +699,18 @@ void QByteArray_PushBack(QByteArray* self, char c) { self->push_back(static_cast(c)); } -void QByteArray_PushBackWithChar(QByteArray* self, const char* c) { - self->push_back(c); +void QByteArray_PushBackWithChar(QByteArray* self, const char* s) { + self->push_back(s); } void QByteArray_PushBackWithQByteArray(QByteArray* self, QByteArray* a) { self->push_back(*a); } +void QByteArray_PushBackWithQByteArrayView(QByteArray* self, QByteArrayView* a) { + self->push_back(*a); +} + void QByteArray_PushFront(QByteArray* self, char c) { self->push_front(static_cast(c)); } @@ -798,88 +723,81 @@ void QByteArray_PushFrontWithQByteArray(QByteArray* self, QByteArray* a) { self->push_front(*a); } +void QByteArray_PushFrontWithQByteArrayView(QByteArray* self, QByteArrayView* a) { + self->push_front(*a); +} + void QByteArray_ShrinkToFit(QByteArray* self) { self->shrink_to_fit(); } -int QByteArray_Count2(const QByteArray* self) { - return self->count(); +char* QByteArray_Erase(QByteArray* self, const char* first, const char* last) { + QByteArray::iterator _ret = self->erase(first, last); + return static_cast(_ret); } -int QByteArray_Length(const QByteArray* self) { - return self->length(); +ptrdiff_t QByteArray_Size(const QByteArray* self) { + qsizetype _ret = self->size(); + return static_cast(_ret); +} + +ptrdiff_t QByteArray_Count2(const QByteArray* self) { + qsizetype _ret = self->count(); + return static_cast(_ret); +} + +ptrdiff_t QByteArray_Length(const QByteArray* self) { + qsizetype _ret = self->length(); + return static_cast(_ret); } bool QByteArray_IsNull(const QByteArray* self) { return self->isNull(); } -QByteArray* QByteArray_Fill2(QByteArray* self, char c, int size) { - QByteArray& _ret = self->fill(static_cast(c), static_cast(size)); +QByteArray* QByteArray_Fill2(QByteArray* self, char c, ptrdiff_t size) { + QByteArray& _ret = self->fill(static_cast(c), (qsizetype)(size)); // Cast returned reference into pointer return &_ret; } -int QByteArray_IndexOf2(const QByteArray* self, char c, int from) { - return self->indexOf(static_cast(c), static_cast(from)); +ptrdiff_t QByteArray_IndexOf2(const QByteArray* self, char c, ptrdiff_t from) { + qsizetype _ret = self->indexOf(static_cast(c), (qsizetype)(from)); + return static_cast(_ret); } -int QByteArray_IndexOf22(const QByteArray* self, const char* c, int from) { - return self->indexOf(c, static_cast(from)); +ptrdiff_t QByteArray_IndexOf22(const QByteArray* self, QByteArrayView* bv, ptrdiff_t from) { + qsizetype _ret = self->indexOf(*bv, (qsizetype)(from)); + return static_cast(_ret); } -int QByteArray_IndexOf23(const QByteArray* self, QByteArray* a, int from) { - return self->indexOf(*a, static_cast(from)); +ptrdiff_t QByteArray_LastIndexOf22(const QByteArray* self, char c, ptrdiff_t from) { + qsizetype _ret = self->lastIndexOf(static_cast(c), (qsizetype)(from)); + return static_cast(_ret); } -int QByteArray_LastIndexOf2(const QByteArray* self, char c, int from) { - return self->lastIndexOf(static_cast(c), static_cast(from)); -} - -int QByteArray_LastIndexOf22(const QByteArray* self, const char* c, int from) { - return self->lastIndexOf(c, static_cast(from)); -} - -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, int cs) { - return self->compare(c, static_cast(cs)); -} - -int QByteArray_Compare22(const QByteArray* self, QByteArray* a, int cs) { +int QByteArray_Compare2(const QByteArray* self, QByteArrayView* a, int cs) { return self->compare(*a, static_cast(cs)); } -QByteArray* QByteArray_Mid2(const QByteArray* self, int index, int lenVal) { - return new QByteArray(self->mid(static_cast(index), static_cast(lenVal))); +QByteArray* QByteArray_Mid2(const QByteArray* self, ptrdiff_t index, ptrdiff_t lenVal) { + return new QByteArray(self->mid((qsizetype)(index), (qsizetype)(lenVal))); } -QByteArray* QByteArray_LeftJustified2(const QByteArray* self, int width, char fill) { - return new QByteArray(self->leftJustified(static_cast(width), static_cast(fill))); +QByteArray* QByteArray_LeftJustified2(const QByteArray* self, ptrdiff_t width, char fill) { + return new QByteArray(self->leftJustified((qsizetype)(width), static_cast(fill))); } -QByteArray* QByteArray_LeftJustified3(const QByteArray* self, int width, char fill, bool truncate) { - return new QByteArray(self->leftJustified(static_cast(width), static_cast(fill), truncate)); +QByteArray* QByteArray_LeftJustified3(const QByteArray* self, ptrdiff_t width, char fill, bool truncate) { + return new QByteArray(self->leftJustified((qsizetype)(width), static_cast(fill), truncate)); } -QByteArray* QByteArray_RightJustified2(const QByteArray* self, int width, char fill) { - return new QByteArray(self->rightJustified(static_cast(width), static_cast(fill))); +QByteArray* QByteArray_RightJustified2(const QByteArray* self, ptrdiff_t width, char fill) { + return new QByteArray(self->rightJustified((qsizetype)(width), static_cast(fill))); } -QByteArray* QByteArray_RightJustified3(const QByteArray* self, int width, char fill, bool truncate) { - return new QByteArray(self->rightJustified(static_cast(width), static_cast(fill), truncate)); -} - -int QByteArray_IndexOf24(const QByteArray* self, struct miqt_string* s, int from) { - QString s_QString = QString::fromUtf8(&s->data, s->len); - return self->indexOf(s_QString, static_cast(from)); -} - -int QByteArray_LastIndexOf24(const QByteArray* self, struct miqt_string* s, int from) { - QString s_QString = QString::fromUtf8(&s->data, s->len); - return self->lastIndexOf(s_QString, static_cast(from)); +QByteArray* QByteArray_RightJustified3(const QByteArray* self, ptrdiff_t width, char fill, bool truncate) { + return new QByteArray(self->rightJustified((qsizetype)(width), static_cast(fill), truncate)); } int16_t QByteArray_ToShort1(const QByteArray* self, bool* ok) { @@ -964,6 +882,14 @@ double QByteArray_ToDouble1(const QByteArray* self, bool* ok) { return self->toDouble(ok); } +QByteArray* QByteArray_ToBase641(const QByteArray* self, int options) { + return new QByteArray(self->toBase64(static_cast(options))); +} + +QByteArray* QByteArray_ToHex1(const QByteArray* self, char separator) { + return new QByteArray(self->toHex(static_cast(separator))); +} + QByteArray* QByteArray_ToPercentEncoding1(const QByteArray* self, QByteArray* exclude) { return new QByteArray(self->toPercentEncoding(*exclude)); } @@ -976,6 +902,10 @@ QByteArray* QByteArray_ToPercentEncoding3(const QByteArray* self, QByteArray* ex return new QByteArray(self->toPercentEncoding(*exclude, *include, static_cast(percent))); } +QByteArray* QByteArray_PercentDecoded1(const QByteArray* self, char percent) { + return new QByteArray(self->percentDecoded(static_cast(percent))); +} + QByteArray* QByteArray_SetNum2(QByteArray* self, int16_t param1, int base) { QByteArray& _ret = self->setNum(static_cast(param1), static_cast(base)); // Cast returned reference into pointer @@ -1000,38 +930,50 @@ QByteArray* QByteArray_SetNum24(QByteArray* self, unsigned int param1, int base) return &_ret; } -QByteArray* QByteArray_SetNum25(QByteArray* self, long long param1, int base) { +QByteArray* QByteArray_SetNum25(QByteArray* self, long param1, int 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 param1, int base) { + QByteArray& _ret = self->setNum(static_cast(param1), static_cast(base)); + // Cast returned reference into pointer + return &_ret; +} + +QByteArray* QByteArray_SetNum27(QByteArray* self, long long param1, int 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* QByteArray_SetNum28(QByteArray* self, unsigned long long param1, int base) { QByteArray& _ret = self->setNum(static_cast(param1), static_cast(base)); // Cast returned reference into pointer return &_ret; } -QByteArray* QByteArray_SetNum27(QByteArray* self, float param1, char f) { - QByteArray& _ret = self->setNum(static_cast(param1), static_cast(f)); +QByteArray* QByteArray_SetNum29(QByteArray* self, float param1, char format) { + QByteArray& _ret = self->setNum(static_cast(param1), static_cast(format)); // Cast returned reference into pointer return &_ret; } -QByteArray* QByteArray_SetNum3(QByteArray* self, float param1, char f, int prec) { - QByteArray& _ret = self->setNum(static_cast(param1), static_cast(f), static_cast(prec)); +QByteArray* QByteArray_SetNum3(QByteArray* self, float param1, char format, int precision) { + QByteArray& _ret = self->setNum(static_cast(param1), static_cast(format), static_cast(precision)); // Cast returned reference into pointer return &_ret; } -QByteArray* QByteArray_SetNum28(QByteArray* self, double param1, char f) { - QByteArray& _ret = self->setNum(static_cast(param1), static_cast(f)); +QByteArray* QByteArray_SetNum210(QByteArray* self, double param1, char format) { + QByteArray& _ret = self->setNum(static_cast(param1), static_cast(format)); // Cast returned reference into pointer return &_ret; } -QByteArray* QByteArray_SetNum32(QByteArray* self, double param1, char f, int prec) { - QByteArray& _ret = self->setNum(static_cast(param1), static_cast(f), static_cast(prec)); +QByteArray* QByteArray_SetNum32(QByteArray* self, double param1, char format, int precision) { + QByteArray& _ret = self->setNum(static_cast(param1), static_cast(format), static_cast(precision)); // Cast returned reference into pointer return &_ret; } @@ -1044,26 +986,38 @@ QByteArray* QByteArray_Number22(unsigned int param1, int base) { return new QByteArray(QByteArray::number(static_cast(param1), static_cast(base))); } -QByteArray* QByteArray_Number23(long long param1, int base) { +QByteArray* QByteArray_Number23(long param1, int base) { + return new QByteArray(QByteArray::number(static_cast(param1), static_cast(base))); +} + +QByteArray* QByteArray_Number24(unsigned long param1, int base) { + return new QByteArray(QByteArray::number(static_cast(param1), static_cast(base))); +} + +QByteArray* QByteArray_Number25(long long param1, int base) { return new QByteArray(QByteArray::number(static_cast(param1), static_cast(base))); } -QByteArray* QByteArray_Number24(unsigned long long param1, int base) { +QByteArray* QByteArray_Number26(unsigned long long param1, int base) { return new QByteArray(QByteArray::number(static_cast(param1), static_cast(base))); } -QByteArray* QByteArray_Number25(double param1, char f) { - return new QByteArray(QByteArray::number(static_cast(param1), static_cast(f))); +QByteArray* QByteArray_Number27(double param1, char format) { + return new QByteArray(QByteArray::number(static_cast(param1), static_cast(format))); } -QByteArray* QByteArray_Number3(double param1, char f, int prec) { - return new QByteArray(QByteArray::number(static_cast(param1), static_cast(f), static_cast(prec))); +QByteArray* QByteArray_Number3(double param1, char format, int precision) { + return new QByteArray(QByteArray::number(static_cast(param1), static_cast(format), static_cast(precision))); } QByteArray__FromBase64Result* QByteArray_FromBase64Encoding2(QByteArray* base64, int options) { return new QByteArray::FromBase64Result(QByteArray::fromBase64Encoding(*base64, static_cast(options))); } +QByteArray* QByteArray_FromBase642(QByteArray* base64, int options) { + return new QByteArray(QByteArray::fromBase64(*base64, static_cast(options))); +} + QByteArray* QByteArray_FromPercentEncoding2(QByteArray* pctEncoded, char percent) { return new QByteArray(QByteArray::fromPercentEncoding(*pctEncoded, static_cast(percent))); } @@ -1072,46 +1026,6 @@ void QByteArray_Delete(QByteArray* self) { delete self; } -QByteRef* QByteRef_new(QByteRef* param1) { - return new QByteRef(*param1); -} - -void QByteRef_OperatorAssign(QByteRef* self, char c) { - self->operator=(static_cast(c)); -} - -void QByteRef_OperatorAssignWithQByteRef(QByteRef* self, QByteRef* c) { - self->operator=(*c); -} - -bool QByteRef_OperatorEqual(const QByteRef* self, char c) { - return self->operator==(static_cast(c)); -} - -bool QByteRef_OperatorNotEqual(const QByteRef* self, char c) { - return self->operator!=(static_cast(c)); -} - -bool QByteRef_OperatorGreater(const QByteRef* self, char c) { - return self->operator>(static_cast(c)); -} - -bool QByteRef_OperatorGreaterOrEqual(const QByteRef* self, char c) { - return self->operator>=(static_cast(c)); -} - -bool QByteRef_OperatorLesser(const QByteRef* self, char c) { - return self->operator<(static_cast(c)); -} - -bool QByteRef_OperatorLesserOrEqual(const QByteRef* self, char c) { - return self->operator<=(static_cast(c)); -} - -void QByteRef_Delete(QByteRef* self) { - delete self; -} - QByteArray__FromBase64Result* QByteArray__FromBase64Result_new(QByteArray__FromBase64Result* param1) { return new QByteArray::FromBase64Result(*param1); } diff --git a/qt/gen_qbytearray.go b/qt/gen_qbytearray.go index 7aa9b7c..a699f22 100644 --- a/qt/gen_qbytearray.go +++ b/qt/gen_qbytearray.go @@ -13,20 +13,6 @@ import ( "unsafe" ) -type DeprecatedRefClassBehavior__EmittingClass int - -const ( - DeprecatedRefClassBehavior__QByteRef DeprecatedRefClassBehavior__EmittingClass = 0 - DeprecatedRefClassBehavior__QCharRef DeprecatedRefClassBehavior__EmittingClass = 1 -) - -type DeprecatedRefClassBehavior__WarningType int - -const ( - DeprecatedRefClassBehavior__OutOfRange DeprecatedRefClassBehavior__WarningType = 0 - DeprecatedRefClassBehavior__DelayedDetach DeprecatedRefClassBehavior__WarningType = 1 -) - type QByteArray__Base64Option int const ( @@ -47,54 +33,6 @@ const ( QByteArray__IllegalPadding QByteArray__Base64DecodingStatus = 3 ) -type QByteArrayDataPtr struct { - h *C.QByteArrayDataPtr -} - -func (this *QByteArrayDataPtr) cPointer() *C.QByteArrayDataPtr { - if this == nil { - return nil - } - return this.h -} - -func newQByteArrayDataPtr(h *C.QByteArrayDataPtr) *QByteArrayDataPtr { - if h == nil { - return nil - } - return &QByteArrayDataPtr{h: h} -} - -func newQByteArrayDataPtr_U(h unsafe.Pointer) *QByteArrayDataPtr { - return newQByteArrayDataPtr((*C.QByteArrayDataPtr)(h)) -} - -// NewQByteArrayDataPtr constructs a new QByteArrayDataPtr object. -func NewQByteArrayDataPtr() *QByteArrayDataPtr { - ret := C.QByteArrayDataPtr_new() - return newQByteArrayDataPtr(ret) -} - -// NewQByteArrayDataPtr2 constructs a new QByteArrayDataPtr object. -func NewQByteArrayDataPtr2(param1 *QByteArrayDataPtr) *QByteArrayDataPtr { - ret := C.QByteArrayDataPtr_new2(param1.cPointer()) - return newQByteArrayDataPtr(ret) -} - -// Delete this object from C++ memory. -func (this *QByteArrayDataPtr) Delete() { - C.QByteArrayDataPtr_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QByteArrayDataPtr) GoGC() { - runtime.SetFinalizer(this, func(this *QByteArrayDataPtr) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} - type QByteArray struct { h *C.QByteArray } @@ -132,14 +70,14 @@ func NewQByteArray2(param1 string) *QByteArray { } // NewQByteArray3 constructs a new QByteArray object. -func NewQByteArray3(size int, c int8) *QByteArray { - ret := C.QByteArray_new3((C.int)(size), (C.char)(c)) +func NewQByteArray3(size int64, c int8) *QByteArray { + ret := C.QByteArray_new3((C.ptrdiff_t)(size), (C.char)(c)) return newQByteArray(ret) } // NewQByteArray4 constructs a new QByteArray object. -func NewQByteArray4(size int, param2 Initialization) *QByteArray { - ret := C.QByteArray_new4((C.int)(size), (C.int)(param2)) +func NewQByteArray4(size int64, param2 Initialization) *QByteArray { + ret := C.QByteArray_new4((C.ptrdiff_t)(size), (C.int)(param2)) return newQByteArray(ret) } @@ -150,16 +88,10 @@ func NewQByteArray5(param1 *QByteArray) *QByteArray { } // NewQByteArray6 constructs a new QByteArray object. -func NewQByteArray6(dd QByteArrayDataPtr) *QByteArray { - ret := C.QByteArray_new6(dd.cPointer()) - return newQByteArray(ret) -} - -// NewQByteArray7 constructs a new QByteArray object. -func NewQByteArray7(param1 string, size int) *QByteArray { +func NewQByteArray6(param1 string, size int64) *QByteArray { param1_Cstring := C.CString(param1) defer C.free(unsafe.Pointer(param1_Cstring)) - ret := C.QByteArray_new7(param1_Cstring, (C.int)(size)) + ret := C.QByteArray_new6(param1_Cstring, (C.ptrdiff_t)(size)) return newQByteArray(ret) } @@ -177,28 +109,28 @@ func (this *QByteArray) Swap(other *QByteArray) { C.QByteArray_Swap(this.h, other.cPointer()) } -func (this *QByteArray) Size() int { - return (int)(C.QByteArray_Size(this.h)) -} - func (this *QByteArray) IsEmpty() bool { return (bool)(C.QByteArray_IsEmpty(this.h)) } -func (this *QByteArray) Resize(size int) { - C.QByteArray_Resize(this.h, (C.int)(size)) +func (this *QByteArray) Resize(size int64) { + C.QByteArray_Resize(this.h, (C.ptrdiff_t)(size)) +} + +func (this *QByteArray) Resize2(size int64, c int8) { + C.QByteArray_Resize2(this.h, (C.ptrdiff_t)(size), (C.char)(c)) } func (this *QByteArray) Fill(c int8) *QByteArray { return newQByteArray_U(unsafe.Pointer(C.QByteArray_Fill(this.h, (C.char)(c)))) } -func (this *QByteArray) Capacity() int { - return (int)(C.QByteArray_Capacity(this.h)) +func (this *QByteArray) Capacity() int64 { + return (int64)(C.QByteArray_Capacity(this.h)) } -func (this *QByteArray) Reserve(size int) { - C.QByteArray_Reserve(this.h, (C.int)(size)) +func (this *QByteArray) Reserve(size int64) { + C.QByteArray_Reserve(this.h, (C.ptrdiff_t)(size)) } func (this *QByteArray) Squeeze() { @@ -236,174 +168,132 @@ func (this *QByteArray) Clear() { C.QByteArray_Clear(this.h) } -func (this *QByteArray) At(i int) int8 { - return (int8)(C.QByteArray_At(this.h, (C.int)(i))) +func (this *QByteArray) At(i int64) int8 { + return (int8)(C.QByteArray_At(this.h, (C.ptrdiff_t)(i))) } -func (this *QByteArray) OperatorSubscript(i int) int8 { - return (int8)(C.QByteArray_OperatorSubscript(this.h, (C.int)(i))) -} - -func (this *QByteArray) OperatorSubscriptWithUint(i uint) int8 { - return (int8)(C.QByteArray_OperatorSubscriptWithUint(this.h, (C.uint)(i))) -} - -func (this *QByteArray) OperatorSubscriptWithInt(i int) *QByteRef { - _ret := C.QByteArray_OperatorSubscriptWithInt(this.h, (C.int)(i)) - _goptr := newQByteRef(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QByteArray) OperatorSubscript2(i uint) *QByteRef { - _ret := C.QByteArray_OperatorSubscript2(this.h, (C.uint)(i)) - _goptr := newQByteRef(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QByteArray) OperatorSubscript(i int64) int8 { + return (int8)(C.QByteArray_OperatorSubscript(this.h, (C.ptrdiff_t)(i))) } func (this *QByteArray) Front() int8 { return (int8)(C.QByteArray_Front(this.h)) } -func (this *QByteArray) Front2() *QByteRef { - _ret := C.QByteArray_Front2(this.h) - _goptr := newQByteRef(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - func (this *QByteArray) Back() int8 { return (int8)(C.QByteArray_Back(this.h)) } -func (this *QByteArray) Back2() *QByteRef { - _ret := C.QByteArray_Back2(this.h) - _goptr := newQByteRef(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QByteArray) IndexOf(c int8) int64 { + return (int64)(C.QByteArray_IndexOf(this.h, (C.char)(c))) } -func (this *QByteArray) IndexOf(c int8) int { - return (int)(C.QByteArray_IndexOf(this.h, (C.char)(c))) +func (this *QByteArray) IndexOfWithBv(bv QByteArrayView) int64 { + return (int64)(C.QByteArray_IndexOfWithBv(this.h, bv.cPointer())) } -func (this *QByteArray) IndexOfWithChar(c string) int { - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - return (int)(C.QByteArray_IndexOfWithChar(this.h, c_Cstring)) +func (this *QByteArray) LastIndexOf(c int8) int64 { + return (int64)(C.QByteArray_LastIndexOf(this.h, (C.char)(c))) } -func (this *QByteArray) IndexOfWithQByteArray(a *QByteArray) int { - return (int)(C.QByteArray_IndexOfWithQByteArray(this.h, a.cPointer())) +func (this *QByteArray) LastIndexOfWithBv(bv QByteArrayView) int64 { + return (int64)(C.QByteArray_LastIndexOfWithBv(this.h, bv.cPointer())) } -func (this *QByteArray) LastIndexOf(c int8) int { - return (int)(C.QByteArray_LastIndexOf(this.h, (C.char)(c))) -} - -func (this *QByteArray) LastIndexOfWithChar(c string) int { - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - return (int)(C.QByteArray_LastIndexOfWithChar(this.h, c_Cstring)) -} - -func (this *QByteArray) LastIndexOfWithQByteArray(a *QByteArray) int { - return (int)(C.QByteArray_LastIndexOfWithQByteArray(this.h, a.cPointer())) +func (this *QByteArray) LastIndexOf2(bv QByteArrayView, from int64) int64 { + return (int64)(C.QByteArray_LastIndexOf2(this.h, bv.cPointer(), (C.ptrdiff_t)(from))) } func (this *QByteArray) Contains(c int8) bool { return (bool)(C.QByteArray_Contains(this.h, (C.char)(c))) } -func (this *QByteArray) ContainsWithChar(a string) bool { - a_Cstring := C.CString(a) - defer C.free(unsafe.Pointer(a_Cstring)) - return (bool)(C.QByteArray_ContainsWithChar(this.h, a_Cstring)) +func (this *QByteArray) ContainsWithBv(bv QByteArrayView) bool { + return (bool)(C.QByteArray_ContainsWithBv(this.h, bv.cPointer())) } -func (this *QByteArray) ContainsWithQByteArray(a *QByteArray) bool { - return (bool)(C.QByteArray_ContainsWithQByteArray(this.h, a.cPointer())) +func (this *QByteArray) Count(c int8) int64 { + return (int64)(C.QByteArray_Count(this.h, (C.char)(c))) } -func (this *QByteArray) Count(c int8) int { - return (int)(C.QByteArray_Count(this.h, (C.char)(c))) +func (this *QByteArray) CountWithBv(bv QByteArrayView) int64 { + return (int64)(C.QByteArray_CountWithBv(this.h, bv.cPointer())) } -func (this *QByteArray) CountWithChar(a string) int { - a_Cstring := C.CString(a) - defer C.free(unsafe.Pointer(a_Cstring)) - return (int)(C.QByteArray_CountWithChar(this.h, a_Cstring)) +func (this *QByteArray) Compare(a QByteArrayView) int { + return (int)(C.QByteArray_Compare(this.h, a.cPointer())) } -func (this *QByteArray) CountWithQByteArray(a *QByteArray) int { - return (int)(C.QByteArray_CountWithQByteArray(this.h, a.cPointer())) -} - -func (this *QByteArray) Compare(c string) int { - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - return (int)(C.QByteArray_Compare(this.h, c_Cstring)) -} - -func (this *QByteArray) CompareWithQByteArray(a *QByteArray) int { - return (int)(C.QByteArray_CompareWithQByteArray(this.h, a.cPointer())) -} - -func (this *QByteArray) Left(lenVal int) *QByteArray { - _ret := C.QByteArray_Left(this.h, (C.int)(lenVal)) +func (this *QByteArray) Left(lenVal int64) *QByteArray { + _ret := C.QByteArray_Left(this.h, (C.ptrdiff_t)(lenVal)) _goptr := newQByteArray(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QByteArray) Right(lenVal int) *QByteArray { - _ret := C.QByteArray_Right(this.h, (C.int)(lenVal)) +func (this *QByteArray) Right(lenVal int64) *QByteArray { + _ret := C.QByteArray_Right(this.h, (C.ptrdiff_t)(lenVal)) _goptr := newQByteArray(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QByteArray) Mid(index int) *QByteArray { - _ret := C.QByteArray_Mid(this.h, (C.int)(index)) +func (this *QByteArray) Mid(index int64) *QByteArray { + _ret := C.QByteArray_Mid(this.h, (C.ptrdiff_t)(index)) _goptr := newQByteArray(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QByteArray) Chopped(lenVal int) *QByteArray { - _ret := C.QByteArray_Chopped(this.h, (C.int)(lenVal)) +func (this *QByteArray) First(n int64) *QByteArray { + _ret := C.QByteArray_First(this.h, (C.ptrdiff_t)(n)) _goptr := newQByteArray(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QByteArray) StartsWith(a *QByteArray) bool { - return (bool)(C.QByteArray_StartsWith(this.h, a.cPointer())) +func (this *QByteArray) Last(n int64) *QByteArray { + _ret := C.QByteArray_Last(this.h, (C.ptrdiff_t)(n)) + _goptr := newQByteArray(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QByteArray) Sliced(pos int64) *QByteArray { + _ret := C.QByteArray_Sliced(this.h, (C.ptrdiff_t)(pos)) + _goptr := newQByteArray(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QByteArray) Sliced2(pos int64, n int64) *QByteArray { + _ret := C.QByteArray_Sliced2(this.h, (C.ptrdiff_t)(pos), (C.ptrdiff_t)(n)) + _goptr := newQByteArray(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QByteArray) Chopped(lenVal int64) *QByteArray { + _ret := C.QByteArray_Chopped(this.h, (C.ptrdiff_t)(lenVal)) + _goptr := newQByteArray(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QByteArray) StartsWith(bv QByteArrayView) bool { + return (bool)(C.QByteArray_StartsWith(this.h, bv.cPointer())) } func (this *QByteArray) StartsWithWithChar(c int8) bool { return (bool)(C.QByteArray_StartsWithWithChar(this.h, (C.char)(c))) } -func (this *QByteArray) StartsWith2(c string) bool { - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - return (bool)(C.QByteArray_StartsWith2(this.h, c_Cstring)) +func (this *QByteArray) EndsWith(c int8) bool { + return (bool)(C.QByteArray_EndsWith(this.h, (C.char)(c))) } -func (this *QByteArray) EndsWith(a *QByteArray) bool { - return (bool)(C.QByteArray_EndsWith(this.h, a.cPointer())) -} - -func (this *QByteArray) EndsWithWithChar(c int8) bool { - return (bool)(C.QByteArray_EndsWithWithChar(this.h, (C.char)(c))) -} - -func (this *QByteArray) EndsWith2(c string) bool { - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - return (bool)(C.QByteArray_EndsWith2(this.h, c_Cstring)) +func (this *QByteArray) EndsWithWithBv(bv QByteArrayView) bool { + return (bool)(C.QByteArray_EndsWithWithBv(this.h, bv.cPointer())) } func (this *QByteArray) IsUpper() bool { @@ -414,12 +304,16 @@ func (this *QByteArray) IsLower() bool { return (bool)(C.QByteArray_IsLower(this.h)) } -func (this *QByteArray) Truncate(pos int) { - C.QByteArray_Truncate(this.h, (C.int)(pos)) +func (this *QByteArray) IsValidUtf8() bool { + return (bool)(C.QByteArray_IsValidUtf8(this.h)) } -func (this *QByteArray) Chop(n int) { - C.QByteArray_Chop(this.h, (C.int)(n)) +func (this *QByteArray) Truncate(pos int64) { + C.QByteArray_Truncate(this.h, (C.ptrdiff_t)(pos)) +} + +func (this *QByteArray) Chop(n int64) { + C.QByteArray_Chop(this.h, (C.ptrdiff_t)(n)) } func (this *QByteArray) ToLower() *QByteArray { @@ -450,15 +344,15 @@ func (this *QByteArray) Simplified() *QByteArray { return _goptr } -func (this *QByteArray) LeftJustified(width int) *QByteArray { - _ret := C.QByteArray_LeftJustified(this.h, (C.int)(width)) +func (this *QByteArray) LeftJustified(width int64) *QByteArray { + _ret := C.QByteArray_LeftJustified(this.h, (C.ptrdiff_t)(width)) _goptr := newQByteArray(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QByteArray) RightJustified(width int) *QByteArray { - _ret := C.QByteArray_RightJustified(this.h, (C.int)(width)) +func (this *QByteArray) RightJustified(width int64) *QByteArray { + _ret := C.QByteArray_RightJustified(this.h, (C.ptrdiff_t)(width)) _goptr := newQByteArray(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -468,8 +362,8 @@ func (this *QByteArray) Prepend(c int8) *QByteArray { return newQByteArray_U(unsafe.Pointer(C.QByteArray_Prepend(this.h, (C.char)(c)))) } -func (this *QByteArray) Prepend2(count int, c int8) *QByteArray { - return newQByteArray_U(unsafe.Pointer(C.QByteArray_Prepend2(this.h, (C.int)(count), (C.char)(c)))) +func (this *QByteArray) Prepend2(count int64, c int8) *QByteArray { + return newQByteArray_U(unsafe.Pointer(C.QByteArray_Prepend2(this.h, (C.ptrdiff_t)(count), (C.char)(c)))) } func (this *QByteArray) PrependWithChar(s string) *QByteArray { @@ -478,22 +372,26 @@ func (this *QByteArray) PrependWithChar(s string) *QByteArray { return newQByteArray_U(unsafe.Pointer(C.QByteArray_PrependWithChar(this.h, s_Cstring))) } -func (this *QByteArray) Prepend3(s string, lenVal int) *QByteArray { +func (this *QByteArray) Prepend3(s string, lenVal int64) *QByteArray { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - return newQByteArray_U(unsafe.Pointer(C.QByteArray_Prepend3(this.h, s_Cstring, (C.int)(lenVal)))) + return newQByteArray_U(unsafe.Pointer(C.QByteArray_Prepend3(this.h, s_Cstring, (C.ptrdiff_t)(lenVal)))) } func (this *QByteArray) PrependWithQByteArray(a *QByteArray) *QByteArray { return newQByteArray_U(unsafe.Pointer(C.QByteArray_PrependWithQByteArray(this.h, a.cPointer()))) } +func (this *QByteArray) PrependWithQByteArrayView(a QByteArrayView) *QByteArray { + return newQByteArray_U(unsafe.Pointer(C.QByteArray_PrependWithQByteArrayView(this.h, a.cPointer()))) +} + func (this *QByteArray) Append(c int8) *QByteArray { return newQByteArray_U(unsafe.Pointer(C.QByteArray_Append(this.h, (C.char)(c)))) } -func (this *QByteArray) Append2(count int, c int8) *QByteArray { - return newQByteArray_U(unsafe.Pointer(C.QByteArray_Append2(this.h, (C.int)(count), (C.char)(c)))) +func (this *QByteArray) Append2(count int64, c int8) *QByteArray { + return newQByteArray_U(unsafe.Pointer(C.QByteArray_Append2(this.h, (C.ptrdiff_t)(count), (C.char)(c)))) } func (this *QByteArray) AppendWithChar(s string) *QByteArray { @@ -502,104 +400,80 @@ func (this *QByteArray) AppendWithChar(s string) *QByteArray { return newQByteArray_U(unsafe.Pointer(C.QByteArray_AppendWithChar(this.h, s_Cstring))) } -func (this *QByteArray) Append3(s string, lenVal int) *QByteArray { +func (this *QByteArray) Append3(s string, lenVal int64) *QByteArray { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - return newQByteArray_U(unsafe.Pointer(C.QByteArray_Append3(this.h, s_Cstring, (C.int)(lenVal)))) + return newQByteArray_U(unsafe.Pointer(C.QByteArray_Append3(this.h, s_Cstring, (C.ptrdiff_t)(lenVal)))) } func (this *QByteArray) AppendWithQByteArray(a *QByteArray) *QByteArray { return newQByteArray_U(unsafe.Pointer(C.QByteArray_AppendWithQByteArray(this.h, a.cPointer()))) } -func (this *QByteArray) Insert(i int, c int8) *QByteArray { - return newQByteArray_U(unsafe.Pointer(C.QByteArray_Insert(this.h, (C.int)(i), (C.char)(c)))) +func (this *QByteArray) AppendWithQByteArrayView(a QByteArrayView) *QByteArray { + return newQByteArray_U(unsafe.Pointer(C.QByteArray_AppendWithQByteArrayView(this.h, a.cPointer()))) } -func (this *QByteArray) Insert2(i int, count int, c int8) *QByteArray { - return newQByteArray_U(unsafe.Pointer(C.QByteArray_Insert2(this.h, (C.int)(i), (C.int)(count), (C.char)(c)))) +func (this *QByteArray) Insert(i int64, data QByteArrayView) *QByteArray { + return newQByteArray_U(unsafe.Pointer(C.QByteArray_Insert(this.h, (C.ptrdiff_t)(i), data.cPointer()))) } -func (this *QByteArray) Insert3(i int, s string) *QByteArray { +func (this *QByteArray) Insert2(i int64, s string) *QByteArray { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - return newQByteArray_U(unsafe.Pointer(C.QByteArray_Insert3(this.h, (C.int)(i), s_Cstring))) + return newQByteArray_U(unsafe.Pointer(C.QByteArray_Insert2(this.h, (C.ptrdiff_t)(i), s_Cstring))) } -func (this *QByteArray) Insert4(i int, s string, lenVal int) *QByteArray { +func (this *QByteArray) Insert3(i int64, data *QByteArray) *QByteArray { + return newQByteArray_U(unsafe.Pointer(C.QByteArray_Insert3(this.h, (C.ptrdiff_t)(i), data.cPointer()))) +} + +func (this *QByteArray) Insert4(i int64, count int64, c int8) *QByteArray { + return newQByteArray_U(unsafe.Pointer(C.QByteArray_Insert4(this.h, (C.ptrdiff_t)(i), (C.ptrdiff_t)(count), (C.char)(c)))) +} + +func (this *QByteArray) Insert5(i int64, c int8) *QByteArray { + return newQByteArray_U(unsafe.Pointer(C.QByteArray_Insert5(this.h, (C.ptrdiff_t)(i), (C.char)(c)))) +} + +func (this *QByteArray) Insert6(i int64, s string, lenVal int64) *QByteArray { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - return newQByteArray_U(unsafe.Pointer(C.QByteArray_Insert4(this.h, (C.int)(i), s_Cstring, (C.int)(lenVal)))) + return newQByteArray_U(unsafe.Pointer(C.QByteArray_Insert6(this.h, (C.ptrdiff_t)(i), s_Cstring, (C.ptrdiff_t)(lenVal)))) } -func (this *QByteArray) Insert5(i int, a *QByteArray) *QByteArray { - return newQByteArray_U(unsafe.Pointer(C.QByteArray_Insert5(this.h, (C.int)(i), a.cPointer()))) +func (this *QByteArray) Remove(index int64, lenVal int64) *QByteArray { + return newQByteArray_U(unsafe.Pointer(C.QByteArray_Remove(this.h, (C.ptrdiff_t)(index), (C.ptrdiff_t)(lenVal)))) } -func (this *QByteArray) Remove(index int, lenVal int) *QByteArray { - return newQByteArray_U(unsafe.Pointer(C.QByteArray_Remove(this.h, (C.int)(index), (C.int)(lenVal)))) -} - -func (this *QByteArray) Replace(index int, lenVal int, s string) *QByteArray { +func (this *QByteArray) Replace(index int64, lenVal int64, s string, alen int64) *QByteArray { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) - return newQByteArray_U(unsafe.Pointer(C.QByteArray_Replace(this.h, (C.int)(index), (C.int)(lenVal), s_Cstring))) + return newQByteArray_U(unsafe.Pointer(C.QByteArray_Replace(this.h, (C.ptrdiff_t)(index), (C.ptrdiff_t)(lenVal), s_Cstring, (C.ptrdiff_t)(alen)))) } -func (this *QByteArray) Replace2(index int, lenVal int, s string, alen int) *QByteArray { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - return newQByteArray_U(unsafe.Pointer(C.QByteArray_Replace2(this.h, (C.int)(index), (C.int)(lenVal), s_Cstring, (C.int)(alen)))) +func (this *QByteArray) Replace2(index int64, lenVal int64, s QByteArrayView) *QByteArray { + return newQByteArray_U(unsafe.Pointer(C.QByteArray_Replace2(this.h, (C.ptrdiff_t)(index), (C.ptrdiff_t)(lenVal), s.cPointer()))) } -func (this *QByteArray) Replace3(index int, lenVal int, s *QByteArray) *QByteArray { - return newQByteArray_U(unsafe.Pointer(C.QByteArray_Replace3(this.h, (C.int)(index), (C.int)(lenVal), s.cPointer()))) +func (this *QByteArray) Replace3(before int8, after QByteArrayView) *QByteArray { + return newQByteArray_U(unsafe.Pointer(C.QByteArray_Replace3(this.h, (C.char)(before), after.cPointer()))) } -func (this *QByteArray) Replace4(before int8, after string) *QByteArray { - after_Cstring := C.CString(after) - defer C.free(unsafe.Pointer(after_Cstring)) - return newQByteArray_U(unsafe.Pointer(C.QByteArray_Replace4(this.h, (C.char)(before), after_Cstring))) -} - -func (this *QByteArray) Replace5(before int8, after *QByteArray) *QByteArray { - return newQByteArray_U(unsafe.Pointer(C.QByteArray_Replace5(this.h, (C.char)(before), after.cPointer()))) -} - -func (this *QByteArray) Replace6(before string, after string) *QByteArray { +func (this *QByteArray) Replace4(before string, bsize int64, after string, asize int64) *QByteArray { before_Cstring := C.CString(before) defer C.free(unsafe.Pointer(before_Cstring)) after_Cstring := C.CString(after) defer C.free(unsafe.Pointer(after_Cstring)) - return newQByteArray_U(unsafe.Pointer(C.QByteArray_Replace6(this.h, before_Cstring, after_Cstring))) + return newQByteArray_U(unsafe.Pointer(C.QByteArray_Replace4(this.h, before_Cstring, (C.ptrdiff_t)(bsize), after_Cstring, (C.ptrdiff_t)(asize)))) } -func (this *QByteArray) Replace7(before string, bsize int, after string, asize int) *QByteArray { - before_Cstring := C.CString(before) - defer C.free(unsafe.Pointer(before_Cstring)) - after_Cstring := C.CString(after) - defer C.free(unsafe.Pointer(after_Cstring)) - return newQByteArray_U(unsafe.Pointer(C.QByteArray_Replace7(this.h, before_Cstring, (C.int)(bsize), after_Cstring, (C.int)(asize)))) +func (this *QByteArray) Replace5(before QByteArrayView, after QByteArrayView) *QByteArray { + return newQByteArray_U(unsafe.Pointer(C.QByteArray_Replace5(this.h, before.cPointer(), after.cPointer()))) } -func (this *QByteArray) Replace8(before *QByteArray, after *QByteArray) *QByteArray { - return newQByteArray_U(unsafe.Pointer(C.QByteArray_Replace8(this.h, before.cPointer(), after.cPointer()))) -} - -func (this *QByteArray) Replace9(before *QByteArray, after string) *QByteArray { - after_Cstring := C.CString(after) - defer C.free(unsafe.Pointer(after_Cstring)) - return newQByteArray_U(unsafe.Pointer(C.QByteArray_Replace9(this.h, before.cPointer(), after_Cstring))) -} - -func (this *QByteArray) Replace10(before string, after *QByteArray) *QByteArray { - before_Cstring := C.CString(before) - defer C.free(unsafe.Pointer(before_Cstring)) - return newQByteArray_U(unsafe.Pointer(C.QByteArray_Replace10(this.h, before_Cstring, after.cPointer()))) -} - -func (this *QByteArray) Replace11(before int8, after int8) *QByteArray { - return newQByteArray_U(unsafe.Pointer(C.QByteArray_Replace11(this.h, (C.char)(before), (C.char)(after)))) +func (this *QByteArray) Replace6(before int8, after int8) *QByteArray { + return newQByteArray_U(unsafe.Pointer(C.QByteArray_Replace6(this.h, (C.char)(before), (C.char)(after)))) } func (this *QByteArray) OperatorPlusAssign(c int8) *QByteArray { @@ -616,6 +490,10 @@ func (this *QByteArray) OperatorPlusAssignWithQByteArray(a *QByteArray) *QByteAr return newQByteArray_U(unsafe.Pointer(C.QByteArray_OperatorPlusAssignWithQByteArray(this.h, a.cPointer()))) } +func (this *QByteArray) OperatorPlusAssignWithQByteArrayView(a QByteArrayView) *QByteArray { + return newQByteArray_U(unsafe.Pointer(C.QByteArray_OperatorPlusAssignWithQByteArrayView(this.h, a.cPointer()))) +} + func (this *QByteArray) Split(sep int8) []QByteArray { var _ma *C.struct_miqt_array = C.QByteArray_Split(this.h, (C.char)(sep)) _ret := make([]QByteArray, int(_ma.len)) @@ -630,63 +508,13 @@ func (this *QByteArray) Split(sep int8) []QByteArray { return _ret } -func (this *QByteArray) Repeated(times int) *QByteArray { - _ret := C.QByteArray_Repeated(this.h, (C.int)(times)) +func (this *QByteArray) Repeated(times int64) *QByteArray { + _ret := C.QByteArray_Repeated(this.h, (C.ptrdiff_t)(times)) _goptr := newQByteArray(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QByteArray) AppendWithQString(s string) *QByteArray { - s_ms := miqt_strdupg(s) - defer C.free(s_ms) - return newQByteArray_U(unsafe.Pointer(C.QByteArray_AppendWithQString(this.h, (*C.struct_miqt_string)(s_ms)))) -} - -func (this *QByteArray) Insert6(i int, s string) *QByteArray { - s_ms := miqt_strdupg(s) - defer C.free(s_ms) - return newQByteArray_U(unsafe.Pointer(C.QByteArray_Insert6(this.h, (C.int)(i), (*C.struct_miqt_string)(s_ms)))) -} - -func (this *QByteArray) Replace12(before string, after string) *QByteArray { - before_ms := miqt_strdupg(before) - defer C.free(before_ms) - after_Cstring := C.CString(after) - defer C.free(unsafe.Pointer(after_Cstring)) - return newQByteArray_U(unsafe.Pointer(C.QByteArray_Replace12(this.h, (*C.struct_miqt_string)(before_ms), after_Cstring))) -} - -func (this *QByteArray) Replace13(c int8, after string) *QByteArray { - after_ms := miqt_strdupg(after) - defer C.free(after_ms) - return newQByteArray_U(unsafe.Pointer(C.QByteArray_Replace13(this.h, (C.char)(c), (*C.struct_miqt_string)(after_ms)))) -} - -func (this *QByteArray) Replace14(before string, after *QByteArray) *QByteArray { - before_ms := miqt_strdupg(before) - defer C.free(before_ms) - return newQByteArray_U(unsafe.Pointer(C.QByteArray_Replace14(this.h, (*C.struct_miqt_string)(before_ms), after.cPointer()))) -} - -func (this *QByteArray) OperatorPlusAssignWithQString(s string) *QByteArray { - s_ms := miqt_strdupg(s) - defer C.free(s_ms) - return newQByteArray_U(unsafe.Pointer(C.QByteArray_OperatorPlusAssignWithQString(this.h, (*C.struct_miqt_string)(s_ms)))) -} - -func (this *QByteArray) IndexOfWithQString(s string) int { - s_ms := miqt_strdupg(s) - defer C.free(s_ms) - return (int)(C.QByteArray_IndexOfWithQString(this.h, (*C.struct_miqt_string)(s_ms))) -} - -func (this *QByteArray) LastIndexOfWithQString(s string) int { - s_ms := miqt_strdupg(s) - defer C.free(s_ms) - return (int)(C.QByteArray_LastIndexOfWithQString(this.h, (*C.struct_miqt_string)(s_ms))) -} - func (this *QByteArray) OperatorEqual(s2 string) bool { s2_ms := miqt_strdupg(s2) defer C.free(s2_ms) @@ -763,15 +591,8 @@ func (this *QByteArray) ToDouble() float64 { return (float64)(C.QByteArray_ToDouble(this.h)) } -func (this *QByteArray) ToBase64(options QByteArray__Base64Option) *QByteArray { - _ret := C.QByteArray_ToBase64(this.h, (C.int)(options)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QByteArray) ToBase642() *QByteArray { - _ret := C.QByteArray_ToBase642(this.h) +func (this *QByteArray) ToBase64() *QByteArray { + _ret := C.QByteArray_ToBase64(this.h) _goptr := newQByteArray(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -784,15 +605,15 @@ func (this *QByteArray) ToHex() *QByteArray { return _goptr } -func (this *QByteArray) ToHexWithSeparator(separator int8) *QByteArray { - _ret := C.QByteArray_ToHexWithSeparator(this.h, (C.char)(separator)) +func (this *QByteArray) ToPercentEncoding() *QByteArray { + _ret := C.QByteArray_ToPercentEncoding(this.h) _goptr := newQByteArray(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QByteArray) ToPercentEncoding() *QByteArray { - _ret := C.QByteArray_ToPercentEncoding(this.h) +func (this *QByteArray) PercentDecoded() *QByteArray { + _ret := C.QByteArray_PercentDecoded(this.h) _goptr := newQByteArray(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -814,6 +635,14 @@ func (this *QByteArray) SetNumWithUint(param1 uint) *QByteArray { return newQByteArray_U(unsafe.Pointer(C.QByteArray_SetNumWithUint(this.h, (C.uint)(param1)))) } +func (this *QByteArray) SetNumWithLong(param1 int64) *QByteArray { + return newQByteArray_U(unsafe.Pointer(C.QByteArray_SetNumWithLong(this.h, (C.long)(param1)))) +} + +func (this *QByteArray) SetNumWithUlong(param1 uint64) *QByteArray { + return newQByteArray_U(unsafe.Pointer(C.QByteArray_SetNumWithUlong(this.h, (C.ulong)(param1)))) +} + func (this *QByteArray) SetNumWithQlonglong(param1 int64) *QByteArray { return newQByteArray_U(unsafe.Pointer(C.QByteArray_SetNumWithQlonglong(this.h, (C.longlong)(param1)))) } @@ -830,10 +659,10 @@ func (this *QByteArray) SetNumWithDouble(param1 float64) *QByteArray { return newQByteArray_U(unsafe.Pointer(C.QByteArray_SetNumWithDouble(this.h, (C.double)(param1)))) } -func (this *QByteArray) SetRawData(a string, n uint) *QByteArray { +func (this *QByteArray) SetRawData(a string, n int64) *QByteArray { a_Cstring := C.CString(a) defer C.free(unsafe.Pointer(a_Cstring)) - return newQByteArray_U(unsafe.Pointer(C.QByteArray_SetRawData(this.h, a_Cstring, (C.uint)(n)))) + return newQByteArray_U(unsafe.Pointer(C.QByteArray_SetRawData(this.h, a_Cstring, (C.ptrdiff_t)(n)))) } func QByteArray_Number(param1 int) *QByteArray { @@ -850,6 +679,20 @@ func QByteArray_NumberWithUint(param1 uint) *QByteArray { return _goptr } +func QByteArray_NumberWithLong(param1 int64) *QByteArray { + _ret := C.QByteArray_NumberWithLong((C.long)(param1)) + _goptr := newQByteArray(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func QByteArray_NumberWithUlong(param1 uint64) *QByteArray { + _ret := C.QByteArray_NumberWithUlong((C.ulong)(param1)) + _goptr := newQByteArray(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + func QByteArray_NumberWithQlonglong(param1 int64) *QByteArray { _ret := C.QByteArray_NumberWithQlonglong((C.longlong)(param1)) _goptr := newQByteArray(_ret) @@ -871,10 +714,10 @@ func QByteArray_NumberWithDouble(param1 float64) *QByteArray { return _goptr } -func QByteArray_FromRawData(param1 string, size int) *QByteArray { - param1_Cstring := C.CString(param1) - defer C.free(unsafe.Pointer(param1_Cstring)) - _ret := C.QByteArray_FromRawData(param1_Cstring, (C.int)(size)) +func QByteArray_FromRawData(data string, size int64) *QByteArray { + data_Cstring := C.CString(data) + defer C.free(unsafe.Pointer(data_Cstring)) + _ret := C.QByteArray_FromRawData(data_Cstring, (C.ptrdiff_t)(size)) _goptr := newQByteArray(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -887,15 +730,8 @@ func QByteArray_FromBase64Encoding(base64 *QByteArray) *QByteArray__FromBase64Re return _goptr } -func QByteArray_FromBase64(base64 *QByteArray, options QByteArray__Base64Option) *QByteArray { - _ret := C.QByteArray_FromBase64(base64.cPointer(), (C.int)(options)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QByteArray_FromBase64WithBase64(base64 *QByteArray) *QByteArray { - _ret := C.QByteArray_FromBase64WithBase64(base64.cPointer()) +func QByteArray_FromBase64(base64 *QByteArray) *QByteArray { + _ret := C.QByteArray_FromBase64(base64.cPointer()) _goptr := newQByteArray(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -959,16 +795,20 @@ func (this *QByteArray) PushBack(c int8) { C.QByteArray_PushBack(this.h, (C.char)(c)) } -func (this *QByteArray) PushBackWithChar(c string) { - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - C.QByteArray_PushBackWithChar(this.h, c_Cstring) +func (this *QByteArray) PushBackWithChar(s string) { + s_Cstring := C.CString(s) + defer C.free(unsafe.Pointer(s_Cstring)) + C.QByteArray_PushBackWithChar(this.h, s_Cstring) } func (this *QByteArray) PushBackWithQByteArray(a *QByteArray) { C.QByteArray_PushBackWithQByteArray(this.h, a.cPointer()) } +func (this *QByteArray) PushBackWithQByteArrayView(a QByteArrayView) { + C.QByteArray_PushBackWithQByteArrayView(this.h, a.cPointer()) +} + func (this *QByteArray) PushFront(c int8) { C.QByteArray_PushFront(this.h, (C.char)(c)) } @@ -983,111 +823,94 @@ func (this *QByteArray) PushFrontWithQByteArray(a *QByteArray) { C.QByteArray_PushFrontWithQByteArray(this.h, a.cPointer()) } +func (this *QByteArray) PushFrontWithQByteArrayView(a QByteArrayView) { + C.QByteArray_PushFrontWithQByteArrayView(this.h, a.cPointer()) +} + func (this *QByteArray) ShrinkToFit() { C.QByteArray_ShrinkToFit(this.h) } -func (this *QByteArray) Count2() int { - return (int)(C.QByteArray_Count2(this.h)) +func (this *QByteArray) Erase(first string, last string) unsafe.Pointer { + first_Cstring := C.CString(first) + defer C.free(unsafe.Pointer(first_Cstring)) + last_Cstring := C.CString(last) + defer C.free(unsafe.Pointer(last_Cstring)) + _ret := C.QByteArray_Erase(this.h, first_Cstring, last_Cstring) + return (unsafe.Pointer)(_ret) } -func (this *QByteArray) Length() int { - return (int)(C.QByteArray_Length(this.h)) +func (this *QByteArray) Size() int64 { + return (int64)(C.QByteArray_Size(this.h)) +} + +func (this *QByteArray) Count2() int64 { + return (int64)(C.QByteArray_Count2(this.h)) +} + +func (this *QByteArray) Length() int64 { + return (int64)(C.QByteArray_Length(this.h)) } func (this *QByteArray) IsNull() bool { return (bool)(C.QByteArray_IsNull(this.h)) } -func (this *QByteArray) Fill2(c int8, size int) *QByteArray { - return newQByteArray_U(unsafe.Pointer(C.QByteArray_Fill2(this.h, (C.char)(c), (C.int)(size)))) +func (this *QByteArray) Fill2(c int8, size int64) *QByteArray { + return newQByteArray_U(unsafe.Pointer(C.QByteArray_Fill2(this.h, (C.char)(c), (C.ptrdiff_t)(size)))) } -func (this *QByteArray) IndexOf2(c int8, from int) int { - return (int)(C.QByteArray_IndexOf2(this.h, (C.char)(c), (C.int)(from))) +func (this *QByteArray) IndexOf2(c int8, from int64) int64 { + return (int64)(C.QByteArray_IndexOf2(this.h, (C.char)(c), (C.ptrdiff_t)(from))) } -func (this *QByteArray) IndexOf22(c string, from int) int { - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - return (int)(C.QByteArray_IndexOf22(this.h, c_Cstring, (C.int)(from))) +func (this *QByteArray) IndexOf22(bv QByteArrayView, from int64) int64 { + return (int64)(C.QByteArray_IndexOf22(this.h, bv.cPointer(), (C.ptrdiff_t)(from))) } -func (this *QByteArray) IndexOf23(a *QByteArray, from int) int { - return (int)(C.QByteArray_IndexOf23(this.h, a.cPointer(), (C.int)(from))) +func (this *QByteArray) LastIndexOf22(c int8, from int64) int64 { + return (int64)(C.QByteArray_LastIndexOf22(this.h, (C.char)(c), (C.ptrdiff_t)(from))) } -func (this *QByteArray) LastIndexOf2(c int8, from int) int { - return (int)(C.QByteArray_LastIndexOf2(this.h, (C.char)(c), (C.int)(from))) +func (this *QByteArray) Compare2(a QByteArrayView, cs CaseSensitivity) int { + return (int)(C.QByteArray_Compare2(this.h, a.cPointer(), (C.int)(cs))) } -func (this *QByteArray) LastIndexOf22(c string, from int) int { - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - return (int)(C.QByteArray_LastIndexOf22(this.h, c_Cstring, (C.int)(from))) -} - -func (this *QByteArray) LastIndexOf23(a *QByteArray, from int) int { - return (int)(C.QByteArray_LastIndexOf23(this.h, a.cPointer(), (C.int)(from))) -} - -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.int)(cs))) -} - -func (this *QByteArray) Compare22(a *QByteArray, cs CaseSensitivity) int { - return (int)(C.QByteArray_Compare22(this.h, a.cPointer(), (C.int)(cs))) -} - -func (this *QByteArray) Mid2(index int, lenVal int) *QByteArray { - _ret := C.QByteArray_Mid2(this.h, (C.int)(index), (C.int)(lenVal)) +func (this *QByteArray) Mid2(index int64, lenVal int64) *QByteArray { + _ret := C.QByteArray_Mid2(this.h, (C.ptrdiff_t)(index), (C.ptrdiff_t)(lenVal)) _goptr := newQByteArray(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QByteArray) LeftJustified2(width int, fill int8) *QByteArray { - _ret := C.QByteArray_LeftJustified2(this.h, (C.int)(width), (C.char)(fill)) +func (this *QByteArray) LeftJustified2(width int64, fill int8) *QByteArray { + _ret := C.QByteArray_LeftJustified2(this.h, (C.ptrdiff_t)(width), (C.char)(fill)) _goptr := newQByteArray(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QByteArray) LeftJustified3(width int, fill int8, truncate bool) *QByteArray { - _ret := C.QByteArray_LeftJustified3(this.h, (C.int)(width), (C.char)(fill), (C.bool)(truncate)) +func (this *QByteArray) LeftJustified3(width int64, fill int8, truncate bool) *QByteArray { + _ret := C.QByteArray_LeftJustified3(this.h, (C.ptrdiff_t)(width), (C.char)(fill), (C.bool)(truncate)) _goptr := newQByteArray(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QByteArray) RightJustified2(width int, fill int8) *QByteArray { - _ret := C.QByteArray_RightJustified2(this.h, (C.int)(width), (C.char)(fill)) +func (this *QByteArray) RightJustified2(width int64, fill int8) *QByteArray { + _ret := C.QByteArray_RightJustified2(this.h, (C.ptrdiff_t)(width), (C.char)(fill)) _goptr := newQByteArray(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QByteArray) RightJustified3(width int, fill int8, truncate bool) *QByteArray { - _ret := C.QByteArray_RightJustified3(this.h, (C.int)(width), (C.char)(fill), (C.bool)(truncate)) +func (this *QByteArray) RightJustified3(width int64, fill int8, truncate bool) *QByteArray { + _ret := C.QByteArray_RightJustified3(this.h, (C.ptrdiff_t)(width), (C.char)(fill), (C.bool)(truncate)) _goptr := newQByteArray(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QByteArray) IndexOf24(s string, from int) int { - s_ms := miqt_strdupg(s) - defer C.free(s_ms) - return (int)(C.QByteArray_IndexOf24(this.h, (*C.struct_miqt_string)(s_ms), (C.int)(from))) -} - -func (this *QByteArray) LastIndexOf24(s string, from int) int { - s_ms := miqt_strdupg(s) - defer C.free(s_ms) - return (int)(C.QByteArray_LastIndexOf24(this.h, (*C.struct_miqt_string)(s_ms), (C.int)(from))) -} - func (this *QByteArray) ToShort1(ok *bool) int16 { return (int16)(C.QByteArray_ToShort1(this.h, (*C.bool)(unsafe.Pointer(ok)))) } @@ -1160,6 +983,20 @@ func (this *QByteArray) ToDouble1(ok *bool) float64 { return (float64)(C.QByteArray_ToDouble1(this.h, (*C.bool)(unsafe.Pointer(ok)))) } +func (this *QByteArray) ToBase641(options QByteArray__Base64Option) *QByteArray { + _ret := C.QByteArray_ToBase641(this.h, (C.int)(options)) + _goptr := newQByteArray(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QByteArray) ToHex1(separator int8) *QByteArray { + _ret := C.QByteArray_ToHex1(this.h, (C.char)(separator)) + _goptr := newQByteArray(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + func (this *QByteArray) ToPercentEncoding1(exclude *QByteArray) *QByteArray { _ret := C.QByteArray_ToPercentEncoding1(this.h, exclude.cPointer()) _goptr := newQByteArray(_ret) @@ -1181,6 +1018,13 @@ func (this *QByteArray) ToPercentEncoding3(exclude *QByteArray, include *QByteAr return _goptr } +func (this *QByteArray) PercentDecoded1(percent int8) *QByteArray { + _ret := C.QByteArray_PercentDecoded1(this.h, (C.char)(percent)) + _goptr := newQByteArray(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + func (this *QByteArray) SetNum2(param1 int16, base int) *QByteArray { return newQByteArray_U(unsafe.Pointer(C.QByteArray_SetNum2(this.h, (C.int16_t)(param1), (C.int)(base)))) } @@ -1198,27 +1042,35 @@ func (this *QByteArray) SetNum24(param1 uint, base int) *QByteArray { } func (this *QByteArray) SetNum25(param1 int64, base int) *QByteArray { - return newQByteArray_U(unsafe.Pointer(C.QByteArray_SetNum25(this.h, (C.longlong)(param1), (C.int)(base)))) + return newQByteArray_U(unsafe.Pointer(C.QByteArray_SetNum25(this.h, (C.long)(param1), (C.int)(base)))) } func (this *QByteArray) SetNum26(param1 uint64, base int) *QByteArray { - return newQByteArray_U(unsafe.Pointer(C.QByteArray_SetNum26(this.h, (C.ulonglong)(param1), (C.int)(base)))) + return newQByteArray_U(unsafe.Pointer(C.QByteArray_SetNum26(this.h, (C.ulong)(param1), (C.int)(base)))) } -func (this *QByteArray) SetNum27(param1 float32, f int8) *QByteArray { - return newQByteArray_U(unsafe.Pointer(C.QByteArray_SetNum27(this.h, (C.float)(param1), (C.char)(f)))) +func (this *QByteArray) SetNum27(param1 int64, base int) *QByteArray { + return newQByteArray_U(unsafe.Pointer(C.QByteArray_SetNum27(this.h, (C.longlong)(param1), (C.int)(base)))) } -func (this *QByteArray) SetNum3(param1 float32, f int8, prec int) *QByteArray { - return newQByteArray_U(unsafe.Pointer(C.QByteArray_SetNum3(this.h, (C.float)(param1), (C.char)(f), (C.int)(prec)))) +func (this *QByteArray) SetNum28(param1 uint64, base int) *QByteArray { + return newQByteArray_U(unsafe.Pointer(C.QByteArray_SetNum28(this.h, (C.ulonglong)(param1), (C.int)(base)))) } -func (this *QByteArray) SetNum28(param1 float64, f int8) *QByteArray { - return newQByteArray_U(unsafe.Pointer(C.QByteArray_SetNum28(this.h, (C.double)(param1), (C.char)(f)))) +func (this *QByteArray) SetNum29(param1 float32, format int8) *QByteArray { + return newQByteArray_U(unsafe.Pointer(C.QByteArray_SetNum29(this.h, (C.float)(param1), (C.char)(format)))) } -func (this *QByteArray) SetNum32(param1 float64, f int8, prec int) *QByteArray { - return newQByteArray_U(unsafe.Pointer(C.QByteArray_SetNum32(this.h, (C.double)(param1), (C.char)(f), (C.int)(prec)))) +func (this *QByteArray) SetNum3(param1 float32, format int8, precision int) *QByteArray { + return newQByteArray_U(unsafe.Pointer(C.QByteArray_SetNum3(this.h, (C.float)(param1), (C.char)(format), (C.int)(precision)))) +} + +func (this *QByteArray) SetNum210(param1 float64, format int8) *QByteArray { + return newQByteArray_U(unsafe.Pointer(C.QByteArray_SetNum210(this.h, (C.double)(param1), (C.char)(format)))) +} + +func (this *QByteArray) SetNum32(param1 float64, format int8, precision int) *QByteArray { + return newQByteArray_U(unsafe.Pointer(C.QByteArray_SetNum32(this.h, (C.double)(param1), (C.char)(format), (C.int)(precision)))) } func QByteArray_Number2(param1 int, base int) *QByteArray { @@ -1236,28 +1088,42 @@ func QByteArray_Number22(param1 uint, base int) *QByteArray { } func QByteArray_Number23(param1 int64, base int) *QByteArray { - _ret := C.QByteArray_Number23((C.longlong)(param1), (C.int)(base)) + _ret := C.QByteArray_Number23((C.long)(param1), (C.int)(base)) _goptr := newQByteArray(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } func QByteArray_Number24(param1 uint64, base int) *QByteArray { - _ret := C.QByteArray_Number24((C.ulonglong)(param1), (C.int)(base)) + _ret := C.QByteArray_Number24((C.ulong)(param1), (C.int)(base)) _goptr := newQByteArray(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QByteArray_Number25(param1 float64, f int8) *QByteArray { - _ret := C.QByteArray_Number25((C.double)(param1), (C.char)(f)) +func QByteArray_Number25(param1 int64, base int) *QByteArray { + _ret := C.QByteArray_Number25((C.longlong)(param1), (C.int)(base)) _goptr := newQByteArray(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QByteArray_Number3(param1 float64, f int8, prec int) *QByteArray { - _ret := C.QByteArray_Number3((C.double)(param1), (C.char)(f), (C.int)(prec)) +func QByteArray_Number26(param1 uint64, base int) *QByteArray { + _ret := C.QByteArray_Number26((C.ulonglong)(param1), (C.int)(base)) + _goptr := newQByteArray(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func QByteArray_Number27(param1 float64, format int8) *QByteArray { + _ret := C.QByteArray_Number27((C.double)(param1), (C.char)(format)) + _goptr := newQByteArray(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func QByteArray_Number3(param1 float64, format int8, precision int) *QByteArray { + _ret := C.QByteArray_Number3((C.double)(param1), (C.char)(format), (C.int)(precision)) _goptr := newQByteArray(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -1270,6 +1136,13 @@ func QByteArray_FromBase64Encoding2(base64 *QByteArray, options QByteArray__Base return _goptr } +func QByteArray_FromBase642(base64 *QByteArray, options QByteArray__Base64Option) *QByteArray { + _ret := C.QByteArray_FromBase642(base64.cPointer(), (C.int)(options)) + _goptr := newQByteArray(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + func QByteArray_FromPercentEncoding2(pctEncoded *QByteArray, percent int8) *QByteArray { _ret := C.QByteArray_FromPercentEncoding2(pctEncoded.cPointer(), (C.char)(percent)) _goptr := newQByteArray(_ret) @@ -1291,80 +1164,6 @@ func (this *QByteArray) GoGC() { }) } -type QByteRef struct { - h *C.QByteRef -} - -func (this *QByteRef) cPointer() *C.QByteRef { - if this == nil { - return nil - } - return this.h -} - -func newQByteRef(h *C.QByteRef) *QByteRef { - if h == nil { - return nil - } - return &QByteRef{h: h} -} - -func newQByteRef_U(h unsafe.Pointer) *QByteRef { - return newQByteRef((*C.QByteRef)(h)) -} - -// NewQByteRef constructs a new QByteRef object. -func NewQByteRef(param1 *QByteRef) *QByteRef { - ret := C.QByteRef_new(param1.cPointer()) - return newQByteRef(ret) -} - -func (this *QByteRef) OperatorAssign(c int8) { - C.QByteRef_OperatorAssign(this.h, (C.char)(c)) -} - -func (this *QByteRef) OperatorAssignWithQByteRef(c *QByteRef) { - C.QByteRef_OperatorAssignWithQByteRef(this.h, c.cPointer()) -} - -func (this *QByteRef) OperatorEqual(c int8) bool { - return (bool)(C.QByteRef_OperatorEqual(this.h, (C.char)(c))) -} - -func (this *QByteRef) OperatorNotEqual(c int8) bool { - return (bool)(C.QByteRef_OperatorNotEqual(this.h, (C.char)(c))) -} - -func (this *QByteRef) OperatorGreater(c int8) bool { - return (bool)(C.QByteRef_OperatorGreater(this.h, (C.char)(c))) -} - -func (this *QByteRef) OperatorGreaterOrEqual(c int8) bool { - return (bool)(C.QByteRef_OperatorGreaterOrEqual(this.h, (C.char)(c))) -} - -func (this *QByteRef) OperatorLesser(c int8) bool { - return (bool)(C.QByteRef_OperatorLesser(this.h, (C.char)(c))) -} - -func (this *QByteRef) OperatorLesserOrEqual(c int8) bool { - return (bool)(C.QByteRef_OperatorLesserOrEqual(this.h, (C.char)(c))) -} - -// Delete this object from C++ memory. -func (this *QByteRef) Delete() { - C.QByteRef_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QByteRef) GoGC() { - runtime.SetFinalizer(this, func(this *QByteRef) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} - type QByteArray__FromBase64Result struct { h *C.QByteArray__FromBase64Result } diff --git a/qt/gen_qbytearray.h b/qt/gen_qbytearray.h index 5e55129..a7f2580 100644 --- a/qt/gen_qbytearray.h +++ b/qt/gen_qbytearray.h @@ -20,35 +20,28 @@ typedef QByteArray::FromBase64Result QByteArray__FromBase64Result; #else class QByteArray__FromBase64Result; #endif -class QByteArrayDataPtr; -class QByteRef; +class QByteArrayView; #else typedef struct QByteArray QByteArray; typedef struct QByteArray__FromBase64Result QByteArray__FromBase64Result; -typedef struct QByteArrayDataPtr QByteArrayDataPtr; -typedef struct QByteRef QByteRef; +typedef struct QByteArrayView QByteArrayView; #endif -QByteArrayDataPtr* QByteArrayDataPtr_new(); -QByteArrayDataPtr* QByteArrayDataPtr_new2(QByteArrayDataPtr* param1); -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, int param2); +QByteArray* QByteArray_new3(ptrdiff_t size, char c); +QByteArray* QByteArray_new4(ptrdiff_t size, int param2); QByteArray* QByteArray_new5(QByteArray* param1); -QByteArray* QByteArray_new6(QByteArrayDataPtr* dd); -QByteArray* QByteArray_new7(const char* param1, int size); +QByteArray* QByteArray_new6(const char* param1, ptrdiff_t size); void QByteArray_OperatorAssign(QByteArray* self, QByteArray* param1); void QByteArray_OperatorAssignWithStr(QByteArray* self, const char* str); void QByteArray_Swap(QByteArray* self, QByteArray* other); -int QByteArray_Size(const QByteArray* self); bool QByteArray_IsEmpty(const QByteArray* self); -void QByteArray_Resize(QByteArray* self, int size); +void QByteArray_Resize(QByteArray* self, ptrdiff_t size); +void QByteArray_Resize2(QByteArray* self, ptrdiff_t size, char c); QByteArray* QByteArray_Fill(QByteArray* self, char c); -int QByteArray_Capacity(const QByteArray* self); -void QByteArray_Reserve(QByteArray* self, int size); +ptrdiff_t QByteArray_Capacity(const QByteArray* self); +void QByteArray_Reserve(QByteArray* self, ptrdiff_t size); void QByteArray_Squeeze(QByteArray* self); char* QByteArray_Data(QByteArray* self); const char* QByteArray_Data2(const QByteArray* self); @@ -57,89 +50,74 @@ void QByteArray_Detach(QByteArray* self); bool QByteArray_IsDetached(const QByteArray* self); bool QByteArray_IsSharedWith(const QByteArray* self, QByteArray* other); void QByteArray_Clear(QByteArray* self); -char QByteArray_At(const QByteArray* self, int i); -char QByteArray_OperatorSubscript(const QByteArray* self, int i); -char QByteArray_OperatorSubscriptWithUint(const QByteArray* self, unsigned int i); -QByteRef* QByteArray_OperatorSubscriptWithInt(QByteArray* self, int i); -QByteRef* QByteArray_OperatorSubscript2(QByteArray* self, unsigned int i); +char QByteArray_At(const QByteArray* self, ptrdiff_t i); +char QByteArray_OperatorSubscript(const QByteArray* self, ptrdiff_t i); char QByteArray_Front(const QByteArray* self); -QByteRef* QByteArray_Front2(QByteArray* self); char QByteArray_Back(const QByteArray* self); -QByteRef* QByteArray_Back2(QByteArray* self); -int QByteArray_IndexOf(const QByteArray* self, char c); -int QByteArray_IndexOfWithChar(const QByteArray* self, const char* c); -int QByteArray_IndexOfWithQByteArray(const QByteArray* self, QByteArray* a); -int QByteArray_LastIndexOf(const QByteArray* self, char c); -int QByteArray_LastIndexOfWithChar(const QByteArray* self, const char* c); -int QByteArray_LastIndexOfWithQByteArray(const QByteArray* self, QByteArray* a); +ptrdiff_t QByteArray_IndexOf(const QByteArray* self, char c); +ptrdiff_t QByteArray_IndexOfWithBv(const QByteArray* self, QByteArrayView* bv); +ptrdiff_t QByteArray_LastIndexOf(const QByteArray* self, char c); +ptrdiff_t QByteArray_LastIndexOfWithBv(const QByteArray* self, QByteArrayView* bv); +ptrdiff_t QByteArray_LastIndexOf2(const QByteArray* self, QByteArrayView* bv, ptrdiff_t from); bool QByteArray_Contains(const QByteArray* self, char c); -bool QByteArray_ContainsWithChar(const QByteArray* self, const char* a); -bool QByteArray_ContainsWithQByteArray(const QByteArray* self, QByteArray* a); -int QByteArray_Count(const QByteArray* self, char c); -int QByteArray_CountWithChar(const QByteArray* self, const char* a); -int QByteArray_CountWithQByteArray(const QByteArray* self, QByteArray* a); -int QByteArray_Compare(const QByteArray* self, const char* c); -int QByteArray_CompareWithQByteArray(const QByteArray* self, QByteArray* a); -QByteArray* QByteArray_Left(const QByteArray* self, int lenVal); -QByteArray* QByteArray_Right(const QByteArray* self, int lenVal); -QByteArray* QByteArray_Mid(const QByteArray* self, int index); -QByteArray* QByteArray_Chopped(const QByteArray* self, int lenVal); -bool QByteArray_StartsWith(const QByteArray* self, QByteArray* a); +bool QByteArray_ContainsWithBv(const QByteArray* self, QByteArrayView* bv); +ptrdiff_t QByteArray_Count(const QByteArray* self, char c); +ptrdiff_t QByteArray_CountWithBv(const QByteArray* self, QByteArrayView* bv); +int QByteArray_Compare(const QByteArray* self, QByteArrayView* a); +QByteArray* QByteArray_Left(const QByteArray* self, ptrdiff_t lenVal); +QByteArray* QByteArray_Right(const QByteArray* self, ptrdiff_t lenVal); +QByteArray* QByteArray_Mid(const QByteArray* self, ptrdiff_t index); +QByteArray* QByteArray_First(const QByteArray* self, ptrdiff_t n); +QByteArray* QByteArray_Last(const QByteArray* self, ptrdiff_t n); +QByteArray* QByteArray_Sliced(const QByteArray* self, ptrdiff_t pos); +QByteArray* QByteArray_Sliced2(const QByteArray* self, ptrdiff_t pos, ptrdiff_t n); +QByteArray* QByteArray_Chopped(const QByteArray* self, ptrdiff_t lenVal); +bool QByteArray_StartsWith(const QByteArray* self, QByteArrayView* bv); bool QByteArray_StartsWithWithChar(const QByteArray* self, char c); -bool QByteArray_StartsWith2(const QByteArray* self, const char* c); -bool QByteArray_EndsWith(const QByteArray* self, QByteArray* a); -bool QByteArray_EndsWithWithChar(const QByteArray* self, char c); -bool QByteArray_EndsWith2(const QByteArray* self, const char* c); +bool QByteArray_EndsWith(const QByteArray* self, char c); +bool QByteArray_EndsWithWithBv(const QByteArray* self, QByteArrayView* bv); bool QByteArray_IsUpper(const QByteArray* self); bool QByteArray_IsLower(const QByteArray* self); -void QByteArray_Truncate(QByteArray* self, int pos); -void QByteArray_Chop(QByteArray* self, int n); +bool QByteArray_IsValidUtf8(const QByteArray* self); +void QByteArray_Truncate(QByteArray* self, ptrdiff_t pos); +void QByteArray_Chop(QByteArray* self, ptrdiff_t n); QByteArray* QByteArray_ToLower(const QByteArray* self); QByteArray* QByteArray_ToUpper(const QByteArray* self); QByteArray* QByteArray_Trimmed(const QByteArray* self); QByteArray* QByteArray_Simplified(const QByteArray* self); -QByteArray* QByteArray_LeftJustified(const QByteArray* self, int width); -QByteArray* QByteArray_RightJustified(const QByteArray* self, int width); +QByteArray* QByteArray_LeftJustified(const QByteArray* self, ptrdiff_t width); +QByteArray* QByteArray_RightJustified(const QByteArray* self, ptrdiff_t width); QByteArray* QByteArray_Prepend(QByteArray* self, char c); -QByteArray* QByteArray_Prepend2(QByteArray* self, int count, char c); +QByteArray* QByteArray_Prepend2(QByteArray* self, ptrdiff_t count, char c); QByteArray* QByteArray_PrependWithChar(QByteArray* self, const char* s); -QByteArray* QByteArray_Prepend3(QByteArray* self, const char* s, int lenVal); +QByteArray* QByteArray_Prepend3(QByteArray* self, const char* s, ptrdiff_t lenVal); QByteArray* QByteArray_PrependWithQByteArray(QByteArray* self, QByteArray* a); +QByteArray* QByteArray_PrependWithQByteArrayView(QByteArray* self, QByteArrayView* a); QByteArray* QByteArray_Append(QByteArray* self, char c); -QByteArray* QByteArray_Append2(QByteArray* self, int count, char c); +QByteArray* QByteArray_Append2(QByteArray* self, ptrdiff_t count, char c); QByteArray* QByteArray_AppendWithChar(QByteArray* self, const char* s); -QByteArray* QByteArray_Append3(QByteArray* self, const char* s, int lenVal); +QByteArray* QByteArray_Append3(QByteArray* self, const char* s, ptrdiff_t lenVal); QByteArray* QByteArray_AppendWithQByteArray(QByteArray* self, QByteArray* a); -QByteArray* QByteArray_Insert(QByteArray* self, int i, char c); -QByteArray* QByteArray_Insert2(QByteArray* self, int i, int count, char c); -QByteArray* QByteArray_Insert3(QByteArray* self, int i, const char* s); -QByteArray* QByteArray_Insert4(QByteArray* self, int i, const char* s, int lenVal); -QByteArray* QByteArray_Insert5(QByteArray* self, int i, QByteArray* a); -QByteArray* QByteArray_Remove(QByteArray* self, int index, int lenVal); -QByteArray* QByteArray_Replace(QByteArray* self, int index, int lenVal, const char* s); -QByteArray* QByteArray_Replace2(QByteArray* self, int index, int lenVal, const char* s, int alen); -QByteArray* QByteArray_Replace3(QByteArray* self, int index, int lenVal, QByteArray* s); -QByteArray* QByteArray_Replace4(QByteArray* self, char before, const char* after); -QByteArray* QByteArray_Replace5(QByteArray* self, char before, QByteArray* after); -QByteArray* QByteArray_Replace6(QByteArray* self, const char* before, const char* after); -QByteArray* QByteArray_Replace7(QByteArray* self, const char* before, int bsize, const char* after, int asize); -QByteArray* QByteArray_Replace8(QByteArray* self, QByteArray* before, QByteArray* after); -QByteArray* QByteArray_Replace9(QByteArray* self, QByteArray* before, const char* after); -QByteArray* QByteArray_Replace10(QByteArray* self, const char* before, QByteArray* after); -QByteArray* QByteArray_Replace11(QByteArray* self, char before, char after); +QByteArray* QByteArray_AppendWithQByteArrayView(QByteArray* self, QByteArrayView* a); +QByteArray* QByteArray_Insert(QByteArray* self, ptrdiff_t i, QByteArrayView* data); +QByteArray* QByteArray_Insert2(QByteArray* self, ptrdiff_t i, const char* s); +QByteArray* QByteArray_Insert3(QByteArray* self, ptrdiff_t i, QByteArray* data); +QByteArray* QByteArray_Insert4(QByteArray* self, ptrdiff_t i, ptrdiff_t count, char c); +QByteArray* QByteArray_Insert5(QByteArray* self, ptrdiff_t i, char c); +QByteArray* QByteArray_Insert6(QByteArray* self, ptrdiff_t i, const char* s, ptrdiff_t lenVal); +QByteArray* QByteArray_Remove(QByteArray* self, ptrdiff_t index, ptrdiff_t lenVal); +QByteArray* QByteArray_Replace(QByteArray* self, ptrdiff_t index, ptrdiff_t lenVal, const char* s, ptrdiff_t alen); +QByteArray* QByteArray_Replace2(QByteArray* self, ptrdiff_t index, ptrdiff_t lenVal, QByteArrayView* s); +QByteArray* QByteArray_Replace3(QByteArray* self, char before, QByteArrayView* after); +QByteArray* QByteArray_Replace4(QByteArray* self, const char* before, ptrdiff_t bsize, const char* after, ptrdiff_t asize); +QByteArray* QByteArray_Replace5(QByteArray* self, QByteArrayView* before, QByteArrayView* after); +QByteArray* QByteArray_Replace6(QByteArray* self, char before, char after); QByteArray* QByteArray_OperatorPlusAssign(QByteArray* self, char c); QByteArray* QByteArray_OperatorPlusAssignWithChar(QByteArray* self, const char* s); QByteArray* QByteArray_OperatorPlusAssignWithQByteArray(QByteArray* self, QByteArray* a); +QByteArray* QByteArray_OperatorPlusAssignWithQByteArrayView(QByteArray* self, QByteArrayView* a); struct miqt_array* QByteArray_Split(const QByteArray* self, char sep); -QByteArray* QByteArray_Repeated(const QByteArray* self, int times); -QByteArray* QByteArray_AppendWithQString(QByteArray* self, struct miqt_string* s); -QByteArray* QByteArray_Insert6(QByteArray* self, int i, struct miqt_string* s); -QByteArray* QByteArray_Replace12(QByteArray* self, struct miqt_string* before, const char* after); -QByteArray* QByteArray_Replace13(QByteArray* self, char c, struct miqt_string* after); -QByteArray* QByteArray_Replace14(QByteArray* self, struct miqt_string* before, QByteArray* after); -QByteArray* QByteArray_OperatorPlusAssignWithQString(QByteArray* self, struct miqt_string* s); -int QByteArray_IndexOfWithQString(const QByteArray* self, struct miqt_string* s); -int QByteArray_LastIndexOfWithQString(const QByteArray* self, struct miqt_string* s); +QByteArray* QByteArray_Repeated(const QByteArray* self, ptrdiff_t times); bool QByteArray_OperatorEqual(const QByteArray* self, struct miqt_string* s2); bool QByteArray_OperatorNotEqual(const QByteArray* self, struct miqt_string* s2); bool QByteArray_OperatorLesser(const QByteArray* self, struct miqt_string* s2); @@ -156,29 +134,31 @@ 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); -QByteArray* QByteArray_ToBase642(const QByteArray* self); +QByteArray* QByteArray_ToBase64(const QByteArray* self); QByteArray* QByteArray_ToHex(const QByteArray* self); -QByteArray* QByteArray_ToHexWithSeparator(const QByteArray* self, char separator); QByteArray* QByteArray_ToPercentEncoding(const QByteArray* self); +QByteArray* QByteArray_PercentDecoded(const QByteArray* self); QByteArray* QByteArray_SetNum(QByteArray* self, int16_t param1); QByteArray* QByteArray_SetNumWithUshort(QByteArray* self, uint16_t param1); QByteArray* QByteArray_SetNumWithInt(QByteArray* self, int param1); QByteArray* QByteArray_SetNumWithUint(QByteArray* self, unsigned int param1); +QByteArray* QByteArray_SetNumWithLong(QByteArray* self, long param1); +QByteArray* QByteArray_SetNumWithUlong(QByteArray* self, unsigned long param1); QByteArray* QByteArray_SetNumWithQlonglong(QByteArray* self, long long param1); QByteArray* QByteArray_SetNumWithQulonglong(QByteArray* self, unsigned long long param1); QByteArray* QByteArray_SetNumWithFloat(QByteArray* self, float param1); QByteArray* QByteArray_SetNumWithDouble(QByteArray* self, double param1); -QByteArray* QByteArray_SetRawData(QByteArray* self, const char* a, unsigned int n); +QByteArray* QByteArray_SetRawData(QByteArray* self, const char* a, ptrdiff_t n); QByteArray* QByteArray_Number(int param1); QByteArray* QByteArray_NumberWithUint(unsigned int param1); +QByteArray* QByteArray_NumberWithLong(long param1); +QByteArray* QByteArray_NumberWithUlong(unsigned long param1); QByteArray* QByteArray_NumberWithQlonglong(long long param1); QByteArray* QByteArray_NumberWithQulonglong(unsigned long long param1); QByteArray* QByteArray_NumberWithDouble(double param1); -QByteArray* QByteArray_FromRawData(const char* param1, int size); +QByteArray* QByteArray_FromRawData(const char* data, ptrdiff_t size); QByteArray__FromBase64Result* QByteArray_FromBase64Encoding(QByteArray* base64); -QByteArray* QByteArray_FromBase64(QByteArray* base64, int options); -QByteArray* QByteArray_FromBase64WithBase64(QByteArray* base64); +QByteArray* QByteArray_FromBase64(QByteArray* base64); QByteArray* QByteArray_FromHex(QByteArray* hexEncoded); QByteArray* QByteArray_FromPercentEncoding(QByteArray* pctEncoded); char* QByteArray_Begin(QByteArray* self); @@ -190,31 +170,29 @@ const char* QByteArray_End2(const QByteArray* self); const char* QByteArray_Cend(const QByteArray* self); const char* QByteArray_ConstEnd(const QByteArray* self); void QByteArray_PushBack(QByteArray* self, char c); -void QByteArray_PushBackWithChar(QByteArray* self, const char* c); +void QByteArray_PushBackWithChar(QByteArray* self, const char* s); void QByteArray_PushBackWithQByteArray(QByteArray* self, QByteArray* a); +void QByteArray_PushBackWithQByteArrayView(QByteArray* self, QByteArrayView* a); void QByteArray_PushFront(QByteArray* self, char c); void QByteArray_PushFrontWithChar(QByteArray* self, const char* c); void QByteArray_PushFrontWithQByteArray(QByteArray* self, QByteArray* a); +void QByteArray_PushFrontWithQByteArrayView(QByteArray* self, QByteArrayView* a); void QByteArray_ShrinkToFit(QByteArray* self); -int QByteArray_Count2(const QByteArray* self); -int QByteArray_Length(const QByteArray* self); +char* QByteArray_Erase(QByteArray* self, const char* first, const char* last); +ptrdiff_t QByteArray_Size(const QByteArray* self); +ptrdiff_t QByteArray_Count2(const QByteArray* self); +ptrdiff_t QByteArray_Length(const QByteArray* self); bool QByteArray_IsNull(const QByteArray* self); -QByteArray* QByteArray_Fill2(QByteArray* self, char c, int size); -int QByteArray_IndexOf2(const QByteArray* self, char c, int from); -int QByteArray_IndexOf22(const QByteArray* self, const char* c, int from); -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, 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); -QByteArray* QByteArray_RightJustified2(const QByteArray* self, int width, char fill); -QByteArray* QByteArray_RightJustified3(const QByteArray* self, int width, char fill, bool truncate); -int QByteArray_IndexOf24(const QByteArray* self, struct miqt_string* s, int from); -int QByteArray_LastIndexOf24(const QByteArray* self, struct miqt_string* s, int from); +QByteArray* QByteArray_Fill2(QByteArray* self, char c, ptrdiff_t size); +ptrdiff_t QByteArray_IndexOf2(const QByteArray* self, char c, ptrdiff_t from); +ptrdiff_t QByteArray_IndexOf22(const QByteArray* self, QByteArrayView* bv, ptrdiff_t from); +ptrdiff_t QByteArray_LastIndexOf22(const QByteArray* self, char c, ptrdiff_t from); +int QByteArray_Compare2(const QByteArray* self, QByteArrayView* a, int cs); +QByteArray* QByteArray_Mid2(const QByteArray* self, ptrdiff_t index, ptrdiff_t lenVal); +QByteArray* QByteArray_LeftJustified2(const QByteArray* self, ptrdiff_t width, char fill); +QByteArray* QByteArray_LeftJustified3(const QByteArray* self, ptrdiff_t width, char fill, bool truncate); +QByteArray* QByteArray_RightJustified2(const QByteArray* self, ptrdiff_t width, char fill); +QByteArray* QByteArray_RightJustified3(const QByteArray* self, ptrdiff_t width, char fill, bool truncate); int16_t QByteArray_ToShort1(const QByteArray* self, bool* ok); int16_t QByteArray_ToShort2(const QByteArray* self, bool* ok, int base); uint16_t QByteArray_ToUShort1(const QByteArray* self, bool* ok); @@ -233,40 +211,37 @@ 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_ToBase641(const QByteArray* self, int options); +QByteArray* QByteArray_ToHex1(const QByteArray* self, char separator); QByteArray* QByteArray_ToPercentEncoding1(const QByteArray* self, QByteArray* exclude); QByteArray* QByteArray_ToPercentEncoding2(const QByteArray* self, QByteArray* exclude, QByteArray* include); QByteArray* QByteArray_ToPercentEncoding3(const QByteArray* self, QByteArray* exclude, QByteArray* include, char percent); +QByteArray* QByteArray_PercentDecoded1(const QByteArray* self, char percent); QByteArray* QByteArray_SetNum2(QByteArray* self, int16_t param1, int base); QByteArray* QByteArray_SetNum22(QByteArray* self, uint16_t param1, int base); QByteArray* QByteArray_SetNum23(QByteArray* self, int param1, int base); QByteArray* QByteArray_SetNum24(QByteArray* self, unsigned int param1, int base); -QByteArray* QByteArray_SetNum25(QByteArray* self, long long param1, int base); -QByteArray* QByteArray_SetNum26(QByteArray* self, unsigned long long param1, int base); -QByteArray* QByteArray_SetNum27(QByteArray* self, float param1, char f); -QByteArray* QByteArray_SetNum3(QByteArray* self, float param1, char f, int prec); -QByteArray* QByteArray_SetNum28(QByteArray* self, double param1, char f); -QByteArray* QByteArray_SetNum32(QByteArray* self, double param1, char f, int prec); +QByteArray* QByteArray_SetNum25(QByteArray* self, long param1, int base); +QByteArray* QByteArray_SetNum26(QByteArray* self, unsigned long param1, int base); +QByteArray* QByteArray_SetNum27(QByteArray* self, long long param1, int base); +QByteArray* QByteArray_SetNum28(QByteArray* self, unsigned long long param1, int base); +QByteArray* QByteArray_SetNum29(QByteArray* self, float param1, char format); +QByteArray* QByteArray_SetNum3(QByteArray* self, float param1, char format, int precision); +QByteArray* QByteArray_SetNum210(QByteArray* self, double param1, char format); +QByteArray* QByteArray_SetNum32(QByteArray* self, double param1, char format, int precision); QByteArray* QByteArray_Number2(int param1, int base); QByteArray* QByteArray_Number22(unsigned int param1, int base); -QByteArray* QByteArray_Number23(long long param1, int base); -QByteArray* QByteArray_Number24(unsigned long long param1, int base); -QByteArray* QByteArray_Number25(double param1, char f); -QByteArray* QByteArray_Number3(double param1, char f, int prec); +QByteArray* QByteArray_Number23(long param1, int base); +QByteArray* QByteArray_Number24(unsigned long param1, int base); +QByteArray* QByteArray_Number25(long long param1, int base); +QByteArray* QByteArray_Number26(unsigned long long param1, int base); +QByteArray* QByteArray_Number27(double param1, char format); +QByteArray* QByteArray_Number3(double param1, char format, int precision); QByteArray__FromBase64Result* QByteArray_FromBase64Encoding2(QByteArray* base64, int options); +QByteArray* QByteArray_FromBase642(QByteArray* base64, int options); QByteArray* QByteArray_FromPercentEncoding2(QByteArray* pctEncoded, char percent); void QByteArray_Delete(QByteArray* self); -QByteRef* QByteRef_new(QByteRef* param1); -void QByteRef_OperatorAssign(QByteRef* self, char c); -void QByteRef_OperatorAssignWithQByteRef(QByteRef* self, QByteRef* c); -bool QByteRef_OperatorEqual(const QByteRef* self, char c); -bool QByteRef_OperatorNotEqual(const QByteRef* self, char c); -bool QByteRef_OperatorGreater(const QByteRef* self, char c); -bool QByteRef_OperatorGreaterOrEqual(const QByteRef* self, char c); -bool QByteRef_OperatorLesser(const QByteRef* self, char c); -bool QByteRef_OperatorLesserOrEqual(const QByteRef* self, char c); -void QByteRef_Delete(QByteRef* self); - QByteArray__FromBase64Result* QByteArray__FromBase64Result_new(QByteArray__FromBase64Result* param1); void QByteArray__FromBase64Result_Swap(QByteArray__FromBase64Result* self, QByteArray__FromBase64Result* other); QByteArray* QByteArray__FromBase64Result_OperatorMultiply(QByteArray__FromBase64Result* self); diff --git a/qt/gen_qbytearraymatcher.cpp b/qt/gen_qbytearraymatcher.cpp index 646d9cd..bb85d42 100644 --- a/qt/gen_qbytearraymatcher.cpp +++ b/qt/gen_qbytearraymatcher.cpp @@ -1,5 +1,6 @@ #include #include +#include #include #include "qbytearraymatcher.h" #include "gen_qbytearraymatcher.h" @@ -13,14 +14,22 @@ QByteArrayMatcher* QByteArrayMatcher_new2(QByteArray* pattern) { return new QByteArrayMatcher(*pattern); } -QByteArrayMatcher* QByteArrayMatcher_new3(const char* pattern, int length) { - return new QByteArrayMatcher(pattern, static_cast(length)); +QByteArrayMatcher* QByteArrayMatcher_new3(QByteArrayView* pattern) { + return new QByteArrayMatcher(*pattern); } -QByteArrayMatcher* QByteArrayMatcher_new4(QByteArrayMatcher* other) { +QByteArrayMatcher* QByteArrayMatcher_new4(const char* pattern) { + return new QByteArrayMatcher(pattern); +} + +QByteArrayMatcher* QByteArrayMatcher_new5(QByteArrayMatcher* other) { return new QByteArrayMatcher(*other); } +QByteArrayMatcher* QByteArrayMatcher_new6(const char* pattern, ptrdiff_t length) { + return new QByteArrayMatcher(pattern, (qsizetype)(length)); +} + void QByteArrayMatcher_OperatorAssign(QByteArrayMatcher* self, QByteArrayMatcher* other) { self->operator=(*other); } @@ -29,31 +38,31 @@ void QByteArrayMatcher_SetPattern(QByteArrayMatcher* self, QByteArray* pattern) self->setPattern(*pattern); } -int QByteArrayMatcher_IndexIn(const QByteArrayMatcher* self, QByteArray* ba) { - return self->indexIn(*ba); +ptrdiff_t QByteArrayMatcher_IndexIn(const QByteArrayMatcher* self, const char* str, ptrdiff_t lenVal) { + qsizetype _ret = self->indexIn(str, (qsizetype)(lenVal)); + return static_cast(_ret); } -int QByteArrayMatcher_IndexIn2(const QByteArrayMatcher* self, const char* str, int lenVal) { - return self->indexIn(str, static_cast(lenVal)); +ptrdiff_t QByteArrayMatcher_IndexInWithData(const QByteArrayMatcher* self, QByteArrayView* data) { + qsizetype _ret = self->indexIn(*data); + return static_cast(_ret); } QByteArray* QByteArrayMatcher_Pattern(const QByteArrayMatcher* self) { return new QByteArray(self->pattern()); } -int QByteArrayMatcher_IndexIn22(const QByteArrayMatcher* self, QByteArray* ba, int from) { - return self->indexIn(*ba, static_cast(from)); +ptrdiff_t QByteArrayMatcher_IndexIn3(const QByteArrayMatcher* self, const char* str, ptrdiff_t lenVal, ptrdiff_t from) { + qsizetype _ret = self->indexIn(str, (qsizetype)(lenVal), (qsizetype)(from)); + return static_cast(_ret); } -int QByteArrayMatcher_IndexIn3(const QByteArrayMatcher* self, const char* str, int lenVal, int from) { - return self->indexIn(str, static_cast(lenVal), static_cast(from)); +ptrdiff_t QByteArrayMatcher_IndexIn2(const QByteArrayMatcher* self, QByteArrayView* data, ptrdiff_t from) { + qsizetype _ret = self->indexIn(*data, (qsizetype)(from)); + return static_cast(_ret); } void QByteArrayMatcher_Delete(QByteArrayMatcher* self) { delete self; } -void QStaticByteArrayMatcherBase_Delete(QStaticByteArrayMatcherBase* self) { - delete self; -} - diff --git a/qt/gen_qbytearraymatcher.go b/qt/gen_qbytearraymatcher.go index 09cff21..ea37ca4 100644 --- a/qt/gen_qbytearraymatcher.go +++ b/qt/gen_qbytearraymatcher.go @@ -48,16 +48,30 @@ func NewQByteArrayMatcher2(pattern *QByteArray) *QByteArrayMatcher { } // NewQByteArrayMatcher3 constructs a new QByteArrayMatcher object. -func NewQByteArrayMatcher3(pattern string, length int) *QByteArrayMatcher { - pattern_Cstring := C.CString(pattern) - defer C.free(unsafe.Pointer(pattern_Cstring)) - ret := C.QByteArrayMatcher_new3(pattern_Cstring, (C.int)(length)) +func NewQByteArrayMatcher3(pattern QByteArrayView) *QByteArrayMatcher { + ret := C.QByteArrayMatcher_new3(pattern.cPointer()) return newQByteArrayMatcher(ret) } // NewQByteArrayMatcher4 constructs a new QByteArrayMatcher object. -func NewQByteArrayMatcher4(other *QByteArrayMatcher) *QByteArrayMatcher { - ret := C.QByteArrayMatcher_new4(other.cPointer()) +func NewQByteArrayMatcher4(pattern string) *QByteArrayMatcher { + pattern_Cstring := C.CString(pattern) + defer C.free(unsafe.Pointer(pattern_Cstring)) + ret := C.QByteArrayMatcher_new4(pattern_Cstring) + return newQByteArrayMatcher(ret) +} + +// NewQByteArrayMatcher5 constructs a new QByteArrayMatcher object. +func NewQByteArrayMatcher5(other *QByteArrayMatcher) *QByteArrayMatcher { + ret := C.QByteArrayMatcher_new5(other.cPointer()) + return newQByteArrayMatcher(ret) +} + +// NewQByteArrayMatcher6 constructs a new QByteArrayMatcher object. +func NewQByteArrayMatcher6(pattern string, length int64) *QByteArrayMatcher { + pattern_Cstring := C.CString(pattern) + defer C.free(unsafe.Pointer(pattern_Cstring)) + ret := C.QByteArrayMatcher_new6(pattern_Cstring, (C.ptrdiff_t)(length)) return newQByteArrayMatcher(ret) } @@ -69,14 +83,14 @@ func (this *QByteArrayMatcher) SetPattern(pattern *QByteArray) { C.QByteArrayMatcher_SetPattern(this.h, pattern.cPointer()) } -func (this *QByteArrayMatcher) IndexIn(ba *QByteArray) int { - return (int)(C.QByteArrayMatcher_IndexIn(this.h, ba.cPointer())) -} - -func (this *QByteArrayMatcher) IndexIn2(str string, lenVal int) int { +func (this *QByteArrayMatcher) IndexIn(str string, lenVal int64) int64 { str_Cstring := C.CString(str) defer C.free(unsafe.Pointer(str_Cstring)) - return (int)(C.QByteArrayMatcher_IndexIn2(this.h, str_Cstring, (C.int)(lenVal))) + return (int64)(C.QByteArrayMatcher_IndexIn(this.h, str_Cstring, (C.ptrdiff_t)(lenVal))) +} + +func (this *QByteArrayMatcher) IndexInWithData(data QByteArrayView) int64 { + return (int64)(C.QByteArrayMatcher_IndexInWithData(this.h, data.cPointer())) } func (this *QByteArrayMatcher) Pattern() *QByteArray { @@ -86,14 +100,14 @@ func (this *QByteArrayMatcher) Pattern() *QByteArray { return _goptr } -func (this *QByteArrayMatcher) IndexIn22(ba *QByteArray, from int) int { - return (int)(C.QByteArrayMatcher_IndexIn22(this.h, ba.cPointer(), (C.int)(from))) -} - -func (this *QByteArrayMatcher) IndexIn3(str string, lenVal int, from int) int { +func (this *QByteArrayMatcher) IndexIn3(str string, lenVal int64, from int64) int64 { str_Cstring := C.CString(str) defer C.free(unsafe.Pointer(str_Cstring)) - return (int)(C.QByteArrayMatcher_IndexIn3(this.h, str_Cstring, (C.int)(lenVal), (C.int)(from))) + return (int64)(C.QByteArrayMatcher_IndexIn3(this.h, str_Cstring, (C.ptrdiff_t)(lenVal), (C.ptrdiff_t)(from))) +} + +func (this *QByteArrayMatcher) IndexIn2(data QByteArrayView, from int64) int64 { + return (int64)(C.QByteArrayMatcher_IndexIn2(this.h, data.cPointer(), (C.ptrdiff_t)(from))) } // Delete this object from C++ memory. @@ -131,17 +145,3 @@ func newQStaticByteArrayMatcherBase(h *C.QStaticByteArrayMatcherBase) *QStaticBy func newQStaticByteArrayMatcherBase_U(h unsafe.Pointer) *QStaticByteArrayMatcherBase { return newQStaticByteArrayMatcherBase((*C.QStaticByteArrayMatcherBase)(h)) } - -// Delete this object from C++ memory. -func (this *QStaticByteArrayMatcherBase) Delete() { - C.QStaticByteArrayMatcherBase_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QStaticByteArrayMatcherBase) GoGC() { - runtime.SetFinalizer(this, func(this *QStaticByteArrayMatcherBase) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} diff --git a/qt/gen_qbytearraymatcher.h b/qt/gen_qbytearraymatcher.h index 5e06be3..25b4aac 100644 --- a/qt/gen_qbytearraymatcher.h +++ b/qt/gen_qbytearraymatcher.h @@ -16,27 +16,30 @@ extern "C" { #ifdef __cplusplus class QByteArray; class QByteArrayMatcher; +class QByteArrayView; class QStaticByteArrayMatcherBase; #else typedef struct QByteArray QByteArray; typedef struct QByteArrayMatcher QByteArrayMatcher; +typedef struct QByteArrayView QByteArrayView; typedef struct QStaticByteArrayMatcherBase QStaticByteArrayMatcherBase; #endif QByteArrayMatcher* QByteArrayMatcher_new(); QByteArrayMatcher* QByteArrayMatcher_new2(QByteArray* pattern); -QByteArrayMatcher* QByteArrayMatcher_new3(const char* pattern, int length); -QByteArrayMatcher* QByteArrayMatcher_new4(QByteArrayMatcher* other); +QByteArrayMatcher* QByteArrayMatcher_new3(QByteArrayView* pattern); +QByteArrayMatcher* QByteArrayMatcher_new4(const char* pattern); +QByteArrayMatcher* QByteArrayMatcher_new5(QByteArrayMatcher* other); +QByteArrayMatcher* QByteArrayMatcher_new6(const char* pattern, ptrdiff_t length); void QByteArrayMatcher_OperatorAssign(QByteArrayMatcher* self, QByteArrayMatcher* other); void QByteArrayMatcher_SetPattern(QByteArrayMatcher* self, QByteArray* pattern); -int QByteArrayMatcher_IndexIn(const QByteArrayMatcher* self, QByteArray* ba); -int QByteArrayMatcher_IndexIn2(const QByteArrayMatcher* self, const char* str, int lenVal); +ptrdiff_t QByteArrayMatcher_IndexIn(const QByteArrayMatcher* self, const char* str, ptrdiff_t lenVal); +ptrdiff_t QByteArrayMatcher_IndexInWithData(const QByteArrayMatcher* self, QByteArrayView* data); QByteArray* QByteArrayMatcher_Pattern(const QByteArrayMatcher* self); -int QByteArrayMatcher_IndexIn22(const QByteArrayMatcher* self, QByteArray* ba, int from); -int QByteArrayMatcher_IndexIn3(const QByteArrayMatcher* self, const char* str, int lenVal, int from); +ptrdiff_t QByteArrayMatcher_IndexIn3(const QByteArrayMatcher* self, const char* str, ptrdiff_t lenVal, ptrdiff_t from); +ptrdiff_t QByteArrayMatcher_IndexIn2(const QByteArrayMatcher* self, QByteArrayView* data, ptrdiff_t from); void QByteArrayMatcher_Delete(QByteArrayMatcher* self); -void QStaticByteArrayMatcherBase_Delete(QStaticByteArrayMatcherBase* self); #ifdef __cplusplus } /* extern C */ diff --git a/qt/gen_qbytearrayview.cpp b/qt/gen_qbytearrayview.cpp new file mode 100644 index 0000000..7218bd1 --- /dev/null +++ b/qt/gen_qbytearrayview.cpp @@ -0,0 +1,343 @@ +#include +#include +#include "qbytearrayview.h" +#include "gen_qbytearrayview.h" +#include "_cgo_export.h" + +QByteArrayView* QByteArrayView_new() { + return new QByteArrayView(); +} + +QByteArrayView* QByteArrayView_new2(QByteArrayView* param1) { + return new QByteArrayView(*param1); +} + +QByteArray* QByteArrayView_ToByteArray(const QByteArrayView* self) { + return new QByteArray(self->toByteArray()); +} + +ptrdiff_t QByteArrayView_Size(const QByteArrayView* self) { + qsizetype _ret = self->size(); + return static_cast(_ret); +} + +const char* QByteArrayView_Data(const QByteArrayView* self) { + QByteArrayView::const_pointer _ret = self->data(); + return const_cast(static_cast(_ret)); +} + +const char* QByteArrayView_ConstData(const QByteArrayView* self) { + QByteArrayView::const_pointer _ret = self->constData(); + return const_cast(static_cast(_ret)); +} + +char QByteArrayView_OperatorSubscript(const QByteArrayView* self, ptrdiff_t n) { + return self->operator[]((qsizetype)(n)); +} + +char QByteArrayView_At(const QByteArrayView* self, ptrdiff_t n) { + return self->at((qsizetype)(n)); +} + +QByteArrayView* QByteArrayView_First(const QByteArrayView* self, ptrdiff_t n) { + return new QByteArrayView(self->first((qsizetype)(n))); +} + +QByteArrayView* QByteArrayView_Last(const QByteArrayView* self, ptrdiff_t n) { + return new QByteArrayView(self->last((qsizetype)(n))); +} + +QByteArrayView* QByteArrayView_Sliced(const QByteArrayView* self, ptrdiff_t pos) { + return new QByteArrayView(self->sliced((qsizetype)(pos))); +} + +QByteArrayView* QByteArrayView_Sliced2(const QByteArrayView* self, ptrdiff_t pos, ptrdiff_t n) { + return new QByteArrayView(self->sliced((qsizetype)(pos), (qsizetype)(n))); +} + +QByteArrayView* QByteArrayView_Chopped(const QByteArrayView* self, ptrdiff_t lenVal) { + return new QByteArrayView(self->chopped((qsizetype)(lenVal))); +} + +void QByteArrayView_Truncate(QByteArrayView* self, ptrdiff_t n) { + self->truncate((qsizetype)(n)); +} + +void QByteArrayView_Chop(QByteArrayView* self, ptrdiff_t n) { + self->chop((qsizetype)(n)); +} + +QByteArrayView* QByteArrayView_Trimmed(const QByteArrayView* self) { + return new QByteArrayView(self->trimmed()); +} + +int16_t QByteArrayView_ToShort(const QByteArrayView* self) { + return self->toShort(); +} + +uint16_t QByteArrayView_ToUShort(const QByteArrayView* self) { + ushort _ret = self->toUShort(); + return static_cast(_ret); +} + +int QByteArrayView_ToInt(const QByteArrayView* self) { + return self->toInt(); +} + +unsigned int QByteArrayView_ToUInt(const QByteArrayView* self) { + uint _ret = self->toUInt(); + return static_cast(_ret); +} + +long QByteArrayView_ToLong(const QByteArrayView* self) { + return self->toLong(); +} + +unsigned long QByteArrayView_ToULong(const QByteArrayView* self) { + ulong _ret = self->toULong(); + return static_cast(_ret); +} + +long long QByteArrayView_ToLongLong(const QByteArrayView* self) { + qlonglong _ret = self->toLongLong(); + return static_cast(_ret); +} + +unsigned long long QByteArrayView_ToULongLong(const QByteArrayView* self) { + qulonglong _ret = self->toULongLong(); + return static_cast(_ret); +} + +float QByteArrayView_ToFloat(const QByteArrayView* self) { + return self->toFloat(); +} + +double QByteArrayView_ToDouble(const QByteArrayView* self) { + return self->toDouble(); +} + +bool QByteArrayView_StartsWith(const QByteArrayView* self, QByteArrayView* other) { + return self->startsWith(*other); +} + +bool QByteArrayView_StartsWithWithChar(const QByteArrayView* self, char c) { + return self->startsWith(static_cast(c)); +} + +bool QByteArrayView_EndsWith(const QByteArrayView* self, QByteArrayView* other) { + return self->endsWith(*other); +} + +bool QByteArrayView_EndsWithWithChar(const QByteArrayView* self, char c) { + return self->endsWith(static_cast(c)); +} + +ptrdiff_t QByteArrayView_IndexOf(const QByteArrayView* self, QByteArrayView* a) { + qsizetype _ret = self->indexOf(*a); + return static_cast(_ret); +} + +ptrdiff_t QByteArrayView_IndexOfWithCh(const QByteArrayView* self, char ch) { + qsizetype _ret = self->indexOf(static_cast(ch)); + return static_cast(_ret); +} + +bool QByteArrayView_Contains(const QByteArrayView* self, QByteArrayView* a) { + return self->contains(*a); +} + +bool QByteArrayView_ContainsWithChar(const QByteArrayView* self, char c) { + return self->contains(static_cast(c)); +} + +ptrdiff_t QByteArrayView_LastIndexOf(const QByteArrayView* self, QByteArrayView* a) { + qsizetype _ret = self->lastIndexOf(*a); + return static_cast(_ret); +} + +ptrdiff_t QByteArrayView_LastIndexOf2(const QByteArrayView* self, QByteArrayView* a, ptrdiff_t from) { + qsizetype _ret = self->lastIndexOf(*a, (qsizetype)(from)); + return static_cast(_ret); +} + +ptrdiff_t QByteArrayView_LastIndexOfWithCh(const QByteArrayView* self, char ch) { + qsizetype _ret = self->lastIndexOf(static_cast(ch)); + return static_cast(_ret); +} + +ptrdiff_t QByteArrayView_Count(const QByteArrayView* self, QByteArrayView* a) { + qsizetype _ret = self->count(*a); + return static_cast(_ret); +} + +ptrdiff_t QByteArrayView_CountWithCh(const QByteArrayView* self, char ch) { + qsizetype _ret = self->count(static_cast(ch)); + return static_cast(_ret); +} + +int QByteArrayView_Compare(const QByteArrayView* self, QByteArrayView* a) { + return self->compare(*a); +} + +bool QByteArrayView_IsValidUtf8(const QByteArrayView* self) { + return self->isValidUtf8(); +} + +const char* QByteArrayView_Begin(const QByteArrayView* self) { + QByteArrayView::const_iterator _ret = self->begin(); + return const_cast(static_cast(_ret)); +} + +const char* QByteArrayView_End(const QByteArrayView* self) { + QByteArrayView::const_iterator _ret = self->end(); + return const_cast(static_cast(_ret)); +} + +const char* QByteArrayView_Cbegin(const QByteArrayView* self) { + QByteArrayView::const_iterator _ret = self->cbegin(); + return const_cast(static_cast(_ret)); +} + +const char* QByteArrayView_Cend(const QByteArrayView* self) { + QByteArrayView::const_iterator _ret = self->cend(); + return const_cast(static_cast(_ret)); +} + +bool QByteArrayView_Empty(const QByteArrayView* self) { + return self->empty(); +} + +char QByteArrayView_Front(const QByteArrayView* self) { + return self->front(); +} + +char QByteArrayView_Back(const QByteArrayView* self) { + return self->back(); +} + +bool QByteArrayView_IsNull(const QByteArrayView* self) { + return self->isNull(); +} + +bool QByteArrayView_IsEmpty(const QByteArrayView* self) { + return self->isEmpty(); +} + +ptrdiff_t QByteArrayView_Length(const QByteArrayView* self) { + qsizetype _ret = self->length(); + return static_cast(_ret); +} + +char QByteArrayView_First2(const QByteArrayView* self) { + return self->first(); +} + +char QByteArrayView_Last2(const QByteArrayView* self) { + return self->last(); +} + +int16_t QByteArrayView_ToShort1(const QByteArrayView* self, bool* ok) { + return self->toShort(ok); +} + +int16_t QByteArrayView_ToShort2(const QByteArrayView* self, bool* ok, int base) { + return self->toShort(ok, static_cast(base)); +} + +uint16_t QByteArrayView_ToUShort1(const QByteArrayView* self, bool* ok) { + ushort _ret = self->toUShort(ok); + return static_cast(_ret); +} + +uint16_t QByteArrayView_ToUShort2(const QByteArrayView* self, bool* ok, int base) { + ushort _ret = self->toUShort(ok, static_cast(base)); + return static_cast(_ret); +} + +int QByteArrayView_ToInt1(const QByteArrayView* self, bool* ok) { + return self->toInt(ok); +} + +int QByteArrayView_ToInt2(const QByteArrayView* self, bool* ok, int base) { + return self->toInt(ok, static_cast(base)); +} + +unsigned int QByteArrayView_ToUInt1(const QByteArrayView* self, bool* ok) { + uint _ret = self->toUInt(ok); + return static_cast(_ret); +} + +unsigned int QByteArrayView_ToUInt2(const QByteArrayView* self, bool* ok, int base) { + uint _ret = self->toUInt(ok, static_cast(base)); + return static_cast(_ret); +} + +long QByteArrayView_ToLong1(const QByteArrayView* self, bool* ok) { + return self->toLong(ok); +} + +long QByteArrayView_ToLong2(const QByteArrayView* self, bool* ok, int base) { + return self->toLong(ok, static_cast(base)); +} + +unsigned long QByteArrayView_ToULong1(const QByteArrayView* self, bool* ok) { + ulong _ret = self->toULong(ok); + return static_cast(_ret); +} + +unsigned long QByteArrayView_ToULong2(const QByteArrayView* self, bool* ok, int base) { + ulong _ret = self->toULong(ok, static_cast(base)); + return static_cast(_ret); +} + +long long QByteArrayView_ToLongLong1(const QByteArrayView* self, bool* ok) { + qlonglong _ret = self->toLongLong(ok); + return static_cast(_ret); +} + +long long QByteArrayView_ToLongLong2(const QByteArrayView* self, bool* ok, int base) { + qlonglong _ret = self->toLongLong(ok, static_cast(base)); + return static_cast(_ret); +} + +unsigned long long QByteArrayView_ToULongLong1(const QByteArrayView* self, bool* ok) { + qulonglong _ret = self->toULongLong(ok); + return static_cast(_ret); +} + +unsigned long long QByteArrayView_ToULongLong2(const QByteArrayView* self, bool* ok, int base) { + qulonglong _ret = self->toULongLong(ok, static_cast(base)); + return static_cast(_ret); +} + +float QByteArrayView_ToFloat1(const QByteArrayView* self, bool* ok) { + return self->toFloat(ok); +} + +double QByteArrayView_ToDouble1(const QByteArrayView* self, bool* ok) { + return self->toDouble(ok); +} + +ptrdiff_t QByteArrayView_IndexOf2(const QByteArrayView* self, QByteArrayView* a, ptrdiff_t from) { + qsizetype _ret = self->indexOf(*a, (qsizetype)(from)); + return static_cast(_ret); +} + +ptrdiff_t QByteArrayView_IndexOf22(const QByteArrayView* self, char ch, ptrdiff_t from) { + qsizetype _ret = self->indexOf(static_cast(ch), (qsizetype)(from)); + return static_cast(_ret); +} + +ptrdiff_t QByteArrayView_LastIndexOf22(const QByteArrayView* self, char ch, ptrdiff_t from) { + qsizetype _ret = self->lastIndexOf(static_cast(ch), (qsizetype)(from)); + return static_cast(_ret); +} + +int QByteArrayView_Compare2(const QByteArrayView* self, QByteArrayView* a, int cs) { + return self->compare(*a, static_cast(cs)); +} + +void QByteArrayView_Delete(QByteArrayView* self) { + delete self; +} + diff --git a/qt/gen_qbytearrayview.go b/qt/gen_qbytearrayview.go new file mode 100644 index 0000000..33db1cc --- /dev/null +++ b/qt/gen_qbytearrayview.go @@ -0,0 +1,381 @@ +package qt + +/* + +#include "gen_qbytearrayview.h" +#include + +*/ +import "C" + +import ( + "runtime" + "unsafe" +) + +type QByteArrayView struct { + h *C.QByteArrayView +} + +func (this *QByteArrayView) cPointer() *C.QByteArrayView { + if this == nil { + return nil + } + return this.h +} + +func newQByteArrayView(h *C.QByteArrayView) *QByteArrayView { + if h == nil { + return nil + } + return &QByteArrayView{h: h} +} + +func newQByteArrayView_U(h unsafe.Pointer) *QByteArrayView { + return newQByteArrayView((*C.QByteArrayView)(h)) +} + +// NewQByteArrayView constructs a new QByteArrayView object. +func NewQByteArrayView() *QByteArrayView { + ret := C.QByteArrayView_new() + return newQByteArrayView(ret) +} + +// NewQByteArrayView2 constructs a new QByteArrayView object. +func NewQByteArrayView2(param1 *QByteArrayView) *QByteArrayView { + ret := C.QByteArrayView_new2(param1.cPointer()) + return newQByteArrayView(ret) +} + +func (this *QByteArrayView) ToByteArray() *QByteArray { + _ret := C.QByteArrayView_ToByteArray(this.h) + _goptr := newQByteArray(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QByteArrayView) Size() int64 { + return (int64)(C.QByteArrayView_Size(this.h)) +} + +func (this *QByteArrayView) Data() unsafe.Pointer { + _ret := C.QByteArrayView_Data(this.h) + return (unsafe.Pointer)(_ret) +} + +func (this *QByteArrayView) ConstData() unsafe.Pointer { + _ret := C.QByteArrayView_ConstData(this.h) + return (unsafe.Pointer)(_ret) +} + +func (this *QByteArrayView) OperatorSubscript(n int64) int8 { + return (int8)(C.QByteArrayView_OperatorSubscript(this.h, (C.ptrdiff_t)(n))) +} + +func (this *QByteArrayView) At(n int64) int8 { + return (int8)(C.QByteArrayView_At(this.h, (C.ptrdiff_t)(n))) +} + +func (this *QByteArrayView) First(n int64) *QByteArrayView { + _ret := C.QByteArrayView_First(this.h, (C.ptrdiff_t)(n)) + _goptr := newQByteArrayView(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QByteArrayView) Last(n int64) *QByteArrayView { + _ret := C.QByteArrayView_Last(this.h, (C.ptrdiff_t)(n)) + _goptr := newQByteArrayView(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QByteArrayView) Sliced(pos int64) *QByteArrayView { + _ret := C.QByteArrayView_Sliced(this.h, (C.ptrdiff_t)(pos)) + _goptr := newQByteArrayView(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QByteArrayView) Sliced2(pos int64, n int64) *QByteArrayView { + _ret := C.QByteArrayView_Sliced2(this.h, (C.ptrdiff_t)(pos), (C.ptrdiff_t)(n)) + _goptr := newQByteArrayView(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QByteArrayView) Chopped(lenVal int64) *QByteArrayView { + _ret := C.QByteArrayView_Chopped(this.h, (C.ptrdiff_t)(lenVal)) + _goptr := newQByteArrayView(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QByteArrayView) Truncate(n int64) { + C.QByteArrayView_Truncate(this.h, (C.ptrdiff_t)(n)) +} + +func (this *QByteArrayView) Chop(n int64) { + C.QByteArrayView_Chop(this.h, (C.ptrdiff_t)(n)) +} + +func (this *QByteArrayView) Trimmed() *QByteArrayView { + _ret := C.QByteArrayView_Trimmed(this.h) + _goptr := newQByteArrayView(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QByteArrayView) ToShort() int16 { + return (int16)(C.QByteArrayView_ToShort(this.h)) +} + +func (this *QByteArrayView) ToUShort() uint16 { + return (uint16)(C.QByteArrayView_ToUShort(this.h)) +} + +func (this *QByteArrayView) ToInt() int { + return (int)(C.QByteArrayView_ToInt(this.h)) +} + +func (this *QByteArrayView) ToUInt() uint { + return (uint)(C.QByteArrayView_ToUInt(this.h)) +} + +func (this *QByteArrayView) ToLong() int64 { + return (int64)(C.QByteArrayView_ToLong(this.h)) +} + +func (this *QByteArrayView) ToULong() uint64 { + return (uint64)(C.QByteArrayView_ToULong(this.h)) +} + +func (this *QByteArrayView) ToLongLong() int64 { + return (int64)(C.QByteArrayView_ToLongLong(this.h)) +} + +func (this *QByteArrayView) ToULongLong() uint64 { + return (uint64)(C.QByteArrayView_ToULongLong(this.h)) +} + +func (this *QByteArrayView) ToFloat() float32 { + return (float32)(C.QByteArrayView_ToFloat(this.h)) +} + +func (this *QByteArrayView) ToDouble() float64 { + return (float64)(C.QByteArrayView_ToDouble(this.h)) +} + +func (this *QByteArrayView) StartsWith(other QByteArrayView) bool { + return (bool)(C.QByteArrayView_StartsWith(this.h, other.cPointer())) +} + +func (this *QByteArrayView) StartsWithWithChar(c int8) bool { + return (bool)(C.QByteArrayView_StartsWithWithChar(this.h, (C.char)(c))) +} + +func (this *QByteArrayView) EndsWith(other QByteArrayView) bool { + return (bool)(C.QByteArrayView_EndsWith(this.h, other.cPointer())) +} + +func (this *QByteArrayView) EndsWithWithChar(c int8) bool { + return (bool)(C.QByteArrayView_EndsWithWithChar(this.h, (C.char)(c))) +} + +func (this *QByteArrayView) IndexOf(a QByteArrayView) int64 { + return (int64)(C.QByteArrayView_IndexOf(this.h, a.cPointer())) +} + +func (this *QByteArrayView) IndexOfWithCh(ch int8) int64 { + return (int64)(C.QByteArrayView_IndexOfWithCh(this.h, (C.char)(ch))) +} + +func (this *QByteArrayView) Contains(a QByteArrayView) bool { + return (bool)(C.QByteArrayView_Contains(this.h, a.cPointer())) +} + +func (this *QByteArrayView) ContainsWithChar(c int8) bool { + return (bool)(C.QByteArrayView_ContainsWithChar(this.h, (C.char)(c))) +} + +func (this *QByteArrayView) LastIndexOf(a QByteArrayView) int64 { + return (int64)(C.QByteArrayView_LastIndexOf(this.h, a.cPointer())) +} + +func (this *QByteArrayView) LastIndexOf2(a QByteArrayView, from int64) int64 { + return (int64)(C.QByteArrayView_LastIndexOf2(this.h, a.cPointer(), (C.ptrdiff_t)(from))) +} + +func (this *QByteArrayView) LastIndexOfWithCh(ch int8) int64 { + return (int64)(C.QByteArrayView_LastIndexOfWithCh(this.h, (C.char)(ch))) +} + +func (this *QByteArrayView) Count(a QByteArrayView) int64 { + return (int64)(C.QByteArrayView_Count(this.h, a.cPointer())) +} + +func (this *QByteArrayView) CountWithCh(ch int8) int64 { + return (int64)(C.QByteArrayView_CountWithCh(this.h, (C.char)(ch))) +} + +func (this *QByteArrayView) Compare(a QByteArrayView) int { + return (int)(C.QByteArrayView_Compare(this.h, a.cPointer())) +} + +func (this *QByteArrayView) IsValidUtf8() bool { + return (bool)(C.QByteArrayView_IsValidUtf8(this.h)) +} + +func (this *QByteArrayView) Begin() unsafe.Pointer { + _ret := C.QByteArrayView_Begin(this.h) + return (unsafe.Pointer)(_ret) +} + +func (this *QByteArrayView) End() unsafe.Pointer { + _ret := C.QByteArrayView_End(this.h) + return (unsafe.Pointer)(_ret) +} + +func (this *QByteArrayView) Cbegin() unsafe.Pointer { + _ret := C.QByteArrayView_Cbegin(this.h) + return (unsafe.Pointer)(_ret) +} + +func (this *QByteArrayView) Cend() unsafe.Pointer { + _ret := C.QByteArrayView_Cend(this.h) + return (unsafe.Pointer)(_ret) +} + +func (this *QByteArrayView) Empty() bool { + return (bool)(C.QByteArrayView_Empty(this.h)) +} + +func (this *QByteArrayView) Front() int8 { + return (int8)(C.QByteArrayView_Front(this.h)) +} + +func (this *QByteArrayView) Back() int8 { + return (int8)(C.QByteArrayView_Back(this.h)) +} + +func (this *QByteArrayView) IsNull() bool { + return (bool)(C.QByteArrayView_IsNull(this.h)) +} + +func (this *QByteArrayView) IsEmpty() bool { + return (bool)(C.QByteArrayView_IsEmpty(this.h)) +} + +func (this *QByteArrayView) Length() int64 { + return (int64)(C.QByteArrayView_Length(this.h)) +} + +func (this *QByteArrayView) First2() int8 { + return (int8)(C.QByteArrayView_First2(this.h)) +} + +func (this *QByteArrayView) Last2() int8 { + return (int8)(C.QByteArrayView_Last2(this.h)) +} + +func (this *QByteArrayView) ToShort1(ok *bool) int16 { + return (int16)(C.QByteArrayView_ToShort1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +} + +func (this *QByteArrayView) ToShort2(ok *bool, base int) int16 { + return (int16)(C.QByteArrayView_ToShort2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) +} + +func (this *QByteArrayView) ToUShort1(ok *bool) uint16 { + return (uint16)(C.QByteArrayView_ToUShort1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +} + +func (this *QByteArrayView) ToUShort2(ok *bool, base int) uint16 { + return (uint16)(C.QByteArrayView_ToUShort2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) +} + +func (this *QByteArrayView) ToInt1(ok *bool) int { + return (int)(C.QByteArrayView_ToInt1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +} + +func (this *QByteArrayView) ToInt2(ok *bool, base int) int { + return (int)(C.QByteArrayView_ToInt2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) +} + +func (this *QByteArrayView) ToUInt1(ok *bool) uint { + return (uint)(C.QByteArrayView_ToUInt1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +} + +func (this *QByteArrayView) ToUInt2(ok *bool, base int) uint { + return (uint)(C.QByteArrayView_ToUInt2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) +} + +func (this *QByteArrayView) ToLong1(ok *bool) int64 { + return (int64)(C.QByteArrayView_ToLong1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +} + +func (this *QByteArrayView) ToLong2(ok *bool, base int) int64 { + return (int64)(C.QByteArrayView_ToLong2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) +} + +func (this *QByteArrayView) ToULong1(ok *bool) uint64 { + return (uint64)(C.QByteArrayView_ToULong1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +} + +func (this *QByteArrayView) ToULong2(ok *bool, base int) uint64 { + return (uint64)(C.QByteArrayView_ToULong2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) +} + +func (this *QByteArrayView) ToLongLong1(ok *bool) int64 { + return (int64)(C.QByteArrayView_ToLongLong1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +} + +func (this *QByteArrayView) ToLongLong2(ok *bool, base int) int64 { + return (int64)(C.QByteArrayView_ToLongLong2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) +} + +func (this *QByteArrayView) ToULongLong1(ok *bool) uint64 { + return (uint64)(C.QByteArrayView_ToULongLong1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +} + +func (this *QByteArrayView) ToULongLong2(ok *bool, base int) uint64 { + return (uint64)(C.QByteArrayView_ToULongLong2(this.h, (*C.bool)(unsafe.Pointer(ok)), (C.int)(base))) +} + +func (this *QByteArrayView) ToFloat1(ok *bool) float32 { + return (float32)(C.QByteArrayView_ToFloat1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +} + +func (this *QByteArrayView) ToDouble1(ok *bool) float64 { + return (float64)(C.QByteArrayView_ToDouble1(this.h, (*C.bool)(unsafe.Pointer(ok)))) +} + +func (this *QByteArrayView) IndexOf2(a QByteArrayView, from int64) int64 { + return (int64)(C.QByteArrayView_IndexOf2(this.h, a.cPointer(), (C.ptrdiff_t)(from))) +} + +func (this *QByteArrayView) IndexOf22(ch int8, from int64) int64 { + return (int64)(C.QByteArrayView_IndexOf22(this.h, (C.char)(ch), (C.ptrdiff_t)(from))) +} + +func (this *QByteArrayView) LastIndexOf22(ch int8, from int64) int64 { + return (int64)(C.QByteArrayView_LastIndexOf22(this.h, (C.char)(ch), (C.ptrdiff_t)(from))) +} + +func (this *QByteArrayView) Compare2(a QByteArrayView, cs CaseSensitivity) int { + return (int)(C.QByteArrayView_Compare2(this.h, a.cPointer(), (C.int)(cs))) +} + +// Delete this object from C++ memory. +func (this *QByteArrayView) Delete() { + C.QByteArrayView_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QByteArrayView) GoGC() { + runtime.SetFinalizer(this, func(this *QByteArrayView) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} diff --git a/qt/gen_qbytearrayview.h b/qt/gen_qbytearrayview.h new file mode 100644 index 0000000..927cfdc --- /dev/null +++ b/qt/gen_qbytearrayview.h @@ -0,0 +1,105 @@ +#ifndef GEN_QBYTEARRAYVIEW_H +#define GEN_QBYTEARRAYVIEW_H + +#include +#include +#include + +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + +#include "binding.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +class QByteArray; +class QByteArrayView; +#else +typedef struct QByteArray QByteArray; +typedef struct QByteArrayView QByteArrayView; +#endif + +QByteArrayView* QByteArrayView_new(); +QByteArrayView* QByteArrayView_new2(QByteArrayView* param1); +QByteArray* QByteArrayView_ToByteArray(const QByteArrayView* self); +ptrdiff_t QByteArrayView_Size(const QByteArrayView* self); +const char* QByteArrayView_Data(const QByteArrayView* self); +const char* QByteArrayView_ConstData(const QByteArrayView* self); +char QByteArrayView_OperatorSubscript(const QByteArrayView* self, ptrdiff_t n); +char QByteArrayView_At(const QByteArrayView* self, ptrdiff_t n); +QByteArrayView* QByteArrayView_First(const QByteArrayView* self, ptrdiff_t n); +QByteArrayView* QByteArrayView_Last(const QByteArrayView* self, ptrdiff_t n); +QByteArrayView* QByteArrayView_Sliced(const QByteArrayView* self, ptrdiff_t pos); +QByteArrayView* QByteArrayView_Sliced2(const QByteArrayView* self, ptrdiff_t pos, ptrdiff_t n); +QByteArrayView* QByteArrayView_Chopped(const QByteArrayView* self, ptrdiff_t lenVal); +void QByteArrayView_Truncate(QByteArrayView* self, ptrdiff_t n); +void QByteArrayView_Chop(QByteArrayView* self, ptrdiff_t n); +QByteArrayView* QByteArrayView_Trimmed(const QByteArrayView* self); +int16_t QByteArrayView_ToShort(const QByteArrayView* self); +uint16_t QByteArrayView_ToUShort(const QByteArrayView* self); +int QByteArrayView_ToInt(const QByteArrayView* self); +unsigned int QByteArrayView_ToUInt(const QByteArrayView* self); +long QByteArrayView_ToLong(const QByteArrayView* self); +unsigned long QByteArrayView_ToULong(const QByteArrayView* self); +long long QByteArrayView_ToLongLong(const QByteArrayView* self); +unsigned long long QByteArrayView_ToULongLong(const QByteArrayView* self); +float QByteArrayView_ToFloat(const QByteArrayView* self); +double QByteArrayView_ToDouble(const QByteArrayView* self); +bool QByteArrayView_StartsWith(const QByteArrayView* self, QByteArrayView* other); +bool QByteArrayView_StartsWithWithChar(const QByteArrayView* self, char c); +bool QByteArrayView_EndsWith(const QByteArrayView* self, QByteArrayView* other); +bool QByteArrayView_EndsWithWithChar(const QByteArrayView* self, char c); +ptrdiff_t QByteArrayView_IndexOf(const QByteArrayView* self, QByteArrayView* a); +ptrdiff_t QByteArrayView_IndexOfWithCh(const QByteArrayView* self, char ch); +bool QByteArrayView_Contains(const QByteArrayView* self, QByteArrayView* a); +bool QByteArrayView_ContainsWithChar(const QByteArrayView* self, char c); +ptrdiff_t QByteArrayView_LastIndexOf(const QByteArrayView* self, QByteArrayView* a); +ptrdiff_t QByteArrayView_LastIndexOf2(const QByteArrayView* self, QByteArrayView* a, ptrdiff_t from); +ptrdiff_t QByteArrayView_LastIndexOfWithCh(const QByteArrayView* self, char ch); +ptrdiff_t QByteArrayView_Count(const QByteArrayView* self, QByteArrayView* a); +ptrdiff_t QByteArrayView_CountWithCh(const QByteArrayView* self, char ch); +int QByteArrayView_Compare(const QByteArrayView* self, QByteArrayView* a); +bool QByteArrayView_IsValidUtf8(const QByteArrayView* self); +const char* QByteArrayView_Begin(const QByteArrayView* self); +const char* QByteArrayView_End(const QByteArrayView* self); +const char* QByteArrayView_Cbegin(const QByteArrayView* self); +const char* QByteArrayView_Cend(const QByteArrayView* self); +bool QByteArrayView_Empty(const QByteArrayView* self); +char QByteArrayView_Front(const QByteArrayView* self); +char QByteArrayView_Back(const QByteArrayView* self); +bool QByteArrayView_IsNull(const QByteArrayView* self); +bool QByteArrayView_IsEmpty(const QByteArrayView* self); +ptrdiff_t QByteArrayView_Length(const QByteArrayView* self); +char QByteArrayView_First2(const QByteArrayView* self); +char QByteArrayView_Last2(const QByteArrayView* self); +int16_t QByteArrayView_ToShort1(const QByteArrayView* self, bool* ok); +int16_t QByteArrayView_ToShort2(const QByteArrayView* self, bool* ok, int base); +uint16_t QByteArrayView_ToUShort1(const QByteArrayView* self, bool* ok); +uint16_t QByteArrayView_ToUShort2(const QByteArrayView* self, bool* ok, int base); +int QByteArrayView_ToInt1(const QByteArrayView* self, bool* ok); +int QByteArrayView_ToInt2(const QByteArrayView* self, bool* ok, int base); +unsigned int QByteArrayView_ToUInt1(const QByteArrayView* self, bool* ok); +unsigned int QByteArrayView_ToUInt2(const QByteArrayView* self, bool* ok, int base); +long QByteArrayView_ToLong1(const QByteArrayView* self, bool* ok); +long QByteArrayView_ToLong2(const QByteArrayView* self, bool* ok, int base); +unsigned long QByteArrayView_ToULong1(const QByteArrayView* self, bool* ok); +unsigned long QByteArrayView_ToULong2(const QByteArrayView* self, bool* ok, int base); +long long QByteArrayView_ToLongLong1(const QByteArrayView* self, bool* ok); +long long QByteArrayView_ToLongLong2(const QByteArrayView* self, bool* ok, int base); +unsigned long long QByteArrayView_ToULongLong1(const QByteArrayView* self, bool* ok); +unsigned long long QByteArrayView_ToULongLong2(const QByteArrayView* self, bool* ok, int base); +float QByteArrayView_ToFloat1(const QByteArrayView* self, bool* ok); +double QByteArrayView_ToDouble1(const QByteArrayView* self, bool* ok); +ptrdiff_t QByteArrayView_IndexOf2(const QByteArrayView* self, QByteArrayView* a, ptrdiff_t from); +ptrdiff_t QByteArrayView_IndexOf22(const QByteArrayView* self, char ch, ptrdiff_t from); +ptrdiff_t QByteArrayView_LastIndexOf22(const QByteArrayView* self, char ch, ptrdiff_t from); +int QByteArrayView_Compare2(const QByteArrayView* self, QByteArrayView* a, int cs); +void QByteArrayView_Delete(QByteArrayView* self); + +#ifdef __cplusplus +} /* extern C */ +#endif + +#endif diff --git a/qt/gen_qcalendar.cpp b/qt/gen_qcalendar.cpp index 52ce970..36abaab 100644 --- a/qt/gen_qcalendar.cpp +++ b/qt/gen_qcalendar.cpp @@ -1,4 +1,6 @@ +#include #include +#define WORKAROUND_INNER_CLASS_DEFINITION_QCalendar__SystemId #define WORKAROUND_INNER_CLASS_DEFINITION_QCalendar__YearMonthDay #include #include @@ -18,6 +20,14 @@ QCalendar* QCalendar_new2(int system) { return new QCalendar(static_cast(system)); } +QCalendar* QCalendar_new3(QAnyStringView* name) { + return new QCalendar(*name); +} + +QCalendar* QCalendar_new4(QCalendar__SystemId* id) { + return new QCalendar(*id); +} + bool QCalendar_IsValid(const QCalendar* self) { return self->isValid(); } @@ -219,3 +229,19 @@ void QCalendar__YearMonthDay_Delete(QCalendar__YearMonthDay* self) { delete self; } +QCalendar__SystemId* QCalendar__SystemId_new() { + return new QCalendar::SystemId(); +} + +size_t QCalendar__SystemId_Index(const QCalendar__SystemId* self) { + return self->index(); +} + +bool QCalendar__SystemId_IsValid(const QCalendar__SystemId* self) { + return self->isValid(); +} + +void QCalendar__SystemId_Delete(QCalendar__SystemId* self) { + delete self; +} + diff --git a/qt/gen_qcalendar.go b/qt/gen_qcalendar.go index 1879a37..04f8af3 100644 --- a/qt/gen_qcalendar.go +++ b/qt/gen_qcalendar.go @@ -65,6 +65,18 @@ func NewQCalendar2(system QCalendar__System) *QCalendar { return newQCalendar(ret) } +// NewQCalendar3 constructs a new QCalendar object. +func NewQCalendar3(name QAnyStringView) *QCalendar { + ret := C.QCalendar_new3(name.cPointer()) + return newQCalendar(ret) +} + +// NewQCalendar4 constructs a new QCalendar object. +func NewQCalendar4(id QCalendar__SystemId) *QCalendar { + ret := C.QCalendar_new4(id.cPointer()) + return newQCalendar(ret) +} + func (this *QCalendar) IsValid() bool { return (bool)(C.QCalendar_IsValid(this.h)) } @@ -322,3 +334,53 @@ func (this *QCalendar__YearMonthDay) GoGC() { runtime.KeepAlive(this.h) }) } + +type QCalendar__SystemId struct { + h *C.QCalendar__SystemId +} + +func (this *QCalendar__SystemId) cPointer() *C.QCalendar__SystemId { + if this == nil { + return nil + } + return this.h +} + +func newQCalendar__SystemId(h *C.QCalendar__SystemId) *QCalendar__SystemId { + if h == nil { + return nil + } + return &QCalendar__SystemId{h: h} +} + +func newQCalendar__SystemId_U(h unsafe.Pointer) *QCalendar__SystemId { + return newQCalendar__SystemId((*C.QCalendar__SystemId)(h)) +} + +// NewQCalendar__SystemId constructs a new QCalendar::SystemId object. +func NewQCalendar__SystemId() *QCalendar__SystemId { + ret := C.QCalendar__SystemId_new() + return newQCalendar__SystemId(ret) +} + +func (this *QCalendar__SystemId) Index() uint64 { + return (uint64)(C.QCalendar__SystemId_Index(this.h)) +} + +func (this *QCalendar__SystemId) IsValid() bool { + return (bool)(C.QCalendar__SystemId_IsValid(this.h)) +} + +// Delete this object from C++ memory. +func (this *QCalendar__SystemId) Delete() { + C.QCalendar__SystemId_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QCalendar__SystemId) GoGC() { + runtime.SetFinalizer(this, func(this *QCalendar__SystemId) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} diff --git a/qt/gen_qcalendar.h b/qt/gen_qcalendar.h index 666dfd2..2a1bbcd 100644 --- a/qt/gen_qcalendar.h +++ b/qt/gen_qcalendar.h @@ -14,7 +14,13 @@ extern "C" { #endif #ifdef __cplusplus +class QAnyStringView; class QCalendar; +#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QCalendar__SystemId) +typedef QCalendar::SystemId QCalendar__SystemId; +#else +class QCalendar__SystemId; +#endif #if defined(WORKAROUND_INNER_CLASS_DEFINITION_QCalendar__YearMonthDay) typedef QCalendar::YearMonthDay QCalendar__YearMonthDay; #else @@ -23,7 +29,9 @@ class QCalendar__YearMonthDay; class QDate; class QLocale; #else +typedef struct QAnyStringView QAnyStringView; typedef struct QCalendar QCalendar; +typedef struct QCalendar__SystemId QCalendar__SystemId; typedef struct QCalendar__YearMonthDay QCalendar__YearMonthDay; typedef struct QDate QDate; typedef struct QLocale QLocale; @@ -31,6 +39,8 @@ typedef struct QLocale QLocale; QCalendar* QCalendar_new(); QCalendar* QCalendar_new2(int system); +QCalendar* QCalendar_new3(QAnyStringView* name); +QCalendar* QCalendar_new4(QCalendar__SystemId* id); bool QCalendar_IsValid(const QCalendar* self); int QCalendar_DaysInMonth(const QCalendar* self, int month); int QCalendar_DaysInYear(const QCalendar* self, int year); @@ -72,6 +82,11 @@ QCalendar__YearMonthDay* QCalendar__YearMonthDay_new4(int y, int m, int d); bool QCalendar__YearMonthDay_IsValid(const QCalendar__YearMonthDay* self); void QCalendar__YearMonthDay_Delete(QCalendar__YearMonthDay* self); +QCalendar__SystemId* QCalendar__SystemId_new(); +size_t QCalendar__SystemId_Index(const QCalendar__SystemId* self); +bool QCalendar__SystemId_IsValid(const QCalendar__SystemId* self); +void QCalendar__SystemId_Delete(QCalendar__SystemId* self); + #ifdef __cplusplus } /* extern C */ #endif diff --git a/qt/gen_qcalendarwidget.cpp b/qt/gen_qcalendarwidget.cpp index 40e1a5b..bd88035 100644 --- a/qt/gen_qcalendarwidget.cpp +++ b/qt/gen_qcalendarwidget.cpp @@ -35,13 +35,6 @@ struct miqt_string* QCalendarWidget_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QCalendarWidget_TrUtf8(const char* s) { - QString _ret = QCalendarWidget::trUtf8(s); - // 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()); -} - QSize* QCalendarWidget_SizeHint(const QCalendarWidget* self) { return new QSize(self->sizeHint()); } @@ -229,10 +222,8 @@ void QCalendarWidget_Clicked(QCalendarWidget* self, QDate* date) { } void QCalendarWidget_connect_Clicked(QCalendarWidget* self, void* slot) { - QCalendarWidget::connect(self, static_cast(&QCalendarWidget::clicked), self, [=](const QDate& date) { - const QDate& date_ret = date; - // Cast returned reference into pointer - QDate* sigval1 = const_cast(&date_ret); + QCalendarWidget::connect(self, static_cast(&QCalendarWidget::clicked), self, [=](QDate date) { + QDate* sigval1 = new QDate(date); miqt_exec_callback_QCalendarWidget_Clicked(slot, sigval1); }); } @@ -242,10 +233,8 @@ void QCalendarWidget_Activated(QCalendarWidget* self, QDate* date) { } void QCalendarWidget_connect_Activated(QCalendarWidget* self, void* slot) { - QCalendarWidget::connect(self, static_cast(&QCalendarWidget::activated), self, [=](const QDate& date) { - const QDate& date_ret = date; - // Cast returned reference into pointer - QDate* sigval1 = const_cast(&date_ret); + QCalendarWidget::connect(self, static_cast(&QCalendarWidget::activated), self, [=](QDate date) { + QDate* sigval1 = new QDate(date); miqt_exec_callback_QCalendarWidget_Activated(slot, sigval1); }); } @@ -276,20 +265,6 @@ struct miqt_string* QCalendarWidget_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QCalendarWidget_TrUtf82(const char* s, const char* c) { - QString _ret = QCalendarWidget::trUtf8(s, c); - // 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* QCalendarWidget_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QCalendarWidget::trUtf8(s, c, static_cast(n)); - // 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 QCalendarWidget_Delete(QCalendarWidget* self) { delete self; } diff --git a/qt/gen_qcalendarwidget.go b/qt/gen_qcalendarwidget.go index 2939dfc..1c871e4 100644 --- a/qt/gen_qcalendarwidget.go +++ b/qt/gen_qcalendarwidget.go @@ -91,15 +91,6 @@ func QCalendarWidget_Tr(s string) string { return _ret } -func QCalendarWidget_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QCalendarWidget_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QCalendarWidget) SizeHint() *QSize { _ret := C.QCalendarWidget_SizeHint(this.h) _goptr := newQSize(_ret) @@ -136,7 +127,7 @@ func (this *QCalendarWidget) MinimumDate() *QDate { return _goptr } -func (this *QCalendarWidget) SetMinimumDate(date *QDate) { +func (this *QCalendarWidget) SetMinimumDate(date QDate) { C.QCalendarWidget_SetMinimumDate(this.h, date.cPointer()) } @@ -147,7 +138,7 @@ func (this *QCalendarWidget) MaximumDate() *QDate { return _goptr } -func (this *QCalendarWidget) SetMaximumDate(date *QDate) { +func (this *QCalendarWidget) SetMaximumDate(date QDate) { C.QCalendarWidget_SetMaximumDate(this.h, date.cPointer()) } @@ -224,14 +215,14 @@ func (this *QCalendarWidget) SetWeekdayTextFormat(dayOfWeek DayOfWeek, format *Q C.QCalendarWidget_SetWeekdayTextFormat(this.h, (C.int)(dayOfWeek), format.cPointer()) } -func (this *QCalendarWidget) DateTextFormatWithDate(date *QDate) *QTextCharFormat { +func (this *QCalendarWidget) DateTextFormatWithDate(date QDate) *QTextCharFormat { _ret := C.QCalendarWidget_DateTextFormatWithDate(this.h, date.cPointer()) _goptr := newQTextCharFormat(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCalendarWidget) SetDateTextFormat(date *QDate, format *QTextCharFormat) { +func (this *QCalendarWidget) SetDateTextFormat(date QDate, format *QTextCharFormat) { C.QCalendarWidget_SetDateTextFormat(this.h, date.cPointer(), format.cPointer()) } @@ -251,11 +242,11 @@ func (this *QCalendarWidget) SetDateEditAcceptDelay(delay int) { C.QCalendarWidget_SetDateEditAcceptDelay(this.h, (C.int)(delay)) } -func (this *QCalendarWidget) SetSelectedDate(date *QDate) { +func (this *QCalendarWidget) SetSelectedDate(date QDate) { C.QCalendarWidget_SetSelectedDate(this.h, date.cPointer()) } -func (this *QCalendarWidget) SetDateRange(min *QDate, max *QDate) { +func (this *QCalendarWidget) SetDateRange(min QDate, max QDate) { C.QCalendarWidget_SetDateRange(this.h, min.cPointer(), max.cPointer()) } @@ -312,42 +303,48 @@ func miqt_exec_callback_QCalendarWidget_SelectionChanged(cb *C.void) { gofunc() } -func (this *QCalendarWidget) Clicked(date *QDate) { +func (this *QCalendarWidget) Clicked(date QDate) { C.QCalendarWidget_Clicked(this.h, date.cPointer()) } -func (this *QCalendarWidget) OnClicked(slot func(date *QDate)) { +func (this *QCalendarWidget) OnClicked(slot func(date QDate)) { C.QCalendarWidget_connect_Clicked(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QCalendarWidget_Clicked func miqt_exec_callback_QCalendarWidget_Clicked(cb *C.void, date *C.QDate) { - gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(date *QDate)) + gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(date QDate)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - slotval1 := newQDate_U(unsafe.Pointer(date)) + date_ret := date + date_goptr := newQDate(date_ret) + date_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + slotval1 := *date_goptr gofunc(slotval1) } -func (this *QCalendarWidget) Activated(date *QDate) { +func (this *QCalendarWidget) Activated(date QDate) { C.QCalendarWidget_Activated(this.h, date.cPointer()) } -func (this *QCalendarWidget) OnActivated(slot func(date *QDate)) { +func (this *QCalendarWidget) OnActivated(slot func(date QDate)) { C.QCalendarWidget_connect_Activated(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QCalendarWidget_Activated func miqt_exec_callback_QCalendarWidget_Activated(cb *C.void, date *C.QDate) { - gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(date *QDate)) + gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(date QDate)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - slotval1 := newQDate_U(unsafe.Pointer(date)) + date_ret := date + date_goptr := newQDate(date_ret) + date_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + slotval1 := *date_goptr gofunc(slotval1) } @@ -396,28 +393,6 @@ func QCalendarWidget_Tr3(s string, c string, n int) string { return _ret } -func QCalendarWidget_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QCalendarWidget_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QCalendarWidget_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QCalendarWidget_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QCalendarWidget) Delete() { C.QCalendarWidget_Delete(this.h) diff --git a/qt/gen_qcalendarwidget.h b/qt/gen_qcalendarwidget.h index 4e144cc..f7e2d97 100644 --- a/qt/gen_qcalendarwidget.h +++ b/qt/gen_qcalendarwidget.h @@ -36,7 +36,6 @@ QCalendarWidget* QCalendarWidget_new2(QWidget* parent); QMetaObject* QCalendarWidget_MetaObject(const QCalendarWidget* self); void* QCalendarWidget_Metacast(QCalendarWidget* self, const char* param1); struct miqt_string* QCalendarWidget_Tr(const char* s); -struct miqt_string* QCalendarWidget_TrUtf8(const char* s); QSize* QCalendarWidget_SizeHint(const QCalendarWidget* self); QSize* QCalendarWidget_MinimumSizeHint(const QCalendarWidget* self); QDate* QCalendarWidget_SelectedDate(const QCalendarWidget* self); @@ -89,8 +88,6 @@ void QCalendarWidget_CurrentPageChanged(QCalendarWidget* self, int year, int mon void QCalendarWidget_connect_CurrentPageChanged(QCalendarWidget* self, void* slot); struct miqt_string* QCalendarWidget_Tr2(const char* s, const char* c); struct miqt_string* QCalendarWidget_Tr3(const char* s, const char* c, int n); -struct miqt_string* QCalendarWidget_TrUtf82(const char* s, const char* c); -struct miqt_string* QCalendarWidget_TrUtf83(const char* s, const char* c, int n); void QCalendarWidget_Delete(QCalendarWidget* self); #ifdef __cplusplus diff --git a/qt/gen_qcborarray.cpp b/qt/gen_qcborarray.cpp index 2a5de07..503db0e 100644 --- a/qt/gen_qcborarray.cpp +++ b/qt/gen_qcborarray.cpp @@ -2,6 +2,7 @@ #define WORKAROUND_INNER_CLASS_DEFINITION_QCborArray__ConstIterator #define WORKAROUND_INNER_CLASS_DEFINITION_QCborArray__Iterator #include +#include #include #include #include @@ -260,11 +261,15 @@ QCborValueRef* QCborArray__Iterator_OperatorMultiply(const QCborArray__Iterator* return new QCborValueRef(self->operator*()); } -QCborValueRef* QCborArray__Iterator_OperatorMinusGreater(const QCborArray__Iterator* self) { +QCborValueRef* QCborArray__Iterator_OperatorMinusGreater(QCborArray__Iterator* self) { return self->operator->(); } -QCborValueRef* QCborArray__Iterator_OperatorSubscript(QCborArray__Iterator* self, ptrdiff_t j) { +QCborValueConstRef* QCborArray__Iterator_OperatorMinusGreater2(const QCborArray__Iterator* self) { + return (QCborValueConstRef*) self->operator->(); +} + +QCborValueRef* QCborArray__Iterator_OperatorSubscript(const QCborArray__Iterator* self, ptrdiff_t j) { return new QCborValueRef(self->operator[]((qsizetype)(j))); } @@ -377,16 +382,16 @@ void QCborArray__ConstIterator_OperatorAssign(QCborArray__ConstIterator* self, Q self->operator=(*other); } -QCborValueRef* QCborArray__ConstIterator_OperatorMultiply(const QCborArray__ConstIterator* self) { - return new QCborValueRef(self->operator*()); +QCborValueConstRef* QCborArray__ConstIterator_OperatorMultiply(const QCborArray__ConstIterator* self) { + return new QCborValueConstRef(self->operator*()); } -QCborValueRef* QCborArray__ConstIterator_OperatorMinusGreater(const QCborArray__ConstIterator* self) { - return (QCborValueRef*) self->operator->(); +QCborValueConstRef* QCborArray__ConstIterator_OperatorMinusGreater(const QCborArray__ConstIterator* self) { + return (QCborValueConstRef*) self->operator->(); } -QCborValueRef* QCborArray__ConstIterator_OperatorSubscript(QCborArray__ConstIterator* self, ptrdiff_t j) { - return new QCborValueRef(self->operator[]((qsizetype)(j))); +QCborValueConstRef* QCborArray__ConstIterator_OperatorSubscript(const QCborArray__ConstIterator* self, ptrdiff_t j) { + return new QCborValueConstRef(self->operator[]((qsizetype)(j))); } bool QCborArray__ConstIterator_OperatorEqual(const QCborArray__ConstIterator* self, QCborArray__Iterator* o) { diff --git a/qt/gen_qcborarray.go b/qt/gen_qcborarray.go index 7da8702..36b7fb2 100644 --- a/qt/gen_qcborarray.go +++ b/qt/gen_qcborarray.go @@ -415,6 +415,10 @@ func (this *QCborArray__Iterator) OperatorMinusGreater() *QCborValueRef { return newQCborValueRef_U(unsafe.Pointer(C.QCborArray__Iterator_OperatorMinusGreater(this.h))) } +func (this *QCborArray__Iterator) OperatorMinusGreater2() *QCborValueConstRef { + return newQCborValueConstRef_U(unsafe.Pointer(C.QCborArray__Iterator_OperatorMinusGreater2(this.h))) +} + func (this *QCborArray__Iterator) OperatorSubscript(j int64) *QCborValueRef { _ret := C.QCborArray__Iterator_OperatorSubscript(this.h, (C.ptrdiff_t)(j)) _goptr := newQCborValueRef(_ret) @@ -570,20 +574,20 @@ func (this *QCborArray__ConstIterator) OperatorAssign(other *QCborArray__ConstIt C.QCborArray__ConstIterator_OperatorAssign(this.h, other.cPointer()) } -func (this *QCborArray__ConstIterator) OperatorMultiply() *QCborValueRef { +func (this *QCborArray__ConstIterator) OperatorMultiply() *QCborValueConstRef { _ret := C.QCborArray__ConstIterator_OperatorMultiply(this.h) - _goptr := newQCborValueRef(_ret) + _goptr := newQCborValueConstRef(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborArray__ConstIterator) OperatorMinusGreater() *QCborValueRef { - return newQCborValueRef_U(unsafe.Pointer(C.QCborArray__ConstIterator_OperatorMinusGreater(this.h))) +func (this *QCborArray__ConstIterator) OperatorMinusGreater() *QCborValueConstRef { + return newQCborValueConstRef_U(unsafe.Pointer(C.QCborArray__ConstIterator_OperatorMinusGreater(this.h))) } -func (this *QCborArray__ConstIterator) OperatorSubscript(j int64) *QCborValueRef { +func (this *QCborArray__ConstIterator) OperatorSubscript(j int64) *QCborValueConstRef { _ret := C.QCborArray__ConstIterator_OperatorSubscript(this.h, (C.ptrdiff_t)(j)) - _goptr := newQCborValueRef(_ret) + _goptr := newQCborValueConstRef(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt/gen_qcborarray.h b/qt/gen_qcborarray.h index a05b5c5..556e7d1 100644 --- a/qt/gen_qcborarray.h +++ b/qt/gen_qcborarray.h @@ -26,6 +26,7 @@ typedef QCborArray::Iterator QCborArray__Iterator; class QCborArray__Iterator; #endif class QCborValue; +class QCborValueConstRef; class QCborValueRef; class QJsonArray; #else @@ -33,6 +34,7 @@ typedef struct QCborArray QCborArray; typedef struct QCborArray__ConstIterator QCborArray__ConstIterator; typedef struct QCborArray__Iterator QCborArray__Iterator; typedef struct QCborValue QCborValue; +typedef struct QCborValueConstRef QCborValueConstRef; typedef struct QCborValueRef QCborValueRef; typedef struct QJsonArray QJsonArray; #endif @@ -97,8 +99,9 @@ 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, ptrdiff_t j); +QCborValueRef* QCborArray__Iterator_OperatorMinusGreater(QCborArray__Iterator* self); +QCborValueConstRef* QCborArray__Iterator_OperatorMinusGreater2(const QCborArray__Iterator* self); +QCborValueRef* QCborArray__Iterator_OperatorSubscript(const QCborArray__Iterator* self, ptrdiff_t j); bool QCborArray__Iterator_OperatorEqual(const QCborArray__Iterator* self, QCborArray__Iterator* o); bool QCborArray__Iterator_OperatorNotEqual(const QCborArray__Iterator* self, QCborArray__Iterator* o); bool QCborArray__Iterator_OperatorLesser(const QCborArray__Iterator* self, QCborArray__Iterator* other); @@ -125,9 +128,9 @@ 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, ptrdiff_t j); +QCborValueConstRef* QCborArray__ConstIterator_OperatorMultiply(const QCborArray__ConstIterator* self); +QCborValueConstRef* QCborArray__ConstIterator_OperatorMinusGreater(const QCborArray__ConstIterator* self); +QCborValueConstRef* QCborArray__ConstIterator_OperatorSubscript(const QCborArray__ConstIterator* self, ptrdiff_t j); bool QCborArray__ConstIterator_OperatorEqual(const QCborArray__ConstIterator* self, QCborArray__Iterator* o); bool QCborArray__ConstIterator_OperatorNotEqual(const QCborArray__ConstIterator* self, QCborArray__Iterator* o); bool QCborArray__ConstIterator_OperatorLesser(const QCborArray__ConstIterator* self, QCborArray__Iterator* other); diff --git a/qt/gen_qcbormap.cpp b/qt/gen_qcbormap.cpp index 4e7557c..2814258 100644 --- a/qt/gen_qcbormap.cpp +++ b/qt/gen_qcbormap.cpp @@ -2,6 +2,7 @@ #define WORKAROUND_INNER_CLASS_DEFINITION_QCborMap__ConstIterator #define WORKAROUND_INNER_CLASS_DEFINITION_QCborMap__Iterator #include +#include #include #include #include @@ -46,7 +47,7 @@ void QCborMap_Clear(QCborMap* self) { } struct miqt_array* QCborMap_Keys(const QCborMap* self) { - QVector _ret = self->keys(); + QList _ret = self->keys(); // Convert QList<> from C++ memory to manually-managed C memory QCborValue** _arr = static_cast(malloc(sizeof(QCborValue*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -280,10 +281,14 @@ void QCborMap__Iterator_OperatorAssign(QCborMap__Iterator* self, QCborMap__Itera self->operator=(*other); } -QCborValueRef* QCborMap__Iterator_OperatorMinusGreater(const QCborMap__Iterator* self) { +QCborValueRef* QCborMap__Iterator_OperatorMinusGreater(QCborMap__Iterator* self) { return self->operator->(); } +QCborValueConstRef* QCborMap__Iterator_OperatorMinusGreater2(const QCborMap__Iterator* self) { + return (QCborValueConstRef*) self->operator->(); +} + QCborValue* QCborMap__Iterator_Key(const QCborMap__Iterator* self) { return new QCborValue(self->key()); } @@ -401,16 +406,16 @@ void QCborMap__ConstIterator_OperatorAssign(QCborMap__ConstIterator* self, QCbor self->operator=(*other); } -QCborValueRef* QCborMap__ConstIterator_OperatorMinusGreater(const QCborMap__ConstIterator* self) { - return (QCborValueRef*) self->operator->(); +QCborValueConstRef* QCborMap__ConstIterator_OperatorMinusGreater(const QCborMap__ConstIterator* self) { + return (QCborValueConstRef*) self->operator->(); } QCborValue* QCborMap__ConstIterator_Key(const QCborMap__ConstIterator* self) { return new QCborValue(self->key()); } -QCborValueRef* QCborMap__ConstIterator_Value(const QCborMap__ConstIterator* self) { - return new QCborValueRef(self->value()); +QCborValueConstRef* QCborMap__ConstIterator_Value(const QCborMap__ConstIterator* self) { + return new QCborValueConstRef(self->value()); } bool QCborMap__ConstIterator_OperatorEqual(const QCborMap__ConstIterator* self, QCborMap__Iterator* o) { diff --git a/qt/gen_qcbormap.go b/qt/gen_qcbormap.go index 70c1ffb..b5b3ccf 100644 --- a/qt/gen_qcbormap.go +++ b/qt/gen_qcbormap.go @@ -79,10 +79,10 @@ func (this *QCborMap) Keys() []QCborValue { _ret := make([]QCborValue, int(_ma.len)) _outCast := (*[0xffff]*C.QCborValue)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _vv_ret := _outCast[i] - _vv_goptr := newQCborValue(_vv_ret) - _vv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_vv_goptr + _lv_ret := _outCast[i] + _lv_goptr := newQCborValue(_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 @@ -474,6 +474,10 @@ func (this *QCborMap__Iterator) OperatorMinusGreater() *QCborValueRef { return newQCborValueRef_U(unsafe.Pointer(C.QCborMap__Iterator_OperatorMinusGreater(this.h))) } +func (this *QCborMap__Iterator) OperatorMinusGreater2() *QCborValueConstRef { + return newQCborValueConstRef_U(unsafe.Pointer(C.QCborMap__Iterator_OperatorMinusGreater2(this.h))) +} + func (this *QCborMap__Iterator) Key() *QCborValue { _ret := C.QCborMap__Iterator_Key(this.h) _goptr := newQCborValue(_ret) @@ -636,8 +640,8 @@ func (this *QCborMap__ConstIterator) OperatorAssign(other *QCborMap__ConstIterat 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))) +func (this *QCborMap__ConstIterator) OperatorMinusGreater() *QCborValueConstRef { + return newQCborValueConstRef_U(unsafe.Pointer(C.QCborMap__ConstIterator_OperatorMinusGreater(this.h))) } func (this *QCborMap__ConstIterator) Key() *QCborValue { @@ -647,9 +651,9 @@ func (this *QCborMap__ConstIterator) Key() *QCborValue { return _goptr } -func (this *QCborMap__ConstIterator) Value() *QCborValueRef { +func (this *QCborMap__ConstIterator) Value() *QCborValueConstRef { _ret := C.QCborMap__ConstIterator_Value(this.h) - _goptr := newQCborValueRef(_ret) + _goptr := newQCborValueConstRef(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt/gen_qcbormap.h b/qt/gen_qcbormap.h index c990cf6..16b4822 100644 --- a/qt/gen_qcbormap.h +++ b/qt/gen_qcbormap.h @@ -26,6 +26,7 @@ typedef QCborMap::Iterator QCborMap__Iterator; class QCborMap__Iterator; #endif class QCborValue; +class QCborValueConstRef; class QCborValueRef; class QJsonObject; #else @@ -33,6 +34,7 @@ typedef struct QCborMap QCborMap; typedef struct QCborMap__ConstIterator QCborMap__ConstIterator; typedef struct QCborMap__Iterator QCborMap__Iterator; typedef struct QCborValue QCborValue; +typedef struct QCborValueConstRef QCborValueConstRef; typedef struct QCborValueRef QCborValueRef; typedef struct QJsonObject QJsonObject; #endif @@ -100,7 +102,8 @@ 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); +QCborValueRef* QCborMap__Iterator_OperatorMinusGreater(QCborMap__Iterator* self); +QCborValueConstRef* QCborMap__Iterator_OperatorMinusGreater2(const QCborMap__Iterator* self); QCborValue* QCborMap__Iterator_Key(const QCborMap__Iterator* self); QCborValueRef* QCborMap__Iterator_Value(const QCborMap__Iterator* self); bool QCborMap__Iterator_OperatorEqual(const QCborMap__Iterator* self, QCborMap__Iterator* o); @@ -129,9 +132,9 @@ 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); +QCborValueConstRef* QCborMap__ConstIterator_OperatorMinusGreater(const QCborMap__ConstIterator* self); QCborValue* QCborMap__ConstIterator_Key(const QCborMap__ConstIterator* self); -QCborValueRef* QCborMap__ConstIterator_Value(const QCborMap__ConstIterator* self); +QCborValueConstRef* QCborMap__ConstIterator_Value(const QCborMap__ConstIterator* self); bool QCborMap__ConstIterator_OperatorEqual(const QCborMap__ConstIterator* self, QCborMap__Iterator* o); bool QCborMap__ConstIterator_OperatorNotEqual(const QCborMap__ConstIterator* self, QCborMap__Iterator* o); bool QCborMap__ConstIterator_OperatorLesser(const QCborMap__ConstIterator* self, QCborMap__Iterator* other); diff --git a/qt/gen_qcborvalue.cpp b/qt/gen_qcborvalue.cpp index 62eee0c..ff8d1f3 100644 --- a/qt/gen_qcborvalue.cpp +++ b/qt/gen_qcborvalue.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -348,11 +349,11 @@ QCborValue* QCborValue_FromCbor3(const unsigned char* data, ptrdiff_t lenVal) { return new QCborValue(QCborValue::fromCbor(static_cast(data), (qsizetype)(lenVal))); } -QByteArray* QCborValue_ToCbor(QCborValue* self) { +QByteArray* QCborValue_ToCbor(const QCborValue* self) { return new QByteArray(self->toCbor()); } -void QCborValue_ToCborWithWriter(QCborValue* self, QCborStreamWriter* writer) { +void QCborValue_ToCborWithWriter(const QCborValue* self, QCborStreamWriter* writer) { self->toCbor(*writer); } @@ -430,11 +431,11 @@ QCborValue* QCborValue_FromCbor33(const unsigned char* data, ptrdiff_t lenVal, Q return new QCborValue(QCborValue::fromCbor(static_cast(data), (qsizetype)(lenVal), error)); } -QByteArray* QCborValue_ToCbor1(QCborValue* self, int opt) { +QByteArray* QCborValue_ToCbor1(const QCborValue* self, int opt) { return new QByteArray(self->toCbor(static_cast(opt))); } -void QCborValue_ToCbor2(QCborValue* self, QCborStreamWriter* writer, int opt) { +void QCborValue_ToCbor2(const QCborValue* self, QCborStreamWriter* writer, int opt) { self->toCbor(*writer, static_cast(opt)); } @@ -449,6 +450,287 @@ void QCborValue_Delete(QCborValue* self) { delete self; } +QCborValueConstRef* QCborValueConstRef_new(QCborValueConstRef* param1) { + return new QCborValueConstRef(*param1); +} + +int QCborValueConstRef_Type(const QCborValueConstRef* self) { + QCborValue::Type _ret = self->type(); + return static_cast(_ret); +} + +bool QCborValueConstRef_IsInteger(const QCborValueConstRef* self) { + return self->isInteger(); +} + +bool QCborValueConstRef_IsByteArray(const QCborValueConstRef* self) { + return self->isByteArray(); +} + +bool QCborValueConstRef_IsString(const QCborValueConstRef* self) { + return self->isString(); +} + +bool QCborValueConstRef_IsArray(const QCborValueConstRef* self) { + return self->isArray(); +} + +bool QCborValueConstRef_IsMap(const QCborValueConstRef* self) { + return self->isMap(); +} + +bool QCborValueConstRef_IsTag(const QCborValueConstRef* self) { + return self->isTag(); +} + +bool QCborValueConstRef_IsFalse(const QCborValueConstRef* self) { + return self->isFalse(); +} + +bool QCborValueConstRef_IsTrue(const QCborValueConstRef* self) { + return self->isTrue(); +} + +bool QCborValueConstRef_IsBool(const QCborValueConstRef* self) { + return self->isBool(); +} + +bool QCborValueConstRef_IsNull(const QCborValueConstRef* self) { + return self->isNull(); +} + +bool QCborValueConstRef_IsUndefined(const QCborValueConstRef* self) { + return self->isUndefined(); +} + +bool QCborValueConstRef_IsDouble(const QCborValueConstRef* self) { + return self->isDouble(); +} + +bool QCborValueConstRef_IsDateTime(const QCborValueConstRef* self) { + return self->isDateTime(); +} + +bool QCborValueConstRef_IsUrl(const QCborValueConstRef* self) { + return self->isUrl(); +} + +bool QCborValueConstRef_IsRegularExpression(const QCborValueConstRef* self) { + return self->isRegularExpression(); +} + +bool QCborValueConstRef_IsUuid(const QCborValueConstRef* self) { + return self->isUuid(); +} + +bool QCborValueConstRef_IsInvalid(const QCborValueConstRef* self) { + return self->isInvalid(); +} + +bool QCborValueConstRef_IsContainer(const QCborValueConstRef* self) { + return self->isContainer(); +} + +bool QCborValueConstRef_IsSimpleType(const QCborValueConstRef* self) { + return self->isSimpleType(); +} + +bool QCborValueConstRef_IsSimpleTypeWithSt(const QCborValueConstRef* self, uint8_t st) { + return self->isSimpleType(static_cast(st)); +} + +uint8_t QCborValueConstRef_ToSimpleType(const QCborValueConstRef* self) { + QCborSimpleType _ret = self->toSimpleType(); + return static_cast(_ret); +} + +uint64_t QCborValueConstRef_Tag(const QCborValueConstRef* self) { + QCborTag _ret = self->tag(); + return static_cast(_ret); +} + +QCborValue* QCborValueConstRef_TaggedValue(const QCborValueConstRef* self) { + return new QCborValue(self->taggedValue()); +} + +long long QCborValueConstRef_ToInteger(const QCborValueConstRef* self) { + qint64 _ret = self->toInteger(); + return static_cast(_ret); +} + +bool QCborValueConstRef_ToBool(const QCborValueConstRef* self) { + return self->toBool(); +} + +double QCborValueConstRef_ToDouble(const QCborValueConstRef* self) { + return self->toDouble(); +} + +QByteArray* QCborValueConstRef_ToByteArray(const QCborValueConstRef* self) { + return new QByteArray(self->toByteArray()); +} + +struct miqt_string* QCborValueConstRef_ToString(const QCborValueConstRef* self) { + QString _ret = self->toString(); + // 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* QCborValueConstRef_ToDateTime(const QCborValueConstRef* self) { + return new QDateTime(self->toDateTime()); +} + +QUrl* QCborValueConstRef_ToUrl(const QCborValueConstRef* self) { + return new QUrl(self->toUrl()); +} + +QRegularExpression* QCborValueConstRef_ToRegularExpression(const QCborValueConstRef* self) { + return new QRegularExpression(self->toRegularExpression()); +} + +QUuid* QCborValueConstRef_ToUuid(const QCborValueConstRef* self) { + return new QUuid(self->toUuid()); +} + +QCborArray* QCborValueConstRef_ToArray(const QCborValueConstRef* self) { + return new QCborArray(self->toArray()); +} + +QCborArray* QCborValueConstRef_ToArrayWithQCborArray(const QCborValueConstRef* self, QCborArray* a) { + return new QCborArray(self->toArray(*a)); +} + +QCborMap* QCborValueConstRef_ToMap(const QCborValueConstRef* self) { + return new QCborMap(self->toMap()); +} + +QCborMap* QCborValueConstRef_ToMapWithQCborMap(const QCborValueConstRef* self, QCborMap* m) { + return new QCborMap(self->toMap(*m)); +} + +QCborValue* QCborValueConstRef_OperatorSubscript(const QCborValueConstRef* self, struct miqt_string* key) { + QString key_QString = QString::fromUtf8(&key->data, key->len); + return new QCborValue(self->operator[](key_QString)); +} + +QCborValue* QCborValueConstRef_OperatorSubscript2(const QCborValueConstRef* self, long long key) { + return new QCborValue(self->operator[](static_cast(key))); +} + +int QCborValueConstRef_Compare(const QCborValueConstRef* self, QCborValue* other) { + return self->compare(*other); +} + +bool QCborValueConstRef_OperatorEqual(const QCborValueConstRef* self, QCborValue* other) { + return self->operator==(*other); +} + +bool QCborValueConstRef_OperatorNotEqual(const QCborValueConstRef* self, QCborValue* other) { + return self->operator!=(*other); +} + +bool QCborValueConstRef_OperatorLesser(const QCborValueConstRef* self, QCborValue* other) { + return self->operator<(*other); +} + +QVariant* QCborValueConstRef_ToVariant(const QCborValueConstRef* self) { + return new QVariant(self->toVariant()); +} + +QJsonValue* QCborValueConstRef_ToJsonValue(const QCborValueConstRef* self) { + return new QJsonValue(self->toJsonValue()); +} + +QByteArray* QCborValueConstRef_ToCbor(const QCborValueConstRef* self) { + return new QByteArray(self->toCbor()); +} + +void QCborValueConstRef_ToCborWithWriter(const QCborValueConstRef* self, QCborStreamWriter* writer) { + self->toCbor(*writer); +} + +struct miqt_string* QCborValueConstRef_ToDiagnosticNotation(const QCborValueConstRef* self) { + QString _ret = self->toDiagnosticNotation(); + // 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()); +} + +uint8_t QCborValueConstRef_ToSimpleType1(const QCborValueConstRef* self, uint8_t defaultValue) { + QCborSimpleType _ret = self->toSimpleType(static_cast(defaultValue)); + return static_cast(_ret); +} + +uint64_t QCborValueConstRef_Tag1(const QCborValueConstRef* self, uint64_t defaultValue) { + QCborTag _ret = self->tag(static_cast(defaultValue)); + return static_cast(_ret); +} + +QCborValue* QCborValueConstRef_TaggedValue1(const QCborValueConstRef* self, QCborValue* defaultValue) { + return new QCborValue(self->taggedValue(*defaultValue)); +} + +long long QCborValueConstRef_ToInteger1(const QCborValueConstRef* self, long long defaultValue) { + qint64 _ret = self->toInteger(static_cast(defaultValue)); + return static_cast(_ret); +} + +bool QCborValueConstRef_ToBool1(const QCborValueConstRef* self, bool defaultValue) { + return self->toBool(defaultValue); +} + +double QCborValueConstRef_ToDouble1(const QCborValueConstRef* self, double defaultValue) { + return self->toDouble(static_cast(defaultValue)); +} + +QByteArray* QCborValueConstRef_ToByteArray1(const QCborValueConstRef* self, QByteArray* defaultValue) { + return new QByteArray(self->toByteArray(*defaultValue)); +} + +struct miqt_string* QCborValueConstRef_ToString1(const QCborValueConstRef* self, struct miqt_string* defaultValue) { + QString defaultValue_QString = QString::fromUtf8(&defaultValue->data, defaultValue->len); + QString _ret = self->toString(defaultValue_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()); +} + +QDateTime* QCborValueConstRef_ToDateTime1(const QCborValueConstRef* self, QDateTime* defaultValue) { + return new QDateTime(self->toDateTime(*defaultValue)); +} + +QUrl* QCborValueConstRef_ToUrl1(const QCborValueConstRef* self, QUrl* defaultValue) { + return new QUrl(self->toUrl(*defaultValue)); +} + +QRegularExpression* QCborValueConstRef_ToRegularExpression1(const QCborValueConstRef* self, QRegularExpression* defaultValue) { + return new QRegularExpression(self->toRegularExpression(*defaultValue)); +} + +QUuid* QCborValueConstRef_ToUuid1(const QCborValueConstRef* self, QUuid* defaultValue) { + return new QUuid(self->toUuid(*defaultValue)); +} + +QByteArray* QCborValueConstRef_ToCbor1(const QCborValueConstRef* self, int opt) { + return new QByteArray(self->toCbor(static_cast(opt))); +} + +void QCborValueConstRef_ToCbor2(const QCborValueConstRef* self, QCborStreamWriter* writer, int opt) { + self->toCbor(*writer, static_cast(opt)); +} + +struct miqt_string* QCborValueConstRef_ToDiagnosticNotation1(const QCborValueConstRef* self, int opt) { + QString _ret = self->toDiagnosticNotation(static_cast(opt)); + // 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 QCborValueConstRef_Delete(QCborValueConstRef* self) { + delete self; +} + QCborValueRef* QCborValueRef_new(QCborValueRef* param1) { return new QCborValueRef(*param1); } @@ -461,6 +743,15 @@ void QCborValueRef_OperatorAssignWithOther(QCborValueRef* self, QCborValueRef* o self->operator=(*other); } +QCborValueRef* QCborValueRef_OperatorSubscript(QCborValueRef* self, long long key) { + return new QCborValueRef(self->operator[](static_cast(key))); +} + +QCborValueRef* QCborValueRef_OperatorSubscript2(QCborValueRef* self, struct miqt_string* key) { + QString key_QString = QString::fromUtf8(&key->data, key->len); + return new QCborValueRef(self->operator[](key_QString)); +} + int QCborValueRef_Type(const QCborValueRef* self) { QCborValue::Type _ret = self->type(); return static_cast(_ret); @@ -546,6 +837,11 @@ bool QCborValueRef_IsSimpleTypeWithSt(const QCborValueRef* self, uint8_t st) { return self->isSimpleType(static_cast(st)); } +uint8_t QCborValueRef_ToSimpleType(const QCborValueRef* self) { + QCborSimpleType _ret = self->toSimpleType(); + return static_cast(_ret); +} + uint64_t QCborValueRef_Tag(const QCborValueRef* self) { QCborTag _ret = self->tag(); return static_cast(_ret); @@ -611,24 +907,15 @@ QCborMap* QCborValueRef_ToMapWithQCborMap(const QCborValueRef* self, QCborMap* m return new QCborMap(self->toMap(*m)); } -QCborValue* QCborValueRef_OperatorSubscript(const QCborValueRef* self, struct miqt_string* key) { +QCborValue* QCborValueRef_OperatorSubscript3(const QCborValueRef* self, struct miqt_string* key) { QString key_QString = QString::fromUtf8(&key->data, key->len); return new QCborValue(self->operator[](key_QString)); } -QCborValue* QCborValueRef_OperatorSubscript2(const QCborValueRef* self, long long key) { +QCborValue* QCborValueRef_OperatorSubscript5(const QCborValueRef* self, long long key) { return new QCborValue(self->operator[](static_cast(key))); } -QCborValueRef* QCborValueRef_OperatorSubscript3(QCborValueRef* self, long long key) { - return new QCborValueRef(self->operator[](static_cast(key))); -} - -QCborValueRef* QCborValueRef_OperatorSubscript5(QCborValueRef* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); - return new QCborValueRef(self->operator[](key_QString)); -} - int QCborValueRef_Compare(const QCborValueRef* self, QCborValue* other) { return self->compare(*other); } @@ -668,6 +955,11 @@ struct miqt_string* QCborValueRef_ToDiagnosticNotation(QCborValueRef* self) { return miqt_strdup(_b.data(), _b.length()); } +uint8_t QCborValueRef_ToSimpleType1(const QCborValueRef* self, uint8_t defaultValue) { + QCborSimpleType _ret = self->toSimpleType(static_cast(defaultValue)); + return static_cast(_ret); +} + uint64_t QCborValueRef_Tag1(const QCborValueRef* self, uint64_t defaultValue) { QCborTag _ret = self->tag(static_cast(defaultValue)); return static_cast(_ret); diff --git a/qt/gen_qcborvalue.go b/qt/gen_qcborvalue.go index 03d8b93..e3c371a 100644 --- a/qt/gen_qcborvalue.go +++ b/qt/gen_qcborvalue.go @@ -693,8 +693,385 @@ func (this *QCborValue) GoGC() { }) } +type QCborValueConstRef struct { + h *C.QCborValueConstRef +} + +func (this *QCborValueConstRef) cPointer() *C.QCborValueConstRef { + if this == nil { + return nil + } + return this.h +} + +func newQCborValueConstRef(h *C.QCborValueConstRef) *QCborValueConstRef { + if h == nil { + return nil + } + return &QCborValueConstRef{h: h} +} + +func newQCborValueConstRef_U(h unsafe.Pointer) *QCborValueConstRef { + return newQCborValueConstRef((*C.QCborValueConstRef)(h)) +} + +// NewQCborValueConstRef constructs a new QCborValueConstRef object. +func NewQCborValueConstRef(param1 *QCborValueConstRef) *QCborValueConstRef { + ret := C.QCborValueConstRef_new(param1.cPointer()) + return newQCborValueConstRef(ret) +} + +func (this *QCborValueConstRef) Type() QCborValue__Type { + return (QCborValue__Type)(C.QCborValueConstRef_Type(this.h)) +} + +func (this *QCborValueConstRef) IsInteger() bool { + return (bool)(C.QCborValueConstRef_IsInteger(this.h)) +} + +func (this *QCborValueConstRef) IsByteArray() bool { + return (bool)(C.QCborValueConstRef_IsByteArray(this.h)) +} + +func (this *QCborValueConstRef) IsString() bool { + return (bool)(C.QCborValueConstRef_IsString(this.h)) +} + +func (this *QCborValueConstRef) IsArray() bool { + return (bool)(C.QCborValueConstRef_IsArray(this.h)) +} + +func (this *QCborValueConstRef) IsMap() bool { + return (bool)(C.QCborValueConstRef_IsMap(this.h)) +} + +func (this *QCborValueConstRef) IsTag() bool { + return (bool)(C.QCborValueConstRef_IsTag(this.h)) +} + +func (this *QCborValueConstRef) IsFalse() bool { + return (bool)(C.QCborValueConstRef_IsFalse(this.h)) +} + +func (this *QCborValueConstRef) IsTrue() bool { + return (bool)(C.QCborValueConstRef_IsTrue(this.h)) +} + +func (this *QCborValueConstRef) IsBool() bool { + return (bool)(C.QCborValueConstRef_IsBool(this.h)) +} + +func (this *QCborValueConstRef) IsNull() bool { + return (bool)(C.QCborValueConstRef_IsNull(this.h)) +} + +func (this *QCborValueConstRef) IsUndefined() bool { + return (bool)(C.QCborValueConstRef_IsUndefined(this.h)) +} + +func (this *QCborValueConstRef) IsDouble() bool { + return (bool)(C.QCborValueConstRef_IsDouble(this.h)) +} + +func (this *QCborValueConstRef) IsDateTime() bool { + return (bool)(C.QCborValueConstRef_IsDateTime(this.h)) +} + +func (this *QCborValueConstRef) IsUrl() bool { + return (bool)(C.QCborValueConstRef_IsUrl(this.h)) +} + +func (this *QCborValueConstRef) IsRegularExpression() bool { + return (bool)(C.QCborValueConstRef_IsRegularExpression(this.h)) +} + +func (this *QCborValueConstRef) IsUuid() bool { + return (bool)(C.QCborValueConstRef_IsUuid(this.h)) +} + +func (this *QCborValueConstRef) IsInvalid() bool { + return (bool)(C.QCborValueConstRef_IsInvalid(this.h)) +} + +func (this *QCborValueConstRef) IsContainer() bool { + return (bool)(C.QCborValueConstRef_IsContainer(this.h)) +} + +func (this *QCborValueConstRef) IsSimpleType() bool { + return (bool)(C.QCborValueConstRef_IsSimpleType(this.h)) +} + +func (this *QCborValueConstRef) IsSimpleTypeWithSt(st QCborSimpleType) bool { + return (bool)(C.QCborValueConstRef_IsSimpleTypeWithSt(this.h, (C.uint8_t)(st))) +} + +func (this *QCborValueConstRef) ToSimpleType() QCborSimpleType { + return (QCborSimpleType)(C.QCborValueConstRef_ToSimpleType(this.h)) +} + +func (this *QCborValueConstRef) Tag() QCborTag { + return (QCborTag)(C.QCborValueConstRef_Tag(this.h)) +} + +func (this *QCborValueConstRef) TaggedValue() *QCborValue { + _ret := C.QCborValueConstRef_TaggedValue(this.h) + _goptr := newQCborValue(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QCborValueConstRef) ToInteger() int64 { + return (int64)(C.QCborValueConstRef_ToInteger(this.h)) +} + +func (this *QCborValueConstRef) ToBool() bool { + return (bool)(C.QCborValueConstRef_ToBool(this.h)) +} + +func (this *QCborValueConstRef) ToDouble() float64 { + return (float64)(C.QCborValueConstRef_ToDouble(this.h)) +} + +func (this *QCborValueConstRef) ToByteArray() *QByteArray { + _ret := C.QCborValueConstRef_ToByteArray(this.h) + _goptr := newQByteArray(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QCborValueConstRef) ToString() string { + var _ms *C.struct_miqt_string = C.QCborValueConstRef_ToString(this.h) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + +func (this *QCborValueConstRef) ToDateTime() *QDateTime { + _ret := C.QCborValueConstRef_ToDateTime(this.h) + _goptr := newQDateTime(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QCborValueConstRef) ToUrl() *QUrl { + _ret := C.QCborValueConstRef_ToUrl(this.h) + _goptr := newQUrl(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QCborValueConstRef) ToRegularExpression() *QRegularExpression { + _ret := C.QCborValueConstRef_ToRegularExpression(this.h) + _goptr := newQRegularExpression(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QCborValueConstRef) ToUuid() *QUuid { + _ret := C.QCborValueConstRef_ToUuid(this.h) + _goptr := newQUuid(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QCborValueConstRef) ToArray() *QCborArray { + _ret := C.QCborValueConstRef_ToArray(this.h) + _goptr := newQCborArray(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QCborValueConstRef) ToArrayWithQCborArray(a *QCborArray) *QCborArray { + _ret := C.QCborValueConstRef_ToArrayWithQCborArray(this.h, a.cPointer()) + _goptr := newQCborArray(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QCborValueConstRef) ToMap() *QCborMap { + _ret := C.QCborValueConstRef_ToMap(this.h) + _goptr := newQCborMap(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QCborValueConstRef) ToMapWithQCborMap(m *QCborMap) *QCborMap { + _ret := C.QCborValueConstRef_ToMapWithQCborMap(this.h, m.cPointer()) + _goptr := newQCborMap(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QCborValueConstRef) OperatorSubscript(key string) *QCborValue { + key_ms := miqt_strdupg(key) + defer C.free(key_ms) + _ret := C.QCborValueConstRef_OperatorSubscript(this.h, (*C.struct_miqt_string)(key_ms)) + _goptr := newQCborValue(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QCborValueConstRef) OperatorSubscript2(key int64) *QCborValue { + _ret := C.QCborValueConstRef_OperatorSubscript2(this.h, (C.longlong)(key)) + _goptr := newQCborValue(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QCborValueConstRef) Compare(other *QCborValue) int { + return (int)(C.QCborValueConstRef_Compare(this.h, other.cPointer())) +} + +func (this *QCborValueConstRef) OperatorEqual(other *QCborValue) bool { + return (bool)(C.QCborValueConstRef_OperatorEqual(this.h, other.cPointer())) +} + +func (this *QCborValueConstRef) OperatorNotEqual(other *QCborValue) bool { + return (bool)(C.QCborValueConstRef_OperatorNotEqual(this.h, other.cPointer())) +} + +func (this *QCborValueConstRef) OperatorLesser(other *QCborValue) bool { + return (bool)(C.QCborValueConstRef_OperatorLesser(this.h, other.cPointer())) +} + +func (this *QCborValueConstRef) ToVariant() *QVariant { + _ret := C.QCborValueConstRef_ToVariant(this.h) + _goptr := newQVariant(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QCborValueConstRef) ToJsonValue() *QJsonValue { + _ret := C.QCborValueConstRef_ToJsonValue(this.h) + _goptr := newQJsonValue(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QCborValueConstRef) ToCbor() *QByteArray { + _ret := C.QCborValueConstRef_ToCbor(this.h) + _goptr := newQByteArray(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QCborValueConstRef) ToCborWithWriter(writer *QCborStreamWriter) { + C.QCborValueConstRef_ToCborWithWriter(this.h, writer.cPointer()) +} + +func (this *QCborValueConstRef) ToDiagnosticNotation() string { + var _ms *C.struct_miqt_string = C.QCborValueConstRef_ToDiagnosticNotation(this.h) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + +func (this *QCborValueConstRef) ToSimpleType1(defaultValue QCborSimpleType) QCborSimpleType { + return (QCborSimpleType)(C.QCborValueConstRef_ToSimpleType1(this.h, (C.uint8_t)(defaultValue))) +} + +func (this *QCborValueConstRef) Tag1(defaultValue QCborTag) QCborTag { + return (QCborTag)(C.QCborValueConstRef_Tag1(this.h, (C.uint64_t)(defaultValue))) +} + +func (this *QCborValueConstRef) TaggedValue1(defaultValue *QCborValue) *QCborValue { + _ret := C.QCborValueConstRef_TaggedValue1(this.h, defaultValue.cPointer()) + _goptr := newQCborValue(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QCborValueConstRef) ToInteger1(defaultValue int64) int64 { + return (int64)(C.QCborValueConstRef_ToInteger1(this.h, (C.longlong)(defaultValue))) +} + +func (this *QCborValueConstRef) ToBool1(defaultValue bool) bool { + return (bool)(C.QCborValueConstRef_ToBool1(this.h, (C.bool)(defaultValue))) +} + +func (this *QCborValueConstRef) ToDouble1(defaultValue float64) float64 { + return (float64)(C.QCborValueConstRef_ToDouble1(this.h, (C.double)(defaultValue))) +} + +func (this *QCborValueConstRef) ToByteArray1(defaultValue *QByteArray) *QByteArray { + _ret := C.QCborValueConstRef_ToByteArray1(this.h, defaultValue.cPointer()) + _goptr := newQByteArray(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QCborValueConstRef) ToString1(defaultValue string) string { + defaultValue_ms := miqt_strdupg(defaultValue) + defer C.free(defaultValue_ms) + var _ms *C.struct_miqt_string = C.QCborValueConstRef_ToString1(this.h, (*C.struct_miqt_string)(defaultValue_ms)) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + +func (this *QCborValueConstRef) ToDateTime1(defaultValue *QDateTime) *QDateTime { + _ret := C.QCborValueConstRef_ToDateTime1(this.h, defaultValue.cPointer()) + _goptr := newQDateTime(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QCborValueConstRef) ToUrl1(defaultValue *QUrl) *QUrl { + _ret := C.QCborValueConstRef_ToUrl1(this.h, defaultValue.cPointer()) + _goptr := newQUrl(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QCborValueConstRef) ToRegularExpression1(defaultValue *QRegularExpression) *QRegularExpression { + _ret := C.QCborValueConstRef_ToRegularExpression1(this.h, defaultValue.cPointer()) + _goptr := newQRegularExpression(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QCborValueConstRef) ToUuid1(defaultValue *QUuid) *QUuid { + _ret := C.QCborValueConstRef_ToUuid1(this.h, defaultValue.cPointer()) + _goptr := newQUuid(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QCborValueConstRef) ToCbor1(opt QCborValue__EncodingOption) *QByteArray { + _ret := C.QCborValueConstRef_ToCbor1(this.h, (C.int)(opt)) + _goptr := newQByteArray(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QCborValueConstRef) ToCbor2(writer *QCborStreamWriter, opt QCborValue__EncodingOption) { + C.QCborValueConstRef_ToCbor2(this.h, writer.cPointer(), (C.int)(opt)) +} + +func (this *QCborValueConstRef) ToDiagnosticNotation1(opt QCborValue__DiagnosticNotationOption) string { + var _ms *C.struct_miqt_string = C.QCborValueConstRef_ToDiagnosticNotation1(this.h, (C.int)(opt)) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + +// Delete this object from C++ memory. +func (this *QCborValueConstRef) Delete() { + C.QCborValueConstRef_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QCborValueConstRef) GoGC() { + runtime.SetFinalizer(this, func(this *QCborValueConstRef) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + type QCborValueRef struct { h *C.QCborValueRef + *QCborValueConstRef } func (this *QCborValueRef) cPointer() *C.QCborValueRef { @@ -708,7 +1085,7 @@ func newQCborValueRef(h *C.QCborValueRef) *QCborValueRef { if h == nil { return nil } - return &QCborValueRef{h: h} + return &QCborValueRef{h: h, QCborValueConstRef: newQCborValueConstRef_U(unsafe.Pointer(h))} } func newQCborValueRef_U(h unsafe.Pointer) *QCborValueRef { @@ -729,6 +1106,22 @@ func (this *QCborValueRef) OperatorAssignWithOther(other *QCborValueRef) { C.QCborValueRef_OperatorAssignWithOther(this.h, other.cPointer()) } +func (this *QCborValueRef) OperatorSubscript(key int64) *QCborValueRef { + _ret := C.QCborValueRef_OperatorSubscript(this.h, (C.longlong)(key)) + _goptr := newQCborValueRef(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QCborValueRef) OperatorSubscript2(key string) *QCborValueRef { + key_ms := miqt_strdupg(key) + defer C.free(key_ms) + _ret := C.QCborValueRef_OperatorSubscript2(this.h, (*C.struct_miqt_string)(key_ms)) + _goptr := newQCborValueRef(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + func (this *QCborValueRef) Type() QCborValue__Type { return (QCborValue__Type)(C.QCborValueRef_Type(this.h)) } @@ -813,6 +1206,10 @@ func (this *QCborValueRef) IsSimpleTypeWithSt(st QCborSimpleType) bool { return (bool)(C.QCborValueRef_IsSimpleTypeWithSt(this.h, (C.uint8_t)(st))) } +func (this *QCborValueRef) ToSimpleType() QCborSimpleType { + return (QCborSimpleType)(C.QCborValueRef_ToSimpleType(this.h)) +} + func (this *QCborValueRef) Tag() QCborTag { return (QCborTag)(C.QCborValueRef_Tag(this.h)) } @@ -906,38 +1303,22 @@ func (this *QCborValueRef) ToMapWithQCborMap(m *QCborMap) *QCborMap { return _goptr } -func (this *QCborValueRef) OperatorSubscript(key string) *QCborValue { +func (this *QCborValueRef) OperatorSubscript3(key string) *QCborValue { key_ms := miqt_strdupg(key) defer C.free(key_ms) - _ret := C.QCborValueRef_OperatorSubscript(this.h, (*C.struct_miqt_string)(key_ms)) + _ret := C.QCborValueRef_OperatorSubscript3(this.h, (*C.struct_miqt_string)(key_ms)) _goptr := newQCborValue(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValueRef) OperatorSubscript2(key int64) *QCborValue { - _ret := C.QCborValueRef_OperatorSubscript2(this.h, (C.longlong)(key)) +func (this *QCborValueRef) OperatorSubscript5(key int64) *QCborValue { + _ret := C.QCborValueRef_OperatorSubscript5(this.h, (C.longlong)(key)) _goptr := newQCborValue(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValueRef) OperatorSubscript3(key int64) *QCborValueRef { - _ret := C.QCborValueRef_OperatorSubscript3(this.h, (C.longlong)(key)) - _goptr := newQCborValueRef(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QCborValueRef) OperatorSubscript5(key string) *QCborValueRef { - key_ms := miqt_strdupg(key) - defer C.free(key_ms) - _ret := C.QCborValueRef_OperatorSubscript5(this.h, (*C.struct_miqt_string)(key_ms)) - _goptr := newQCborValueRef(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - func (this *QCborValueRef) Compare(other *QCborValue) int { return (int)(C.QCborValueRef_Compare(this.h, other.cPointer())) } @@ -986,6 +1367,10 @@ func (this *QCborValueRef) ToDiagnosticNotation() string { return _ret } +func (this *QCborValueRef) ToSimpleType1(defaultValue QCborSimpleType) QCborSimpleType { + return (QCborSimpleType)(C.QCborValueRef_ToSimpleType1(this.h, (C.uint8_t)(defaultValue))) +} + func (this *QCborValueRef) Tag1(defaultValue QCborTag) QCborTag { return (QCborTag)(C.QCborValueRef_Tag1(this.h, (C.uint64_t)(defaultValue))) } diff --git a/qt/gen_qcborvalue.h b/qt/gen_qcborvalue.h index 411f763..e8a709e 100644 --- a/qt/gen_qcborvalue.h +++ b/qt/gen_qcborvalue.h @@ -21,6 +21,7 @@ class QCborParserError; class QCborStreamReader; class QCborStreamWriter; class QCborValue; +class QCborValueConstRef; class QCborValueRef; class QDateTime; class QJsonValue; @@ -36,6 +37,7 @@ typedef struct QCborParserError QCborParserError; typedef struct QCborStreamReader QCborStreamReader; typedef struct QCborStreamWriter QCborStreamWriter; typedef struct QCborValue QCborValue; +typedef struct QCborValueConstRef QCborValueConstRef; typedef struct QCborValueRef QCborValueRef; typedef struct QDateTime QDateTime; typedef struct QJsonValue QJsonValue; @@ -125,8 +127,8 @@ QCborValue* QCborValue_FromCbor(QCborStreamReader* reader); QCborValue* QCborValue_FromCborWithBa(QByteArray* ba); QCborValue* QCborValue_FromCbor2(const char* data, ptrdiff_t lenVal); QCborValue* QCborValue_FromCbor3(const unsigned char* data, ptrdiff_t lenVal); -QByteArray* QCborValue_ToCbor(QCborValue* self); -void QCborValue_ToCborWithWriter(QCborValue* self, QCborStreamWriter* writer); +QByteArray* QCborValue_ToCbor(const QCborValue* self); +void QCborValue_ToCborWithWriter(const QCborValue* self, QCborStreamWriter* writer); struct miqt_string* QCborValue_ToDiagnosticNotation(const QCborValue* self); uint8_t QCborValue_ToSimpleType1(const QCborValue* self, uint8_t defaultValue); long long QCborValue_ToInteger1(const QCborValue* self, long long defaultValue); @@ -143,14 +145,82 @@ QUuid* QCborValue_ToUuid1(const QCborValue* self, QUuid* defaultValue); QCborValue* QCborValue_FromCbor22(QByteArray* ba, QCborParserError* error); QCborValue* QCborValue_FromCbor32(const char* data, ptrdiff_t lenVal, QCborParserError* error); QCborValue* QCborValue_FromCbor33(const unsigned char* data, ptrdiff_t lenVal, QCborParserError* error); -QByteArray* QCborValue_ToCbor1(QCborValue* self, int opt); -void QCborValue_ToCbor2(QCborValue* self, QCborStreamWriter* writer, int opt); +QByteArray* QCborValue_ToCbor1(const QCborValue* self, int opt); +void QCborValue_ToCbor2(const QCborValue* self, QCborStreamWriter* writer, int opt); struct miqt_string* QCborValue_ToDiagnosticNotation1(const QCborValue* self, int opts); void QCborValue_Delete(QCborValue* self); +QCborValueConstRef* QCborValueConstRef_new(QCborValueConstRef* param1); +int QCborValueConstRef_Type(const QCborValueConstRef* self); +bool QCborValueConstRef_IsInteger(const QCborValueConstRef* self); +bool QCborValueConstRef_IsByteArray(const QCborValueConstRef* self); +bool QCborValueConstRef_IsString(const QCborValueConstRef* self); +bool QCborValueConstRef_IsArray(const QCborValueConstRef* self); +bool QCborValueConstRef_IsMap(const QCborValueConstRef* self); +bool QCborValueConstRef_IsTag(const QCborValueConstRef* self); +bool QCborValueConstRef_IsFalse(const QCborValueConstRef* self); +bool QCborValueConstRef_IsTrue(const QCborValueConstRef* self); +bool QCborValueConstRef_IsBool(const QCborValueConstRef* self); +bool QCborValueConstRef_IsNull(const QCborValueConstRef* self); +bool QCborValueConstRef_IsUndefined(const QCborValueConstRef* self); +bool QCborValueConstRef_IsDouble(const QCborValueConstRef* self); +bool QCborValueConstRef_IsDateTime(const QCborValueConstRef* self); +bool QCborValueConstRef_IsUrl(const QCborValueConstRef* self); +bool QCborValueConstRef_IsRegularExpression(const QCborValueConstRef* self); +bool QCborValueConstRef_IsUuid(const QCborValueConstRef* self); +bool QCborValueConstRef_IsInvalid(const QCborValueConstRef* self); +bool QCborValueConstRef_IsContainer(const QCborValueConstRef* self); +bool QCborValueConstRef_IsSimpleType(const QCborValueConstRef* self); +bool QCborValueConstRef_IsSimpleTypeWithSt(const QCborValueConstRef* self, uint8_t st); +uint8_t QCborValueConstRef_ToSimpleType(const QCborValueConstRef* self); +uint64_t QCborValueConstRef_Tag(const QCborValueConstRef* self); +QCborValue* QCborValueConstRef_TaggedValue(const QCborValueConstRef* self); +long long QCborValueConstRef_ToInteger(const QCborValueConstRef* self); +bool QCborValueConstRef_ToBool(const QCborValueConstRef* self); +double QCborValueConstRef_ToDouble(const QCborValueConstRef* self); +QByteArray* QCborValueConstRef_ToByteArray(const QCborValueConstRef* self); +struct miqt_string* QCborValueConstRef_ToString(const QCborValueConstRef* self); +QDateTime* QCborValueConstRef_ToDateTime(const QCborValueConstRef* self); +QUrl* QCborValueConstRef_ToUrl(const QCborValueConstRef* self); +QRegularExpression* QCborValueConstRef_ToRegularExpression(const QCborValueConstRef* self); +QUuid* QCborValueConstRef_ToUuid(const QCborValueConstRef* self); +QCborArray* QCborValueConstRef_ToArray(const QCborValueConstRef* self); +QCborArray* QCborValueConstRef_ToArrayWithQCborArray(const QCborValueConstRef* self, QCborArray* a); +QCborMap* QCborValueConstRef_ToMap(const QCborValueConstRef* self); +QCborMap* QCborValueConstRef_ToMapWithQCborMap(const QCborValueConstRef* self, QCborMap* m); +QCborValue* QCborValueConstRef_OperatorSubscript(const QCborValueConstRef* self, struct miqt_string* key); +QCborValue* QCborValueConstRef_OperatorSubscript2(const QCborValueConstRef* self, long long key); +int QCborValueConstRef_Compare(const QCborValueConstRef* self, QCborValue* other); +bool QCborValueConstRef_OperatorEqual(const QCborValueConstRef* self, QCborValue* other); +bool QCborValueConstRef_OperatorNotEqual(const QCborValueConstRef* self, QCborValue* other); +bool QCborValueConstRef_OperatorLesser(const QCborValueConstRef* self, QCborValue* other); +QVariant* QCborValueConstRef_ToVariant(const QCborValueConstRef* self); +QJsonValue* QCborValueConstRef_ToJsonValue(const QCborValueConstRef* self); +QByteArray* QCborValueConstRef_ToCbor(const QCborValueConstRef* self); +void QCborValueConstRef_ToCborWithWriter(const QCborValueConstRef* self, QCborStreamWriter* writer); +struct miqt_string* QCborValueConstRef_ToDiagnosticNotation(const QCborValueConstRef* self); +uint8_t QCborValueConstRef_ToSimpleType1(const QCborValueConstRef* self, uint8_t defaultValue); +uint64_t QCborValueConstRef_Tag1(const QCborValueConstRef* self, uint64_t defaultValue); +QCborValue* QCborValueConstRef_TaggedValue1(const QCborValueConstRef* self, QCborValue* defaultValue); +long long QCborValueConstRef_ToInteger1(const QCborValueConstRef* self, long long defaultValue); +bool QCborValueConstRef_ToBool1(const QCborValueConstRef* self, bool defaultValue); +double QCborValueConstRef_ToDouble1(const QCborValueConstRef* self, double defaultValue); +QByteArray* QCborValueConstRef_ToByteArray1(const QCborValueConstRef* self, QByteArray* defaultValue); +struct miqt_string* QCborValueConstRef_ToString1(const QCborValueConstRef* self, struct miqt_string* defaultValue); +QDateTime* QCborValueConstRef_ToDateTime1(const QCborValueConstRef* self, QDateTime* defaultValue); +QUrl* QCborValueConstRef_ToUrl1(const QCborValueConstRef* self, QUrl* defaultValue); +QRegularExpression* QCborValueConstRef_ToRegularExpression1(const QCborValueConstRef* self, QRegularExpression* defaultValue); +QUuid* QCborValueConstRef_ToUuid1(const QCborValueConstRef* self, QUuid* defaultValue); +QByteArray* QCborValueConstRef_ToCbor1(const QCborValueConstRef* self, int opt); +void QCborValueConstRef_ToCbor2(const QCborValueConstRef* self, QCborStreamWriter* writer, int opt); +struct miqt_string* QCborValueConstRef_ToDiagnosticNotation1(const QCborValueConstRef* self, int opt); +void QCborValueConstRef_Delete(QCborValueConstRef* self); + QCborValueRef* QCborValueRef_new(QCborValueRef* param1); void QCborValueRef_OperatorAssign(QCborValueRef* self, QCborValue* other); void QCborValueRef_OperatorAssignWithOther(QCborValueRef* self, QCborValueRef* other); +QCborValueRef* QCborValueRef_OperatorSubscript(QCborValueRef* self, long long key); +QCborValueRef* QCborValueRef_OperatorSubscript2(QCborValueRef* self, struct miqt_string* key); int QCborValueRef_Type(const QCborValueRef* self); bool QCborValueRef_IsInteger(const QCborValueRef* self); bool QCborValueRef_IsByteArray(const QCborValueRef* self); @@ -172,6 +242,7 @@ bool QCborValueRef_IsInvalid(const QCborValueRef* self); bool QCborValueRef_IsContainer(const QCborValueRef* self); bool QCborValueRef_IsSimpleType(const QCborValueRef* self); bool QCborValueRef_IsSimpleTypeWithSt(const QCborValueRef* self, uint8_t st); +uint8_t QCborValueRef_ToSimpleType(const QCborValueRef* self); uint64_t QCborValueRef_Tag(const QCborValueRef* self); QCborValue* QCborValueRef_TaggedValue(const QCborValueRef* self); long long QCborValueRef_ToInteger(const QCborValueRef* self); @@ -187,10 +258,8 @@ QCborArray* QCborValueRef_ToArray(const QCborValueRef* self); QCborArray* QCborValueRef_ToArrayWithQCborArray(const QCborValueRef* self, QCborArray* a); QCborMap* QCborValueRef_ToMap(const QCborValueRef* self); QCborMap* QCborValueRef_ToMapWithQCborMap(const QCborValueRef* self, QCborMap* m); -QCborValue* QCborValueRef_OperatorSubscript(const QCborValueRef* self, struct miqt_string* key); -QCborValue* QCborValueRef_OperatorSubscript2(const QCborValueRef* self, long long key); -QCborValueRef* QCborValueRef_OperatorSubscript3(QCborValueRef* self, long long key); -QCborValueRef* QCborValueRef_OperatorSubscript5(QCborValueRef* self, struct miqt_string* key); +QCborValue* QCborValueRef_OperatorSubscript3(const QCborValueRef* self, struct miqt_string* key); +QCborValue* QCborValueRef_OperatorSubscript5(const QCborValueRef* self, long long key); int QCborValueRef_Compare(const QCborValueRef* self, QCborValue* other); bool QCborValueRef_OperatorEqual(const QCborValueRef* self, QCborValue* other); bool QCborValueRef_OperatorNotEqual(const QCborValueRef* self, QCborValue* other); @@ -200,6 +269,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); +uint8_t QCborValueRef_ToSimpleType1(const QCborValueRef* self, uint8_t 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); diff --git a/qt/gen_qchar.cpp b/qt/gen_qchar.cpp index d41f559..a8ac60b 100644 --- a/qt/gen_qchar.cpp +++ b/qt/gen_qchar.cpp @@ -19,11 +19,6 @@ char QLatin1Char_ToLatin1(const QLatin1Char* self) { return self->toLatin1(); } -uint16_t QLatin1Char_Unicode(const QLatin1Char* self) { - ushort _ret = self->unicode(); - return static_cast(_ret); -} - void QLatin1Char_Delete(QLatin1Char* self) { delete self; } @@ -87,11 +82,6 @@ int QChar_JoiningType(const QChar* self) { return static_cast(_ret); } -int QChar_Joining(const QChar* self) { - QChar::Joining _ret = self->joining(); - return static_cast(_ret); -} - unsigned char QChar_CombiningClass(const QChar* self) { return self->combiningClass(); } @@ -150,11 +140,6 @@ char QChar_ToLatin1(const QChar* self) { return self->toLatin1(); } -uint16_t QChar_Unicode(const QChar* self) { - ushort _ret = self->unicode(); - return static_cast(_ret); -} - QChar* QChar_FromLatin1(char c) { return new QChar(QChar::fromLatin1(static_cast(c))); } @@ -245,178 +230,11 @@ void QChar_SetRow(QChar* self, unsigned char arow) { self->setRow(static_cast(arow)); } -bool QChar_IsNonCharacterWithUcs4(unsigned int ucs4) { - return QChar::isNonCharacter(static_cast(ucs4)); -} - -bool QChar_IsHighSurrogateWithUcs4(unsigned int ucs4) { - return QChar::isHighSurrogate(static_cast(ucs4)); -} - -bool QChar_IsLowSurrogateWithUcs4(unsigned int ucs4) { - return QChar::isLowSurrogate(static_cast(ucs4)); -} - -bool QChar_IsSurrogateWithUcs4(unsigned int ucs4) { - return QChar::isSurrogate(static_cast(ucs4)); -} - -bool QChar_RequiresSurrogates(unsigned int ucs4) { - return QChar::requiresSurrogates(static_cast(ucs4)); -} - -unsigned int QChar_SurrogateToUcs4(uint16_t high, uint16_t low) { - uint _ret = QChar::surrogateToUcs4(static_cast(high), static_cast(low)); - return static_cast(_ret); -} - -unsigned int QChar_SurrogateToUcs42(QChar* high, QChar* low) { - uint _ret = QChar::surrogateToUcs4(*high, *low); - return static_cast(_ret); -} - -uint16_t QChar_HighSurrogate(unsigned int ucs4) { - ushort _ret = QChar::highSurrogate(static_cast(ucs4)); - return static_cast(_ret); -} - -uint16_t QChar_LowSurrogate(unsigned int ucs4) { - ushort _ret = QChar::lowSurrogate(static_cast(ucs4)); - return static_cast(_ret); -} - -int QChar_CategoryWithUcs4(unsigned int ucs4) { - QChar::Category _ret = QChar::category(static_cast(ucs4)); - return static_cast(_ret); -} - -int QChar_DirectionWithUcs4(unsigned int ucs4) { - QChar::Direction _ret = QChar::direction(static_cast(ucs4)); - return static_cast(_ret); -} - -int QChar_JoiningTypeWithUcs4(unsigned int ucs4) { - QChar::JoiningType _ret = QChar::joiningType(static_cast(ucs4)); - return static_cast(_ret); -} - -int QChar_JoiningWithUcs4(unsigned int ucs4) { - QChar::Joining _ret = QChar::joining(static_cast(ucs4)); - return static_cast(_ret); -} - -unsigned char QChar_CombiningClassWithUcs4(unsigned int ucs4) { - return QChar::combiningClass(static_cast(ucs4)); -} - -unsigned int QChar_MirroredCharWithUcs4(unsigned int ucs4) { - uint _ret = QChar::mirroredChar(static_cast(ucs4)); - return static_cast(_ret); -} - -bool QChar_HasMirroredWithUcs4(unsigned int ucs4) { - return QChar::hasMirrored(static_cast(ucs4)); -} - -struct miqt_string* QChar_DecompositionWithUcs4(unsigned int ucs4) { - QString _ret = QChar::decomposition(static_cast(ucs4)); - // 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()); -} - -int QChar_DecompositionTagWithUcs4(unsigned int ucs4) { - QChar::Decomposition _ret = QChar::decompositionTag(static_cast(ucs4)); - return static_cast(_ret); -} - -int QChar_DigitValueWithUcs4(unsigned int ucs4) { - return QChar::digitValue(static_cast(ucs4)); -} - -unsigned int QChar_ToLowerWithUcs4(unsigned int ucs4) { - uint _ret = QChar::toLower(static_cast(ucs4)); - return static_cast(_ret); -} - -unsigned int QChar_ToUpperWithUcs4(unsigned int ucs4) { - uint _ret = QChar::toUpper(static_cast(ucs4)); - return static_cast(_ret); -} - -unsigned int QChar_ToTitleCaseWithUcs4(unsigned int ucs4) { - uint _ret = QChar::toTitleCase(static_cast(ucs4)); - return static_cast(_ret); -} - -unsigned int QChar_ToCaseFoldedWithUcs4(unsigned int ucs4) { - uint _ret = QChar::toCaseFolded(static_cast(ucs4)); - return static_cast(_ret); -} - -int QChar_ScriptWithUcs4(unsigned int ucs4) { - QChar::Script _ret = QChar::script(static_cast(ucs4)); - return static_cast(_ret); -} - -int QChar_UnicodeVersionWithUcs4(unsigned int ucs4) { - QChar::UnicodeVersion _ret = QChar::unicodeVersion(static_cast(ucs4)); - return static_cast(_ret); -} - int QChar_CurrentUnicodeVersion() { QChar::UnicodeVersion _ret = QChar::currentUnicodeVersion(); return static_cast(_ret); } -bool QChar_IsPrintWithUcs4(unsigned int ucs4) { - return QChar::isPrint(static_cast(ucs4)); -} - -bool QChar_IsSpaceWithUcs4(unsigned int ucs4) { - return QChar::isSpace(static_cast(ucs4)); -} - -bool QChar_IsMarkWithUcs4(unsigned int ucs4) { - return QChar::isMark(static_cast(ucs4)); -} - -bool QChar_IsPunctWithUcs4(unsigned int ucs4) { - return QChar::isPunct(static_cast(ucs4)); -} - -bool QChar_IsSymbolWithUcs4(unsigned int ucs4) { - return QChar::isSymbol(static_cast(ucs4)); -} - -bool QChar_IsLetterWithUcs4(unsigned int ucs4) { - return QChar::isLetter(static_cast(ucs4)); -} - -bool QChar_IsNumberWithUcs4(unsigned int ucs4) { - return QChar::isNumber(static_cast(ucs4)); -} - -bool QChar_IsLetterOrNumberWithUcs4(unsigned int ucs4) { - return QChar::isLetterOrNumber(static_cast(ucs4)); -} - -bool QChar_IsDigitWithUcs4(unsigned int ucs4) { - return QChar::isDigit(static_cast(ucs4)); -} - -bool QChar_IsLowerWithUcs4(unsigned int ucs4) { - return QChar::isLower(static_cast(ucs4)); -} - -bool QChar_IsUpperWithUcs4(unsigned int ucs4) { - return QChar::isUpper(static_cast(ucs4)); -} - -bool QChar_IsTitleCaseWithUcs4(unsigned int ucs4) { - return QChar::isTitleCase(static_cast(ucs4)); -} - void QChar_Delete(QChar* self) { delete self; } diff --git a/qt/gen_qchar.go b/qt/gen_qchar.go index 859821a..20d8c92 100644 --- a/qt/gen_qchar.go +++ b/qt/gen_qchar.go @@ -30,6 +30,7 @@ const ( QChar__ByteOrderSwapped QChar__SpecialCharacter = 65534 QChar__ParagraphSeparator QChar__SpecialCharacter = 8233 QChar__LineSeparator QChar__SpecialCharacter = 8232 + QChar__VisualTabCharacter QChar__SpecialCharacter = 8594 QChar__LastValidCodePoint QChar__SpecialCharacter = 1114111 ) @@ -228,7 +229,12 @@ const ( QChar__Script_DivesAkuru QChar__Script = 154 QChar__Script_KhitanSmallScript QChar__Script = 155 QChar__Script_Yezidi QChar__Script = 156 - QChar__ScriptCount QChar__Script = 157 + QChar__Script_CyproMinoan QChar__Script = 157 + QChar__Script_OldUyghur QChar__Script = 158 + QChar__Script_Tangsa QChar__Script = 159 + QChar__Script_Toto QChar__Script = 160 + QChar__Script_Vithkuqi QChar__Script = 161 + QChar__ScriptCount QChar__Script = 162 ) type QChar__Direction int @@ -293,15 +299,6 @@ const ( QChar__Joining_Transparent QChar__JoiningType = 5 ) -type QChar__Joining int - -const ( - QChar__OtherJoining QChar__Joining = 0 - QChar__Dual QChar__Joining = 1 - QChar__Right QChar__Joining = 2 - QChar__Center QChar__Joining = 3 -) - type QChar__CombiningClass int const ( @@ -353,6 +350,7 @@ const ( QChar__Unicode_12_0 QChar__UnicodeVersion = 21 QChar__Unicode_12_1 QChar__UnicodeVersion = 22 QChar__Unicode_13_0 QChar__UnicodeVersion = 23 + QChar__Unicode_14_0 QChar__UnicodeVersion = 24 ) type QLatin1Char struct { @@ -393,10 +391,6 @@ func (this *QLatin1Char) ToLatin1() int8 { return (int8)(C.QLatin1Char_ToLatin1(this.h)) } -func (this *QLatin1Char) Unicode() uint16 { - return (uint16)(C.QLatin1Char_Unicode(this.h)) -} - // Delete this object from C++ memory. func (this *QLatin1Char) Delete() { C.QLatin1Char_Delete(this.h) @@ -511,10 +505,6 @@ func (this *QChar) JoiningType() QChar__JoiningType { return (QChar__JoiningType)(C.QChar_JoiningType(this.h)) } -func (this *QChar) Joining() QChar__Joining { - return (QChar__Joining)(C.QChar_Joining(this.h)) -} - func (this *QChar) CombiningClass() byte { return (byte)(C.QChar_CombiningClass(this.h)) } @@ -585,10 +575,6 @@ func (this *QChar) ToLatin1() int8 { return (int8)(C.QChar_ToLatin1(this.h)) } -func (this *QChar) Unicode() uint16 { - return (uint16)(C.QChar_Unicode(this.h)) -} - func QChar_FromLatin1(c int8) *QChar { _ret := C.QChar_FromLatin1((C.char)(c)) _goptr := newQChar(_ret) @@ -680,161 +666,10 @@ func (this *QChar) SetRow(arow byte) { C.QChar_SetRow(this.h, (C.uchar)(arow)) } -func QChar_IsNonCharacterWithUcs4(ucs4 uint) bool { - return (bool)(C.QChar_IsNonCharacterWithUcs4((C.uint)(ucs4))) -} - -func QChar_IsHighSurrogateWithUcs4(ucs4 uint) bool { - return (bool)(C.QChar_IsHighSurrogateWithUcs4((C.uint)(ucs4))) -} - -func QChar_IsLowSurrogateWithUcs4(ucs4 uint) bool { - return (bool)(C.QChar_IsLowSurrogateWithUcs4((C.uint)(ucs4))) -} - -func QChar_IsSurrogateWithUcs4(ucs4 uint) bool { - return (bool)(C.QChar_IsSurrogateWithUcs4((C.uint)(ucs4))) -} - -func QChar_RequiresSurrogates(ucs4 uint) bool { - return (bool)(C.QChar_RequiresSurrogates((C.uint)(ucs4))) -} - -func QChar_SurrogateToUcs4(high uint16, low uint16) uint { - return (uint)(C.QChar_SurrogateToUcs4((C.uint16_t)(high), (C.uint16_t)(low))) -} - -func QChar_SurrogateToUcs42(high QChar, low QChar) uint { - return (uint)(C.QChar_SurrogateToUcs42(high.cPointer(), low.cPointer())) -} - -func QChar_HighSurrogate(ucs4 uint) uint16 { - return (uint16)(C.QChar_HighSurrogate((C.uint)(ucs4))) -} - -func QChar_LowSurrogate(ucs4 uint) uint16 { - return (uint16)(C.QChar_LowSurrogate((C.uint)(ucs4))) -} - -func QChar_CategoryWithUcs4(ucs4 uint) QChar__Category { - return (QChar__Category)(C.QChar_CategoryWithUcs4((C.uint)(ucs4))) -} - -func QChar_DirectionWithUcs4(ucs4 uint) QChar__Direction { - return (QChar__Direction)(C.QChar_DirectionWithUcs4((C.uint)(ucs4))) -} - -func QChar_JoiningTypeWithUcs4(ucs4 uint) QChar__JoiningType { - return (QChar__JoiningType)(C.QChar_JoiningTypeWithUcs4((C.uint)(ucs4))) -} - -func QChar_JoiningWithUcs4(ucs4 uint) QChar__Joining { - return (QChar__Joining)(C.QChar_JoiningWithUcs4((C.uint)(ucs4))) -} - -func QChar_CombiningClassWithUcs4(ucs4 uint) byte { - return (byte)(C.QChar_CombiningClassWithUcs4((C.uint)(ucs4))) -} - -func QChar_MirroredCharWithUcs4(ucs4 uint) uint { - return (uint)(C.QChar_MirroredCharWithUcs4((C.uint)(ucs4))) -} - -func QChar_HasMirroredWithUcs4(ucs4 uint) bool { - return (bool)(C.QChar_HasMirroredWithUcs4((C.uint)(ucs4))) -} - -func QChar_DecompositionWithUcs4(ucs4 uint) string { - var _ms *C.struct_miqt_string = C.QChar_DecompositionWithUcs4((C.uint)(ucs4)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QChar_DecompositionTagWithUcs4(ucs4 uint) QChar__Decomposition { - return (QChar__Decomposition)(C.QChar_DecompositionTagWithUcs4((C.uint)(ucs4))) -} - -func QChar_DigitValueWithUcs4(ucs4 uint) int { - return (int)(C.QChar_DigitValueWithUcs4((C.uint)(ucs4))) -} - -func QChar_ToLowerWithUcs4(ucs4 uint) uint { - return (uint)(C.QChar_ToLowerWithUcs4((C.uint)(ucs4))) -} - -func QChar_ToUpperWithUcs4(ucs4 uint) uint { - return (uint)(C.QChar_ToUpperWithUcs4((C.uint)(ucs4))) -} - -func QChar_ToTitleCaseWithUcs4(ucs4 uint) uint { - return (uint)(C.QChar_ToTitleCaseWithUcs4((C.uint)(ucs4))) -} - -func QChar_ToCaseFoldedWithUcs4(ucs4 uint) uint { - return (uint)(C.QChar_ToCaseFoldedWithUcs4((C.uint)(ucs4))) -} - -func QChar_ScriptWithUcs4(ucs4 uint) QChar__Script { - return (QChar__Script)(C.QChar_ScriptWithUcs4((C.uint)(ucs4))) -} - -func QChar_UnicodeVersionWithUcs4(ucs4 uint) QChar__UnicodeVersion { - return (QChar__UnicodeVersion)(C.QChar_UnicodeVersionWithUcs4((C.uint)(ucs4))) -} - func QChar_CurrentUnicodeVersion() QChar__UnicodeVersion { return (QChar__UnicodeVersion)(C.QChar_CurrentUnicodeVersion()) } -func QChar_IsPrintWithUcs4(ucs4 uint) bool { - return (bool)(C.QChar_IsPrintWithUcs4((C.uint)(ucs4))) -} - -func QChar_IsSpaceWithUcs4(ucs4 uint) bool { - return (bool)(C.QChar_IsSpaceWithUcs4((C.uint)(ucs4))) -} - -func QChar_IsMarkWithUcs4(ucs4 uint) bool { - return (bool)(C.QChar_IsMarkWithUcs4((C.uint)(ucs4))) -} - -func QChar_IsPunctWithUcs4(ucs4 uint) bool { - return (bool)(C.QChar_IsPunctWithUcs4((C.uint)(ucs4))) -} - -func QChar_IsSymbolWithUcs4(ucs4 uint) bool { - return (bool)(C.QChar_IsSymbolWithUcs4((C.uint)(ucs4))) -} - -func QChar_IsLetterWithUcs4(ucs4 uint) bool { - return (bool)(C.QChar_IsLetterWithUcs4((C.uint)(ucs4))) -} - -func QChar_IsNumberWithUcs4(ucs4 uint) bool { - return (bool)(C.QChar_IsNumberWithUcs4((C.uint)(ucs4))) -} - -func QChar_IsLetterOrNumberWithUcs4(ucs4 uint) bool { - return (bool)(C.QChar_IsLetterOrNumberWithUcs4((C.uint)(ucs4))) -} - -func QChar_IsDigitWithUcs4(ucs4 uint) bool { - return (bool)(C.QChar_IsDigitWithUcs4((C.uint)(ucs4))) -} - -func QChar_IsLowerWithUcs4(ucs4 uint) bool { - return (bool)(C.QChar_IsLowerWithUcs4((C.uint)(ucs4))) -} - -func QChar_IsUpperWithUcs4(ucs4 uint) bool { - return (bool)(C.QChar_IsUpperWithUcs4((C.uint)(ucs4))) -} - -func QChar_IsTitleCaseWithUcs4(ucs4 uint) bool { - return (bool)(C.QChar_IsTitleCaseWithUcs4((C.uint)(ucs4))) -} - // Delete this object from C++ memory. func (this *QChar) Delete() { C.QChar_Delete(this.h) diff --git a/qt/gen_qchar.h b/qt/gen_qchar.h index f4610f2..af4b62c 100644 --- a/qt/gen_qchar.h +++ b/qt/gen_qchar.h @@ -24,7 +24,6 @@ typedef struct QLatin1Char QLatin1Char; QLatin1Char* QLatin1Char_new(char c); QLatin1Char* QLatin1Char_new2(QLatin1Char* param1); char QLatin1Char_ToLatin1(const QLatin1Char* self); -uint16_t QLatin1Char_Unicode(const QLatin1Char* self); void QLatin1Char_Delete(QLatin1Char* self); QChar* QChar_new(); @@ -41,7 +40,6 @@ QChar* QChar_new11(QChar* param1); 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); @@ -55,7 +53,6 @@ QChar* QChar_ToCaseFolded(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); bool QChar_IsNull(const QChar* self); bool QChar_IsPrint(const QChar* self); @@ -78,44 +75,7 @@ unsigned char QChar_Cell(const QChar* self); unsigned char QChar_Row(const QChar* self); void QChar_SetCell(QChar* self, unsigned char acell); void QChar_SetRow(QChar* self, unsigned char arow); -bool QChar_IsNonCharacterWithUcs4(unsigned int ucs4); -bool QChar_IsHighSurrogateWithUcs4(unsigned int ucs4); -bool QChar_IsLowSurrogateWithUcs4(unsigned int ucs4); -bool QChar_IsSurrogateWithUcs4(unsigned int ucs4); -bool QChar_RequiresSurrogates(unsigned int ucs4); -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); -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); -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); -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); -bool QChar_IsPunctWithUcs4(unsigned int ucs4); -bool QChar_IsSymbolWithUcs4(unsigned int ucs4); -bool QChar_IsLetterWithUcs4(unsigned int ucs4); -bool QChar_IsNumberWithUcs4(unsigned int ucs4); -bool QChar_IsLetterOrNumberWithUcs4(unsigned int ucs4); -bool QChar_IsDigitWithUcs4(unsigned int ucs4); -bool QChar_IsLowerWithUcs4(unsigned int ucs4); -bool QChar_IsUpperWithUcs4(unsigned int ucs4); -bool QChar_IsTitleCaseWithUcs4(unsigned int ucs4); void QChar_Delete(QChar* self); #ifdef __cplusplus diff --git a/qt/gen_qcheckbox.cpp b/qt/gen_qcheckbox.cpp index 6d3045d..e19c328 100644 --- a/qt/gen_qcheckbox.cpp +++ b/qt/gen_qcheckbox.cpp @@ -42,13 +42,6 @@ struct miqt_string* QCheckBox_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QCheckBox_TrUtf8(const char* s) { - QString _ret = QCheckBox::trUtf8(s); - // 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()); -} - QSize* QCheckBox_SizeHint(const QCheckBox* self) { return new QSize(self->sizeHint()); } @@ -99,20 +92,6 @@ struct miqt_string* QCheckBox_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QCheckBox_TrUtf82(const char* s, const char* c) { - QString _ret = QCheckBox::trUtf8(s, c); - // 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* QCheckBox_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QCheckBox::trUtf8(s, c, static_cast(n)); - // 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 QCheckBox_SetTristate1(QCheckBox* self, bool y) { self->setTristate(y); } diff --git a/qt/gen_qcheckbox.go b/qt/gen_qcheckbox.go index 415c777..def5eb5 100644 --- a/qt/gen_qcheckbox.go +++ b/qt/gen_qcheckbox.go @@ -84,15 +84,6 @@ func QCheckBox_Tr(s string) string { return _ret } -func QCheckBox_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QCheckBox_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QCheckBox) SizeHint() *QSize { _ret := C.QCheckBox_SizeHint(this.h) _goptr := newQSize(_ret) @@ -165,28 +156,6 @@ func QCheckBox_Tr3(s string, c string, n int) string { return _ret } -func QCheckBox_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QCheckBox_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QCheckBox_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QCheckBox_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QCheckBox) SetTristate1(y bool) { C.QCheckBox_SetTristate1(this.h, (C.bool)(y)) } diff --git a/qt/gen_qcheckbox.h b/qt/gen_qcheckbox.h index 83e996e..b8387fb 100644 --- a/qt/gen_qcheckbox.h +++ b/qt/gen_qcheckbox.h @@ -32,7 +32,6 @@ QCheckBox* QCheckBox_new4(struct miqt_string* text, QWidget* parent); QMetaObject* QCheckBox_MetaObject(const QCheckBox* self); void* QCheckBox_Metacast(QCheckBox* self, const char* param1); struct miqt_string* QCheckBox_Tr(const char* s); -struct miqt_string* QCheckBox_TrUtf8(const char* s); QSize* QCheckBox_SizeHint(const QCheckBox* self); QSize* QCheckBox_MinimumSizeHint(const QCheckBox* self); void QCheckBox_SetTristate(QCheckBox* self); @@ -43,8 +42,6 @@ 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); struct miqt_string* QCheckBox_Tr3(const char* s, const char* c, int n); -struct miqt_string* QCheckBox_TrUtf82(const char* s, const char* c); -struct miqt_string* QCheckBox_TrUtf83(const char* s, const char* c, int n); void QCheckBox_SetTristate1(QCheckBox* self, bool y); void QCheckBox_Delete(QCheckBox* self); diff --git a/qt/gen_qclipboard.cpp b/qt/gen_qclipboard.cpp index 90a7140..841720b 100644 --- a/qt/gen_qclipboard.cpp +++ b/qt/gen_qclipboard.cpp @@ -25,13 +25,6 @@ struct miqt_string* QClipboard_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QClipboard_TrUtf8(const char* s) { - QString _ret = QClipboard::trUtf8(s); - // 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 QClipboard_Clear(QClipboard* self) { self->clear(); } @@ -156,20 +149,6 @@ struct miqt_string* QClipboard_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QClipboard_TrUtf82(const char* s, const char* c) { - QString _ret = QClipboard::trUtf8(s, c); - // 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_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QClipboard::trUtf8(s, c, static_cast(n)); - // 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 QClipboard_Clear1(QClipboard* self, int mode) { self->clear(static_cast(mode)); } diff --git a/qt/gen_qclipboard.go b/qt/gen_qclipboard.go index 4521e4a..b248016 100644 --- a/qt/gen_qclipboard.go +++ b/qt/gen_qclipboard.go @@ -64,15 +64,6 @@ func QClipboard_Tr(s string) string { return _ret } -func QClipboard_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QClipboard_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QClipboard) Clear() { C.QClipboard_Clear(this.h) } @@ -242,28 +233,6 @@ func QClipboard_Tr3(s string, c string, n int) string { return _ret } -func QClipboard_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QClipboard_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QClipboard_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QClipboard_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QClipboard) Clear1(mode QClipboard__Mode) { C.QClipboard_Clear1(this.h, (C.int)(mode)) } diff --git a/qt/gen_qclipboard.h b/qt/gen_qclipboard.h index c6487de..8d3350f 100644 --- a/qt/gen_qclipboard.h +++ b/qt/gen_qclipboard.h @@ -30,7 +30,6 @@ typedef struct QPixmap QPixmap; QMetaObject* QClipboard_MetaObject(const QClipboard* self); void* QClipboard_Metacast(QClipboard* self, const char* param1); struct miqt_string* QClipboard_Tr(const char* s); -struct miqt_string* QClipboard_TrUtf8(const char* s); void QClipboard_Clear(QClipboard* self); bool QClipboard_SupportsSelection(const QClipboard* self); bool QClipboard_SupportsFindBuffer(const QClipboard* self); @@ -56,8 +55,6 @@ void QClipboard_DataChanged(QClipboard* self); void QClipboard_connect_DataChanged(QClipboard* self, void* slot); struct miqt_string* QClipboard_Tr2(const char* s, const char* c); struct miqt_string* QClipboard_Tr3(const char* s, const char* c, int n); -struct miqt_string* QClipboard_TrUtf82(const char* s, const char* c); -struct miqt_string* QClipboard_TrUtf83(const char* s, const char* c, int n); 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); diff --git a/qt/gen_qcollator.cpp b/qt/gen_qcollator.cpp index eafb4cc..db9875c 100644 --- a/qt/gen_qcollator.cpp +++ b/qt/gen_qcollator.cpp @@ -88,8 +88,8 @@ int QCollator_Compare(const QCollator* self, struct miqt_string* s1, struct miqt return self->compare(s1_QString, s2_QString); } -int QCollator_Compare3(const QCollator* self, QChar* s1, int len1, QChar* s2, int len2) { - return self->compare(s1, static_cast(len1), s2, static_cast(len2)); +int QCollator_Compare2(const QCollator* self, QChar* s1, ptrdiff_t len1, QChar* s2, ptrdiff_t len2) { + return self->compare(s1, (qsizetype)(len1), s2, (qsizetype)(len2)); } bool QCollator_OperatorCall(const QCollator* self, struct miqt_string* s1, struct miqt_string* s2) { diff --git a/qt/gen_qcollator.go b/qt/gen_qcollator.go index d481a8a..6856498 100644 --- a/qt/gen_qcollator.go +++ b/qt/gen_qcollator.go @@ -158,8 +158,8 @@ func (this *QCollator) Compare(s1 string, s2 string) int { return (int)(C.QCollator_Compare(this.h, (*C.struct_miqt_string)(s1_ms), (*C.struct_miqt_string)(s2_ms))) } -func (this *QCollator) Compare3(s1 *QChar, len1 int, s2 *QChar, len2 int) int { - return (int)(C.QCollator_Compare3(this.h, s1.cPointer(), (C.int)(len1), s2.cPointer(), (C.int)(len2))) +func (this *QCollator) Compare2(s1 *QChar, len1 int64, s2 *QChar, len2 int64) int { + return (int)(C.QCollator_Compare2(this.h, s1.cPointer(), (C.ptrdiff_t)(len1), s2.cPointer(), (C.ptrdiff_t)(len2))) } func (this *QCollator) OperatorCall(s1 string, s2 string) bool { diff --git a/qt/gen_qcollator.h b/qt/gen_qcollator.h index 28a7468..3c28c29 100644 --- a/qt/gen_qcollator.h +++ b/qt/gen_qcollator.h @@ -45,7 +45,7 @@ bool QCollator_NumericMode(const QCollator* self); void QCollator_SetIgnorePunctuation(QCollator* self, bool on); bool QCollator_IgnorePunctuation(const QCollator* self); int QCollator_Compare(const QCollator* self, struct miqt_string* s1, struct miqt_string* s2); -int QCollator_Compare3(const QCollator* self, QChar* s1, int len1, QChar* s2, int len2); +int QCollator_Compare2(const QCollator* self, QChar* s1, ptrdiff_t len1, QChar* s2, ptrdiff_t len2); bool QCollator_OperatorCall(const QCollator* self, struct miqt_string* s1, struct miqt_string* s2); QCollatorSortKey* QCollator_SortKey(const QCollator* self, struct miqt_string* stringVal); void QCollator_Delete(QCollator* self); diff --git a/qt/gen_qcolor.cpp b/qt/gen_qcolor.cpp index f28e131..2f1f514 100644 --- a/qt/gen_qcolor.cpp +++ b/qt/gen_qcolor.cpp @@ -1,3 +1,4 @@ +#include #include #include #include @@ -41,12 +42,12 @@ QColor* QColor_new8(int spec) { return new QColor(static_cast(spec)); } -QColor* QColor_new9(QColor* color) { - return new QColor(*color); +QColor* QColor_new9(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)); } -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)); +QColor* QColor_new10(QColor* param1) { + return new QColor(*param1); } QColor* QColor_new11(int r, int g, int b, int a) { @@ -57,11 +58,11 @@ QColor* QColor_new12(int spec, uint16_t a1, uint16_t a2, uint16_t a3, uint16_t a return new QColor(static_cast(spec), static_cast(a1), static_cast(a2), static_cast(a3), static_cast(a4), static_cast(a5)); } -void QColor_OperatorAssign(QColor* self, QColor* param1) { - self->operator=(*param1); +QColor* QColor_FromString(QAnyStringView* name) { + return new QColor(QColor::fromString(*name)); } -void QColor_OperatorAssignWithColor(QColor* self, int color) { +void QColor_OperatorAssign(QColor* self, int color) { self->operator=(static_cast(color)); } @@ -76,13 +77,6 @@ struct miqt_string* QColor_Name(const QColor* self) { return miqt_strdup(_b.data(), _b.length()); } -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(); - return miqt_strdup(_b.data(), _b.length()); -} - void QColor_SetNamedColor(QColor* self, struct miqt_string* name) { QString name_QString = QString::fromUtf8(&name->data, name->len); self->setNamedColor(name_QString); @@ -117,13 +111,12 @@ void QColor_SetAlpha(QColor* self, int alpha) { self->setAlpha(static_cast(alpha)); } -double QColor_AlphaF(const QColor* self) { - qreal _ret = self->alphaF(); - return static_cast(_ret); +float QColor_AlphaF(const QColor* self) { + return self->alphaF(); } -void QColor_SetAlphaF(QColor* self, double alpha) { - self->setAlphaF(static_cast(alpha)); +void QColor_SetAlphaF(QColor* self, float alpha) { + self->setAlphaF(static_cast(alpha)); } int QColor_Red(const QColor* self) { @@ -150,31 +143,28 @@ void QColor_SetBlue(QColor* self, int blue) { self->setBlue(static_cast(blue)); } -double QColor_RedF(const QColor* self) { - qreal _ret = self->redF(); - return static_cast(_ret); +float QColor_RedF(const QColor* self) { + return self->redF(); } -double QColor_GreenF(const QColor* self) { - qreal _ret = self->greenF(); - return static_cast(_ret); +float QColor_GreenF(const QColor* self) { + return self->greenF(); } -double QColor_BlueF(const QColor* self) { - qreal _ret = self->blueF(); - return static_cast(_ret); +float QColor_BlueF(const QColor* self) { + return self->blueF(); } -void QColor_SetRedF(QColor* self, double red) { - self->setRedF(static_cast(red)); +void QColor_SetRedF(QColor* self, float red) { + self->setRedF(static_cast(red)); } -void QColor_SetGreenF(QColor* self, double green) { - self->setGreenF(static_cast(green)); +void QColor_SetGreenF(QColor* self, float green) { + self->setGreenF(static_cast(green)); } -void QColor_SetBlueF(QColor* self, double blue) { - self->setBlueF(static_cast(blue)); +void QColor_SetBlueF(QColor* self, float blue) { + self->setBlueF(static_cast(blue)); } void QColor_GetRgb(const QColor* self, int* r, int* g, int* b) { @@ -185,12 +175,12 @@ void QColor_SetRgb(QColor* self, int r, int g, int b) { self->setRgb(static_cast(r), static_cast(g), static_cast(b)); } -void QColor_GetRgbF(const QColor* self, double* r, double* g, double* b) { - self->getRgbF(static_cast(r), static_cast(g), static_cast(b)); +void QColor_GetRgbF(const QColor* self, float* r, float* g, float* b) { + self->getRgbF(static_cast(r), static_cast(g), static_cast(b)); } -void QColor_SetRgbF(QColor* self, double r, double g, double b) { - self->setRgbF(static_cast(r), static_cast(g), static_cast(b)); +void QColor_SetRgbF(QColor* self, float r, float g, float b) { + self->setRgbF(static_cast(r), static_cast(g), static_cast(b)); } QRgba64* QColor_Rgba64(const QColor* self) { @@ -239,29 +229,24 @@ int QColor_Value(const QColor* self) { return self->value(); } -double QColor_HueF(const QColor* self) { - qreal _ret = self->hueF(); - return static_cast(_ret); +float QColor_HueF(const QColor* self) { + return self->hueF(); } -double QColor_SaturationF(const QColor* self) { - qreal _ret = self->saturationF(); - return static_cast(_ret); +float QColor_SaturationF(const QColor* self) { + return self->saturationF(); } -double QColor_HsvHueF(const QColor* self) { - qreal _ret = self->hsvHueF(); - return static_cast(_ret); +float QColor_HsvHueF(const QColor* self) { + return self->hsvHueF(); } -double QColor_HsvSaturationF(const QColor* self) { - qreal _ret = self->hsvSaturationF(); - return static_cast(_ret); +float QColor_HsvSaturationF(const QColor* self) { + return self->hsvSaturationF(); } -double QColor_ValueF(const QColor* self) { - qreal _ret = self->valueF(); - return static_cast(_ret); +float QColor_ValueF(const QColor* self) { + return self->valueF(); } void QColor_GetHsv(const QColor* self, int* h, int* s, int* v) { @@ -272,12 +257,12 @@ void QColor_SetHsv(QColor* self, int h, int s, int v) { self->setHsv(static_cast(h), static_cast(s), static_cast(v)); } -void QColor_GetHsvF(const QColor* self, double* h, double* s, double* v) { - self->getHsvF(static_cast(h), static_cast(s), static_cast(v)); +void QColor_GetHsvF(const QColor* self, float* h, float* s, float* v) { + self->getHsvF(static_cast(h), static_cast(s), static_cast(v)); } -void QColor_SetHsvF(QColor* self, double h, double s, double v) { - self->setHsvF(static_cast(h), static_cast(s), static_cast(v)); +void QColor_SetHsvF(QColor* self, float h, float s, float v) { + self->setHsvF(static_cast(h), static_cast(s), static_cast(v)); } int QColor_Cyan(const QColor* self) { @@ -296,31 +281,23 @@ int QColor_Black(const QColor* self) { return self->black(); } -double QColor_CyanF(const QColor* self) { - qreal _ret = self->cyanF(); - return static_cast(_ret); +float QColor_CyanF(const QColor* self) { + return self->cyanF(); } -double QColor_MagentaF(const QColor* self) { - qreal _ret = self->magentaF(); - return static_cast(_ret); +float QColor_MagentaF(const QColor* self) { + return self->magentaF(); } -double QColor_YellowF(const QColor* self) { - qreal _ret = self->yellowF(); - return static_cast(_ret); +float QColor_YellowF(const QColor* self) { + return self->yellowF(); } -double QColor_BlackF(const QColor* self) { - qreal _ret = self->blackF(); - return static_cast(_ret); +float QColor_BlackF(const QColor* self) { + return self->blackF(); } -void QColor_GetCmyk(QColor* self, int* c, int* m, int* y, int* k) { - self->getCmyk(static_cast(c), static_cast(m), static_cast(y), static_cast(k)); -} - -void QColor_GetCmyk2(const QColor* self, int* c, int* m, int* y, int* k) { +void QColor_GetCmyk(const QColor* self, int* c, int* m, int* y, int* k) { self->getCmyk(static_cast(c), static_cast(m), static_cast(y), static_cast(k)); } @@ -328,16 +305,12 @@ void QColor_SetCmyk(QColor* self, int c, int m, int y, int k) { self->setCmyk(static_cast(c), static_cast(m), static_cast(y), static_cast(k)); } -void QColor_GetCmykF(QColor* self, double* c, double* m, double* y, double* k) { - self->getCmykF(static_cast(c), static_cast(m), static_cast(y), static_cast(k)); +void QColor_GetCmykF(const QColor* self, float* c, float* m, float* y, float* k) { + self->getCmykF(static_cast(c), static_cast(m), static_cast(y), static_cast(k)); } -void QColor_GetCmykF2(const QColor* self, double* c, double* m, double* y, double* k) { - self->getCmykF(static_cast(c), static_cast(m), static_cast(y), static_cast(k)); -} - -void QColor_SetCmykF(QColor* self, double c, double m, double y, double k) { - self->setCmykF(static_cast(c), static_cast(m), static_cast(y), static_cast(k)); +void QColor_SetCmykF(QColor* self, float c, float m, float y, float k) { + self->setCmykF(static_cast(c), static_cast(m), static_cast(y), static_cast(k)); } int QColor_HslHue(const QColor* self) { @@ -352,19 +325,16 @@ int QColor_Lightness(const QColor* self) { return self->lightness(); } -double QColor_HslHueF(const QColor* self) { - qreal _ret = self->hslHueF(); - return static_cast(_ret); +float QColor_HslHueF(const QColor* self) { + return self->hslHueF(); } -double QColor_HslSaturationF(const QColor* self) { - qreal _ret = self->hslSaturationF(); - return static_cast(_ret); +float QColor_HslSaturationF(const QColor* self) { + return self->hslSaturationF(); } -double QColor_LightnessF(const QColor* self) { - qreal _ret = self->lightnessF(); - return static_cast(_ret); +float QColor_LightnessF(const QColor* self) { + return self->lightnessF(); } void QColor_GetHsl(const QColor* self, int* h, int* s, int* l) { @@ -375,12 +345,12 @@ void QColor_SetHsl(QColor* self, int h, int s, int l) { self->setHsl(static_cast(h), static_cast(s), static_cast(l)); } -void QColor_GetHslF(const QColor* self, double* h, double* s, double* l) { - self->getHslF(static_cast(h), static_cast(s), static_cast(l)); +void QColor_GetHslF(const QColor* self, float* h, float* s, float* l) { + self->getHslF(static_cast(h), static_cast(s), static_cast(l)); } -void QColor_SetHslF(QColor* self, double h, double s, double l) { - self->setHslF(static_cast(h), static_cast(s), static_cast(l)); +void QColor_SetHslF(QColor* self, float h, float s, float l) { + self->setHslF(static_cast(h), static_cast(s), static_cast(l)); } QColor* QColor_ToRgb(const QColor* self) { @@ -419,8 +389,8 @@ QColor* QColor_FromRgb2(int r, int g, int b) { return new QColor(QColor::fromRgb(static_cast(r), static_cast(g), static_cast(b))); } -QColor* QColor_FromRgbF(double r, double g, double b) { - return new QColor(QColor::fromRgbF(static_cast(r), static_cast(g), static_cast(b))); +QColor* QColor_FromRgbF(float r, float g, float b) { + return new QColor(QColor::fromRgbF(static_cast(r), static_cast(g), static_cast(b))); } QColor* QColor_FromRgba64(uint16_t r, uint16_t g, uint16_t b) { @@ -435,32 +405,24 @@ QColor* QColor_FromHsv(int h, int s, int v) { return new QColor(QColor::fromHsv(static_cast(h), static_cast(s), static_cast(v))); } -QColor* QColor_FromHsvF(double h, double s, double v) { - return new QColor(QColor::fromHsvF(static_cast(h), static_cast(s), static_cast(v))); +QColor* QColor_FromHsvF(float h, float s, float v) { + return new QColor(QColor::fromHsvF(static_cast(h), static_cast(s), static_cast(v))); } QColor* QColor_FromCmyk(int c, int m, int y, int k) { return new QColor(QColor::fromCmyk(static_cast(c), static_cast(m), static_cast(y), static_cast(k))); } -QColor* QColor_FromCmykF(double c, double m, double y, double k) { - return new QColor(QColor::fromCmykF(static_cast(c), static_cast(m), static_cast(y), static_cast(k))); +QColor* QColor_FromCmykF(float c, float m, float y, float k) { + return new QColor(QColor::fromCmykF(static_cast(c), static_cast(m), static_cast(y), static_cast(k))); } QColor* QColor_FromHsl(int h, int s, int l) { return new QColor(QColor::fromHsl(static_cast(h), static_cast(s), static_cast(l))); } -QColor* QColor_FromHslF(double h, double s, double l) { - return new QColor(QColor::fromHslF(static_cast(h), static_cast(s), static_cast(l))); -} - -QColor* QColor_Light(const QColor* self) { - return new QColor(self->light()); -} - -QColor* QColor_Dark(const QColor* self) { - return new QColor(self->dark()); +QColor* QColor_FromHslF(float h, float s, float l) { + return new QColor(QColor::fromHslF(static_cast(h), static_cast(s), static_cast(l))); } QColor* QColor_Lighter(const QColor* self) { @@ -484,6 +446,17 @@ bool QColor_IsValidColor(struct miqt_string* name) { return QColor::isValidColor(name_QString); } +bool QColor_IsValidColorName(QAnyStringView* param1) { + return QColor::isValidColorName(*param1); +} + +struct miqt_string* QColor_Name1(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(); + return miqt_strdup(_b.data(), _b.length()); +} + void QColor_GetRgb4(const QColor* self, int* r, int* g, int* b, int* a) { self->getRgb(static_cast(r), static_cast(g), static_cast(b), static_cast(a)); } @@ -492,12 +465,12 @@ void QColor_SetRgb4(QColor* self, int r, int g, int b, int a) { self->setRgb(static_cast(r), static_cast(g), static_cast(b), static_cast(a)); } -void QColor_GetRgbF4(const QColor* self, double* r, double* g, double* b, double* a) { - self->getRgbF(static_cast(r), static_cast(g), static_cast(b), static_cast(a)); +void QColor_GetRgbF4(const QColor* self, float* r, float* g, float* b, float* a) { + self->getRgbF(static_cast(r), static_cast(g), static_cast(b), static_cast(a)); } -void QColor_SetRgbF4(QColor* self, double r, double g, double b, double a) { - self->setRgbF(static_cast(r), static_cast(g), static_cast(b), static_cast(a)); +void QColor_SetRgbF4(QColor* self, float r, float g, float b, float a) { + self->setRgbF(static_cast(r), static_cast(g), static_cast(b), static_cast(a)); } void QColor_GetHsv4(const QColor* self, int* h, int* s, int* v, int* a) { @@ -508,19 +481,15 @@ void QColor_SetHsv4(QColor* self, int h, int s, int v, int a) { self->setHsv(static_cast(h), static_cast(s), static_cast(v), static_cast(a)); } -void QColor_GetHsvF4(const QColor* self, double* h, double* s, double* v, double* a) { - self->getHsvF(static_cast(h), static_cast(s), static_cast(v), static_cast(a)); +void QColor_GetHsvF4(const QColor* self, float* h, float* s, float* v, float* a) { + self->getHsvF(static_cast(h), static_cast(s), static_cast(v), static_cast(a)); } -void QColor_SetHsvF4(QColor* self, double h, double s, double v, double a) { - self->setHsvF(static_cast(h), static_cast(s), static_cast(v), static_cast(a)); +void QColor_SetHsvF4(QColor* self, float h, float s, float v, float a) { + self->setHsvF(static_cast(h), static_cast(s), static_cast(v), static_cast(a)); } -void QColor_GetCmyk5(QColor* self, int* c, int* m, int* y, int* k, int* a) { - self->getCmyk(static_cast(c), static_cast(m), static_cast(y), static_cast(k), static_cast(a)); -} - -void QColor_GetCmyk52(const QColor* self, int* c, int* m, int* y, int* k, int* a) { +void QColor_GetCmyk5(const QColor* self, int* c, int* m, int* y, int* k, int* a) { self->getCmyk(static_cast(c), static_cast(m), static_cast(y), static_cast(k), static_cast(a)); } @@ -528,16 +497,12 @@ void QColor_SetCmyk5(QColor* self, int c, int m, int y, int k, int a) { self->setCmyk(static_cast(c), static_cast(m), static_cast(y), static_cast(k), static_cast(a)); } -void QColor_GetCmykF5(QColor* self, double* c, double* m, double* y, double* k, double* a) { - self->getCmykF(static_cast(c), static_cast(m), static_cast(y), static_cast(k), static_cast(a)); +void QColor_GetCmykF5(const QColor* self, float* c, float* m, float* y, float* k, float* a) { + self->getCmykF(static_cast(c), static_cast(m), static_cast(y), static_cast(k), static_cast(a)); } -void QColor_GetCmykF52(const QColor* self, double* c, double* m, double* y, double* k, double* a) { - self->getCmykF(static_cast(c), static_cast(m), static_cast(y), static_cast(k), static_cast(a)); -} - -void QColor_SetCmykF5(QColor* self, double c, double m, double y, double k, double a) { - self->setCmykF(static_cast(c), static_cast(m), static_cast(y), static_cast(k), static_cast(a)); +void QColor_SetCmykF5(QColor* self, float c, float m, float y, float k, float a) { + self->setCmykF(static_cast(c), static_cast(m), static_cast(y), static_cast(k), static_cast(a)); } void QColor_GetHsl4(const QColor* self, int* h, int* s, int* l, int* a) { @@ -548,20 +513,20 @@ void QColor_SetHsl4(QColor* self, int h, int s, int l, int a) { self->setHsl(static_cast(h), static_cast(s), static_cast(l), static_cast(a)); } -void QColor_GetHslF4(const QColor* self, double* h, double* s, double* l, double* a) { - self->getHslF(static_cast(h), static_cast(s), static_cast(l), static_cast(a)); +void QColor_GetHslF4(const QColor* self, float* h, float* s, float* l, float* a) { + self->getHslF(static_cast(h), static_cast(s), static_cast(l), static_cast(a)); } -void QColor_SetHslF4(QColor* self, double h, double s, double l, double a) { - self->setHslF(static_cast(h), static_cast(s), static_cast(l), static_cast(a)); +void QColor_SetHslF4(QColor* self, float h, float s, float l, float a) { + self->setHslF(static_cast(h), static_cast(s), static_cast(l), static_cast(a)); } QColor* QColor_FromRgb4(int r, int g, int b, int a) { return new QColor(QColor::fromRgb(static_cast(r), static_cast(g), static_cast(b), static_cast(a))); } -QColor* QColor_FromRgbF4(double r, double g, double b, double a) { - return new QColor(QColor::fromRgbF(static_cast(r), static_cast(g), static_cast(b), static_cast(a))); +QColor* QColor_FromRgbF4(float r, float g, float b, float a) { + return new QColor(QColor::fromRgbF(static_cast(r), static_cast(g), static_cast(b), static_cast(a))); } QColor* QColor_FromRgba644(uint16_t r, uint16_t g, uint16_t b, uint16_t a) { @@ -572,32 +537,24 @@ QColor* QColor_FromHsv4(int h, int s, int v, int a) { return new QColor(QColor::fromHsv(static_cast(h), static_cast(s), static_cast(v), static_cast(a))); } -QColor* QColor_FromHsvF4(double h, double s, double v, double a) { - return new QColor(QColor::fromHsvF(static_cast(h), static_cast(s), static_cast(v), static_cast(a))); +QColor* QColor_FromHsvF4(float h, float s, float v, float a) { + return new QColor(QColor::fromHsvF(static_cast(h), static_cast(s), static_cast(v), static_cast(a))); } QColor* QColor_FromCmyk5(int c, int m, int y, int k, int a) { return new QColor(QColor::fromCmyk(static_cast(c), static_cast(m), static_cast(y), static_cast(k), static_cast(a))); } -QColor* QColor_FromCmykF5(double c, double m, double y, double k, double a) { - return new QColor(QColor::fromCmykF(static_cast(c), static_cast(m), static_cast(y), static_cast(k), static_cast(a))); +QColor* QColor_FromCmykF5(float c, float m, float y, float k, float a) { + return new QColor(QColor::fromCmykF(static_cast(c), static_cast(m), static_cast(y), static_cast(k), static_cast(a))); } QColor* QColor_FromHsl4(int h, int s, int l, int a) { return new QColor(QColor::fromHsl(static_cast(h), static_cast(s), static_cast(l), static_cast(a))); } -QColor* QColor_FromHslF4(double h, double s, double l, double a) { - return new QColor(QColor::fromHslF(static_cast(h), static_cast(s), static_cast(l), static_cast(a))); -} - -QColor* QColor_Light1(const QColor* self, int f) { - return new QColor(self->light(static_cast(f))); -} - -QColor* QColor_Dark1(const QColor* self, int f) { - return new QColor(self->dark(static_cast(f))); +QColor* QColor_FromHslF4(float h, float s, float l, float a) { + return new QColor(QColor::fromHslF(static_cast(h), static_cast(s), static_cast(l), static_cast(a))); } QColor* QColor_Lighter1(const QColor* self, int f) { diff --git a/qt/gen_qcolor.go b/qt/gen_qcolor.go index 42b0f91..110a274 100644 --- a/qt/gen_qcolor.go +++ b/qt/gen_qcolor.go @@ -106,14 +106,14 @@ func NewQColor8(spec QColor__Spec) *QColor { } // NewQColor9 constructs a new QColor object. -func NewQColor9(color *QColor) *QColor { - ret := C.QColor_new9(color.cPointer()) +func NewQColor9(spec QColor__Spec, a1 uint16, a2 uint16, a3 uint16, a4 uint16) *QColor { + ret := C.QColor_new9((C.int)(spec), (C.uint16_t)(a1), (C.uint16_t)(a2), (C.uint16_t)(a3), (C.uint16_t)(a4)) return newQColor(ret) } // 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.int)(spec), (C.uint16_t)(a1), (C.uint16_t)(a2), (C.uint16_t)(a3), (C.uint16_t)(a4)) +func NewQColor10(param1 *QColor) *QColor { + ret := C.QColor_new10(param1.cPointer()) return newQColor(ret) } @@ -129,12 +129,15 @@ func NewQColor12(spec QColor__Spec, a1 uint16, a2 uint16, a3 uint16, a4 uint16, return newQColor(ret) } -func (this *QColor) OperatorAssign(param1 *QColor) { - C.QColor_OperatorAssign(this.h, param1.cPointer()) +func QColor_FromString(name QAnyStringView) *QColor { + _ret := C.QColor_FromString(name.cPointer()) + _goptr := newQColor(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr } -func (this *QColor) OperatorAssignWithColor(color GlobalColor) { - C.QColor_OperatorAssignWithColor(this.h, (C.int)(color)) +func (this *QColor) OperatorAssign(color GlobalColor) { + C.QColor_OperatorAssign(this.h, (C.int)(color)) } func (this *QColor) IsValid() bool { @@ -148,13 +151,6 @@ func (this *QColor) Name() string { return _ret } -func (this *QColor) NameWithFormat(format QColor__NameFormat) string { - 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 -} - func (this *QColor) SetNamedColor(name string) { name_ms := miqt_strdupg(name) defer C.free(name_ms) @@ -187,12 +183,12 @@ func (this *QColor) SetAlpha(alpha int) { C.QColor_SetAlpha(this.h, (C.int)(alpha)) } -func (this *QColor) AlphaF() float64 { - return (float64)(C.QColor_AlphaF(this.h)) +func (this *QColor) AlphaF() float32 { + return (float32)(C.QColor_AlphaF(this.h)) } -func (this *QColor) SetAlphaF(alpha float64) { - C.QColor_SetAlphaF(this.h, (C.double)(alpha)) +func (this *QColor) SetAlphaF(alpha float32) { + C.QColor_SetAlphaF(this.h, (C.float)(alpha)) } func (this *QColor) Red() int { @@ -219,28 +215,28 @@ func (this *QColor) SetBlue(blue int) { C.QColor_SetBlue(this.h, (C.int)(blue)) } -func (this *QColor) RedF() float64 { - return (float64)(C.QColor_RedF(this.h)) +func (this *QColor) RedF() float32 { + return (float32)(C.QColor_RedF(this.h)) } -func (this *QColor) GreenF() float64 { - return (float64)(C.QColor_GreenF(this.h)) +func (this *QColor) GreenF() float32 { + return (float32)(C.QColor_GreenF(this.h)) } -func (this *QColor) BlueF() float64 { - return (float64)(C.QColor_BlueF(this.h)) +func (this *QColor) BlueF() float32 { + return (float32)(C.QColor_BlueF(this.h)) } -func (this *QColor) SetRedF(red float64) { - C.QColor_SetRedF(this.h, (C.double)(red)) +func (this *QColor) SetRedF(red float32) { + C.QColor_SetRedF(this.h, (C.float)(red)) } -func (this *QColor) SetGreenF(green float64) { - C.QColor_SetGreenF(this.h, (C.double)(green)) +func (this *QColor) SetGreenF(green float32) { + C.QColor_SetGreenF(this.h, (C.float)(green)) } -func (this *QColor) SetBlueF(blue float64) { - C.QColor_SetBlueF(this.h, (C.double)(blue)) +func (this *QColor) SetBlueF(blue float32) { + C.QColor_SetBlueF(this.h, (C.float)(blue)) } func (this *QColor) GetRgb(r *int, g *int, b *int) { @@ -251,12 +247,12 @@ func (this *QColor) SetRgb(r int, g int, b int) { C.QColor_SetRgb(this.h, (C.int)(r), (C.int)(g), (C.int)(b)) } -func (this *QColor) GetRgbF(r *float64, g *float64, b *float64) { - C.QColor_GetRgbF(this.h, (*C.double)(unsafe.Pointer(r)), (*C.double)(unsafe.Pointer(g)), (*C.double)(unsafe.Pointer(b))) +func (this *QColor) GetRgbF(r *float32, g *float32, b *float32) { + C.QColor_GetRgbF(this.h, (*C.float)(unsafe.Pointer(r)), (*C.float)(unsafe.Pointer(g)), (*C.float)(unsafe.Pointer(b))) } -func (this *QColor) SetRgbF(r float64, g float64, b float64) { - C.QColor_SetRgbF(this.h, (C.double)(r), (C.double)(g), (C.double)(b)) +func (this *QColor) SetRgbF(r float32, g float32, b float32) { + C.QColor_SetRgbF(this.h, (C.float)(r), (C.float)(g), (C.float)(b)) } func (this *QColor) Rgba64() *QRgba64 { @@ -306,24 +302,24 @@ func (this *QColor) Value() int { return (int)(C.QColor_Value(this.h)) } -func (this *QColor) HueF() float64 { - return (float64)(C.QColor_HueF(this.h)) +func (this *QColor) HueF() float32 { + return (float32)(C.QColor_HueF(this.h)) } -func (this *QColor) SaturationF() float64 { - return (float64)(C.QColor_SaturationF(this.h)) +func (this *QColor) SaturationF() float32 { + return (float32)(C.QColor_SaturationF(this.h)) } -func (this *QColor) HsvHueF() float64 { - return (float64)(C.QColor_HsvHueF(this.h)) +func (this *QColor) HsvHueF() float32 { + return (float32)(C.QColor_HsvHueF(this.h)) } -func (this *QColor) HsvSaturationF() float64 { - return (float64)(C.QColor_HsvSaturationF(this.h)) +func (this *QColor) HsvSaturationF() float32 { + return (float32)(C.QColor_HsvSaturationF(this.h)) } -func (this *QColor) ValueF() float64 { - return (float64)(C.QColor_ValueF(this.h)) +func (this *QColor) ValueF() float32 { + return (float32)(C.QColor_ValueF(this.h)) } func (this *QColor) GetHsv(h *int, s *int, v *int) { @@ -334,12 +330,12 @@ func (this *QColor) SetHsv(h int, s int, v int) { C.QColor_SetHsv(this.h, (C.int)(h), (C.int)(s), (C.int)(v)) } -func (this *QColor) GetHsvF(h *float64, s *float64, v *float64) { - C.QColor_GetHsvF(this.h, (*C.double)(unsafe.Pointer(h)), (*C.double)(unsafe.Pointer(s)), (*C.double)(unsafe.Pointer(v))) +func (this *QColor) GetHsvF(h *float32, s *float32, v *float32) { + C.QColor_GetHsvF(this.h, (*C.float)(unsafe.Pointer(h)), (*C.float)(unsafe.Pointer(s)), (*C.float)(unsafe.Pointer(v))) } -func (this *QColor) SetHsvF(h float64, s float64, v float64) { - C.QColor_SetHsvF(this.h, (C.double)(h), (C.double)(s), (C.double)(v)) +func (this *QColor) SetHsvF(h float32, s float32, v float32) { + C.QColor_SetHsvF(this.h, (C.float)(h), (C.float)(s), (C.float)(v)) } func (this *QColor) Cyan() int { @@ -358,44 +354,36 @@ func (this *QColor) Black() int { return (int)(C.QColor_Black(this.h)) } -func (this *QColor) CyanF() float64 { - return (float64)(C.QColor_CyanF(this.h)) +func (this *QColor) CyanF() float32 { + return (float32)(C.QColor_CyanF(this.h)) } -func (this *QColor) MagentaF() float64 { - return (float64)(C.QColor_MagentaF(this.h)) +func (this *QColor) MagentaF() float32 { + return (float32)(C.QColor_MagentaF(this.h)) } -func (this *QColor) YellowF() float64 { - return (float64)(C.QColor_YellowF(this.h)) +func (this *QColor) YellowF() float32 { + return (float32)(C.QColor_YellowF(this.h)) } -func (this *QColor) BlackF() float64 { - return (float64)(C.QColor_BlackF(this.h)) +func (this *QColor) BlackF() float32 { + return (float32)(C.QColor_BlackF(this.h)) } func (this *QColor) GetCmyk(c *int, m *int, y *int, k *int) { C.QColor_GetCmyk(this.h, (*C.int)(unsafe.Pointer(c)), (*C.int)(unsafe.Pointer(m)), (*C.int)(unsafe.Pointer(y)), (*C.int)(unsafe.Pointer(k))) } -func (this *QColor) GetCmyk2(c *int, m *int, y *int, k *int) { - C.QColor_GetCmyk2(this.h, (*C.int)(unsafe.Pointer(c)), (*C.int)(unsafe.Pointer(m)), (*C.int)(unsafe.Pointer(y)), (*C.int)(unsafe.Pointer(k))) -} - func (this *QColor) SetCmyk(c int, m int, y int, k int) { C.QColor_SetCmyk(this.h, (C.int)(c), (C.int)(m), (C.int)(y), (C.int)(k)) } -func (this *QColor) GetCmykF(c *float64, m *float64, y *float64, k *float64) { - C.QColor_GetCmykF(this.h, (*C.double)(unsafe.Pointer(c)), (*C.double)(unsafe.Pointer(m)), (*C.double)(unsafe.Pointer(y)), (*C.double)(unsafe.Pointer(k))) +func (this *QColor) GetCmykF(c *float32, m *float32, y *float32, k *float32) { + C.QColor_GetCmykF(this.h, (*C.float)(unsafe.Pointer(c)), (*C.float)(unsafe.Pointer(m)), (*C.float)(unsafe.Pointer(y)), (*C.float)(unsafe.Pointer(k))) } -func (this *QColor) GetCmykF2(c *float64, m *float64, y *float64, k *float64) { - C.QColor_GetCmykF2(this.h, (*C.double)(unsafe.Pointer(c)), (*C.double)(unsafe.Pointer(m)), (*C.double)(unsafe.Pointer(y)), (*C.double)(unsafe.Pointer(k))) -} - -func (this *QColor) SetCmykF(c float64, m float64, y float64, k float64) { - C.QColor_SetCmykF(this.h, (C.double)(c), (C.double)(m), (C.double)(y), (C.double)(k)) +func (this *QColor) SetCmykF(c float32, m float32, y float32, k float32) { + C.QColor_SetCmykF(this.h, (C.float)(c), (C.float)(m), (C.float)(y), (C.float)(k)) } func (this *QColor) HslHue() int { @@ -410,16 +398,16 @@ func (this *QColor) Lightness() int { return (int)(C.QColor_Lightness(this.h)) } -func (this *QColor) HslHueF() float64 { - return (float64)(C.QColor_HslHueF(this.h)) +func (this *QColor) HslHueF() float32 { + return (float32)(C.QColor_HslHueF(this.h)) } -func (this *QColor) HslSaturationF() float64 { - return (float64)(C.QColor_HslSaturationF(this.h)) +func (this *QColor) HslSaturationF() float32 { + return (float32)(C.QColor_HslSaturationF(this.h)) } -func (this *QColor) LightnessF() float64 { - return (float64)(C.QColor_LightnessF(this.h)) +func (this *QColor) LightnessF() float32 { + return (float32)(C.QColor_LightnessF(this.h)) } func (this *QColor) GetHsl(h *int, s *int, l *int) { @@ -430,12 +418,12 @@ func (this *QColor) SetHsl(h int, s int, l int) { C.QColor_SetHsl(this.h, (C.int)(h), (C.int)(s), (C.int)(l)) } -func (this *QColor) GetHslF(h *float64, s *float64, l *float64) { - C.QColor_GetHslF(this.h, (*C.double)(unsafe.Pointer(h)), (*C.double)(unsafe.Pointer(s)), (*C.double)(unsafe.Pointer(l))) +func (this *QColor) GetHslF(h *float32, s *float32, l *float32) { + C.QColor_GetHslF(this.h, (*C.float)(unsafe.Pointer(h)), (*C.float)(unsafe.Pointer(s)), (*C.float)(unsafe.Pointer(l))) } -func (this *QColor) SetHslF(h float64, s float64, l float64) { - C.QColor_SetHslF(this.h, (C.double)(h), (C.double)(s), (C.double)(l)) +func (this *QColor) SetHslF(h float32, s float32, l float32) { + C.QColor_SetHslF(this.h, (C.float)(h), (C.float)(s), (C.float)(l)) } func (this *QColor) ToRgb() *QColor { @@ -501,8 +489,8 @@ func QColor_FromRgb2(r int, g int, b int) *QColor { return _goptr } -func QColor_FromRgbF(r float64, g float64, b float64) *QColor { - _ret := C.QColor_FromRgbF((C.double)(r), (C.double)(g), (C.double)(b)) +func QColor_FromRgbF(r float32, g float32, b float32) *QColor { + _ret := C.QColor_FromRgbF((C.float)(r), (C.float)(g), (C.float)(b)) _goptr := newQColor(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -529,8 +517,8 @@ func QColor_FromHsv(h int, s int, v int) *QColor { return _goptr } -func QColor_FromHsvF(h float64, s float64, v float64) *QColor { - _ret := C.QColor_FromHsvF((C.double)(h), (C.double)(s), (C.double)(v)) +func QColor_FromHsvF(h float32, s float32, v float32) *QColor { + _ret := C.QColor_FromHsvF((C.float)(h), (C.float)(s), (C.float)(v)) _goptr := newQColor(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -543,8 +531,8 @@ func QColor_FromCmyk(c int, m int, y int, k int) *QColor { return _goptr } -func QColor_FromCmykF(c float64, m float64, y float64, k float64) *QColor { - _ret := C.QColor_FromCmykF((C.double)(c), (C.double)(m), (C.double)(y), (C.double)(k)) +func QColor_FromCmykF(c float32, m float32, y float32, k float32) *QColor { + _ret := C.QColor_FromCmykF((C.float)(c), (C.float)(m), (C.float)(y), (C.float)(k)) _goptr := newQColor(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -557,22 +545,8 @@ func QColor_FromHsl(h int, s int, l int) *QColor { return _goptr } -func QColor_FromHslF(h float64, s float64, l float64) *QColor { - _ret := C.QColor_FromHslF((C.double)(h), (C.double)(s), (C.double)(l)) - _goptr := newQColor(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QColor) Light() *QColor { - _ret := C.QColor_Light(this.h) - _goptr := newQColor(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QColor) Dark() *QColor { - _ret := C.QColor_Dark(this.h) +func QColor_FromHslF(h float32, s float32, l float32) *QColor { + _ret := C.QColor_FromHslF((C.float)(h), (C.float)(s), (C.float)(l)) _goptr := newQColor(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -606,6 +580,17 @@ func QColor_IsValidColor(name string) bool { return (bool)(C.QColor_IsValidColor((*C.struct_miqt_string)(name_ms))) } +func QColor_IsValidColorName(param1 QAnyStringView) bool { + return (bool)(C.QColor_IsValidColorName(param1.cPointer())) +} + +func (this *QColor) Name1(format QColor__NameFormat) string { + var _ms *C.struct_miqt_string = C.QColor_Name1(this.h, (C.int)(format)) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + func (this *QColor) GetRgb4(r *int, g *int, b *int, a *int) { C.QColor_GetRgb4(this.h, (*C.int)(unsafe.Pointer(r)), (*C.int)(unsafe.Pointer(g)), (*C.int)(unsafe.Pointer(b)), (*C.int)(unsafe.Pointer(a))) } @@ -614,12 +599,12 @@ func (this *QColor) SetRgb4(r int, g int, b int, a int) { C.QColor_SetRgb4(this.h, (C.int)(r), (C.int)(g), (C.int)(b), (C.int)(a)) } -func (this *QColor) GetRgbF4(r *float64, g *float64, b *float64, a *float64) { - C.QColor_GetRgbF4(this.h, (*C.double)(unsafe.Pointer(r)), (*C.double)(unsafe.Pointer(g)), (*C.double)(unsafe.Pointer(b)), (*C.double)(unsafe.Pointer(a))) +func (this *QColor) GetRgbF4(r *float32, g *float32, b *float32, a *float32) { + C.QColor_GetRgbF4(this.h, (*C.float)(unsafe.Pointer(r)), (*C.float)(unsafe.Pointer(g)), (*C.float)(unsafe.Pointer(b)), (*C.float)(unsafe.Pointer(a))) } -func (this *QColor) SetRgbF4(r float64, g float64, b float64, a float64) { - C.QColor_SetRgbF4(this.h, (C.double)(r), (C.double)(g), (C.double)(b), (C.double)(a)) +func (this *QColor) SetRgbF4(r float32, g float32, b float32, a float32) { + C.QColor_SetRgbF4(this.h, (C.float)(r), (C.float)(g), (C.float)(b), (C.float)(a)) } func (this *QColor) GetHsv4(h *int, s *int, v *int, a *int) { @@ -630,36 +615,28 @@ func (this *QColor) SetHsv4(h int, s int, v int, a int) { C.QColor_SetHsv4(this.h, (C.int)(h), (C.int)(s), (C.int)(v), (C.int)(a)) } -func (this *QColor) GetHsvF4(h *float64, s *float64, v *float64, a *float64) { - C.QColor_GetHsvF4(this.h, (*C.double)(unsafe.Pointer(h)), (*C.double)(unsafe.Pointer(s)), (*C.double)(unsafe.Pointer(v)), (*C.double)(unsafe.Pointer(a))) +func (this *QColor) GetHsvF4(h *float32, s *float32, v *float32, a *float32) { + C.QColor_GetHsvF4(this.h, (*C.float)(unsafe.Pointer(h)), (*C.float)(unsafe.Pointer(s)), (*C.float)(unsafe.Pointer(v)), (*C.float)(unsafe.Pointer(a))) } -func (this *QColor) SetHsvF4(h float64, s float64, v float64, a float64) { - C.QColor_SetHsvF4(this.h, (C.double)(h), (C.double)(s), (C.double)(v), (C.double)(a)) +func (this *QColor) SetHsvF4(h float32, s float32, v float32, a float32) { + C.QColor_SetHsvF4(this.h, (C.float)(h), (C.float)(s), (C.float)(v), (C.float)(a)) } func (this *QColor) GetCmyk5(c *int, m *int, y *int, k *int, a *int) { C.QColor_GetCmyk5(this.h, (*C.int)(unsafe.Pointer(c)), (*C.int)(unsafe.Pointer(m)), (*C.int)(unsafe.Pointer(y)), (*C.int)(unsafe.Pointer(k)), (*C.int)(unsafe.Pointer(a))) } -func (this *QColor) GetCmyk52(c *int, m *int, y *int, k *int, a *int) { - C.QColor_GetCmyk52(this.h, (*C.int)(unsafe.Pointer(c)), (*C.int)(unsafe.Pointer(m)), (*C.int)(unsafe.Pointer(y)), (*C.int)(unsafe.Pointer(k)), (*C.int)(unsafe.Pointer(a))) -} - func (this *QColor) SetCmyk5(c int, m int, y int, k int, a int) { C.QColor_SetCmyk5(this.h, (C.int)(c), (C.int)(m), (C.int)(y), (C.int)(k), (C.int)(a)) } -func (this *QColor) GetCmykF5(c *float64, m *float64, y *float64, k *float64, a *float64) { - C.QColor_GetCmykF5(this.h, (*C.double)(unsafe.Pointer(c)), (*C.double)(unsafe.Pointer(m)), (*C.double)(unsafe.Pointer(y)), (*C.double)(unsafe.Pointer(k)), (*C.double)(unsafe.Pointer(a))) +func (this *QColor) GetCmykF5(c *float32, m *float32, y *float32, k *float32, a *float32) { + C.QColor_GetCmykF5(this.h, (*C.float)(unsafe.Pointer(c)), (*C.float)(unsafe.Pointer(m)), (*C.float)(unsafe.Pointer(y)), (*C.float)(unsafe.Pointer(k)), (*C.float)(unsafe.Pointer(a))) } -func (this *QColor) GetCmykF52(c *float64, m *float64, y *float64, k *float64, a *float64) { - C.QColor_GetCmykF52(this.h, (*C.double)(unsafe.Pointer(c)), (*C.double)(unsafe.Pointer(m)), (*C.double)(unsafe.Pointer(y)), (*C.double)(unsafe.Pointer(k)), (*C.double)(unsafe.Pointer(a))) -} - -func (this *QColor) SetCmykF5(c float64, m float64, y float64, k float64, a float64) { - C.QColor_SetCmykF5(this.h, (C.double)(c), (C.double)(m), (C.double)(y), (C.double)(k), (C.double)(a)) +func (this *QColor) SetCmykF5(c float32, m float32, y float32, k float32, a float32) { + C.QColor_SetCmykF5(this.h, (C.float)(c), (C.float)(m), (C.float)(y), (C.float)(k), (C.float)(a)) } func (this *QColor) GetHsl4(h *int, s *int, l *int, a *int) { @@ -670,12 +647,12 @@ func (this *QColor) SetHsl4(h int, s int, l int, a int) { C.QColor_SetHsl4(this.h, (C.int)(h), (C.int)(s), (C.int)(l), (C.int)(a)) } -func (this *QColor) GetHslF4(h *float64, s *float64, l *float64, a *float64) { - C.QColor_GetHslF4(this.h, (*C.double)(unsafe.Pointer(h)), (*C.double)(unsafe.Pointer(s)), (*C.double)(unsafe.Pointer(l)), (*C.double)(unsafe.Pointer(a))) +func (this *QColor) GetHslF4(h *float32, s *float32, l *float32, a *float32) { + C.QColor_GetHslF4(this.h, (*C.float)(unsafe.Pointer(h)), (*C.float)(unsafe.Pointer(s)), (*C.float)(unsafe.Pointer(l)), (*C.float)(unsafe.Pointer(a))) } -func (this *QColor) SetHslF4(h float64, s float64, l float64, a float64) { - C.QColor_SetHslF4(this.h, (C.double)(h), (C.double)(s), (C.double)(l), (C.double)(a)) +func (this *QColor) SetHslF4(h float32, s float32, l float32, a float32) { + C.QColor_SetHslF4(this.h, (C.float)(h), (C.float)(s), (C.float)(l), (C.float)(a)) } func QColor_FromRgb4(r int, g int, b int, a int) *QColor { @@ -685,8 +662,8 @@ func QColor_FromRgb4(r int, g int, b int, a int) *QColor { return _goptr } -func QColor_FromRgbF4(r float64, g float64, b float64, a float64) *QColor { - _ret := C.QColor_FromRgbF4((C.double)(r), (C.double)(g), (C.double)(b), (C.double)(a)) +func QColor_FromRgbF4(r float32, g float32, b float32, a float32) *QColor { + _ret := C.QColor_FromRgbF4((C.float)(r), (C.float)(g), (C.float)(b), (C.float)(a)) _goptr := newQColor(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -706,8 +683,8 @@ func QColor_FromHsv4(h int, s int, v int, a int) *QColor { return _goptr } -func QColor_FromHsvF4(h float64, s float64, v float64, a float64) *QColor { - _ret := C.QColor_FromHsvF4((C.double)(h), (C.double)(s), (C.double)(v), (C.double)(a)) +func QColor_FromHsvF4(h float32, s float32, v float32, a float32) *QColor { + _ret := C.QColor_FromHsvF4((C.float)(h), (C.float)(s), (C.float)(v), (C.float)(a)) _goptr := newQColor(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -720,8 +697,8 @@ func QColor_FromCmyk5(c int, m int, y int, k int, a int) *QColor { return _goptr } -func QColor_FromCmykF5(c float64, m float64, y float64, k float64, a float64) *QColor { - _ret := C.QColor_FromCmykF5((C.double)(c), (C.double)(m), (C.double)(y), (C.double)(k), (C.double)(a)) +func QColor_FromCmykF5(c float32, m float32, y float32, k float32, a float32) *QColor { + _ret := C.QColor_FromCmykF5((C.float)(c), (C.float)(m), (C.float)(y), (C.float)(k), (C.float)(a)) _goptr := newQColor(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -734,22 +711,8 @@ func QColor_FromHsl4(h int, s int, l int, a int) *QColor { return _goptr } -func QColor_FromHslF4(h float64, s float64, l float64, a float64) *QColor { - _ret := C.QColor_FromHslF4((C.double)(h), (C.double)(s), (C.double)(l), (C.double)(a)) - _goptr := newQColor(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QColor) Light1(f int) *QColor { - _ret := C.QColor_Light1(this.h, (C.int)(f)) - _goptr := newQColor(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QColor) Dark1(f int) *QColor { - _ret := C.QColor_Dark1(this.h, (C.int)(f)) +func QColor_FromHslF4(h float32, s float32, l float32, a float32) *QColor { + _ret := C.QColor_FromHslF4((C.float)(h), (C.float)(s), (C.float)(l), (C.float)(a)) _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 de31e59..ca88eb3 100644 --- a/qt/gen_qcolor.h +++ b/qt/gen_qcolor.h @@ -14,9 +14,11 @@ extern "C" { #endif #ifdef __cplusplus +class QAnyStringView; class QColor; class QRgba64; #else +typedef struct QAnyStringView QAnyStringView; typedef struct QColor QColor; typedef struct QRgba64 QRgba64; #endif @@ -29,38 +31,37 @@ QColor* QColor_new5(QRgba64* rgba64); QColor* QColor_new6(struct miqt_string* name); QColor* QColor_new7(const char* aname); QColor* QColor_new8(int spec); -QColor* QColor_new9(QColor* color); -QColor* QColor_new10(int spec, uint16_t a1, uint16_t a2, uint16_t a3, uint16_t a4); +QColor* QColor_new9(int spec, uint16_t a1, uint16_t a2, uint16_t a3, uint16_t a4); +QColor* QColor_new10(QColor* param1); QColor* QColor_new11(int r, int g, int b, int a); 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, int color); +QColor* QColor_FromString(QAnyStringView* name); +void QColor_OperatorAssign(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, int format); void QColor_SetNamedColor(QColor* self, struct miqt_string* name); struct miqt_array* QColor_ColorNames(); 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); -void QColor_SetAlphaF(QColor* self, double alpha); +float QColor_AlphaF(const QColor* self); +void QColor_SetAlphaF(QColor* self, float alpha); int QColor_Red(const QColor* self); int QColor_Green(const QColor* self); int QColor_Blue(const QColor* self); void QColor_SetRed(QColor* self, int red); void QColor_SetGreen(QColor* self, int green); void QColor_SetBlue(QColor* self, int blue); -double QColor_RedF(const QColor* self); -double QColor_GreenF(const QColor* self); -double QColor_BlueF(const QColor* self); -void QColor_SetRedF(QColor* self, double red); -void QColor_SetGreenF(QColor* self, double green); -void QColor_SetBlueF(QColor* self, double blue); +float QColor_RedF(const QColor* self); +float QColor_GreenF(const QColor* self); +float QColor_BlueF(const QColor* self); +void QColor_SetRedF(QColor* self, float red); +void QColor_SetGreenF(QColor* self, float green); +void QColor_SetBlueF(QColor* self, float blue); void QColor_GetRgb(const QColor* self, int* r, int* g, int* b); void QColor_SetRgb(QColor* self, int r, int g, int b); -void QColor_GetRgbF(const QColor* self, double* r, double* g, double* b); -void QColor_SetRgbF(QColor* self, double r, double g, double b); +void QColor_GetRgbF(const QColor* self, float* r, float* g, float* b); +void QColor_SetRgbF(QColor* self, float r, float g, float b); QRgba64* QColor_Rgba64(const QColor* self); void QColor_SetRgba64(QColor* self, QRgba64* rgba); unsigned int QColor_Rgba(const QColor* self); @@ -72,39 +73,37 @@ int QColor_Saturation(const QColor* self); int QColor_HsvHue(const QColor* self); int QColor_HsvSaturation(const QColor* self); int QColor_Value(const QColor* self); -double QColor_HueF(const QColor* self); -double QColor_SaturationF(const QColor* self); -double QColor_HsvHueF(const QColor* self); -double QColor_HsvSaturationF(const QColor* self); -double QColor_ValueF(const QColor* self); +float QColor_HueF(const QColor* self); +float QColor_SaturationF(const QColor* self); +float QColor_HsvHueF(const QColor* self); +float QColor_HsvSaturationF(const QColor* self); +float QColor_ValueF(const QColor* self); void QColor_GetHsv(const QColor* self, int* h, int* s, int* v); void QColor_SetHsv(QColor* self, int h, int s, int v); -void QColor_GetHsvF(const QColor* self, double* h, double* s, double* v); -void QColor_SetHsvF(QColor* self, double h, double s, double v); +void QColor_GetHsvF(const QColor* self, float* h, float* s, float* v); +void QColor_SetHsvF(QColor* self, float h, float s, float v); int QColor_Cyan(const QColor* self); int QColor_Magenta(const QColor* self); int QColor_Yellow(const QColor* self); int QColor_Black(const QColor* self); -double QColor_CyanF(const QColor* self); -double QColor_MagentaF(const QColor* self); -double QColor_YellowF(const QColor* self); -double QColor_BlackF(const QColor* self); -void QColor_GetCmyk(QColor* self, int* c, int* m, int* y, int* k); -void QColor_GetCmyk2(const QColor* self, int* c, int* m, int* y, int* k); +float QColor_CyanF(const QColor* self); +float QColor_MagentaF(const QColor* self); +float QColor_YellowF(const QColor* self); +float QColor_BlackF(const QColor* self); +void QColor_GetCmyk(const QColor* self, int* c, int* m, int* y, int* k); void QColor_SetCmyk(QColor* self, int c, int m, int y, int k); -void QColor_GetCmykF(QColor* self, double* c, double* m, double* y, double* k); -void QColor_GetCmykF2(const QColor* self, double* c, double* m, double* y, double* k); -void QColor_SetCmykF(QColor* self, double c, double m, double y, double k); +void QColor_GetCmykF(const QColor* self, float* c, float* m, float* y, float* k); +void QColor_SetCmykF(QColor* self, float c, float m, float y, float k); int QColor_HslHue(const QColor* self); int QColor_HslSaturation(const QColor* self); int QColor_Lightness(const QColor* self); -double QColor_HslHueF(const QColor* self); -double QColor_HslSaturationF(const QColor* self); -double QColor_LightnessF(const QColor* self); +float QColor_HslHueF(const QColor* self); +float QColor_HslSaturationF(const QColor* self); +float QColor_LightnessF(const QColor* self); void QColor_GetHsl(const QColor* self, int* h, int* s, int* l); void QColor_SetHsl(QColor* self, int h, int s, int l); -void QColor_GetHslF(const QColor* self, double* h, double* s, double* l); -void QColor_SetHslF(QColor* self, double h, double s, double l); +void QColor_GetHslF(const QColor* self, float* h, float* s, float* l); +void QColor_SetHslF(QColor* self, float h, float s, float l); QColor* QColor_ToRgb(const QColor* self); QColor* QColor_ToHsv(const QColor* self); QColor* QColor_ToCmyk(const QColor* self); @@ -114,51 +113,47 @@ 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); -QColor* QColor_FromRgbF(double r, double g, double b); +QColor* QColor_FromRgbF(float r, float g, float b); QColor* QColor_FromRgba64(uint16_t r, uint16_t g, uint16_t b); QColor* QColor_FromRgba64WithRgba(QRgba64* rgba); QColor* QColor_FromHsv(int h, int s, int v); -QColor* QColor_FromHsvF(double h, double s, double v); +QColor* QColor_FromHsvF(float h, float s, float v); QColor* QColor_FromCmyk(int c, int m, int y, int k); -QColor* QColor_FromCmykF(double c, double m, double y, double k); +QColor* QColor_FromCmykF(float c, float m, float y, float k); QColor* QColor_FromHsl(int h, int s, int l); -QColor* QColor_FromHslF(double h, double s, double l); -QColor* QColor_Light(const QColor* self); -QColor* QColor_Dark(const QColor* self); +QColor* QColor_FromHslF(float h, float s, float l); QColor* QColor_Lighter(const QColor* self); QColor* QColor_Darker(const QColor* self); bool QColor_OperatorEqual(const QColor* self, QColor* c); bool QColor_OperatorNotEqual(const QColor* self, QColor* c); bool QColor_IsValidColor(struct miqt_string* name); +bool QColor_IsValidColorName(QAnyStringView* param1); +struct miqt_string* QColor_Name1(const QColor* self, int format); void QColor_GetRgb4(const QColor* self, int* r, int* g, int* b, int* a); void QColor_SetRgb4(QColor* self, int r, int g, int b, int a); -void QColor_GetRgbF4(const QColor* self, double* r, double* g, double* b, double* a); -void QColor_SetRgbF4(QColor* self, double r, double g, double b, double a); +void QColor_GetRgbF4(const QColor* self, float* r, float* g, float* b, float* a); +void QColor_SetRgbF4(QColor* self, float r, float g, float b, float a); void QColor_GetHsv4(const QColor* self, int* h, int* s, int* v, int* a); void QColor_SetHsv4(QColor* self, int h, int s, int v, int a); -void QColor_GetHsvF4(const QColor* self, double* h, double* s, double* v, double* a); -void QColor_SetHsvF4(QColor* self, double h, double s, double v, double a); -void QColor_GetCmyk5(QColor* self, int* c, int* m, int* y, int* k, int* a); -void QColor_GetCmyk52(const QColor* self, int* c, int* m, int* y, int* k, int* a); +void QColor_GetHsvF4(const QColor* self, float* h, float* s, float* v, float* a); +void QColor_SetHsvF4(QColor* self, float h, float s, float v, float a); +void QColor_GetCmyk5(const QColor* self, int* c, int* m, int* y, int* k, int* a); void QColor_SetCmyk5(QColor* self, int c, int m, int y, int k, int a); -void QColor_GetCmykF5(QColor* self, double* c, double* m, double* y, double* k, double* a); -void QColor_GetCmykF52(const QColor* self, double* c, double* m, double* y, double* k, double* a); -void QColor_SetCmykF5(QColor* self, double c, double m, double y, double k, double a); +void QColor_GetCmykF5(const QColor* self, float* c, float* m, float* y, float* k, float* a); +void QColor_SetCmykF5(QColor* self, float c, float m, float y, float k, float a); void QColor_GetHsl4(const QColor* self, int* h, int* s, int* l, int* a); void QColor_SetHsl4(QColor* self, int h, int s, int l, int a); -void QColor_GetHslF4(const QColor* self, double* h, double* s, double* l, double* a); -void QColor_SetHslF4(QColor* self, double h, double s, double l, double a); +void QColor_GetHslF4(const QColor* self, float* h, float* s, float* l, float* a); +void QColor_SetHslF4(QColor* self, float h, float s, float l, float a); QColor* QColor_FromRgb4(int r, int g, int b, int a); -QColor* QColor_FromRgbF4(double r, double g, double b, double a); +QColor* QColor_FromRgbF4(float r, float g, float b, float a); QColor* QColor_FromRgba644(uint16_t r, uint16_t g, uint16_t b, uint16_t a); QColor* QColor_FromHsv4(int h, int s, int v, int a); -QColor* QColor_FromHsvF4(double h, double s, double v, double a); +QColor* QColor_FromHsvF4(float h, float s, float v, float a); QColor* QColor_FromCmyk5(int c, int m, int y, int k, int a); -QColor* QColor_FromCmykF5(double c, double m, double y, double k, double a); +QColor* QColor_FromCmykF5(float c, float m, float y, float k, float a); QColor* QColor_FromHsl4(int h, int s, int l, int a); -QColor* QColor_FromHslF4(double h, double s, double l, double a); -QColor* QColor_Light1(const QColor* self, int f); -QColor* QColor_Dark1(const QColor* self, int f); +QColor* QColor_FromHslF4(float h, float s, float l, float a); QColor* QColor_Lighter1(const QColor* self, int f); QColor* QColor_Darker1(const QColor* self, int f); void QColor_Delete(QColor* self); diff --git a/qt/gen_qcolordialog.cpp b/qt/gen_qcolordialog.cpp index 705a2e6..ff6df2b 100644 --- a/qt/gen_qcolordialog.cpp +++ b/qt/gen_qcolordialog.cpp @@ -40,13 +40,6 @@ struct miqt_string* QColorDialog_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QColorDialog_TrUtf8(const char* s) { - QString _ret = QColorDialog::trUtf8(s); - // 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 QColorDialog_SetCurrentColor(QColorDialog* self, QColor* color) { self->setCurrentColor(*color); } @@ -84,11 +77,6 @@ QColor* QColorDialog_GetColor() { return new QColor(QColorDialog::getColor()); } -unsigned int QColorDialog_GetRgba() { - QRgb _ret = QColorDialog::getRgba(); - return static_cast(_ret); -} - int QColorDialog_CustomCount() { return QColorDialog::customCount(); } @@ -149,20 +137,6 @@ struct miqt_string* QColorDialog_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QColorDialog_TrUtf82(const char* s, const char* c) { - QString _ret = QColorDialog::trUtf8(s, c); - // 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* QColorDialog_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QColorDialog::trUtf8(s, c, static_cast(n)); - // 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 QColorDialog_SetOption2(QColorDialog* self, int option, bool on) { self->setOption(static_cast(option), on); } @@ -185,21 +159,6 @@ QColor* QColorDialog_GetColor4(QColor* initial, QWidget* parent, struct miqt_str return new QColor(QColorDialog::getColor(*initial, parent, title_QString, static_cast(options))); } -unsigned int QColorDialog_GetRgba1(unsigned int rgba) { - QRgb _ret = QColorDialog::getRgba(static_cast(rgba)); - return static_cast(_ret); -} - -unsigned int QColorDialog_GetRgba2(unsigned int rgba, bool* ok) { - QRgb _ret = QColorDialog::getRgba(static_cast(rgba), ok); - return static_cast(_ret); -} - -unsigned int QColorDialog_GetRgba3(unsigned int rgba, bool* ok, QWidget* parent) { - QRgb _ret = QColorDialog::getRgba(static_cast(rgba), ok, parent); - return static_cast(_ret); -} - void QColorDialog_Delete(QColorDialog* self) { delete self; } diff --git a/qt/gen_qcolordialog.go b/qt/gen_qcolordialog.go index 9afa3b1..eccdbfe 100644 --- a/qt/gen_qcolordialog.go +++ b/qt/gen_qcolordialog.go @@ -88,15 +88,6 @@ func QColorDialog_Tr(s string) string { return _ret } -func QColorDialog_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QColorDialog_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QColorDialog) SetCurrentColor(color *QColor) { C.QColorDialog_SetCurrentColor(this.h, color.cPointer()) } @@ -142,10 +133,6 @@ func QColorDialog_GetColor() *QColor { return _goptr } -func QColorDialog_GetRgba() uint { - return (uint)(C.QColorDialog_GetRgba()) -} - func QColorDialog_CustomCount() int { return (int)(C.QColorDialog_CustomCount()) } @@ -234,28 +221,6 @@ func QColorDialog_Tr3(s string, c string, n int) string { return _ret } -func QColorDialog_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QColorDialog_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QColorDialog_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QColorDialog_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QColorDialog) SetOption2(option QColorDialog__ColorDialogOption, on bool) { C.QColorDialog_SetOption2(this.h, (C.int)(option), (C.bool)(on)) } @@ -292,18 +257,6 @@ func QColorDialog_GetColor4(initial *QColor, parent *QWidget, title string, opti return _goptr } -func QColorDialog_GetRgba1(rgba uint) uint { - return (uint)(C.QColorDialog_GetRgba1((C.uint)(rgba))) -} - -func QColorDialog_GetRgba2(rgba uint, ok *bool) uint { - return (uint)(C.QColorDialog_GetRgba2((C.uint)(rgba), (*C.bool)(unsafe.Pointer(ok)))) -} - -func QColorDialog_GetRgba3(rgba uint, ok *bool, parent *QWidget) uint { - return (uint)(C.QColorDialog_GetRgba3((C.uint)(rgba), (*C.bool)(unsafe.Pointer(ok)), parent.cPointer())) -} - // Delete this object from C++ memory. func (this *QColorDialog) Delete() { C.QColorDialog_Delete(this.h) diff --git a/qt/gen_qcolordialog.h b/qt/gen_qcolordialog.h index 68b0301..208bafd 100644 --- a/qt/gen_qcolordialog.h +++ b/qt/gen_qcolordialog.h @@ -32,7 +32,6 @@ QColorDialog* QColorDialog_new4(QColor* initial, QWidget* parent); QMetaObject* QColorDialog_MetaObject(const QColorDialog* self); void* QColorDialog_Metacast(QColorDialog* self, const char* param1); struct miqt_string* QColorDialog_Tr(const char* s); -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); @@ -42,7 +41,6 @@ void QColorDialog_SetOptions(QColorDialog* self, int options); int QColorDialog_Options(const QColorDialog* self); void QColorDialog_SetVisible(QColorDialog* self, bool visible); QColor* QColorDialog_GetColor(); -unsigned int QColorDialog_GetRgba(); int QColorDialog_CustomCount(); QColor* QColorDialog_CustomColor(int index); void QColorDialog_SetCustomColor(int index, QColor* color); @@ -54,16 +52,11 @@ void QColorDialog_ColorSelected(QColorDialog* self, QColor* color); void QColorDialog_connect_ColorSelected(QColorDialog* self, void* slot); struct miqt_string* QColorDialog_Tr2(const char* s, const char* c); struct miqt_string* QColorDialog_Tr3(const char* s, const char* c, int n); -struct miqt_string* QColorDialog_TrUtf82(const char* s, const char* c); -struct miqt_string* QColorDialog_TrUtf83(const char* s, const char* c, int n); 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); QColor* QColorDialog_GetColor4(QColor* initial, QWidget* parent, struct miqt_string* title, int options); -unsigned int QColorDialog_GetRgba1(unsigned int rgba); -unsigned int QColorDialog_GetRgba2(unsigned int rgba, bool* ok); -unsigned int QColorDialog_GetRgba3(unsigned int rgba, bool* ok, QWidget* parent); void QColorDialog_Delete(QColorDialog* self); #ifdef __cplusplus diff --git a/qt/gen_qcolormap.cpp b/qt/gen_qcolormap.cpp index 539fa96..a31e4ec 100644 --- a/qt/gen_qcolormap.cpp +++ b/qt/gen_qcolormap.cpp @@ -48,7 +48,7 @@ QColor* QColormap_ColorAt(const QColormap* self, unsigned int pixel) { } struct miqt_array* QColormap_Colormap(const QColormap* self) { - const QVector _ret = self->colormap(); + const QList _ret = self->colormap(); // Convert QList<> from C++ memory to manually-managed C memory QColor** _arr = static_cast(malloc(sizeof(QColor*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { diff --git a/qt/gen_qcolormap.go b/qt/gen_qcolormap.go index 1b9b38a..6b71df7 100644 --- a/qt/gen_qcolormap.go +++ b/qt/gen_qcolormap.go @@ -96,10 +96,10 @@ func (this *QColormap) Colormap() []QColor { _ret := make([]QColor, int(_ma.len)) _outCast := (*[0xffff]*C.QColor)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _vv_ret := _outCast[i] - _vv_goptr := newQColor(_vv_ret) - _vv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_vv_goptr + _lv_ret := _outCast[i] + _lv_goptr := newQColor(_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 diff --git a/qt/gen_qcolorspace.cpp b/qt/gen_qcolorspace.cpp index d0c0dda..90496ba 100644 --- a/qt/gen_qcolorspace.cpp +++ b/qt/gen_qcolorspace.cpp @@ -1,7 +1,11 @@ #include #include #include +#include #include +#include +#include +#include #include "qcolorspace.h" #include "gen_qcolorspace.h" #include "_cgo_export.h" @@ -22,19 +26,61 @@ 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, int transferFunction) { +QColorSpace* QColorSpace_new5(int primaries, struct miqt_array* /* of uint16_t */ transferFunctionTable) { + QList transferFunctionTable_QList; + transferFunctionTable_QList.reserve(transferFunctionTable->len); + uint16_t* transferFunctionTable_arr = static_cast(transferFunctionTable->data); + for(size_t i = 0; i < transferFunctionTable->len; ++i) { + transferFunctionTable_QList.push_back(static_cast(transferFunctionTable_arr[i])); + } + return new QColorSpace(static_cast(primaries), transferFunctionTable_QList); +} + +QColorSpace* QColorSpace_new6(QPointF* whitePoint, QPointF* redPoint, QPointF* greenPoint, QPointF* bluePoint, int transferFunction) { return new QColorSpace(*whitePoint, *redPoint, *greenPoint, *bluePoint, static_cast(transferFunction)); } -QColorSpace* QColorSpace_new6(QColorSpace* colorSpace) { +QColorSpace* QColorSpace_new7(QPointF* whitePoint, QPointF* redPoint, QPointF* greenPoint, QPointF* bluePoint, struct miqt_array* /* of uint16_t */ transferFunctionTable) { + QList transferFunctionTable_QList; + transferFunctionTable_QList.reserve(transferFunctionTable->len); + uint16_t* transferFunctionTable_arr = static_cast(transferFunctionTable->data); + for(size_t i = 0; i < transferFunctionTable->len; ++i) { + transferFunctionTable_QList.push_back(static_cast(transferFunctionTable_arr[i])); + } + return new QColorSpace(*whitePoint, *redPoint, *greenPoint, *bluePoint, transferFunctionTable_QList); +} + +QColorSpace* QColorSpace_new8(QPointF* whitePoint, QPointF* redPoint, QPointF* greenPoint, QPointF* bluePoint, struct miqt_array* /* of uint16_t */ redTransferFunctionTable, struct miqt_array* /* of uint16_t */ greenTransferFunctionTable, struct miqt_array* /* of uint16_t */ blueTransferFunctionTable) { + QList redTransferFunctionTable_QList; + redTransferFunctionTable_QList.reserve(redTransferFunctionTable->len); + uint16_t* redTransferFunctionTable_arr = static_cast(redTransferFunctionTable->data); + for(size_t i = 0; i < redTransferFunctionTable->len; ++i) { + redTransferFunctionTable_QList.push_back(static_cast(redTransferFunctionTable_arr[i])); + } + QList greenTransferFunctionTable_QList; + greenTransferFunctionTable_QList.reserve(greenTransferFunctionTable->len); + uint16_t* greenTransferFunctionTable_arr = static_cast(greenTransferFunctionTable->data); + for(size_t i = 0; i < greenTransferFunctionTable->len; ++i) { + greenTransferFunctionTable_QList.push_back(static_cast(greenTransferFunctionTable_arr[i])); + } + QList blueTransferFunctionTable_QList; + blueTransferFunctionTable_QList.reserve(blueTransferFunctionTable->len); + uint16_t* blueTransferFunctionTable_arr = static_cast(blueTransferFunctionTable->data); + for(size_t i = 0; i < blueTransferFunctionTable->len; ++i) { + blueTransferFunctionTable_QList.push_back(static_cast(blueTransferFunctionTable_arr[i])); + } + return new QColorSpace(*whitePoint, *redPoint, *greenPoint, *bluePoint, redTransferFunctionTable_QList, greenTransferFunctionTable_QList, blueTransferFunctionTable_QList); +} + +QColorSpace* QColorSpace_new9(QColorSpace* colorSpace) { return new QColorSpace(*colorSpace); } -QColorSpace* QColorSpace_new7(int primaries, int transferFunction, float gamma) { +QColorSpace* QColorSpace_new10(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, int transferFunction, float gamma) { +QColorSpace* QColorSpace_new11(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)); } @@ -60,14 +106,90 @@ float QColorSpace_Gamma(const QColorSpace* self) { return self->gamma(); } +struct miqt_string* QColorSpace_Description(const QColorSpace* self) { + QString _ret = self->description(); + // 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 QColorSpace_SetDescription(QColorSpace* self, struct miqt_string* description) { + QString description_QString = QString::fromUtf8(&description->data, description->len); + self->setDescription(description_QString); +} + void QColorSpace_SetTransferFunction(QColorSpace* self, int transferFunction) { self->setTransferFunction(static_cast(transferFunction)); } +void QColorSpace_SetTransferFunctionWithTransferFunctionTable(QColorSpace* self, struct miqt_array* /* of uint16_t */ transferFunctionTable) { + QList transferFunctionTable_QList; + transferFunctionTable_QList.reserve(transferFunctionTable->len); + uint16_t* transferFunctionTable_arr = static_cast(transferFunctionTable->data); + for(size_t i = 0; i < transferFunctionTable->len; ++i) { + transferFunctionTable_QList.push_back(static_cast(transferFunctionTable_arr[i])); + } + self->setTransferFunction(transferFunctionTable_QList); +} + +void QColorSpace_SetTransferFunctions(QColorSpace* self, struct miqt_array* /* of uint16_t */ redTransferFunctionTable, struct miqt_array* /* of uint16_t */ greenTransferFunctionTable, struct miqt_array* /* of uint16_t */ blueTransferFunctionTable) { + QList redTransferFunctionTable_QList; + redTransferFunctionTable_QList.reserve(redTransferFunctionTable->len); + uint16_t* redTransferFunctionTable_arr = static_cast(redTransferFunctionTable->data); + for(size_t i = 0; i < redTransferFunctionTable->len; ++i) { + redTransferFunctionTable_QList.push_back(static_cast(redTransferFunctionTable_arr[i])); + } + QList greenTransferFunctionTable_QList; + greenTransferFunctionTable_QList.reserve(greenTransferFunctionTable->len); + uint16_t* greenTransferFunctionTable_arr = static_cast(greenTransferFunctionTable->data); + for(size_t i = 0; i < greenTransferFunctionTable->len; ++i) { + greenTransferFunctionTable_QList.push_back(static_cast(greenTransferFunctionTable_arr[i])); + } + QList blueTransferFunctionTable_QList; + blueTransferFunctionTable_QList.reserve(blueTransferFunctionTable->len); + uint16_t* blueTransferFunctionTable_arr = static_cast(blueTransferFunctionTable->data); + for(size_t i = 0; i < blueTransferFunctionTable->len; ++i) { + blueTransferFunctionTable_QList.push_back(static_cast(blueTransferFunctionTable_arr[i])); + } + self->setTransferFunctions(redTransferFunctionTable_QList, greenTransferFunctionTable_QList, blueTransferFunctionTable_QList); +} + QColorSpace* QColorSpace_WithTransferFunction(const QColorSpace* self, int transferFunction) { return new QColorSpace(self->withTransferFunction(static_cast(transferFunction))); } +QColorSpace* QColorSpace_WithTransferFunctionWithTransferFunctionTable(const QColorSpace* self, struct miqt_array* /* of uint16_t */ transferFunctionTable) { + QList transferFunctionTable_QList; + transferFunctionTable_QList.reserve(transferFunctionTable->len); + uint16_t* transferFunctionTable_arr = static_cast(transferFunctionTable->data); + for(size_t i = 0; i < transferFunctionTable->len; ++i) { + transferFunctionTable_QList.push_back(static_cast(transferFunctionTable_arr[i])); + } + return new QColorSpace(self->withTransferFunction(transferFunctionTable_QList)); +} + +QColorSpace* QColorSpace_WithTransferFunctions(const QColorSpace* self, struct miqt_array* /* of uint16_t */ redTransferFunctionTable, struct miqt_array* /* of uint16_t */ greenTransferFunctionTable, struct miqt_array* /* of uint16_t */ blueTransferFunctionTable) { + QList redTransferFunctionTable_QList; + redTransferFunctionTable_QList.reserve(redTransferFunctionTable->len); + uint16_t* redTransferFunctionTable_arr = static_cast(redTransferFunctionTable->data); + for(size_t i = 0; i < redTransferFunctionTable->len; ++i) { + redTransferFunctionTable_QList.push_back(static_cast(redTransferFunctionTable_arr[i])); + } + QList greenTransferFunctionTable_QList; + greenTransferFunctionTable_QList.reserve(greenTransferFunctionTable->len); + uint16_t* greenTransferFunctionTable_arr = static_cast(greenTransferFunctionTable->data); + for(size_t i = 0; i < greenTransferFunctionTable->len; ++i) { + greenTransferFunctionTable_QList.push_back(static_cast(greenTransferFunctionTable_arr[i])); + } + QList blueTransferFunctionTable_QList; + blueTransferFunctionTable_QList.reserve(blueTransferFunctionTable->len); + uint16_t* blueTransferFunctionTable_arr = static_cast(blueTransferFunctionTable->data); + for(size_t i = 0; i < blueTransferFunctionTable->len; ++i) { + blueTransferFunctionTable_QList.push_back(static_cast(blueTransferFunctionTable_arr[i])); + } + return new QColorSpace(self->withTransferFunctions(redTransferFunctionTable_QList, greenTransferFunctionTable_QList, blueTransferFunctionTable_QList)); +} + void QColorSpace_SetPrimaries(QColorSpace* self, int primariesId) { self->setPrimaries(static_cast(primariesId)); } @@ -76,6 +198,10 @@ void QColorSpace_SetPrimaries2(QColorSpace* self, QPointF* whitePoint, QPointF* self->setPrimaries(*whitePoint, *redPoint, *greenPoint, *bluePoint); } +void QColorSpace_Detach(QColorSpace* self) { + self->detach(); +} + bool QColorSpace_IsValid(const QColorSpace* self) { return self->isValid(); } diff --git a/qt/gen_qcolorspace.go b/qt/gen_qcolorspace.go index 6bf3482..28b2935 100644 --- a/qt/gen_qcolorspace.go +++ b/qt/gen_qcolorspace.go @@ -90,26 +90,84 @@ func NewQColorSpace4(primaries QColorSpace__Primaries, gamma float32) *QColorSpa } // 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.int)(transferFunction)) +func NewQColorSpace5(primaries QColorSpace__Primaries, transferFunctionTable []uint16) *QColorSpace { + // For the C ABI, malloc a C array of raw pointers + transferFunctionTable_CArray := (*[0xffff]C.uint16_t)(C.malloc(C.size_t(8 * len(transferFunctionTable)))) + defer C.free(unsafe.Pointer(transferFunctionTable_CArray)) + for i := range transferFunctionTable { + transferFunctionTable_CArray[i] = (C.uint16_t)(transferFunctionTable[i]) + } + transferFunctionTable_ma := &C.struct_miqt_array{len: C.size_t(len(transferFunctionTable)), data: unsafe.Pointer(transferFunctionTable_CArray)} + defer runtime.KeepAlive(unsafe.Pointer(transferFunctionTable_ma)) + ret := C.QColorSpace_new5((C.int)(primaries), transferFunctionTable_ma) return newQColorSpace(ret) } // NewQColorSpace6 constructs a new QColorSpace object. -func NewQColorSpace6(colorSpace *QColorSpace) *QColorSpace { - ret := C.QColorSpace_new6(colorSpace.cPointer()) +func NewQColorSpace6(whitePoint *QPointF, redPoint *QPointF, greenPoint *QPointF, bluePoint *QPointF, transferFunction QColorSpace__TransferFunction) *QColorSpace { + ret := C.QColorSpace_new6(whitePoint.cPointer(), redPoint.cPointer(), greenPoint.cPointer(), bluePoint.cPointer(), (C.int)(transferFunction)) return newQColorSpace(ret) } // NewQColorSpace7 constructs a new QColorSpace object. -func NewQColorSpace7(primaries QColorSpace__Primaries, transferFunction QColorSpace__TransferFunction, gamma float32) *QColorSpace { - ret := C.QColorSpace_new7((C.int)(primaries), (C.int)(transferFunction), (C.float)(gamma)) +func NewQColorSpace7(whitePoint *QPointF, redPoint *QPointF, greenPoint *QPointF, bluePoint *QPointF, transferFunctionTable []uint16) *QColorSpace { + // For the C ABI, malloc a C array of raw pointers + transferFunctionTable_CArray := (*[0xffff]C.uint16_t)(C.malloc(C.size_t(8 * len(transferFunctionTable)))) + defer C.free(unsafe.Pointer(transferFunctionTable_CArray)) + for i := range transferFunctionTable { + transferFunctionTable_CArray[i] = (C.uint16_t)(transferFunctionTable[i]) + } + transferFunctionTable_ma := &C.struct_miqt_array{len: C.size_t(len(transferFunctionTable)), data: unsafe.Pointer(transferFunctionTable_CArray)} + defer runtime.KeepAlive(unsafe.Pointer(transferFunctionTable_ma)) + ret := C.QColorSpace_new7(whitePoint.cPointer(), redPoint.cPointer(), greenPoint.cPointer(), bluePoint.cPointer(), transferFunctionTable_ma) 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.int)(transferFunction), (C.float)(gamma)) +func NewQColorSpace8(whitePoint *QPointF, redPoint *QPointF, greenPoint *QPointF, bluePoint *QPointF, redTransferFunctionTable []uint16, greenTransferFunctionTable []uint16, blueTransferFunctionTable []uint16) *QColorSpace { + // For the C ABI, malloc a C array of raw pointers + redTransferFunctionTable_CArray := (*[0xffff]C.uint16_t)(C.malloc(C.size_t(8 * len(redTransferFunctionTable)))) + defer C.free(unsafe.Pointer(redTransferFunctionTable_CArray)) + for i := range redTransferFunctionTable { + redTransferFunctionTable_CArray[i] = (C.uint16_t)(redTransferFunctionTable[i]) + } + redTransferFunctionTable_ma := &C.struct_miqt_array{len: C.size_t(len(redTransferFunctionTable)), data: unsafe.Pointer(redTransferFunctionTable_CArray)} + defer runtime.KeepAlive(unsafe.Pointer(redTransferFunctionTable_ma)) + // For the C ABI, malloc a C array of raw pointers + greenTransferFunctionTable_CArray := (*[0xffff]C.uint16_t)(C.malloc(C.size_t(8 * len(greenTransferFunctionTable)))) + defer C.free(unsafe.Pointer(greenTransferFunctionTable_CArray)) + for i := range greenTransferFunctionTable { + greenTransferFunctionTable_CArray[i] = (C.uint16_t)(greenTransferFunctionTable[i]) + } + greenTransferFunctionTable_ma := &C.struct_miqt_array{len: C.size_t(len(greenTransferFunctionTable)), data: unsafe.Pointer(greenTransferFunctionTable_CArray)} + defer runtime.KeepAlive(unsafe.Pointer(greenTransferFunctionTable_ma)) + // For the C ABI, malloc a C array of raw pointers + blueTransferFunctionTable_CArray := (*[0xffff]C.uint16_t)(C.malloc(C.size_t(8 * len(blueTransferFunctionTable)))) + defer C.free(unsafe.Pointer(blueTransferFunctionTable_CArray)) + for i := range blueTransferFunctionTable { + blueTransferFunctionTable_CArray[i] = (C.uint16_t)(blueTransferFunctionTable[i]) + } + blueTransferFunctionTable_ma := &C.struct_miqt_array{len: C.size_t(len(blueTransferFunctionTable)), data: unsafe.Pointer(blueTransferFunctionTable_CArray)} + defer runtime.KeepAlive(unsafe.Pointer(blueTransferFunctionTable_ma)) + ret := C.QColorSpace_new8(whitePoint.cPointer(), redPoint.cPointer(), greenPoint.cPointer(), bluePoint.cPointer(), redTransferFunctionTable_ma, greenTransferFunctionTable_ma, blueTransferFunctionTable_ma) + return newQColorSpace(ret) +} + +// NewQColorSpace9 constructs a new QColorSpace object. +func NewQColorSpace9(colorSpace *QColorSpace) *QColorSpace { + ret := C.QColorSpace_new9(colorSpace.cPointer()) + return newQColorSpace(ret) +} + +// NewQColorSpace10 constructs a new QColorSpace object. +func NewQColorSpace10(primaries QColorSpace__Primaries, transferFunction QColorSpace__TransferFunction, gamma float32) *QColorSpace { + ret := C.QColorSpace_new10((C.int)(primaries), (C.int)(transferFunction), (C.float)(gamma)) + return newQColorSpace(ret) +} + +// NewQColorSpace11 constructs a new QColorSpace object. +func NewQColorSpace11(whitePoint *QPointF, redPoint *QPointF, greenPoint *QPointF, bluePoint *QPointF, transferFunction QColorSpace__TransferFunction, gamma float32) *QColorSpace { + ret := C.QColorSpace_new11(whitePoint.cPointer(), redPoint.cPointer(), greenPoint.cPointer(), bluePoint.cPointer(), (C.int)(transferFunction), (C.float)(gamma)) return newQColorSpace(ret) } @@ -133,10 +191,63 @@ func (this *QColorSpace) Gamma() float32 { return (float32)(C.QColorSpace_Gamma(this.h)) } +func (this *QColorSpace) Description() string { + var _ms *C.struct_miqt_string = C.QColorSpace_Description(this.h) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + +func (this *QColorSpace) SetDescription(description string) { + description_ms := miqt_strdupg(description) + defer C.free(description_ms) + C.QColorSpace_SetDescription(this.h, (*C.struct_miqt_string)(description_ms)) +} + func (this *QColorSpace) SetTransferFunction(transferFunction QColorSpace__TransferFunction) { C.QColorSpace_SetTransferFunction(this.h, (C.int)(transferFunction)) } +func (this *QColorSpace) SetTransferFunctionWithTransferFunctionTable(transferFunctionTable []uint16) { + // For the C ABI, malloc a C array of raw pointers + transferFunctionTable_CArray := (*[0xffff]C.uint16_t)(C.malloc(C.size_t(8 * len(transferFunctionTable)))) + defer C.free(unsafe.Pointer(transferFunctionTable_CArray)) + for i := range transferFunctionTable { + transferFunctionTable_CArray[i] = (C.uint16_t)(transferFunctionTable[i]) + } + transferFunctionTable_ma := &C.struct_miqt_array{len: C.size_t(len(transferFunctionTable)), data: unsafe.Pointer(transferFunctionTable_CArray)} + defer runtime.KeepAlive(unsafe.Pointer(transferFunctionTable_ma)) + C.QColorSpace_SetTransferFunctionWithTransferFunctionTable(this.h, transferFunctionTable_ma) +} + +func (this *QColorSpace) SetTransferFunctions(redTransferFunctionTable []uint16, greenTransferFunctionTable []uint16, blueTransferFunctionTable []uint16) { + // For the C ABI, malloc a C array of raw pointers + redTransferFunctionTable_CArray := (*[0xffff]C.uint16_t)(C.malloc(C.size_t(8 * len(redTransferFunctionTable)))) + defer C.free(unsafe.Pointer(redTransferFunctionTable_CArray)) + for i := range redTransferFunctionTable { + redTransferFunctionTable_CArray[i] = (C.uint16_t)(redTransferFunctionTable[i]) + } + redTransferFunctionTable_ma := &C.struct_miqt_array{len: C.size_t(len(redTransferFunctionTable)), data: unsafe.Pointer(redTransferFunctionTable_CArray)} + defer runtime.KeepAlive(unsafe.Pointer(redTransferFunctionTable_ma)) + // For the C ABI, malloc a C array of raw pointers + greenTransferFunctionTable_CArray := (*[0xffff]C.uint16_t)(C.malloc(C.size_t(8 * len(greenTransferFunctionTable)))) + defer C.free(unsafe.Pointer(greenTransferFunctionTable_CArray)) + for i := range greenTransferFunctionTable { + greenTransferFunctionTable_CArray[i] = (C.uint16_t)(greenTransferFunctionTable[i]) + } + greenTransferFunctionTable_ma := &C.struct_miqt_array{len: C.size_t(len(greenTransferFunctionTable)), data: unsafe.Pointer(greenTransferFunctionTable_CArray)} + defer runtime.KeepAlive(unsafe.Pointer(greenTransferFunctionTable_ma)) + // For the C ABI, malloc a C array of raw pointers + blueTransferFunctionTable_CArray := (*[0xffff]C.uint16_t)(C.malloc(C.size_t(8 * len(blueTransferFunctionTable)))) + defer C.free(unsafe.Pointer(blueTransferFunctionTable_CArray)) + for i := range blueTransferFunctionTable { + blueTransferFunctionTable_CArray[i] = (C.uint16_t)(blueTransferFunctionTable[i]) + } + blueTransferFunctionTable_ma := &C.struct_miqt_array{len: C.size_t(len(blueTransferFunctionTable)), data: unsafe.Pointer(blueTransferFunctionTable_CArray)} + defer runtime.KeepAlive(unsafe.Pointer(blueTransferFunctionTable_ma)) + C.QColorSpace_SetTransferFunctions(this.h, redTransferFunctionTable_ma, greenTransferFunctionTable_ma, blueTransferFunctionTable_ma) +} + func (this *QColorSpace) WithTransferFunction(transferFunction QColorSpace__TransferFunction) *QColorSpace { _ret := C.QColorSpace_WithTransferFunction(this.h, (C.int)(transferFunction)) _goptr := newQColorSpace(_ret) @@ -144,6 +255,52 @@ func (this *QColorSpace) WithTransferFunction(transferFunction QColorSpace__Tran return _goptr } +func (this *QColorSpace) WithTransferFunctionWithTransferFunctionTable(transferFunctionTable []uint16) *QColorSpace { + // For the C ABI, malloc a C array of raw pointers + transferFunctionTable_CArray := (*[0xffff]C.uint16_t)(C.malloc(C.size_t(8 * len(transferFunctionTable)))) + defer C.free(unsafe.Pointer(transferFunctionTable_CArray)) + for i := range transferFunctionTable { + transferFunctionTable_CArray[i] = (C.uint16_t)(transferFunctionTable[i]) + } + transferFunctionTable_ma := &C.struct_miqt_array{len: C.size_t(len(transferFunctionTable)), data: unsafe.Pointer(transferFunctionTable_CArray)} + defer runtime.KeepAlive(unsafe.Pointer(transferFunctionTable_ma)) + _ret := C.QColorSpace_WithTransferFunctionWithTransferFunctionTable(this.h, transferFunctionTable_ma) + _goptr := newQColorSpace(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QColorSpace) WithTransferFunctions(redTransferFunctionTable []uint16, greenTransferFunctionTable []uint16, blueTransferFunctionTable []uint16) *QColorSpace { + // For the C ABI, malloc a C array of raw pointers + redTransferFunctionTable_CArray := (*[0xffff]C.uint16_t)(C.malloc(C.size_t(8 * len(redTransferFunctionTable)))) + defer C.free(unsafe.Pointer(redTransferFunctionTable_CArray)) + for i := range redTransferFunctionTable { + redTransferFunctionTable_CArray[i] = (C.uint16_t)(redTransferFunctionTable[i]) + } + redTransferFunctionTable_ma := &C.struct_miqt_array{len: C.size_t(len(redTransferFunctionTable)), data: unsafe.Pointer(redTransferFunctionTable_CArray)} + defer runtime.KeepAlive(unsafe.Pointer(redTransferFunctionTable_ma)) + // For the C ABI, malloc a C array of raw pointers + greenTransferFunctionTable_CArray := (*[0xffff]C.uint16_t)(C.malloc(C.size_t(8 * len(greenTransferFunctionTable)))) + defer C.free(unsafe.Pointer(greenTransferFunctionTable_CArray)) + for i := range greenTransferFunctionTable { + greenTransferFunctionTable_CArray[i] = (C.uint16_t)(greenTransferFunctionTable[i]) + } + greenTransferFunctionTable_ma := &C.struct_miqt_array{len: C.size_t(len(greenTransferFunctionTable)), data: unsafe.Pointer(greenTransferFunctionTable_CArray)} + defer runtime.KeepAlive(unsafe.Pointer(greenTransferFunctionTable_ma)) + // For the C ABI, malloc a C array of raw pointers + blueTransferFunctionTable_CArray := (*[0xffff]C.uint16_t)(C.malloc(C.size_t(8 * len(blueTransferFunctionTable)))) + defer C.free(unsafe.Pointer(blueTransferFunctionTable_CArray)) + for i := range blueTransferFunctionTable { + blueTransferFunctionTable_CArray[i] = (C.uint16_t)(blueTransferFunctionTable[i]) + } + blueTransferFunctionTable_ma := &C.struct_miqt_array{len: C.size_t(len(blueTransferFunctionTable)), data: unsafe.Pointer(blueTransferFunctionTable_CArray)} + defer runtime.KeepAlive(unsafe.Pointer(blueTransferFunctionTable_ma)) + _ret := C.QColorSpace_WithTransferFunctions(this.h, redTransferFunctionTable_ma, greenTransferFunctionTable_ma, blueTransferFunctionTable_ma) + _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.int)(primariesId)) } @@ -152,6 +309,10 @@ func (this *QColorSpace) SetPrimaries2(whitePoint *QPointF, redPoint *QPointF, g C.QColorSpace_SetPrimaries2(this.h, whitePoint.cPointer(), redPoint.cPointer(), greenPoint.cPointer(), bluePoint.cPointer()) } +func (this *QColorSpace) Detach() { + C.QColorSpace_Detach(this.h) +} + func (this *QColorSpace) IsValid() bool { return (bool)(C.QColorSpace_IsValid(this.h)) } diff --git a/qt/gen_qcolorspace.h b/qt/gen_qcolorspace.h index ab55695..58f0bee 100644 --- a/qt/gen_qcolorspace.h +++ b/qt/gen_qcolorspace.h @@ -29,19 +29,29 @@ QColorSpace* QColorSpace_new(); 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(int primaries, int transferFunction, float gamma); -QColorSpace* QColorSpace_new8(QPointF* whitePoint, QPointF* redPoint, QPointF* greenPoint, QPointF* bluePoint, int transferFunction, float gamma); +QColorSpace* QColorSpace_new5(int primaries, struct miqt_array* /* of uint16_t */ transferFunctionTable); +QColorSpace* QColorSpace_new6(QPointF* whitePoint, QPointF* redPoint, QPointF* greenPoint, QPointF* bluePoint, int transferFunction); +QColorSpace* QColorSpace_new7(QPointF* whitePoint, QPointF* redPoint, QPointF* greenPoint, QPointF* bluePoint, struct miqt_array* /* of uint16_t */ transferFunctionTable); +QColorSpace* QColorSpace_new8(QPointF* whitePoint, QPointF* redPoint, QPointF* greenPoint, QPointF* bluePoint, struct miqt_array* /* of uint16_t */ redTransferFunctionTable, struct miqt_array* /* of uint16_t */ greenTransferFunctionTable, struct miqt_array* /* of uint16_t */ blueTransferFunctionTable); +QColorSpace* QColorSpace_new9(QColorSpace* colorSpace); +QColorSpace* QColorSpace_new10(int primaries, int transferFunction, float gamma); +QColorSpace* QColorSpace_new11(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); int QColorSpace_Primaries(const QColorSpace* self); int QColorSpace_TransferFunction(const QColorSpace* self); float QColorSpace_Gamma(const QColorSpace* self); +struct miqt_string* QColorSpace_Description(const QColorSpace* self); +void QColorSpace_SetDescription(QColorSpace* self, struct miqt_string* description); void QColorSpace_SetTransferFunction(QColorSpace* self, int transferFunction); +void QColorSpace_SetTransferFunctionWithTransferFunctionTable(QColorSpace* self, struct miqt_array* /* of uint16_t */ transferFunctionTable); +void QColorSpace_SetTransferFunctions(QColorSpace* self, struct miqt_array* /* of uint16_t */ redTransferFunctionTable, struct miqt_array* /* of uint16_t */ greenTransferFunctionTable, struct miqt_array* /* of uint16_t */ blueTransferFunctionTable); QColorSpace* QColorSpace_WithTransferFunction(const QColorSpace* self, int transferFunction); +QColorSpace* QColorSpace_WithTransferFunctionWithTransferFunctionTable(const QColorSpace* self, struct miqt_array* /* of uint16_t */ transferFunctionTable); +QColorSpace* QColorSpace_WithTransferFunctions(const QColorSpace* self, struct miqt_array* /* of uint16_t */ redTransferFunctionTable, struct miqt_array* /* of uint16_t */ greenTransferFunctionTable, struct miqt_array* /* of uint16_t */ blueTransferFunctionTable); void QColorSpace_SetPrimaries(QColorSpace* self, int primariesId); void QColorSpace_SetPrimaries2(QColorSpace* self, QPointF* whitePoint, QPointF* redPoint, QPointF* greenPoint, QPointF* bluePoint); +void QColorSpace_Detach(QColorSpace* self); bool QColorSpace_IsValid(const QColorSpace* self); QColorSpace* QColorSpace_FromIccProfile(QByteArray* iccProfile); QByteArray* QColorSpace_IccProfile(const QColorSpace* self); diff --git a/qt/gen_qcolortransform.cpp b/qt/gen_qcolortransform.cpp index df6802c..e225f4a 100644 --- a/qt/gen_qcolortransform.cpp +++ b/qt/gen_qcolortransform.cpp @@ -21,6 +21,10 @@ void QColorTransform_Swap(QColorTransform* self, QColorTransform* other) { self->swap(*other); } +bool QColorTransform_IsIdentity(const QColorTransform* self) { + return self->isIdentity(); +} + unsigned int QColorTransform_Map(const QColorTransform* self, unsigned int argb) { QRgb _ret = self->map(static_cast(argb)); return static_cast(_ret); diff --git a/qt/gen_qcolortransform.go b/qt/gen_qcolortransform.go index a3d8fad..3a22982 100644 --- a/qt/gen_qcolortransform.go +++ b/qt/gen_qcolortransform.go @@ -55,6 +55,10 @@ func (this *QColorTransform) Swap(other *QColorTransform) { C.QColorTransform_Swap(this.h, other.cPointer()) } +func (this *QColorTransform) IsIdentity() bool { + return (bool)(C.QColorTransform_IsIdentity(this.h)) +} + func (this *QColorTransform) Map(argb uint) uint { return (uint)(C.QColorTransform_Map(this.h, (C.uint)(argb))) } diff --git a/qt/gen_qcolortransform.h b/qt/gen_qcolortransform.h index 2799918..a0aba5f 100644 --- a/qt/gen_qcolortransform.h +++ b/qt/gen_qcolortransform.h @@ -27,6 +27,7 @@ QColorTransform* QColorTransform_new(); QColorTransform* QColorTransform_new2(QColorTransform* colorTransform); void QColorTransform_OperatorAssign(QColorTransform* self, QColorTransform* other); void QColorTransform_Swap(QColorTransform* self, QColorTransform* other); +bool QColorTransform_IsIdentity(const QColorTransform* self); unsigned int QColorTransform_Map(const QColorTransform* self, unsigned int argb); QRgba64* QColorTransform_MapWithRgba64(const QColorTransform* self, QRgba64* rgba64); QColor* QColorTransform_MapWithColor(const QColorTransform* self, QColor* color); diff --git a/qt/gen_qcolumnview.cpp b/qt/gen_qcolumnview.cpp index 699b7ae..10b53b3 100644 --- a/qt/gen_qcolumnview.cpp +++ b/qt/gen_qcolumnview.cpp @@ -38,13 +38,6 @@ struct miqt_string* QColumnView_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QColumnView_TrUtf8(const char* s) { - QString _ret = QColumnView::trUtf8(s); - // 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 QColumnView_UpdatePreviewWidget(QColumnView* self, QModelIndex* index) { self->updatePreviewWidget(*index); } @@ -143,20 +136,6 @@ struct miqt_string* QColumnView_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QColumnView_TrUtf82(const char* s, const char* c) { - QString _ret = QColumnView::trUtf8(s, c); - // 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* QColumnView_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QColumnView::trUtf8(s, c, static_cast(n)); - // 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 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 1bea152..fe90386 100644 --- a/qt/gen_qcolumnview.go +++ b/qt/gen_qcolumnview.go @@ -68,15 +68,6 @@ func QColumnView_Tr(s string) string { return _ret } -func QColumnView_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QColumnView_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QColumnView) UpdatePreviewWidget(index *QModelIndex) { C.QColumnView_UpdatePreviewWidget(this.h, index.cPointer()) } @@ -199,28 +190,6 @@ func QColumnView_Tr3(s string, c string, n int) string { return _ret } -func QColumnView_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QColumnView_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QColumnView_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QColumnView_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QColumnView) ScrollTo2(index *QModelIndex, hint QAbstractItemView__ScrollHint) { C.QColumnView_ScrollTo2(this.h, index.cPointer(), (C.int)(hint)) } diff --git a/qt/gen_qcolumnview.h b/qt/gen_qcolumnview.h index e84c4a2..670254f 100644 --- a/qt/gen_qcolumnview.h +++ b/qt/gen_qcolumnview.h @@ -40,7 +40,6 @@ QColumnView* QColumnView_new2(QWidget* parent); QMetaObject* QColumnView_MetaObject(const QColumnView* self); void* QColumnView_Metacast(QColumnView* self, const char* param1); struct miqt_string* QColumnView_Tr(const char* s); -struct miqt_string* QColumnView_TrUtf8(const char* s); void QColumnView_UpdatePreviewWidget(QColumnView* self, QModelIndex* index); void QColumnView_connect_UpdatePreviewWidget(QColumnView* self, void* slot); QModelIndex* QColumnView_IndexAt(const QColumnView* self, QPoint* point); @@ -59,8 +58,6 @@ void QColumnView_SetColumnWidths(QColumnView* self, struct miqt_array* /* of int struct miqt_array* QColumnView_ColumnWidths(const QColumnView* self); 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, int hint); void QColumnView_Delete(QColumnView* self); diff --git a/qt/gen_qcombobox.cpp b/qt/gen_qcombobox.cpp index 96bc235..becdad2 100644 --- a/qt/gen_qcombobox.cpp +++ b/qt/gen_qcombobox.cpp @@ -43,13 +43,6 @@ struct miqt_string* QComboBox_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QComboBox_TrUtf8(const char* s) { - QString _ret = QComboBox::trUtf8(s); - // 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()); -} - int QComboBox_MaxVisibleItems(const QComboBox* self) { return self->maxVisibleItems(); } @@ -70,23 +63,6 @@ int QComboBox_MaxCount(const QComboBox* self) { return self->maxCount(); } -bool QComboBox_AutoCompletion(const QComboBox* self) { - return self->autoCompletion(); -} - -void QComboBox_SetAutoCompletion(QComboBox* self, bool enable) { - self->setAutoCompletion(enable); -} - -int QComboBox_AutoCompletionCaseSensitivity(const QComboBox* self) { - Qt::CaseSensitivity _ret = self->autoCompletionCaseSensitivity(); - return static_cast(_ret); -} - -void QComboBox_SetAutoCompletionCaseSensitivity(QComboBox* self, int sensitivity) { - self->setAutoCompletionCaseSensitivity(static_cast(sensitivity)); -} - bool QComboBox_DuplicatesEnabled(const QComboBox* self) { return self->duplicatesEnabled(); } @@ -451,21 +427,6 @@ void QComboBox_connect_CurrentIndexChanged(QComboBox* self, void* slot) { }); } -void QComboBox_CurrentIndexChangedWithQString(QComboBox* self, struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); - self->currentIndexChanged(param1_QString); -} - -void QComboBox_connect_CurrentIndexChangedWithQString(QComboBox* self, void* slot) { - QComboBox::connect(self, static_cast(&QComboBox::currentIndexChanged), self, [=](const QString& param1) { - const QString param1_ret = param1; - // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory - QByteArray param1_b = param1_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(param1_b.data(), param1_b.length()); - miqt_exec_callback_QComboBox_CurrentIndexChangedWithQString(slot, sigval1); - }); -} - void QComboBox_CurrentTextChanged(QComboBox* self, struct miqt_string* param1) { QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); self->currentTextChanged(param1_QString); @@ -481,36 +442,6 @@ void QComboBox_connect_CurrentTextChanged(QComboBox* self, void* slot) { }); } -void QComboBox_ActivatedWithQString(QComboBox* self, struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); - self->activated(param1_QString); -} - -void QComboBox_connect_ActivatedWithQString(QComboBox* self, void* slot) { - QComboBox::connect(self, static_cast(&QComboBox::activated), self, [=](const QString& param1) { - const QString param1_ret = param1; - // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory - QByteArray param1_b = param1_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(param1_b.data(), param1_b.length()); - miqt_exec_callback_QComboBox_ActivatedWithQString(slot, sigval1); - }); -} - -void QComboBox_HighlightedWithQString(QComboBox* self, struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); - self->highlighted(param1_QString); -} - -void QComboBox_connect_HighlightedWithQString(QComboBox* self, void* slot) { - QComboBox::connect(self, static_cast(&QComboBox::highlighted), self, [=](const QString& param1) { - const QString param1_ret = param1; - // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory - QByteArray param1_b = param1_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(param1_b.data(), param1_b.length()); - miqt_exec_callback_QComboBox_HighlightedWithQString(slot, sigval1); - }); -} - struct miqt_string* QComboBox_Tr2(const char* s, const char* c) { QString _ret = QComboBox::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -525,20 +456,6 @@ struct miqt_string* QComboBox_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QComboBox_TrUtf82(const char* s, const char* c) { - QString _ret = QComboBox::trUtf8(s, c); - // 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* QComboBox_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QComboBox::trUtf8(s, c, static_cast(n)); - // 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()); -} - int QComboBox_FindText2(const QComboBox* self, struct miqt_string* text, int flags) { QString text_QString = QString::fromUtf8(&text->data, text->len); return self->findText(text_QString, static_cast(flags)); diff --git a/qt/gen_qcombobox.go b/qt/gen_qcombobox.go index c90af26..ad2f489 100644 --- a/qt/gen_qcombobox.go +++ b/qt/gen_qcombobox.go @@ -31,8 +31,7 @@ type QComboBox__SizeAdjustPolicy int const ( QComboBox__AdjustToContents QComboBox__SizeAdjustPolicy = 0 QComboBox__AdjustToContentsOnFirstShow QComboBox__SizeAdjustPolicy = 1 - QComboBox__AdjustToMinimumContentsLength QComboBox__SizeAdjustPolicy = 2 - QComboBox__AdjustToMinimumContentsLengthWithIcon QComboBox__SizeAdjustPolicy = 3 + QComboBox__AdjustToMinimumContentsLengthWithIcon QComboBox__SizeAdjustPolicy = 2 ) type QComboBox struct { @@ -89,15 +88,6 @@ func QComboBox_Tr(s string) string { return _ret } -func QComboBox_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QComboBox_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QComboBox) MaxVisibleItems() int { return (int)(C.QComboBox_MaxVisibleItems(this.h)) } @@ -118,22 +108,6 @@ func (this *QComboBox) MaxCount() int { return (int)(C.QComboBox_MaxCount(this.h)) } -func (this *QComboBox) AutoCompletion() bool { - return (bool)(C.QComboBox_AutoCompletion(this.h)) -} - -func (this *QComboBox) SetAutoCompletion(enable bool) { - C.QComboBox_SetAutoCompletion(this.h, (C.bool)(enable)) -} - -func (this *QComboBox) AutoCompletionCaseSensitivity() CaseSensitivity { - return (CaseSensitivity)(C.QComboBox_AutoCompletionCaseSensitivity(this.h)) -} - -func (this *QComboBox) SetAutoCompletionCaseSensitivity(sensitivity CaseSensitivity) { - C.QComboBox_SetAutoCompletionCaseSensitivity(this.h, (C.int)(sensitivity)) -} - func (this *QComboBox) DuplicatesEnabled() bool { return (bool)(C.QComboBox_DuplicatesEnabled(this.h)) } @@ -595,31 +569,6 @@ func miqt_exec_callback_QComboBox_CurrentIndexChanged(cb *C.void, index C.int) { gofunc(slotval1) } -func (this *QComboBox) CurrentIndexChangedWithQString(param1 string) { - param1_ms := miqt_strdupg(param1) - defer C.free(param1_ms) - C.QComboBox_CurrentIndexChangedWithQString(this.h, (*C.struct_miqt_string)(param1_ms)) -} -func (this *QComboBox) OnCurrentIndexChangedWithQString(slot func(param1 string)) { - C.QComboBox_connect_CurrentIndexChangedWithQString(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) -} - -//export miqt_exec_callback_QComboBox_CurrentIndexChangedWithQString -func miqt_exec_callback_QComboBox_CurrentIndexChangedWithQString(cb *C.void, param1 *C.struct_miqt_string) { - gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 string)) - if !ok { - panic("miqt: callback of non-callback type (heap corruption?)") - } - - // Convert all CABI parameters to Go parameters - var param1_ms *C.struct_miqt_string = param1 - param1_ret := C.GoStringN(¶m1_ms.data, C.int(int64(param1_ms.len))) - C.free(unsafe.Pointer(param1_ms)) - slotval1 := param1_ret - - gofunc(slotval1) -} - func (this *QComboBox) CurrentTextChanged(param1 string) { param1_ms := miqt_strdupg(param1) defer C.free(param1_ms) @@ -645,56 +594,6 @@ func miqt_exec_callback_QComboBox_CurrentTextChanged(cb *C.void, param1 *C.struc gofunc(slotval1) } -func (this *QComboBox) ActivatedWithQString(param1 string) { - param1_ms := miqt_strdupg(param1) - defer C.free(param1_ms) - C.QComboBox_ActivatedWithQString(this.h, (*C.struct_miqt_string)(param1_ms)) -} -func (this *QComboBox) OnActivatedWithQString(slot func(param1 string)) { - C.QComboBox_connect_ActivatedWithQString(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) -} - -//export miqt_exec_callback_QComboBox_ActivatedWithQString -func miqt_exec_callback_QComboBox_ActivatedWithQString(cb *C.void, param1 *C.struct_miqt_string) { - gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 string)) - if !ok { - panic("miqt: callback of non-callback type (heap corruption?)") - } - - // Convert all CABI parameters to Go parameters - var param1_ms *C.struct_miqt_string = param1 - param1_ret := C.GoStringN(¶m1_ms.data, C.int(int64(param1_ms.len))) - C.free(unsafe.Pointer(param1_ms)) - slotval1 := param1_ret - - gofunc(slotval1) -} - -func (this *QComboBox) HighlightedWithQString(param1 string) { - param1_ms := miqt_strdupg(param1) - defer C.free(param1_ms) - C.QComboBox_HighlightedWithQString(this.h, (*C.struct_miqt_string)(param1_ms)) -} -func (this *QComboBox) OnHighlightedWithQString(slot func(param1 string)) { - C.QComboBox_connect_HighlightedWithQString(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) -} - -//export miqt_exec_callback_QComboBox_HighlightedWithQString -func miqt_exec_callback_QComboBox_HighlightedWithQString(cb *C.void, param1 *C.struct_miqt_string) { - gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 string)) - if !ok { - panic("miqt: callback of non-callback type (heap corruption?)") - } - - // Convert all CABI parameters to Go parameters - var param1_ms *C.struct_miqt_string = param1 - param1_ret := C.GoStringN(¶m1_ms.data, C.int(int64(param1_ms.len))) - C.free(unsafe.Pointer(param1_ms)) - slotval1 := param1_ret - - gofunc(slotval1) -} - func QComboBox_Tr2(s string, c string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) @@ -717,28 +616,6 @@ func QComboBox_Tr3(s string, c string, n int) string { return _ret } -func QComboBox_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QComboBox_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QComboBox_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QComboBox_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QComboBox) FindText2(text string, flags MatchFlag) int { text_ms := miqt_strdupg(text) defer C.free(text_ms) diff --git a/qt/gen_qcombobox.h b/qt/gen_qcombobox.h index 8242a1f..f89db08 100644 --- a/qt/gen_qcombobox.h +++ b/qt/gen_qcombobox.h @@ -50,16 +50,11 @@ QComboBox* QComboBox_new2(QWidget* parent); QMetaObject* QComboBox_MetaObject(const QComboBox* self); void* QComboBox_Metacast(QComboBox* self, const char* param1); struct miqt_string* QComboBox_Tr(const char* s); -struct miqt_string* QComboBox_TrUtf8(const char* s); int QComboBox_MaxVisibleItems(const QComboBox* self); void QComboBox_SetMaxVisibleItems(QComboBox* self, int maxItems); int QComboBox_Count(const QComboBox* self); 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); -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); @@ -135,18 +130,10 @@ void QComboBox_TextHighlighted(QComboBox* self, struct miqt_string* param1); void QComboBox_connect_TextHighlighted(QComboBox* self, void* slot); void QComboBox_CurrentIndexChanged(QComboBox* self, int index); void QComboBox_connect_CurrentIndexChanged(QComboBox* self, void* slot); -void QComboBox_CurrentIndexChangedWithQString(QComboBox* self, struct miqt_string* param1); -void QComboBox_connect_CurrentIndexChangedWithQString(QComboBox* self, void* slot); void QComboBox_CurrentTextChanged(QComboBox* self, struct miqt_string* param1); void QComboBox_connect_CurrentTextChanged(QComboBox* self, void* slot); -void QComboBox_ActivatedWithQString(QComboBox* self, struct miqt_string* param1); -void QComboBox_connect_ActivatedWithQString(QComboBox* self, void* slot); -void QComboBox_HighlightedWithQString(QComboBox* self, struct miqt_string* param1); -void QComboBox_connect_HighlightedWithQString(QComboBox* self, void* slot); struct miqt_string* QComboBox_Tr2(const char* s, const char* c); struct miqt_string* QComboBox_Tr3(const char* s, const char* c, int n); -struct miqt_string* QComboBox_TrUtf82(const char* s, const char* c); -struct miqt_string* QComboBox_TrUtf83(const char* s, const char* c, int n); int QComboBox_FindText2(const QComboBox* self, struct miqt_string* text, int flags); int QComboBox_FindData2(const QComboBox* self, QVariant* data, int role); int QComboBox_FindData3(const QComboBox* self, QVariant* data, int role, int flags); diff --git a/qt/gen_qcommandlineoption.cpp b/qt/gen_qcommandlineoption.cpp index 305555f..d6dafde 100644 --- a/qt/gen_qcommandlineoption.cpp +++ b/qt/gen_qcommandlineoption.cpp @@ -176,14 +176,6 @@ void QCommandLineOption_SetFlags(QCommandLineOption* self, int aflags) { self->setFlags(static_cast(aflags)); } -void QCommandLineOption_SetHidden(QCommandLineOption* self, bool hidden) { - self->setHidden(hidden); -} - -bool QCommandLineOption_IsHidden(const QCommandLineOption* self) { - return self->isHidden(); -} - void QCommandLineOption_Delete(QCommandLineOption* self) { delete self; } diff --git a/qt/gen_qcommandlineoption.go b/qt/gen_qcommandlineoption.go index 19ab050..ecd8dd1 100644 --- a/qt/gen_qcommandlineoption.go +++ b/qt/gen_qcommandlineoption.go @@ -258,14 +258,6 @@ func (this *QCommandLineOption) SetFlags(aflags QCommandLineOption__Flag) { C.QCommandLineOption_SetFlags(this.h, (C.int)(aflags)) } -func (this *QCommandLineOption) SetHidden(hidden bool) { - C.QCommandLineOption_SetHidden(this.h, (C.bool)(hidden)) -} - -func (this *QCommandLineOption) IsHidden() bool { - return (bool)(C.QCommandLineOption_IsHidden(this.h)) -} - // Delete this object from C++ memory. func (this *QCommandLineOption) Delete() { C.QCommandLineOption_Delete(this.h) diff --git a/qt/gen_qcommandlineoption.h b/qt/gen_qcommandlineoption.h index f2570b6..f2f142c 100644 --- a/qt/gen_qcommandlineoption.h +++ b/qt/gen_qcommandlineoption.h @@ -40,8 +40,6 @@ void QCommandLineOption_SetDefaultValues(QCommandLineOption* self, struct miqt_a struct miqt_array* QCommandLineOption_DefaultValues(const QCommandLineOption* self); int QCommandLineOption_Flags(const QCommandLineOption* self); void QCommandLineOption_SetFlags(QCommandLineOption* self, int aflags); -void QCommandLineOption_SetHidden(QCommandLineOption* self, bool hidden); -bool QCommandLineOption_IsHidden(const QCommandLineOption* self); void QCommandLineOption_Delete(QCommandLineOption* self); #ifdef __cplusplus diff --git a/qt/gen_qcommandlineparser.cpp b/qt/gen_qcommandlineparser.cpp index cfc760f..75c54a3 100644 --- a/qt/gen_qcommandlineparser.cpp +++ b/qt/gen_qcommandlineparser.cpp @@ -20,13 +20,6 @@ struct miqt_string* QCommandLineParser_Tr(const char* sourceText) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QCommandLineParser_TrUtf8(const char* sourceText) { - QString _ret = QCommandLineParser::trUtf8(sourceText); - // 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 QCommandLineParser_SetSingleDashWordOptionMode(QCommandLineParser* self, int parsingMode) { self->setSingleDashWordOptionMode(static_cast(parsingMode)); } @@ -217,6 +210,14 @@ struct miqt_array* QCommandLineParser_UnknownOptionNames(const QCommandLineParse return _out; } +void QCommandLineParser_ShowVersion(QCommandLineParser* self) { + self->showVersion(); +} + +void QCommandLineParser_ShowHelp(QCommandLineParser* self) { + self->showHelp(); +} + struct miqt_string* QCommandLineParser_HelpText(const QCommandLineParser* self) { QString _ret = self->helpText(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -238,20 +239,6 @@ struct miqt_string* QCommandLineParser_Tr3(const char* sourceText, const char* d return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QCommandLineParser_TrUtf82(const char* sourceText, const char* disambiguation) { - QString _ret = QCommandLineParser::trUtf8(sourceText, disambiguation); - // 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* QCommandLineParser_TrUtf83(const char* sourceText, const char* disambiguation, int n) { - QString _ret = QCommandLineParser::trUtf8(sourceText, disambiguation, static_cast(n)); - // 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 QCommandLineParser_AddPositionalArgument3(QCommandLineParser* self, struct miqt_string* name, struct miqt_string* description, struct miqt_string* syntax) { QString name_QString = QString::fromUtf8(&name->data, name->len); QString description_QString = QString::fromUtf8(&description->data, description->len); @@ -259,6 +246,10 @@ void QCommandLineParser_AddPositionalArgument3(QCommandLineParser* self, struct self->addPositionalArgument(name_QString, description_QString, syntax_QString); } +void QCommandLineParser_ShowHelp1(QCommandLineParser* self, int exitCode) { + self->showHelp(static_cast(exitCode)); +} + void QCommandLineParser_Delete(QCommandLineParser* self) { delete self; } diff --git a/qt/gen_qcommandlineparser.go b/qt/gen_qcommandlineparser.go index f765da9..7939129 100644 --- a/qt/gen_qcommandlineparser.go +++ b/qt/gen_qcommandlineparser.go @@ -64,15 +64,6 @@ func QCommandLineParser_Tr(sourceText string) string { return _ret } -func QCommandLineParser_TrUtf8(sourceText string) string { - sourceText_Cstring := C.CString(sourceText) - defer C.free(unsafe.Pointer(sourceText_Cstring)) - var _ms *C.struct_miqt_string = C.QCommandLineParser_TrUtf8(sourceText_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QCommandLineParser) SetSingleDashWordOptionMode(parsingMode QCommandLineParser__SingleDashWordOptionMode) { C.QCommandLineParser_SetSingleDashWordOptionMode(this.h, (C.int)(parsingMode)) } @@ -273,6 +264,14 @@ func (this *QCommandLineParser) UnknownOptionNames() []string { return _ret } +func (this *QCommandLineParser) ShowVersion() { + C.QCommandLineParser_ShowVersion(this.h) +} + +func (this *QCommandLineParser) ShowHelp() { + C.QCommandLineParser_ShowHelp(this.h) +} + func (this *QCommandLineParser) HelpText() string { var _ms *C.struct_miqt_string = C.QCommandLineParser_HelpText(this.h) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) @@ -302,28 +301,6 @@ func QCommandLineParser_Tr3(sourceText string, disambiguation string, n int) str return _ret } -func QCommandLineParser_TrUtf82(sourceText string, disambiguation string) string { - sourceText_Cstring := C.CString(sourceText) - defer C.free(unsafe.Pointer(sourceText_Cstring)) - disambiguation_Cstring := C.CString(disambiguation) - defer C.free(unsafe.Pointer(disambiguation_Cstring)) - var _ms *C.struct_miqt_string = C.QCommandLineParser_TrUtf82(sourceText_Cstring, disambiguation_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QCommandLineParser_TrUtf83(sourceText string, disambiguation string, n int) string { - sourceText_Cstring := C.CString(sourceText) - defer C.free(unsafe.Pointer(sourceText_Cstring)) - disambiguation_Cstring := C.CString(disambiguation) - defer C.free(unsafe.Pointer(disambiguation_Cstring)) - var _ms *C.struct_miqt_string = C.QCommandLineParser_TrUtf83(sourceText_Cstring, disambiguation_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QCommandLineParser) AddPositionalArgument3(name string, description string, syntax string) { name_ms := miqt_strdupg(name) defer C.free(name_ms) @@ -334,6 +311,10 @@ func (this *QCommandLineParser) AddPositionalArgument3(name string, description C.QCommandLineParser_AddPositionalArgument3(this.h, (*C.struct_miqt_string)(name_ms), (*C.struct_miqt_string)(description_ms), (*C.struct_miqt_string)(syntax_ms)) } +func (this *QCommandLineParser) ShowHelp1(exitCode int) { + C.QCommandLineParser_ShowHelp1(this.h, (C.int)(exitCode)) +} + // Delete this object from C++ memory. func (this *QCommandLineParser) Delete() { C.QCommandLineParser_Delete(this.h) diff --git a/qt/gen_qcommandlineparser.h b/qt/gen_qcommandlineparser.h index 9826b91..2bd85c7 100644 --- a/qt/gen_qcommandlineparser.h +++ b/qt/gen_qcommandlineparser.h @@ -25,7 +25,6 @@ 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, int parsingMode); void QCommandLineParser_SetOptionsAfterPositionalArgumentsMode(QCommandLineParser* self, int mode); bool QCommandLineParser_AddOption(QCommandLineParser* self, QCommandLineOption* commandLineOption); @@ -49,12 +48,13 @@ struct miqt_array* QCommandLineParser_ValuesWithOption(const QCommandLineParser* struct miqt_array* QCommandLineParser_PositionalArguments(const QCommandLineParser* self); struct miqt_array* QCommandLineParser_OptionNames(const QCommandLineParser* self); struct miqt_array* QCommandLineParser_UnknownOptionNames(const QCommandLineParser* self); +void QCommandLineParser_ShowVersion(QCommandLineParser* self); +void QCommandLineParser_ShowHelp(QCommandLineParser* self); struct miqt_string* QCommandLineParser_HelpText(const QCommandLineParser* self); struct miqt_string* QCommandLineParser_Tr2(const char* sourceText, const char* disambiguation); struct miqt_string* QCommandLineParser_Tr3(const char* sourceText, const char* disambiguation, int n); -struct miqt_string* QCommandLineParser_TrUtf82(const char* sourceText, const char* disambiguation); -struct miqt_string* QCommandLineParser_TrUtf83(const char* sourceText, const char* disambiguation, int n); void QCommandLineParser_AddPositionalArgument3(QCommandLineParser* self, struct miqt_string* name, struct miqt_string* description, struct miqt_string* syntax); +void QCommandLineParser_ShowHelp1(QCommandLineParser* self, int exitCode); void QCommandLineParser_Delete(QCommandLineParser* self); #ifdef __cplusplus diff --git a/qt/gen_qcommandlinkbutton.cpp b/qt/gen_qcommandlinkbutton.cpp index c68a426..e2f2ff7 100644 --- a/qt/gen_qcommandlinkbutton.cpp +++ b/qt/gen_qcommandlinkbutton.cpp @@ -1,8 +1,10 @@ #include #include +#include #include #include #include +#include #include #include "qcommandlinkbutton.h" #include "gen_qcommandlinkbutton.h" @@ -53,13 +55,6 @@ struct miqt_string* QCommandLinkButton_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QCommandLinkButton_TrUtf8(const char* s) { - QString _ret = QCommandLinkButton::trUtf8(s); - // 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* QCommandLinkButton_Description(const QCommandLinkButton* self) { QString _ret = self->description(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -72,6 +67,22 @@ void QCommandLinkButton_SetDescription(QCommandLinkButton* self, struct miqt_str self->setDescription(description_QString); } +QSize* QCommandLinkButton_SizeHint(const QCommandLinkButton* self) { + return new QSize(self->sizeHint()); +} + +int QCommandLinkButton_HeightForWidth(const QCommandLinkButton* self, int param1) { + return self->heightForWidth(static_cast(param1)); +} + +QSize* QCommandLinkButton_MinimumSizeHint(const QCommandLinkButton* self) { + return new QSize(self->minimumSizeHint()); +} + +void QCommandLinkButton_InitStyleOption(const QCommandLinkButton* self, QStyleOptionButton* option) { + self->initStyleOption(option); +} + struct miqt_string* QCommandLinkButton_Tr2(const char* s, const char* c) { QString _ret = QCommandLinkButton::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -86,20 +97,6 @@ struct miqt_string* QCommandLinkButton_Tr3(const char* s, const char* c, int n) return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QCommandLinkButton_TrUtf82(const char* s, const char* c) { - QString _ret = QCommandLinkButton::trUtf8(s, c); - // 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* QCommandLinkButton_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QCommandLinkButton::trUtf8(s, c, static_cast(n)); - // 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 QCommandLinkButton_Delete(QCommandLinkButton* self) { delete self; } diff --git a/qt/gen_qcommandlinkbutton.go b/qt/gen_qcommandlinkbutton.go index 552b1f9..2ef0216 100644 --- a/qt/gen_qcommandlinkbutton.go +++ b/qt/gen_qcommandlinkbutton.go @@ -103,15 +103,6 @@ func QCommandLinkButton_Tr(s string) string { return _ret } -func QCommandLinkButton_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QCommandLinkButton_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QCommandLinkButton) Description() string { var _ms *C.struct_miqt_string = C.QCommandLinkButton_Description(this.h) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) @@ -125,6 +116,28 @@ func (this *QCommandLinkButton) SetDescription(description string) { C.QCommandLinkButton_SetDescription(this.h, (*C.struct_miqt_string)(description_ms)) } +func (this *QCommandLinkButton) SizeHint() *QSize { + _ret := C.QCommandLinkButton_SizeHint(this.h) + _goptr := newQSize(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QCommandLinkButton) HeightForWidth(param1 int) int { + return (int)(C.QCommandLinkButton_HeightForWidth(this.h, (C.int)(param1))) +} + +func (this *QCommandLinkButton) MinimumSizeHint() *QSize { + _ret := C.QCommandLinkButton_MinimumSizeHint(this.h) + _goptr := newQSize(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QCommandLinkButton) InitStyleOption(option *QStyleOptionButton) { + C.QCommandLinkButton_InitStyleOption(this.h, option.cPointer()) +} + func QCommandLinkButton_Tr2(s string, c string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) @@ -147,28 +160,6 @@ func QCommandLinkButton_Tr3(s string, c string, n int) string { return _ret } -func QCommandLinkButton_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QCommandLinkButton_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QCommandLinkButton_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QCommandLinkButton_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QCommandLinkButton) Delete() { C.QCommandLinkButton_Delete(this.h) diff --git a/qt/gen_qcommandlinkbutton.h b/qt/gen_qcommandlinkbutton.h index 1702001..f3e72bc 100644 --- a/qt/gen_qcommandlinkbutton.h +++ b/qt/gen_qcommandlinkbutton.h @@ -16,10 +16,14 @@ extern "C" { #ifdef __cplusplus class QCommandLinkButton; class QMetaObject; +class QSize; +class QStyleOptionButton; class QWidget; #else typedef struct QCommandLinkButton QCommandLinkButton; typedef struct QMetaObject QMetaObject; +typedef struct QSize QSize; +typedef struct QStyleOptionButton QStyleOptionButton; typedef struct QWidget QWidget; #endif @@ -32,13 +36,14 @@ QCommandLinkButton* QCommandLinkButton_new6(struct miqt_string* text, struct miq QMetaObject* QCommandLinkButton_MetaObject(const QCommandLinkButton* self); void* QCommandLinkButton_Metacast(QCommandLinkButton* self, const char* param1); struct miqt_string* QCommandLinkButton_Tr(const char* s); -struct miqt_string* QCommandLinkButton_TrUtf8(const char* s); struct miqt_string* QCommandLinkButton_Description(const QCommandLinkButton* self); void QCommandLinkButton_SetDescription(QCommandLinkButton* self, struct miqt_string* description); +QSize* QCommandLinkButton_SizeHint(const QCommandLinkButton* self); +int QCommandLinkButton_HeightForWidth(const QCommandLinkButton* self, int param1); +QSize* QCommandLinkButton_MinimumSizeHint(const QCommandLinkButton* self); +void QCommandLinkButton_InitStyleOption(const QCommandLinkButton* self, QStyleOptionButton* option); struct miqt_string* QCommandLinkButton_Tr2(const char* s, const char* c); struct miqt_string* QCommandLinkButton_Tr3(const char* s, const char* c, int n); -struct miqt_string* QCommandLinkButton_TrUtf82(const char* s, const char* c); -struct miqt_string* QCommandLinkButton_TrUtf83(const char* s, const char* c, int n); void QCommandLinkButton_Delete(QCommandLinkButton* self); #ifdef __cplusplus diff --git a/qt/gen_qcommonstyle.cpp b/qt/gen_qcommonstyle.cpp index 9ae5459..b1d5738 100644 --- a/qt/gen_qcommonstyle.cpp +++ b/qt/gen_qcommonstyle.cpp @@ -38,13 +38,6 @@ struct miqt_string* QCommonStyle_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QCommonStyle_TrUtf8(const char* s) { - QString _ret = QCommonStyle::trUtf8(s); - // 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 QCommonStyle_DrawPrimitive(const QCommonStyle* self, int pe, QStyleOption* opt, QPainter* p) { self->drawPrimitive(static_cast(pe), opt, p); } @@ -132,20 +125,6 @@ struct miqt_string* QCommonStyle_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QCommonStyle_TrUtf82(const char* s, const char* c) { - QString _ret = QCommonStyle::trUtf8(s, c); - // 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* QCommonStyle_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QCommonStyle::trUtf8(s, c, static_cast(n)); - // 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 QCommonStyle_DrawPrimitive4(const QCommonStyle* self, int pe, QStyleOption* opt, QPainter* p, QWidget* w) { self->drawPrimitive(static_cast(pe), opt, p, w); } diff --git a/qt/gen_qcommonstyle.go b/qt/gen_qcommonstyle.go index 0659ccc..f655b6f 100644 --- a/qt/gen_qcommonstyle.go +++ b/qt/gen_qcommonstyle.go @@ -61,15 +61,6 @@ func QCommonStyle_Tr(s string) string { return _ret } -func QCommonStyle_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QCommonStyle_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QCommonStyle) DrawPrimitive(pe QStyle__PrimitiveElement, opt *QStyleOption, p *QPainter) { C.QCommonStyle_DrawPrimitive(this.h, (C.int)(pe), opt.cPointer(), p.cPointer()) } @@ -182,28 +173,6 @@ func QCommonStyle_Tr3(s string, c string, n int) string { return _ret } -func QCommonStyle_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QCommonStyle_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QCommonStyle_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QCommonStyle_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QCommonStyle) DrawPrimitive4(pe QStyle__PrimitiveElement, opt *QStyleOption, p *QPainter, w *QWidget) { C.QCommonStyle_DrawPrimitive4(this.h, (C.int)(pe), opt.cPointer(), p.cPointer(), w.cPointer()) } diff --git a/qt/gen_qcommonstyle.h b/qt/gen_qcommonstyle.h index 9906fab..9353242 100644 --- a/qt/gen_qcommonstyle.h +++ b/qt/gen_qcommonstyle.h @@ -49,7 +49,6 @@ QCommonStyle* QCommonStyle_new(); QMetaObject* QCommonStyle_MetaObject(const QCommonStyle* self); void* QCommonStyle_Metacast(QCommonStyle* self, const char* param1); struct miqt_string* QCommonStyle_Tr(const char* s); -struct miqt_string* QCommonStyle_TrUtf8(const char* s); 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); @@ -70,8 +69,6 @@ void QCommonStyle_Unpolish(QCommonStyle* self, QWidget* widget); void QCommonStyle_UnpolishWithApplication(QCommonStyle* self, QApplication* application); 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, 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); diff --git a/qt/gen_qcompare.cpp b/qt/gen_qcompare.cpp new file mode 100644 index 0000000..1c360fc --- /dev/null +++ b/qt/gen_qcompare.cpp @@ -0,0 +1,13 @@ +#include +#include "qcompare.h" +#include "gen_qcompare.h" +#include "_cgo_export.h" + +QPartialOrdering* QPartialOrdering_new(QPartialOrdering* param1) { + return new QPartialOrdering(*param1); +} + +void QPartialOrdering_Delete(QPartialOrdering* self) { + delete self; +} + diff --git a/qt/gen_qcompare.go b/qt/gen_qcompare.go new file mode 100644 index 0000000..8cf2b2b --- /dev/null +++ b/qt/gen_qcompare.go @@ -0,0 +1,71 @@ +package qt + +/* + +#include "gen_qcompare.h" +#include + +*/ +import "C" + +import ( + "runtime" + "unsafe" +) + +type QtPrivate__Ordering int8 + +const ( + QtPrivate__Equal QtPrivate__Ordering = 0 + QtPrivate__Equivalent QtPrivate__Ordering = 0 + QtPrivate__Less QtPrivate__Ordering = -1 + QtPrivate__Greater QtPrivate__Ordering = 1 +) + +type QtPrivate__Uncomparable int8 + +const ( + QtPrivate__Unordered QtPrivate__Uncomparable = -127 +) + +type QPartialOrdering struct { + h *C.QPartialOrdering +} + +func (this *QPartialOrdering) cPointer() *C.QPartialOrdering { + if this == nil { + return nil + } + return this.h +} + +func newQPartialOrdering(h *C.QPartialOrdering) *QPartialOrdering { + if h == nil { + return nil + } + return &QPartialOrdering{h: h} +} + +func newQPartialOrdering_U(h unsafe.Pointer) *QPartialOrdering { + return newQPartialOrdering((*C.QPartialOrdering)(h)) +} + +// NewQPartialOrdering constructs a new QPartialOrdering object. +func NewQPartialOrdering(param1 *QPartialOrdering) *QPartialOrdering { + ret := C.QPartialOrdering_new(param1.cPointer()) + return newQPartialOrdering(ret) +} + +// Delete this object from C++ memory. +func (this *QPartialOrdering) Delete() { + C.QPartialOrdering_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QPartialOrdering) GoGC() { + runtime.SetFinalizer(this, func(this *QPartialOrdering) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} diff --git a/qt/gen_qcompare.h b/qt/gen_qcompare.h new file mode 100644 index 0000000..e310e9a --- /dev/null +++ b/qt/gen_qcompare.h @@ -0,0 +1,29 @@ +#ifndef GEN_QCOMPARE_H +#define GEN_QCOMPARE_H + +#include +#include +#include + +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + +#include "binding.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +class QPartialOrdering; +#else +typedef struct QPartialOrdering QPartialOrdering; +#endif + +QPartialOrdering* QPartialOrdering_new(QPartialOrdering* param1); +void QPartialOrdering_Delete(QPartialOrdering* self); + +#ifdef __cplusplus +} /* extern C */ +#endif + +#endif diff --git a/qt/gen_qcompleter.cpp b/qt/gen_qcompleter.cpp index a82e4f0..a888159 100644 --- a/qt/gen_qcompleter.cpp +++ b/qt/gen_qcompleter.cpp @@ -67,13 +67,6 @@ struct miqt_string* QCompleter_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QCompleter_TrUtf8(const char* s) { - QString _ret = QCompleter::trUtf8(s); - // 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 QCompleter_SetWidget(QCompleter* self, QWidget* widget) { self->setWidget(widget); } @@ -303,20 +296,6 @@ struct miqt_string* QCompleter_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QCompleter_TrUtf82(const char* s, const char* c) { - QString _ret = QCompleter::trUtf8(s, c); - // 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* QCompleter_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QCompleter::trUtf8(s, c, static_cast(n)); - // 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 QCompleter_Complete1(QCompleter* self, QRect* rect) { self->complete(*rect); } diff --git a/qt/gen_qcompleter.go b/qt/gen_qcompleter.go index 6cf6155..8cec6e8 100644 --- a/qt/gen_qcompleter.go +++ b/qt/gen_qcompleter.go @@ -128,15 +128,6 @@ func QCompleter_Tr(s string) string { return _ret } -func QCompleter_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QCompleter_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QCompleter) SetWidget(widget *QWidget) { C.QCompleter_SetWidget(this.h, widget.cPointer()) } @@ -407,28 +398,6 @@ func QCompleter_Tr3(s string, c string, n int) string { return _ret } -func QCompleter_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QCompleter_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QCompleter_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QCompleter_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QCompleter) Complete1(rect *QRect) { C.QCompleter_Complete1(this.h, rect.cPointer()) } diff --git a/qt/gen_qcompleter.h b/qt/gen_qcompleter.h index 08d1dca..9bfeccb 100644 --- a/qt/gen_qcompleter.h +++ b/qt/gen_qcompleter.h @@ -42,7 +42,6 @@ QCompleter* QCompleter_new6(struct miqt_array* /* of struct miqt_string* */ comp QMetaObject* QCompleter_MetaObject(const QCompleter* self); void* QCompleter_Metacast(QCompleter* self, const char* param1); struct miqt_string* QCompleter_Tr(const char* s); -struct miqt_string* QCompleter_TrUtf8(const char* s); void QCompleter_SetWidget(QCompleter* self, QWidget* widget); QWidget* QCompleter_Widget(const QCompleter* self); void QCompleter_SetModel(QCompleter* self, QAbstractItemModel* c); @@ -86,8 +85,6 @@ void QCompleter_HighlightedWithIndex(QCompleter* self, QModelIndex* index); void QCompleter_connect_HighlightedWithIndex(QCompleter* self, void* slot); struct miqt_string* QCompleter_Tr2(const char* s, const char* c); struct miqt_string* QCompleter_Tr3(const char* s, const char* c, int n); -struct miqt_string* QCompleter_TrUtf82(const char* s, const char* c); -struct miqt_string* QCompleter_TrUtf83(const char* s, const char* c, int n); void QCompleter_Complete1(QCompleter* self, QRect* rect); void QCompleter_Delete(QCompleter* self); diff --git a/qt/gen_qconcatenatetablesproxymodel.cpp b/qt/gen_qconcatenatetablesproxymodel.cpp index bc89498..10b8f30 100644 --- a/qt/gen_qconcatenatetablesproxymodel.cpp +++ b/qt/gen_qconcatenatetablesproxymodel.cpp @@ -37,13 +37,6 @@ struct miqt_string* QConcatenateTablesProxyModel_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QConcatenateTablesProxyModel_TrUtf8(const char* s) { - QString _ret = QConcatenateTablesProxyModel::trUtf8(s); - // 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* QConcatenateTablesProxyModel_SourceModels(const QConcatenateTablesProxyModel* self) { QList _ret = self->sourceModels(); // Convert QList<> from C++ memory to manually-managed C memory @@ -158,20 +151,6 @@ struct miqt_string* QConcatenateTablesProxyModel_Tr3(const char* s, const char* return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QConcatenateTablesProxyModel_TrUtf82(const char* s, const char* c) { - QString _ret = QConcatenateTablesProxyModel::trUtf8(s, c); - // 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* QConcatenateTablesProxyModel_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QConcatenateTablesProxyModel::trUtf8(s, c, static_cast(n)); - // 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()); -} - QVariant* QConcatenateTablesProxyModel_Data2(const QConcatenateTablesProxyModel* self, QModelIndex* index, int role) { return new QVariant(self->data(*index, static_cast(role))); } diff --git a/qt/gen_qconcatenatetablesproxymodel.go b/qt/gen_qconcatenatetablesproxymodel.go index dc48858..d3a9e6f 100644 --- a/qt/gen_qconcatenatetablesproxymodel.go +++ b/qt/gen_qconcatenatetablesproxymodel.go @@ -67,15 +67,6 @@ func QConcatenateTablesProxyModel_Tr(s string) string { return _ret } -func QConcatenateTablesProxyModel_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QConcatenateTablesProxyModel_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QConcatenateTablesProxyModel) SourceModels() []*QAbstractItemModel { var _ma *C.struct_miqt_array = C.QConcatenateTablesProxyModel_SourceModels(this.h) _ret := make([]*QAbstractItemModel, int(_ma.len)) @@ -216,28 +207,6 @@ func QConcatenateTablesProxyModel_Tr3(s string, c string, n int) string { return _ret } -func QConcatenateTablesProxyModel_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QConcatenateTablesProxyModel_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QConcatenateTablesProxyModel_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QConcatenateTablesProxyModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QConcatenateTablesProxyModel) Data2(index *QModelIndex, role int) *QVariant { _ret := C.QConcatenateTablesProxyModel_Data2(this.h, index.cPointer(), (C.int)(role)) _goptr := newQVariant(_ret) diff --git a/qt/gen_qconcatenatetablesproxymodel.h b/qt/gen_qconcatenatetablesproxymodel.h index 5b57e26..b8541be 100644 --- a/qt/gen_qconcatenatetablesproxymodel.h +++ b/qt/gen_qconcatenatetablesproxymodel.h @@ -38,7 +38,6 @@ QConcatenateTablesProxyModel* QConcatenateTablesProxyModel_new2(QObject* parent) QMetaObject* QConcatenateTablesProxyModel_MetaObject(const QConcatenateTablesProxyModel* self); void* QConcatenateTablesProxyModel_Metacast(QConcatenateTablesProxyModel* self, const char* param1); struct miqt_string* QConcatenateTablesProxyModel_Tr(const char* s); -struct miqt_string* QConcatenateTablesProxyModel_TrUtf8(const char* s); struct miqt_array* QConcatenateTablesProxyModel_SourceModels(const QConcatenateTablesProxyModel* self); void QConcatenateTablesProxyModel_AddSourceModel(QConcatenateTablesProxyModel* self, QAbstractItemModel* sourceModel); void QConcatenateTablesProxyModel_RemoveSourceModel(QConcatenateTablesProxyModel* self, QAbstractItemModel* sourceModel); @@ -59,8 +58,6 @@ bool QConcatenateTablesProxyModel_DropMimeData(QConcatenateTablesProxyModel* sel 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); -struct miqt_string* QConcatenateTablesProxyModel_TrUtf82(const char* s, const char* c); -struct miqt_string* QConcatenateTablesProxyModel_TrUtf83(const char* s, const char* c, int n); QVariant* QConcatenateTablesProxyModel_Data2(const QConcatenateTablesProxyModel* self, QModelIndex* index, int role); bool QConcatenateTablesProxyModel_SetData3(QConcatenateTablesProxyModel* self, QModelIndex* index, QVariant* value, int role); QModelIndex* QConcatenateTablesProxyModel_Index3(const QConcatenateTablesProxyModel* self, int row, int column, QModelIndex* parent); diff --git a/qt/gen_qcontainerfwd.cpp b/qt/gen_qcontainerfwd.cpp deleted file mode 100644 index 8f19bf9..0000000 --- a/qt/gen_qcontainerfwd.cpp +++ /dev/null @@ -1,4 +0,0 @@ -#include "qcontainerfwd.h" -#include "gen_qcontainerfwd.h" -#include "_cgo_export.h" - diff --git a/qt/gen_qcontiguouscache.cpp b/qt/gen_qcontiguouscache.cpp index 8209cc5..5c88281 100644 --- a/qt/gen_qcontiguouscache.cpp +++ b/qt/gen_qcontiguouscache.cpp @@ -3,8 +3,8 @@ #include "gen_qcontiguouscache.h" #include "_cgo_export.h" -QContiguousCacheData* QContiguousCacheData_AllocateData(int size, int alignment) { - return QContiguousCacheData::allocateData(static_cast(size), static_cast(alignment)); +QContiguousCacheData* QContiguousCacheData_AllocateData(ptrdiff_t size, ptrdiff_t alignment) { + return QContiguousCacheData::allocateData((qsizetype)(size), (qsizetype)(alignment)); } void QContiguousCacheData_FreeData(QContiguousCacheData* data) { diff --git a/qt/gen_qcontiguouscache.go b/qt/gen_qcontiguouscache.go index 94f8fbc..0ee71c7 100644 --- a/qt/gen_qcontiguouscache.go +++ b/qt/gen_qcontiguouscache.go @@ -35,8 +35,8 @@ func newQContiguousCacheData_U(h unsafe.Pointer) *QContiguousCacheData { return newQContiguousCacheData((*C.QContiguousCacheData)(h)) } -func QContiguousCacheData_AllocateData(size int, alignment int) *QContiguousCacheData { - return newQContiguousCacheData_U(unsafe.Pointer(C.QContiguousCacheData_AllocateData((C.int)(size), (C.int)(alignment)))) +func QContiguousCacheData_AllocateData(size int64, alignment int64) *QContiguousCacheData { + return newQContiguousCacheData_U(unsafe.Pointer(C.QContiguousCacheData_AllocateData((C.ptrdiff_t)(size), (C.ptrdiff_t)(alignment)))) } func QContiguousCacheData_FreeData(data *QContiguousCacheData) { diff --git a/qt/gen_qcontiguouscache.h b/qt/gen_qcontiguouscache.h index 809b724..511ad0a 100644 --- a/qt/gen_qcontiguouscache.h +++ b/qt/gen_qcontiguouscache.h @@ -19,7 +19,7 @@ class QContiguousCacheData; typedef struct QContiguousCacheData QContiguousCacheData; #endif -QContiguousCacheData* QContiguousCacheData_AllocateData(int size, int alignment); +QContiguousCacheData* QContiguousCacheData_AllocateData(ptrdiff_t size, ptrdiff_t alignment); void QContiguousCacheData_FreeData(QContiguousCacheData* data); void QContiguousCacheData_Delete(QContiguousCacheData* self); diff --git a/qt/gen_qcoreapplication.cpp b/qt/gen_qcoreapplication.cpp index d687fa3..1f2ce20 100644 --- a/qt/gen_qcoreapplication.cpp +++ b/qt/gen_qcoreapplication.cpp @@ -36,13 +36,6 @@ struct miqt_string* QCoreApplication_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QCoreApplication_TrUtf8(const char* s) { - QString _ret = QCoreApplication::trUtf8(s); - // 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* QCoreApplication_Arguments() { QStringList _ret = QCoreApplication::arguments(); // Convert QList<> from C++ memory to manually-managed C memory @@ -139,10 +132,6 @@ void QCoreApplication_ProcessEvents2(int flags, int maxtime) { QCoreApplication::processEvents(static_cast(flags), static_cast(maxtime)); } -void QCoreApplication_Exit() { - QCoreApplication::exit(); -} - bool QCoreApplication_SendEvent(QObject* receiver, QEvent* event) { return QCoreApplication::sendEvent(receiver, event); } @@ -159,10 +148,6 @@ void QCoreApplication_RemovePostedEvents(QObject* receiver) { QCoreApplication::removePostedEvents(receiver); } -bool QCoreApplication_HasPendingEvents() { - return QCoreApplication::hasPendingEvents(); -} - QAbstractEventDispatcher* QCoreApplication_EventDispatcher() { return QCoreApplication::eventDispatcher(); } @@ -254,18 +239,28 @@ struct miqt_string* QCoreApplication_Translate(const char* context, const char* return miqt_strdup(_b.data(), _b.length()); } -void QCoreApplication_Flush() { - QCoreApplication::flush(); -} - void QCoreApplication_InstallNativeEventFilter(QCoreApplication* self, QAbstractNativeEventFilter* filterObj) { self->installNativeEventFilter(filterObj); } +void QCoreApplication_connect_InstallNativeEventFilter(QCoreApplication* self, void* slot) { + QCoreApplication::connect(self, static_cast(&QCoreApplication::installNativeEventFilter), self, [=](QAbstractNativeEventFilter* filterObj) { + QAbstractNativeEventFilter* sigval1 = filterObj; + miqt_exec_callback_QCoreApplication_InstallNativeEventFilter(slot, sigval1); + }); +} + void QCoreApplication_RemoveNativeEventFilter(QCoreApplication* self, QAbstractNativeEventFilter* filterObj) { self->removeNativeEventFilter(filterObj); } +void QCoreApplication_connect_RemoveNativeEventFilter(QCoreApplication* self, void* slot) { + QCoreApplication::connect(self, static_cast(&QCoreApplication::removeNativeEventFilter), self, [=](QAbstractNativeEventFilter* filterObj) { + QAbstractNativeEventFilter* sigval1 = filterObj; + miqt_exec_callback_QCoreApplication_RemoveNativeEventFilter(slot, sigval1); + }); +} + bool QCoreApplication_IsQuitLockEnabled() { return QCoreApplication::isQuitLockEnabled(); } @@ -278,6 +273,10 @@ void QCoreApplication_Quit() { QCoreApplication::quit(); } +void QCoreApplication_Exit() { + QCoreApplication::exit(); +} + void QCoreApplication_OrganizationNameChanged(QCoreApplication* self) { self->organizationNameChanged(); } @@ -332,20 +331,6 @@ struct miqt_string* QCoreApplication_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QCoreApplication_TrUtf82(const char* s, const char* c) { - QString _ret = QCoreApplication::trUtf8(s, c); - // 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* QCoreApplication_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QCoreApplication::trUtf8(s, c, static_cast(n)); - // 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 QCoreApplication_SetAttribute2(int attribute, bool on) { QCoreApplication::setAttribute(static_cast(attribute), on); } @@ -354,10 +339,6 @@ void QCoreApplication_ProcessEvents1(int flags) { QCoreApplication::processEvents(static_cast(flags)); } -void QCoreApplication_Exit1(int retcode) { - QCoreApplication::exit(static_cast(retcode)); -} - void QCoreApplication_PostEvent3(QObject* receiver, QEvent* event, int priority) { QCoreApplication::postEvent(receiver, event, static_cast(priority)); } @@ -388,6 +369,10 @@ struct miqt_string* QCoreApplication_Translate4(const char* context, const char* return miqt_strdup(_b.data(), _b.length()); } +void QCoreApplication_Exit1(int retcode) { + QCoreApplication::exit(static_cast(retcode)); +} + void QCoreApplication_Delete(QCoreApplication* self) { delete self; } diff --git a/qt/gen_qcoreapplication.go b/qt/gen_qcoreapplication.go index b799226..5ee84bf 100644 --- a/qt/gen_qcoreapplication.go +++ b/qt/gen_qcoreapplication.go @@ -17,7 +17,7 @@ import ( type QCoreApplication__ int const ( - QCoreApplication__ApplicationFlags QCoreApplication__ = 331528 + QCoreApplication__ApplicationFlags QCoreApplication__ = 394242 ) type QCoreApplication struct { @@ -88,15 +88,6 @@ func QCoreApplication_Tr(s string) string { return _ret } -func QCoreApplication_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QCoreApplication_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func QCoreApplication_Arguments() []string { var _ma *C.struct_miqt_array = C.QCoreApplication_Arguments() _ret := make([]string, int(_ma.len)) @@ -195,10 +186,6 @@ func QCoreApplication_ProcessEvents2(flags QEventLoop__ProcessEventsFlag, maxtim C.QCoreApplication_ProcessEvents2((C.int)(flags), (C.int)(maxtime)) } -func QCoreApplication_Exit() { - C.QCoreApplication_Exit() -} - func QCoreApplication_SendEvent(receiver *QObject, event *QEvent) bool { return (bool)(C.QCoreApplication_SendEvent(receiver.cPointer(), event.cPointer())) } @@ -215,10 +202,6 @@ func QCoreApplication_RemovePostedEvents(receiver *QObject) { C.QCoreApplication_RemovePostedEvents(receiver.cPointer()) } -func QCoreApplication_HasPendingEvents() bool { - return (bool)(C.QCoreApplication_HasPendingEvents()) -} - func QCoreApplication_EventDispatcher() *QAbstractEventDispatcher { return newQAbstractEventDispatcher_U(unsafe.Pointer(C.QCoreApplication_EventDispatcher())) } @@ -316,17 +299,45 @@ func QCoreApplication_Translate(context string, key string) string { return _ret } -func QCoreApplication_Flush() { - C.QCoreApplication_Flush() -} - func (this *QCoreApplication) InstallNativeEventFilter(filterObj *QAbstractNativeEventFilter) { C.QCoreApplication_InstallNativeEventFilter(this.h, filterObj.cPointer()) } +func (this *QCoreApplication) OnInstallNativeEventFilter(slot func(filterObj *QAbstractNativeEventFilter)) { + C.QCoreApplication_connect_InstallNativeEventFilter(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) +} + +//export miqt_exec_callback_QCoreApplication_InstallNativeEventFilter +func miqt_exec_callback_QCoreApplication_InstallNativeEventFilter(cb *C.void, filterObj *C.QAbstractNativeEventFilter) { + gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(filterObj *QAbstractNativeEventFilter)) + if !ok { + panic("miqt: callback of non-callback type (heap corruption?)") + } + + // Convert all CABI parameters to Go parameters + slotval1 := newQAbstractNativeEventFilter_U(unsafe.Pointer(filterObj)) + + gofunc(slotval1) +} func (this *QCoreApplication) RemoveNativeEventFilter(filterObj *QAbstractNativeEventFilter) { C.QCoreApplication_RemoveNativeEventFilter(this.h, filterObj.cPointer()) } +func (this *QCoreApplication) OnRemoveNativeEventFilter(slot func(filterObj *QAbstractNativeEventFilter)) { + C.QCoreApplication_connect_RemoveNativeEventFilter(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) +} + +//export miqt_exec_callback_QCoreApplication_RemoveNativeEventFilter +func miqt_exec_callback_QCoreApplication_RemoveNativeEventFilter(cb *C.void, filterObj *C.QAbstractNativeEventFilter) { + gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(filterObj *QAbstractNativeEventFilter)) + if !ok { + panic("miqt: callback of non-callback type (heap corruption?)") + } + + // Convert all CABI parameters to Go parameters + slotval1 := newQAbstractNativeEventFilter_U(unsafe.Pointer(filterObj)) + + gofunc(slotval1) +} func QCoreApplication_IsQuitLockEnabled() bool { return (bool)(C.QCoreApplication_IsQuitLockEnabled()) @@ -340,6 +351,10 @@ func QCoreApplication_Quit() { C.QCoreApplication_Quit() } +func QCoreApplication_Exit() { + C.QCoreApplication_Exit() +} + func (this *QCoreApplication) OrganizationNameChanged() { C.QCoreApplication_OrganizationNameChanged(this.h) } @@ -430,28 +445,6 @@ func QCoreApplication_Tr3(s string, c string, n int) string { return _ret } -func QCoreApplication_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QCoreApplication_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QCoreApplication_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QCoreApplication_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func QCoreApplication_SetAttribute2(attribute ApplicationAttribute, on bool) { C.QCoreApplication_SetAttribute2((C.int)(attribute), (C.bool)(on)) } @@ -460,10 +453,6 @@ func QCoreApplication_ProcessEvents1(flags QEventLoop__ProcessEventsFlag) { C.QCoreApplication_ProcessEvents1((C.int)(flags)) } -func QCoreApplication_Exit1(retcode int) { - C.QCoreApplication_Exit1((C.int)(retcode)) -} - func QCoreApplication_PostEvent3(receiver *QObject, event *QEvent, priority int) { C.QCoreApplication_PostEvent3(receiver.cPointer(), event.cPointer(), (C.int)(priority)) } @@ -506,6 +495,10 @@ func QCoreApplication_Translate4(context string, key string, disambiguation stri return _ret } +func QCoreApplication_Exit1(retcode int) { + C.QCoreApplication_Exit1((C.int)(retcode)) +} + // Delete this object from C++ memory. func (this *QCoreApplication) Delete() { C.QCoreApplication_Delete(this.h) diff --git a/qt/gen_qcoreapplication.h b/qt/gen_qcoreapplication.h index 0b45b04..b1b237b 100644 --- a/qt/gen_qcoreapplication.h +++ b/qt/gen_qcoreapplication.h @@ -36,7 +36,6 @@ QCoreApplication* QCoreApplication_new2(int* argc, char** argv, int param3); QMetaObject* QCoreApplication_MetaObject(const QCoreApplication* self); void* QCoreApplication_Metacast(QCoreApplication* self, const char* param1); struct miqt_string* QCoreApplication_Tr(const char* s); -struct miqt_string* QCoreApplication_TrUtf8(const char* s); struct miqt_array* QCoreApplication_Arguments(); void QCoreApplication_SetAttribute(int attribute); bool QCoreApplication_TestAttribute(int attribute); @@ -54,12 +53,10 @@ QCoreApplication* QCoreApplication_Instance(); int QCoreApplication_Exec(); void QCoreApplication_ProcessEvents(); void QCoreApplication_ProcessEvents2(int flags, int maxtime); -void QCoreApplication_Exit(); bool QCoreApplication_SendEvent(QObject* receiver, QEvent* event); void QCoreApplication_PostEvent(QObject* receiver, QEvent* event); void QCoreApplication_SendPostedEvents(); void QCoreApplication_RemovePostedEvents(QObject* receiver); -bool QCoreApplication_HasPendingEvents(); QAbstractEventDispatcher* QCoreApplication_EventDispatcher(); void QCoreApplication_SetEventDispatcher(QAbstractEventDispatcher* eventDispatcher); bool QCoreApplication_Notify(QCoreApplication* self, QObject* param1, QEvent* param2); @@ -75,12 +72,14 @@ void QCoreApplication_RemoveLibraryPath(struct miqt_string* param1); bool QCoreApplication_InstallTranslator(QTranslator* messageFile); bool QCoreApplication_RemoveTranslator(QTranslator* messageFile); struct miqt_string* QCoreApplication_Translate(const char* context, const char* key); -void QCoreApplication_Flush(); void QCoreApplication_InstallNativeEventFilter(QCoreApplication* self, QAbstractNativeEventFilter* filterObj); +void QCoreApplication_connect_InstallNativeEventFilter(QCoreApplication* self, void* slot); void QCoreApplication_RemoveNativeEventFilter(QCoreApplication* self, QAbstractNativeEventFilter* filterObj); +void QCoreApplication_connect_RemoveNativeEventFilter(QCoreApplication* self, void* slot); bool QCoreApplication_IsQuitLockEnabled(); void QCoreApplication_SetQuitLockEnabled(bool enabled); void QCoreApplication_Quit(); +void QCoreApplication_Exit(); void QCoreApplication_OrganizationNameChanged(QCoreApplication* self); void QCoreApplication_connect_OrganizationNameChanged(QCoreApplication* self, void* slot); void QCoreApplication_OrganizationDomainChanged(QCoreApplication* self); @@ -91,17 +90,15 @@ void QCoreApplication_ApplicationVersionChanged(QCoreApplication* self); void QCoreApplication_connect_ApplicationVersionChanged(QCoreApplication* self, void* slot); struct miqt_string* QCoreApplication_Tr2(const char* s, const char* c); struct miqt_string* QCoreApplication_Tr3(const char* s, const char* c, int n); -struct miqt_string* QCoreApplication_TrUtf82(const char* s, const char* c); -struct miqt_string* QCoreApplication_TrUtf83(const char* s, const char* c, int n); 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); void QCoreApplication_SendPostedEvents1(QObject* receiver); void QCoreApplication_SendPostedEvents2(QObject* receiver, int event_type); void QCoreApplication_RemovePostedEvents2(QObject* receiver, int eventType); struct miqt_string* QCoreApplication_Translate3(const char* context, const char* key, const char* disambiguation); struct miqt_string* QCoreApplication_Translate4(const char* context, const char* key, const char* disambiguation, int n); +void QCoreApplication_Exit1(int retcode); void QCoreApplication_Delete(QCoreApplication* self); #ifdef __cplusplus diff --git a/qt/gen_qcoreevent.cpp b/qt/gen_qcoreevent.cpp index 306f3f6..b227101 100644 --- a/qt/gen_qcoreevent.cpp +++ b/qt/gen_qcoreevent.cpp @@ -13,14 +13,6 @@ QEvent* QEvent_new(int typeVal) { return new QEvent(static_cast(typeVal)); } -QEvent* QEvent_new2(QEvent* other) { - return new QEvent(*other); -} - -void QEvent_OperatorAssign(QEvent* self, QEvent* other) { - self->operator=(*other); -} - int QEvent_Type(const QEvent* self) { QEvent::Type _ret = self->type(); return static_cast(_ret); @@ -46,10 +38,26 @@ void QEvent_Ignore(QEvent* self) { self->ignore(); } +bool QEvent_IsInputEvent(const QEvent* self) { + return self->isInputEvent(); +} + +bool QEvent_IsPointerEvent(const QEvent* self) { + return self->isPointerEvent(); +} + +bool QEvent_IsSinglePointEvent(const QEvent* self) { + return self->isSinglePointEvent(); +} + int QEvent_RegisterEventType() { return QEvent::registerEventType(); } +QEvent* QEvent_Clone(const QEvent* self) { + return self->clone(); +} + int QEvent_RegisterEventType1(int hint) { return QEvent::registerEventType(static_cast(hint)); } @@ -62,8 +70,8 @@ QTimerEvent* QTimerEvent_new(int timerId) { return new QTimerEvent(static_cast(timerId)); } -QTimerEvent* QTimerEvent_new2(QTimerEvent* param1) { - return new QTimerEvent(*param1); +QTimerEvent* QTimerEvent_Clone(const QTimerEvent* self) { + return self->clone(); } int QTimerEvent_TimerId(const QTimerEvent* self) { @@ -78,8 +86,8 @@ QChildEvent* QChildEvent_new(int typeVal, QObject* child) { return new QChildEvent(static_cast(typeVal), child); } -QChildEvent* QChildEvent_new2(QChildEvent* param1) { - return new QChildEvent(*param1); +QChildEvent* QChildEvent_Clone(const QChildEvent* self) { + return self->clone(); } QObject* QChildEvent_Child(const QChildEvent* self) { @@ -106,8 +114,8 @@ QDynamicPropertyChangeEvent* QDynamicPropertyChangeEvent_new(QByteArray* name) { return new QDynamicPropertyChangeEvent(*name); } -QDynamicPropertyChangeEvent* QDynamicPropertyChangeEvent_new2(QDynamicPropertyChangeEvent* param1) { - return new QDynamicPropertyChangeEvent(*param1); +QDynamicPropertyChangeEvent* QDynamicPropertyChangeEvent_Clone(const QDynamicPropertyChangeEvent* self) { + return self->clone(); } QByteArray* QDynamicPropertyChangeEvent_PropertyName(const QDynamicPropertyChangeEvent* self) { @@ -122,8 +130,8 @@ QDeferredDeleteEvent* QDeferredDeleteEvent_new() { return new QDeferredDeleteEvent(); } -QDeferredDeleteEvent* QDeferredDeleteEvent_new2(QDeferredDeleteEvent* param1) { - return new QDeferredDeleteEvent(*param1); +QDeferredDeleteEvent* QDeferredDeleteEvent_Clone(const QDeferredDeleteEvent* self) { + return self->clone(); } int QDeferredDeleteEvent_LoopLevel(const QDeferredDeleteEvent* self) { diff --git a/qt/gen_qcoreevent.go b/qt/gen_qcoreevent.go index ed3ac0b..3bc3dd3 100644 --- a/qt/gen_qcoreevent.go +++ b/qt/gen_qcoreevent.go @@ -137,6 +137,7 @@ const ( QEvent__GraphicsSceneDragLeave QEvent__Type = 166 QEvent__GraphicsSceneDrop QEvent__Type = 167 QEvent__GraphicsSceneWheel QEvent__Type = 168 + QEvent__GraphicsSceneLeave QEvent__Type = 220 QEvent__KeyboardLayoutChange QEvent__Type = 169 QEvent__DynamicPropertyChange QEvent__Type = 170 QEvent__TabletEnterProximity QEvent__Type = 171 @@ -158,7 +159,6 @@ const ( QEvent__UngrabMouse QEvent__Type = 187 QEvent__GrabKeyboard QEvent__Type = 188 QEvent__UngrabKeyboard QEvent__Type = 189 - QEvent__MacGLClearDrawable QEvent__Type = 191 QEvent__StateMachineSignal QEvent__Type = 192 QEvent__StateMachineWrapped QEvent__Type = 193 QEvent__TouchBegin QEvent__Type = 194 @@ -186,6 +186,7 @@ const ( QEvent__PlatformSurface QEvent__Type = 217 QEvent__Pointer QEvent__Type = 218 QEvent__TabletTrackingChange QEvent__Type = 219 + QEvent__WindowAboutToChangeInternal QEvent__Type = 221 QEvent__User QEvent__Type = 1000 QEvent__MaxUser QEvent__Type = 65535 ) @@ -218,16 +219,6 @@ func NewQEvent(typeVal QEvent__Type) *QEvent { return newQEvent(ret) } -// NewQEvent2 constructs a new QEvent object. -func NewQEvent2(other *QEvent) *QEvent { - ret := C.QEvent_new2(other.cPointer()) - return newQEvent(ret) -} - -func (this *QEvent) OperatorAssign(other *QEvent) { - C.QEvent_OperatorAssign(this.h, other.cPointer()) -} - func (this *QEvent) Type() QEvent__Type { return (QEvent__Type)(C.QEvent_Type(this.h)) } @@ -252,10 +243,26 @@ func (this *QEvent) Ignore() { C.QEvent_Ignore(this.h) } +func (this *QEvent) IsInputEvent() bool { + return (bool)(C.QEvent_IsInputEvent(this.h)) +} + +func (this *QEvent) IsPointerEvent() bool { + return (bool)(C.QEvent_IsPointerEvent(this.h)) +} + +func (this *QEvent) IsSinglePointEvent() bool { + return (bool)(C.QEvent_IsSinglePointEvent(this.h)) +} + func QEvent_RegisterEventType() int { return (int)(C.QEvent_RegisterEventType()) } +func (this *QEvent) Clone() *QEvent { + return newQEvent_U(unsafe.Pointer(C.QEvent_Clone(this.h))) +} + func QEvent_RegisterEventType1(hint int) int { return (int)(C.QEvent_RegisterEventType1((C.int)(hint))) } @@ -303,10 +310,8 @@ func NewQTimerEvent(timerId int) *QTimerEvent { return newQTimerEvent(ret) } -// NewQTimerEvent2 constructs a new QTimerEvent object. -func NewQTimerEvent2(param1 *QTimerEvent) *QTimerEvent { - ret := C.QTimerEvent_new2(param1.cPointer()) - return newQTimerEvent(ret) +func (this *QTimerEvent) Clone() *QTimerEvent { + return newQTimerEvent_U(unsafe.Pointer(C.QTimerEvent_Clone(this.h))) } func (this *QTimerEvent) TimerId() int { @@ -356,10 +361,8 @@ func NewQChildEvent(typeVal QEvent__Type, child *QObject) *QChildEvent { return newQChildEvent(ret) } -// NewQChildEvent2 constructs a new QChildEvent object. -func NewQChildEvent2(param1 *QChildEvent) *QChildEvent { - ret := C.QChildEvent_new2(param1.cPointer()) - return newQChildEvent(ret) +func (this *QChildEvent) Clone() *QChildEvent { + return newQChildEvent_U(unsafe.Pointer(C.QChildEvent_Clone(this.h))) } func (this *QChildEvent) Child() *QObject { @@ -421,10 +424,8 @@ func NewQDynamicPropertyChangeEvent(name *QByteArray) *QDynamicPropertyChangeEve return newQDynamicPropertyChangeEvent(ret) } -// NewQDynamicPropertyChangeEvent2 constructs a new QDynamicPropertyChangeEvent object. -func NewQDynamicPropertyChangeEvent2(param1 *QDynamicPropertyChangeEvent) *QDynamicPropertyChangeEvent { - ret := C.QDynamicPropertyChangeEvent_new2(param1.cPointer()) - return newQDynamicPropertyChangeEvent(ret) +func (this *QDynamicPropertyChangeEvent) Clone() *QDynamicPropertyChangeEvent { + return newQDynamicPropertyChangeEvent_U(unsafe.Pointer(C.QDynamicPropertyChangeEvent_Clone(this.h))) } func (this *QDynamicPropertyChangeEvent) PropertyName() *QByteArray { @@ -477,10 +478,8 @@ func NewQDeferredDeleteEvent() *QDeferredDeleteEvent { return newQDeferredDeleteEvent(ret) } -// NewQDeferredDeleteEvent2 constructs a new QDeferredDeleteEvent object. -func NewQDeferredDeleteEvent2(param1 *QDeferredDeleteEvent) *QDeferredDeleteEvent { - ret := C.QDeferredDeleteEvent_new2(param1.cPointer()) - return newQDeferredDeleteEvent(ret) +func (this *QDeferredDeleteEvent) Clone() *QDeferredDeleteEvent { + return newQDeferredDeleteEvent_U(unsafe.Pointer(C.QDeferredDeleteEvent_Clone(this.h))) } func (this *QDeferredDeleteEvent) LoopLevel() int { diff --git a/qt/gen_qcoreevent.h b/qt/gen_qcoreevent.h index 57e3c3d..3aceebd 100644 --- a/qt/gen_qcoreevent.h +++ b/qt/gen_qcoreevent.h @@ -32,25 +32,27 @@ typedef struct QTimerEvent QTimerEvent; #endif QEvent* QEvent_new(int typeVal); -QEvent* QEvent_new2(QEvent* other); -void QEvent_OperatorAssign(QEvent* self, QEvent* other); 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); void QEvent_Accept(QEvent* self); void QEvent_Ignore(QEvent* self); +bool QEvent_IsInputEvent(const QEvent* self); +bool QEvent_IsPointerEvent(const QEvent* self); +bool QEvent_IsSinglePointEvent(const QEvent* self); int QEvent_RegisterEventType(); +QEvent* QEvent_Clone(const QEvent* self); int QEvent_RegisterEventType1(int hint); void QEvent_Delete(QEvent* self); QTimerEvent* QTimerEvent_new(int timerId); -QTimerEvent* QTimerEvent_new2(QTimerEvent* param1); +QTimerEvent* QTimerEvent_Clone(const QTimerEvent* self); int QTimerEvent_TimerId(const QTimerEvent* self); void QTimerEvent_Delete(QTimerEvent* self); QChildEvent* QChildEvent_new(int typeVal, QObject* child); -QChildEvent* QChildEvent_new2(QChildEvent* param1); +QChildEvent* QChildEvent_Clone(const QChildEvent* self); QObject* QChildEvent_Child(const QChildEvent* self); bool QChildEvent_Added(const QChildEvent* self); bool QChildEvent_Polished(const QChildEvent* self); @@ -58,12 +60,12 @@ bool QChildEvent_Removed(const QChildEvent* self); void QChildEvent_Delete(QChildEvent* self); QDynamicPropertyChangeEvent* QDynamicPropertyChangeEvent_new(QByteArray* name); -QDynamicPropertyChangeEvent* QDynamicPropertyChangeEvent_new2(QDynamicPropertyChangeEvent* param1); +QDynamicPropertyChangeEvent* QDynamicPropertyChangeEvent_Clone(const QDynamicPropertyChangeEvent* self); QByteArray* QDynamicPropertyChangeEvent_PropertyName(const QDynamicPropertyChangeEvent* self); void QDynamicPropertyChangeEvent_Delete(QDynamicPropertyChangeEvent* self); QDeferredDeleteEvent* QDeferredDeleteEvent_new(); -QDeferredDeleteEvent* QDeferredDeleteEvent_new2(QDeferredDeleteEvent* param1); +QDeferredDeleteEvent* QDeferredDeleteEvent_Clone(const QDeferredDeleteEvent* self); int QDeferredDeleteEvent_LoopLevel(const QDeferredDeleteEvent* self); void QDeferredDeleteEvent_Delete(QDeferredDeleteEvent* self); diff --git a/qt/gen_qcryptographichash.cpp b/qt/gen_qcryptographichash.cpp index 63ceba6..8b83510 100644 --- a/qt/gen_qcryptographichash.cpp +++ b/qt/gen_qcryptographichash.cpp @@ -1,4 +1,5 @@ #include +#include #include #include #include "qcryptographichash.h" @@ -13,11 +14,11 @@ void QCryptographicHash_Reset(QCryptographicHash* self) { self->reset(); } -void QCryptographicHash_AddData(QCryptographicHash* self, const char* data, int length) { - self->addData(data, static_cast(length)); +void QCryptographicHash_AddData(QCryptographicHash* self, const char* data, ptrdiff_t length) { + self->addData(data, (qsizetype)(length)); } -void QCryptographicHash_AddDataWithData(QCryptographicHash* self, QByteArray* data) { +void QCryptographicHash_AddDataWithData(QCryptographicHash* self, QByteArrayView* data) { self->addData(*data); } @@ -29,7 +30,11 @@ QByteArray* QCryptographicHash_Result(const QCryptographicHash* self) { return new QByteArray(self->result()); } -QByteArray* QCryptographicHash_Hash(QByteArray* data, int method) { +QByteArrayView* QCryptographicHash_ResultView(const QCryptographicHash* self) { + return new QByteArrayView(self->resultView()); +} + +QByteArray* QCryptographicHash_Hash(QByteArrayView* data, int method) { return new QByteArray(QCryptographicHash::hash(*data, static_cast(method))); } diff --git a/qt/gen_qcryptographichash.go b/qt/gen_qcryptographichash.go index 8f6c3cd..fa49acc 100644 --- a/qt/gen_qcryptographichash.go +++ b/qt/gen_qcryptographichash.go @@ -35,6 +35,14 @@ const ( QCryptographicHash__Sha3_256 QCryptographicHash__Algorithm = 12 QCryptographicHash__Sha3_384 QCryptographicHash__Algorithm = 13 QCryptographicHash__Sha3_512 QCryptographicHash__Algorithm = 14 + QCryptographicHash__Blake2b_160 QCryptographicHash__Algorithm = 15 + QCryptographicHash__Blake2b_256 QCryptographicHash__Algorithm = 16 + QCryptographicHash__Blake2b_384 QCryptographicHash__Algorithm = 17 + QCryptographicHash__Blake2b_512 QCryptographicHash__Algorithm = 18 + QCryptographicHash__Blake2s_128 QCryptographicHash__Algorithm = 19 + QCryptographicHash__Blake2s_160 QCryptographicHash__Algorithm = 20 + QCryptographicHash__Blake2s_224 QCryptographicHash__Algorithm = 21 + QCryptographicHash__Blake2s_256 QCryptographicHash__Algorithm = 22 ) type QCryptographicHash struct { @@ -69,13 +77,13 @@ func (this *QCryptographicHash) Reset() { C.QCryptographicHash_Reset(this.h) } -func (this *QCryptographicHash) AddData(data string, length int) { +func (this *QCryptographicHash) AddData(data string, length int64) { data_Cstring := C.CString(data) defer C.free(unsafe.Pointer(data_Cstring)) - C.QCryptographicHash_AddData(this.h, data_Cstring, (C.int)(length)) + C.QCryptographicHash_AddData(this.h, data_Cstring, (C.ptrdiff_t)(length)) } -func (this *QCryptographicHash) AddDataWithData(data *QByteArray) { +func (this *QCryptographicHash) AddDataWithData(data QByteArrayView) { C.QCryptographicHash_AddDataWithData(this.h, data.cPointer()) } @@ -90,7 +98,14 @@ func (this *QCryptographicHash) Result() *QByteArray { return _goptr } -func QCryptographicHash_Hash(data *QByteArray, method QCryptographicHash__Algorithm) *QByteArray { +func (this *QCryptographicHash) ResultView() *QByteArrayView { + _ret := C.QCryptographicHash_ResultView(this.h) + _goptr := newQByteArrayView(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func QCryptographicHash_Hash(data QByteArrayView, method QCryptographicHash__Algorithm) *QByteArray { _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 diff --git a/qt/gen_qcryptographichash.h b/qt/gen_qcryptographichash.h index 2f48421..6a30d3d 100644 --- a/qt/gen_qcryptographichash.h +++ b/qt/gen_qcryptographichash.h @@ -15,21 +15,24 @@ extern "C" { #ifdef __cplusplus class QByteArray; +class QByteArrayView; class QCryptographicHash; class QIODevice; #else typedef struct QByteArray QByteArray; +typedef struct QByteArrayView QByteArrayView; typedef struct QCryptographicHash QCryptographicHash; typedef struct QIODevice QIODevice; #endif 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); +void QCryptographicHash_AddData(QCryptographicHash* self, const char* data, ptrdiff_t length); +void QCryptographicHash_AddDataWithData(QCryptographicHash* self, QByteArrayView* data); bool QCryptographicHash_AddDataWithDevice(QCryptographicHash* self, QIODevice* device); QByteArray* QCryptographicHash_Result(const QCryptographicHash* self); -QByteArray* QCryptographicHash_Hash(QByteArray* data, int method); +QByteArrayView* QCryptographicHash_ResultView(const QCryptographicHash* self); +QByteArray* QCryptographicHash_Hash(QByteArrayView* data, int method); int QCryptographicHash_HashLength(int method); void QCryptographicHash_Delete(QCryptographicHash* self); diff --git a/qt/gen_qcursor.cpp b/qt/gen_qcursor.cpp index 4c5ae79..ff5839d 100644 --- a/qt/gen_qcursor.cpp +++ b/qt/gen_qcursor.cpp @@ -60,22 +60,22 @@ void QCursor_SetShape(QCursor* self, int newShape) { self->setShape(static_cast(newShape)); } -QBitmap* QCursor_Bitmap(const QCursor* self) { - return (QBitmap*) self->bitmap(); -} - -QBitmap* QCursor_Mask(const QCursor* self) { - return (QBitmap*) self->mask(); -} - -QBitmap* QCursor_BitmapWithQtReturnByValueConstant(const QCursor* self, int param1) { +QBitmap* QCursor_Bitmap(const QCursor* self, int param1) { return new QBitmap(self->bitmap(static_cast(param1))); } -QBitmap* QCursor_MaskWithQtReturnByValueConstant(const QCursor* self, int param1) { +QBitmap* QCursor_Mask(const QCursor* self, int param1) { return new QBitmap(self->mask(static_cast(param1))); } +QBitmap* QCursor_Bitmap2(const QCursor* self) { + return new QBitmap(self->bitmap()); +} + +QBitmap* QCursor_Mask2(const QCursor* self) { + return new QBitmap(self->mask()); +} + QPixmap* QCursor_Pixmap(const QCursor* self) { return new QPixmap(self->pixmap()); } diff --git a/qt/gen_qcursor.go b/qt/gen_qcursor.go index 04044a2..c3bf46b 100644 --- a/qt/gen_qcursor.go +++ b/qt/gen_qcursor.go @@ -105,23 +105,29 @@ func (this *QCursor) SetShape(newShape CursorShape) { C.QCursor_SetShape(this.h, (C.int)(newShape)) } -func (this *QCursor) Bitmap() *QBitmap { - return newQBitmap_U(unsafe.Pointer(C.QCursor_Bitmap(this.h))) -} - -func (this *QCursor) Mask() *QBitmap { - return newQBitmap_U(unsafe.Pointer(C.QCursor_Mask(this.h))) -} - -func (this *QCursor) BitmapWithQtReturnByValueConstant(param1 ReturnByValueConstant) *QBitmap { - _ret := C.QCursor_BitmapWithQtReturnByValueConstant(this.h, (C.int)(param1)) +func (this *QCursor) Bitmap(param1 ReturnByValueConstant) *QBitmap { + _ret := C.QCursor_Bitmap(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.int)(param1)) +func (this *QCursor) Mask(param1 ReturnByValueConstant) *QBitmap { + _ret := C.QCursor_Mask(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) Bitmap2() *QBitmap { + _ret := C.QCursor_Bitmap2(this.h) + _goptr := newQBitmap(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QCursor) Mask2() *QBitmap { + _ret := C.QCursor_Mask2(this.h) _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 8e34845..b4b0eef 100644 --- a/qt/gen_qcursor.h +++ b/qt/gen_qcursor.h @@ -40,10 +40,10 @@ void QCursor_OperatorAssign(QCursor* self, QCursor* cursor); void QCursor_Swap(QCursor* self, QCursor* other); 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, int param1); -QBitmap* QCursor_MaskWithQtReturnByValueConstant(const QCursor* self, int param1); +QBitmap* QCursor_Bitmap(const QCursor* self, int param1); +QBitmap* QCursor_Mask(const QCursor* self, int param1); +QBitmap* QCursor_Bitmap2(const QCursor* self); +QBitmap* QCursor_Mask2(const QCursor* self); 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 e476396..32ae642 100644 --- a/qt/gen_qdatastream.cpp +++ b/qt/gen_qdatastream.cpp @@ -15,7 +15,7 @@ QDataStream* QDataStream_new2(QIODevice* param1) { } QDataStream* QDataStream_new3(QByteArray* param1, int flags) { - return new QDataStream(param1, static_cast(flags)); + return new QDataStream(param1, static_cast(flags)); } QDataStream* QDataStream_new4(QByteArray* param1) { @@ -30,10 +30,6 @@ void QDataStream_SetDevice(QDataStream* self, QIODevice* device) { self->setDevice(device); } -void QDataStream_UnsetDevice(QDataStream* self) { - self->unsetDevice(); -} - bool QDataStream_AtEnd(const QDataStream* self) { return self->atEnd(); } @@ -77,7 +73,11 @@ void QDataStream_SetVersion(QDataStream* self, int version) { self->setVersion(static_cast(version)); } -void QDataStream_OperatorShiftRight(QDataStream* self, signed char* i) { +void QDataStream_OperatorShiftRight(QDataStream* self, char* i) { + self->operator>>(static_cast(*i)); +} + +void QDataStream_OperatorShiftRightWithQint8(QDataStream* self, signed char* i) { self->operator>>(static_cast(*i)); } @@ -125,7 +125,11 @@ void QDataStream_OperatorShiftRightWithStr(QDataStream* self, char* str) { self->operator>>(str); } -void QDataStream_OperatorShiftLeft(QDataStream* self, signed char i) { +void QDataStream_OperatorShiftLeft(QDataStream* self, char i) { + self->operator<<(static_cast(i)); +} + +void QDataStream_OperatorShiftLeftWithQint8(QDataStream* self, signed char i) { self->operator<<(static_cast(i)); } @@ -211,6 +215,10 @@ void QDataStream_AbortTransaction(QDataStream* self) { self->abortTransaction(); } +bool QDataStream_IsDeviceTransactionStarted(const QDataStream* self) { + return self->isDeviceTransactionStarted(); +} + void QDataStream_Delete(QDataStream* self) { delete self; } @@ -219,10 +227,6 @@ QtPrivate__StreamStateSaver* QtPrivate__StreamStateSaver_new(QDataStream* s) { return new QtPrivate::StreamStateSaver(s); } -QtPrivate__StreamStateSaver* QtPrivate__StreamStateSaver_new2(QtPrivate__StreamStateSaver* param1) { - return new QtPrivate::StreamStateSaver(*param1); -} - void QtPrivate__StreamStateSaver_Delete(QtPrivate__StreamStateSaver* self) { delete self; } diff --git a/qt/gen_qdatastream.go b/qt/gen_qdatastream.go index f27e2fb..8f0ba8d 100644 --- a/qt/gen_qdatastream.go +++ b/qt/gen_qdatastream.go @@ -48,7 +48,12 @@ const ( QDataStream__Qt_5_13 QDataStream__Version = 19 QDataStream__Qt_5_14 QDataStream__Version = 19 QDataStream__Qt_5_15 QDataStream__Version = 19 - QDataStream__Qt_DefaultCompiledVersion QDataStream__Version = 19 + QDataStream__Qt_6_0 QDataStream__Version = 20 + QDataStream__Qt_6_1 QDataStream__Version = 20 + QDataStream__Qt_6_2 QDataStream__Version = 20 + QDataStream__Qt_6_3 QDataStream__Version = 20 + QDataStream__Qt_6_4 QDataStream__Version = 20 + QDataStream__Qt_DefaultCompiledVersion QDataStream__Version = 20 ) type QDataStream__ByteOrder int @@ -76,6 +81,7 @@ const ( type QDataStream struct { h *C.QDataStream + *QIODeviceBase } func (this *QDataStream) cPointer() *C.QDataStream { @@ -89,7 +95,7 @@ func newQDataStream(h *C.QDataStream) *QDataStream { if h == nil { return nil } - return &QDataStream{h: h} + return &QDataStream{h: h, QIODeviceBase: newQIODeviceBase_U(unsafe.Pointer(h))} } func newQDataStream_U(h unsafe.Pointer) *QDataStream { @@ -109,7 +115,7 @@ func NewQDataStream2(param1 *QIODevice) *QDataStream { } // NewQDataStream3 constructs a new QDataStream object. -func NewQDataStream3(param1 *QByteArray, flags QIODevice__OpenModeFlag) *QDataStream { +func NewQDataStream3(param1 *QByteArray, flags QIODeviceBase__OpenModeFlag) *QDataStream { ret := C.QDataStream_new3(param1.cPointer(), (C.int)(flags)) return newQDataStream(ret) } @@ -128,10 +134,6 @@ func (this *QDataStream) SetDevice(device *QIODevice) { C.QDataStream_SetDevice(this.h, device.cPointer()) } -func (this *QDataStream) UnsetDevice() { - C.QDataStream_UnsetDevice(this.h) -} - func (this *QDataStream) AtEnd() bool { return (bool)(C.QDataStream_AtEnd(this.h)) } @@ -173,7 +175,11 @@ func (this *QDataStream) SetVersion(version int) { } func (this *QDataStream) OperatorShiftRight(i *int8) { - C.QDataStream_OperatorShiftRight(this.h, (*C.schar)(unsafe.Pointer(i))) + C.QDataStream_OperatorShiftRight(this.h, (*C.char)(unsafe.Pointer(i))) +} + +func (this *QDataStream) OperatorShiftRightWithQint8(i *int8) { + C.QDataStream_OperatorShiftRightWithQint8(this.h, (*C.schar)(unsafe.Pointer(i))) } func (this *QDataStream) OperatorShiftRightWithQuint8(i *byte) { @@ -223,7 +229,11 @@ func (this *QDataStream) OperatorShiftRightWithStr(str string) { } func (this *QDataStream) OperatorShiftLeft(i int8) { - C.QDataStream_OperatorShiftLeft(this.h, (C.schar)(i)) + C.QDataStream_OperatorShiftLeft(this.h, (C.char)(i)) +} + +func (this *QDataStream) OperatorShiftLeftWithQint8(i int8) { + C.QDataStream_OperatorShiftLeftWithQint8(this.h, (C.schar)(i)) } func (this *QDataStream) OperatorShiftLeftWithQuint8(i byte) { @@ -316,6 +326,10 @@ func (this *QDataStream) AbortTransaction() { C.QDataStream_AbortTransaction(this.h) } +func (this *QDataStream) IsDeviceTransactionStarted() bool { + return (bool)(C.QDataStream_IsDeviceTransactionStarted(this.h)) +} + // Delete this object from C++ memory. func (this *QDataStream) Delete() { C.QDataStream_Delete(this.h) @@ -358,12 +372,6 @@ func NewQtPrivate__StreamStateSaver(s *QDataStream) *QtPrivate__StreamStateSaver return newQtPrivate__StreamStateSaver(ret) } -// NewQtPrivate__StreamStateSaver2 constructs a new QtPrivate::StreamStateSaver object. -func NewQtPrivate__StreamStateSaver2(param1 *QtPrivate__StreamStateSaver) *QtPrivate__StreamStateSaver { - ret := C.QtPrivate__StreamStateSaver_new2(param1.cPointer()) - return newQtPrivate__StreamStateSaver(ret) -} - // Delete this object from C++ memory. func (this *QtPrivate__StreamStateSaver) Delete() { C.QtPrivate__StreamStateSaver_Delete(this.h) diff --git a/qt/gen_qdatastream.h b/qt/gen_qdatastream.h index ac9982c..23e3826 100644 --- a/qt/gen_qdatastream.h +++ b/qt/gen_qdatastream.h @@ -35,7 +35,6 @@ QDataStream* QDataStream_new3(QByteArray* param1, int flags); QDataStream* QDataStream_new4(QByteArray* param1); QIODevice* QDataStream_Device(const QDataStream* self); void QDataStream_SetDevice(QDataStream* self, QIODevice* device); -void QDataStream_UnsetDevice(QDataStream* self); bool QDataStream_AtEnd(const QDataStream* self); int QDataStream_Status(const QDataStream* self); void QDataStream_SetStatus(QDataStream* self, int status); @@ -46,7 +45,8 @@ 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); +void QDataStream_OperatorShiftRight(QDataStream* self, char* i); +void QDataStream_OperatorShiftRightWithQint8(QDataStream* self, signed char* i); void QDataStream_OperatorShiftRightWithQuint8(QDataStream* self, unsigned char* i); void QDataStream_OperatorShiftRightWithQint16(QDataStream* self, int16_t* i); void QDataStream_OperatorShiftRightWithQuint16(QDataStream* self, uint16_t* i); @@ -58,7 +58,8 @@ void QDataStream_OperatorShiftRightWithBool(QDataStream* self, bool* i); void QDataStream_OperatorShiftRightWithFloat(QDataStream* self, float* f); void QDataStream_OperatorShiftRightWithDouble(QDataStream* self, double* f); void QDataStream_OperatorShiftRightWithStr(QDataStream* self, char* str); -void QDataStream_OperatorShiftLeft(QDataStream* self, signed char i); +void QDataStream_OperatorShiftLeft(QDataStream* self, char i); +void QDataStream_OperatorShiftLeftWithQint8(QDataStream* self, signed char i); void QDataStream_OperatorShiftLeftWithQuint8(QDataStream* self, unsigned char i); void QDataStream_OperatorShiftLeftWithQint16(QDataStream* self, int16_t i); void QDataStream_OperatorShiftLeftWithQuint16(QDataStream* self, uint16_t i); @@ -79,10 +80,10 @@ void QDataStream_StartTransaction(QDataStream* self); bool QDataStream_CommitTransaction(QDataStream* self); void QDataStream_RollbackTransaction(QDataStream* self); void QDataStream_AbortTransaction(QDataStream* self); +bool QDataStream_IsDeviceTransactionStarted(const QDataStream* self); void QDataStream_Delete(QDataStream* self); QtPrivate__StreamStateSaver* QtPrivate__StreamStateSaver_new(QDataStream* s); -QtPrivate__StreamStateSaver* QtPrivate__StreamStateSaver_new2(QtPrivate__StreamStateSaver* param1); void QtPrivate__StreamStateSaver_Delete(QtPrivate__StreamStateSaver* self); #ifdef __cplusplus diff --git a/qt/gen_qdatawidgetmapper.cpp b/qt/gen_qdatawidgetmapper.cpp index 19db662..7c18b1a 100644 --- a/qt/gen_qdatawidgetmapper.cpp +++ b/qt/gen_qdatawidgetmapper.cpp @@ -36,13 +36,6 @@ struct miqt_string* QDataWidgetMapper_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QDataWidgetMapper_TrUtf8(const char* s) { - QString _ret = QDataWidgetMapper::trUtf8(s); - // 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 QDataWidgetMapper_SetModel(QDataWidgetMapper* self, QAbstractItemModel* model) { self->setModel(model); } @@ -174,20 +167,6 @@ struct miqt_string* QDataWidgetMapper_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QDataWidgetMapper_TrUtf82(const char* s, const char* c) { - QString _ret = QDataWidgetMapper::trUtf8(s, c); - // 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* QDataWidgetMapper_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QDataWidgetMapper::trUtf8(s, c, static_cast(n)); - // 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 QDataWidgetMapper_Delete(QDataWidgetMapper* self) { delete self; } diff --git a/qt/gen_qdatawidgetmapper.go b/qt/gen_qdatawidgetmapper.go index 32fc8b0..44ee0a6 100644 --- a/qt/gen_qdatawidgetmapper.go +++ b/qt/gen_qdatawidgetmapper.go @@ -75,15 +75,6 @@ func QDataWidgetMapper_Tr(s string) string { return _ret } -func QDataWidgetMapper_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDataWidgetMapper_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QDataWidgetMapper) SetModel(model *QAbstractItemModel) { C.QDataWidgetMapper_SetModel(this.h, model.cPointer()) } @@ -236,28 +227,6 @@ func QDataWidgetMapper_Tr3(s string, c string, n int) string { return _ret } -func QDataWidgetMapper_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDataWidgetMapper_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QDataWidgetMapper_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDataWidgetMapper_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QDataWidgetMapper) Delete() { C.QDataWidgetMapper_Delete(this.h) diff --git a/qt/gen_qdatawidgetmapper.h b/qt/gen_qdatawidgetmapper.h index 460d566..83baa25 100644 --- a/qt/gen_qdatawidgetmapper.h +++ b/qt/gen_qdatawidgetmapper.h @@ -38,7 +38,6 @@ QDataWidgetMapper* QDataWidgetMapper_new2(QObject* parent); QMetaObject* QDataWidgetMapper_MetaObject(const QDataWidgetMapper* self); void* QDataWidgetMapper_Metacast(QDataWidgetMapper* self, const char* param1); struct miqt_string* QDataWidgetMapper_Tr(const char* s); -struct miqt_string* QDataWidgetMapper_TrUtf8(const char* s); void QDataWidgetMapper_SetModel(QDataWidgetMapper* self, QAbstractItemModel* model); QAbstractItemModel* QDataWidgetMapper_Model(const QDataWidgetMapper* self); void QDataWidgetMapper_SetItemDelegate(QDataWidgetMapper* self, QAbstractItemDelegate* delegate); @@ -69,8 +68,6 @@ void QDataWidgetMapper_CurrentIndexChanged(QDataWidgetMapper* self, int index); void QDataWidgetMapper_connect_CurrentIndexChanged(QDataWidgetMapper* self, void* slot); struct miqt_string* QDataWidgetMapper_Tr2(const char* s, const char* c); struct miqt_string* QDataWidgetMapper_Tr3(const char* s, const char* c, int n); -struct miqt_string* QDataWidgetMapper_TrUtf82(const char* s, const char* c); -struct miqt_string* QDataWidgetMapper_TrUtf83(const char* s, const char* c, int n); void QDataWidgetMapper_Delete(QDataWidgetMapper* self); #ifdef __cplusplus diff --git a/qt/gen_qdatetime.cpp b/qt/gen_qdatetime.cpp index 853236d..675ef7d 100644 --- a/qt/gen_qdatetime.cpp +++ b/qt/gen_qdatetime.cpp @@ -110,34 +110,6 @@ QDateTime* QDate_EndOfDayWithZone(const QDate* self, QTimeZone* zone) { return new QDateTime(self->endOfDay(*zone)); } -struct miqt_string* QDate_ShortMonthName(int month) { - QString _ret = QDate::shortMonthName(static_cast(month)); - // 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_ShortDayName(int weekday) { - QString _ret = QDate::shortDayName(static_cast(weekday)); - // 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_LongMonthName(int month) { - QString _ret = QDate::longMonthName(static_cast(month)); - // 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_LongDayName(int weekday) { - QString _ret = QDate::longDayName(static_cast(weekday)); - // 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_ToString(const QDate* self) { QString _ret = self->toString(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -145,13 +117,6 @@ struct miqt_string* QDate_ToString(const QDate* self) { return miqt_strdup(_b.data(), _b.length()); } -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(); - return miqt_strdup(_b.data(), _b.length()); -} - struct miqt_string* QDate_ToStringWithFormat(const QDate* self, struct miqt_string* format) { QString format_QString = QString::fromUtf8(&format->data, format->len); QString _ret = self->toString(format_QString); @@ -160,14 +125,6 @@ struct miqt_string* QDate_ToStringWithFormat(const QDate* self, struct miqt_stri return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QDate_ToString3(const QDate* self, struct miqt_string* format, QCalendar* cal) { - QString format_QString = QString::fromUtf8(&format->data, format->len); - QString _ret = self->toString(format_QString, *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()); -} - bool QDate_SetDate(QDate* self, int year, int month, int day) { return self->setDate(static_cast(year), static_cast(month), static_cast(day)); } @@ -176,11 +133,7 @@ bool QDate_SetDate2(QDate* self, int year, int month, int day, QCalendar* cal) { return self->setDate(static_cast(year), static_cast(month), static_cast(day), *cal); } -void QDate_GetDate(QDate* self, int* year, int* month, int* day) { - self->getDate(static_cast(year), static_cast(month), static_cast(day)); -} - -void QDate_GetDate2(const QDate* self, int* year, int* month, int* day) { +void QDate_GetDate(const QDate* self, int* year, int* month, int* day) { self->getDate(static_cast(year), static_cast(month), static_cast(day)); } @@ -204,54 +157,24 @@ QDate* QDate_AddYears2(const QDate* self, int years, QCalendar* cal) { return new QDate(self->addYears(static_cast(years), *cal)); } -long long QDate_DaysTo(const QDate* self, QDate* param1) { - qint64 _ret = self->daysTo(*param1); +long long QDate_DaysTo(const QDate* self, QDate* d) { + qint64 _ret = self->daysTo(*d); return static_cast(_ret); } -bool QDate_OperatorEqual(const QDate* self, QDate* other) { - return self->operator==(*other); -} - -bool QDate_OperatorNotEqual(const QDate* self, QDate* other) { - return self->operator!=(*other); -} - -bool QDate_OperatorLesser(const QDate* self, QDate* other) { - return self->operator<(*other); -} - -bool QDate_OperatorLesserOrEqual(const QDate* self, QDate* other) { - return self->operator<=(*other); -} - -bool QDate_OperatorGreater(const QDate* self, QDate* other) { - return self->operator>(*other); -} - -bool QDate_OperatorGreaterOrEqual(const QDate* self, QDate* other) { - return self->operator>=(*other); -} - QDate* QDate_CurrentDate() { return new QDate(QDate::currentDate()); } -QDate* QDate_FromString(struct miqt_string* s) { - QString s_QString = QString::fromUtf8(&s->data, s->len); - return new QDate(QDate::fromString(s_QString)); +QDate* QDate_FromStringWithStringVal(struct miqt_string* stringVal) { + QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); + return new QDate(QDate::fromString(stringVal_QString)); } -QDate* QDate_FromString2(struct miqt_string* s, struct miqt_string* format) { - QString s_QString = QString::fromUtf8(&s->data, s->len); +QDate* QDate_FromString4(struct miqt_string* stringVal, struct miqt_string* format) { + QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); QString format_QString = QString::fromUtf8(&format->data, format->len); - return new QDate(QDate::fromString(s_QString, format_QString)); -} - -QDate* QDate_FromString3(struct miqt_string* s, struct miqt_string* format, QCalendar* cal) { - QString s_QString = QString::fromUtf8(&s->data, s->len); - QString format_QString = QString::fromUtf8(&format->data, format->len); - return new QDate(QDate::fromString(s_QString, format_QString, *cal)); + return new QDate(QDate::fromString(stringVal_QString, format_QString)); } bool QDate_IsValid2(int y, int m, int d) { @@ -291,34 +214,6 @@ 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, 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, 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, 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, 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, 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 @@ -326,9 +221,23 @@ struct miqt_string* QDate_ToString1(const QDate* self, int format) { return miqt_strdup(_b.data(), _b.length()); } -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))); +struct miqt_string* QDate_ToString22(const QDate* self, struct miqt_string* format, QCalendar* cal) { + QString format_QString = QString::fromUtf8(&format->data, format->len); + QString _ret = self->toString(format_QString, *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()); +} + +QDate* QDate_FromString23(struct miqt_string* stringVal, int format) { + QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); + return new QDate(QDate::fromString(stringVal_QString, static_cast(format))); +} + +QDate* QDate_FromString34(struct miqt_string* stringVal, struct miqt_string* format, QCalendar* cal) { + QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); + QString format_QString = QString::fromUtf8(&format->data, format->len); + return new QDate(QDate::fromString(stringVal_QString, format_QString, *cal)); } void QDate_Delete(QDate* self) { @@ -402,40 +311,16 @@ QTime* QTime_AddSecs(const QTime* self, int secs) { return new QTime(self->addSecs(static_cast(secs))); } -int QTime_SecsTo(const QTime* self, QTime* param1) { - return self->secsTo(*param1); +int QTime_SecsTo(const QTime* self, QTime* t) { + return self->secsTo(*t); } QTime* QTime_AddMSecs(const QTime* self, int ms) { return new QTime(self->addMSecs(static_cast(ms))); } -int QTime_MsecsTo(const QTime* self, QTime* param1) { - return self->msecsTo(*param1); -} - -bool QTime_OperatorEqual(const QTime* self, QTime* other) { - return self->operator==(*other); -} - -bool QTime_OperatorNotEqual(const QTime* self, QTime* other) { - return self->operator!=(*other); -} - -bool QTime_OperatorLesser(const QTime* self, QTime* other) { - return self->operator<(*other); -} - -bool QTime_OperatorLesserOrEqual(const QTime* self, QTime* other) { - return self->operator<=(*other); -} - -bool QTime_OperatorGreater(const QTime* self, QTime* other) { - return self->operator>(*other); -} - -bool QTime_OperatorGreaterOrEqual(const QTime* self, QTime* other) { - return self->operator>=(*other); +int QTime_MsecsTo(const QTime* self, QTime* t) { + return self->msecsTo(*t); } QTime* QTime_FromMSecsSinceStartOfDay(int msecs) { @@ -450,33 +335,21 @@ QTime* QTime_CurrentTime() { return new QTime(QTime::currentTime()); } -QTime* QTime_FromString(struct miqt_string* s) { - QString s_QString = QString::fromUtf8(&s->data, s->len); - return new QTime(QTime::fromString(s_QString)); +QTime* QTime_FromStringWithStringVal(struct miqt_string* stringVal) { + QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); + return new QTime(QTime::fromString(stringVal_QString)); } -QTime* QTime_FromString2(struct miqt_string* s, struct miqt_string* format) { - QString s_QString = QString::fromUtf8(&s->data, s->len); +QTime* QTime_FromString4(struct miqt_string* stringVal, struct miqt_string* format) { + QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); QString format_QString = QString::fromUtf8(&format->data, format->len); - return new QTime(QTime::fromString(s_QString, format_QString)); + return new QTime(QTime::fromString(stringVal_QString, format_QString)); } bool QTime_IsValid2(int h, int m, int s) { return QTime::isValid(static_cast(h), static_cast(m), static_cast(s)); } -void QTime_Start(QTime* self) { - self->start(); -} - -int QTime_Restart(QTime* self) { - return self->restart(); -} - -int QTime_Elapsed(const QTime* self) { - return self->elapsed(); -} - 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 @@ -488,9 +361,9 @@ 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, int f) { - QString s_QString = QString::fromUtf8(&s->data, s->len); - return new QTime(QTime::fromString(s_QString, static_cast(f))); +QTime* QTime_FromString23(struct miqt_string* stringVal, int format) { + QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); + return new QTime(QTime::fromString(stringVal_QString, static_cast(format))); } bool QTime_IsValid4(int h, int m, int s, int ms) { @@ -501,28 +374,28 @@ void QTime_Delete(QTime* self) { delete self; } -QDateTime* QDateTime_new(QDate* param1) { - return new QDateTime(*param1); +QDateTime* QDateTime_new() { + return new QDateTime(); } -QDateTime* QDateTime_new2(QDate* param1, QTime* param2) { - return new QDateTime(*param1, *param2); +QDateTime* QDateTime_new2(QDate* date, QTime* time) { + return new QDateTime(*date, *time); } -QDateTime* QDateTime_new3(QDate* date, QTime* time, int spec, int offsetSeconds) { - return new QDateTime(*date, *time, static_cast(spec), static_cast(offsetSeconds)); -} - -QDateTime* QDateTime_new4(QDate* date, QTime* time, QTimeZone* timeZone) { +QDateTime* QDateTime_new3(QDate* date, QTime* time, QTimeZone* timeZone) { return new QDateTime(*date, *time, *timeZone); } -QDateTime* QDateTime_new5(QDateTime* other) { +QDateTime* QDateTime_new4(QDateTime* other) { return new QDateTime(*other); } -QDateTime* QDateTime_new6(QDate* param1, QTime* param2, int spec) { - return new QDateTime(*param1, *param2, static_cast(spec)); +QDateTime* QDateTime_new5(QDate* date, QTime* time, int spec) { + return new QDateTime(*date, *time, static_cast(spec)); +} + +QDateTime* QDateTime_new6(QDate* date, QTime* time, int spec, int offsetSeconds) { + return new QDateTime(*date, *time, static_cast(spec), static_cast(offsetSeconds)); } void QDateTime_OperatorAssign(QDateTime* self, QDateTime* other) { @@ -626,14 +499,6 @@ struct miqt_string* QDateTime_ToStringWithFormat(const QDateTime* self, struct m return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QDateTime_ToString2(const QDateTime* self, struct miqt_string* format, QCalendar* cal) { - QString format_QString = QString::fromUtf8(&format->data, format->len); - QString _ret = self->toString(format_QString, *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()); -} - QDateTime* QDateTime_AddDays(const QDateTime* self, long long days) { return new QDateTime(self->addDays(static_cast(days))); } @@ -689,38 +554,6 @@ long long QDateTime_MsecsTo(const QDateTime* self, QDateTime* param1) { return static_cast(_ret); } -bool QDateTime_OperatorEqual(const QDateTime* self, QDateTime* other) { - return self->operator==(*other); -} - -bool QDateTime_OperatorNotEqual(const QDateTime* self, QDateTime* other) { - return self->operator!=(*other); -} - -bool QDateTime_OperatorLesser(const QDateTime* self, QDateTime* other) { - return self->operator<(*other); -} - -bool QDateTime_OperatorLesserOrEqual(const QDateTime* self, QDateTime* other) { - return self->operator<=(*other); -} - -bool QDateTime_OperatorGreater(const QDateTime* self, QDateTime* other) { - return self->operator>(*other); -} - -bool QDateTime_OperatorGreaterOrEqual(const QDateTime* self, QDateTime* other) { - return self->operator>=(*other); -} - -void QDateTime_SetUtcOffset(QDateTime* self, int seconds) { - self->setUtcOffset(static_cast(seconds)); -} - -int QDateTime_UtcOffset(const QDateTime* self) { - return self->utcOffset(); -} - QDateTime* QDateTime_CurrentDateTime() { return new QDateTime(QDateTime::currentDateTime()); } @@ -729,57 +562,26 @@ QDateTime* QDateTime_CurrentDateTimeUtc() { return new QDateTime(QDateTime::currentDateTimeUtc()); } -QDateTime* QDateTime_FromString(struct miqt_string* s) { - QString s_QString = QString::fromUtf8(&s->data, s->len); - return new QDateTime(QDateTime::fromString(s_QString)); +QDateTime* QDateTime_FromStringWithStringVal(struct miqt_string* stringVal) { + QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); + return new QDateTime(QDateTime::fromString(stringVal_QString)); } -QDateTime* QDateTime_FromString2(struct miqt_string* s, struct miqt_string* format) { - QString s_QString = QString::fromUtf8(&s->data, s->len); +QDateTime* QDateTime_FromString4(struct miqt_string* stringVal, struct miqt_string* format) { + QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); QString format_QString = QString::fromUtf8(&format->data, format->len); - return new QDateTime(QDateTime::fromString(s_QString, format_QString)); -} - -QDateTime* QDateTime_FromString3(struct miqt_string* s, struct miqt_string* format, QCalendar* cal) { - QString s_QString = QString::fromUtf8(&s->data, s->len); - QString format_QString = QString::fromUtf8(&format->data, format->len); - return new QDateTime(QDateTime::fromString(s_QString, format_QString, *cal)); -} - -unsigned int QDateTime_ToTimeT(const QDateTime* self) { - uint _ret = self->toTime_t(); - return static_cast(_ret); -} - -void QDateTime_SetTimeT(QDateTime* self, unsigned int secsSince1Jan1970UTC) { - self->setTime_t(static_cast(secsSince1Jan1970UTC)); -} - -QDateTime* QDateTime_FromTimeT(unsigned int secsSince1Jan1970UTC) { - return new QDateTime(QDateTime::fromTime_t(static_cast(secsSince1Jan1970UTC))); -} - -QDateTime* QDateTime_FromTimeT2(unsigned int secsSince1Jan1970UTC, int spec) { - return new QDateTime(QDateTime::fromTime_t(static_cast(secsSince1Jan1970UTC), static_cast(spec))); -} - -QDateTime* QDateTime_FromTimeT3(unsigned int secsSince1Jan1970UTC, QTimeZone* timeZone) { - return new QDateTime(QDateTime::fromTime_t(static_cast(secsSince1Jan1970UTC), *timeZone)); + return new QDateTime(QDateTime::fromString(stringVal_QString, format_QString)); } QDateTime* QDateTime_FromMSecsSinceEpoch(long long msecs) { return new QDateTime(QDateTime::fromMSecsSinceEpoch(static_cast(msecs))); } -QDateTime* QDateTime_FromMSecsSinceEpoch2(long long msecs, int spec) { - return new QDateTime(QDateTime::fromMSecsSinceEpoch(static_cast(msecs), static_cast(spec))); -} - QDateTime* QDateTime_FromSecsSinceEpoch(long long secs) { return new QDateTime(QDateTime::fromSecsSinceEpoch(static_cast(secs))); } -QDateTime* QDateTime_FromMSecsSinceEpoch3(long long msecs, QTimeZone* timeZone) { +QDateTime* QDateTime_FromMSecsSinceEpoch2(long long msecs, QTimeZone* timeZone) { return new QDateTime(QDateTime::fromMSecsSinceEpoch(static_cast(msecs), *timeZone)); } @@ -804,25 +606,39 @@ struct miqt_string* QDateTime_ToString1(const QDateTime* self, int format) { return miqt_strdup(_b.data(), _b.length()); } -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))); +struct miqt_string* QDateTime_ToString22(const QDateTime* self, struct miqt_string* format, QCalendar* cal) { + QString format_QString = QString::fromUtf8(&format->data, format->len); + QString _ret = self->toString(format_QString, *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()); } -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_FromString23(struct miqt_string* stringVal, int format) { + QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); + return new QDateTime(QDateTime::fromString(stringVal_QString, static_cast(format))); } -QDateTime* QDateTime_FromMSecsSinceEpoch32(long long msecs, int spec, int offsetFromUtc) { +QDateTime* QDateTime_FromString34(struct miqt_string* stringVal, struct miqt_string* format, QCalendar* cal) { + QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); + QString format_QString = QString::fromUtf8(&format->data, format->len); + return new QDateTime(QDateTime::fromString(stringVal_QString, format_QString, *cal)); +} + +QDateTime* QDateTime_FromMSecsSinceEpoch22(long long msecs, int spec) { + return new QDateTime(QDateTime::fromMSecsSinceEpoch(static_cast(msecs), static_cast(spec))); +} + +QDateTime* QDateTime_FromMSecsSinceEpoch3(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, int spe) { - return new QDateTime(QDateTime::fromSecsSinceEpoch(static_cast(secs), static_cast(spe))); +QDateTime* QDateTime_FromSecsSinceEpoch22(long long secs, int spec) { + return new QDateTime(QDateTime::fromSecsSinceEpoch(static_cast(secs), static_cast(spec))); } -QDateTime* QDateTime_FromSecsSinceEpoch3(long long secs, int spe, int offsetFromUtc) { - return new QDateTime(QDateTime::fromSecsSinceEpoch(static_cast(secs), static_cast(spe), static_cast(offsetFromUtc))); +QDateTime* QDateTime_FromSecsSinceEpoch3(long long secs, int spec, int offsetFromUtc) { + return new QDateTime(QDateTime::fromSecsSinceEpoch(static_cast(secs), static_cast(spec), static_cast(offsetFromUtc))); } void QDateTime_Delete(QDateTime* self) { diff --git a/qt/gen_qdatetime.go b/qt/gen_qdatetime.go index c69fc7b..509b362 100644 --- a/qt/gen_qdatetime.go +++ b/qt/gen_qdatetime.go @@ -13,13 +13,6 @@ import ( "unsafe" ) -type QDate__MonthNameType int - -const ( - QDate__DateFormat QDate__MonthNameType = 0 - QDate__StandaloneFormat QDate__MonthNameType = 1 -) - type QDateTime__YearRange int const ( @@ -169,34 +162,6 @@ func (this *QDate) EndOfDayWithZone(zone *QTimeZone) *QDateTime { return _goptr } -func QDate_ShortMonthName(month int) string { - var _ms *C.struct_miqt_string = C.QDate_ShortMonthName((C.int)(month)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QDate_ShortDayName(weekday int) string { - var _ms *C.struct_miqt_string = C.QDate_ShortDayName((C.int)(weekday)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QDate_LongMonthName(month int) string { - var _ms *C.struct_miqt_string = C.QDate_LongMonthName((C.int)(month)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QDate_LongDayName(weekday int) string { - var _ms *C.struct_miqt_string = C.QDate_LongDayName((C.int)(weekday)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QDate) ToString() string { var _ms *C.struct_miqt_string = C.QDate_ToString(this.h) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) @@ -204,13 +169,6 @@ func (this *QDate) ToString() string { return _ret } -func (this *QDate) ToString2(format DateFormat, cal QCalendar) string { - 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 -} - func (this *QDate) ToStringWithFormat(format string) string { format_ms := miqt_strdupg(format) defer C.free(format_ms) @@ -220,15 +178,6 @@ func (this *QDate) ToStringWithFormat(format string) string { return _ret } -func (this *QDate) ToString3(format string, cal QCalendar) string { - format_ms := miqt_strdupg(format) - defer C.free(format_ms) - var _ms *C.struct_miqt_string = C.QDate_ToString3(this.h, (*C.struct_miqt_string)(format_ms), cal.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QDate) SetDate(year int, month int, day int) bool { return (bool)(C.QDate_SetDate(this.h, (C.int)(year), (C.int)(month), (C.int)(day))) } @@ -241,10 +190,6 @@ func (this *QDate) GetDate(year *int, month *int, day *int) { C.QDate_GetDate(this.h, (*C.int)(unsafe.Pointer(year)), (*C.int)(unsafe.Pointer(month)), (*C.int)(unsafe.Pointer(day))) } -func (this *QDate) GetDate2(year *int, month *int, day *int) { - C.QDate_GetDate2(this.h, (*C.int)(unsafe.Pointer(year)), (*C.int)(unsafe.Pointer(month)), (*C.int)(unsafe.Pointer(day))) -} - func (this *QDate) AddDays(days int64) *QDate { _ret := C.QDate_AddDays(this.h, (C.longlong)(days)) _goptr := newQDate(_ret) @@ -280,32 +225,8 @@ func (this *QDate) AddYears2(years int, cal QCalendar) *QDate { return _goptr } -func (this *QDate) DaysTo(param1 *QDate) int64 { - return (int64)(C.QDate_DaysTo(this.h, param1.cPointer())) -} - -func (this *QDate) OperatorEqual(other *QDate) bool { - return (bool)(C.QDate_OperatorEqual(this.h, other.cPointer())) -} - -func (this *QDate) OperatorNotEqual(other *QDate) bool { - return (bool)(C.QDate_OperatorNotEqual(this.h, other.cPointer())) -} - -func (this *QDate) OperatorLesser(other *QDate) bool { - return (bool)(C.QDate_OperatorLesser(this.h, other.cPointer())) -} - -func (this *QDate) OperatorLesserOrEqual(other *QDate) bool { - return (bool)(C.QDate_OperatorLesserOrEqual(this.h, other.cPointer())) -} - -func (this *QDate) OperatorGreater(other *QDate) bool { - return (bool)(C.QDate_OperatorGreater(this.h, other.cPointer())) -} - -func (this *QDate) OperatorGreaterOrEqual(other *QDate) bool { - return (bool)(C.QDate_OperatorGreaterOrEqual(this.h, other.cPointer())) +func (this *QDate) DaysTo(d QDate) int64 { + return (int64)(C.QDate_DaysTo(this.h, d.cPointer())) } func QDate_CurrentDate() *QDate { @@ -315,32 +236,21 @@ func QDate_CurrentDate() *QDate { return _goptr } -func QDate_FromString(s string) *QDate { - s_ms := miqt_strdupg(s) - defer C.free(s_ms) - _ret := C.QDate_FromString((*C.struct_miqt_string)(s_ms)) +func QDate_FromStringWithStringVal(stringVal string) *QDate { + stringVal_ms := miqt_strdupg(stringVal) + defer C.free(stringVal_ms) + _ret := C.QDate_FromStringWithStringVal((*C.struct_miqt_string)(stringVal_ms)) _goptr := newQDate(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QDate_FromString2(s string, format string) *QDate { - s_ms := miqt_strdupg(s) - defer C.free(s_ms) +func QDate_FromString4(stringVal string, format string) *QDate { + stringVal_ms := miqt_strdupg(stringVal) + defer C.free(stringVal_ms) format_ms := miqt_strdupg(format) defer C.free(format_ms) - _ret := C.QDate_FromString2((*C.struct_miqt_string)(s_ms), (*C.struct_miqt_string)(format_ms)) - _goptr := newQDate(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QDate_FromString3(s string, format string, cal QCalendar) *QDate { - s_ms := miqt_strdupg(s) - defer C.free(s_ms) - format_ms := miqt_strdupg(format) - defer C.free(format_ms) - _ret := C.QDate_FromString3((*C.struct_miqt_string)(s_ms), (*C.struct_miqt_string)(format_ms), cal.cPointer()) + _ret := C.QDate_FromString4((*C.struct_miqt_string)(stringVal_ms), (*C.struct_miqt_string)(format_ms)) _goptr := newQDate(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -397,34 +307,6 @@ func (this *QDate) EndOfDay2(spec TimeSpec, offsetSeconds int) *QDateTime { return _goptr } -func QDate_ShortMonthName2(month int, typeVal QDate__MonthNameType) string { - 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.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.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.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.int)(format)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) @@ -432,10 +314,30 @@ func (this *QDate) ToString1(format DateFormat) string { return _ret } -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.int)(f)) +func (this *QDate) ToString22(format string, cal QCalendar) string { + format_ms := miqt_strdupg(format) + defer C.free(format_ms) + var _ms *C.struct_miqt_string = C.QDate_ToString22(this.h, (*C.struct_miqt_string)(format_ms), cal.cPointer()) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + +func QDate_FromString23(stringVal string, format DateFormat) *QDate { + stringVal_ms := miqt_strdupg(stringVal) + defer C.free(stringVal_ms) + _ret := C.QDate_FromString23((*C.struct_miqt_string)(stringVal_ms), (C.int)(format)) + _goptr := newQDate(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func QDate_FromString34(stringVal string, format string, cal QCalendar) *QDate { + stringVal_ms := miqt_strdupg(stringVal) + defer C.free(stringVal_ms) + format_ms := miqt_strdupg(format) + defer C.free(format_ms) + _ret := C.QDate_FromString34((*C.struct_miqt_string)(stringVal_ms), (*C.struct_miqt_string)(format_ms), cal.cPointer()) _goptr := newQDate(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -558,8 +460,8 @@ func (this *QTime) AddSecs(secs int) *QTime { return _goptr } -func (this *QTime) SecsTo(param1 *QTime) int { - return (int)(C.QTime_SecsTo(this.h, param1.cPointer())) +func (this *QTime) SecsTo(t QTime) int { + return (int)(C.QTime_SecsTo(this.h, t.cPointer())) } func (this *QTime) AddMSecs(ms int) *QTime { @@ -569,32 +471,8 @@ func (this *QTime) AddMSecs(ms int) *QTime { return _goptr } -func (this *QTime) MsecsTo(param1 *QTime) int { - return (int)(C.QTime_MsecsTo(this.h, param1.cPointer())) -} - -func (this *QTime) OperatorEqual(other *QTime) bool { - return (bool)(C.QTime_OperatorEqual(this.h, other.cPointer())) -} - -func (this *QTime) OperatorNotEqual(other *QTime) bool { - return (bool)(C.QTime_OperatorNotEqual(this.h, other.cPointer())) -} - -func (this *QTime) OperatorLesser(other *QTime) bool { - return (bool)(C.QTime_OperatorLesser(this.h, other.cPointer())) -} - -func (this *QTime) OperatorLesserOrEqual(other *QTime) bool { - return (bool)(C.QTime_OperatorLesserOrEqual(this.h, other.cPointer())) -} - -func (this *QTime) OperatorGreater(other *QTime) bool { - return (bool)(C.QTime_OperatorGreater(this.h, other.cPointer())) -} - -func (this *QTime) OperatorGreaterOrEqual(other *QTime) bool { - return (bool)(C.QTime_OperatorGreaterOrEqual(this.h, other.cPointer())) +func (this *QTime) MsecsTo(t QTime) int { + return (int)(C.QTime_MsecsTo(this.h, t.cPointer())) } func QTime_FromMSecsSinceStartOfDay(msecs int) *QTime { @@ -615,21 +493,21 @@ func QTime_CurrentTime() *QTime { return _goptr } -func QTime_FromString(s string) *QTime { - s_ms := miqt_strdupg(s) - defer C.free(s_ms) - _ret := C.QTime_FromString((*C.struct_miqt_string)(s_ms)) +func QTime_FromStringWithStringVal(stringVal string) *QTime { + stringVal_ms := miqt_strdupg(stringVal) + defer C.free(stringVal_ms) + _ret := C.QTime_FromStringWithStringVal((*C.struct_miqt_string)(stringVal_ms)) _goptr := newQTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QTime_FromString2(s string, format string) *QTime { - s_ms := miqt_strdupg(s) - defer C.free(s_ms) +func QTime_FromString4(stringVal string, format string) *QTime { + stringVal_ms := miqt_strdupg(stringVal) + defer C.free(stringVal_ms) format_ms := miqt_strdupg(format) defer C.free(format_ms) - _ret := C.QTime_FromString2((*C.struct_miqt_string)(s_ms), (*C.struct_miqt_string)(format_ms)) + _ret := C.QTime_FromString4((*C.struct_miqt_string)(stringVal_ms), (*C.struct_miqt_string)(format_ms)) _goptr := newQTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -639,18 +517,6 @@ func QTime_IsValid2(h int, m int, s int) bool { return (bool)(C.QTime_IsValid2((C.int)(h), (C.int)(m), (C.int)(s))) } -func (this *QTime) Start() { - C.QTime_Start(this.h) -} - -func (this *QTime) Restart() int { - return (int)(C.QTime_Restart(this.h)) -} - -func (this *QTime) Elapsed() int { - return (int)(C.QTime_Elapsed(this.h)) -} - func (this *QTime) ToString1(f DateFormat) string { var _ms *C.struct_miqt_string = C.QTime_ToString1(this.h, (C.int)(f)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) @@ -662,10 +528,10 @@ func (this *QTime) SetHMS4(h int, m int, s int, ms int) bool { return (bool)(C.QTime_SetHMS4(this.h, (C.int)(h), (C.int)(m), (C.int)(s), (C.int)(ms))) } -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.int)(f)) +func QTime_FromString23(stringVal string, format DateFormat) *QTime { + stringVal_ms := miqt_strdupg(stringVal) + defer C.free(stringVal_ms) + _ret := C.QTime_FromString23((*C.struct_miqt_string)(stringVal_ms), (C.int)(format)) _goptr := newQTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -712,38 +578,38 @@ func newQDateTime_U(h unsafe.Pointer) *QDateTime { } // NewQDateTime constructs a new QDateTime object. -func NewQDateTime(param1 *QDate) *QDateTime { - ret := C.QDateTime_new(param1.cPointer()) +func NewQDateTime() *QDateTime { + ret := C.QDateTime_new() return newQDateTime(ret) } // NewQDateTime2 constructs a new QDateTime object. -func NewQDateTime2(param1 *QDate, param2 *QTime) *QDateTime { - ret := C.QDateTime_new2(param1.cPointer(), param2.cPointer()) +func NewQDateTime2(date QDate, time QTime) *QDateTime { + ret := C.QDateTime_new2(date.cPointer(), time.cPointer()) return newQDateTime(ret) } // 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.int)(spec), (C.int)(offsetSeconds)) +func NewQDateTime3(date QDate, time QTime, timeZone *QTimeZone) *QDateTime { + ret := C.QDateTime_new3(date.cPointer(), time.cPointer(), timeZone.cPointer()) return newQDateTime(ret) } // NewQDateTime4 constructs a new QDateTime object. -func NewQDateTime4(date *QDate, time *QTime, timeZone *QTimeZone) *QDateTime { - ret := C.QDateTime_new4(date.cPointer(), time.cPointer(), timeZone.cPointer()) +func NewQDateTime4(other *QDateTime) *QDateTime { + ret := C.QDateTime_new4(other.cPointer()) return newQDateTime(ret) } // NewQDateTime5 constructs a new QDateTime object. -func NewQDateTime5(other *QDateTime) *QDateTime { - ret := C.QDateTime_new5(other.cPointer()) +func NewQDateTime5(date QDate, time QTime, spec TimeSpec) *QDateTime { + ret := C.QDateTime_new5(date.cPointer(), time.cPointer(), (C.int)(spec)) return newQDateTime(ret) } // NewQDateTime6 constructs a new QDateTime object. -func NewQDateTime6(param1 *QDate, param2 *QTime, spec TimeSpec) *QDateTime { - ret := C.QDateTime_new6(param1.cPointer(), param2.cPointer(), (C.int)(spec)) +func NewQDateTime6(date QDate, time QTime, spec TimeSpec, offsetSeconds int) *QDateTime { + ret := C.QDateTime_new6(date.cPointer(), time.cPointer(), (C.int)(spec), (C.int)(offsetSeconds)) return newQDateTime(ret) } @@ -811,11 +677,11 @@ func (this *QDateTime) ToSecsSinceEpoch() int64 { return (int64)(C.QDateTime_ToSecsSinceEpoch(this.h)) } -func (this *QDateTime) SetDate(date *QDate) { +func (this *QDateTime) SetDate(date QDate) { C.QDateTime_SetDate(this.h, date.cPointer()) } -func (this *QDateTime) SetTime(time *QTime) { +func (this *QDateTime) SetTime(time QTime) { C.QDateTime_SetTime(this.h, time.cPointer()) } @@ -855,15 +721,6 @@ func (this *QDateTime) ToStringWithFormat(format string) string { return _ret } -func (this *QDateTime) ToString2(format string, cal QCalendar) string { - format_ms := miqt_strdupg(format) - defer C.free(format_ms) - var _ms *C.struct_miqt_string = C.QDateTime_ToString2(this.h, (*C.struct_miqt_string)(format_ms), cal.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QDateTime) AddDays(days int64) *QDateTime { _ret := C.QDateTime_AddDays(this.h, (C.longlong)(days)) _goptr := newQDateTime(_ret) @@ -946,38 +803,6 @@ func (this *QDateTime) MsecsTo(param1 *QDateTime) int64 { return (int64)(C.QDateTime_MsecsTo(this.h, param1.cPointer())) } -func (this *QDateTime) OperatorEqual(other *QDateTime) bool { - return (bool)(C.QDateTime_OperatorEqual(this.h, other.cPointer())) -} - -func (this *QDateTime) OperatorNotEqual(other *QDateTime) bool { - return (bool)(C.QDateTime_OperatorNotEqual(this.h, other.cPointer())) -} - -func (this *QDateTime) OperatorLesser(other *QDateTime) bool { - return (bool)(C.QDateTime_OperatorLesser(this.h, other.cPointer())) -} - -func (this *QDateTime) OperatorLesserOrEqual(other *QDateTime) bool { - return (bool)(C.QDateTime_OperatorLesserOrEqual(this.h, other.cPointer())) -} - -func (this *QDateTime) OperatorGreater(other *QDateTime) bool { - return (bool)(C.QDateTime_OperatorGreater(this.h, other.cPointer())) -} - -func (this *QDateTime) OperatorGreaterOrEqual(other *QDateTime) bool { - return (bool)(C.QDateTime_OperatorGreaterOrEqual(this.h, other.cPointer())) -} - -func (this *QDateTime) SetUtcOffset(seconds int) { - C.QDateTime_SetUtcOffset(this.h, (C.int)(seconds)) -} - -func (this *QDateTime) UtcOffset() int { - return (int)(C.QDateTime_UtcOffset(this.h)) -} - func QDateTime_CurrentDateTime() *QDateTime { _ret := C.QDateTime_CurrentDateTime() _goptr := newQDateTime(_ret) @@ -992,61 +817,21 @@ func QDateTime_CurrentDateTimeUtc() *QDateTime { return _goptr } -func QDateTime_FromString(s string) *QDateTime { - s_ms := miqt_strdupg(s) - defer C.free(s_ms) - _ret := C.QDateTime_FromString((*C.struct_miqt_string)(s_ms)) +func QDateTime_FromStringWithStringVal(stringVal string) *QDateTime { + stringVal_ms := miqt_strdupg(stringVal) + defer C.free(stringVal_ms) + _ret := C.QDateTime_FromStringWithStringVal((*C.struct_miqt_string)(stringVal_ms)) _goptr := newQDateTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QDateTime_FromString2(s string, format string) *QDateTime { - s_ms := miqt_strdupg(s) - defer C.free(s_ms) +func QDateTime_FromString4(stringVal string, format string) *QDateTime { + stringVal_ms := miqt_strdupg(stringVal) + defer C.free(stringVal_ms) format_ms := miqt_strdupg(format) defer C.free(format_ms) - _ret := C.QDateTime_FromString2((*C.struct_miqt_string)(s_ms), (*C.struct_miqt_string)(format_ms)) - _goptr := newQDateTime(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QDateTime_FromString3(s string, format string, cal QCalendar) *QDateTime { - s_ms := miqt_strdupg(s) - defer C.free(s_ms) - format_ms := miqt_strdupg(format) - defer C.free(format_ms) - _ret := C.QDateTime_FromString3((*C.struct_miqt_string)(s_ms), (*C.struct_miqt_string)(format_ms), cal.cPointer()) - _goptr := newQDateTime(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QDateTime) ToTimeT() uint { - return (uint)(C.QDateTime_ToTimeT(this.h)) -} - -func (this *QDateTime) SetTimeT(secsSince1Jan1970UTC uint) { - C.QDateTime_SetTimeT(this.h, (C.uint)(secsSince1Jan1970UTC)) -} - -func QDateTime_FromTimeT(secsSince1Jan1970UTC uint) *QDateTime { - _ret := C.QDateTime_FromTimeT((C.uint)(secsSince1Jan1970UTC)) - _goptr := newQDateTime(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QDateTime_FromTimeT2(secsSince1Jan1970UTC uint, spec TimeSpec) *QDateTime { - _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 -} - -func QDateTime_FromTimeT3(secsSince1Jan1970UTC uint, timeZone *QTimeZone) *QDateTime { - _ret := C.QDateTime_FromTimeT3((C.uint)(secsSince1Jan1970UTC), timeZone.cPointer()) + _ret := C.QDateTime_FromString4((*C.struct_miqt_string)(stringVal_ms), (*C.struct_miqt_string)(format_ms)) _goptr := newQDateTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -1059,13 +844,6 @@ func QDateTime_FromMSecsSinceEpoch(msecs int64) *QDateTime { return _goptr } -func QDateTime_FromMSecsSinceEpoch2(msecs int64, spec TimeSpec) *QDateTime { - _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 -} - func QDateTime_FromSecsSinceEpoch(secs int64) *QDateTime { _ret := C.QDateTime_FromSecsSinceEpoch((C.longlong)(secs)) _goptr := newQDateTime(_ret) @@ -1073,8 +851,8 @@ func QDateTime_FromSecsSinceEpoch(secs int64) *QDateTime { return _goptr } -func QDateTime_FromMSecsSinceEpoch3(msecs int64, timeZone *QTimeZone) *QDateTime { - _ret := C.QDateTime_FromMSecsSinceEpoch3((C.longlong)(msecs), timeZone.cPointer()) +func QDateTime_FromMSecsSinceEpoch2(msecs int64, timeZone *QTimeZone) *QDateTime { + _ret := C.QDateTime_FromMSecsSinceEpoch2((C.longlong)(msecs), timeZone.cPointer()) _goptr := newQDateTime(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -1102,38 +880,58 @@ func (this *QDateTime) ToString1(format DateFormat) string { return _ret } -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.int)(f)) +func (this *QDateTime) ToString22(format string, cal QCalendar) string { + format_ms := miqt_strdupg(format) + defer C.free(format_ms) + var _ms *C.struct_miqt_string = C.QDateTime_ToString22(this.h, (*C.struct_miqt_string)(format_ms), cal.cPointer()) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + +func QDateTime_FromString23(stringVal string, format DateFormat) *QDateTime { + stringVal_ms := miqt_strdupg(stringVal) + defer C.free(stringVal_ms) + _ret := C.QDateTime_FromString23((*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 QDateTime_FromTimeT32(secsSince1Jan1970UTC uint, spec TimeSpec, offsetFromUtc int) *QDateTime { - _ret := C.QDateTime_FromTimeT32((C.uint)(secsSince1Jan1970UTC), (C.int)(spec), (C.int)(offsetFromUtc)) +func QDateTime_FromString34(stringVal string, format string, cal QCalendar) *QDateTime { + stringVal_ms := miqt_strdupg(stringVal) + defer C.free(stringVal_ms) + format_ms := miqt_strdupg(format) + defer C.free(format_ms) + _ret := C.QDateTime_FromString34((*C.struct_miqt_string)(stringVal_ms), (*C.struct_miqt_string)(format_ms), cal.cPointer()) _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.int)(spec), (C.int)(offsetFromUtc)) +func QDateTime_FromMSecsSinceEpoch22(msecs int64, spec TimeSpec) *QDateTime { + _ret := C.QDateTime_FromMSecsSinceEpoch22((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 } -func QDateTime_FromSecsSinceEpoch22(secs int64, spe TimeSpec) *QDateTime { - _ret := C.QDateTime_FromSecsSinceEpoch22((C.longlong)(secs), (C.int)(spe)) +func QDateTime_FromMSecsSinceEpoch3(msecs int64, spec TimeSpec, offsetFromUtc int) *QDateTime { + _ret := C.QDateTime_FromMSecsSinceEpoch3((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_FromSecsSinceEpoch3(secs int64, spe TimeSpec, offsetFromUtc int) *QDateTime { - _ret := C.QDateTime_FromSecsSinceEpoch3((C.longlong)(secs), (C.int)(spe), (C.int)(offsetFromUtc)) +func QDateTime_FromSecsSinceEpoch22(secs int64, spec TimeSpec) *QDateTime { + _ret := C.QDateTime_FromSecsSinceEpoch22((C.longlong)(secs), (C.int)(spec)) + _goptr := newQDateTime(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func QDateTime_FromSecsSinceEpoch3(secs int64, spec TimeSpec, offsetFromUtc int) *QDateTime { + _ret := C.QDateTime_FromSecsSinceEpoch3((C.longlong)(secs), (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 diff --git a/qt/gen_qdatetime.h b/qt/gen_qdatetime.h index 99d5dd0..c3d1c54 100644 --- a/qt/gen_qdatetime.h +++ b/qt/gen_qdatetime.h @@ -52,34 +52,20 @@ QDateTime* QDate_StartOfDay(const QDate* self); QDateTime* QDate_EndOfDay(const QDate* self); QDateTime* QDate_StartOfDayWithZone(const QDate* self, QTimeZone* zone); QDateTime* QDate_EndOfDayWithZone(const QDate* self, QTimeZone* zone); -struct miqt_string* QDate_ShortMonthName(int month); -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, 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); bool QDate_SetDate2(QDate* self, int year, int month, int day, QCalendar* cal); -void QDate_GetDate(QDate* self, int* year, int* month, int* day); -void QDate_GetDate2(const QDate* self, int* year, int* month, int* day); +void QDate_GetDate(const QDate* self, int* year, int* month, int* day); QDate* QDate_AddDays(const QDate* self, long long days); QDate* QDate_AddMonths(const QDate* self, int months); QDate* QDate_AddYears(const QDate* self, int years); QDate* QDate_AddMonths2(const QDate* self, int months, QCalendar* cal); QDate* QDate_AddYears2(const QDate* self, int years, QCalendar* cal); -long long QDate_DaysTo(const QDate* self, QDate* param1); -bool QDate_OperatorEqual(const QDate* self, QDate* other); -bool QDate_OperatorNotEqual(const QDate* self, QDate* other); -bool QDate_OperatorLesser(const QDate* self, QDate* other); -bool QDate_OperatorLesserOrEqual(const QDate* self, QDate* other); -bool QDate_OperatorGreater(const QDate* self, QDate* other); -bool QDate_OperatorGreaterOrEqual(const QDate* self, QDate* other); +long long QDate_DaysTo(const QDate* self, QDate* d); QDate* QDate_CurrentDate(); -QDate* QDate_FromString(struct miqt_string* s); -QDate* QDate_FromString2(struct miqt_string* s, struct miqt_string* format); -QDate* QDate_FromString3(struct miqt_string* s, struct miqt_string* format, QCalendar* cal); +QDate* QDate_FromStringWithStringVal(struct miqt_string* stringVal); +QDate* QDate_FromString4(struct miqt_string* stringVal, struct miqt_string* format); bool QDate_IsValid2(int y, int m, int d); bool QDate_IsLeapYear(int year); QDate* QDate_FromJulianDay(long long jd_); @@ -89,12 +75,10 @@ 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); +struct miqt_string* QDate_ToString22(const QDate* self, struct miqt_string* format, QCalendar* cal); +QDate* QDate_FromString23(struct miqt_string* stringVal, int format); +QDate* QDate_FromString34(struct miqt_string* stringVal, struct miqt_string* format, QCalendar* cal); void QDate_Delete(QDate* self); QTime* QTime_new(); @@ -112,36 +96,27 @@ struct miqt_string* QTime_ToString(const QTime* self); struct miqt_string* QTime_ToStringWithFormat(const QTime* self, struct miqt_string* format); bool QTime_SetHMS(QTime* self, int h, int m, int s); QTime* QTime_AddSecs(const QTime* self, int secs); -int QTime_SecsTo(const QTime* self, QTime* param1); +int QTime_SecsTo(const QTime* self, QTime* t); QTime* QTime_AddMSecs(const QTime* self, int ms); -int QTime_MsecsTo(const QTime* self, QTime* param1); -bool QTime_OperatorEqual(const QTime* self, QTime* other); -bool QTime_OperatorNotEqual(const QTime* self, QTime* other); -bool QTime_OperatorLesser(const QTime* self, QTime* other); -bool QTime_OperatorLesserOrEqual(const QTime* self, QTime* other); -bool QTime_OperatorGreater(const QTime* self, QTime* other); -bool QTime_OperatorGreaterOrEqual(const QTime* self, QTime* other); +int QTime_MsecsTo(const QTime* self, QTime* t); QTime* QTime_FromMSecsSinceStartOfDay(int msecs); int QTime_MsecsSinceStartOfDay(const QTime* self); QTime* QTime_CurrentTime(); -QTime* QTime_FromString(struct miqt_string* s); -QTime* QTime_FromString2(struct miqt_string* s, struct miqt_string* format); +QTime* QTime_FromStringWithStringVal(struct miqt_string* stringVal); +QTime* QTime_FromString4(struct miqt_string* stringVal, struct miqt_string* format); 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, int f); bool QTime_SetHMS4(QTime* self, int h, int m, int s, int ms); -QTime* QTime_FromString22(struct miqt_string* s, int f); +QTime* QTime_FromString23(struct miqt_string* stringVal, int format); 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, 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, int spec); +QDateTime* QDateTime_new(); +QDateTime* QDateTime_new2(QDate* date, QTime* time); +QDateTime* QDateTime_new3(QDate* date, QTime* time, QTimeZone* timeZone); +QDateTime* QDateTime_new4(QDateTime* other); +QDateTime* QDateTime_new5(QDate* date, QTime* time, int spec); +QDateTime* QDateTime_new6(QDate* date, QTime* time, int spec, int offsetSeconds); void QDateTime_OperatorAssign(QDateTime* self, QDateTime* other); void QDateTime_Swap(QDateTime* self, QDateTime* other); bool QDateTime_IsNull(const QDateTime* self); @@ -164,7 +139,6 @@ void QDateTime_SetMSecsSinceEpoch(QDateTime* self, long long msecs); void QDateTime_SetSecsSinceEpoch(QDateTime* self, long long secs); struct miqt_string* QDateTime_ToString(const QDateTime* self); struct miqt_string* QDateTime_ToStringWithFormat(const QDateTime* self, struct miqt_string* format); -struct miqt_string* QDateTime_ToString2(const QDateTime* self, struct miqt_string* format, QCalendar* cal); QDateTime* QDateTime_AddDays(const QDateTime* self, long long days); QDateTime* QDateTime_AddMonths(const QDateTime* self, int months); QDateTime* QDateTime_AddYears(const QDateTime* self, int years); @@ -178,37 +152,24 @@ QDateTime* QDateTime_ToTimeZone(const QDateTime* self, QTimeZone* toZone); long long QDateTime_DaysTo(const QDateTime* self, QDateTime* param1); long long QDateTime_SecsTo(const QDateTime* self, QDateTime* param1); long long QDateTime_MsecsTo(const QDateTime* self, QDateTime* param1); -bool QDateTime_OperatorEqual(const QDateTime* self, QDateTime* other); -bool QDateTime_OperatorNotEqual(const QDateTime* self, QDateTime* other); -bool QDateTime_OperatorLesser(const QDateTime* self, QDateTime* other); -bool QDateTime_OperatorLesserOrEqual(const QDateTime* self, QDateTime* other); -bool QDateTime_OperatorGreater(const QDateTime* self, QDateTime* other); -bool QDateTime_OperatorGreaterOrEqual(const QDateTime* self, QDateTime* other); -void QDateTime_SetUtcOffset(QDateTime* self, int seconds); -int QDateTime_UtcOffset(const QDateTime* self); QDateTime* QDateTime_CurrentDateTime(); QDateTime* QDateTime_CurrentDateTimeUtc(); -QDateTime* QDateTime_FromString(struct miqt_string* s); -QDateTime* QDateTime_FromString2(struct miqt_string* s, struct miqt_string* format); -QDateTime* QDateTime_FromString3(struct miqt_string* s, struct miqt_string* format, QCalendar* cal); -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, int spec); -QDateTime* QDateTime_FromTimeT3(unsigned int secsSince1Jan1970UTC, QTimeZone* timeZone); +QDateTime* QDateTime_FromStringWithStringVal(struct miqt_string* stringVal); +QDateTime* QDateTime_FromString4(struct miqt_string* stringVal, struct miqt_string* format); QDateTime* QDateTime_FromMSecsSinceEpoch(long long msecs); -QDateTime* QDateTime_FromMSecsSinceEpoch2(long long msecs, int spec); QDateTime* QDateTime_FromSecsSinceEpoch(long long secs); -QDateTime* QDateTime_FromMSecsSinceEpoch3(long long msecs, QTimeZone* timeZone); +QDateTime* QDateTime_FromMSecsSinceEpoch2(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, 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); +struct miqt_string* QDateTime_ToString22(const QDateTime* self, struct miqt_string* format, QCalendar* cal); +QDateTime* QDateTime_FromString23(struct miqt_string* stringVal, int format); +QDateTime* QDateTime_FromString34(struct miqt_string* stringVal, struct miqt_string* format, QCalendar* cal); +QDateTime* QDateTime_FromMSecsSinceEpoch22(long long msecs, int spec); +QDateTime* QDateTime_FromMSecsSinceEpoch3(long long msecs, int spec, int offsetFromUtc); +QDateTime* QDateTime_FromSecsSinceEpoch22(long long secs, int spec); +QDateTime* QDateTime_FromSecsSinceEpoch3(long long secs, int spec, int offsetFromUtc); void QDateTime_Delete(QDateTime* self); #ifdef __cplusplus diff --git a/qt/gen_qdatetimeedit.cpp b/qt/gen_qdatetimeedit.cpp index b60e478..9169dd1 100644 --- a/qt/gen_qdatetimeedit.cpp +++ b/qt/gen_qdatetimeedit.cpp @@ -64,13 +64,6 @@ struct miqt_string* QDateTimeEdit_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QDateTimeEdit_TrUtf8(const char* s) { - QString _ret = QDateTimeEdit::trUtf8(s); - // 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* QDateTimeEdit_DateTime(const QDateTimeEdit* self) { return new QDateTime(self->dateTime()); } @@ -288,10 +281,8 @@ void QDateTimeEdit_TimeChanged(QDateTimeEdit* self, QTime* time) { } void QDateTimeEdit_connect_TimeChanged(QDateTimeEdit* self, void* slot) { - QDateTimeEdit::connect(self, static_cast(&QDateTimeEdit::timeChanged), self, [=](const QTime& time) { - const QTime& time_ret = time; - // Cast returned reference into pointer - QTime* sigval1 = const_cast(&time_ret); + QDateTimeEdit::connect(self, static_cast(&QDateTimeEdit::timeChanged), self, [=](QTime time) { + QTime* sigval1 = new QTime(time); miqt_exec_callback_QDateTimeEdit_TimeChanged(slot, sigval1); }); } @@ -301,10 +292,8 @@ void QDateTimeEdit_DateChanged(QDateTimeEdit* self, QDate* date) { } void QDateTimeEdit_connect_DateChanged(QDateTimeEdit* self, void* slot) { - QDateTimeEdit::connect(self, static_cast(&QDateTimeEdit::dateChanged), self, [=](const QDate& date) { - const QDate& date_ret = date; - // Cast returned reference into pointer - QDate* sigval1 = const_cast(&date_ret); + QDateTimeEdit::connect(self, static_cast(&QDateTimeEdit::dateChanged), self, [=](QDate date) { + QDate* sigval1 = new QDate(date); miqt_exec_callback_QDateTimeEdit_DateChanged(slot, sigval1); }); } @@ -335,20 +324,6 @@ struct miqt_string* QDateTimeEdit_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QDateTimeEdit_TrUtf82(const char* s, const char* c) { - QString _ret = QDateTimeEdit::trUtf8(s, c); - // 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* QDateTimeEdit_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QDateTimeEdit::trUtf8(s, c, static_cast(n)); - // 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 QDateTimeEdit_Delete(QDateTimeEdit* self) { delete self; } @@ -384,22 +359,13 @@ struct miqt_string* QTimeEdit_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTimeEdit_TrUtf8(const char* s) { - QString _ret = QTimeEdit::trUtf8(s); - // 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 QTimeEdit_UserTimeChanged(QTimeEdit* self, QTime* time) { self->userTimeChanged(*time); } void QTimeEdit_connect_UserTimeChanged(QTimeEdit* self, void* slot) { - QTimeEdit::connect(self, static_cast(&QTimeEdit::userTimeChanged), self, [=](const QTime& time) { - const QTime& time_ret = time; - // Cast returned reference into pointer - QTime* sigval1 = const_cast(&time_ret); + QTimeEdit::connect(self, static_cast(&QTimeEdit::userTimeChanged), self, [=](QTime time) { + QTime* sigval1 = new QTime(time); miqt_exec_callback_QTimeEdit_UserTimeChanged(slot, sigval1); }); } @@ -418,20 +384,6 @@ struct miqt_string* QTimeEdit_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTimeEdit_TrUtf82(const char* s, const char* c) { - QString _ret = QTimeEdit::trUtf8(s, c); - // 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* QTimeEdit_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QTimeEdit::trUtf8(s, c, static_cast(n)); - // 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 QTimeEdit_Delete(QTimeEdit* self) { delete self; } @@ -467,22 +419,13 @@ struct miqt_string* QDateEdit_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QDateEdit_TrUtf8(const char* s) { - QString _ret = QDateEdit::trUtf8(s); - // 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 QDateEdit_UserDateChanged(QDateEdit* self, QDate* date) { self->userDateChanged(*date); } void QDateEdit_connect_UserDateChanged(QDateEdit* self, void* slot) { - QDateEdit::connect(self, static_cast(&QDateEdit::userDateChanged), self, [=](const QDate& date) { - const QDate& date_ret = date; - // Cast returned reference into pointer - QDate* sigval1 = const_cast(&date_ret); + QDateEdit::connect(self, static_cast(&QDateEdit::userDateChanged), self, [=](QDate date) { + QDate* sigval1 = new QDate(date); miqt_exec_callback_QDateEdit_UserDateChanged(slot, sigval1); }); } @@ -501,20 +444,6 @@ struct miqt_string* QDateEdit_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QDateEdit_TrUtf82(const char* s, const char* c) { - QString _ret = QDateEdit::trUtf8(s, c); - // 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* QDateEdit_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QDateEdit::trUtf8(s, c, static_cast(n)); - // 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 QDateEdit_Delete(QDateEdit* self) { delete self; } diff --git a/qt/gen_qdatetimeedit.go b/qt/gen_qdatetimeedit.go index 35d2da2..fd0ffd8 100644 --- a/qt/gen_qdatetimeedit.go +++ b/qt/gen_qdatetimeedit.go @@ -66,13 +66,13 @@ func NewQDateTimeEdit2(dt *QDateTime) *QDateTimeEdit { } // NewQDateTimeEdit3 constructs a new QDateTimeEdit object. -func NewQDateTimeEdit3(d *QDate) *QDateTimeEdit { +func NewQDateTimeEdit3(d QDate) *QDateTimeEdit { ret := C.QDateTimeEdit_new3(d.cPointer()) return newQDateTimeEdit(ret) } // NewQDateTimeEdit4 constructs a new QDateTimeEdit object. -func NewQDateTimeEdit4(t *QTime) *QDateTimeEdit { +func NewQDateTimeEdit4(t QTime) *QDateTimeEdit { ret := C.QDateTimeEdit_new4(t.cPointer()) return newQDateTimeEdit(ret) } @@ -90,13 +90,13 @@ func NewQDateTimeEdit6(dt *QDateTime, parent *QWidget) *QDateTimeEdit { } // NewQDateTimeEdit7 constructs a new QDateTimeEdit object. -func NewQDateTimeEdit7(d *QDate, parent *QWidget) *QDateTimeEdit { +func NewQDateTimeEdit7(d QDate, parent *QWidget) *QDateTimeEdit { ret := C.QDateTimeEdit_new7(d.cPointer(), parent.cPointer()) return newQDateTimeEdit(ret) } // NewQDateTimeEdit8 constructs a new QDateTimeEdit object. -func NewQDateTimeEdit8(t *QTime, parent *QWidget) *QDateTimeEdit { +func NewQDateTimeEdit8(t QTime, parent *QWidget) *QDateTimeEdit { ret := C.QDateTimeEdit_new8(t.cPointer(), parent.cPointer()) return newQDateTimeEdit(ret) } @@ -120,15 +120,6 @@ func QDateTimeEdit_Tr(s string) string { return _ret } -func QDateTimeEdit_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDateTimeEdit_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QDateTimeEdit) DateTime() *QDateTime { _ret := C.QDateTimeEdit_DateTime(this.h) _goptr := newQDateTime(_ret) @@ -202,7 +193,7 @@ func (this *QDateTimeEdit) MinimumDate() *QDate { return _goptr } -func (this *QDateTimeEdit) SetMinimumDate(min *QDate) { +func (this *QDateTimeEdit) SetMinimumDate(min QDate) { C.QDateTimeEdit_SetMinimumDate(this.h, min.cPointer()) } @@ -217,7 +208,7 @@ func (this *QDateTimeEdit) MaximumDate() *QDate { return _goptr } -func (this *QDateTimeEdit) SetMaximumDate(max *QDate) { +func (this *QDateTimeEdit) SetMaximumDate(max QDate) { C.QDateTimeEdit_SetMaximumDate(this.h, max.cPointer()) } @@ -225,7 +216,7 @@ func (this *QDateTimeEdit) ClearMaximumDate() { C.QDateTimeEdit_ClearMaximumDate(this.h) } -func (this *QDateTimeEdit) SetDateRange(min *QDate, max *QDate) { +func (this *QDateTimeEdit) SetDateRange(min QDate, max QDate) { C.QDateTimeEdit_SetDateRange(this.h, min.cPointer(), max.cPointer()) } @@ -236,7 +227,7 @@ func (this *QDateTimeEdit) MinimumTime() *QTime { return _goptr } -func (this *QDateTimeEdit) SetMinimumTime(min *QTime) { +func (this *QDateTimeEdit) SetMinimumTime(min QTime) { C.QDateTimeEdit_SetMinimumTime(this.h, min.cPointer()) } @@ -251,7 +242,7 @@ func (this *QDateTimeEdit) MaximumTime() *QTime { return _goptr } -func (this *QDateTimeEdit) SetMaximumTime(max *QTime) { +func (this *QDateTimeEdit) SetMaximumTime(max QTime) { C.QDateTimeEdit_SetMaximumTime(this.h, max.cPointer()) } @@ -259,7 +250,7 @@ func (this *QDateTimeEdit) ClearMaximumTime() { C.QDateTimeEdit_ClearMaximumTime(this.h) } -func (this *QDateTimeEdit) SetTimeRange(min *QTime, max *QTime) { +func (this *QDateTimeEdit) SetTimeRange(min QTime, max QTime) { C.QDateTimeEdit_SetTimeRange(this.h, min.cPointer(), max.cPointer()) } @@ -378,42 +369,48 @@ func miqt_exec_callback_QDateTimeEdit_DateTimeChanged(cb *C.void, dateTime *C.QD gofunc(slotval1) } -func (this *QDateTimeEdit) TimeChanged(time *QTime) { +func (this *QDateTimeEdit) TimeChanged(time QTime) { C.QDateTimeEdit_TimeChanged(this.h, time.cPointer()) } -func (this *QDateTimeEdit) OnTimeChanged(slot func(time *QTime)) { +func (this *QDateTimeEdit) OnTimeChanged(slot func(time QTime)) { C.QDateTimeEdit_connect_TimeChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QDateTimeEdit_TimeChanged func miqt_exec_callback_QDateTimeEdit_TimeChanged(cb *C.void, time *C.QTime) { - gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(time *QTime)) + gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(time QTime)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - slotval1 := newQTime_U(unsafe.Pointer(time)) + time_ret := time + time_goptr := newQTime(time_ret) + time_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + slotval1 := *time_goptr gofunc(slotval1) } -func (this *QDateTimeEdit) DateChanged(date *QDate) { +func (this *QDateTimeEdit) DateChanged(date QDate) { C.QDateTimeEdit_DateChanged(this.h, date.cPointer()) } -func (this *QDateTimeEdit) OnDateChanged(slot func(date *QDate)) { +func (this *QDateTimeEdit) OnDateChanged(slot func(date QDate)) { C.QDateTimeEdit_connect_DateChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QDateTimeEdit_DateChanged func miqt_exec_callback_QDateTimeEdit_DateChanged(cb *C.void, date *C.QDate) { - gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(date *QDate)) + gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(date QDate)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - slotval1 := newQDate_U(unsafe.Pointer(date)) + date_ret := date + date_goptr := newQDate(date_ret) + date_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + slotval1 := *date_goptr gofunc(slotval1) } @@ -422,11 +419,11 @@ func (this *QDateTimeEdit) SetDateTime(dateTime *QDateTime) { C.QDateTimeEdit_SetDateTime(this.h, dateTime.cPointer()) } -func (this *QDateTimeEdit) SetDate(date *QDate) { +func (this *QDateTimeEdit) SetDate(date QDate) { C.QDateTimeEdit_SetDate(this.h, date.cPointer()) } -func (this *QDateTimeEdit) SetTime(time *QTime) { +func (this *QDateTimeEdit) SetTime(time QTime) { C.QDateTimeEdit_SetTime(this.h, time.cPointer()) } @@ -452,28 +449,6 @@ func QDateTimeEdit_Tr3(s string, c string, n int) string { return _ret } -func QDateTimeEdit_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDateTimeEdit_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QDateTimeEdit_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDateTimeEdit_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QDateTimeEdit) Delete() { C.QDateTimeEdit_Delete(this.h) @@ -518,7 +493,7 @@ func NewQTimeEdit() *QTimeEdit { } // NewQTimeEdit2 constructs a new QTimeEdit object. -func NewQTimeEdit2(time *QTime) *QTimeEdit { +func NewQTimeEdit2(time QTime) *QTimeEdit { ret := C.QTimeEdit_new2(time.cPointer()) return newQTimeEdit(ret) } @@ -530,7 +505,7 @@ func NewQTimeEdit3(parent *QWidget) *QTimeEdit { } // NewQTimeEdit4 constructs a new QTimeEdit object. -func NewQTimeEdit4(time *QTime, parent *QWidget) *QTimeEdit { +func NewQTimeEdit4(time QTime, parent *QWidget) *QTimeEdit { ret := C.QTimeEdit_new4(time.cPointer(), parent.cPointer()) return newQTimeEdit(ret) } @@ -554,31 +529,25 @@ func QTimeEdit_Tr(s string) string { return _ret } -func QTimeEdit_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTimeEdit_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QTimeEdit) UserTimeChanged(time *QTime) { +func (this *QTimeEdit) UserTimeChanged(time QTime) { C.QTimeEdit_UserTimeChanged(this.h, time.cPointer()) } -func (this *QTimeEdit) OnUserTimeChanged(slot func(time *QTime)) { +func (this *QTimeEdit) OnUserTimeChanged(slot func(time QTime)) { C.QTimeEdit_connect_UserTimeChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QTimeEdit_UserTimeChanged func miqt_exec_callback_QTimeEdit_UserTimeChanged(cb *C.void, time *C.QTime) { - gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(time *QTime)) + gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(time QTime)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - slotval1 := newQTime_U(unsafe.Pointer(time)) + time_ret := time + time_goptr := newQTime(time_ret) + time_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + slotval1 := *time_goptr gofunc(slotval1) } @@ -605,28 +574,6 @@ func QTimeEdit_Tr3(s string, c string, n int) string { return _ret } -func QTimeEdit_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTimeEdit_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QTimeEdit_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTimeEdit_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QTimeEdit) Delete() { C.QTimeEdit_Delete(this.h) @@ -671,7 +618,7 @@ func NewQDateEdit() *QDateEdit { } // NewQDateEdit2 constructs a new QDateEdit object. -func NewQDateEdit2(date *QDate) *QDateEdit { +func NewQDateEdit2(date QDate) *QDateEdit { ret := C.QDateEdit_new2(date.cPointer()) return newQDateEdit(ret) } @@ -683,7 +630,7 @@ func NewQDateEdit3(parent *QWidget) *QDateEdit { } // NewQDateEdit4 constructs a new QDateEdit object. -func NewQDateEdit4(date *QDate, parent *QWidget) *QDateEdit { +func NewQDateEdit4(date QDate, parent *QWidget) *QDateEdit { ret := C.QDateEdit_new4(date.cPointer(), parent.cPointer()) return newQDateEdit(ret) } @@ -707,31 +654,25 @@ func QDateEdit_Tr(s string) string { return _ret } -func QDateEdit_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDateEdit_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QDateEdit) UserDateChanged(date *QDate) { +func (this *QDateEdit) UserDateChanged(date QDate) { C.QDateEdit_UserDateChanged(this.h, date.cPointer()) } -func (this *QDateEdit) OnUserDateChanged(slot func(date *QDate)) { +func (this *QDateEdit) OnUserDateChanged(slot func(date QDate)) { C.QDateEdit_connect_UserDateChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) } //export miqt_exec_callback_QDateEdit_UserDateChanged func miqt_exec_callback_QDateEdit_UserDateChanged(cb *C.void, date *C.QDate) { - gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(date *QDate)) + gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(date QDate)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") } // Convert all CABI parameters to Go parameters - slotval1 := newQDate_U(unsafe.Pointer(date)) + date_ret := date + date_goptr := newQDate(date_ret) + date_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + slotval1 := *date_goptr gofunc(slotval1) } @@ -758,28 +699,6 @@ func QDateEdit_Tr3(s string, c string, n int) string { return _ret } -func QDateEdit_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDateEdit_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QDateEdit_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDateEdit_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QDateEdit) Delete() { C.QDateEdit_Delete(this.h) diff --git a/qt/gen_qdatetimeedit.h b/qt/gen_qdatetimeedit.h index bad70a1..cc6a9ac 100644 --- a/qt/gen_qdatetimeedit.h +++ b/qt/gen_qdatetimeedit.h @@ -52,7 +52,6 @@ QDateTimeEdit* QDateTimeEdit_new8(QTime* t, QWidget* parent); QMetaObject* QDateTimeEdit_MetaObject(const QDateTimeEdit* self); void* QDateTimeEdit_Metacast(QDateTimeEdit* self, const char* param1); struct miqt_string* QDateTimeEdit_Tr(const char* s); -struct miqt_string* QDateTimeEdit_TrUtf8(const char* s); QDateTime* QDateTimeEdit_DateTime(const QDateTimeEdit* self); QDate* QDateTimeEdit_Date(const QDateTimeEdit* self); QTime* QDateTimeEdit_Time(const QDateTimeEdit* self); @@ -111,8 +110,6 @@ void QDateTimeEdit_SetDate(QDateTimeEdit* self, QDate* date); void QDateTimeEdit_SetTime(QDateTimeEdit* self, QTime* time); struct miqt_string* QDateTimeEdit_Tr2(const char* s, const char* c); struct miqt_string* QDateTimeEdit_Tr3(const char* s, const char* c, int n); -struct miqt_string* QDateTimeEdit_TrUtf82(const char* s, const char* c); -struct miqt_string* QDateTimeEdit_TrUtf83(const char* s, const char* c, int n); void QDateTimeEdit_Delete(QDateTimeEdit* self); QTimeEdit* QTimeEdit_new(); @@ -122,13 +119,10 @@ QTimeEdit* QTimeEdit_new4(QTime* time, QWidget* parent); QMetaObject* QTimeEdit_MetaObject(const QTimeEdit* self); void* QTimeEdit_Metacast(QTimeEdit* self, const char* param1); struct miqt_string* QTimeEdit_Tr(const char* s); -struct miqt_string* QTimeEdit_TrUtf8(const char* s); void QTimeEdit_UserTimeChanged(QTimeEdit* self, QTime* time); void QTimeEdit_connect_UserTimeChanged(QTimeEdit* self, void* slot); struct miqt_string* QTimeEdit_Tr2(const char* s, const char* c); struct miqt_string* QTimeEdit_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTimeEdit_TrUtf82(const char* s, const char* c); -struct miqt_string* QTimeEdit_TrUtf83(const char* s, const char* c, int n); void QTimeEdit_Delete(QTimeEdit* self); QDateEdit* QDateEdit_new(); @@ -138,13 +132,10 @@ QDateEdit* QDateEdit_new4(QDate* date, QWidget* parent); QMetaObject* QDateEdit_MetaObject(const QDateEdit* self); void* QDateEdit_Metacast(QDateEdit* self, const char* param1); struct miqt_string* QDateEdit_Tr(const char* s); -struct miqt_string* QDateEdit_TrUtf8(const char* s); void QDateEdit_UserDateChanged(QDateEdit* self, QDate* date); void QDateEdit_connect_UserDateChanged(QDateEdit* self, void* slot); struct miqt_string* QDateEdit_Tr2(const char* s, const char* c); struct miqt_string* QDateEdit_Tr3(const char* s, const char* c, int n); -struct miqt_string* QDateEdit_TrUtf82(const char* s, const char* c); -struct miqt_string* QDateEdit_TrUtf83(const char* s, const char* c, int n); void QDateEdit_Delete(QDateEdit* self); #ifdef __cplusplus diff --git a/qt/gen_qdebug.cpp b/qt/gen_qdebug.cpp index 888ea3b..845918b 100644 --- a/qt/gen_qdebug.cpp +++ b/qt/gen_qdebug.cpp @@ -1,4 +1,5 @@ #include +#include #include #include #include @@ -188,6 +189,12 @@ QDebug* QDebug_OperatorShiftLeftWithQByteArray(QDebug* self, QByteArray* t) { return &_ret; } +QDebug* QDebug_OperatorShiftLeftWithQByteArrayView(QDebug* self, QByteArrayView* t) { + QDebug& _ret = self->operator<<(*t); + // Cast returned reference into pointer + return &_ret; +} + QDebug* QDebug_OperatorShiftLeftWithVoid(QDebug* self, const void* t) { QDebug& _ret = self->operator<<(t); // Cast returned reference into pointer diff --git a/qt/gen_qdebug.go b/qt/gen_qdebug.go index cefe1a2..b62f203 100644 --- a/qt/gen_qdebug.go +++ b/qt/gen_qdebug.go @@ -23,6 +23,7 @@ const ( type QDebug struct { h *C.QDebug + *QIODeviceBase } func (this *QDebug) cPointer() *C.QDebug { @@ -36,7 +37,7 @@ func newQDebug(h *C.QDebug) *QDebug { if h == nil { return nil } - return &QDebug{h: h} + return &QDebug{h: h, QIODeviceBase: newQIODeviceBase_U(unsafe.Pointer(h))} } func newQDebug_U(h unsafe.Pointer) *QDebug { @@ -179,6 +180,10 @@ func (this *QDebug) OperatorShiftLeftWithQByteArray(t *QByteArray) *QDebug { return newQDebug_U(unsafe.Pointer(C.QDebug_OperatorShiftLeftWithQByteArray(this.h, t.cPointer()))) } +func (this *QDebug) OperatorShiftLeftWithQByteArrayView(t QByteArrayView) *QDebug { + return newQDebug_U(unsafe.Pointer(C.QDebug_OperatorShiftLeftWithQByteArrayView(this.h, t.cPointer()))) +} + func (this *QDebug) OperatorShiftLeftWithVoid(t unsafe.Pointer) *QDebug { return newQDebug_U(unsafe.Pointer(C.QDebug_OperatorShiftLeftWithVoid(this.h, t))) } diff --git a/qt/gen_qdebug.h b/qt/gen_qdebug.h index d0730aa..b99b65b 100644 --- a/qt/gen_qdebug.h +++ b/qt/gen_qdebug.h @@ -15,6 +15,7 @@ extern "C" { #ifdef __cplusplus class QByteArray; +class QByteArrayView; class QChar; class QDebug; class QDebugStateSaver; @@ -22,6 +23,7 @@ class QIODevice; class QNoDebug; #else typedef struct QByteArray QByteArray; +typedef struct QByteArrayView QByteArrayView; typedef struct QChar QChar; typedef struct QDebug QDebug; typedef struct QDebugStateSaver QDebugStateSaver; @@ -61,6 +63,7 @@ QDebug* QDebug_OperatorShiftLeftWithDouble(QDebug* self, double t); QDebug* QDebug_OperatorShiftLeft2(QDebug* self, const char* t); QDebug* QDebug_OperatorShiftLeftWithQString(QDebug* self, struct miqt_string* t); QDebug* QDebug_OperatorShiftLeftWithQByteArray(QDebug* self, QByteArray* t); +QDebug* QDebug_OperatorShiftLeftWithQByteArrayView(QDebug* self, QByteArrayView* t); QDebug* QDebug_OperatorShiftLeftWithVoid(QDebug* self, const void* t); QDebug* QDebug_MaybeQuote1(QDebug* self, char c); void QDebug_Delete(QDebug* self); diff --git a/qt/gen_qdesktopwidget.cpp b/qt/gen_qdesktopwidget.cpp deleted file mode 100644 index 8c9970c..0000000 --- a/qt/gen_qdesktopwidget.cpp +++ /dev/null @@ -1,181 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include "qdesktopwidget.h" -#include "gen_qdesktopwidget.h" -#include "_cgo_export.h" - -QDesktopWidget* QDesktopWidget_new() { - return new QDesktopWidget(); -} - -QMetaObject* QDesktopWidget_MetaObject(const QDesktopWidget* self) { - return (QMetaObject*) self->metaObject(); -} - -void* QDesktopWidget_Metacast(QDesktopWidget* self, const char* param1) { - return self->qt_metacast(param1); -} - -struct miqt_string* QDesktopWidget_Tr(const char* s) { - QString _ret = QDesktopWidget::tr(s); - // 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* QDesktopWidget_TrUtf8(const char* s) { - QString _ret = QDesktopWidget::trUtf8(s); - // 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()); -} - -int QDesktopWidget_ScreenNumber(const QDesktopWidget* self) { - return self->screenNumber(); -} - -QRect* QDesktopWidget_ScreenGeometry(const QDesktopWidget* self, QWidget* widget) { - return new QRect(self->screenGeometry(widget)); -} - -QRect* QDesktopWidget_AvailableGeometry(const QDesktopWidget* self, QWidget* widget) { - return new QRect(self->availableGeometry(widget)); -} - -bool QDesktopWidget_IsVirtualDesktop(const QDesktopWidget* self) { - return self->isVirtualDesktop(); -} - -int QDesktopWidget_NumScreens(const QDesktopWidget* self) { - return self->numScreens(); -} - -int QDesktopWidget_ScreenCount(const QDesktopWidget* self) { - return self->screenCount(); -} - -int QDesktopWidget_PrimaryScreen(const QDesktopWidget* self) { - return self->primaryScreen(); -} - -int QDesktopWidget_ScreenNumberWithQPoint(const QDesktopWidget* self, QPoint* param1) { - return self->screenNumber(*param1); -} - -QWidget* QDesktopWidget_Screen(QDesktopWidget* self) { - return self->screen(); -} - -QRect* QDesktopWidget_ScreenGeometry2(const QDesktopWidget* self) { - return new QRect(self->screenGeometry()); -} - -QRect* QDesktopWidget_ScreenGeometryWithPoint(const QDesktopWidget* self, QPoint* point) { - return new QRect(self->screenGeometry(*point)); -} - -QRect* QDesktopWidget_AvailableGeometry2(const QDesktopWidget* self) { - return new QRect(self->availableGeometry()); -} - -QRect* QDesktopWidget_AvailableGeometryWithPoint(const QDesktopWidget* self, QPoint* point) { - return new QRect(self->availableGeometry(*point)); -} - -void QDesktopWidget_Resized(QDesktopWidget* self, int param1) { - self->resized(static_cast(param1)); -} - -void QDesktopWidget_connect_Resized(QDesktopWidget* self, void* slot) { - QDesktopWidget::connect(self, static_cast(&QDesktopWidget::resized), self, [=](int param1) { - int sigval1 = param1; - miqt_exec_callback_QDesktopWidget_Resized(slot, sigval1); - }); -} - -void QDesktopWidget_WorkAreaResized(QDesktopWidget* self, int param1) { - self->workAreaResized(static_cast(param1)); -} - -void QDesktopWidget_connect_WorkAreaResized(QDesktopWidget* self, void* slot) { - QDesktopWidget::connect(self, static_cast(&QDesktopWidget::workAreaResized), self, [=](int param1) { - int sigval1 = param1; - miqt_exec_callback_QDesktopWidget_WorkAreaResized(slot, sigval1); - }); -} - -void QDesktopWidget_ScreenCountChanged(QDesktopWidget* self, int param1) { - self->screenCountChanged(static_cast(param1)); -} - -void QDesktopWidget_connect_ScreenCountChanged(QDesktopWidget* self, void* slot) { - QDesktopWidget::connect(self, static_cast(&QDesktopWidget::screenCountChanged), self, [=](int param1) { - int sigval1 = param1; - miqt_exec_callback_QDesktopWidget_ScreenCountChanged(slot, sigval1); - }); -} - -void QDesktopWidget_PrimaryScreenChanged(QDesktopWidget* self) { - self->primaryScreenChanged(); -} - -void QDesktopWidget_connect_PrimaryScreenChanged(QDesktopWidget* self, void* slot) { - QDesktopWidget::connect(self, static_cast(&QDesktopWidget::primaryScreenChanged), self, [=]() { - miqt_exec_callback_QDesktopWidget_PrimaryScreenChanged(slot); - }); -} - -struct miqt_string* QDesktopWidget_Tr2(const char* s, const char* c) { - QString _ret = QDesktopWidget::tr(s, c); - // 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* QDesktopWidget_Tr3(const char* s, const char* c, int n) { - QString _ret = QDesktopWidget::tr(s, c, static_cast(n)); - // 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* QDesktopWidget_TrUtf82(const char* s, const char* c) { - QString _ret = QDesktopWidget::trUtf8(s, c); - // 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* QDesktopWidget_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QDesktopWidget::trUtf8(s, c, static_cast(n)); - // 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()); -} - -int QDesktopWidget_ScreenNumber1(const QDesktopWidget* self, QWidget* widget) { - return self->screenNumber(widget); -} - -QWidget* QDesktopWidget_Screen1(QDesktopWidget* self, int screen) { - return self->screen(static_cast(screen)); -} - -QRect* QDesktopWidget_ScreenGeometry1(const QDesktopWidget* self, int screen) { - return new QRect(self->screenGeometry(static_cast(screen))); -} - -QRect* QDesktopWidget_AvailableGeometry1(const QDesktopWidget* self, int screen) { - return new QRect(self->availableGeometry(static_cast(screen))); -} - -void QDesktopWidget_Delete(QDesktopWidget* self) { - delete self; -} - diff --git a/qt/gen_qdesktopwidget.go b/qt/gen_qdesktopwidget.go deleted file mode 100644 index 6643897..0000000 --- a/qt/gen_qdesktopwidget.go +++ /dev/null @@ -1,299 +0,0 @@ -package qt - -/* - -#include "gen_qdesktopwidget.h" -#include - -*/ -import "C" - -import ( - "runtime" - "runtime/cgo" - "unsafe" -) - -type QDesktopWidget struct { - h *C.QDesktopWidget - *QWidget -} - -func (this *QDesktopWidget) cPointer() *C.QDesktopWidget { - if this == nil { - return nil - } - return this.h -} - -func newQDesktopWidget(h *C.QDesktopWidget) *QDesktopWidget { - if h == nil { - return nil - } - return &QDesktopWidget{h: h, QWidget: newQWidget_U(unsafe.Pointer(h))} -} - -func newQDesktopWidget_U(h unsafe.Pointer) *QDesktopWidget { - return newQDesktopWidget((*C.QDesktopWidget)(h)) -} - -// NewQDesktopWidget constructs a new QDesktopWidget object. -func NewQDesktopWidget() *QDesktopWidget { - ret := C.QDesktopWidget_new() - return newQDesktopWidget(ret) -} - -func (this *QDesktopWidget) MetaObject() *QMetaObject { - return newQMetaObject_U(unsafe.Pointer(C.QDesktopWidget_MetaObject(this.h))) -} - -func (this *QDesktopWidget) Metacast(param1 string) unsafe.Pointer { - param1_Cstring := C.CString(param1) - defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QDesktopWidget_Metacast(this.h, param1_Cstring) -} - -func QDesktopWidget_Tr(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDesktopWidget_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QDesktopWidget_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDesktopWidget_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QDesktopWidget) ScreenNumber() int { - return (int)(C.QDesktopWidget_ScreenNumber(this.h)) -} - -func (this *QDesktopWidget) ScreenGeometry(widget *QWidget) *QRect { - _ret := C.QDesktopWidget_ScreenGeometry(this.h, widget.cPointer()) - _goptr := newQRect(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QDesktopWidget) AvailableGeometry(widget *QWidget) *QRect { - _ret := C.QDesktopWidget_AvailableGeometry(this.h, widget.cPointer()) - _goptr := newQRect(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QDesktopWidget) IsVirtualDesktop() bool { - return (bool)(C.QDesktopWidget_IsVirtualDesktop(this.h)) -} - -func (this *QDesktopWidget) NumScreens() int { - return (int)(C.QDesktopWidget_NumScreens(this.h)) -} - -func (this *QDesktopWidget) ScreenCount() int { - return (int)(C.QDesktopWidget_ScreenCount(this.h)) -} - -func (this *QDesktopWidget) PrimaryScreen() int { - return (int)(C.QDesktopWidget_PrimaryScreen(this.h)) -} - -func (this *QDesktopWidget) ScreenNumberWithQPoint(param1 *QPoint) int { - return (int)(C.QDesktopWidget_ScreenNumberWithQPoint(this.h, param1.cPointer())) -} - -func (this *QDesktopWidget) Screen() *QWidget { - return newQWidget_U(unsafe.Pointer(C.QDesktopWidget_Screen(this.h))) -} - -func (this *QDesktopWidget) ScreenGeometry2() *QRect { - _ret := C.QDesktopWidget_ScreenGeometry2(this.h) - _goptr := newQRect(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QDesktopWidget) ScreenGeometryWithPoint(point *QPoint) *QRect { - _ret := C.QDesktopWidget_ScreenGeometryWithPoint(this.h, point.cPointer()) - _goptr := newQRect(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QDesktopWidget) AvailableGeometry2() *QRect { - _ret := C.QDesktopWidget_AvailableGeometry2(this.h) - _goptr := newQRect(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QDesktopWidget) AvailableGeometryWithPoint(point *QPoint) *QRect { - _ret := C.QDesktopWidget_AvailableGeometryWithPoint(this.h, point.cPointer()) - _goptr := newQRect(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QDesktopWidget) Resized(param1 int) { - C.QDesktopWidget_Resized(this.h, (C.int)(param1)) -} -func (this *QDesktopWidget) OnResized(slot func(param1 int)) { - C.QDesktopWidget_connect_Resized(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) -} - -//export miqt_exec_callback_QDesktopWidget_Resized -func miqt_exec_callback_QDesktopWidget_Resized(cb *C.void, param1 C.int) { - gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 int)) - if !ok { - panic("miqt: callback of non-callback type (heap corruption?)") - } - - // Convert all CABI parameters to Go parameters - slotval1 := (int)(param1) - - gofunc(slotval1) -} - -func (this *QDesktopWidget) WorkAreaResized(param1 int) { - C.QDesktopWidget_WorkAreaResized(this.h, (C.int)(param1)) -} -func (this *QDesktopWidget) OnWorkAreaResized(slot func(param1 int)) { - C.QDesktopWidget_connect_WorkAreaResized(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) -} - -//export miqt_exec_callback_QDesktopWidget_WorkAreaResized -func miqt_exec_callback_QDesktopWidget_WorkAreaResized(cb *C.void, param1 C.int) { - gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 int)) - if !ok { - panic("miqt: callback of non-callback type (heap corruption?)") - } - - // Convert all CABI parameters to Go parameters - slotval1 := (int)(param1) - - gofunc(slotval1) -} - -func (this *QDesktopWidget) ScreenCountChanged(param1 int) { - C.QDesktopWidget_ScreenCountChanged(this.h, (C.int)(param1)) -} -func (this *QDesktopWidget) OnScreenCountChanged(slot func(param1 int)) { - C.QDesktopWidget_connect_ScreenCountChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) -} - -//export miqt_exec_callback_QDesktopWidget_ScreenCountChanged -func miqt_exec_callback_QDesktopWidget_ScreenCountChanged(cb *C.void, param1 C.int) { - gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 int)) - if !ok { - panic("miqt: callback of non-callback type (heap corruption?)") - } - - // Convert all CABI parameters to Go parameters - slotval1 := (int)(param1) - - gofunc(slotval1) -} - -func (this *QDesktopWidget) PrimaryScreenChanged() { - C.QDesktopWidget_PrimaryScreenChanged(this.h) -} -func (this *QDesktopWidget) OnPrimaryScreenChanged(slot func()) { - C.QDesktopWidget_connect_PrimaryScreenChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) -} - -//export miqt_exec_callback_QDesktopWidget_PrimaryScreenChanged -func miqt_exec_callback_QDesktopWidget_PrimaryScreenChanged(cb *C.void) { - gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func()) - if !ok { - panic("miqt: callback of non-callback type (heap corruption?)") - } - - gofunc() -} - -func QDesktopWidget_Tr2(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDesktopWidget_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QDesktopWidget_Tr3(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDesktopWidget_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QDesktopWidget_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDesktopWidget_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QDesktopWidget_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDesktopWidget_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QDesktopWidget) ScreenNumber1(widget *QWidget) int { - return (int)(C.QDesktopWidget_ScreenNumber1(this.h, widget.cPointer())) -} - -func (this *QDesktopWidget) Screen1(screen int) *QWidget { - return newQWidget_U(unsafe.Pointer(C.QDesktopWidget_Screen1(this.h, (C.int)(screen)))) -} - -func (this *QDesktopWidget) ScreenGeometry1(screen int) *QRect { - _ret := C.QDesktopWidget_ScreenGeometry1(this.h, (C.int)(screen)) - _goptr := newQRect(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QDesktopWidget) AvailableGeometry1(screen int) *QRect { - _ret := C.QDesktopWidget_AvailableGeometry1(this.h, (C.int)(screen)) - _goptr := newQRect(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -// Delete this object from C++ memory. -func (this *QDesktopWidget) Delete() { - C.QDesktopWidget_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QDesktopWidget) GoGC() { - runtime.SetFinalizer(this, func(this *QDesktopWidget) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} diff --git a/qt/gen_qdesktopwidget.h b/qt/gen_qdesktopwidget.h deleted file mode 100644 index f274336..0000000 --- a/qt/gen_qdesktopwidget.h +++ /dev/null @@ -1,70 +0,0 @@ -#ifndef GEN_QDESKTOPWIDGET_H -#define GEN_QDESKTOPWIDGET_H - -#include -#include -#include - -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - -#include "binding.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __cplusplus -class QDesktopWidget; -class QMetaObject; -class QPoint; -class QRect; -class QWidget; -#else -typedef struct QDesktopWidget QDesktopWidget; -typedef struct QMetaObject QMetaObject; -typedef struct QPoint QPoint; -typedef struct QRect QRect; -typedef struct QWidget QWidget; -#endif - -QDesktopWidget* QDesktopWidget_new(); -QMetaObject* QDesktopWidget_MetaObject(const QDesktopWidget* self); -void* QDesktopWidget_Metacast(QDesktopWidget* self, const char* param1); -struct miqt_string* QDesktopWidget_Tr(const char* s); -struct miqt_string* QDesktopWidget_TrUtf8(const char* s); -int QDesktopWidget_ScreenNumber(const QDesktopWidget* self); -QRect* QDesktopWidget_ScreenGeometry(const QDesktopWidget* self, QWidget* widget); -QRect* QDesktopWidget_AvailableGeometry(const QDesktopWidget* self, QWidget* widget); -bool QDesktopWidget_IsVirtualDesktop(const QDesktopWidget* self); -int QDesktopWidget_NumScreens(const QDesktopWidget* self); -int QDesktopWidget_ScreenCount(const QDesktopWidget* self); -int QDesktopWidget_PrimaryScreen(const QDesktopWidget* self); -int QDesktopWidget_ScreenNumberWithQPoint(const QDesktopWidget* self, QPoint* param1); -QWidget* QDesktopWidget_Screen(QDesktopWidget* self); -QRect* QDesktopWidget_ScreenGeometry2(const QDesktopWidget* self); -QRect* QDesktopWidget_ScreenGeometryWithPoint(const QDesktopWidget* self, QPoint* point); -QRect* QDesktopWidget_AvailableGeometry2(const QDesktopWidget* self); -QRect* QDesktopWidget_AvailableGeometryWithPoint(const QDesktopWidget* self, QPoint* point); -void QDesktopWidget_Resized(QDesktopWidget* self, int param1); -void QDesktopWidget_connect_Resized(QDesktopWidget* self, void* slot); -void QDesktopWidget_WorkAreaResized(QDesktopWidget* self, int param1); -void QDesktopWidget_connect_WorkAreaResized(QDesktopWidget* self, void* slot); -void QDesktopWidget_ScreenCountChanged(QDesktopWidget* self, int param1); -void QDesktopWidget_connect_ScreenCountChanged(QDesktopWidget* self, void* slot); -void QDesktopWidget_PrimaryScreenChanged(QDesktopWidget* self); -void QDesktopWidget_connect_PrimaryScreenChanged(QDesktopWidget* self, void* slot); -struct miqt_string* QDesktopWidget_Tr2(const char* s, const char* c); -struct miqt_string* QDesktopWidget_Tr3(const char* s, const char* c, int n); -struct miqt_string* QDesktopWidget_TrUtf82(const char* s, const char* c); -struct miqt_string* QDesktopWidget_TrUtf83(const char* s, const char* c, int n); -int QDesktopWidget_ScreenNumber1(const QDesktopWidget* self, QWidget* widget); -QWidget* QDesktopWidget_Screen1(QDesktopWidget* self, int screen); -QRect* QDesktopWidget_ScreenGeometry1(const QDesktopWidget* self, int screen); -QRect* QDesktopWidget_AvailableGeometry1(const QDesktopWidget* self, int screen); -void QDesktopWidget_Delete(QDesktopWidget* self); - -#ifdef __cplusplus -} /* extern C */ -#endif - -#endif diff --git a/qt/gen_qdial.cpp b/qt/gen_qdial.cpp index 0e993dd..ae5a624 100644 --- a/qt/gen_qdial.cpp +++ b/qt/gen_qdial.cpp @@ -32,13 +32,6 @@ struct miqt_string* QDial_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QDial_TrUtf8(const char* s) { - QString _ret = QDial::trUtf8(s); - // 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()); -} - bool QDial_Wrapping(const QDial* self) { return self->wrapping(); } @@ -90,20 +83,6 @@ struct miqt_string* QDial_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QDial_TrUtf82(const char* s, const char* c) { - QString _ret = QDial::trUtf8(s, c); - // 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* QDial_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QDial::trUtf8(s, c, static_cast(n)); - // 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 QDial_Delete(QDial* self) { delete self; } diff --git a/qt/gen_qdial.go b/qt/gen_qdial.go index b98c494..495ebf3 100644 --- a/qt/gen_qdial.go +++ b/qt/gen_qdial.go @@ -67,15 +67,6 @@ func QDial_Tr(s string) string { return _ret } -func QDial_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDial_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QDial) Wrapping() bool { return (bool)(C.QDial_Wrapping(this.h)) } @@ -140,28 +131,6 @@ func QDial_Tr3(s string, c string, n int) string { return _ret } -func QDial_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDial_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QDial_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDial_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QDial) Delete() { C.QDial_Delete(this.h) diff --git a/qt/gen_qdial.h b/qt/gen_qdial.h index cae6bf0..ac83501 100644 --- a/qt/gen_qdial.h +++ b/qt/gen_qdial.h @@ -30,7 +30,6 @@ QDial* QDial_new2(QWidget* parent); QMetaObject* QDial_MetaObject(const QDial* self); void* QDial_Metacast(QDial* self, const char* param1); struct miqt_string* QDial_Tr(const char* s); -struct miqt_string* QDial_TrUtf8(const char* s); bool QDial_Wrapping(const QDial* self); int QDial_NotchSize(const QDial* self); void QDial_SetNotchTarget(QDial* self, double target); @@ -42,8 +41,6 @@ void QDial_SetNotchesVisible(QDial* self, bool visible); void QDial_SetWrapping(QDial* self, bool on); struct miqt_string* QDial_Tr2(const char* s, const char* c); struct miqt_string* QDial_Tr3(const char* s, const char* c, int n); -struct miqt_string* QDial_TrUtf82(const char* s, const char* c); -struct miqt_string* QDial_TrUtf83(const char* s, const char* c, int n); void QDial_Delete(QDial* self); #ifdef __cplusplus diff --git a/qt/gen_qdialog.cpp b/qt/gen_qdialog.cpp index ca28955..3da76c3 100644 --- a/qt/gen_qdialog.cpp +++ b/qt/gen_qdialog.cpp @@ -36,13 +36,6 @@ struct miqt_string* QDialog_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QDialog_TrUtf8(const char* s) { - QString _ret = QDialog::trUtf8(s); - // 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()); -} - int QDialog_Result(const QDialog* self) { return self->result(); } @@ -51,23 +44,6 @@ void QDialog_SetVisible(QDialog* self, bool visible) { self->setVisible(visible); } -void QDialog_SetOrientation(QDialog* self, int orientation) { - self->setOrientation(static_cast(orientation)); -} - -int QDialog_Orientation(const QDialog* self) { - Qt::Orientation _ret = self->orientation(); - return static_cast(_ret); -} - -void QDialog_SetExtension(QDialog* self, QWidget* extension) { - self->setExtension(extension); -} - -QWidget* QDialog_Extension(const QDialog* self) { - return self->extension(); -} - QSize* QDialog_SizeHint(const QDialog* self) { return new QSize(self->sizeHint()); } @@ -143,10 +119,6 @@ void QDialog_Reject(QDialog* self) { self->reject(); } -void QDialog_ShowExtension(QDialog* self, bool param1) { - self->showExtension(param1); -} - struct miqt_string* QDialog_Tr2(const char* s, const char* c) { QString _ret = QDialog::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -161,20 +133,6 @@ struct miqt_string* QDialog_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QDialog_TrUtf82(const char* s, const char* c) { - QString _ret = QDialog::trUtf8(s, c); - // 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* QDialog_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QDialog::trUtf8(s, c, static_cast(n)); - // 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 QDialog_Delete(QDialog* self) { delete self; } diff --git a/qt/gen_qdialog.go b/qt/gen_qdialog.go index d6509f8..424632f 100644 --- a/qt/gen_qdialog.go +++ b/qt/gen_qdialog.go @@ -81,15 +81,6 @@ func QDialog_Tr(s string) string { return _ret } -func QDialog_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDialog_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QDialog) Result() int { return (int)(C.QDialog_Result(this.h)) } @@ -98,22 +89,6 @@ func (this *QDialog) SetVisible(visible bool) { C.QDialog_SetVisible(this.h, (C.bool)(visible)) } -func (this *QDialog) SetOrientation(orientation Orientation) { - C.QDialog_SetOrientation(this.h, (C.int)(orientation)) -} - -func (this *QDialog) Orientation() Orientation { - return (Orientation)(C.QDialog_Orientation(this.h)) -} - -func (this *QDialog) SetExtension(extension *QWidget) { - C.QDialog_SetExtension(this.h, extension.cPointer()) -} - -func (this *QDialog) Extension() *QWidget { - return newQWidget_U(unsafe.Pointer(C.QDialog_Extension(this.h))) -} - func (this *QDialog) SizeHint() *QSize { _ret := C.QDialog_SizeHint(this.h) _goptr := newQSize(_ret) @@ -218,10 +193,6 @@ func (this *QDialog) Reject() { C.QDialog_Reject(this.h) } -func (this *QDialog) ShowExtension(param1 bool) { - C.QDialog_ShowExtension(this.h, (C.bool)(param1)) -} - func QDialog_Tr2(s string, c string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) @@ -244,28 +215,6 @@ func QDialog_Tr3(s string, c string, n int) string { return _ret } -func QDialog_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDialog_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QDialog_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDialog_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QDialog) Delete() { C.QDialog_Delete(this.h) diff --git a/qt/gen_qdialog.h b/qt/gen_qdialog.h index 1c9958f..5ce3311 100644 --- a/qt/gen_qdialog.h +++ b/qt/gen_qdialog.h @@ -31,13 +31,8 @@ QDialog* QDialog_new3(QWidget* parent, int f); QMetaObject* QDialog_MetaObject(const QDialog* self); void* QDialog_Metacast(QDialog* self, const char* param1); 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, 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); QSize* QDialog_MinimumSizeHint(const QDialog* self); void QDialog_SetSizeGripEnabled(QDialog* self, bool sizeGripEnabled); @@ -55,11 +50,8 @@ int QDialog_Exec(QDialog* self); void QDialog_Done(QDialog* self, int param1); void QDialog_Accept(QDialog* self); void QDialog_Reject(QDialog* self); -void QDialog_ShowExtension(QDialog* self, bool param1); struct miqt_string* QDialog_Tr2(const char* s, const char* c); struct miqt_string* QDialog_Tr3(const char* s, const char* c, int n); -struct miqt_string* QDialog_TrUtf82(const char* s, const char* c); -struct miqt_string* QDialog_TrUtf83(const char* s, const char* c, int n); void QDialog_Delete(QDialog* self); #ifdef __cplusplus diff --git a/qt/gen_qdialogbuttonbox.cpp b/qt/gen_qdialogbuttonbox.cpp index 12f74af..48a353f 100644 --- a/qt/gen_qdialogbuttonbox.cpp +++ b/qt/gen_qdialogbuttonbox.cpp @@ -58,13 +58,6 @@ struct miqt_string* QDialogButtonBox_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QDialogButtonBox_TrUtf8(const char* s) { - QString _ret = QDialogButtonBox::trUtf8(s); - // 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 QDialogButtonBox_SetOrientation(QDialogButtonBox* self, int orientation) { self->setOrientation(static_cast(orientation)); } @@ -194,20 +187,6 @@ struct miqt_string* QDialogButtonBox_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QDialogButtonBox_TrUtf82(const char* s, const char* c) { - QString _ret = QDialogButtonBox::trUtf8(s, c); - // 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* QDialogButtonBox_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QDialogButtonBox::trUtf8(s, c, static_cast(n)); - // 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 QDialogButtonBox_Delete(QDialogButtonBox* self) { delete self; } diff --git a/qt/gen_qdialogbuttonbox.go b/qt/gen_qdialogbuttonbox.go index 33c2bec..b6fc800 100644 --- a/qt/gen_qdialogbuttonbox.go +++ b/qt/gen_qdialogbuttonbox.go @@ -63,7 +63,7 @@ const ( QDialogButtonBox__MacLayout QDialogButtonBox__ButtonLayout = 1 QDialogButtonBox__KdeLayout QDialogButtonBox__ButtonLayout = 2 QDialogButtonBox__GnomeLayout QDialogButtonBox__ButtonLayout = 3 - QDialogButtonBox__AndroidLayout QDialogButtonBox__ButtonLayout = 5 + QDialogButtonBox__AndroidLayout QDialogButtonBox__ButtonLayout = 4 ) type QDialogButtonBox struct { @@ -156,15 +156,6 @@ func QDialogButtonBox_Tr(s string) string { return _ret } -func QDialogButtonBox_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDialogButtonBox_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QDialogButtonBox) SetOrientation(orientation Orientation) { C.QDialogButtonBox_SetOrientation(this.h, (C.int)(orientation)) } @@ -327,28 +318,6 @@ func QDialogButtonBox_Tr3(s string, c string, n int) string { return _ret } -func QDialogButtonBox_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDialogButtonBox_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QDialogButtonBox_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDialogButtonBox_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QDialogButtonBox) Delete() { C.QDialogButtonBox_Delete(this.h) diff --git a/qt/gen_qdialogbuttonbox.h b/qt/gen_qdialogbuttonbox.h index eaf2232..004e137 100644 --- a/qt/gen_qdialogbuttonbox.h +++ b/qt/gen_qdialogbuttonbox.h @@ -38,7 +38,6 @@ QDialogButtonBox* QDialogButtonBox_new8(int buttons, int orientation, QWidget* p QMetaObject* QDialogButtonBox_MetaObject(const QDialogButtonBox* self); void* QDialogButtonBox_Metacast(QDialogButtonBox* self, const char* param1); struct miqt_string* QDialogButtonBox_Tr(const char* s); -struct miqt_string* QDialogButtonBox_TrUtf8(const char* s); void QDialogButtonBox_SetOrientation(QDialogButtonBox* self, int orientation); int QDialogButtonBox_Orientation(const QDialogButtonBox* self); void QDialogButtonBox_AddButton(QDialogButtonBox* self, QAbstractButton* button, int role); @@ -64,8 +63,6 @@ void QDialogButtonBox_Rejected(QDialogButtonBox* self); void QDialogButtonBox_connect_Rejected(QDialogButtonBox* self, void* slot); struct miqt_string* QDialogButtonBox_Tr2(const char* s, const char* c); struct miqt_string* QDialogButtonBox_Tr3(const char* s, const char* c, int n); -struct miqt_string* QDialogButtonBox_TrUtf82(const char* s, const char* c); -struct miqt_string* QDialogButtonBox_TrUtf83(const char* s, const char* c, int n); void QDialogButtonBox_Delete(QDialogButtonBox* self); #ifdef __cplusplus diff --git a/qt/gen_qdir.cpp b/qt/gen_qdir.cpp index d6d17f0..276a842 100644 --- a/qt/gen_qdir.cpp +++ b/qt/gen_qdir.cpp @@ -44,11 +44,6 @@ void QDir_OperatorAssign(QDir* self, QDir* param1) { self->operator=(*param1); } -void QDir_OperatorAssignWithPath(QDir* self, struct miqt_string* path) { - QString path_QString = QString::fromUtf8(&path->data, path->len); - self->operator=(path_QString); -} - void QDir_Swap(QDir* self, QDir* other) { self->swap(*other); } @@ -79,11 +74,6 @@ struct miqt_string* QDir_CanonicalPath(const QDir* self) { return miqt_strdup(_b.data(), _b.length()); } -void QDir_AddResourceSearchPath(struct miqt_string* path) { - QString path_QString = QString::fromUtf8(&path->data, path->len); - QDir::addResourceSearchPath(path_QString); -} - void QDir_SetSearchPaths(struct miqt_string* prefix, struct miqt_array* /* of struct miqt_string* */ searchPaths) { QString prefix_QString = QString::fromUtf8(&prefix->data, prefix->len); QList searchPaths_QList; @@ -330,6 +320,11 @@ bool QDir_Mkdir(const QDir* self, struct miqt_string* dirName) { return self->mkdir(dirName_QString); } +bool QDir_Mkdir2(const QDir* self, struct miqt_string* dirName, int permissions) { + QString dirName_QString = QString::fromUtf8(&dirName->data, dirName->len); + return self->mkdir(dirName_QString, static_cast(permissions)); +} + bool QDir_Rmdir(const QDir* self, struct miqt_string* dirName) { QString dirName_QString = QString::fromUtf8(&dirName->data, dirName->len); return self->rmdir(dirName_QString); diff --git a/qt/gen_qdir.go b/qt/gen_qdir.go index 9705ad2..fb86cf7 100644 --- a/qt/gen_qdir.go +++ b/qt/gen_qdir.go @@ -131,12 +131,6 @@ func (this *QDir) OperatorAssign(param1 *QDir) { C.QDir_OperatorAssign(this.h, param1.cPointer()) } -func (this *QDir) OperatorAssignWithPath(path string) { - path_ms := miqt_strdupg(path) - defer C.free(path_ms) - C.QDir_OperatorAssignWithPath(this.h, (*C.struct_miqt_string)(path_ms)) -} - func (this *QDir) Swap(other *QDir) { C.QDir_Swap(this.h, other.cPointer()) } @@ -168,12 +162,6 @@ func (this *QDir) CanonicalPath() string { return _ret } -func QDir_AddResourceSearchPath(path string) { - path_ms := miqt_strdupg(path) - defer C.free(path_ms) - C.QDir_AddResourceSearchPath((*C.struct_miqt_string)(path_ms)) -} - func QDir_SetSearchPaths(prefix string, searchPaths []string) { prefix_ms := miqt_strdupg(prefix) defer C.free(prefix_ms) @@ -433,6 +421,12 @@ func (this *QDir) Mkdir(dirName string) bool { return (bool)(C.QDir_Mkdir(this.h, (*C.struct_miqt_string)(dirName_ms))) } +func (this *QDir) Mkdir2(dirName string, permissions QFileDevice__Permission) bool { + dirName_ms := miqt_strdupg(dirName) + defer C.free(dirName_ms) + return (bool)(C.QDir_Mkdir2(this.h, (*C.struct_miqt_string)(dirName_ms), (C.int)(permissions))) +} + func (this *QDir) Rmdir(dirName string) bool { dirName_ms := miqt_strdupg(dirName) defer C.free(dirName_ms) diff --git a/qt/gen_qdir.h b/qt/gen_qdir.h index 373dc51..67f96fd 100644 --- a/qt/gen_qdir.h +++ b/qt/gen_qdir.h @@ -30,13 +30,11 @@ QDir* QDir_new4(struct miqt_string* path); QDir* QDir_new5(struct miqt_string* path, struct miqt_string* nameFilter, int sort); QDir* QDir_new6(struct miqt_string* path, struct miqt_string* nameFilter, int sort, int filter); void QDir_OperatorAssign(QDir* self, QDir* param1); -void QDir_OperatorAssignWithPath(QDir* self, struct miqt_string* path); void QDir_Swap(QDir* self, QDir* other); void QDir_SetPath(QDir* self, struct miqt_string* path); struct miqt_string* QDir_Path(const QDir* self); struct miqt_string* QDir_AbsolutePath(const QDir* self); struct miqt_string* QDir_CanonicalPath(const QDir* self); -void QDir_AddResourceSearchPath(struct miqt_string* path); void QDir_SetSearchPaths(struct miqt_string* prefix, struct miqt_array* /* of struct miqt_string* */ searchPaths); void QDir_AddSearchPath(struct miqt_string* prefix, struct miqt_string* path); struct miqt_array* QDir_SearchPaths(struct miqt_string* prefix); @@ -63,6 +61,7 @@ struct miqt_array* QDir_EntryListWithNameFilters(const QDir* self, struct miqt_a struct miqt_array* QDir_EntryInfoList(const QDir* self); struct miqt_array* QDir_EntryInfoListWithNameFilters(const QDir* self, struct miqt_array* /* of struct miqt_string* */ nameFilters); bool QDir_Mkdir(const QDir* self, struct miqt_string* dirName); +bool QDir_Mkdir2(const QDir* self, struct miqt_string* dirName, int permissions); bool QDir_Rmdir(const QDir* self, struct miqt_string* dirName); bool QDir_Mkpath(const QDir* self, struct miqt_string* dirPath); bool QDir_Rmpath(const QDir* self, struct miqt_string* dirPath); diff --git a/qt/gen_qdiriterator.cpp b/qt/gen_qdiriterator.cpp index b87d6ab..91e1419 100644 --- a/qt/gen_qdiriterator.cpp +++ b/qt/gen_qdiriterator.cpp @@ -80,6 +80,10 @@ struct miqt_string* QDirIterator_Next(QDirIterator* self) { return miqt_strdup(_b.data(), _b.length()); } +QFileInfo* QDirIterator_NextFileInfo(QDirIterator* self) { + return new QFileInfo(self->nextFileInfo()); +} + bool QDirIterator_HasNext(const QDirIterator* self) { return self->hasNext(); } diff --git a/qt/gen_qdiriterator.go b/qt/gen_qdiriterator.go index 2aab748..f23a694 100644 --- a/qt/gen_qdiriterator.go +++ b/qt/gen_qdiriterator.go @@ -148,6 +148,13 @@ func (this *QDirIterator) Next() string { return _ret } +func (this *QDirIterator) NextFileInfo() *QFileInfo { + _ret := C.QDirIterator_NextFileInfo(this.h) + _goptr := newQFileInfo(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + func (this *QDirIterator) HasNext() bool { return (bool)(C.QDirIterator_HasNext(this.h)) } diff --git a/qt/gen_qdiriterator.h b/qt/gen_qdiriterator.h index 59077e4..27df722 100644 --- a/qt/gen_qdiriterator.h +++ b/qt/gen_qdiriterator.h @@ -33,6 +33,7 @@ QDirIterator* QDirIterator_new7(struct miqt_string* path, int filter, int flags) QDirIterator* QDirIterator_new8(struct miqt_string* path, struct miqt_array* /* of struct miqt_string* */ nameFilters, int filters); QDirIterator* QDirIterator_new9(struct miqt_string* path, struct miqt_array* /* of struct miqt_string* */ nameFilters, int filters, int flags); struct miqt_string* QDirIterator_Next(QDirIterator* self); +QFileInfo* QDirIterator_NextFileInfo(QDirIterator* self); bool QDirIterator_HasNext(const QDirIterator* self); struct miqt_string* QDirIterator_FileName(const QDirIterator* self); struct miqt_string* QDirIterator_FilePath(const QDirIterator* self); diff --git a/qt/gen_qdirmodel.cpp b/qt/gen_qdirmodel.cpp deleted file mode 100644 index fe706cc..0000000 --- a/qt/gen_qdirmodel.cpp +++ /dev/null @@ -1,343 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "qdirmodel.h" -#include "gen_qdirmodel.h" -#include "_cgo_export.h" - -QDirModel* QDirModel_new(struct miqt_array* /* of struct miqt_string* */ nameFilters, int filters, int sort) { - QList nameFilters_QList; - nameFilters_QList.reserve(nameFilters->len); - struct miqt_string** nameFilters_arr = static_cast(nameFilters->data); - for(size_t i = 0; i < nameFilters->len; ++i) { - QString nameFilters_arr_i_QString = QString::fromUtf8(&nameFilters_arr[i]->data, nameFilters_arr[i]->len); - nameFilters_QList.push_back(nameFilters_arr_i_QString); - } - return new QDirModel(nameFilters_QList, static_cast(filters), static_cast(sort)); -} - -QDirModel* QDirModel_new2() { - return new QDirModel(); -} - -QDirModel* QDirModel_new3(struct miqt_array* /* of struct miqt_string* */ nameFilters, int filters, int sort, QObject* parent) { - QList nameFilters_QList; - nameFilters_QList.reserve(nameFilters->len); - struct miqt_string** nameFilters_arr = static_cast(nameFilters->data); - for(size_t i = 0; i < nameFilters->len; ++i) { - QString nameFilters_arr_i_QString = QString::fromUtf8(&nameFilters_arr[i]->data, nameFilters_arr[i]->len); - nameFilters_QList.push_back(nameFilters_arr_i_QString); - } - return new QDirModel(nameFilters_QList, static_cast(filters), static_cast(sort), parent); -} - -QDirModel* QDirModel_new4(QObject* parent) { - return new QDirModel(parent); -} - -QMetaObject* QDirModel_MetaObject(const QDirModel* self) { - return (QMetaObject*) self->metaObject(); -} - -void* QDirModel_Metacast(QDirModel* self, const char* param1) { - return self->qt_metacast(param1); -} - -struct miqt_string* QDirModel_Tr(const char* s) { - QString _ret = QDirModel::tr(s); - // 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* QDirModel_TrUtf8(const char* s) { - QString _ret = QDirModel::trUtf8(s); - // 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()); -} - -QModelIndex* QDirModel_Index(const QDirModel* self, int row, int column) { - return new QModelIndex(self->index(static_cast(row), static_cast(column))); -} - -QModelIndex* QDirModel_Parent(const QDirModel* self, QModelIndex* child) { - return new QModelIndex(self->parent(*child)); -} - -int QDirModel_RowCount(const QDirModel* self) { - return self->rowCount(); -} - -int QDirModel_ColumnCount(const QDirModel* self) { - return self->columnCount(); -} - -QVariant* QDirModel_Data(const QDirModel* self, QModelIndex* index) { - return new QVariant(self->data(*index)); -} - -bool QDirModel_SetData(QDirModel* self, QModelIndex* index, QVariant* value) { - return self->setData(*index, *value); -} - -QVariant* QDirModel_HeaderData(const QDirModel* self, int section, int orientation) { - return new QVariant(self->headerData(static_cast(section), static_cast(orientation))); -} - -bool QDirModel_HasChildren(const QDirModel* self) { - return self->hasChildren(); -} - -int QDirModel_Flags(const QDirModel* self, QModelIndex* index) { - Qt::ItemFlags _ret = self->flags(*index); - return static_cast(_ret); -} - -void QDirModel_Sort(QDirModel* self, int column) { - self->sort(static_cast(column)); -} - -struct miqt_array* QDirModel_MimeTypes(const QDirModel* self) { - QStringList _ret = self->mimeTypes(); - // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); - for (size_t i = 0, e = _ret.length(); i < e; ++i) { - QString _lv_ret = _ret[i]; - // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory - QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); - } - struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); - _out->len = _ret.length(); - _out->data = static_cast(_arr); - return _out; -} - -QMimeData* QDirModel_MimeData(const QDirModel* self, struct miqt_array* /* of QModelIndex* */ indexes) { - QList indexes_QList; - indexes_QList.reserve(indexes->len); - QModelIndex** indexes_arr = static_cast(indexes->data); - for(size_t i = 0; i < indexes->len; ++i) { - indexes_QList.push_back(*(indexes_arr[i])); - } - return self->mimeData(indexes_QList); -} - -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); -} - -int QDirModel_SupportedDropActions(const QDirModel* self) { - Qt::DropActions _ret = self->supportedDropActions(); - return static_cast(_ret); -} - -void QDirModel_SetIconProvider(QDirModel* self, QFileIconProvider* provider) { - self->setIconProvider(provider); -} - -QFileIconProvider* QDirModel_IconProvider(const QDirModel* self) { - return self->iconProvider(); -} - -void QDirModel_SetNameFilters(QDirModel* self, struct miqt_array* /* of struct miqt_string* */ filters) { - QList filters_QList; - filters_QList.reserve(filters->len); - struct miqt_string** filters_arr = static_cast(filters->data); - for(size_t i = 0; i < filters->len; ++i) { - QString filters_arr_i_QString = QString::fromUtf8(&filters_arr[i]->data, filters_arr[i]->len); - filters_QList.push_back(filters_arr_i_QString); - } - self->setNameFilters(filters_QList); -} - -struct miqt_array* QDirModel_NameFilters(const QDirModel* self) { - QStringList _ret = self->nameFilters(); - // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); - for (size_t i = 0, e = _ret.length(); i < e; ++i) { - QString _lv_ret = _ret[i]; - // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory - QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); - } - struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); - _out->len = _ret.length(); - _out->data = static_cast(_arr); - return _out; -} - -void QDirModel_SetFilter(QDirModel* self, int filters) { - self->setFilter(static_cast(filters)); -} - -int QDirModel_Filter(const QDirModel* self) { - QDir::Filters _ret = self->filter(); - return static_cast(_ret); -} - -void QDirModel_SetSorting(QDirModel* self, int sort) { - self->setSorting(static_cast(sort)); -} - -int QDirModel_Sorting(const QDirModel* self) { - QDir::SortFlags _ret = self->sorting(); - return static_cast(_ret); -} - -void QDirModel_SetResolveSymlinks(QDirModel* self, bool enable) { - self->setResolveSymlinks(enable); -} - -bool QDirModel_ResolveSymlinks(const QDirModel* self) { - return self->resolveSymlinks(); -} - -void QDirModel_SetReadOnly(QDirModel* self, bool enable) { - self->setReadOnly(enable); -} - -bool QDirModel_IsReadOnly(const QDirModel* self) { - return self->isReadOnly(); -} - -void QDirModel_SetLazyChildCount(QDirModel* self, bool enable) { - self->setLazyChildCount(enable); -} - -bool QDirModel_LazyChildCount(const QDirModel* self) { - return self->lazyChildCount(); -} - -QModelIndex* QDirModel_IndexWithPath(const QDirModel* self, struct miqt_string* path) { - QString path_QString = QString::fromUtf8(&path->data, path->len); - return new QModelIndex(self->index(path_QString)); -} - -bool QDirModel_IsDir(const QDirModel* self, QModelIndex* index) { - return self->isDir(*index); -} - -QModelIndex* QDirModel_Mkdir(QDirModel* self, QModelIndex* parent, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); - return new QModelIndex(self->mkdir(*parent, name_QString)); -} - -bool QDirModel_Rmdir(QDirModel* self, QModelIndex* index) { - return self->rmdir(*index); -} - -bool QDirModel_Remove(QDirModel* self, QModelIndex* index) { - return self->remove(*index); -} - -struct miqt_string* QDirModel_FilePath(const QDirModel* self, QModelIndex* index) { - QString _ret = self->filePath(*index); - // 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* QDirModel_FileName(const QDirModel* self, QModelIndex* index) { - QString _ret = self->fileName(*index); - // 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()); -} - -QIcon* QDirModel_FileIcon(const QDirModel* self, QModelIndex* index) { - return new QIcon(self->fileIcon(*index)); -} - -QFileInfo* QDirModel_FileInfo(const QDirModel* self, QModelIndex* index) { - return new QFileInfo(self->fileInfo(*index)); -} - -void QDirModel_Refresh(QDirModel* self) { - self->refresh(); -} - -struct miqt_string* QDirModel_Tr2(const char* s, const char* c) { - QString _ret = QDirModel::tr(s, c); - // 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* QDirModel_Tr3(const char* s, const char* c, int n) { - QString _ret = QDirModel::tr(s, c, static_cast(n)); - // 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* QDirModel_TrUtf82(const char* s, const char* c) { - QString _ret = QDirModel::trUtf8(s, c); - // 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* QDirModel_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QDirModel::trUtf8(s, c, static_cast(n)); - // 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()); -} - -QModelIndex* QDirModel_Index3(const QDirModel* self, int row, int column, QModelIndex* parent) { - return new QModelIndex(self->index(static_cast(row), static_cast(column), *parent)); -} - -int QDirModel_RowCount1(const QDirModel* self, QModelIndex* parent) { - return self->rowCount(*parent); -} - -int QDirModel_ColumnCount1(const QDirModel* self, QModelIndex* parent) { - return self->columnCount(*parent); -} - -QVariant* QDirModel_Data2(const QDirModel* self, QModelIndex* index, int role) { - return new QVariant(self->data(*index, static_cast(role))); -} - -bool QDirModel_SetData3(QDirModel* self, QModelIndex* index, QVariant* value, int role) { - return self->setData(*index, *value, static_cast(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))); -} - -bool QDirModel_HasChildren1(const QDirModel* self, QModelIndex* index) { - return self->hasChildren(*index); -} - -void QDirModel_Sort2(QDirModel* self, int column, int order) { - self->sort(static_cast(column), static_cast(order)); -} - -QModelIndex* QDirModel_Index2(const QDirModel* self, struct miqt_string* path, int column) { - QString path_QString = QString::fromUtf8(&path->data, path->len); - return new QModelIndex(self->index(path_QString, static_cast(column))); -} - -void QDirModel_Refresh1(QDirModel* self, QModelIndex* parent) { - self->refresh(*parent); -} - -void QDirModel_Delete(QDirModel* self) { - delete self; -} - diff --git a/qt/gen_qdirmodel.go b/qt/gen_qdirmodel.go deleted file mode 100644 index 9c9cc5b..0000000 --- a/qt/gen_qdirmodel.go +++ /dev/null @@ -1,453 +0,0 @@ -package qt - -/* - -#include "gen_qdirmodel.h" -#include - -*/ -import "C" - -import ( - "runtime" - "unsafe" -) - -type QDirModel__Roles int - -const ( - QDirModel__FileIconRole QDirModel__Roles = 1 - QDirModel__FilePathRole QDirModel__Roles = 257 - QDirModel__FileNameRole QDirModel__Roles = 258 -) - -type QDirModel struct { - h *C.QDirModel - *QAbstractItemModel -} - -func (this *QDirModel) cPointer() *C.QDirModel { - if this == nil { - return nil - } - return this.h -} - -func newQDirModel(h *C.QDirModel) *QDirModel { - if h == nil { - return nil - } - return &QDirModel{h: h, QAbstractItemModel: newQAbstractItemModel_U(unsafe.Pointer(h))} -} - -func newQDirModel_U(h unsafe.Pointer) *QDirModel { - return newQDirModel((*C.QDirModel)(h)) -} - -// NewQDirModel constructs a new QDirModel object. -func NewQDirModel(nameFilters []string, filters QDir__Filter, sort QDir__SortFlag) *QDirModel { - // For the C ABI, malloc a C array of raw pointers - nameFilters_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(nameFilters)))) - defer C.free(unsafe.Pointer(nameFilters_CArray)) - for i := range nameFilters { - nameFilters_i_ms := miqt_strdupg(nameFilters[i]) - defer C.free(nameFilters_i_ms) - nameFilters_CArray[i] = (*C.struct_miqt_string)(nameFilters_i_ms) - } - 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)) - return newQDirModel(ret) -} - -// NewQDirModel2 constructs a new QDirModel object. -func NewQDirModel2() *QDirModel { - ret := C.QDirModel_new2() - return newQDirModel(ret) -} - -// NewQDirModel3 constructs a new QDirModel object. -func NewQDirModel3(nameFilters []string, filters QDir__Filter, sort QDir__SortFlag, parent *QObject) *QDirModel { - // For the C ABI, malloc a C array of raw pointers - nameFilters_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(nameFilters)))) - defer C.free(unsafe.Pointer(nameFilters_CArray)) - for i := range nameFilters { - nameFilters_i_ms := miqt_strdupg(nameFilters[i]) - defer C.free(nameFilters_i_ms) - nameFilters_CArray[i] = (*C.struct_miqt_string)(nameFilters_i_ms) - } - 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()) - return newQDirModel(ret) -} - -// NewQDirModel4 constructs a new QDirModel object. -func NewQDirModel4(parent *QObject) *QDirModel { - ret := C.QDirModel_new4(parent.cPointer()) - return newQDirModel(ret) -} - -func (this *QDirModel) MetaObject() *QMetaObject { - return newQMetaObject_U(unsafe.Pointer(C.QDirModel_MetaObject(this.h))) -} - -func (this *QDirModel) Metacast(param1 string) unsafe.Pointer { - param1_Cstring := C.CString(param1) - defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QDirModel_Metacast(this.h, param1_Cstring) -} - -func QDirModel_Tr(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDirModel_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QDirModel_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDirModel_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QDirModel) Index(row int, column int) *QModelIndex { - _ret := C.QDirModel_Index(this.h, (C.int)(row), (C.int)(column)) - _goptr := newQModelIndex(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QDirModel) Parent(child *QModelIndex) *QModelIndex { - _ret := C.QDirModel_Parent(this.h, child.cPointer()) - _goptr := newQModelIndex(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QDirModel) RowCount() int { - return (int)(C.QDirModel_RowCount(this.h)) -} - -func (this *QDirModel) ColumnCount() int { - return (int)(C.QDirModel_ColumnCount(this.h)) -} - -func (this *QDirModel) Data(index *QModelIndex) *QVariant { - _ret := C.QDirModel_Data(this.h, index.cPointer()) - _goptr := newQVariant(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QDirModel) SetData(index *QModelIndex, value *QVariant) bool { - return (bool)(C.QDirModel_SetData(this.h, index.cPointer(), value.cPointer())) -} - -func (this *QDirModel) HeaderData(section int, orientation Orientation) *QVariant { - _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 -} - -func (this *QDirModel) HasChildren() bool { - return (bool)(C.QDirModel_HasChildren(this.h)) -} - -func (this *QDirModel) Flags(index *QModelIndex) ItemFlag { - return (ItemFlag)(C.QDirModel_Flags(this.h, index.cPointer())) -} - -func (this *QDirModel) Sort(column int) { - C.QDirModel_Sort(this.h, (C.int)(column)) -} - -func (this *QDirModel) MimeTypes() []string { - var _ma *C.struct_miqt_array = C.QDirModel_MimeTypes(this.h) - _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++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) - _ret[i] = _lv_ret - } - C.free(unsafe.Pointer(_ma)) - return _ret -} - -func (this *QDirModel) MimeData(indexes []QModelIndex) *QMimeData { - // For the C ABI, malloc a C array of raw pointers - indexes_CArray := (*[0xffff]*C.QModelIndex)(C.malloc(C.size_t(8 * len(indexes)))) - defer C.free(unsafe.Pointer(indexes_CArray)) - for i := range indexes { - indexes_CArray[i] = indexes[i].cPointer() - } - indexes_ma := &C.struct_miqt_array{len: C.size_t(len(indexes)), data: unsafe.Pointer(indexes_CArray)} - defer runtime.KeepAlive(unsafe.Pointer(indexes_ma)) - return newQMimeData_U(unsafe.Pointer(C.QDirModel_MimeData(this.h, indexes_ma))) -} - -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.int)(action), (C.int)(row), (C.int)(column), parent.cPointer())) -} - -func (this *QDirModel) SupportedDropActions() DropAction { - return (DropAction)(C.QDirModel_SupportedDropActions(this.h)) -} - -func (this *QDirModel) SetIconProvider(provider *QFileIconProvider) { - C.QDirModel_SetIconProvider(this.h, provider.cPointer()) -} - -func (this *QDirModel) IconProvider() *QFileIconProvider { - return newQFileIconProvider_U(unsafe.Pointer(C.QDirModel_IconProvider(this.h))) -} - -func (this *QDirModel) SetNameFilters(filters []string) { - // For the C ABI, malloc a C array of raw pointers - filters_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(filters)))) - defer C.free(unsafe.Pointer(filters_CArray)) - for i := range filters { - filters_i_ms := miqt_strdupg(filters[i]) - defer C.free(filters_i_ms) - filters_CArray[i] = (*C.struct_miqt_string)(filters_i_ms) - } - filters_ma := &C.struct_miqt_array{len: C.size_t(len(filters)), data: unsafe.Pointer(filters_CArray)} - defer runtime.KeepAlive(unsafe.Pointer(filters_ma)) - C.QDirModel_SetNameFilters(this.h, filters_ma) -} - -func (this *QDirModel) NameFilters() []string { - var _ma *C.struct_miqt_array = C.QDirModel_NameFilters(this.h) - _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++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) - _ret[i] = _lv_ret - } - C.free(unsafe.Pointer(_ma)) - return _ret -} - -func (this *QDirModel) SetFilter(filters QDir__Filter) { - C.QDirModel_SetFilter(this.h, (C.int)(filters)) -} - -func (this *QDirModel) Filter() QDir__Filter { - return (QDir__Filter)(C.QDirModel_Filter(this.h)) -} - -func (this *QDirModel) SetSorting(sort QDir__SortFlag) { - C.QDirModel_SetSorting(this.h, (C.int)(sort)) -} - -func (this *QDirModel) Sorting() QDir__SortFlag { - return (QDir__SortFlag)(C.QDirModel_Sorting(this.h)) -} - -func (this *QDirModel) SetResolveSymlinks(enable bool) { - C.QDirModel_SetResolveSymlinks(this.h, (C.bool)(enable)) -} - -func (this *QDirModel) ResolveSymlinks() bool { - return (bool)(C.QDirModel_ResolveSymlinks(this.h)) -} - -func (this *QDirModel) SetReadOnly(enable bool) { - C.QDirModel_SetReadOnly(this.h, (C.bool)(enable)) -} - -func (this *QDirModel) IsReadOnly() bool { - return (bool)(C.QDirModel_IsReadOnly(this.h)) -} - -func (this *QDirModel) SetLazyChildCount(enable bool) { - C.QDirModel_SetLazyChildCount(this.h, (C.bool)(enable)) -} - -func (this *QDirModel) LazyChildCount() bool { - return (bool)(C.QDirModel_LazyChildCount(this.h)) -} - -func (this *QDirModel) IndexWithPath(path string) *QModelIndex { - path_ms := miqt_strdupg(path) - defer C.free(path_ms) - _ret := C.QDirModel_IndexWithPath(this.h, (*C.struct_miqt_string)(path_ms)) - _goptr := newQModelIndex(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QDirModel) IsDir(index *QModelIndex) bool { - return (bool)(C.QDirModel_IsDir(this.h, index.cPointer())) -} - -func (this *QDirModel) Mkdir(parent *QModelIndex, name string) *QModelIndex { - name_ms := miqt_strdupg(name) - defer C.free(name_ms) - _ret := C.QDirModel_Mkdir(this.h, parent.cPointer(), (*C.struct_miqt_string)(name_ms)) - _goptr := newQModelIndex(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QDirModel) Rmdir(index *QModelIndex) bool { - return (bool)(C.QDirModel_Rmdir(this.h, index.cPointer())) -} - -func (this *QDirModel) Remove(index *QModelIndex) bool { - return (bool)(C.QDirModel_Remove(this.h, index.cPointer())) -} - -func (this *QDirModel) FilePath(index *QModelIndex) string { - var _ms *C.struct_miqt_string = C.QDirModel_FilePath(this.h, index.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QDirModel) FileName(index *QModelIndex) string { - var _ms *C.struct_miqt_string = C.QDirModel_FileName(this.h, index.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QDirModel) FileIcon(index *QModelIndex) *QIcon { - _ret := C.QDirModel_FileIcon(this.h, index.cPointer()) - _goptr := newQIcon(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QDirModel) FileInfo(index *QModelIndex) *QFileInfo { - _ret := C.QDirModel_FileInfo(this.h, index.cPointer()) - _goptr := newQFileInfo(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QDirModel) Refresh() { - C.QDirModel_Refresh(this.h) -} - -func QDirModel_Tr2(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDirModel_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QDirModel_Tr3(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDirModel_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QDirModel_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDirModel_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QDirModel_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDirModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QDirModel) Index3(row int, column int, parent *QModelIndex) *QModelIndex { - _ret := C.QDirModel_Index3(this.h, (C.int)(row), (C.int)(column), parent.cPointer()) - _goptr := newQModelIndex(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QDirModel) RowCount1(parent *QModelIndex) int { - return (int)(C.QDirModel_RowCount1(this.h, parent.cPointer())) -} - -func (this *QDirModel) ColumnCount1(parent *QModelIndex) int { - return (int)(C.QDirModel_ColumnCount1(this.h, parent.cPointer())) -} - -func (this *QDirModel) Data2(index *QModelIndex, role int) *QVariant { - _ret := C.QDirModel_Data2(this.h, index.cPointer(), (C.int)(role)) - _goptr := newQVariant(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QDirModel) SetData3(index *QModelIndex, value *QVariant, role int) bool { - return (bool)(C.QDirModel_SetData3(this.h, index.cPointer(), value.cPointer(), (C.int)(role))) -} - -func (this *QDirModel) HeaderData3(section int, orientation Orientation, role int) *QVariant { - _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 -} - -func (this *QDirModel) HasChildren1(index *QModelIndex) bool { - return (bool)(C.QDirModel_HasChildren1(this.h, index.cPointer())) -} - -func (this *QDirModel) Sort2(column int, order SortOrder) { - C.QDirModel_Sort2(this.h, (C.int)(column), (C.int)(order)) -} - -func (this *QDirModel) Index2(path string, column int) *QModelIndex { - path_ms := miqt_strdupg(path) - defer C.free(path_ms) - _ret := C.QDirModel_Index2(this.h, (*C.struct_miqt_string)(path_ms), (C.int)(column)) - _goptr := newQModelIndex(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QDirModel) Refresh1(parent *QModelIndex) { - C.QDirModel_Refresh1(this.h, parent.cPointer()) -} - -// Delete this object from C++ memory. -func (this *QDirModel) Delete() { - C.QDirModel_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QDirModel) GoGC() { - runtime.SetFinalizer(this, func(this *QDirModel) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} diff --git a/qt/gen_qdirmodel.h b/qt/gen_qdirmodel.h deleted file mode 100644 index 9177116..0000000 --- a/qt/gen_qdirmodel.h +++ /dev/null @@ -1,104 +0,0 @@ -#ifndef GEN_QDIRMODEL_H -#define GEN_QDIRMODEL_H - -#include -#include -#include - -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - -#include "binding.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __cplusplus -class QDirModel; -class QFileIconProvider; -class QFileInfo; -class QIcon; -class QMetaObject; -class QMimeData; -class QModelIndex; -class QObject; -class QVariant; -#else -typedef struct QDirModel QDirModel; -typedef struct QFileIconProvider QFileIconProvider; -typedef struct QFileInfo QFileInfo; -typedef struct QIcon QIcon; -typedef struct QMetaObject QMetaObject; -typedef struct QMimeData QMimeData; -typedef struct QModelIndex QModelIndex; -typedef struct QObject QObject; -typedef struct QVariant QVariant; -#endif - -QDirModel* QDirModel_new(struct miqt_array* /* of struct miqt_string* */ nameFilters, int filters, int sort); -QDirModel* QDirModel_new2(); -QDirModel* QDirModel_new3(struct miqt_array* /* of struct miqt_string* */ nameFilters, int filters, int sort, QObject* parent); -QDirModel* QDirModel_new4(QObject* parent); -QMetaObject* QDirModel_MetaObject(const QDirModel* self); -void* QDirModel_Metacast(QDirModel* self, const char* param1); -struct miqt_string* QDirModel_Tr(const char* s); -struct miqt_string* QDirModel_TrUtf8(const char* s); -QModelIndex* QDirModel_Index(const QDirModel* self, int row, int column); -QModelIndex* QDirModel_Parent(const QDirModel* self, QModelIndex* child); -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, 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, 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); -void QDirModel_SetNameFilters(QDirModel* self, struct miqt_array* /* of struct miqt_string* */ filters); -struct miqt_array* QDirModel_NameFilters(const QDirModel* self); -void QDirModel_SetFilter(QDirModel* self, int filters); -int QDirModel_Filter(const QDirModel* self); -void QDirModel_SetSorting(QDirModel* self, int sort); -int QDirModel_Sorting(const QDirModel* self); -void QDirModel_SetResolveSymlinks(QDirModel* self, bool enable); -bool QDirModel_ResolveSymlinks(const QDirModel* self); -void QDirModel_SetReadOnly(QDirModel* self, bool enable); -bool QDirModel_IsReadOnly(const QDirModel* self); -void QDirModel_SetLazyChildCount(QDirModel* self, bool enable); -bool QDirModel_LazyChildCount(const QDirModel* self); -QModelIndex* QDirModel_IndexWithPath(const QDirModel* self, struct miqt_string* path); -bool QDirModel_IsDir(const QDirModel* self, QModelIndex* index); -QModelIndex* QDirModel_Mkdir(QDirModel* self, QModelIndex* parent, struct miqt_string* name); -bool QDirModel_Rmdir(QDirModel* self, QModelIndex* index); -bool QDirModel_Remove(QDirModel* self, QModelIndex* index); -struct miqt_string* QDirModel_FilePath(const QDirModel* self, QModelIndex* index); -struct miqt_string* QDirModel_FileName(const QDirModel* self, QModelIndex* index); -QIcon* QDirModel_FileIcon(const QDirModel* self, QModelIndex* index); -QFileInfo* QDirModel_FileInfo(const QDirModel* self, QModelIndex* index); -void QDirModel_Refresh(QDirModel* self); -struct miqt_string* QDirModel_Tr2(const char* s, const char* c); -struct miqt_string* QDirModel_Tr3(const char* s, const char* c, int n); -struct miqt_string* QDirModel_TrUtf82(const char* s, const char* c); -struct miqt_string* QDirModel_TrUtf83(const char* s, const char* c, int n); -QModelIndex* QDirModel_Index3(const QDirModel* self, int row, int column, QModelIndex* parent); -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, int orientation, int role); -bool QDirModel_HasChildren1(const QDirModel* self, QModelIndex* index); -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); - -#ifdef __cplusplus -} /* extern C */ -#endif - -#endif diff --git a/qt/gen_qdockwidget.cpp b/qt/gen_qdockwidget.cpp index ee0e533..0aa1b17 100644 --- a/qt/gen_qdockwidget.cpp +++ b/qt/gen_qdockwidget.cpp @@ -51,13 +51,6 @@ struct miqt_string* QDockWidget_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QDockWidget_TrUtf8(const char* s) { - QString _ret = QDockWidget::trUtf8(s); - // 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()); -} - QWidget* QDockWidget_Widget(const QDockWidget* self) { return self->widget(); } @@ -180,20 +173,6 @@ struct miqt_string* QDockWidget_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QDockWidget_TrUtf82(const char* s, const char* c) { - QString _ret = QDockWidget::trUtf8(s, c); - // 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* QDockWidget_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QDockWidget::trUtf8(s, c, static_cast(n)); - // 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 QDockWidget_Delete(QDockWidget* self) { delete self; } diff --git a/qt/gen_qdockwidget.go b/qt/gen_qdockwidget.go index 34d2cd5..7a116f3 100644 --- a/qt/gen_qdockwidget.go +++ b/qt/gen_qdockwidget.go @@ -22,7 +22,6 @@ const ( QDockWidget__DockWidgetFloatable QDockWidget__DockWidgetFeature = 4 QDockWidget__DockWidgetVerticalTitleBar QDockWidget__DockWidgetFeature = 8 QDockWidget__DockWidgetFeatureMask QDockWidget__DockWidgetFeature = 15 - QDockWidget__AllDockWidgetFeatures QDockWidget__DockWidgetFeature = 7 QDockWidget__NoDockWidgetFeatures QDockWidget__DockWidgetFeature = 0 QDockWidget__Reserved QDockWidget__DockWidgetFeature = 255 ) @@ -111,15 +110,6 @@ func QDockWidget_Tr(s string) string { return _ret } -func QDockWidget_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDockWidget_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QDockWidget) Widget() *QWidget { return newQWidget_U(unsafe.Pointer(C.QDockWidget_Widget(this.h))) } @@ -290,28 +280,6 @@ func QDockWidget_Tr3(s string, c string, n int) string { return _ret } -func QDockWidget_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDockWidget_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QDockWidget_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDockWidget_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QDockWidget) Delete() { C.QDockWidget_Delete(this.h) diff --git a/qt/gen_qdockwidget.h b/qt/gen_qdockwidget.h index 7a21f1e..b250cb2 100644 --- a/qt/gen_qdockwidget.h +++ b/qt/gen_qdockwidget.h @@ -34,7 +34,6 @@ QDockWidget* QDockWidget_new6(QWidget* parent, int flags); QMetaObject* QDockWidget_MetaObject(const QDockWidget* self); void* QDockWidget_Metacast(QDockWidget* self, const char* param1); struct miqt_string* QDockWidget_Tr(const char* s); -struct miqt_string* QDockWidget_TrUtf8(const char* s); QWidget* QDockWidget_Widget(const QDockWidget* self); void QDockWidget_SetWidget(QDockWidget* self, QWidget* widget); void QDockWidget_SetFeatures(QDockWidget* self, int features); @@ -59,8 +58,6 @@ 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); -struct miqt_string* QDockWidget_TrUtf82(const char* s, const char* c); -struct miqt_string* QDockWidget_TrUtf83(const char* s, const char* c, int n); void QDockWidget_Delete(QDockWidget* self); #ifdef __cplusplus diff --git a/qt/gen_qdrag.cpp b/qt/gen_qdrag.cpp index a6148b9..6c3f862 100644 --- a/qt/gen_qdrag.cpp +++ b/qt/gen_qdrag.cpp @@ -30,13 +30,6 @@ struct miqt_string* QDrag_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QDrag_TrUtf8(const char* s) { - QString _ret = QDrag::trUtf8(s); - // 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 QDrag_SetMimeData(QDrag* self, QMimeData* data) { self->setMimeData(data); } @@ -69,11 +62,6 @@ QObject* QDrag_Target(const QDrag* self) { return self->target(); } -int QDrag_Start(QDrag* self) { - Qt::DropAction _ret = self->start(); - return static_cast(_ret); -} - int QDrag_Exec(QDrag* self) { Qt::DropAction _ret = self->exec(); return static_cast(_ret); @@ -143,25 +131,6 @@ struct miqt_string* QDrag_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QDrag_TrUtf82(const char* s, const char* c) { - QString _ret = QDrag::trUtf8(s, c); - // 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* QDrag_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QDrag::trUtf8(s, c, static_cast(n)); - // 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()); -} - -int QDrag_Start1(QDrag* self, int supportedActions) { - Qt::DropAction _ret = self->start(static_cast(supportedActions)); - return static_cast(_ret); -} - int QDrag_Exec1(QDrag* self, int supportedActions) { Qt::DropAction _ret = self->exec(static_cast(supportedActions)); return static_cast(_ret); diff --git a/qt/gen_qdrag.go b/qt/gen_qdrag.go index 39424b0..f3192a8 100644 --- a/qt/gen_qdrag.go +++ b/qt/gen_qdrag.go @@ -62,15 +62,6 @@ func QDrag_Tr(s string) string { return _ret } -func QDrag_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDrag_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QDrag) SetMimeData(data *QMimeData) { C.QDrag_SetMimeData(this.h, data.cPointer()) } @@ -109,10 +100,6 @@ func (this *QDrag) Target() *QObject { return newQObject_U(unsafe.Pointer(C.QDrag_Target(this.h))) } -func (this *QDrag) Start() DropAction { - return (DropAction)(C.QDrag_Start(this.h)) -} - func (this *QDrag) Exec() DropAction { return (DropAction)(C.QDrag_Exec(this.h)) } @@ -206,32 +193,6 @@ func QDrag_Tr3(s string, c string, n int) string { return _ret } -func QDrag_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDrag_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QDrag_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDrag_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QDrag) Start1(supportedActions DropAction) DropAction { - return (DropAction)(C.QDrag_Start1(this.h, (C.int)(supportedActions))) -} - func (this *QDrag) Exec1(supportedActions DropAction) DropAction { return (DropAction)(C.QDrag_Exec1(this.h, (C.int)(supportedActions))) } diff --git a/qt/gen_qdrag.h b/qt/gen_qdrag.h index a13e140..cd7265d 100644 --- a/qt/gen_qdrag.h +++ b/qt/gen_qdrag.h @@ -33,7 +33,6 @@ QDrag* QDrag_new(QObject* dragSource); QMetaObject* QDrag_MetaObject(const QDrag* self); void* QDrag_Metacast(QDrag* self, const char* param1); struct miqt_string* QDrag_Tr(const char* s); -struct miqt_string* QDrag_TrUtf8(const char* s); void QDrag_SetMimeData(QDrag* self, QMimeData* data); QMimeData* QDrag_MimeData(const QDrag* self); void QDrag_SetPixmap(QDrag* self, QPixmap* pixmap); @@ -42,7 +41,6 @@ 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); -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); @@ -56,9 +54,6 @@ void QDrag_TargetChanged(QDrag* self, QObject* newTarget); void QDrag_connect_TargetChanged(QDrag* self, void* slot); struct miqt_string* QDrag_Tr2(const char* s, const char* c); struct miqt_string* QDrag_Tr3(const char* s, const char* c, int n); -struct miqt_string* QDrag_TrUtf82(const char* s, const char* c); -struct miqt_string* QDrag_TrUtf83(const char* s, const char* c, int n); -int QDrag_Start1(QDrag* self, int supportedActions); int QDrag_Exec1(QDrag* self, int supportedActions); void QDrag_Delete(QDrag* self); diff --git a/qt/gen_qeasingcurve.cpp b/qt/gen_qeasingcurve.cpp index 59a830a..cb6c267 100644 --- a/qt/gen_qeasingcurve.cpp +++ b/qt/gen_qeasingcurve.cpp @@ -69,7 +69,7 @@ void QEasingCurve_AddTCBSegment(QEasingCurve* self, QPointF* nextPoint, double t } struct miqt_array* QEasingCurve_ToCubicSpline(const QEasingCurve* self) { - QVector _ret = self->toCubicSpline(); + QList _ret = self->toCubicSpline(); // Convert QList<> from C++ memory to manually-managed C memory QPointF** _arr = static_cast(malloc(sizeof(QPointF*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { diff --git a/qt/gen_qeasingcurve.go b/qt/gen_qeasingcurve.go index 4518570..1663633 100644 --- a/qt/gen_qeasingcurve.go +++ b/qt/gen_qeasingcurve.go @@ -160,10 +160,10 @@ func (this *QEasingCurve) ToCubicSpline() []QPointF { _ret := make([]QPointF, int(_ma.len)) _outCast := (*[0xffff]*C.QPointF)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _vv_ret := _outCast[i] - _vv_goptr := newQPointF(_vv_ret) - _vv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_vv_goptr + _lv_ret := _outCast[i] + _lv_goptr := newQPointF(_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 diff --git a/qt/gen_qelapsedtimer.cpp b/qt/gen_qelapsedtimer.cpp index c43ef09..362853a 100644 --- a/qt/gen_qelapsedtimer.cpp +++ b/qt/gen_qelapsedtimer.cpp @@ -62,14 +62,6 @@ long long QElapsedTimer_SecsTo(const QElapsedTimer* self, QElapsedTimer* other) return static_cast(_ret); } -bool QElapsedTimer_OperatorEqual(const QElapsedTimer* self, QElapsedTimer* other) { - return self->operator==(*other); -} - -bool QElapsedTimer_OperatorNotEqual(const QElapsedTimer* self, QElapsedTimer* other) { - return self->operator!=(*other); -} - void QElapsedTimer_Delete(QElapsedTimer* self) { delete self; } diff --git a/qt/gen_qelapsedtimer.go b/qt/gen_qelapsedtimer.go index 5bcbd48..307fc6e 100644 --- a/qt/gen_qelapsedtimer.go +++ b/qt/gen_qelapsedtimer.go @@ -18,9 +18,8 @@ type QElapsedTimer__ClockType int const ( QElapsedTimer__SystemTime QElapsedTimer__ClockType = 0 QElapsedTimer__MonotonicClock QElapsedTimer__ClockType = 1 - QElapsedTimer__TickCounter QElapsedTimer__ClockType = 2 - QElapsedTimer__MachAbsoluteTime QElapsedTimer__ClockType = 3 - QElapsedTimer__PerformanceCounter QElapsedTimer__ClockType = 4 + QElapsedTimer__MachAbsoluteTime QElapsedTimer__ClockType = 2 + QElapsedTimer__PerformanceCounter QElapsedTimer__ClockType = 3 ) type QElapsedTimer struct { @@ -99,14 +98,6 @@ func (this *QElapsedTimer) SecsTo(other *QElapsedTimer) int64 { return (int64)(C.QElapsedTimer_SecsTo(this.h, other.cPointer())) } -func (this *QElapsedTimer) OperatorEqual(other *QElapsedTimer) bool { - return (bool)(C.QElapsedTimer_OperatorEqual(this.h, other.cPointer())) -} - -func (this *QElapsedTimer) OperatorNotEqual(other *QElapsedTimer) bool { - return (bool)(C.QElapsedTimer_OperatorNotEqual(this.h, other.cPointer())) -} - // Delete this object from C++ memory. func (this *QElapsedTimer) Delete() { C.QElapsedTimer_Delete(this.h) diff --git a/qt/gen_qelapsedtimer.h b/qt/gen_qelapsedtimer.h index 229f068..fafe0b7 100644 --- a/qt/gen_qelapsedtimer.h +++ b/qt/gen_qelapsedtimer.h @@ -32,8 +32,6 @@ bool QElapsedTimer_HasExpired(const QElapsedTimer* self, long long timeout); long long QElapsedTimer_MsecsSinceReference(const QElapsedTimer* self); long long QElapsedTimer_MsecsTo(const QElapsedTimer* self, QElapsedTimer* other); long long QElapsedTimer_SecsTo(const QElapsedTimer* self, QElapsedTimer* other); -bool QElapsedTimer_OperatorEqual(const QElapsedTimer* self, QElapsedTimer* other); -bool QElapsedTimer_OperatorNotEqual(const QElapsedTimer* self, QElapsedTimer* other); void QElapsedTimer_Delete(QElapsedTimer* self); #ifdef __cplusplus diff --git a/qt/gen_qerrormessage.cpp b/qt/gen_qerrormessage.cpp index f2d5860..39b9bca 100644 --- a/qt/gen_qerrormessage.cpp +++ b/qt/gen_qerrormessage.cpp @@ -31,13 +31,6 @@ struct miqt_string* QErrorMessage_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QErrorMessage_TrUtf8(const char* s) { - QString _ret = QErrorMessage::trUtf8(s); - // 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()); -} - QErrorMessage* QErrorMessage_QtHandler() { return QErrorMessage::qtHandler(); } @@ -67,20 +60,6 @@ struct miqt_string* QErrorMessage_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QErrorMessage_TrUtf82(const char* s, const char* c) { - QString _ret = QErrorMessage::trUtf8(s, c); - // 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* QErrorMessage_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QErrorMessage::trUtf8(s, c, static_cast(n)); - // 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 QErrorMessage_Delete(QErrorMessage* self) { delete self; } diff --git a/qt/gen_qerrormessage.go b/qt/gen_qerrormessage.go index 0514ddd..a969f77 100644 --- a/qt/gen_qerrormessage.go +++ b/qt/gen_qerrormessage.go @@ -67,15 +67,6 @@ func QErrorMessage_Tr(s string) string { return _ret } -func QErrorMessage_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QErrorMessage_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func QErrorMessage_QtHandler() *QErrorMessage { return newQErrorMessage_U(unsafe.Pointer(C.QErrorMessage_QtHandler())) } @@ -116,28 +107,6 @@ func QErrorMessage_Tr3(s string, c string, n int) string { return _ret } -func QErrorMessage_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QErrorMessage_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QErrorMessage_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QErrorMessage_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QErrorMessage) Delete() { C.QErrorMessage_Delete(this.h) diff --git a/qt/gen_qerrormessage.h b/qt/gen_qerrormessage.h index 9bf729c..7c9f0cb 100644 --- a/qt/gen_qerrormessage.h +++ b/qt/gen_qerrormessage.h @@ -28,14 +28,11 @@ QErrorMessage* QErrorMessage_new2(QWidget* parent); QMetaObject* QErrorMessage_MetaObject(const QErrorMessage* self); void* QErrorMessage_Metacast(QErrorMessage* self, const char* param1); struct miqt_string* QErrorMessage_Tr(const char* s); -struct miqt_string* QErrorMessage_TrUtf8(const char* s); QErrorMessage* QErrorMessage_QtHandler(); void QErrorMessage_ShowMessage(QErrorMessage* self, struct miqt_string* message); void QErrorMessage_ShowMessage2(QErrorMessage* self, struct miqt_string* message, struct miqt_string* typeVal); struct miqt_string* QErrorMessage_Tr2(const char* s, const char* c); struct miqt_string* QErrorMessage_Tr3(const char* s, const char* c, int n); -struct miqt_string* QErrorMessage_TrUtf82(const char* s, const char* c); -struct miqt_string* QErrorMessage_TrUtf83(const char* s, const char* c, int n); void QErrorMessage_Delete(QErrorMessage* self); #ifdef __cplusplus diff --git a/qt/gen_qevent.cpp b/qt/gen_qevent.cpp index ff54c13..392180f 100644 --- a/qt/gen_qevent.cpp +++ b/qt/gen_qevent.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -16,10 +17,12 @@ #include #include #include +#include #include #include #define WORKAROUND_INNER_CLASS_DEFINITION_QInputMethodEvent__Attribute #include +#include #include #include #include @@ -31,7 +34,8 @@ #include #include #include -#include +#include +#include #include #include #include @@ -42,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -50,30 +55,35 @@ #include #include #include -#include #include -#define WORKAROUND_INNER_CLASS_DEFINITION_QTouchEvent__TouchPoint #include #include -#include #include #include -#include #include #include "qevent.h" #include "gen_qevent.h" #include "_cgo_export.h" -QInputEvent* QInputEvent_new(int typeVal) { - return new QInputEvent(static_cast(typeVal)); +QInputEvent* QInputEvent_new(int typeVal, QInputDevice* m_dev) { + return new QInputEvent(static_cast(typeVal), m_dev); } -QInputEvent* QInputEvent_new2(QInputEvent* param1) { - return new QInputEvent(*param1); +QInputEvent* QInputEvent_new2(int typeVal, QInputDevice* m_dev, int modifiers) { + return new QInputEvent(static_cast(typeVal), m_dev, static_cast(modifiers)); } -QInputEvent* QInputEvent_new3(int typeVal, int modifiers) { - return new QInputEvent(static_cast(typeVal), static_cast(modifiers)); +QInputEvent* QInputEvent_Clone(const QInputEvent* self) { + return self->clone(); +} + +QInputDevice* QInputEvent_Device(const QInputEvent* self) { + return (QInputDevice*) self->device(); +} + +int QInputEvent_DeviceType(const QInputEvent* self) { + QInputDevice::DeviceType _ret = self->deviceType(); + return static_cast(_ret); } int QInputEvent_Modifiers(const QInputEvent* self) { @@ -81,29 +91,194 @@ int QInputEvent_Modifiers(const QInputEvent* self) { return static_cast(_ret); } -void QInputEvent_SetModifiers(QInputEvent* self, int amodifiers) { - self->setModifiers(static_cast(amodifiers)); +void QInputEvent_SetModifiers(QInputEvent* self, int modifiers) { + self->setModifiers(static_cast(modifiers)); } -unsigned long QInputEvent_Timestamp(const QInputEvent* self) { - ulong _ret = self->timestamp(); - return static_cast(_ret); +unsigned long long QInputEvent_Timestamp(const QInputEvent* self) { + quint64 _ret = self->timestamp(); + return static_cast(_ret); } -void QInputEvent_SetTimestamp(QInputEvent* self, unsigned long atimestamp) { - self->setTimestamp(static_cast(atimestamp)); +void QInputEvent_SetTimestamp(QInputEvent* self, unsigned long long timestamp) { + self->setTimestamp(static_cast(timestamp)); } void QInputEvent_Delete(QInputEvent* self) { delete self; } -QEnterEvent* QEnterEvent_new(QPointF* localPos, QPointF* windowPos, QPointF* screenPos) { - return new QEnterEvent(*localPos, *windowPos, *screenPos); +QPointerEvent* QPointerEvent_new(int typeVal, QPointingDevice* dev) { + return new QPointerEvent(static_cast(typeVal), dev); } -QEnterEvent* QEnterEvent_new2(QEnterEvent* param1) { - return new QEnterEvent(*param1); +QPointerEvent* QPointerEvent_new2(int typeVal, QPointingDevice* dev, int modifiers) { + return new QPointerEvent(static_cast(typeVal), dev, static_cast(modifiers)); +} + +QPointerEvent* QPointerEvent_new3(int typeVal, QPointingDevice* dev, int modifiers, struct miqt_array* /* of QEventPoint* */ points) { + QList points_QList; + points_QList.reserve(points->len); + QEventPoint** points_arr = static_cast(points->data); + for(size_t i = 0; i < points->len; ++i) { + points_QList.push_back(*(points_arr[i])); + } + return new QPointerEvent(static_cast(typeVal), dev, static_cast(modifiers), points_QList); +} + +QPointerEvent* QPointerEvent_Clone(const QPointerEvent* self) { + return self->clone(); +} + +QPointingDevice* QPointerEvent_PointingDevice(const QPointerEvent* self) { + return (QPointingDevice*) self->pointingDevice(); +} + +int QPointerEvent_PointerType(const QPointerEvent* self) { + QPointingDevice::PointerType _ret = self->pointerType(); + return static_cast(_ret); +} + +void QPointerEvent_SetTimestamp(QPointerEvent* self, unsigned long long timestamp) { + self->setTimestamp(static_cast(timestamp)); +} + +ptrdiff_t QPointerEvent_PointCount(const QPointerEvent* self) { + qsizetype _ret = self->pointCount(); + return static_cast(_ret); +} + +QEventPoint* QPointerEvent_Point(QPointerEvent* self, ptrdiff_t i) { + QEventPoint& _ret = self->point((qsizetype)(i)); + // Cast returned reference into pointer + return &_ret; +} + +struct miqt_array* QPointerEvent_Points(const QPointerEvent* self) { + const QList& _ret = self->points(); + // Convert QList<> from C++ memory to manually-managed C memory + QEventPoint** _arr = static_cast(malloc(sizeof(QEventPoint*) * _ret.length())); + for (size_t i = 0, e = _ret.length(); i < e; ++i) { + _arr[i] = new QEventPoint(_ret[i]); + } + struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); + _out->len = _ret.length(); + _out->data = static_cast(_arr); + return _out; +} + +QEventPoint* QPointerEvent_PointById(QPointerEvent* self, int id) { + return self->pointById(static_cast(id)); +} + +bool QPointerEvent_AllPointsGrabbed(const QPointerEvent* self) { + return self->allPointsGrabbed(); +} + +bool QPointerEvent_IsBeginEvent(const QPointerEvent* self) { + return self->isBeginEvent(); +} + +bool QPointerEvent_IsUpdateEvent(const QPointerEvent* self) { + return self->isUpdateEvent(); +} + +bool QPointerEvent_IsEndEvent(const QPointerEvent* self) { + return self->isEndEvent(); +} + +bool QPointerEvent_AllPointsAccepted(const QPointerEvent* self) { + return self->allPointsAccepted(); +} + +void QPointerEvent_SetAccepted(QPointerEvent* self, bool accepted) { + self->setAccepted(accepted); +} + +QObject* QPointerEvent_ExclusiveGrabber(const QPointerEvent* self, QEventPoint* point) { + return self->exclusiveGrabber(*point); +} + +void QPointerEvent_SetExclusiveGrabber(QPointerEvent* self, QEventPoint* point, QObject* exclusiveGrabber) { + self->setExclusiveGrabber(*point, exclusiveGrabber); +} + +void QPointerEvent_ClearPassiveGrabbers(QPointerEvent* self, QEventPoint* point) { + self->clearPassiveGrabbers(*point); +} + +bool QPointerEvent_AddPassiveGrabber(QPointerEvent* self, QEventPoint* point, QObject* grabber) { + return self->addPassiveGrabber(*point, grabber); +} + +bool QPointerEvent_RemovePassiveGrabber(QPointerEvent* self, QEventPoint* point, QObject* grabber) { + return self->removePassiveGrabber(*point, grabber); +} + +void QPointerEvent_Delete(QPointerEvent* self) { + delete self; +} + +QSinglePointEvent* QSinglePointEvent_Clone(const QSinglePointEvent* self) { + return self->clone(); +} + +int QSinglePointEvent_Button(const QSinglePointEvent* self) { + Qt::MouseButton _ret = self->button(); + return static_cast(_ret); +} + +int QSinglePointEvent_Buttons(const QSinglePointEvent* self) { + Qt::MouseButtons _ret = self->buttons(); + return static_cast(_ret); +} + +QPointF* QSinglePointEvent_Position(const QSinglePointEvent* self) { + return new QPointF(self->position()); +} + +QPointF* QSinglePointEvent_ScenePosition(const QSinglePointEvent* self) { + return new QPointF(self->scenePosition()); +} + +QPointF* QSinglePointEvent_GlobalPosition(const QSinglePointEvent* self) { + return new QPointF(self->globalPosition()); +} + +bool QSinglePointEvent_IsBeginEvent(const QSinglePointEvent* self) { + return self->isBeginEvent(); +} + +bool QSinglePointEvent_IsUpdateEvent(const QSinglePointEvent* self) { + return self->isUpdateEvent(); +} + +bool QSinglePointEvent_IsEndEvent(const QSinglePointEvent* self) { + return self->isEndEvent(); +} + +QObject* QSinglePointEvent_ExclusivePointGrabber(const QSinglePointEvent* self) { + return self->exclusivePointGrabber(); +} + +void QSinglePointEvent_SetExclusivePointGrabber(QSinglePointEvent* self, QObject* exclusiveGrabber) { + self->setExclusivePointGrabber(exclusiveGrabber); +} + +void QSinglePointEvent_Delete(QSinglePointEvent* self) { + delete self; +} + +QEnterEvent* QEnterEvent_new(QPointF* localPos, QPointF* scenePos, QPointF* globalPos) { + return new QEnterEvent(*localPos, *scenePos, *globalPos); +} + +QEnterEvent* QEnterEvent_new2(QPointF* localPos, QPointF* scenePos, QPointF* globalPos, QPointingDevice* device) { + return new QEnterEvent(*localPos, *scenePos, *globalPos, device); +} + +QEnterEvent* QEnterEvent_Clone(const QEnterEvent* self) { + return self->clone(); } QPoint* QEnterEvent_Pos(const QEnterEvent* self) { @@ -131,21 +306,15 @@ int QEnterEvent_GlobalY(const QEnterEvent* self) { } QPointF* QEnterEvent_LocalPos(const QEnterEvent* self) { - const QPointF& _ret = self->localPos(); - // Cast returned reference into pointer - return const_cast(&_ret); + return new QPointF(self->localPos()); } QPointF* QEnterEvent_WindowPos(const QEnterEvent* self) { - const QPointF& _ret = self->windowPos(); - // Cast returned reference into pointer - return const_cast(&_ret); + return new QPointF(self->windowPos()); } QPointF* QEnterEvent_ScreenPos(const QEnterEvent* self) { - const QPointF& _ret = self->screenPos(); - // Cast returned reference into pointer - return const_cast(&_ret); + return new QPointF(self->screenPos()); } void QEnterEvent_Delete(QEnterEvent* self) { @@ -156,20 +325,36 @@ QMouseEvent* QMouseEvent_new(int typeVal, QPointF* localPos, int button, int but return new QMouseEvent(static_cast(typeVal), *localPos, static_cast(button), static_cast(buttons), static_cast(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_new2(int typeVal, QPointF* localPos, QPointF* globalPos, int button, int buttons, int modifiers) { + return new QMouseEvent(static_cast(typeVal), *localPos, *globalPos, static_cast(button), static_cast(buttons), static_cast(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_new3(int typeVal, QPointF* localPos, QPointF* scenePos, QPointF* globalPos, int button, int buttons, int modifiers) { + return new QMouseEvent(static_cast(typeVal), *localPos, *scenePos, *globalPos, static_cast(button), static_cast(buttons), static_cast(modifiers)); } -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)); +QMouseEvent* QMouseEvent_new4(int typeVal, QPointF* localPos, QPointF* scenePos, QPointF* globalPos, int button, int buttons, int modifiers, int source) { + return new QMouseEvent(static_cast(typeVal), *localPos, *scenePos, *globalPos, static_cast(button), static_cast(buttons), static_cast(modifiers), static_cast(source)); } -QMouseEvent* QMouseEvent_new5(QMouseEvent* param1) { - return new QMouseEvent(*param1); +QMouseEvent* QMouseEvent_new5(int typeVal, QPointF* localPos, int button, int buttons, int modifiers, QPointingDevice* device) { + return new QMouseEvent(static_cast(typeVal), *localPos, static_cast(button), static_cast(buttons), static_cast(modifiers), device); +} + +QMouseEvent* QMouseEvent_new6(int typeVal, QPointF* localPos, QPointF* globalPos, int button, int buttons, int modifiers, QPointingDevice* device) { + return new QMouseEvent(static_cast(typeVal), *localPos, *globalPos, static_cast(button), static_cast(buttons), static_cast(modifiers), device); +} + +QMouseEvent* QMouseEvent_new7(int typeVal, QPointF* localPos, QPointF* scenePos, QPointF* globalPos, int button, int buttons, int modifiers, QPointingDevice* device) { + return new QMouseEvent(static_cast(typeVal), *localPos, *scenePos, *globalPos, static_cast(button), static_cast(buttons), static_cast(modifiers), device); +} + +QMouseEvent* QMouseEvent_new8(int typeVal, QPointF* localPos, QPointF* scenePos, QPointF* globalPos, int button, int buttons, int modifiers, int source, QPointingDevice* device) { + return new QMouseEvent(static_cast(typeVal), *localPos, *scenePos, *globalPos, static_cast(button), static_cast(buttons), static_cast(modifiers), static_cast(source), device); +} + +QMouseEvent* QMouseEvent_Clone(const QMouseEvent* self) { + return self->clone(); } QPoint* QMouseEvent_Pos(const QMouseEvent* self) { @@ -197,35 +382,15 @@ int QMouseEvent_GlobalY(const QMouseEvent* self) { } QPointF* QMouseEvent_LocalPos(const QMouseEvent* self) { - const QPointF& _ret = self->localPos(); - // Cast returned reference into pointer - return const_cast(&_ret); + return new QPointF(self->localPos()); } QPointF* QMouseEvent_WindowPos(const QMouseEvent* self) { - const QPointF& _ret = self->windowPos(); - // Cast returned reference into pointer - return const_cast(&_ret); + return new QPointF(self->windowPos()); } QPointF* QMouseEvent_ScreenPos(const QMouseEvent* self) { - const QPointF& _ret = self->screenPos(); - // Cast returned reference into pointer - return const_cast(&_ret); -} - -int QMouseEvent_Button(const QMouseEvent* self) { - Qt::MouseButton _ret = self->button(); - return static_cast(_ret); -} - -int QMouseEvent_Buttons(const QMouseEvent* self) { - Qt::MouseButtons _ret = self->buttons(); - return static_cast(_ret); -} - -void QMouseEvent_SetLocalPos(QMouseEvent* self, QPointF* localPosition) { - self->setLocalPos(*localPosition); + return new QPointF(self->screenPos()); } int QMouseEvent_Source(const QMouseEvent* self) { @@ -242,86 +407,74 @@ void QMouseEvent_Delete(QMouseEvent* self) { delete self; } -QHoverEvent* QHoverEvent_new(int typeVal, QPointF* pos, QPointF* oldPos) { +QHoverEvent* QHoverEvent_new(int typeVal, QPointF* scenePos, QPointF* globalPos, QPointF* oldPos) { + return new QHoverEvent(static_cast(typeVal), *scenePos, *globalPos, *oldPos); +} + +QHoverEvent* QHoverEvent_new2(int typeVal, QPointF* pos, QPointF* oldPos) { return new QHoverEvent(static_cast(typeVal), *pos, *oldPos); } -QHoverEvent* QHoverEvent_new2(QHoverEvent* param1) { - return new QHoverEvent(*param1); +QHoverEvent* QHoverEvent_new3(int typeVal, QPointF* scenePos, QPointF* globalPos, QPointF* oldPos, int modifiers) { + return new QHoverEvent(static_cast(typeVal), *scenePos, *globalPos, *oldPos, static_cast(modifiers)); } -QHoverEvent* QHoverEvent_new3(int typeVal, QPointF* pos, QPointF* oldPos, int modifiers) { +QHoverEvent* QHoverEvent_new4(int typeVal, QPointF* scenePos, QPointF* globalPos, QPointF* oldPos, int modifiers, QPointingDevice* device) { + return new QHoverEvent(static_cast(typeVal), *scenePos, *globalPos, *oldPos, static_cast(modifiers), device); +} + +QHoverEvent* QHoverEvent_new5(int typeVal, QPointF* pos, QPointF* oldPos, int modifiers) { return new QHoverEvent(static_cast(typeVal), *pos, *oldPos, static_cast(modifiers)); } +QHoverEvent* QHoverEvent_new6(int typeVal, QPointF* pos, QPointF* oldPos, int modifiers, QPointingDevice* device) { + return new QHoverEvent(static_cast(typeVal), *pos, *oldPos, static_cast(modifiers), device); +} + +QHoverEvent* QHoverEvent_Clone(const QHoverEvent* self) { + return self->clone(); +} + QPoint* QHoverEvent_Pos(const QHoverEvent* self) { return new QPoint(self->pos()); } +QPointF* QHoverEvent_PosF(const QHoverEvent* self) { + return new QPointF(self->posF()); +} + +bool QHoverEvent_IsUpdateEvent(const QHoverEvent* self) { + return self->isUpdateEvent(); +} + QPoint* QHoverEvent_OldPos(const QHoverEvent* self) { return new QPoint(self->oldPos()); } -QPointF* QHoverEvent_PosF(const QHoverEvent* self) { - const QPointF& _ret = self->posF(); - // Cast returned reference into pointer - return const_cast(&_ret); -} - QPointF* QHoverEvent_OldPosF(const QHoverEvent* self) { - const QPointF& _ret = self->oldPosF(); - // Cast returned reference into pointer - return const_cast(&_ret); + return new QPointF(self->oldPosF()); } void QHoverEvent_Delete(QHoverEvent* self) { delete self; } -QWheelEvent* QWheelEvent_new(QPointF* pos, int delta, int buttons, int modifiers) { - return new QWheelEvent(*pos, static_cast(delta), static_cast(buttons), static_cast(modifiers)); -} - -QWheelEvent* QWheelEvent_new2(QPointF* pos, QPointF* globalPos, int delta, int buttons, int modifiers) { - 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, 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, 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, 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, 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, int phase, bool inverted) { +QWheelEvent* QWheelEvent_new(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); } -QWheelEvent* QWheelEvent_new8(QWheelEvent* param1) { - return new QWheelEvent(*param1); -} - -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, 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, int phase, bool inverted, int source) { +QWheelEvent* QWheelEvent_new2(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)); } +QWheelEvent* QWheelEvent_new3(QPointF* pos, QPointF* globalPos, QPoint* pixelDelta, QPoint* angleDelta, int buttons, int modifiers, int phase, bool inverted, int source, QPointingDevice* device) { + return new QWheelEvent(*pos, *globalPos, *pixelDelta, *angleDelta, static_cast(buttons), static_cast(modifiers), static_cast(phase), inverted, static_cast(source), device); +} + +QWheelEvent* QWheelEvent_Clone(const QWheelEvent* self) { + return self->clone(); +} + QPoint* QWheelEvent_PixelDelta(const QWheelEvent* self) { return new QPoint(self->pixelDelta()); } @@ -330,64 +483,6 @@ QPoint* QWheelEvent_AngleDelta(const QWheelEvent* self) { return new QPoint(self->angleDelta()); } -int QWheelEvent_Delta(const QWheelEvent* self) { - return self->delta(); -} - -int QWheelEvent_Orientation(const QWheelEvent* self) { - Qt::Orientation _ret = self->orientation(); - return static_cast(_ret); -} - -QPoint* QWheelEvent_Pos(const QWheelEvent* self) { - return new QPoint(self->pos()); -} - -QPoint* QWheelEvent_GlobalPos(const QWheelEvent* self) { - return new QPoint(self->globalPos()); -} - -int QWheelEvent_X(const QWheelEvent* self) { - return self->x(); -} - -int QWheelEvent_Y(const QWheelEvent* self) { - return self->y(); -} - -int QWheelEvent_GlobalX(const QWheelEvent* self) { - return self->globalX(); -} - -int QWheelEvent_GlobalY(const QWheelEvent* self) { - return self->globalY(); -} - -QPointF* QWheelEvent_PosF(const QWheelEvent* self) { - const QPointF& _ret = self->posF(); - // Cast returned reference into pointer - return const_cast(&_ret); -} - -QPointF* QWheelEvent_GlobalPosF(const QWheelEvent* self) { - const QPointF& _ret = self->globalPosF(); - // Cast returned reference into pointer - return const_cast(&_ret); -} - -QPointF* QWheelEvent_Position(const QWheelEvent* self) { - return new QPointF(self->position()); -} - -QPointF* QWheelEvent_GlobalPosition(const QWheelEvent* self) { - return new QPointF(self->globalPosition()); -} - -int QWheelEvent_Buttons(const QWheelEvent* self) { - Qt::MouseButtons _ret = self->buttons(); - return static_cast(_ret); -} - int QWheelEvent_Phase(const QWheelEvent* self) { Qt::ScrollPhase _ret = self->phase(); return static_cast(_ret); @@ -397,6 +492,26 @@ bool QWheelEvent_Inverted(const QWheelEvent* self) { return self->inverted(); } +bool QWheelEvent_IsInverted(const QWheelEvent* self) { + return self->isInverted(); +} + +bool QWheelEvent_HasPixelDelta(const QWheelEvent* self) { + return self->hasPixelDelta(); +} + +bool QWheelEvent_IsBeginEvent(const QWheelEvent* self) { + return self->isBeginEvent(); +} + +bool QWheelEvent_IsUpdateEvent(const QWheelEvent* self) { + return self->isUpdateEvent(); +} + +bool QWheelEvent_IsEndEvent(const QWheelEvent* self) { + return self->isEndEvent(); +} + int QWheelEvent_Source(const QWheelEvent* self) { Qt::MouseEventSource _ret = self->source(); return static_cast(_ret); @@ -406,16 +521,12 @@ void QWheelEvent_Delete(QWheelEvent* self) { delete self; } -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_new(int t, QPointingDevice* device, QPointF* pos, QPointF* globalPos, double pressure, float xTilt, float yTilt, float tangentialPressure, double rotation, float z, int keyState, int button, int buttons) { + return new QTabletEvent(static_cast(t), device, *pos, *globalPos, static_cast(pressure), static_cast(xTilt), static_cast(yTilt), static_cast(tangentialPressure), static_cast(rotation), static_cast(z), static_cast(keyState), static_cast(button), static_cast(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)); -} - -QTabletEvent* QTabletEvent_new3(QTabletEvent* param1) { - return new QTabletEvent(*param1); +QTabletEvent* QTabletEvent_Clone(const QTabletEvent* self) { + return self->clone(); } QPoint* QTabletEvent_Pos(const QTabletEvent* self) { @@ -427,15 +538,11 @@ QPoint* QTabletEvent_GlobalPos(const QTabletEvent* self) { } QPointF* QTabletEvent_PosF(const QTabletEvent* self) { - const QPointF& _ret = self->posF(); - // Cast returned reference into pointer - return const_cast(&_ret); + return new QPointF(self->posF()); } QPointF* QTabletEvent_GlobalPosF(const QTabletEvent* self) { - const QPointF& _ret = self->globalPosF(); - // Cast returned reference into pointer - return const_cast(&_ret); + return new QPointF(self->globalPosF()); } int QTabletEvent_X(const QTabletEvent* self) { @@ -464,21 +571,6 @@ double QTabletEvent_HiResGlobalY(const QTabletEvent* self) { return static_cast(_ret); } -int QTabletEvent_Device(const QTabletEvent* self) { - QTabletEvent::TabletDevice _ret = self->device(); - return static_cast(_ret); -} - -int QTabletEvent_DeviceType(const QTabletEvent* self) { - QTabletEvent::TabletDevice _ret = self->deviceType(); - return static_cast(_ret); -} - -int QTabletEvent_PointerType(const QTabletEvent* self) { - QTabletEvent::PointerType _ret = self->pointerType(); - return static_cast(_ret); -} - long long QTabletEvent_UniqueId(const QTabletEvent* self) { qint64 _ret = self->uniqueId(); return static_cast(_ret); @@ -489,8 +581,14 @@ double QTabletEvent_Pressure(const QTabletEvent* self) { return static_cast(_ret); } -int QTabletEvent_Z(const QTabletEvent* self) { - return self->z(); +double QTabletEvent_Rotation(const QTabletEvent* self) { + qreal _ret = self->rotation(); + return static_cast(_ret); +} + +double QTabletEvent_Z(const QTabletEvent* self) { + qreal _ret = self->z(); + return static_cast(_ret); } double QTabletEvent_TangentialPressure(const QTabletEvent* self) { @@ -498,43 +596,34 @@ double QTabletEvent_TangentialPressure(const QTabletEvent* self) { return static_cast(_ret); } -double QTabletEvent_Rotation(const QTabletEvent* self) { - qreal _ret = self->rotation(); +double QTabletEvent_XTilt(const QTabletEvent* self) { + qreal _ret = self->xTilt(); return static_cast(_ret); } -int QTabletEvent_XTilt(const QTabletEvent* self) { - return self->xTilt(); -} - -int QTabletEvent_YTilt(const QTabletEvent* self) { - return self->yTilt(); -} - -int QTabletEvent_Button(const QTabletEvent* self) { - Qt::MouseButton _ret = self->button(); - return static_cast(_ret); -} - -int QTabletEvent_Buttons(const QTabletEvent* self) { - Qt::MouseButtons _ret = self->buttons(); - return static_cast(_ret); +double QTabletEvent_YTilt(const QTabletEvent* self) { + qreal _ret = self->yTilt(); + return static_cast(_ret); } void QTabletEvent_Delete(QTabletEvent* self) { delete self; } -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_new(int typeVal, QPointingDevice* dev, QPointF* localPos, QPointF* scenePos, QPointF* globalPos, double value, unsigned long long sequenceId, unsigned long long intArgument) { + return new QNativeGestureEvent(static_cast(typeVal), dev, *localPos, *scenePos, *globalPos, static_cast(value), static_cast(sequenceId), static_cast(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)); +QNativeGestureEvent* QNativeGestureEvent_new2(int typeVal, QPointingDevice* dev, int fingerCount, QPointF* localPos, QPointF* scenePos, QPointF* globalPos, double value, QPointF* delta) { + return new QNativeGestureEvent(static_cast(typeVal), dev, static_cast(fingerCount), *localPos, *scenePos, *globalPos, static_cast(value), *delta); } -QNativeGestureEvent* QNativeGestureEvent_new3(QNativeGestureEvent* param1) { - return new QNativeGestureEvent(*param1); +QNativeGestureEvent* QNativeGestureEvent_new3(int typeVal, QPointingDevice* dev, int fingerCount, QPointF* localPos, QPointF* scenePos, QPointF* globalPos, double value, QPointF* delta, unsigned long long sequenceId) { + return new QNativeGestureEvent(static_cast(typeVal), dev, static_cast(fingerCount), *localPos, *scenePos, *globalPos, static_cast(value), *delta, static_cast(sequenceId)); +} + +QNativeGestureEvent* QNativeGestureEvent_Clone(const QNativeGestureEvent* self) { + return self->clone(); } int QNativeGestureEvent_GestureType(const QNativeGestureEvent* self) { @@ -542,11 +631,19 @@ int QNativeGestureEvent_GestureType(const QNativeGestureEvent* self) { return static_cast(_ret); } +int QNativeGestureEvent_FingerCount(const QNativeGestureEvent* self) { + return self->fingerCount(); +} + double QNativeGestureEvent_Value(const QNativeGestureEvent* self) { qreal _ret = self->value(); return static_cast(_ret); } +QPointF* QNativeGestureEvent_Delta(const QNativeGestureEvent* self) { + return new QPointF(self->delta()); +} + QPoint* QNativeGestureEvent_Pos(const QNativeGestureEvent* self) { return new QPoint(self->pos()); } @@ -556,25 +653,15 @@ QPoint* QNativeGestureEvent_GlobalPos(const QNativeGestureEvent* self) { } QPointF* QNativeGestureEvent_LocalPos(const QNativeGestureEvent* self) { - const QPointF& _ret = self->localPos(); - // Cast returned reference into pointer - return const_cast(&_ret); + return new QPointF(self->localPos()); } QPointF* QNativeGestureEvent_WindowPos(const QNativeGestureEvent* self) { - const QPointF& _ret = self->windowPos(); - // Cast returned reference into pointer - return const_cast(&_ret); + return new QPointF(self->windowPos()); } QPointF* QNativeGestureEvent_ScreenPos(const QNativeGestureEvent* self) { - const QPointF& _ret = self->screenPos(); - // Cast returned reference into pointer - return const_cast(&_ret); -} - -QTouchDevice* QNativeGestureEvent_Device(const QNativeGestureEvent* self) { - return (QTouchDevice*) self->device(); + return new QPointF(self->screenPos()); } void QNativeGestureEvent_Delete(QNativeGestureEvent* self) { @@ -589,38 +676,43 @@ QKeyEvent* QKeyEvent_new2(int typeVal, int key, int modifiers, unsigned int nati return new QKeyEvent(static_cast(typeVal), static_cast(key), static_cast(modifiers), static_cast(nativeScanCode), static_cast(nativeVirtualKey), static_cast(nativeModifiers)); } -QKeyEvent* QKeyEvent_new3(QKeyEvent* param1) { - return new QKeyEvent(*param1); -} - -QKeyEvent* QKeyEvent_new4(int typeVal, int key, int modifiers, struct miqt_string* text) { +QKeyEvent* QKeyEvent_new3(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(int typeVal, int key, int modifiers, struct miqt_string* text, bool autorep) { +QKeyEvent* QKeyEvent_new4(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(int typeVal, int key, int modifiers, struct miqt_string* text, bool autorep, uint16_t count) { +QKeyEvent* QKeyEvent_new5(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)); + return new QKeyEvent(static_cast(typeVal), static_cast(key), static_cast(modifiers), text_QString, autorep, static_cast(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_new6(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(int typeVal, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string* text, bool autorep) { +QKeyEvent* QKeyEvent_new7(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(int 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_new8(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)); + 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)); +} + +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, QInputDevice* device) { + 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), device); +} + +QKeyEvent* QKeyEvent_Clone(const QKeyEvent* self) { + return self->clone(); } int QKeyEvent_Key(const QKeyEvent* self) { @@ -636,6 +728,10 @@ int QKeyEvent_Modifiers(const QKeyEvent* self) { return static_cast(_ret); } +QKeyCombination* QKeyEvent_KeyCombination(const QKeyEvent* self) { + return new QKeyCombination(self->keyCombination()); +} + struct miqt_string* QKeyEvent_Text(const QKeyEvent* self) { QString _ret = self->text(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -674,12 +770,12 @@ QFocusEvent* QFocusEvent_new(int typeVal) { return new QFocusEvent(static_cast(typeVal)); } -QFocusEvent* QFocusEvent_new2(QFocusEvent* param1) { - return new QFocusEvent(*param1); +QFocusEvent* QFocusEvent_new2(int typeVal, int reason) { + return new QFocusEvent(static_cast(typeVal), static_cast(reason)); } -QFocusEvent* QFocusEvent_new3(int typeVal, int reason) { - return new QFocusEvent(static_cast(typeVal), static_cast(reason)); +QFocusEvent* QFocusEvent_Clone(const QFocusEvent* self) { + return self->clone(); } bool QFocusEvent_GotFocus(const QFocusEvent* self) { @@ -707,8 +803,8 @@ QPaintEvent* QPaintEvent_new2(QRect* paintRect) { return new QPaintEvent(*paintRect); } -QPaintEvent* QPaintEvent_new3(QPaintEvent* param1) { - return new QPaintEvent(*param1); +QPaintEvent* QPaintEvent_Clone(const QPaintEvent* self) { + return self->clone(); } QRect* QPaintEvent_Rect(const QPaintEvent* self) { @@ -731,8 +827,8 @@ QMoveEvent* QMoveEvent_new(QPoint* pos, QPoint* oldPos) { return new QMoveEvent(*pos, *oldPos); } -QMoveEvent* QMoveEvent_new2(QMoveEvent* param1) { - return new QMoveEvent(*param1); +QMoveEvent* QMoveEvent_Clone(const QMoveEvent* self) { + return self->clone(); } QPoint* QMoveEvent_Pos(const QMoveEvent* self) { @@ -751,12 +847,12 @@ void QMoveEvent_Delete(QMoveEvent* self) { delete self; } -QExposeEvent* QExposeEvent_new(QRegion* rgn) { - return new QExposeEvent(*rgn); +QExposeEvent* QExposeEvent_new(QRegion* m_region) { + return new QExposeEvent(*m_region); } -QExposeEvent* QExposeEvent_new2(QExposeEvent* param1) { - return new QExposeEvent(*param1); +QExposeEvent* QExposeEvent_Clone(const QExposeEvent* self) { + return self->clone(); } QRegion* QExposeEvent_Region(const QExposeEvent* self) { @@ -773,8 +869,8 @@ QPlatformSurfaceEvent* QPlatformSurfaceEvent_new(int surfaceEventType) { return new QPlatformSurfaceEvent(static_cast(surfaceEventType)); } -QPlatformSurfaceEvent* QPlatformSurfaceEvent_new2(QPlatformSurfaceEvent* param1) { - return new QPlatformSurfaceEvent(*param1); +QPlatformSurfaceEvent* QPlatformSurfaceEvent_Clone(const QPlatformSurfaceEvent* self) { + return self->clone(); } int QPlatformSurfaceEvent_SurfaceEventType(const QPlatformSurfaceEvent* self) { @@ -790,8 +886,8 @@ QResizeEvent* QResizeEvent_new(QSize* size, QSize* oldSize) { return new QResizeEvent(*size, *oldSize); } -QResizeEvent* QResizeEvent_new2(QResizeEvent* param1) { - return new QResizeEvent(*param1); +QResizeEvent* QResizeEvent_Clone(const QResizeEvent* self) { + return self->clone(); } QSize* QResizeEvent_Size(const QResizeEvent* self) { @@ -814,12 +910,8 @@ QCloseEvent* QCloseEvent_new() { return new QCloseEvent(); } -QCloseEvent* QCloseEvent_new2(QCloseEvent* param1) { - return new QCloseEvent(*param1); -} - -void QCloseEvent_OperatorAssign(QCloseEvent* self, QCloseEvent* param1) { - self->operator=(*param1); +QCloseEvent* QCloseEvent_Clone(const QCloseEvent* self) { + return self->clone(); } void QCloseEvent_Delete(QCloseEvent* self) { @@ -830,12 +922,8 @@ QIconDragEvent* QIconDragEvent_new() { return new QIconDragEvent(); } -QIconDragEvent* QIconDragEvent_new2(QIconDragEvent* param1) { - return new QIconDragEvent(*param1); -} - -void QIconDragEvent_OperatorAssign(QIconDragEvent* self, QIconDragEvent* param1) { - self->operator=(*param1); +QIconDragEvent* QIconDragEvent_Clone(const QIconDragEvent* self) { + return self->clone(); } void QIconDragEvent_Delete(QIconDragEvent* self) { @@ -846,12 +934,8 @@ QShowEvent* QShowEvent_new() { return new QShowEvent(); } -QShowEvent* QShowEvent_new2(QShowEvent* param1) { - return new QShowEvent(*param1); -} - -void QShowEvent_OperatorAssign(QShowEvent* self, QShowEvent* param1) { - self->operator=(*param1); +QShowEvent* QShowEvent_Clone(const QShowEvent* self) { + return self->clone(); } void QShowEvent_Delete(QShowEvent* self) { @@ -862,32 +946,28 @@ QHideEvent* QHideEvent_new() { return new QHideEvent(); } -QHideEvent* QHideEvent_new2(QHideEvent* param1) { - return new QHideEvent(*param1); -} - -void QHideEvent_OperatorAssign(QHideEvent* self, QHideEvent* param1) { - self->operator=(*param1); +QHideEvent* QHideEvent_Clone(const QHideEvent* self) { + return self->clone(); } void QHideEvent_Delete(QHideEvent* self) { delete self; } -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(int reason, QPoint* pos, QPoint* globalPos) { +QContextMenuEvent* QContextMenuEvent_new(int reason, QPoint* pos, QPoint* globalPos) { return new QContextMenuEvent(static_cast(reason), *pos, *globalPos); } -QContextMenuEvent* QContextMenuEvent_new3(int reason, QPoint* pos) { +QContextMenuEvent* QContextMenuEvent_new2(int reason, QPoint* pos) { return new QContextMenuEvent(static_cast(reason), *pos); } -QContextMenuEvent* QContextMenuEvent_new4(QContextMenuEvent* param1) { - return new QContextMenuEvent(*param1); +QContextMenuEvent* QContextMenuEvent_new3(int reason, QPoint* pos, QPoint* globalPos, int modifiers) { + return new QContextMenuEvent(static_cast(reason), *pos, *globalPos, static_cast(modifiers)); +} + +QContextMenuEvent* QContextMenuEvent_Clone(const QContextMenuEvent* self) { + return self->clone(); } int QContextMenuEvent_X(const QContextMenuEvent* self) { @@ -942,8 +1022,8 @@ QInputMethodEvent* QInputMethodEvent_new2(struct miqt_string* preeditText, struc return new QInputMethodEvent(preeditText_QString, attributes_QList); } -QInputMethodEvent* QInputMethodEvent_new3(QInputMethodEvent* other) { - return new QInputMethodEvent(*other); +QInputMethodEvent* QInputMethodEvent_Clone(const QInputMethodEvent* self) { + return self->clone(); } void QInputMethodEvent_SetCommitString(QInputMethodEvent* self, struct miqt_string* commitString) { @@ -1004,8 +1084,8 @@ QInputMethodQueryEvent* QInputMethodQueryEvent_new(int queries) { return new QInputMethodQueryEvent(static_cast(queries)); } -QInputMethodQueryEvent* QInputMethodQueryEvent_new2(QInputMethodQueryEvent* param1) { - return new QInputMethodQueryEvent(*param1); +QInputMethodQueryEvent* QInputMethodQueryEvent_Clone(const QInputMethodQueryEvent* self) { + return self->clone(); } int QInputMethodQueryEvent_Queries(const QInputMethodQueryEvent* self) { @@ -1029,12 +1109,12 @@ QDropEvent* QDropEvent_new(QPointF* pos, int actions, QMimeData* data, int butto return new QDropEvent(*pos, static_cast(actions), data, static_cast(buttons), static_cast(modifiers)); } -QDropEvent* QDropEvent_new2(QDropEvent* param1) { - return new QDropEvent(*param1); +QDropEvent* QDropEvent_new2(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)); } -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)); +QDropEvent* QDropEvent_Clone(const QDropEvent* self) { + return self->clone(); } QPoint* QDropEvent_Pos(const QDropEvent* self) { @@ -1042,9 +1122,7 @@ QPoint* QDropEvent_Pos(const QDropEvent* self) { } QPointF* QDropEvent_PosF(const QDropEvent* self) { - const QPointF& _ret = self->posF(); - // Cast returned reference into pointer - return const_cast(&_ret); + return new QPointF(self->posF()); } int QDropEvent_MouseButtons(const QDropEvent* self) { @@ -1057,6 +1135,20 @@ int QDropEvent_KeyboardModifiers(const QDropEvent* self) { return static_cast(_ret); } +QPointF* QDropEvent_Position(const QDropEvent* self) { + return new QPointF(self->position()); +} + +int QDropEvent_Buttons(const QDropEvent* self) { + Qt::MouseButtons _ret = self->buttons(); + return static_cast(_ret); +} + +int QDropEvent_Modifiers(const QDropEvent* self) { + Qt::KeyboardModifiers _ret = self->modifiers(); + return static_cast(_ret); +} + int QDropEvent_PossibleActions(const QDropEvent* self) { Qt::DropActions _ret = self->possibleActions(); return static_cast(_ret); @@ -1096,12 +1188,12 @@ QDragMoveEvent* QDragMoveEvent_new(QPoint* pos, int actions, QMimeData* data, in return new QDragMoveEvent(*pos, static_cast(actions), data, static_cast(buttons), static_cast(modifiers)); } -QDragMoveEvent* QDragMoveEvent_new2(QDragMoveEvent* param1) { - return new QDragMoveEvent(*param1); +QDragMoveEvent* QDragMoveEvent_new2(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)); } -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)); +QDragMoveEvent* QDragMoveEvent_Clone(const QDragMoveEvent* self) { + return self->clone(); } QRect* QDragMoveEvent_AnswerRect(const QDragMoveEvent* self) { @@ -1132,12 +1224,8 @@ QDragEnterEvent* QDragEnterEvent_new(QPoint* pos, int actions, QMimeData* data, return new QDragEnterEvent(*pos, static_cast(actions), data, static_cast(buttons), static_cast(modifiers)); } -QDragEnterEvent* QDragEnterEvent_new2(QDragEnterEvent* param1) { - return new QDragEnterEvent(*param1); -} - -void QDragEnterEvent_OperatorAssign(QDragEnterEvent* self, QDragEnterEvent* param1) { - self->operator=(*param1); +QDragEnterEvent* QDragEnterEvent_Clone(const QDragEnterEvent* self) { + return self->clone(); } void QDragEnterEvent_Delete(QDragEnterEvent* self) { @@ -1148,12 +1236,8 @@ QDragLeaveEvent* QDragLeaveEvent_new() { return new QDragLeaveEvent(); } -QDragLeaveEvent* QDragLeaveEvent_new2(QDragLeaveEvent* param1) { - return new QDragLeaveEvent(*param1); -} - -void QDragLeaveEvent_OperatorAssign(QDragLeaveEvent* self, QDragLeaveEvent* param1) { - self->operator=(*param1); +QDragLeaveEvent* QDragLeaveEvent_Clone(const QDragLeaveEvent* self) { + return self->clone(); } void QDragLeaveEvent_Delete(QDragLeaveEvent* self) { @@ -1164,8 +1248,8 @@ QHelpEvent* QHelpEvent_new(int typeVal, QPoint* pos, QPoint* globalPos) { return new QHelpEvent(static_cast(typeVal), *pos, *globalPos); } -QHelpEvent* QHelpEvent_new2(QHelpEvent* param1) { - return new QHelpEvent(*param1); +QHelpEvent* QHelpEvent_Clone(const QHelpEvent* self) { + return self->clone(); } int QHelpEvent_X(const QHelpEvent* self) { @@ -1205,8 +1289,8 @@ QStatusTipEvent* QStatusTipEvent_new(struct miqt_string* tip) { return new QStatusTipEvent(tip_QString); } -QStatusTipEvent* QStatusTipEvent_new2(QStatusTipEvent* param1) { - return new QStatusTipEvent(*param1); +QStatusTipEvent* QStatusTipEvent_Clone(const QStatusTipEvent* self) { + return self->clone(); } struct miqt_string* QStatusTipEvent_Tip(const QStatusTipEvent* self) { @@ -1225,8 +1309,8 @@ QWhatsThisClickedEvent* QWhatsThisClickedEvent_new(struct miqt_string* href) { return new QWhatsThisClickedEvent(href_QString); } -QWhatsThisClickedEvent* QWhatsThisClickedEvent_new2(QWhatsThisClickedEvent* param1) { - return new QWhatsThisClickedEvent(*param1); +QWhatsThisClickedEvent* QWhatsThisClickedEvent_Clone(const QWhatsThisClickedEvent* self) { + return self->clone(); } struct miqt_string* QWhatsThisClickedEvent_Href(const QWhatsThisClickedEvent* self) { @@ -1244,12 +1328,12 @@ QActionEvent* QActionEvent_new(int typeVal, QAction* action) { return new QActionEvent(static_cast(typeVal), action); } -QActionEvent* QActionEvent_new2(QActionEvent* param1) { - return new QActionEvent(*param1); +QActionEvent* QActionEvent_new2(int typeVal, QAction* action, QAction* before) { + return new QActionEvent(static_cast(typeVal), action, before); } -QActionEvent* QActionEvent_new3(int typeVal, QAction* action, QAction* before) { - return new QActionEvent(static_cast(typeVal), action, before); +QActionEvent* QActionEvent_Clone(const QActionEvent* self) { + return self->clone(); } QAction* QActionEvent_Action(const QActionEvent* self) { @@ -1260,10 +1344,6 @@ QAction* QActionEvent_Before(const QActionEvent* self) { return self->before(); } -void QActionEvent_OperatorAssign(QActionEvent* self, QActionEvent* param1) { - self->operator=(*param1); -} - void QActionEvent_Delete(QActionEvent* self) { delete self; } @@ -1277,8 +1357,8 @@ QFileOpenEvent* QFileOpenEvent_new2(QUrl* url) { return new QFileOpenEvent(*url); } -QFileOpenEvent* QFileOpenEvent_new3(QFileOpenEvent* param1) { - return new QFileOpenEvent(*param1); +QFileOpenEvent* QFileOpenEvent_Clone(const QFileOpenEvent* self) { + return self->clone(); } struct miqt_string* QFileOpenEvent_File(const QFileOpenEvent* self) { @@ -1304,8 +1384,8 @@ QToolBarChangeEvent* QToolBarChangeEvent_new(bool t) { return new QToolBarChangeEvent(t); } -QToolBarChangeEvent* QToolBarChangeEvent_new2(QToolBarChangeEvent* param1) { - return new QToolBarChangeEvent(*param1); +QToolBarChangeEvent* QToolBarChangeEvent_Clone(const QToolBarChangeEvent* self) { + return self->clone(); } bool QToolBarChangeEvent_Toggle(const QToolBarChangeEvent* self) { @@ -1320,12 +1400,12 @@ QShortcutEvent* QShortcutEvent_new(QKeySequence* key, int id) { return new QShortcutEvent(*key, static_cast(id)); } -QShortcutEvent* QShortcutEvent_new2(QShortcutEvent* param1) { - return new QShortcutEvent(*param1); +QShortcutEvent* QShortcutEvent_new2(QKeySequence* key, int id, bool ambiguous) { + return new QShortcutEvent(*key, static_cast(id), ambiguous); } -QShortcutEvent* QShortcutEvent_new3(QKeySequence* key, int id, bool ambiguous) { - return new QShortcutEvent(*key, static_cast(id), ambiguous); +QShortcutEvent* QShortcutEvent_Clone(const QShortcutEvent* self) { + return self->clone(); } QKeySequence* QShortcutEvent_Key(const QShortcutEvent* self) { @@ -1346,16 +1426,16 @@ void QShortcutEvent_Delete(QShortcutEvent* self) { delete self; } -QWindowStateChangeEvent* QWindowStateChangeEvent_new(int aOldState) { - return new QWindowStateChangeEvent(static_cast(aOldState)); +QWindowStateChangeEvent* QWindowStateChangeEvent_new(int oldState) { + return new QWindowStateChangeEvent(static_cast(oldState)); } -QWindowStateChangeEvent* QWindowStateChangeEvent_new2(QWindowStateChangeEvent* param1) { - return new QWindowStateChangeEvent(*param1); +QWindowStateChangeEvent* QWindowStateChangeEvent_new2(int oldState, bool isOverride) { + return new QWindowStateChangeEvent(static_cast(oldState), isOverride); } -QWindowStateChangeEvent* QWindowStateChangeEvent_new3(int aOldState, bool isOverride) { - return new QWindowStateChangeEvent(static_cast(aOldState), isOverride); +QWindowStateChangeEvent* QWindowStateChangeEvent_Clone(const QWindowStateChangeEvent* self) { + return self->clone(); } int QWindowStateChangeEvent_OldState(const QWindowStateChangeEvent* self) { @@ -1371,80 +1451,61 @@ void QWindowStateChangeEvent_Delete(QWindowStateChangeEvent* self) { delete self; } -QPointingDeviceUniqueId* QPointingDeviceUniqueId_new() { - return new QPointingDeviceUniqueId(); -} - -QPointingDeviceUniqueId* QPointingDeviceUniqueId_new2(QPointingDeviceUniqueId* param1) { - return new QPointingDeviceUniqueId(*param1); -} - -QPointingDeviceUniqueId* QPointingDeviceUniqueId_FromNumericId(long long id) { - return new QPointingDeviceUniqueId(QPointingDeviceUniqueId::fromNumericId(static_cast(id))); -} - -bool QPointingDeviceUniqueId_IsValid(const QPointingDeviceUniqueId* self) { - return self->isValid(); -} - -long long QPointingDeviceUniqueId_NumericId(const QPointingDeviceUniqueId* self) { - qint64 _ret = self->numericId(); - return static_cast(_ret); -} - -void QPointingDeviceUniqueId_Delete(QPointingDeviceUniqueId* self) { - delete self; -} - QTouchEvent* QTouchEvent_new(int eventType) { return new QTouchEvent(static_cast(eventType)); } -QTouchEvent* QTouchEvent_new2(QTouchEvent* param1) { - return new QTouchEvent(*param1); +QTouchEvent* QTouchEvent_new2(int eventType, QPointingDevice* device, int modifiers, uint8_t touchPointStates) { + return new QTouchEvent(static_cast(eventType), device, static_cast(modifiers), static_cast(touchPointStates)); } -QTouchEvent* QTouchEvent_new3(int eventType, QTouchDevice* device) { +QTouchEvent* QTouchEvent_new3(int eventType, QPointingDevice* device) { return new QTouchEvent(static_cast(eventType), device); } -QTouchEvent* QTouchEvent_new4(int eventType, QTouchDevice* device, int modifiers) { +QTouchEvent* QTouchEvent_new4(int eventType, QPointingDevice* device, int modifiers) { return new QTouchEvent(static_cast(eventType), device, static_cast(modifiers)); } -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(int eventType, QTouchDevice* device, int modifiers, int touchPointStates, struct miqt_array* /* of QTouchEvent__TouchPoint* */ touchPoints) { - QList touchPoints_QList; +QTouchEvent* QTouchEvent_new5(int eventType, QPointingDevice* device, int modifiers, struct miqt_array* /* of QEventPoint* */ touchPoints) { + QList touchPoints_QList; touchPoints_QList.reserve(touchPoints->len); - QTouchEvent__TouchPoint** touchPoints_arr = static_cast(touchPoints->data); + QEventPoint** touchPoints_arr = static_cast(touchPoints->data); for(size_t i = 0; i < touchPoints->len; ++i) { touchPoints_QList.push_back(*(touchPoints_arr[i])); } - return new QTouchEvent(static_cast(eventType), device, static_cast(modifiers), static_cast(touchPointStates), touchPoints_QList); + return new QTouchEvent(static_cast(eventType), device, static_cast(modifiers), touchPoints_QList); } -QWindow* QTouchEvent_Window(const QTouchEvent* self) { - return self->window(); +QTouchEvent* QTouchEvent_new6(int eventType, QPointingDevice* device, int modifiers, uint8_t touchPointStates, struct miqt_array* /* of QEventPoint* */ touchPoints) { + QList touchPoints_QList; + touchPoints_QList.reserve(touchPoints->len); + QEventPoint** touchPoints_arr = static_cast(touchPoints->data); + for(size_t i = 0; i < touchPoints->len; ++i) { + touchPoints_QList.push_back(*(touchPoints_arr[i])); + } + return new QTouchEvent(static_cast(eventType), device, static_cast(modifiers), static_cast(touchPointStates), touchPoints_QList); +} + +QTouchEvent* QTouchEvent_Clone(const QTouchEvent* self) { + return self->clone(); } QObject* QTouchEvent_Target(const QTouchEvent* self) { return self->target(); } -int QTouchEvent_TouchPointStates(const QTouchEvent* self) { - Qt::TouchPointStates _ret = self->touchPointStates(); - return static_cast(_ret); +uint8_t QTouchEvent_TouchPointStates(const QTouchEvent* self) { + QEventPoint::States _ret = self->touchPointStates(); + return static_cast(_ret); } struct miqt_array* QTouchEvent_TouchPoints(const QTouchEvent* self) { - const QList& _ret = self->touchPoints(); + 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())); + QEventPoint** _arr = static_cast(malloc(sizeof(QEventPoint*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { - _arr[i] = new QTouchEvent::TouchPoint(_ret[i]); + _arr[i] = new QEventPoint(_ret[i]); } struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); _out->len = _ret.length(); @@ -1452,34 +1513,16 @@ struct miqt_array* QTouchEvent_TouchPoints(const QTouchEvent* self) { return _out; } -QTouchDevice* QTouchEvent_Device(const QTouchEvent* self) { - return self->device(); +bool QTouchEvent_IsBeginEvent(const QTouchEvent* self) { + return self->isBeginEvent(); } -void QTouchEvent_SetWindow(QTouchEvent* self, QWindow* awindow) { - self->setWindow(awindow); +bool QTouchEvent_IsUpdateEvent(const QTouchEvent* self) { + return self->isUpdateEvent(); } -void QTouchEvent_SetTarget(QTouchEvent* self, QObject* atarget) { - self->setTarget(atarget); -} - -void QTouchEvent_SetTouchPointStates(QTouchEvent* self, int aTouchPointStates) { - self->setTouchPointStates(static_cast(aTouchPointStates)); -} - -void QTouchEvent_SetTouchPoints(QTouchEvent* self, struct miqt_array* /* of QTouchEvent__TouchPoint* */ atouchPoints) { - QList atouchPoints_QList; - atouchPoints_QList.reserve(atouchPoints->len); - QTouchEvent__TouchPoint** atouchPoints_arr = static_cast(atouchPoints->data); - for(size_t i = 0; i < atouchPoints->len; ++i) { - atouchPoints_QList.push_back(*(atouchPoints_arr[i])); - } - self->setTouchPoints(atouchPoints_QList); -} - -void QTouchEvent_SetDevice(QTouchEvent* self, QTouchDevice* adevice) { - self->setDevice(adevice); +bool QTouchEvent_IsEndEvent(const QTouchEvent* self) { + return self->isEndEvent(); } void QTouchEvent_Delete(QTouchEvent* self) { @@ -1490,8 +1533,8 @@ QScrollPrepareEvent* QScrollPrepareEvent_new(QPointF* startPos) { return new QScrollPrepareEvent(*startPos); } -QScrollPrepareEvent* QScrollPrepareEvent_new2(QScrollPrepareEvent* param1) { - return new QScrollPrepareEvent(*param1); +QScrollPrepareEvent* QScrollPrepareEvent_Clone(const QScrollPrepareEvent* self) { + return self->clone(); } QPointF* QScrollPrepareEvent_StartPos(const QScrollPrepareEvent* self) { @@ -1530,8 +1573,8 @@ QScrollEvent* QScrollEvent_new(QPointF* contentPos, QPointF* overshoot, int scro return new QScrollEvent(*contentPos, *overshoot, static_cast(scrollState)); } -QScrollEvent* QScrollEvent_new2(QScrollEvent* param1) { - return new QScrollEvent(*param1); +QScrollEvent* QScrollEvent_Clone(const QScrollEvent* self) { + return self->clone(); } QPointF* QScrollEvent_ContentPos(const QScrollEvent* self) { @@ -1555,8 +1598,8 @@ QScreenOrientationChangeEvent* QScreenOrientationChangeEvent_new(QScreen* screen return new QScreenOrientationChangeEvent(screen, static_cast(orientation)); } -QScreenOrientationChangeEvent* QScreenOrientationChangeEvent_new2(QScreenOrientationChangeEvent* param1) { - return new QScreenOrientationChangeEvent(*param1); +QScreenOrientationChangeEvent* QScreenOrientationChangeEvent_Clone(const QScreenOrientationChangeEvent* self) { + return self->clone(); } QScreen* QScreenOrientationChangeEvent_Screen(const QScreenOrientationChangeEvent* self) { @@ -1576,8 +1619,8 @@ QApplicationStateChangeEvent* QApplicationStateChangeEvent_new(int state) { return new QApplicationStateChangeEvent(static_cast(state)); } -QApplicationStateChangeEvent* QApplicationStateChangeEvent_new2(QApplicationStateChangeEvent* param1) { - return new QApplicationStateChangeEvent(*param1); +QApplicationStateChangeEvent* QApplicationStateChangeEvent_Clone(const QApplicationStateChangeEvent* self) { + return self->clone(); } int QApplicationStateChangeEvent_ApplicationState(const QApplicationStateChangeEvent* self) { @@ -1609,238 +1652,3 @@ void QInputMethodEvent__Attribute_Delete(QInputMethodEvent__Attribute* self) { delete self; } -QTouchEvent__TouchPoint* QTouchEvent__TouchPoint_new() { - return new QTouchEvent::TouchPoint(); -} - -QTouchEvent__TouchPoint* QTouchEvent__TouchPoint_new2(QTouchEvent__TouchPoint* other) { - return new QTouchEvent::TouchPoint(*other); -} - -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); -} - -int QTouchEvent__TouchPoint_Id(const QTouchEvent__TouchPoint* self) { - return self->id(); -} - -QPointingDeviceUniqueId* QTouchEvent__TouchPoint_UniqueId(const QTouchEvent__TouchPoint* self) { - return new QPointingDeviceUniqueId(self->uniqueId()); -} - -int QTouchEvent__TouchPoint_State(const QTouchEvent__TouchPoint* self) { - Qt::TouchPointState _ret = self->state(); - return static_cast(_ret); -} - -QPointF* QTouchEvent__TouchPoint_Pos(const QTouchEvent__TouchPoint* self) { - return new QPointF(self->pos()); -} - -QPointF* QTouchEvent__TouchPoint_StartPos(const QTouchEvent__TouchPoint* self) { - return new QPointF(self->startPos()); -} - -QPointF* QTouchEvent__TouchPoint_LastPos(const QTouchEvent__TouchPoint* self) { - return new QPointF(self->lastPos()); -} - -QPointF* QTouchEvent__TouchPoint_ScenePos(const QTouchEvent__TouchPoint* self) { - return new QPointF(self->scenePos()); -} - -QPointF* QTouchEvent__TouchPoint_StartScenePos(const QTouchEvent__TouchPoint* self) { - return new QPointF(self->startScenePos()); -} - -QPointF* QTouchEvent__TouchPoint_LastScenePos(const QTouchEvent__TouchPoint* self) { - return new QPointF(self->lastScenePos()); -} - -QPointF* QTouchEvent__TouchPoint_ScreenPos(const QTouchEvent__TouchPoint* self) { - return new QPointF(self->screenPos()); -} - -QPointF* QTouchEvent__TouchPoint_StartScreenPos(const QTouchEvent__TouchPoint* self) { - return new QPointF(self->startScreenPos()); -} - -QPointF* QTouchEvent__TouchPoint_LastScreenPos(const QTouchEvent__TouchPoint* self) { - return new QPointF(self->lastScreenPos()); -} - -QPointF* QTouchEvent__TouchPoint_NormalizedPos(const QTouchEvent__TouchPoint* self) { - return new QPointF(self->normalizedPos()); -} - -QPointF* QTouchEvent__TouchPoint_StartNormalizedPos(const QTouchEvent__TouchPoint* self) { - return new QPointF(self->startNormalizedPos()); -} - -QPointF* QTouchEvent__TouchPoint_LastNormalizedPos(const QTouchEvent__TouchPoint* self) { - return new QPointF(self->lastNormalizedPos()); -} - -QRectF* QTouchEvent__TouchPoint_Rect(const QTouchEvent__TouchPoint* self) { - return new QRectF(self->rect()); -} - -QRectF* QTouchEvent__TouchPoint_SceneRect(const QTouchEvent__TouchPoint* self) { - return new QRectF(self->sceneRect()); -} - -QRectF* QTouchEvent__TouchPoint_ScreenRect(const QTouchEvent__TouchPoint* self) { - return new QRectF(self->screenRect()); -} - -void QTouchEvent__TouchPoint_SetRect(QTouchEvent__TouchPoint* self, QRectF* rect) { - self->setRect(*rect); -} - -void QTouchEvent__TouchPoint_SetSceneRect(QTouchEvent__TouchPoint* self, QRectF* sceneRect) { - self->setSceneRect(*sceneRect); -} - -void QTouchEvent__TouchPoint_SetScreenRect(QTouchEvent__TouchPoint* self, QRectF* screenRect) { - self->setScreenRect(*screenRect); -} - -double QTouchEvent__TouchPoint_Pressure(const QTouchEvent__TouchPoint* self) { - qreal _ret = self->pressure(); - return static_cast(_ret); -} - -double QTouchEvent__TouchPoint_Rotation(const QTouchEvent__TouchPoint* self) { - qreal _ret = self->rotation(); - return static_cast(_ret); -} - -QSizeF* QTouchEvent__TouchPoint_EllipseDiameters(const QTouchEvent__TouchPoint* self) { - return new QSizeF(self->ellipseDiameters()); -} - -QVector2D* QTouchEvent__TouchPoint_Velocity(const QTouchEvent__TouchPoint* self) { - return new QVector2D(self->velocity()); -} - -int QTouchEvent__TouchPoint_Flags(const QTouchEvent__TouchPoint* self) { - QTouchEvent::TouchPoint::InfoFlags _ret = self->flags(); - return static_cast(_ret); -} - -struct miqt_array* QTouchEvent__TouchPoint_RawScreenPositions(const QTouchEvent__TouchPoint* self) { - QVector _ret = self->rawScreenPositions(); - // Convert QList<> from C++ memory to manually-managed C memory - QPointF** _arr = static_cast(malloc(sizeof(QPointF*) * _ret.length())); - for (size_t i = 0, e = _ret.length(); i < e; ++i) { - _arr[i] = new QPointF(_ret[i]); - } - struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); - _out->len = _ret.length(); - _out->data = static_cast(_arr); - return _out; -} - -void QTouchEvent__TouchPoint_SetId(QTouchEvent__TouchPoint* self, int id) { - self->setId(static_cast(id)); -} - -void QTouchEvent__TouchPoint_SetUniqueId(QTouchEvent__TouchPoint* self, long long uid) { - self->setUniqueId(static_cast(uid)); -} - -void QTouchEvent__TouchPoint_SetState(QTouchEvent__TouchPoint* self, int state) { - self->setState(static_cast(state)); -} - -void QTouchEvent__TouchPoint_SetPos(QTouchEvent__TouchPoint* self, QPointF* pos) { - self->setPos(*pos); -} - -void QTouchEvent__TouchPoint_SetScenePos(QTouchEvent__TouchPoint* self, QPointF* scenePos) { - self->setScenePos(*scenePos); -} - -void QTouchEvent__TouchPoint_SetScreenPos(QTouchEvent__TouchPoint* self, QPointF* screenPos) { - self->setScreenPos(*screenPos); -} - -void QTouchEvent__TouchPoint_SetNormalizedPos(QTouchEvent__TouchPoint* self, QPointF* normalizedPos) { - self->setNormalizedPos(*normalizedPos); -} - -void QTouchEvent__TouchPoint_SetStartPos(QTouchEvent__TouchPoint* self, QPointF* startPos) { - self->setStartPos(*startPos); -} - -void QTouchEvent__TouchPoint_SetStartScenePos(QTouchEvent__TouchPoint* self, QPointF* startScenePos) { - self->setStartScenePos(*startScenePos); -} - -void QTouchEvent__TouchPoint_SetStartScreenPos(QTouchEvent__TouchPoint* self, QPointF* startScreenPos) { - self->setStartScreenPos(*startScreenPos); -} - -void QTouchEvent__TouchPoint_SetStartNormalizedPos(QTouchEvent__TouchPoint* self, QPointF* startNormalizedPos) { - self->setStartNormalizedPos(*startNormalizedPos); -} - -void QTouchEvent__TouchPoint_SetLastPos(QTouchEvent__TouchPoint* self, QPointF* lastPos) { - self->setLastPos(*lastPos); -} - -void QTouchEvent__TouchPoint_SetLastScenePos(QTouchEvent__TouchPoint* self, QPointF* lastScenePos) { - self->setLastScenePos(*lastScenePos); -} - -void QTouchEvent__TouchPoint_SetLastScreenPos(QTouchEvent__TouchPoint* self, QPointF* lastScreenPos) { - self->setLastScreenPos(*lastScreenPos); -} - -void QTouchEvent__TouchPoint_SetLastNormalizedPos(QTouchEvent__TouchPoint* self, QPointF* lastNormalizedPos) { - self->setLastNormalizedPos(*lastNormalizedPos); -} - -void QTouchEvent__TouchPoint_SetPressure(QTouchEvent__TouchPoint* self, double pressure) { - self->setPressure(static_cast(pressure)); -} - -void QTouchEvent__TouchPoint_SetRotation(QTouchEvent__TouchPoint* self, double angle) { - self->setRotation(static_cast(angle)); -} - -void QTouchEvent__TouchPoint_SetEllipseDiameters(QTouchEvent__TouchPoint* self, QSizeF* dia) { - self->setEllipseDiameters(*dia); -} - -void QTouchEvent__TouchPoint_SetVelocity(QTouchEvent__TouchPoint* self, QVector2D* v) { - self->setVelocity(*v); -} - -void QTouchEvent__TouchPoint_SetFlags(QTouchEvent__TouchPoint* self, int flags) { - self->setFlags(static_cast(flags)); -} - -void QTouchEvent__TouchPoint_SetRawScreenPositions(QTouchEvent__TouchPoint* self, struct miqt_array* /* of QPointF* */ positions) { - QVector positions_QList; - positions_QList.reserve(positions->len); - QPointF** positions_arr = static_cast(positions->data); - for(size_t i = 0; i < positions->len; ++i) { - positions_QList.push_back(*(positions_arr[i])); - } - self->setRawScreenPositions(positions_QList); -} - -void QTouchEvent__TouchPoint_Delete(QTouchEvent__TouchPoint* self) { - delete self; -} - diff --git a/qt/gen_qevent.go b/qt/gen_qevent.go index ea6f443..a1b364b 100644 --- a/qt/gen_qevent.go +++ b/qt/gen_qevent.go @@ -19,27 +19,6 @@ const ( QWheelEvent__DefaultDeltasPerStep QWheelEvent__ = 120 ) -type QTabletEvent__TabletDevice int - -const ( - QTabletEvent__NoDevice QTabletEvent__TabletDevice = 0 - QTabletEvent__Puck QTabletEvent__TabletDevice = 1 - QTabletEvent__Stylus QTabletEvent__TabletDevice = 2 - QTabletEvent__Airbrush QTabletEvent__TabletDevice = 3 - QTabletEvent__FourDMouse QTabletEvent__TabletDevice = 4 - QTabletEvent__XFreeEraser QTabletEvent__TabletDevice = 5 - QTabletEvent__RotationStylus QTabletEvent__TabletDevice = 6 -) - -type QTabletEvent__PointerType int - -const ( - QTabletEvent__PointerType__UnknownPointer QTabletEvent__PointerType = 0 - QTabletEvent__PointerType__Pen QTabletEvent__PointerType = 1 - QTabletEvent__PointerType__Cursor QTabletEvent__PointerType = 2 - QTabletEvent__PointerType__Eraser QTabletEvent__PointerType = 3 -) - type QPlatformSurfaceEvent__SurfaceEventType int const ( @@ -58,18 +37,11 @@ const ( type QInputMethodEvent__AttributeType int const ( - QInputMethodEvent__AttributeType__TextFormat QInputMethodEvent__AttributeType = 0 - QInputMethodEvent__AttributeType__Cursor QInputMethodEvent__AttributeType = 1 - QInputMethodEvent__AttributeType__Language QInputMethodEvent__AttributeType = 2 - QInputMethodEvent__AttributeType__Ruby QInputMethodEvent__AttributeType = 3 - QInputMethodEvent__AttributeType__Selection QInputMethodEvent__AttributeType = 4 -) - -type QTouchEvent__TouchPoint__InfoFlag int - -const ( - QTouchEvent__TouchPoint__InfoFlag__Pen QTouchEvent__TouchPoint__InfoFlag = 1 - QTouchEvent__TouchPoint__InfoFlag__Token QTouchEvent__TouchPoint__InfoFlag = 2 + QInputMethodEvent__TextFormat QInputMethodEvent__AttributeType = 0 + QInputMethodEvent__Cursor QInputMethodEvent__AttributeType = 1 + QInputMethodEvent__Language QInputMethodEvent__AttributeType = 2 + QInputMethodEvent__Ruby QInputMethodEvent__AttributeType = 3 + QInputMethodEvent__Selection QInputMethodEvent__AttributeType = 4 ) type QScrollEvent__ScrollState int @@ -104,37 +76,43 @@ func newQInputEvent_U(h unsafe.Pointer) *QInputEvent { } // NewQInputEvent constructs a new QInputEvent object. -func NewQInputEvent(typeVal QEvent__Type) *QInputEvent { - ret := C.QInputEvent_new((C.int)(typeVal)) +func NewQInputEvent(typeVal QEvent__Type, m_dev *QInputDevice) *QInputEvent { + ret := C.QInputEvent_new((C.int)(typeVal), m_dev.cPointer()) return newQInputEvent(ret) } // NewQInputEvent2 constructs a new QInputEvent object. -func NewQInputEvent2(param1 *QInputEvent) *QInputEvent { - ret := C.QInputEvent_new2(param1.cPointer()) +func NewQInputEvent2(typeVal QEvent__Type, m_dev *QInputDevice, modifiers KeyboardModifier) *QInputEvent { + ret := C.QInputEvent_new2((C.int)(typeVal), m_dev.cPointer(), (C.int)(modifiers)) return newQInputEvent(ret) } -// NewQInputEvent3 constructs a new QInputEvent object. -func NewQInputEvent3(typeVal QEvent__Type, modifiers KeyboardModifier) *QInputEvent { - ret := C.QInputEvent_new3((C.int)(typeVal), (C.int)(modifiers)) - return newQInputEvent(ret) +func (this *QInputEvent) Clone() *QInputEvent { + return newQInputEvent_U(unsafe.Pointer(C.QInputEvent_Clone(this.h))) +} + +func (this *QInputEvent) Device() *QInputDevice { + return newQInputDevice_U(unsafe.Pointer(C.QInputEvent_Device(this.h))) +} + +func (this *QInputEvent) DeviceType() QInputDevice__DeviceType { + return (QInputDevice__DeviceType)(C.QInputEvent_DeviceType(this.h)) } func (this *QInputEvent) Modifiers() KeyboardModifier { return (KeyboardModifier)(C.QInputEvent_Modifiers(this.h)) } -func (this *QInputEvent) SetModifiers(amodifiers KeyboardModifier) { - C.QInputEvent_SetModifiers(this.h, (C.int)(amodifiers)) +func (this *QInputEvent) SetModifiers(modifiers KeyboardModifier) { + C.QInputEvent_SetModifiers(this.h, (C.int)(modifiers)) } func (this *QInputEvent) Timestamp() uint64 { return (uint64)(C.QInputEvent_Timestamp(this.h)) } -func (this *QInputEvent) SetTimestamp(atimestamp uint64) { - C.QInputEvent_SetTimestamp(this.h, (C.ulong)(atimestamp)) +func (this *QInputEvent) SetTimestamp(timestamp uint64) { + C.QInputEvent_SetTimestamp(this.h, (C.ulonglong)(timestamp)) } // Delete this object from C++ memory. @@ -151,9 +129,248 @@ func (this *QInputEvent) GoGC() { }) } +type QPointerEvent struct { + h *C.QPointerEvent + *QInputEvent +} + +func (this *QPointerEvent) cPointer() *C.QPointerEvent { + if this == nil { + return nil + } + return this.h +} + +func newQPointerEvent(h *C.QPointerEvent) *QPointerEvent { + if h == nil { + return nil + } + return &QPointerEvent{h: h, QInputEvent: newQInputEvent_U(unsafe.Pointer(h))} +} + +func newQPointerEvent_U(h unsafe.Pointer) *QPointerEvent { + return newQPointerEvent((*C.QPointerEvent)(h)) +} + +// NewQPointerEvent constructs a new QPointerEvent object. +func NewQPointerEvent(typeVal QEvent__Type, dev *QPointingDevice) *QPointerEvent { + ret := C.QPointerEvent_new((C.int)(typeVal), dev.cPointer()) + return newQPointerEvent(ret) +} + +// NewQPointerEvent2 constructs a new QPointerEvent object. +func NewQPointerEvent2(typeVal QEvent__Type, dev *QPointingDevice, modifiers KeyboardModifier) *QPointerEvent { + ret := C.QPointerEvent_new2((C.int)(typeVal), dev.cPointer(), (C.int)(modifiers)) + return newQPointerEvent(ret) +} + +// NewQPointerEvent3 constructs a new QPointerEvent object. +func NewQPointerEvent3(typeVal QEvent__Type, dev *QPointingDevice, modifiers KeyboardModifier, points []QEventPoint) *QPointerEvent { + // For the C ABI, malloc a C array of raw pointers + points_CArray := (*[0xffff]*C.QEventPoint)(C.malloc(C.size_t(8 * len(points)))) + defer C.free(unsafe.Pointer(points_CArray)) + for i := range points { + points_CArray[i] = points[i].cPointer() + } + points_ma := &C.struct_miqt_array{len: C.size_t(len(points)), data: unsafe.Pointer(points_CArray)} + defer runtime.KeepAlive(unsafe.Pointer(points_ma)) + ret := C.QPointerEvent_new3((C.int)(typeVal), dev.cPointer(), (C.int)(modifiers), points_ma) + return newQPointerEvent(ret) +} + +func (this *QPointerEvent) Clone() *QPointerEvent { + return newQPointerEvent_U(unsafe.Pointer(C.QPointerEvent_Clone(this.h))) +} + +func (this *QPointerEvent) PointingDevice() *QPointingDevice { + return newQPointingDevice_U(unsafe.Pointer(C.QPointerEvent_PointingDevice(this.h))) +} + +func (this *QPointerEvent) PointerType() QPointingDevice__PointerType { + return (QPointingDevice__PointerType)(C.QPointerEvent_PointerType(this.h)) +} + +func (this *QPointerEvent) SetTimestamp(timestamp uint64) { + C.QPointerEvent_SetTimestamp(this.h, (C.ulonglong)(timestamp)) +} + +func (this *QPointerEvent) PointCount() int64 { + return (int64)(C.QPointerEvent_PointCount(this.h)) +} + +func (this *QPointerEvent) Point(i int64) *QEventPoint { + return newQEventPoint_U(unsafe.Pointer(C.QPointerEvent_Point(this.h, (C.ptrdiff_t)(i)))) +} + +func (this *QPointerEvent) Points() []QEventPoint { + var _ma *C.struct_miqt_array = C.QPointerEvent_Points(this.h) + _ret := make([]QEventPoint, int(_ma.len)) + _outCast := (*[0xffff]*C.QEventPoint)(unsafe.Pointer(_ma.data)) // hey ya + for i := 0; i < int(_ma.len); i++ { + _lv_ret := _outCast[i] + _lv_goptr := newQEventPoint(_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 *QPointerEvent) PointById(id int) *QEventPoint { + return newQEventPoint_U(unsafe.Pointer(C.QPointerEvent_PointById(this.h, (C.int)(id)))) +} + +func (this *QPointerEvent) AllPointsGrabbed() bool { + return (bool)(C.QPointerEvent_AllPointsGrabbed(this.h)) +} + +func (this *QPointerEvent) IsBeginEvent() bool { + return (bool)(C.QPointerEvent_IsBeginEvent(this.h)) +} + +func (this *QPointerEvent) IsUpdateEvent() bool { + return (bool)(C.QPointerEvent_IsUpdateEvent(this.h)) +} + +func (this *QPointerEvent) IsEndEvent() bool { + return (bool)(C.QPointerEvent_IsEndEvent(this.h)) +} + +func (this *QPointerEvent) AllPointsAccepted() bool { + return (bool)(C.QPointerEvent_AllPointsAccepted(this.h)) +} + +func (this *QPointerEvent) SetAccepted(accepted bool) { + C.QPointerEvent_SetAccepted(this.h, (C.bool)(accepted)) +} + +func (this *QPointerEvent) ExclusiveGrabber(point *QEventPoint) *QObject { + return newQObject_U(unsafe.Pointer(C.QPointerEvent_ExclusiveGrabber(this.h, point.cPointer()))) +} + +func (this *QPointerEvent) SetExclusiveGrabber(point *QEventPoint, exclusiveGrabber *QObject) { + C.QPointerEvent_SetExclusiveGrabber(this.h, point.cPointer(), exclusiveGrabber.cPointer()) +} + +func (this *QPointerEvent) ClearPassiveGrabbers(point *QEventPoint) { + C.QPointerEvent_ClearPassiveGrabbers(this.h, point.cPointer()) +} + +func (this *QPointerEvent) AddPassiveGrabber(point *QEventPoint, grabber *QObject) bool { + return (bool)(C.QPointerEvent_AddPassiveGrabber(this.h, point.cPointer(), grabber.cPointer())) +} + +func (this *QPointerEvent) RemovePassiveGrabber(point *QEventPoint, grabber *QObject) bool { + return (bool)(C.QPointerEvent_RemovePassiveGrabber(this.h, point.cPointer(), grabber.cPointer())) +} + +// Delete this object from C++ memory. +func (this *QPointerEvent) Delete() { + C.QPointerEvent_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QPointerEvent) GoGC() { + runtime.SetFinalizer(this, func(this *QPointerEvent) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + +type QSinglePointEvent struct { + h *C.QSinglePointEvent + *QPointerEvent +} + +func (this *QSinglePointEvent) cPointer() *C.QSinglePointEvent { + if this == nil { + return nil + } + return this.h +} + +func newQSinglePointEvent(h *C.QSinglePointEvent) *QSinglePointEvent { + if h == nil { + return nil + } + return &QSinglePointEvent{h: h, QPointerEvent: newQPointerEvent_U(unsafe.Pointer(h))} +} + +func newQSinglePointEvent_U(h unsafe.Pointer) *QSinglePointEvent { + return newQSinglePointEvent((*C.QSinglePointEvent)(h)) +} + +func (this *QSinglePointEvent) Clone() *QSinglePointEvent { + return newQSinglePointEvent_U(unsafe.Pointer(C.QSinglePointEvent_Clone(this.h))) +} + +func (this *QSinglePointEvent) Button() MouseButton { + return (MouseButton)(C.QSinglePointEvent_Button(this.h)) +} + +func (this *QSinglePointEvent) Buttons() MouseButton { + return (MouseButton)(C.QSinglePointEvent_Buttons(this.h)) +} + +func (this *QSinglePointEvent) Position() *QPointF { + _ret := C.QSinglePointEvent_Position(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QSinglePointEvent) ScenePosition() *QPointF { + _ret := C.QSinglePointEvent_ScenePosition(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QSinglePointEvent) GlobalPosition() *QPointF { + _ret := C.QSinglePointEvent_GlobalPosition(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QSinglePointEvent) IsBeginEvent() bool { + return (bool)(C.QSinglePointEvent_IsBeginEvent(this.h)) +} + +func (this *QSinglePointEvent) IsUpdateEvent() bool { + return (bool)(C.QSinglePointEvent_IsUpdateEvent(this.h)) +} + +func (this *QSinglePointEvent) IsEndEvent() bool { + return (bool)(C.QSinglePointEvent_IsEndEvent(this.h)) +} + +func (this *QSinglePointEvent) ExclusivePointGrabber() *QObject { + return newQObject_U(unsafe.Pointer(C.QSinglePointEvent_ExclusivePointGrabber(this.h))) +} + +func (this *QSinglePointEvent) SetExclusivePointGrabber(exclusiveGrabber *QObject) { + C.QSinglePointEvent_SetExclusivePointGrabber(this.h, exclusiveGrabber.cPointer()) +} + +// Delete this object from C++ memory. +func (this *QSinglePointEvent) Delete() { + C.QSinglePointEvent_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QSinglePointEvent) GoGC() { + runtime.SetFinalizer(this, func(this *QSinglePointEvent) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + type QEnterEvent struct { h *C.QEnterEvent - *QEvent + *QSinglePointEvent } func (this *QEnterEvent) cPointer() *C.QEnterEvent { @@ -167,7 +384,7 @@ func newQEnterEvent(h *C.QEnterEvent) *QEnterEvent { if h == nil { return nil } - return &QEnterEvent{h: h, QEvent: newQEvent_U(unsafe.Pointer(h))} + return &QEnterEvent{h: h, QSinglePointEvent: newQSinglePointEvent_U(unsafe.Pointer(h))} } func newQEnterEvent_U(h unsafe.Pointer) *QEnterEvent { @@ -175,17 +392,21 @@ func newQEnterEvent_U(h unsafe.Pointer) *QEnterEvent { } // NewQEnterEvent constructs a new QEnterEvent object. -func NewQEnterEvent(localPos *QPointF, windowPos *QPointF, screenPos *QPointF) *QEnterEvent { - ret := C.QEnterEvent_new(localPos.cPointer(), windowPos.cPointer(), screenPos.cPointer()) +func NewQEnterEvent(localPos *QPointF, scenePos *QPointF, globalPos *QPointF) *QEnterEvent { + ret := C.QEnterEvent_new(localPos.cPointer(), scenePos.cPointer(), globalPos.cPointer()) return newQEnterEvent(ret) } // NewQEnterEvent2 constructs a new QEnterEvent object. -func NewQEnterEvent2(param1 *QEnterEvent) *QEnterEvent { - ret := C.QEnterEvent_new2(param1.cPointer()) +func NewQEnterEvent2(localPos *QPointF, scenePos *QPointF, globalPos *QPointF, device *QPointingDevice) *QEnterEvent { + ret := C.QEnterEvent_new2(localPos.cPointer(), scenePos.cPointer(), globalPos.cPointer(), device.cPointer()) return newQEnterEvent(ret) } +func (this *QEnterEvent) Clone() *QEnterEvent { + return newQEnterEvent_U(unsafe.Pointer(C.QEnterEvent_Clone(this.h))) +} + func (this *QEnterEvent) Pos() *QPoint { _ret := C.QEnterEvent_Pos(this.h) _goptr := newQPoint(_ret) @@ -217,15 +438,24 @@ func (this *QEnterEvent) GlobalY() int { } func (this *QEnterEvent) LocalPos() *QPointF { - return newQPointF_U(unsafe.Pointer(C.QEnterEvent_LocalPos(this.h))) + _ret := C.QEnterEvent_LocalPos(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr } func (this *QEnterEvent) WindowPos() *QPointF { - return newQPointF_U(unsafe.Pointer(C.QEnterEvent_WindowPos(this.h))) + _ret := C.QEnterEvent_WindowPos(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr } func (this *QEnterEvent) ScreenPos() *QPointF { - return newQPointF_U(unsafe.Pointer(C.QEnterEvent_ScreenPos(this.h))) + _ret := C.QEnterEvent_ScreenPos(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr } // Delete this object from C++ memory. @@ -244,7 +474,7 @@ func (this *QEnterEvent) GoGC() { type QMouseEvent struct { h *C.QMouseEvent - *QInputEvent + *QSinglePointEvent } func (this *QMouseEvent) cPointer() *C.QMouseEvent { @@ -258,7 +488,7 @@ func newQMouseEvent(h *C.QMouseEvent) *QMouseEvent { if h == nil { return nil } - return &QMouseEvent{h: h, QInputEvent: newQInputEvent_U(unsafe.Pointer(h))} + return &QMouseEvent{h: h, QSinglePointEvent: newQSinglePointEvent_U(unsafe.Pointer(h))} } func newQMouseEvent_U(h unsafe.Pointer) *QMouseEvent { @@ -272,29 +502,51 @@ func NewQMouseEvent(typeVal QEvent__Type, localPos *QPointF, button MouseButton, } // NewQMouseEvent2 constructs a new QMouseEvent object. -func NewQMouseEvent2(typeVal QEvent__Type, localPos *QPointF, screenPos *QPointF, button MouseButton, buttons MouseButton, modifiers KeyboardModifier) *QMouseEvent { - ret := C.QMouseEvent_new2((C.int)(typeVal), localPos.cPointer(), screenPos.cPointer(), (C.int)(button), (C.int)(buttons), (C.int)(modifiers)) +func NewQMouseEvent2(typeVal QEvent__Type, localPos *QPointF, globalPos *QPointF, button MouseButton, buttons MouseButton, modifiers KeyboardModifier) *QMouseEvent { + ret := C.QMouseEvent_new2((C.int)(typeVal), localPos.cPointer(), globalPos.cPointer(), (C.int)(button), (C.int)(buttons), (C.int)(modifiers)) return newQMouseEvent(ret) } // NewQMouseEvent3 constructs a new QMouseEvent object. -func NewQMouseEvent3(typeVal QEvent__Type, localPos *QPointF, windowPos *QPointF, screenPos *QPointF, button MouseButton, buttons MouseButton, modifiers KeyboardModifier) *QMouseEvent { - ret := C.QMouseEvent_new3((C.int)(typeVal), localPos.cPointer(), windowPos.cPointer(), screenPos.cPointer(), (C.int)(button), (C.int)(buttons), (C.int)(modifiers)) +func NewQMouseEvent3(typeVal QEvent__Type, localPos *QPointF, scenePos *QPointF, globalPos *QPointF, button MouseButton, buttons MouseButton, modifiers KeyboardModifier) *QMouseEvent { + ret := C.QMouseEvent_new3((C.int)(typeVal), localPos.cPointer(), scenePos.cPointer(), globalPos.cPointer(), (C.int)(button), (C.int)(buttons), (C.int)(modifiers)) return newQMouseEvent(ret) } // NewQMouseEvent4 constructs a new QMouseEvent object. -func NewQMouseEvent4(typeVal QEvent__Type, localPos *QPointF, windowPos *QPointF, screenPos *QPointF, button MouseButton, buttons MouseButton, modifiers KeyboardModifier, source MouseEventSource) *QMouseEvent { - ret := C.QMouseEvent_new4((C.int)(typeVal), localPos.cPointer(), windowPos.cPointer(), screenPos.cPointer(), (C.int)(button), (C.int)(buttons), (C.int)(modifiers), (C.int)(source)) +func NewQMouseEvent4(typeVal QEvent__Type, localPos *QPointF, scenePos *QPointF, globalPos *QPointF, button MouseButton, buttons MouseButton, modifiers KeyboardModifier, source MouseEventSource) *QMouseEvent { + ret := C.QMouseEvent_new4((C.int)(typeVal), localPos.cPointer(), scenePos.cPointer(), globalPos.cPointer(), (C.int)(button), (C.int)(buttons), (C.int)(modifiers), (C.int)(source)) return newQMouseEvent(ret) } // NewQMouseEvent5 constructs a new QMouseEvent object. -func NewQMouseEvent5(param1 *QMouseEvent) *QMouseEvent { - ret := C.QMouseEvent_new5(param1.cPointer()) +func NewQMouseEvent5(typeVal QEvent__Type, localPos *QPointF, button MouseButton, buttons MouseButton, modifiers KeyboardModifier, device *QPointingDevice) *QMouseEvent { + ret := C.QMouseEvent_new5((C.int)(typeVal), localPos.cPointer(), (C.int)(button), (C.int)(buttons), (C.int)(modifiers), device.cPointer()) return newQMouseEvent(ret) } +// NewQMouseEvent6 constructs a new QMouseEvent object. +func NewQMouseEvent6(typeVal QEvent__Type, localPos *QPointF, globalPos *QPointF, button MouseButton, buttons MouseButton, modifiers KeyboardModifier, device *QPointingDevice) *QMouseEvent { + ret := C.QMouseEvent_new6((C.int)(typeVal), localPos.cPointer(), globalPos.cPointer(), (C.int)(button), (C.int)(buttons), (C.int)(modifiers), device.cPointer()) + return newQMouseEvent(ret) +} + +// NewQMouseEvent7 constructs a new QMouseEvent object. +func NewQMouseEvent7(typeVal QEvent__Type, localPos *QPointF, scenePos *QPointF, globalPos *QPointF, button MouseButton, buttons MouseButton, modifiers KeyboardModifier, device *QPointingDevice) *QMouseEvent { + ret := C.QMouseEvent_new7((C.int)(typeVal), localPos.cPointer(), scenePos.cPointer(), globalPos.cPointer(), (C.int)(button), (C.int)(buttons), (C.int)(modifiers), device.cPointer()) + return newQMouseEvent(ret) +} + +// NewQMouseEvent8 constructs a new QMouseEvent object. +func NewQMouseEvent8(typeVal QEvent__Type, localPos *QPointF, scenePos *QPointF, globalPos *QPointF, button MouseButton, buttons MouseButton, modifiers KeyboardModifier, source MouseEventSource, device *QPointingDevice) *QMouseEvent { + ret := C.QMouseEvent_new8((C.int)(typeVal), localPos.cPointer(), scenePos.cPointer(), globalPos.cPointer(), (C.int)(button), (C.int)(buttons), (C.int)(modifiers), (C.int)(source), device.cPointer()) + return newQMouseEvent(ret) +} + +func (this *QMouseEvent) Clone() *QMouseEvent { + return newQMouseEvent_U(unsafe.Pointer(C.QMouseEvent_Clone(this.h))) +} + func (this *QMouseEvent) Pos() *QPoint { _ret := C.QMouseEvent_Pos(this.h) _goptr := newQPoint(_ret) @@ -326,27 +578,24 @@ func (this *QMouseEvent) GlobalY() int { } func (this *QMouseEvent) LocalPos() *QPointF { - return newQPointF_U(unsafe.Pointer(C.QMouseEvent_LocalPos(this.h))) + _ret := C.QMouseEvent_LocalPos(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr } func (this *QMouseEvent) WindowPos() *QPointF { - return newQPointF_U(unsafe.Pointer(C.QMouseEvent_WindowPos(this.h))) + _ret := C.QMouseEvent_WindowPos(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr } func (this *QMouseEvent) ScreenPos() *QPointF { - return newQPointF_U(unsafe.Pointer(C.QMouseEvent_ScreenPos(this.h))) -} - -func (this *QMouseEvent) Button() MouseButton { - return (MouseButton)(C.QMouseEvent_Button(this.h)) -} - -func (this *QMouseEvent) Buttons() MouseButton { - return (MouseButton)(C.QMouseEvent_Buttons(this.h)) -} - -func (this *QMouseEvent) SetLocalPos(localPosition *QPointF) { - C.QMouseEvent_SetLocalPos(this.h, localPosition.cPointer()) + _ret := C.QMouseEvent_ScreenPos(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr } func (this *QMouseEvent) Source() MouseEventSource { @@ -373,7 +622,7 @@ func (this *QMouseEvent) GoGC() { type QHoverEvent struct { h *C.QHoverEvent - *QInputEvent + *QSinglePointEvent } func (this *QHoverEvent) cPointer() *C.QHoverEvent { @@ -387,7 +636,7 @@ func newQHoverEvent(h *C.QHoverEvent) *QHoverEvent { if h == nil { return nil } - return &QHoverEvent{h: h, QInputEvent: newQInputEvent_U(unsafe.Pointer(h))} + return &QHoverEvent{h: h, QSinglePointEvent: newQSinglePointEvent_U(unsafe.Pointer(h))} } func newQHoverEvent_U(h unsafe.Pointer) *QHoverEvent { @@ -395,23 +644,45 @@ 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.int)(typeVal), pos.cPointer(), oldPos.cPointer()) +func NewQHoverEvent(typeVal QEvent__Type, scenePos *QPointF, globalPos *QPointF, oldPos *QPointF) *QHoverEvent { + ret := C.QHoverEvent_new((C.int)(typeVal), scenePos.cPointer(), globalPos.cPointer(), oldPos.cPointer()) return newQHoverEvent(ret) } // NewQHoverEvent2 constructs a new QHoverEvent object. -func NewQHoverEvent2(param1 *QHoverEvent) *QHoverEvent { - ret := C.QHoverEvent_new2(param1.cPointer()) +func NewQHoverEvent2(typeVal QEvent__Type, pos *QPointF, oldPos *QPointF) *QHoverEvent { + ret := C.QHoverEvent_new2((C.int)(typeVal), pos.cPointer(), oldPos.cPointer()) return newQHoverEvent(ret) } // NewQHoverEvent3 constructs a new QHoverEvent object. -func NewQHoverEvent3(typeVal QEvent__Type, pos *QPointF, oldPos *QPointF, modifiers KeyboardModifier) *QHoverEvent { - ret := C.QHoverEvent_new3((C.int)(typeVal), pos.cPointer(), oldPos.cPointer(), (C.int)(modifiers)) +func NewQHoverEvent3(typeVal QEvent__Type, scenePos *QPointF, globalPos *QPointF, oldPos *QPointF, modifiers KeyboardModifier) *QHoverEvent { + ret := C.QHoverEvent_new3((C.int)(typeVal), scenePos.cPointer(), globalPos.cPointer(), oldPos.cPointer(), (C.int)(modifiers)) return newQHoverEvent(ret) } +// NewQHoverEvent4 constructs a new QHoverEvent object. +func NewQHoverEvent4(typeVal QEvent__Type, scenePos *QPointF, globalPos *QPointF, oldPos *QPointF, modifiers KeyboardModifier, device *QPointingDevice) *QHoverEvent { + ret := C.QHoverEvent_new4((C.int)(typeVal), scenePos.cPointer(), globalPos.cPointer(), oldPos.cPointer(), (C.int)(modifiers), device.cPointer()) + return newQHoverEvent(ret) +} + +// NewQHoverEvent5 constructs a new QHoverEvent object. +func NewQHoverEvent5(typeVal QEvent__Type, pos *QPointF, oldPos *QPointF, modifiers KeyboardModifier) *QHoverEvent { + ret := C.QHoverEvent_new5((C.int)(typeVal), pos.cPointer(), oldPos.cPointer(), (C.int)(modifiers)) + return newQHoverEvent(ret) +} + +// NewQHoverEvent6 constructs a new QHoverEvent object. +func NewQHoverEvent6(typeVal QEvent__Type, pos *QPointF, oldPos *QPointF, modifiers KeyboardModifier, device *QPointingDevice) *QHoverEvent { + ret := C.QHoverEvent_new6((C.int)(typeVal), pos.cPointer(), oldPos.cPointer(), (C.int)(modifiers), device.cPointer()) + return newQHoverEvent(ret) +} + +func (this *QHoverEvent) Clone() *QHoverEvent { + return newQHoverEvent_U(unsafe.Pointer(C.QHoverEvent_Clone(this.h))) +} + func (this *QHoverEvent) Pos() *QPoint { _ret := C.QHoverEvent_Pos(this.h) _goptr := newQPoint(_ret) @@ -419,6 +690,17 @@ func (this *QHoverEvent) Pos() *QPoint { return _goptr } +func (this *QHoverEvent) PosF() *QPointF { + _ret := C.QHoverEvent_PosF(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QHoverEvent) IsUpdateEvent() bool { + return (bool)(C.QHoverEvent_IsUpdateEvent(this.h)) +} + func (this *QHoverEvent) OldPos() *QPoint { _ret := C.QHoverEvent_OldPos(this.h) _goptr := newQPoint(_ret) @@ -426,12 +708,11 @@ func (this *QHoverEvent) OldPos() *QPoint { return _goptr } -func (this *QHoverEvent) PosF() *QPointF { - return newQPointF_U(unsafe.Pointer(C.QHoverEvent_PosF(this.h))) -} - func (this *QHoverEvent) OldPosF() *QPointF { - return newQPointF_U(unsafe.Pointer(C.QHoverEvent_OldPosF(this.h))) + _ret := C.QHoverEvent_OldPosF(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr } // Delete this object from C++ memory. @@ -450,7 +731,7 @@ func (this *QHoverEvent) GoGC() { type QWheelEvent struct { h *C.QWheelEvent - *QInputEvent + *QSinglePointEvent } func (this *QWheelEvent) cPointer() *C.QWheelEvent { @@ -464,7 +745,7 @@ func newQWheelEvent(h *C.QWheelEvent) *QWheelEvent { if h == nil { return nil } - return &QWheelEvent{h: h, QInputEvent: newQInputEvent_U(unsafe.Pointer(h))} + return &QWheelEvent{h: h, QSinglePointEvent: newQSinglePointEvent_U(unsafe.Pointer(h))} } func newQWheelEvent_U(h unsafe.Pointer) *QWheelEvent { @@ -472,69 +753,25 @@ func newQWheelEvent_U(h unsafe.Pointer) *QWheelEvent { } // NewQWheelEvent constructs a new QWheelEvent object. -func NewQWheelEvent(pos *QPointF, delta int, buttons MouseButton, modifiers KeyboardModifier) *QWheelEvent { - ret := C.QWheelEvent_new(pos.cPointer(), (C.int)(delta), (C.int)(buttons), (C.int)(modifiers)) +func NewQWheelEvent(pos *QPointF, globalPos *QPointF, pixelDelta QPoint, angleDelta QPoint, buttons MouseButton, modifiers KeyboardModifier, phase ScrollPhase, inverted bool) *QWheelEvent { + ret := C.QWheelEvent_new(pos.cPointer(), globalPos.cPointer(), pixelDelta.cPointer(), angleDelta.cPointer(), (C.int)(buttons), (C.int)(modifiers), (C.int)(phase), (C.bool)(inverted)) return newQWheelEvent(ret) } // NewQWheelEvent2 constructs a new QWheelEvent object. -func NewQWheelEvent2(pos *QPointF, globalPos *QPointF, delta int, buttons MouseButton, modifiers KeyboardModifier) *QWheelEvent { - ret := C.QWheelEvent_new2(pos.cPointer(), globalPos.cPointer(), (C.int)(delta), (C.int)(buttons), (C.int)(modifiers)) +func NewQWheelEvent2(pos *QPointF, globalPos *QPointF, pixelDelta QPoint, angleDelta QPoint, buttons MouseButton, modifiers KeyboardModifier, phase ScrollPhase, inverted bool, source MouseEventSource) *QWheelEvent { + ret := C.QWheelEvent_new2(pos.cPointer(), globalPos.cPointer(), pixelDelta.cPointer(), angleDelta.cPointer(), (C.int)(buttons), (C.int)(modifiers), (C.int)(phase), (C.bool)(inverted), (C.int)(source)) return newQWheelEvent(ret) } // NewQWheelEvent3 constructs a new QWheelEvent object. -func NewQWheelEvent3(pos *QPointF, globalPos *QPointF, pixelDelta QPoint, angleDelta QPoint, qt4Delta int, qt4Orientation Orientation, buttons MouseButton, modifiers KeyboardModifier) *QWheelEvent { - ret := C.QWheelEvent_new3(pos.cPointer(), globalPos.cPointer(), pixelDelta.cPointer(), angleDelta.cPointer(), (C.int)(qt4Delta), (C.int)(qt4Orientation), (C.int)(buttons), (C.int)(modifiers)) +func NewQWheelEvent3(pos *QPointF, globalPos *QPointF, pixelDelta QPoint, angleDelta QPoint, buttons MouseButton, modifiers KeyboardModifier, phase ScrollPhase, inverted bool, source MouseEventSource, device *QPointingDevice) *QWheelEvent { + ret := C.QWheelEvent_new3(pos.cPointer(), globalPos.cPointer(), pixelDelta.cPointer(), angleDelta.cPointer(), (C.int)(buttons), (C.int)(modifiers), (C.int)(phase), (C.bool)(inverted), (C.int)(source), device.cPointer()) return newQWheelEvent(ret) } -// NewQWheelEvent4 constructs a new QWheelEvent object. -func NewQWheelEvent4(pos *QPointF, globalPos *QPointF, pixelDelta QPoint, angleDelta QPoint, qt4Delta int, qt4Orientation Orientation, buttons MouseButton, modifiers KeyboardModifier, phase ScrollPhase) *QWheelEvent { - ret := C.QWheelEvent_new4(pos.cPointer(), globalPos.cPointer(), pixelDelta.cPointer(), angleDelta.cPointer(), (C.int)(qt4Delta), (C.int)(qt4Orientation), (C.int)(buttons), (C.int)(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 MouseButton, modifiers KeyboardModifier, phase ScrollPhase, source MouseEventSource) *QWheelEvent { - ret := C.QWheelEvent_new5(pos.cPointer(), globalPos.cPointer(), pixelDelta.cPointer(), angleDelta.cPointer(), (C.int)(qt4Delta), (C.int)(qt4Orientation), (C.int)(buttons), (C.int)(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 MouseButton, modifiers KeyboardModifier, phase ScrollPhase, source MouseEventSource, inverted bool) *QWheelEvent { - ret := C.QWheelEvent_new6(pos.cPointer(), globalPos.cPointer(), pixelDelta.cPointer(), angleDelta.cPointer(), (C.int)(qt4Delta), (C.int)(qt4Orientation), (C.int)(buttons), (C.int)(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 MouseButton, modifiers KeyboardModifier, phase ScrollPhase, inverted bool) *QWheelEvent { - ret := C.QWheelEvent_new7(pos.cPointer(), globalPos.cPointer(), pixelDelta.cPointer(), angleDelta.cPointer(), (C.int)(buttons), (C.int)(modifiers), (C.int)(phase), (C.bool)(inverted)) - return newQWheelEvent(ret) -} - -// NewQWheelEvent8 constructs a new QWheelEvent object. -func NewQWheelEvent8(param1 *QWheelEvent) *QWheelEvent { - ret := C.QWheelEvent_new8(param1.cPointer()) - return newQWheelEvent(ret) -} - -// NewQWheelEvent9 constructs a new QWheelEvent object. -func NewQWheelEvent9(pos *QPointF, delta int, buttons MouseButton, modifiers KeyboardModifier, orient Orientation) *QWheelEvent { - ret := C.QWheelEvent_new9(pos.cPointer(), (C.int)(delta), (C.int)(buttons), (C.int)(modifiers), (C.int)(orient)) - return newQWheelEvent(ret) -} - -// NewQWheelEvent10 constructs a new QWheelEvent object. -func NewQWheelEvent10(pos *QPointF, globalPos *QPointF, delta int, buttons MouseButton, modifiers KeyboardModifier, orient Orientation) *QWheelEvent { - ret := C.QWheelEvent_new10(pos.cPointer(), globalPos.cPointer(), (C.int)(delta), (C.int)(buttons), (C.int)(modifiers), (C.int)(orient)) - return newQWheelEvent(ret) -} - -// NewQWheelEvent11 constructs a new QWheelEvent object. -func NewQWheelEvent11(pos QPointF, globalPos QPointF, pixelDelta QPoint, angleDelta QPoint, buttons MouseButton, modifiers KeyboardModifier, 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.int)(phase), (C.bool)(inverted), (C.int)(source)) - return newQWheelEvent(ret) +func (this *QWheelEvent) Clone() *QWheelEvent { + return newQWheelEvent_U(unsafe.Pointer(C.QWheelEvent_Clone(this.h))) } func (this *QWheelEvent) PixelDelta() *QPoint { @@ -551,70 +788,6 @@ func (this *QWheelEvent) AngleDelta() *QPoint { return _goptr } -func (this *QWheelEvent) Delta() int { - return (int)(C.QWheelEvent_Delta(this.h)) -} - -func (this *QWheelEvent) Orientation() Orientation { - return (Orientation)(C.QWheelEvent_Orientation(this.h)) -} - -func (this *QWheelEvent) Pos() *QPoint { - _ret := C.QWheelEvent_Pos(this.h) - _goptr := newQPoint(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QWheelEvent) GlobalPos() *QPoint { - _ret := C.QWheelEvent_GlobalPos(this.h) - _goptr := newQPoint(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QWheelEvent) X() int { - return (int)(C.QWheelEvent_X(this.h)) -} - -func (this *QWheelEvent) Y() int { - return (int)(C.QWheelEvent_Y(this.h)) -} - -func (this *QWheelEvent) GlobalX() int { - return (int)(C.QWheelEvent_GlobalX(this.h)) -} - -func (this *QWheelEvent) GlobalY() int { - return (int)(C.QWheelEvent_GlobalY(this.h)) -} - -func (this *QWheelEvent) PosF() *QPointF { - return newQPointF_U(unsafe.Pointer(C.QWheelEvent_PosF(this.h))) -} - -func (this *QWheelEvent) GlobalPosF() *QPointF { - return newQPointF_U(unsafe.Pointer(C.QWheelEvent_GlobalPosF(this.h))) -} - -func (this *QWheelEvent) Position() *QPointF { - _ret := C.QWheelEvent_Position(this.h) - _goptr := newQPointF(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QWheelEvent) GlobalPosition() *QPointF { - _ret := C.QWheelEvent_GlobalPosition(this.h) - _goptr := newQPointF(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QWheelEvent) Buttons() MouseButton { - return (MouseButton)(C.QWheelEvent_Buttons(this.h)) -} - func (this *QWheelEvent) Phase() ScrollPhase { return (ScrollPhase)(C.QWheelEvent_Phase(this.h)) } @@ -623,6 +796,26 @@ func (this *QWheelEvent) Inverted() bool { return (bool)(C.QWheelEvent_Inverted(this.h)) } +func (this *QWheelEvent) IsInverted() bool { + return (bool)(C.QWheelEvent_IsInverted(this.h)) +} + +func (this *QWheelEvent) HasPixelDelta() bool { + return (bool)(C.QWheelEvent_HasPixelDelta(this.h)) +} + +func (this *QWheelEvent) IsBeginEvent() bool { + return (bool)(C.QWheelEvent_IsBeginEvent(this.h)) +} + +func (this *QWheelEvent) IsUpdateEvent() bool { + return (bool)(C.QWheelEvent_IsUpdateEvent(this.h)) +} + +func (this *QWheelEvent) IsEndEvent() bool { + return (bool)(C.QWheelEvent_IsEndEvent(this.h)) +} + func (this *QWheelEvent) Source() MouseEventSource { return (MouseEventSource)(C.QWheelEvent_Source(this.h)) } @@ -643,7 +836,7 @@ func (this *QWheelEvent) GoGC() { type QTabletEvent struct { h *C.QTabletEvent - *QInputEvent + *QSinglePointEvent } func (this *QTabletEvent) cPointer() *C.QTabletEvent { @@ -657,7 +850,7 @@ func newQTabletEvent(h *C.QTabletEvent) *QTabletEvent { if h == nil { return nil } - return &QTabletEvent{h: h, QInputEvent: newQInputEvent_U(unsafe.Pointer(h))} + return &QTabletEvent{h: h, QSinglePointEvent: newQSinglePointEvent_U(unsafe.Pointer(h))} } func newQTabletEvent_U(h unsafe.Pointer) *QTabletEvent { @@ -665,21 +858,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 KeyboardModifier, uniqueID int64) *QTabletEvent { - 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), (C.int)(keyState), (C.longlong)(uniqueID)) +func NewQTabletEvent(t QEvent__Type, device *QPointingDevice, pos *QPointF, globalPos *QPointF, pressure float64, xTilt float32, yTilt float32, tangentialPressure float32, rotation float64, z float32, keyState KeyboardModifier, button MouseButton, buttons MouseButton) *QTabletEvent { + ret := C.QTabletEvent_new((C.int)(t), device.cPointer(), pos.cPointer(), globalPos.cPointer(), (C.double)(pressure), (C.float)(xTilt), (C.float)(yTilt), (C.float)(tangentialPressure), (C.double)(rotation), (C.float)(z), (C.int)(keyState), (C.int)(button), (C.int)(buttons)) 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 KeyboardModifier, uniqueID int64, button MouseButton, buttons MouseButton) *QTabletEvent { - 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), (C.int)(keyState), (C.longlong)(uniqueID), (C.int)(button), (C.int)(buttons)) - return newQTabletEvent(ret) -} - -// NewQTabletEvent3 constructs a new QTabletEvent object. -func NewQTabletEvent3(param1 *QTabletEvent) *QTabletEvent { - ret := C.QTabletEvent_new3(param1.cPointer()) - return newQTabletEvent(ret) +func (this *QTabletEvent) Clone() *QTabletEvent { + return newQTabletEvent_U(unsafe.Pointer(C.QTabletEvent_Clone(this.h))) } func (this *QTabletEvent) Pos() *QPoint { @@ -697,11 +882,17 @@ func (this *QTabletEvent) GlobalPos() *QPoint { } func (this *QTabletEvent) PosF() *QPointF { - return newQPointF_U(unsafe.Pointer(C.QTabletEvent_PosF(this.h))) + _ret := C.QTabletEvent_PosF(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr } func (this *QTabletEvent) GlobalPosF() *QPointF { - return newQPointF_U(unsafe.Pointer(C.QTabletEvent_GlobalPosF(this.h))) + _ret := C.QTabletEvent_GlobalPosF(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr } func (this *QTabletEvent) X() int { @@ -728,18 +919,6 @@ func (this *QTabletEvent) HiResGlobalY() float64 { return (float64)(C.QTabletEvent_HiResGlobalY(this.h)) } -func (this *QTabletEvent) Device() QTabletEvent__TabletDevice { - return (QTabletEvent__TabletDevice)(C.QTabletEvent_Device(this.h)) -} - -func (this *QTabletEvent) DeviceType() QTabletEvent__TabletDevice { - return (QTabletEvent__TabletDevice)(C.QTabletEvent_DeviceType(this.h)) -} - -func (this *QTabletEvent) PointerType() QTabletEvent__PointerType { - return (QTabletEvent__PointerType)(C.QTabletEvent_PointerType(this.h)) -} - func (this *QTabletEvent) UniqueId() int64 { return (int64)(C.QTabletEvent_UniqueId(this.h)) } @@ -748,32 +927,24 @@ func (this *QTabletEvent) Pressure() float64 { return (float64)(C.QTabletEvent_Pressure(this.h)) } -func (this *QTabletEvent) Z() int { - return (int)(C.QTabletEvent_Z(this.h)) +func (this *QTabletEvent) Rotation() float64 { + return (float64)(C.QTabletEvent_Rotation(this.h)) +} + +func (this *QTabletEvent) Z() float64 { + return (float64)(C.QTabletEvent_Z(this.h)) } func (this *QTabletEvent) TangentialPressure() float64 { return (float64)(C.QTabletEvent_TangentialPressure(this.h)) } -func (this *QTabletEvent) Rotation() float64 { - return (float64)(C.QTabletEvent_Rotation(this.h)) +func (this *QTabletEvent) XTilt() float64 { + return (float64)(C.QTabletEvent_XTilt(this.h)) } -func (this *QTabletEvent) XTilt() int { - return (int)(C.QTabletEvent_XTilt(this.h)) -} - -func (this *QTabletEvent) YTilt() int { - return (int)(C.QTabletEvent_YTilt(this.h)) -} - -func (this *QTabletEvent) Button() MouseButton { - return (MouseButton)(C.QTabletEvent_Button(this.h)) -} - -func (this *QTabletEvent) Buttons() MouseButton { - return (MouseButton)(C.QTabletEvent_Buttons(this.h)) +func (this *QTabletEvent) YTilt() float64 { + return (float64)(C.QTabletEvent_YTilt(this.h)) } // Delete this object from C++ memory. @@ -792,7 +963,7 @@ func (this *QTabletEvent) GoGC() { type QNativeGestureEvent struct { h *C.QNativeGestureEvent - *QInputEvent + *QSinglePointEvent } func (this *QNativeGestureEvent) cPointer() *C.QNativeGestureEvent { @@ -806,7 +977,7 @@ func newQNativeGestureEvent(h *C.QNativeGestureEvent) *QNativeGestureEvent { if h == nil { return nil } - return &QNativeGestureEvent{h: h, QInputEvent: newQInputEvent_U(unsafe.Pointer(h))} + return &QNativeGestureEvent{h: h, QSinglePointEvent: newQSinglePointEvent_U(unsafe.Pointer(h))} } func newQNativeGestureEvent_U(h unsafe.Pointer) *QNativeGestureEvent { @@ -814,31 +985,46 @@ 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.int)(typeVal), localPos.cPointer(), windowPos.cPointer(), screenPos.cPointer(), (C.double)(value), (C.ulong)(sequenceId), (C.ulonglong)(intArgument)) +func NewQNativeGestureEvent(typeVal NativeGestureType, dev *QPointingDevice, localPos *QPointF, scenePos *QPointF, globalPos *QPointF, value float64, sequenceId uint64, intArgument uint64) *QNativeGestureEvent { + ret := C.QNativeGestureEvent_new((C.int)(typeVal), dev.cPointer(), localPos.cPointer(), scenePos.cPointer(), globalPos.cPointer(), (C.double)(value), (C.ulonglong)(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.int)(typeVal), dev.cPointer(), localPos.cPointer(), windowPos.cPointer(), screenPos.cPointer(), (C.double)(value), (C.ulong)(sequenceId), (C.ulonglong)(intArgument)) +func NewQNativeGestureEvent2(typeVal NativeGestureType, dev *QPointingDevice, fingerCount int, localPos *QPointF, scenePos *QPointF, globalPos *QPointF, value float64, delta *QPointF) *QNativeGestureEvent { + ret := C.QNativeGestureEvent_new2((C.int)(typeVal), dev.cPointer(), (C.int)(fingerCount), localPos.cPointer(), scenePos.cPointer(), globalPos.cPointer(), (C.double)(value), delta.cPointer()) return newQNativeGestureEvent(ret) } // NewQNativeGestureEvent3 constructs a new QNativeGestureEvent object. -func NewQNativeGestureEvent3(param1 *QNativeGestureEvent) *QNativeGestureEvent { - ret := C.QNativeGestureEvent_new3(param1.cPointer()) +func NewQNativeGestureEvent3(typeVal NativeGestureType, dev *QPointingDevice, fingerCount int, localPos *QPointF, scenePos *QPointF, globalPos *QPointF, value float64, delta *QPointF, sequenceId uint64) *QNativeGestureEvent { + ret := C.QNativeGestureEvent_new3((C.int)(typeVal), dev.cPointer(), (C.int)(fingerCount), localPos.cPointer(), scenePos.cPointer(), globalPos.cPointer(), (C.double)(value), delta.cPointer(), (C.ulonglong)(sequenceId)) return newQNativeGestureEvent(ret) } +func (this *QNativeGestureEvent) Clone() *QNativeGestureEvent { + return newQNativeGestureEvent_U(unsafe.Pointer(C.QNativeGestureEvent_Clone(this.h))) +} + func (this *QNativeGestureEvent) GestureType() NativeGestureType { return (NativeGestureType)(C.QNativeGestureEvent_GestureType(this.h)) } +func (this *QNativeGestureEvent) FingerCount() int { + return (int)(C.QNativeGestureEvent_FingerCount(this.h)) +} + func (this *QNativeGestureEvent) Value() float64 { return (float64)(C.QNativeGestureEvent_Value(this.h)) } +func (this *QNativeGestureEvent) Delta() *QPointF { + _ret := C.QNativeGestureEvent_Delta(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + func (this *QNativeGestureEvent) Pos() *QPoint { _ret := C.QNativeGestureEvent_Pos(this.h) _goptr := newQPoint(_ret) @@ -854,19 +1040,24 @@ func (this *QNativeGestureEvent) GlobalPos() *QPoint { } func (this *QNativeGestureEvent) LocalPos() *QPointF { - return newQPointF_U(unsafe.Pointer(C.QNativeGestureEvent_LocalPos(this.h))) + _ret := C.QNativeGestureEvent_LocalPos(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr } func (this *QNativeGestureEvent) WindowPos() *QPointF { - return newQPointF_U(unsafe.Pointer(C.QNativeGestureEvent_WindowPos(this.h))) + _ret := C.QNativeGestureEvent_WindowPos(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr } func (this *QNativeGestureEvent) ScreenPos() *QPointF { - return newQPointF_U(unsafe.Pointer(C.QNativeGestureEvent_ScreenPos(this.h))) -} - -func (this *QNativeGestureEvent) Device() *QTouchDevice { - return newQTouchDevice_U(unsafe.Pointer(C.QNativeGestureEvent_Device(this.h))) + _ret := C.QNativeGestureEvent_ScreenPos(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr } // Delete this object from C++ memory. @@ -919,59 +1110,65 @@ func NewQKeyEvent2(typeVal QEvent__Type, key int, modifiers KeyboardModifier, na } // NewQKeyEvent3 constructs a new QKeyEvent object. -func NewQKeyEvent3(param1 *QKeyEvent) *QKeyEvent { - ret := C.QKeyEvent_new3(param1.cPointer()) +func NewQKeyEvent3(typeVal QEvent__Type, key int, modifiers KeyboardModifier, text string) *QKeyEvent { + text_ms := miqt_strdupg(text) + defer C.free(text_ms) + ret := C.QKeyEvent_new3((C.int)(typeVal), (C.int)(key), (C.int)(modifiers), (*C.struct_miqt_string)(text_ms)) return newQKeyEvent(ret) } // NewQKeyEvent4 constructs a new QKeyEvent object. -func NewQKeyEvent4(typeVal QEvent__Type, key int, modifiers KeyboardModifier, text string) *QKeyEvent { +func NewQKeyEvent4(typeVal QEvent__Type, key int, modifiers KeyboardModifier, text string, autorep bool) *QKeyEvent { text_ms := miqt_strdupg(text) defer C.free(text_ms) - ret := C.QKeyEvent_new4((C.int)(typeVal), (C.int)(key), (C.int)(modifiers), (*C.struct_miqt_string)(text_ms)) + ret := C.QKeyEvent_new4((C.int)(typeVal), (C.int)(key), (C.int)(modifiers), (*C.struct_miqt_string)(text_ms), (C.bool)(autorep)) return newQKeyEvent(ret) } // NewQKeyEvent5 constructs a new QKeyEvent object. -func NewQKeyEvent5(typeVal QEvent__Type, key int, modifiers KeyboardModifier, text string, autorep bool) *QKeyEvent { +func NewQKeyEvent5(typeVal QEvent__Type, key int, modifiers KeyboardModifier, text string, autorep bool, count uint16) *QKeyEvent { text_ms := miqt_strdupg(text) defer C.free(text_ms) - ret := C.QKeyEvent_new5((C.int)(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), (C.int)(modifiers), (*C.struct_miqt_string)(text_ms), (C.bool)(autorep), (C.uint16_t)(count)) return newQKeyEvent(ret) } // NewQKeyEvent6 constructs a new QKeyEvent object. -func NewQKeyEvent6(typeVal QEvent__Type, key int, modifiers KeyboardModifier, text string, autorep bool, count uint16) *QKeyEvent { +func NewQKeyEvent6(typeVal QEvent__Type, key int, modifiers KeyboardModifier, nativeScanCode uint, nativeVirtualKey uint, nativeModifiers uint, text string) *QKeyEvent { text_ms := miqt_strdupg(text) defer C.free(text_ms) - ret := C.QKeyEvent_new6((C.int)(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), (C.int)(modifiers), (C.uint)(nativeScanCode), (C.uint)(nativeVirtualKey), (C.uint)(nativeModifiers), (*C.struct_miqt_string)(text_ms)) return newQKeyEvent(ret) } // NewQKeyEvent7 constructs a new QKeyEvent object. -func NewQKeyEvent7(typeVal QEvent__Type, key int, modifiers KeyboardModifier, nativeScanCode uint, nativeVirtualKey uint, nativeModifiers uint, text string) *QKeyEvent { +func NewQKeyEvent7(typeVal QEvent__Type, key int, modifiers KeyboardModifier, nativeScanCode uint, nativeVirtualKey uint, nativeModifiers uint, text string, autorep bool) *QKeyEvent { text_ms := miqt_strdupg(text) defer C.free(text_ms) - ret := C.QKeyEvent_new7((C.int)(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), (C.int)(modifiers), (C.uint)(nativeScanCode), (C.uint)(nativeVirtualKey), (C.uint)(nativeModifiers), (*C.struct_miqt_string)(text_ms), (C.bool)(autorep)) return newQKeyEvent(ret) } // NewQKeyEvent8 constructs a new QKeyEvent object. -func NewQKeyEvent8(typeVal QEvent__Type, key int, modifiers KeyboardModifier, nativeScanCode uint, nativeVirtualKey uint, nativeModifiers uint, text string, autorep bool) *QKeyEvent { +func NewQKeyEvent8(typeVal QEvent__Type, key int, modifiers KeyboardModifier, 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_new8((C.int)(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), (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)) return newQKeyEvent(ret) } // NewQKeyEvent9 constructs a new QKeyEvent object. -func NewQKeyEvent9(typeVal QEvent__Type, key int, modifiers KeyboardModifier, nativeScanCode uint, nativeVirtualKey uint, nativeModifiers uint, text string, autorep bool, count uint16) *QKeyEvent { +func NewQKeyEvent9(typeVal QEvent__Type, key int, modifiers KeyboardModifier, nativeScanCode uint, nativeVirtualKey uint, nativeModifiers uint, text string, autorep bool, count uint16, device *QInputDevice) *QKeyEvent { text_ms := miqt_strdupg(text) defer C.free(text_ms) - ret := C.QKeyEvent_new9((C.int)(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), (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), device.cPointer()) return newQKeyEvent(ret) } +func (this *QKeyEvent) Clone() *QKeyEvent { + return newQKeyEvent_U(unsafe.Pointer(C.QKeyEvent_Clone(this.h))) +} + func (this *QKeyEvent) Key() int { return (int)(C.QKeyEvent_Key(this.h)) } @@ -984,6 +1181,13 @@ func (this *QKeyEvent) Modifiers() KeyboardModifier { return (KeyboardModifier)(C.QKeyEvent_Modifiers(this.h)) } +func (this *QKeyEvent) KeyCombination() *QKeyCombination { + _ret := C.QKeyEvent_KeyCombination(this.h) + _goptr := newQKeyCombination(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + func (this *QKeyEvent) Text() string { var _ms *C.struct_miqt_string = C.QKeyEvent_Text(this.h) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) @@ -1055,15 +1259,13 @@ func NewQFocusEvent(typeVal QEvent__Type) *QFocusEvent { } // NewQFocusEvent2 constructs a new QFocusEvent object. -func NewQFocusEvent2(param1 *QFocusEvent) *QFocusEvent { - ret := C.QFocusEvent_new2(param1.cPointer()) +func NewQFocusEvent2(typeVal QEvent__Type, reason FocusReason) *QFocusEvent { + ret := C.QFocusEvent_new2((C.int)(typeVal), (C.int)(reason)) return newQFocusEvent(ret) } -// NewQFocusEvent3 constructs a new QFocusEvent object. -func NewQFocusEvent3(typeVal QEvent__Type, reason FocusReason) *QFocusEvent { - ret := C.QFocusEvent_new3((C.int)(typeVal), (C.int)(reason)) - return newQFocusEvent(ret) +func (this *QFocusEvent) Clone() *QFocusEvent { + return newQFocusEvent_U(unsafe.Pointer(C.QFocusEvent_Clone(this.h))) } func (this *QFocusEvent) GotFocus() bool { @@ -1127,10 +1329,8 @@ func NewQPaintEvent2(paintRect *QRect) *QPaintEvent { return newQPaintEvent(ret) } -// NewQPaintEvent3 constructs a new QPaintEvent object. -func NewQPaintEvent3(param1 *QPaintEvent) *QPaintEvent { - ret := C.QPaintEvent_new3(param1.cPointer()) - return newQPaintEvent(ret) +func (this *QPaintEvent) Clone() *QPaintEvent { + return newQPaintEvent_U(unsafe.Pointer(C.QPaintEvent_Clone(this.h))) } func (this *QPaintEvent) Rect() *QRect { @@ -1184,10 +1384,8 @@ func NewQMoveEvent(pos *QPoint, oldPos *QPoint) *QMoveEvent { return newQMoveEvent(ret) } -// NewQMoveEvent2 constructs a new QMoveEvent object. -func NewQMoveEvent2(param1 *QMoveEvent) *QMoveEvent { - ret := C.QMoveEvent_new2(param1.cPointer()) - return newQMoveEvent(ret) +func (this *QMoveEvent) Clone() *QMoveEvent { + return newQMoveEvent_U(unsafe.Pointer(C.QMoveEvent_Clone(this.h))) } func (this *QMoveEvent) Pos() *QPoint { @@ -1236,15 +1434,13 @@ func newQExposeEvent_U(h unsafe.Pointer) *QExposeEvent { } // NewQExposeEvent constructs a new QExposeEvent object. -func NewQExposeEvent(rgn *QRegion) *QExposeEvent { - ret := C.QExposeEvent_new(rgn.cPointer()) +func NewQExposeEvent(m_region *QRegion) *QExposeEvent { + ret := C.QExposeEvent_new(m_region.cPointer()) return newQExposeEvent(ret) } -// NewQExposeEvent2 constructs a new QExposeEvent object. -func NewQExposeEvent2(param1 *QExposeEvent) *QExposeEvent { - ret := C.QExposeEvent_new2(param1.cPointer()) - return newQExposeEvent(ret) +func (this *QExposeEvent) Clone() *QExposeEvent { + return newQExposeEvent_U(unsafe.Pointer(C.QExposeEvent_Clone(this.h))) } func (this *QExposeEvent) Region() *QRegion { @@ -1294,10 +1490,8 @@ func NewQPlatformSurfaceEvent(surfaceEventType QPlatformSurfaceEvent__SurfaceEve return newQPlatformSurfaceEvent(ret) } -// NewQPlatformSurfaceEvent2 constructs a new QPlatformSurfaceEvent object. -func NewQPlatformSurfaceEvent2(param1 *QPlatformSurfaceEvent) *QPlatformSurfaceEvent { - ret := C.QPlatformSurfaceEvent_new2(param1.cPointer()) - return newQPlatformSurfaceEvent(ret) +func (this *QPlatformSurfaceEvent) Clone() *QPlatformSurfaceEvent { + return newQPlatformSurfaceEvent_U(unsafe.Pointer(C.QPlatformSurfaceEvent_Clone(this.h))) } func (this *QPlatformSurfaceEvent) SurfaceEventType() QPlatformSurfaceEvent__SurfaceEventType { @@ -1347,10 +1541,8 @@ func NewQResizeEvent(size *QSize, oldSize *QSize) *QResizeEvent { return newQResizeEvent(ret) } -// NewQResizeEvent2 constructs a new QResizeEvent object. -func NewQResizeEvent2(param1 *QResizeEvent) *QResizeEvent { - ret := C.QResizeEvent_new2(param1.cPointer()) - return newQResizeEvent(ret) +func (this *QResizeEvent) Clone() *QResizeEvent { + return newQResizeEvent_U(unsafe.Pointer(C.QResizeEvent_Clone(this.h))) } func (this *QResizeEvent) Size() *QSize { @@ -1404,14 +1596,8 @@ func NewQCloseEvent() *QCloseEvent { return newQCloseEvent(ret) } -// NewQCloseEvent2 constructs a new QCloseEvent object. -func NewQCloseEvent2(param1 *QCloseEvent) *QCloseEvent { - ret := C.QCloseEvent_new2(param1.cPointer()) - return newQCloseEvent(ret) -} - -func (this *QCloseEvent) OperatorAssign(param1 *QCloseEvent) { - C.QCloseEvent_OperatorAssign(this.h, param1.cPointer()) +func (this *QCloseEvent) Clone() *QCloseEvent { + return newQCloseEvent_U(unsafe.Pointer(C.QCloseEvent_Clone(this.h))) } // Delete this object from C++ memory. @@ -1457,14 +1643,8 @@ func NewQIconDragEvent() *QIconDragEvent { return newQIconDragEvent(ret) } -// NewQIconDragEvent2 constructs a new QIconDragEvent object. -func NewQIconDragEvent2(param1 *QIconDragEvent) *QIconDragEvent { - ret := C.QIconDragEvent_new2(param1.cPointer()) - return newQIconDragEvent(ret) -} - -func (this *QIconDragEvent) OperatorAssign(param1 *QIconDragEvent) { - C.QIconDragEvent_OperatorAssign(this.h, param1.cPointer()) +func (this *QIconDragEvent) Clone() *QIconDragEvent { + return newQIconDragEvent_U(unsafe.Pointer(C.QIconDragEvent_Clone(this.h))) } // Delete this object from C++ memory. @@ -1510,14 +1690,8 @@ func NewQShowEvent() *QShowEvent { return newQShowEvent(ret) } -// NewQShowEvent2 constructs a new QShowEvent object. -func NewQShowEvent2(param1 *QShowEvent) *QShowEvent { - ret := C.QShowEvent_new2(param1.cPointer()) - return newQShowEvent(ret) -} - -func (this *QShowEvent) OperatorAssign(param1 *QShowEvent) { - C.QShowEvent_OperatorAssign(this.h, param1.cPointer()) +func (this *QShowEvent) Clone() *QShowEvent { + return newQShowEvent_U(unsafe.Pointer(C.QShowEvent_Clone(this.h))) } // Delete this object from C++ memory. @@ -1563,14 +1737,8 @@ func NewQHideEvent() *QHideEvent { return newQHideEvent(ret) } -// NewQHideEvent2 constructs a new QHideEvent object. -func NewQHideEvent2(param1 *QHideEvent) *QHideEvent { - ret := C.QHideEvent_new2(param1.cPointer()) - return newQHideEvent(ret) -} - -func (this *QHideEvent) OperatorAssign(param1 *QHideEvent) { - C.QHideEvent_OperatorAssign(this.h, param1.cPointer()) +func (this *QHideEvent) Clone() *QHideEvent { + return newQHideEvent_U(unsafe.Pointer(C.QHideEvent_Clone(this.h))) } // Delete this object from C++ memory. @@ -1611,27 +1779,25 @@ func newQContextMenuEvent_U(h unsafe.Pointer) *QContextMenuEvent { } // NewQContextMenuEvent constructs a new QContextMenuEvent object. -func NewQContextMenuEvent(reason QContextMenuEvent__Reason, pos *QPoint, globalPos *QPoint, modifiers KeyboardModifier) *QContextMenuEvent { - ret := C.QContextMenuEvent_new((C.int)(reason), pos.cPointer(), globalPos.cPointer(), (C.int)(modifiers)) +func NewQContextMenuEvent(reason QContextMenuEvent__Reason, pos *QPoint, globalPos *QPoint) *QContextMenuEvent { + ret := C.QContextMenuEvent_new((C.int)(reason), pos.cPointer(), globalPos.cPointer()) return newQContextMenuEvent(ret) } // NewQContextMenuEvent2 constructs a new QContextMenuEvent object. -func NewQContextMenuEvent2(reason QContextMenuEvent__Reason, pos *QPoint, globalPos *QPoint) *QContextMenuEvent { - ret := C.QContextMenuEvent_new2((C.int)(reason), pos.cPointer(), globalPos.cPointer()) +func NewQContextMenuEvent2(reason QContextMenuEvent__Reason, pos *QPoint) *QContextMenuEvent { + ret := C.QContextMenuEvent_new2((C.int)(reason), pos.cPointer()) return newQContextMenuEvent(ret) } // NewQContextMenuEvent3 constructs a new QContextMenuEvent object. -func NewQContextMenuEvent3(reason QContextMenuEvent__Reason, pos *QPoint) *QContextMenuEvent { - ret := C.QContextMenuEvent_new3((C.int)(reason), pos.cPointer()) +func NewQContextMenuEvent3(reason QContextMenuEvent__Reason, pos *QPoint, globalPos *QPoint, modifiers KeyboardModifier) *QContextMenuEvent { + ret := C.QContextMenuEvent_new3((C.int)(reason), pos.cPointer(), globalPos.cPointer(), (C.int)(modifiers)) return newQContextMenuEvent(ret) } -// NewQContextMenuEvent4 constructs a new QContextMenuEvent object. -func NewQContextMenuEvent4(param1 *QContextMenuEvent) *QContextMenuEvent { - ret := C.QContextMenuEvent_new4(param1.cPointer()) - return newQContextMenuEvent(ret) +func (this *QContextMenuEvent) Clone() *QContextMenuEvent { + return newQContextMenuEvent_U(unsafe.Pointer(C.QContextMenuEvent_Clone(this.h))) } func (this *QContextMenuEvent) X() int { @@ -1721,10 +1887,8 @@ func NewQInputMethodEvent2(preeditText string, attributes []QInputMethodEvent__A return newQInputMethodEvent(ret) } -// NewQInputMethodEvent3 constructs a new QInputMethodEvent object. -func NewQInputMethodEvent3(other *QInputMethodEvent) *QInputMethodEvent { - ret := C.QInputMethodEvent_new3(other.cPointer()) - return newQInputMethodEvent(ret) +func (this *QInputMethodEvent) Clone() *QInputMethodEvent { + return newQInputMethodEvent_U(unsafe.Pointer(C.QInputMethodEvent_Clone(this.h))) } func (this *QInputMethodEvent) SetCommitString(commitString string) { @@ -1824,10 +1988,8 @@ func NewQInputMethodQueryEvent(queries InputMethodQuery) *QInputMethodQueryEvent return newQInputMethodQueryEvent(ret) } -// NewQInputMethodQueryEvent2 constructs a new QInputMethodQueryEvent object. -func NewQInputMethodQueryEvent2(param1 *QInputMethodQueryEvent) *QInputMethodQueryEvent { - ret := C.QInputMethodQueryEvent_new2(param1.cPointer()) - return newQInputMethodQueryEvent(ret) +func (this *QInputMethodQueryEvent) Clone() *QInputMethodQueryEvent { + return newQInputMethodQueryEvent_U(unsafe.Pointer(C.QInputMethodQueryEvent_Clone(this.h))) } func (this *QInputMethodQueryEvent) Queries() InputMethodQuery { @@ -1889,15 +2051,13 @@ func NewQDropEvent(pos *QPointF, actions DropAction, data *QMimeData, buttons Mo } // NewQDropEvent2 constructs a new QDropEvent object. -func NewQDropEvent2(param1 *QDropEvent) *QDropEvent { - ret := C.QDropEvent_new2(param1.cPointer()) +func NewQDropEvent2(pos *QPointF, actions DropAction, data *QMimeData, buttons MouseButton, modifiers KeyboardModifier, typeVal QEvent__Type) *QDropEvent { + ret := C.QDropEvent_new2(pos.cPointer(), (C.int)(actions), data.cPointer(), (C.int)(buttons), (C.int)(modifiers), (C.int)(typeVal)) return newQDropEvent(ret) } -// NewQDropEvent3 constructs a new QDropEvent object. -func NewQDropEvent3(pos *QPointF, actions DropAction, data *QMimeData, buttons MouseButton, modifiers KeyboardModifier, typeVal QEvent__Type) *QDropEvent { - ret := C.QDropEvent_new3(pos.cPointer(), (C.int)(actions), data.cPointer(), (C.int)(buttons), (C.int)(modifiers), (C.int)(typeVal)) - return newQDropEvent(ret) +func (this *QDropEvent) Clone() *QDropEvent { + return newQDropEvent_U(unsafe.Pointer(C.QDropEvent_Clone(this.h))) } func (this *QDropEvent) Pos() *QPoint { @@ -1908,7 +2068,10 @@ func (this *QDropEvent) Pos() *QPoint { } func (this *QDropEvent) PosF() *QPointF { - return newQPointF_U(unsafe.Pointer(C.QDropEvent_PosF(this.h))) + _ret := C.QDropEvent_PosF(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr } func (this *QDropEvent) MouseButtons() MouseButton { @@ -1919,6 +2082,21 @@ func (this *QDropEvent) KeyboardModifiers() KeyboardModifier { return (KeyboardModifier)(C.QDropEvent_KeyboardModifiers(this.h)) } +func (this *QDropEvent) Position() *QPointF { + _ret := C.QDropEvent_Position(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QDropEvent) Buttons() MouseButton { + return (MouseButton)(C.QDropEvent_Buttons(this.h)) +} + +func (this *QDropEvent) Modifiers() KeyboardModifier { + return (KeyboardModifier)(C.QDropEvent_Modifiers(this.h)) +} + func (this *QDropEvent) PossibleActions() DropAction { return (DropAction)(C.QDropEvent_PossibleActions(this.h)) } @@ -1991,15 +2169,13 @@ func NewQDragMoveEvent(pos *QPoint, actions DropAction, data *QMimeData, buttons } // NewQDragMoveEvent2 constructs a new QDragMoveEvent object. -func NewQDragMoveEvent2(param1 *QDragMoveEvent) *QDragMoveEvent { - ret := C.QDragMoveEvent_new2(param1.cPointer()) +func NewQDragMoveEvent2(pos *QPoint, actions DropAction, data *QMimeData, buttons MouseButton, modifiers KeyboardModifier, typeVal QEvent__Type) *QDragMoveEvent { + ret := C.QDragMoveEvent_new2(pos.cPointer(), (C.int)(actions), data.cPointer(), (C.int)(buttons), (C.int)(modifiers), (C.int)(typeVal)) return newQDragMoveEvent(ret) } -// NewQDragMoveEvent3 constructs a new QDragMoveEvent object. -func NewQDragMoveEvent3(pos *QPoint, actions DropAction, data *QMimeData, buttons MouseButton, modifiers KeyboardModifier, typeVal QEvent__Type) *QDragMoveEvent { - ret := C.QDragMoveEvent_new3(pos.cPointer(), (C.int)(actions), data.cPointer(), (C.int)(buttons), (C.int)(modifiers), (C.int)(typeVal)) - return newQDragMoveEvent(ret) +func (this *QDragMoveEvent) Clone() *QDragMoveEvent { + return newQDragMoveEvent_U(unsafe.Pointer(C.QDragMoveEvent_Clone(this.h))) } func (this *QDragMoveEvent) AnswerRect() *QRect { @@ -2068,14 +2244,8 @@ func NewQDragEnterEvent(pos *QPoint, actions DropAction, data *QMimeData, button return newQDragEnterEvent(ret) } -// NewQDragEnterEvent2 constructs a new QDragEnterEvent object. -func NewQDragEnterEvent2(param1 *QDragEnterEvent) *QDragEnterEvent { - ret := C.QDragEnterEvent_new2(param1.cPointer()) - return newQDragEnterEvent(ret) -} - -func (this *QDragEnterEvent) OperatorAssign(param1 *QDragEnterEvent) { - C.QDragEnterEvent_OperatorAssign(this.h, param1.cPointer()) +func (this *QDragEnterEvent) Clone() *QDragEnterEvent { + return newQDragEnterEvent_U(unsafe.Pointer(C.QDragEnterEvent_Clone(this.h))) } // Delete this object from C++ memory. @@ -2121,14 +2291,8 @@ func NewQDragLeaveEvent() *QDragLeaveEvent { return newQDragLeaveEvent(ret) } -// NewQDragLeaveEvent2 constructs a new QDragLeaveEvent object. -func NewQDragLeaveEvent2(param1 *QDragLeaveEvent) *QDragLeaveEvent { - ret := C.QDragLeaveEvent_new2(param1.cPointer()) - return newQDragLeaveEvent(ret) -} - -func (this *QDragLeaveEvent) OperatorAssign(param1 *QDragLeaveEvent) { - C.QDragLeaveEvent_OperatorAssign(this.h, param1.cPointer()) +func (this *QDragLeaveEvent) Clone() *QDragLeaveEvent { + return newQDragLeaveEvent_U(unsafe.Pointer(C.QDragLeaveEvent_Clone(this.h))) } // Delete this object from C++ memory. @@ -2174,10 +2338,8 @@ func NewQHelpEvent(typeVal QEvent__Type, pos *QPoint, globalPos *QPoint) *QHelpE return newQHelpEvent(ret) } -// NewQHelpEvent2 constructs a new QHelpEvent object. -func NewQHelpEvent2(param1 *QHelpEvent) *QHelpEvent { - ret := C.QHelpEvent_new2(param1.cPointer()) - return newQHelpEvent(ret) +func (this *QHelpEvent) Clone() *QHelpEvent { + return newQHelpEvent_U(unsafe.Pointer(C.QHelpEvent_Clone(this.h))) } func (this *QHelpEvent) X() int { @@ -2249,10 +2411,8 @@ func NewQStatusTipEvent(tip string) *QStatusTipEvent { return newQStatusTipEvent(ret) } -// NewQStatusTipEvent2 constructs a new QStatusTipEvent object. -func NewQStatusTipEvent2(param1 *QStatusTipEvent) *QStatusTipEvent { - ret := C.QStatusTipEvent_new2(param1.cPointer()) - return newQStatusTipEvent(ret) +func (this *QStatusTipEvent) Clone() *QStatusTipEvent { + return newQStatusTipEvent_U(unsafe.Pointer(C.QStatusTipEvent_Clone(this.h))) } func (this *QStatusTipEvent) Tip() string { @@ -2307,10 +2467,8 @@ func NewQWhatsThisClickedEvent(href string) *QWhatsThisClickedEvent { return newQWhatsThisClickedEvent(ret) } -// NewQWhatsThisClickedEvent2 constructs a new QWhatsThisClickedEvent object. -func NewQWhatsThisClickedEvent2(param1 *QWhatsThisClickedEvent) *QWhatsThisClickedEvent { - ret := C.QWhatsThisClickedEvent_new2(param1.cPointer()) - return newQWhatsThisClickedEvent(ret) +func (this *QWhatsThisClickedEvent) Clone() *QWhatsThisClickedEvent { + return newQWhatsThisClickedEvent_U(unsafe.Pointer(C.QWhatsThisClickedEvent_Clone(this.h))) } func (this *QWhatsThisClickedEvent) Href() string { @@ -2364,15 +2522,13 @@ func NewQActionEvent(typeVal int, action *QAction) *QActionEvent { } // NewQActionEvent2 constructs a new QActionEvent object. -func NewQActionEvent2(param1 *QActionEvent) *QActionEvent { - ret := C.QActionEvent_new2(param1.cPointer()) +func NewQActionEvent2(typeVal int, action *QAction, before *QAction) *QActionEvent { + ret := C.QActionEvent_new2((C.int)(typeVal), action.cPointer(), before.cPointer()) return newQActionEvent(ret) } -// NewQActionEvent3 constructs a new QActionEvent object. -func NewQActionEvent3(typeVal int, action *QAction, before *QAction) *QActionEvent { - ret := C.QActionEvent_new3((C.int)(typeVal), action.cPointer(), before.cPointer()) - return newQActionEvent(ret) +func (this *QActionEvent) Clone() *QActionEvent { + return newQActionEvent_U(unsafe.Pointer(C.QActionEvent_Clone(this.h))) } func (this *QActionEvent) Action() *QAction { @@ -2383,10 +2539,6 @@ func (this *QActionEvent) Before() *QAction { return newQAction_U(unsafe.Pointer(C.QActionEvent_Before(this.h))) } -func (this *QActionEvent) OperatorAssign(param1 *QActionEvent) { - C.QActionEvent_OperatorAssign(this.h, param1.cPointer()) -} - // Delete this object from C++ memory. func (this *QActionEvent) Delete() { C.QActionEvent_Delete(this.h) @@ -2438,10 +2590,8 @@ func NewQFileOpenEvent2(url *QUrl) *QFileOpenEvent { return newQFileOpenEvent(ret) } -// NewQFileOpenEvent3 constructs a new QFileOpenEvent object. -func NewQFileOpenEvent3(param1 *QFileOpenEvent) *QFileOpenEvent { - ret := C.QFileOpenEvent_new3(param1.cPointer()) - return newQFileOpenEvent(ret) +func (this *QFileOpenEvent) Clone() *QFileOpenEvent { + return newQFileOpenEvent_U(unsafe.Pointer(C.QFileOpenEvent_Clone(this.h))) } func (this *QFileOpenEvent) File() string { @@ -2458,7 +2608,7 @@ func (this *QFileOpenEvent) Url() *QUrl { return _goptr } -func (this *QFileOpenEvent) OpenFile(file *QFile, flags QIODevice__OpenModeFlag) bool { +func (this *QFileOpenEvent) OpenFile(file *QFile, flags QIODeviceBase__OpenModeFlag) bool { return (bool)(C.QFileOpenEvent_OpenFile(this.h, file.cPointer(), (C.int)(flags))) } @@ -2505,10 +2655,8 @@ func NewQToolBarChangeEvent(t bool) *QToolBarChangeEvent { return newQToolBarChangeEvent(ret) } -// NewQToolBarChangeEvent2 constructs a new QToolBarChangeEvent object. -func NewQToolBarChangeEvent2(param1 *QToolBarChangeEvent) *QToolBarChangeEvent { - ret := C.QToolBarChangeEvent_new2(param1.cPointer()) - return newQToolBarChangeEvent(ret) +func (this *QToolBarChangeEvent) Clone() *QToolBarChangeEvent { + return newQToolBarChangeEvent_U(unsafe.Pointer(C.QToolBarChangeEvent_Clone(this.h))) } func (this *QToolBarChangeEvent) Toggle() bool { @@ -2559,15 +2707,13 @@ func NewQShortcutEvent(key *QKeySequence, id int) *QShortcutEvent { } // NewQShortcutEvent2 constructs a new QShortcutEvent object. -func NewQShortcutEvent2(param1 *QShortcutEvent) *QShortcutEvent { - ret := C.QShortcutEvent_new2(param1.cPointer()) +func NewQShortcutEvent2(key *QKeySequence, id int, ambiguous bool) *QShortcutEvent { + ret := C.QShortcutEvent_new2(key.cPointer(), (C.int)(id), (C.bool)(ambiguous)) return newQShortcutEvent(ret) } -// NewQShortcutEvent3 constructs a new QShortcutEvent object. -func NewQShortcutEvent3(key *QKeySequence, id int, ambiguous bool) *QShortcutEvent { - ret := C.QShortcutEvent_new3(key.cPointer(), (C.int)(id), (C.bool)(ambiguous)) - return newQShortcutEvent(ret) +func (this *QShortcutEvent) Clone() *QShortcutEvent { + return newQShortcutEvent_U(unsafe.Pointer(C.QShortcutEvent_Clone(this.h))) } func (this *QShortcutEvent) Key() *QKeySequence { @@ -2620,21 +2766,19 @@ func newQWindowStateChangeEvent_U(h unsafe.Pointer) *QWindowStateChangeEvent { } // NewQWindowStateChangeEvent constructs a new QWindowStateChangeEvent object. -func NewQWindowStateChangeEvent(aOldState WindowState) *QWindowStateChangeEvent { - ret := C.QWindowStateChangeEvent_new((C.int)(aOldState)) +func NewQWindowStateChangeEvent(oldState WindowState) *QWindowStateChangeEvent { + ret := C.QWindowStateChangeEvent_new((C.int)(oldState)) return newQWindowStateChangeEvent(ret) } // NewQWindowStateChangeEvent2 constructs a new QWindowStateChangeEvent object. -func NewQWindowStateChangeEvent2(param1 *QWindowStateChangeEvent) *QWindowStateChangeEvent { - ret := C.QWindowStateChangeEvent_new2(param1.cPointer()) +func NewQWindowStateChangeEvent2(oldState WindowState, isOverride bool) *QWindowStateChangeEvent { + ret := C.QWindowStateChangeEvent_new2((C.int)(oldState), (C.bool)(isOverride)) return newQWindowStateChangeEvent(ret) } -// NewQWindowStateChangeEvent3 constructs a new QWindowStateChangeEvent object. -func NewQWindowStateChangeEvent3(aOldState WindowState, isOverride bool) *QWindowStateChangeEvent { - ret := C.QWindowStateChangeEvent_new3((C.int)(aOldState), (C.bool)(isOverride)) - return newQWindowStateChangeEvent(ret) +func (this *QWindowStateChangeEvent) Clone() *QWindowStateChangeEvent { + return newQWindowStateChangeEvent_U(unsafe.Pointer(C.QWindowStateChangeEvent_Clone(this.h))) } func (this *QWindowStateChangeEvent) OldState() WindowState { @@ -2659,72 +2803,9 @@ func (this *QWindowStateChangeEvent) GoGC() { }) } -type QPointingDeviceUniqueId struct { - h *C.QPointingDeviceUniqueId -} - -func (this *QPointingDeviceUniqueId) cPointer() *C.QPointingDeviceUniqueId { - if this == nil { - return nil - } - return this.h -} - -func newQPointingDeviceUniqueId(h *C.QPointingDeviceUniqueId) *QPointingDeviceUniqueId { - if h == nil { - return nil - } - return &QPointingDeviceUniqueId{h: h} -} - -func newQPointingDeviceUniqueId_U(h unsafe.Pointer) *QPointingDeviceUniqueId { - return newQPointingDeviceUniqueId((*C.QPointingDeviceUniqueId)(h)) -} - -// NewQPointingDeviceUniqueId constructs a new QPointingDeviceUniqueId object. -func NewQPointingDeviceUniqueId() *QPointingDeviceUniqueId { - ret := C.QPointingDeviceUniqueId_new() - return newQPointingDeviceUniqueId(ret) -} - -// NewQPointingDeviceUniqueId2 constructs a new QPointingDeviceUniqueId object. -func NewQPointingDeviceUniqueId2(param1 *QPointingDeviceUniqueId) *QPointingDeviceUniqueId { - ret := C.QPointingDeviceUniqueId_new2(param1.cPointer()) - return newQPointingDeviceUniqueId(ret) -} - -func QPointingDeviceUniqueId_FromNumericId(id int64) *QPointingDeviceUniqueId { - _ret := C.QPointingDeviceUniqueId_FromNumericId((C.longlong)(id)) - _goptr := newQPointingDeviceUniqueId(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QPointingDeviceUniqueId) IsValid() bool { - return (bool)(C.QPointingDeviceUniqueId_IsValid(this.h)) -} - -func (this *QPointingDeviceUniqueId) NumericId() int64 { - return (int64)(C.QPointingDeviceUniqueId_NumericId(this.h)) -} - -// Delete this object from C++ memory. -func (this *QPointingDeviceUniqueId) Delete() { - C.QPointingDeviceUniqueId_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QPointingDeviceUniqueId) GoGC() { - runtime.SetFinalizer(this, func(this *QPointingDeviceUniqueId) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} - type QTouchEvent struct { h *C.QTouchEvent - *QInputEvent + *QPointerEvent } func (this *QTouchEvent) cPointer() *C.QTouchEvent { @@ -2738,7 +2819,7 @@ func newQTouchEvent(h *C.QTouchEvent) *QTouchEvent { if h == nil { return nil } - return &QTouchEvent{h: h, QInputEvent: newQInputEvent_U(unsafe.Pointer(h))} + return &QTouchEvent{h: h, QPointerEvent: newQPointerEvent_U(unsafe.Pointer(h))} } func newQTouchEvent_U(h unsafe.Pointer) *QTouchEvent { @@ -2752,62 +2833,70 @@ func NewQTouchEvent(eventType QEvent__Type) *QTouchEvent { } // NewQTouchEvent2 constructs a new QTouchEvent object. -func NewQTouchEvent2(param1 *QTouchEvent) *QTouchEvent { - ret := C.QTouchEvent_new2(param1.cPointer()) +func NewQTouchEvent2(eventType QEvent__Type, device *QPointingDevice, modifiers KeyboardModifier, touchPointStates QEventPoint__State) *QTouchEvent { + ret := C.QTouchEvent_new2((C.int)(eventType), device.cPointer(), (C.int)(modifiers), (C.uint8_t)(touchPointStates)) return newQTouchEvent(ret) } // NewQTouchEvent3 constructs a new QTouchEvent object. -func NewQTouchEvent3(eventType QEvent__Type, device *QTouchDevice) *QTouchEvent { +func NewQTouchEvent3(eventType QEvent__Type, device *QPointingDevice) *QTouchEvent { 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 KeyboardModifier) *QTouchEvent { +func NewQTouchEvent4(eventType QEvent__Type, device *QPointingDevice, modifiers KeyboardModifier) *QTouchEvent { ret := C.QTouchEvent_new4((C.int)(eventType), device.cPointer(), (C.int)(modifiers)) return newQTouchEvent(ret) } // NewQTouchEvent5 constructs a new QTouchEvent object. -func NewQTouchEvent5(eventType QEvent__Type, device *QTouchDevice, modifiers KeyboardModifier, touchPointStates TouchPointState) *QTouchEvent { - ret := C.QTouchEvent_new5((C.int)(eventType), device.cPointer(), (C.int)(modifiers), (C.int)(touchPointStates)) - return newQTouchEvent(ret) -} - -// NewQTouchEvent6 constructs a new QTouchEvent object. -func NewQTouchEvent6(eventType QEvent__Type, device *QTouchDevice, modifiers KeyboardModifier, touchPointStates TouchPointState, touchPoints []QTouchEvent__TouchPoint) *QTouchEvent { +func NewQTouchEvent5(eventType QEvent__Type, device *QPointingDevice, modifiers KeyboardModifier, touchPoints []QEventPoint) *QTouchEvent { // For the C ABI, malloc a C array of raw pointers - touchPoints_CArray := (*[0xffff]*C.QTouchEvent__TouchPoint)(C.malloc(C.size_t(8 * len(touchPoints)))) + touchPoints_CArray := (*[0xffff]*C.QEventPoint)(C.malloc(C.size_t(8 * len(touchPoints)))) defer C.free(unsafe.Pointer(touchPoints_CArray)) for i := range touchPoints { touchPoints_CArray[i] = touchPoints[i].cPointer() } 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.int)(eventType), device.cPointer(), (C.int)(modifiers), (C.int)(touchPointStates), touchPoints_ma) + ret := C.QTouchEvent_new5((C.int)(eventType), device.cPointer(), (C.int)(modifiers), touchPoints_ma) return newQTouchEvent(ret) } -func (this *QTouchEvent) Window() *QWindow { - return newQWindow_U(unsafe.Pointer(C.QTouchEvent_Window(this.h))) +// NewQTouchEvent6 constructs a new QTouchEvent object. +func NewQTouchEvent6(eventType QEvent__Type, device *QPointingDevice, modifiers KeyboardModifier, touchPointStates QEventPoint__State, touchPoints []QEventPoint) *QTouchEvent { + // For the C ABI, malloc a C array of raw pointers + touchPoints_CArray := (*[0xffff]*C.QEventPoint)(C.malloc(C.size_t(8 * len(touchPoints)))) + defer C.free(unsafe.Pointer(touchPoints_CArray)) + for i := range touchPoints { + touchPoints_CArray[i] = touchPoints[i].cPointer() + } + 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.int)(eventType), device.cPointer(), (C.int)(modifiers), (C.uint8_t)(touchPointStates), touchPoints_ma) + return newQTouchEvent(ret) +} + +func (this *QTouchEvent) Clone() *QTouchEvent { + return newQTouchEvent_U(unsafe.Pointer(C.QTouchEvent_Clone(this.h))) } func (this *QTouchEvent) Target() *QObject { return newQObject_U(unsafe.Pointer(C.QTouchEvent_Target(this.h))) } -func (this *QTouchEvent) TouchPointStates() TouchPointState { - return (TouchPointState)(C.QTouchEvent_TouchPointStates(this.h)) +func (this *QTouchEvent) TouchPointStates() QEventPoint__State { + return (QEventPoint__State)(C.QTouchEvent_TouchPointStates(this.h)) } -func (this *QTouchEvent) TouchPoints() []QTouchEvent__TouchPoint { +func (this *QTouchEvent) TouchPoints() []QEventPoint { 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 + _ret := make([]QEventPoint, int(_ma.len)) + _outCast := (*[0xffff]*C.QEventPoint)(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 := newQEventPoint(_lv_ret) _lv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer _ret[i] = *_lv_goptr } @@ -2815,36 +2904,16 @@ func (this *QTouchEvent) TouchPoints() []QTouchEvent__TouchPoint { return _ret } -func (this *QTouchEvent) Device() *QTouchDevice { - return newQTouchDevice_U(unsafe.Pointer(C.QTouchEvent_Device(this.h))) +func (this *QTouchEvent) IsBeginEvent() bool { + return (bool)(C.QTouchEvent_IsBeginEvent(this.h)) } -func (this *QTouchEvent) SetWindow(awindow *QWindow) { - C.QTouchEvent_SetWindow(this.h, awindow.cPointer()) +func (this *QTouchEvent) IsUpdateEvent() bool { + return (bool)(C.QTouchEvent_IsUpdateEvent(this.h)) } -func (this *QTouchEvent) SetTarget(atarget *QObject) { - C.QTouchEvent_SetTarget(this.h, atarget.cPointer()) -} - -func (this *QTouchEvent) SetTouchPointStates(aTouchPointStates TouchPointState) { - C.QTouchEvent_SetTouchPointStates(this.h, (C.int)(aTouchPointStates)) -} - -func (this *QTouchEvent) SetTouchPoints(atouchPoints []QTouchEvent__TouchPoint) { - // For the C ABI, malloc a C array of raw pointers - atouchPoints_CArray := (*[0xffff]*C.QTouchEvent__TouchPoint)(C.malloc(C.size_t(8 * len(atouchPoints)))) - defer C.free(unsafe.Pointer(atouchPoints_CArray)) - for i := range atouchPoints { - atouchPoints_CArray[i] = atouchPoints[i].cPointer() - } - atouchPoints_ma := &C.struct_miqt_array{len: C.size_t(len(atouchPoints)), data: unsafe.Pointer(atouchPoints_CArray)} - defer runtime.KeepAlive(unsafe.Pointer(atouchPoints_ma)) - C.QTouchEvent_SetTouchPoints(this.h, atouchPoints_ma) -} - -func (this *QTouchEvent) SetDevice(adevice *QTouchDevice) { - C.QTouchEvent_SetDevice(this.h, adevice.cPointer()) +func (this *QTouchEvent) IsEndEvent() bool { + return (bool)(C.QTouchEvent_IsEndEvent(this.h)) } // Delete this object from C++ memory. @@ -2890,10 +2959,8 @@ func NewQScrollPrepareEvent(startPos *QPointF) *QScrollPrepareEvent { return newQScrollPrepareEvent(ret) } -// NewQScrollPrepareEvent2 constructs a new QScrollPrepareEvent object. -func NewQScrollPrepareEvent2(param1 *QScrollPrepareEvent) *QScrollPrepareEvent { - ret := C.QScrollPrepareEvent_new2(param1.cPointer()) - return newQScrollPrepareEvent(ret) +func (this *QScrollPrepareEvent) Clone() *QScrollPrepareEvent { + return newQScrollPrepareEvent_U(unsafe.Pointer(C.QScrollPrepareEvent_Clone(this.h))) } func (this *QScrollPrepareEvent) StartPos() *QPointF { @@ -2979,10 +3046,8 @@ func NewQScrollEvent(contentPos *QPointF, overshoot *QPointF, scrollState QScrol return newQScrollEvent(ret) } -// NewQScrollEvent2 constructs a new QScrollEvent object. -func NewQScrollEvent2(param1 *QScrollEvent) *QScrollEvent { - ret := C.QScrollEvent_new2(param1.cPointer()) - return newQScrollEvent(ret) +func (this *QScrollEvent) Clone() *QScrollEvent { + return newQScrollEvent_U(unsafe.Pointer(C.QScrollEvent_Clone(this.h))) } func (this *QScrollEvent) ContentPos() *QPointF { @@ -3046,10 +3111,8 @@ func NewQScreenOrientationChangeEvent(screen *QScreen, orientation ScreenOrienta return newQScreenOrientationChangeEvent(ret) } -// NewQScreenOrientationChangeEvent2 constructs a new QScreenOrientationChangeEvent object. -func NewQScreenOrientationChangeEvent2(param1 *QScreenOrientationChangeEvent) *QScreenOrientationChangeEvent { - ret := C.QScreenOrientationChangeEvent_new2(param1.cPointer()) - return newQScreenOrientationChangeEvent(ret) +func (this *QScreenOrientationChangeEvent) Clone() *QScreenOrientationChangeEvent { + return newQScreenOrientationChangeEvent_U(unsafe.Pointer(C.QScreenOrientationChangeEvent_Clone(this.h))) } func (this *QScreenOrientationChangeEvent) Screen() *QScreen { @@ -3103,10 +3166,8 @@ func NewQApplicationStateChangeEvent(state ApplicationState) *QApplicationStateC return newQApplicationStateChangeEvent(ret) } -// NewQApplicationStateChangeEvent2 constructs a new QApplicationStateChangeEvent object. -func NewQApplicationStateChangeEvent2(param1 *QApplicationStateChangeEvent) *QApplicationStateChangeEvent { - ret := C.QApplicationStateChangeEvent_new2(param1.cPointer()) - return newQApplicationStateChangeEvent(ret) +func (this *QApplicationStateChangeEvent) Clone() *QApplicationStateChangeEvent { + return newQApplicationStateChangeEvent_U(unsafe.Pointer(C.QApplicationStateChangeEvent_Clone(this.h))) } func (this *QApplicationStateChangeEvent) ApplicationState() ApplicationState { @@ -3184,329 +3245,3 @@ func (this *QInputMethodEvent__Attribute) GoGC() { runtime.KeepAlive(this.h) }) } - -type QTouchEvent__TouchPoint struct { - h *C.QTouchEvent__TouchPoint -} - -func (this *QTouchEvent__TouchPoint) cPointer() *C.QTouchEvent__TouchPoint { - if this == nil { - return nil - } - return this.h -} - -func newQTouchEvent__TouchPoint(h *C.QTouchEvent__TouchPoint) *QTouchEvent__TouchPoint { - if h == nil { - return nil - } - return &QTouchEvent__TouchPoint{h: h} -} - -func newQTouchEvent__TouchPoint_U(h unsafe.Pointer) *QTouchEvent__TouchPoint { - return newQTouchEvent__TouchPoint((*C.QTouchEvent__TouchPoint)(h)) -} - -// NewQTouchEvent__TouchPoint constructs a new QTouchEvent::TouchPoint object. -func NewQTouchEvent__TouchPoint() *QTouchEvent__TouchPoint { - ret := C.QTouchEvent__TouchPoint_new() - return newQTouchEvent__TouchPoint(ret) -} - -// NewQTouchEvent__TouchPoint2 constructs a new QTouchEvent::TouchPoint object. -func NewQTouchEvent__TouchPoint2(other *QTouchEvent__TouchPoint) *QTouchEvent__TouchPoint { - ret := C.QTouchEvent__TouchPoint_new2(other.cPointer()) - return newQTouchEvent__TouchPoint(ret) -} - -// NewQTouchEvent__TouchPoint3 constructs a new QTouchEvent::TouchPoint object. -func NewQTouchEvent__TouchPoint3(id int) *QTouchEvent__TouchPoint { - ret := C.QTouchEvent__TouchPoint_new3((C.int)(id)) - 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()) -} - -func (this *QTouchEvent__TouchPoint) Id() int { - return (int)(C.QTouchEvent__TouchPoint_Id(this.h)) -} - -func (this *QTouchEvent__TouchPoint) UniqueId() *QPointingDeviceUniqueId { - _ret := C.QTouchEvent__TouchPoint_UniqueId(this.h) - _goptr := newQPointingDeviceUniqueId(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QTouchEvent__TouchPoint) State() TouchPointState { - return (TouchPointState)(C.QTouchEvent__TouchPoint_State(this.h)) -} - -func (this *QTouchEvent__TouchPoint) Pos() *QPointF { - _ret := C.QTouchEvent__TouchPoint_Pos(this.h) - _goptr := newQPointF(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QTouchEvent__TouchPoint) StartPos() *QPointF { - _ret := C.QTouchEvent__TouchPoint_StartPos(this.h) - _goptr := newQPointF(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QTouchEvent__TouchPoint) LastPos() *QPointF { - _ret := C.QTouchEvent__TouchPoint_LastPos(this.h) - _goptr := newQPointF(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QTouchEvent__TouchPoint) ScenePos() *QPointF { - _ret := C.QTouchEvent__TouchPoint_ScenePos(this.h) - _goptr := newQPointF(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QTouchEvent__TouchPoint) StartScenePos() *QPointF { - _ret := C.QTouchEvent__TouchPoint_StartScenePos(this.h) - _goptr := newQPointF(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QTouchEvent__TouchPoint) LastScenePos() *QPointF { - _ret := C.QTouchEvent__TouchPoint_LastScenePos(this.h) - _goptr := newQPointF(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QTouchEvent__TouchPoint) ScreenPos() *QPointF { - _ret := C.QTouchEvent__TouchPoint_ScreenPos(this.h) - _goptr := newQPointF(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QTouchEvent__TouchPoint) StartScreenPos() *QPointF { - _ret := C.QTouchEvent__TouchPoint_StartScreenPos(this.h) - _goptr := newQPointF(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QTouchEvent__TouchPoint) LastScreenPos() *QPointF { - _ret := C.QTouchEvent__TouchPoint_LastScreenPos(this.h) - _goptr := newQPointF(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QTouchEvent__TouchPoint) NormalizedPos() *QPointF { - _ret := C.QTouchEvent__TouchPoint_NormalizedPos(this.h) - _goptr := newQPointF(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QTouchEvent__TouchPoint) StartNormalizedPos() *QPointF { - _ret := C.QTouchEvent__TouchPoint_StartNormalizedPos(this.h) - _goptr := newQPointF(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QTouchEvent__TouchPoint) LastNormalizedPos() *QPointF { - _ret := C.QTouchEvent__TouchPoint_LastNormalizedPos(this.h) - _goptr := newQPointF(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QTouchEvent__TouchPoint) Rect() *QRectF { - _ret := C.QTouchEvent__TouchPoint_Rect(this.h) - _goptr := newQRectF(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QTouchEvent__TouchPoint) SceneRect() *QRectF { - _ret := C.QTouchEvent__TouchPoint_SceneRect(this.h) - _goptr := newQRectF(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QTouchEvent__TouchPoint) ScreenRect() *QRectF { - _ret := C.QTouchEvent__TouchPoint_ScreenRect(this.h) - _goptr := newQRectF(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QTouchEvent__TouchPoint) SetRect(rect *QRectF) { - C.QTouchEvent__TouchPoint_SetRect(this.h, rect.cPointer()) -} - -func (this *QTouchEvent__TouchPoint) SetSceneRect(sceneRect *QRectF) { - C.QTouchEvent__TouchPoint_SetSceneRect(this.h, sceneRect.cPointer()) -} - -func (this *QTouchEvent__TouchPoint) SetScreenRect(screenRect *QRectF) { - C.QTouchEvent__TouchPoint_SetScreenRect(this.h, screenRect.cPointer()) -} - -func (this *QTouchEvent__TouchPoint) Pressure() float64 { - return (float64)(C.QTouchEvent__TouchPoint_Pressure(this.h)) -} - -func (this *QTouchEvent__TouchPoint) Rotation() float64 { - return (float64)(C.QTouchEvent__TouchPoint_Rotation(this.h)) -} - -func (this *QTouchEvent__TouchPoint) EllipseDiameters() *QSizeF { - _ret := C.QTouchEvent__TouchPoint_EllipseDiameters(this.h) - _goptr := newQSizeF(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QTouchEvent__TouchPoint) Velocity() *QVector2D { - _ret := C.QTouchEvent__TouchPoint_Velocity(this.h) - _goptr := newQVector2D(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QTouchEvent__TouchPoint) Flags() QTouchEvent__TouchPoint__InfoFlag { - return (QTouchEvent__TouchPoint__InfoFlag)(C.QTouchEvent__TouchPoint_Flags(this.h)) -} - -func (this *QTouchEvent__TouchPoint) RawScreenPositions() []QPointF { - var _ma *C.struct_miqt_array = C.QTouchEvent__TouchPoint_RawScreenPositions(this.h) - _ret := make([]QPointF, int(_ma.len)) - _outCast := (*[0xffff]*C.QPointF)(unsafe.Pointer(_ma.data)) // hey ya - for i := 0; i < int(_ma.len); i++ { - _vv_ret := _outCast[i] - _vv_goptr := newQPointF(_vv_ret) - _vv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_vv_goptr - } - C.free(unsafe.Pointer(_ma)) - return _ret -} - -func (this *QTouchEvent__TouchPoint) SetId(id int) { - C.QTouchEvent__TouchPoint_SetId(this.h, (C.int)(id)) -} - -func (this *QTouchEvent__TouchPoint) SetUniqueId(uid int64) { - C.QTouchEvent__TouchPoint_SetUniqueId(this.h, (C.longlong)(uid)) -} - -func (this *QTouchEvent__TouchPoint) SetState(state TouchPointState) { - C.QTouchEvent__TouchPoint_SetState(this.h, (C.int)(state)) -} - -func (this *QTouchEvent__TouchPoint) SetPos(pos *QPointF) { - C.QTouchEvent__TouchPoint_SetPos(this.h, pos.cPointer()) -} - -func (this *QTouchEvent__TouchPoint) SetScenePos(scenePos *QPointF) { - C.QTouchEvent__TouchPoint_SetScenePos(this.h, scenePos.cPointer()) -} - -func (this *QTouchEvent__TouchPoint) SetScreenPos(screenPos *QPointF) { - C.QTouchEvent__TouchPoint_SetScreenPos(this.h, screenPos.cPointer()) -} - -func (this *QTouchEvent__TouchPoint) SetNormalizedPos(normalizedPos *QPointF) { - C.QTouchEvent__TouchPoint_SetNormalizedPos(this.h, normalizedPos.cPointer()) -} - -func (this *QTouchEvent__TouchPoint) SetStartPos(startPos *QPointF) { - C.QTouchEvent__TouchPoint_SetStartPos(this.h, startPos.cPointer()) -} - -func (this *QTouchEvent__TouchPoint) SetStartScenePos(startScenePos *QPointF) { - C.QTouchEvent__TouchPoint_SetStartScenePos(this.h, startScenePos.cPointer()) -} - -func (this *QTouchEvent__TouchPoint) SetStartScreenPos(startScreenPos *QPointF) { - C.QTouchEvent__TouchPoint_SetStartScreenPos(this.h, startScreenPos.cPointer()) -} - -func (this *QTouchEvent__TouchPoint) SetStartNormalizedPos(startNormalizedPos *QPointF) { - C.QTouchEvent__TouchPoint_SetStartNormalizedPos(this.h, startNormalizedPos.cPointer()) -} - -func (this *QTouchEvent__TouchPoint) SetLastPos(lastPos *QPointF) { - C.QTouchEvent__TouchPoint_SetLastPos(this.h, lastPos.cPointer()) -} - -func (this *QTouchEvent__TouchPoint) SetLastScenePos(lastScenePos *QPointF) { - C.QTouchEvent__TouchPoint_SetLastScenePos(this.h, lastScenePos.cPointer()) -} - -func (this *QTouchEvent__TouchPoint) SetLastScreenPos(lastScreenPos *QPointF) { - C.QTouchEvent__TouchPoint_SetLastScreenPos(this.h, lastScreenPos.cPointer()) -} - -func (this *QTouchEvent__TouchPoint) SetLastNormalizedPos(lastNormalizedPos *QPointF) { - C.QTouchEvent__TouchPoint_SetLastNormalizedPos(this.h, lastNormalizedPos.cPointer()) -} - -func (this *QTouchEvent__TouchPoint) SetPressure(pressure float64) { - C.QTouchEvent__TouchPoint_SetPressure(this.h, (C.double)(pressure)) -} - -func (this *QTouchEvent__TouchPoint) SetRotation(angle float64) { - C.QTouchEvent__TouchPoint_SetRotation(this.h, (C.double)(angle)) -} - -func (this *QTouchEvent__TouchPoint) SetEllipseDiameters(dia *QSizeF) { - C.QTouchEvent__TouchPoint_SetEllipseDiameters(this.h, dia.cPointer()) -} - -func (this *QTouchEvent__TouchPoint) SetVelocity(v *QVector2D) { - C.QTouchEvent__TouchPoint_SetVelocity(this.h, v.cPointer()) -} - -func (this *QTouchEvent__TouchPoint) SetFlags(flags QTouchEvent__TouchPoint__InfoFlag) { - C.QTouchEvent__TouchPoint_SetFlags(this.h, (C.int)(flags)) -} - -func (this *QTouchEvent__TouchPoint) SetRawScreenPositions(positions []QPointF) { - // For the C ABI, malloc a C array of raw pointers - positions_CArray := (*[0xffff]*C.QPointF)(C.malloc(C.size_t(8 * len(positions)))) - defer C.free(unsafe.Pointer(positions_CArray)) - for i := range positions { - positions_CArray[i] = positions[i].cPointer() - } - positions_ma := &C.struct_miqt_array{len: C.size_t(len(positions)), data: unsafe.Pointer(positions_CArray)} - defer runtime.KeepAlive(unsafe.Pointer(positions_ma)) - C.QTouchEvent__TouchPoint_SetRawScreenPositions(this.h, positions_ma) -} - -// Delete this object from C++ memory. -func (this *QTouchEvent__TouchPoint) Delete() { - C.QTouchEvent__TouchPoint_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QTouchEvent__TouchPoint) GoGC() { - runtime.SetFinalizer(this, func(this *QTouchEvent__TouchPoint) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} diff --git a/qt/gen_qevent.h b/qt/gen_qevent.h index 3c9210a..1cca211 100644 --- a/qt/gen_qevent.h +++ b/qt/gen_qevent.h @@ -24,6 +24,7 @@ class QDragLeaveEvent; class QDragMoveEvent; class QDropEvent; class QEnterEvent; +class QEventPoint; class QExposeEvent; class QFile; class QFileOpenEvent; @@ -32,6 +33,7 @@ class QHelpEvent; class QHideEvent; class QHoverEvent; class QIconDragEvent; +class QInputDevice; class QInputEvent; class QInputMethodEvent; #if defined(WORKAROUND_INNER_CLASS_DEFINITION_QInputMethodEvent__Attribute) @@ -40,6 +42,7 @@ typedef QInputMethodEvent::Attribute QInputMethodEvent__Attribute; class QInputMethodEvent__Attribute; #endif class QInputMethodQueryEvent; +class QKeyCombination; class QKeyEvent; class QKeySequence; class QMimeData; @@ -51,7 +54,8 @@ class QPaintEvent; class QPlatformSurfaceEvent; class QPoint; class QPointF; -class QPointingDeviceUniqueId; +class QPointerEvent; +class QPointingDevice; class QRect; class QRectF; class QRegion; @@ -62,24 +66,17 @@ class QScrollEvent; class QScrollPrepareEvent; class QShortcutEvent; class QShowEvent; +class QSinglePointEvent; class QSize; class QSizeF; class QStatusTipEvent; class QTabletEvent; class QToolBarChangeEvent; -class QTouchDevice; class QTouchEvent; -#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QTouchEvent__TouchPoint) -typedef QTouchEvent::TouchPoint QTouchEvent__TouchPoint; -#else -class QTouchEvent__TouchPoint; -#endif class QUrl; class QVariant; -class QVector2D; class QWhatsThisClickedEvent; class QWheelEvent; -class QWindow; class QWindowStateChangeEvent; #else typedef struct QAction QAction; @@ -92,6 +89,7 @@ typedef struct QDragLeaveEvent QDragLeaveEvent; typedef struct QDragMoveEvent QDragMoveEvent; typedef struct QDropEvent QDropEvent; typedef struct QEnterEvent QEnterEvent; +typedef struct QEventPoint QEventPoint; typedef struct QExposeEvent QExposeEvent; typedef struct QFile QFile; typedef struct QFileOpenEvent QFileOpenEvent; @@ -100,10 +98,12 @@ typedef struct QHelpEvent QHelpEvent; typedef struct QHideEvent QHideEvent; typedef struct QHoverEvent QHoverEvent; typedef struct QIconDragEvent QIconDragEvent; +typedef struct QInputDevice QInputDevice; typedef struct QInputEvent QInputEvent; typedef struct QInputMethodEvent QInputMethodEvent; typedef struct QInputMethodEvent__Attribute QInputMethodEvent__Attribute; typedef struct QInputMethodQueryEvent QInputMethodQueryEvent; +typedef struct QKeyCombination QKeyCombination; typedef struct QKeyEvent QKeyEvent; typedef struct QKeySequence QKeySequence; typedef struct QMimeData QMimeData; @@ -115,7 +115,8 @@ typedef struct QPaintEvent QPaintEvent; typedef struct QPlatformSurfaceEvent QPlatformSurfaceEvent; typedef struct QPoint QPoint; typedef struct QPointF QPointF; -typedef struct QPointingDeviceUniqueId QPointingDeviceUniqueId; +typedef struct QPointerEvent QPointerEvent; +typedef struct QPointingDevice QPointingDevice; typedef struct QRect QRect; typedef struct QRectF QRectF; typedef struct QRegion QRegion; @@ -126,34 +127,71 @@ typedef struct QScrollEvent QScrollEvent; typedef struct QScrollPrepareEvent QScrollPrepareEvent; typedef struct QShortcutEvent QShortcutEvent; typedef struct QShowEvent QShowEvent; +typedef struct QSinglePointEvent QSinglePointEvent; typedef struct QSize QSize; typedef struct QSizeF QSizeF; typedef struct QStatusTipEvent QStatusTipEvent; typedef struct QTabletEvent QTabletEvent; typedef struct QToolBarChangeEvent QToolBarChangeEvent; -typedef struct QTouchDevice QTouchDevice; typedef struct QTouchEvent QTouchEvent; -typedef struct QTouchEvent__TouchPoint QTouchEvent__TouchPoint; typedef struct QUrl QUrl; typedef struct QVariant QVariant; -typedef struct QVector2D QVector2D; typedef struct QWhatsThisClickedEvent QWhatsThisClickedEvent; typedef struct QWheelEvent QWheelEvent; -typedef struct QWindow QWindow; typedef struct QWindowStateChangeEvent QWindowStateChangeEvent; #endif -QInputEvent* QInputEvent_new(int typeVal); -QInputEvent* QInputEvent_new2(QInputEvent* param1); -QInputEvent* QInputEvent_new3(int typeVal, int modifiers); +QInputEvent* QInputEvent_new(int typeVal, QInputDevice* m_dev); +QInputEvent* QInputEvent_new2(int typeVal, QInputDevice* m_dev, int modifiers); +QInputEvent* QInputEvent_Clone(const QInputEvent* self); +QInputDevice* QInputEvent_Device(const QInputEvent* self); +int QInputEvent_DeviceType(const QInputEvent* self); int QInputEvent_Modifiers(const QInputEvent* self); -void QInputEvent_SetModifiers(QInputEvent* self, int amodifiers); -unsigned long QInputEvent_Timestamp(const QInputEvent* self); -void QInputEvent_SetTimestamp(QInputEvent* self, unsigned long atimestamp); +void QInputEvent_SetModifiers(QInputEvent* self, int modifiers); +unsigned long long QInputEvent_Timestamp(const QInputEvent* self); +void QInputEvent_SetTimestamp(QInputEvent* self, unsigned long long timestamp); void QInputEvent_Delete(QInputEvent* self); -QEnterEvent* QEnterEvent_new(QPointF* localPos, QPointF* windowPos, QPointF* screenPos); -QEnterEvent* QEnterEvent_new2(QEnterEvent* param1); +QPointerEvent* QPointerEvent_new(int typeVal, QPointingDevice* dev); +QPointerEvent* QPointerEvent_new2(int typeVal, QPointingDevice* dev, int modifiers); +QPointerEvent* QPointerEvent_new3(int typeVal, QPointingDevice* dev, int modifiers, struct miqt_array* /* of QEventPoint* */ points); +QPointerEvent* QPointerEvent_Clone(const QPointerEvent* self); +QPointingDevice* QPointerEvent_PointingDevice(const QPointerEvent* self); +int QPointerEvent_PointerType(const QPointerEvent* self); +void QPointerEvent_SetTimestamp(QPointerEvent* self, unsigned long long timestamp); +ptrdiff_t QPointerEvent_PointCount(const QPointerEvent* self); +QEventPoint* QPointerEvent_Point(QPointerEvent* self, ptrdiff_t i); +struct miqt_array* QPointerEvent_Points(const QPointerEvent* self); +QEventPoint* QPointerEvent_PointById(QPointerEvent* self, int id); +bool QPointerEvent_AllPointsGrabbed(const QPointerEvent* self); +bool QPointerEvent_IsBeginEvent(const QPointerEvent* self); +bool QPointerEvent_IsUpdateEvent(const QPointerEvent* self); +bool QPointerEvent_IsEndEvent(const QPointerEvent* self); +bool QPointerEvent_AllPointsAccepted(const QPointerEvent* self); +void QPointerEvent_SetAccepted(QPointerEvent* self, bool accepted); +QObject* QPointerEvent_ExclusiveGrabber(const QPointerEvent* self, QEventPoint* point); +void QPointerEvent_SetExclusiveGrabber(QPointerEvent* self, QEventPoint* point, QObject* exclusiveGrabber); +void QPointerEvent_ClearPassiveGrabbers(QPointerEvent* self, QEventPoint* point); +bool QPointerEvent_AddPassiveGrabber(QPointerEvent* self, QEventPoint* point, QObject* grabber); +bool QPointerEvent_RemovePassiveGrabber(QPointerEvent* self, QEventPoint* point, QObject* grabber); +void QPointerEvent_Delete(QPointerEvent* self); + +QSinglePointEvent* QSinglePointEvent_Clone(const QSinglePointEvent* self); +int QSinglePointEvent_Button(const QSinglePointEvent* self); +int QSinglePointEvent_Buttons(const QSinglePointEvent* self); +QPointF* QSinglePointEvent_Position(const QSinglePointEvent* self); +QPointF* QSinglePointEvent_ScenePosition(const QSinglePointEvent* self); +QPointF* QSinglePointEvent_GlobalPosition(const QSinglePointEvent* self); +bool QSinglePointEvent_IsBeginEvent(const QSinglePointEvent* self); +bool QSinglePointEvent_IsUpdateEvent(const QSinglePointEvent* self); +bool QSinglePointEvent_IsEndEvent(const QSinglePointEvent* self); +QObject* QSinglePointEvent_ExclusivePointGrabber(const QSinglePointEvent* self); +void QSinglePointEvent_SetExclusivePointGrabber(QSinglePointEvent* self, QObject* exclusiveGrabber); +void QSinglePointEvent_Delete(QSinglePointEvent* self); + +QEnterEvent* QEnterEvent_new(QPointF* localPos, QPointF* scenePos, QPointF* globalPos); +QEnterEvent* QEnterEvent_new2(QPointF* localPos, QPointF* scenePos, QPointF* globalPos, QPointingDevice* device); +QEnterEvent* QEnterEvent_Clone(const QEnterEvent* self); QPoint* QEnterEvent_Pos(const QEnterEvent* self); QPoint* QEnterEvent_GlobalPos(const QEnterEvent* self); int QEnterEvent_X(const QEnterEvent* self); @@ -166,10 +204,14 @@ QPointF* QEnterEvent_ScreenPos(const QEnterEvent* self); void QEnterEvent_Delete(QEnterEvent* self); 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); +QMouseEvent* QMouseEvent_new2(int typeVal, QPointF* localPos, QPointF* globalPos, int button, int buttons, int modifiers); +QMouseEvent* QMouseEvent_new3(int typeVal, QPointF* localPos, QPointF* scenePos, QPointF* globalPos, int button, int buttons, int modifiers); +QMouseEvent* QMouseEvent_new4(int typeVal, QPointF* localPos, QPointF* scenePos, QPointF* globalPos, int button, int buttons, int modifiers, int source); +QMouseEvent* QMouseEvent_new5(int typeVal, QPointF* localPos, int button, int buttons, int modifiers, QPointingDevice* device); +QMouseEvent* QMouseEvent_new6(int typeVal, QPointF* localPos, QPointF* globalPos, int button, int buttons, int modifiers, QPointingDevice* device); +QMouseEvent* QMouseEvent_new7(int typeVal, QPointF* localPos, QPointF* scenePos, QPointF* globalPos, int button, int buttons, int modifiers, QPointingDevice* device); +QMouseEvent* QMouseEvent_new8(int typeVal, QPointF* localPos, QPointF* scenePos, QPointF* globalPos, int button, int buttons, int modifiers, int source, QPointingDevice* device); +QMouseEvent* QMouseEvent_Clone(const QMouseEvent* self); QPoint* QMouseEvent_Pos(const QMouseEvent* self); QPoint* QMouseEvent_GlobalPos(const QMouseEvent* self); int QMouseEvent_X(const QMouseEvent* self); @@ -179,56 +221,42 @@ int QMouseEvent_GlobalY(const QMouseEvent* self); QPointF* QMouseEvent_LocalPos(const QMouseEvent* self); QPointF* QMouseEvent_WindowPos(const QMouseEvent* self); QPointF* QMouseEvent_ScreenPos(const QMouseEvent* self); -int QMouseEvent_Button(const QMouseEvent* self); -int QMouseEvent_Buttons(const QMouseEvent* self); -void QMouseEvent_SetLocalPos(QMouseEvent* self, QPointF* localPosition); int QMouseEvent_Source(const QMouseEvent* self); int QMouseEvent_Flags(const QMouseEvent* self); void QMouseEvent_Delete(QMouseEvent* self); -QHoverEvent* QHoverEvent_new(int typeVal, QPointF* pos, QPointF* oldPos); -QHoverEvent* QHoverEvent_new2(QHoverEvent* param1); -QHoverEvent* QHoverEvent_new3(int typeVal, QPointF* pos, QPointF* oldPos, int modifiers); +QHoverEvent* QHoverEvent_new(int typeVal, QPointF* scenePos, QPointF* globalPos, QPointF* oldPos); +QHoverEvent* QHoverEvent_new2(int typeVal, QPointF* pos, QPointF* oldPos); +QHoverEvent* QHoverEvent_new3(int typeVal, QPointF* scenePos, QPointF* globalPos, QPointF* oldPos, int modifiers); +QHoverEvent* QHoverEvent_new4(int typeVal, QPointF* scenePos, QPointF* globalPos, QPointF* oldPos, int modifiers, QPointingDevice* device); +QHoverEvent* QHoverEvent_new5(int typeVal, QPointF* pos, QPointF* oldPos, int modifiers); +QHoverEvent* QHoverEvent_new6(int typeVal, QPointF* pos, QPointF* oldPos, int modifiers, QPointingDevice* device); +QHoverEvent* QHoverEvent_Clone(const QHoverEvent* self); QPoint* QHoverEvent_Pos(const QHoverEvent* self); -QPoint* QHoverEvent_OldPos(const QHoverEvent* self); QPointF* QHoverEvent_PosF(const QHoverEvent* self); +bool QHoverEvent_IsUpdateEvent(const QHoverEvent* self); +QPoint* QHoverEvent_OldPos(const QHoverEvent* self); QPointF* QHoverEvent_OldPosF(const QHoverEvent* self); 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, 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, 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); +QWheelEvent* QWheelEvent_new(QPointF* pos, QPointF* globalPos, QPoint* pixelDelta, QPoint* angleDelta, int buttons, int modifiers, int phase, bool inverted); +QWheelEvent* QWheelEvent_new2(QPointF* pos, QPointF* globalPos, QPoint* pixelDelta, QPoint* angleDelta, int buttons, int modifiers, int phase, bool inverted, int source); +QWheelEvent* QWheelEvent_new3(QPointF* pos, QPointF* globalPos, QPoint* pixelDelta, QPoint* angleDelta, int buttons, int modifiers, int phase, bool inverted, int source, QPointingDevice* device); +QWheelEvent* QWheelEvent_Clone(const QWheelEvent* self); QPoint* QWheelEvent_PixelDelta(const QWheelEvent* self); QPoint* QWheelEvent_AngleDelta(const QWheelEvent* self); -int QWheelEvent_Delta(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); -int QWheelEvent_Y(const QWheelEvent* self); -int QWheelEvent_GlobalX(const QWheelEvent* self); -int QWheelEvent_GlobalY(const QWheelEvent* self); -QPointF* QWheelEvent_PosF(const QWheelEvent* self); -QPointF* QWheelEvent_GlobalPosF(const QWheelEvent* self); -QPointF* QWheelEvent_Position(const QWheelEvent* self); -QPointF* QWheelEvent_GlobalPosition(const QWheelEvent* self); -int QWheelEvent_Buttons(const QWheelEvent* self); int QWheelEvent_Phase(const QWheelEvent* self); bool QWheelEvent_Inverted(const QWheelEvent* self); +bool QWheelEvent_IsInverted(const QWheelEvent* self); +bool QWheelEvent_HasPixelDelta(const QWheelEvent* self); +bool QWheelEvent_IsBeginEvent(const QWheelEvent* self); +bool QWheelEvent_IsUpdateEvent(const QWheelEvent* self); +bool QWheelEvent_IsEndEvent(const QWheelEvent* self); int QWheelEvent_Source(const QWheelEvent* self); void QWheelEvent_Delete(QWheelEvent* self); -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); +QTabletEvent* QTabletEvent_new(int t, QPointingDevice* device, QPointF* pos, QPointF* globalPos, double pressure, float xTilt, float yTilt, float tangentialPressure, double rotation, float z, int keyState, int button, int buttons); +QTabletEvent* QTabletEvent_Clone(const QTabletEvent* self); QPoint* QTabletEvent_Pos(const QTabletEvent* self); QPoint* QTabletEvent_GlobalPos(const QTabletEvent* self); QPointF* QTabletEvent_PosF(const QTabletEvent* self); @@ -239,45 +267,44 @@ int QTabletEvent_GlobalX(const QTabletEvent* self); int QTabletEvent_GlobalY(const QTabletEvent* self); double QTabletEvent_HiResGlobalX(const QTabletEvent* self); double QTabletEvent_HiResGlobalY(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); -double QTabletEvent_TangentialPressure(const QTabletEvent* self); double QTabletEvent_Rotation(const QTabletEvent* self); -int QTabletEvent_XTilt(const QTabletEvent* self); -int QTabletEvent_YTilt(const QTabletEvent* self); -int QTabletEvent_Button(const QTabletEvent* self); -int QTabletEvent_Buttons(const QTabletEvent* self); +double QTabletEvent_Z(const QTabletEvent* self); +double QTabletEvent_TangentialPressure(const QTabletEvent* self); +double QTabletEvent_XTilt(const QTabletEvent* self); +double QTabletEvent_YTilt(const QTabletEvent* self); void QTabletEvent_Delete(QTabletEvent* self); -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); +QNativeGestureEvent* QNativeGestureEvent_new(int typeVal, QPointingDevice* dev, QPointF* localPos, QPointF* scenePos, QPointF* globalPos, double value, unsigned long long sequenceId, unsigned long long intArgument); +QNativeGestureEvent* QNativeGestureEvent_new2(int typeVal, QPointingDevice* dev, int fingerCount, QPointF* localPos, QPointF* scenePos, QPointF* globalPos, double value, QPointF* delta); +QNativeGestureEvent* QNativeGestureEvent_new3(int typeVal, QPointingDevice* dev, int fingerCount, QPointF* localPos, QPointF* scenePos, QPointF* globalPos, double value, QPointF* delta, unsigned long long sequenceId); +QNativeGestureEvent* QNativeGestureEvent_Clone(const QNativeGestureEvent* self); int QNativeGestureEvent_GestureType(const QNativeGestureEvent* self); +int QNativeGestureEvent_FingerCount(const QNativeGestureEvent* self); double QNativeGestureEvent_Value(const QNativeGestureEvent* self); +QPointF* QNativeGestureEvent_Delta(const QNativeGestureEvent* self); QPoint* QNativeGestureEvent_Pos(const QNativeGestureEvent* self); QPoint* QNativeGestureEvent_GlobalPos(const QNativeGestureEvent* self); QPointF* QNativeGestureEvent_LocalPos(const QNativeGestureEvent* self); QPointF* QNativeGestureEvent_WindowPos(const QNativeGestureEvent* self); QPointF* QNativeGestureEvent_ScreenPos(const QNativeGestureEvent* self); -QTouchDevice* QNativeGestureEvent_Device(const QNativeGestureEvent* self); void QNativeGestureEvent_Delete(QNativeGestureEvent* self); 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(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); +QKeyEvent* QKeyEvent_new3(int typeVal, int key, int modifiers, struct miqt_string* text); +QKeyEvent* QKeyEvent_new4(int 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, uint16_t count); +QKeyEvent* QKeyEvent_new6(int 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, 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, 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, QInputDevice* device); +QKeyEvent* QKeyEvent_Clone(const QKeyEvent* self); int QKeyEvent_Key(const QKeyEvent* self); bool QKeyEvent_Matches(const QKeyEvent* self, int key); int QKeyEvent_Modifiers(const QKeyEvent* self); +QKeyCombination* QKeyEvent_KeyCombination(const QKeyEvent* self); struct miqt_string* QKeyEvent_Text(const QKeyEvent* self); bool QKeyEvent_IsAutoRepeat(const QKeyEvent* self); int QKeyEvent_Count(const QKeyEvent* self); @@ -287,8 +314,8 @@ unsigned int QKeyEvent_NativeModifiers(const QKeyEvent* self); void QKeyEvent_Delete(QKeyEvent* self); QFocusEvent* QFocusEvent_new(int typeVal); -QFocusEvent* QFocusEvent_new2(QFocusEvent* param1); -QFocusEvent* QFocusEvent_new3(int typeVal, int reason); +QFocusEvent* QFocusEvent_new2(int typeVal, int reason); +QFocusEvent* QFocusEvent_Clone(const QFocusEvent* self); bool QFocusEvent_GotFocus(const QFocusEvent* self); bool QFocusEvent_LostFocus(const QFocusEvent* self); int QFocusEvent_Reason(const QFocusEvent* self); @@ -296,57 +323,53 @@ void QFocusEvent_Delete(QFocusEvent* self); QPaintEvent* QPaintEvent_new(QRegion* paintRegion); QPaintEvent* QPaintEvent_new2(QRect* paintRect); -QPaintEvent* QPaintEvent_new3(QPaintEvent* param1); +QPaintEvent* QPaintEvent_Clone(const QPaintEvent* self); QRect* QPaintEvent_Rect(const QPaintEvent* self); QRegion* QPaintEvent_Region(const QPaintEvent* self); void QPaintEvent_Delete(QPaintEvent* self); QMoveEvent* QMoveEvent_new(QPoint* pos, QPoint* oldPos); -QMoveEvent* QMoveEvent_new2(QMoveEvent* param1); +QMoveEvent* QMoveEvent_Clone(const QMoveEvent* self); QPoint* QMoveEvent_Pos(const QMoveEvent* self); QPoint* QMoveEvent_OldPos(const QMoveEvent* self); void QMoveEvent_Delete(QMoveEvent* self); -QExposeEvent* QExposeEvent_new(QRegion* rgn); -QExposeEvent* QExposeEvent_new2(QExposeEvent* param1); +QExposeEvent* QExposeEvent_new(QRegion* m_region); +QExposeEvent* QExposeEvent_Clone(const QExposeEvent* self); QRegion* QExposeEvent_Region(const QExposeEvent* self); void QExposeEvent_Delete(QExposeEvent* self); QPlatformSurfaceEvent* QPlatformSurfaceEvent_new(int surfaceEventType); -QPlatformSurfaceEvent* QPlatformSurfaceEvent_new2(QPlatformSurfaceEvent* param1); +QPlatformSurfaceEvent* QPlatformSurfaceEvent_Clone(const QPlatformSurfaceEvent* self); int QPlatformSurfaceEvent_SurfaceEventType(const QPlatformSurfaceEvent* self); void QPlatformSurfaceEvent_Delete(QPlatformSurfaceEvent* self); QResizeEvent* QResizeEvent_new(QSize* size, QSize* oldSize); -QResizeEvent* QResizeEvent_new2(QResizeEvent* param1); +QResizeEvent* QResizeEvent_Clone(const QResizeEvent* self); QSize* QResizeEvent_Size(const QResizeEvent* self); QSize* QResizeEvent_OldSize(const QResizeEvent* self); void QResizeEvent_Delete(QResizeEvent* self); QCloseEvent* QCloseEvent_new(); -QCloseEvent* QCloseEvent_new2(QCloseEvent* param1); -void QCloseEvent_OperatorAssign(QCloseEvent* self, QCloseEvent* param1); +QCloseEvent* QCloseEvent_Clone(const QCloseEvent* self); void QCloseEvent_Delete(QCloseEvent* self); QIconDragEvent* QIconDragEvent_new(); -QIconDragEvent* QIconDragEvent_new2(QIconDragEvent* param1); -void QIconDragEvent_OperatorAssign(QIconDragEvent* self, QIconDragEvent* param1); +QIconDragEvent* QIconDragEvent_Clone(const QIconDragEvent* self); void QIconDragEvent_Delete(QIconDragEvent* self); QShowEvent* QShowEvent_new(); -QShowEvent* QShowEvent_new2(QShowEvent* param1); -void QShowEvent_OperatorAssign(QShowEvent* self, QShowEvent* param1); +QShowEvent* QShowEvent_Clone(const QShowEvent* self); void QShowEvent_Delete(QShowEvent* self); QHideEvent* QHideEvent_new(); -QHideEvent* QHideEvent_new2(QHideEvent* param1); -void QHideEvent_OperatorAssign(QHideEvent* self, QHideEvent* param1); +QHideEvent* QHideEvent_Clone(const QHideEvent* self); void QHideEvent_Delete(QHideEvent* self); -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); +QContextMenuEvent* QContextMenuEvent_new(int reason, QPoint* pos, QPoint* globalPos); +QContextMenuEvent* QContextMenuEvent_new2(int reason, QPoint* pos); +QContextMenuEvent* QContextMenuEvent_new3(int reason, QPoint* pos, QPoint* globalPos, int modifiers); +QContextMenuEvent* QContextMenuEvent_Clone(const QContextMenuEvent* self); int QContextMenuEvent_X(const QContextMenuEvent* self); int QContextMenuEvent_Y(const QContextMenuEvent* self); int QContextMenuEvent_GlobalX(const QContextMenuEvent* self); @@ -358,7 +381,7 @@ 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); +QInputMethodEvent* QInputMethodEvent_Clone(const QInputMethodEvent* self); 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); @@ -370,19 +393,22 @@ void QInputMethodEvent_SetCommitString3(QInputMethodEvent* self, struct miqt_str void QInputMethodEvent_Delete(QInputMethodEvent* self); QInputMethodQueryEvent* QInputMethodQueryEvent_new(int queries); -QInputMethodQueryEvent* QInputMethodQueryEvent_new2(QInputMethodQueryEvent* param1); +QInputMethodQueryEvent* QInputMethodQueryEvent_Clone(const QInputMethodQueryEvent* self); int QInputMethodQueryEvent_Queries(const QInputMethodQueryEvent* self); 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, int typeVal); +QDropEvent* QDropEvent_new2(QPointF* pos, int actions, QMimeData* data, int buttons, int modifiers, int typeVal); +QDropEvent* QDropEvent_Clone(const QDropEvent* self); QPoint* QDropEvent_Pos(const QDropEvent* self); QPointF* QDropEvent_PosF(const QDropEvent* self); int QDropEvent_MouseButtons(const QDropEvent* self); int QDropEvent_KeyboardModifiers(const QDropEvent* self); +QPointF* QDropEvent_Position(const QDropEvent* self); +int QDropEvent_Buttons(const QDropEvent* self); +int QDropEvent_Modifiers(const QDropEvent* self); int QDropEvent_PossibleActions(const QDropEvent* self); int QDropEvent_ProposedAction(const QDropEvent* self); void QDropEvent_AcceptProposedAction(QDropEvent* self); @@ -393,8 +419,8 @@ 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, int typeVal); +QDragMoveEvent* QDragMoveEvent_new2(QPoint* pos, int actions, QMimeData* data, int buttons, int modifiers, int typeVal); +QDragMoveEvent* QDragMoveEvent_Clone(const QDragMoveEvent* self); QRect* QDragMoveEvent_AnswerRect(const QDragMoveEvent* self); void QDragMoveEvent_Accept(QDragMoveEvent* self); void QDragMoveEvent_Ignore(QDragMoveEvent* self); @@ -403,17 +429,15 @@ void QDragMoveEvent_IgnoreWithQRect(QDragMoveEvent* self, QRect* r); void QDragMoveEvent_Delete(QDragMoveEvent* self); QDragEnterEvent* QDragEnterEvent_new(QPoint* pos, int actions, QMimeData* data, int buttons, int modifiers); -QDragEnterEvent* QDragEnterEvent_new2(QDragEnterEvent* param1); -void QDragEnterEvent_OperatorAssign(QDragEnterEvent* self, QDragEnterEvent* param1); +QDragEnterEvent* QDragEnterEvent_Clone(const QDragEnterEvent* self); void QDragEnterEvent_Delete(QDragEnterEvent* self); QDragLeaveEvent* QDragLeaveEvent_new(); -QDragLeaveEvent* QDragLeaveEvent_new2(QDragLeaveEvent* param1); -void QDragLeaveEvent_OperatorAssign(QDragLeaveEvent* self, QDragLeaveEvent* param1); +QDragLeaveEvent* QDragLeaveEvent_Clone(const QDragLeaveEvent* self); void QDragLeaveEvent_Delete(QDragLeaveEvent* self); QHelpEvent* QHelpEvent_new(int typeVal, QPoint* pos, QPoint* globalPos); -QHelpEvent* QHelpEvent_new2(QHelpEvent* param1); +QHelpEvent* QHelpEvent_Clone(const QHelpEvent* self); int QHelpEvent_X(const QHelpEvent* self); int QHelpEvent_Y(const QHelpEvent* self); int QHelpEvent_GlobalX(const QHelpEvent* self); @@ -423,78 +447,67 @@ QPoint* QHelpEvent_GlobalPos(const QHelpEvent* self); void QHelpEvent_Delete(QHelpEvent* self); QStatusTipEvent* QStatusTipEvent_new(struct miqt_string* tip); -QStatusTipEvent* QStatusTipEvent_new2(QStatusTipEvent* param1); +QStatusTipEvent* QStatusTipEvent_Clone(const QStatusTipEvent* self); struct miqt_string* QStatusTipEvent_Tip(const QStatusTipEvent* self); void QStatusTipEvent_Delete(QStatusTipEvent* self); QWhatsThisClickedEvent* QWhatsThisClickedEvent_new(struct miqt_string* href); -QWhatsThisClickedEvent* QWhatsThisClickedEvent_new2(QWhatsThisClickedEvent* param1); +QWhatsThisClickedEvent* QWhatsThisClickedEvent_Clone(const QWhatsThisClickedEvent* self); struct miqt_string* QWhatsThisClickedEvent_Href(const QWhatsThisClickedEvent* self); void QWhatsThisClickedEvent_Delete(QWhatsThisClickedEvent* self); QActionEvent* QActionEvent_new(int typeVal, QAction* action); -QActionEvent* QActionEvent_new2(QActionEvent* param1); -QActionEvent* QActionEvent_new3(int typeVal, QAction* action, QAction* before); +QActionEvent* QActionEvent_new2(int typeVal, QAction* action, QAction* before); +QActionEvent* QActionEvent_Clone(const QActionEvent* self); QAction* QActionEvent_Action(const QActionEvent* self); QAction* QActionEvent_Before(const QActionEvent* self); -void QActionEvent_OperatorAssign(QActionEvent* self, QActionEvent* param1); void QActionEvent_Delete(QActionEvent* self); QFileOpenEvent* QFileOpenEvent_new(struct miqt_string* file); QFileOpenEvent* QFileOpenEvent_new2(QUrl* url); -QFileOpenEvent* QFileOpenEvent_new3(QFileOpenEvent* param1); +QFileOpenEvent* QFileOpenEvent_Clone(const QFileOpenEvent* self); struct miqt_string* QFileOpenEvent_File(const QFileOpenEvent* self); QUrl* QFileOpenEvent_Url(const QFileOpenEvent* self); bool QFileOpenEvent_OpenFile(const QFileOpenEvent* self, QFile* file, int flags); void QFileOpenEvent_Delete(QFileOpenEvent* self); QToolBarChangeEvent* QToolBarChangeEvent_new(bool t); -QToolBarChangeEvent* QToolBarChangeEvent_new2(QToolBarChangeEvent* param1); +QToolBarChangeEvent* QToolBarChangeEvent_Clone(const QToolBarChangeEvent* self); bool QToolBarChangeEvent_Toggle(const QToolBarChangeEvent* self); void QToolBarChangeEvent_Delete(QToolBarChangeEvent* self); QShortcutEvent* QShortcutEvent_new(QKeySequence* key, int id); -QShortcutEvent* QShortcutEvent_new2(QShortcutEvent* param1); -QShortcutEvent* QShortcutEvent_new3(QKeySequence* key, int id, bool ambiguous); +QShortcutEvent* QShortcutEvent_new2(QKeySequence* key, int id, bool ambiguous); +QShortcutEvent* QShortcutEvent_Clone(const QShortcutEvent* self); QKeySequence* QShortcutEvent_Key(const QShortcutEvent* self); int QShortcutEvent_ShortcutId(const QShortcutEvent* self); bool QShortcutEvent_IsAmbiguous(const QShortcutEvent* self); void QShortcutEvent_Delete(QShortcutEvent* self); -QWindowStateChangeEvent* QWindowStateChangeEvent_new(int aOldState); -QWindowStateChangeEvent* QWindowStateChangeEvent_new2(QWindowStateChangeEvent* param1); -QWindowStateChangeEvent* QWindowStateChangeEvent_new3(int aOldState, bool isOverride); +QWindowStateChangeEvent* QWindowStateChangeEvent_new(int oldState); +QWindowStateChangeEvent* QWindowStateChangeEvent_new2(int oldState, bool isOverride); +QWindowStateChangeEvent* QWindowStateChangeEvent_Clone(const QWindowStateChangeEvent* self); int QWindowStateChangeEvent_OldState(const QWindowStateChangeEvent* self); bool QWindowStateChangeEvent_IsOverride(const QWindowStateChangeEvent* self); void QWindowStateChangeEvent_Delete(QWindowStateChangeEvent* self); -QPointingDeviceUniqueId* QPointingDeviceUniqueId_new(); -QPointingDeviceUniqueId* QPointingDeviceUniqueId_new2(QPointingDeviceUniqueId* param1); -QPointingDeviceUniqueId* QPointingDeviceUniqueId_FromNumericId(long long id); -bool QPointingDeviceUniqueId_IsValid(const QPointingDeviceUniqueId* self); -long long QPointingDeviceUniqueId_NumericId(const QPointingDeviceUniqueId* self); -void QPointingDeviceUniqueId_Delete(QPointingDeviceUniqueId* self); - QTouchEvent* QTouchEvent_new(int eventType); -QTouchEvent* QTouchEvent_new2(QTouchEvent* param1); -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); +QTouchEvent* QTouchEvent_new2(int eventType, QPointingDevice* device, int modifiers, uint8_t touchPointStates); +QTouchEvent* QTouchEvent_new3(int eventType, QPointingDevice* device); +QTouchEvent* QTouchEvent_new4(int eventType, QPointingDevice* device, int modifiers); +QTouchEvent* QTouchEvent_new5(int eventType, QPointingDevice* device, int modifiers, struct miqt_array* /* of QEventPoint* */ touchPoints); +QTouchEvent* QTouchEvent_new6(int eventType, QPointingDevice* device, int modifiers, uint8_t touchPointStates, struct miqt_array* /* of QEventPoint* */ touchPoints); +QTouchEvent* QTouchEvent_Clone(const QTouchEvent* self); QObject* QTouchEvent_Target(const QTouchEvent* self); -int QTouchEvent_TouchPointStates(const QTouchEvent* self); +uint8_t 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); -void QTouchEvent_SetTouchPointStates(QTouchEvent* self, int aTouchPointStates); -void QTouchEvent_SetTouchPoints(QTouchEvent* self, struct miqt_array* /* of QTouchEvent__TouchPoint* */ atouchPoints); -void QTouchEvent_SetDevice(QTouchEvent* self, QTouchDevice* adevice); +bool QTouchEvent_IsBeginEvent(const QTouchEvent* self); +bool QTouchEvent_IsUpdateEvent(const QTouchEvent* self); +bool QTouchEvent_IsEndEvent(const QTouchEvent* self); void QTouchEvent_Delete(QTouchEvent* self); QScrollPrepareEvent* QScrollPrepareEvent_new(QPointF* startPos); -QScrollPrepareEvent* QScrollPrepareEvent_new2(QScrollPrepareEvent* param1); +QScrollPrepareEvent* QScrollPrepareEvent_Clone(const QScrollPrepareEvent* self); QPointF* QScrollPrepareEvent_StartPos(const QScrollPrepareEvent* self); QSizeF* QScrollPrepareEvent_ViewportSize(const QScrollPrepareEvent* self); QRectF* QScrollPrepareEvent_ContentPosRange(const QScrollPrepareEvent* self); @@ -505,20 +518,20 @@ void QScrollPrepareEvent_SetContentPos(QScrollPrepareEvent* self, QPointF* pos); void QScrollPrepareEvent_Delete(QScrollPrepareEvent* self); QScrollEvent* QScrollEvent_new(QPointF* contentPos, QPointF* overshoot, int scrollState); -QScrollEvent* QScrollEvent_new2(QScrollEvent* param1); +QScrollEvent* QScrollEvent_Clone(const QScrollEvent* self); QPointF* QScrollEvent_ContentPos(const QScrollEvent* self); QPointF* QScrollEvent_OvershootDistance(const QScrollEvent* self); int QScrollEvent_ScrollState(const QScrollEvent* self); void QScrollEvent_Delete(QScrollEvent* self); QScreenOrientationChangeEvent* QScreenOrientationChangeEvent_new(QScreen* screen, int orientation); -QScreenOrientationChangeEvent* QScreenOrientationChangeEvent_new2(QScreenOrientationChangeEvent* param1); +QScreenOrientationChangeEvent* QScreenOrientationChangeEvent_Clone(const QScreenOrientationChangeEvent* self); QScreen* QScreenOrientationChangeEvent_Screen(const QScreenOrientationChangeEvent* self); int QScreenOrientationChangeEvent_Orientation(const QScreenOrientationChangeEvent* self); void QScreenOrientationChangeEvent_Delete(QScreenOrientationChangeEvent* self); QApplicationStateChangeEvent* QApplicationStateChangeEvent_new(int state); -QApplicationStateChangeEvent* QApplicationStateChangeEvent_new2(QApplicationStateChangeEvent* param1); +QApplicationStateChangeEvent* QApplicationStateChangeEvent_Clone(const QApplicationStateChangeEvent* self); int QApplicationStateChangeEvent_ApplicationState(const QApplicationStateChangeEvent* self); void QApplicationStateChangeEvent_Delete(QApplicationStateChangeEvent* self); @@ -528,61 +541,6 @@ QInputMethodEvent__Attribute* QInputMethodEvent__Attribute_new3(QInputMethodEven 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); -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); -QPointF* QTouchEvent__TouchPoint_ScenePos(const QTouchEvent__TouchPoint* self); -QPointF* QTouchEvent__TouchPoint_StartScenePos(const QTouchEvent__TouchPoint* self); -QPointF* QTouchEvent__TouchPoint_LastScenePos(const QTouchEvent__TouchPoint* self); -QPointF* QTouchEvent__TouchPoint_ScreenPos(const QTouchEvent__TouchPoint* self); -QPointF* QTouchEvent__TouchPoint_StartScreenPos(const QTouchEvent__TouchPoint* self); -QPointF* QTouchEvent__TouchPoint_LastScreenPos(const QTouchEvent__TouchPoint* self); -QPointF* QTouchEvent__TouchPoint_NormalizedPos(const QTouchEvent__TouchPoint* self); -QPointF* QTouchEvent__TouchPoint_StartNormalizedPos(const QTouchEvent__TouchPoint* self); -QPointF* QTouchEvent__TouchPoint_LastNormalizedPos(const QTouchEvent__TouchPoint* self); -QRectF* QTouchEvent__TouchPoint_Rect(const QTouchEvent__TouchPoint* self); -QRectF* QTouchEvent__TouchPoint_SceneRect(const QTouchEvent__TouchPoint* self); -QRectF* QTouchEvent__TouchPoint_ScreenRect(const QTouchEvent__TouchPoint* self); -void QTouchEvent__TouchPoint_SetRect(QTouchEvent__TouchPoint* self, QRectF* rect); -void QTouchEvent__TouchPoint_SetSceneRect(QTouchEvent__TouchPoint* self, QRectF* sceneRect); -void QTouchEvent__TouchPoint_SetScreenRect(QTouchEvent__TouchPoint* self, QRectF* screenRect); -double QTouchEvent__TouchPoint_Pressure(const QTouchEvent__TouchPoint* self); -double QTouchEvent__TouchPoint_Rotation(const QTouchEvent__TouchPoint* self); -QSizeF* QTouchEvent__TouchPoint_EllipseDiameters(const QTouchEvent__TouchPoint* self); -QVector2D* QTouchEvent__TouchPoint_Velocity(const QTouchEvent__TouchPoint* self); -int QTouchEvent__TouchPoint_Flags(const QTouchEvent__TouchPoint* self); -struct miqt_array* QTouchEvent__TouchPoint_RawScreenPositions(const QTouchEvent__TouchPoint* self); -void QTouchEvent__TouchPoint_SetId(QTouchEvent__TouchPoint* self, int id); -void QTouchEvent__TouchPoint_SetUniqueId(QTouchEvent__TouchPoint* self, long long uid); -void QTouchEvent__TouchPoint_SetState(QTouchEvent__TouchPoint* self, int state); -void QTouchEvent__TouchPoint_SetPos(QTouchEvent__TouchPoint* self, QPointF* pos); -void QTouchEvent__TouchPoint_SetScenePos(QTouchEvent__TouchPoint* self, QPointF* scenePos); -void QTouchEvent__TouchPoint_SetScreenPos(QTouchEvent__TouchPoint* self, QPointF* screenPos); -void QTouchEvent__TouchPoint_SetNormalizedPos(QTouchEvent__TouchPoint* self, QPointF* normalizedPos); -void QTouchEvent__TouchPoint_SetStartPos(QTouchEvent__TouchPoint* self, QPointF* startPos); -void QTouchEvent__TouchPoint_SetStartScenePos(QTouchEvent__TouchPoint* self, QPointF* startScenePos); -void QTouchEvent__TouchPoint_SetStartScreenPos(QTouchEvent__TouchPoint* self, QPointF* startScreenPos); -void QTouchEvent__TouchPoint_SetStartNormalizedPos(QTouchEvent__TouchPoint* self, QPointF* startNormalizedPos); -void QTouchEvent__TouchPoint_SetLastPos(QTouchEvent__TouchPoint* self, QPointF* lastPos); -void QTouchEvent__TouchPoint_SetLastScenePos(QTouchEvent__TouchPoint* self, QPointF* lastScenePos); -void QTouchEvent__TouchPoint_SetLastScreenPos(QTouchEvent__TouchPoint* self, QPointF* lastScreenPos); -void QTouchEvent__TouchPoint_SetLastNormalizedPos(QTouchEvent__TouchPoint* self, QPointF* lastNormalizedPos); -void QTouchEvent__TouchPoint_SetPressure(QTouchEvent__TouchPoint* self, double pressure); -void QTouchEvent__TouchPoint_SetRotation(QTouchEvent__TouchPoint* self, double angle); -void QTouchEvent__TouchPoint_SetEllipseDiameters(QTouchEvent__TouchPoint* self, QSizeF* dia); -void QTouchEvent__TouchPoint_SetVelocity(QTouchEvent__TouchPoint* self, QVector2D* v); -void QTouchEvent__TouchPoint_SetFlags(QTouchEvent__TouchPoint* self, int flags); -void QTouchEvent__TouchPoint_SetRawScreenPositions(QTouchEvent__TouchPoint* self, struct miqt_array* /* of QPointF* */ positions); -void QTouchEvent__TouchPoint_Delete(QTouchEvent__TouchPoint* self); - #ifdef __cplusplus } /* extern C */ #endif diff --git a/qt/gen_qeventloop.cpp b/qt/gen_qeventloop.cpp index ec27ef8..d630a78 100644 --- a/qt/gen_qeventloop.cpp +++ b/qt/gen_qeventloop.cpp @@ -34,13 +34,6 @@ struct miqt_string* QEventLoop_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QEventLoop_TrUtf8(const char* s) { - QString _ret = QEventLoop::trUtf8(s); - // 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()); -} - bool QEventLoop_ProcessEvents(QEventLoop* self) { return self->processEvents(); } @@ -53,10 +46,6 @@ int QEventLoop_Exec(QEventLoop* self) { return self->exec(); } -void QEventLoop_Exit(QEventLoop* self) { - self->exit(); -} - bool QEventLoop_IsRunning(const QEventLoop* self) { return self->isRunning(); } @@ -69,6 +58,10 @@ bool QEventLoop_Event(QEventLoop* self, QEvent* event) { return self->event(event); } +void QEventLoop_Exit(QEventLoop* self) { + self->exit(); +} + void QEventLoop_Quit(QEventLoop* self) { self->quit(); } @@ -87,20 +80,6 @@ struct miqt_string* QEventLoop_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QEventLoop_TrUtf82(const char* s, const char* c) { - QString _ret = QEventLoop::trUtf8(s, c); - // 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* QEventLoop_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QEventLoop::trUtf8(s, c, static_cast(n)); - // 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()); -} - bool QEventLoop_ProcessEvents1(QEventLoop* self, int flags) { return self->processEvents(static_cast(flags)); } diff --git a/qt/gen_qeventloop.go b/qt/gen_qeventloop.go index 413bf7c..c1ed397 100644 --- a/qt/gen_qeventloop.go +++ b/qt/gen_qeventloop.go @@ -23,6 +23,7 @@ const ( QEventLoop__X11ExcludeTimers QEventLoop__ProcessEventsFlag = 8 QEventLoop__EventLoopExec QEventLoop__ProcessEventsFlag = 32 QEventLoop__DialogExec QEventLoop__ProcessEventsFlag = 64 + QEventLoop__ApplicationExec QEventLoop__ProcessEventsFlag = 128 ) type QEventLoop struct { @@ -79,15 +80,6 @@ func QEventLoop_Tr(s string) string { return _ret } -func QEventLoop_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QEventLoop_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QEventLoop) ProcessEvents() bool { return (bool)(C.QEventLoop_ProcessEvents(this.h)) } @@ -100,10 +92,6 @@ func (this *QEventLoop) Exec() int { return (int)(C.QEventLoop_Exec(this.h)) } -func (this *QEventLoop) Exit() { - C.QEventLoop_Exit(this.h) -} - func (this *QEventLoop) IsRunning() bool { return (bool)(C.QEventLoop_IsRunning(this.h)) } @@ -116,6 +104,10 @@ func (this *QEventLoop) Event(event *QEvent) bool { return (bool)(C.QEventLoop_Event(this.h, event.cPointer())) } +func (this *QEventLoop) Exit() { + C.QEventLoop_Exit(this.h) +} + func (this *QEventLoop) Quit() { C.QEventLoop_Quit(this.h) } @@ -142,28 +134,6 @@ func QEventLoop_Tr3(s string, c string, n int) string { return _ret } -func QEventLoop_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QEventLoop_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QEventLoop_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QEventLoop_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QEventLoop) ProcessEvents1(flags QEventLoop__ProcessEventsFlag) bool { return (bool)(C.QEventLoop_ProcessEvents1(this.h, (C.int)(flags))) } diff --git a/qt/gen_qeventloop.h b/qt/gen_qeventloop.h index f820ed8..871e536 100644 --- a/qt/gen_qeventloop.h +++ b/qt/gen_qeventloop.h @@ -34,19 +34,16 @@ QEventLoop* QEventLoop_new2(QObject* parent); QMetaObject* QEventLoop_MetaObject(const QEventLoop* self); void* QEventLoop_Metacast(QEventLoop* self, const char* param1); struct miqt_string* QEventLoop_Tr(const char* s); -struct miqt_string* QEventLoop_TrUtf8(const char* s); bool QEventLoop_ProcessEvents(QEventLoop* self); void QEventLoop_ProcessEvents2(QEventLoop* self, int flags, int maximumTime); int QEventLoop_Exec(QEventLoop* self); -void QEventLoop_Exit(QEventLoop* self); bool QEventLoop_IsRunning(const QEventLoop* self); void QEventLoop_WakeUp(QEventLoop* self); bool QEventLoop_Event(QEventLoop* self, QEvent* event); +void QEventLoop_Exit(QEventLoop* self); void QEventLoop_Quit(QEventLoop* self); struct miqt_string* QEventLoop_Tr2(const char* s, const char* c); struct miqt_string* QEventLoop_Tr3(const char* s, const char* c, int n); -struct miqt_string* QEventLoop_TrUtf82(const char* s, const char* c); -struct miqt_string* QEventLoop_TrUtf83(const char* s, const char* c, int n); bool QEventLoop_ProcessEvents1(QEventLoop* self, int flags); int QEventLoop_Exec1(QEventLoop* self, int flags); void QEventLoop_Exit1(QEventLoop* self, int returnCode); diff --git a/qt/gen_qeventpoint.cpp b/qt/gen_qeventpoint.cpp new file mode 100644 index 0000000..3803f57 --- /dev/null +++ b/qt/gen_qeventpoint.cpp @@ -0,0 +1,217 @@ +#include +#include +#include +#include +#include +#include +#include "qeventpoint.h" +#include "gen_qeventpoint.h" +#include "_cgo_export.h" + +QEventPoint* QEventPoint_new() { + return new QEventPoint(); +} + +QEventPoint* QEventPoint_new2(int pointId, uint8_t state, QPointF* scenePosition, QPointF* globalPosition) { + return new QEventPoint(static_cast(pointId), static_cast(state), *scenePosition, *globalPosition); +} + +QEventPoint* QEventPoint_new3(QEventPoint* other) { + return new QEventPoint(*other); +} + +QEventPoint* QEventPoint_new4(int id) { + return new QEventPoint(static_cast(id)); +} + +QEventPoint* QEventPoint_new5(int id, QPointingDevice* device) { + return new QEventPoint(static_cast(id), device); +} + +void QEventPoint_OperatorAssign(QEventPoint* self, QEventPoint* other) { + self->operator=(*other); +} + +bool QEventPoint_OperatorEqual(const QEventPoint* self, QEventPoint* other) { + return self->operator==(*other); +} + +bool QEventPoint_OperatorNotEqual(const QEventPoint* self, QEventPoint* other) { + return self->operator!=(*other); +} + +void QEventPoint_Swap(QEventPoint* self, QEventPoint* other) { + self->swap(*other); +} + +QPointF* QEventPoint_Position(const QEventPoint* self) { + return new QPointF(self->position()); +} + +QPointF* QEventPoint_PressPosition(const QEventPoint* self) { + return new QPointF(self->pressPosition()); +} + +QPointF* QEventPoint_GrabPosition(const QEventPoint* self) { + return new QPointF(self->grabPosition()); +} + +QPointF* QEventPoint_LastPosition(const QEventPoint* self) { + return new QPointF(self->lastPosition()); +} + +QPointF* QEventPoint_ScenePosition(const QEventPoint* self) { + return new QPointF(self->scenePosition()); +} + +QPointF* QEventPoint_ScenePressPosition(const QEventPoint* self) { + return new QPointF(self->scenePressPosition()); +} + +QPointF* QEventPoint_SceneGrabPosition(const QEventPoint* self) { + return new QPointF(self->sceneGrabPosition()); +} + +QPointF* QEventPoint_SceneLastPosition(const QEventPoint* self) { + return new QPointF(self->sceneLastPosition()); +} + +QPointF* QEventPoint_GlobalPosition(const QEventPoint* self) { + return new QPointF(self->globalPosition()); +} + +QPointF* QEventPoint_GlobalPressPosition(const QEventPoint* self) { + return new QPointF(self->globalPressPosition()); +} + +QPointF* QEventPoint_GlobalGrabPosition(const QEventPoint* self) { + return new QPointF(self->globalGrabPosition()); +} + +QPointF* QEventPoint_GlobalLastPosition(const QEventPoint* self) { + return new QPointF(self->globalLastPosition()); +} + +QPointF* QEventPoint_NormalizedPosition(const QEventPoint* self) { + return new QPointF(self->normalizedPosition()); +} + +QPointF* QEventPoint_Pos(const QEventPoint* self) { + return new QPointF(self->pos()); +} + +QPointF* QEventPoint_StartPos(const QEventPoint* self) { + return new QPointF(self->startPos()); +} + +QPointF* QEventPoint_ScenePos(const QEventPoint* self) { + return new QPointF(self->scenePos()); +} + +QPointF* QEventPoint_StartScenePos(const QEventPoint* self) { + return new QPointF(self->startScenePos()); +} + +QPointF* QEventPoint_ScreenPos(const QEventPoint* self) { + return new QPointF(self->screenPos()); +} + +QPointF* QEventPoint_StartScreenPos(const QEventPoint* self) { + return new QPointF(self->startScreenPos()); +} + +QPointF* QEventPoint_StartNormalizedPos(const QEventPoint* self) { + return new QPointF(self->startNormalizedPos()); +} + +QPointF* QEventPoint_NormalizedPos(const QEventPoint* self) { + return new QPointF(self->normalizedPos()); +} + +QPointF* QEventPoint_LastPos(const QEventPoint* self) { + return new QPointF(self->lastPos()); +} + +QPointF* QEventPoint_LastScenePos(const QEventPoint* self) { + return new QPointF(self->lastScenePos()); +} + +QPointF* QEventPoint_LastScreenPos(const QEventPoint* self) { + return new QPointF(self->lastScreenPos()); +} + +QPointF* QEventPoint_LastNormalizedPos(const QEventPoint* self) { + return new QPointF(self->lastNormalizedPos()); +} + +QVector2D* QEventPoint_Velocity(const QEventPoint* self) { + return new QVector2D(self->velocity()); +} + +uint8_t QEventPoint_State(const QEventPoint* self) { + QEventPoint::State _ret = self->state(); + return static_cast(_ret); +} + +QPointingDevice* QEventPoint_Device(const QEventPoint* self) { + return (QPointingDevice*) self->device(); +} + +int QEventPoint_Id(const QEventPoint* self) { + return self->id(); +} + +QPointingDeviceUniqueId* QEventPoint_UniqueId(const QEventPoint* self) { + return new QPointingDeviceUniqueId(self->uniqueId()); +} + +unsigned long QEventPoint_Timestamp(const QEventPoint* self) { + ulong _ret = self->timestamp(); + return static_cast(_ret); +} + +unsigned long QEventPoint_LastTimestamp(const QEventPoint* self) { + ulong _ret = self->lastTimestamp(); + return static_cast(_ret); +} + +unsigned long QEventPoint_PressTimestamp(const QEventPoint* self) { + ulong _ret = self->pressTimestamp(); + return static_cast(_ret); +} + +double QEventPoint_TimeHeld(const QEventPoint* self) { + qreal _ret = self->timeHeld(); + return static_cast(_ret); +} + +double QEventPoint_Pressure(const QEventPoint* self) { + qreal _ret = self->pressure(); + return static_cast(_ret); +} + +double QEventPoint_Rotation(const QEventPoint* self) { + qreal _ret = self->rotation(); + return static_cast(_ret); +} + +QSizeF* QEventPoint_EllipseDiameters(const QEventPoint* self) { + return new QSizeF(self->ellipseDiameters()); +} + +bool QEventPoint_IsAccepted(const QEventPoint* self) { + return self->isAccepted(); +} + +void QEventPoint_SetAccepted(QEventPoint* self) { + self->setAccepted(); +} + +void QEventPoint_SetAccepted1(QEventPoint* self, bool accepted) { + self->setAccepted(accepted); +} + +void QEventPoint_Delete(QEventPoint* self) { + delete self; +} + diff --git a/qt/gen_qeventpoint.go b/qt/gen_qeventpoint.go new file mode 100644 index 0000000..f3a3588 --- /dev/null +++ b/qt/gen_qeventpoint.go @@ -0,0 +1,350 @@ +package qt + +/* + +#include "gen_qeventpoint.h" +#include + +*/ +import "C" + +import ( + "runtime" + "unsafe" +) + +type QEventPoint__State byte + +const ( + QEventPoint__Unknown QEventPoint__State = 0 + QEventPoint__Stationary QEventPoint__State = 4 + QEventPoint__Pressed QEventPoint__State = 1 + QEventPoint__Updated QEventPoint__State = 2 + QEventPoint__Released QEventPoint__State = 8 +) + +type QEventPoint struct { + h *C.QEventPoint +} + +func (this *QEventPoint) cPointer() *C.QEventPoint { + if this == nil { + return nil + } + return this.h +} + +func newQEventPoint(h *C.QEventPoint) *QEventPoint { + if h == nil { + return nil + } + return &QEventPoint{h: h} +} + +func newQEventPoint_U(h unsafe.Pointer) *QEventPoint { + return newQEventPoint((*C.QEventPoint)(h)) +} + +// NewQEventPoint constructs a new QEventPoint object. +func NewQEventPoint() *QEventPoint { + ret := C.QEventPoint_new() + return newQEventPoint(ret) +} + +// NewQEventPoint2 constructs a new QEventPoint object. +func NewQEventPoint2(pointId int, state QEventPoint__State, scenePosition *QPointF, globalPosition *QPointF) *QEventPoint { + ret := C.QEventPoint_new2((C.int)(pointId), (C.uint8_t)(state), scenePosition.cPointer(), globalPosition.cPointer()) + return newQEventPoint(ret) +} + +// NewQEventPoint3 constructs a new QEventPoint object. +func NewQEventPoint3(other *QEventPoint) *QEventPoint { + ret := C.QEventPoint_new3(other.cPointer()) + return newQEventPoint(ret) +} + +// NewQEventPoint4 constructs a new QEventPoint object. +func NewQEventPoint4(id int) *QEventPoint { + ret := C.QEventPoint_new4((C.int)(id)) + return newQEventPoint(ret) +} + +// NewQEventPoint5 constructs a new QEventPoint object. +func NewQEventPoint5(id int, device *QPointingDevice) *QEventPoint { + ret := C.QEventPoint_new5((C.int)(id), device.cPointer()) + return newQEventPoint(ret) +} + +func (this *QEventPoint) OperatorAssign(other *QEventPoint) { + C.QEventPoint_OperatorAssign(this.h, other.cPointer()) +} + +func (this *QEventPoint) OperatorEqual(other *QEventPoint) bool { + return (bool)(C.QEventPoint_OperatorEqual(this.h, other.cPointer())) +} + +func (this *QEventPoint) OperatorNotEqual(other *QEventPoint) bool { + return (bool)(C.QEventPoint_OperatorNotEqual(this.h, other.cPointer())) +} + +func (this *QEventPoint) Swap(other *QEventPoint) { + C.QEventPoint_Swap(this.h, other.cPointer()) +} + +func (this *QEventPoint) Position() *QPointF { + _ret := C.QEventPoint_Position(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QEventPoint) PressPosition() *QPointF { + _ret := C.QEventPoint_PressPosition(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QEventPoint) GrabPosition() *QPointF { + _ret := C.QEventPoint_GrabPosition(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QEventPoint) LastPosition() *QPointF { + _ret := C.QEventPoint_LastPosition(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QEventPoint) ScenePosition() *QPointF { + _ret := C.QEventPoint_ScenePosition(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QEventPoint) ScenePressPosition() *QPointF { + _ret := C.QEventPoint_ScenePressPosition(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QEventPoint) SceneGrabPosition() *QPointF { + _ret := C.QEventPoint_SceneGrabPosition(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QEventPoint) SceneLastPosition() *QPointF { + _ret := C.QEventPoint_SceneLastPosition(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QEventPoint) GlobalPosition() *QPointF { + _ret := C.QEventPoint_GlobalPosition(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QEventPoint) GlobalPressPosition() *QPointF { + _ret := C.QEventPoint_GlobalPressPosition(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QEventPoint) GlobalGrabPosition() *QPointF { + _ret := C.QEventPoint_GlobalGrabPosition(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QEventPoint) GlobalLastPosition() *QPointF { + _ret := C.QEventPoint_GlobalLastPosition(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QEventPoint) NormalizedPosition() *QPointF { + _ret := C.QEventPoint_NormalizedPosition(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QEventPoint) Pos() *QPointF { + _ret := C.QEventPoint_Pos(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QEventPoint) StartPos() *QPointF { + _ret := C.QEventPoint_StartPos(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QEventPoint) ScenePos() *QPointF { + _ret := C.QEventPoint_ScenePos(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QEventPoint) StartScenePos() *QPointF { + _ret := C.QEventPoint_StartScenePos(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QEventPoint) ScreenPos() *QPointF { + _ret := C.QEventPoint_ScreenPos(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QEventPoint) StartScreenPos() *QPointF { + _ret := C.QEventPoint_StartScreenPos(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QEventPoint) StartNormalizedPos() *QPointF { + _ret := C.QEventPoint_StartNormalizedPos(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QEventPoint) NormalizedPos() *QPointF { + _ret := C.QEventPoint_NormalizedPos(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QEventPoint) LastPos() *QPointF { + _ret := C.QEventPoint_LastPos(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QEventPoint) LastScenePos() *QPointF { + _ret := C.QEventPoint_LastScenePos(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QEventPoint) LastScreenPos() *QPointF { + _ret := C.QEventPoint_LastScreenPos(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QEventPoint) LastNormalizedPos() *QPointF { + _ret := C.QEventPoint_LastNormalizedPos(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QEventPoint) Velocity() *QVector2D { + _ret := C.QEventPoint_Velocity(this.h) + _goptr := newQVector2D(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QEventPoint) State() QEventPoint__State { + return (QEventPoint__State)(C.QEventPoint_State(this.h)) +} + +func (this *QEventPoint) Device() *QPointingDevice { + return newQPointingDevice_U(unsafe.Pointer(C.QEventPoint_Device(this.h))) +} + +func (this *QEventPoint) Id() int { + return (int)(C.QEventPoint_Id(this.h)) +} + +func (this *QEventPoint) UniqueId() *QPointingDeviceUniqueId { + _ret := C.QEventPoint_UniqueId(this.h) + _goptr := newQPointingDeviceUniqueId(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QEventPoint) Timestamp() uint64 { + return (uint64)(C.QEventPoint_Timestamp(this.h)) +} + +func (this *QEventPoint) LastTimestamp() uint64 { + return (uint64)(C.QEventPoint_LastTimestamp(this.h)) +} + +func (this *QEventPoint) PressTimestamp() uint64 { + return (uint64)(C.QEventPoint_PressTimestamp(this.h)) +} + +func (this *QEventPoint) TimeHeld() float64 { + return (float64)(C.QEventPoint_TimeHeld(this.h)) +} + +func (this *QEventPoint) Pressure() float64 { + return (float64)(C.QEventPoint_Pressure(this.h)) +} + +func (this *QEventPoint) Rotation() float64 { + return (float64)(C.QEventPoint_Rotation(this.h)) +} + +func (this *QEventPoint) EllipseDiameters() *QSizeF { + _ret := C.QEventPoint_EllipseDiameters(this.h) + _goptr := newQSizeF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QEventPoint) IsAccepted() bool { + return (bool)(C.QEventPoint_IsAccepted(this.h)) +} + +func (this *QEventPoint) SetAccepted() { + C.QEventPoint_SetAccepted(this.h) +} + +func (this *QEventPoint) SetAccepted1(accepted bool) { + C.QEventPoint_SetAccepted1(this.h, (C.bool)(accepted)) +} + +// Delete this object from C++ memory. +func (this *QEventPoint) Delete() { + C.QEventPoint_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QEventPoint) GoGC() { + runtime.SetFinalizer(this, func(this *QEventPoint) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} diff --git a/qt/gen_qeventpoint.h b/qt/gen_qeventpoint.h new file mode 100644 index 0000000..98d0a9e --- /dev/null +++ b/qt/gen_qeventpoint.h @@ -0,0 +1,87 @@ +#ifndef GEN_QEVENTPOINT_H +#define GEN_QEVENTPOINT_H + +#include +#include +#include + +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + +#include "binding.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +class QEventPoint; +class QPointF; +class QPointingDevice; +class QPointingDeviceUniqueId; +class QSizeF; +class QVector2D; +#else +typedef struct QEventPoint QEventPoint; +typedef struct QPointF QPointF; +typedef struct QPointingDevice QPointingDevice; +typedef struct QPointingDeviceUniqueId QPointingDeviceUniqueId; +typedef struct QSizeF QSizeF; +typedef struct QVector2D QVector2D; +#endif + +QEventPoint* QEventPoint_new(); +QEventPoint* QEventPoint_new2(int pointId, uint8_t state, QPointF* scenePosition, QPointF* globalPosition); +QEventPoint* QEventPoint_new3(QEventPoint* other); +QEventPoint* QEventPoint_new4(int id); +QEventPoint* QEventPoint_new5(int id, QPointingDevice* device); +void QEventPoint_OperatorAssign(QEventPoint* self, QEventPoint* other); +bool QEventPoint_OperatorEqual(const QEventPoint* self, QEventPoint* other); +bool QEventPoint_OperatorNotEqual(const QEventPoint* self, QEventPoint* other); +void QEventPoint_Swap(QEventPoint* self, QEventPoint* other); +QPointF* QEventPoint_Position(const QEventPoint* self); +QPointF* QEventPoint_PressPosition(const QEventPoint* self); +QPointF* QEventPoint_GrabPosition(const QEventPoint* self); +QPointF* QEventPoint_LastPosition(const QEventPoint* self); +QPointF* QEventPoint_ScenePosition(const QEventPoint* self); +QPointF* QEventPoint_ScenePressPosition(const QEventPoint* self); +QPointF* QEventPoint_SceneGrabPosition(const QEventPoint* self); +QPointF* QEventPoint_SceneLastPosition(const QEventPoint* self); +QPointF* QEventPoint_GlobalPosition(const QEventPoint* self); +QPointF* QEventPoint_GlobalPressPosition(const QEventPoint* self); +QPointF* QEventPoint_GlobalGrabPosition(const QEventPoint* self); +QPointF* QEventPoint_GlobalLastPosition(const QEventPoint* self); +QPointF* QEventPoint_NormalizedPosition(const QEventPoint* self); +QPointF* QEventPoint_Pos(const QEventPoint* self); +QPointF* QEventPoint_StartPos(const QEventPoint* self); +QPointF* QEventPoint_ScenePos(const QEventPoint* self); +QPointF* QEventPoint_StartScenePos(const QEventPoint* self); +QPointF* QEventPoint_ScreenPos(const QEventPoint* self); +QPointF* QEventPoint_StartScreenPos(const QEventPoint* self); +QPointF* QEventPoint_StartNormalizedPos(const QEventPoint* self); +QPointF* QEventPoint_NormalizedPos(const QEventPoint* self); +QPointF* QEventPoint_LastPos(const QEventPoint* self); +QPointF* QEventPoint_LastScenePos(const QEventPoint* self); +QPointF* QEventPoint_LastScreenPos(const QEventPoint* self); +QPointF* QEventPoint_LastNormalizedPos(const QEventPoint* self); +QVector2D* QEventPoint_Velocity(const QEventPoint* self); +uint8_t QEventPoint_State(const QEventPoint* self); +QPointingDevice* QEventPoint_Device(const QEventPoint* self); +int QEventPoint_Id(const QEventPoint* self); +QPointingDeviceUniqueId* QEventPoint_UniqueId(const QEventPoint* self); +unsigned long QEventPoint_Timestamp(const QEventPoint* self); +unsigned long QEventPoint_LastTimestamp(const QEventPoint* self); +unsigned long QEventPoint_PressTimestamp(const QEventPoint* self); +double QEventPoint_TimeHeld(const QEventPoint* self); +double QEventPoint_Pressure(const QEventPoint* self); +double QEventPoint_Rotation(const QEventPoint* self); +QSizeF* QEventPoint_EllipseDiameters(const QEventPoint* self); +bool QEventPoint_IsAccepted(const QEventPoint* self); +void QEventPoint_SetAccepted(QEventPoint* self); +void QEventPoint_SetAccepted1(QEventPoint* self, bool accepted); +void QEventPoint_Delete(QEventPoint* self); + +#ifdef __cplusplus +} /* extern C */ +#endif + +#endif diff --git a/qt/gen_qeventtransition.cpp b/qt/gen_qeventtransition.cpp deleted file mode 100644 index b0229d9..0000000 --- a/qt/gen_qeventtransition.cpp +++ /dev/null @@ -1,98 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include "qeventtransition.h" -#include "gen_qeventtransition.h" -#include "_cgo_export.h" - -QEventTransition* QEventTransition_new() { - return new QEventTransition(); -} - -QEventTransition* QEventTransition_new2(QObject* object, int typeVal) { - return new QEventTransition(object, static_cast(typeVal)); -} - -QEventTransition* QEventTransition_new3(QState* sourceState) { - return new QEventTransition(sourceState); -} - -QEventTransition* QEventTransition_new4(QObject* object, int typeVal, QState* sourceState) { - return new QEventTransition(object, static_cast(typeVal), sourceState); -} - -QMetaObject* QEventTransition_MetaObject(const QEventTransition* self) { - return (QMetaObject*) self->metaObject(); -} - -void* QEventTransition_Metacast(QEventTransition* self, const char* param1) { - return self->qt_metacast(param1); -} - -struct miqt_string* QEventTransition_Tr(const char* s) { - QString _ret = QEventTransition::tr(s); - // 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* QEventTransition_TrUtf8(const char* s) { - QString _ret = QEventTransition::trUtf8(s); - // 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()); -} - -QObject* QEventTransition_EventSource(const QEventTransition* self) { - return self->eventSource(); -} - -void QEventTransition_SetEventSource(QEventTransition* self, QObject* object) { - self->setEventSource(object); -} - -int QEventTransition_EventType(const QEventTransition* self) { - QEvent::Type _ret = self->eventType(); - return static_cast(_ret); -} - -void QEventTransition_SetEventType(QEventTransition* self, int typeVal) { - self->setEventType(static_cast(typeVal)); -} - -struct miqt_string* QEventTransition_Tr2(const char* s, const char* c) { - QString _ret = QEventTransition::tr(s, c); - // 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* QEventTransition_Tr3(const char* s, const char* c, int n) { - QString _ret = QEventTransition::tr(s, c, static_cast(n)); - // 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* QEventTransition_TrUtf82(const char* s, const char* c) { - QString _ret = QEventTransition::trUtf8(s, c); - // 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* QEventTransition_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QEventTransition::trUtf8(s, c, static_cast(n)); - // 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 QEventTransition_Delete(QEventTransition* self) { - delete self; -} - diff --git a/qt/gen_qeventtransition.go b/qt/gen_qeventtransition.go deleted file mode 100644 index 27283c8..0000000 --- a/qt/gen_qeventtransition.go +++ /dev/null @@ -1,163 +0,0 @@ -package qt - -/* - -#include "gen_qeventtransition.h" -#include - -*/ -import "C" - -import ( - "runtime" - "unsafe" -) - -type QEventTransition struct { - h *C.QEventTransition - *QAbstractTransition -} - -func (this *QEventTransition) cPointer() *C.QEventTransition { - if this == nil { - return nil - } - return this.h -} - -func newQEventTransition(h *C.QEventTransition) *QEventTransition { - if h == nil { - return nil - } - return &QEventTransition{h: h, QAbstractTransition: newQAbstractTransition_U(unsafe.Pointer(h))} -} - -func newQEventTransition_U(h unsafe.Pointer) *QEventTransition { - return newQEventTransition((*C.QEventTransition)(h)) -} - -// NewQEventTransition constructs a new QEventTransition object. -func NewQEventTransition() *QEventTransition { - ret := C.QEventTransition_new() - return newQEventTransition(ret) -} - -// NewQEventTransition2 constructs a new QEventTransition object. -func NewQEventTransition2(object *QObject, typeVal QEvent__Type) *QEventTransition { - ret := C.QEventTransition_new2(object.cPointer(), (C.int)(typeVal)) - return newQEventTransition(ret) -} - -// NewQEventTransition3 constructs a new QEventTransition object. -func NewQEventTransition3(sourceState *QState) *QEventTransition { - ret := C.QEventTransition_new3(sourceState.cPointer()) - return newQEventTransition(ret) -} - -// NewQEventTransition4 constructs a new QEventTransition object. -func NewQEventTransition4(object *QObject, typeVal QEvent__Type, sourceState *QState) *QEventTransition { - ret := C.QEventTransition_new4(object.cPointer(), (C.int)(typeVal), sourceState.cPointer()) - return newQEventTransition(ret) -} - -func (this *QEventTransition) MetaObject() *QMetaObject { - return newQMetaObject_U(unsafe.Pointer(C.QEventTransition_MetaObject(this.h))) -} - -func (this *QEventTransition) Metacast(param1 string) unsafe.Pointer { - param1_Cstring := C.CString(param1) - defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QEventTransition_Metacast(this.h, param1_Cstring) -} - -func QEventTransition_Tr(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QEventTransition_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QEventTransition_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QEventTransition_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QEventTransition) EventSource() *QObject { - return newQObject_U(unsafe.Pointer(C.QEventTransition_EventSource(this.h))) -} - -func (this *QEventTransition) SetEventSource(object *QObject) { - C.QEventTransition_SetEventSource(this.h, object.cPointer()) -} - -func (this *QEventTransition) EventType() QEvent__Type { - return (QEvent__Type)(C.QEventTransition_EventType(this.h)) -} - -func (this *QEventTransition) SetEventType(typeVal QEvent__Type) { - C.QEventTransition_SetEventType(this.h, (C.int)(typeVal)) -} - -func QEventTransition_Tr2(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QEventTransition_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QEventTransition_Tr3(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QEventTransition_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QEventTransition_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QEventTransition_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QEventTransition_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QEventTransition_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -// Delete this object from C++ memory. -func (this *QEventTransition) Delete() { - C.QEventTransition_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QEventTransition) GoGC() { - runtime.SetFinalizer(this, func(this *QEventTransition) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} diff --git a/qt/gen_qeventtransition.h b/qt/gen_qeventtransition.h deleted file mode 100644 index 11c383d..0000000 --- a/qt/gen_qeventtransition.h +++ /dev/null @@ -1,50 +0,0 @@ -#ifndef GEN_QEVENTTRANSITION_H -#define GEN_QEVENTTRANSITION_H - -#include -#include -#include - -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - -#include "binding.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __cplusplus -class QEventTransition; -class QMetaObject; -class QObject; -class QState; -#else -typedef struct QEventTransition QEventTransition; -typedef struct QMetaObject QMetaObject; -typedef struct QObject QObject; -typedef struct QState QState; -#endif - -QEventTransition* QEventTransition_new(); -QEventTransition* QEventTransition_new2(QObject* object, int typeVal); -QEventTransition* QEventTransition_new3(QState* sourceState); -QEventTransition* QEventTransition_new4(QObject* object, int typeVal, QState* sourceState); -QMetaObject* QEventTransition_MetaObject(const QEventTransition* self); -void* QEventTransition_Metacast(QEventTransition* self, const char* param1); -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); -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); -struct miqt_string* QEventTransition_TrUtf83(const char* s, const char* c, int n); -void QEventTransition_Delete(QEventTransition* self); - -#ifdef __cplusplus -} /* extern C */ -#endif - -#endif diff --git a/qt/gen_qexception.cpp b/qt/gen_qexception.cpp index 1ec4e82..5c2c9b7 100644 --- a/qt/gen_qexception.cpp +++ b/qt/gen_qexception.cpp @@ -1,47 +1,18 @@ -#define WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__ExceptionHolder #define WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__ExceptionStore #include "qexception.h" #include "gen_qexception.h" #include "_cgo_export.h" -QtPrivate__ExceptionHolder* QtPrivate__ExceptionHolder_new() { - return new QtPrivate::ExceptionHolder(); -} - -QtPrivate__ExceptionHolder* QtPrivate__ExceptionHolder_new2(QtPrivate__ExceptionHolder* other) { - return new QtPrivate::ExceptionHolder(*other); -} - -void QtPrivate__ExceptionHolder_OperatorAssign(QtPrivate__ExceptionHolder* self, QtPrivate__ExceptionHolder* other) { - self->operator=(*other); -} - -void QtPrivate__ExceptionHolder_Delete(QtPrivate__ExceptionHolder* self) { - delete self; -} - -QtPrivate__ExceptionStore* QtPrivate__ExceptionStore_new(QtPrivate__ExceptionStore* param1) { - return new QtPrivate::ExceptionStore(*param1); -} - bool QtPrivate__ExceptionStore_HasException(const QtPrivate__ExceptionStore* self) { return self->hasException(); } -QtPrivate__ExceptionHolder* QtPrivate__ExceptionStore_Exception(QtPrivate__ExceptionStore* self) { - return new QtPrivate::ExceptionHolder(self->exception()); -} - void QtPrivate__ExceptionStore_ThrowPossibleException(QtPrivate__ExceptionStore* self) { self->throwPossibleException(); } -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_RethrowException(const QtPrivate__ExceptionStore* self) { + self->rethrowException(); } void QtPrivate__ExceptionStore_Delete(QtPrivate__ExceptionStore* self) { diff --git a/qt/gen_qexception.go b/qt/gen_qexception.go index 1bb0200..e23383a 100644 --- a/qt/gen_qexception.go +++ b/qt/gen_qexception.go @@ -13,58 +13,6 @@ import ( "unsafe" ) -type QtPrivate__ExceptionHolder struct { - h *C.QtPrivate__ExceptionHolder -} - -func (this *QtPrivate__ExceptionHolder) cPointer() *C.QtPrivate__ExceptionHolder { - if this == nil { - return nil - } - return this.h -} - -func newQtPrivate__ExceptionHolder(h *C.QtPrivate__ExceptionHolder) *QtPrivate__ExceptionHolder { - if h == nil { - return nil - } - return &QtPrivate__ExceptionHolder{h: h} -} - -func newQtPrivate__ExceptionHolder_U(h unsafe.Pointer) *QtPrivate__ExceptionHolder { - return newQtPrivate__ExceptionHolder((*C.QtPrivate__ExceptionHolder)(h)) -} - -// NewQtPrivate__ExceptionHolder constructs a new QtPrivate::ExceptionHolder object. -func NewQtPrivate__ExceptionHolder() *QtPrivate__ExceptionHolder { - ret := C.QtPrivate__ExceptionHolder_new() - return newQtPrivate__ExceptionHolder(ret) -} - -// NewQtPrivate__ExceptionHolder2 constructs a new QtPrivate::ExceptionHolder object. -func NewQtPrivate__ExceptionHolder2(other *QtPrivate__ExceptionHolder) *QtPrivate__ExceptionHolder { - ret := C.QtPrivate__ExceptionHolder_new2(other.cPointer()) - return newQtPrivate__ExceptionHolder(ret) -} - -func (this *QtPrivate__ExceptionHolder) OperatorAssign(other *QtPrivate__ExceptionHolder) { - C.QtPrivate__ExceptionHolder_OperatorAssign(this.h, other.cPointer()) -} - -// Delete this object from C++ memory. -func (this *QtPrivate__ExceptionHolder) Delete() { - C.QtPrivate__ExceptionHolder_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QtPrivate__ExceptionHolder) GoGC() { - runtime.SetFinalizer(this, func(this *QtPrivate__ExceptionHolder) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} - type QtPrivate__ExceptionStore struct { h *C.QtPrivate__ExceptionStore } @@ -87,33 +35,16 @@ func newQtPrivate__ExceptionStore_U(h unsafe.Pointer) *QtPrivate__ExceptionStore return newQtPrivate__ExceptionStore((*C.QtPrivate__ExceptionStore)(h)) } -// NewQtPrivate__ExceptionStore constructs a new QtPrivate::ExceptionStore object. -func NewQtPrivate__ExceptionStore(param1 *QtPrivate__ExceptionStore) *QtPrivate__ExceptionStore { - ret := C.QtPrivate__ExceptionStore_new(param1.cPointer()) - return newQtPrivate__ExceptionStore(ret) -} - func (this *QtPrivate__ExceptionStore) HasException() bool { return (bool)(C.QtPrivate__ExceptionStore_HasException(this.h)) } -func (this *QtPrivate__ExceptionStore) Exception() *QtPrivate__ExceptionHolder { - _ret := C.QtPrivate__ExceptionStore_Exception(this.h) - _goptr := newQtPrivate__ExceptionHolder(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - func (this *QtPrivate__ExceptionStore) ThrowPossibleException() { C.QtPrivate__ExceptionStore_ThrowPossibleException(this.h) } -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()) +func (this *QtPrivate__ExceptionStore) RethrowException() { + C.QtPrivate__ExceptionStore_RethrowException(this.h) } // Delete this object from C++ memory. diff --git a/qt/gen_qexception.h b/qt/gen_qexception.h index 7cfa47e..3cb6d50 100644 --- a/qt/gen_qexception.h +++ b/qt/gen_qexception.h @@ -14,32 +14,18 @@ extern "C" { #endif #ifdef __cplusplus -#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__ExceptionHolder) -typedef QtPrivate::ExceptionHolder QtPrivate__ExceptionHolder; -#else -class QtPrivate__ExceptionHolder; -#endif #if defined(WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__ExceptionStore) typedef QtPrivate::ExceptionStore QtPrivate__ExceptionStore; #else class QtPrivate__ExceptionStore; #endif #else -typedef struct QtPrivate__ExceptionHolder QtPrivate__ExceptionHolder; typedef struct QtPrivate__ExceptionStore QtPrivate__ExceptionStore; #endif -QtPrivate__ExceptionHolder* QtPrivate__ExceptionHolder_new(); -QtPrivate__ExceptionHolder* QtPrivate__ExceptionHolder_new2(QtPrivate__ExceptionHolder* other); -void QtPrivate__ExceptionHolder_OperatorAssign(QtPrivate__ExceptionHolder* self, QtPrivate__ExceptionHolder* other); -void QtPrivate__ExceptionHolder_Delete(QtPrivate__ExceptionHolder* self); - -QtPrivate__ExceptionStore* QtPrivate__ExceptionStore_new(QtPrivate__ExceptionStore* param1); bool QtPrivate__ExceptionStore_HasException(const QtPrivate__ExceptionStore* self); -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_RethrowException(const QtPrivate__ExceptionStore* self); void QtPrivate__ExceptionStore_Delete(QtPrivate__ExceptionStore* self); #ifdef __cplusplus diff --git a/qt/gen_qfile.cpp b/qt/gen_qfile.cpp index 79cff3a..acf3fdc 100644 --- a/qt/gen_qfile.cpp +++ b/qt/gen_qfile.cpp @@ -42,13 +42,6 @@ struct miqt_string* QFile_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QFile_TrUtf8(const char* s) { - QString _ret = QFile::trUtf8(s); - // 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* QFile_FileName(const QFile* self) { QString _ret = self->fileName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -89,21 +82,6 @@ bool QFile_ExistsWithFileName(struct miqt_string* fileName) { return QFile::exists(fileName_QString); } -struct miqt_string* QFile_ReadLink(const QFile* self) { - QString _ret = self->readLink(); - // 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* QFile_ReadLinkWithFileName(struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); - QString _ret = QFile::readLink(fileName_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()); -} - struct miqt_string* QFile_SymLinkTarget(const QFile* self) { QString _ret = self->symLinkTarget(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -153,10 +131,10 @@ bool QFile_Link(QFile* self, struct miqt_string* newName) { return self->link(newName_QString); } -bool QFile_Link2(struct miqt_string* oldname, struct miqt_string* newName) { - QString oldname_QString = QString::fromUtf8(&oldname->data, oldname->len); +bool QFile_Link2(struct miqt_string* fileName, struct miqt_string* newName) { + QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); QString newName_QString = QString::fromUtf8(&newName->data, newName->len); - return QFile::link(oldname_QString, newName_QString); + return QFile::link(fileName_QString, newName_QString); } bool QFile_Copy(QFile* self, struct miqt_string* newName) { @@ -171,11 +149,15 @@ bool QFile_Copy2(struct miqt_string* fileName, struct miqt_string* newName) { } bool QFile_Open(QFile* self, int flags) { - return self->open(static_cast(flags)); + return self->open(static_cast(flags)); } -bool QFile_Open3(QFile* self, int fd, int ioFlags) { - return self->open(static_cast(fd), static_cast(ioFlags)); +bool QFile_Open2(QFile* self, int flags, int permissions) { + return self->open(static_cast(flags), static_cast(permissions)); +} + +bool QFile_Open4(QFile* self, int fd, int ioFlags) { + return self->open(static_cast(fd), static_cast(ioFlags)); } long long QFile_Size(const QFile* self) { @@ -226,22 +208,8 @@ struct miqt_string* QFile_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QFile_TrUtf82(const char* s, const char* c) { - QString _ret = QFile::trUtf8(s, c); - // 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* QFile_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QFile::trUtf8(s, c, static_cast(n)); - // 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()); -} - bool QFile_Open33(QFile* self, int fd, int ioFlags, int handleFlags) { - return self->open(static_cast(fd), static_cast(ioFlags), static_cast(handleFlags)); + return self->open(static_cast(fd), static_cast(ioFlags), static_cast(handleFlags)); } void QFile_Delete(QFile* self) { diff --git a/qt/gen_qfile.go b/qt/gen_qfile.go index c9620f5..0a0af56 100644 --- a/qt/gen_qfile.go +++ b/qt/gen_qfile.go @@ -83,15 +83,6 @@ func QFile_Tr(s string) string { return _ret } -func QFile_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFile_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QFile) FileName() string { var _ms *C.struct_miqt_string = C.QFile_FileName(this.h) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) @@ -140,22 +131,6 @@ func QFile_ExistsWithFileName(fileName string) bool { return (bool)(C.QFile_ExistsWithFileName((*C.struct_miqt_string)(fileName_ms))) } -func (this *QFile) ReadLink() string { - var _ms *C.struct_miqt_string = C.QFile_ReadLink(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QFile_ReadLinkWithFileName(fileName string) string { - fileName_ms := miqt_strdupg(fileName) - defer C.free(fileName_ms) - var _ms *C.struct_miqt_string = C.QFile_ReadLinkWithFileName((*C.struct_miqt_string)(fileName_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QFile) SymLinkTarget() string { var _ms *C.struct_miqt_string = C.QFile_SymLinkTarget(this.h) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) @@ -212,12 +187,12 @@ func (this *QFile) Link(newName string) bool { return (bool)(C.QFile_Link(this.h, (*C.struct_miqt_string)(newName_ms))) } -func QFile_Link2(oldname string, newName string) bool { - oldname_ms := miqt_strdupg(oldname) - defer C.free(oldname_ms) +func QFile_Link2(fileName string, newName string) bool { + fileName_ms := miqt_strdupg(fileName) + defer C.free(fileName_ms) newName_ms := miqt_strdupg(newName) defer C.free(newName_ms) - return (bool)(C.QFile_Link2((*C.struct_miqt_string)(oldname_ms), (*C.struct_miqt_string)(newName_ms))) + return (bool)(C.QFile_Link2((*C.struct_miqt_string)(fileName_ms), (*C.struct_miqt_string)(newName_ms))) } func (this *QFile) Copy(newName string) bool { @@ -234,12 +209,16 @@ func QFile_Copy2(fileName string, newName string) bool { return (bool)(C.QFile_Copy2((*C.struct_miqt_string)(fileName_ms), (*C.struct_miqt_string)(newName_ms))) } -func (this *QFile) Open(flags QIODevice__OpenModeFlag) bool { +func (this *QFile) Open(flags QIODeviceBase__OpenModeFlag) bool { return (bool)(C.QFile_Open(this.h, (C.int)(flags))) } -func (this *QFile) Open3(fd int, ioFlags QIODevice__OpenModeFlag) bool { - return (bool)(C.QFile_Open3(this.h, (C.int)(fd), (C.int)(ioFlags))) +func (this *QFile) Open2(flags QIODeviceBase__OpenModeFlag, permissions QFileDevice__Permission) bool { + return (bool)(C.QFile_Open2(this.h, (C.int)(flags), (C.int)(permissions))) +} + +func (this *QFile) Open4(fd int, ioFlags QIODeviceBase__OpenModeFlag) bool { + return (bool)(C.QFile_Open4(this.h, (C.int)(fd), (C.int)(ioFlags))) } func (this *QFile) Size() int64 { @@ -298,29 +277,7 @@ func QFile_Tr3(s string, c string, n int) string { return _ret } -func QFile_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFile_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QFile_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFile_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QFile) Open33(fd int, ioFlags QIODevice__OpenModeFlag, handleFlags QFileDevice__FileHandleFlag) bool { +func (this *QFile) Open33(fd int, ioFlags QIODeviceBase__OpenModeFlag, handleFlags QFileDevice__FileHandleFlag) bool { return (bool)(C.QFile_Open33(this.h, (C.int)(fd), (C.int)(ioFlags), (C.int)(handleFlags))) } diff --git a/qt/gen_qfile.h b/qt/gen_qfile.h index 662c8b1..38e6656 100644 --- a/qt/gen_qfile.h +++ b/qt/gen_qfile.h @@ -32,7 +32,6 @@ QFile* QFile_new4(struct miqt_string* name, QObject* parent); QMetaObject* QFile_MetaObject(const QFile* self); void* QFile_Metacast(QFile* self, const char* param1); struct miqt_string* QFile_Tr(const char* s); -struct miqt_string* QFile_TrUtf8(const char* s); struct miqt_string* QFile_FileName(const QFile* self); void QFile_SetFileName(QFile* self, struct miqt_string* name); QByteArray* QFile_EncodeName(struct miqt_string* fileName); @@ -40,8 +39,6 @@ struct miqt_string* QFile_DecodeName(QByteArray* localFileName); struct miqt_string* QFile_DecodeNameWithLocalFileName(const char* localFileName); bool QFile_Exists(const QFile* self); bool QFile_ExistsWithFileName(struct miqt_string* fileName); -struct miqt_string* QFile_ReadLink(const QFile* self); -struct miqt_string* QFile_ReadLinkWithFileName(struct miqt_string* fileName); struct miqt_string* QFile_SymLinkTarget(const QFile* self); struct miqt_string* QFile_SymLinkTargetWithFileName(struct miqt_string* fileName); bool QFile_Remove(QFile* self); @@ -51,11 +48,12 @@ bool QFile_MoveToTrashWithFileName(struct miqt_string* fileName); bool QFile_Rename(QFile* self, struct miqt_string* newName); bool QFile_Rename2(struct miqt_string* oldName, struct miqt_string* newName); bool QFile_Link(QFile* self, struct miqt_string* newName); -bool QFile_Link2(struct miqt_string* oldname, struct miqt_string* newName); +bool QFile_Link2(struct miqt_string* fileName, struct miqt_string* newName); bool QFile_Copy(QFile* self, struct miqt_string* newName); bool QFile_Copy2(struct miqt_string* fileName, struct miqt_string* newName); bool QFile_Open(QFile* self, int flags); -bool QFile_Open3(QFile* self, int fd, int ioFlags); +bool QFile_Open2(QFile* self, int flags, int permissions); +bool QFile_Open4(QFile* self, int fd, int ioFlags); long long QFile_Size(const QFile* self); bool QFile_Resize(QFile* self, long long sz); bool QFile_Resize2(struct miqt_string* filename, long long sz); @@ -65,8 +63,6 @@ bool QFile_SetPermissions(QFile* self, int permissionSpec); bool QFile_SetPermissions2(struct miqt_string* filename, int permissionSpec); struct miqt_string* QFile_Tr2(const char* s, const char* c); struct miqt_string* QFile_Tr3(const char* s, const char* c, int n); -struct miqt_string* QFile_TrUtf82(const char* s, const char* c); -struct miqt_string* QFile_TrUtf83(const char* s, const char* c, int n); bool QFile_Open33(QFile* self, int fd, int ioFlags, int handleFlags); void QFile_Delete(QFile* self); diff --git a/qt/gen_qfiledevice.cpp b/qt/gen_qfiledevice.cpp index a83eaa0..94a49f8 100644 --- a/qt/gen_qfiledevice.cpp +++ b/qt/gen_qfiledevice.cpp @@ -23,13 +23,6 @@ struct miqt_string* QFileDevice_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QFileDevice_TrUtf8(const char* s) { - QString _ret = QFileDevice::trUtf8(s); - // 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()); -} - int QFileDevice_Error(const QFileDevice* self) { QFileDevice::FileError _ret = self->error(); return static_cast(_ret); @@ -124,20 +117,6 @@ struct miqt_string* QFileDevice_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QFileDevice_TrUtf82(const char* s, const char* c) { - QString _ret = QFileDevice::trUtf8(s, c); - // 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* QFileDevice_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QFileDevice::trUtf8(s, c, static_cast(n)); - // 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()); -} - 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); diff --git a/qt/gen_qfiledevice.go b/qt/gen_qfiledevice.go index 4ba7095..d7383c3 100644 --- a/qt/gen_qfiledevice.go +++ b/qt/gen_qfiledevice.go @@ -66,11 +66,11 @@ const ( QFileDevice__DontCloseHandle QFileDevice__FileHandleFlag = 0 ) -type QFileDevice__MemoryMapFlags int +type QFileDevice__MemoryMapFlag int const ( - QFileDevice__NoOptions QFileDevice__MemoryMapFlags = 0 - QFileDevice__MapPrivateOption QFileDevice__MemoryMapFlags = 1 + QFileDevice__NoOptions QFileDevice__MemoryMapFlag = 0 + QFileDevice__MapPrivateOption QFileDevice__MemoryMapFlag = 1 ) type QFileDevice struct { @@ -115,15 +115,6 @@ func QFileDevice_Tr(s string) string { return _ret } -func QFileDevice_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFileDevice_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QFileDevice) Error() QFileDevice__FileError { return (QFileDevice__FileError)(C.QFileDevice_Error(this.h)) } @@ -224,29 +215,7 @@ func QFileDevice_Tr3(s string, c string, n int) string { return _ret } -func QFileDevice_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFileDevice_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QFileDevice_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFileDevice_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QFileDevice) Map3(offset int64, size int64, flags QFileDevice__MemoryMapFlags) *byte { +func (this *QFileDevice) Map3(offset int64, size int64, flags QFileDevice__MemoryMapFlag) *byte { return (*byte)(C.QFileDevice_Map3(this.h, (C.longlong)(offset), (C.longlong)(size), (C.int)(flags))) } diff --git a/qt/gen_qfiledevice.h b/qt/gen_qfiledevice.h index b5bda5d..7f2d9f9 100644 --- a/qt/gen_qfiledevice.h +++ b/qt/gen_qfiledevice.h @@ -26,7 +26,6 @@ typedef struct QMetaObject QMetaObject; QMetaObject* QFileDevice_MetaObject(const QFileDevice* self); void* QFileDevice_Metacast(QFileDevice* self, const char* param1); struct miqt_string* QFileDevice_Tr(const char* s); -struct miqt_string* QFileDevice_TrUtf8(const char* s); int QFileDevice_Error(const QFileDevice* self); void QFileDevice_UnsetError(QFileDevice* self); void QFileDevice_Close(QFileDevice* self); @@ -47,8 +46,6 @@ 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, int flags); void QFileDevice_Delete(QFileDevice* self); diff --git a/qt/gen_qfiledialog.cpp b/qt/gen_qfiledialog.cpp index a95c023..20f0404 100644 --- a/qt/gen_qfiledialog.cpp +++ b/qt/gen_qfiledialog.cpp @@ -1,9 +1,9 @@ +#include #include #include #include #include #include -#include #include #include #include @@ -60,13 +60,6 @@ struct miqt_string* QFileDialog_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QFileDialog_TrUtf8(const char* s) { - QString _ret = QFileDialog::trUtf8(s); - // 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 QFileDialog_SetDirectory(QFileDialog* self, struct miqt_string* directory) { QString directory_QString = QString::fromUtf8(&directory->data, directory->len); self->setDirectory(directory_QString); @@ -126,14 +119,6 @@ struct miqt_array* QFileDialog_SelectedUrls(const QFileDialog* self) { return _out; } -void QFileDialog_SetNameFilterDetailsVisible(QFileDialog* self, bool enabled) { - self->setNameFilterDetailsVisible(enabled); -} - -bool QFileDialog_IsNameFilterDetailsVisible(const QFileDialog* self) { - return self->isNameFilterDetailsVisible(); -} - void QFileDialog_SetNameFilter(QFileDialog* self, struct miqt_string* filter) { QString filter_QString = QString::fromUtf8(&filter->data, filter->len); self->setNameFilter(filter_QString); @@ -253,22 +238,6 @@ int QFileDialog_AcceptMode(const QFileDialog* self) { return static_cast(_ret); } -void QFileDialog_SetReadOnly(QFileDialog* self, bool enabled) { - self->setReadOnly(enabled); -} - -bool QFileDialog_IsReadOnly(const QFileDialog* self) { - return self->isReadOnly(); -} - -void QFileDialog_SetResolveSymlinks(QFileDialog* self, bool enabled) { - self->setResolveSymlinks(enabled); -} - -bool QFileDialog_ResolveSymlinks(const QFileDialog* self) { - return self->resolveSymlinks(); -} - void QFileDialog_SetSidebarUrls(QFileDialog* self, struct miqt_array* /* of QUrl* */ urls) { QList urls_QList; urls_QList.reserve(urls->len); @@ -300,14 +269,6 @@ bool QFileDialog_RestoreState(QFileDialog* self, QByteArray* state) { return self->restoreState(*state); } -void QFileDialog_SetConfirmOverwrite(QFileDialog* self, bool enabled) { - self->setConfirmOverwrite(enabled); -} - -bool QFileDialog_ConfirmOverwrite(const QFileDialog* self) { - return self->confirmOverwrite(); -} - void QFileDialog_SetDefaultSuffix(QFileDialog* self, struct miqt_string* suffix) { QString suffix_QString = QString::fromUtf8(&suffix->data, suffix->len); self->setDefaultSuffix(suffix_QString); @@ -355,11 +316,11 @@ QAbstractItemDelegate* QFileDialog_ItemDelegate(const QFileDialog* self) { return self->itemDelegate(); } -void QFileDialog_SetIconProvider(QFileDialog* self, QFileIconProvider* provider) { +void QFileDialog_SetIconProvider(QFileDialog* self, QAbstractFileIconProvider* provider) { self->setIconProvider(provider); } -QFileIconProvider* QFileDialog_IconProvider(const QFileDialog* self) { +QAbstractFileIconProvider* QFileDialog_IconProvider(const QFileDialog* self) { return self->iconProvider(); } @@ -666,20 +627,6 @@ struct miqt_string* QFileDialog_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QFileDialog_TrUtf82(const char* s, const char* c) { - QString _ret = QFileDialog::trUtf8(s, c); - // 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* QFileDialog_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QFileDialog::trUtf8(s, c, static_cast(n)); - // 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 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 ab01189..e7d07b4 100644 --- a/qt/gen_qfiledialog.go +++ b/qt/gen_qfiledialog.go @@ -28,7 +28,6 @@ const ( QFileDialog__ExistingFile QFileDialog__FileMode = 1 QFileDialog__Directory QFileDialog__FileMode = 2 QFileDialog__ExistingFiles QFileDialog__FileMode = 3 - QFileDialog__DirectoryOnly QFileDialog__FileMode = 4 ) type QFileDialog__AcceptMode int @@ -54,11 +53,10 @@ const ( QFileDialog__ShowDirsOnly QFileDialog__Option = 1 QFileDialog__DontResolveSymlinks QFileDialog__Option = 2 QFileDialog__DontConfirmOverwrite QFileDialog__Option = 4 - QFileDialog__DontUseSheet QFileDialog__Option = 8 - QFileDialog__DontUseNativeDialog QFileDialog__Option = 16 - QFileDialog__ReadOnly QFileDialog__Option = 32 - QFileDialog__HideNameFilterDetails QFileDialog__Option = 64 - QFileDialog__DontUseCustomDirectoryIcons QFileDialog__Option = 128 + QFileDialog__DontUseNativeDialog QFileDialog__Option = 8 + QFileDialog__ReadOnly QFileDialog__Option = 16 + QFileDialog__HideNameFilterDetails QFileDialog__Option = 32 + QFileDialog__DontUseCustomDirectoryIcons QFileDialog__Option = 64 ) type QFileDialog struct { @@ -151,15 +149,6 @@ func QFileDialog_Tr(s string) string { return _ret } -func QFileDialog_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFileDialog_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QFileDialog) SetDirectory(directory string) { directory_ms := miqt_strdupg(directory) defer C.free(directory_ms) @@ -226,14 +215,6 @@ func (this *QFileDialog) SelectedUrls() []QUrl { return _ret } -func (this *QFileDialog) SetNameFilterDetailsVisible(enabled bool) { - C.QFileDialog_SetNameFilterDetailsVisible(this.h, (C.bool)(enabled)) -} - -func (this *QFileDialog) IsNameFilterDetailsVisible() bool { - return (bool)(C.QFileDialog_IsNameFilterDetailsVisible(this.h)) -} - func (this *QFileDialog) SetNameFilter(filter string) { filter_ms := miqt_strdupg(filter) defer C.free(filter_ms) @@ -354,22 +335,6 @@ func (this *QFileDialog) AcceptMode() QFileDialog__AcceptMode { return (QFileDialog__AcceptMode)(C.QFileDialog_AcceptMode(this.h)) } -func (this *QFileDialog) SetReadOnly(enabled bool) { - C.QFileDialog_SetReadOnly(this.h, (C.bool)(enabled)) -} - -func (this *QFileDialog) IsReadOnly() bool { - return (bool)(C.QFileDialog_IsReadOnly(this.h)) -} - -func (this *QFileDialog) SetResolveSymlinks(enabled bool) { - C.QFileDialog_SetResolveSymlinks(this.h, (C.bool)(enabled)) -} - -func (this *QFileDialog) ResolveSymlinks() bool { - return (bool)(C.QFileDialog_ResolveSymlinks(this.h)) -} - func (this *QFileDialog) SetSidebarUrls(urls []QUrl) { // For the C ABI, malloc a C array of raw pointers urls_CArray := (*[0xffff]*C.QUrl)(C.malloc(C.size_t(8 * len(urls)))) @@ -407,14 +372,6 @@ func (this *QFileDialog) RestoreState(state *QByteArray) bool { return (bool)(C.QFileDialog_RestoreState(this.h, state.cPointer())) } -func (this *QFileDialog) SetConfirmOverwrite(enabled bool) { - C.QFileDialog_SetConfirmOverwrite(this.h, (C.bool)(enabled)) -} - -func (this *QFileDialog) ConfirmOverwrite() bool { - return (bool)(C.QFileDialog_ConfirmOverwrite(this.h)) -} - func (this *QFileDialog) SetDefaultSuffix(suffix string) { suffix_ms := miqt_strdupg(suffix) defer C.free(suffix_ms) @@ -464,12 +421,12 @@ func (this *QFileDialog) ItemDelegate() *QAbstractItemDelegate { return newQAbstractItemDelegate_U(unsafe.Pointer(C.QFileDialog_ItemDelegate(this.h))) } -func (this *QFileDialog) SetIconProvider(provider *QFileIconProvider) { +func (this *QFileDialog) SetIconProvider(provider *QAbstractFileIconProvider) { C.QFileDialog_SetIconProvider(this.h, provider.cPointer()) } -func (this *QFileDialog) IconProvider() *QFileIconProvider { - return newQFileIconProvider_U(unsafe.Pointer(C.QFileDialog_IconProvider(this.h))) +func (this *QFileDialog) IconProvider() *QAbstractFileIconProvider { + return newQAbstractFileIconProvider_U(unsafe.Pointer(C.QFileDialog_IconProvider(this.h))) } func (this *QFileDialog) SetLabelText(label QFileDialog__DialogLabel, text string) { @@ -875,28 +832,6 @@ func QFileDialog_Tr3(s string, c string, n int) string { return _ret } -func QFileDialog_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFileDialog_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QFileDialog_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFileDialog_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QFileDialog) SetOption2(option QFileDialog__Option, on bool) { C.QFileDialog_SetOption2(this.h, (C.int)(option), (C.bool)(on)) } diff --git a/qt/gen_qfiledialog.h b/qt/gen_qfiledialog.h index ea55258..e448b1f 100644 --- a/qt/gen_qfiledialog.h +++ b/qt/gen_qfiledialog.h @@ -14,22 +14,22 @@ extern "C" { #endif #ifdef __cplusplus +class QAbstractFileIconProvider; class QAbstractItemDelegate; class QAbstractProxyModel; class QByteArray; class QDir; class QFileDialog; -class QFileIconProvider; class QMetaObject; class QUrl; class QWidget; #else +typedef struct QAbstractFileIconProvider QAbstractFileIconProvider; typedef struct QAbstractItemDelegate QAbstractItemDelegate; typedef struct QAbstractProxyModel QAbstractProxyModel; typedef struct QByteArray QByteArray; typedef struct QDir QDir; typedef struct QFileDialog QFileDialog; -typedef struct QFileIconProvider QFileIconProvider; typedef struct QMetaObject QMetaObject; typedef struct QUrl QUrl; typedef struct QWidget QWidget; @@ -44,7 +44,6 @@ QFileDialog* QFileDialog_new6(QWidget* parent, struct miqt_string* caption, stru QMetaObject* QFileDialog_MetaObject(const QFileDialog* self); void* QFileDialog_Metacast(QFileDialog* self, const char* param1); struct miqt_string* QFileDialog_Tr(const char* s); -struct miqt_string* QFileDialog_TrUtf8(const char* s); void QFileDialog_SetDirectory(QFileDialog* self, struct miqt_string* directory); void QFileDialog_SetDirectoryWithDirectory(QFileDialog* self, QDir* directory); QDir* QFileDialog_Directory(const QFileDialog* self); @@ -54,8 +53,6 @@ void QFileDialog_SelectFile(QFileDialog* self, struct miqt_string* filename); struct miqt_array* QFileDialog_SelectedFiles(const QFileDialog* self); void QFileDialog_SelectUrl(QFileDialog* self, QUrl* url); struct miqt_array* QFileDialog_SelectedUrls(const QFileDialog* self); -void QFileDialog_SetNameFilterDetailsVisible(QFileDialog* self, bool enabled); -bool QFileDialog_IsNameFilterDetailsVisible(const QFileDialog* self); void QFileDialog_SetNameFilter(QFileDialog* self, struct miqt_string* filter); void QFileDialog_SetNameFilters(QFileDialog* self, struct miqt_array* /* of struct miqt_string* */ filters); struct miqt_array* QFileDialog_NameFilters(const QFileDialog* self); @@ -73,24 +70,18 @@ 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); -bool QFileDialog_ResolveSymlinks(const QFileDialog* self); void QFileDialog_SetSidebarUrls(QFileDialog* self, struct miqt_array* /* of QUrl* */ urls); struct miqt_array* QFileDialog_SidebarUrls(const QFileDialog* self); QByteArray* QFileDialog_SaveState(const QFileDialog* self); bool QFileDialog_RestoreState(QFileDialog* self, QByteArray* state); -void QFileDialog_SetConfirmOverwrite(QFileDialog* self, bool enabled); -bool QFileDialog_ConfirmOverwrite(const QFileDialog* self); void QFileDialog_SetDefaultSuffix(QFileDialog* self, struct miqt_string* suffix); struct miqt_string* QFileDialog_DefaultSuffix(const QFileDialog* self); void QFileDialog_SetHistory(QFileDialog* self, struct miqt_array* /* of struct miqt_string* */ paths); struct miqt_array* QFileDialog_History(const QFileDialog* self); void QFileDialog_SetItemDelegate(QFileDialog* self, QAbstractItemDelegate* delegate); QAbstractItemDelegate* QFileDialog_ItemDelegate(const QFileDialog* self); -void QFileDialog_SetIconProvider(QFileDialog* self, QFileIconProvider* provider); -QFileIconProvider* QFileDialog_IconProvider(const QFileDialog* self); +void QFileDialog_SetIconProvider(QFileDialog* self, QAbstractFileIconProvider* provider); +QAbstractFileIconProvider* QFileDialog_IconProvider(const QFileDialog* self); 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); @@ -131,8 +122,6 @@ struct miqt_array* QFileDialog_GetOpenFileUrls(); void QFileDialog_SaveFileContent(QByteArray* fileContent); 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, int option, bool on); struct miqt_string* QFileDialog_GetOpenFileName1(QWidget* parent); struct miqt_string* QFileDialog_GetOpenFileName2(QWidget* parent, struct miqt_string* caption); diff --git a/qt/gen_qfileiconprovider.cpp b/qt/gen_qfileiconprovider.cpp index 40d18f4..9af40d6 100644 --- a/qt/gen_qfileiconprovider.cpp +++ b/qt/gen_qfileiconprovider.cpp @@ -1,9 +1,6 @@ #include #include #include -#include -#include -#include #include "qfileiconprovider.h" #include "gen_qfileiconprovider.h" #include "_cgo_export.h" @@ -13,29 +10,13 @@ QFileIconProvider* QFileIconProvider_new() { } QIcon* QFileIconProvider_Icon(const QFileIconProvider* self, int typeVal) { - return new QIcon(self->icon(static_cast(typeVal))); + return new QIcon(self->icon(static_cast(typeVal))); } QIcon* QFileIconProvider_IconWithInfo(const QFileIconProvider* self, QFileInfo* info) { return new QIcon(self->icon(*info)); } -struct miqt_string* QFileIconProvider_Type(const QFileIconProvider* self, QFileInfo* info) { - QString _ret = self->type(*info); - // 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 QFileIconProvider_SetOptions(QFileIconProvider* self, int options) { - self->setOptions(static_cast(options)); -} - -int QFileIconProvider_Options(const QFileIconProvider* self) { - QFileIconProvider::Options _ret = self->options(); - return static_cast(_ret); -} - void QFileIconProvider_Delete(QFileIconProvider* self) { delete self; } diff --git a/qt/gen_qfileiconprovider.go b/qt/gen_qfileiconprovider.go index 94bf084..99fb2e8 100644 --- a/qt/gen_qfileiconprovider.go +++ b/qt/gen_qfileiconprovider.go @@ -13,26 +13,9 @@ import ( "unsafe" ) -type QFileIconProvider__IconType int - -const ( - QFileIconProvider__Computer QFileIconProvider__IconType = 0 - QFileIconProvider__Desktop QFileIconProvider__IconType = 1 - QFileIconProvider__Trashcan QFileIconProvider__IconType = 2 - QFileIconProvider__Network QFileIconProvider__IconType = 3 - QFileIconProvider__Drive QFileIconProvider__IconType = 4 - QFileIconProvider__Folder QFileIconProvider__IconType = 5 - QFileIconProvider__File QFileIconProvider__IconType = 6 -) - -type QFileIconProvider__Option int - -const ( - QFileIconProvider__DontUseCustomDirectoryIcons QFileIconProvider__Option = 1 -) - type QFileIconProvider struct { h *C.QFileIconProvider + *QAbstractFileIconProvider } func (this *QFileIconProvider) cPointer() *C.QFileIconProvider { @@ -46,7 +29,7 @@ func newQFileIconProvider(h *C.QFileIconProvider) *QFileIconProvider { if h == nil { return nil } - return &QFileIconProvider{h: h} + return &QFileIconProvider{h: h, QAbstractFileIconProvider: newQAbstractFileIconProvider_U(unsafe.Pointer(h))} } func newQFileIconProvider_U(h unsafe.Pointer) *QFileIconProvider { @@ -59,7 +42,7 @@ func NewQFileIconProvider() *QFileIconProvider { return newQFileIconProvider(ret) } -func (this *QFileIconProvider) Icon(typeVal QFileIconProvider__IconType) *QIcon { +func (this *QFileIconProvider) Icon(typeVal QAbstractFileIconProvider__IconType) *QIcon { _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 @@ -73,21 +56,6 @@ func (this *QFileIconProvider) IconWithInfo(info *QFileInfo) *QIcon { return _goptr } -func (this *QFileIconProvider) Type(info *QFileInfo) string { - var _ms *C.struct_miqt_string = C.QFileIconProvider_Type(this.h, info.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QFileIconProvider) SetOptions(options QFileIconProvider__Option) { - C.QFileIconProvider_SetOptions(this.h, (C.int)(options)) -} - -func (this *QFileIconProvider) Options() QFileIconProvider__Option { - return (QFileIconProvider__Option)(C.QFileIconProvider_Options(this.h)) -} - // Delete this object from C++ memory. func (this *QFileIconProvider) Delete() { C.QFileIconProvider_Delete(this.h) diff --git a/qt/gen_qfileiconprovider.h b/qt/gen_qfileiconprovider.h index 3a36486..3a07eff 100644 --- a/qt/gen_qfileiconprovider.h +++ b/qt/gen_qfileiconprovider.h @@ -26,9 +26,6 @@ typedef struct QIcon QIcon; QFileIconProvider* QFileIconProvider_new(); 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); -int QFileIconProvider_Options(const QFileIconProvider* self); void QFileIconProvider_Delete(QFileIconProvider* self); #ifdef __cplusplus diff --git a/qt/gen_qfileinfo.cpp b/qt/gen_qfileinfo.cpp index 6fc91bc..6d49933 100644 --- a/qt/gen_qfileinfo.cpp +++ b/qt/gen_qfileinfo.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include #include @@ -18,7 +18,7 @@ QFileInfo* QFileInfo_new2(struct miqt_string* file) { return new QFileInfo(file_QString); } -QFileInfo* QFileInfo_new3(QFile* file) { +QFileInfo* QFileInfo_new3(QFileDevice* file) { return new QFileInfo(*file); } @@ -52,7 +52,7 @@ void QFileInfo_SetFile(QFileInfo* self, struct miqt_string* file) { self->setFile(file_QString); } -void QFileInfo_SetFileWithFile(QFileInfo* self, QFile* file) { +void QFileInfo_SetFileWithFile(QFileInfo* self, QFileDevice* file) { self->setFile(*file); } @@ -218,6 +218,10 @@ bool QFileInfo_IsShortcut(const QFileInfo* self) { return self->isShortcut(); } +bool QFileInfo_IsAlias(const QFileInfo* self) { + return self->isAlias(); +} + bool QFileInfo_IsJunction(const QFileInfo* self) { return self->isJunction(); } @@ -230,15 +234,15 @@ bool QFileInfo_IsBundle(const QFileInfo* self) { return self->isBundle(); } -struct miqt_string* QFileInfo_ReadLink(const QFileInfo* self) { - QString _ret = self->readLink(); +struct miqt_string* QFileInfo_SymLinkTarget(const QFileInfo* self) { + QString _ret = self->symLinkTarget(); // 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* QFileInfo_SymLinkTarget(const QFileInfo* self) { - QString _ret = self->symLinkTarget(); +struct miqt_string* QFileInfo_JunctionTarget(const QFileInfo* self) { + QString _ret = self->junctionTarget(); // 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()); @@ -282,10 +286,6 @@ long long QFileInfo_Size(const QFileInfo* self) { return static_cast(_ret); } -QDateTime* QFileInfo_Created(const QFileInfo* self) { - return new QDateTime(self->created()); -} - QDateTime* QFileInfo_BirthTime(const QFileInfo* self) { return new QDateTime(self->birthTime()); } @@ -314,6 +314,10 @@ void QFileInfo_SetCaching(QFileInfo* self, bool on) { self->setCaching(on); } +void QFileInfo_Stat(QFileInfo* self) { + self->stat(); +} + void QFileInfo_Delete(QFileInfo* self) { delete self; } diff --git a/qt/gen_qfileinfo.go b/qt/gen_qfileinfo.go index cdb2ec4..516b6f8 100644 --- a/qt/gen_qfileinfo.go +++ b/qt/gen_qfileinfo.go @@ -50,7 +50,7 @@ func NewQFileInfo2(file string) *QFileInfo { } // NewQFileInfo3 constructs a new QFileInfo object. -func NewQFileInfo3(file *QFile) *QFileInfo { +func NewQFileInfo3(file *QFileDevice) *QFileInfo { ret := C.QFileInfo_new3(file.cPointer()) return newQFileInfo(ret) } @@ -91,7 +91,7 @@ func (this *QFileInfo) SetFile(file string) { C.QFileInfo_SetFile(this.h, (*C.struct_miqt_string)(file_ms)) } -func (this *QFileInfo) SetFileWithFile(file *QFile) { +func (this *QFileInfo) SetFileWithFile(file *QFileDevice) { C.QFileInfo_SetFileWithFile(this.h, file.cPointer()) } @@ -265,6 +265,10 @@ func (this *QFileInfo) IsShortcut() bool { return (bool)(C.QFileInfo_IsShortcut(this.h)) } +func (this *QFileInfo) IsAlias() bool { + return (bool)(C.QFileInfo_IsAlias(this.h)) +} + func (this *QFileInfo) IsJunction() bool { return (bool)(C.QFileInfo_IsJunction(this.h)) } @@ -277,15 +281,15 @@ func (this *QFileInfo) IsBundle() bool { return (bool)(C.QFileInfo_IsBundle(this.h)) } -func (this *QFileInfo) ReadLink() string { - var _ms *C.struct_miqt_string = C.QFileInfo_ReadLink(this.h) +func (this *QFileInfo) SymLinkTarget() string { + var _ms *C.struct_miqt_string = C.QFileInfo_SymLinkTarget(this.h) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } -func (this *QFileInfo) SymLinkTarget() string { - var _ms *C.struct_miqt_string = C.QFileInfo_SymLinkTarget(this.h) +func (this *QFileInfo) JunctionTarget() string { + var _ms *C.struct_miqt_string = C.QFileInfo_JunctionTarget(this.h) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -325,13 +329,6 @@ func (this *QFileInfo) Size() int64 { return (int64)(C.QFileInfo_Size(this.h)) } -func (this *QFileInfo) Created() *QDateTime { - _ret := C.QFileInfo_Created(this.h) - _goptr := newQDateTime(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - func (this *QFileInfo) BirthTime() *QDateTime { _ret := C.QFileInfo_BirthTime(this.h) _goptr := newQDateTime(_ret) @@ -375,6 +372,10 @@ func (this *QFileInfo) SetCaching(on bool) { C.QFileInfo_SetCaching(this.h, (C.bool)(on)) } +func (this *QFileInfo) Stat() { + C.QFileInfo_Stat(this.h) +} + // Delete this object from C++ memory. func (this *QFileInfo) Delete() { C.QFileInfo_Delete(this.h) diff --git a/qt/gen_qfileinfo.h b/qt/gen_qfileinfo.h index 2408dc6..8271935 100644 --- a/qt/gen_qfileinfo.h +++ b/qt/gen_qfileinfo.h @@ -16,18 +16,18 @@ extern "C" { #ifdef __cplusplus class QDateTime; class QDir; -class QFile; +class QFileDevice; class QFileInfo; #else typedef struct QDateTime QDateTime; typedef struct QDir QDir; -typedef struct QFile QFile; +typedef struct QFileDevice QFileDevice; typedef struct QFileInfo QFileInfo; #endif QFileInfo* QFileInfo_new(); QFileInfo* QFileInfo_new2(struct miqt_string* file); -QFileInfo* QFileInfo_new3(QFile* file); +QFileInfo* QFileInfo_new3(QFileDevice* file); QFileInfo* QFileInfo_new4(QDir* dir, struct miqt_string* file); QFileInfo* QFileInfo_new5(QFileInfo* fileinfo); void QFileInfo_OperatorAssign(QFileInfo* self, QFileInfo* fileinfo); @@ -35,7 +35,7 @@ void QFileInfo_Swap(QFileInfo* self, QFileInfo* other); bool QFileInfo_OperatorEqual(const QFileInfo* self, QFileInfo* fileinfo); bool QFileInfo_OperatorNotEqual(const QFileInfo* self, QFileInfo* fileinfo); void QFileInfo_SetFile(QFileInfo* self, struct miqt_string* file); -void QFileInfo_SetFileWithFile(QFileInfo* self, QFile* file); +void QFileInfo_SetFileWithFile(QFileInfo* self, QFileDevice* file); void QFileInfo_SetFile2(QFileInfo* self, QDir* dir, struct miqt_string* file); bool QFileInfo_Exists(const QFileInfo* self); bool QFileInfo_ExistsWithFile(struct miqt_string* file); @@ -67,11 +67,12 @@ bool QFileInfo_IsDir(const QFileInfo* self); bool QFileInfo_IsSymLink(const QFileInfo* self); bool QFileInfo_IsSymbolicLink(const QFileInfo* self); bool QFileInfo_IsShortcut(const QFileInfo* self); +bool QFileInfo_IsAlias(const QFileInfo* self); bool QFileInfo_IsJunction(const QFileInfo* self); bool QFileInfo_IsRoot(const QFileInfo* self); bool QFileInfo_IsBundle(const QFileInfo* self); -struct miqt_string* QFileInfo_ReadLink(const QFileInfo* self); struct miqt_string* QFileInfo_SymLinkTarget(const QFileInfo* self); +struct miqt_string* QFileInfo_JunctionTarget(const QFileInfo* self); struct miqt_string* QFileInfo_Owner(const QFileInfo* self); unsigned int QFileInfo_OwnerId(const QFileInfo* self); struct miqt_string* QFileInfo_Group(const QFileInfo* self); @@ -79,7 +80,6 @@ unsigned int QFileInfo_GroupId(const QFileInfo* self); bool QFileInfo_Permission(const QFileInfo* self, int permissions); int QFileInfo_Permissions(const QFileInfo* self); long long QFileInfo_Size(const QFileInfo* self); -QDateTime* QFileInfo_Created(const QFileInfo* self); QDateTime* QFileInfo_BirthTime(const QFileInfo* self); QDateTime* QFileInfo_MetadataChangeTime(const QFileInfo* self); QDateTime* QFileInfo_LastModified(const QFileInfo* self); @@ -87,6 +87,7 @@ QDateTime* QFileInfo_LastRead(const QFileInfo* self); QDateTime* QFileInfo_FileTime(const QFileInfo* self, int time); bool QFileInfo_Caching(const QFileInfo* self); void QFileInfo_SetCaching(QFileInfo* self, bool on); +void QFileInfo_Stat(QFileInfo* self); void QFileInfo_Delete(QFileInfo* self); #ifdef __cplusplus diff --git a/qt/gen_qfileselector.cpp b/qt/gen_qfileselector.cpp index e8eea0d..93440d1 100644 --- a/qt/gen_qfileselector.cpp +++ b/qt/gen_qfileselector.cpp @@ -33,13 +33,6 @@ struct miqt_string* QFileSelector_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QFileSelector_TrUtf8(const char* s) { - QString _ret = QFileSelector::trUtf8(s); - // 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* QFileSelector_Select(const QFileSelector* self, struct miqt_string* filePath) { QString filePath_QString = QString::fromUtf8(&filePath->data, filePath->len); QString _ret = self->select(filePath_QString); @@ -109,20 +102,6 @@ struct miqt_string* QFileSelector_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QFileSelector_TrUtf82(const char* s, const char* c) { - QString _ret = QFileSelector::trUtf8(s, c); - // 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* QFileSelector_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QFileSelector::trUtf8(s, c, static_cast(n)); - // 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 QFileSelector_Delete(QFileSelector* self) { delete self; } diff --git a/qt/gen_qfileselector.go b/qt/gen_qfileselector.go index 18f1b2a..a40c140 100644 --- a/qt/gen_qfileselector.go +++ b/qt/gen_qfileselector.go @@ -67,15 +67,6 @@ func QFileSelector_Tr(s string) string { return _ret } -func QFileSelector_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFileSelector_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QFileSelector) Select(filePath string) string { filePath_ms := miqt_strdupg(filePath) defer C.free(filePath_ms) @@ -156,28 +147,6 @@ func QFileSelector_Tr3(s string, c string, n int) string { return _ret } -func QFileSelector_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFileSelector_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QFileSelector_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFileSelector_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QFileSelector) Delete() { C.QFileSelector_Delete(this.h) diff --git a/qt/gen_qfileselector.h b/qt/gen_qfileselector.h index bc83e36..cac24e0 100644 --- a/qt/gen_qfileselector.h +++ b/qt/gen_qfileselector.h @@ -30,7 +30,6 @@ QFileSelector* QFileSelector_new2(QObject* parent); QMetaObject* QFileSelector_MetaObject(const QFileSelector* self); void* QFileSelector_Metacast(QFileSelector* self, const char* param1); struct miqt_string* QFileSelector_Tr(const char* s); -struct miqt_string* QFileSelector_TrUtf8(const char* s); struct miqt_string* QFileSelector_Select(const QFileSelector* self, struct miqt_string* filePath); QUrl* QFileSelector_SelectWithFilePath(const QFileSelector* self, QUrl* filePath); struct miqt_array* QFileSelector_ExtraSelectors(const QFileSelector* self); @@ -38,8 +37,6 @@ void QFileSelector_SetExtraSelectors(QFileSelector* self, struct miqt_array* /* struct miqt_array* QFileSelector_AllSelectors(const QFileSelector* self); struct miqt_string* QFileSelector_Tr2(const char* s, const char* c); struct miqt_string* QFileSelector_Tr3(const char* s, const char* c, int n); -struct miqt_string* QFileSelector_TrUtf82(const char* s, const char* c); -struct miqt_string* QFileSelector_TrUtf83(const char* s, const char* c, int n); void QFileSelector_Delete(QFileSelector* self); #ifdef __cplusplus diff --git a/qt/gen_qfilesystemmodel.cpp b/qt/gen_qfilesystemmodel.cpp index 111906c..1548a46 100644 --- a/qt/gen_qfilesystemmodel.cpp +++ b/qt/gen_qfilesystemmodel.cpp @@ -1,6 +1,6 @@ +#include #include #include -#include #include #include #include @@ -40,13 +40,6 @@ struct miqt_string* QFileSystemModel_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QFileSystemModel_TrUtf8(const char* s) { - QString _ret = QFileSystemModel::trUtf8(s); - // 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 QFileSystemModel_RootPathChanged(QFileSystemModel* self, struct miqt_string* newPath) { QString newPath_QString = QString::fromUtf8(&newPath->data, newPath->len); self->rootPathChanged(newPath_QString); @@ -215,11 +208,11 @@ QDir* QFileSystemModel_RootDirectory(const QFileSystemModel* self) { return new QDir(self->rootDirectory()); } -void QFileSystemModel_SetIconProvider(QFileSystemModel* self, QFileIconProvider* provider) { +void QFileSystemModel_SetIconProvider(QFileSystemModel* self, QAbstractFileIconProvider* provider) { self->setIconProvider(provider); } -QFileIconProvider* QFileSystemModel_IconProvider(const QFileSystemModel* self) { +QAbstractFileIconProvider* QFileSystemModel_IconProvider(const QFileSystemModel* self) { return self->iconProvider(); } @@ -374,20 +367,6 @@ struct miqt_string* QFileSystemModel_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QFileSystemModel_TrUtf82(const char* s, const char* c) { - QString _ret = QFileSystemModel::trUtf8(s, c); - // 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* QFileSystemModel_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QFileSystemModel::trUtf8(s, c, static_cast(n)); - // 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()); -} - QModelIndex* QFileSystemModel_Index3(const QFileSystemModel* self, int row, int column, QModelIndex* parent) { return new QModelIndex(self->index(static_cast(row), static_cast(column), *parent)); } diff --git a/qt/gen_qfilesystemmodel.go b/qt/gen_qfilesystemmodel.go index 2bd0fda..926c2ab 100644 --- a/qt/gen_qfilesystemmodel.go +++ b/qt/gen_qfilesystemmodel.go @@ -85,15 +85,6 @@ func QFileSystemModel_Tr(s string) string { return _ret } -func QFileSystemModel_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFileSystemModel_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QFileSystemModel) RootPathChanged(newPath string) { newPath_ms := miqt_strdupg(newPath) defer C.free(newPath_ms) @@ -321,12 +312,12 @@ func (this *QFileSystemModel) RootDirectory() *QDir { return _goptr } -func (this *QFileSystemModel) SetIconProvider(provider *QFileIconProvider) { +func (this *QFileSystemModel) SetIconProvider(provider *QAbstractFileIconProvider) { C.QFileSystemModel_SetIconProvider(this.h, provider.cPointer()) } -func (this *QFileSystemModel) IconProvider() *QFileIconProvider { - return newQFileIconProvider_U(unsafe.Pointer(C.QFileSystemModel_IconProvider(this.h))) +func (this *QFileSystemModel) IconProvider() *QAbstractFileIconProvider { + return newQAbstractFileIconProvider_U(unsafe.Pointer(C.QFileSystemModel_IconProvider(this.h))) } func (this *QFileSystemModel) SetFilter(filters QDir__Filter) { @@ -498,28 +489,6 @@ func QFileSystemModel_Tr3(s string, c string, n int) string { return _ret } -func QFileSystemModel_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFileSystemModel_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QFileSystemModel_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFileSystemModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QFileSystemModel) Index3(row int, column int, parent *QModelIndex) *QModelIndex { _ret := C.QFileSystemModel_Index3(this.h, (C.int)(row), (C.int)(column), parent.cPointer()) _goptr := newQModelIndex(_ret) diff --git a/qt/gen_qfilesystemmodel.h b/qt/gen_qfilesystemmodel.h index 6e68cf9..65fab44 100644 --- a/qt/gen_qfilesystemmodel.h +++ b/qt/gen_qfilesystemmodel.h @@ -14,9 +14,9 @@ extern "C" { #endif #ifdef __cplusplus +class QAbstractFileIconProvider; class QDateTime; class QDir; -class QFileIconProvider; class QFileInfo; class QFileSystemModel; class QIcon; @@ -26,9 +26,9 @@ class QModelIndex; class QObject; class QVariant; #else +typedef struct QAbstractFileIconProvider QAbstractFileIconProvider; typedef struct QDateTime QDateTime; typedef struct QDir QDir; -typedef struct QFileIconProvider QFileIconProvider; typedef struct QFileInfo QFileInfo; typedef struct QFileSystemModel QFileSystemModel; typedef struct QIcon QIcon; @@ -44,7 +44,6 @@ QFileSystemModel* QFileSystemModel_new2(QObject* parent); QMetaObject* QFileSystemModel_MetaObject(const QFileSystemModel* self); void* QFileSystemModel_Metacast(QFileSystemModel* self, const char* param1); struct miqt_string* QFileSystemModel_Tr(const char* s); -struct miqt_string* QFileSystemModel_TrUtf8(const char* s); void QFileSystemModel_RootPathChanged(QFileSystemModel* self, struct miqt_string* newPath); void QFileSystemModel_connect_RootPathChanged(QFileSystemModel* self, void* slot); void QFileSystemModel_FileRenamed(QFileSystemModel* self, struct miqt_string* path, struct miqt_string* oldName, struct miqt_string* newName); @@ -73,8 +72,8 @@ int QFileSystemModel_SupportedDropActions(const QFileSystemModel* self); QModelIndex* QFileSystemModel_SetRootPath(QFileSystemModel* self, struct miqt_string* path); struct miqt_string* QFileSystemModel_RootPath(const QFileSystemModel* self); QDir* QFileSystemModel_RootDirectory(const QFileSystemModel* self); -void QFileSystemModel_SetIconProvider(QFileSystemModel* self, QFileIconProvider* provider); -QFileIconProvider* QFileSystemModel_IconProvider(const QFileSystemModel* self); +void QFileSystemModel_SetIconProvider(QFileSystemModel* self, QAbstractFileIconProvider* provider); +QAbstractFileIconProvider* QFileSystemModel_IconProvider(const QFileSystemModel* self); void QFileSystemModel_SetFilter(QFileSystemModel* self, int filters); int QFileSystemModel_Filter(const QFileSystemModel* self); void QFileSystemModel_SetResolveSymlinks(QFileSystemModel* self, bool enable); @@ -103,8 +102,6 @@ QFileInfo* QFileSystemModel_FileInfo(const QFileSystemModel* self, QModelIndex* bool QFileSystemModel_Remove(QFileSystemModel* self, QModelIndex* index); struct miqt_string* QFileSystemModel_Tr2(const char* s, const char* c); struct miqt_string* QFileSystemModel_Tr3(const char* s, const char* c, int n); -struct miqt_string* QFileSystemModel_TrUtf82(const char* s, const char* c); -struct miqt_string* QFileSystemModel_TrUtf83(const char* s, const char* c, int n); QModelIndex* QFileSystemModel_Index3(const QFileSystemModel* self, int row, int column, QModelIndex* parent); QModelIndex* QFileSystemModel_Index2(const QFileSystemModel* self, struct miqt_string* path, int column); bool QFileSystemModel_HasChildren1(const QFileSystemModel* self, QModelIndex* parent); diff --git a/qt/gen_qfilesystemwatcher.cpp b/qt/gen_qfilesystemwatcher.cpp index c50716f..dd785af 100644 --- a/qt/gen_qfilesystemwatcher.cpp +++ b/qt/gen_qfilesystemwatcher.cpp @@ -54,13 +54,6 @@ struct miqt_string* QFileSystemWatcher_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QFileSystemWatcher_TrUtf8(const char* s) { - QString _ret = QFileSystemWatcher::trUtf8(s); - // 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()); -} - bool QFileSystemWatcher_AddPath(QFileSystemWatcher* self, struct miqt_string* file) { QString file_QString = QString::fromUtf8(&file->data, file->len); return self->addPath(file_QString); @@ -163,20 +156,6 @@ struct miqt_string* QFileSystemWatcher_Tr3(const char* s, const char* c, int n) return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QFileSystemWatcher_TrUtf82(const char* s, const char* c) { - QString _ret = QFileSystemWatcher::trUtf8(s, c); - // 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* QFileSystemWatcher_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QFileSystemWatcher::trUtf8(s, c, static_cast(n)); - // 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 QFileSystemWatcher_Delete(QFileSystemWatcher* self) { delete self; } diff --git a/qt/gen_qfilesystemwatcher.go b/qt/gen_qfilesystemwatcher.go index 3d013d5..153347b 100644 --- a/qt/gen_qfilesystemwatcher.go +++ b/qt/gen_qfilesystemwatcher.go @@ -99,15 +99,6 @@ func QFileSystemWatcher_Tr(s string) string { return _ret } -func QFileSystemWatcher_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFileSystemWatcher_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QFileSystemWatcher) AddPath(file string) bool { file_ms := miqt_strdupg(file) defer C.free(file_ms) @@ -218,28 +209,6 @@ func QFileSystemWatcher_Tr3(s string, c string, n int) string { return _ret } -func QFileSystemWatcher_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFileSystemWatcher_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QFileSystemWatcher_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFileSystemWatcher_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QFileSystemWatcher) Delete() { C.QFileSystemWatcher_Delete(this.h) diff --git a/qt/gen_qfilesystemwatcher.h b/qt/gen_qfilesystemwatcher.h index 4dee94c..07bcc52 100644 --- a/qt/gen_qfilesystemwatcher.h +++ b/qt/gen_qfilesystemwatcher.h @@ -30,7 +30,6 @@ QFileSystemWatcher* QFileSystemWatcher_new4(struct miqt_array* /* of struct miqt QMetaObject* QFileSystemWatcher_MetaObject(const QFileSystemWatcher* self); void* QFileSystemWatcher_Metacast(QFileSystemWatcher* self, const char* param1); struct miqt_string* QFileSystemWatcher_Tr(const char* s); -struct miqt_string* QFileSystemWatcher_TrUtf8(const char* s); bool QFileSystemWatcher_AddPath(QFileSystemWatcher* self, struct miqt_string* file); struct miqt_array* QFileSystemWatcher_AddPaths(QFileSystemWatcher* self, struct miqt_array* /* of struct miqt_string* */ files); bool QFileSystemWatcher_RemovePath(QFileSystemWatcher* self, struct miqt_string* file); @@ -39,8 +38,6 @@ struct miqt_array* QFileSystemWatcher_Files(const QFileSystemWatcher* self); struct miqt_array* QFileSystemWatcher_Directories(const QFileSystemWatcher* self); struct miqt_string* QFileSystemWatcher_Tr2(const char* s, const char* c); struct miqt_string* QFileSystemWatcher_Tr3(const char* s, const char* c, int n); -struct miqt_string* QFileSystemWatcher_TrUtf82(const char* s, const char* c); -struct miqt_string* QFileSystemWatcher_TrUtf83(const char* s, const char* c, int n); void QFileSystemWatcher_Delete(QFileSystemWatcher* self); #ifdef __cplusplus diff --git a/qt/gen_qfinalstate.cpp b/qt/gen_qfinalstate.cpp deleted file mode 100644 index 7d25b12..0000000 --- a/qt/gen_qfinalstate.cpp +++ /dev/null @@ -1,72 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include "qfinalstate.h" -#include "gen_qfinalstate.h" -#include "_cgo_export.h" - -QFinalState* QFinalState_new() { - return new QFinalState(); -} - -QFinalState* QFinalState_new2(QState* parent) { - return new QFinalState(parent); -} - -QMetaObject* QFinalState_MetaObject(const QFinalState* self) { - return (QMetaObject*) self->metaObject(); -} - -void* QFinalState_Metacast(QFinalState* self, const char* param1) { - return self->qt_metacast(param1); -} - -struct miqt_string* QFinalState_Tr(const char* s) { - QString _ret = QFinalState::tr(s); - // 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* QFinalState_TrUtf8(const char* s) { - QString _ret = QFinalState::trUtf8(s); - // 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* QFinalState_Tr2(const char* s, const char* c) { - QString _ret = QFinalState::tr(s, c); - // 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* QFinalState_Tr3(const char* s, const char* c, int n) { - QString _ret = QFinalState::tr(s, c, static_cast(n)); - // 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* QFinalState_TrUtf82(const char* s, const char* c) { - QString _ret = QFinalState::trUtf8(s, c); - // 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* QFinalState_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QFinalState::trUtf8(s, c, static_cast(n)); - // 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 QFinalState_Delete(QFinalState* self) { - delete self; -} - diff --git a/qt/gen_qfinalstate.go b/qt/gen_qfinalstate.go deleted file mode 100644 index a45bf87..0000000 --- a/qt/gen_qfinalstate.go +++ /dev/null @@ -1,135 +0,0 @@ -package qt - -/* - -#include "gen_qfinalstate.h" -#include - -*/ -import "C" - -import ( - "runtime" - "unsafe" -) - -type QFinalState struct { - h *C.QFinalState - *QAbstractState -} - -func (this *QFinalState) cPointer() *C.QFinalState { - if this == nil { - return nil - } - return this.h -} - -func newQFinalState(h *C.QFinalState) *QFinalState { - if h == nil { - return nil - } - return &QFinalState{h: h, QAbstractState: newQAbstractState_U(unsafe.Pointer(h))} -} - -func newQFinalState_U(h unsafe.Pointer) *QFinalState { - return newQFinalState((*C.QFinalState)(h)) -} - -// NewQFinalState constructs a new QFinalState object. -func NewQFinalState() *QFinalState { - ret := C.QFinalState_new() - return newQFinalState(ret) -} - -// NewQFinalState2 constructs a new QFinalState object. -func NewQFinalState2(parent *QState) *QFinalState { - ret := C.QFinalState_new2(parent.cPointer()) - return newQFinalState(ret) -} - -func (this *QFinalState) MetaObject() *QMetaObject { - return newQMetaObject_U(unsafe.Pointer(C.QFinalState_MetaObject(this.h))) -} - -func (this *QFinalState) Metacast(param1 string) unsafe.Pointer { - param1_Cstring := C.CString(param1) - defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QFinalState_Metacast(this.h, param1_Cstring) -} - -func QFinalState_Tr(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFinalState_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QFinalState_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFinalState_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QFinalState_Tr2(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFinalState_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QFinalState_Tr3(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFinalState_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QFinalState_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFinalState_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QFinalState_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFinalState_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -// Delete this object from C++ memory. -func (this *QFinalState) Delete() { - C.QFinalState_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QFinalState) GoGC() { - runtime.SetFinalizer(this, func(this *QFinalState) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} diff --git a/qt/gen_qfinalstate.h b/qt/gen_qfinalstate.h deleted file mode 100644 index 308428e..0000000 --- a/qt/gen_qfinalstate.h +++ /dev/null @@ -1,42 +0,0 @@ -#ifndef GEN_QFINALSTATE_H -#define GEN_QFINALSTATE_H - -#include -#include -#include - -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - -#include "binding.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __cplusplus -class QFinalState; -class QMetaObject; -class QState; -#else -typedef struct QFinalState QFinalState; -typedef struct QMetaObject QMetaObject; -typedef struct QState QState; -#endif - -QFinalState* QFinalState_new(); -QFinalState* QFinalState_new2(QState* parent); -QMetaObject* QFinalState_MetaObject(const QFinalState* self); -void* QFinalState_Metacast(QFinalState* self, const char* param1); -struct miqt_string* QFinalState_Tr(const char* s); -struct miqt_string* QFinalState_TrUtf8(const char* s); -struct miqt_string* QFinalState_Tr2(const char* s, const char* c); -struct miqt_string* QFinalState_Tr3(const char* s, const char* c, int n); -struct miqt_string* QFinalState_TrUtf82(const char* s, const char* c); -struct miqt_string* QFinalState_TrUtf83(const char* s, const char* c, int n); -void QFinalState_Delete(QFinalState* self); - -#ifdef __cplusplus -} /* extern C */ -#endif - -#endif diff --git a/qt/gen_qfloat16.cpp b/qt/gen_qfloat16.cpp index c7277aa..32d0ada 100644 --- a/qt/gen_qfloat16.cpp +++ b/qt/gen_qfloat16.cpp @@ -6,7 +6,11 @@ qfloat16* qfloat16_new() { return new qfloat16(); } -qfloat16* qfloat16_new2(float f) { +qfloat16* qfloat16_new2(int param1) { + return new qfloat16(static_cast(param1)); +} + +qfloat16* qfloat16_new3(float f) { return new qfloat16(static_cast(f)); } diff --git a/qt/gen_qfloat16.go b/qt/gen_qfloat16.go index d8f8423..52ef9b9 100644 --- a/qt/gen_qfloat16.go +++ b/qt/gen_qfloat16.go @@ -42,8 +42,14 @@ func Newqfloat16() *qfloat16 { } // Newqfloat162 constructs a new qfloat16 object. -func Newqfloat162(f float32) *qfloat16 { - ret := C.qfloat16_new2((C.float)(f)) +func Newqfloat162(param1 Initialization) *qfloat16 { + ret := C.qfloat16_new2((C.int)(param1)) + return newqfloat16(ret) +} + +// Newqfloat163 constructs a new qfloat16 object. +func Newqfloat163(f float32) *qfloat16 { + ret := C.qfloat16_new3((C.float)(f)) return newqfloat16(ret) } diff --git a/qt/gen_qfloat16.h b/qt/gen_qfloat16.h index 8c58a93..c8e553c 100644 --- a/qt/gen_qfloat16.h +++ b/qt/gen_qfloat16.h @@ -20,7 +20,8 @@ typedef struct qfloat16 qfloat16; #endif qfloat16* qfloat16_new(); -qfloat16* qfloat16_new2(float f); +qfloat16* qfloat16_new2(int param1); +qfloat16* qfloat16_new3(float f); bool qfloat16_IsInf(const qfloat16* self); bool qfloat16_IsNaN(const qfloat16* self); bool qfloat16_IsFinite(const qfloat16* self); diff --git a/qt/gen_qfocusframe.cpp b/qt/gen_qfocusframe.cpp index 863f4de..53082bf 100644 --- a/qt/gen_qfocusframe.cpp +++ b/qt/gen_qfocusframe.cpp @@ -31,13 +31,6 @@ struct miqt_string* QFocusFrame_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QFocusFrame_TrUtf8(const char* s) { - QString _ret = QFocusFrame::trUtf8(s); - // 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 QFocusFrame_SetWidget(QFocusFrame* self, QWidget* widget) { self->setWidget(widget); } @@ -60,20 +53,6 @@ struct miqt_string* QFocusFrame_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QFocusFrame_TrUtf82(const char* s, const char* c) { - QString _ret = QFocusFrame::trUtf8(s, c); - // 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* QFocusFrame_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QFocusFrame::trUtf8(s, c, static_cast(n)); - // 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 QFocusFrame_Delete(QFocusFrame* self) { delete self; } diff --git a/qt/gen_qfocusframe.go b/qt/gen_qfocusframe.go index be8b0ff..5edec51 100644 --- a/qt/gen_qfocusframe.go +++ b/qt/gen_qfocusframe.go @@ -67,15 +67,6 @@ func QFocusFrame_Tr(s string) string { return _ret } -func QFocusFrame_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFocusFrame_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QFocusFrame) SetWidget(widget *QWidget) { C.QFocusFrame_SetWidget(this.h, widget.cPointer()) } @@ -106,28 +97,6 @@ func QFocusFrame_Tr3(s string, c string, n int) string { return _ret } -func QFocusFrame_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFocusFrame_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QFocusFrame_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFocusFrame_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QFocusFrame) Delete() { C.QFocusFrame_Delete(this.h) diff --git a/qt/gen_qfocusframe.h b/qt/gen_qfocusframe.h index d4b5eca..a9eb459 100644 --- a/qt/gen_qfocusframe.h +++ b/qt/gen_qfocusframe.h @@ -28,13 +28,10 @@ QFocusFrame* QFocusFrame_new2(QWidget* parent); QMetaObject* QFocusFrame_MetaObject(const QFocusFrame* self); void* QFocusFrame_Metacast(QFocusFrame* self, const char* param1); struct miqt_string* QFocusFrame_Tr(const char* s); -struct miqt_string* QFocusFrame_TrUtf8(const char* s); void QFocusFrame_SetWidget(QFocusFrame* self, QWidget* widget); QWidget* QFocusFrame_Widget(const QFocusFrame* self); struct miqt_string* QFocusFrame_Tr2(const char* s, const char* c); struct miqt_string* QFocusFrame_Tr3(const char* s, const char* c, int n); -struct miqt_string* QFocusFrame_TrUtf82(const char* s, const char* c); -struct miqt_string* QFocusFrame_TrUtf83(const char* s, const char* c, int n); void QFocusFrame_Delete(QFocusFrame* self); #ifdef __cplusplus diff --git a/qt/gen_qfont.cpp b/qt/gen_qfont.cpp index 2d07b58..41e2008 100644 --- a/qt/gen_qfont.cpp +++ b/qt/gen_qfont.cpp @@ -17,8 +17,15 @@ QFont* QFont_new2(struct miqt_string* family) { return new QFont(family_QString); } -QFont* QFont_new3(QFont* font, QPaintDevice* pd) { - return new QFont(*font, pd); +QFont* QFont_new3(struct miqt_array* /* of struct miqt_string* */ families) { + QList families_QList; + families_QList.reserve(families->len); + struct miqt_string** families_arr = static_cast(families->data); + for(size_t i = 0; i < families->len; ++i) { + QString families_arr_i_QString = QString::fromUtf8(&families_arr[i]->data, families_arr[i]->len); + families_QList.push_back(families_arr_i_QString); + } + return new QFont(families_QList); } QFont* QFont_new4(QFont* font, QPaintDevice* pd) { @@ -44,6 +51,39 @@ QFont* QFont_new8(struct miqt_string* family, int pointSize, int weight, bool it return new QFont(family_QString, static_cast(pointSize), static_cast(weight), italic); } +QFont* QFont_new9(struct miqt_array* /* of struct miqt_string* */ families, int pointSize) { + QList families_QList; + families_QList.reserve(families->len); + struct miqt_string** families_arr = static_cast(families->data); + for(size_t i = 0; i < families->len; ++i) { + QString families_arr_i_QString = QString::fromUtf8(&families_arr[i]->data, families_arr[i]->len); + families_QList.push_back(families_arr_i_QString); + } + return new QFont(families_QList, static_cast(pointSize)); +} + +QFont* QFont_new10(struct miqt_array* /* of struct miqt_string* */ families, int pointSize, int weight) { + QList families_QList; + families_QList.reserve(families->len); + struct miqt_string** families_arr = static_cast(families->data); + for(size_t i = 0; i < families->len; ++i) { + QString families_arr_i_QString = QString::fromUtf8(&families_arr[i]->data, families_arr[i]->len); + families_QList.push_back(families_arr_i_QString); + } + return new QFont(families_QList, static_cast(pointSize), static_cast(weight)); +} + +QFont* QFont_new11(struct miqt_array* /* of struct miqt_string* */ families, int pointSize, int weight, bool italic) { + QList families_QList; + families_QList.reserve(families->len); + struct miqt_string** families_arr = static_cast(families->data); + for(size_t i = 0; i < families->len; ++i) { + QString families_arr_i_QString = QString::fromUtf8(&families_arr[i]->data, families_arr[i]->len); + families_QList.push_back(families_arr_i_QString); + } + return new QFont(families_QList, static_cast(pointSize), static_cast(weight), italic); +} + void QFont_Swap(QFont* self, QFont* other) { self->swap(*other); } @@ -125,11 +165,12 @@ void QFont_SetPixelSize(QFont* self, int pixelSize) { } int QFont_Weight(const QFont* self) { - return self->weight(); + QFont::Weight _ret = self->weight(); + return static_cast(_ret); } void QFont_SetWeight(QFont* self, int weight) { - self->setWeight(static_cast(weight)); + self->setWeight(static_cast(weight)); } bool QFont_Bold(const QFont* self) { @@ -264,14 +305,6 @@ int QFont_HintingPreference(const QFont* self) { return static_cast(_ret); } -bool QFont_RawMode(const QFont* self) { - return self->rawMode(); -} - -void QFont_SetRawMode(QFont* self, bool rawMode) { - self->setRawMode(rawMode); -} - bool QFont_ExactMatch(const QFont* self) { return self->exactMatch(); } @@ -296,18 +329,6 @@ bool QFont_IsCopyOf(const QFont* self, QFont* param1) { return self->isCopyOf(*param1); } -void QFont_SetRawName(QFont* self, struct miqt_string* rawName) { - QString rawName_QString = QString::fromUtf8(&rawName->data, rawName->len); - self->setRawName(rawName_QString); -} - -struct miqt_string* QFont_RawName(const QFont* self) { - QString _ret = self->rawName(); - // 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* QFont_Key(const QFont* self) { QString _ret = self->key(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -410,31 +431,25 @@ struct miqt_string* QFont_DefaultFamily(const QFont* self) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QFont_LastResortFamily(const QFont* self) { - QString _ret = self->lastResortFamily(); - // 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* QFont_LastResortFont(const QFont* self) { - QString _ret = self->lastResortFont(); - // 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()); -} - QFont* QFont_Resolve(const QFont* self, QFont* param1) { return new QFont(self->resolve(*param1)); } -unsigned int QFont_Resolve2(const QFont* self) { - uint _ret = self->resolve(); +unsigned int QFont_ResolveMask(const QFont* self) { + uint _ret = self->resolveMask(); return static_cast(_ret); } -void QFont_ResolveWithMask(QFont* self, unsigned int mask) { - self->resolve(static_cast(mask)); +void QFont_SetResolveMask(QFont* self, unsigned int mask) { + self->setResolveMask(static_cast(mask)); +} + +void QFont_SetLegacyWeight(QFont* self, int legacyWeight) { + self->setLegacyWeight(static_cast(legacyWeight)); +} + +int QFont_LegacyWeight(const QFont* self) { + return self->legacyWeight(); } void QFont_SetStyleHint2(QFont* self, int param1, int param2) { diff --git a/qt/gen_qfont.go b/qt/gen_qfont.go index f0b7c25..e4d488f 100644 --- a/qt/gen_qfont.go +++ b/qt/gen_qfont.go @@ -43,8 +43,6 @@ const ( QFont__PreferQuality QFont__StyleStrategy = 64 QFont__PreferAntialias QFont__StyleStrategy = 128 QFont__NoAntialias QFont__StyleStrategy = 256 - QFont__OpenGLCompatible QFont__StyleStrategy = 512 - QFont__ForceIntegerMetrics QFont__StyleStrategy = 1024 QFont__NoSubpixelAntialias QFont__StyleStrategy = 2048 QFont__PreferNoShaping QFont__StyleStrategy = 4096 QFont__NoFontMerging QFont__StyleStrategy = 32768 @@ -62,15 +60,15 @@ const ( type QFont__Weight int const ( - QFont__Thin QFont__Weight = 0 - QFont__ExtraLight QFont__Weight = 12 - QFont__Light QFont__Weight = 25 - QFont__Normal QFont__Weight = 50 - QFont__Medium QFont__Weight = 57 - QFont__DemiBold QFont__Weight = 63 - QFont__Bold QFont__Weight = 75 - QFont__ExtraBold QFont__Weight = 81 - QFont__Black QFont__Weight = 87 + QFont__Thin QFont__Weight = 100 + QFont__ExtraLight QFont__Weight = 200 + QFont__Light QFont__Weight = 300 + QFont__Normal QFont__Weight = 400 + QFont__Medium QFont__Weight = 500 + QFont__DemiBold QFont__Weight = 600 + QFont__Bold QFont__Weight = 700 + QFont__ExtraBold QFont__Weight = 800 + QFont__Black QFont__Weight = 900 ) type QFont__Style int @@ -175,8 +173,18 @@ func NewQFont2(family string) *QFont { } // NewQFont3 constructs a new QFont object. -func NewQFont3(font *QFont, pd *QPaintDevice) *QFont { - ret := C.QFont_new3(font.cPointer(), pd.cPointer()) +func NewQFont3(families []string) *QFont { + // For the C ABI, malloc a C array of raw pointers + families_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(families)))) + defer C.free(unsafe.Pointer(families_CArray)) + for i := range families { + families_i_ms := miqt_strdupg(families[i]) + defer C.free(families_i_ms) + families_CArray[i] = (*C.struct_miqt_string)(families_i_ms) + } + families_ma := &C.struct_miqt_array{len: C.size_t(len(families)), data: unsafe.Pointer(families_CArray)} + defer runtime.KeepAlive(unsafe.Pointer(families_ma)) + ret := C.QFont_new3(families_ma) return newQFont(ret) } @@ -216,6 +224,54 @@ func NewQFont8(family string, pointSize int, weight int, italic bool) *QFont { return newQFont(ret) } +// NewQFont9 constructs a new QFont object. +func NewQFont9(families []string, pointSize int) *QFont { + // For the C ABI, malloc a C array of raw pointers + families_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(families)))) + defer C.free(unsafe.Pointer(families_CArray)) + for i := range families { + families_i_ms := miqt_strdupg(families[i]) + defer C.free(families_i_ms) + families_CArray[i] = (*C.struct_miqt_string)(families_i_ms) + } + families_ma := &C.struct_miqt_array{len: C.size_t(len(families)), data: unsafe.Pointer(families_CArray)} + defer runtime.KeepAlive(unsafe.Pointer(families_ma)) + ret := C.QFont_new9(families_ma, (C.int)(pointSize)) + return newQFont(ret) +} + +// NewQFont10 constructs a new QFont object. +func NewQFont10(families []string, pointSize int, weight int) *QFont { + // For the C ABI, malloc a C array of raw pointers + families_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(families)))) + defer C.free(unsafe.Pointer(families_CArray)) + for i := range families { + families_i_ms := miqt_strdupg(families[i]) + defer C.free(families_i_ms) + families_CArray[i] = (*C.struct_miqt_string)(families_i_ms) + } + families_ma := &C.struct_miqt_array{len: C.size_t(len(families)), data: unsafe.Pointer(families_CArray)} + defer runtime.KeepAlive(unsafe.Pointer(families_ma)) + ret := C.QFont_new10(families_ma, (C.int)(pointSize), (C.int)(weight)) + return newQFont(ret) +} + +// NewQFont11 constructs a new QFont object. +func NewQFont11(families []string, pointSize int, weight int, italic bool) *QFont { + // For the C ABI, malloc a C array of raw pointers + families_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(families)))) + defer C.free(unsafe.Pointer(families_CArray)) + for i := range families { + families_i_ms := miqt_strdupg(families[i]) + defer C.free(families_i_ms) + families_CArray[i] = (*C.struct_miqt_string)(families_i_ms) + } + families_ma := &C.struct_miqt_array{len: C.size_t(len(families)), data: unsafe.Pointer(families_CArray)} + defer runtime.KeepAlive(unsafe.Pointer(families_ma)) + ret := C.QFont_new11(families_ma, (C.int)(pointSize), (C.int)(weight), (C.bool)(italic)) + return newQFont(ret) +} + func (this *QFont) Swap(other *QFont) { C.QFont_Swap(this.h, other.cPointer()) } @@ -298,11 +354,11 @@ func (this *QFont) SetPixelSize(pixelSize int) { C.QFont_SetPixelSize(this.h, (C.int)(pixelSize)) } -func (this *QFont) Weight() int { - return (int)(C.QFont_Weight(this.h)) +func (this *QFont) Weight() QFont__Weight { + return (QFont__Weight)(C.QFont_Weight(this.h)) } -func (this *QFont) SetWeight(weight int) { +func (this *QFont) SetWeight(weight QFont__Weight) { C.QFont_SetWeight(this.h, (C.int)(weight)) } @@ -430,14 +486,6 @@ func (this *QFont) HintingPreference() QFont__HintingPreference { return (QFont__HintingPreference)(C.QFont_HintingPreference(this.h)) } -func (this *QFont) RawMode() bool { - return (bool)(C.QFont_RawMode(this.h)) -} - -func (this *QFont) SetRawMode(rawMode bool) { - C.QFont_SetRawMode(this.h, (C.bool)(rawMode)) -} - func (this *QFont) ExactMatch() bool { return (bool)(C.QFont_ExactMatch(this.h)) } @@ -462,19 +510,6 @@ func (this *QFont) IsCopyOf(param1 *QFont) bool { return (bool)(C.QFont_IsCopyOf(this.h, param1.cPointer())) } -func (this *QFont) SetRawName(rawName string) { - rawName_ms := miqt_strdupg(rawName) - defer C.free(rawName_ms) - C.QFont_SetRawName(this.h, (*C.struct_miqt_string)(rawName_ms)) -} - -func (this *QFont) RawName() string { - var _ms *C.struct_miqt_string = C.QFont_RawName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QFont) Key() string { var _ms *C.struct_miqt_string = C.QFont_Key(this.h) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) @@ -583,20 +618,6 @@ func (this *QFont) DefaultFamily() string { return _ret } -func (this *QFont) LastResortFamily() string { - var _ms *C.struct_miqt_string = C.QFont_LastResortFamily(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QFont) LastResortFont() string { - var _ms *C.struct_miqt_string = C.QFont_LastResortFont(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QFont) Resolve(param1 *QFont) *QFont { _ret := C.QFont_Resolve(this.h, param1.cPointer()) _goptr := newQFont(_ret) @@ -604,12 +625,20 @@ func (this *QFont) Resolve(param1 *QFont) *QFont { return _goptr } -func (this *QFont) Resolve2() uint { - return (uint)(C.QFont_Resolve2(this.h)) +func (this *QFont) ResolveMask() uint { + return (uint)(C.QFont_ResolveMask(this.h)) } -func (this *QFont) ResolveWithMask(mask uint) { - C.QFont_ResolveWithMask(this.h, (C.uint)(mask)) +func (this *QFont) SetResolveMask(mask uint) { + C.QFont_SetResolveMask(this.h, (C.uint)(mask)) +} + +func (this *QFont) SetLegacyWeight(legacyWeight int) { + C.QFont_SetLegacyWeight(this.h, (C.int)(legacyWeight)) +} + +func (this *QFont) LegacyWeight() int { + return (int)(C.QFont_LegacyWeight(this.h)) } func (this *QFont) SetStyleHint2(param1 QFont__StyleHint, param2 QFont__StyleStrategy) { diff --git a/qt/gen_qfont.h b/qt/gen_qfont.h index 4b45805..71098c5 100644 --- a/qt/gen_qfont.h +++ b/qt/gen_qfont.h @@ -23,12 +23,15 @@ typedef struct QPaintDevice QPaintDevice; QFont* QFont_new(); QFont* QFont_new2(struct miqt_string* family); -QFont* QFont_new3(QFont* font, QPaintDevice* pd); +QFont* QFont_new3(struct miqt_array* /* of struct miqt_string* */ families); QFont* QFont_new4(QFont* font, QPaintDevice* pd); QFont* QFont_new5(QFont* font); QFont* QFont_new6(struct miqt_string* family, int pointSize); QFont* QFont_new7(struct miqt_string* family, int pointSize, int weight); QFont* QFont_new8(struct miqt_string* family, int pointSize, int weight, bool italic); +QFont* QFont_new9(struct miqt_array* /* of struct miqt_string* */ families, int pointSize); +QFont* QFont_new10(struct miqt_array* /* of struct miqt_string* */ families, int pointSize, int weight); +QFont* QFont_new11(struct miqt_array* /* of struct miqt_string* */ families, int pointSize, int weight, bool italic); void QFont_Swap(QFont* self, QFont* other); struct miqt_string* QFont_Family(const QFont* self); void QFont_SetFamily(QFont* self, struct miqt_string* family); @@ -75,16 +78,12 @@ 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); void QFont_OperatorAssign(QFont* self, QFont* param1); bool QFont_OperatorEqual(const QFont* self, QFont* param1); bool QFont_OperatorNotEqual(const QFont* self, QFont* param1); bool QFont_OperatorLesser(const QFont* self, QFont* param1); bool QFont_IsCopyOf(const QFont* self, QFont* param1); -void QFont_SetRawName(QFont* self, struct miqt_string* rawName); -struct miqt_string* QFont_RawName(const QFont* self); struct miqt_string* QFont_Key(const QFont* self); struct miqt_string* QFont_ToString(const QFont* self); bool QFont_FromString(QFont* self, struct miqt_string* param1); @@ -98,11 +97,11 @@ void QFont_Initialize(); void QFont_Cleanup(); void QFont_CacheStatistics(); struct miqt_string* QFont_DefaultFamily(const QFont* self); -struct miqt_string* QFont_LastResortFamily(const QFont* self); -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); +unsigned int QFont_ResolveMask(const QFont* self); +void QFont_SetResolveMask(QFont* self, unsigned int mask); +void QFont_SetLegacyWeight(QFont* self, int legacyWeight); +int QFont_LegacyWeight(const QFont* self); void QFont_SetStyleHint2(QFont* self, int param1, int param2); void QFont_Delete(QFont* self); diff --git a/qt/gen_qfontcombobox.cpp b/qt/gen_qfontcombobox.cpp index 03f0a02..f92902a 100644 --- a/qt/gen_qfontcombobox.cpp +++ b/qt/gen_qfontcombobox.cpp @@ -33,13 +33,6 @@ struct miqt_string* QFontComboBox_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QFontComboBox_TrUtf8(const char* s) { - QString _ret = QFontComboBox::trUtf8(s); - // 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 QFontComboBox_SetWritingSystem(QFontComboBox* self, int writingSystem) { self->setWritingSystem(static_cast(writingSystem)); } @@ -66,6 +59,37 @@ QSize* QFontComboBox_SizeHint(const QFontComboBox* self) { return new QSize(self->sizeHint()); } +void QFontComboBox_SetSampleTextForSystem(QFontComboBox* self, int writingSystem, struct miqt_string* sampleText) { + QString sampleText_QString = QString::fromUtf8(&sampleText->data, sampleText->len); + self->setSampleTextForSystem(static_cast(writingSystem), sampleText_QString); +} + +struct miqt_string* QFontComboBox_SampleTextForSystem(const QFontComboBox* self, int writingSystem) { + QString _ret = self->sampleTextForSystem(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()); +} + +void QFontComboBox_SetSampleTextForFont(QFontComboBox* self, struct miqt_string* fontFamily, struct miqt_string* sampleText) { + QString fontFamily_QString = QString::fromUtf8(&fontFamily->data, fontFamily->len); + QString sampleText_QString = QString::fromUtf8(&sampleText->data, sampleText->len); + self->setSampleTextForFont(fontFamily_QString, sampleText_QString); +} + +struct miqt_string* QFontComboBox_SampleTextForFont(const QFontComboBox* self, struct miqt_string* fontFamily) { + QString fontFamily_QString = QString::fromUtf8(&fontFamily->data, fontFamily->len); + QString _ret = self->sampleTextForFont(fontFamily_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()); +} + +void QFontComboBox_SetDisplayFont(QFontComboBox* self, struct miqt_string* fontFamily, QFont* font) { + QString fontFamily_QString = QString::fromUtf8(&fontFamily->data, fontFamily->len); + self->setDisplayFont(fontFamily_QString, *font); +} + void QFontComboBox_SetCurrentFont(QFontComboBox* self, QFont* f) { self->setCurrentFont(*f); } @@ -97,20 +121,6 @@ struct miqt_string* QFontComboBox_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QFontComboBox_TrUtf82(const char* s, const char* c) { - QString _ret = QFontComboBox::trUtf8(s, c); - // 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* QFontComboBox_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QFontComboBox::trUtf8(s, c, static_cast(n)); - // 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 QFontComboBox_Delete(QFontComboBox* self) { delete self; } diff --git a/qt/gen_qfontcombobox.go b/qt/gen_qfontcombobox.go index f138ff0..c653667 100644 --- a/qt/gen_qfontcombobox.go +++ b/qt/gen_qfontcombobox.go @@ -78,15 +78,6 @@ func QFontComboBox_Tr(s string) string { return _ret } -func QFontComboBox_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFontComboBox_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QFontComboBox) SetWritingSystem(writingSystem QFontDatabase__WritingSystem) { C.QFontComboBox_SetWritingSystem(this.h, (C.int)(writingSystem)) } @@ -117,6 +108,42 @@ func (this *QFontComboBox) SizeHint() *QSize { return _goptr } +func (this *QFontComboBox) SetSampleTextForSystem(writingSystem QFontDatabase__WritingSystem, sampleText string) { + sampleText_ms := miqt_strdupg(sampleText) + defer C.free(sampleText_ms) + C.QFontComboBox_SetSampleTextForSystem(this.h, (C.int)(writingSystem), (*C.struct_miqt_string)(sampleText_ms)) +} + +func (this *QFontComboBox) SampleTextForSystem(writingSystem QFontDatabase__WritingSystem) string { + var _ms *C.struct_miqt_string = C.QFontComboBox_SampleTextForSystem(this.h, (C.int)(writingSystem)) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + +func (this *QFontComboBox) SetSampleTextForFont(fontFamily string, sampleText string) { + fontFamily_ms := miqt_strdupg(fontFamily) + defer C.free(fontFamily_ms) + sampleText_ms := miqt_strdupg(sampleText) + defer C.free(sampleText_ms) + C.QFontComboBox_SetSampleTextForFont(this.h, (*C.struct_miqt_string)(fontFamily_ms), (*C.struct_miqt_string)(sampleText_ms)) +} + +func (this *QFontComboBox) SampleTextForFont(fontFamily string) string { + fontFamily_ms := miqt_strdupg(fontFamily) + defer C.free(fontFamily_ms) + var _ms *C.struct_miqt_string = C.QFontComboBox_SampleTextForFont(this.h, (*C.struct_miqt_string)(fontFamily_ms)) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + +func (this *QFontComboBox) SetDisplayFont(fontFamily string, font *QFont) { + fontFamily_ms := miqt_strdupg(fontFamily) + defer C.free(fontFamily_ms) + C.QFontComboBox_SetDisplayFont(this.h, (*C.struct_miqt_string)(fontFamily_ms), font.cPointer()) +} + func (this *QFontComboBox) SetCurrentFont(f *QFont) { C.QFontComboBox_SetCurrentFont(this.h, f.cPointer()) } @@ -163,28 +190,6 @@ func QFontComboBox_Tr3(s string, c string, n int) string { return _ret } -func QFontComboBox_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFontComboBox_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QFontComboBox_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFontComboBox_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QFontComboBox) Delete() { C.QFontComboBox_Delete(this.h) diff --git a/qt/gen_qfontcombobox.h b/qt/gen_qfontcombobox.h index eb83549..4262074 100644 --- a/qt/gen_qfontcombobox.h +++ b/qt/gen_qfontcombobox.h @@ -32,20 +32,22 @@ QFontComboBox* QFontComboBox_new2(QWidget* parent); QMetaObject* QFontComboBox_MetaObject(const QFontComboBox* self); void* QFontComboBox_Metacast(QFontComboBox* self, const char* param1); struct miqt_string* QFontComboBox_Tr(const char* s); -struct miqt_string* QFontComboBox_TrUtf8(const char* s); 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); QSize* QFontComboBox_SizeHint(const QFontComboBox* self); +void QFontComboBox_SetSampleTextForSystem(QFontComboBox* self, int writingSystem, struct miqt_string* sampleText); +struct miqt_string* QFontComboBox_SampleTextForSystem(const QFontComboBox* self, int writingSystem); +void QFontComboBox_SetSampleTextForFont(QFontComboBox* self, struct miqt_string* fontFamily, struct miqt_string* sampleText); +struct miqt_string* QFontComboBox_SampleTextForFont(const QFontComboBox* self, struct miqt_string* fontFamily); +void QFontComboBox_SetDisplayFont(QFontComboBox* self, struct miqt_string* fontFamily, QFont* font); void QFontComboBox_SetCurrentFont(QFontComboBox* self, QFont* f); void QFontComboBox_CurrentFontChanged(QFontComboBox* self, QFont* f); void QFontComboBox_connect_CurrentFontChanged(QFontComboBox* self, void* slot); struct miqt_string* QFontComboBox_Tr2(const char* s, const char* c); struct miqt_string* QFontComboBox_Tr3(const char* s, const char* c, int n); -struct miqt_string* QFontComboBox_TrUtf82(const char* s, const char* c); -struct miqt_string* QFontComboBox_TrUtf83(const char* s, const char* c, int n); void QFontComboBox_Delete(QFontComboBox* self); #ifdef __cplusplus diff --git a/qt/gen_qfontdatabase.cpp b/qt/gen_qfontdatabase.cpp index 84a863b..5bda6e3 100644 --- a/qt/gen_qfontdatabase.cpp +++ b/qt/gen_qfontdatabase.cpp @@ -27,8 +27,8 @@ struct miqt_array* QFontDatabase_StandardSizes() { return _out; } -struct miqt_array* QFontDatabase_WritingSystems(const QFontDatabase* self) { - QList _ret = self->writingSystems(); +struct miqt_array* QFontDatabase_WritingSystems() { + QList _ret = QFontDatabase::writingSystems(); // Convert QList<> from C++ memory to manually-managed C memory int* _arr = static_cast(malloc(sizeof(int) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -41,9 +41,9 @@ struct miqt_array* QFontDatabase_WritingSystems(const QFontDatabase* self) { return _out; } -struct miqt_array* QFontDatabase_WritingSystemsWithFamily(const QFontDatabase* self, struct miqt_string* family) { +struct miqt_array* QFontDatabase_WritingSystemsWithFamily(struct miqt_string* family) { QString family_QString = QString::fromUtf8(&family->data, family->len); - QList _ret = self->writingSystems(family_QString); + QList _ret = QFontDatabase::writingSystems(family_QString); // Convert QList<> from C++ memory to manually-managed C memory int* _arr = static_cast(malloc(sizeof(int) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -56,8 +56,8 @@ struct miqt_array* QFontDatabase_WritingSystemsWithFamily(const QFontDatabase* s return _out; } -struct miqt_array* QFontDatabase_Families(const QFontDatabase* self) { - QStringList _ret = self->families(); +struct miqt_array* QFontDatabase_Families() { + QStringList _ret = QFontDatabase::families(); // Convert QList<> from C++ memory to manually-managed C memory struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -72,9 +72,9 @@ struct miqt_array* QFontDatabase_Families(const QFontDatabase* self) { return _out; } -struct miqt_array* QFontDatabase_Styles(const QFontDatabase* self, struct miqt_string* family) { +struct miqt_array* QFontDatabase_Styles(struct miqt_string* family) { QString family_QString = QString::fromUtf8(&family->data, family->len); - QStringList _ret = self->styles(family_QString); + QStringList _ret = QFontDatabase::styles(family_QString); // Convert QList<> from C++ memory to manually-managed C memory struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -89,9 +89,9 @@ struct miqt_array* QFontDatabase_Styles(const QFontDatabase* self, struct miqt_s return _out; } -struct miqt_array* QFontDatabase_PointSizes(QFontDatabase* self, struct miqt_string* family) { +struct miqt_array* QFontDatabase_PointSizes(struct miqt_string* family) { QString family_QString = QString::fromUtf8(&family->data, family->len); - QList _ret = self->pointSizes(family_QString); + QList _ret = QFontDatabase::pointSizes(family_QString); // Convert QList<> from C++ memory to manually-managed C memory int* _arr = static_cast(malloc(sizeof(int) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -103,10 +103,10 @@ struct miqt_array* QFontDatabase_PointSizes(QFontDatabase* self, struct miqt_str return _out; } -struct miqt_array* QFontDatabase_SmoothSizes(QFontDatabase* self, struct miqt_string* family, struct miqt_string* style) { +struct miqt_array* QFontDatabase_SmoothSizes(struct miqt_string* family, struct miqt_string* style) { QString family_QString = QString::fromUtf8(&family->data, family->len); QString style_QString = QString::fromUtf8(&style->data, style->len); - QList _ret = self->smoothSizes(family_QString, style_QString); + QList _ret = QFontDatabase::smoothSizes(family_QString, style_QString); // Convert QList<> from C++ memory to manually-managed C memory int* _arr = static_cast(malloc(sizeof(int) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -118,72 +118,72 @@ struct miqt_array* QFontDatabase_SmoothSizes(QFontDatabase* self, struct miqt_st return _out; } -struct miqt_string* QFontDatabase_StyleString(QFontDatabase* self, QFont* font) { - QString _ret = self->styleString(*font); +struct miqt_string* QFontDatabase_StyleString(QFont* font) { + QString _ret = QFontDatabase::styleString(*font); // 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_StyleStringWithFontInfo(QFontDatabase* self, QFontInfo* fontInfo) { - QString _ret = self->styleString(*fontInfo); +struct miqt_string* QFontDatabase_StyleStringWithFontInfo(QFontInfo* fontInfo) { + QString _ret = QFontDatabase::styleString(*fontInfo); // 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()); } -QFont* QFontDatabase_Font(const QFontDatabase* self, struct miqt_string* family, struct miqt_string* style, int pointSize) { +QFont* QFontDatabase_Font(struct miqt_string* family, struct miqt_string* style, int pointSize) { QString family_QString = QString::fromUtf8(&family->data, family->len); QString style_QString = QString::fromUtf8(&style->data, style->len); - return new QFont(self->font(family_QString, style_QString, static_cast(pointSize))); + return new QFont(QFontDatabase::font(family_QString, style_QString, static_cast(pointSize))); } -bool QFontDatabase_IsBitmapScalable(const QFontDatabase* self, struct miqt_string* family) { +bool QFontDatabase_IsBitmapScalable(struct miqt_string* family) { QString family_QString = QString::fromUtf8(&family->data, family->len); - return self->isBitmapScalable(family_QString); + return QFontDatabase::isBitmapScalable(family_QString); } -bool QFontDatabase_IsSmoothlyScalable(const QFontDatabase* self, struct miqt_string* family) { +bool QFontDatabase_IsSmoothlyScalable(struct miqt_string* family) { QString family_QString = QString::fromUtf8(&family->data, family->len); - return self->isSmoothlyScalable(family_QString); + return QFontDatabase::isSmoothlyScalable(family_QString); } -bool QFontDatabase_IsScalable(const QFontDatabase* self, struct miqt_string* family) { +bool QFontDatabase_IsScalable(struct miqt_string* family) { QString family_QString = QString::fromUtf8(&family->data, family->len); - return self->isScalable(family_QString); + return QFontDatabase::isScalable(family_QString); } -bool QFontDatabase_IsFixedPitch(const QFontDatabase* self, struct miqt_string* family) { +bool QFontDatabase_IsFixedPitch(struct miqt_string* family) { QString family_QString = QString::fromUtf8(&family->data, family->len); - return self->isFixedPitch(family_QString); + return QFontDatabase::isFixedPitch(family_QString); } -bool QFontDatabase_Italic(const QFontDatabase* self, struct miqt_string* family, struct miqt_string* style) { +bool QFontDatabase_Italic(struct miqt_string* family, struct miqt_string* style) { QString family_QString = QString::fromUtf8(&family->data, family->len); QString style_QString = QString::fromUtf8(&style->data, style->len); - return self->italic(family_QString, style_QString); + return QFontDatabase::italic(family_QString, style_QString); } -bool QFontDatabase_Bold(const QFontDatabase* self, struct miqt_string* family, struct miqt_string* style) { +bool QFontDatabase_Bold(struct miqt_string* family, struct miqt_string* style) { QString family_QString = QString::fromUtf8(&family->data, family->len); QString style_QString = QString::fromUtf8(&style->data, style->len); - return self->bold(family_QString, style_QString); + return QFontDatabase::bold(family_QString, style_QString); } -int QFontDatabase_Weight(const QFontDatabase* self, struct miqt_string* family, struct miqt_string* style) { +int QFontDatabase_Weight(struct miqt_string* family, struct miqt_string* style) { QString family_QString = QString::fromUtf8(&family->data, family->len); QString style_QString = QString::fromUtf8(&style->data, style->len); - return self->weight(family_QString, style_QString); + return QFontDatabase::weight(family_QString, style_QString); } -bool QFontDatabase_HasFamily(const QFontDatabase* self, struct miqt_string* family) { +bool QFontDatabase_HasFamily(struct miqt_string* family) { QString family_QString = QString::fromUtf8(&family->data, family->len); - return self->hasFamily(family_QString); + return QFontDatabase::hasFamily(family_QString); } -bool QFontDatabase_IsPrivateFamily(const QFontDatabase* self, struct miqt_string* family) { +bool QFontDatabase_IsPrivateFamily(struct miqt_string* family) { QString family_QString = QString::fromUtf8(&family->data, family->len); - return self->isPrivateFamily(family_QString); + return QFontDatabase::isPrivateFamily(family_QString); } struct miqt_string* QFontDatabase_WritingSystemName(int writingSystem) { @@ -233,16 +233,12 @@ bool QFontDatabase_RemoveAllApplicationFonts() { return QFontDatabase::removeAllApplicationFonts(); } -bool QFontDatabase_SupportsThreadedFontRendering() { - return QFontDatabase::supportsThreadedFontRendering(); -} - QFont* QFontDatabase_SystemFont(int typeVal) { return new QFont(QFontDatabase::systemFont(static_cast(typeVal))); } -struct miqt_array* QFontDatabase_Families1(const QFontDatabase* self, int writingSystem) { - QStringList _ret = self->families(static_cast(writingSystem)); +struct miqt_array* QFontDatabase_Families1(int writingSystem) { + QStringList _ret = QFontDatabase::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())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -257,10 +253,10 @@ struct miqt_array* QFontDatabase_Families1(const QFontDatabase* self, int writin return _out; } -struct miqt_array* QFontDatabase_PointSizes2(QFontDatabase* self, struct miqt_string* family, struct miqt_string* style) { +struct miqt_array* QFontDatabase_PointSizes2(struct miqt_string* family, struct miqt_string* style) { QString family_QString = QString::fromUtf8(&family->data, family->len); QString style_QString = QString::fromUtf8(&style->data, style->len); - QList _ret = self->pointSizes(family_QString, style_QString); + QList _ret = QFontDatabase::pointSizes(family_QString, style_QString); // Convert QList<> from C++ memory to manually-managed C memory int* _arr = static_cast(malloc(sizeof(int) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -272,28 +268,28 @@ struct miqt_array* QFontDatabase_PointSizes2(QFontDatabase* self, struct miqt_st return _out; } -bool QFontDatabase_IsBitmapScalable2(const QFontDatabase* self, struct miqt_string* family, struct miqt_string* style) { +bool QFontDatabase_IsBitmapScalable2(struct miqt_string* family, struct miqt_string* style) { QString family_QString = QString::fromUtf8(&family->data, family->len); QString style_QString = QString::fromUtf8(&style->data, style->len); - return self->isBitmapScalable(family_QString, style_QString); + return QFontDatabase::isBitmapScalable(family_QString, style_QString); } -bool QFontDatabase_IsSmoothlyScalable2(const QFontDatabase* self, struct miqt_string* family, struct miqt_string* style) { +bool QFontDatabase_IsSmoothlyScalable2(struct miqt_string* family, struct miqt_string* style) { QString family_QString = QString::fromUtf8(&family->data, family->len); QString style_QString = QString::fromUtf8(&style->data, style->len); - return self->isSmoothlyScalable(family_QString, style_QString); + return QFontDatabase::isSmoothlyScalable(family_QString, style_QString); } -bool QFontDatabase_IsScalable2(const QFontDatabase* self, struct miqt_string* family, struct miqt_string* style) { +bool QFontDatabase_IsScalable2(struct miqt_string* family, struct miqt_string* style) { QString family_QString = QString::fromUtf8(&family->data, family->len); QString style_QString = QString::fromUtf8(&style->data, style->len); - return self->isScalable(family_QString, style_QString); + return QFontDatabase::isScalable(family_QString, style_QString); } -bool QFontDatabase_IsFixedPitch2(const QFontDatabase* self, struct miqt_string* family, struct miqt_string* style) { +bool QFontDatabase_IsFixedPitch2(struct miqt_string* family, struct miqt_string* style) { QString family_QString = QString::fromUtf8(&family->data, family->len); QString style_QString = QString::fromUtf8(&style->data, style->len); - return self->isFixedPitch(family_QString, style_QString); + return QFontDatabase::isFixedPitch(family_QString, style_QString); } void QFontDatabase_Delete(QFontDatabase* self) { diff --git a/qt/gen_qfontdatabase.go b/qt/gen_qfontdatabase.go index 921d2a1..fd817fa 100644 --- a/qt/gen_qfontdatabase.go +++ b/qt/gen_qfontdatabase.go @@ -102,8 +102,8 @@ func QFontDatabase_StandardSizes() []int { return _ret } -func (this *QFontDatabase) WritingSystems() []QFontDatabase__WritingSystem { - var _ma *C.struct_miqt_array = C.QFontDatabase_WritingSystems(this.h) +func QFontDatabase_WritingSystems() []QFontDatabase__WritingSystem { + var _ma *C.struct_miqt_array = C.QFontDatabase_WritingSystems() _ret := make([]QFontDatabase__WritingSystem, int(_ma.len)) _outCast := (*[0xffff]C.int)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -113,10 +113,10 @@ func (this *QFontDatabase) WritingSystems() []QFontDatabase__WritingSystem { return _ret } -func (this *QFontDatabase) WritingSystemsWithFamily(family string) []QFontDatabase__WritingSystem { +func QFontDatabase_WritingSystemsWithFamily(family string) []QFontDatabase__WritingSystem { family_ms := miqt_strdupg(family) defer C.free(family_ms) - var _ma *C.struct_miqt_array = C.QFontDatabase_WritingSystemsWithFamily(this.h, (*C.struct_miqt_string)(family_ms)) + var _ma *C.struct_miqt_array = C.QFontDatabase_WritingSystemsWithFamily((*C.struct_miqt_string)(family_ms)) _ret := make([]QFontDatabase__WritingSystem, int(_ma.len)) _outCast := (*[0xffff]C.int)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -126,8 +126,8 @@ func (this *QFontDatabase) WritingSystemsWithFamily(family string) []QFontDataba return _ret } -func (this *QFontDatabase) Families() []string { - var _ma *C.struct_miqt_array = C.QFontDatabase_Families(this.h) +func QFontDatabase_Families() []string { + var _ma *C.struct_miqt_array = C.QFontDatabase_Families() _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++ { @@ -140,10 +140,10 @@ func (this *QFontDatabase) Families() []string { return _ret } -func (this *QFontDatabase) Styles(family string) []string { +func QFontDatabase_Styles(family string) []string { family_ms := miqt_strdupg(family) defer C.free(family_ms) - var _ma *C.struct_miqt_array = C.QFontDatabase_Styles(this.h, (*C.struct_miqt_string)(family_ms)) + var _ma *C.struct_miqt_array = C.QFontDatabase_Styles((*C.struct_miqt_string)(family_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++ { @@ -156,10 +156,10 @@ func (this *QFontDatabase) Styles(family string) []string { return _ret } -func (this *QFontDatabase) PointSizes(family string) []int { +func QFontDatabase_PointSizes(family string) []int { family_ms := miqt_strdupg(family) defer C.free(family_ms) - var _ma *C.struct_miqt_array = C.QFontDatabase_PointSizes(this.h, (*C.struct_miqt_string)(family_ms)) + var _ma *C.struct_miqt_array = C.QFontDatabase_PointSizes((*C.struct_miqt_string)(family_ms)) _ret := make([]int, int(_ma.len)) _outCast := (*[0xffff]C.int)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -169,12 +169,12 @@ func (this *QFontDatabase) PointSizes(family string) []int { return _ret } -func (this *QFontDatabase) SmoothSizes(family string, style string) []int { +func QFontDatabase_SmoothSizes(family string, style string) []int { family_ms := miqt_strdupg(family) defer C.free(family_ms) style_ms := miqt_strdupg(style) defer C.free(style_ms) - var _ma *C.struct_miqt_array = C.QFontDatabase_SmoothSizes(this.h, (*C.struct_miqt_string)(family_ms), (*C.struct_miqt_string)(style_ms)) + var _ma *C.struct_miqt_array = C.QFontDatabase_SmoothSizes((*C.struct_miqt_string)(family_ms), (*C.struct_miqt_string)(style_ms)) _ret := make([]int, int(_ma.len)) _outCast := (*[0xffff]C.int)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -184,89 +184,89 @@ func (this *QFontDatabase) SmoothSizes(family string, style string) []int { return _ret } -func (this *QFontDatabase) StyleString(font *QFont) string { - var _ms *C.struct_miqt_string = C.QFontDatabase_StyleString(this.h, font.cPointer()) +func QFontDatabase_StyleString(font *QFont) string { + var _ms *C.struct_miqt_string = C.QFontDatabase_StyleString(font.cPointer()) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } -func (this *QFontDatabase) StyleStringWithFontInfo(fontInfo *QFontInfo) string { - var _ms *C.struct_miqt_string = C.QFontDatabase_StyleStringWithFontInfo(this.h, fontInfo.cPointer()) +func QFontDatabase_StyleStringWithFontInfo(fontInfo *QFontInfo) string { + var _ms *C.struct_miqt_string = C.QFontDatabase_StyleStringWithFontInfo(fontInfo.cPointer()) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } -func (this *QFontDatabase) Font(family string, style string, pointSize int) *QFont { +func QFontDatabase_Font(family string, style string, pointSize int) *QFont { family_ms := miqt_strdupg(family) defer C.free(family_ms) style_ms := miqt_strdupg(style) defer C.free(style_ms) - _ret := C.QFontDatabase_Font(this.h, (*C.struct_miqt_string)(family_ms), (*C.struct_miqt_string)(style_ms), (C.int)(pointSize)) + _ret := C.QFontDatabase_Font((*C.struct_miqt_string)(family_ms), (*C.struct_miqt_string)(style_ms), (C.int)(pointSize)) _goptr := newQFont(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QFontDatabase) IsBitmapScalable(family string) bool { +func QFontDatabase_IsBitmapScalable(family string) bool { family_ms := miqt_strdupg(family) defer C.free(family_ms) - return (bool)(C.QFontDatabase_IsBitmapScalable(this.h, (*C.struct_miqt_string)(family_ms))) + return (bool)(C.QFontDatabase_IsBitmapScalable((*C.struct_miqt_string)(family_ms))) } -func (this *QFontDatabase) IsSmoothlyScalable(family string) bool { +func QFontDatabase_IsSmoothlyScalable(family string) bool { family_ms := miqt_strdupg(family) defer C.free(family_ms) - return (bool)(C.QFontDatabase_IsSmoothlyScalable(this.h, (*C.struct_miqt_string)(family_ms))) + return (bool)(C.QFontDatabase_IsSmoothlyScalable((*C.struct_miqt_string)(family_ms))) } -func (this *QFontDatabase) IsScalable(family string) bool { +func QFontDatabase_IsScalable(family string) bool { family_ms := miqt_strdupg(family) defer C.free(family_ms) - return (bool)(C.QFontDatabase_IsScalable(this.h, (*C.struct_miqt_string)(family_ms))) + return (bool)(C.QFontDatabase_IsScalable((*C.struct_miqt_string)(family_ms))) } -func (this *QFontDatabase) IsFixedPitch(family string) bool { +func QFontDatabase_IsFixedPitch(family string) bool { family_ms := miqt_strdupg(family) defer C.free(family_ms) - return (bool)(C.QFontDatabase_IsFixedPitch(this.h, (*C.struct_miqt_string)(family_ms))) + return (bool)(C.QFontDatabase_IsFixedPitch((*C.struct_miqt_string)(family_ms))) } -func (this *QFontDatabase) Italic(family string, style string) bool { +func QFontDatabase_Italic(family string, style string) bool { family_ms := miqt_strdupg(family) defer C.free(family_ms) style_ms := miqt_strdupg(style) defer C.free(style_ms) - return (bool)(C.QFontDatabase_Italic(this.h, (*C.struct_miqt_string)(family_ms), (*C.struct_miqt_string)(style_ms))) + return (bool)(C.QFontDatabase_Italic((*C.struct_miqt_string)(family_ms), (*C.struct_miqt_string)(style_ms))) } -func (this *QFontDatabase) Bold(family string, style string) bool { +func QFontDatabase_Bold(family string, style string) bool { family_ms := miqt_strdupg(family) defer C.free(family_ms) style_ms := miqt_strdupg(style) defer C.free(style_ms) - return (bool)(C.QFontDatabase_Bold(this.h, (*C.struct_miqt_string)(family_ms), (*C.struct_miqt_string)(style_ms))) + return (bool)(C.QFontDatabase_Bold((*C.struct_miqt_string)(family_ms), (*C.struct_miqt_string)(style_ms))) } -func (this *QFontDatabase) Weight(family string, style string) int { +func QFontDatabase_Weight(family string, style string) int { family_ms := miqt_strdupg(family) defer C.free(family_ms) style_ms := miqt_strdupg(style) defer C.free(style_ms) - return (int)(C.QFontDatabase_Weight(this.h, (*C.struct_miqt_string)(family_ms), (*C.struct_miqt_string)(style_ms))) + return (int)(C.QFontDatabase_Weight((*C.struct_miqt_string)(family_ms), (*C.struct_miqt_string)(style_ms))) } -func (this *QFontDatabase) HasFamily(family string) bool { +func QFontDatabase_HasFamily(family string) bool { family_ms := miqt_strdupg(family) defer C.free(family_ms) - return (bool)(C.QFontDatabase_HasFamily(this.h, (*C.struct_miqt_string)(family_ms))) + return (bool)(C.QFontDatabase_HasFamily((*C.struct_miqt_string)(family_ms))) } -func (this *QFontDatabase) IsPrivateFamily(family string) bool { +func QFontDatabase_IsPrivateFamily(family string) bool { family_ms := miqt_strdupg(family) defer C.free(family_ms) - return (bool)(C.QFontDatabase_IsPrivateFamily(this.h, (*C.struct_miqt_string)(family_ms))) + return (bool)(C.QFontDatabase_IsPrivateFamily((*C.struct_miqt_string)(family_ms))) } func QFontDatabase_WritingSystemName(writingSystem QFontDatabase__WritingSystem) string { @@ -315,10 +315,6 @@ func QFontDatabase_RemoveAllApplicationFonts() bool { return (bool)(C.QFontDatabase_RemoveAllApplicationFonts()) } -func QFontDatabase_SupportsThreadedFontRendering() bool { - return (bool)(C.QFontDatabase_SupportsThreadedFontRendering()) -} - func QFontDatabase_SystemFont(typeVal QFontDatabase__SystemFont) *QFont { _ret := C.QFontDatabase_SystemFont((C.int)(typeVal)) _goptr := newQFont(_ret) @@ -326,8 +322,8 @@ func QFontDatabase_SystemFont(typeVal QFontDatabase__SystemFont) *QFont { return _goptr } -func (this *QFontDatabase) Families1(writingSystem QFontDatabase__WritingSystem) []string { - var _ma *C.struct_miqt_array = C.QFontDatabase_Families1(this.h, (C.int)(writingSystem)) +func QFontDatabase_Families1(writingSystem QFontDatabase__WritingSystem) []string { + var _ma *C.struct_miqt_array = C.QFontDatabase_Families1((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++ { @@ -340,12 +336,12 @@ func (this *QFontDatabase) Families1(writingSystem QFontDatabase__WritingSystem) return _ret } -func (this *QFontDatabase) PointSizes2(family string, style string) []int { +func QFontDatabase_PointSizes2(family string, style string) []int { family_ms := miqt_strdupg(family) defer C.free(family_ms) style_ms := miqt_strdupg(style) defer C.free(style_ms) - var _ma *C.struct_miqt_array = C.QFontDatabase_PointSizes2(this.h, (*C.struct_miqt_string)(family_ms), (*C.struct_miqt_string)(style_ms)) + var _ma *C.struct_miqt_array = C.QFontDatabase_PointSizes2((*C.struct_miqt_string)(family_ms), (*C.struct_miqt_string)(style_ms)) _ret := make([]int, int(_ma.len)) _outCast := (*[0xffff]C.int)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -355,36 +351,36 @@ func (this *QFontDatabase) PointSizes2(family string, style string) []int { return _ret } -func (this *QFontDatabase) IsBitmapScalable2(family string, style string) bool { +func QFontDatabase_IsBitmapScalable2(family string, style string) bool { family_ms := miqt_strdupg(family) defer C.free(family_ms) style_ms := miqt_strdupg(style) defer C.free(style_ms) - return (bool)(C.QFontDatabase_IsBitmapScalable2(this.h, (*C.struct_miqt_string)(family_ms), (*C.struct_miqt_string)(style_ms))) + return (bool)(C.QFontDatabase_IsBitmapScalable2((*C.struct_miqt_string)(family_ms), (*C.struct_miqt_string)(style_ms))) } -func (this *QFontDatabase) IsSmoothlyScalable2(family string, style string) bool { +func QFontDatabase_IsSmoothlyScalable2(family string, style string) bool { family_ms := miqt_strdupg(family) defer C.free(family_ms) style_ms := miqt_strdupg(style) defer C.free(style_ms) - return (bool)(C.QFontDatabase_IsSmoothlyScalable2(this.h, (*C.struct_miqt_string)(family_ms), (*C.struct_miqt_string)(style_ms))) + return (bool)(C.QFontDatabase_IsSmoothlyScalable2((*C.struct_miqt_string)(family_ms), (*C.struct_miqt_string)(style_ms))) } -func (this *QFontDatabase) IsScalable2(family string, style string) bool { +func QFontDatabase_IsScalable2(family string, style string) bool { family_ms := miqt_strdupg(family) defer C.free(family_ms) style_ms := miqt_strdupg(style) defer C.free(style_ms) - return (bool)(C.QFontDatabase_IsScalable2(this.h, (*C.struct_miqt_string)(family_ms), (*C.struct_miqt_string)(style_ms))) + return (bool)(C.QFontDatabase_IsScalable2((*C.struct_miqt_string)(family_ms), (*C.struct_miqt_string)(style_ms))) } -func (this *QFontDatabase) IsFixedPitch2(family string, style string) bool { +func QFontDatabase_IsFixedPitch2(family string, style string) bool { family_ms := miqt_strdupg(family) defer C.free(family_ms) style_ms := miqt_strdupg(style) defer C.free(style_ms) - return (bool)(C.QFontDatabase_IsFixedPitch2(this.h, (*C.struct_miqt_string)(family_ms), (*C.struct_miqt_string)(style_ms))) + return (bool)(C.QFontDatabase_IsFixedPitch2((*C.struct_miqt_string)(family_ms), (*C.struct_miqt_string)(style_ms))) } // Delete this object from C++ memory. diff --git a/qt/gen_qfontdatabase.h b/qt/gen_qfontdatabase.h index b2dbdec..907fd68 100644 --- a/qt/gen_qfontdatabase.h +++ b/qt/gen_qfontdatabase.h @@ -27,24 +27,24 @@ typedef struct QFontInfo QFontInfo; QFontDatabase* QFontDatabase_new(); struct miqt_array* QFontDatabase_StandardSizes(); -struct miqt_array* QFontDatabase_WritingSystems(const QFontDatabase* self); -struct miqt_array* QFontDatabase_WritingSystemsWithFamily(const QFontDatabase* self, struct miqt_string* family); -struct miqt_array* QFontDatabase_Families(const QFontDatabase* self); -struct miqt_array* QFontDatabase_Styles(const QFontDatabase* self, struct miqt_string* family); -struct miqt_array* QFontDatabase_PointSizes(QFontDatabase* self, struct miqt_string* family); -struct miqt_array* QFontDatabase_SmoothSizes(QFontDatabase* self, struct miqt_string* family, struct miqt_string* style); -struct miqt_string* QFontDatabase_StyleString(QFontDatabase* self, QFont* font); -struct miqt_string* QFontDatabase_StyleStringWithFontInfo(QFontDatabase* self, QFontInfo* fontInfo); -QFont* QFontDatabase_Font(const QFontDatabase* self, struct miqt_string* family, struct miqt_string* style, int pointSize); -bool QFontDatabase_IsBitmapScalable(const QFontDatabase* self, struct miqt_string* family); -bool QFontDatabase_IsSmoothlyScalable(const QFontDatabase* self, struct miqt_string* family); -bool QFontDatabase_IsScalable(const QFontDatabase* self, struct miqt_string* family); -bool QFontDatabase_IsFixedPitch(const QFontDatabase* self, struct miqt_string* family); -bool QFontDatabase_Italic(const QFontDatabase* self, struct miqt_string* family, struct miqt_string* style); -bool QFontDatabase_Bold(const QFontDatabase* self, struct miqt_string* family, struct miqt_string* style); -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_array* QFontDatabase_WritingSystems(); +struct miqt_array* QFontDatabase_WritingSystemsWithFamily(struct miqt_string* family); +struct miqt_array* QFontDatabase_Families(); +struct miqt_array* QFontDatabase_Styles(struct miqt_string* family); +struct miqt_array* QFontDatabase_PointSizes(struct miqt_string* family); +struct miqt_array* QFontDatabase_SmoothSizes(struct miqt_string* family, struct miqt_string* style); +struct miqt_string* QFontDatabase_StyleString(QFont* font); +struct miqt_string* QFontDatabase_StyleStringWithFontInfo(QFontInfo* fontInfo); +QFont* QFontDatabase_Font(struct miqt_string* family, struct miqt_string* style, int pointSize); +bool QFontDatabase_IsBitmapScalable(struct miqt_string* family); +bool QFontDatabase_IsSmoothlyScalable(struct miqt_string* family); +bool QFontDatabase_IsScalable(struct miqt_string* family); +bool QFontDatabase_IsFixedPitch(struct miqt_string* family); +bool QFontDatabase_Italic(struct miqt_string* family, struct miqt_string* style); +bool QFontDatabase_Bold(struct miqt_string* family, struct miqt_string* style); +int QFontDatabase_Weight(struct miqt_string* family, struct miqt_string* style); +bool QFontDatabase_HasFamily(struct miqt_string* family); +bool QFontDatabase_IsPrivateFamily(struct miqt_string* family); struct miqt_string* QFontDatabase_WritingSystemName(int writingSystem); struct miqt_string* QFontDatabase_WritingSystemSample(int writingSystem); int QFontDatabase_AddApplicationFont(struct miqt_string* fileName); @@ -52,14 +52,13 @@ 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(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); -bool QFontDatabase_IsScalable2(const QFontDatabase* self, struct miqt_string* family, struct miqt_string* style); -bool QFontDatabase_IsFixedPitch2(const QFontDatabase* self, struct miqt_string* family, struct miqt_string* style); +struct miqt_array* QFontDatabase_Families1(int writingSystem); +struct miqt_array* QFontDatabase_PointSizes2(struct miqt_string* family, struct miqt_string* style); +bool QFontDatabase_IsBitmapScalable2(struct miqt_string* family, struct miqt_string* style); +bool QFontDatabase_IsSmoothlyScalable2(struct miqt_string* family, struct miqt_string* style); +bool QFontDatabase_IsScalable2(struct miqt_string* family, struct miqt_string* style); +bool QFontDatabase_IsFixedPitch2(struct miqt_string* family, struct miqt_string* style); void QFontDatabase_Delete(QFontDatabase* self); #ifdef __cplusplus diff --git a/qt/gen_qfontdialog.cpp b/qt/gen_qfontdialog.cpp index 38fcf3e..0e33e02 100644 --- a/qt/gen_qfontdialog.cpp +++ b/qt/gen_qfontdialog.cpp @@ -40,13 +40,6 @@ struct miqt_string* QFontDialog_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QFontDialog_TrUtf8(const char* s) { - QString _ret = QFontDialog::trUtf8(s); - // 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 QFontDialog_SetCurrentFont(QFontDialog* self, QFont* font) { self->setCurrentFont(*font); } @@ -128,20 +121,6 @@ struct miqt_string* QFontDialog_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QFontDialog_TrUtf82(const char* s, const char* c) { - QString _ret = QFontDialog::trUtf8(s, c); - // 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* QFontDialog_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QFontDialog::trUtf8(s, c, static_cast(n)); - // 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 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 b9bbd87..5e4a25d 100644 --- a/qt/gen_qfontdialog.go +++ b/qt/gen_qfontdialog.go @@ -91,15 +91,6 @@ func QFontDialog_Tr(s string) string { return _ret } -func QFontDialog_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFontDialog_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QFontDialog) SetCurrentFont(font *QFont) { C.QFontDialog_SetCurrentFont(this.h, font.cPointer()) } @@ -214,28 +205,6 @@ func QFontDialog_Tr3(s string, c string, n int) string { return _ret } -func QFontDialog_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFontDialog_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QFontDialog_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFontDialog_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QFontDialog) SetOption2(option QFontDialog__FontDialogOption, on bool) { C.QFontDialog_SetOption2(this.h, (C.int)(option), (C.bool)(on)) } diff --git a/qt/gen_qfontdialog.h b/qt/gen_qfontdialog.h index 140a3aa..9a894d1 100644 --- a/qt/gen_qfontdialog.h +++ b/qt/gen_qfontdialog.h @@ -32,7 +32,6 @@ QFontDialog* QFontDialog_new4(QFont* initial, QWidget* parent); QMetaObject* QFontDialog_MetaObject(const QFontDialog* self); void* QFontDialog_Metacast(QFontDialog* self, const char* param1); struct miqt_string* QFontDialog_Tr(const char* s); -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); @@ -49,8 +48,6 @@ void QFontDialog_FontSelected(QFontDialog* self, QFont* font); void QFontDialog_connect_FontSelected(QFontDialog* self, void* slot); struct miqt_string* QFontDialog_Tr2(const char* s, const char* c); struct miqt_string* QFontDialog_Tr3(const char* s, const char* c, int n); -struct miqt_string* QFontDialog_TrUtf82(const char* s, const char* c); -struct miqt_string* QFontDialog_TrUtf83(const char* s, const char* c, int n); 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); diff --git a/qt/gen_qfontinfo.cpp b/qt/gen_qfontinfo.cpp index ff89622..8839302 100644 --- a/qt/gen_qfontinfo.cpp +++ b/qt/gen_qfontinfo.cpp @@ -88,8 +88,8 @@ int QFontInfo_StyleHint(const QFontInfo* self) { return static_cast(_ret); } -bool QFontInfo_RawMode(const QFontInfo* self) { - return self->rawMode(); +int QFontInfo_LegacyWeight(const QFontInfo* self) { + return self->legacyWeight(); } bool QFontInfo_ExactMatch(const QFontInfo* self) { diff --git a/qt/gen_qfontinfo.go b/qt/gen_qfontinfo.go index 6fb4cf0..fce9857 100644 --- a/qt/gen_qfontinfo.go +++ b/qt/gen_qfontinfo.go @@ -117,8 +117,8 @@ func (this *QFontInfo) StyleHint() QFont__StyleHint { return (QFont__StyleHint)(C.QFontInfo_StyleHint(this.h)) } -func (this *QFontInfo) RawMode() bool { - return (bool)(C.QFontInfo_RawMode(this.h)) +func (this *QFontInfo) LegacyWeight() int { + return (int)(C.QFontInfo_LegacyWeight(this.h)) } func (this *QFontInfo) ExactMatch() bool { diff --git a/qt/gen_qfontinfo.h b/qt/gen_qfontinfo.h index 8b287e7..5c1cebf 100644 --- a/qt/gen_qfontinfo.h +++ b/qt/gen_qfontinfo.h @@ -39,7 +39,7 @@ bool QFontInfo_Overline(const QFontInfo* self); bool QFontInfo_StrikeOut(const QFontInfo* self); bool QFontInfo_FixedPitch(const QFontInfo* self); int QFontInfo_StyleHint(const QFontInfo* self); -bool QFontInfo_RawMode(const QFontInfo* self); +int QFontInfo_LegacyWeight(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 64aaf41..b0b4f76 100644 --- a/qt/gen_qfontmetrics.cpp +++ b/qt/gen_qfontmetrics.cpp @@ -10,6 +10,7 @@ #include #include #include +#include #include "qfontmetrics.h" #include "gen_qfontmetrics.h" #include "_cgo_export.h" @@ -94,32 +95,18 @@ int QFontMetrics_RightBearing(const QFontMetrics* self, QChar* param1) { return self->rightBearing(*param1); } -int QFontMetrics_Width(const QFontMetrics* self, struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); - return self->width(param1_QString); -} - -int QFontMetrics_Width2(const QFontMetrics* self, struct miqt_string* param1, int lenVal, int flags) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); - return self->width(param1_QString, static_cast(lenVal), static_cast(flags)); -} - -int QFontMetrics_WidthWithQChar(const QFontMetrics* self, QChar* param1) { - return self->width(*param1); -} - int QFontMetrics_HorizontalAdvance(const QFontMetrics* self, struct miqt_string* param1) { QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); return self->horizontalAdvance(param1_QString); } -int QFontMetrics_HorizontalAdvanceWithQChar(const QFontMetrics* self, QChar* param1) { - return self->horizontalAdvance(*param1); +int QFontMetrics_HorizontalAdvance2(const QFontMetrics* self, struct miqt_string* param1, QTextOption* textOption) { + QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); + return self->horizontalAdvance(param1_QString, *textOption); } -int QFontMetrics_CharWidth(const QFontMetrics* self, struct miqt_string* str, int pos) { - QString str_QString = QString::fromUtf8(&str->data, str->len); - return self->charWidth(str_QString, static_cast(pos)); +int QFontMetrics_HorizontalAdvanceWithQChar(const QFontMetrics* self, QChar* param1) { + return self->horizontalAdvance(*param1); } QRect* QFontMetrics_BoundingRect(const QFontMetrics* self, QChar* param1) { @@ -131,12 +118,17 @@ QRect* QFontMetrics_BoundingRectWithText(const QFontMetrics* self, struct miqt_s return new QRect(self->boundingRect(text_QString)); } -QRect* QFontMetrics_BoundingRect2(const QFontMetrics* self, QRect* r, int flags, struct miqt_string* text) { +QRect* QFontMetrics_BoundingRect2(const QFontMetrics* self, struct miqt_string* text, QTextOption* textOption) { + QString text_QString = QString::fromUtf8(&text->data, text->len); + return new QRect(self->boundingRect(text_QString, *textOption)); +} + +QRect* QFontMetrics_BoundingRect3(const QFontMetrics* self, QRect* r, int flags, struct miqt_string* text) { QString text_QString = QString::fromUtf8(&text->data, text->len); return new QRect(self->boundingRect(*r, static_cast(flags), text_QString)); } -QRect* QFontMetrics_BoundingRect3(const QFontMetrics* self, int x, int y, int w, int h, int flags, struct miqt_string* text) { +QRect* QFontMetrics_BoundingRect4(const QFontMetrics* self, int x, int y, int w, int h, int flags, struct miqt_string* text) { QString text_QString = QString::fromUtf8(&text->data, text->len); return new QRect(self->boundingRect(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(flags), text_QString)); } @@ -151,6 +143,11 @@ QRect* QFontMetrics_TightBoundingRect(const QFontMetrics* self, struct miqt_stri return new QRect(self->tightBoundingRect(text_QString)); } +QRect* QFontMetrics_TightBoundingRect2(const QFontMetrics* self, struct miqt_string* text, QTextOption* textOption) { + QString text_QString = QString::fromUtf8(&text->data, text->len); + return new QRect(self->tightBoundingRect(text_QString, *textOption)); +} + 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)); @@ -188,17 +185,12 @@ bool QFontMetrics_OperatorNotEqual(const QFontMetrics* self, QFontMetrics* other return self->operator!=(*other); } -int QFontMetrics_Width22(const QFontMetrics* self, struct miqt_string* param1, int lenVal) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); - return self->width(param1_QString, static_cast(lenVal)); -} - -int QFontMetrics_HorizontalAdvance2(const QFontMetrics* self, struct miqt_string* param1, int lenVal) { +int QFontMetrics_HorizontalAdvance22(const QFontMetrics* self, struct miqt_string* param1, int lenVal) { QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); return self->horizontalAdvance(param1_QString, static_cast(lenVal)); } -QRect* QFontMetrics_BoundingRect4(const QFontMetrics* self, QRect* r, int flags, struct miqt_string* text, int tabstops) { +QRect* QFontMetrics_BoundingRect42(const QFontMetrics* self, QRect* r, int flags, struct miqt_string* text, int tabstops) { QString text_QString = QString::fromUtf8(&text->data, text->len); return new QRect(self->boundingRect(*r, static_cast(flags), text_QString, static_cast(tabstops))); } @@ -341,17 +333,6 @@ double QFontMetricsF_RightBearing(const QFontMetricsF* self, QChar* param1) { return static_cast(_ret); } -double QFontMetricsF_Width(const QFontMetricsF* self, struct miqt_string* stringVal) { - QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); - qreal _ret = self->width(stringVal_QString); - return static_cast(_ret); -} - -double QFontMetricsF_WidthWithQChar(const QFontMetricsF* self, QChar* 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); qreal _ret = self->horizontalAdvance(stringVal_QString); @@ -363,16 +344,27 @@ double QFontMetricsF_HorizontalAdvanceWithQChar(const QFontMetricsF* self, QChar return static_cast(_ret); } +double QFontMetricsF_HorizontalAdvance2(const QFontMetricsF* self, struct miqt_string* stringVal, QTextOption* textOption) { + QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); + qreal _ret = self->horizontalAdvance(stringVal_QString, *textOption); + return static_cast(_ret); +} + QRectF* QFontMetricsF_BoundingRect(const QFontMetricsF* self, struct miqt_string* stringVal) { QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); return new QRectF(self->boundingRect(stringVal_QString)); } +QRectF* QFontMetricsF_BoundingRect2(const QFontMetricsF* self, struct miqt_string* text, QTextOption* textOption) { + QString text_QString = QString::fromUtf8(&text->data, text->len); + return new QRectF(self->boundingRect(text_QString, *textOption)); +} + QRectF* QFontMetricsF_BoundingRectWithQChar(const QFontMetricsF* self, QChar* param1) { return new QRectF(self->boundingRect(*param1)); } -QRectF* QFontMetricsF_BoundingRect2(const QFontMetricsF* self, QRectF* r, int flags, struct miqt_string* stringVal) { +QRectF* QFontMetricsF_BoundingRect3(const QFontMetricsF* self, QRectF* r, int flags, struct miqt_string* stringVal) { QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); return new QRectF(self->boundingRect(*r, static_cast(flags), stringVal_QString)); } @@ -387,6 +379,11 @@ QRectF* QFontMetricsF_TightBoundingRect(const QFontMetricsF* self, struct miqt_s return new QRectF(self->tightBoundingRect(text_QString)); } +QRectF* QFontMetricsF_TightBoundingRect2(const QFontMetricsF* self, struct miqt_string* text, QTextOption* textOption) { + QString text_QString = QString::fromUtf8(&text->data, text->len); + return new QRectF(self->tightBoundingRect(text_QString, *textOption)); +} + 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)); @@ -428,7 +425,7 @@ bool QFontMetricsF_OperatorNotEqual(const QFontMetricsF* self, QFontMetricsF* ot return self->operator!=(*other); } -double QFontMetricsF_HorizontalAdvance2(const QFontMetricsF* self, struct miqt_string* stringVal, int length) { +double QFontMetricsF_HorizontalAdvance22(const QFontMetricsF* self, struct miqt_string* stringVal, int length) { QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); qreal _ret = self->horizontalAdvance(stringVal_QString, static_cast(length)); return static_cast(_ret); diff --git a/qt/gen_qfontmetrics.go b/qt/gen_qfontmetrics.go index 6bfbed0..3f48cf7 100644 --- a/qt/gen_qfontmetrics.go +++ b/qt/gen_qfontmetrics.go @@ -121,36 +121,20 @@ func (this *QFontMetrics) RightBearing(param1 QChar) int { return (int)(C.QFontMetrics_RightBearing(this.h, param1.cPointer())) } -func (this *QFontMetrics) Width(param1 string) int { - param1_ms := miqt_strdupg(param1) - defer C.free(param1_ms) - return (int)(C.QFontMetrics_Width(this.h, (*C.struct_miqt_string)(param1_ms))) -} - -func (this *QFontMetrics) Width2(param1 string, lenVal int, flags int) int { - param1_ms := miqt_strdupg(param1) - defer C.free(param1_ms) - return (int)(C.QFontMetrics_Width2(this.h, (*C.struct_miqt_string)(param1_ms), (C.int)(lenVal), (C.int)(flags))) -} - -func (this *QFontMetrics) WidthWithQChar(param1 QChar) int { - return (int)(C.QFontMetrics_WidthWithQChar(this.h, param1.cPointer())) -} - func (this *QFontMetrics) HorizontalAdvance(param1 string) int { param1_ms := miqt_strdupg(param1) defer C.free(param1_ms) return (int)(C.QFontMetrics_HorizontalAdvance(this.h, (*C.struct_miqt_string)(param1_ms))) } -func (this *QFontMetrics) HorizontalAdvanceWithQChar(param1 QChar) int { - return (int)(C.QFontMetrics_HorizontalAdvanceWithQChar(this.h, param1.cPointer())) +func (this *QFontMetrics) HorizontalAdvance2(param1 string, textOption *QTextOption) int { + param1_ms := miqt_strdupg(param1) + defer C.free(param1_ms) + return (int)(C.QFontMetrics_HorizontalAdvance2(this.h, (*C.struct_miqt_string)(param1_ms), textOption.cPointer())) } -func (this *QFontMetrics) CharWidth(str string, pos int) int { - str_ms := miqt_strdupg(str) - defer C.free(str_ms) - return (int)(C.QFontMetrics_CharWidth(this.h, (*C.struct_miqt_string)(str_ms), (C.int)(pos))) +func (this *QFontMetrics) HorizontalAdvanceWithQChar(param1 QChar) int { + return (int)(C.QFontMetrics_HorizontalAdvanceWithQChar(this.h, param1.cPointer())) } func (this *QFontMetrics) BoundingRect(param1 QChar) *QRect { @@ -169,19 +153,28 @@ func (this *QFontMetrics) BoundingRectWithText(text string) *QRect { return _goptr } -func (this *QFontMetrics) BoundingRect2(r *QRect, flags int, text string) *QRect { +func (this *QFontMetrics) BoundingRect2(text string, textOption *QTextOption) *QRect { text_ms := miqt_strdupg(text) defer C.free(text_ms) - _ret := C.QFontMetrics_BoundingRect2(this.h, r.cPointer(), (C.int)(flags), (*C.struct_miqt_string)(text_ms)) + _ret := C.QFontMetrics_BoundingRect2(this.h, (*C.struct_miqt_string)(text_ms), textOption.cPointer()) _goptr := newQRect(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QFontMetrics) BoundingRect3(x int, y int, w int, h int, flags int, text string) *QRect { +func (this *QFontMetrics) BoundingRect3(r *QRect, flags int, text string) *QRect { text_ms := miqt_strdupg(text) defer C.free(text_ms) - _ret := C.QFontMetrics_BoundingRect3(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.int)(flags), (*C.struct_miqt_string)(text_ms)) + _ret := C.QFontMetrics_BoundingRect3(this.h, r.cPointer(), (C.int)(flags), (*C.struct_miqt_string)(text_ms)) + _goptr := newQRect(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QFontMetrics) BoundingRect4(x int, y int, w int, h int, flags int, text string) *QRect { + text_ms := miqt_strdupg(text) + defer C.free(text_ms) + _ret := C.QFontMetrics_BoundingRect4(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.int)(flags), (*C.struct_miqt_string)(text_ms)) _goptr := newQRect(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -205,6 +198,15 @@ func (this *QFontMetrics) TightBoundingRect(text string) *QRect { return _goptr } +func (this *QFontMetrics) TightBoundingRect2(text string, textOption *QTextOption) *QRect { + text_ms := miqt_strdupg(text) + defer C.free(text_ms) + _ret := C.QFontMetrics_TightBoundingRect2(this.h, (*C.struct_miqt_string)(text_ms), textOption.cPointer()) + _goptr := newQRect(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + func (this *QFontMetrics) ElidedText(text string, mode TextElideMode, width int) string { text_ms := miqt_strdupg(text) defer C.free(text_ms) @@ -242,22 +244,16 @@ func (this *QFontMetrics) OperatorNotEqual(other *QFontMetrics) bool { return (bool)(C.QFontMetrics_OperatorNotEqual(this.h, other.cPointer())) } -func (this *QFontMetrics) Width22(param1 string, lenVal int) int { +func (this *QFontMetrics) HorizontalAdvance22(param1 string, lenVal int) int { param1_ms := miqt_strdupg(param1) defer C.free(param1_ms) - return (int)(C.QFontMetrics_Width22(this.h, (*C.struct_miqt_string)(param1_ms), (C.int)(lenVal))) + return (int)(C.QFontMetrics_HorizontalAdvance22(this.h, (*C.struct_miqt_string)(param1_ms), (C.int)(lenVal))) } -func (this *QFontMetrics) HorizontalAdvance2(param1 string, lenVal int) int { - param1_ms := miqt_strdupg(param1) - defer C.free(param1_ms) - return (int)(C.QFontMetrics_HorizontalAdvance2(this.h, (*C.struct_miqt_string)(param1_ms), (C.int)(lenVal))) -} - -func (this *QFontMetrics) BoundingRect4(r *QRect, flags int, text string, tabstops int) *QRect { +func (this *QFontMetrics) BoundingRect42(r *QRect, flags int, text string, tabstops int) *QRect { text_ms := miqt_strdupg(text) defer C.free(text_ms) - _ret := C.QFontMetrics_BoundingRect4(this.h, r.cPointer(), (C.int)(flags), (*C.struct_miqt_string)(text_ms), (C.int)(tabstops)) + _ret := C.QFontMetrics_BoundingRect42(this.h, r.cPointer(), (C.int)(flags), (*C.struct_miqt_string)(text_ms), (C.int)(tabstops)) _goptr := newQRect(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -449,16 +445,6 @@ func (this *QFontMetricsF) RightBearing(param1 QChar) float64 { return (float64)(C.QFontMetricsF_RightBearing(this.h, param1.cPointer())) } -func (this *QFontMetricsF) Width(stringVal string) float64 { - stringVal_ms := miqt_strdupg(stringVal) - defer C.free(stringVal_ms) - return (float64)(C.QFontMetricsF_Width(this.h, (*C.struct_miqt_string)(stringVal_ms))) -} - -func (this *QFontMetricsF) WidthWithQChar(param1 QChar) float64 { - return (float64)(C.QFontMetricsF_WidthWithQChar(this.h, param1.cPointer())) -} - func (this *QFontMetricsF) HorizontalAdvance(stringVal string) float64 { stringVal_ms := miqt_strdupg(stringVal) defer C.free(stringVal_ms) @@ -469,6 +455,12 @@ func (this *QFontMetricsF) HorizontalAdvanceWithQChar(param1 QChar) float64 { return (float64)(C.QFontMetricsF_HorizontalAdvanceWithQChar(this.h, param1.cPointer())) } +func (this *QFontMetricsF) HorizontalAdvance2(stringVal string, textOption *QTextOption) float64 { + stringVal_ms := miqt_strdupg(stringVal) + defer C.free(stringVal_ms) + return (float64)(C.QFontMetricsF_HorizontalAdvance2(this.h, (*C.struct_miqt_string)(stringVal_ms), textOption.cPointer())) +} + func (this *QFontMetricsF) BoundingRect(stringVal string) *QRectF { stringVal_ms := miqt_strdupg(stringVal) defer C.free(stringVal_ms) @@ -478,6 +470,15 @@ func (this *QFontMetricsF) BoundingRect(stringVal string) *QRectF { return _goptr } +func (this *QFontMetricsF) BoundingRect2(text string, textOption *QTextOption) *QRectF { + text_ms := miqt_strdupg(text) + defer C.free(text_ms) + _ret := C.QFontMetricsF_BoundingRect2(this.h, (*C.struct_miqt_string)(text_ms), textOption.cPointer()) + _goptr := newQRectF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + func (this *QFontMetricsF) BoundingRectWithQChar(param1 QChar) *QRectF { _ret := C.QFontMetricsF_BoundingRectWithQChar(this.h, param1.cPointer()) _goptr := newQRectF(_ret) @@ -485,10 +486,10 @@ func (this *QFontMetricsF) BoundingRectWithQChar(param1 QChar) *QRectF { return _goptr } -func (this *QFontMetricsF) BoundingRect2(r *QRectF, flags int, stringVal string) *QRectF { +func (this *QFontMetricsF) BoundingRect3(r *QRectF, flags int, stringVal string) *QRectF { stringVal_ms := miqt_strdupg(stringVal) defer C.free(stringVal_ms) - _ret := C.QFontMetricsF_BoundingRect2(this.h, r.cPointer(), (C.int)(flags), (*C.struct_miqt_string)(stringVal_ms)) + _ret := C.QFontMetricsF_BoundingRect3(this.h, r.cPointer(), (C.int)(flags), (*C.struct_miqt_string)(stringVal_ms)) _goptr := newQRectF(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -512,6 +513,15 @@ func (this *QFontMetricsF) TightBoundingRect(text string) *QRectF { return _goptr } +func (this *QFontMetricsF) TightBoundingRect2(text string, textOption *QTextOption) *QRectF { + text_ms := miqt_strdupg(text) + defer C.free(text_ms) + _ret := C.QFontMetricsF_TightBoundingRect2(this.h, (*C.struct_miqt_string)(text_ms), textOption.cPointer()) + _goptr := newQRectF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + func (this *QFontMetricsF) ElidedText(text string, mode TextElideMode, width float64) string { text_ms := miqt_strdupg(text) defer C.free(text_ms) @@ -549,10 +559,10 @@ func (this *QFontMetricsF) OperatorNotEqual(other *QFontMetricsF) bool { return (bool)(C.QFontMetricsF_OperatorNotEqual(this.h, other.cPointer())) } -func (this *QFontMetricsF) HorizontalAdvance2(stringVal string, length int) float64 { +func (this *QFontMetricsF) HorizontalAdvance22(stringVal string, length int) float64 { stringVal_ms := miqt_strdupg(stringVal) defer C.free(stringVal_ms) - return (float64)(C.QFontMetricsF_HorizontalAdvance2(this.h, (*C.struct_miqt_string)(stringVal_ms), (C.int)(length))) + return (float64)(C.QFontMetricsF_HorizontalAdvance22(this.h, (*C.struct_miqt_string)(stringVal_ms), (C.int)(length))) } func (this *QFontMetricsF) BoundingRect4(r *QRectF, flags int, stringVal string, tabstops int) *QRectF { diff --git a/qt/gen_qfontmetrics.h b/qt/gen_qfontmetrics.h index 7b19973..2b49108 100644 --- a/qt/gen_qfontmetrics.h +++ b/qt/gen_qfontmetrics.h @@ -23,6 +23,7 @@ class QRect; class QRectF; class QSize; class QSizeF; +class QTextOption; #else typedef struct QChar QChar; typedef struct QFont QFont; @@ -33,6 +34,7 @@ typedef struct QRect QRect; typedef struct QRectF QRectF; typedef struct QSize QSize; typedef struct QSizeF QSizeF; +typedef struct QTextOption QTextOption; #endif QFontMetrics* QFontMetrics_new(QFont* param1); @@ -55,18 +57,17 @@ bool QFontMetrics_InFont(const QFontMetrics* self, QChar* param1); bool QFontMetrics_InFontUcs4(const QFontMetrics* self, unsigned int ucs4); int QFontMetrics_LeftBearing(const QFontMetrics* self, QChar* param1); int QFontMetrics_RightBearing(const QFontMetrics* self, QChar* param1); -int QFontMetrics_Width(const QFontMetrics* self, struct miqt_string* param1); -int QFontMetrics_Width2(const QFontMetrics* self, struct miqt_string* param1, int lenVal, int flags); -int QFontMetrics_WidthWithQChar(const QFontMetrics* self, QChar* param1); int QFontMetrics_HorizontalAdvance(const QFontMetrics* self, struct miqt_string* param1); +int QFontMetrics_HorizontalAdvance2(const QFontMetrics* self, struct miqt_string* param1, QTextOption* textOption); int QFontMetrics_HorizontalAdvanceWithQChar(const QFontMetrics* self, QChar* param1); -int QFontMetrics_CharWidth(const QFontMetrics* self, struct miqt_string* str, int pos); QRect* QFontMetrics_BoundingRect(const QFontMetrics* self, QChar* param1); QRect* QFontMetrics_BoundingRectWithText(const QFontMetrics* self, struct miqt_string* text); -QRect* QFontMetrics_BoundingRect2(const QFontMetrics* self, QRect* r, int flags, struct miqt_string* text); -QRect* QFontMetrics_BoundingRect3(const QFontMetrics* self, int x, int y, int w, int h, int flags, struct miqt_string* text); +QRect* QFontMetrics_BoundingRect2(const QFontMetrics* self, struct miqt_string* text, QTextOption* textOption); +QRect* QFontMetrics_BoundingRect3(const QFontMetrics* self, QRect* r, int flags, struct miqt_string* text); +QRect* QFontMetrics_BoundingRect4(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); +QRect* QFontMetrics_TightBoundingRect2(const QFontMetrics* self, struct miqt_string* text, QTextOption* textOption); 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); @@ -75,9 +76,8 @@ int QFontMetrics_LineWidth(const QFontMetrics* self); double QFontMetrics_FontDpi(const QFontMetrics* self); bool QFontMetrics_OperatorEqual(const QFontMetrics* self, QFontMetrics* other); bool QFontMetrics_OperatorNotEqual(const QFontMetrics* self, QFontMetrics* other); -int QFontMetrics_Width22(const QFontMetrics* self, struct miqt_string* param1, int lenVal); -int QFontMetrics_HorizontalAdvance2(const QFontMetrics* self, struct miqt_string* param1, int lenVal); -QRect* QFontMetrics_BoundingRect4(const QFontMetrics* self, QRect* r, int flags, struct miqt_string* text, int tabstops); +int QFontMetrics_HorizontalAdvance22(const QFontMetrics* self, struct miqt_string* param1, int lenVal); +QRect* QFontMetrics_BoundingRect42(const QFontMetrics* self, QRect* r, int flags, struct miqt_string* text, int tabstops); QRect* QFontMetrics_BoundingRect5(const QFontMetrics* self, QRect* r, int flags, struct miqt_string* text, int tabstops, int* tabarray); QRect* QFontMetrics_BoundingRect7(const QFontMetrics* self, int x, int y, int w, int h, int flags, struct miqt_string* text, int tabstops); QRect* QFontMetrics_BoundingRect8(const QFontMetrics* self, int x, int y, int w, int h, int flags, struct miqt_string* text, int tabstops, int* tabarray); @@ -108,15 +108,16 @@ bool QFontMetricsF_InFont(const QFontMetricsF* self, QChar* param1); bool QFontMetricsF_InFontUcs4(const QFontMetricsF* self, unsigned int ucs4); double QFontMetricsF_LeftBearing(const QFontMetricsF* self, QChar* param1); double QFontMetricsF_RightBearing(const QFontMetricsF* self, QChar* param1); -double QFontMetricsF_Width(const QFontMetricsF* self, struct miqt_string* stringVal); -double QFontMetricsF_WidthWithQChar(const QFontMetricsF* self, QChar* param1); double QFontMetricsF_HorizontalAdvance(const QFontMetricsF* self, struct miqt_string* stringVal); double QFontMetricsF_HorizontalAdvanceWithQChar(const QFontMetricsF* self, QChar* param1); +double QFontMetricsF_HorizontalAdvance2(const QFontMetricsF* self, struct miqt_string* stringVal, QTextOption* textOption); QRectF* QFontMetricsF_BoundingRect(const QFontMetricsF* self, struct miqt_string* stringVal); +QRectF* QFontMetricsF_BoundingRect2(const QFontMetricsF* self, struct miqt_string* text, QTextOption* textOption); QRectF* QFontMetricsF_BoundingRectWithQChar(const QFontMetricsF* self, QChar* param1); -QRectF* QFontMetricsF_BoundingRect2(const QFontMetricsF* self, QRectF* r, int flags, struct miqt_string* stringVal); +QRectF* QFontMetricsF_BoundingRect3(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); +QRectF* QFontMetricsF_TightBoundingRect2(const QFontMetricsF* self, struct miqt_string* text, QTextOption* textOption); 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); @@ -125,7 +126,7 @@ double QFontMetricsF_LineWidth(const QFontMetricsF* self); double QFontMetricsF_FontDpi(const QFontMetricsF* self); bool QFontMetricsF_OperatorEqual(const QFontMetricsF* self, QFontMetricsF* other); bool QFontMetricsF_OperatorNotEqual(const QFontMetricsF* self, QFontMetricsF* other); -double QFontMetricsF_HorizontalAdvance2(const QFontMetricsF* self, struct miqt_string* stringVal, int length); +double QFontMetricsF_HorizontalAdvance22(const QFontMetricsF* self, struct miqt_string* stringVal, int length); QRectF* QFontMetricsF_BoundingRect4(const QFontMetricsF* self, QRectF* r, int flags, struct miqt_string* stringVal, int tabstops); 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); diff --git a/qt/gen_qformlayout.cpp b/qt/gen_qformlayout.cpp index 762b620..7fae0d9 100644 --- a/qt/gen_qformlayout.cpp +++ b/qt/gen_qformlayout.cpp @@ -36,13 +36,6 @@ struct miqt_string* QFormLayout_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QFormLayout_TrUtf8(const char* s) { - QString _ret = QFormLayout::trUtf8(s); - // 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 QFormLayout_SetFieldGrowthPolicy(QFormLayout* self, int policy) { self->setFieldGrowthPolicy(static_cast(policy)); } @@ -191,6 +184,30 @@ void QFormLayout_SetLayout(QFormLayout* self, int row, int role, QLayout* layout self->setLayout(static_cast(row), static_cast(role), layout); } +void QFormLayout_SetRowVisible(QFormLayout* self, int row, bool on) { + self->setRowVisible(static_cast(row), on); +} + +void QFormLayout_SetRowVisible2(QFormLayout* self, QWidget* widget, bool on) { + self->setRowVisible(widget, on); +} + +void QFormLayout_SetRowVisible3(QFormLayout* self, QLayout* layout, bool on) { + self->setRowVisible(layout, on); +} + +bool QFormLayout_IsRowVisible(const QFormLayout* self, int row) { + return self->isRowVisible(static_cast(row)); +} + +bool QFormLayout_IsRowVisibleWithWidget(const QFormLayout* self, QWidget* widget) { + return self->isRowVisible(widget); +} + +bool QFormLayout_IsRowVisibleWithLayout(const QFormLayout* self, QLayout* layout) { + return self->isRowVisible(layout); +} + QLayoutItem* QFormLayout_ItemAt(const QFormLayout* self, int row, int role) { return self->itemAt(static_cast(row), static_cast(role)); } @@ -266,20 +283,6 @@ struct miqt_string* QFormLayout_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QFormLayout_TrUtf82(const char* s, const char* c) { - QString _ret = QFormLayout::trUtf8(s, c); - // 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* QFormLayout_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QFormLayout::trUtf8(s, c, static_cast(n)); - // 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 QFormLayout_Delete(QFormLayout* self) { delete self; } diff --git a/qt/gen_qformlayout.go b/qt/gen_qformlayout.go index 989bf29..bb07b23 100644 --- a/qt/gen_qformlayout.go +++ b/qt/gen_qformlayout.go @@ -91,15 +91,6 @@ func QFormLayout_Tr(s string) string { return _ret } -func QFormLayout_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFormLayout_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QFormLayout) SetFieldGrowthPolicy(policy QFormLayout__FieldGrowthPolicy) { C.QFormLayout_SetFieldGrowthPolicy(this.h, (C.int)(policy)) } @@ -257,6 +248,30 @@ func (this *QFormLayout) SetLayout(row int, role QFormLayout__ItemRole, layout * C.QFormLayout_SetLayout(this.h, (C.int)(row), (C.int)(role), layout.cPointer()) } +func (this *QFormLayout) SetRowVisible(row int, on bool) { + C.QFormLayout_SetRowVisible(this.h, (C.int)(row), (C.bool)(on)) +} + +func (this *QFormLayout) SetRowVisible2(widget *QWidget, on bool) { + C.QFormLayout_SetRowVisible2(this.h, widget.cPointer(), (C.bool)(on)) +} + +func (this *QFormLayout) SetRowVisible3(layout *QLayout, on bool) { + C.QFormLayout_SetRowVisible3(this.h, layout.cPointer(), (C.bool)(on)) +} + +func (this *QFormLayout) IsRowVisible(row int) bool { + return (bool)(C.QFormLayout_IsRowVisible(this.h, (C.int)(row))) +} + +func (this *QFormLayout) IsRowVisibleWithWidget(widget *QWidget) bool { + return (bool)(C.QFormLayout_IsRowVisibleWithWidget(this.h, widget.cPointer())) +} + +func (this *QFormLayout) IsRowVisibleWithLayout(layout *QLayout) bool { + return (bool)(C.QFormLayout_IsRowVisibleWithLayout(this.h, layout.cPointer())) +} + func (this *QFormLayout) ItemAt(row int, role QFormLayout__ItemRole) *QLayoutItem { return newQLayoutItem_U(unsafe.Pointer(C.QFormLayout_ItemAt(this.h, (C.int)(row), (C.int)(role)))) } @@ -345,28 +360,6 @@ func QFormLayout_Tr3(s string, c string, n int) string { return _ret } -func QFormLayout_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFormLayout_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QFormLayout_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFormLayout_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QFormLayout) Delete() { C.QFormLayout_Delete(this.h) diff --git a/qt/gen_qformlayout.h b/qt/gen_qformlayout.h index c9285f5..38e7bbd 100644 --- a/qt/gen_qformlayout.h +++ b/qt/gen_qformlayout.h @@ -42,7 +42,6 @@ QFormLayout* QFormLayout_new2(QWidget* parent); QMetaObject* QFormLayout_MetaObject(const QFormLayout* self); void* QFormLayout_Metacast(QFormLayout* self, const char* param1); struct miqt_string* QFormLayout_Tr(const char* s); -struct miqt_string* QFormLayout_TrUtf8(const char* s); void QFormLayout_SetFieldGrowthPolicy(QFormLayout* self, int policy); int QFormLayout_FieldGrowthPolicy(const QFormLayout* self); void QFormLayout_SetRowWrapPolicy(QFormLayout* self, int policy); @@ -78,6 +77,12 @@ QFormLayout__TakeRowResult* QFormLayout_TakeRowWithLayout(QFormLayout* self, QLa void QFormLayout_SetItem(QFormLayout* self, int row, int role, QLayoutItem* item); void QFormLayout_SetWidget(QFormLayout* self, int row, int role, QWidget* widget); void QFormLayout_SetLayout(QFormLayout* self, int row, int role, QLayout* layout); +void QFormLayout_SetRowVisible(QFormLayout* self, int row, bool on); +void QFormLayout_SetRowVisible2(QFormLayout* self, QWidget* widget, bool on); +void QFormLayout_SetRowVisible3(QFormLayout* self, QLayout* layout, bool on); +bool QFormLayout_IsRowVisible(const QFormLayout* self, int row); +bool QFormLayout_IsRowVisibleWithWidget(const QFormLayout* self, QWidget* widget); +bool QFormLayout_IsRowVisibleWithLayout(const QFormLayout* self, QLayout* layout); QLayoutItem* QFormLayout_ItemAt(const QFormLayout* self, int row, int role); QWidget* QFormLayout_LabelForField(const QFormLayout* self, QWidget* field); QWidget* QFormLayout_LabelForFieldWithField(const QFormLayout* self, QLayout* field); @@ -95,8 +100,6 @@ int QFormLayout_Count(const QFormLayout* self); int QFormLayout_RowCount(const QFormLayout* self); struct miqt_string* QFormLayout_Tr2(const char* s, const char* c); struct miqt_string* QFormLayout_Tr3(const char* s, const char* c, int n); -struct miqt_string* QFormLayout_TrUtf82(const char* s, const char* c); -struct miqt_string* QFormLayout_TrUtf83(const char* s, const char* c, int n); void QFormLayout_Delete(QFormLayout* self); void QFormLayout__TakeRowResult_Delete(QFormLayout__TakeRowResult* self); diff --git a/qt/gen_qframe.cpp b/qt/gen_qframe.cpp index 1f4ab04..50be0e0 100644 --- a/qt/gen_qframe.cpp +++ b/qt/gen_qframe.cpp @@ -37,13 +37,6 @@ struct miqt_string* QFrame_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QFrame_TrUtf8(const char* s) { - QString _ret = QFrame::trUtf8(s); - // 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()); -} - int QFrame_FrameStyle(const QFrame* self) { return self->frameStyle(); } @@ -116,20 +109,6 @@ struct miqt_string* QFrame_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QFrame_TrUtf82(const char* s, const char* c) { - QString _ret = QFrame::trUtf8(s, c); - // 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* QFrame_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QFrame::trUtf8(s, c, static_cast(n)); - // 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 QFrame_Delete(QFrame* self) { delete self; } diff --git a/qt/gen_qframe.go b/qt/gen_qframe.go index 6b4e744..f3bf8d1 100644 --- a/qt/gen_qframe.go +++ b/qt/gen_qframe.go @@ -100,15 +100,6 @@ func QFrame_Tr(s string) string { return _ret } -func QFrame_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFrame_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QFrame) FrameStyle() int { return (int)(C.QFrame_FrameStyle(this.h)) } @@ -193,28 +184,6 @@ func QFrame_Tr3(s string, c string, n int) string { return _ret } -func QFrame_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFrame_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QFrame_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFrame_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QFrame) Delete() { C.QFrame_Delete(this.h) diff --git a/qt/gen_qframe.h b/qt/gen_qframe.h index 17d099a..5025e63 100644 --- a/qt/gen_qframe.h +++ b/qt/gen_qframe.h @@ -33,7 +33,6 @@ QFrame* QFrame_new3(QWidget* parent, int f); QMetaObject* QFrame_MetaObject(const QFrame* self); void* QFrame_Metacast(QFrame* self, const char* param1); struct miqt_string* QFrame_Tr(const char* s); -struct miqt_string* QFrame_TrUtf8(const char* s); int QFrame_FrameStyle(const QFrame* self); void QFrame_SetFrameStyle(QFrame* self, int frameStyle); int QFrame_FrameWidth(const QFrame* self); @@ -50,8 +49,6 @@ QRect* QFrame_FrameRect(const QFrame* self); void QFrame_SetFrameRect(QFrame* self, QRect* frameRect); struct miqt_string* QFrame_Tr2(const char* s, const char* c); struct miqt_string* QFrame_Tr3(const char* s, const char* c, int n); -struct miqt_string* QFrame_TrUtf82(const char* s, const char* c); -struct miqt_string* QFrame_TrUtf83(const char* s, const char* c, int n); void QFrame_Delete(QFrame* self); #ifdef __cplusplus diff --git a/qt/gen_qfutureinterface.cpp b/qt/gen_qfutureinterface.cpp index f3883b8..4de5cc0 100644 --- a/qt/gen_qfutureinterface.cpp +++ b/qt/gen_qfutureinterface.cpp @@ -5,8 +5,6 @@ #include #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" @@ -23,6 +21,10 @@ QFutureInterfaceBase* QFutureInterfaceBase_new3(int initialState) { return new QFutureInterfaceBase(static_cast(initialState)); } +void QFutureInterfaceBase_OperatorAssign(QFutureInterfaceBase* self, QFutureInterfaceBase* other) { + self->operator=(*other); +} + void QFutureInterfaceBase_ReportStarted(QFutureInterfaceBase* self) { self->reportStarted(); } @@ -47,6 +49,10 @@ void QFutureInterfaceBase_SetThreadPool(QFutureInterfaceBase* self, QThreadPool* self->setThreadPool(pool); } +QThreadPool* QFutureInterfaceBase_ThreadPool(const QFutureInterfaceBase* self) { + return self->threadPool(); +} + void QFutureInterfaceBase_SetFilterMode(QFutureInterfaceBase* self, bool enable) { self->setFilterMode(enable); } @@ -123,6 +129,22 @@ bool QFutureInterfaceBase_IsPaused(const QFutureInterfaceBase* self) { return self->isPaused(); } +void QFutureInterfaceBase_SetPaused(QFutureInterfaceBase* self, bool paused) { + self->setPaused(paused); +} + +void QFutureInterfaceBase_TogglePaused(QFutureInterfaceBase* self) { + self->togglePaused(); +} + +bool QFutureInterfaceBase_IsSuspending(const QFutureInterfaceBase* self) { + return self->isSuspending(); +} + +bool QFutureInterfaceBase_IsSuspended(const QFutureInterfaceBase* self) { + return self->isSuspended(); +} + bool QFutureInterfaceBase_IsThrottled(const QFutureInterfaceBase* self) { return self->isThrottled(); } @@ -131,16 +153,32 @@ bool QFutureInterfaceBase_IsResultReadyAt(const QFutureInterfaceBase* self, int return self->isResultReadyAt(static_cast(index)); } +bool QFutureInterfaceBase_IsValid(const QFutureInterfaceBase* self) { + return self->isValid(); +} + +int QFutureInterfaceBase_LoadState(const QFutureInterfaceBase* self) { + return self->loadState(); +} + void QFutureInterfaceBase_Cancel(QFutureInterfaceBase* self) { self->cancel(); } -void QFutureInterfaceBase_SetPaused(QFutureInterfaceBase* self, bool paused) { - self->setPaused(paused); +void QFutureInterfaceBase_CancelAndFinish(QFutureInterfaceBase* self) { + self->cancelAndFinish(); } -void QFutureInterfaceBase_TogglePaused(QFutureInterfaceBase* self) { - self->togglePaused(); +void QFutureInterfaceBase_SetSuspended(QFutureInterfaceBase* self, bool suspend) { + self->setSuspended(suspend); +} + +void QFutureInterfaceBase_ToggleSuspended(QFutureInterfaceBase* self) { + self->toggleSuspended(); +} + +void QFutureInterfaceBase_ReportSuspended(const QFutureInterfaceBase* self) { + self->reportSuspended(); } void QFutureInterfaceBase_SetThrottled(QFutureInterfaceBase* self, bool enable) { @@ -163,32 +201,18 @@ void QFutureInterfaceBase_WaitForResume(QFutureInterfaceBase* self) { self->waitForResume(); } +void QFutureInterfaceBase_SuspendIfRequested(QFutureInterfaceBase* self) { + self->suspendIfRequested(); +} + QMutex* QFutureInterfaceBase_Mutex(const QFutureInterfaceBase* self) { - return self->mutex(); -} - -QMutex* QFutureInterfaceBase_MutexWithInt(const QFutureInterfaceBase* self, int param1) { - QMutex& _ret = self->mutex(static_cast(param1)); + QMutex& _ret = self->mutex(); // Cast returned reference into pointer return &_ret; } -QtPrivate__ExceptionStore* QFutureInterfaceBase_ExceptionStore(QFutureInterfaceBase* self) { - QtPrivate::ExceptionStore& _ret = self->exceptionStore(); - // Cast returned reference into pointer - 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_HasException(const QFutureInterfaceBase* self) { + return self->hasException(); } bool QFutureInterfaceBase_OperatorEqual(const QFutureInterfaceBase* self, QFutureInterfaceBase* other) { @@ -199,8 +223,12 @@ bool QFutureInterfaceBase_OperatorNotEqual(const QFutureInterfaceBase* self, QFu return self->operator!=(*other); } -void QFutureInterfaceBase_OperatorAssign(QFutureInterfaceBase* self, QFutureInterfaceBase* other) { - self->operator=(*other); +void QFutureInterfaceBase_Swap(QFutureInterfaceBase* self, QFutureInterfaceBase* other) { + self->swap(*other); +} + +bool QFutureInterfaceBase_IsChainCanceled(const QFutureInterfaceBase* self) { + return self->isChainCanceled(); } void QFutureInterfaceBase_Delete(QFutureInterfaceBase* self) { diff --git a/qt/gen_qfutureinterface.go b/qt/gen_qfutureinterface.go index b91f57b..8138366 100644 --- a/qt/gen_qfutureinterface.go +++ b/qt/gen_qfutureinterface.go @@ -16,13 +16,15 @@ import ( type QFutureInterfaceBase__State int const ( - QFutureInterfaceBase__NoState QFutureInterfaceBase__State = 0 - QFutureInterfaceBase__Running QFutureInterfaceBase__State = 1 - QFutureInterfaceBase__Started QFutureInterfaceBase__State = 2 - QFutureInterfaceBase__Finished QFutureInterfaceBase__State = 4 - QFutureInterfaceBase__Canceled QFutureInterfaceBase__State = 8 - QFutureInterfaceBase__Paused QFutureInterfaceBase__State = 16 - QFutureInterfaceBase__Throttled QFutureInterfaceBase__State = 32 + QFutureInterfaceBase__NoState QFutureInterfaceBase__State = 0 + QFutureInterfaceBase__Running QFutureInterfaceBase__State = 1 + QFutureInterfaceBase__Started QFutureInterfaceBase__State = 2 + QFutureInterfaceBase__Finished QFutureInterfaceBase__State = 4 + QFutureInterfaceBase__Canceled QFutureInterfaceBase__State = 8 + QFutureInterfaceBase__Suspending QFutureInterfaceBase__State = 16 + QFutureInterfaceBase__Suspended QFutureInterfaceBase__State = 32 + QFutureInterfaceBase__Throttled QFutureInterfaceBase__State = 64 + QFutureInterfaceBase__Pending QFutureInterfaceBase__State = 128 ) type QFutureInterfaceBase struct { @@ -65,6 +67,10 @@ func NewQFutureInterfaceBase3(initialState QFutureInterfaceBase__State) *QFuture return newQFutureInterfaceBase(ret) } +func (this *QFutureInterfaceBase) OperatorAssign(other *QFutureInterfaceBase) { + C.QFutureInterfaceBase_OperatorAssign(this.h, other.cPointer()) +} + func (this *QFutureInterfaceBase) ReportStarted() { C.QFutureInterfaceBase_ReportStarted(this.h) } @@ -89,6 +95,10 @@ func (this *QFutureInterfaceBase) SetThreadPool(pool *QThreadPool) { C.QFutureInterfaceBase_SetThreadPool(this.h, pool.cPointer()) } +func (this *QFutureInterfaceBase) ThreadPool() *QThreadPool { + return newQThreadPool_U(unsafe.Pointer(C.QFutureInterfaceBase_ThreadPool(this.h))) +} + func (this *QFutureInterfaceBase) SetFilterMode(enable bool) { C.QFutureInterfaceBase_SetFilterMode(this.h, (C.bool)(enable)) } @@ -166,6 +176,22 @@ func (this *QFutureInterfaceBase) IsPaused() bool { return (bool)(C.QFutureInterfaceBase_IsPaused(this.h)) } +func (this *QFutureInterfaceBase) SetPaused(paused bool) { + C.QFutureInterfaceBase_SetPaused(this.h, (C.bool)(paused)) +} + +func (this *QFutureInterfaceBase) TogglePaused() { + C.QFutureInterfaceBase_TogglePaused(this.h) +} + +func (this *QFutureInterfaceBase) IsSuspending() bool { + return (bool)(C.QFutureInterfaceBase_IsSuspending(this.h)) +} + +func (this *QFutureInterfaceBase) IsSuspended() bool { + return (bool)(C.QFutureInterfaceBase_IsSuspended(this.h)) +} + func (this *QFutureInterfaceBase) IsThrottled() bool { return (bool)(C.QFutureInterfaceBase_IsThrottled(this.h)) } @@ -174,16 +200,32 @@ func (this *QFutureInterfaceBase) IsResultReadyAt(index int) bool { return (bool)(C.QFutureInterfaceBase_IsResultReadyAt(this.h, (C.int)(index))) } +func (this *QFutureInterfaceBase) IsValid() bool { + return (bool)(C.QFutureInterfaceBase_IsValid(this.h)) +} + +func (this *QFutureInterfaceBase) LoadState() int { + return (int)(C.QFutureInterfaceBase_LoadState(this.h)) +} + func (this *QFutureInterfaceBase) Cancel() { C.QFutureInterfaceBase_Cancel(this.h) } -func (this *QFutureInterfaceBase) SetPaused(paused bool) { - C.QFutureInterfaceBase_SetPaused(this.h, (C.bool)(paused)) +func (this *QFutureInterfaceBase) CancelAndFinish() { + C.QFutureInterfaceBase_CancelAndFinish(this.h) } -func (this *QFutureInterfaceBase) TogglePaused() { - C.QFutureInterfaceBase_TogglePaused(this.h) +func (this *QFutureInterfaceBase) SetSuspended(suspend bool) { + C.QFutureInterfaceBase_SetSuspended(this.h, (C.bool)(suspend)) +} + +func (this *QFutureInterfaceBase) ToggleSuspended() { + C.QFutureInterfaceBase_ToggleSuspended(this.h) +} + +func (this *QFutureInterfaceBase) ReportSuspended() { + C.QFutureInterfaceBase_ReportSuspended(this.h) } func (this *QFutureInterfaceBase) SetThrottled(enable bool) { @@ -206,24 +248,16 @@ func (this *QFutureInterfaceBase) WaitForResume() { C.QFutureInterfaceBase_WaitForResume(this.h) } +func (this *QFutureInterfaceBase) SuspendIfRequested() { + C.QFutureInterfaceBase_SuspendIfRequested(this.h) +} + func (this *QFutureInterfaceBase) Mutex() *QMutex { return newQMutex_U(unsafe.Pointer(C.QFutureInterfaceBase_Mutex(this.h))) } -func (this *QFutureInterfaceBase) MutexWithInt(param1 int) *QMutex { - return newQMutex_U(unsafe.Pointer(C.QFutureInterfaceBase_MutexWithInt(this.h, (C.int)(param1)))) -} - -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) HasException() bool { + return (bool)(C.QFutureInterfaceBase_HasException(this.h)) } func (this *QFutureInterfaceBase) OperatorEqual(other *QFutureInterfaceBase) bool { @@ -234,8 +268,12 @@ func (this *QFutureInterfaceBase) OperatorNotEqual(other *QFutureInterfaceBase) return (bool)(C.QFutureInterfaceBase_OperatorNotEqual(this.h, other.cPointer())) } -func (this *QFutureInterfaceBase) OperatorAssign(other *QFutureInterfaceBase) { - C.QFutureInterfaceBase_OperatorAssign(this.h, other.cPointer()) +func (this *QFutureInterfaceBase) Swap(other *QFutureInterfaceBase) { + C.QFutureInterfaceBase_Swap(this.h, other.cPointer()) +} + +func (this *QFutureInterfaceBase) IsChainCanceled() bool { + return (bool)(C.QFutureInterfaceBase_IsChainCanceled(this.h)) } // Delete this object from C++ memory. diff --git a/qt/gen_qfutureinterface.h b/qt/gen_qfutureinterface.h index d86f661..a271fc8 100644 --- a/qt/gen_qfutureinterface.h +++ b/qt/gen_qfutureinterface.h @@ -18,34 +18,24 @@ class QFutureInterfaceBase; class QMutex; class QRunnable; class QThreadPool; -#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__ExceptionStore) -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(int initialState); +void QFutureInterfaceBase_OperatorAssign(QFutureInterfaceBase* self, QFutureInterfaceBase* other); void QFutureInterfaceBase_ReportStarted(QFutureInterfaceBase* self); void QFutureInterfaceBase_ReportFinished(QFutureInterfaceBase* self); void QFutureInterfaceBase_ReportCanceled(QFutureInterfaceBase* self); void QFutureInterfaceBase_ReportResultsReady(QFutureInterfaceBase* self, int beginIndex, int endIndex); void QFutureInterfaceBase_SetRunnable(QFutureInterfaceBase* self, QRunnable* runnable); void QFutureInterfaceBase_SetThreadPool(QFutureInterfaceBase* self, QThreadPool* pool); +QThreadPool* QFutureInterfaceBase_ThreadPool(const QFutureInterfaceBase* self); void QFutureInterfaceBase_SetFilterMode(QFutureInterfaceBase* self, bool enable); void QFutureInterfaceBase_SetProgressRange(QFutureInterfaceBase* self, int minimum, int maximum); int QFutureInterfaceBase_ProgressMinimum(const QFutureInterfaceBase* self); @@ -64,24 +54,31 @@ bool QFutureInterfaceBase_IsStarted(const QFutureInterfaceBase* self); bool QFutureInterfaceBase_IsCanceled(const QFutureInterfaceBase* self); bool QFutureInterfaceBase_IsFinished(const QFutureInterfaceBase* self); bool QFutureInterfaceBase_IsPaused(const QFutureInterfaceBase* self); -bool QFutureInterfaceBase_IsThrottled(const QFutureInterfaceBase* self); -bool QFutureInterfaceBase_IsResultReadyAt(const QFutureInterfaceBase* self, int index); -void QFutureInterfaceBase_Cancel(QFutureInterfaceBase* self); void QFutureInterfaceBase_SetPaused(QFutureInterfaceBase* self, bool paused); void QFutureInterfaceBase_TogglePaused(QFutureInterfaceBase* self); +bool QFutureInterfaceBase_IsSuspending(const QFutureInterfaceBase* self); +bool QFutureInterfaceBase_IsSuspended(const QFutureInterfaceBase* self); +bool QFutureInterfaceBase_IsThrottled(const QFutureInterfaceBase* self); +bool QFutureInterfaceBase_IsResultReadyAt(const QFutureInterfaceBase* self, int index); +bool QFutureInterfaceBase_IsValid(const QFutureInterfaceBase* self); +int QFutureInterfaceBase_LoadState(const QFutureInterfaceBase* self); +void QFutureInterfaceBase_Cancel(QFutureInterfaceBase* self); +void QFutureInterfaceBase_CancelAndFinish(QFutureInterfaceBase* self); +void QFutureInterfaceBase_SetSuspended(QFutureInterfaceBase* self, bool suspend); +void QFutureInterfaceBase_ToggleSuspended(QFutureInterfaceBase* self); +void QFutureInterfaceBase_ReportSuspended(const QFutureInterfaceBase* self); void QFutureInterfaceBase_SetThrottled(QFutureInterfaceBase* self, bool enable); void QFutureInterfaceBase_WaitForFinished(QFutureInterfaceBase* self); bool QFutureInterfaceBase_WaitForNextResult(QFutureInterfaceBase* self); void QFutureInterfaceBase_WaitForResult(QFutureInterfaceBase* self, int resultIndex); void QFutureInterfaceBase_WaitForResume(QFutureInterfaceBase* self); +void QFutureInterfaceBase_SuspendIfRequested(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_HasException(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); +void QFutureInterfaceBase_Swap(QFutureInterfaceBase* self, QFutureInterfaceBase* other); +bool QFutureInterfaceBase_IsChainCanceled(const QFutureInterfaceBase* self); void QFutureInterfaceBase_Delete(QFutureInterfaceBase* self); #ifdef __cplusplus diff --git a/qt/gen_qfuturewatcher.cpp b/qt/gen_qfuturewatcher.cpp index 89006a3..e577fa3 100644 --- a/qt/gen_qfuturewatcher.cpp +++ b/qt/gen_qfuturewatcher.cpp @@ -23,13 +23,6 @@ struct miqt_string* QFutureWatcherBase_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QFutureWatcherBase_TrUtf8(const char* s) { - QString _ret = QFutureWatcherBase::trUtf8(s); - // 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()); -} - int QFutureWatcherBase_ProgressValue(const QFutureWatcherBase* self) { return self->progressValue(); } @@ -69,6 +62,14 @@ bool QFutureWatcherBase_IsPaused(const QFutureWatcherBase* self) { return self->isPaused(); } +bool QFutureWatcherBase_IsSuspending(const QFutureWatcherBase* self) { + return self->isSuspending(); +} + +bool QFutureWatcherBase_IsSuspended(const QFutureWatcherBase* self) { + return self->isSuspended(); +} + void QFutureWatcherBase_WaitForFinished(QFutureWatcherBase* self) { self->waitForFinished(); } @@ -121,6 +122,26 @@ void QFutureWatcherBase_connect_Paused(QFutureWatcherBase* self, void* slot) { }); } +void QFutureWatcherBase_Suspending(QFutureWatcherBase* self) { + self->suspending(); +} + +void QFutureWatcherBase_connect_Suspending(QFutureWatcherBase* self, void* slot) { + QFutureWatcherBase::connect(self, static_cast(&QFutureWatcherBase::suspending), self, [=]() { + miqt_exec_callback_QFutureWatcherBase_Suspending(slot); + }); +} + +void QFutureWatcherBase_Suspended(QFutureWatcherBase* self) { + self->suspended(); +} + +void QFutureWatcherBase_connect_Suspended(QFutureWatcherBase* self, void* slot) { + QFutureWatcherBase::connect(self, static_cast(&QFutureWatcherBase::suspended), self, [=]() { + miqt_exec_callback_QFutureWatcherBase_Suspended(slot); + }); +} + void QFutureWatcherBase_Resumed(QFutureWatcherBase* self) { self->resumed(); } @@ -196,6 +217,22 @@ void QFutureWatcherBase_Cancel(QFutureWatcherBase* self) { self->cancel(); } +void QFutureWatcherBase_SetSuspended(QFutureWatcherBase* self, bool suspend) { + self->setSuspended(suspend); +} + +void QFutureWatcherBase_Suspend(QFutureWatcherBase* self) { + self->suspend(); +} + +void QFutureWatcherBase_Resume(QFutureWatcherBase* self) { + self->resume(); +} + +void QFutureWatcherBase_ToggleSuspended(QFutureWatcherBase* self) { + self->toggleSuspended(); +} + void QFutureWatcherBase_SetPaused(QFutureWatcherBase* self, bool paused) { self->setPaused(paused); } @@ -204,10 +241,6 @@ void QFutureWatcherBase_Pause(QFutureWatcherBase* self) { self->pause(); } -void QFutureWatcherBase_Resume(QFutureWatcherBase* self) { - self->resume(); -} - void QFutureWatcherBase_TogglePaused(QFutureWatcherBase* self) { self->togglePaused(); } @@ -226,20 +259,6 @@ struct miqt_string* QFutureWatcherBase_Tr3(const char* s, const char* c, int n) return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QFutureWatcherBase_TrUtf82(const char* s, const char* c) { - QString _ret = QFutureWatcherBase::trUtf8(s, c); - // 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* QFutureWatcherBase_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QFutureWatcherBase::trUtf8(s, c, static_cast(n)); - // 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 QFutureWatcherBase_Delete(QFutureWatcherBase* self) { delete self; } diff --git a/qt/gen_qfuturewatcher.go b/qt/gen_qfuturewatcher.go index bdef774..107a770 100644 --- a/qt/gen_qfuturewatcher.go +++ b/qt/gen_qfuturewatcher.go @@ -56,15 +56,6 @@ func QFutureWatcherBase_Tr(s string) string { return _ret } -func QFutureWatcherBase_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QFutureWatcherBase_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QFutureWatcherBase) ProgressValue() int { return (int)(C.QFutureWatcherBase_ProgressValue(this.h)) } @@ -104,6 +95,14 @@ func (this *QFutureWatcherBase) IsPaused() bool { return (bool)(C.QFutureWatcherBase_IsPaused(this.h)) } +func (this *QFutureWatcherBase) IsSuspending() bool { + return (bool)(C.QFutureWatcherBase_IsSuspending(this.h)) +} + +func (this *QFutureWatcherBase) IsSuspended() bool { + return (bool)(C.QFutureWatcherBase_IsSuspended(this.h)) +} + func (this *QFutureWatcherBase) WaitForFinished() { C.QFutureWatcherBase_WaitForFinished(this.h) } @@ -184,6 +183,40 @@ func miqt_exec_callback_QFutureWatcherBase_Paused(cb *C.void) { gofunc() } +func (this *QFutureWatcherBase) Suspending() { + C.QFutureWatcherBase_Suspending(this.h) +} +func (this *QFutureWatcherBase) OnSuspending(slot func()) { + C.QFutureWatcherBase_connect_Suspending(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) +} + +//export miqt_exec_callback_QFutureWatcherBase_Suspending +func miqt_exec_callback_QFutureWatcherBase_Suspending(cb *C.void) { + gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func()) + if !ok { + panic("miqt: callback of non-callback type (heap corruption?)") + } + + gofunc() +} + +func (this *QFutureWatcherBase) Suspended() { + C.QFutureWatcherBase_Suspended(this.h) +} +func (this *QFutureWatcherBase) OnSuspended(slot func()) { + C.QFutureWatcherBase_connect_Suspended(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) +} + +//export miqt_exec_callback_QFutureWatcherBase_Suspended +func miqt_exec_callback_QFutureWatcherBase_Suspended(cb *C.void) { + gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func()) + if !ok { + panic("miqt: callback of non-callback type (heap corruption?)") + } + + gofunc() +} + func (this *QFutureWatcherBase) Resumed() { C.QFutureWatcherBase_Resumed(this.h) } @@ -314,6 +347,22 @@ func (this *QFutureWatcherBase) Cancel() { C.QFutureWatcherBase_Cancel(this.h) } +func (this *QFutureWatcherBase) SetSuspended(suspend bool) { + C.QFutureWatcherBase_SetSuspended(this.h, (C.bool)(suspend)) +} + +func (this *QFutureWatcherBase) Suspend() { + C.QFutureWatcherBase_Suspend(this.h) +} + +func (this *QFutureWatcherBase) Resume() { + C.QFutureWatcherBase_Resume(this.h) +} + +func (this *QFutureWatcherBase) ToggleSuspended() { + C.QFutureWatcherBase_ToggleSuspended(this.h) +} + func (this *QFutureWatcherBase) SetPaused(paused bool) { C.QFutureWatcherBase_SetPaused(this.h, (C.bool)(paused)) } @@ -322,10 +371,6 @@ func (this *QFutureWatcherBase) Pause() { C.QFutureWatcherBase_Pause(this.h) } -func (this *QFutureWatcherBase) Resume() { - C.QFutureWatcherBase_Resume(this.h) -} - func (this *QFutureWatcherBase) TogglePaused() { C.QFutureWatcherBase_TogglePaused(this.h) } @@ -352,28 +397,6 @@ func QFutureWatcherBase_Tr3(s string, c string, n int) string { return _ret } -func QFutureWatcherBase_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFutureWatcherBase_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QFutureWatcherBase_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QFutureWatcherBase_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QFutureWatcherBase) Delete() { C.QFutureWatcherBase_Delete(this.h) diff --git a/qt/gen_qfuturewatcher.h b/qt/gen_qfuturewatcher.h index f1d41c9..2aeea95 100644 --- a/qt/gen_qfuturewatcher.h +++ b/qt/gen_qfuturewatcher.h @@ -26,7 +26,6 @@ typedef struct QMetaObject QMetaObject; QMetaObject* QFutureWatcherBase_MetaObject(const QFutureWatcherBase* self); void* QFutureWatcherBase_Metacast(QFutureWatcherBase* self, const char* param1); struct miqt_string* QFutureWatcherBase_Tr(const char* s); -struct miqt_string* QFutureWatcherBase_TrUtf8(const char* s); int QFutureWatcherBase_ProgressValue(const QFutureWatcherBase* self); int QFutureWatcherBase_ProgressMinimum(const QFutureWatcherBase* self); int QFutureWatcherBase_ProgressMaximum(const QFutureWatcherBase* self); @@ -36,6 +35,8 @@ bool QFutureWatcherBase_IsFinished(const QFutureWatcherBase* self); bool QFutureWatcherBase_IsRunning(const QFutureWatcherBase* self); bool QFutureWatcherBase_IsCanceled(const QFutureWatcherBase* self); bool QFutureWatcherBase_IsPaused(const QFutureWatcherBase* self); +bool QFutureWatcherBase_IsSuspending(const QFutureWatcherBase* self); +bool QFutureWatcherBase_IsSuspended(const QFutureWatcherBase* self); void QFutureWatcherBase_WaitForFinished(QFutureWatcherBase* self); void QFutureWatcherBase_SetPendingResultsLimit(QFutureWatcherBase* self, int limit); bool QFutureWatcherBase_Event(QFutureWatcherBase* self, QEvent* event); @@ -47,6 +48,10 @@ void QFutureWatcherBase_Canceled(QFutureWatcherBase* self); void QFutureWatcherBase_connect_Canceled(QFutureWatcherBase* self, void* slot); void QFutureWatcherBase_Paused(QFutureWatcherBase* self); void QFutureWatcherBase_connect_Paused(QFutureWatcherBase* self, void* slot); +void QFutureWatcherBase_Suspending(QFutureWatcherBase* self); +void QFutureWatcherBase_connect_Suspending(QFutureWatcherBase* self, void* slot); +void QFutureWatcherBase_Suspended(QFutureWatcherBase* self); +void QFutureWatcherBase_connect_Suspended(QFutureWatcherBase* self, void* slot); void QFutureWatcherBase_Resumed(QFutureWatcherBase* self); void QFutureWatcherBase_connect_Resumed(QFutureWatcherBase* self, void* slot); void QFutureWatcherBase_ResultReadyAt(QFutureWatcherBase* self, int resultIndex); @@ -60,14 +65,15 @@ void QFutureWatcherBase_connect_ProgressValueChanged(QFutureWatcherBase* self, v void QFutureWatcherBase_ProgressTextChanged(QFutureWatcherBase* self, struct miqt_string* progressText); void QFutureWatcherBase_connect_ProgressTextChanged(QFutureWatcherBase* self, void* slot); void QFutureWatcherBase_Cancel(QFutureWatcherBase* self); +void QFutureWatcherBase_SetSuspended(QFutureWatcherBase* self, bool suspend); +void QFutureWatcherBase_Suspend(QFutureWatcherBase* self); +void QFutureWatcherBase_Resume(QFutureWatcherBase* self); +void QFutureWatcherBase_ToggleSuspended(QFutureWatcherBase* self); void QFutureWatcherBase_SetPaused(QFutureWatcherBase* self, bool paused); void QFutureWatcherBase_Pause(QFutureWatcherBase* self); -void QFutureWatcherBase_Resume(QFutureWatcherBase* self); void QFutureWatcherBase_TogglePaused(QFutureWatcherBase* self); struct miqt_string* QFutureWatcherBase_Tr2(const char* s, const char* c); struct miqt_string* QFutureWatcherBase_Tr3(const char* s, const char* c, int n); -struct miqt_string* QFutureWatcherBase_TrUtf82(const char* s, const char* c); -struct miqt_string* QFutureWatcherBase_TrUtf83(const char* s, const char* c, int n); void QFutureWatcherBase_Delete(QFutureWatcherBase* self); #ifdef __cplusplus diff --git a/qt/gen_qgenericplugin.cpp b/qt/gen_qgenericplugin.cpp index 262c0bf..b41cc5d 100644 --- a/qt/gen_qgenericplugin.cpp +++ b/qt/gen_qgenericplugin.cpp @@ -23,13 +23,6 @@ struct miqt_string* QGenericPlugin_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGenericPlugin_TrUtf8(const char* s) { - QString _ret = QGenericPlugin::trUtf8(s); - // 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()); -} - QObject* QGenericPlugin_Create(QGenericPlugin* self, struct miqt_string* name, struct miqt_string* spec) { QString name_QString = QString::fromUtf8(&name->data, name->len); QString spec_QString = QString::fromUtf8(&spec->data, spec->len); @@ -50,20 +43,6 @@ struct miqt_string* QGenericPlugin_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGenericPlugin_TrUtf82(const char* s, const char* c) { - QString _ret = QGenericPlugin::trUtf8(s, c); - // 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* QGenericPlugin_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QGenericPlugin::trUtf8(s, c, static_cast(n)); - // 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 QGenericPlugin_Delete(QGenericPlugin* self) { delete self; } diff --git a/qt/gen_qgenericplugin.go b/qt/gen_qgenericplugin.go index 9bab421..d6fc1dd 100644 --- a/qt/gen_qgenericplugin.go +++ b/qt/gen_qgenericplugin.go @@ -55,15 +55,6 @@ func QGenericPlugin_Tr(s string) string { return _ret } -func QGenericPlugin_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGenericPlugin_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QGenericPlugin) Create(name string, spec string) *QObject { name_ms := miqt_strdupg(name) defer C.free(name_ms) @@ -94,28 +85,6 @@ func QGenericPlugin_Tr3(s string, c string, n int) string { return _ret } -func QGenericPlugin_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGenericPlugin_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QGenericPlugin_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGenericPlugin_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QGenericPlugin) Delete() { C.QGenericPlugin_Delete(this.h) diff --git a/qt/gen_qgenericplugin.h b/qt/gen_qgenericplugin.h index 437ae25..42117f9 100644 --- a/qt/gen_qgenericplugin.h +++ b/qt/gen_qgenericplugin.h @@ -26,12 +26,9 @@ typedef struct QObject QObject; QMetaObject* QGenericPlugin_MetaObject(const QGenericPlugin* self); void* QGenericPlugin_Metacast(QGenericPlugin* self, const char* param1); struct miqt_string* QGenericPlugin_Tr(const char* s); -struct miqt_string* QGenericPlugin_TrUtf8(const char* s); QObject* QGenericPlugin_Create(QGenericPlugin* self, struct miqt_string* name, struct miqt_string* spec); struct miqt_string* QGenericPlugin_Tr2(const char* s, const char* c); struct miqt_string* QGenericPlugin_Tr3(const char* s, const char* c, int n); -struct miqt_string* QGenericPlugin_TrUtf82(const char* s, const char* c); -struct miqt_string* QGenericPlugin_TrUtf83(const char* s, const char* c, int n); void QGenericPlugin_Delete(QGenericPlugin* self); #ifdef __cplusplus diff --git a/qt/gen_qgesture.cpp b/qt/gen_qgesture.cpp index 68e6e44..10af604 100644 --- a/qt/gen_qgesture.cpp +++ b/qt/gen_qgesture.cpp @@ -40,13 +40,6 @@ struct miqt_string* QGesture_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGesture_TrUtf8(const char* s) { - QString _ret = QGesture::trUtf8(s); - // 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()); -} - int QGesture_GestureType(const QGesture* self) { Qt::GestureType _ret = self->gestureType(); return static_cast(_ret); @@ -96,20 +89,6 @@ struct miqt_string* QGesture_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGesture_TrUtf82(const char* s, const char* c) { - QString _ret = QGesture::trUtf8(s, c); - // 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* QGesture_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QGesture::trUtf8(s, c, static_cast(n)); - // 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 QGesture_Delete(QGesture* self) { delete self; } @@ -137,13 +116,6 @@ struct miqt_string* QPanGesture_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QPanGesture_TrUtf8(const char* s) { - QString _ret = QPanGesture::trUtf8(s); - // 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()); -} - QPointF* QPanGesture_LastOffset(const QPanGesture* self) { return new QPointF(self->lastOffset()); } @@ -187,20 +159,6 @@ struct miqt_string* QPanGesture_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QPanGesture_TrUtf82(const char* s, const char* c) { - QString _ret = QPanGesture::trUtf8(s, c); - // 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* QPanGesture_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QPanGesture::trUtf8(s, c, static_cast(n)); - // 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 QPanGesture_Delete(QPanGesture* self) { delete self; } @@ -228,13 +186,6 @@ struct miqt_string* QPinchGesture_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QPinchGesture_TrUtf8(const char* s) { - QString _ret = QPinchGesture::trUtf8(s); - // 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()); -} - int QPinchGesture_TotalChangeFlags(const QPinchGesture* self) { QPinchGesture::ChangeFlags _ret = self->totalChangeFlags(); return static_cast(_ret); @@ -345,20 +296,6 @@ struct miqt_string* QPinchGesture_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QPinchGesture_TrUtf82(const char* s, const char* c) { - QString _ret = QPinchGesture::trUtf8(s, c); - // 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* QPinchGesture_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QPinchGesture::trUtf8(s, c, static_cast(n)); - // 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 QPinchGesture_Delete(QPinchGesture* self) { delete self; } @@ -386,13 +323,6 @@ struct miqt_string* QSwipeGesture_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QSwipeGesture_TrUtf8(const char* s) { - QString _ret = QSwipeGesture::trUtf8(s); - // 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()); -} - int QSwipeGesture_HorizontalDirection(const QSwipeGesture* self) { QSwipeGesture::SwipeDirection _ret = self->horizontalDirection(); return static_cast(_ret); @@ -426,20 +356,6 @@ struct miqt_string* QSwipeGesture_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QSwipeGesture_TrUtf82(const char* s, const char* c) { - QString _ret = QSwipeGesture::trUtf8(s, c); - // 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* QSwipeGesture_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QSwipeGesture::trUtf8(s, c, static_cast(n)); - // 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 QSwipeGesture_Delete(QSwipeGesture* self) { delete self; } @@ -467,13 +383,6 @@ struct miqt_string* QTapGesture_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTapGesture_TrUtf8(const char* s) { - QString _ret = QTapGesture::trUtf8(s); - // 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()); -} - QPointF* QTapGesture_Position(const QTapGesture* self) { return new QPointF(self->position()); } @@ -496,20 +405,6 @@ struct miqt_string* QTapGesture_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTapGesture_TrUtf82(const char* s, const char* c) { - QString _ret = QTapGesture::trUtf8(s, c); - // 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* QTapGesture_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QTapGesture::trUtf8(s, c, static_cast(n)); - // 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 QTapGesture_Delete(QTapGesture* self) { delete self; } @@ -537,13 +432,6 @@ struct miqt_string* QTapAndHoldGesture_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTapAndHoldGesture_TrUtf8(const char* s) { - QString _ret = QTapAndHoldGesture::trUtf8(s); - // 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()); -} - QPointF* QTapAndHoldGesture_Position(const QTapAndHoldGesture* self) { return new QPointF(self->position()); } @@ -574,20 +462,6 @@ struct miqt_string* QTapAndHoldGesture_Tr3(const char* s, const char* c, int n) return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTapAndHoldGesture_TrUtf82(const char* s, const char* c) { - QString _ret = QTapAndHoldGesture::trUtf8(s, c); - // 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* QTapAndHoldGesture_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QTapAndHoldGesture::trUtf8(s, c, static_cast(n)); - // 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 QTapAndHoldGesture_Delete(QTapAndHoldGesture* self) { delete self; } diff --git a/qt/gen_qgesture.go b/qt/gen_qgesture.go index 6036ecc..3edd8d2 100644 --- a/qt/gen_qgesture.go +++ b/qt/gen_qgesture.go @@ -92,15 +92,6 @@ func QGesture_Tr(s string) string { return _ret } -func QGesture_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGesture_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QGesture) GestureType() GestureType { return (GestureType)(C.QGesture_GestureType(this.h)) } @@ -158,28 +149,6 @@ func QGesture_Tr3(s string, c string, n int) string { return _ret } -func QGesture_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGesture_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QGesture_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGesture_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QGesture) Delete() { C.QGesture_Delete(this.h) @@ -248,15 +217,6 @@ func QPanGesture_Tr(s string) string { return _ret } -func QPanGesture_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPanGesture_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QPanGesture) LastOffset() *QPointF { _ret := C.QPanGesture_LastOffset(this.h) _goptr := newQPointF(_ret) @@ -316,28 +276,6 @@ func QPanGesture_Tr3(s string, c string, n int) string { return _ret } -func QPanGesture_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPanGesture_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QPanGesture_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPanGesture_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QPanGesture) Delete() { C.QPanGesture_Delete(this.h) @@ -406,15 +344,6 @@ func QPinchGesture_Tr(s string) string { return _ret } -func QPinchGesture_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPinchGesture_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QPinchGesture) TotalChangeFlags() QPinchGesture__ChangeFlag { return (QPinchGesture__ChangeFlag)(C.QPinchGesture_TotalChangeFlags(this.h)) } @@ -534,28 +463,6 @@ func QPinchGesture_Tr3(s string, c string, n int) string { return _ret } -func QPinchGesture_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPinchGesture_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QPinchGesture_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPinchGesture_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QPinchGesture) Delete() { C.QPinchGesture_Delete(this.h) @@ -624,15 +531,6 @@ func QSwipeGesture_Tr(s string) string { return _ret } -func QSwipeGesture_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSwipeGesture_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QSwipeGesture) HorizontalDirection() QSwipeGesture__SwipeDirection { return (QSwipeGesture__SwipeDirection)(C.QSwipeGesture_HorizontalDirection(this.h)) } @@ -671,28 +569,6 @@ func QSwipeGesture_Tr3(s string, c string, n int) string { return _ret } -func QSwipeGesture_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSwipeGesture_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QSwipeGesture_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSwipeGesture_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QSwipeGesture) Delete() { C.QSwipeGesture_Delete(this.h) @@ -761,15 +637,6 @@ func QTapGesture_Tr(s string) string { return _ret } -func QTapGesture_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTapGesture_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QTapGesture) Position() *QPointF { _ret := C.QTapGesture_Position(this.h) _goptr := newQPointF(_ret) @@ -803,28 +670,6 @@ func QTapGesture_Tr3(s string, c string, n int) string { return _ret } -func QTapGesture_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTapGesture_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QTapGesture_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTapGesture_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QTapGesture) Delete() { C.QTapGesture_Delete(this.h) @@ -893,15 +738,6 @@ func QTapAndHoldGesture_Tr(s string) string { return _ret } -func QTapAndHoldGesture_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTapAndHoldGesture_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QTapAndHoldGesture) Position() *QPointF { _ret := C.QTapAndHoldGesture_Position(this.h) _goptr := newQPointF(_ret) @@ -943,28 +779,6 @@ func QTapAndHoldGesture_Tr3(s string, c string, n int) string { return _ret } -func QTapAndHoldGesture_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTapAndHoldGesture_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QTapAndHoldGesture_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTapAndHoldGesture_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QTapAndHoldGesture) Delete() { C.QTapAndHoldGesture_Delete(this.h) diff --git a/qt/gen_qgesture.h b/qt/gen_qgesture.h index 32ffa54..899fc07 100644 --- a/qt/gen_qgesture.h +++ b/qt/gen_qgesture.h @@ -44,7 +44,6 @@ QGesture* QGesture_new2(QObject* parent); QMetaObject* QGesture_MetaObject(const QGesture* self); void* QGesture_Metacast(QGesture* self, const char* param1); struct miqt_string* QGesture_Tr(const char* s); -struct miqt_string* QGesture_TrUtf8(const char* s); int QGesture_GestureType(const QGesture* self); int QGesture_State(const QGesture* self); QPointF* QGesture_HotSpot(const QGesture* self); @@ -55,8 +54,6 @@ 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); -struct miqt_string* QGesture_TrUtf83(const char* s, const char* c, int n); void QGesture_Delete(QGesture* self); QPanGesture* QPanGesture_new(); @@ -64,7 +61,6 @@ QPanGesture* QPanGesture_new2(QObject* parent); QMetaObject* QPanGesture_MetaObject(const QPanGesture* self); void* QPanGesture_Metacast(QPanGesture* self, const char* param1); struct miqt_string* QPanGesture_Tr(const char* s); -struct miqt_string* QPanGesture_TrUtf8(const char* s); QPointF* QPanGesture_LastOffset(const QPanGesture* self); QPointF* QPanGesture_Offset(const QPanGesture* self); QPointF* QPanGesture_Delta(const QPanGesture* self); @@ -74,8 +70,6 @@ void QPanGesture_SetOffset(QPanGesture* self, QPointF* value); void QPanGesture_SetAcceleration(QPanGesture* self, double value); struct miqt_string* QPanGesture_Tr2(const char* s, const char* c); struct miqt_string* QPanGesture_Tr3(const char* s, const char* c, int n); -struct miqt_string* QPanGesture_TrUtf82(const char* s, const char* c); -struct miqt_string* QPanGesture_TrUtf83(const char* s, const char* c, int n); void QPanGesture_Delete(QPanGesture* self); QPinchGesture* QPinchGesture_new(); @@ -83,7 +77,6 @@ QPinchGesture* QPinchGesture_new2(QObject* parent); QMetaObject* QPinchGesture_MetaObject(const QPinchGesture* self); void* QPinchGesture_Metacast(QPinchGesture* self, const char* param1); struct miqt_string* QPinchGesture_Tr(const char* s); -struct miqt_string* QPinchGesture_TrUtf8(const char* s); int QPinchGesture_TotalChangeFlags(const QPinchGesture* self); void QPinchGesture_SetTotalChangeFlags(QPinchGesture* self, int value); int QPinchGesture_ChangeFlags(const QPinchGesture* self); @@ -108,8 +101,6 @@ void QPinchGesture_SetLastRotationAngle(QPinchGesture* self, double value); void QPinchGesture_SetRotationAngle(QPinchGesture* self, double value); struct miqt_string* QPinchGesture_Tr2(const char* s, const char* c); struct miqt_string* QPinchGesture_Tr3(const char* s, const char* c, int n); -struct miqt_string* QPinchGesture_TrUtf82(const char* s, const char* c); -struct miqt_string* QPinchGesture_TrUtf83(const char* s, const char* c, int n); void QPinchGesture_Delete(QPinchGesture* self); QSwipeGesture* QSwipeGesture_new(); @@ -117,15 +108,12 @@ QSwipeGesture* QSwipeGesture_new2(QObject* parent); QMetaObject* QSwipeGesture_MetaObject(const QSwipeGesture* self); void* QSwipeGesture_Metacast(QSwipeGesture* self, const char* param1); struct miqt_string* QSwipeGesture_Tr(const char* s); -struct miqt_string* QSwipeGesture_TrUtf8(const char* s); 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); struct miqt_string* QSwipeGesture_Tr3(const char* s, const char* c, int n); -struct miqt_string* QSwipeGesture_TrUtf82(const char* s, const char* c); -struct miqt_string* QSwipeGesture_TrUtf83(const char* s, const char* c, int n); void QSwipeGesture_Delete(QSwipeGesture* self); QTapGesture* QTapGesture_new(); @@ -133,13 +121,10 @@ QTapGesture* QTapGesture_new2(QObject* parent); QMetaObject* QTapGesture_MetaObject(const QTapGesture* self); void* QTapGesture_Metacast(QTapGesture* self, const char* param1); struct miqt_string* QTapGesture_Tr(const char* s); -struct miqt_string* QTapGesture_TrUtf8(const char* s); QPointF* QTapGesture_Position(const QTapGesture* self); void QTapGesture_SetPosition(QTapGesture* self, QPointF* pos); struct miqt_string* QTapGesture_Tr2(const char* s, const char* c); struct miqt_string* QTapGesture_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTapGesture_TrUtf82(const char* s, const char* c); -struct miqt_string* QTapGesture_TrUtf83(const char* s, const char* c, int n); void QTapGesture_Delete(QTapGesture* self); QTapAndHoldGesture* QTapAndHoldGesture_new(); @@ -147,15 +132,12 @@ QTapAndHoldGesture* QTapAndHoldGesture_new2(QObject* parent); QMetaObject* QTapAndHoldGesture_MetaObject(const QTapAndHoldGesture* self); void* QTapAndHoldGesture_Metacast(QTapAndHoldGesture* self, const char* param1); struct miqt_string* QTapAndHoldGesture_Tr(const char* s); -struct miqt_string* QTapAndHoldGesture_TrUtf8(const char* s); QPointF* QTapAndHoldGesture_Position(const QTapAndHoldGesture* self); void QTapAndHoldGesture_SetPosition(QTapAndHoldGesture* self, QPointF* pos); void QTapAndHoldGesture_SetTimeout(int msecs); int QTapAndHoldGesture_Timeout(); struct miqt_string* QTapAndHoldGesture_Tr2(const char* s, const char* c); struct miqt_string* QTapAndHoldGesture_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTapAndHoldGesture_TrUtf82(const char* s, const char* c); -struct miqt_string* QTapAndHoldGesture_TrUtf83(const char* s, const char* c, int n); void QTapAndHoldGesture_Delete(QTapAndHoldGesture* self); QGestureEvent* QGestureEvent_new(struct miqt_array* /* of QGesture* */ gestures); diff --git a/qt/gen_qglyphrun.cpp b/qt/gen_qglyphrun.cpp index a651f3b..c29f05a 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(); + QList _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) { @@ -49,7 +49,7 @@ struct miqt_array* QGlyphRun_GlyphIndexes(const QGlyphRun* self) { } void QGlyphRun_SetGlyphIndexes(QGlyphRun* self, struct miqt_array* /* of unsigned int */ glyphIndexes) { - QVector glyphIndexes_QList; + QList glyphIndexes_QList; glyphIndexes_QList.reserve(glyphIndexes->len); unsigned int* glyphIndexes_arr = static_cast(glyphIndexes->data); for(size_t i = 0; i < glyphIndexes->len; ++i) { @@ -59,7 +59,7 @@ void QGlyphRun_SetGlyphIndexes(QGlyphRun* self, struct miqt_array* /* of unsigne } struct miqt_array* QGlyphRun_Positions(const QGlyphRun* self) { - QVector _ret = self->positions(); + QList _ret = self->positions(); // Convert QList<> from C++ memory to manually-managed C memory QPointF** _arr = static_cast(malloc(sizeof(QPointF*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -72,7 +72,7 @@ struct miqt_array* QGlyphRun_Positions(const QGlyphRun* self) { } void QGlyphRun_SetPositions(QGlyphRun* self, struct miqt_array* /* of QPointF* */ positions) { - QVector positions_QList; + QList positions_QList; positions_QList.reserve(positions->len); QPointF** positions_arr = static_cast(positions->data); for(size_t i = 0; i < positions->len; ++i) { diff --git a/qt/gen_qglyphrun.go b/qt/gen_qglyphrun.go index f1c9b92..7d17a6e 100644 --- a/qt/gen_qglyphrun.go +++ b/qt/gen_qglyphrun.go @@ -108,10 +108,10 @@ func (this *QGlyphRun) Positions() []QPointF { _ret := make([]QPointF, int(_ma.len)) _outCast := (*[0xffff]*C.QPointF)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _vv_ret := _outCast[i] - _vv_goptr := newQPointF(_vv_ret) - _vv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_vv_goptr + _lv_ret := _outCast[i] + _lv_goptr := newQPointF(_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 diff --git a/qt/gen_qgraphicsanchorlayout.cpp b/qt/gen_qgraphicsanchorlayout.cpp index bc7d1c4..113f459 100644 --- a/qt/gen_qgraphicsanchorlayout.cpp +++ b/qt/gen_qgraphicsanchorlayout.cpp @@ -25,13 +25,6 @@ struct miqt_string* QGraphicsAnchor_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGraphicsAnchor_TrUtf8(const char* s) { - QString _ret = QGraphicsAnchor::trUtf8(s); - // 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 QGraphicsAnchor_SetSpacing(QGraphicsAnchor* self, double spacing) { self->setSpacing(static_cast(spacing)); } @@ -68,20 +61,6 @@ struct miqt_string* QGraphicsAnchor_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGraphicsAnchor_TrUtf82(const char* s, const char* c) { - QString _ret = QGraphicsAnchor::trUtf8(s, c); - // 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* QGraphicsAnchor_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QGraphicsAnchor::trUtf8(s, c, static_cast(n)); - // 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 QGraphicsAnchor_Delete(QGraphicsAnchor* self) { delete self; } diff --git a/qt/gen_qgraphicsanchorlayout.go b/qt/gen_qgraphicsanchorlayout.go index 3c8fa23..038be4b 100644 --- a/qt/gen_qgraphicsanchorlayout.go +++ b/qt/gen_qgraphicsanchorlayout.go @@ -55,15 +55,6 @@ func QGraphicsAnchor_Tr(s string) string { return _ret } -func QGraphicsAnchor_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsAnchor_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QGraphicsAnchor) SetSpacing(spacing float64) { C.QGraphicsAnchor_SetSpacing(this.h, (C.double)(spacing)) } @@ -106,28 +97,6 @@ func QGraphicsAnchor_Tr3(s string, c string, n int) string { return _ret } -func QGraphicsAnchor_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsAnchor_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QGraphicsAnchor_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsAnchor_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QGraphicsAnchor) Delete() { C.QGraphicsAnchor_Delete(this.h) diff --git a/qt/gen_qgraphicsanchorlayout.h b/qt/gen_qgraphicsanchorlayout.h index 289e05a..2468764 100644 --- a/qt/gen_qgraphicsanchorlayout.h +++ b/qt/gen_qgraphicsanchorlayout.h @@ -30,7 +30,6 @@ typedef struct QRectF QRectF; QMetaObject* QGraphicsAnchor_MetaObject(const QGraphicsAnchor* self); void* QGraphicsAnchor_Metacast(QGraphicsAnchor* self, const char* param1); struct miqt_string* QGraphicsAnchor_Tr(const char* s); -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); @@ -38,8 +37,6 @@ 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); -struct miqt_string* QGraphicsAnchor_TrUtf83(const char* s, const char* c, int n); void QGraphicsAnchor_Delete(QGraphicsAnchor* self); QGraphicsAnchorLayout* QGraphicsAnchorLayout_new(); diff --git a/qt/gen_qgraphicseffect.cpp b/qt/gen_qgraphicseffect.cpp index f9bf51b..9b632ee 100644 --- a/qt/gen_qgraphicseffect.cpp +++ b/qt/gen_qgraphicseffect.cpp @@ -31,13 +31,6 @@ struct miqt_string* QGraphicsEffect_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGraphicsEffect_TrUtf8(const char* s) { - QString _ret = QGraphicsEffect::trUtf8(s); - // 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()); -} - QRectF* QGraphicsEffect_BoundingRectFor(const QGraphicsEffect* self, QRectF* sourceRect) { return new QRectF(self->boundingRectFor(*sourceRect)); } @@ -83,20 +76,6 @@ struct miqt_string* QGraphicsEffect_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGraphicsEffect_TrUtf82(const char* s, const char* c) { - QString _ret = QGraphicsEffect::trUtf8(s, c); - // 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* QGraphicsEffect_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QGraphicsEffect::trUtf8(s, c, static_cast(n)); - // 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 QGraphicsEffect_Delete(QGraphicsEffect* self) { delete self; } @@ -124,13 +103,6 @@ struct miqt_string* QGraphicsColorizeEffect_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGraphicsColorizeEffect_TrUtf8(const char* s) { - QString _ret = QGraphicsColorizeEffect::trUtf8(s); - // 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()); -} - QColor* QGraphicsColorizeEffect_Color(const QGraphicsColorizeEffect* self) { return new QColor(self->color()); } @@ -187,20 +159,6 @@ struct miqt_string* QGraphicsColorizeEffect_Tr3(const char* s, const char* c, in return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGraphicsColorizeEffect_TrUtf82(const char* s, const char* c) { - QString _ret = QGraphicsColorizeEffect::trUtf8(s, c); - // 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* QGraphicsColorizeEffect_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QGraphicsColorizeEffect::trUtf8(s, c, static_cast(n)); - // 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 QGraphicsColorizeEffect_Delete(QGraphicsColorizeEffect* self) { delete self; } @@ -228,13 +186,6 @@ struct miqt_string* QGraphicsBlurEffect_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGraphicsBlurEffect_TrUtf8(const char* s) { - QString _ret = QGraphicsBlurEffect::trUtf8(s); - // 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()); -} - QRectF* QGraphicsBlurEffect_BoundingRectFor(const QGraphicsBlurEffect* self, QRectF* rect) { return new QRectF(self->boundingRectFor(*rect)); } @@ -295,20 +246,6 @@ struct miqt_string* QGraphicsBlurEffect_Tr3(const char* s, const char* c, int n) return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGraphicsBlurEffect_TrUtf82(const char* s, const char* c) { - QString _ret = QGraphicsBlurEffect::trUtf8(s, c); - // 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* QGraphicsBlurEffect_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QGraphicsBlurEffect::trUtf8(s, c, static_cast(n)); - // 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 QGraphicsBlurEffect_Delete(QGraphicsBlurEffect* self) { delete self; } @@ -336,13 +273,6 @@ struct miqt_string* QGraphicsDropShadowEffect_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGraphicsDropShadowEffect_TrUtf8(const char* s) { - QString _ret = QGraphicsDropShadowEffect::trUtf8(s); - // 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()); -} - QRectF* QGraphicsDropShadowEffect_BoundingRectFor(const QGraphicsDropShadowEffect* self, QRectF* rect) { return new QRectF(self->boundingRectFor(*rect)); } @@ -450,20 +380,6 @@ struct miqt_string* QGraphicsDropShadowEffect_Tr3(const char* s, const char* c, return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGraphicsDropShadowEffect_TrUtf82(const char* s, const char* c) { - QString _ret = QGraphicsDropShadowEffect::trUtf8(s, c); - // 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* QGraphicsDropShadowEffect_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QGraphicsDropShadowEffect::trUtf8(s, c, static_cast(n)); - // 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 QGraphicsDropShadowEffect_Delete(QGraphicsDropShadowEffect* self) { delete self; } @@ -491,13 +407,6 @@ struct miqt_string* QGraphicsOpacityEffect_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGraphicsOpacityEffect_TrUtf8(const char* s) { - QString _ret = QGraphicsOpacityEffect::trUtf8(s); - // 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()); -} - double QGraphicsOpacityEffect_Opacity(const QGraphicsOpacityEffect* self) { qreal _ret = self->opacity(); return static_cast(_ret); @@ -554,20 +463,6 @@ struct miqt_string* QGraphicsOpacityEffect_Tr3(const char* s, const char* c, int return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGraphicsOpacityEffect_TrUtf82(const char* s, const char* c) { - QString _ret = QGraphicsOpacityEffect::trUtf8(s, c); - // 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* QGraphicsOpacityEffect_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QGraphicsOpacityEffect::trUtf8(s, c, static_cast(n)); - // 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 QGraphicsOpacityEffect_Delete(QGraphicsOpacityEffect* self) { delete self; } diff --git a/qt/gen_qgraphicseffect.go b/qt/gen_qgraphicseffect.go index 49d1b91..172dc3c 100644 --- a/qt/gen_qgraphicseffect.go +++ b/qt/gen_qgraphicseffect.go @@ -81,15 +81,6 @@ func QGraphicsEffect_Tr(s string) string { return _ret } -func QGraphicsEffect_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsEffect_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QGraphicsEffect) BoundingRectFor(sourceRect *QRectF) *QRectF { _ret := C.QGraphicsEffect_BoundingRectFor(this.h, sourceRect.cPointer()) _goptr := newQRectF(_ret) @@ -158,28 +149,6 @@ func QGraphicsEffect_Tr3(s string, c string, n int) string { return _ret } -func QGraphicsEffect_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsEffect_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QGraphicsEffect_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsEffect_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QGraphicsEffect) Delete() { C.QGraphicsEffect_Delete(this.h) @@ -248,15 +217,6 @@ func QGraphicsColorizeEffect_Tr(s string) string { return _ret } -func QGraphicsColorizeEffect_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsColorizeEffect_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QGraphicsColorizeEffect) Color() *QColor { _ret := C.QGraphicsColorizeEffect_Color(this.h) _goptr := newQColor(_ret) @@ -338,28 +298,6 @@ func QGraphicsColorizeEffect_Tr3(s string, c string, n int) string { return _ret } -func QGraphicsColorizeEffect_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsColorizeEffect_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QGraphicsColorizeEffect_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsColorizeEffect_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QGraphicsColorizeEffect) Delete() { C.QGraphicsColorizeEffect_Delete(this.h) @@ -428,15 +366,6 @@ func QGraphicsBlurEffect_Tr(s string) string { return _ret } -func QGraphicsBlurEffect_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsBlurEffect_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QGraphicsBlurEffect) BoundingRectFor(rect *QRectF) *QRectF { _ret := C.QGraphicsBlurEffect_BoundingRectFor(this.h, rect.cPointer()) _goptr := newQRectF(_ret) @@ -522,28 +451,6 @@ func QGraphicsBlurEffect_Tr3(s string, c string, n int) string { return _ret } -func QGraphicsBlurEffect_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsBlurEffect_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QGraphicsBlurEffect_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsBlurEffect_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QGraphicsBlurEffect) Delete() { C.QGraphicsBlurEffect_Delete(this.h) @@ -612,15 +519,6 @@ func QGraphicsDropShadowEffect_Tr(s string) string { return _ret } -func QGraphicsDropShadowEffect_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsDropShadowEffect_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QGraphicsDropShadowEffect) BoundingRectFor(rect *QRectF) *QRectF { _ret := C.QGraphicsDropShadowEffect_BoundingRectFor(this.h, rect.cPointer()) _goptr := newQRectF(_ret) @@ -764,28 +662,6 @@ func QGraphicsDropShadowEffect_Tr3(s string, c string, n int) string { return _ret } -func QGraphicsDropShadowEffect_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsDropShadowEffect_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QGraphicsDropShadowEffect_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsDropShadowEffect_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QGraphicsDropShadowEffect) Delete() { C.QGraphicsDropShadowEffect_Delete(this.h) @@ -854,15 +730,6 @@ func QGraphicsOpacityEffect_Tr(s string) string { return _ret } -func QGraphicsOpacityEffect_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsOpacityEffect_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QGraphicsOpacityEffect) Opacity() float64 { return (float64)(C.QGraphicsOpacityEffect_Opacity(this.h)) } @@ -944,28 +811,6 @@ func QGraphicsOpacityEffect_Tr3(s string, c string, n int) string { return _ret } -func QGraphicsOpacityEffect_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsOpacityEffect_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QGraphicsOpacityEffect_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsOpacityEffect_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QGraphicsOpacityEffect) Delete() { C.QGraphicsOpacityEffect_Delete(this.h) diff --git a/qt/gen_qgraphicseffect.h b/qt/gen_qgraphicseffect.h index df2a6e9..9349273 100644 --- a/qt/gen_qgraphicseffect.h +++ b/qt/gen_qgraphicseffect.h @@ -42,7 +42,6 @@ typedef struct QRectF QRectF; QMetaObject* QGraphicsEffect_MetaObject(const QGraphicsEffect* self); void* QGraphicsEffect_Metacast(QGraphicsEffect* self, const char* param1); struct miqt_string* QGraphicsEffect_Tr(const char* s); -struct miqt_string* QGraphicsEffect_TrUtf8(const char* s); QRectF* QGraphicsEffect_BoundingRectFor(const QGraphicsEffect* self, QRectF* sourceRect); QRectF* QGraphicsEffect_BoundingRect(const QGraphicsEffect* self); bool QGraphicsEffect_IsEnabled(const QGraphicsEffect* self); @@ -52,8 +51,6 @@ void QGraphicsEffect_EnabledChanged(QGraphicsEffect* self, bool enabled); void QGraphicsEffect_connect_EnabledChanged(QGraphicsEffect* self, void* slot); struct miqt_string* QGraphicsEffect_Tr2(const char* s, const char* c); struct miqt_string* QGraphicsEffect_Tr3(const char* s, const char* c, int n); -struct miqt_string* QGraphicsEffect_TrUtf82(const char* s, const char* c); -struct miqt_string* QGraphicsEffect_TrUtf83(const char* s, const char* c, int n); void QGraphicsEffect_Delete(QGraphicsEffect* self); QGraphicsColorizeEffect* QGraphicsColorizeEffect_new(); @@ -61,7 +58,6 @@ QGraphicsColorizeEffect* QGraphicsColorizeEffect_new2(QObject* parent); QMetaObject* QGraphicsColorizeEffect_MetaObject(const QGraphicsColorizeEffect* self); void* QGraphicsColorizeEffect_Metacast(QGraphicsColorizeEffect* self, const char* param1); struct miqt_string* QGraphicsColorizeEffect_Tr(const char* s); -struct miqt_string* QGraphicsColorizeEffect_TrUtf8(const char* s); QColor* QGraphicsColorizeEffect_Color(const QGraphicsColorizeEffect* self); double QGraphicsColorizeEffect_Strength(const QGraphicsColorizeEffect* self); void QGraphicsColorizeEffect_SetColor(QGraphicsColorizeEffect* self, QColor* c); @@ -72,8 +68,6 @@ void QGraphicsColorizeEffect_StrengthChanged(QGraphicsColorizeEffect* self, doub void QGraphicsColorizeEffect_connect_StrengthChanged(QGraphicsColorizeEffect* self, void* slot); struct miqt_string* QGraphicsColorizeEffect_Tr2(const char* s, const char* c); struct miqt_string* QGraphicsColorizeEffect_Tr3(const char* s, const char* c, int n); -struct miqt_string* QGraphicsColorizeEffect_TrUtf82(const char* s, const char* c); -struct miqt_string* QGraphicsColorizeEffect_TrUtf83(const char* s, const char* c, int n); void QGraphicsColorizeEffect_Delete(QGraphicsColorizeEffect* self); QGraphicsBlurEffect* QGraphicsBlurEffect_new(); @@ -81,7 +75,6 @@ QGraphicsBlurEffect* QGraphicsBlurEffect_new2(QObject* parent); QMetaObject* QGraphicsBlurEffect_MetaObject(const QGraphicsBlurEffect* self); void* QGraphicsBlurEffect_Metacast(QGraphicsBlurEffect* self, const char* param1); struct miqt_string* QGraphicsBlurEffect_Tr(const char* s); -struct miqt_string* QGraphicsBlurEffect_TrUtf8(const char* s); QRectF* QGraphicsBlurEffect_BoundingRectFor(const QGraphicsBlurEffect* self, QRectF* rect); double QGraphicsBlurEffect_BlurRadius(const QGraphicsBlurEffect* self); int QGraphicsBlurEffect_BlurHints(const QGraphicsBlurEffect* self); @@ -93,8 +86,6 @@ void QGraphicsBlurEffect_BlurHintsChanged(QGraphicsBlurEffect* self, int hints); void QGraphicsBlurEffect_connect_BlurHintsChanged(QGraphicsBlurEffect* self, void* slot); struct miqt_string* QGraphicsBlurEffect_Tr2(const char* s, const char* c); struct miqt_string* QGraphicsBlurEffect_Tr3(const char* s, const char* c, int n); -struct miqt_string* QGraphicsBlurEffect_TrUtf82(const char* s, const char* c); -struct miqt_string* QGraphicsBlurEffect_TrUtf83(const char* s, const char* c, int n); void QGraphicsBlurEffect_Delete(QGraphicsBlurEffect* self); QGraphicsDropShadowEffect* QGraphicsDropShadowEffect_new(); @@ -102,7 +93,6 @@ QGraphicsDropShadowEffect* QGraphicsDropShadowEffect_new2(QObject* parent); QMetaObject* QGraphicsDropShadowEffect_MetaObject(const QGraphicsDropShadowEffect* self); void* QGraphicsDropShadowEffect_Metacast(QGraphicsDropShadowEffect* self, const char* param1); struct miqt_string* QGraphicsDropShadowEffect_Tr(const char* s); -struct miqt_string* QGraphicsDropShadowEffect_TrUtf8(const char* s); QRectF* QGraphicsDropShadowEffect_BoundingRectFor(const QGraphicsDropShadowEffect* self, QRectF* rect); QPointF* QGraphicsDropShadowEffect_Offset(const QGraphicsDropShadowEffect* self); double QGraphicsDropShadowEffect_XOffset(const QGraphicsDropShadowEffect* self); @@ -124,8 +114,6 @@ void QGraphicsDropShadowEffect_ColorChanged(QGraphicsDropShadowEffect* self, QCo void QGraphicsDropShadowEffect_connect_ColorChanged(QGraphicsDropShadowEffect* self, void* slot); struct miqt_string* QGraphicsDropShadowEffect_Tr2(const char* s, const char* c); struct miqt_string* QGraphicsDropShadowEffect_Tr3(const char* s, const char* c, int n); -struct miqt_string* QGraphicsDropShadowEffect_TrUtf82(const char* s, const char* c); -struct miqt_string* QGraphicsDropShadowEffect_TrUtf83(const char* s, const char* c, int n); void QGraphicsDropShadowEffect_Delete(QGraphicsDropShadowEffect* self); QGraphicsOpacityEffect* QGraphicsOpacityEffect_new(); @@ -133,7 +121,6 @@ QGraphicsOpacityEffect* QGraphicsOpacityEffect_new2(QObject* parent); QMetaObject* QGraphicsOpacityEffect_MetaObject(const QGraphicsOpacityEffect* self); void* QGraphicsOpacityEffect_Metacast(QGraphicsOpacityEffect* self, const char* param1); struct miqt_string* QGraphicsOpacityEffect_Tr(const char* s); -struct miqt_string* QGraphicsOpacityEffect_TrUtf8(const char* s); double QGraphicsOpacityEffect_Opacity(const QGraphicsOpacityEffect* self); QBrush* QGraphicsOpacityEffect_OpacityMask(const QGraphicsOpacityEffect* self); void QGraphicsOpacityEffect_SetOpacity(QGraphicsOpacityEffect* self, double opacity); @@ -144,8 +131,6 @@ void QGraphicsOpacityEffect_OpacityMaskChanged(QGraphicsOpacityEffect* self, QBr void QGraphicsOpacityEffect_connect_OpacityMaskChanged(QGraphicsOpacityEffect* self, void* slot); struct miqt_string* QGraphicsOpacityEffect_Tr2(const char* s, const char* c); struct miqt_string* QGraphicsOpacityEffect_Tr3(const char* s, const char* c, int n); -struct miqt_string* QGraphicsOpacityEffect_TrUtf82(const char* s, const char* c); -struct miqt_string* QGraphicsOpacityEffect_TrUtf83(const char* s, const char* c, int n); void QGraphicsOpacityEffect_Delete(QGraphicsOpacityEffect* self); #ifdef __cplusplus diff --git a/qt/gen_qgraphicsitem.cpp b/qt/gen_qgraphicsitem.cpp index 50ed3ba..e3d070e 100644 --- a/qt/gen_qgraphicsitem.cpp +++ b/qt/gen_qgraphicsitem.cpp @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include @@ -388,22 +387,6 @@ void QGraphicsItem_EnsureVisible2(QGraphicsItem* self, double x, double y, doubl self->ensureVisible(static_cast(x), static_cast(y), static_cast(w), static_cast(h)); } -QMatrix* QGraphicsItem_Matrix(const QGraphicsItem* self) { - return new QMatrix(self->matrix()); -} - -QMatrix* QGraphicsItem_SceneMatrix(const QGraphicsItem* self) { - return new QMatrix(self->sceneMatrix()); -} - -void QGraphicsItem_SetMatrix(QGraphicsItem* self, QMatrix* matrix) { - self->setMatrix(*matrix); -} - -void QGraphicsItem_ResetMatrix(QGraphicsItem* self) { - self->resetMatrix(); -} - QTransform* QGraphicsItem_Transform(const QGraphicsItem* self) { return new QTransform(self->transform()); } @@ -785,10 +768,6 @@ void QGraphicsItem_EnsureVisible6(QGraphicsItem* self, double x, double y, doubl self->ensureVisible(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(xmargin), static_cast(ymargin)); } -void QGraphicsItem_SetMatrix2(QGraphicsItem* self, QMatrix* matrix, bool combine) { - self->setMatrix(*matrix, combine); -} - QTransform* QGraphicsItem_ItemTransform2(const QGraphicsItem* self, QGraphicsItem* other, bool* ok) { return new QTransform(self->itemTransform(other, ok)); } @@ -853,13 +832,6 @@ struct miqt_string* QGraphicsObject_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGraphicsObject_TrUtf8(const char* s) { - QString _ret = QGraphicsObject::trUtf8(s); - // 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 QGraphicsObject_GrabGesture(QGraphicsObject* self, int typeVal) { self->grabGesture(static_cast(typeVal)); } @@ -1002,20 +974,6 @@ struct miqt_string* QGraphicsObject_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGraphicsObject_TrUtf82(const char* s, const char* c) { - QString _ret = QGraphicsObject::trUtf8(s, c); - // 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* QGraphicsObject_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QGraphicsObject::trUtf8(s, c, static_cast(n)); - // 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 QGraphicsObject_GrabGesture2(QGraphicsObject* self, int typeVal, int flags) { self->grabGesture(static_cast(typeVal), static_cast(flags)); } @@ -1524,13 +1482,6 @@ struct miqt_string* QGraphicsTextItem_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGraphicsTextItem_TrUtf8(const char* s) { - QString _ret = QGraphicsTextItem::trUtf8(s); - // 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* QGraphicsTextItem_ToHtml(const QGraphicsTextItem* self) { QString _ret = self->toHtml(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -1697,20 +1648,6 @@ struct miqt_string* QGraphicsTextItem_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGraphicsTextItem_TrUtf82(const char* s, const char* c) { - QString _ret = QGraphicsTextItem::trUtf8(s, c); - // 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* QGraphicsTextItem_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QGraphicsTextItem::trUtf8(s, c, static_cast(n)); - // 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 QGraphicsTextItem_Delete(QGraphicsTextItem* self) { delete self; } diff --git a/qt/gen_qgraphicsitem.go b/qt/gen_qgraphicsitem.go index 2026f2e..b15ff5f 100644 --- a/qt/gen_qgraphicsitem.go +++ b/qt/gen_qgraphicsitem.go @@ -43,7 +43,6 @@ type QGraphicsItem__GraphicsItemChange int const ( QGraphicsItem__ItemPositionChange QGraphicsItem__GraphicsItemChange = 0 - QGraphicsItem__ItemMatrixChange QGraphicsItem__GraphicsItemChange = 1 QGraphicsItem__ItemVisibleChange QGraphicsItem__GraphicsItemChange = 2 QGraphicsItem__ItemEnabledChange QGraphicsItem__GraphicsItemChange = 3 QGraphicsItem__ItemSelectedChange QGraphicsItem__GraphicsItemChange = 4 @@ -530,28 +529,6 @@ func (this *QGraphicsItem) EnsureVisible2(x float64, y float64, w float64, h flo C.QGraphicsItem_EnsureVisible2(this.h, (C.double)(x), (C.double)(y), (C.double)(w), (C.double)(h)) } -func (this *QGraphicsItem) Matrix() *QMatrix { - _ret := C.QGraphicsItem_Matrix(this.h) - _goptr := newQMatrix(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QGraphicsItem) SceneMatrix() *QMatrix { - _ret := C.QGraphicsItem_SceneMatrix(this.h) - _goptr := newQMatrix(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QGraphicsItem) SetMatrix(matrix *QMatrix) { - C.QGraphicsItem_SetMatrix(this.h, matrix.cPointer()) -} - -func (this *QGraphicsItem) ResetMatrix() { - C.QGraphicsItem_ResetMatrix(this.h) -} - func (this *QGraphicsItem) Transform() *QTransform { _ret := C.QGraphicsItem_Transform(this.h) _goptr := newQTransform(_ret) @@ -1055,10 +1032,6 @@ func (this *QGraphicsItem) EnsureVisible6(x float64, y float64, w float64, h flo C.QGraphicsItem_EnsureVisible6(this.h, (C.double)(x), (C.double)(y), (C.double)(w), (C.double)(h), (C.int)(xmargin), (C.int)(ymargin)) } -func (this *QGraphicsItem) SetMatrix2(matrix *QMatrix, combine bool) { - C.QGraphicsItem_SetMatrix2(this.h, matrix.cPointer(), (C.bool)(combine)) -} - func (this *QGraphicsItem) ItemTransform2(other *QGraphicsItem, ok *bool) *QTransform { _ret := C.QGraphicsItem_ItemTransform2(this.h, other.cPointer(), (*C.bool)(unsafe.Pointer(ok))) _goptr := newQTransform(_ret) @@ -1162,15 +1135,6 @@ func QGraphicsObject_Tr(s string) string { return _ret } -func QGraphicsObject_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsObject_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QGraphicsObject) GrabGesture(typeVal GestureType) { C.QGraphicsObject_GrabGesture(this.h, (C.int)(typeVal)) } @@ -1405,28 +1369,6 @@ func QGraphicsObject_Tr3(s string, c string, n int) string { return _ret } -func QGraphicsObject_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsObject_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QGraphicsObject_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsObject_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QGraphicsObject) GrabGesture2(typeVal GestureType, flags GestureFlag) { C.QGraphicsObject_GrabGesture2(this.h, (C.int)(typeVal), (C.int)(flags)) } @@ -2350,15 +2292,6 @@ func QGraphicsTextItem_Tr(s string) string { return _ret } -func QGraphicsTextItem_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsTextItem_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QGraphicsTextItem) ToHtml() string { var _ms *C.struct_miqt_string = C.QGraphicsTextItem_ToHtml(this.h) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) @@ -2571,28 +2504,6 @@ func QGraphicsTextItem_Tr3(s string, c string, n int) string { return _ret } -func QGraphicsTextItem_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsTextItem_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QGraphicsTextItem_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsTextItem_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QGraphicsTextItem) Delete() { C.QGraphicsTextItem_Delete(this.h) diff --git a/qt/gen_qgraphicsitem.h b/qt/gen_qgraphicsitem.h index b250b4d..1aa8317 100644 --- a/qt/gen_qgraphicsitem.h +++ b/qt/gen_qgraphicsitem.h @@ -35,7 +35,6 @@ class QGraphicsTextItem; class QGraphicsTransform; class QGraphicsWidget; class QLineF; -class QMatrix; class QMetaObject; class QPainter; class QPainterPath; @@ -73,7 +72,6 @@ typedef struct QGraphicsTextItem QGraphicsTextItem; typedef struct QGraphicsTransform QGraphicsTransform; typedef struct QGraphicsWidget QGraphicsWidget; typedef struct QLineF QLineF; -typedef struct QMatrix QMatrix; typedef struct QMetaObject QMetaObject; typedef struct QPainter QPainter; typedef struct QPainterPath QPainterPath; @@ -172,10 +170,6 @@ void QGraphicsItem_SetPos2(QGraphicsItem* self, double x, double y); void QGraphicsItem_MoveBy(QGraphicsItem* self, double dx, double dy); void QGraphicsItem_EnsureVisible(QGraphicsItem* self); void QGraphicsItem_EnsureVisible2(QGraphicsItem* self, double x, double y, double w, double h); -QMatrix* QGraphicsItem_Matrix(const QGraphicsItem* self); -QMatrix* QGraphicsItem_SceneMatrix(const QGraphicsItem* self); -void QGraphicsItem_SetMatrix(QGraphicsItem* self, QMatrix* matrix); -void QGraphicsItem_ResetMatrix(QGraphicsItem* self); QTransform* QGraphicsItem_Transform(const QGraphicsItem* self); QTransform* QGraphicsItem_SceneTransform(const QGraphicsItem* self); QTransform* QGraphicsItem_DeviceTransform(const QGraphicsItem* self, QTransform* viewportTransform); @@ -264,7 +258,6 @@ void QGraphicsItem_EnsureVisible22(QGraphicsItem* self, QRectF* rect, int xmargi void QGraphicsItem_EnsureVisible3(QGraphicsItem* self, QRectF* rect, int xmargin, int ymargin); void QGraphicsItem_EnsureVisible5(QGraphicsItem* self, double x, double y, double w, double h, int xmargin); void QGraphicsItem_EnsureVisible6(QGraphicsItem* self, double x, double y, double w, double h, int xmargin, int ymargin); -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, int mode); @@ -279,7 +272,6 @@ void QGraphicsItem_Delete(QGraphicsItem* self); QMetaObject* QGraphicsObject_MetaObject(const QGraphicsObject* self); void* QGraphicsObject_Metacast(QGraphicsObject* self, const char* param1); struct miqt_string* QGraphicsObject_Tr(const char* s); -struct miqt_string* QGraphicsObject_TrUtf8(const char* s); void QGraphicsObject_GrabGesture(QGraphicsObject* self, int typeVal); void QGraphicsObject_UngrabGesture(QGraphicsObject* self, int typeVal); void QGraphicsObject_ParentChanged(QGraphicsObject* self); @@ -308,8 +300,6 @@ void QGraphicsObject_HeightChanged(QGraphicsObject* self); void QGraphicsObject_connect_HeightChanged(QGraphicsObject* self, void* slot); 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, int typeVal, int flags); void QGraphicsObject_Delete(QGraphicsObject* self); @@ -443,7 +433,6 @@ QGraphicsTextItem* QGraphicsTextItem_new4(struct miqt_string* text, QGraphicsIte QMetaObject* QGraphicsTextItem_MetaObject(const QGraphicsTextItem* self); void* QGraphicsTextItem_Metacast(QGraphicsTextItem* self, const char* param1); struct miqt_string* QGraphicsTextItem_Tr(const char* s); -struct miqt_string* QGraphicsTextItem_TrUtf8(const char* s); struct miqt_string* QGraphicsTextItem_ToHtml(const QGraphicsTextItem* self); void QGraphicsTextItem_SetHtml(QGraphicsTextItem* self, struct miqt_string* html); struct miqt_string* QGraphicsTextItem_ToPlainText(const QGraphicsTextItem* self); @@ -478,8 +467,6 @@ void QGraphicsTextItem_LinkHovered(QGraphicsTextItem* self, struct miqt_string* void QGraphicsTextItem_connect_LinkHovered(QGraphicsTextItem* self, void* slot); struct miqt_string* QGraphicsTextItem_Tr2(const char* s, const char* c); struct miqt_string* QGraphicsTextItem_Tr3(const char* s, const char* c, int n); -struct miqt_string* QGraphicsTextItem_TrUtf82(const char* s, const char* c); -struct miqt_string* QGraphicsTextItem_TrUtf83(const char* s, const char* c, int n); void QGraphicsTextItem_Delete(QGraphicsTextItem* self); QGraphicsSimpleTextItem* QGraphicsSimpleTextItem_new(); diff --git a/qt/gen_qgraphicsitemanimation.cpp b/qt/gen_qgraphicsitemanimation.cpp index 1bbec65..958da49 100644 --- a/qt/gen_qgraphicsitemanimation.cpp +++ b/qt/gen_qgraphicsitemanimation.cpp @@ -1,6 +1,5 @@ #include #include -#include #include #include #include @@ -36,13 +35,6 @@ struct miqt_string* QGraphicsItemAnimation_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGraphicsItemAnimation_TrUtf8(const char* s) { - QString _ret = QGraphicsItemAnimation::trUtf8(s); - // 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()); -} - QGraphicsItem* QGraphicsItemAnimation_Item(const QGraphicsItemAnimation* self) { return self->item(); } @@ -67,10 +59,6 @@ void QGraphicsItemAnimation_SetPosAt(QGraphicsItemAnimation* self, double step, self->setPosAt(static_cast(step), *pos); } -QMatrix* QGraphicsItemAnimation_MatrixAt(const QGraphicsItemAnimation* self, double step) { - return new QMatrix(self->matrixAt(static_cast(step))); -} - QTransform* QGraphicsItemAnimation_TransformAt(const QGraphicsItemAnimation* self, double step) { return new QTransform(self->transformAt(static_cast(step))); } @@ -134,10 +122,6 @@ void QGraphicsItemAnimation_SetStep(QGraphicsItemAnimation* self, double x) { self->setStep(static_cast(x)); } -void QGraphicsItemAnimation_Reset(QGraphicsItemAnimation* self) { - self->reset(); -} - struct miqt_string* QGraphicsItemAnimation_Tr2(const char* s, const char* c) { QString _ret = QGraphicsItemAnimation::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -152,20 +136,6 @@ struct miqt_string* QGraphicsItemAnimation_Tr3(const char* s, const char* c, int return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGraphicsItemAnimation_TrUtf82(const char* s, const char* c) { - QString _ret = QGraphicsItemAnimation::trUtf8(s, c); - // 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* QGraphicsItemAnimation_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QGraphicsItemAnimation::trUtf8(s, c, static_cast(n)); - // 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 QGraphicsItemAnimation_Delete(QGraphicsItemAnimation* self) { delete self; } diff --git a/qt/gen_qgraphicsitemanimation.go b/qt/gen_qgraphicsitemanimation.go index 59ab538..67c700b 100644 --- a/qt/gen_qgraphicsitemanimation.go +++ b/qt/gen_qgraphicsitemanimation.go @@ -67,15 +67,6 @@ func QGraphicsItemAnimation_Tr(s string) string { return _ret } -func QGraphicsItemAnimation_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsItemAnimation_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QGraphicsItemAnimation) Item() *QGraphicsItem { return newQGraphicsItem_U(unsafe.Pointer(C.QGraphicsItemAnimation_Item(this.h))) } @@ -103,13 +94,6 @@ func (this *QGraphicsItemAnimation) SetPosAt(step float64, pos *QPointF) { C.QGraphicsItemAnimation_SetPosAt(this.h, (C.double)(step), pos.cPointer()) } -func (this *QGraphicsItemAnimation) MatrixAt(step float64) *QMatrix { - _ret := C.QGraphicsItemAnimation_MatrixAt(this.h, (C.double)(step)) - _goptr := newQMatrix(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - func (this *QGraphicsItemAnimation) TransformAt(step float64) *QTransform { _ret := C.QGraphicsItemAnimation_TransformAt(this.h, (C.double)(step)) _goptr := newQTransform(_ret) @@ -169,10 +153,6 @@ func (this *QGraphicsItemAnimation) SetStep(x float64) { C.QGraphicsItemAnimation_SetStep(this.h, (C.double)(x)) } -func (this *QGraphicsItemAnimation) Reset() { - C.QGraphicsItemAnimation_Reset(this.h) -} - func QGraphicsItemAnimation_Tr2(s string, c string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) @@ -195,28 +175,6 @@ func QGraphicsItemAnimation_Tr3(s string, c string, n int) string { return _ret } -func QGraphicsItemAnimation_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsItemAnimation_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QGraphicsItemAnimation_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsItemAnimation_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QGraphicsItemAnimation) Delete() { C.QGraphicsItemAnimation_Delete(this.h) diff --git a/qt/gen_qgraphicsitemanimation.h b/qt/gen_qgraphicsitemanimation.h index 6fe58e6..c2a4330 100644 --- a/qt/gen_qgraphicsitemanimation.h +++ b/qt/gen_qgraphicsitemanimation.h @@ -16,7 +16,6 @@ extern "C" { #ifdef __cplusplus class QGraphicsItem; class QGraphicsItemAnimation; -class QMatrix; class QMetaObject; class QObject; class QPointF; @@ -25,7 +24,6 @@ class QTransform; #else typedef struct QGraphicsItem QGraphicsItem; typedef struct QGraphicsItemAnimation QGraphicsItemAnimation; -typedef struct QMatrix QMatrix; typedef struct QMetaObject QMetaObject; typedef struct QObject QObject; typedef struct QPointF QPointF; @@ -38,14 +36,12 @@ QGraphicsItemAnimation* QGraphicsItemAnimation_new2(QObject* parent); QMetaObject* QGraphicsItemAnimation_MetaObject(const QGraphicsItemAnimation* self); void* QGraphicsItemAnimation_Metacast(QGraphicsItemAnimation* self, const char* param1); struct miqt_string* QGraphicsItemAnimation_Tr(const char* s); -struct miqt_string* QGraphicsItemAnimation_TrUtf8(const char* s); QGraphicsItem* QGraphicsItemAnimation_Item(const QGraphicsItemAnimation* self); void QGraphicsItemAnimation_SetItem(QGraphicsItemAnimation* self, QGraphicsItem* item); QTimeLine* QGraphicsItemAnimation_TimeLine(const QGraphicsItemAnimation* self); void QGraphicsItemAnimation_SetTimeLine(QGraphicsItemAnimation* self, QTimeLine* timeLine); QPointF* QGraphicsItemAnimation_PosAt(const QGraphicsItemAnimation* self, double step); void QGraphicsItemAnimation_SetPosAt(QGraphicsItemAnimation* self, double step, QPointF* pos); -QMatrix* QGraphicsItemAnimation_MatrixAt(const QGraphicsItemAnimation* self, double step); QTransform* QGraphicsItemAnimation_TransformAt(const QGraphicsItemAnimation* self, double step); double QGraphicsItemAnimation_RotationAt(const QGraphicsItemAnimation* self, double step); void QGraphicsItemAnimation_SetRotationAt(QGraphicsItemAnimation* self, double step, double angle); @@ -60,11 +56,8 @@ double QGraphicsItemAnimation_HorizontalShearAt(const QGraphicsItemAnimation* se void QGraphicsItemAnimation_SetShearAt(QGraphicsItemAnimation* self, double step, double sh, double sv); void QGraphicsItemAnimation_Clear(QGraphicsItemAnimation* self); void QGraphicsItemAnimation_SetStep(QGraphicsItemAnimation* self, double x); -void QGraphicsItemAnimation_Reset(QGraphicsItemAnimation* self); struct miqt_string* QGraphicsItemAnimation_Tr2(const char* s, const char* c); struct miqt_string* QGraphicsItemAnimation_Tr3(const char* s, const char* c, int n); -struct miqt_string* QGraphicsItemAnimation_TrUtf82(const char* s, const char* c); -struct miqt_string* QGraphicsItemAnimation_TrUtf83(const char* s, const char* c, int n); void QGraphicsItemAnimation_Delete(QGraphicsItemAnimation* self); #ifdef __cplusplus diff --git a/qt/gen_qgraphicslayoutitem.cpp b/qt/gen_qgraphicslayoutitem.cpp index 3b4fb3a..f9051a6 100644 --- a/qt/gen_qgraphicslayoutitem.cpp +++ b/qt/gen_qgraphicslayoutitem.cpp @@ -133,6 +133,10 @@ void QGraphicsLayoutItem_UpdateGeometry(QGraphicsLayoutItem* self) { self->updateGeometry(); } +bool QGraphicsLayoutItem_IsEmpty(const QGraphicsLayoutItem* self) { + return self->isEmpty(); +} + QGraphicsLayoutItem* QGraphicsLayoutItem_ParentLayoutItem(const QGraphicsLayoutItem* self) { return self->parentLayoutItem(); } diff --git a/qt/gen_qgraphicslayoutitem.go b/qt/gen_qgraphicslayoutitem.go index 3faba8f..f396861 100644 --- a/qt/gen_qgraphicslayoutitem.go +++ b/qt/gen_qgraphicslayoutitem.go @@ -176,6 +176,10 @@ func (this *QGraphicsLayoutItem) UpdateGeometry() { C.QGraphicsLayoutItem_UpdateGeometry(this.h) } +func (this *QGraphicsLayoutItem) IsEmpty() bool { + return (bool)(C.QGraphicsLayoutItem_IsEmpty(this.h)) +} + func (this *QGraphicsLayoutItem) ParentLayoutItem() *QGraphicsLayoutItem { return newQGraphicsLayoutItem_U(unsafe.Pointer(C.QGraphicsLayoutItem_ParentLayoutItem(this.h))) } diff --git a/qt/gen_qgraphicslayoutitem.h b/qt/gen_qgraphicslayoutitem.h index e0baabe..bc9da67 100644 --- a/qt/gen_qgraphicslayoutitem.h +++ b/qt/gen_qgraphicslayoutitem.h @@ -57,6 +57,7 @@ void QGraphicsLayoutItem_GetContentsMargins(const QGraphicsLayoutItem* self, dou QRectF* QGraphicsLayoutItem_ContentsRect(const QGraphicsLayoutItem* self); QSizeF* QGraphicsLayoutItem_EffectiveSizeHint(const QGraphicsLayoutItem* self, int which); void QGraphicsLayoutItem_UpdateGeometry(QGraphicsLayoutItem* self); +bool QGraphicsLayoutItem_IsEmpty(const QGraphicsLayoutItem* self); QGraphicsLayoutItem* QGraphicsLayoutItem_ParentLayoutItem(const QGraphicsLayoutItem* self); void QGraphicsLayoutItem_SetParentLayoutItem(QGraphicsLayoutItem* self, QGraphicsLayoutItem* parent); bool QGraphicsLayoutItem_IsLayout(const QGraphicsLayoutItem* self); diff --git a/qt/gen_qgraphicsproxywidget.cpp b/qt/gen_qgraphicsproxywidget.cpp index cb86872..d16b6f6 100644 --- a/qt/gen_qgraphicsproxywidget.cpp +++ b/qt/gen_qgraphicsproxywidget.cpp @@ -39,13 +39,6 @@ struct miqt_string* QGraphicsProxyWidget_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGraphicsProxyWidget_TrUtf8(const char* s) { - QString _ret = QGraphicsProxyWidget::trUtf8(s); - // 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 QGraphicsProxyWidget_SetWidget(QGraphicsProxyWidget* self, QWidget* widget) { self->setWidget(widget); } @@ -88,20 +81,6 @@ struct miqt_string* QGraphicsProxyWidget_Tr3(const char* s, const char* c, int n return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGraphicsProxyWidget_TrUtf82(const char* s, const char* c) { - QString _ret = QGraphicsProxyWidget::trUtf8(s, c); - // 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* QGraphicsProxyWidget_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QGraphicsProxyWidget::trUtf8(s, c, static_cast(n)); - // 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 QGraphicsProxyWidget_Delete(QGraphicsProxyWidget* self) { delete self; } diff --git a/qt/gen_qgraphicsproxywidget.go b/qt/gen_qgraphicsproxywidget.go index a57f2a8..f06ff87 100644 --- a/qt/gen_qgraphicsproxywidget.go +++ b/qt/gen_qgraphicsproxywidget.go @@ -79,15 +79,6 @@ func QGraphicsProxyWidget_Tr(s string) string { return _ret } -func QGraphicsProxyWidget_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsProxyWidget_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QGraphicsProxyWidget) SetWidget(widget *QWidget) { C.QGraphicsProxyWidget_SetWidget(this.h, widget.cPointer()) } @@ -141,28 +132,6 @@ func QGraphicsProxyWidget_Tr3(s string, c string, n int) string { return _ret } -func QGraphicsProxyWidget_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsProxyWidget_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QGraphicsProxyWidget_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsProxyWidget_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QGraphicsProxyWidget) Delete() { C.QGraphicsProxyWidget_Delete(this.h) diff --git a/qt/gen_qgraphicsproxywidget.h b/qt/gen_qgraphicsproxywidget.h index 3dedc86..c2e4303 100644 --- a/qt/gen_qgraphicsproxywidget.h +++ b/qt/gen_qgraphicsproxywidget.h @@ -37,7 +37,6 @@ QGraphicsProxyWidget* QGraphicsProxyWidget_new3(QGraphicsItem* parent, int wFlag QMetaObject* QGraphicsProxyWidget_MetaObject(const QGraphicsProxyWidget* self); void* QGraphicsProxyWidget_Metacast(QGraphicsProxyWidget* self, const char* param1); struct miqt_string* QGraphicsProxyWidget_Tr(const char* s); -struct miqt_string* QGraphicsProxyWidget_TrUtf8(const char* s); void QGraphicsProxyWidget_SetWidget(QGraphicsProxyWidget* self, QWidget* widget); QWidget* QGraphicsProxyWidget_Widget(const QGraphicsProxyWidget* self); QRectF* QGraphicsProxyWidget_SubWidgetRect(const QGraphicsProxyWidget* self, QWidget* widget); @@ -47,8 +46,6 @@ int QGraphicsProxyWidget_Type(const QGraphicsProxyWidget* self); QGraphicsProxyWidget* QGraphicsProxyWidget_CreateProxyForChildWidget(QGraphicsProxyWidget* self, QWidget* child); struct miqt_string* QGraphicsProxyWidget_Tr2(const char* s, const char* c); struct miqt_string* QGraphicsProxyWidget_Tr3(const char* s, const char* c, int n); -struct miqt_string* QGraphicsProxyWidget_TrUtf82(const char* s, const char* c); -struct miqt_string* QGraphicsProxyWidget_TrUtf83(const char* s, const char* c, int n); void QGraphicsProxyWidget_Delete(QGraphicsProxyWidget* self); #ifdef __cplusplus diff --git a/qt/gen_qgraphicsscene.cpp b/qt/gen_qgraphicsscene.cpp index e5987e2..63ace4b 100644 --- a/qt/gen_qgraphicsscene.cpp +++ b/qt/gen_qgraphicsscene.cpp @@ -75,13 +75,6 @@ struct miqt_string* QGraphicsScene_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGraphicsScene_TrUtf8(const char* s) { - QString _ret = QGraphicsScene::trUtf8(s); - // 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()); -} - QRectF* QGraphicsScene_SceneRect(const QGraphicsScene* self) { return new QRectF(self->sceneRect()); } @@ -117,14 +110,6 @@ void QGraphicsScene_SetItemIndexMethod(QGraphicsScene* self, int method) { self->setItemIndexMethod(static_cast(method)); } -bool QGraphicsScene_IsSortCacheEnabled(const QGraphicsScene* self) { - return self->isSortCacheEnabled(); -} - -void QGraphicsScene_SetSortCacheEnabled(QGraphicsScene* self, bool enabled) { - self->setSortCacheEnabled(enabled); -} - int QGraphicsScene_BspTreeDepth(const QGraphicsScene* self) { return self->bspTreeDepth(); } @@ -189,6 +174,19 @@ struct miqt_array* QGraphicsScene_ItemsWithPath(const QGraphicsScene* self, QPai return _out; } +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) { + _arr[i] = _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_array* QGraphicsScene_CollidingItems(const QGraphicsScene* self, QGraphicsItem* item) { QList _ret = self->collidingItems(item); // Convert QList<> from C++ memory to manually-managed C memory @@ -206,19 +204,6 @@ 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, 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) { - _arr[i] = _ret[i]; - } - struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); - _out->len = _ret.length(); - _out->data = static_cast(_arr); - return _out; -} - QGraphicsItem* QGraphicsScene_ItemAt2(const QGraphicsScene* self, double x, double y, QTransform* deviceTransform) { return self->itemAt(static_cast(x), static_cast(y), *deviceTransform); } @@ -248,10 +233,6 @@ void QGraphicsScene_SetSelectionAreaWithPath(QGraphicsScene* self, QPainterPath* self->setSelectionArea(*path); } -void QGraphicsScene_SetSelectionArea2(QGraphicsScene* self, QPainterPath* path, int selectionOperation) { - self->setSelectionArea(*path, static_cast(selectionOperation)); -} - QGraphicsItemGroup* QGraphicsScene_CreateItemGroup(QGraphicsScene* self, struct miqt_array* /* of QGraphicsItem* */ items) { QList items_QList; items_QList.reserve(items->len); @@ -555,20 +536,6 @@ struct miqt_string* QGraphicsScene_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGraphicsScene_TrUtf82(const char* s, const char* c) { - QString _ret = QGraphicsScene::trUtf8(s, c); - // 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* QGraphicsScene_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QGraphicsScene::trUtf8(s, c, static_cast(n)); - // 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 QGraphicsScene_Render2(QGraphicsScene* self, QPainter* painter, QRectF* target) { self->render(painter, *target); } @@ -711,19 +678,6 @@ struct miqt_array* QGraphicsScene_Items44(const QGraphicsScene* self, QPainterPa return _out; } -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) { - _arr[i] = _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_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 @@ -737,15 +691,24 @@ struct miqt_array* QGraphicsScene_Items7(const QGraphicsScene* self, double x, d return _out; } -void QGraphicsScene_SetSelectionArea22(QGraphicsScene* self, QPainterPath* path, int mode) { - self->setSelectionArea(*path, 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) { + _arr[i] = _ret[i]; + } + struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); + _out->len = _ret.length(); + _out->data = static_cast(_arr); + return _out; } -void QGraphicsScene_SetSelectionArea3(QGraphicsScene* self, QPainterPath* path, int mode, QTransform* deviceTransform) { - self->setSelectionArea(*path, static_cast(mode), *deviceTransform); +void QGraphicsScene_SetSelectionArea2(QGraphicsScene* self, QPainterPath* path, int selectionOperation) { + self->setSelectionArea(*path, static_cast(selectionOperation)); } -void QGraphicsScene_SetSelectionArea32(QGraphicsScene* self, QPainterPath* path, int selectionOperation, int mode) { +void QGraphicsScene_SetSelectionArea3(QGraphicsScene* self, QPainterPath* path, int selectionOperation, int mode) { self->setSelectionArea(*path, static_cast(selectionOperation), static_cast(mode)); } diff --git a/qt/gen_qgraphicsscene.go b/qt/gen_qgraphicsscene.go index 86bd7fd..9ef1634 100644 --- a/qt/gen_qgraphicsscene.go +++ b/qt/gen_qgraphicsscene.go @@ -108,15 +108,6 @@ func QGraphicsScene_Tr(s string) string { return _ret } -func QGraphicsScene_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsScene_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QGraphicsScene) SceneRect() *QRectF { _ret := C.QGraphicsScene_SceneRect(this.h) _goptr := newQRectF(_ret) @@ -152,14 +143,6 @@ func (this *QGraphicsScene) SetItemIndexMethod(method QGraphicsScene__ItemIndexM C.QGraphicsScene_SetItemIndexMethod(this.h, (C.int)(method)) } -func (this *QGraphicsScene) IsSortCacheEnabled() bool { - return (bool)(C.QGraphicsScene_IsSortCacheEnabled(this.h)) -} - -func (this *QGraphicsScene) SetSortCacheEnabled(enabled bool) { - C.QGraphicsScene_SetSortCacheEnabled(this.h, (C.bool)(enabled)) -} - func (this *QGraphicsScene) BspTreeDepth() int { return (int)(C.QGraphicsScene_BspTreeDepth(this.h)) } @@ -219,6 +202,17 @@ func (this *QGraphicsScene) ItemsWithPath(path *QPainterPath) []*QGraphicsItem { return _ret } +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.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++ { + _ret[i] = newQGraphicsItem_U(unsafe.Pointer(_outCast[i])) + } + C.free(unsafe.Pointer(_ma)) + return _ret +} + func (this *QGraphicsScene) CollidingItems(item *QGraphicsItem) []*QGraphicsItem { var _ma *C.struct_miqt_array = C.QGraphicsScene_CollidingItems(this.h, item.cPointer()) _ret := make([]*QGraphicsItem, int(_ma.len)) @@ -234,17 +228,6 @@ func (this *QGraphicsScene) ItemAt(pos *QPointF, deviceTransform *QTransform) *Q return newQGraphicsItem_U(unsafe.Pointer(C.QGraphicsScene_ItemAt(this.h, pos.cPointer(), deviceTransform.cPointer()))) } -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.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++ { - _ret[i] = newQGraphicsItem_U(unsafe.Pointer(_outCast[i])) - } - C.free(unsafe.Pointer(_ma)) - return _ret -} - func (this *QGraphicsScene) ItemAt2(x float64, y float64, deviceTransform *QTransform) *QGraphicsItem { return newQGraphicsItem_U(unsafe.Pointer(C.QGraphicsScene_ItemAt2(this.h, (C.double)(x), (C.double)(y), deviceTransform.cPointer()))) } @@ -275,10 +258,6 @@ func (this *QGraphicsScene) SetSelectionAreaWithPath(path *QPainterPath) { C.QGraphicsScene_SetSelectionAreaWithPath(this.h, path.cPointer()) } -func (this *QGraphicsScene) SetSelectionArea2(path *QPainterPath, selectionOperation ItemSelectionOperation) { - C.QGraphicsScene_SetSelectionArea2(this.h, path.cPointer(), (C.int)(selectionOperation)) -} - func (this *QGraphicsScene) CreateItemGroup(items []*QGraphicsItem) *QGraphicsItemGroup { // For the C ABI, malloc a C array of raw pointers items_CArray := (*[0xffff]*C.QGraphicsItem)(C.malloc(C.size_t(8 * len(items)))) @@ -640,28 +619,6 @@ func QGraphicsScene_Tr3(s string, c string, n int) string { return _ret } -func QGraphicsScene_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsScene_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QGraphicsScene_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsScene_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QGraphicsScene) Render2(painter *QPainter, target *QRectF) { C.QGraphicsScene_Render2(this.h, painter.cPointer(), target.cPointer()) } @@ -784,17 +741,6 @@ func (this *QGraphicsScene) Items44(path *QPainterPath, mode ItemSelectionMode, return _ret } -func (this *QGraphicsScene) CollidingItems2(item *QGraphicsItem, mode ItemSelectionMode) []*QGraphicsItem { - 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++ { - _ret[i] = newQGraphicsItem_U(unsafe.Pointer(_outCast[i])) - } - C.free(unsafe.Pointer(_ma)) - return _ret -} - 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.int)(mode), (C.int)(order), deviceTransform.cPointer()) _ret := make([]*QGraphicsItem, int(_ma.len)) @@ -806,16 +752,23 @@ func (this *QGraphicsScene) Items7(x float64, y float64, w float64, h float64, m return _ret } -func (this *QGraphicsScene) SetSelectionArea22(path *QPainterPath, mode ItemSelectionMode) { - C.QGraphicsScene_SetSelectionArea22(this.h, path.cPointer(), (C.int)(mode)) +func (this *QGraphicsScene) CollidingItems2(item *QGraphicsItem, mode ItemSelectionMode) []*QGraphicsItem { + 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++ { + _ret[i] = newQGraphicsItem_U(unsafe.Pointer(_outCast[i])) + } + C.free(unsafe.Pointer(_ma)) + return _ret } -func (this *QGraphicsScene) SetSelectionArea3(path *QPainterPath, mode ItemSelectionMode, deviceTransform *QTransform) { - C.QGraphicsScene_SetSelectionArea3(this.h, path.cPointer(), (C.int)(mode), deviceTransform.cPointer()) +func (this *QGraphicsScene) SetSelectionArea2(path *QPainterPath, selectionOperation ItemSelectionOperation) { + C.QGraphicsScene_SetSelectionArea2(this.h, path.cPointer(), (C.int)(selectionOperation)) } -func (this *QGraphicsScene) SetSelectionArea32(path *QPainterPath, selectionOperation ItemSelectionOperation, mode ItemSelectionMode) { - C.QGraphicsScene_SetSelectionArea32(this.h, path.cPointer(), (C.int)(selectionOperation), (C.int)(mode)) +func (this *QGraphicsScene) SetSelectionArea3(path *QPainterPath, selectionOperation ItemSelectionOperation, mode ItemSelectionMode) { + C.QGraphicsScene_SetSelectionArea3(this.h, path.cPointer(), (C.int)(selectionOperation), (C.int)(mode)) } func (this *QGraphicsScene) SetSelectionArea4(path *QPainterPath, selectionOperation ItemSelectionOperation, mode ItemSelectionMode, deviceTransform *QTransform) { diff --git a/qt/gen_qgraphicsscene.h b/qt/gen_qgraphicsscene.h index 8d573b4..7ae7f87 100644 --- a/qt/gen_qgraphicsscene.h +++ b/qt/gen_qgraphicsscene.h @@ -86,7 +86,6 @@ QGraphicsScene* QGraphicsScene_new6(double x, double y, double width, double hei QMetaObject* QGraphicsScene_MetaObject(const QGraphicsScene* self); void* QGraphicsScene_Metacast(QGraphicsScene* self, const char* param1); struct miqt_string* QGraphicsScene_Tr(const char* s); -struct miqt_string* QGraphicsScene_TrUtf8(const char* s); QRectF* QGraphicsScene_SceneRect(const QGraphicsScene* self); double QGraphicsScene_Width(const QGraphicsScene* self); double QGraphicsScene_Height(const QGraphicsScene* self); @@ -95,8 +94,6 @@ void QGraphicsScene_SetSceneRect2(QGraphicsScene* self, double x, double y, doub void QGraphicsScene_Render(QGraphicsScene* self, QPainter* painter); 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); void QGraphicsScene_SetBspTreeDepth(QGraphicsScene* self, int depth); QRectF* QGraphicsScene_ItemsBoundingRect(const QGraphicsScene* self); @@ -104,15 +101,14 @@ struct miqt_array* QGraphicsScene_Items(const QGraphicsScene* self); struct miqt_array* QGraphicsScene_ItemsWithPos(const QGraphicsScene* self, QPointF* pos); struct miqt_array* QGraphicsScene_ItemsWithRect(const QGraphicsScene* self, QRectF* rect); struct miqt_array* QGraphicsScene_ItemsWithPath(const QGraphicsScene* self, QPainterPath* path); +struct miqt_array* QGraphicsScene_Items2(const QGraphicsScene* self, double x, double y, double w, double h, int mode, int order); 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, 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, 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); @@ -175,8 +171,6 @@ void QGraphicsScene_FocusItemChanged(QGraphicsScene* self, QGraphicsItem* newFoc 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); -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, int aspectRatioMode); @@ -190,11 +184,10 @@ struct miqt_array* QGraphicsScene_Items42(const QGraphicsScene* self, QRectF* re 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); +struct miqt_array* QGraphicsScene_CollidingItems2(const QGraphicsScene* self, QGraphicsItem* item, int mode); +void QGraphicsScene_SetSelectionArea2(QGraphicsScene* self, QPainterPath* path, int selectionOperation); +void QGraphicsScene_SetSelectionArea3(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); diff --git a/qt/gen_qgraphicssceneevent.cpp b/qt/gen_qgraphicssceneevent.cpp index 86da562..5f9c58e 100644 --- a/qt/gen_qgraphicssceneevent.cpp +++ b/qt/gen_qgraphicssceneevent.cpp @@ -28,6 +28,15 @@ void QGraphicsSceneEvent_SetWidget(QGraphicsSceneEvent* self, QWidget* widget) { self->setWidget(widget); } +unsigned long long QGraphicsSceneEvent_Timestamp(const QGraphicsSceneEvent* self) { + quint64 _ret = self->timestamp(); + return static_cast(_ret); +} + +void QGraphicsSceneEvent_SetTimestamp(QGraphicsSceneEvent* self, unsigned long long ts) { + self->setTimestamp(static_cast(ts)); +} + void QGraphicsSceneEvent_Delete(QGraphicsSceneEvent* self) { delete self; } @@ -228,6 +237,31 @@ void QGraphicsSceneWheelEvent_SetOrientation(QGraphicsSceneWheelEvent* self, int self->setOrientation(static_cast(orientation)); } +int QGraphicsSceneWheelEvent_Phase(const QGraphicsSceneWheelEvent* self) { + Qt::ScrollPhase _ret = self->phase(); + return static_cast(_ret); +} + +void QGraphicsSceneWheelEvent_SetPhase(QGraphicsSceneWheelEvent* self, int scrollPhase) { + self->setPhase(static_cast(scrollPhase)); +} + +QPoint* QGraphicsSceneWheelEvent_PixelDelta(const QGraphicsSceneWheelEvent* self) { + return new QPoint(self->pixelDelta()); +} + +void QGraphicsSceneWheelEvent_SetPixelDelta(QGraphicsSceneWheelEvent* self, QPoint* delta) { + self->setPixelDelta(*delta); +} + +bool QGraphicsSceneWheelEvent_IsInverted(const QGraphicsSceneWheelEvent* self) { + return self->isInverted(); +} + +void QGraphicsSceneWheelEvent_SetInverted(QGraphicsSceneWheelEvent* self, bool inverted) { + self->setInverted(inverted); +} + void QGraphicsSceneWheelEvent_Delete(QGraphicsSceneWheelEvent* self) { delete self; } diff --git a/qt/gen_qgraphicssceneevent.go b/qt/gen_qgraphicssceneevent.go index 6c8553a..e567ca5 100644 --- a/qt/gen_qgraphicssceneevent.go +++ b/qt/gen_qgraphicssceneevent.go @@ -58,6 +58,14 @@ func (this *QGraphicsSceneEvent) SetWidget(widget *QWidget) { C.QGraphicsSceneEvent_SetWidget(this.h, widget.cPointer()) } +func (this *QGraphicsSceneEvent) Timestamp() uint64 { + return (uint64)(C.QGraphicsSceneEvent_Timestamp(this.h)) +} + +func (this *QGraphicsSceneEvent) SetTimestamp(ts uint64) { + C.QGraphicsSceneEvent_SetTimestamp(this.h, (C.ulonglong)(ts)) +} + // Delete this object from C++ memory. func (this *QGraphicsSceneEvent) Delete() { C.QGraphicsSceneEvent_Delete(this.h) @@ -360,6 +368,33 @@ func (this *QGraphicsSceneWheelEvent) SetOrientation(orientation Orientation) { C.QGraphicsSceneWheelEvent_SetOrientation(this.h, (C.int)(orientation)) } +func (this *QGraphicsSceneWheelEvent) Phase() ScrollPhase { + return (ScrollPhase)(C.QGraphicsSceneWheelEvent_Phase(this.h)) +} + +func (this *QGraphicsSceneWheelEvent) SetPhase(scrollPhase ScrollPhase) { + C.QGraphicsSceneWheelEvent_SetPhase(this.h, (C.int)(scrollPhase)) +} + +func (this *QGraphicsSceneWheelEvent) PixelDelta() *QPoint { + _ret := C.QGraphicsSceneWheelEvent_PixelDelta(this.h) + _goptr := newQPoint(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QGraphicsSceneWheelEvent) SetPixelDelta(delta QPoint) { + C.QGraphicsSceneWheelEvent_SetPixelDelta(this.h, delta.cPointer()) +} + +func (this *QGraphicsSceneWheelEvent) IsInverted() bool { + return (bool)(C.QGraphicsSceneWheelEvent_IsInverted(this.h)) +} + +func (this *QGraphicsSceneWheelEvent) SetInverted(inverted bool) { + C.QGraphicsSceneWheelEvent_SetInverted(this.h, (C.bool)(inverted)) +} + // Delete this object from C++ memory. func (this *QGraphicsSceneWheelEvent) Delete() { C.QGraphicsSceneWheelEvent_Delete(this.h) diff --git a/qt/gen_qgraphicssceneevent.h b/qt/gen_qgraphicssceneevent.h index a0e20a0..7466bc9 100644 --- a/qt/gen_qgraphicssceneevent.h +++ b/qt/gen_qgraphicssceneevent.h @@ -48,6 +48,8 @@ typedef struct QWidget QWidget; QGraphicsSceneEvent* QGraphicsSceneEvent_new(int typeVal); QWidget* QGraphicsSceneEvent_Widget(const QGraphicsSceneEvent* self); void QGraphicsSceneEvent_SetWidget(QGraphicsSceneEvent* self, QWidget* widget); +unsigned long long QGraphicsSceneEvent_Timestamp(const QGraphicsSceneEvent* self); +void QGraphicsSceneEvent_SetTimestamp(QGraphicsSceneEvent* self, unsigned long long ts); void QGraphicsSceneEvent_Delete(QGraphicsSceneEvent* self); QGraphicsSceneMouseEvent* QGraphicsSceneMouseEvent_new(); @@ -98,6 +100,12 @@ int QGraphicsSceneWheelEvent_Delta(const QGraphicsSceneWheelEvent* self); void QGraphicsSceneWheelEvent_SetDelta(QGraphicsSceneWheelEvent* self, int delta); int QGraphicsSceneWheelEvent_Orientation(const QGraphicsSceneWheelEvent* self); void QGraphicsSceneWheelEvent_SetOrientation(QGraphicsSceneWheelEvent* self, int orientation); +int QGraphicsSceneWheelEvent_Phase(const QGraphicsSceneWheelEvent* self); +void QGraphicsSceneWheelEvent_SetPhase(QGraphicsSceneWheelEvent* self, int scrollPhase); +QPoint* QGraphicsSceneWheelEvent_PixelDelta(const QGraphicsSceneWheelEvent* self); +void QGraphicsSceneWheelEvent_SetPixelDelta(QGraphicsSceneWheelEvent* self, QPoint* delta); +bool QGraphicsSceneWheelEvent_IsInverted(const QGraphicsSceneWheelEvent* self); +void QGraphicsSceneWheelEvent_SetInverted(QGraphicsSceneWheelEvent* self, bool inverted); void QGraphicsSceneWheelEvent_Delete(QGraphicsSceneWheelEvent* self); QGraphicsSceneContextMenuEvent* QGraphicsSceneContextMenuEvent_new(); diff --git a/qt/gen_qgraphicstransform.cpp b/qt/gen_qgraphicstransform.cpp index 0e375ee..ff12b90 100644 --- a/qt/gen_qgraphicstransform.cpp +++ b/qt/gen_qgraphicstransform.cpp @@ -27,13 +27,6 @@ struct miqt_string* QGraphicsTransform_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGraphicsTransform_TrUtf8(const char* s) { - QString _ret = QGraphicsTransform::trUtf8(s); - // 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 QGraphicsTransform_ApplyTo(const QGraphicsTransform* self, QMatrix4x4* matrix) { self->applyTo(matrix); } @@ -52,20 +45,6 @@ struct miqt_string* QGraphicsTransform_Tr3(const char* s, const char* c, int n) return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGraphicsTransform_TrUtf82(const char* s, const char* c) { - QString _ret = QGraphicsTransform::trUtf8(s, c); - // 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* QGraphicsTransform_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QGraphicsTransform::trUtf8(s, c, static_cast(n)); - // 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 QGraphicsTransform_Delete(QGraphicsTransform* self) { delete self; } @@ -93,13 +72,6 @@ struct miqt_string* QGraphicsScale_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGraphicsScale_TrUtf8(const char* s) { - QString _ret = QGraphicsScale::trUtf8(s); - // 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()); -} - QVector3D* QGraphicsScale_Origin(const QGraphicsScale* self) { return new QVector3D(self->origin()); } @@ -203,20 +175,6 @@ struct miqt_string* QGraphicsScale_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGraphicsScale_TrUtf82(const char* s, const char* c) { - QString _ret = QGraphicsScale::trUtf8(s, c); - // 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* QGraphicsScale_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QGraphicsScale::trUtf8(s, c, static_cast(n)); - // 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 QGraphicsScale_Delete(QGraphicsScale* self) { delete self; } @@ -244,13 +202,6 @@ struct miqt_string* QGraphicsRotation_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGraphicsRotation_TrUtf8(const char* s) { - QString _ret = QGraphicsRotation::trUtf8(s); - // 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()); -} - QVector3D* QGraphicsRotation_Origin(const QGraphicsRotation* self) { return new QVector3D(self->origin()); } @@ -328,20 +279,6 @@ struct miqt_string* QGraphicsRotation_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGraphicsRotation_TrUtf82(const char* s, const char* c) { - QString _ret = QGraphicsRotation::trUtf8(s, c); - // 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* QGraphicsRotation_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QGraphicsRotation::trUtf8(s, c, static_cast(n)); - // 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 QGraphicsRotation_Delete(QGraphicsRotation* self) { delete self; } diff --git a/qt/gen_qgraphicstransform.go b/qt/gen_qgraphicstransform.go index a5b3d1f..12b18d1 100644 --- a/qt/gen_qgraphicstransform.go +++ b/qt/gen_qgraphicstransform.go @@ -56,15 +56,6 @@ func QGraphicsTransform_Tr(s string) string { return _ret } -func QGraphicsTransform_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsTransform_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QGraphicsTransform) ApplyTo(matrix *QMatrix4x4) { C.QGraphicsTransform_ApplyTo(this.h, matrix.cPointer()) } @@ -91,28 +82,6 @@ func QGraphicsTransform_Tr3(s string, c string, n int) string { return _ret } -func QGraphicsTransform_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsTransform_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QGraphicsTransform_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsTransform_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QGraphicsTransform) Delete() { C.QGraphicsTransform_Delete(this.h) @@ -181,15 +150,6 @@ func QGraphicsScale_Tr(s string) string { return _ret } -func QGraphicsScale_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsScale_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QGraphicsScale) Origin() *QVector3D { _ret := C.QGraphicsScale_Origin(this.h) _goptr := newQVector3D(_ret) @@ -336,28 +296,6 @@ func QGraphicsScale_Tr3(s string, c string, n int) string { return _ret } -func QGraphicsScale_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsScale_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QGraphicsScale_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsScale_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QGraphicsScale) Delete() { C.QGraphicsScale_Delete(this.h) @@ -426,15 +364,6 @@ func QGraphicsRotation_Tr(s string) string { return _ret } -func QGraphicsRotation_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsRotation_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QGraphicsRotation) Origin() *QVector3D { _ret := C.QGraphicsRotation_Origin(this.h) _goptr := newQVector3D(_ret) @@ -546,28 +475,6 @@ func QGraphicsRotation_Tr3(s string, c string, n int) string { return _ret } -func QGraphicsRotation_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsRotation_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QGraphicsRotation_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsRotation_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QGraphicsRotation) Delete() { C.QGraphicsRotation_Delete(this.h) diff --git a/qt/gen_qgraphicstransform.h b/qt/gen_qgraphicstransform.h index 95079ff..b1b28ac 100644 --- a/qt/gen_qgraphicstransform.h +++ b/qt/gen_qgraphicstransform.h @@ -34,12 +34,9 @@ typedef struct QVector3D QVector3D; QMetaObject* QGraphicsTransform_MetaObject(const QGraphicsTransform* self); void* QGraphicsTransform_Metacast(QGraphicsTransform* self, const char* param1); struct miqt_string* QGraphicsTransform_Tr(const char* s); -struct miqt_string* QGraphicsTransform_TrUtf8(const char* s); void QGraphicsTransform_ApplyTo(const QGraphicsTransform* self, QMatrix4x4* matrix); struct miqt_string* QGraphicsTransform_Tr2(const char* s, const char* c); struct miqt_string* QGraphicsTransform_Tr3(const char* s, const char* c, int n); -struct miqt_string* QGraphicsTransform_TrUtf82(const char* s, const char* c); -struct miqt_string* QGraphicsTransform_TrUtf83(const char* s, const char* c, int n); void QGraphicsTransform_Delete(QGraphicsTransform* self); QGraphicsScale* QGraphicsScale_new(); @@ -47,7 +44,6 @@ QGraphicsScale* QGraphicsScale_new2(QObject* parent); QMetaObject* QGraphicsScale_MetaObject(const QGraphicsScale* self); void* QGraphicsScale_Metacast(QGraphicsScale* self, const char* param1); struct miqt_string* QGraphicsScale_Tr(const char* s); -struct miqt_string* QGraphicsScale_TrUtf8(const char* s); QVector3D* QGraphicsScale_Origin(const QGraphicsScale* self); void QGraphicsScale_SetOrigin(QGraphicsScale* self, QVector3D* point); double QGraphicsScale_XScale(const QGraphicsScale* self); @@ -69,8 +65,6 @@ void QGraphicsScale_ScaleChanged(QGraphicsScale* self); void QGraphicsScale_connect_ScaleChanged(QGraphicsScale* self, void* slot); struct miqt_string* QGraphicsScale_Tr2(const char* s, const char* c); struct miqt_string* QGraphicsScale_Tr3(const char* s, const char* c, int n); -struct miqt_string* QGraphicsScale_TrUtf82(const char* s, const char* c); -struct miqt_string* QGraphicsScale_TrUtf83(const char* s, const char* c, int n); void QGraphicsScale_Delete(QGraphicsScale* self); QGraphicsRotation* QGraphicsRotation_new(); @@ -78,7 +72,6 @@ QGraphicsRotation* QGraphicsRotation_new2(QObject* parent); QMetaObject* QGraphicsRotation_MetaObject(const QGraphicsRotation* self); void* QGraphicsRotation_Metacast(QGraphicsRotation* self, const char* param1); struct miqt_string* QGraphicsRotation_Tr(const char* s); -struct miqt_string* QGraphicsRotation_TrUtf8(const char* s); QVector3D* QGraphicsRotation_Origin(const QGraphicsRotation* self); void QGraphicsRotation_SetOrigin(QGraphicsRotation* self, QVector3D* point); double QGraphicsRotation_Angle(const QGraphicsRotation* self); @@ -95,8 +88,6 @@ void QGraphicsRotation_AxisChanged(QGraphicsRotation* self); void QGraphicsRotation_connect_AxisChanged(QGraphicsRotation* self, void* slot); struct miqt_string* QGraphicsRotation_Tr2(const char* s, const char* c); struct miqt_string* QGraphicsRotation_Tr3(const char* s, const char* c, int n); -struct miqt_string* QGraphicsRotation_TrUtf82(const char* s, const char* c); -struct miqt_string* QGraphicsRotation_TrUtf83(const char* s, const char* c, int n); void QGraphicsRotation_Delete(QGraphicsRotation* self); #ifdef __cplusplus diff --git a/qt/gen_qgraphicsview.cpp b/qt/gen_qgraphicsview.cpp index e6dabe8..5c7ef9a 100644 --- a/qt/gen_qgraphicsview.cpp +++ b/qt/gen_qgraphicsview.cpp @@ -3,7 +3,6 @@ #include #include #include -#include #include #include #include @@ -53,13 +52,6 @@ struct miqt_string* QGraphicsView_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGraphicsView_TrUtf8(const char* s) { - QString _ret = QGraphicsView::trUtf8(s); - // 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()); -} - QSize* QGraphicsView_SizeHint(const QGraphicsView* self) { return new QSize(self->sizeHint()); } @@ -189,18 +181,6 @@ void QGraphicsView_SetSceneRect2(QGraphicsView* self, double x, double y, double self->setSceneRect(static_cast(x), static_cast(y), static_cast(w), static_cast(h)); } -QMatrix* QGraphicsView_Matrix(const QGraphicsView* self) { - return new QMatrix(self->matrix()); -} - -void QGraphicsView_SetMatrix(QGraphicsView* self, QMatrix* matrix) { - self->setMatrix(*matrix); -} - -void QGraphicsView_ResetMatrix(QGraphicsView* self) { - self->resetMatrix(); -} - QTransform* QGraphicsView_Transform(const QGraphicsView* self) { return new QTransform(self->transform()); } @@ -452,20 +432,6 @@ struct miqt_string* QGraphicsView_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGraphicsView_TrUtf82(const char* s, const char* c) { - QString _ret = QGraphicsView::trUtf8(s, c); - // 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* QGraphicsView_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QGraphicsView::trUtf8(s, c, static_cast(n)); - // 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 QGraphicsView_SetRenderHint2(QGraphicsView* self, int hint, bool enabled) { self->setRenderHint(static_cast(hint), enabled); } @@ -474,10 +440,6 @@ void QGraphicsView_SetOptimizationFlag2(QGraphicsView* self, int flag, bool enab self->setOptimizationFlag(static_cast(flag), enabled); } -void QGraphicsView_SetMatrix2(QGraphicsView* self, QMatrix* matrix, bool combine) { - self->setMatrix(*matrix, combine); -} - void QGraphicsView_SetTransform2(QGraphicsView* self, QTransform* matrix, bool combine) { self->setTransform(*matrix, combine); } diff --git a/qt/gen_qgraphicsview.go b/qt/gen_qgraphicsview.go index edcdc04..3027cf6 100644 --- a/qt/gen_qgraphicsview.go +++ b/qt/gen_qgraphicsview.go @@ -50,10 +50,9 @@ const ( type QGraphicsView__OptimizationFlag int const ( - QGraphicsView__DontClipPainter QGraphicsView__OptimizationFlag = 1 - QGraphicsView__DontSavePainterState QGraphicsView__OptimizationFlag = 2 - QGraphicsView__DontAdjustForAntialiasing QGraphicsView__OptimizationFlag = 4 - QGraphicsView__IndirectPainting QGraphicsView__OptimizationFlag = 8 + QGraphicsView__DontSavePainterState QGraphicsView__OptimizationFlag = 1 + QGraphicsView__DontAdjustForAntialiasing QGraphicsView__OptimizationFlag = 2 + QGraphicsView__IndirectPainting QGraphicsView__OptimizationFlag = 4 ) type QGraphicsView struct { @@ -122,15 +121,6 @@ func QGraphicsView_Tr(s string) string { return _ret } -func QGraphicsView_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsView_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QGraphicsView) SizeHint() *QSize { _ret := C.QGraphicsView_SizeHint(this.h) _goptr := newQSize(_ret) @@ -260,21 +250,6 @@ func (this *QGraphicsView) SetSceneRect2(x float64, y float64, w float64, h floa C.QGraphicsView_SetSceneRect2(this.h, (C.double)(x), (C.double)(y), (C.double)(w), (C.double)(h)) } -func (this *QGraphicsView) Matrix() *QMatrix { - _ret := C.QGraphicsView_Matrix(this.h) - _goptr := newQMatrix(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QGraphicsView) SetMatrix(matrix *QMatrix) { - C.QGraphicsView_SetMatrix(this.h, matrix.cPointer()) -} - -func (this *QGraphicsView) ResetMatrix() { - C.QGraphicsView_ResetMatrix(this.h) -} - func (this *QGraphicsView) Transform() *QTransform { _ret := C.QGraphicsView_Transform(this.h) _goptr := newQTransform(_ret) @@ -577,28 +552,6 @@ func QGraphicsView_Tr3(s string, c string, n int) string { return _ret } -func QGraphicsView_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsView_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QGraphicsView_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsView_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QGraphicsView) SetRenderHint2(hint QPainter__RenderHint, enabled bool) { C.QGraphicsView_SetRenderHint2(this.h, (C.int)(hint), (C.bool)(enabled)) } @@ -607,10 +560,6 @@ func (this *QGraphicsView) SetOptimizationFlag2(flag QGraphicsView__Optimization C.QGraphicsView_SetOptimizationFlag2(this.h, (C.int)(flag), (C.bool)(enabled)) } -func (this *QGraphicsView) SetMatrix2(matrix *QMatrix, combine bool) { - C.QGraphicsView_SetMatrix2(this.h, matrix.cPointer(), (C.bool)(combine)) -} - func (this *QGraphicsView) SetTransform2(matrix *QTransform, combine bool) { C.QGraphicsView_SetTransform2(this.h, matrix.cPointer(), (C.bool)(combine)) } diff --git a/qt/gen_qgraphicsview.h b/qt/gen_qgraphicsview.h index ed3bb97..0d42164 100644 --- a/qt/gen_qgraphicsview.h +++ b/qt/gen_qgraphicsview.h @@ -18,7 +18,6 @@ class QBrush; class QGraphicsItem; class QGraphicsScene; class QGraphicsView; -class QMatrix; class QMetaObject; class QPainter; class QPainterPath; @@ -35,7 +34,6 @@ typedef struct QBrush QBrush; typedef struct QGraphicsItem QGraphicsItem; typedef struct QGraphicsScene QGraphicsScene; typedef struct QGraphicsView QGraphicsView; -typedef struct QMatrix QMatrix; typedef struct QMetaObject QMetaObject; typedef struct QPainter QPainter; typedef struct QPainterPath QPainterPath; @@ -56,7 +54,6 @@ QGraphicsView* QGraphicsView_new4(QGraphicsScene* scene, QWidget* parent); QMetaObject* QGraphicsView_MetaObject(const QGraphicsView* self); void* QGraphicsView_Metacast(QGraphicsView* self, const char* param1); 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, int hint); @@ -87,9 +84,6 @@ void QGraphicsView_SetScene(QGraphicsView* self, QGraphicsScene* scene); QRectF* QGraphicsView_SceneRect(const QGraphicsView* self); void QGraphicsView_SetSceneRect(QGraphicsView* self, QRectF* rect); void QGraphicsView_SetSceneRect2(QGraphicsView* self, double x, double y, double w, double h); -QMatrix* QGraphicsView_Matrix(const QGraphicsView* self); -void QGraphicsView_SetMatrix(QGraphicsView* self, QMatrix* matrix); -void QGraphicsView_ResetMatrix(QGraphicsView* self); QTransform* QGraphicsView_Transform(const QGraphicsView* self); QTransform* QGraphicsView_ViewportTransform(const QGraphicsView* self); bool QGraphicsView_IsTransformed(const QGraphicsView* self); @@ -135,11 +129,8 @@ void QGraphicsView_RubberBandChanged(QGraphicsView* self, QRect* viewportRect, Q void QGraphicsView_connect_RubberBandChanged(QGraphicsView* self, void* slot); 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, 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); void QGraphicsView_EnsureVisible3(QGraphicsView* self, QRectF* rect, int xmargin, int ymargin); diff --git a/qt/gen_qgraphicswidget.cpp b/qt/gen_qgraphicswidget.cpp index f1666f2..b65d81b 100644 --- a/qt/gen_qgraphicswidget.cpp +++ b/qt/gen_qgraphicswidget.cpp @@ -49,13 +49,6 @@ struct miqt_string* QGraphicsWidget_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGraphicsWidget_TrUtf8(const char* s) { - QString _ret = QGraphicsWidget::trUtf8(s); - // 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()); -} - QGraphicsLayout* QGraphicsWidget_Layout(const QGraphicsWidget* self) { return self->layout(); } @@ -347,20 +340,6 @@ struct miqt_string* QGraphicsWidget_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGraphicsWidget_TrUtf82(const char* s, const char* c) { - QString _ret = QGraphicsWidget::trUtf8(s, c); - // 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* QGraphicsWidget_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QGraphicsWidget::trUtf8(s, c, static_cast(n)); - // 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()); -} - int QGraphicsWidget_GrabShortcut2(QGraphicsWidget* self, QKeySequence* sequence, int context) { return self->grabShortcut(*sequence, static_cast(context)); } diff --git a/qt/gen_qgraphicswidget.go b/qt/gen_qgraphicswidget.go index 4990955..a52edd7 100644 --- a/qt/gen_qgraphicswidget.go +++ b/qt/gen_qgraphicswidget.go @@ -81,15 +81,6 @@ func QGraphicsWidget_Tr(s string) string { return _ret } -func QGraphicsWidget_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsWidget_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QGraphicsWidget) Layout() *QGraphicsLayout { return newQGraphicsLayout_U(unsafe.Pointer(C.QGraphicsWidget_Layout(this.h))) } @@ -426,28 +417,6 @@ func QGraphicsWidget_Tr3(s string, c string, n int) string { return _ret } -func QGraphicsWidget_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsWidget_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QGraphicsWidget_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGraphicsWidget_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QGraphicsWidget) GrabShortcut2(sequence *QKeySequence, context ShortcutContext) int { return (int)(C.QGraphicsWidget_GrabShortcut2(this.h, sequence.cPointer(), (C.int)(context))) } diff --git a/qt/gen_qgraphicswidget.h b/qt/gen_qgraphicswidget.h index c706fe4..1477440 100644 --- a/qt/gen_qgraphicswidget.h +++ b/qt/gen_qgraphicswidget.h @@ -55,7 +55,6 @@ QGraphicsWidget* QGraphicsWidget_new3(QGraphicsItem* parent, int wFlags); QMetaObject* QGraphicsWidget_MetaObject(const QGraphicsWidget* self); void* QGraphicsWidget_Metacast(QGraphicsWidget* self, const char* param1); struct miqt_string* QGraphicsWidget_Tr(const char* s); -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); @@ -119,8 +118,6 @@ void QGraphicsWidget_connect_LayoutChanged(QGraphicsWidget* self, void* slot); bool QGraphicsWidget_Close(QGraphicsWidget* self); 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, int context); void QGraphicsWidget_SetShortcutEnabled2(QGraphicsWidget* self, int id, bool enabled); void QGraphicsWidget_SetShortcutAutoRepeat2(QGraphicsWidget* self, int id, bool enabled); diff --git a/qt/gen_qgridlayout.cpp b/qt/gen_qgridlayout.cpp index 981e5f4..931fd36 100644 --- a/qt/gen_qgridlayout.cpp +++ b/qt/gen_qgridlayout.cpp @@ -12,12 +12,12 @@ #include "gen_qgridlayout.h" #include "_cgo_export.h" -QGridLayout* QGridLayout_new(QWidget* parent) { - return new QGridLayout(parent); +QGridLayout* QGridLayout_new() { + return new QGridLayout(); } -QGridLayout* QGridLayout_new2() { - return new QGridLayout(); +QGridLayout* QGridLayout_new2(QWidget* parent) { + return new QGridLayout(parent); } QMetaObject* QGridLayout_MetaObject(const QGridLayout* self) { @@ -35,13 +35,6 @@ struct miqt_string* QGridLayout_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGridLayout_TrUtf8(const char* s) { - QString _ret = QGridLayout::trUtf8(s); - // 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()); -} - QSize* QGridLayout_SizeHint(const QGridLayout* self) { return new QSize(self->sizeHint()); } @@ -218,20 +211,6 @@ struct miqt_string* QGridLayout_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGridLayout_TrUtf82(const char* s, const char* c) { - QString _ret = QGridLayout::trUtf8(s, c); - // 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* QGridLayout_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QGridLayout::trUtf8(s, c, static_cast(n)); - // 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 QGridLayout_AddWidget4(QGridLayout* self, QWidget* param1, int row, int column, int param4) { self->addWidget(param1, static_cast(row), static_cast(column), static_cast(param4)); } diff --git a/qt/gen_qgridlayout.go b/qt/gen_qgridlayout.go index 27e0b51..e8e5261 100644 --- a/qt/gen_qgridlayout.go +++ b/qt/gen_qgridlayout.go @@ -37,14 +37,14 @@ func newQGridLayout_U(h unsafe.Pointer) *QGridLayout { } // NewQGridLayout constructs a new QGridLayout object. -func NewQGridLayout(parent *QWidget) *QGridLayout { - ret := C.QGridLayout_new(parent.cPointer()) +func NewQGridLayout() *QGridLayout { + ret := C.QGridLayout_new() return newQGridLayout(ret) } // NewQGridLayout2 constructs a new QGridLayout object. -func NewQGridLayout2() *QGridLayout { - ret := C.QGridLayout_new2() +func NewQGridLayout2(parent *QWidget) *QGridLayout { + ret := C.QGridLayout_new2(parent.cPointer()) return newQGridLayout(ret) } @@ -67,15 +67,6 @@ func QGridLayout_Tr(s string) string { return _ret } -func QGridLayout_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGridLayout_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QGridLayout) SizeHint() *QSize { _ret := C.QGridLayout_SizeHint(this.h) _goptr := newQSize(_ret) @@ -270,28 +261,6 @@ func QGridLayout_Tr3(s string, c string, n int) string { return _ret } -func QGridLayout_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGridLayout_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QGridLayout_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGridLayout_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QGridLayout) AddWidget4(param1 *QWidget, row int, column int, param4 AlignmentFlag) { C.QGridLayout_AddWidget4(this.h, param1.cPointer(), (C.int)(row), (C.int)(column), (C.int)(param4)) } diff --git a/qt/gen_qgridlayout.h b/qt/gen_qgridlayout.h index f2ff61c..9764d6e 100644 --- a/qt/gen_qgridlayout.h +++ b/qt/gen_qgridlayout.h @@ -31,12 +31,11 @@ typedef struct QSize QSize; typedef struct QWidget QWidget; #endif -QGridLayout* QGridLayout_new(QWidget* parent); -QGridLayout* QGridLayout_new2(); +QGridLayout* QGridLayout_new(); +QGridLayout* QGridLayout_new2(QWidget* parent); QMetaObject* QGridLayout_MetaObject(const QGridLayout* self); void* QGridLayout_Metacast(QGridLayout* self, const char* param1); struct miqt_string* QGridLayout_Tr(const char* s); -struct miqt_string* QGridLayout_TrUtf8(const char* s); QSize* QGridLayout_SizeHint(const QGridLayout* self); QSize* QGridLayout_MinimumSize(const QGridLayout* self); QSize* QGridLayout_MaximumSize(const QGridLayout* self); @@ -79,8 +78,6 @@ 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); -struct miqt_string* QGridLayout_TrUtf82(const char* s, const char* c); -struct miqt_string* QGridLayout_TrUtf83(const char* s, const char* c, int n); void QGridLayout_AddWidget4(QGridLayout* self, QWidget* param1, int row, int column, int param4); void QGridLayout_AddWidget6(QGridLayout* self, QWidget* param1, int row, int column, int rowSpan, int columnSpan, int param6); void QGridLayout_AddLayout4(QGridLayout* self, QLayout* param1, int row, int column, int param4); diff --git a/qt/gen_qgroupbox.cpp b/qt/gen_qgroupbox.cpp index 74971d7..07febc3 100644 --- a/qt/gen_qgroupbox.cpp +++ b/qt/gen_qgroupbox.cpp @@ -42,13 +42,6 @@ struct miqt_string* QGroupBox_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGroupBox_TrUtf8(const char* s) { - QString _ret = QGroupBox::trUtf8(s); - // 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* QGroupBox_Title(const QGroupBox* self) { QString _ret = self->title(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -133,20 +126,6 @@ struct miqt_string* QGroupBox_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGroupBox_TrUtf82(const char* s, const char* c) { - QString _ret = QGroupBox::trUtf8(s, c); - // 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* QGroupBox_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QGroupBox::trUtf8(s, c, static_cast(n)); - // 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 QGroupBox_Clicked1(QGroupBox* self, bool checked) { self->clicked(checked); } diff --git a/qt/gen_qgroupbox.go b/qt/gen_qgroupbox.go index 70c6b76..a2209f0 100644 --- a/qt/gen_qgroupbox.go +++ b/qt/gen_qgroupbox.go @@ -84,15 +84,6 @@ func QGroupBox_Tr(s string) string { return _ret } -func QGroupBox_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGroupBox_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QGroupBox) Title() string { var _ms *C.struct_miqt_string = C.QGroupBox_Title(this.h) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) @@ -204,28 +195,6 @@ func QGroupBox_Tr3(s string, c string, n int) string { return _ret } -func QGroupBox_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGroupBox_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QGroupBox_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGroupBox_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QGroupBox) Clicked1(checked bool) { C.QGroupBox_Clicked1(this.h, (C.bool)(checked)) } diff --git a/qt/gen_qgroupbox.h b/qt/gen_qgroupbox.h index 0eab8b9..255e29d 100644 --- a/qt/gen_qgroupbox.h +++ b/qt/gen_qgroupbox.h @@ -32,7 +32,6 @@ QGroupBox* QGroupBox_new4(struct miqt_string* title, QWidget* parent); QMetaObject* QGroupBox_MetaObject(const QGroupBox* self); void* QGroupBox_Metacast(QGroupBox* self, const char* param1); struct miqt_string* QGroupBox_Tr(const char* s); -struct miqt_string* QGroupBox_TrUtf8(const char* s); struct miqt_string* QGroupBox_Title(const QGroupBox* self); void QGroupBox_SetTitle(QGroupBox* self, struct miqt_string* title); int QGroupBox_Alignment(const QGroupBox* self); @@ -50,8 +49,6 @@ void QGroupBox_Toggled(QGroupBox* self, bool param1); void QGroupBox_connect_Toggled(QGroupBox* self, void* slot); struct miqt_string* QGroupBox_Tr2(const char* s, const char* c); struct miqt_string* QGroupBox_Tr3(const char* s, const char* c, int n); -struct miqt_string* QGroupBox_TrUtf82(const char* s, const char* c); -struct miqt_string* QGroupBox_TrUtf83(const char* s, const char* c, int n); void QGroupBox_Clicked1(QGroupBox* self, bool checked); void QGroupBox_connect_Clicked1(QGroupBox* self, void* slot); void QGroupBox_Delete(QGroupBox* self); diff --git a/qt/gen_qguiapplication.cpp b/qt/gen_qguiapplication.cpp index d7e30e9..bd386d8 100644 --- a/qt/gen_qguiapplication.cpp +++ b/qt/gen_qguiapplication.cpp @@ -44,13 +44,6 @@ struct miqt_string* QGuiApplication_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGuiApplication_TrUtf8(const char* s) { - QString _ret = QGuiApplication::trUtf8(s); - // 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 QGuiApplication_SetApplicationDisplayName(struct miqt_string* name) { QString name_QString = QString::fromUtf8(&name->data, name->len); QGuiApplication::setApplicationDisplayName(name_QString); @@ -294,14 +287,6 @@ bool QGuiApplication_IsSavingSession(const QGuiApplication* self) { return self->isSavingSession(); } -bool QGuiApplication_IsFallbackSessionManagementEnabled() { - return QGuiApplication::isFallbackSessionManagementEnabled(); -} - -void QGuiApplication_SetFallbackSessionManagementEnabled(bool fallbackSessionManagementEnabled) { - QGuiApplication::setFallbackSessionManagementEnabled(fallbackSessionManagementEnabled); -} - void QGuiApplication_Sync() { QGuiApplication::sync(); } @@ -431,6 +416,16 @@ void QGuiApplication_connect_SaveStateRequest(QGuiApplication* self, void* slot) }); } +void QGuiApplication_ApplicationDisplayNameChanged(QGuiApplication* self) { + self->applicationDisplayNameChanged(); +} + +void QGuiApplication_connect_ApplicationDisplayNameChanged(QGuiApplication* self, void* slot) { + QGuiApplication::connect(self, static_cast(&QGuiApplication::applicationDisplayNameChanged), self, [=]() { + miqt_exec_callback_QGuiApplication_ApplicationDisplayNameChanged(slot); + }); +} + void QGuiApplication_PaletteChanged(QGuiApplication* self, QPalette* pal) { self->paletteChanged(*pal); } @@ -444,16 +439,6 @@ void QGuiApplication_connect_PaletteChanged(QGuiApplication* self, void* slot) { }); } -void QGuiApplication_ApplicationDisplayNameChanged(QGuiApplication* self) { - self->applicationDisplayNameChanged(); -} - -void QGuiApplication_connect_ApplicationDisplayNameChanged(QGuiApplication* self, void* slot) { - QGuiApplication::connect(self, static_cast(&QGuiApplication::applicationDisplayNameChanged), self, [=]() { - miqt_exec_callback_QGuiApplication_ApplicationDisplayNameChanged(slot); - }); -} - void QGuiApplication_FontChanged(QGuiApplication* self, QFont* font) { self->fontChanged(*font); } @@ -481,20 +466,6 @@ struct miqt_string* QGuiApplication_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QGuiApplication_TrUtf82(const char* s, const char* c) { - QString _ret = QGuiApplication::trUtf8(s, c); - // 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* QGuiApplication_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QGuiApplication::trUtf8(s, c, static_cast(n)); - // 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 QGuiApplication_Delete(QGuiApplication* self) { delete self; } diff --git a/qt/gen_qguiapplication.go b/qt/gen_qguiapplication.go index a64e081..8f14408 100644 --- a/qt/gen_qguiapplication.go +++ b/qt/gen_qguiapplication.go @@ -82,15 +82,6 @@ func QGuiApplication_Tr(s string) string { return _ret } -func QGuiApplication_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QGuiApplication_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func QGuiApplication_SetApplicationDisplayName(name string) { name_ms := miqt_strdupg(name) defer C.free(name_ms) @@ -332,14 +323,6 @@ func (this *QGuiApplication) IsSavingSession() bool { return (bool)(C.QGuiApplication_IsSavingSession(this.h)) } -func QGuiApplication_IsFallbackSessionManagementEnabled() bool { - return (bool)(C.QGuiApplication_IsFallbackSessionManagementEnabled()) -} - -func QGuiApplication_SetFallbackSessionManagementEnabled(fallbackSessionManagementEnabled bool) { - C.QGuiApplication_SetFallbackSessionManagementEnabled((C.bool)(fallbackSessionManagementEnabled)) -} - func QGuiApplication_Sync() { C.QGuiApplication_Sync() } @@ -558,6 +541,23 @@ func miqt_exec_callback_QGuiApplication_SaveStateRequest(cb *C.void, sessionMana gofunc(slotval1) } +func (this *QGuiApplication) ApplicationDisplayNameChanged() { + C.QGuiApplication_ApplicationDisplayNameChanged(this.h) +} +func (this *QGuiApplication) OnApplicationDisplayNameChanged(slot func()) { + C.QGuiApplication_connect_ApplicationDisplayNameChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) +} + +//export miqt_exec_callback_QGuiApplication_ApplicationDisplayNameChanged +func miqt_exec_callback_QGuiApplication_ApplicationDisplayNameChanged(cb *C.void) { + gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func()) + if !ok { + panic("miqt: callback of non-callback type (heap corruption?)") + } + + gofunc() +} + func (this *QGuiApplication) PaletteChanged(pal *QPalette) { C.QGuiApplication_PaletteChanged(this.h, pal.cPointer()) } @@ -578,23 +578,6 @@ func miqt_exec_callback_QGuiApplication_PaletteChanged(cb *C.void, pal *C.QPalet gofunc(slotval1) } -func (this *QGuiApplication) ApplicationDisplayNameChanged() { - C.QGuiApplication_ApplicationDisplayNameChanged(this.h) -} -func (this *QGuiApplication) OnApplicationDisplayNameChanged(slot func()) { - C.QGuiApplication_connect_ApplicationDisplayNameChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) -} - -//export miqt_exec_callback_QGuiApplication_ApplicationDisplayNameChanged -func miqt_exec_callback_QGuiApplication_ApplicationDisplayNameChanged(cb *C.void) { - gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func()) - if !ok { - panic("miqt: callback of non-callback type (heap corruption?)") - } - - gofunc() -} - func (this *QGuiApplication) FontChanged(font *QFont) { C.QGuiApplication_FontChanged(this.h, font.cPointer()) } @@ -637,28 +620,6 @@ func QGuiApplication_Tr3(s string, c string, n int) string { return _ret } -func QGuiApplication_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGuiApplication_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QGuiApplication_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QGuiApplication_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QGuiApplication) Delete() { C.QGuiApplication_Delete(this.h) diff --git a/qt/gen_qguiapplication.h b/qt/gen_qguiapplication.h index dc56f58..c74da0b 100644 --- a/qt/gen_qguiapplication.h +++ b/qt/gen_qguiapplication.h @@ -52,7 +52,6 @@ QGuiApplication* QGuiApplication_new2(int* argc, char** argv, int param3); QMetaObject* QGuiApplication_MetaObject(const QGuiApplication* self); void* QGuiApplication_Metacast(QGuiApplication* self, const char* param1); struct miqt_string* QGuiApplication_Tr(const char* s); -struct miqt_string* QGuiApplication_TrUtf8(const char* s); void QGuiApplication_SetApplicationDisplayName(struct miqt_string* name); struct miqt_string* QGuiApplication_ApplicationDisplayName(); void QGuiApplication_SetDesktopFileName(struct miqt_string* name); @@ -101,8 +100,6 @@ bool QGuiApplication_IsSessionRestored(const QGuiApplication* self); struct miqt_string* QGuiApplication_SessionId(const QGuiApplication* self); struct miqt_string* QGuiApplication_SessionKey(const QGuiApplication* self); bool QGuiApplication_IsSavingSession(const QGuiApplication* self); -bool QGuiApplication_IsFallbackSessionManagementEnabled(); -void QGuiApplication_SetFallbackSessionManagementEnabled(bool fallbackSessionManagementEnabled); void QGuiApplication_Sync(); void QGuiApplication_FontDatabaseChanged(QGuiApplication* self); void QGuiApplication_connect_FontDatabaseChanged(QGuiApplication* self, void* slot); @@ -126,16 +123,14 @@ void QGuiApplication_CommitDataRequest(QGuiApplication* self, QSessionManager* s void QGuiApplication_connect_CommitDataRequest(QGuiApplication* self, void* slot); void QGuiApplication_SaveStateRequest(QGuiApplication* self, QSessionManager* sessionManager); void QGuiApplication_connect_SaveStateRequest(QGuiApplication* self, void* slot); -void QGuiApplication_PaletteChanged(QGuiApplication* self, QPalette* pal); -void QGuiApplication_connect_PaletteChanged(QGuiApplication* self, void* slot); void QGuiApplication_ApplicationDisplayNameChanged(QGuiApplication* self); void QGuiApplication_connect_ApplicationDisplayNameChanged(QGuiApplication* self, void* slot); +void QGuiApplication_PaletteChanged(QGuiApplication* self, QPalette* pal); +void QGuiApplication_connect_PaletteChanged(QGuiApplication* self, void* slot); void QGuiApplication_FontChanged(QGuiApplication* self, QFont* font); void QGuiApplication_connect_FontChanged(QGuiApplication* self, void* slot); struct miqt_string* QGuiApplication_Tr2(const char* s, const char* c); struct miqt_string* QGuiApplication_Tr3(const char* s, const char* c, int n); -struct miqt_string* QGuiApplication_TrUtf82(const char* s, const char* c); -struct miqt_string* QGuiApplication_TrUtf83(const char* s, const char* c, int n); void QGuiApplication_Delete(QGuiApplication* self); #ifdef __cplusplus diff --git a/qt/gen_qguiapplication_platform.cpp b/qt/gen_qguiapplication_platform.cpp new file mode 100644 index 0000000..0f9804d --- /dev/null +++ b/qt/gen_qguiapplication_platform.cpp @@ -0,0 +1,5 @@ +#define WORKAROUND_INNER_CLASS_DEFINITION_QNativeInterface__QX11Application +#include "qguiapplication_platform.h" +#include "gen_qguiapplication_platform.h" +#include "_cgo_export.h" + diff --git a/qt/gen_qguiapplication_platform.go b/qt/gen_qguiapplication_platform.go new file mode 100644 index 0000000..3e64452 --- /dev/null +++ b/qt/gen_qguiapplication_platform.go @@ -0,0 +1,35 @@ +package qt + +/* + +#include "gen_qguiapplication_platform.h" +#include + +*/ +import "C" + +import ( + "unsafe" +) + +type QNativeInterface__QX11Application struct { + h *C.QNativeInterface__QX11Application +} + +func (this *QNativeInterface__QX11Application) cPointer() *C.QNativeInterface__QX11Application { + if this == nil { + return nil + } + return this.h +} + +func newQNativeInterface__QX11Application(h *C.QNativeInterface__QX11Application) *QNativeInterface__QX11Application { + if h == nil { + return nil + } + return &QNativeInterface__QX11Application{h: h} +} + +func newQNativeInterface__QX11Application_U(h unsafe.Pointer) *QNativeInterface__QX11Application { + return newQNativeInterface__QX11Application((*C.QNativeInterface__QX11Application)(h)) +} diff --git a/qt/gen_qguiapplication_platform.h b/qt/gen_qguiapplication_platform.h new file mode 100644 index 0000000..0dd9eec --- /dev/null +++ b/qt/gen_qguiapplication_platform.h @@ -0,0 +1,31 @@ +#ifndef GEN_QGUIAPPLICATION_PLATFORM_H +#define GEN_QGUIAPPLICATION_PLATFORM_H + +#include +#include +#include + +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + +#include "binding.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QNativeInterface__QX11Application) +typedef QNativeInterface::QX11Application QNativeInterface__QX11Application; +#else +class QNativeInterface__QX11Application; +#endif +#else +typedef struct QNativeInterface__QX11Application QNativeInterface__QX11Application; +#endif + + +#ifdef __cplusplus +} /* extern C */ +#endif + +#endif diff --git a/qt/gen_qhash.cpp b/qt/gen_qhash.cpp index ab1ab84..8153c86 100644 --- a/qt/gen_qhash.cpp +++ b/qt/gen_qhash.cpp @@ -1,46 +1,9 @@ -#include -#define WORKAROUND_INNER_CLASS_DEFINITION_QHashData__Node #include +#define WORKAROUND_INNER_CLASS_DEFINITION_QHashPrivate__SpanConstants #include "qhash.h" #include "gen_qhash.h" #include "_cgo_export.h" -void* QHashData_AllocateNode(QHashData* self, int nodeAlign) { - return self->allocateNode(static_cast(nodeAlign)); -} - -void QHashData_FreeNode(QHashData* self, void* node) { - self->freeNode(node); -} - -bool QHashData_WillGrow(QHashData* self) { - return self->willGrow(); -} - -void QHashData_HasShrunk(QHashData* self) { - self->hasShrunk(); -} - -void QHashData_Rehash(QHashData* self, int hint) { - self->rehash(static_cast(hint)); -} - -QHashData__Node* QHashData_FirstNode(QHashData* self) { - return self->firstNode(); -} - -QHashData__Node* QHashData_NextNode(QHashData__Node* node) { - return QHashData::nextNode(node); -} - -QHashData__Node* QHashData_PreviousNode(QHashData__Node* node) { - return QHashData::previousNode(node); -} - -void QHashData_Delete(QHashData* self) { - delete self; -} - QHashDummyValue* QHashDummyValue_new() { return new QHashDummyValue(); } @@ -49,11 +12,15 @@ QHashDummyValue* QHashDummyValue_new2(QHashDummyValue* param1) { return new QHashDummyValue(*param1); } +bool QHashDummyValue_OperatorEqual(const QHashDummyValue* self, QHashDummyValue* param1) { + return self->operator==(*param1); +} + void QHashDummyValue_Delete(QHashDummyValue* self) { delete self; } -void QHashData__Node_Delete(QHashData__Node* self) { +void QHashPrivate__SpanConstants_Delete(QHashPrivate__SpanConstants* self) { delete self; } diff --git a/qt/gen_qhash.go b/qt/gen_qhash.go index aceb9a0..e46eb9c 100644 --- a/qt/gen_qhash.go +++ b/qt/gen_qhash.go @@ -13,74 +13,6 @@ import ( "unsafe" ) -type QHashData struct { - h *C.QHashData -} - -func (this *QHashData) cPointer() *C.QHashData { - if this == nil { - return nil - } - return this.h -} - -func newQHashData(h *C.QHashData) *QHashData { - if h == nil { - return nil - } - return &QHashData{h: h} -} - -func newQHashData_U(h unsafe.Pointer) *QHashData { - return newQHashData((*C.QHashData)(h)) -} - -func (this *QHashData) AllocateNode(nodeAlign int) unsafe.Pointer { - return C.QHashData_AllocateNode(this.h, (C.int)(nodeAlign)) -} - -func (this *QHashData) FreeNode(node unsafe.Pointer) { - C.QHashData_FreeNode(this.h, node) -} - -func (this *QHashData) WillGrow() bool { - return (bool)(C.QHashData_WillGrow(this.h)) -} - -func (this *QHashData) HasShrunk() { - C.QHashData_HasShrunk(this.h) -} - -func (this *QHashData) Rehash(hint int) { - C.QHashData_Rehash(this.h, (C.int)(hint)) -} - -func (this *QHashData) FirstNode() *QHashData__Node { - return newQHashData__Node_U(unsafe.Pointer(C.QHashData_FirstNode(this.h))) -} - -func QHashData_NextNode(node *QHashData__Node) *QHashData__Node { - return newQHashData__Node_U(unsafe.Pointer(C.QHashData_NextNode(node.cPointer()))) -} - -func QHashData_PreviousNode(node *QHashData__Node) *QHashData__Node { - return newQHashData__Node_U(unsafe.Pointer(C.QHashData_PreviousNode(node.cPointer()))) -} - -// Delete this object from C++ memory. -func (this *QHashData) Delete() { - C.QHashData_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QHashData) GoGC() { - runtime.SetFinalizer(this, func(this *QHashData) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} - type QHashDummyValue struct { h *C.QHashDummyValue } @@ -115,6 +47,10 @@ func NewQHashDummyValue2(param1 *QHashDummyValue) *QHashDummyValue { return newQHashDummyValue(ret) } +func (this *QHashDummyValue) OperatorEqual(param1 *QHashDummyValue) bool { + return (bool)(C.QHashDummyValue_OperatorEqual(this.h, param1.cPointer())) +} + // Delete this object from C++ memory. func (this *QHashDummyValue) Delete() { C.QHashDummyValue_Delete(this.h) @@ -129,37 +65,37 @@ func (this *QHashDummyValue) GoGC() { }) } -type QHashData__Node struct { - h *C.QHashData__Node +type QHashPrivate__SpanConstants struct { + h *C.QHashPrivate__SpanConstants } -func (this *QHashData__Node) cPointer() *C.QHashData__Node { +func (this *QHashPrivate__SpanConstants) cPointer() *C.QHashPrivate__SpanConstants { if this == nil { return nil } return this.h } -func newQHashData__Node(h *C.QHashData__Node) *QHashData__Node { +func newQHashPrivate__SpanConstants(h *C.QHashPrivate__SpanConstants) *QHashPrivate__SpanConstants { if h == nil { return nil } - return &QHashData__Node{h: h} + return &QHashPrivate__SpanConstants{h: h} } -func newQHashData__Node_U(h unsafe.Pointer) *QHashData__Node { - return newQHashData__Node((*C.QHashData__Node)(h)) +func newQHashPrivate__SpanConstants_U(h unsafe.Pointer) *QHashPrivate__SpanConstants { + return newQHashPrivate__SpanConstants((*C.QHashPrivate__SpanConstants)(h)) } // Delete this object from C++ memory. -func (this *QHashData__Node) Delete() { - C.QHashData__Node_Delete(this.h) +func (this *QHashPrivate__SpanConstants) Delete() { + C.QHashPrivate__SpanConstants_Delete(this.h) } // GoGC adds a Go Finalizer to this pointer, so that it will be deleted // from C++ memory once it is unreachable from Go memory. -func (this *QHashData__Node) GoGC() { - runtime.SetFinalizer(this, func(this *QHashData__Node) { +func (this *QHashPrivate__SpanConstants) GoGC() { + runtime.SetFinalizer(this, func(this *QHashPrivate__SpanConstants) { this.Delete() runtime.KeepAlive(this.h) }) diff --git a/qt/gen_qhash.h b/qt/gen_qhash.h index 58388bf..e4ef0bd 100644 --- a/qt/gen_qhash.h +++ b/qt/gen_qhash.h @@ -14,34 +14,23 @@ extern "C" { #endif #ifdef __cplusplus -class QHashData; -#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QHashData__Node) -typedef QHashData::Node QHashData__Node; -#else -class QHashData__Node; -#endif class QHashDummyValue; +#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QHashPrivate__SpanConstants) +typedef QHashPrivate::SpanConstants QHashPrivate__SpanConstants; #else -typedef struct QHashData QHashData; -typedef struct QHashData__Node QHashData__Node; -typedef struct QHashDummyValue QHashDummyValue; +class QHashPrivate__SpanConstants; +#endif +#else +typedef struct QHashDummyValue QHashDummyValue; +typedef struct QHashPrivate__SpanConstants QHashPrivate__SpanConstants; #endif - -void* QHashData_AllocateNode(QHashData* self, int nodeAlign); -void QHashData_FreeNode(QHashData* self, void* node); -bool QHashData_WillGrow(QHashData* self); -void QHashData_HasShrunk(QHashData* self); -void QHashData_Rehash(QHashData* self, int hint); -QHashData__Node* QHashData_FirstNode(QHashData* self); -QHashData__Node* QHashData_NextNode(QHashData__Node* node); -QHashData__Node* QHashData_PreviousNode(QHashData__Node* node); -void QHashData_Delete(QHashData* self); QHashDummyValue* QHashDummyValue_new(); QHashDummyValue* QHashDummyValue_new2(QHashDummyValue* param1); +bool QHashDummyValue_OperatorEqual(const QHashDummyValue* self, QHashDummyValue* param1); void QHashDummyValue_Delete(QHashDummyValue* self); -void QHashData__Node_Delete(QHashData__Node* self); +void QHashPrivate__SpanConstants_Delete(QHashPrivate__SpanConstants* self); #ifdef __cplusplus } /* extern C */ diff --git a/qt/gen_qhashfunctions.cpp b/qt/gen_qhashfunctions.cpp index 6708de0..10d860d 100644 --- a/qt/gen_qhashfunctions.cpp +++ b/qt/gen_qhashfunctions.cpp @@ -1,15 +1,36 @@ +#include #define WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__QHashCombine #define WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__QHashCombineCommutative #include "qhashfunctions.h" #include "gen_qhashfunctions.h" #include "_cgo_export.h" -QtPrivate__QHashCombine* QtPrivate__QHashCombine_new() { - return new QtPrivate::QHashCombine(); +QHashSeed* QHashSeed_new() { + return new QHashSeed(); } -QtPrivate__QHashCombine* QtPrivate__QHashCombine_new2(QtPrivate__QHashCombine* param1) { - return new QtPrivate::QHashCombine(*param1); +QHashSeed* QHashSeed_new2(size_t d) { + return new QHashSeed(static_cast(d)); +} + +QHashSeed* QHashSeed_GlobalSeed() { + return new QHashSeed(QHashSeed::globalSeed()); +} + +void QHashSeed_SetDeterministicGlobalSeed() { + QHashSeed::setDeterministicGlobalSeed(); +} + +void QHashSeed_ResetRandomGlobalSeed() { + QHashSeed::resetRandomGlobalSeed(); +} + +void QHashSeed_Delete(QHashSeed* self) { + delete self; +} + +QtPrivate__QHashCombine* QtPrivate__QHashCombine_new() { + return new QtPrivate::QHashCombine(); } void QtPrivate__QHashCombine_Delete(QtPrivate__QHashCombine* self) { @@ -20,10 +41,6 @@ QtPrivate__QHashCombineCommutative* QtPrivate__QHashCombineCommutative_new() { return new QtPrivate::QHashCombineCommutative(); } -QtPrivate__QHashCombineCommutative* QtPrivate__QHashCombineCommutative_new2(QtPrivate__QHashCombineCommutative* param1) { - return new QtPrivate::QHashCombineCommutative(*param1); -} - void QtPrivate__QHashCombineCommutative_Delete(QtPrivate__QHashCombineCommutative* self) { delete self; } diff --git a/qt/gen_qhashfunctions.go b/qt/gen_qhashfunctions.go index e22d6ce..ceabf69 100644 --- a/qt/gen_qhashfunctions.go +++ b/qt/gen_qhashfunctions.go @@ -13,6 +13,69 @@ import ( "unsafe" ) +type QHashSeed struct { + h *C.QHashSeed +} + +func (this *QHashSeed) cPointer() *C.QHashSeed { + if this == nil { + return nil + } + return this.h +} + +func newQHashSeed(h *C.QHashSeed) *QHashSeed { + if h == nil { + return nil + } + return &QHashSeed{h: h} +} + +func newQHashSeed_U(h unsafe.Pointer) *QHashSeed { + return newQHashSeed((*C.QHashSeed)(h)) +} + +// NewQHashSeed constructs a new QHashSeed object. +func NewQHashSeed() *QHashSeed { + ret := C.QHashSeed_new() + return newQHashSeed(ret) +} + +// NewQHashSeed2 constructs a new QHashSeed object. +func NewQHashSeed2(d uint64) *QHashSeed { + ret := C.QHashSeed_new2((C.size_t)(d)) + return newQHashSeed(ret) +} + +func QHashSeed_GlobalSeed() *QHashSeed { + _ret := C.QHashSeed_GlobalSeed() + _goptr := newQHashSeed(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func QHashSeed_SetDeterministicGlobalSeed() { + C.QHashSeed_SetDeterministicGlobalSeed() +} + +func QHashSeed_ResetRandomGlobalSeed() { + C.QHashSeed_ResetRandomGlobalSeed() +} + +// Delete this object from C++ memory. +func (this *QHashSeed) Delete() { + C.QHashSeed_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QHashSeed) GoGC() { + runtime.SetFinalizer(this, func(this *QHashSeed) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + type QtPrivate__QHashCombine struct { h *C.QtPrivate__QHashCombine } @@ -41,12 +104,6 @@ func NewQtPrivate__QHashCombine() *QtPrivate__QHashCombine { return newQtPrivate__QHashCombine(ret) } -// NewQtPrivate__QHashCombine2 constructs a new QtPrivate::QHashCombine object. -func NewQtPrivate__QHashCombine2(param1 *QtPrivate__QHashCombine) *QtPrivate__QHashCombine { - ret := C.QtPrivate__QHashCombine_new2(param1.cPointer()) - return newQtPrivate__QHashCombine(ret) -} - // Delete this object from C++ memory. func (this *QtPrivate__QHashCombine) Delete() { C.QtPrivate__QHashCombine_Delete(this.h) @@ -89,12 +146,6 @@ func NewQtPrivate__QHashCombineCommutative() *QtPrivate__QHashCombineCommutative return newQtPrivate__QHashCombineCommutative(ret) } -// NewQtPrivate__QHashCombineCommutative2 constructs a new QtPrivate::QHashCombineCommutative object. -func NewQtPrivate__QHashCombineCommutative2(param1 *QtPrivate__QHashCombineCommutative) *QtPrivate__QHashCombineCommutative { - ret := C.QtPrivate__QHashCombineCommutative_new2(param1.cPointer()) - return newQtPrivate__QHashCombineCommutative(ret) -} - // Delete this object from C++ memory. func (this *QtPrivate__QHashCombineCommutative) Delete() { C.QtPrivate__QHashCombineCommutative_Delete(this.h) diff --git a/qt/gen_qhashfunctions.h b/qt/gen_qhashfunctions.h index 2b39c93..0a9d775 100644 --- a/qt/gen_qhashfunctions.h +++ b/qt/gen_qhashfunctions.h @@ -14,6 +14,7 @@ extern "C" { #endif #ifdef __cplusplus +class QHashSeed; #if defined(WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__QHashCombine) typedef QtPrivate::QHashCombine QtPrivate__QHashCombine; #else @@ -25,16 +26,22 @@ typedef QtPrivate::QHashCombineCommutative QtPrivate__QHashCombineCommutative; class QtPrivate__QHashCombineCommutative; #endif #else +typedef struct QHashSeed QHashSeed; typedef struct QtPrivate__QHashCombine QtPrivate__QHashCombine; typedef struct QtPrivate__QHashCombineCommutative QtPrivate__QHashCombineCommutative; #endif +QHashSeed* QHashSeed_new(); +QHashSeed* QHashSeed_new2(size_t d); +QHashSeed* QHashSeed_GlobalSeed(); +void QHashSeed_SetDeterministicGlobalSeed(); +void QHashSeed_ResetRandomGlobalSeed(); +void QHashSeed_Delete(QHashSeed* self); + QtPrivate__QHashCombine* QtPrivate__QHashCombine_new(); -QtPrivate__QHashCombine* QtPrivate__QHashCombine_new2(QtPrivate__QHashCombine* param1); void QtPrivate__QHashCombine_Delete(QtPrivate__QHashCombine* self); QtPrivate__QHashCombineCommutative* QtPrivate__QHashCombineCommutative_new(); -QtPrivate__QHashCombineCommutative* QtPrivate__QHashCombineCommutative_new2(QtPrivate__QHashCombineCommutative* param1); void QtPrivate__QHashCombineCommutative_Delete(QtPrivate__QHashCombineCommutative* self); #ifdef __cplusplus diff --git a/qt/gen_qheaderview.cpp b/qt/gen_qheaderview.cpp index 8f25067..bc1ab8a 100644 --- a/qt/gen_qheaderview.cpp +++ b/qt/gen_qheaderview.cpp @@ -35,13 +35,6 @@ struct miqt_string* QHeaderView_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QHeaderView_TrUtf8(const char* s) { - QString _ret = QHeaderView::trUtf8(s); - // 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 QHeaderView_SetModel(QHeaderView* self, QAbstractItemModel* model) { self->setModel(model); } @@ -225,6 +218,14 @@ int QHeaderView_SortIndicatorOrder(const QHeaderView* self) { return static_cast(_ret); } +void QHeaderView_SetSortIndicatorClearable(QHeaderView* self, bool clearable) { + self->setSortIndicatorClearable(clearable); +} + +bool QHeaderView_IsSortIndicatorClearable(const QHeaderView* self) { + return self->isSortIndicatorClearable(); +} + bool QHeaderView_StretchLastSection(const QHeaderView* self) { return self->stretchLastSection(); } @@ -434,6 +435,17 @@ void QHeaderView_connect_SortIndicatorChanged(QHeaderView* self, void* slot) { }); } +void QHeaderView_SortIndicatorClearableChanged(QHeaderView* self, bool clearable) { + self->sortIndicatorClearableChanged(clearable); +} + +void QHeaderView_connect_SortIndicatorClearableChanged(QHeaderView* self, void* slot) { + QHeaderView::connect(self, static_cast(&QHeaderView::sortIndicatorClearableChanged), self, [=](bool clearable) { + bool sigval1 = clearable; + miqt_exec_callback_QHeaderView_SortIndicatorClearableChanged(slot, sigval1); + }); +} + struct miqt_string* QHeaderView_Tr2(const char* s, const char* c) { QString _ret = QHeaderView::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -448,20 +460,6 @@ struct miqt_string* QHeaderView_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QHeaderView_TrUtf82(const char* s, const char* c) { - QString _ret = QHeaderView::trUtf8(s, c); - // 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* QHeaderView_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QHeaderView::trUtf8(s, c, static_cast(n)); - // 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 QHeaderView_Delete(QHeaderView* self) { delete self; } diff --git a/qt/gen_qheaderview.go b/qt/gen_qheaderview.go index 3d53a96..e01a984 100644 --- a/qt/gen_qheaderview.go +++ b/qt/gen_qheaderview.go @@ -78,15 +78,6 @@ func QHeaderView_Tr(s string) string { return _ret } -func QHeaderView_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QHeaderView_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QHeaderView) SetModel(model *QAbstractItemModel) { C.QHeaderView_SetModel(this.h, model.cPointer()) } @@ -270,6 +261,14 @@ func (this *QHeaderView) SortIndicatorOrder() SortOrder { return (SortOrder)(C.QHeaderView_SortIndicatorOrder(this.h)) } +func (this *QHeaderView) SetSortIndicatorClearable(clearable bool) { + C.QHeaderView_SetSortIndicatorClearable(this.h, (C.bool)(clearable)) +} + +func (this *QHeaderView) IsSortIndicatorClearable() bool { + return (bool)(C.QHeaderView_IsSortIndicatorClearable(this.h)) +} + func (this *QHeaderView) StretchLastSection() bool { return (bool)(C.QHeaderView_StretchLastSection(this.h)) } @@ -574,6 +573,26 @@ func miqt_exec_callback_QHeaderView_SortIndicatorChanged(cb *C.void, logicalInde gofunc(slotval1, slotval2) } +func (this *QHeaderView) SortIndicatorClearableChanged(clearable bool) { + C.QHeaderView_SortIndicatorClearableChanged(this.h, (C.bool)(clearable)) +} +func (this *QHeaderView) OnSortIndicatorClearableChanged(slot func(clearable bool)) { + C.QHeaderView_connect_SortIndicatorClearableChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) +} + +//export miqt_exec_callback_QHeaderView_SortIndicatorClearableChanged +func miqt_exec_callback_QHeaderView_SortIndicatorClearableChanged(cb *C.void, clearable C.bool) { + gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(clearable bool)) + if !ok { + panic("miqt: callback of non-callback type (heap corruption?)") + } + + // Convert all CABI parameters to Go parameters + slotval1 := (bool)(clearable) + + gofunc(slotval1) +} + func QHeaderView_Tr2(s string, c string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) @@ -596,28 +615,6 @@ func QHeaderView_Tr3(s string, c string, n int) string { return _ret } -func QHeaderView_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QHeaderView_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QHeaderView_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QHeaderView_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QHeaderView) Delete() { C.QHeaderView_Delete(this.h) diff --git a/qt/gen_qheaderview.h b/qt/gen_qheaderview.h index 2a3fddd..b946775 100644 --- a/qt/gen_qheaderview.h +++ b/qt/gen_qheaderview.h @@ -36,7 +36,6 @@ QHeaderView* QHeaderView_new2(int orientation, QWidget* parent); QMetaObject* QHeaderView_MetaObject(const QHeaderView* self); void* QHeaderView_Metacast(QHeaderView* self, const char* param1); struct miqt_string* QHeaderView_Tr(const char* s); -struct miqt_string* QHeaderView_TrUtf8(const char* s); void QHeaderView_SetModel(QHeaderView* self, QAbstractItemModel* model); int QHeaderView_Orientation(const QHeaderView* self); int QHeaderView_Offset(const QHeaderView* self); @@ -82,6 +81,8 @@ bool QHeaderView_IsSortIndicatorShown(const QHeaderView* self); void QHeaderView_SetSortIndicator(QHeaderView* self, int logicalIndex, int order); int QHeaderView_SortIndicatorSection(const QHeaderView* self); int QHeaderView_SortIndicatorOrder(const QHeaderView* self); +void QHeaderView_SetSortIndicatorClearable(QHeaderView* self, bool clearable); +bool QHeaderView_IsSortIndicatorClearable(const QHeaderView* self); bool QHeaderView_StretchLastSection(const QHeaderView* self); void QHeaderView_SetStretchLastSection(QHeaderView* self, bool stretch); bool QHeaderView_CascadingSectionResizes(const QHeaderView* self); @@ -125,10 +126,10 @@ void QHeaderView_GeometriesChanged(QHeaderView* self); void QHeaderView_connect_GeometriesChanged(QHeaderView* self, void* slot); void QHeaderView_SortIndicatorChanged(QHeaderView* self, int logicalIndex, int order); void QHeaderView_connect_SortIndicatorChanged(QHeaderView* self, void* slot); +void QHeaderView_SortIndicatorClearableChanged(QHeaderView* self, bool clearable); +void QHeaderView_connect_SortIndicatorClearableChanged(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); -struct miqt_string* QHeaderView_TrUtf82(const char* s, const char* c); -struct miqt_string* QHeaderView_TrUtf83(const char* s, const char* c, int n); void QHeaderView_Delete(QHeaderView* self); #ifdef __cplusplus diff --git a/qt/gen_qhistorystate.cpp b/qt/gen_qhistorystate.cpp deleted file mode 100644 index 4fce842..0000000 --- a/qt/gen_qhistorystate.cpp +++ /dev/null @@ -1,107 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include "qhistorystate.h" -#include "gen_qhistorystate.h" -#include "_cgo_export.h" - -QHistoryState* QHistoryState_new() { - return new QHistoryState(); -} - -QHistoryState* QHistoryState_new2(int typeVal) { - return new QHistoryState(static_cast(typeVal)); -} - -QHistoryState* QHistoryState_new3(QState* parent) { - return new QHistoryState(parent); -} - -QHistoryState* QHistoryState_new4(int typeVal, QState* parent) { - return new QHistoryState(static_cast(typeVal), parent); -} - -QMetaObject* QHistoryState_MetaObject(const QHistoryState* self) { - return (QMetaObject*) self->metaObject(); -} - -void* QHistoryState_Metacast(QHistoryState* self, const char* param1) { - return self->qt_metacast(param1); -} - -struct miqt_string* QHistoryState_Tr(const char* s) { - QString _ret = QHistoryState::tr(s); - // 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* QHistoryState_TrUtf8(const char* s) { - QString _ret = QHistoryState::trUtf8(s); - // 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()); -} - -QAbstractTransition* QHistoryState_DefaultTransition(const QHistoryState* self) { - return self->defaultTransition(); -} - -void QHistoryState_SetDefaultTransition(QHistoryState* self, QAbstractTransition* transition) { - self->setDefaultTransition(transition); -} - -QAbstractState* QHistoryState_DefaultState(const QHistoryState* self) { - return self->defaultState(); -} - -void QHistoryState_SetDefaultState(QHistoryState* self, QAbstractState* state) { - self->setDefaultState(state); -} - -int QHistoryState_HistoryType(const QHistoryState* self) { - QHistoryState::HistoryType _ret = self->historyType(); - return static_cast(_ret); -} - -void QHistoryState_SetHistoryType(QHistoryState* self, int typeVal) { - self->setHistoryType(static_cast(typeVal)); -} - -struct miqt_string* QHistoryState_Tr2(const char* s, const char* c) { - QString _ret = QHistoryState::tr(s, c); - // 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* QHistoryState_Tr3(const char* s, const char* c, int n) { - QString _ret = QHistoryState::tr(s, c, static_cast(n)); - // 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* QHistoryState_TrUtf82(const char* s, const char* c) { - QString _ret = QHistoryState::trUtf8(s, c); - // 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* QHistoryState_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QHistoryState::trUtf8(s, c, static_cast(n)); - // 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 QHistoryState_Delete(QHistoryState* self) { - delete self; -} - diff --git a/qt/gen_qhistorystate.go b/qt/gen_qhistorystate.go deleted file mode 100644 index 31955ef..0000000 --- a/qt/gen_qhistorystate.go +++ /dev/null @@ -1,178 +0,0 @@ -package qt - -/* - -#include "gen_qhistorystate.h" -#include - -*/ -import "C" - -import ( - "runtime" - "unsafe" -) - -type QHistoryState__HistoryType int - -const ( - QHistoryState__ShallowHistory QHistoryState__HistoryType = 0 - QHistoryState__DeepHistory QHistoryState__HistoryType = 1 -) - -type QHistoryState struct { - h *C.QHistoryState - *QAbstractState -} - -func (this *QHistoryState) cPointer() *C.QHistoryState { - if this == nil { - return nil - } - return this.h -} - -func newQHistoryState(h *C.QHistoryState) *QHistoryState { - if h == nil { - return nil - } - return &QHistoryState{h: h, QAbstractState: newQAbstractState_U(unsafe.Pointer(h))} -} - -func newQHistoryState_U(h unsafe.Pointer) *QHistoryState { - return newQHistoryState((*C.QHistoryState)(h)) -} - -// NewQHistoryState constructs a new QHistoryState object. -func NewQHistoryState() *QHistoryState { - ret := C.QHistoryState_new() - return newQHistoryState(ret) -} - -// NewQHistoryState2 constructs a new QHistoryState object. -func NewQHistoryState2(typeVal QHistoryState__HistoryType) *QHistoryState { - ret := C.QHistoryState_new2((C.int)(typeVal)) - return newQHistoryState(ret) -} - -// NewQHistoryState3 constructs a new QHistoryState object. -func NewQHistoryState3(parent *QState) *QHistoryState { - ret := C.QHistoryState_new3(parent.cPointer()) - return newQHistoryState(ret) -} - -// NewQHistoryState4 constructs a new QHistoryState object. -func NewQHistoryState4(typeVal QHistoryState__HistoryType, parent *QState) *QHistoryState { - ret := C.QHistoryState_new4((C.int)(typeVal), parent.cPointer()) - return newQHistoryState(ret) -} - -func (this *QHistoryState) MetaObject() *QMetaObject { - return newQMetaObject_U(unsafe.Pointer(C.QHistoryState_MetaObject(this.h))) -} - -func (this *QHistoryState) Metacast(param1 string) unsafe.Pointer { - param1_Cstring := C.CString(param1) - defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QHistoryState_Metacast(this.h, param1_Cstring) -} - -func QHistoryState_Tr(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QHistoryState_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QHistoryState_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QHistoryState_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QHistoryState) DefaultTransition() *QAbstractTransition { - return newQAbstractTransition_U(unsafe.Pointer(C.QHistoryState_DefaultTransition(this.h))) -} - -func (this *QHistoryState) SetDefaultTransition(transition *QAbstractTransition) { - C.QHistoryState_SetDefaultTransition(this.h, transition.cPointer()) -} - -func (this *QHistoryState) DefaultState() *QAbstractState { - return newQAbstractState_U(unsafe.Pointer(C.QHistoryState_DefaultState(this.h))) -} - -func (this *QHistoryState) SetDefaultState(state *QAbstractState) { - C.QHistoryState_SetDefaultState(this.h, state.cPointer()) -} - -func (this *QHistoryState) HistoryType() QHistoryState__HistoryType { - return (QHistoryState__HistoryType)(C.QHistoryState_HistoryType(this.h)) -} - -func (this *QHistoryState) SetHistoryType(typeVal QHistoryState__HistoryType) { - C.QHistoryState_SetHistoryType(this.h, (C.int)(typeVal)) -} - -func QHistoryState_Tr2(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QHistoryState_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QHistoryState_Tr3(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QHistoryState_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QHistoryState_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QHistoryState_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QHistoryState_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QHistoryState_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -// Delete this object from C++ memory. -func (this *QHistoryState) Delete() { - C.QHistoryState_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QHistoryState) GoGC() { - runtime.SetFinalizer(this, func(this *QHistoryState) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} diff --git a/qt/gen_qhistorystate.h b/qt/gen_qhistorystate.h deleted file mode 100644 index 6c1c243..0000000 --- a/qt/gen_qhistorystate.h +++ /dev/null @@ -1,54 +0,0 @@ -#ifndef GEN_QHISTORYSTATE_H -#define GEN_QHISTORYSTATE_H - -#include -#include -#include - -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - -#include "binding.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __cplusplus -class QAbstractState; -class QAbstractTransition; -class QHistoryState; -class QMetaObject; -class QState; -#else -typedef struct QAbstractState QAbstractState; -typedef struct QAbstractTransition QAbstractTransition; -typedef struct QHistoryState QHistoryState; -typedef struct QMetaObject QMetaObject; -typedef struct QState QState; -#endif - -QHistoryState* QHistoryState_new(); -QHistoryState* QHistoryState_new2(int typeVal); -QHistoryState* QHistoryState_new3(QState* parent); -QHistoryState* QHistoryState_new4(int typeVal, QState* parent); -QMetaObject* QHistoryState_MetaObject(const QHistoryState* self); -void* QHistoryState_Metacast(QHistoryState* self, const char* param1); -struct miqt_string* QHistoryState_Tr(const char* s); -struct miqt_string* QHistoryState_TrUtf8(const char* s); -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); -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); -struct miqt_string* QHistoryState_TrUtf83(const char* s, const char* c, int n); -void QHistoryState_Delete(QHistoryState* self); - -#ifdef __cplusplus -} /* extern C */ -#endif - -#endif diff --git a/qt/gen_qicon.cpp b/qt/gen_qicon.cpp index 868e960..cd80791 100644 --- a/qt/gen_qicon.cpp +++ b/qt/gen_qicon.cpp @@ -54,7 +54,11 @@ QPixmap* QIcon_PixmapWithExtent(const QIcon* self, int extent) { return new QPixmap(self->pixmap(static_cast(extent))); } -QPixmap* QIcon_Pixmap3(const QIcon* self, QWindow* window, QSize* size) { +QPixmap* QIcon_Pixmap3(const QIcon* self, QSize* size, double devicePixelRatio) { + return new QPixmap(self->pixmap(*size, static_cast(devicePixelRatio))); +} + +QPixmap* QIcon_Pixmap4(const QIcon* self, QWindow* window, QSize* size) { return new QPixmap(self->pixmap(window, *size)); } @@ -233,7 +237,7 @@ 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, int mode, int state) { +QPixmap* QIcon_Pixmap42(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))); } @@ -245,11 +249,19 @@ 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, int mode) { +QPixmap* QIcon_Pixmap35(const QIcon* self, QSize* size, double devicePixelRatio, int mode) { + return new QPixmap(self->pixmap(*size, static_cast(devicePixelRatio), static_cast(mode))); +} + +QPixmap* QIcon_Pixmap43(const QIcon* self, QSize* size, double devicePixelRatio, int mode, int state) { + return new QPixmap(self->pixmap(*size, static_cast(devicePixelRatio), static_cast(mode), static_cast(state))); +} + +QPixmap* QIcon_Pixmap36(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, int mode, int state) { +QPixmap* QIcon_Pixmap44(const QIcon* self, QWindow* window, QSize* size, int mode, int state) { return new QPixmap(self->pixmap(window, *size, static_cast(mode), static_cast(state))); } diff --git a/qt/gen_qicon.go b/qt/gen_qicon.go index 061b52b..8f92a01 100644 --- a/qt/gen_qicon.go +++ b/qt/gen_qicon.go @@ -112,8 +112,15 @@ func (this *QIcon) PixmapWithExtent(extent int) *QPixmap { return _goptr } -func (this *QIcon) Pixmap3(window *QWindow, size *QSize) *QPixmap { - _ret := C.QIcon_Pixmap3(this.h, window.cPointer(), size.cPointer()) +func (this *QIcon) Pixmap3(size *QSize, devicePixelRatio float64) *QPixmap { + _ret := C.QIcon_Pixmap3(this.h, size.cPointer(), (C.double)(devicePixelRatio)) + _goptr := newQPixmap(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QIcon) Pixmap4(window *QWindow, size *QSize) *QPixmap { + _ret := C.QIcon_Pixmap4(this.h, window.cPointer(), size.cPointer()) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -323,8 +330,8 @@ func (this *QIcon) Pixmap33(w int, h int, mode QIcon__Mode) *QPixmap { 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.int)(mode), (C.int)(state)) +func (this *QIcon) Pixmap42(w int, h int, mode QIcon__Mode, state QIcon__State) *QPixmap { + _ret := C.QIcon_Pixmap42(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 @@ -344,15 +351,29 @@ func (this *QIcon) Pixmap34(extent int, mode QIcon__Mode, state QIcon__State) *Q 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.int)(mode)) +func (this *QIcon) Pixmap35(size *QSize, devicePixelRatio float64, mode QIcon__Mode) *QPixmap { + _ret := C.QIcon_Pixmap35(this.h, size.cPointer(), (C.double)(devicePixelRatio), (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.int)(mode), (C.int)(state)) +func (this *QIcon) Pixmap43(size *QSize, devicePixelRatio float64, mode QIcon__Mode, state QIcon__State) *QPixmap { + _ret := C.QIcon_Pixmap43(this.h, size.cPointer(), (C.double)(devicePixelRatio), (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) Pixmap36(window *QWindow, size *QSize, mode QIcon__Mode) *QPixmap { + _ret := C.QIcon_Pixmap36(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) Pixmap44(window *QWindow, size *QSize, mode QIcon__Mode, state QIcon__State) *QPixmap { + _ret := C.QIcon_Pixmap44(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 diff --git a/qt/gen_qicon.h b/qt/gen_qicon.h index dce160d..4a1ec4b 100644 --- a/qt/gen_qicon.h +++ b/qt/gen_qicon.h @@ -41,7 +41,8 @@ void QIcon_Swap(QIcon* self, QIcon* other); QPixmap* QIcon_Pixmap(const QIcon* self, QSize* size); QPixmap* QIcon_Pixmap2(const QIcon* self, int w, int h); QPixmap* QIcon_PixmapWithExtent(const QIcon* self, int extent); -QPixmap* QIcon_Pixmap3(const QIcon* self, QWindow* window, QSize* size); +QPixmap* QIcon_Pixmap3(const QIcon* self, QSize* size, double devicePixelRatio); +QPixmap* QIcon_Pixmap4(const QIcon* self, QWindow* window, QSize* size); QSize* QIcon_ActualSize(const QIcon* self, QSize* size); QSize* QIcon_ActualSize2(const QIcon* self, QWindow* window, QSize* size); struct miqt_string* QIcon_Name(const QIcon* self); @@ -70,11 +71,13 @@ void QIcon_SetFallbackThemeName(struct miqt_string* name); 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_Pixmap42(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); +QPixmap* QIcon_Pixmap35(const QIcon* self, QSize* size, double devicePixelRatio, int mode); +QPixmap* QIcon_Pixmap43(const QIcon* self, QSize* size, double devicePixelRatio, int mode, int state); +QPixmap* QIcon_Pixmap36(const QIcon* self, QWindow* window, QSize* size, int mode); +QPixmap* QIcon_Pixmap44(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); diff --git a/qt/gen_qiconengine.cpp b/qt/gen_qiconengine.cpp index cd42121..a7f7f0c 100644 --- a/qt/gen_qiconengine.cpp +++ b/qt/gen_qiconengine.cpp @@ -1,6 +1,5 @@ #include #include -#define WORKAROUND_INNER_CLASS_DEFINITION_QIconEngine__AvailableSizesArgument #define WORKAROUND_INNER_CLASS_DEFINITION_QIconEngine__ScaledPixmapArgument #include #include @@ -54,7 +53,7 @@ bool QIconEngine_Write(const QIconEngine* self, QDataStream* out) { return self->write(*out); } -struct miqt_array* QIconEngine_AvailableSizes(const QIconEngine* self) { +struct miqt_array* QIconEngine_AvailableSizes(QIconEngine* self) { QList _ret = self->availableSizes(); // Convert QList<> from C++ memory to manually-managed C memory QSize** _arr = static_cast(malloc(sizeof(QSize*) * _ret.length())); @@ -67,14 +66,14 @@ struct miqt_array* QIconEngine_AvailableSizes(const QIconEngine* self) { return _out; } -struct miqt_string* QIconEngine_IconName(const QIconEngine* self) { +struct miqt_string* QIconEngine_IconName(QIconEngine* self) { QString _ret = self->iconName(); // 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()); } -bool QIconEngine_IsNull(const QIconEngine* self) { +bool QIconEngine_IsNull(QIconEngine* self) { return self->isNull(); } @@ -86,7 +85,7 @@ void QIconEngine_VirtualHook(QIconEngine* self, int id, void* data) { self->virtual_hook(static_cast(id), data); } -struct miqt_array* QIconEngine_AvailableSizes1(const QIconEngine* self, int mode) { +struct miqt_array* QIconEngine_AvailableSizes1(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())); @@ -99,7 +98,7 @@ struct miqt_array* QIconEngine_AvailableSizes1(const QIconEngine* self, int mode return _out; } -struct miqt_array* QIconEngine_AvailableSizes2(const QIconEngine* self, int mode, int state) { +struct miqt_array* QIconEngine_AvailableSizes2(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,18 +115,6 @@ void QIconEngine_Delete(QIconEngine* self) { delete self; } -QIconEngine__AvailableSizesArgument* QIconEngine__AvailableSizesArgument_new(QIconEngine__AvailableSizesArgument* param1) { - 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; -} - QIconEngine__ScaledPixmapArgument* QIconEngine__ScaledPixmapArgument_new(QIconEngine__ScaledPixmapArgument* param1) { return new QIconEngine::ScaledPixmapArgument(*param1); } diff --git a/qt/gen_qiconengine.go b/qt/gen_qiconengine.go index c80b9ad..83cc426 100644 --- a/qt/gen_qiconengine.go +++ b/qt/gen_qiconengine.go @@ -16,10 +16,8 @@ import ( type QIconEngine__IconEngineHook int const ( - QIconEngine__AvailableSizesHook QIconEngine__IconEngineHook = 1 - QIconEngine__IconNameHook QIconEngine__IconEngineHook = 2 - QIconEngine__IsNullHook QIconEngine__IconEngineHook = 3 - QIconEngine__ScaledPixmapHook QIconEngine__IconEngineHook = 4 + QIconEngine__IsNullHook QIconEngine__IconEngineHook = 3 + QIconEngine__ScaledPixmapHook QIconEngine__IconEngineHook = 4 ) type QIconEngine struct { @@ -169,52 +167,6 @@ func (this *QIconEngine) GoGC() { }) } -type QIconEngine__AvailableSizesArgument struct { - h *C.QIconEngine__AvailableSizesArgument -} - -func (this *QIconEngine__AvailableSizesArgument) cPointer() *C.QIconEngine__AvailableSizesArgument { - if this == nil { - return nil - } - return this.h -} - -func newQIconEngine__AvailableSizesArgument(h *C.QIconEngine__AvailableSizesArgument) *QIconEngine__AvailableSizesArgument { - if h == nil { - return nil - } - return &QIconEngine__AvailableSizesArgument{h: h} -} - -func newQIconEngine__AvailableSizesArgument_U(h unsafe.Pointer) *QIconEngine__AvailableSizesArgument { - return newQIconEngine__AvailableSizesArgument((*C.QIconEngine__AvailableSizesArgument)(h)) -} - -// NewQIconEngine__AvailableSizesArgument constructs a new QIconEngine::AvailableSizesArgument object. -func NewQIconEngine__AvailableSizesArgument(param1 *QIconEngine__AvailableSizesArgument) *QIconEngine__AvailableSizesArgument { - ret := C.QIconEngine__AvailableSizesArgument_new(param1.cPointer()) - 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) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QIconEngine__AvailableSizesArgument) GoGC() { - runtime.SetFinalizer(this, func(this *QIconEngine__AvailableSizesArgument) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} - type QIconEngine__ScaledPixmapArgument struct { h *C.QIconEngine__ScaledPixmapArgument } diff --git a/qt/gen_qiconengine.h b/qt/gen_qiconengine.h index 5a2db3d..a8af9df 100644 --- a/qt/gen_qiconengine.h +++ b/qt/gen_qiconengine.h @@ -16,11 +16,6 @@ extern "C" { #ifdef __cplusplus class QDataStream; class QIconEngine; -#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QIconEngine__AvailableSizesArgument) -typedef QIconEngine::AvailableSizesArgument QIconEngine__AvailableSizesArgument; -#else -class QIconEngine__AvailableSizesArgument; -#endif #if defined(WORKAROUND_INNER_CLASS_DEFINITION_QIconEngine__ScaledPixmapArgument) typedef QIconEngine::ScaledPixmapArgument QIconEngine__ScaledPixmapArgument; #else @@ -33,7 +28,6 @@ class QSize; #else typedef struct QDataStream QDataStream; typedef struct QIconEngine QIconEngine; -typedef struct QIconEngine__AvailableSizesArgument QIconEngine__AvailableSizesArgument; typedef struct QIconEngine__ScaledPixmapArgument QIconEngine__ScaledPixmapArgument; typedef struct QPainter QPainter; typedef struct QPixmap QPixmap; @@ -50,19 +44,15 @@ struct miqt_string* QIconEngine_Key(const QIconEngine* self); QIconEngine* QIconEngine_Clone(const QIconEngine* self); bool QIconEngine_Read(QIconEngine* self, QDataStream* in); 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); +struct miqt_array* QIconEngine_AvailableSizes(QIconEngine* self); +struct miqt_string* QIconEngine_IconName(QIconEngine* self); +bool QIconEngine_IsNull(QIconEngine* self); QPixmap* QIconEngine_ScaledPixmap(QIconEngine* self, QSize* size, int mode, int state, double scale); void QIconEngine_VirtualHook(QIconEngine* self, int id, void* data); -struct miqt_array* QIconEngine_AvailableSizes1(const QIconEngine* self, int mode); -struct miqt_array* QIconEngine_AvailableSizes2(const QIconEngine* self, int mode, int state); +struct miqt_array* QIconEngine_AvailableSizes1(QIconEngine* self, int mode); +struct miqt_array* QIconEngine_AvailableSizes2(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); diff --git a/qt/gen_qiconengineplugin.cpp b/qt/gen_qiconengineplugin.cpp index 1f0db27..a7071d9 100644 --- a/qt/gen_qiconengineplugin.cpp +++ b/qt/gen_qiconengineplugin.cpp @@ -23,13 +23,6 @@ struct miqt_string* QIconEnginePlugin_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QIconEnginePlugin_TrUtf8(const char* s) { - QString _ret = QIconEnginePlugin::trUtf8(s); - // 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()); -} - QIconEngine* QIconEnginePlugin_Create(QIconEnginePlugin* self) { return self->create(); } @@ -48,20 +41,6 @@ struct miqt_string* QIconEnginePlugin_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QIconEnginePlugin_TrUtf82(const char* s, const char* c) { - QString _ret = QIconEnginePlugin::trUtf8(s, c); - // 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* QIconEnginePlugin_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QIconEnginePlugin::trUtf8(s, c, static_cast(n)); - // 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()); -} - QIconEngine* QIconEnginePlugin_Create1(QIconEnginePlugin* self, struct miqt_string* filename) { QString filename_QString = QString::fromUtf8(&filename->data, filename->len); return self->create(filename_QString); diff --git a/qt/gen_qiconengineplugin.go b/qt/gen_qiconengineplugin.go index 55c793b..927cf08 100644 --- a/qt/gen_qiconengineplugin.go +++ b/qt/gen_qiconengineplugin.go @@ -55,15 +55,6 @@ func QIconEnginePlugin_Tr(s string) string { return _ret } -func QIconEnginePlugin_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QIconEnginePlugin_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QIconEnginePlugin) Create() *QIconEngine { return newQIconEngine_U(unsafe.Pointer(C.QIconEnginePlugin_Create(this.h))) } @@ -90,28 +81,6 @@ func QIconEnginePlugin_Tr3(s string, c string, n int) string { return _ret } -func QIconEnginePlugin_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QIconEnginePlugin_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QIconEnginePlugin_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QIconEnginePlugin_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QIconEnginePlugin) Create1(filename string) *QIconEngine { filename_ms := miqt_strdupg(filename) defer C.free(filename_ms) diff --git a/qt/gen_qiconengineplugin.h b/qt/gen_qiconengineplugin.h index fa7212a..5e4c6a2 100644 --- a/qt/gen_qiconengineplugin.h +++ b/qt/gen_qiconengineplugin.h @@ -26,12 +26,9 @@ typedef struct QMetaObject QMetaObject; QMetaObject* QIconEnginePlugin_MetaObject(const QIconEnginePlugin* self); void* QIconEnginePlugin_Metacast(QIconEnginePlugin* self, const char* param1); struct miqt_string* QIconEnginePlugin_Tr(const char* s); -struct miqt_string* QIconEnginePlugin_TrUtf8(const char* s); QIconEngine* QIconEnginePlugin_Create(QIconEnginePlugin* self); struct miqt_string* QIconEnginePlugin_Tr2(const char* s, const char* c); struct miqt_string* QIconEnginePlugin_Tr3(const char* s, const char* c, int n); -struct miqt_string* QIconEnginePlugin_TrUtf82(const char* s, const char* c); -struct miqt_string* QIconEnginePlugin_TrUtf83(const char* s, const char* c, int n); QIconEngine* QIconEnginePlugin_Create1(QIconEnginePlugin* self, struct miqt_string* filename); void QIconEnginePlugin_Delete(QIconEnginePlugin* self); diff --git a/qt/gen_qidentityproxymodel.cpp b/qt/gen_qidentityproxymodel.cpp index 46d7eed..db5e03e 100644 --- a/qt/gen_qidentityproxymodel.cpp +++ b/qt/gen_qidentityproxymodel.cpp @@ -36,13 +36,6 @@ struct miqt_string* QIdentityProxyModel_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QIdentityProxyModel_TrUtf8(const char* s) { - QString _ret = QIdentityProxyModel::trUtf8(s); - // 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()); -} - int QIdentityProxyModel_ColumnCount(const QIdentityProxyModel* self) { return self->columnCount(); } @@ -134,20 +127,6 @@ struct miqt_string* QIdentityProxyModel_Tr3(const char* s, const char* c, int n) return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QIdentityProxyModel_TrUtf82(const char* s, const char* c) { - QString _ret = QIdentityProxyModel::trUtf8(s, c); - // 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* QIdentityProxyModel_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QIdentityProxyModel::trUtf8(s, c, static_cast(n)); - // 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()); -} - int QIdentityProxyModel_ColumnCount1(const QIdentityProxyModel* self, QModelIndex* parent) { return self->columnCount(*parent); } diff --git a/qt/gen_qidentityproxymodel.go b/qt/gen_qidentityproxymodel.go index 76dcdb2..f34bf96 100644 --- a/qt/gen_qidentityproxymodel.go +++ b/qt/gen_qidentityproxymodel.go @@ -67,15 +67,6 @@ func QIdentityProxyModel_Tr(s string) string { return _ret } -func QIdentityProxyModel_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QIdentityProxyModel_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QIdentityProxyModel) ColumnCount() int { return (int)(C.QIdentityProxyModel_ColumnCount(this.h)) } @@ -194,28 +185,6 @@ func QIdentityProxyModel_Tr3(s string, c string, n int) string { return _ret } -func QIdentityProxyModel_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QIdentityProxyModel_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QIdentityProxyModel_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QIdentityProxyModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QIdentityProxyModel) ColumnCount1(parent *QModelIndex) int { return (int)(C.QIdentityProxyModel_ColumnCount1(this.h, parent.cPointer())) } diff --git a/qt/gen_qidentityproxymodel.h b/qt/gen_qidentityproxymodel.h index 1c5641f..b93a312 100644 --- a/qt/gen_qidentityproxymodel.h +++ b/qt/gen_qidentityproxymodel.h @@ -36,7 +36,6 @@ QIdentityProxyModel* QIdentityProxyModel_new2(QObject* parent); QMetaObject* QIdentityProxyModel_MetaObject(const QIdentityProxyModel* self); void* QIdentityProxyModel_Metacast(QIdentityProxyModel* self, const char* param1); struct miqt_string* QIdentityProxyModel_Tr(const char* s); -struct miqt_string* QIdentityProxyModel_TrUtf8(const char* s); int QIdentityProxyModel_ColumnCount(const QIdentityProxyModel* self); QModelIndex* QIdentityProxyModel_Index(const QIdentityProxyModel* self, int row, int column); QModelIndex* QIdentityProxyModel_MapFromSource(const QIdentityProxyModel* self, QModelIndex* sourceIndex); @@ -56,8 +55,6 @@ bool QIdentityProxyModel_MoveRows(QIdentityProxyModel* self, QModelIndex* source bool QIdentityProxyModel_MoveColumns(QIdentityProxyModel* self, QModelIndex* sourceParent, int sourceColumn, int count, QModelIndex* destinationParent, int destinationChild); struct miqt_string* QIdentityProxyModel_Tr2(const char* s, const char* c); struct miqt_string* QIdentityProxyModel_Tr3(const char* s, const char* c, int n); -struct miqt_string* QIdentityProxyModel_TrUtf82(const char* s, const char* c); -struct miqt_string* QIdentityProxyModel_TrUtf83(const char* s, const char* c, int n); 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); diff --git a/qt/gen_qimage.cpp b/qt/gen_qimage.cpp index 6f00e67..a687519 100644 --- a/qt/gen_qimage.cpp +++ b/qt/gen_qimage.cpp @@ -1,16 +1,17 @@ #include +#include #include #include #include #include #include #include -#include #include #include #include #include #include +#include #include #include #include @@ -39,12 +40,12 @@ 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, int format) { - return new QImage(static_cast(data), static_cast(width), static_cast(height), static_cast(bytesPerLine), static_cast(format)); +QImage* QImage_new6(unsigned char* data, int width, int height, ptrdiff_t bytesPerLine, int format) { + return new QImage(static_cast(data), static_cast(width), static_cast(height), (qsizetype)(bytesPerLine), static_cast(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)); +QImage* QImage_new7(const unsigned char* data, int width, int height, ptrdiff_t bytesPerLine, int format) { + return new QImage(static_cast(data), static_cast(width), static_cast(height), (qsizetype)(bytesPerLine), static_cast(format)); } QImage* QImage_new8(struct miqt_string* fileName) { @@ -111,7 +112,7 @@ QImage* QImage_ConvertToFormat(const QImage* self, int f) { } QImage* QImage_ConvertToFormat2(const QImage* self, int f, struct miqt_array* /* of unsigned int */ colorTable) { - QVector colorTable_QList; + QList colorTable_QList; colorTable_QList.reserve(colorTable->len); unsigned int* colorTable_arr = static_cast(colorTable->data); for(size_t i = 0; i < colorTable->len; ++i) { @@ -124,6 +125,10 @@ bool QImage_ReinterpretAsFormat(QImage* self, int f) { return self->reinterpretAsFormat(static_cast(f)); } +QImage* QImage_ConvertedTo(const QImage* self, int f) { + return new QImage(self->convertedTo(static_cast(f))); +} + void QImage_ConvertTo(QImage* self, int f) { self->convertTo(static_cast(f)); } @@ -192,10 +197,6 @@ const unsigned char* QImage_ConstBits(const QImage* self) { return static_cast(_ret); } -int QImage_ByteCount(const QImage* self) { - return self->byteCount(); -} - ptrdiff_t QImage_SizeInBytes(const QImage* self) { qsizetype _ret = self->sizeInBytes(); return static_cast(_ret); @@ -216,8 +217,9 @@ const unsigned char* QImage_ConstScanLine(const QImage* self, int param1) { return static_cast(_ret); } -int QImage_BytesPerLine(const QImage* self) { - return self->bytesPerLine(); +ptrdiff_t QImage_BytesPerLine(const QImage* self) { + qsizetype _ret = self->bytesPerLine(); + return static_cast(_ret); } bool QImage_Valid(const QImage* self, int x, int y) { @@ -271,7 +273,7 @@ void QImage_SetPixelColor2(QImage* self, QPoint* pt, QColor* c) { } struct miqt_array* QImage_ColorTable(const QImage* self) { - QVector _ret = self->colorTable(); + QList _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 +286,7 @@ struct miqt_array* QImage_ColorTable(const QImage* self) { } void QImage_SetColorTable(QImage* self, struct miqt_array* /* of unsigned int */ colors) { - QVector colors_QList; + QList colors_QList; colors_QList.reserve(colors->len); unsigned int* colors_arr = static_cast(colors->data); for(size_t i = 0; i < colors->len; ++i) { @@ -302,6 +304,10 @@ void QImage_SetDevicePixelRatio(QImage* self, double scaleFactor) { self->setDevicePixelRatio(static_cast(scaleFactor)); } +QSizeF* QImage_DeviceIndependentSize(const QImage* self) { + return new QSizeF(self->deviceIndependentSize()); +} + void QImage_Fill(QImage* self, unsigned int pixel) { self->fill(static_cast(pixel)); } @@ -322,10 +328,6 @@ void QImage_SetAlphaChannel(QImage* self, QImage* alphaChannel) { self->setAlphaChannel(*alphaChannel); } -QImage* QImage_AlphaChannel(const QImage* self) { - return new QImage(self->alphaChannel()); -} - QImage* QImage_CreateAlphaMask(const QImage* self) { return new QImage(self->createAlphaMask()); } @@ -354,19 +356,11 @@ QImage* QImage_ScaledToHeight(const QImage* self, int h) { return new QImage(self->scaledToHeight(static_cast(h))); } -QImage* QImage_Transformed(const QImage* self, QMatrix* matrix) { +QImage* QImage_Transformed(const QImage* self, QTransform* matrix) { return new QImage(self->transformed(*matrix)); } -QMatrix* QImage_TrueMatrix(QMatrix* param1, int w, int h) { - return new QMatrix(QImage::trueMatrix(*param1, static_cast(w), static_cast(h))); -} - -QImage* QImage_TransformedWithMatrix(const QImage* self, QTransform* matrix) { - return new QImage(self->transformed(*matrix)); -} - -QTransform* QImage_TrueMatrix2(QTransform* param1, int w, int h) { +QTransform* QImage_TrueMatrix(QTransform* param1, int w, int h) { return new QTransform(QImage::trueMatrix(*param1, static_cast(w), static_cast(h))); } @@ -378,6 +372,14 @@ QImage* QImage_RgbSwapped(const QImage* self) { return new QImage(self->rgbSwapped()); } +void QImage_Mirror(QImage* self) { + self->mirror(); +} + +void QImage_RgbSwap(QImage* self) { + self->rgbSwap(); +} + void QImage_InvertPixels(QImage* self) { self->invertPixels(); } @@ -398,6 +400,10 @@ void QImage_SetColorSpace(QImage* self, QColorSpace* colorSpace) { self->setColorSpace(*colorSpace); } +QImage* QImage_ColorTransformed(const QImage* self, QColorTransform* transform) { + return new QImage(self->colorTransformed(*transform)); +} + void QImage_ApplyColorTransform(QImage* self, QColorTransform* transform) { self->applyColorTransform(*transform); } @@ -411,7 +417,11 @@ bool QImage_LoadWithFileName(QImage* self, struct miqt_string* fileName) { return self->load(fileName_QString); } -bool QImage_LoadFromData(QImage* self, const unsigned char* buf, int lenVal) { +bool QImage_LoadFromData(QImage* self, QByteArrayView* data) { + return self->loadFromData(*data); +} + +bool QImage_LoadFromData2(QImage* self, const unsigned char* buf, int lenVal) { return self->loadFromData(static_cast(buf), static_cast(lenVal)); } @@ -428,7 +438,11 @@ bool QImage_SaveWithDevice(const QImage* self, QIODevice* device) { return self->save(device); } -QImage* QImage_FromData(const unsigned char* data, int size) { +QImage* QImage_FromData(QByteArrayView* data) { + return new QImage(QImage::fromData(*data)); +} + +QImage* QImage_FromData2(const unsigned char* data, int size) { return new QImage(QImage::fromData(static_cast(data), static_cast(size))); } @@ -520,7 +534,7 @@ 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) { - QVector colorTable_QList; + QList colorTable_QList; colorTable_QList.reserve(colorTable->len); unsigned int* colorTable_arr = static_cast(colorTable->data); for(size_t i = 0; i < colorTable->len; ++i) { @@ -529,6 +543,10 @@ QImage* QImage_ConvertToFormat3(const QImage* self, int f, struct miqt_array* /* return new QImage(self->convertToFormat(static_cast(f), colorTable_QList, static_cast(flags))); } +QImage* QImage_ConvertedTo2(const QImage* self, int f, int flags) { + return new QImage(self->convertedTo(static_cast(f), static_cast(flags))); +} + void QImage_ConvertTo2(QImage* self, int f, int flags) { self->convertTo(static_cast(f), static_cast(flags)); } @@ -569,11 +587,7 @@ 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, int mode) { - return new QImage(self->transformed(*matrix, static_cast(mode))); -} - -QImage* QImage_Transformed22(const QImage* self, QTransform* matrix, int mode) { +QImage* QImage_Transformed2(const QImage* self, QTransform* matrix, int mode) { return new QImage(self->transformed(*matrix, static_cast(mode))); } @@ -585,6 +599,14 @@ QImage* QImage_Mirrored2(const QImage* self, bool horizontally, bool vertically) return new QImage(self->mirrored(horizontally, vertically)); } +void QImage_Mirror1(QImage* self, bool horizontally) { + self->mirror(horizontally); +} + +void QImage_Mirror2(QImage* self, bool horizontally, bool vertically) { + self->mirror(horizontally, vertically); +} + void QImage_InvertPixels1(QImage* self, int param1) { self->invertPixels(static_cast(param1)); } @@ -594,12 +616,16 @@ bool QImage_Load2(QImage* self, struct miqt_string* fileName, const char* format return self->load(fileName_QString, format); } +bool QImage_LoadFromData22(QImage* self, QByteArrayView* data, const char* format) { + return self->loadFromData(*data, format); +} + bool QImage_LoadFromData3(QImage* self, const unsigned char* buf, int lenVal, const char* format) { return self->loadFromData(static_cast(buf), static_cast(lenVal), format); } -bool QImage_LoadFromData2(QImage* self, QByteArray* data, const char* aformat) { - return self->loadFromData(*data, aformat); +bool QImage_LoadFromData23(QImage* self, QByteArray* data, const char* format) { + return self->loadFromData(*data, format); } bool QImage_Save2(const QImage* self, struct miqt_string* fileName, const char* format) { @@ -620,11 +646,15 @@ bool QImage_Save32(const QImage* self, QIODevice* device, const char* format, in return self->save(device, format, static_cast(quality)); } +QImage* QImage_FromData22(QByteArrayView* data, const char* format) { + return new QImage(QImage::fromData(*data, format)); +} + QImage* QImage_FromData3(const unsigned char* data, int size, const char* format) { return new QImage(QImage::fromData(static_cast(data), static_cast(size), format)); } -QImage* QImage_FromData2(QByteArray* data, const char* format) { +QImage* QImage_FromData23(QByteArray* data, const char* format) { return new QImage(QImage::fromData(*data, format)); } diff --git a/qt/gen_qimage.go b/qt/gen_qimage.go index c02243c..d380983 100644 --- a/qt/gen_qimage.go +++ b/qt/gen_qimage.go @@ -23,37 +23,43 @@ const ( type QImage__Format int const ( - QImage__Format_Invalid QImage__Format = 0 - QImage__Format_Mono QImage__Format = 1 - QImage__Format_MonoLSB QImage__Format = 2 - QImage__Format_Indexed8 QImage__Format = 3 - QImage__Format_RGB32 QImage__Format = 4 - QImage__Format_ARGB32 QImage__Format = 5 - QImage__Format_ARGB32_Premultiplied QImage__Format = 6 - QImage__Format_RGB16 QImage__Format = 7 - QImage__Format_ARGB8565_Premultiplied QImage__Format = 8 - QImage__Format_RGB666 QImage__Format = 9 - QImage__Format_ARGB6666_Premultiplied QImage__Format = 10 - QImage__Format_RGB555 QImage__Format = 11 - QImage__Format_ARGB8555_Premultiplied QImage__Format = 12 - QImage__Format_RGB888 QImage__Format = 13 - QImage__Format_RGB444 QImage__Format = 14 - QImage__Format_ARGB4444_Premultiplied QImage__Format = 15 - QImage__Format_RGBX8888 QImage__Format = 16 - QImage__Format_RGBA8888 QImage__Format = 17 - QImage__Format_RGBA8888_Premultiplied QImage__Format = 18 - QImage__Format_BGR30 QImage__Format = 19 - QImage__Format_A2BGR30_Premultiplied QImage__Format = 20 - QImage__Format_RGB30 QImage__Format = 21 - QImage__Format_A2RGB30_Premultiplied QImage__Format = 22 - QImage__Format_Alpha8 QImage__Format = 23 - QImage__Format_Grayscale8 QImage__Format = 24 - QImage__Format_RGBX64 QImage__Format = 25 - QImage__Format_RGBA64 QImage__Format = 26 - QImage__Format_RGBA64_Premultiplied QImage__Format = 27 - QImage__Format_Grayscale16 QImage__Format = 28 - QImage__Format_BGR888 QImage__Format = 29 - QImage__NImageFormats QImage__Format = 30 + QImage__Format_Invalid QImage__Format = 0 + QImage__Format_Mono QImage__Format = 1 + QImage__Format_MonoLSB QImage__Format = 2 + QImage__Format_Indexed8 QImage__Format = 3 + QImage__Format_RGB32 QImage__Format = 4 + QImage__Format_ARGB32 QImage__Format = 5 + QImage__Format_ARGB32_Premultiplied QImage__Format = 6 + QImage__Format_RGB16 QImage__Format = 7 + QImage__Format_ARGB8565_Premultiplied QImage__Format = 8 + QImage__Format_RGB666 QImage__Format = 9 + QImage__Format_ARGB6666_Premultiplied QImage__Format = 10 + QImage__Format_RGB555 QImage__Format = 11 + QImage__Format_ARGB8555_Premultiplied QImage__Format = 12 + QImage__Format_RGB888 QImage__Format = 13 + QImage__Format_RGB444 QImage__Format = 14 + QImage__Format_ARGB4444_Premultiplied QImage__Format = 15 + QImage__Format_RGBX8888 QImage__Format = 16 + QImage__Format_RGBA8888 QImage__Format = 17 + QImage__Format_RGBA8888_Premultiplied QImage__Format = 18 + QImage__Format_BGR30 QImage__Format = 19 + QImage__Format_A2BGR30_Premultiplied QImage__Format = 20 + QImage__Format_RGB30 QImage__Format = 21 + QImage__Format_A2RGB30_Premultiplied QImage__Format = 22 + QImage__Format_Alpha8 QImage__Format = 23 + QImage__Format_Grayscale8 QImage__Format = 24 + QImage__Format_RGBX64 QImage__Format = 25 + QImage__Format_RGBA64 QImage__Format = 26 + QImage__Format_RGBA64_Premultiplied QImage__Format = 27 + QImage__Format_Grayscale16 QImage__Format = 28 + QImage__Format_BGR888 QImage__Format = 29 + QImage__Format_RGBX16FPx4 QImage__Format = 30 + QImage__Format_RGBA16FPx4 QImage__Format = 31 + QImage__Format_RGBA16FPx4_Premultiplied QImage__Format = 32 + QImage__Format_RGBX32FPx4 QImage__Format = 33 + QImage__Format_RGBA32FPx4 QImage__Format = 34 + QImage__Format_RGBA32FPx4_Premultiplied QImage__Format = 35 + QImage__NImageFormats QImage__Format = 36 ) type QImage struct { @@ -110,14 +116,14 @@ func NewQImage5(data *byte, width int, height int, format QImage__Format) *QImag } // 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.int)(format)) +func NewQImage6(data *byte, width int, height int, bytesPerLine int64, format QImage__Format) *QImage { + ret := C.QImage_new6((*C.uchar)(unsafe.Pointer(data)), (C.int)(width), (C.int)(height), (C.ptrdiff_t)(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.int)(format)) +func NewQImage7(data *byte, width int, height int, bytesPerLine int64, format QImage__Format) *QImage { + ret := C.QImage_new7((*C.uchar)(unsafe.Pointer(data)), (C.int)(width), (C.int)(height), (C.ptrdiff_t)(bytesPerLine), (C.int)(format)) return newQImage(ret) } @@ -221,6 +227,13 @@ func (this *QImage) ReinterpretAsFormat(f QImage__Format) bool { return (bool)(C.QImage_ReinterpretAsFormat(this.h, (C.int)(f))) } +func (this *QImage) ConvertedTo(f QImage__Format) *QImage { + _ret := C.QImage_ConvertedTo(this.h, (C.int)(f)) + _goptr := newQImage(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + func (this *QImage) ConvertTo(f QImage__Format) { C.QImage_ConvertTo(this.h, (C.int)(f)) } @@ -291,10 +304,6 @@ func (this *QImage) ConstBits() *byte { return (*byte)(C.QImage_ConstBits(this.h)) } -func (this *QImage) ByteCount() int { - return (int)(C.QImage_ByteCount(this.h)) -} - func (this *QImage) SizeInBytes() int64 { return (int64)(C.QImage_SizeInBytes(this.h)) } @@ -311,8 +320,8 @@ func (this *QImage) ConstScanLine(param1 int) *byte { return (*byte)(C.QImage_ConstScanLine(this.h, (C.int)(param1))) } -func (this *QImage) BytesPerLine() int { - return (int)(C.QImage_BytesPerLine(this.h)) +func (this *QImage) BytesPerLine() int64 { + return (int64)(C.QImage_BytesPerLine(this.h)) } func (this *QImage) Valid(x int, y int) bool { @@ -400,6 +409,13 @@ func (this *QImage) SetDevicePixelRatio(scaleFactor float64) { C.QImage_SetDevicePixelRatio(this.h, (C.double)(scaleFactor)) } +func (this *QImage) DeviceIndependentSize() *QSizeF { + _ret := C.QImage_DeviceIndependentSize(this.h) + _goptr := newQSizeF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + func (this *QImage) Fill(pixel uint) { C.QImage_Fill(this.h, (C.uint)(pixel)) } @@ -420,13 +436,6 @@ func (this *QImage) SetAlphaChannel(alphaChannel *QImage) { C.QImage_SetAlphaChannel(this.h, alphaChannel.cPointer()) } -func (this *QImage) AlphaChannel() *QImage { - _ret := C.QImage_AlphaChannel(this.h) - _goptr := newQImage(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - func (this *QImage) CreateAlphaMask() *QImage { _ret := C.QImage_CreateAlphaMask(this.h) _goptr := newQImage(_ret) @@ -476,29 +485,15 @@ func (this *QImage) ScaledToHeight(h int) *QImage { return _goptr } -func (this *QImage) Transformed(matrix *QMatrix) *QImage { +func (this *QImage) Transformed(matrix *QTransform) *QImage { _ret := C.QImage_Transformed(this.h, matrix.cPointer()) _goptr := newQImage(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QImage_TrueMatrix(param1 *QMatrix, w int, h int) *QMatrix { +func QImage_TrueMatrix(param1 *QTransform, w int, h int) *QTransform { _ret := C.QImage_TrueMatrix(param1.cPointer(), (C.int)(w), (C.int)(h)) - _goptr := newQMatrix(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QImage) TransformedWithMatrix(matrix *QTransform) *QImage { - _ret := C.QImage_TransformedWithMatrix(this.h, matrix.cPointer()) - _goptr := newQImage(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QImage_TrueMatrix2(param1 *QTransform, w int, h int) *QTransform { - _ret := C.QImage_TrueMatrix2(param1.cPointer(), (C.int)(w), (C.int)(h)) _goptr := newQTransform(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -518,6 +513,14 @@ func (this *QImage) RgbSwapped() *QImage { return _goptr } +func (this *QImage) Mirror() { + C.QImage_Mirror(this.h) +} + +func (this *QImage) RgbSwap() { + C.QImage_RgbSwap(this.h) +} + func (this *QImage) InvertPixels() { C.QImage_InvertPixels(this.h) } @@ -544,6 +547,13 @@ func (this *QImage) SetColorSpace(colorSpace *QColorSpace) { C.QImage_SetColorSpace(this.h, colorSpace.cPointer()) } +func (this *QImage) ColorTransformed(transform *QColorTransform) *QImage { + _ret := C.QImage_ColorTransformed(this.h, transform.cPointer()) + _goptr := newQImage(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + func (this *QImage) ApplyColorTransform(transform *QColorTransform) { C.QImage_ApplyColorTransform(this.h, transform.cPointer()) } @@ -560,8 +570,12 @@ func (this *QImage) LoadWithFileName(fileName string) bool { return (bool)(C.QImage_LoadWithFileName(this.h, (*C.struct_miqt_string)(fileName_ms))) } -func (this *QImage) LoadFromData(buf *byte, lenVal int) bool { - return (bool)(C.QImage_LoadFromData(this.h, (*C.uchar)(unsafe.Pointer(buf)), (C.int)(lenVal))) +func (this *QImage) LoadFromData(data QByteArrayView) bool { + return (bool)(C.QImage_LoadFromData(this.h, data.cPointer())) +} + +func (this *QImage) LoadFromData2(buf *byte, lenVal int) bool { + return (bool)(C.QImage_LoadFromData2(this.h, (*C.uchar)(unsafe.Pointer(buf)), (C.int)(lenVal))) } func (this *QImage) LoadFromDataWithData(data *QByteArray) bool { @@ -578,8 +592,15 @@ func (this *QImage) SaveWithDevice(device *QIODevice) bool { return (bool)(C.QImage_SaveWithDevice(this.h, device.cPointer())) } -func QImage_FromData(data *byte, size int) *QImage { - _ret := C.QImage_FromData((*C.uchar)(unsafe.Pointer(data)), (C.int)(size)) +func QImage_FromData(data QByteArrayView) *QImage { + _ret := C.QImage_FromData(data.cPointer()) + _goptr := newQImage(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func QImage_FromData2(data *byte, size int) *QImage { + _ret := C.QImage_FromData2((*C.uchar)(unsafe.Pointer(data)), (C.int)(size)) _goptr := newQImage(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -703,6 +724,13 @@ func (this *QImage) ConvertToFormat3(f QImage__Format, colorTable []uint, flags return _goptr } +func (this *QImage) ConvertedTo2(f QImage__Format, flags ImageConversionFlag) *QImage { + _ret := C.QImage_ConvertedTo2(this.h, (C.int)(f), (C.int)(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 ImageConversionFlag) { C.QImage_ConvertTo2(this.h, (C.int)(f), (C.int)(flags)) } @@ -770,20 +798,13 @@ func (this *QImage) ScaledToHeight2(h int, mode TransformationMode) *QImage { return _goptr } -func (this *QImage) Transformed2(matrix *QMatrix, mode TransformationMode) *QImage { +func (this *QImage) Transformed2(matrix *QTransform, mode TransformationMode) *QImage { _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.int)(mode)) - _goptr := newQImage(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - func (this *QImage) Mirrored1(horizontally bool) *QImage { _ret := C.QImage_Mirrored1(this.h, (C.bool)(horizontally)) _goptr := newQImage(_ret) @@ -798,6 +819,14 @@ func (this *QImage) Mirrored2(horizontally bool, vertically bool) *QImage { return _goptr } +func (this *QImage) Mirror1(horizontally bool) { + C.QImage_Mirror1(this.h, (C.bool)(horizontally)) +} + +func (this *QImage) Mirror2(horizontally bool, vertically bool) { + C.QImage_Mirror2(this.h, (C.bool)(horizontally), (C.bool)(vertically)) +} + func (this *QImage) InvertPixels1(param1 QImage__InvertMode) { C.QImage_InvertPixels1(this.h, (C.int)(param1)) } @@ -810,16 +839,22 @@ func (this *QImage) Load2(fileName string, format string) bool { return (bool)(C.QImage_Load2(this.h, (*C.struct_miqt_string)(fileName_ms), format_Cstring)) } +func (this *QImage) LoadFromData22(data QByteArrayView, format string) bool { + format_Cstring := C.CString(format) + defer C.free(unsafe.Pointer(format_Cstring)) + return (bool)(C.QImage_LoadFromData22(this.h, data.cPointer(), format_Cstring)) +} + func (this *QImage) LoadFromData3(buf *byte, lenVal int, format string) bool { format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) return (bool)(C.QImage_LoadFromData3(this.h, (*C.uchar)(unsafe.Pointer(buf)), (C.int)(lenVal), format_Cstring)) } -func (this *QImage) LoadFromData2(data *QByteArray, aformat string) bool { - aformat_Cstring := C.CString(aformat) - defer C.free(unsafe.Pointer(aformat_Cstring)) - return (bool)(C.QImage_LoadFromData2(this.h, data.cPointer(), aformat_Cstring)) +func (this *QImage) LoadFromData23(data *QByteArray, format string) bool { + format_Cstring := C.CString(format) + defer C.free(unsafe.Pointer(format_Cstring)) + return (bool)(C.QImage_LoadFromData23(this.h, data.cPointer(), format_Cstring)) } func (this *QImage) Save2(fileName string, format string) bool { @@ -850,6 +885,15 @@ func (this *QImage) Save32(device *QIODevice, format string, quality int) bool { return (bool)(C.QImage_Save32(this.h, device.cPointer(), format_Cstring, (C.int)(quality))) } +func QImage_FromData22(data QByteArrayView, format string) *QImage { + format_Cstring := C.CString(format) + defer C.free(unsafe.Pointer(format_Cstring)) + _ret := C.QImage_FromData22(data.cPointer(), format_Cstring) + _goptr := newQImage(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + func QImage_FromData3(data *byte, size int, format string) *QImage { format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) @@ -859,10 +903,10 @@ func QImage_FromData3(data *byte, size int, format string) *QImage { return _goptr } -func QImage_FromData2(data *QByteArray, format string) *QImage { +func QImage_FromData23(data *QByteArray, format string) *QImage { format_Cstring := C.CString(format) defer C.free(unsafe.Pointer(format_Cstring)) - _ret := C.QImage_FromData2(data.cPointer(), format_Cstring) + _ret := C.QImage_FromData23(data.cPointer(), format_Cstring) _goptr := newQImage(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr diff --git a/qt/gen_qimage.h b/qt/gen_qimage.h index 4ad9844..36d77c5 100644 --- a/qt/gen_qimage.h +++ b/qt/gen_qimage.h @@ -15,31 +15,33 @@ extern "C" { #ifdef __cplusplus class QByteArray; +class QByteArrayView; class QColor; class QColorSpace; class QColorTransform; class QIODevice; class QImage; -class QMatrix; class QPaintEngine; class QPixelFormat; class QPoint; class QRect; class QSize; +class QSizeF; class QTransform; #else typedef struct QByteArray QByteArray; +typedef struct QByteArrayView QByteArrayView; typedef struct QColor QColor; typedef struct QColorSpace QColorSpace; typedef struct QColorTransform QColorTransform; typedef struct QIODevice QIODevice; typedef struct QImage QImage; -typedef struct QMatrix QMatrix; typedef struct QPaintEngine QPaintEngine; typedef struct QPixelFormat QPixelFormat; typedef struct QPoint QPoint; typedef struct QRect QRect; typedef struct QSize QSize; +typedef struct QSizeF QSizeF; typedef struct QTransform QTransform; #endif @@ -48,8 +50,8 @@ 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_new6(unsigned char* data, int width, int height, ptrdiff_t bytesPerLine, int format); +QImage* QImage_new7(const unsigned char* data, int width, int height, ptrdiff_t 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); @@ -67,6 +69,7 @@ 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); +QImage* QImage_ConvertedTo(const QImage* self, int f); void QImage_ConvertTo(QImage* self, int f); int QImage_Width(const QImage* self); int QImage_Height(const QImage* self); @@ -83,12 +86,11 @@ bool QImage_IsGrayscale(const QImage* self); unsigned char* QImage_Bits(QImage* self); const unsigned char* QImage_Bits2(const QImage* self); const unsigned char* QImage_ConstBits(const QImage* self); -int QImage_ByteCount(const QImage* self); ptrdiff_t QImage_SizeInBytes(const QImage* self); unsigned char* QImage_ScanLine(QImage* self, int param1); const unsigned char* QImage_ScanLineWithInt(const QImage* self, int param1); const unsigned char* QImage_ConstScanLine(const QImage* self, int param1); -int QImage_BytesPerLine(const QImage* self); +ptrdiff_t QImage_BytesPerLine(const QImage* self); bool QImage_Valid(const QImage* self, int x, int y); bool QImage_ValidWithPt(const QImage* self, QPoint* pt); int QImage_PixelIndex(const QImage* self, int x, int y); @@ -105,12 +107,12 @@ struct miqt_array* QImage_ColorTable(const QImage* self); void QImage_SetColorTable(QImage* self, struct miqt_array* /* of unsigned int */ colors); double QImage_DevicePixelRatio(const QImage* self); void QImage_SetDevicePixelRatio(QImage* self, double scaleFactor); +QSizeF* QImage_DeviceIndependentSize(const QImage* self); void QImage_Fill(QImage* self, unsigned int pixel); void QImage_FillWithColor(QImage* self, QColor* 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); QImage* QImage_CreateAlphaMask(const QImage* self); QImage* QImage_CreateHeuristicMask(const QImage* self); QImage* QImage_CreateMaskFromColor(const QImage* self, unsigned int color); @@ -118,25 +120,28 @@ QImage* QImage_Scaled(const QImage* self, int w, int h); QImage* QImage_ScaledWithQSize(const QImage* self, QSize* s); QImage* QImage_ScaledToWidth(const QImage* self, int w); QImage* QImage_ScaledToHeight(const QImage* self, int h); -QImage* QImage_Transformed(const QImage* self, QMatrix* matrix); -QMatrix* QImage_TrueMatrix(QMatrix* param1, int w, int h); -QImage* QImage_TransformedWithMatrix(const QImage* self, QTransform* matrix); -QTransform* QImage_TrueMatrix2(QTransform* param1, int w, int h); +QImage* QImage_Transformed(const QImage* self, QTransform* matrix); +QTransform* QImage_TrueMatrix(QTransform* param1, int w, int h); QImage* QImage_Mirrored(const QImage* self); QImage* QImage_RgbSwapped(const QImage* self); +void QImage_Mirror(QImage* self); +void QImage_RgbSwap(QImage* self); void QImage_InvertPixels(QImage* self); QColorSpace* QImage_ColorSpace(const QImage* self); QImage* QImage_ConvertedToColorSpace(const QImage* self, QColorSpace* param1); void QImage_ConvertToColorSpace(QImage* self, QColorSpace* param1); void QImage_SetColorSpace(QImage* self, QColorSpace* colorSpace); +QImage* QImage_ColorTransformed(const QImage* self, QColorTransform* transform); void QImage_ApplyColorTransform(QImage* self, QColorTransform* transform); bool QImage_Load(QImage* self, QIODevice* device, const char* format); bool QImage_LoadWithFileName(QImage* self, struct miqt_string* fileName); -bool QImage_LoadFromData(QImage* self, const unsigned char* buf, int lenVal); +bool QImage_LoadFromData(QImage* self, QByteArrayView* data); +bool QImage_LoadFromData2(QImage* self, const unsigned char* buf, int lenVal); bool QImage_LoadFromDataWithData(QImage* self, QByteArray* data); bool QImage_Save(const QImage* self, struct miqt_string* fileName); bool QImage_SaveWithDevice(const QImage* self, QIODevice* device); -QImage* QImage_FromData(const unsigned char* data, int size); +QImage* QImage_FromData(QByteArrayView* data); +QImage* QImage_FromData2(const unsigned char* data, int size); QImage* QImage_FromDataWithData(QByteArray* data); long long QImage_CacheKey(const QImage* self); QPaintEngine* QImage_PaintEngine(const QImage* self); @@ -155,6 +160,7 @@ int QImage_ToImageFormat(QPixelFormat* format); QImage* QImage_Copy1(const QImage* self, QRect* rect); 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); +QImage* QImage_ConvertedTo2(const QImage* self, int f, 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); @@ -165,20 +171,23 @@ 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_Transformed2(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_Mirror1(QImage* self, bool horizontally); +void QImage_Mirror2(QImage* self, bool horizontally, bool vertically); void QImage_InvertPixels1(QImage* self, int param1); bool QImage_Load2(QImage* self, struct miqt_string* fileName, const char* format); +bool QImage_LoadFromData22(QImage* self, QByteArrayView* data, 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); +bool QImage_LoadFromData23(QImage* self, QByteArray* data, const char* format); bool QImage_Save2(const QImage* self, struct miqt_string* fileName, const char* format); bool QImage_Save3(const QImage* self, struct miqt_string* fileName, const char* format, int quality); bool QImage_Save22(const QImage* self, QIODevice* device, const char* format); bool QImage_Save32(const QImage* self, QIODevice* device, const char* format, int quality); +QImage* QImage_FromData22(QByteArrayView* data, const char* format); QImage* QImage_FromData3(const unsigned char* data, int size, const char* format); -QImage* QImage_FromData2(QByteArray* data, const char* format); +QImage* QImage_FromData23(QByteArray* data, const char* format); struct miqt_string* QImage_Text1(const QImage* self, struct miqt_string* key); void QImage_Delete(QImage* self); diff --git a/qt/gen_qimageiohandler.cpp b/qt/gen_qimageiohandler.cpp index f657d99..f402ee0 100644 --- a/qt/gen_qimageiohandler.cpp +++ b/qt/gen_qimageiohandler.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -33,10 +34,6 @@ QByteArray* QImageIOHandler_Format(const QImageIOHandler* self) { return new QByteArray(self->format()); } -QByteArray* QImageIOHandler_Name(const QImageIOHandler* self) { - return new QByteArray(self->name()); -} - bool QImageIOHandler_CanRead(const QImageIOHandler* self) { return self->canRead(); } @@ -89,6 +86,10 @@ QRect* QImageIOHandler_CurrentImageRect(const QImageIOHandler* self) { return new QRect(self->currentImageRect()); } +bool QImageIOHandler_AllocateImage(QSize* size, int format, QImage* image) { + return QImageIOHandler::allocateImage(*size, static_cast(format), image); +} + void QImageIOHandler_Delete(QImageIOHandler* self) { delete self; } @@ -108,13 +109,6 @@ struct miqt_string* QImageIOPlugin_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QImageIOPlugin_TrUtf8(const char* s) { - QString _ret = QImageIOPlugin::trUtf8(s); - // 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()); -} - int QImageIOPlugin_Capabilities(const QImageIOPlugin* self, QIODevice* device, QByteArray* format) { QImageIOPlugin::Capabilities _ret = self->capabilities(device, *format); return static_cast(_ret); @@ -138,20 +132,6 @@ struct miqt_string* QImageIOPlugin_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QImageIOPlugin_TrUtf82(const char* s, const char* c) { - QString _ret = QImageIOPlugin::trUtf8(s, c); - // 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* QImageIOPlugin_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QImageIOPlugin::trUtf8(s, c, static_cast(n)); - // 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()); -} - QImageIOHandler* QImageIOPlugin_Create2(const QImageIOPlugin* self, QIODevice* device, QByteArray* format) { return self->create(device, *format); } diff --git a/qt/gen_qimageiohandler.go b/qt/gen_qimageiohandler.go index e1186e7..3c3fe3e 100644 --- a/qt/gen_qimageiohandler.go +++ b/qt/gen_qimageiohandler.go @@ -35,7 +35,6 @@ const ( QImageIOHandler__OptimizedWrite QImageIOHandler__ImageOption = 16 QImageIOHandler__ProgressiveScanWrite QImageIOHandler__ImageOption = 17 QImageIOHandler__ImageTransformation QImageIOHandler__ImageOption = 18 - QImageIOHandler__TransformedByDefault QImageIOHandler__ImageOption = 19 ) type QImageIOHandler__Transformation int @@ -104,13 +103,6 @@ func (this *QImageIOHandler) Format() *QByteArray { return _goptr } -func (this *QImageIOHandler) Name() *QByteArray { - _ret := C.QImageIOHandler_Name(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - func (this *QImageIOHandler) CanRead() bool { return (bool)(C.QImageIOHandler_CanRead(this.h)) } @@ -169,6 +161,10 @@ func (this *QImageIOHandler) CurrentImageRect() *QRect { return _goptr } +func QImageIOHandler_AllocateImage(size QSize, format QImage__Format, image *QImage) bool { + return (bool)(C.QImageIOHandler_AllocateImage(size.cPointer(), (C.int)(format), image.cPointer())) +} + // Delete this object from C++ memory. func (this *QImageIOHandler) Delete() { C.QImageIOHandler_Delete(this.h) @@ -225,15 +221,6 @@ func QImageIOPlugin_Tr(s string) string { return _ret } -func QImageIOPlugin_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QImageIOPlugin_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QImageIOPlugin) Capabilities(device *QIODevice, format *QByteArray) QImageIOPlugin__Capability { return (QImageIOPlugin__Capability)(C.QImageIOPlugin_Capabilities(this.h, device.cPointer(), format.cPointer())) } @@ -264,28 +251,6 @@ func QImageIOPlugin_Tr3(s string, c string, n int) string { return _ret } -func QImageIOPlugin_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QImageIOPlugin_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QImageIOPlugin_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QImageIOPlugin_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QImageIOPlugin) Create2(device *QIODevice, format *QByteArray) *QImageIOHandler { return newQImageIOHandler_U(unsafe.Pointer(C.QImageIOPlugin_Create2(this.h, device.cPointer(), format.cPointer()))) } diff --git a/qt/gen_qimageiohandler.h b/qt/gen_qimageiohandler.h index be4063e..02b7cb9 100644 --- a/qt/gen_qimageiohandler.h +++ b/qt/gen_qimageiohandler.h @@ -21,6 +21,7 @@ class QImageIOHandler; class QImageIOPlugin; class QMetaObject; class QRect; +class QSize; class QVariant; #else typedef struct QByteArray QByteArray; @@ -30,6 +31,7 @@ typedef struct QImageIOHandler QImageIOHandler; typedef struct QImageIOPlugin QImageIOPlugin; typedef struct QMetaObject QMetaObject; typedef struct QRect QRect; +typedef struct QSize QSize; typedef struct QVariant QVariant; #endif @@ -38,7 +40,6 @@ QIODevice* QImageIOHandler_Device(const QImageIOHandler* self); void QImageIOHandler_SetFormat(QImageIOHandler* self, QByteArray* format); void QImageIOHandler_SetFormatWithFormat(const QImageIOHandler* self, QByteArray* format); QByteArray* QImageIOHandler_Format(const QImageIOHandler* self); -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); @@ -52,18 +53,16 @@ int QImageIOHandler_ImageCount(const QImageIOHandler* self); int QImageIOHandler_NextImageDelay(const QImageIOHandler* self); int QImageIOHandler_CurrentImageNumber(const QImageIOHandler* self); QRect* QImageIOHandler_CurrentImageRect(const QImageIOHandler* self); +bool QImageIOHandler_AllocateImage(QSize* size, int format, QImage* image); void QImageIOHandler_Delete(QImageIOHandler* self); QMetaObject* QImageIOPlugin_MetaObject(const QImageIOPlugin* self); void* QImageIOPlugin_Metacast(QImageIOPlugin* self, const char* param1); struct miqt_string* QImageIOPlugin_Tr(const char* s); -struct miqt_string* QImageIOPlugin_TrUtf8(const char* s); int QImageIOPlugin_Capabilities(const QImageIOPlugin* self, QIODevice* device, QByteArray* format); QImageIOHandler* QImageIOPlugin_Create(const QImageIOPlugin* self, QIODevice* device); struct miqt_string* QImageIOPlugin_Tr2(const char* s, const char* c); struct miqt_string* QImageIOPlugin_Tr3(const char* s, const char* c, int n); -struct miqt_string* QImageIOPlugin_TrUtf82(const char* s, const char* c); -struct miqt_string* QImageIOPlugin_TrUtf83(const char* s, const char* c, int n); QImageIOHandler* QImageIOPlugin_Create2(const QImageIOPlugin* self, QIODevice* device, QByteArray* format); void QImageIOPlugin_Delete(QImageIOPlugin* self); diff --git a/qt/gen_qimagereader.cpp b/qt/gen_qimagereader.cpp index bd50587..7787929 100644 --- a/qt/gen_qimagereader.cpp +++ b/qt/gen_qimagereader.cpp @@ -42,13 +42,6 @@ struct miqt_string* QImageReader_Tr(const char* sourceText) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QImageReader_TrUtf8(const char* sourceText) { - QString _ret = QImageReader::trUtf8(sourceText); - // 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 QImageReader_SetFormat(QImageReader* self, QByteArray* format) { self->setFormat(*format); } @@ -183,14 +176,6 @@ bool QImageReader_AutoTransform(const QImageReader* self) { return self->autoTransform(); } -void QImageReader_SetGamma(QImageReader* self, float gamma) { - self->setGamma(static_cast(gamma)); -} - -float QImageReader_Gamma(const QImageReader* self) { - return self->gamma(); -} - QByteArray* QImageReader_SubType(const QImageReader* self) { return new QByteArray(self->subType()); } @@ -312,6 +297,14 @@ struct miqt_array* QImageReader_ImageFormatsForMimeType(QByteArray* mimeType) { return _out; } +int QImageReader_AllocationLimit() { + return QImageReader::allocationLimit(); +} + +void QImageReader_SetAllocationLimit(int mbLimit) { + QImageReader::setAllocationLimit(static_cast(mbLimit)); +} + struct miqt_string* QImageReader_Tr2(const char* sourceText, const char* disambiguation) { QString _ret = QImageReader::tr(sourceText, disambiguation); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -326,20 +319,6 @@ struct miqt_string* QImageReader_Tr3(const char* sourceText, const char* disambi return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QImageReader_TrUtf82(const char* sourceText, const char* disambiguation) { - QString _ret = QImageReader::trUtf8(sourceText, disambiguation); - // 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* QImageReader_TrUtf83(const char* sourceText, const char* disambiguation, int n) { - QString _ret = QImageReader::trUtf8(sourceText, disambiguation, static_cast(n)); - // 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 QImageReader_Delete(QImageReader* self) { delete self; } diff --git a/qt/gen_qimagereader.go b/qt/gen_qimagereader.go index a38366c..f5c256d 100644 --- a/qt/gen_qimagereader.go +++ b/qt/gen_qimagereader.go @@ -88,15 +88,6 @@ func QImageReader_Tr(sourceText string) string { return _ret } -func QImageReader_TrUtf8(sourceText string) string { - sourceText_Cstring := C.CString(sourceText) - defer C.free(unsafe.Pointer(sourceText_Cstring)) - var _ms *C.struct_miqt_string = C.QImageReader_TrUtf8(sourceText_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QImageReader) SetFormat(format *QByteArray) { C.QImageReader_SetFormat(this.h, format.cPointer()) } @@ -247,14 +238,6 @@ func (this *QImageReader) AutoTransform() bool { return (bool)(C.QImageReader_AutoTransform(this.h)) } -func (this *QImageReader) SetGamma(gamma float32) { - C.QImageReader_SetGamma(this.h, (C.float)(gamma)) -} - -func (this *QImageReader) Gamma() float32 { - return (float32)(C.QImageReader_Gamma(this.h)) -} - func (this *QImageReader) SubType() *QByteArray { _ret := C.QImageReader_SubType(this.h) _goptr := newQByteArray(_ret) @@ -395,6 +378,14 @@ func QImageReader_ImageFormatsForMimeType(mimeType *QByteArray) []QByteArray { return _ret } +func QImageReader_AllocationLimit() int { + return (int)(C.QImageReader_AllocationLimit()) +} + +func QImageReader_SetAllocationLimit(mbLimit int) { + C.QImageReader_SetAllocationLimit((C.int)(mbLimit)) +} + func QImageReader_Tr2(sourceText string, disambiguation string) string { sourceText_Cstring := C.CString(sourceText) defer C.free(unsafe.Pointer(sourceText_Cstring)) @@ -417,28 +408,6 @@ func QImageReader_Tr3(sourceText string, disambiguation string, n int) string { return _ret } -func QImageReader_TrUtf82(sourceText string, disambiguation string) string { - sourceText_Cstring := C.CString(sourceText) - defer C.free(unsafe.Pointer(sourceText_Cstring)) - disambiguation_Cstring := C.CString(disambiguation) - defer C.free(unsafe.Pointer(disambiguation_Cstring)) - var _ms *C.struct_miqt_string = C.QImageReader_TrUtf82(sourceText_Cstring, disambiguation_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QImageReader_TrUtf83(sourceText string, disambiguation string, n int) string { - sourceText_Cstring := C.CString(sourceText) - defer C.free(unsafe.Pointer(sourceText_Cstring)) - disambiguation_Cstring := C.CString(disambiguation) - defer C.free(unsafe.Pointer(disambiguation_Cstring)) - var _ms *C.struct_miqt_string = C.QImageReader_TrUtf83(sourceText_Cstring, disambiguation_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QImageReader) Delete() { C.QImageReader_Delete(this.h) diff --git a/qt/gen_qimagereader.h b/qt/gen_qimagereader.h index 3117bcf..5bd2a89 100644 --- a/qt/gen_qimagereader.h +++ b/qt/gen_qimagereader.h @@ -37,7 +37,6 @@ QImageReader* QImageReader_new3(struct miqt_string* fileName); QImageReader* QImageReader_new4(QIODevice* device, QByteArray* format); QImageReader* QImageReader_new5(struct miqt_string* fileName, QByteArray* format); struct miqt_string* QImageReader_Tr(const char* sourceText); -struct miqt_string* QImageReader_TrUtf8(const char* sourceText); void QImageReader_SetFormat(QImageReader* self, QByteArray* format); QByteArray* QImageReader_Format(const QImageReader* self); void QImageReader_SetAutoDetectImageFormat(QImageReader* self, bool enabled); @@ -66,8 +65,6 @@ bool QImageReader_SupportsAnimation(const QImageReader* self); int QImageReader_Transformation(const QImageReader* self); void QImageReader_SetAutoTransform(QImageReader* self, bool enabled); bool QImageReader_AutoTransform(const QImageReader* self); -void QImageReader_SetGamma(QImageReader* self, float gamma); -float QImageReader_Gamma(const QImageReader* self); QByteArray* QImageReader_SubType(const QImageReader* self); struct miqt_array* QImageReader_SupportedSubTypes(const QImageReader* self); bool QImageReader_CanRead(const QImageReader* self); @@ -88,10 +85,10 @@ QByteArray* QImageReader_ImageFormatWithDevice(QIODevice* device); struct miqt_array* QImageReader_SupportedImageFormats(); struct miqt_array* QImageReader_SupportedMimeTypes(); struct miqt_array* QImageReader_ImageFormatsForMimeType(QByteArray* mimeType); +int QImageReader_AllocationLimit(); +void QImageReader_SetAllocationLimit(int mbLimit); struct miqt_string* QImageReader_Tr2(const char* sourceText, const char* disambiguation); struct miqt_string* QImageReader_Tr3(const char* sourceText, const char* disambiguation, int n); -struct miqt_string* QImageReader_TrUtf82(const char* sourceText, const char* disambiguation); -struct miqt_string* QImageReader_TrUtf83(const char* sourceText, const char* disambiguation, int n); void QImageReader_Delete(QImageReader* self); #ifdef __cplusplus diff --git a/qt/gen_qimagewriter.cpp b/qt/gen_qimagewriter.cpp index 7517de8..29ed818 100644 --- a/qt/gen_qimagewriter.cpp +++ b/qt/gen_qimagewriter.cpp @@ -35,13 +35,6 @@ struct miqt_string* QImageWriter_Tr(const char* sourceText) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QImageWriter_TrUtf8(const char* sourceText) { - QString _ret = QImageWriter::trUtf8(sourceText); - // 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 QImageWriter_SetFormat(QImageWriter* self, QByteArray* format) { self->setFormat(*format); } @@ -86,14 +79,6 @@ int QImageWriter_Compression(const QImageWriter* self) { return self->compression(); } -void QImageWriter_SetGamma(QImageWriter* self, float gamma) { - self->setGamma(static_cast(gamma)); -} - -float QImageWriter_Gamma(const QImageWriter* self) { - return self->gamma(); -} - void QImageWriter_SetSubType(QImageWriter* self, QByteArray* typeVal) { self->setSubType(*typeVal); } @@ -140,18 +125,6 @@ void QImageWriter_SetTransformation(QImageWriter* self, int orientation) { self->setTransformation(static_cast(orientation)); } -void QImageWriter_SetDescription(QImageWriter* self, struct miqt_string* description) { - QString description_QString = QString::fromUtf8(&description->data, description->len); - self->setDescription(description_QString); -} - -struct miqt_string* QImageWriter_Description(const QImageWriter* self) { - QString _ret = self->description(); - // 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 QImageWriter_SetText(QImageWriter* self, struct miqt_string* key, struct miqt_string* text) { QString key_QString = QString::fromUtf8(&key->data, key->len); QString text_QString = QString::fromUtf8(&text->data, text->len); @@ -235,20 +208,6 @@ struct miqt_string* QImageWriter_Tr3(const char* sourceText, const char* disambi return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QImageWriter_TrUtf82(const char* sourceText, const char* disambiguation) { - QString _ret = QImageWriter::trUtf8(sourceText, disambiguation); - // 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* QImageWriter_TrUtf83(const char* sourceText, const char* disambiguation, int n) { - QString _ret = QImageWriter::trUtf8(sourceText, disambiguation, static_cast(n)); - // 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 QImageWriter_Delete(QImageWriter* self) { delete self; } diff --git a/qt/gen_qimagewriter.go b/qt/gen_qimagewriter.go index 4cf52eb..22401c8 100644 --- a/qt/gen_qimagewriter.go +++ b/qt/gen_qimagewriter.go @@ -81,15 +81,6 @@ func QImageWriter_Tr(sourceText string) string { return _ret } -func QImageWriter_TrUtf8(sourceText string) string { - sourceText_Cstring := C.CString(sourceText) - defer C.free(unsafe.Pointer(sourceText_Cstring)) - var _ms *C.struct_miqt_string = C.QImageWriter_TrUtf8(sourceText_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QImageWriter) SetFormat(format *QByteArray) { C.QImageWriter_SetFormat(this.h, format.cPointer()) } @@ -138,14 +129,6 @@ func (this *QImageWriter) Compression() int { return (int)(C.QImageWriter_Compression(this.h)) } -func (this *QImageWriter) SetGamma(gamma float32) { - C.QImageWriter_SetGamma(this.h, (C.float)(gamma)) -} - -func (this *QImageWriter) Gamma() float32 { - return (float32)(C.QImageWriter_Gamma(this.h)) -} - func (this *QImageWriter) SetSubType(typeVal *QByteArray) { C.QImageWriter_SetSubType(this.h, typeVal.cPointer()) } @@ -195,19 +178,6 @@ func (this *QImageWriter) SetTransformation(orientation QImageIOHandler__Transfo C.QImageWriter_SetTransformation(this.h, (C.int)(orientation)) } -func (this *QImageWriter) SetDescription(description string) { - description_ms := miqt_strdupg(description) - defer C.free(description_ms) - C.QImageWriter_SetDescription(this.h, (*C.struct_miqt_string)(description_ms)) -} - -func (this *QImageWriter) Description() string { - var _ms *C.struct_miqt_string = C.QImageWriter_Description(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QImageWriter) SetText(key string, text string) { key_ms := miqt_strdupg(key) defer C.free(key_ms) @@ -303,28 +273,6 @@ func QImageWriter_Tr3(sourceText string, disambiguation string, n int) string { return _ret } -func QImageWriter_TrUtf82(sourceText string, disambiguation string) string { - sourceText_Cstring := C.CString(sourceText) - defer C.free(unsafe.Pointer(sourceText_Cstring)) - disambiguation_Cstring := C.CString(disambiguation) - defer C.free(unsafe.Pointer(disambiguation_Cstring)) - var _ms *C.struct_miqt_string = C.QImageWriter_TrUtf82(sourceText_Cstring, disambiguation_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QImageWriter_TrUtf83(sourceText string, disambiguation string, n int) string { - sourceText_Cstring := C.CString(sourceText) - defer C.free(unsafe.Pointer(sourceText_Cstring)) - disambiguation_Cstring := C.CString(disambiguation) - defer C.free(unsafe.Pointer(disambiguation_Cstring)) - var _ms *C.struct_miqt_string = C.QImageWriter_TrUtf83(sourceText_Cstring, disambiguation_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QImageWriter) Delete() { C.QImageWriter_Delete(this.h) diff --git a/qt/gen_qimagewriter.h b/qt/gen_qimagewriter.h index 2753f53..5003028 100644 --- a/qt/gen_qimagewriter.h +++ b/qt/gen_qimagewriter.h @@ -30,7 +30,6 @@ QImageWriter* QImageWriter_new2(QIODevice* device, QByteArray* format); QImageWriter* QImageWriter_new3(struct miqt_string* fileName); QImageWriter* QImageWriter_new4(struct miqt_string* fileName, QByteArray* format); struct miqt_string* QImageWriter_Tr(const char* sourceText); -struct miqt_string* QImageWriter_TrUtf8(const char* sourceText); void QImageWriter_SetFormat(QImageWriter* self, QByteArray* format); QByteArray* QImageWriter_Format(const QImageWriter* self); void QImageWriter_SetDevice(QImageWriter* self, QIODevice* device); @@ -41,8 +40,6 @@ void QImageWriter_SetQuality(QImageWriter* self, int quality); int QImageWriter_Quality(const QImageWriter* self); void QImageWriter_SetCompression(QImageWriter* self, int compression); int QImageWriter_Compression(const QImageWriter* self); -void QImageWriter_SetGamma(QImageWriter* self, float gamma); -float QImageWriter_Gamma(const QImageWriter* self); void QImageWriter_SetSubType(QImageWriter* self, QByteArray* typeVal); QByteArray* QImageWriter_SubType(const QImageWriter* self); struct miqt_array* QImageWriter_SupportedSubTypes(const QImageWriter* self); @@ -52,8 +49,6 @@ void QImageWriter_SetProgressiveScanWrite(QImageWriter* self, bool progressive); bool QImageWriter_ProgressiveScanWrite(const QImageWriter* self); int QImageWriter_Transformation(const QImageWriter* self); void QImageWriter_SetTransformation(QImageWriter* self, int orientation); -void QImageWriter_SetDescription(QImageWriter* self, struct miqt_string* description); -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); @@ -65,8 +60,6 @@ struct miqt_array* QImageWriter_SupportedMimeTypes(); struct miqt_array* QImageWriter_ImageFormatsForMimeType(QByteArray* mimeType); struct miqt_string* QImageWriter_Tr2(const char* sourceText, const char* disambiguation); struct miqt_string* QImageWriter_Tr3(const char* sourceText, const char* disambiguation, int n); -struct miqt_string* QImageWriter_TrUtf82(const char* sourceText, const char* disambiguation); -struct miqt_string* QImageWriter_TrUtf83(const char* sourceText, const char* disambiguation, int n); void QImageWriter_Delete(QImageWriter* self); #ifdef __cplusplus diff --git a/qt/gen_qinputdevice.cpp b/qt/gen_qinputdevice.cpp new file mode 100644 index 0000000..b580e02 --- /dev/null +++ b/qt/gen_qinputdevice.cpp @@ -0,0 +1,160 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include "qinputdevice.h" +#include "gen_qinputdevice.h" +#include "_cgo_export.h" + +QInputDevice* QInputDevice_new() { + return new QInputDevice(); +} + +QInputDevice* QInputDevice_new2(struct miqt_string* name, long long systemId, int typeVal) { + QString name_QString = QString::fromUtf8(&name->data, name->len); + return new QInputDevice(name_QString, static_cast(systemId), static_cast(typeVal)); +} + +QInputDevice* QInputDevice_new3(QObject* parent) { + return new QInputDevice(parent); +} + +QInputDevice* QInputDevice_new4(struct miqt_string* name, long long systemId, int typeVal, struct miqt_string* seatName) { + QString name_QString = QString::fromUtf8(&name->data, name->len); + QString seatName_QString = QString::fromUtf8(&seatName->data, seatName->len); + return new QInputDevice(name_QString, static_cast(systemId), static_cast(typeVal), seatName_QString); +} + +QInputDevice* QInputDevice_new5(struct miqt_string* name, long long systemId, int typeVal, struct miqt_string* seatName, QObject* parent) { + QString name_QString = QString::fromUtf8(&name->data, name->len); + QString seatName_QString = QString::fromUtf8(&seatName->data, seatName->len); + return new QInputDevice(name_QString, static_cast(systemId), static_cast(typeVal), seatName_QString, parent); +} + +QMetaObject* QInputDevice_MetaObject(const QInputDevice* self) { + return (QMetaObject*) self->metaObject(); +} + +void* QInputDevice_Metacast(QInputDevice* self, const char* param1) { + return self->qt_metacast(param1); +} + +struct miqt_string* QInputDevice_Tr(const char* s) { + QString _ret = QInputDevice::tr(s); + // 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* QInputDevice_Name(const QInputDevice* self) { + QString _ret = self->name(); + // 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()); +} + +int QInputDevice_Type(const QInputDevice* self) { + QInputDevice::DeviceType _ret = self->type(); + return static_cast(_ret); +} + +int QInputDevice_Capabilities(const QInputDevice* self) { + QInputDevice::Capabilities _ret = self->capabilities(); + return static_cast(_ret); +} + +bool QInputDevice_HasCapability(const QInputDevice* self, int cap) { + return self->hasCapability(static_cast(cap)); +} + +long long QInputDevice_SystemId(const QInputDevice* self) { + qint64 _ret = self->systemId(); + return static_cast(_ret); +} + +struct miqt_string* QInputDevice_SeatName(const QInputDevice* self) { + QString _ret = self->seatName(); + // 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()); +} + +QRect* QInputDevice_AvailableVirtualGeometry(const QInputDevice* self) { + return new QRect(self->availableVirtualGeometry()); +} + +struct miqt_array* QInputDevice_SeatNames() { + QStringList _ret = QInputDevice::seatNames(); + // Convert QList<> from C++ memory to manually-managed C memory + struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); + for (size_t i = 0, e = _ret.length(); i < e; ++i) { + QString _lv_ret = _ret[i]; + // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory + QByteArray _lv_b = _lv_ret.toUtf8(); + _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); + } + struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); + _out->len = _ret.length(); + _out->data = static_cast(_arr); + return _out; +} + +struct miqt_array* QInputDevice_Devices() { + QList _ret = QInputDevice::devices(); + // Convert QList<> from C++ memory to manually-managed C memory + QInputDevice** _arr = static_cast(malloc(sizeof(QInputDevice*) * _ret.length())); + for (size_t i = 0, e = _ret.length(); i < e; ++i) { + _arr[i] = (QInputDevice*) _ret[i]; + } + struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); + _out->len = _ret.length(); + _out->data = static_cast(_arr); + return _out; +} + +QInputDevice* QInputDevice_PrimaryKeyboard() { + return (QInputDevice*) QInputDevice::primaryKeyboard(); +} + +bool QInputDevice_OperatorEqual(const QInputDevice* self, QInputDevice* other) { + return self->operator==(*other); +} + +void QInputDevice_AvailableVirtualGeometryChanged(QInputDevice* self, QRect* area) { + self->availableVirtualGeometryChanged(*area); +} + +void QInputDevice_connect_AvailableVirtualGeometryChanged(QInputDevice* self, void* slot) { + QInputDevice::connect(self, static_cast(&QInputDevice::availableVirtualGeometryChanged), self, [=](QRect area) { + QRect* sigval1 = new QRect(area); + miqt_exec_callback_QInputDevice_AvailableVirtualGeometryChanged(slot, sigval1); + }); +} + +struct miqt_string* QInputDevice_Tr2(const char* s, const char* c) { + QString _ret = QInputDevice::tr(s, c); + // 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* QInputDevice_Tr3(const char* s, const char* c, int n) { + QString _ret = QInputDevice::tr(s, c, static_cast(n)); + // 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()); +} + +QInputDevice* QInputDevice_PrimaryKeyboard1(struct miqt_string* seatName) { + QString seatName_QString = QString::fromUtf8(&seatName->data, seatName->len); + return (QInputDevice*) QInputDevice::primaryKeyboard(seatName_QString); +} + +void QInputDevice_Delete(QInputDevice* self) { + delete self; +} + diff --git a/qt/gen_qinputdevice.go b/qt/gen_qinputdevice.go new file mode 100644 index 0000000..e1f715d --- /dev/null +++ b/qt/gen_qinputdevice.go @@ -0,0 +1,267 @@ +package qt + +/* + +#include "gen_qinputdevice.h" +#include + +*/ +import "C" + +import ( + "runtime" + "runtime/cgo" + "unsafe" +) + +type QInputDevice__DeviceType int + +const ( + QInputDevice__Unknown QInputDevice__DeviceType = 0 + QInputDevice__Mouse QInputDevice__DeviceType = 1 + QInputDevice__TouchScreen QInputDevice__DeviceType = 2 + QInputDevice__TouchPad QInputDevice__DeviceType = 4 + QInputDevice__Puck QInputDevice__DeviceType = 8 + QInputDevice__Stylus QInputDevice__DeviceType = 16 + QInputDevice__Airbrush QInputDevice__DeviceType = 32 + QInputDevice__Keyboard QInputDevice__DeviceType = 4096 + QInputDevice__AllDevices QInputDevice__DeviceType = 2147483647 +) + +type QInputDevice__Capability int + +const ( + QInputDevice__None QInputDevice__Capability = 0 + QInputDevice__Position QInputDevice__Capability = 1 + QInputDevice__Area QInputDevice__Capability = 2 + QInputDevice__Pressure QInputDevice__Capability = 4 + QInputDevice__Velocity QInputDevice__Capability = 8 + QInputDevice__NormalizedPosition QInputDevice__Capability = 32 + QInputDevice__MouseEmulation QInputDevice__Capability = 64 + QInputDevice__PixelScroll QInputDevice__Capability = 128 + QInputDevice__Scroll QInputDevice__Capability = 256 + QInputDevice__Hover QInputDevice__Capability = 512 + QInputDevice__Rotation QInputDevice__Capability = 1024 + QInputDevice__XTilt QInputDevice__Capability = 2048 + QInputDevice__YTilt QInputDevice__Capability = 4096 + QInputDevice__TangentialPressure QInputDevice__Capability = 8192 + QInputDevice__ZPosition QInputDevice__Capability = 16384 + QInputDevice__All QInputDevice__Capability = 2147483647 +) + +type QInputDevice struct { + h *C.QInputDevice + *QObject +} + +func (this *QInputDevice) cPointer() *C.QInputDevice { + if this == nil { + return nil + } + return this.h +} + +func newQInputDevice(h *C.QInputDevice) *QInputDevice { + if h == nil { + return nil + } + return &QInputDevice{h: h, QObject: newQObject_U(unsafe.Pointer(h))} +} + +func newQInputDevice_U(h unsafe.Pointer) *QInputDevice { + return newQInputDevice((*C.QInputDevice)(h)) +} + +// NewQInputDevice constructs a new QInputDevice object. +func NewQInputDevice() *QInputDevice { + ret := C.QInputDevice_new() + return newQInputDevice(ret) +} + +// NewQInputDevice2 constructs a new QInputDevice object. +func NewQInputDevice2(name string, systemId int64, typeVal QInputDevice__DeviceType) *QInputDevice { + name_ms := miqt_strdupg(name) + defer C.free(name_ms) + ret := C.QInputDevice_new2((*C.struct_miqt_string)(name_ms), (C.longlong)(systemId), (C.int)(typeVal)) + return newQInputDevice(ret) +} + +// NewQInputDevice3 constructs a new QInputDevice object. +func NewQInputDevice3(parent *QObject) *QInputDevice { + ret := C.QInputDevice_new3(parent.cPointer()) + return newQInputDevice(ret) +} + +// NewQInputDevice4 constructs a new QInputDevice object. +func NewQInputDevice4(name string, systemId int64, typeVal QInputDevice__DeviceType, seatName string) *QInputDevice { + name_ms := miqt_strdupg(name) + defer C.free(name_ms) + seatName_ms := miqt_strdupg(seatName) + defer C.free(seatName_ms) + ret := C.QInputDevice_new4((*C.struct_miqt_string)(name_ms), (C.longlong)(systemId), (C.int)(typeVal), (*C.struct_miqt_string)(seatName_ms)) + return newQInputDevice(ret) +} + +// NewQInputDevice5 constructs a new QInputDevice object. +func NewQInputDevice5(name string, systemId int64, typeVal QInputDevice__DeviceType, seatName string, parent *QObject) *QInputDevice { + name_ms := miqt_strdupg(name) + defer C.free(name_ms) + seatName_ms := miqt_strdupg(seatName) + defer C.free(seatName_ms) + ret := C.QInputDevice_new5((*C.struct_miqt_string)(name_ms), (C.longlong)(systemId), (C.int)(typeVal), (*C.struct_miqt_string)(seatName_ms), parent.cPointer()) + return newQInputDevice(ret) +} + +func (this *QInputDevice) MetaObject() *QMetaObject { + return newQMetaObject_U(unsafe.Pointer(C.QInputDevice_MetaObject(this.h))) +} + +func (this *QInputDevice) Metacast(param1 string) unsafe.Pointer { + param1_Cstring := C.CString(param1) + defer C.free(unsafe.Pointer(param1_Cstring)) + return C.QInputDevice_Metacast(this.h, param1_Cstring) +} + +func QInputDevice_Tr(s string) string { + s_Cstring := C.CString(s) + defer C.free(unsafe.Pointer(s_Cstring)) + var _ms *C.struct_miqt_string = C.QInputDevice_Tr(s_Cstring) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + +func (this *QInputDevice) Name() string { + var _ms *C.struct_miqt_string = C.QInputDevice_Name(this.h) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + +func (this *QInputDevice) Type() QInputDevice__DeviceType { + return (QInputDevice__DeviceType)(C.QInputDevice_Type(this.h)) +} + +func (this *QInputDevice) Capabilities() QInputDevice__Capability { + return (QInputDevice__Capability)(C.QInputDevice_Capabilities(this.h)) +} + +func (this *QInputDevice) HasCapability(cap QInputDevice__Capability) bool { + return (bool)(C.QInputDevice_HasCapability(this.h, (C.int)(cap))) +} + +func (this *QInputDevice) SystemId() int64 { + return (int64)(C.QInputDevice_SystemId(this.h)) +} + +func (this *QInputDevice) SeatName() string { + var _ms *C.struct_miqt_string = C.QInputDevice_SeatName(this.h) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + +func (this *QInputDevice) AvailableVirtualGeometry() *QRect { + _ret := C.QInputDevice_AvailableVirtualGeometry(this.h) + _goptr := newQRect(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func QInputDevice_SeatNames() []string { + var _ma *C.struct_miqt_array = C.QInputDevice_SeatNames() + _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++ { + var _lv_ms *C.struct_miqt_string = _outCast[i] + _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) + C.free(unsafe.Pointer(_lv_ms)) + _ret[i] = _lv_ret + } + C.free(unsafe.Pointer(_ma)) + return _ret +} + +func QInputDevice_Devices() []*QInputDevice { + var _ma *C.struct_miqt_array = C.QInputDevice_Devices() + _ret := make([]*QInputDevice, int(_ma.len)) + _outCast := (*[0xffff]*C.QInputDevice)(unsafe.Pointer(_ma.data)) // hey ya + for i := 0; i < int(_ma.len); i++ { + _ret[i] = newQInputDevice_U(unsafe.Pointer(_outCast[i])) + } + C.free(unsafe.Pointer(_ma)) + return _ret +} + +func QInputDevice_PrimaryKeyboard() *QInputDevice { + return newQInputDevice_U(unsafe.Pointer(C.QInputDevice_PrimaryKeyboard())) +} + +func (this *QInputDevice) OperatorEqual(other *QInputDevice) bool { + return (bool)(C.QInputDevice_OperatorEqual(this.h, other.cPointer())) +} + +func (this *QInputDevice) AvailableVirtualGeometryChanged(area QRect) { + C.QInputDevice_AvailableVirtualGeometryChanged(this.h, area.cPointer()) +} +func (this *QInputDevice) OnAvailableVirtualGeometryChanged(slot func(area QRect)) { + C.QInputDevice_connect_AvailableVirtualGeometryChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) +} + +//export miqt_exec_callback_QInputDevice_AvailableVirtualGeometryChanged +func miqt_exec_callback_QInputDevice_AvailableVirtualGeometryChanged(cb *C.void, area *C.QRect) { + gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(area QRect)) + if !ok { + panic("miqt: callback of non-callback type (heap corruption?)") + } + + // Convert all CABI parameters to Go parameters + area_ret := area + area_goptr := newQRect(area_ret) + area_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + slotval1 := *area_goptr + + gofunc(slotval1) +} + +func QInputDevice_Tr2(s string, c string) string { + s_Cstring := C.CString(s) + defer C.free(unsafe.Pointer(s_Cstring)) + c_Cstring := C.CString(c) + defer C.free(unsafe.Pointer(c_Cstring)) + var _ms *C.struct_miqt_string = C.QInputDevice_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + +func QInputDevice_Tr3(s string, c string, n int) string { + s_Cstring := C.CString(s) + defer C.free(unsafe.Pointer(s_Cstring)) + c_Cstring := C.CString(c) + defer C.free(unsafe.Pointer(c_Cstring)) + var _ms *C.struct_miqt_string = C.QInputDevice_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + +func QInputDevice_PrimaryKeyboard1(seatName string) *QInputDevice { + seatName_ms := miqt_strdupg(seatName) + defer C.free(seatName_ms) + return newQInputDevice_U(unsafe.Pointer(C.QInputDevice_PrimaryKeyboard1((*C.struct_miqt_string)(seatName_ms)))) +} + +// Delete this object from C++ memory. +func (this *QInputDevice) Delete() { + C.QInputDevice_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QInputDevice) GoGC() { + runtime.SetFinalizer(this, func(this *QInputDevice) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} diff --git a/qt/gen_qinputdevice.h b/qt/gen_qinputdevice.h new file mode 100644 index 0000000..5a330c6 --- /dev/null +++ b/qt/gen_qinputdevice.h @@ -0,0 +1,58 @@ +#ifndef GEN_QINPUTDEVICE_H +#define GEN_QINPUTDEVICE_H + +#include +#include +#include + +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + +#include "binding.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +class QInputDevice; +class QMetaObject; +class QObject; +class QRect; +#else +typedef struct QInputDevice QInputDevice; +typedef struct QMetaObject QMetaObject; +typedef struct QObject QObject; +typedef struct QRect QRect; +#endif + +QInputDevice* QInputDevice_new(); +QInputDevice* QInputDevice_new2(struct miqt_string* name, long long systemId, int typeVal); +QInputDevice* QInputDevice_new3(QObject* parent); +QInputDevice* QInputDevice_new4(struct miqt_string* name, long long systemId, int typeVal, struct miqt_string* seatName); +QInputDevice* QInputDevice_new5(struct miqt_string* name, long long systemId, int typeVal, struct miqt_string* seatName, QObject* parent); +QMetaObject* QInputDevice_MetaObject(const QInputDevice* self); +void* QInputDevice_Metacast(QInputDevice* self, const char* param1); +struct miqt_string* QInputDevice_Tr(const char* s); +struct miqt_string* QInputDevice_Name(const QInputDevice* self); +int QInputDevice_Type(const QInputDevice* self); +int QInputDevice_Capabilities(const QInputDevice* self); +bool QInputDevice_HasCapability(const QInputDevice* self, int cap); +long long QInputDevice_SystemId(const QInputDevice* self); +struct miqt_string* QInputDevice_SeatName(const QInputDevice* self); +QRect* QInputDevice_AvailableVirtualGeometry(const QInputDevice* self); +struct miqt_array* QInputDevice_SeatNames(); +struct miqt_array* QInputDevice_Devices(); +QInputDevice* QInputDevice_PrimaryKeyboard(); +bool QInputDevice_OperatorEqual(const QInputDevice* self, QInputDevice* other); +void QInputDevice_AvailableVirtualGeometryChanged(QInputDevice* self, QRect* area); +void QInputDevice_connect_AvailableVirtualGeometryChanged(QInputDevice* self, void* slot); +struct miqt_string* QInputDevice_Tr2(const char* s, const char* c); +struct miqt_string* QInputDevice_Tr3(const char* s, const char* c, int n); +QInputDevice* QInputDevice_PrimaryKeyboard1(struct miqt_string* seatName); +void QInputDevice_Delete(QInputDevice* self); + +#ifdef __cplusplus +} /* extern C */ +#endif + +#endif diff --git a/qt/gen_qinputdialog.cpp b/qt/gen_qinputdialog.cpp index 0464ec2..039295a 100644 --- a/qt/gen_qinputdialog.cpp +++ b/qt/gen_qinputdialog.cpp @@ -37,13 +37,6 @@ struct miqt_string* QInputDialog_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QInputDialog_TrUtf8(const char* s) { - QString _ret = QInputDialog::trUtf8(s); - // 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 QInputDialog_SetInputMode(QInputDialog* self, int mode) { self->setInputMode(static_cast(mode)); } @@ -292,12 +285,6 @@ double QInputDialog_GetDouble(QWidget* parent, struct miqt_string* title, struct return QInputDialog::getDouble(parent, title_QString, label_QString); } -double QInputDialog_GetDouble2(QWidget* parent, struct miqt_string* title, struct miqt_string* label, double value, double minValue, double maxValue, int decimals, bool* ok, int flags, double step) { - QString title_QString = QString::fromUtf8(&title->data, title->len); - QString label_QString = QString::fromUtf8(&label->data, label->len); - return QInputDialog::getDouble(parent, title_QString, label_QString, static_cast(value), static_cast(minValue), static_cast(maxValue), static_cast(decimals), ok, static_cast(flags), static_cast(step)); -} - void QInputDialog_SetDoubleStep(QInputDialog* self, double step) { self->setDoubleStep(static_cast(step)); } @@ -398,20 +385,6 @@ struct miqt_string* QInputDialog_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QInputDialog_TrUtf82(const char* s, const char* c) { - QString _ret = QInputDialog::trUtf8(s, c); - // 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* QInputDialog_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QInputDialog::trUtf8(s, c, static_cast(n)); - // 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 QInputDialog_SetOption2(QInputDialog* self, int option, bool on) { self->setOption(static_cast(option), on); } @@ -657,6 +630,12 @@ double QInputDialog_GetDouble9(QWidget* parent, struct miqt_string* title, struc return QInputDialog::getDouble(parent, title_QString, label_QString, static_cast(value), static_cast(minValue), static_cast(maxValue), static_cast(decimals), ok, static_cast(flags)); } +double QInputDialog_GetDouble10(QWidget* parent, struct miqt_string* title, struct miqt_string* label, double value, double minValue, double maxValue, int decimals, bool* ok, int flags, double step) { + QString title_QString = QString::fromUtf8(&title->data, title->len); + QString label_QString = QString::fromUtf8(&label->data, label->len); + return QInputDialog::getDouble(parent, title_QString, label_QString, static_cast(value), static_cast(minValue), static_cast(maxValue), static_cast(decimals), ok, static_cast(flags), static_cast(step)); +} + void QInputDialog_Delete(QInputDialog* self) { delete self; } diff --git a/qt/gen_qinputdialog.go b/qt/gen_qinputdialog.go index 49096f2..019e1f5 100644 --- a/qt/gen_qinputdialog.go +++ b/qt/gen_qinputdialog.go @@ -90,15 +90,6 @@ func QInputDialog_Tr(s string) string { return _ret } -func QInputDialog_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QInputDialog_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QInputDialog) SetInputMode(mode QInputDialog__InputMode) { C.QInputDialog_SetInputMode(this.h, (C.int)(mode)) } @@ -368,14 +359,6 @@ func QInputDialog_GetDouble(parent *QWidget, title string, label string) float64 return (float64)(C.QInputDialog_GetDouble(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(label_ms))) } -func QInputDialog_GetDouble2(parent *QWidget, title string, label string, value float64, minValue float64, maxValue float64, decimals int, ok *bool, flags WindowType, step float64) float64 { - title_ms := miqt_strdupg(title) - 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))) -} - func (this *QInputDialog) SetDoubleStep(step float64) { C.QInputDialog_SetDoubleStep(this.h, (C.double)(step)) } @@ -540,28 +523,6 @@ func QInputDialog_Tr3(s string, c string, n int) string { return _ret } -func QInputDialog_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QInputDialog_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QInputDialog_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QInputDialog_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QInputDialog) SetOption2(option QInputDialog__InputDialogOption, on bool) { C.QInputDialog_SetOption2(this.h, (C.int)(option), (C.bool)(on)) } @@ -882,6 +843,14 @@ func QInputDialog_GetDouble9(parent *QWidget, title string, label string, value 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))) } +func QInputDialog_GetDouble10(parent *QWidget, title string, label string, value float64, minValue float64, maxValue float64, decimals int, ok *bool, flags WindowType, step float64) float64 { + title_ms := miqt_strdupg(title) + defer C.free(title_ms) + label_ms := miqt_strdupg(label) + defer C.free(label_ms) + return (float64)(C.QInputDialog_GetDouble10(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))) +} + // Delete this object from C++ memory. func (this *QInputDialog) Delete() { C.QInputDialog_Delete(this.h) diff --git a/qt/gen_qinputdialog.h b/qt/gen_qinputdialog.h index da0fbaa..5c7929b 100644 --- a/qt/gen_qinputdialog.h +++ b/qt/gen_qinputdialog.h @@ -31,7 +31,6 @@ QInputDialog* QInputDialog_new3(QWidget* parent, int flags); QMetaObject* QInputDialog_MetaObject(const QInputDialog* self); void* QInputDialog_Metacast(QInputDialog* self, const char* param1); struct miqt_string* QInputDialog_Tr(const char* s); -struct miqt_string* QInputDialog_TrUtf8(const char* s); void QInputDialog_SetInputMode(QInputDialog* self, int mode); int QInputDialog_InputMode(const QInputDialog* self); void QInputDialog_SetLabelText(QInputDialog* self, struct miqt_string* text); @@ -78,7 +77,6 @@ struct miqt_string* QInputDialog_GetMultiLineText(QWidget* parent, struct miqt_s struct miqt_string* QInputDialog_GetItem(QWidget* parent, struct miqt_string* title, struct miqt_string* label, struct miqt_array* /* of struct miqt_string* */ items); int QInputDialog_GetInt(QWidget* parent, struct miqt_string* title, struct miqt_string* label); double QInputDialog_GetDouble(QWidget* parent, struct miqt_string* title, struct miqt_string* label); -double QInputDialog_GetDouble2(QWidget* parent, struct miqt_string* title, struct miqt_string* label, double value, double minValue, double maxValue, int decimals, bool* ok, int flags, double step); void QInputDialog_SetDoubleStep(QInputDialog* self, double step); double QInputDialog_DoubleStep(const QInputDialog* self); void QInputDialog_TextValueChanged(QInputDialog* self, struct miqt_string* text); @@ -96,8 +94,6 @@ void QInputDialog_connect_DoubleValueSelected(QInputDialog* self, void* slot); void QInputDialog_Done(QInputDialog* self, int result); 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, 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); @@ -125,6 +121,7 @@ double QInputDialog_GetDouble6(QWidget* parent, struct miqt_string* title, struc double QInputDialog_GetDouble7(QWidget* parent, struct miqt_string* title, struct miqt_string* label, double value, double minValue, double maxValue, int decimals); double QInputDialog_GetDouble8(QWidget* parent, struct miqt_string* title, struct miqt_string* label, double value, double minValue, double maxValue, int decimals, bool* ok); double QInputDialog_GetDouble9(QWidget* parent, struct miqt_string* title, struct miqt_string* label, double value, double minValue, double maxValue, int decimals, bool* ok, int flags); +double QInputDialog_GetDouble10(QWidget* parent, struct miqt_string* title, struct miqt_string* label, double value, double minValue, double maxValue, int decimals, bool* ok, int flags, double step); void QInputDialog_Delete(QInputDialog* self); #ifdef __cplusplus diff --git a/qt/gen_qinputmethod.cpp b/qt/gen_qinputmethod.cpp index 4c8dc27..9653c4e 100644 --- a/qt/gen_qinputmethod.cpp +++ b/qt/gen_qinputmethod.cpp @@ -26,13 +26,6 @@ struct miqt_string* QInputMethod_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QInputMethod_TrUtf8(const char* s) { - QString _ret = QInputMethod::trUtf8(s); - // 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()); -} - QTransform* QInputMethod_InputItemTransform(const QInputMethod* self) { return new QTransform(self->inputItemTransform()); } @@ -210,17 +203,3 @@ struct miqt_string* QInputMethod_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QInputMethod_TrUtf82(const char* s, const char* c) { - QString _ret = QInputMethod::trUtf8(s, c); - // 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* QInputMethod_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QInputMethod::trUtf8(s, c, static_cast(n)); - // 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()); -} - diff --git a/qt/gen_qinputmethod.go b/qt/gen_qinputmethod.go index df743e5..908232b 100644 --- a/qt/gen_qinputmethod.go +++ b/qt/gen_qinputmethod.go @@ -62,15 +62,6 @@ func QInputMethod_Tr(s string) string { return _ret } -func QInputMethod_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QInputMethod_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QInputMethod) InputItemTransform() *QTransform { _ret := C.QInputMethod_InputItemTransform(this.h) _goptr := newQTransform(_ret) @@ -144,7 +135,7 @@ func (this *QInputMethod) InputDirection() LayoutDirection { return (LayoutDirection)(C.QInputMethod_InputDirection(this.h)) } -func QInputMethod_QueryFocusObject(query InputMethodQuery, argument QVariant) *QVariant { +func QInputMethod_QueryFocusObject(query InputMethodQuery, argument *QVariant) *QVariant { _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 @@ -335,25 +326,3 @@ func QInputMethod_Tr3(s string, c string, n int) string { C.free(unsafe.Pointer(_ms)) return _ret } - -func QInputMethod_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QInputMethod_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QInputMethod_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QInputMethod_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} diff --git a/qt/gen_qinputmethod.h b/qt/gen_qinputmethod.h index 3fa2d31..283ce44 100644 --- a/qt/gen_qinputmethod.h +++ b/qt/gen_qinputmethod.h @@ -32,7 +32,6 @@ typedef struct QVariant QVariant; QMetaObject* QInputMethod_MetaObject(const QInputMethod* self); void* QInputMethod_Metacast(QInputMethod* self, const char* param1); struct miqt_string* QInputMethod_Tr(const char* s); -struct miqt_string* QInputMethod_TrUtf8(const char* s); QTransform* QInputMethod_InputItemTransform(const QInputMethod* self); void QInputMethod_SetInputItemTransform(QInputMethod* self, QTransform* transform); QRectF* QInputMethod_InputItemRectangle(const QInputMethod* self); @@ -71,8 +70,6 @@ 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); -struct miqt_string* QInputMethod_TrUtf82(const char* s, const char* c); -struct miqt_string* QInputMethod_TrUtf83(const char* s, const char* c, int n); #ifdef __cplusplus } /* extern C */ diff --git a/qt/gen_qiodevice.cpp b/qt/gen_qiodevice.cpp index 8862b2c..f328615 100644 --- a/qt/gen_qiodevice.cpp +++ b/qt/gen_qiodevice.cpp @@ -23,15 +23,8 @@ struct miqt_string* QIODevice_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QIODevice_TrUtf8(const char* s) { - QString _ret = QIODevice::trUtf8(s); - // 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()); -} - int QIODevice_OpenMode(const QIODevice* self) { - QIODevice::OpenMode _ret = self->openMode(); + QIODeviceBase::OpenMode _ret = self->openMode(); return static_cast(_ret); } @@ -84,7 +77,7 @@ void QIODevice_SetCurrentWriteChannel(QIODevice* self, int channel) { } bool QIODevice_Open(QIODevice* self, int mode) { - return self->open(static_cast(mode)); + return self->open(static_cast(mode)); } void QIODevice_Close(QIODevice* self) { @@ -301,20 +294,6 @@ struct miqt_string* QIODevice_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QIODevice_TrUtf82(const char* s, const char* c) { - QString _ret = QIODevice::trUtf8(s, c); - // 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* QIODevice_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QIODevice::trUtf8(s, c, static_cast(n)); - // 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()); -} - QByteArray* QIODevice_ReadLine1(QIODevice* self, long long maxlen) { return new QByteArray(self->readLine(static_cast(maxlen))); } diff --git a/qt/gen_qiodevice.go b/qt/gen_qiodevice.go index 7df1c56..80b2e64 100644 --- a/qt/gen_qiodevice.go +++ b/qt/gen_qiodevice.go @@ -14,24 +14,10 @@ import ( "unsafe" ) -type QIODevice__OpenModeFlag int - -const ( - QIODevice__NotOpen QIODevice__OpenModeFlag = 0 - QIODevice__ReadOnly QIODevice__OpenModeFlag = 1 - QIODevice__WriteOnly QIODevice__OpenModeFlag = 2 - QIODevice__ReadWrite QIODevice__OpenModeFlag = 3 - QIODevice__Append QIODevice__OpenModeFlag = 4 - QIODevice__Truncate QIODevice__OpenModeFlag = 8 - QIODevice__Text QIODevice__OpenModeFlag = 16 - QIODevice__Unbuffered QIODevice__OpenModeFlag = 32 - QIODevice__NewOnly QIODevice__OpenModeFlag = 64 - QIODevice__ExistingOnly QIODevice__OpenModeFlag = 128 -) - type QIODevice struct { h *C.QIODevice *QObject + *QIODeviceBase } func (this *QIODevice) cPointer() *C.QIODevice { @@ -45,7 +31,7 @@ func newQIODevice(h *C.QIODevice) *QIODevice { if h == nil { return nil } - return &QIODevice{h: h, QObject: newQObject_U(unsafe.Pointer(h))} + return &QIODevice{h: h, QObject: newQObject_U(unsafe.Pointer(h)), QIODeviceBase: newQIODeviceBase_U(unsafe.Pointer(h))} } func newQIODevice_U(h unsafe.Pointer) *QIODevice { @@ -71,17 +57,8 @@ func QIODevice_Tr(s string) string { return _ret } -func QIODevice_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QIODevice_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QIODevice) OpenMode() QIODevice__OpenModeFlag { - return (QIODevice__OpenModeFlag)(C.QIODevice_OpenMode(this.h)) +func (this *QIODevice) OpenMode() QIODeviceBase__OpenModeFlag { + return (QIODeviceBase__OpenModeFlag)(C.QIODevice_OpenMode(this.h)) } func (this *QIODevice) SetTextModeEnabled(enabled bool) { @@ -132,7 +109,7 @@ func (this *QIODevice) SetCurrentWriteChannel(channel int) { C.QIODevice_SetCurrentWriteChannel(this.h, (C.int)(channel)) } -func (this *QIODevice) Open(mode QIODevice__OpenModeFlag) bool { +func (this *QIODevice) Open(mode QIODeviceBase__OpenModeFlag) bool { return (bool)(C.QIODevice_Open(this.h, (C.int)(mode))) } @@ -418,28 +395,6 @@ func QIODevice_Tr3(s string, c string, n int) string { return _ret } -func QIODevice_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QIODevice_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QIODevice_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QIODevice_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QIODevice) ReadLine1(maxlen int64) *QByteArray { _ret := C.QIODevice_ReadLine1(this.h, (C.longlong)(maxlen)) _goptr := newQByteArray(_ret) diff --git a/qt/gen_qiodevice.h b/qt/gen_qiodevice.h index 0961a86..ab31d88 100644 --- a/qt/gen_qiodevice.h +++ b/qt/gen_qiodevice.h @@ -26,7 +26,6 @@ typedef struct QMetaObject QMetaObject; QMetaObject* QIODevice_MetaObject(const QIODevice* self); void* QIODevice_Metacast(QIODevice* self, const char* param1); struct miqt_string* QIODevice_Tr(const char* s); -struct miqt_string* QIODevice_TrUtf8(const char* s); int QIODevice_OpenMode(const QIODevice* self); void QIODevice_SetTextModeEnabled(QIODevice* self, bool enabled); bool QIODevice_IsTextModeEnabled(const QIODevice* self); @@ -85,8 +84,6 @@ void QIODevice_ReadChannelFinished(QIODevice* self); void QIODevice_connect_ReadChannelFinished(QIODevice* self, void* slot); struct miqt_string* QIODevice_Tr2(const char* s, const char* c); struct miqt_string* QIODevice_Tr3(const char* s, const char* c, int n); -struct miqt_string* QIODevice_TrUtf82(const char* s, const char* c); -struct miqt_string* QIODevice_TrUtf83(const char* s, const char* c, int n); QByteArray* QIODevice_ReadLine1(QIODevice* self, long long maxlen); void QIODevice_Delete(QIODevice* self); diff --git a/qt/gen_qiodevicebase.cpp b/qt/gen_qiodevicebase.cpp new file mode 100644 index 0000000..97af30d --- /dev/null +++ b/qt/gen_qiodevicebase.cpp @@ -0,0 +1,5 @@ +#include +#include "qiodevicebase.h" +#include "gen_qiodevicebase.h" +#include "_cgo_export.h" + diff --git a/qt/gen_qiodevicebase.go b/qt/gen_qiodevicebase.go new file mode 100644 index 0000000..de2f88d --- /dev/null +++ b/qt/gen_qiodevicebase.go @@ -0,0 +1,50 @@ +package qt + +/* + +#include "gen_qiodevicebase.h" +#include + +*/ +import "C" + +import ( + "unsafe" +) + +type QIODeviceBase__OpenModeFlag int + +const ( + QIODeviceBase__NotOpen QIODeviceBase__OpenModeFlag = 0 + QIODeviceBase__ReadOnly QIODeviceBase__OpenModeFlag = 1 + QIODeviceBase__WriteOnly QIODeviceBase__OpenModeFlag = 2 + QIODeviceBase__ReadWrite QIODeviceBase__OpenModeFlag = 3 + QIODeviceBase__Append QIODeviceBase__OpenModeFlag = 4 + QIODeviceBase__Truncate QIODeviceBase__OpenModeFlag = 8 + QIODeviceBase__Text QIODeviceBase__OpenModeFlag = 16 + QIODeviceBase__Unbuffered QIODeviceBase__OpenModeFlag = 32 + QIODeviceBase__NewOnly QIODeviceBase__OpenModeFlag = 64 + QIODeviceBase__ExistingOnly QIODeviceBase__OpenModeFlag = 128 +) + +type QIODeviceBase struct { + h *C.QIODeviceBase +} + +func (this *QIODeviceBase) cPointer() *C.QIODeviceBase { + if this == nil { + return nil + } + return this.h +} + +func newQIODeviceBase(h *C.QIODeviceBase) *QIODeviceBase { + if h == nil { + return nil + } + return &QIODeviceBase{h: h} +} + +func newQIODeviceBase_U(h unsafe.Pointer) *QIODeviceBase { + return newQIODeviceBase((*C.QIODeviceBase)(h)) +} diff --git a/qt/gen_qlinkedlist.h b/qt/gen_qiodevicebase.h similarity index 55% rename from qt/gen_qlinkedlist.h rename to qt/gen_qiodevicebase.h index f6cfbe1..f87ad49 100644 --- a/qt/gen_qlinkedlist.h +++ b/qt/gen_qiodevicebase.h @@ -1,5 +1,5 @@ -#ifndef GEN_QLINKEDLIST_H -#define GEN_QLINKEDLIST_H +#ifndef GEN_QIODEVICEBASE_H +#define GEN_QIODEVICEBASE_H #include #include @@ -14,13 +14,11 @@ extern "C" { #endif #ifdef __cplusplus -class QLinkedListData; +class QIODeviceBase; #else -typedef struct QLinkedListData QLinkedListData; +typedef struct QIODeviceBase QIODeviceBase; #endif -QLinkedListData* QLinkedListData_new(); -void QLinkedListData_Delete(QLinkedListData* self); #ifdef __cplusplus } /* extern C */ diff --git a/qt/gen_qitemdelegate.cpp b/qt/gen_qitemdelegate.cpp index f4dbc1e..28c2c74 100644 --- a/qt/gen_qitemdelegate.cpp +++ b/qt/gen_qitemdelegate.cpp @@ -38,13 +38,6 @@ struct miqt_string* QItemDelegate_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QItemDelegate_TrUtf8(const char* s) { - QString _ret = QItemDelegate::trUtf8(s); - // 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()); -} - bool QItemDelegate_HasClipping(const QItemDelegate* self) { return self->hasClipping(); } @@ -99,20 +92,6 @@ struct miqt_string* QItemDelegate_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QItemDelegate_TrUtf82(const char* s, const char* c) { - QString _ret = QItemDelegate::trUtf8(s, c); - // 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* QItemDelegate_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QItemDelegate::trUtf8(s, c, static_cast(n)); - // 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 QItemDelegate_Delete(QItemDelegate* self) { delete self; } diff --git a/qt/gen_qitemdelegate.go b/qt/gen_qitemdelegate.go index 4b50f5b..3e90297 100644 --- a/qt/gen_qitemdelegate.go +++ b/qt/gen_qitemdelegate.go @@ -67,15 +67,6 @@ func QItemDelegate_Tr(s string) string { return _ret } -func QItemDelegate_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QItemDelegate_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QItemDelegate) HasClipping() bool { return (bool)(C.QItemDelegate_HasClipping(this.h)) } @@ -141,28 +132,6 @@ func QItemDelegate_Tr3(s string, c string, n int) string { return _ret } -func QItemDelegate_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QItemDelegate_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QItemDelegate_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QItemDelegate_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QItemDelegate) Delete() { C.QItemDelegate_Delete(this.h) diff --git a/qt/gen_qitemdelegate.h b/qt/gen_qitemdelegate.h index f51043d..9eafe22 100644 --- a/qt/gen_qitemdelegate.h +++ b/qt/gen_qitemdelegate.h @@ -42,7 +42,6 @@ QItemDelegate* QItemDelegate_new2(QObject* parent); QMetaObject* QItemDelegate_MetaObject(const QItemDelegate* self); void* QItemDelegate_Metacast(QItemDelegate* self, const char* param1); struct miqt_string* QItemDelegate_Tr(const char* s); -struct miqt_string* QItemDelegate_TrUtf8(const char* s); bool QItemDelegate_HasClipping(const QItemDelegate* self); void QItemDelegate_SetClipping(QItemDelegate* self, bool clip); void QItemDelegate_Paint(const QItemDelegate* self, QPainter* painter, QStyleOptionViewItem* option, QModelIndex* index); @@ -55,8 +54,6 @@ QItemEditorFactory* QItemDelegate_ItemEditorFactory(const QItemDelegate* self); void QItemDelegate_SetItemEditorFactory(QItemDelegate* self, QItemEditorFactory* factory); struct miqt_string* QItemDelegate_Tr2(const char* s, const char* c); struct miqt_string* QItemDelegate_Tr3(const char* s, const char* c, int n); -struct miqt_string* QItemDelegate_TrUtf82(const char* s, const char* c); -struct miqt_string* QItemDelegate_TrUtf83(const char* s, const char* c, int n); void QItemDelegate_Delete(QItemDelegate* self); #ifdef __cplusplus diff --git a/qt/gen_qitemselectionmodel.cpp b/qt/gen_qitemselectionmodel.cpp index 47716a7..58cdb0c 100644 --- a/qt/gen_qitemselectionmodel.cpp +++ b/qt/gen_qitemselectionmodel.cpp @@ -17,20 +17,16 @@ QItemSelectionRange* QItemSelectionRange_new() { return new QItemSelectionRange(); } -QItemSelectionRange* QItemSelectionRange_new2(QItemSelectionRange* other) { - return new QItemSelectionRange(*other); -} - -QItemSelectionRange* QItemSelectionRange_new3(QModelIndex* topL, QModelIndex* bottomR) { +QItemSelectionRange* QItemSelectionRange_new2(QModelIndex* topL, QModelIndex* bottomR) { return new QItemSelectionRange(*topL, *bottomR); } -QItemSelectionRange* QItemSelectionRange_new4(QModelIndex* index) { +QItemSelectionRange* QItemSelectionRange_new3(QModelIndex* index) { return new QItemSelectionRange(*index); } -void QItemSelectionRange_OperatorAssign(QItemSelectionRange* self, QItemSelectionRange* other) { - self->operator=(*other); +QItemSelectionRange* QItemSelectionRange_new4(QItemSelectionRange* param1) { + return new QItemSelectionRange(*param1); } void QItemSelectionRange_Swap(QItemSelectionRange* self, QItemSelectionRange* other) { @@ -105,10 +101,6 @@ bool QItemSelectionRange_OperatorNotEqual(const QItemSelectionRange* self, QItem return self->operator!=(*other); } -bool QItemSelectionRange_OperatorLesser(const QItemSelectionRange* self, QItemSelectionRange* other) { - return self->operator<(*other); -} - bool QItemSelectionRange_IsValid(const QItemSelectionRange* self) { return self->isValid(); } @@ -161,13 +153,6 @@ struct miqt_string* QItemSelectionModel_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QItemSelectionModel_TrUtf8(const char* s) { - QString _ret = QItemSelectionModel::trUtf8(s); - // 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()); -} - QModelIndex* QItemSelectionModel_CurrentIndex(const QItemSelectionModel* self) { return new QModelIndex(self->currentIndex()); } @@ -344,20 +329,6 @@ struct miqt_string* QItemSelectionModel_Tr3(const char* s, const char* c, int n) return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QItemSelectionModel_TrUtf82(const char* s, const char* c) { - QString _ret = QItemSelectionModel::trUtf8(s, c); - // 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* QItemSelectionModel_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QItemSelectionModel::trUtf8(s, c, static_cast(n)); - // 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()); -} - bool QItemSelectionModel_IsRowSelected2(const QItemSelectionModel* self, int row, QModelIndex* parent) { return self->isRowSelected(static_cast(row), *parent); } diff --git a/qt/gen_qitemselectionmodel.go b/qt/gen_qitemselectionmodel.go index 97fdebb..ba6d7aa 100644 --- a/qt/gen_qitemselectionmodel.go +++ b/qt/gen_qitemselectionmodel.go @@ -59,27 +59,23 @@ func NewQItemSelectionRange() *QItemSelectionRange { } // NewQItemSelectionRange2 constructs a new QItemSelectionRange object. -func NewQItemSelectionRange2(other *QItemSelectionRange) *QItemSelectionRange { - ret := C.QItemSelectionRange_new2(other.cPointer()) +func NewQItemSelectionRange2(topL *QModelIndex, bottomR *QModelIndex) *QItemSelectionRange { + ret := C.QItemSelectionRange_new2(topL.cPointer(), bottomR.cPointer()) return newQItemSelectionRange(ret) } // NewQItemSelectionRange3 constructs a new QItemSelectionRange object. -func NewQItemSelectionRange3(topL *QModelIndex, bottomR *QModelIndex) *QItemSelectionRange { - ret := C.QItemSelectionRange_new3(topL.cPointer(), bottomR.cPointer()) +func NewQItemSelectionRange3(index *QModelIndex) *QItemSelectionRange { + ret := C.QItemSelectionRange_new3(index.cPointer()) return newQItemSelectionRange(ret) } // NewQItemSelectionRange4 constructs a new QItemSelectionRange object. -func NewQItemSelectionRange4(index *QModelIndex) *QItemSelectionRange { - ret := C.QItemSelectionRange_new4(index.cPointer()) +func NewQItemSelectionRange4(param1 *QItemSelectionRange) *QItemSelectionRange { + ret := C.QItemSelectionRange_new4(param1.cPointer()) return newQItemSelectionRange(ret) } -func (this *QItemSelectionRange) OperatorAssign(other *QItemSelectionRange) { - C.QItemSelectionRange_OperatorAssign(this.h, other.cPointer()) -} - func (this *QItemSelectionRange) Swap(other *QItemSelectionRange) { C.QItemSelectionRange_Swap(this.h, other.cPointer()) } @@ -154,10 +150,6 @@ func (this *QItemSelectionRange) OperatorNotEqual(other *QItemSelectionRange) bo return (bool)(C.QItemSelectionRange_OperatorNotEqual(this.h, other.cPointer())) } -func (this *QItemSelectionRange) OperatorLesser(other *QItemSelectionRange) bool { - return (bool)(C.QItemSelectionRange_OperatorLesser(this.h, other.cPointer())) -} - func (this *QItemSelectionRange) IsValid() bool { return (bool)(C.QItemSelectionRange_IsValid(this.h)) } @@ -254,15 +246,6 @@ func QItemSelectionModel_Tr(s string) string { return _ret } -func QItemSelectionModel_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QItemSelectionModel_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QItemSelectionModel) CurrentIndex() *QModelIndex { _ret := C.QItemSelectionModel_CurrentIndex(this.h) _goptr := newQModelIndex(_ret) @@ -477,28 +460,6 @@ func QItemSelectionModel_Tr3(s string, c string, n int) string { return _ret } -func QItemSelectionModel_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QItemSelectionModel_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QItemSelectionModel_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QItemSelectionModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QItemSelectionModel) IsRowSelected2(row int, parent *QModelIndex) bool { return (bool)(C.QItemSelectionModel_IsRowSelected2(this.h, (C.int)(row), parent.cPointer())) } diff --git a/qt/gen_qitemselectionmodel.h b/qt/gen_qitemselectionmodel.h index 2fb6754..11ceaec 100644 --- a/qt/gen_qitemselectionmodel.h +++ b/qt/gen_qitemselectionmodel.h @@ -32,10 +32,9 @@ typedef struct QPersistentModelIndex QPersistentModelIndex; #endif QItemSelectionRange* QItemSelectionRange_new(); -QItemSelectionRange* QItemSelectionRange_new2(QItemSelectionRange* other); -QItemSelectionRange* QItemSelectionRange_new3(QModelIndex* topL, QModelIndex* bottomR); -QItemSelectionRange* QItemSelectionRange_new4(QModelIndex* index); -void QItemSelectionRange_OperatorAssign(QItemSelectionRange* self, QItemSelectionRange* other); +QItemSelectionRange* QItemSelectionRange_new2(QModelIndex* topL, QModelIndex* bottomR); +QItemSelectionRange* QItemSelectionRange_new3(QModelIndex* index); +QItemSelectionRange* QItemSelectionRange_new4(QItemSelectionRange* param1); void QItemSelectionRange_Swap(QItemSelectionRange* self, QItemSelectionRange* other); int QItemSelectionRange_Top(const QItemSelectionRange* self); int QItemSelectionRange_Left(const QItemSelectionRange* self); @@ -53,7 +52,6 @@ bool QItemSelectionRange_Intersects(const QItemSelectionRange* self, QItemSelect QItemSelectionRange* QItemSelectionRange_Intersected(const QItemSelectionRange* self, QItemSelectionRange* other); bool QItemSelectionRange_OperatorEqual(const QItemSelectionRange* self, QItemSelectionRange* other); bool QItemSelectionRange_OperatorNotEqual(const QItemSelectionRange* self, QItemSelectionRange* other); -bool QItemSelectionRange_OperatorLesser(const QItemSelectionRange* self, QItemSelectionRange* other); bool QItemSelectionRange_IsValid(const QItemSelectionRange* self); bool QItemSelectionRange_IsEmpty(const QItemSelectionRange* self); struct miqt_array* QItemSelectionRange_Indexes(const QItemSelectionRange* self); @@ -65,7 +63,6 @@ QItemSelectionModel* QItemSelectionModel_new3(QAbstractItemModel* model); QMetaObject* QItemSelectionModel_MetaObject(const QItemSelectionModel* self); void* QItemSelectionModel_Metacast(QItemSelectionModel* self, const char* param1); struct miqt_string* QItemSelectionModel_Tr(const char* s); -struct miqt_string* QItemSelectionModel_TrUtf8(const char* s); QModelIndex* QItemSelectionModel_CurrentIndex(const QItemSelectionModel* self); bool QItemSelectionModel_IsSelected(const QItemSelectionModel* self, QModelIndex* index); bool QItemSelectionModel_IsRowSelected(const QItemSelectionModel* self, int row); @@ -95,8 +92,6 @@ void QItemSelectionModel_ModelChanged(QItemSelectionModel* self, QAbstractItemMo void QItemSelectionModel_connect_ModelChanged(QItemSelectionModel* self, void* slot); struct miqt_string* QItemSelectionModel_Tr2(const char* s, const char* c); struct miqt_string* QItemSelectionModel_Tr3(const char* s, const char* c, int n); -struct miqt_string* QItemSelectionModel_TrUtf82(const char* s, const char* c); -struct miqt_string* QItemSelectionModel_TrUtf83(const char* s, const char* c, int n); bool QItemSelectionModel_IsRowSelected2(const QItemSelectionModel* self, int row, QModelIndex* parent); bool QItemSelectionModel_IsColumnSelected2(const QItemSelectionModel* self, int column, QModelIndex* parent); bool QItemSelectionModel_RowIntersectsSelection2(const QItemSelectionModel* self, int row, QModelIndex* parent); diff --git a/qt/gen_qjsonarray.cpp b/qt/gen_qjsonarray.cpp index 14d8c1d..608e9ed 100644 --- a/qt/gen_qjsonarray.cpp +++ b/qt/gen_qjsonarray.cpp @@ -2,9 +2,8 @@ #define WORKAROUND_INNER_CLASS_DEFINITION_QJsonArray__const_iterator #define WORKAROUND_INNER_CLASS_DEFINITION_QJsonArray__iterator #include -#include +#include #include -#include #include #include #include @@ -36,20 +35,22 @@ QJsonArray* QJsonArray_FromStringList(struct miqt_array* /* of struct miqt_strin return new QJsonArray(QJsonArray::fromStringList(list_QList)); } -int QJsonArray_Size(const QJsonArray* self) { - return self->size(); +ptrdiff_t QJsonArray_Size(const QJsonArray* self) { + qsizetype _ret = self->size(); + return static_cast(_ret); } -int QJsonArray_Count(const QJsonArray* self) { - return self->count(); +ptrdiff_t QJsonArray_Count(const QJsonArray* self) { + qsizetype _ret = self->count(); + return static_cast(_ret); } bool QJsonArray_IsEmpty(const QJsonArray* self) { return self->isEmpty(); } -QJsonValue* QJsonArray_At(const QJsonArray* self, int i) { - return new QJsonValue(self->at(static_cast(i))); +QJsonValue* QJsonArray_At(const QJsonArray* self, ptrdiff_t i) { + return new QJsonValue(self->at((qsizetype)(i))); } QJsonValue* QJsonArray_First(const QJsonArray* self) { @@ -68,12 +69,12 @@ void QJsonArray_Append(QJsonArray* self, QJsonValue* value) { self->append(*value); } -void QJsonArray_RemoveAt(QJsonArray* self, int i) { - self->removeAt(static_cast(i)); +void QJsonArray_RemoveAt(QJsonArray* self, ptrdiff_t i) { + self->removeAt((qsizetype)(i)); } -QJsonValue* QJsonArray_TakeAt(QJsonArray* self, int i) { - return new QJsonValue(self->takeAt(static_cast(i))); +QJsonValue* QJsonArray_TakeAt(QJsonArray* self, ptrdiff_t i) { + return new QJsonValue(self->takeAt((qsizetype)(i))); } void QJsonArray_RemoveFirst(QJsonArray* self) { @@ -84,24 +85,24 @@ void QJsonArray_RemoveLast(QJsonArray* self) { self->removeLast(); } -void QJsonArray_Insert(QJsonArray* self, int i, QJsonValue* value) { - self->insert(static_cast(i), *value); +void QJsonArray_Insert(QJsonArray* self, ptrdiff_t i, QJsonValue* value) { + self->insert((qsizetype)(i), *value); } -void QJsonArray_Replace(QJsonArray* self, int i, QJsonValue* value) { - self->replace(static_cast(i), *value); +void QJsonArray_Replace(QJsonArray* self, ptrdiff_t i, QJsonValue* value) { + self->replace((qsizetype)(i), *value); } bool QJsonArray_Contains(const QJsonArray* self, QJsonValue* element) { return self->contains(*element); } -QJsonValueRef* QJsonArray_OperatorSubscript(QJsonArray* self, int i) { - return new QJsonValueRef(self->operator[](static_cast(i))); +QJsonValueRef* QJsonArray_OperatorSubscript(QJsonArray* self, ptrdiff_t i) { + return new QJsonValueRef(self->operator[]((qsizetype)(i))); } -QJsonValue* QJsonArray_OperatorSubscriptWithInt(const QJsonArray* self, int i) { - return new QJsonValue(self->operator[](static_cast(i))); +QJsonValue* QJsonArray_OperatorSubscriptWithQsizetype(const QJsonArray* self, ptrdiff_t i) { + return new QJsonValue(self->operator[]((qsizetype)(i))); } bool QJsonArray_OperatorEqual(const QJsonArray* self, QJsonArray* other) { @@ -200,24 +201,32 @@ QJsonArray__iterator* QJsonArray__iterator_new() { return new QJsonArray::iterator(); } -QJsonArray__iterator* QJsonArray__iterator_new2(QJsonArray* array, int index) { - return new QJsonArray::iterator(array, static_cast(index)); +QJsonArray__iterator* QJsonArray__iterator_new2(QJsonArray* array, ptrdiff_t index) { + return new QJsonArray::iterator(array, (qsizetype)(index)); } -QJsonArray__iterator* QJsonArray__iterator_new3(QJsonArray__iterator* param1) { - return new QJsonArray::iterator(*param1); +QJsonArray__iterator* QJsonArray__iterator_new3(QJsonArray__iterator* other) { + return new QJsonArray::iterator(*other); +} + +void QJsonArray__iterator_OperatorAssign(QJsonArray__iterator* self, QJsonArray__iterator* other) { + self->operator=(*other); } QJsonValueRef* QJsonArray__iterator_OperatorMultiply(const QJsonArray__iterator* self) { return new QJsonValueRef(self->operator*()); } -QJsonValueRefPtr* QJsonArray__iterator_OperatorMinusGreater(const QJsonArray__iterator* self) { - return new QJsonValueRefPtr(self->operator->()); +QJsonValueConstRef* QJsonArray__iterator_OperatorMinusGreater(const QJsonArray__iterator* self) { + return (QJsonValueConstRef*) self->operator->(); } -QJsonValueRef* QJsonArray__iterator_OperatorSubscript(const QJsonArray__iterator* self, int j) { - return new QJsonValueRef(self->operator[](static_cast(j))); +QJsonValueRef* QJsonArray__iterator_OperatorMinusGreater2(QJsonArray__iterator* self) { + return self->operator->(); +} + +QJsonValueRef* QJsonArray__iterator_OperatorSubscript(const QJsonArray__iterator* self, ptrdiff_t j) { + return new QJsonValueRef(self->operator[]((qsizetype)(j))); } bool QJsonArray__iterator_OperatorEqual(const QJsonArray__iterator* self, QJsonArray__iterator* o) { @@ -288,28 +297,29 @@ QJsonArray__iterator* QJsonArray__iterator_OperatorMinusMinusWithInt(QJsonArray_ 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)); +QJsonArray__iterator* QJsonArray__iterator_OperatorPlusAssign(QJsonArray__iterator* self, ptrdiff_t j) { + QJsonArray::iterator& _ret = self->operator+=((qsizetype)(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)); +QJsonArray__iterator* QJsonArray__iterator_OperatorMinusAssign(QJsonArray__iterator* self, ptrdiff_t j) { + QJsonArray::iterator& _ret = self->operator-=((qsizetype)(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))); +QJsonArray__iterator* QJsonArray__iterator_OperatorPlus(const QJsonArray__iterator* self, ptrdiff_t j) { + return new QJsonArray::iterator(self->operator+((qsizetype)(j))); } -QJsonArray__iterator* QJsonArray__iterator_OperatorMinus(const QJsonArray__iterator* self, int j) { - return new QJsonArray::iterator(self->operator-(static_cast(j))); +QJsonArray__iterator* QJsonArray__iterator_OperatorMinus(const QJsonArray__iterator* self, ptrdiff_t j) { + return new QJsonArray::iterator(self->operator-((qsizetype)(j))); } -int QJsonArray__iterator_OperatorMinusWithQJsonArrayiterator(const QJsonArray__iterator* self, QJsonArray__iterator* j) { - return self->operator-(*j); +ptrdiff_t QJsonArray__iterator_OperatorMinusWithQJsonArrayiterator(const QJsonArray__iterator* self, QJsonArray__iterator* j) { + qsizetype _ret = self->operator-(*j); + return static_cast(_ret); } void QJsonArray__iterator_Delete(QJsonArray__iterator* self) { @@ -320,28 +330,32 @@ QJsonArray__const_iterator* QJsonArray__const_iterator_new() { return new QJsonArray::const_iterator(); } -QJsonArray__const_iterator* QJsonArray__const_iterator_new2(QJsonArray* array, int index) { - return new QJsonArray::const_iterator(array, static_cast(index)); +QJsonArray__const_iterator* QJsonArray__const_iterator_new2(QJsonArray* array, ptrdiff_t index) { + return new QJsonArray::const_iterator(array, (qsizetype)(index)); } -QJsonArray__const_iterator* QJsonArray__const_iterator_new3(QJsonArray__const_iterator* o) { +QJsonArray__const_iterator* QJsonArray__const_iterator_new3(QJsonArray__iterator* o) { return new QJsonArray::const_iterator(*o); } -QJsonArray__const_iterator* QJsonArray__const_iterator_new4(QJsonArray__iterator* o) { - return new QJsonArray::const_iterator(*o); +QJsonArray__const_iterator* QJsonArray__const_iterator_new4(QJsonArray__const_iterator* other) { + return new QJsonArray::const_iterator(*other); } -QJsonValue* QJsonArray__const_iterator_OperatorMultiply(const QJsonArray__const_iterator* self) { - return new QJsonValue(self->operator*()); +void QJsonArray__const_iterator_OperatorAssign(QJsonArray__const_iterator* self, QJsonArray__const_iterator* other) { + self->operator=(*other); } -QJsonValuePtr* QJsonArray__const_iterator_OperatorMinusGreater(const QJsonArray__const_iterator* self) { - return new QJsonValuePtr(self->operator->()); +QJsonValueConstRef* QJsonArray__const_iterator_OperatorMultiply(const QJsonArray__const_iterator* self) { + return new QJsonValueConstRef(self->operator*()); } -QJsonValue* QJsonArray__const_iterator_OperatorSubscript(const QJsonArray__const_iterator* self, int j) { - return new QJsonValue(self->operator[](static_cast(j))); +QJsonValueConstRef* QJsonArray__const_iterator_OperatorMinusGreater(const QJsonArray__const_iterator* self) { + return (QJsonValueConstRef*) self->operator->(); +} + +QJsonValueConstRef* QJsonArray__const_iterator_OperatorSubscript(const QJsonArray__const_iterator* self, ptrdiff_t j) { + return new QJsonValueConstRef(self->operator[]((qsizetype)(j))); } bool QJsonArray__const_iterator_OperatorEqual(const QJsonArray__const_iterator* self, QJsonArray__const_iterator* o) { @@ -388,28 +402,29 @@ QJsonArray__const_iterator* QJsonArray__const_iterator_OperatorMinusMinusWithInt 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)); +QJsonArray__const_iterator* QJsonArray__const_iterator_OperatorPlusAssign(QJsonArray__const_iterator* self, ptrdiff_t j) { + QJsonArray::const_iterator& _ret = self->operator+=((qsizetype)(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)); +QJsonArray__const_iterator* QJsonArray__const_iterator_OperatorMinusAssign(QJsonArray__const_iterator* self, ptrdiff_t j) { + QJsonArray::const_iterator& _ret = self->operator-=((qsizetype)(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))); +QJsonArray__const_iterator* QJsonArray__const_iterator_OperatorPlus(const QJsonArray__const_iterator* self, ptrdiff_t j) { + return new QJsonArray::const_iterator(self->operator+((qsizetype)(j))); } -QJsonArray__const_iterator* QJsonArray__const_iterator_OperatorMinus(const QJsonArray__const_iterator* self, int j) { - return new QJsonArray::const_iterator(self->operator-(static_cast(j))); +QJsonArray__const_iterator* QJsonArray__const_iterator_OperatorMinus(const QJsonArray__const_iterator* self, ptrdiff_t j) { + return new QJsonArray::const_iterator(self->operator-((qsizetype)(j))); } -int QJsonArray__const_iterator_OperatorMinusWithQJsonArrayconstIterator(const QJsonArray__const_iterator* self, QJsonArray__const_iterator* j) { - return self->operator-(*j); +ptrdiff_t QJsonArray__const_iterator_OperatorMinusWithQJsonArrayconstIterator(const QJsonArray__const_iterator* self, QJsonArray__const_iterator* j) { + qsizetype _ret = self->operator-(*j); + return static_cast(_ret); } void QJsonArray__const_iterator_Delete(QJsonArray__const_iterator* self) { diff --git a/qt/gen_qjsonarray.go b/qt/gen_qjsonarray.go index b624ea7..786903f 100644 --- a/qt/gen_qjsonarray.go +++ b/qt/gen_qjsonarray.go @@ -68,20 +68,20 @@ func QJsonArray_FromStringList(list []string) *QJsonArray { return _goptr } -func (this *QJsonArray) Size() int { - return (int)(C.QJsonArray_Size(this.h)) +func (this *QJsonArray) Size() int64 { + return (int64)(C.QJsonArray_Size(this.h)) } -func (this *QJsonArray) Count() int { - return (int)(C.QJsonArray_Count(this.h)) +func (this *QJsonArray) Count() int64 { + return (int64)(C.QJsonArray_Count(this.h)) } func (this *QJsonArray) IsEmpty() bool { return (bool)(C.QJsonArray_IsEmpty(this.h)) } -func (this *QJsonArray) At(i int) *QJsonValue { - _ret := C.QJsonArray_At(this.h, (C.int)(i)) +func (this *QJsonArray) At(i int64) *QJsonValue { + _ret := C.QJsonArray_At(this.h, (C.ptrdiff_t)(i)) _goptr := newQJsonValue(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -109,12 +109,12 @@ func (this *QJsonArray) Append(value *QJsonValue) { C.QJsonArray_Append(this.h, value.cPointer()) } -func (this *QJsonArray) RemoveAt(i int) { - C.QJsonArray_RemoveAt(this.h, (C.int)(i)) +func (this *QJsonArray) RemoveAt(i int64) { + C.QJsonArray_RemoveAt(this.h, (C.ptrdiff_t)(i)) } -func (this *QJsonArray) TakeAt(i int) *QJsonValue { - _ret := C.QJsonArray_TakeAt(this.h, (C.int)(i)) +func (this *QJsonArray) TakeAt(i int64) *QJsonValue { + _ret := C.QJsonArray_TakeAt(this.h, (C.ptrdiff_t)(i)) _goptr := newQJsonValue(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -128,27 +128,27 @@ func (this *QJsonArray) RemoveLast() { C.QJsonArray_RemoveLast(this.h) } -func (this *QJsonArray) Insert(i int, value *QJsonValue) { - C.QJsonArray_Insert(this.h, (C.int)(i), value.cPointer()) +func (this *QJsonArray) Insert(i int64, value *QJsonValue) { + C.QJsonArray_Insert(this.h, (C.ptrdiff_t)(i), value.cPointer()) } -func (this *QJsonArray) Replace(i int, value *QJsonValue) { - C.QJsonArray_Replace(this.h, (C.int)(i), value.cPointer()) +func (this *QJsonArray) Replace(i int64, value *QJsonValue) { + C.QJsonArray_Replace(this.h, (C.ptrdiff_t)(i), value.cPointer()) } func (this *QJsonArray) Contains(element *QJsonValue) bool { return (bool)(C.QJsonArray_Contains(this.h, element.cPointer())) } -func (this *QJsonArray) OperatorSubscript(i int) *QJsonValueRef { - _ret := C.QJsonArray_OperatorSubscript(this.h, (C.int)(i)) +func (this *QJsonArray) OperatorSubscript(i int64) *QJsonValueRef { + _ret := C.QJsonArray_OperatorSubscript(this.h, (C.ptrdiff_t)(i)) _goptr := newQJsonValueRef(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QJsonArray) OperatorSubscriptWithInt(i int) *QJsonValue { - _ret := C.QJsonArray_OperatorSubscriptWithInt(this.h, (C.int)(i)) +func (this *QJsonArray) OperatorSubscriptWithQsizetype(i int64) *QJsonValue { + _ret := C.QJsonArray_OperatorSubscriptWithQsizetype(this.h, (C.ptrdiff_t)(i)) _goptr := newQJsonValue(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -314,17 +314,21 @@ func NewQJsonArray__iterator() *QJsonArray__iterator { } // NewQJsonArray__iterator2 constructs a new QJsonArray::iterator object. -func NewQJsonArray__iterator2(array *QJsonArray, index int) *QJsonArray__iterator { - ret := C.QJsonArray__iterator_new2(array.cPointer(), (C.int)(index)) +func NewQJsonArray__iterator2(array *QJsonArray, index int64) *QJsonArray__iterator { + ret := C.QJsonArray__iterator_new2(array.cPointer(), (C.ptrdiff_t)(index)) return newQJsonArray__iterator(ret) } // NewQJsonArray__iterator3 constructs a new QJsonArray::iterator object. -func NewQJsonArray__iterator3(param1 *QJsonArray__iterator) *QJsonArray__iterator { - ret := C.QJsonArray__iterator_new3(param1.cPointer()) +func NewQJsonArray__iterator3(other *QJsonArray__iterator) *QJsonArray__iterator { + ret := C.QJsonArray__iterator_new3(other.cPointer()) return newQJsonArray__iterator(ret) } +func (this *QJsonArray__iterator) OperatorAssign(other *QJsonArray__iterator) { + C.QJsonArray__iterator_OperatorAssign(this.h, other.cPointer()) +} + func (this *QJsonArray__iterator) OperatorMultiply() *QJsonValueRef { _ret := C.QJsonArray__iterator_OperatorMultiply(this.h) _goptr := newQJsonValueRef(_ret) @@ -332,15 +336,16 @@ func (this *QJsonArray__iterator) OperatorMultiply() *QJsonValueRef { return _goptr } -func (this *QJsonArray__iterator) OperatorMinusGreater() *QJsonValueRefPtr { - _ret := C.QJsonArray__iterator_OperatorMinusGreater(this.h) - _goptr := newQJsonValueRefPtr(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QJsonArray__iterator) OperatorMinusGreater() *QJsonValueConstRef { + return newQJsonValueConstRef_U(unsafe.Pointer(C.QJsonArray__iterator_OperatorMinusGreater(this.h))) } -func (this *QJsonArray__iterator) OperatorSubscript(j int) *QJsonValueRef { - _ret := C.QJsonArray__iterator_OperatorSubscript(this.h, (C.int)(j)) +func (this *QJsonArray__iterator) OperatorMinusGreater2() *QJsonValueRef { + return newQJsonValueRef_U(unsafe.Pointer(C.QJsonArray__iterator_OperatorMinusGreater2(this.h))) +} + +func (this *QJsonArray__iterator) OperatorSubscript(j int64) *QJsonValueRef { + _ret := C.QJsonArray__iterator_OperatorSubscript(this.h, (C.ptrdiff_t)(j)) _goptr := newQJsonValueRef(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -416,30 +421,30 @@ func (this *QJsonArray__iterator) OperatorMinusMinusWithInt(param1 int) *QJsonAr 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) OperatorPlusAssign(j int64) *QJsonArray__iterator { + return newQJsonArray__iterator_U(unsafe.Pointer(C.QJsonArray__iterator_OperatorPlusAssign(this.h, (C.ptrdiff_t)(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) OperatorMinusAssign(j int64) *QJsonArray__iterator { + return newQJsonArray__iterator_U(unsafe.Pointer(C.QJsonArray__iterator_OperatorMinusAssign(this.h, (C.ptrdiff_t)(j)))) } -func (this *QJsonArray__iterator) OperatorPlus(j int) *QJsonArray__iterator { - _ret := C.QJsonArray__iterator_OperatorPlus(this.h, (C.int)(j)) +func (this *QJsonArray__iterator) OperatorPlus(j int64) *QJsonArray__iterator { + _ret := C.QJsonArray__iterator_OperatorPlus(this.h, (C.ptrdiff_t)(j)) _goptr := newQJsonArray__iterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QJsonArray__iterator) OperatorMinus(j int) *QJsonArray__iterator { - _ret := C.QJsonArray__iterator_OperatorMinus(this.h, (C.int)(j)) +func (this *QJsonArray__iterator) OperatorMinus(j int64) *QJsonArray__iterator { + _ret := C.QJsonArray__iterator_OperatorMinus(this.h, (C.ptrdiff_t)(j)) _goptr := newQJsonArray__iterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QJsonArray__iterator) OperatorMinusWithQJsonArrayiterator(j QJsonArray__iterator) int { - return (int)(C.QJsonArray__iterator_OperatorMinusWithQJsonArrayiterator(this.h, j.cPointer())) +func (this *QJsonArray__iterator) OperatorMinusWithQJsonArrayiterator(j QJsonArray__iterator) int64 { + return (int64)(C.QJsonArray__iterator_OperatorMinusWithQJsonArrayiterator(this.h, j.cPointer())) } // Delete this object from C++ memory. @@ -485,40 +490,41 @@ func NewQJsonArray__const_iterator() *QJsonArray__const_iterator { } // NewQJsonArray__const_iterator2 constructs a new QJsonArray::const_iterator object. -func NewQJsonArray__const_iterator2(array *QJsonArray, index int) *QJsonArray__const_iterator { - ret := C.QJsonArray__const_iterator_new2(array.cPointer(), (C.int)(index)) +func NewQJsonArray__const_iterator2(array *QJsonArray, index int64) *QJsonArray__const_iterator { + ret := C.QJsonArray__const_iterator_new2(array.cPointer(), (C.ptrdiff_t)(index)) return newQJsonArray__const_iterator(ret) } // NewQJsonArray__const_iterator3 constructs a new QJsonArray::const_iterator object. -func NewQJsonArray__const_iterator3(o *QJsonArray__const_iterator) *QJsonArray__const_iterator { +func NewQJsonArray__const_iterator3(o *QJsonArray__iterator) *QJsonArray__const_iterator { ret := C.QJsonArray__const_iterator_new3(o.cPointer()) return newQJsonArray__const_iterator(ret) } // NewQJsonArray__const_iterator4 constructs a new QJsonArray::const_iterator object. -func NewQJsonArray__const_iterator4(o *QJsonArray__iterator) *QJsonArray__const_iterator { - ret := C.QJsonArray__const_iterator_new4(o.cPointer()) +func NewQJsonArray__const_iterator4(other *QJsonArray__const_iterator) *QJsonArray__const_iterator { + ret := C.QJsonArray__const_iterator_new4(other.cPointer()) return newQJsonArray__const_iterator(ret) } -func (this *QJsonArray__const_iterator) OperatorMultiply() *QJsonValue { +func (this *QJsonArray__const_iterator) OperatorAssign(other *QJsonArray__const_iterator) { + C.QJsonArray__const_iterator_OperatorAssign(this.h, other.cPointer()) +} + +func (this *QJsonArray__const_iterator) OperatorMultiply() *QJsonValueConstRef { _ret := C.QJsonArray__const_iterator_OperatorMultiply(this.h) - _goptr := newQJsonValue(_ret) + _goptr := newQJsonValueConstRef(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QJsonArray__const_iterator) OperatorMinusGreater() *QJsonValuePtr { - _ret := C.QJsonArray__const_iterator_OperatorMinusGreater(this.h) - _goptr := newQJsonValuePtr(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QJsonArray__const_iterator) OperatorMinusGreater() *QJsonValueConstRef { + return newQJsonValueConstRef_U(unsafe.Pointer(C.QJsonArray__const_iterator_OperatorMinusGreater(this.h))) } -func (this *QJsonArray__const_iterator) OperatorSubscript(j int) *QJsonValue { - _ret := C.QJsonArray__const_iterator_OperatorSubscript(this.h, (C.int)(j)) - _goptr := newQJsonValue(_ret) +func (this *QJsonArray__const_iterator) OperatorSubscript(j int64) *QJsonValueConstRef { + _ret := C.QJsonArray__const_iterator_OperatorSubscript(this.h, (C.ptrdiff_t)(j)) + _goptr := newQJsonValueConstRef(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -569,30 +575,30 @@ func (this *QJsonArray__const_iterator) OperatorMinusMinusWithInt(param1 int) *Q 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) OperatorPlusAssign(j int64) *QJsonArray__const_iterator { + return newQJsonArray__const_iterator_U(unsafe.Pointer(C.QJsonArray__const_iterator_OperatorPlusAssign(this.h, (C.ptrdiff_t)(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) OperatorMinusAssign(j int64) *QJsonArray__const_iterator { + return newQJsonArray__const_iterator_U(unsafe.Pointer(C.QJsonArray__const_iterator_OperatorMinusAssign(this.h, (C.ptrdiff_t)(j)))) } -func (this *QJsonArray__const_iterator) OperatorPlus(j int) *QJsonArray__const_iterator { - _ret := C.QJsonArray__const_iterator_OperatorPlus(this.h, (C.int)(j)) +func (this *QJsonArray__const_iterator) OperatorPlus(j int64) *QJsonArray__const_iterator { + _ret := C.QJsonArray__const_iterator_OperatorPlus(this.h, (C.ptrdiff_t)(j)) _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) OperatorMinus(j int) *QJsonArray__const_iterator { - _ret := C.QJsonArray__const_iterator_OperatorMinus(this.h, (C.int)(j)) +func (this *QJsonArray__const_iterator) OperatorMinus(j int64) *QJsonArray__const_iterator { + _ret := C.QJsonArray__const_iterator_OperatorMinus(this.h, (C.ptrdiff_t)(j)) _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) OperatorMinusWithQJsonArrayconstIterator(j QJsonArray__const_iterator) int { - return (int)(C.QJsonArray__const_iterator_OperatorMinusWithQJsonArrayconstIterator(this.h, j.cPointer())) +func (this *QJsonArray__const_iterator) OperatorMinusWithQJsonArrayconstIterator(j QJsonArray__const_iterator) int64 { + return (int64)(C.QJsonArray__const_iterator_OperatorMinusWithQJsonArrayconstIterator(this.h, j.cPointer())) } // Delete this object from C++ memory. diff --git a/qt/gen_qjsonarray.h b/qt/gen_qjsonarray.h index b205336..729a6f3 100644 --- a/qt/gen_qjsonarray.h +++ b/qt/gen_qjsonarray.h @@ -26,40 +26,38 @@ typedef QJsonArray::iterator QJsonArray__iterator; class QJsonArray__iterator; #endif class QJsonValue; -class QJsonValuePtr; +class QJsonValueConstRef; class QJsonValueRef; -class QJsonValueRefPtr; #else typedef struct QJsonArray QJsonArray; typedef struct QJsonArray__const_iterator QJsonArray__const_iterator; typedef struct QJsonArray__iterator QJsonArray__iterator; typedef struct QJsonValue QJsonValue; -typedef struct QJsonValuePtr QJsonValuePtr; +typedef struct QJsonValueConstRef QJsonValueConstRef; typedef struct QJsonValueRef QJsonValueRef; -typedef struct QJsonValueRefPtr QJsonValueRefPtr; #endif QJsonArray* QJsonArray_new(); QJsonArray* QJsonArray_new2(QJsonArray* other); void QJsonArray_OperatorAssign(QJsonArray* self, QJsonArray* other); QJsonArray* QJsonArray_FromStringList(struct miqt_array* /* of struct miqt_string* */ list); -int QJsonArray_Size(const QJsonArray* self); -int QJsonArray_Count(const QJsonArray* self); +ptrdiff_t QJsonArray_Size(const QJsonArray* self); +ptrdiff_t QJsonArray_Count(const QJsonArray* self); bool QJsonArray_IsEmpty(const QJsonArray* self); -QJsonValue* QJsonArray_At(const QJsonArray* self, int i); +QJsonValue* QJsonArray_At(const QJsonArray* self, ptrdiff_t i); QJsonValue* QJsonArray_First(const QJsonArray* self); QJsonValue* QJsonArray_Last(const QJsonArray* self); void QJsonArray_Prepend(QJsonArray* self, QJsonValue* value); void QJsonArray_Append(QJsonArray* self, QJsonValue* value); -void QJsonArray_RemoveAt(QJsonArray* self, int i); -QJsonValue* QJsonArray_TakeAt(QJsonArray* self, int i); +void QJsonArray_RemoveAt(QJsonArray* self, ptrdiff_t i); +QJsonValue* QJsonArray_TakeAt(QJsonArray* self, ptrdiff_t i); void QJsonArray_RemoveFirst(QJsonArray* self); void QJsonArray_RemoveLast(QJsonArray* self); -void QJsonArray_Insert(QJsonArray* self, int i, QJsonValue* value); -void QJsonArray_Replace(QJsonArray* self, int i, QJsonValue* value); +void QJsonArray_Insert(QJsonArray* self, ptrdiff_t i, QJsonValue* value); +void QJsonArray_Replace(QJsonArray* self, ptrdiff_t i, QJsonValue* value); bool QJsonArray_Contains(const QJsonArray* self, QJsonValue* element); -QJsonValueRef* QJsonArray_OperatorSubscript(QJsonArray* self, int i); -QJsonValue* QJsonArray_OperatorSubscriptWithInt(const QJsonArray* self, int i); +QJsonValueRef* QJsonArray_OperatorSubscript(QJsonArray* self, ptrdiff_t i); +QJsonValue* QJsonArray_OperatorSubscriptWithQsizetype(const QJsonArray* self, ptrdiff_t i); bool QJsonArray_OperatorEqual(const QJsonArray* self, QJsonArray* other); bool QJsonArray_OperatorNotEqual(const QJsonArray* self, QJsonArray* other); void QJsonArray_Swap(QJsonArray* self, QJsonArray* other); @@ -84,11 +82,13 @@ bool QJsonArray_Empty(const QJsonArray* self); void QJsonArray_Delete(QJsonArray* self); QJsonArray__iterator* QJsonArray__iterator_new(); -QJsonArray__iterator* QJsonArray__iterator_new2(QJsonArray* array, int index); -QJsonArray__iterator* QJsonArray__iterator_new3(QJsonArray__iterator* param1); +QJsonArray__iterator* QJsonArray__iterator_new2(QJsonArray* array, ptrdiff_t index); +QJsonArray__iterator* QJsonArray__iterator_new3(QJsonArray__iterator* other); +void QJsonArray__iterator_OperatorAssign(QJsonArray__iterator* self, QJsonArray__iterator* other); QJsonValueRef* QJsonArray__iterator_OperatorMultiply(const QJsonArray__iterator* self); -QJsonValueRefPtr* QJsonArray__iterator_OperatorMinusGreater(const QJsonArray__iterator* self); -QJsonValueRef* QJsonArray__iterator_OperatorSubscript(const QJsonArray__iterator* self, int j); +QJsonValueConstRef* QJsonArray__iterator_OperatorMinusGreater(const QJsonArray__iterator* self); +QJsonValueRef* QJsonArray__iterator_OperatorMinusGreater2(QJsonArray__iterator* self); +QJsonValueRef* QJsonArray__iterator_OperatorSubscript(const QJsonArray__iterator* self, ptrdiff_t j); bool QJsonArray__iterator_OperatorEqual(const QJsonArray__iterator* self, QJsonArray__iterator* o); bool QJsonArray__iterator_OperatorNotEqual(const QJsonArray__iterator* self, QJsonArray__iterator* o); bool QJsonArray__iterator_OperatorLesser(const QJsonArray__iterator* self, QJsonArray__iterator* other); @@ -105,20 +105,21 @@ QJsonArray__iterator* QJsonArray__iterator_OperatorPlusPlus(QJsonArray__iterator 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); +QJsonArray__iterator* QJsonArray__iterator_OperatorPlusAssign(QJsonArray__iterator* self, ptrdiff_t j); +QJsonArray__iterator* QJsonArray__iterator_OperatorMinusAssign(QJsonArray__iterator* self, ptrdiff_t j); +QJsonArray__iterator* QJsonArray__iterator_OperatorPlus(const QJsonArray__iterator* self, ptrdiff_t j); +QJsonArray__iterator* QJsonArray__iterator_OperatorMinus(const QJsonArray__iterator* self, ptrdiff_t j); +ptrdiff_t QJsonArray__iterator_OperatorMinusWithQJsonArrayiterator(const QJsonArray__iterator* self, QJsonArray__iterator* j); void QJsonArray__iterator_Delete(QJsonArray__iterator* self); QJsonArray__const_iterator* QJsonArray__const_iterator_new(); -QJsonArray__const_iterator* QJsonArray__const_iterator_new2(QJsonArray* array, int index); -QJsonArray__const_iterator* QJsonArray__const_iterator_new3(QJsonArray__const_iterator* o); -QJsonArray__const_iterator* QJsonArray__const_iterator_new4(QJsonArray__iterator* o); -QJsonValue* QJsonArray__const_iterator_OperatorMultiply(const QJsonArray__const_iterator* self); -QJsonValuePtr* QJsonArray__const_iterator_OperatorMinusGreater(const QJsonArray__const_iterator* self); -QJsonValue* QJsonArray__const_iterator_OperatorSubscript(const QJsonArray__const_iterator* self, int j); +QJsonArray__const_iterator* QJsonArray__const_iterator_new2(QJsonArray* array, ptrdiff_t index); +QJsonArray__const_iterator* QJsonArray__const_iterator_new3(QJsonArray__iterator* o); +QJsonArray__const_iterator* QJsonArray__const_iterator_new4(QJsonArray__const_iterator* other); +void QJsonArray__const_iterator_OperatorAssign(QJsonArray__const_iterator* self, QJsonArray__const_iterator* other); +QJsonValueConstRef* QJsonArray__const_iterator_OperatorMultiply(const QJsonArray__const_iterator* self); +QJsonValueConstRef* QJsonArray__const_iterator_OperatorMinusGreater(const QJsonArray__const_iterator* self); +QJsonValueConstRef* QJsonArray__const_iterator_OperatorSubscript(const QJsonArray__const_iterator* self, ptrdiff_t j); bool QJsonArray__const_iterator_OperatorEqual(const QJsonArray__const_iterator* self, QJsonArray__const_iterator* o); bool QJsonArray__const_iterator_OperatorNotEqual(const QJsonArray__const_iterator* self, QJsonArray__const_iterator* o); bool QJsonArray__const_iterator_OperatorLesser(const QJsonArray__const_iterator* self, QJsonArray__const_iterator* other); @@ -129,11 +130,11 @@ QJsonArray__const_iterator* QJsonArray__const_iterator_OperatorPlusPlus(QJsonArr 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); +QJsonArray__const_iterator* QJsonArray__const_iterator_OperatorPlusAssign(QJsonArray__const_iterator* self, ptrdiff_t j); +QJsonArray__const_iterator* QJsonArray__const_iterator_OperatorMinusAssign(QJsonArray__const_iterator* self, ptrdiff_t j); +QJsonArray__const_iterator* QJsonArray__const_iterator_OperatorPlus(const QJsonArray__const_iterator* self, ptrdiff_t j); +QJsonArray__const_iterator* QJsonArray__const_iterator_OperatorMinus(const QJsonArray__const_iterator* self, ptrdiff_t j); +ptrdiff_t QJsonArray__const_iterator_OperatorMinusWithQJsonArrayconstIterator(const QJsonArray__const_iterator* self, QJsonArray__const_iterator* j); void QJsonArray__const_iterator_Delete(QJsonArray__const_iterator* self); #ifdef __cplusplus diff --git a/qt/gen_qjsondocument.cpp b/qt/gen_qjsondocument.cpp index ee390d3..3b27956 100644 --- a/qt/gen_qjsondocument.cpp +++ b/qt/gen_qjsondocument.cpp @@ -47,22 +47,6 @@ void QJsonDocument_Swap(QJsonDocument* self, QJsonDocument* other) { self->swap(*other); } -QJsonDocument* QJsonDocument_FromRawData(const char* data, int size) { - return new QJsonDocument(QJsonDocument::fromRawData(data, static_cast(size))); -} - -const char* QJsonDocument_RawData(const QJsonDocument* self, int* size) { - return (const char*) self->rawData(static_cast(size)); -} - -QJsonDocument* QJsonDocument_FromBinaryData(QByteArray* data) { - return new QJsonDocument(QJsonDocument::fromBinaryData(*data)); -} - -QByteArray* QJsonDocument_ToBinaryData(const QJsonDocument* self) { - return new QByteArray(self->toBinaryData()); -} - QJsonDocument* QJsonDocument_FromVariant(QVariant* variant) { return new QJsonDocument(QJsonDocument::fromVariant(*variant)); } @@ -79,10 +63,6 @@ QByteArray* QJsonDocument_ToJson(const QJsonDocument* self) { return new QByteArray(self->toJson()); } -QByteArray* QJsonDocument_ToJsonWithFormat(const QJsonDocument* self, int format) { - return new QByteArray(self->toJson(static_cast(format))); -} - bool QJsonDocument_IsEmpty(const QJsonDocument* self) { return self->isEmpty(); } @@ -116,8 +96,8 @@ QJsonValue* QJsonDocument_OperatorSubscript(const QJsonDocument* self, struct mi return new QJsonValue(self->operator[](key_QString)); } -QJsonValue* QJsonDocument_OperatorSubscriptWithInt(const QJsonDocument* self, int i) { - return new QJsonValue(self->operator[](static_cast(i))); +QJsonValue* QJsonDocument_OperatorSubscriptWithQsizetype(const QJsonDocument* self, ptrdiff_t i) { + return new QJsonValue(self->operator[]((qsizetype)(i))); } bool QJsonDocument_OperatorEqual(const QJsonDocument* self, QJsonDocument* other) { @@ -132,18 +112,14 @@ bool QJsonDocument_IsNull(const QJsonDocument* self) { return self->isNull(); } -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, int validation) { - return new QJsonDocument(QJsonDocument::fromBinaryData(*data, static_cast(validation))); -} - QJsonDocument* QJsonDocument_FromJson2(QByteArray* json, QJsonParseError* error) { return new QJsonDocument(QJsonDocument::fromJson(*json, error)); } +QByteArray* QJsonDocument_ToJson1(const QJsonDocument* self, int format) { + return new QByteArray(self->toJson(static_cast(format))); +} + void QJsonDocument_Delete(QJsonDocument* self) { delete self; } diff --git a/qt/gen_qjsondocument.go b/qt/gen_qjsondocument.go index 7459123..5ebb596 100644 --- a/qt/gen_qjsondocument.go +++ b/qt/gen_qjsondocument.go @@ -33,13 +33,6 @@ const ( QJsonParseError__GarbageAtEnd QJsonParseError__ParseError = 14 ) -type QJsonDocument__DataValidation int - -const ( - QJsonDocument__Validate QJsonDocument__DataValidation = 0 - QJsonDocument__BypassValidation QJsonDocument__DataValidation = 1 -) - type QJsonDocument__JsonFormat int const ( @@ -144,34 +137,6 @@ func (this *QJsonDocument) Swap(other *QJsonDocument) { C.QJsonDocument_Swap(this.h, other.cPointer()) } -func QJsonDocument_FromRawData(data string, size int) *QJsonDocument { - data_Cstring := C.CString(data) - defer C.free(unsafe.Pointer(data_Cstring)) - _ret := C.QJsonDocument_FromRawData(data_Cstring, (C.int)(size)) - _goptr := newQJsonDocument(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QJsonDocument) RawData(size *int) unsafe.Pointer { - _ret := C.QJsonDocument_RawData(this.h, (*C.int)(unsafe.Pointer(size))) - return (unsafe.Pointer)(_ret) -} - -func QJsonDocument_FromBinaryData(data *QByteArray) *QJsonDocument { - _ret := C.QJsonDocument_FromBinaryData(data.cPointer()) - _goptr := newQJsonDocument(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QJsonDocument) ToBinaryData() *QByteArray { - _ret := C.QJsonDocument_ToBinaryData(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - func QJsonDocument_FromVariant(variant *QVariant) *QJsonDocument { _ret := C.QJsonDocument_FromVariant(variant.cPointer()) _goptr := newQJsonDocument(_ret) @@ -200,13 +165,6 @@ func (this *QJsonDocument) ToJson() *QByteArray { return _goptr } -func (this *QJsonDocument) ToJsonWithFormat(format QJsonDocument__JsonFormat) *QByteArray { - _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 -} - func (this *QJsonDocument) IsEmpty() bool { return (bool)(C.QJsonDocument_IsEmpty(this.h)) } @@ -250,8 +208,8 @@ func (this *QJsonDocument) OperatorSubscript(key string) *QJsonValue { return _goptr } -func (this *QJsonDocument) OperatorSubscriptWithInt(i int) *QJsonValue { - _ret := C.QJsonDocument_OperatorSubscriptWithInt(this.h, (C.int)(i)) +func (this *QJsonDocument) OperatorSubscriptWithQsizetype(i int64) *QJsonValue { + _ret := C.QJsonDocument_OperatorSubscriptWithQsizetype(this.h, (C.ptrdiff_t)(i)) _goptr := newQJsonValue(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -269,22 +227,6 @@ func (this *QJsonDocument) IsNull() bool { return (bool)(C.QJsonDocument_IsNull(this.h)) } -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.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.int)(validation)) - _goptr := newQJsonDocument(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - func QJsonDocument_FromJson2(json *QByteArray, error *QJsonParseError) *QJsonDocument { _ret := C.QJsonDocument_FromJson2(json.cPointer(), error.cPointer()) _goptr := newQJsonDocument(_ret) @@ -292,6 +234,13 @@ func QJsonDocument_FromJson2(json *QByteArray, error *QJsonParseError) *QJsonDoc return _goptr } +func (this *QJsonDocument) ToJson1(format QJsonDocument__JsonFormat) *QByteArray { + _ret := C.QJsonDocument_ToJson1(this.h, (C.int)(format)) + _goptr := newQByteArray(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + // Delete this object from C++ memory. func (this *QJsonDocument) Delete() { C.QJsonDocument_Delete(this.h) diff --git a/qt/gen_qjsondocument.h b/qt/gen_qjsondocument.h index 354c9d9..f08f090 100644 --- a/qt/gen_qjsondocument.h +++ b/qt/gen_qjsondocument.h @@ -40,15 +40,10 @@ QJsonDocument* QJsonDocument_new3(QJsonArray* array); QJsonDocument* QJsonDocument_new4(QJsonDocument* other); void QJsonDocument_OperatorAssign(QJsonDocument* self, QJsonDocument* other); void QJsonDocument_Swap(QJsonDocument* self, QJsonDocument* other); -QJsonDocument* QJsonDocument_FromRawData(const char* data, int size); -const char* QJsonDocument_RawData(const QJsonDocument* self, int* size); -QJsonDocument* QJsonDocument_FromBinaryData(QByteArray* data); -QByteArray* QJsonDocument_ToBinaryData(const QJsonDocument* self); 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, int format); bool QJsonDocument_IsEmpty(const QJsonDocument* self); bool QJsonDocument_IsArray(const QJsonDocument* self); bool QJsonDocument_IsObject(const QJsonDocument* self); @@ -57,13 +52,12 @@ QJsonArray* QJsonDocument_Array(const QJsonDocument* self); void QJsonDocument_SetObject(QJsonDocument* self, QJsonObject* object); void QJsonDocument_SetArray(QJsonDocument* self, QJsonArray* array); QJsonValue* QJsonDocument_OperatorSubscript(const QJsonDocument* self, struct miqt_string* key); -QJsonValue* QJsonDocument_OperatorSubscriptWithInt(const QJsonDocument* self, int i); +QJsonValue* QJsonDocument_OperatorSubscriptWithQsizetype(const QJsonDocument* self, ptrdiff_t i); 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, int validation); -QJsonDocument* QJsonDocument_FromBinaryData2(QByteArray* data, int validation); QJsonDocument* QJsonDocument_FromJson2(QByteArray* json, QJsonParseError* error); +QByteArray* QJsonDocument_ToJson1(const QJsonDocument* self, int format); void QJsonDocument_Delete(QJsonDocument* self); #ifdef __cplusplus diff --git a/qt/gen_qjsonobject.cpp b/qt/gen_qjsonobject.cpp index c372dbf..d312900 100644 --- a/qt/gen_qjsonobject.cpp +++ b/qt/gen_qjsonobject.cpp @@ -2,9 +2,8 @@ #define WORKAROUND_INNER_CLASS_DEFINITION_QJsonObject__const_iterator #define WORKAROUND_INNER_CLASS_DEFINITION_QJsonObject__iterator #include -#include +#include #include -#include #include #include #include @@ -45,16 +44,19 @@ struct miqt_array* QJsonObject_Keys(const QJsonObject* self) { return _out; } -int QJsonObject_Size(const QJsonObject* self) { - return self->size(); +ptrdiff_t QJsonObject_Size(const QJsonObject* self) { + qsizetype _ret = self->size(); + return static_cast(_ret); } -int QJsonObject_Count(const QJsonObject* self) { - return self->count(); +ptrdiff_t QJsonObject_Count(const QJsonObject* self) { + qsizetype _ret = self->count(); + return static_cast(_ret); } -int QJsonObject_Length(const QJsonObject* self) { - return self->length(); +ptrdiff_t QJsonObject_Length(const QJsonObject* self) { + qsizetype _ret = self->length(); + return static_cast(_ret); } bool QJsonObject_IsEmpty(const QJsonObject* self) { @@ -159,12 +161,16 @@ QJsonObject__iterator* QJsonObject__iterator_new() { return new QJsonObject::iterator(); } -QJsonObject__iterator* QJsonObject__iterator_new2(QJsonObject* obj, int index) { - return new QJsonObject::iterator(obj, static_cast(index)); +QJsonObject__iterator* QJsonObject__iterator_new2(QJsonObject* obj, ptrdiff_t index) { + return new QJsonObject::iterator(obj, (qsizetype)(index)); } -QJsonObject__iterator* QJsonObject__iterator_new3(QJsonObject__iterator* param1) { - return new QJsonObject::iterator(*param1); +QJsonObject__iterator* QJsonObject__iterator_new3(QJsonObject__iterator* other) { + return new QJsonObject::iterator(*other); +} + +void QJsonObject__iterator_OperatorAssign(QJsonObject__iterator* self, QJsonObject__iterator* other) { + self->operator=(*other); } struct miqt_string* QJsonObject__iterator_Key(const QJsonObject__iterator* self) { @@ -182,12 +188,16 @@ QJsonValueRef* QJsonObject__iterator_OperatorMultiply(const QJsonObject__iterato return new QJsonValueRef(self->operator*()); } -QJsonValueRefPtr* QJsonObject__iterator_OperatorMinusGreater(const QJsonObject__iterator* self) { - return new QJsonValueRefPtr(self->operator->()); +QJsonValueConstRef* QJsonObject__iterator_OperatorMinusGreater(const QJsonObject__iterator* self) { + return (QJsonValueConstRef*) self->operator->(); } -QJsonValueRef* QJsonObject__iterator_OperatorSubscript(QJsonObject__iterator* self, int j) { - return new QJsonValueRef(self->operator[](static_cast(j))); +QJsonValueRef* QJsonObject__iterator_OperatorMinusGreater2(QJsonObject__iterator* self) { + return self->operator->(); +} + +QJsonValueRef* QJsonObject__iterator_OperatorSubscript(const QJsonObject__iterator* self, ptrdiff_t j) { + return new QJsonValueRef(self->operator[]((qsizetype)(j))); } bool QJsonObject__iterator_OperatorEqual(const QJsonObject__iterator* self, QJsonObject__iterator* other) { @@ -234,28 +244,29 @@ QJsonObject__iterator* QJsonObject__iterator_OperatorMinusMinusWithInt(QJsonObje return new QJsonObject::iterator(self->operator--(static_cast(param1))); } -QJsonObject__iterator* QJsonObject__iterator_OperatorPlus(const QJsonObject__iterator* self, int j) { - return new QJsonObject::iterator(self->operator+(static_cast(j))); +QJsonObject__iterator* QJsonObject__iterator_OperatorPlus(const QJsonObject__iterator* self, ptrdiff_t j) { + return new QJsonObject::iterator(self->operator+((qsizetype)(j))); } -QJsonObject__iterator* QJsonObject__iterator_OperatorMinus(const QJsonObject__iterator* self, int j) { - return new QJsonObject::iterator(self->operator-(static_cast(j))); +QJsonObject__iterator* QJsonObject__iterator_OperatorMinus(const QJsonObject__iterator* self, ptrdiff_t j) { + return new QJsonObject::iterator(self->operator-((qsizetype)(j))); } -QJsonObject__iterator* QJsonObject__iterator_OperatorPlusAssign(QJsonObject__iterator* self, int j) { - QJsonObject::iterator& _ret = self->operator+=(static_cast(j)); +QJsonObject__iterator* QJsonObject__iterator_OperatorPlusAssign(QJsonObject__iterator* self, ptrdiff_t j) { + QJsonObject::iterator& _ret = self->operator+=((qsizetype)(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)); +QJsonObject__iterator* QJsonObject__iterator_OperatorMinusAssign(QJsonObject__iterator* self, ptrdiff_t j) { + QJsonObject::iterator& _ret = self->operator-=((qsizetype)(j)); // Cast returned reference into pointer return &_ret; } -int QJsonObject__iterator_OperatorMinusWithQJsonObjectiterator(const QJsonObject__iterator* self, QJsonObject__iterator* j) { - return self->operator-(*j); +ptrdiff_t QJsonObject__iterator_OperatorMinusWithQJsonObjectiterator(const QJsonObject__iterator* self, QJsonObject__iterator* j) { + qsizetype _ret = self->operator-(*j); + return static_cast(_ret); } bool QJsonObject__iterator_OperatorEqualWithOther(const QJsonObject__iterator* self, QJsonObject__const_iterator* other) { @@ -290,16 +301,20 @@ QJsonObject__const_iterator* QJsonObject__const_iterator_new() { return new QJsonObject::const_iterator(); } -QJsonObject__const_iterator* QJsonObject__const_iterator_new2(QJsonObject* obj, int index) { - return new QJsonObject::const_iterator(obj, static_cast(index)); +QJsonObject__const_iterator* QJsonObject__const_iterator_new2(QJsonObject* obj, ptrdiff_t index) { + return new QJsonObject::const_iterator(obj, (qsizetype)(index)); } QJsonObject__const_iterator* QJsonObject__const_iterator_new3(QJsonObject__iterator* other) { return new QJsonObject::const_iterator(*other); } -QJsonObject__const_iterator* QJsonObject__const_iterator_new4(QJsonObject__const_iterator* param1) { - return new QJsonObject::const_iterator(*param1); +QJsonObject__const_iterator* QJsonObject__const_iterator_new4(QJsonObject__const_iterator* other) { + return new QJsonObject::const_iterator(*other); +} + +void QJsonObject__const_iterator_OperatorAssign(QJsonObject__const_iterator* self, QJsonObject__const_iterator* other) { + self->operator=(*other); } struct miqt_string* QJsonObject__const_iterator_Key(const QJsonObject__const_iterator* self) { @@ -309,20 +324,20 @@ struct miqt_string* QJsonObject__const_iterator_Key(const QJsonObject__const_ite return miqt_strdup(_b.data(), _b.length()); } -QJsonValue* QJsonObject__const_iterator_Value(const QJsonObject__const_iterator* self) { - return new QJsonValue(self->value()); +QJsonValueConstRef* QJsonObject__const_iterator_Value(const QJsonObject__const_iterator* self) { + return new QJsonValueConstRef(self->value()); } -QJsonValue* QJsonObject__const_iterator_OperatorMultiply(const QJsonObject__const_iterator* self) { - return new QJsonValue(self->operator*()); +QJsonValueConstRef* QJsonObject__const_iterator_OperatorMultiply(const QJsonObject__const_iterator* self) { + return new QJsonValueConstRef(self->operator*()); } -QJsonValuePtr* QJsonObject__const_iterator_OperatorMinusGreater(const QJsonObject__const_iterator* self) { - return new QJsonValuePtr(self->operator->()); +QJsonValueConstRef* QJsonObject__const_iterator_OperatorMinusGreater(const QJsonObject__const_iterator* self) { + return (QJsonValueConstRef*) self->operator->(); } -QJsonValue* QJsonObject__const_iterator_OperatorSubscript(QJsonObject__const_iterator* self, int j) { - return new QJsonValue(self->operator[](static_cast(j))); +QJsonValueConstRef* QJsonObject__const_iterator_OperatorSubscript(const QJsonObject__const_iterator* self, ptrdiff_t j) { + return new QJsonValueConstRef(self->operator[]((qsizetype)(j))); } bool QJsonObject__const_iterator_OperatorEqual(const QJsonObject__const_iterator* self, QJsonObject__const_iterator* other) { @@ -369,28 +384,29 @@ QJsonObject__const_iterator* QJsonObject__const_iterator_OperatorMinusMinusWithI return new QJsonObject::const_iterator(self->operator--(static_cast(param1))); } -QJsonObject__const_iterator* QJsonObject__const_iterator_OperatorPlus(const QJsonObject__const_iterator* self, int j) { - return new QJsonObject::const_iterator(self->operator+(static_cast(j))); +QJsonObject__const_iterator* QJsonObject__const_iterator_OperatorPlus(const QJsonObject__const_iterator* self, ptrdiff_t j) { + return new QJsonObject::const_iterator(self->operator+((qsizetype)(j))); } -QJsonObject__const_iterator* QJsonObject__const_iterator_OperatorMinus(const QJsonObject__const_iterator* self, int j) { - return new QJsonObject::const_iterator(self->operator-(static_cast(j))); +QJsonObject__const_iterator* QJsonObject__const_iterator_OperatorMinus(const QJsonObject__const_iterator* self, ptrdiff_t j) { + return new QJsonObject::const_iterator(self->operator-((qsizetype)(j))); } -QJsonObject__const_iterator* QJsonObject__const_iterator_OperatorPlusAssign(QJsonObject__const_iterator* self, int j) { - QJsonObject::const_iterator& _ret = self->operator+=(static_cast(j)); +QJsonObject__const_iterator* QJsonObject__const_iterator_OperatorPlusAssign(QJsonObject__const_iterator* self, ptrdiff_t j) { + QJsonObject::const_iterator& _ret = self->operator+=((qsizetype)(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)); +QJsonObject__const_iterator* QJsonObject__const_iterator_OperatorMinusAssign(QJsonObject__const_iterator* self, ptrdiff_t j) { + QJsonObject::const_iterator& _ret = self->operator-=((qsizetype)(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); +ptrdiff_t QJsonObject__const_iterator_OperatorMinusWithQJsonObjectconstIterator(const QJsonObject__const_iterator* self, QJsonObject__const_iterator* j) { + qsizetype _ret = self->operator-(*j); + return static_cast(_ret); } bool QJsonObject__const_iterator_OperatorEqualWithOther(const QJsonObject__const_iterator* self, QJsonObject__iterator* other) { diff --git a/qt/gen_qjsonobject.go b/qt/gen_qjsonobject.go index 32b0ff1..536d2d4 100644 --- a/qt/gen_qjsonobject.go +++ b/qt/gen_qjsonobject.go @@ -69,16 +69,16 @@ func (this *QJsonObject) Keys() []string { return _ret } -func (this *QJsonObject) Size() int { - return (int)(C.QJsonObject_Size(this.h)) +func (this *QJsonObject) Size() int64 { + return (int64)(C.QJsonObject_Size(this.h)) } -func (this *QJsonObject) Count() int { - return (int)(C.QJsonObject_Count(this.h)) +func (this *QJsonObject) Count() int64 { + return (int64)(C.QJsonObject_Count(this.h)) } -func (this *QJsonObject) Length() int { - return (int)(C.QJsonObject_Length(this.h)) +func (this *QJsonObject) Length() int64 { + return (int64)(C.QJsonObject_Length(this.h)) } func (this *QJsonObject) IsEmpty() bool { @@ -273,17 +273,21 @@ func NewQJsonObject__iterator() *QJsonObject__iterator { } // NewQJsonObject__iterator2 constructs a new QJsonObject::iterator object. -func NewQJsonObject__iterator2(obj *QJsonObject, index int) *QJsonObject__iterator { - ret := C.QJsonObject__iterator_new2(obj.cPointer(), (C.int)(index)) +func NewQJsonObject__iterator2(obj *QJsonObject, index int64) *QJsonObject__iterator { + ret := C.QJsonObject__iterator_new2(obj.cPointer(), (C.ptrdiff_t)(index)) return newQJsonObject__iterator(ret) } // NewQJsonObject__iterator3 constructs a new QJsonObject::iterator object. -func NewQJsonObject__iterator3(param1 *QJsonObject__iterator) *QJsonObject__iterator { - ret := C.QJsonObject__iterator_new3(param1.cPointer()) +func NewQJsonObject__iterator3(other *QJsonObject__iterator) *QJsonObject__iterator { + ret := C.QJsonObject__iterator_new3(other.cPointer()) return newQJsonObject__iterator(ret) } +func (this *QJsonObject__iterator) OperatorAssign(other *QJsonObject__iterator) { + C.QJsonObject__iterator_OperatorAssign(this.h, other.cPointer()) +} + func (this *QJsonObject__iterator) Key() string { var _ms *C.struct_miqt_string = C.QJsonObject__iterator_Key(this.h) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) @@ -305,15 +309,16 @@ func (this *QJsonObject__iterator) OperatorMultiply() *QJsonValueRef { return _goptr } -func (this *QJsonObject__iterator) OperatorMinusGreater() *QJsonValueRefPtr { - _ret := C.QJsonObject__iterator_OperatorMinusGreater(this.h) - _goptr := newQJsonValueRefPtr(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QJsonObject__iterator) OperatorMinusGreater() *QJsonValueConstRef { + return newQJsonValueConstRef_U(unsafe.Pointer(C.QJsonObject__iterator_OperatorMinusGreater(this.h))) } -func (this *QJsonObject__iterator) OperatorSubscript(j int) *QJsonValueRef { - _ret := C.QJsonObject__iterator_OperatorSubscript(this.h, (C.int)(j)) +func (this *QJsonObject__iterator) OperatorMinusGreater2() *QJsonValueRef { + return newQJsonValueRef_U(unsafe.Pointer(C.QJsonObject__iterator_OperatorMinusGreater2(this.h))) +} + +func (this *QJsonObject__iterator) OperatorSubscript(j int64) *QJsonValueRef { + _ret := C.QJsonObject__iterator_OperatorSubscript(this.h, (C.ptrdiff_t)(j)) _goptr := newQJsonValueRef(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -365,30 +370,30 @@ func (this *QJsonObject__iterator) OperatorMinusMinusWithInt(param1 int) *QJsonO return _goptr } -func (this *QJsonObject__iterator) OperatorPlus(j int) *QJsonObject__iterator { - _ret := C.QJsonObject__iterator_OperatorPlus(this.h, (C.int)(j)) +func (this *QJsonObject__iterator) OperatorPlus(j int64) *QJsonObject__iterator { + _ret := C.QJsonObject__iterator_OperatorPlus(this.h, (C.ptrdiff_t)(j)) _goptr := newQJsonObject__iterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QJsonObject__iterator) OperatorMinus(j int) *QJsonObject__iterator { - _ret := C.QJsonObject__iterator_OperatorMinus(this.h, (C.int)(j)) +func (this *QJsonObject__iterator) OperatorMinus(j int64) *QJsonObject__iterator { + _ret := C.QJsonObject__iterator_OperatorMinus(this.h, (C.ptrdiff_t)(j)) _goptr := newQJsonObject__iterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer 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) OperatorPlusAssign(j int64) *QJsonObject__iterator { + return newQJsonObject__iterator_U(unsafe.Pointer(C.QJsonObject__iterator_OperatorPlusAssign(this.h, (C.ptrdiff_t)(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) OperatorMinusAssign(j int64) *QJsonObject__iterator { + return newQJsonObject__iterator_U(unsafe.Pointer(C.QJsonObject__iterator_OperatorMinusAssign(this.h, (C.ptrdiff_t)(j)))) } -func (this *QJsonObject__iterator) OperatorMinusWithQJsonObjectiterator(j QJsonObject__iterator) int { - return (int)(C.QJsonObject__iterator_OperatorMinusWithQJsonObjectiterator(this.h, j.cPointer())) +func (this *QJsonObject__iterator) OperatorMinusWithQJsonObjectiterator(j QJsonObject__iterator) int64 { + return (int64)(C.QJsonObject__iterator_OperatorMinusWithQJsonObjectiterator(this.h, j.cPointer())) } func (this *QJsonObject__iterator) OperatorEqualWithOther(other *QJsonObject__const_iterator) bool { @@ -458,8 +463,8 @@ func NewQJsonObject__const_iterator() *QJsonObject__const_iterator { } // NewQJsonObject__const_iterator2 constructs a new QJsonObject::const_iterator object. -func NewQJsonObject__const_iterator2(obj *QJsonObject, index int) *QJsonObject__const_iterator { - ret := C.QJsonObject__const_iterator_new2(obj.cPointer(), (C.int)(index)) +func NewQJsonObject__const_iterator2(obj *QJsonObject, index int64) *QJsonObject__const_iterator { + ret := C.QJsonObject__const_iterator_new2(obj.cPointer(), (C.ptrdiff_t)(index)) return newQJsonObject__const_iterator(ret) } @@ -470,11 +475,15 @@ func NewQJsonObject__const_iterator3(other *QJsonObject__iterator) *QJsonObject_ } // NewQJsonObject__const_iterator4 constructs a new QJsonObject::const_iterator object. -func NewQJsonObject__const_iterator4(param1 *QJsonObject__const_iterator) *QJsonObject__const_iterator { - ret := C.QJsonObject__const_iterator_new4(param1.cPointer()) +func NewQJsonObject__const_iterator4(other *QJsonObject__const_iterator) *QJsonObject__const_iterator { + ret := C.QJsonObject__const_iterator_new4(other.cPointer()) return newQJsonObject__const_iterator(ret) } +func (this *QJsonObject__const_iterator) OperatorAssign(other *QJsonObject__const_iterator) { + C.QJsonObject__const_iterator_OperatorAssign(this.h, other.cPointer()) +} + func (this *QJsonObject__const_iterator) Key() string { var _ms *C.struct_miqt_string = C.QJsonObject__const_iterator_Key(this.h) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) @@ -482,30 +491,27 @@ func (this *QJsonObject__const_iterator) Key() string { return _ret } -func (this *QJsonObject__const_iterator) Value() *QJsonValue { +func (this *QJsonObject__const_iterator) Value() *QJsonValueConstRef { _ret := C.QJsonObject__const_iterator_Value(this.h) - _goptr := newQJsonValue(_ret) + _goptr := newQJsonValueConstRef(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QJsonObject__const_iterator) OperatorMultiply() *QJsonValue { +func (this *QJsonObject__const_iterator) OperatorMultiply() *QJsonValueConstRef { _ret := C.QJsonObject__const_iterator_OperatorMultiply(this.h) - _goptr := newQJsonValue(_ret) + _goptr := newQJsonValueConstRef(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QJsonObject__const_iterator) OperatorMinusGreater() *QJsonValuePtr { - _ret := C.QJsonObject__const_iterator_OperatorMinusGreater(this.h) - _goptr := newQJsonValuePtr(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QJsonObject__const_iterator) OperatorMinusGreater() *QJsonValueConstRef { + return newQJsonValueConstRef_U(unsafe.Pointer(C.QJsonObject__const_iterator_OperatorMinusGreater(this.h))) } -func (this *QJsonObject__const_iterator) OperatorSubscript(j int) *QJsonValue { - _ret := C.QJsonObject__const_iterator_OperatorSubscript(this.h, (C.int)(j)) - _goptr := newQJsonValue(_ret) +func (this *QJsonObject__const_iterator) OperatorSubscript(j int64) *QJsonValueConstRef { + _ret := C.QJsonObject__const_iterator_OperatorSubscript(this.h, (C.ptrdiff_t)(j)) + _goptr := newQJsonValueConstRef(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -556,30 +562,30 @@ func (this *QJsonObject__const_iterator) OperatorMinusMinusWithInt(param1 int) * return _goptr } -func (this *QJsonObject__const_iterator) OperatorPlus(j int) *QJsonObject__const_iterator { - _ret := C.QJsonObject__const_iterator_OperatorPlus(this.h, (C.int)(j)) +func (this *QJsonObject__const_iterator) OperatorPlus(j int64) *QJsonObject__const_iterator { + _ret := C.QJsonObject__const_iterator_OperatorPlus(this.h, (C.ptrdiff_t)(j)) _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) OperatorMinus(j int) *QJsonObject__const_iterator { - _ret := C.QJsonObject__const_iterator_OperatorMinus(this.h, (C.int)(j)) +func (this *QJsonObject__const_iterator) OperatorMinus(j int64) *QJsonObject__const_iterator { + _ret := C.QJsonObject__const_iterator_OperatorMinus(this.h, (C.ptrdiff_t)(j)) _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) 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) OperatorPlusAssign(j int64) *QJsonObject__const_iterator { + return newQJsonObject__const_iterator_U(unsafe.Pointer(C.QJsonObject__const_iterator_OperatorPlusAssign(this.h, (C.ptrdiff_t)(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) OperatorMinusAssign(j int64) *QJsonObject__const_iterator { + return newQJsonObject__const_iterator_U(unsafe.Pointer(C.QJsonObject__const_iterator_OperatorMinusAssign(this.h, (C.ptrdiff_t)(j)))) } -func (this *QJsonObject__const_iterator) OperatorMinusWithQJsonObjectconstIterator(j QJsonObject__const_iterator) int { - return (int)(C.QJsonObject__const_iterator_OperatorMinusWithQJsonObjectconstIterator(this.h, j.cPointer())) +func (this *QJsonObject__const_iterator) OperatorMinusWithQJsonObjectconstIterator(j QJsonObject__const_iterator) int64 { + return (int64)(C.QJsonObject__const_iterator_OperatorMinusWithQJsonObjectconstIterator(this.h, j.cPointer())) } func (this *QJsonObject__const_iterator) OperatorEqualWithOther(other *QJsonObject__iterator) bool { diff --git a/qt/gen_qjsonobject.h b/qt/gen_qjsonobject.h index a910a15..3a010c9 100644 --- a/qt/gen_qjsonobject.h +++ b/qt/gen_qjsonobject.h @@ -26,17 +26,15 @@ typedef QJsonObject::iterator QJsonObject__iterator; class QJsonObject__iterator; #endif class QJsonValue; -class QJsonValuePtr; +class QJsonValueConstRef; class QJsonValueRef; -class QJsonValueRefPtr; #else typedef struct QJsonObject QJsonObject; typedef struct QJsonObject__const_iterator QJsonObject__const_iterator; typedef struct QJsonObject__iterator QJsonObject__iterator; typedef struct QJsonValue QJsonValue; -typedef struct QJsonValuePtr QJsonValuePtr; +typedef struct QJsonValueConstRef QJsonValueConstRef; typedef struct QJsonValueRef QJsonValueRef; -typedef struct QJsonValueRefPtr QJsonValueRefPtr; #endif QJsonObject* QJsonObject_new(); @@ -44,9 +42,9 @@ QJsonObject* QJsonObject_new2(QJsonObject* other); void QJsonObject_OperatorAssign(QJsonObject* self, QJsonObject* other); void QJsonObject_Swap(QJsonObject* self, QJsonObject* other); struct miqt_array* QJsonObject_Keys(const QJsonObject* self); -int QJsonObject_Size(const QJsonObject* self); -int QJsonObject_Count(const QJsonObject* self); -int QJsonObject_Length(const QJsonObject* self); +ptrdiff_t QJsonObject_Size(const QJsonObject* self); +ptrdiff_t QJsonObject_Count(const QJsonObject* self); +ptrdiff_t QJsonObject_Length(const QJsonObject* self); bool QJsonObject_IsEmpty(const QJsonObject* self); QJsonValue* QJsonObject_Value(const QJsonObject* self, struct miqt_string* key); QJsonValue* QJsonObject_OperatorSubscript(const QJsonObject* self, struct miqt_string* key); @@ -71,13 +69,15 @@ bool QJsonObject_Empty(const QJsonObject* self); void QJsonObject_Delete(QJsonObject* self); QJsonObject__iterator* QJsonObject__iterator_new(); -QJsonObject__iterator* QJsonObject__iterator_new2(QJsonObject* obj, int index); -QJsonObject__iterator* QJsonObject__iterator_new3(QJsonObject__iterator* param1); +QJsonObject__iterator* QJsonObject__iterator_new2(QJsonObject* obj, ptrdiff_t index); +QJsonObject__iterator* QJsonObject__iterator_new3(QJsonObject__iterator* other); +void QJsonObject__iterator_OperatorAssign(QJsonObject__iterator* self, QJsonObject__iterator* other); struct miqt_string* QJsonObject__iterator_Key(const QJsonObject__iterator* self); QJsonValueRef* QJsonObject__iterator_Value(const QJsonObject__iterator* self); QJsonValueRef* QJsonObject__iterator_OperatorMultiply(const QJsonObject__iterator* self); -QJsonValueRefPtr* QJsonObject__iterator_OperatorMinusGreater(const QJsonObject__iterator* self); -QJsonValueRef* QJsonObject__iterator_OperatorSubscript(QJsonObject__iterator* self, int j); +QJsonValueConstRef* QJsonObject__iterator_OperatorMinusGreater(const QJsonObject__iterator* self); +QJsonValueRef* QJsonObject__iterator_OperatorMinusGreater2(QJsonObject__iterator* self); +QJsonValueRef* QJsonObject__iterator_OperatorSubscript(const QJsonObject__iterator* self, ptrdiff_t j); bool QJsonObject__iterator_OperatorEqual(const QJsonObject__iterator* self, QJsonObject__iterator* other); bool QJsonObject__iterator_OperatorNotEqual(const QJsonObject__iterator* self, QJsonObject__iterator* other); bool QJsonObject__iterator_OperatorLesser(const QJsonObject__iterator* self, QJsonObject__iterator* other); @@ -88,11 +88,11 @@ QJsonObject__iterator* QJsonObject__iterator_OperatorPlusPlus(QJsonObject__itera 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); +QJsonObject__iterator* QJsonObject__iterator_OperatorPlus(const QJsonObject__iterator* self, ptrdiff_t j); +QJsonObject__iterator* QJsonObject__iterator_OperatorMinus(const QJsonObject__iterator* self, ptrdiff_t j); +QJsonObject__iterator* QJsonObject__iterator_OperatorPlusAssign(QJsonObject__iterator* self, ptrdiff_t j); +QJsonObject__iterator* QJsonObject__iterator_OperatorMinusAssign(QJsonObject__iterator* self, ptrdiff_t j); +ptrdiff_t 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); bool QJsonObject__iterator_OperatorLesserWithOther(const QJsonObject__iterator* self, QJsonObject__const_iterator* other); @@ -102,14 +102,15 @@ bool QJsonObject__iterator_OperatorGreaterOrEqualWithOther(const QJsonObject__it void QJsonObject__iterator_Delete(QJsonObject__iterator* self); QJsonObject__const_iterator* QJsonObject__const_iterator_new(); -QJsonObject__const_iterator* QJsonObject__const_iterator_new2(QJsonObject* obj, int index); +QJsonObject__const_iterator* QJsonObject__const_iterator_new2(QJsonObject* obj, ptrdiff_t index); QJsonObject__const_iterator* QJsonObject__const_iterator_new3(QJsonObject__iterator* other); -QJsonObject__const_iterator* QJsonObject__const_iterator_new4(QJsonObject__const_iterator* param1); +QJsonObject__const_iterator* QJsonObject__const_iterator_new4(QJsonObject__const_iterator* other); +void QJsonObject__const_iterator_OperatorAssign(QJsonObject__const_iterator* self, QJsonObject__const_iterator* other); struct miqt_string* QJsonObject__const_iterator_Key(const QJsonObject__const_iterator* self); -QJsonValue* QJsonObject__const_iterator_Value(const QJsonObject__const_iterator* self); -QJsonValue* QJsonObject__const_iterator_OperatorMultiply(const QJsonObject__const_iterator* self); -QJsonValuePtr* QJsonObject__const_iterator_OperatorMinusGreater(const QJsonObject__const_iterator* self); -QJsonValue* QJsonObject__const_iterator_OperatorSubscript(QJsonObject__const_iterator* self, int j); +QJsonValueConstRef* QJsonObject__const_iterator_Value(const QJsonObject__const_iterator* self); +QJsonValueConstRef* QJsonObject__const_iterator_OperatorMultiply(const QJsonObject__const_iterator* self); +QJsonValueConstRef* QJsonObject__const_iterator_OperatorMinusGreater(const QJsonObject__const_iterator* self); +QJsonValueConstRef* QJsonObject__const_iterator_OperatorSubscript(const QJsonObject__const_iterator* self, ptrdiff_t j); bool QJsonObject__const_iterator_OperatorEqual(const QJsonObject__const_iterator* self, QJsonObject__const_iterator* other); bool QJsonObject__const_iterator_OperatorNotEqual(const QJsonObject__const_iterator* self, QJsonObject__const_iterator* other); bool QJsonObject__const_iterator_OperatorLesser(const QJsonObject__const_iterator* self, QJsonObject__const_iterator* other); @@ -120,11 +121,11 @@ QJsonObject__const_iterator* QJsonObject__const_iterator_OperatorPlusPlus(QJsonO 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); +QJsonObject__const_iterator* QJsonObject__const_iterator_OperatorPlus(const QJsonObject__const_iterator* self, ptrdiff_t j); +QJsonObject__const_iterator* QJsonObject__const_iterator_OperatorMinus(const QJsonObject__const_iterator* self, ptrdiff_t j); +QJsonObject__const_iterator* QJsonObject__const_iterator_OperatorPlusAssign(QJsonObject__const_iterator* self, ptrdiff_t j); +QJsonObject__const_iterator* QJsonObject__const_iterator_OperatorMinusAssign(QJsonObject__const_iterator* self, ptrdiff_t j); +ptrdiff_t 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); bool QJsonObject__const_iterator_OperatorLesserWithOther(const QJsonObject__const_iterator* self, QJsonObject__iterator* other); diff --git a/qt/gen_qjsonvalue.cpp b/qt/gen_qjsonvalue.cpp index 761cbf9..b00cfbb 100644 --- a/qt/gen_qjsonvalue.cpp +++ b/qt/gen_qjsonvalue.cpp @@ -1,9 +1,8 @@ #include #include #include -#include +#include #include -#include #include #include #include @@ -114,6 +113,11 @@ int QJsonValue_ToInt(const QJsonValue* self) { return self->toInt(); } +long long QJsonValue_ToInteger(const QJsonValue* self) { + qint64 _ret = self->toInteger(); + return static_cast(_ret); +} + double QJsonValue_ToDouble(const QJsonValue* self) { return self->toDouble(); } @@ -154,8 +158,8 @@ QJsonValue* QJsonValue_OperatorSubscript(const QJsonValue* self, struct miqt_str return new QJsonValue(self->operator[](key_QString)); } -QJsonValue* QJsonValue_OperatorSubscriptWithInt(const QJsonValue* self, int i) { - return new QJsonValue(self->operator[](static_cast(i))); +QJsonValue* QJsonValue_OperatorSubscriptWithQsizetype(const QJsonValue* self, ptrdiff_t i) { + return new QJsonValue(self->operator[]((qsizetype)(i))); } bool QJsonValue_OperatorEqual(const QJsonValue* self, QJsonValue* other) { @@ -174,6 +178,11 @@ int QJsonValue_ToInt1(const QJsonValue* self, int defaultValue) { return self->toInt(static_cast(defaultValue)); } +long long QJsonValue_ToInteger1(const QJsonValue* self, long long defaultValue) { + qint64 _ret = self->toInteger(static_cast(defaultValue)); + return static_cast(_ret); +} + double QJsonValue_ToDouble1(const QJsonValue* self, double defaultValue) { return self->toDouble(static_cast(defaultValue)); } @@ -182,16 +191,130 @@ void QJsonValue_Delete(QJsonValue* self) { delete self; } +QJsonValueConstRef* QJsonValueConstRef_new(QJsonValueConstRef* param1) { + return new QJsonValueConstRef(*param1); +} + +QVariant* QJsonValueConstRef_ToVariant(const QJsonValueConstRef* self) { + return new QVariant(self->toVariant()); +} + +int QJsonValueConstRef_Type(const QJsonValueConstRef* self) { + QJsonValue::Type _ret = self->type(); + return static_cast(_ret); +} + +bool QJsonValueConstRef_IsNull(const QJsonValueConstRef* self) { + return self->isNull(); +} + +bool QJsonValueConstRef_IsBool(const QJsonValueConstRef* self) { + return self->isBool(); +} + +bool QJsonValueConstRef_IsDouble(const QJsonValueConstRef* self) { + return self->isDouble(); +} + +bool QJsonValueConstRef_IsString(const QJsonValueConstRef* self) { + return self->isString(); +} + +bool QJsonValueConstRef_IsArray(const QJsonValueConstRef* self) { + return self->isArray(); +} + +bool QJsonValueConstRef_IsObject(const QJsonValueConstRef* self) { + return self->isObject(); +} + +bool QJsonValueConstRef_IsUndefined(const QJsonValueConstRef* self) { + return self->isUndefined(); +} + +bool QJsonValueConstRef_ToBool(const QJsonValueConstRef* self) { + return self->toBool(); +} + +int QJsonValueConstRef_ToInt(const QJsonValueConstRef* self) { + return self->toInt(); +} + +long long QJsonValueConstRef_ToInteger(const QJsonValueConstRef* self) { + qint64 _ret = self->toInteger(); + return static_cast(_ret); +} + +double QJsonValueConstRef_ToDouble(const QJsonValueConstRef* self) { + return self->toDouble(); +} + +struct miqt_string* QJsonValueConstRef_ToString(const QJsonValueConstRef* self) { + QString _ret = self->toString(); + // 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()); +} + +QJsonArray* QJsonValueConstRef_ToArray(const QJsonValueConstRef* self) { + return new QJsonArray(self->toArray()); +} + +QJsonObject* QJsonValueConstRef_ToObject(const QJsonValueConstRef* self) { + return new QJsonObject(self->toObject()); +} + +QJsonValue* QJsonValueConstRef_OperatorSubscriptWithQsizetype(const QJsonValueConstRef* self, ptrdiff_t i) { + return new QJsonValue(self->operator[]((qsizetype)(i))); +} + +bool QJsonValueConstRef_OperatorEqual(const QJsonValueConstRef* self, QJsonValue* other) { + return self->operator==(*other); +} + +bool QJsonValueConstRef_OperatorNotEqual(const QJsonValueConstRef* self, QJsonValue* other) { + return self->operator!=(*other); +} + +bool QJsonValueConstRef_ToBool1(const QJsonValueConstRef* self, bool defaultValue) { + return self->toBool(defaultValue); +} + +int QJsonValueConstRef_ToInt1(const QJsonValueConstRef* self, int defaultValue) { + return self->toInt(static_cast(defaultValue)); +} + +long long QJsonValueConstRef_ToInteger1(const QJsonValueConstRef* self, long long defaultValue) { + qint64 _ret = self->toInteger(static_cast(defaultValue)); + return static_cast(_ret); +} + +double QJsonValueConstRef_ToDouble1(const QJsonValueConstRef* self, double defaultValue) { + return self->toDouble(static_cast(defaultValue)); +} + +struct miqt_string* QJsonValueConstRef_ToString1(const QJsonValueConstRef* self, struct miqt_string* defaultValue) { + QString defaultValue_QString = QString::fromUtf8(&defaultValue->data, defaultValue->len); + QString _ret = self->toString(defaultValue_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()); +} + +void QJsonValueConstRef_Delete(QJsonValueConstRef* self) { + delete self; +} + QJsonValueRef* QJsonValueRef_new(QJsonValueRef* param1) { return new QJsonValueRef(*param1); } -QJsonValueRef* QJsonValueRef_new2(QJsonArray* array, int idx) { - return new QJsonValueRef(array, static_cast(idx)); +QJsonValueRef* QJsonValueRef_new2(QJsonArray* array, ptrdiff_t idx) { + return new QJsonValueRef(array, (qsizetype)(idx)); } -QJsonValueRef* QJsonValueRef_new3(QJsonObject* object, int idx) { - return new QJsonValueRef(object, static_cast(idx)); +QJsonValueRef* QJsonValueRef_new3(QJsonObject* object, ptrdiff_t idx) { + return new QJsonValueRef(object, (qsizetype)(idx)); } void QJsonValueRef_OperatorAssign(QJsonValueRef* self, QJsonValue* val) { @@ -247,6 +370,11 @@ int QJsonValueRef_ToInt(const QJsonValueRef* self) { return self->toInt(); } +long long QJsonValueRef_ToInteger(const QJsonValueRef* self) { + qint64 _ret = self->toInteger(); + return static_cast(_ret); +} + double QJsonValueRef_ToDouble(const QJsonValueRef* self) { return self->toDouble(); } @@ -266,24 +394,8 @@ QJsonObject* QJsonValueRef_ToObject(const QJsonValueRef* self) { return new QJsonObject(self->toObject()); } -bool QJsonValueRef_ToBoolWithDefaultValue(const QJsonValueRef* self, bool defaultValue) { - return self->toBool(defaultValue); -} - -int QJsonValueRef_ToIntWithDefaultValue(const QJsonValueRef* self, int defaultValue) { - return self->toInt(static_cast(defaultValue)); -} - -double QJsonValueRef_ToDoubleWithDefaultValue(const QJsonValueRef* self, double defaultValue) { - return self->toDouble(static_cast(defaultValue)); -} - -struct miqt_string* QJsonValueRef_ToStringWithDefaultValue(const QJsonValueRef* self, struct miqt_string* defaultValue) { - QString defaultValue_QString = QString::fromUtf8(&defaultValue->data, defaultValue->len); - QString _ret = self->toString(defaultValue_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()); +QJsonValue* QJsonValueRef_OperatorSubscriptWithQsizetype(const QJsonValueRef* self, ptrdiff_t i) { + return new QJsonValue(self->operator[]((qsizetype)(i))); } bool QJsonValueRef_OperatorEqual(const QJsonValueRef* self, QJsonValue* other) { @@ -294,63 +406,32 @@ bool QJsonValueRef_OperatorNotEqual(const QJsonValueRef* self, QJsonValue* other return self->operator!=(*other); } +bool QJsonValueRef_ToBool1(const QJsonValueRef* self, bool defaultValue) { + return self->toBool(defaultValue); +} + +int QJsonValueRef_ToInt1(const QJsonValueRef* self, int defaultValue) { + return self->toInt(static_cast(defaultValue)); +} + +long long QJsonValueRef_ToInteger1(const QJsonValueRef* self, long long defaultValue) { + qint64 _ret = self->toInteger(static_cast(defaultValue)); + return static_cast(_ret); +} + +double QJsonValueRef_ToDouble1(const QJsonValueRef* self, double defaultValue) { + return self->toDouble(static_cast(defaultValue)); +} + +struct miqt_string* QJsonValueRef_ToString1(const QJsonValueRef* self, struct miqt_string* defaultValue) { + QString defaultValue_QString = QString::fromUtf8(&defaultValue->data, defaultValue->len); + QString _ret = self->toString(defaultValue_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()); +} + void QJsonValueRef_Delete(QJsonValueRef* self) { delete self; } -QJsonValuePtr* QJsonValuePtr_new(QJsonValue* val) { - return new QJsonValuePtr(*val); -} - -QJsonValuePtr* QJsonValuePtr_new2(QJsonValuePtr* param1) { - return new QJsonValuePtr(*param1); -} - -QJsonValue* QJsonValuePtr_OperatorMultiply(QJsonValuePtr* self) { - QJsonValue& _ret = self->operator*(); - // Cast returned reference into pointer - return &_ret; -} - -QJsonValue* QJsonValuePtr_OperatorMinusGreater(QJsonValuePtr* self) { - return self->operator->(); -} - -void QJsonValuePtr_OperatorAssign(QJsonValuePtr* self, QJsonValuePtr* param1) { - self->operator=(*param1); -} - -void QJsonValuePtr_Delete(QJsonValuePtr* self) { - delete self; -} - -QJsonValueRefPtr* QJsonValueRefPtr_new(QJsonArray* array, int idx) { - return new QJsonValueRefPtr(array, static_cast(idx)); -} - -QJsonValueRefPtr* QJsonValueRefPtr_new2(QJsonObject* object, int idx) { - return new QJsonValueRefPtr(object, static_cast(idx)); -} - -QJsonValueRefPtr* QJsonValueRefPtr_new3(QJsonValueRefPtr* param1) { - return new QJsonValueRefPtr(*param1); -} - -QJsonValueRef* QJsonValueRefPtr_OperatorMultiply(QJsonValueRefPtr* self) { - QJsonValueRef& _ret = self->operator*(); - // Cast returned reference into pointer - return &_ret; -} - -QJsonValueRef* QJsonValueRefPtr_OperatorMinusGreater(QJsonValueRefPtr* self) { - return self->operator->(); -} - -void QJsonValueRefPtr_OperatorAssign(QJsonValueRefPtr* self, QJsonValueRefPtr* param1) { - self->operator=(*param1); -} - -void QJsonValueRefPtr_Delete(QJsonValueRefPtr* self) { - delete self; -} - diff --git a/qt/gen_qjsonvalue.go b/qt/gen_qjsonvalue.go index b70535d..9b0c57e 100644 --- a/qt/gen_qjsonvalue.go +++ b/qt/gen_qjsonvalue.go @@ -179,6 +179,10 @@ func (this *QJsonValue) ToInt() int { return (int)(C.QJsonValue_ToInt(this.h)) } +func (this *QJsonValue) ToInteger() int64 { + return (int64)(C.QJsonValue_ToInteger(this.h)) +} + func (this *QJsonValue) ToDouble() float64 { return (float64)(C.QJsonValue_ToDouble(this.h)) } @@ -236,8 +240,8 @@ func (this *QJsonValue) OperatorSubscript(key string) *QJsonValue { return _goptr } -func (this *QJsonValue) OperatorSubscriptWithInt(i int) *QJsonValue { - _ret := C.QJsonValue_OperatorSubscriptWithInt(this.h, (C.int)(i)) +func (this *QJsonValue) OperatorSubscriptWithQsizetype(i int64) *QJsonValue { + _ret := C.QJsonValue_OperatorSubscriptWithQsizetype(this.h, (C.ptrdiff_t)(i)) _goptr := newQJsonValue(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -259,6 +263,10 @@ func (this *QJsonValue) ToInt1(defaultValue int) int { return (int)(C.QJsonValue_ToInt1(this.h, (C.int)(defaultValue))) } +func (this *QJsonValue) ToInteger1(defaultValue int64) int64 { + return (int64)(C.QJsonValue_ToInteger1(this.h, (C.longlong)(defaultValue))) +} + func (this *QJsonValue) ToDouble1(defaultValue float64) float64 { return (float64)(C.QJsonValue_ToDouble1(this.h, (C.double)(defaultValue))) } @@ -277,8 +285,167 @@ func (this *QJsonValue) GoGC() { }) } +type QJsonValueConstRef struct { + h *C.QJsonValueConstRef +} + +func (this *QJsonValueConstRef) cPointer() *C.QJsonValueConstRef { + if this == nil { + return nil + } + return this.h +} + +func newQJsonValueConstRef(h *C.QJsonValueConstRef) *QJsonValueConstRef { + if h == nil { + return nil + } + return &QJsonValueConstRef{h: h} +} + +func newQJsonValueConstRef_U(h unsafe.Pointer) *QJsonValueConstRef { + return newQJsonValueConstRef((*C.QJsonValueConstRef)(h)) +} + +// NewQJsonValueConstRef constructs a new QJsonValueConstRef object. +func NewQJsonValueConstRef(param1 *QJsonValueConstRef) *QJsonValueConstRef { + ret := C.QJsonValueConstRef_new(param1.cPointer()) + return newQJsonValueConstRef(ret) +} + +func (this *QJsonValueConstRef) ToVariant() *QVariant { + _ret := C.QJsonValueConstRef_ToVariant(this.h) + _goptr := newQVariant(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QJsonValueConstRef) Type() QJsonValue__Type { + return (QJsonValue__Type)(C.QJsonValueConstRef_Type(this.h)) +} + +func (this *QJsonValueConstRef) IsNull() bool { + return (bool)(C.QJsonValueConstRef_IsNull(this.h)) +} + +func (this *QJsonValueConstRef) IsBool() bool { + return (bool)(C.QJsonValueConstRef_IsBool(this.h)) +} + +func (this *QJsonValueConstRef) IsDouble() bool { + return (bool)(C.QJsonValueConstRef_IsDouble(this.h)) +} + +func (this *QJsonValueConstRef) IsString() bool { + return (bool)(C.QJsonValueConstRef_IsString(this.h)) +} + +func (this *QJsonValueConstRef) IsArray() bool { + return (bool)(C.QJsonValueConstRef_IsArray(this.h)) +} + +func (this *QJsonValueConstRef) IsObject() bool { + return (bool)(C.QJsonValueConstRef_IsObject(this.h)) +} + +func (this *QJsonValueConstRef) IsUndefined() bool { + return (bool)(C.QJsonValueConstRef_IsUndefined(this.h)) +} + +func (this *QJsonValueConstRef) ToBool() bool { + return (bool)(C.QJsonValueConstRef_ToBool(this.h)) +} + +func (this *QJsonValueConstRef) ToInt() int { + return (int)(C.QJsonValueConstRef_ToInt(this.h)) +} + +func (this *QJsonValueConstRef) ToInteger() int64 { + return (int64)(C.QJsonValueConstRef_ToInteger(this.h)) +} + +func (this *QJsonValueConstRef) ToDouble() float64 { + return (float64)(C.QJsonValueConstRef_ToDouble(this.h)) +} + +func (this *QJsonValueConstRef) ToString() string { + var _ms *C.struct_miqt_string = C.QJsonValueConstRef_ToString(this.h) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + +func (this *QJsonValueConstRef) ToArray() *QJsonArray { + _ret := C.QJsonValueConstRef_ToArray(this.h) + _goptr := newQJsonArray(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QJsonValueConstRef) ToObject() *QJsonObject { + _ret := C.QJsonValueConstRef_ToObject(this.h) + _goptr := newQJsonObject(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QJsonValueConstRef) OperatorSubscriptWithQsizetype(i int64) *QJsonValue { + _ret := C.QJsonValueConstRef_OperatorSubscriptWithQsizetype(this.h, (C.ptrdiff_t)(i)) + _goptr := newQJsonValue(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QJsonValueConstRef) OperatorEqual(other *QJsonValue) bool { + return (bool)(C.QJsonValueConstRef_OperatorEqual(this.h, other.cPointer())) +} + +func (this *QJsonValueConstRef) OperatorNotEqual(other *QJsonValue) bool { + return (bool)(C.QJsonValueConstRef_OperatorNotEqual(this.h, other.cPointer())) +} + +func (this *QJsonValueConstRef) ToBool1(defaultValue bool) bool { + return (bool)(C.QJsonValueConstRef_ToBool1(this.h, (C.bool)(defaultValue))) +} + +func (this *QJsonValueConstRef) ToInt1(defaultValue int) int { + return (int)(C.QJsonValueConstRef_ToInt1(this.h, (C.int)(defaultValue))) +} + +func (this *QJsonValueConstRef) ToInteger1(defaultValue int64) int64 { + return (int64)(C.QJsonValueConstRef_ToInteger1(this.h, (C.longlong)(defaultValue))) +} + +func (this *QJsonValueConstRef) ToDouble1(defaultValue float64) float64 { + return (float64)(C.QJsonValueConstRef_ToDouble1(this.h, (C.double)(defaultValue))) +} + +func (this *QJsonValueConstRef) ToString1(defaultValue string) string { + defaultValue_ms := miqt_strdupg(defaultValue) + defer C.free(defaultValue_ms) + var _ms *C.struct_miqt_string = C.QJsonValueConstRef_ToString1(this.h, (*C.struct_miqt_string)(defaultValue_ms)) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + +// Delete this object from C++ memory. +func (this *QJsonValueConstRef) Delete() { + C.QJsonValueConstRef_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QJsonValueConstRef) GoGC() { + runtime.SetFinalizer(this, func(this *QJsonValueConstRef) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + type QJsonValueRef struct { h *C.QJsonValueRef + *QJsonValueConstRef } func (this *QJsonValueRef) cPointer() *C.QJsonValueRef { @@ -292,7 +459,7 @@ func newQJsonValueRef(h *C.QJsonValueRef) *QJsonValueRef { if h == nil { return nil } - return &QJsonValueRef{h: h} + return &QJsonValueRef{h: h, QJsonValueConstRef: newQJsonValueConstRef_U(unsafe.Pointer(h))} } func newQJsonValueRef_U(h unsafe.Pointer) *QJsonValueRef { @@ -306,14 +473,14 @@ func NewQJsonValueRef(param1 *QJsonValueRef) *QJsonValueRef { } // NewQJsonValueRef2 constructs a new QJsonValueRef object. -func NewQJsonValueRef2(array *QJsonArray, idx int) *QJsonValueRef { - ret := C.QJsonValueRef_new2(array.cPointer(), (C.int)(idx)) +func NewQJsonValueRef2(array *QJsonArray, idx int64) *QJsonValueRef { + ret := C.QJsonValueRef_new2(array.cPointer(), (C.ptrdiff_t)(idx)) return newQJsonValueRef(ret) } // NewQJsonValueRef3 constructs a new QJsonValueRef object. -func NewQJsonValueRef3(object *QJsonObject, idx int) *QJsonValueRef { - ret := C.QJsonValueRef_new3(object.cPointer(), (C.int)(idx)) +func NewQJsonValueRef3(object *QJsonObject, idx int64) *QJsonValueRef { + ret := C.QJsonValueRef_new3(object.cPointer(), (C.ptrdiff_t)(idx)) return newQJsonValueRef(ret) } @@ -372,6 +539,10 @@ func (this *QJsonValueRef) ToInt() int { return (int)(C.QJsonValueRef_ToInt(this.h)) } +func (this *QJsonValueRef) ToInteger() int64 { + return (int64)(C.QJsonValueRef_ToInteger(this.h)) +} + func (this *QJsonValueRef) ToDouble() float64 { return (float64)(C.QJsonValueRef_ToDouble(this.h)) } @@ -397,25 +568,11 @@ func (this *QJsonValueRef) ToObject() *QJsonObject { return _goptr } -func (this *QJsonValueRef) ToBoolWithDefaultValue(defaultValue bool) bool { - return (bool)(C.QJsonValueRef_ToBoolWithDefaultValue(this.h, (C.bool)(defaultValue))) -} - -func (this *QJsonValueRef) ToIntWithDefaultValue(defaultValue int) int { - return (int)(C.QJsonValueRef_ToIntWithDefaultValue(this.h, (C.int)(defaultValue))) -} - -func (this *QJsonValueRef) ToDoubleWithDefaultValue(defaultValue float64) float64 { - return (float64)(C.QJsonValueRef_ToDoubleWithDefaultValue(this.h, (C.double)(defaultValue))) -} - -func (this *QJsonValueRef) ToStringWithDefaultValue(defaultValue string) string { - defaultValue_ms := miqt_strdupg(defaultValue) - defer C.free(defaultValue_ms) - var _ms *C.struct_miqt_string = C.QJsonValueRef_ToStringWithDefaultValue(this.h, (*C.struct_miqt_string)(defaultValue_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret +func (this *QJsonValueRef) OperatorSubscriptWithQsizetype(i int64) *QJsonValue { + _ret := C.QJsonValueRef_OperatorSubscriptWithQsizetype(this.h, (C.ptrdiff_t)(i)) + _goptr := newQJsonValue(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr } func (this *QJsonValueRef) OperatorEqual(other *QJsonValue) bool { @@ -426,6 +583,31 @@ func (this *QJsonValueRef) OperatorNotEqual(other *QJsonValue) bool { return (bool)(C.QJsonValueRef_OperatorNotEqual(this.h, other.cPointer())) } +func (this *QJsonValueRef) ToBool1(defaultValue bool) bool { + return (bool)(C.QJsonValueRef_ToBool1(this.h, (C.bool)(defaultValue))) +} + +func (this *QJsonValueRef) ToInt1(defaultValue int) int { + return (int)(C.QJsonValueRef_ToInt1(this.h, (C.int)(defaultValue))) +} + +func (this *QJsonValueRef) ToInteger1(defaultValue int64) int64 { + return (int64)(C.QJsonValueRef_ToInteger1(this.h, (C.longlong)(defaultValue))) +} + +func (this *QJsonValueRef) ToDouble1(defaultValue float64) float64 { + return (float64)(C.QJsonValueRef_ToDouble1(this.h, (C.double)(defaultValue))) +} + +func (this *QJsonValueRef) ToString1(defaultValue string) string { + defaultValue_ms := miqt_strdupg(defaultValue) + defer C.free(defaultValue_ms) + var _ms *C.struct_miqt_string = C.QJsonValueRef_ToString1(this.h, (*C.struct_miqt_string)(defaultValue_ms)) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + // Delete this object from C++ memory. func (this *QJsonValueRef) Delete() { C.QJsonValueRef_Delete(this.h) @@ -439,129 +621,3 @@ func (this *QJsonValueRef) GoGC() { runtime.KeepAlive(this.h) }) } - -type QJsonValuePtr struct { - h *C.QJsonValuePtr -} - -func (this *QJsonValuePtr) cPointer() *C.QJsonValuePtr { - if this == nil { - return nil - } - return this.h -} - -func newQJsonValuePtr(h *C.QJsonValuePtr) *QJsonValuePtr { - if h == nil { - return nil - } - return &QJsonValuePtr{h: h} -} - -func newQJsonValuePtr_U(h unsafe.Pointer) *QJsonValuePtr { - return newQJsonValuePtr((*C.QJsonValuePtr)(h)) -} - -// NewQJsonValuePtr constructs a new QJsonValuePtr object. -func NewQJsonValuePtr(val *QJsonValue) *QJsonValuePtr { - ret := C.QJsonValuePtr_new(val.cPointer()) - return newQJsonValuePtr(ret) -} - -// NewQJsonValuePtr2 constructs a new QJsonValuePtr object. -func NewQJsonValuePtr2(param1 *QJsonValuePtr) *QJsonValuePtr { - ret := C.QJsonValuePtr_new2(param1.cPointer()) - return newQJsonValuePtr(ret) -} - -func (this *QJsonValuePtr) OperatorMultiply() *QJsonValue { - return newQJsonValue_U(unsafe.Pointer(C.QJsonValuePtr_OperatorMultiply(this.h))) -} - -func (this *QJsonValuePtr) OperatorMinusGreater() *QJsonValue { - return newQJsonValue_U(unsafe.Pointer(C.QJsonValuePtr_OperatorMinusGreater(this.h))) -} - -func (this *QJsonValuePtr) OperatorAssign(param1 *QJsonValuePtr) { - C.QJsonValuePtr_OperatorAssign(this.h, param1.cPointer()) -} - -// Delete this object from C++ memory. -func (this *QJsonValuePtr) Delete() { - C.QJsonValuePtr_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QJsonValuePtr) GoGC() { - runtime.SetFinalizer(this, func(this *QJsonValuePtr) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} - -type QJsonValueRefPtr struct { - h *C.QJsonValueRefPtr -} - -func (this *QJsonValueRefPtr) cPointer() *C.QJsonValueRefPtr { - if this == nil { - return nil - } - return this.h -} - -func newQJsonValueRefPtr(h *C.QJsonValueRefPtr) *QJsonValueRefPtr { - if h == nil { - return nil - } - return &QJsonValueRefPtr{h: h} -} - -func newQJsonValueRefPtr_U(h unsafe.Pointer) *QJsonValueRefPtr { - return newQJsonValueRefPtr((*C.QJsonValueRefPtr)(h)) -} - -// NewQJsonValueRefPtr constructs a new QJsonValueRefPtr object. -func NewQJsonValueRefPtr(array *QJsonArray, idx int) *QJsonValueRefPtr { - ret := C.QJsonValueRefPtr_new(array.cPointer(), (C.int)(idx)) - return newQJsonValueRefPtr(ret) -} - -// NewQJsonValueRefPtr2 constructs a new QJsonValueRefPtr object. -func NewQJsonValueRefPtr2(object *QJsonObject, idx int) *QJsonValueRefPtr { - ret := C.QJsonValueRefPtr_new2(object.cPointer(), (C.int)(idx)) - return newQJsonValueRefPtr(ret) -} - -// NewQJsonValueRefPtr3 constructs a new QJsonValueRefPtr object. -func NewQJsonValueRefPtr3(param1 *QJsonValueRefPtr) *QJsonValueRefPtr { - ret := C.QJsonValueRefPtr_new3(param1.cPointer()) - return newQJsonValueRefPtr(ret) -} - -func (this *QJsonValueRefPtr) OperatorMultiply() *QJsonValueRef { - return newQJsonValueRef_U(unsafe.Pointer(C.QJsonValueRefPtr_OperatorMultiply(this.h))) -} - -func (this *QJsonValueRefPtr) OperatorMinusGreater() *QJsonValueRef { - return newQJsonValueRef_U(unsafe.Pointer(C.QJsonValueRefPtr_OperatorMinusGreater(this.h))) -} - -func (this *QJsonValueRefPtr) OperatorAssign(param1 *QJsonValueRefPtr) { - C.QJsonValueRefPtr_OperatorAssign(this.h, param1.cPointer()) -} - -// Delete this object from C++ memory. -func (this *QJsonValueRefPtr) Delete() { - C.QJsonValueRefPtr_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QJsonValueRefPtr) GoGC() { - runtime.SetFinalizer(this, func(this *QJsonValueRefPtr) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} diff --git a/qt/gen_qjsonvalue.h b/qt/gen_qjsonvalue.h index 43960be..6aac3d2 100644 --- a/qt/gen_qjsonvalue.h +++ b/qt/gen_qjsonvalue.h @@ -17,17 +17,15 @@ extern "C" { class QJsonArray; class QJsonObject; class QJsonValue; -class QJsonValuePtr; +class QJsonValueConstRef; class QJsonValueRef; -class QJsonValueRefPtr; class QVariant; #else typedef struct QJsonArray QJsonArray; typedef struct QJsonObject QJsonObject; typedef struct QJsonValue QJsonValue; -typedef struct QJsonValuePtr QJsonValuePtr; +typedef struct QJsonValueConstRef QJsonValueConstRef; typedef struct QJsonValueRef QJsonValueRef; -typedef struct QJsonValueRefPtr QJsonValueRefPtr; typedef struct QVariant QVariant; #endif @@ -56,6 +54,7 @@ bool QJsonValue_IsObject(const QJsonValue* self); bool QJsonValue_IsUndefined(const QJsonValue* self); bool QJsonValue_ToBool(const QJsonValue* self); int QJsonValue_ToInt(const QJsonValue* self); +long long QJsonValue_ToInteger(const QJsonValue* self); double QJsonValue_ToDouble(const QJsonValue* self); struct miqt_string* QJsonValue_ToString(const QJsonValue* self); struct miqt_string* QJsonValue_ToStringWithDefaultValue(const QJsonValue* self, struct miqt_string* defaultValue); @@ -64,17 +63,45 @@ QJsonArray* QJsonValue_ToArrayWithDefaultValue(const QJsonValue* self, QJsonArra QJsonObject* QJsonValue_ToObject(const QJsonValue* self); QJsonObject* QJsonValue_ToObjectWithDefaultValue(const QJsonValue* self, QJsonObject* defaultValue); QJsonValue* QJsonValue_OperatorSubscript(const QJsonValue* self, struct miqt_string* key); -QJsonValue* QJsonValue_OperatorSubscriptWithInt(const QJsonValue* self, int i); +QJsonValue* QJsonValue_OperatorSubscriptWithQsizetype(const QJsonValue* self, ptrdiff_t i); bool QJsonValue_OperatorEqual(const QJsonValue* self, QJsonValue* other); bool QJsonValue_OperatorNotEqual(const QJsonValue* self, QJsonValue* other); bool QJsonValue_ToBool1(const QJsonValue* self, bool defaultValue); int QJsonValue_ToInt1(const QJsonValue* self, int defaultValue); +long long QJsonValue_ToInteger1(const QJsonValue* self, long long defaultValue); double QJsonValue_ToDouble1(const QJsonValue* self, double defaultValue); void QJsonValue_Delete(QJsonValue* self); +QJsonValueConstRef* QJsonValueConstRef_new(QJsonValueConstRef* param1); +QVariant* QJsonValueConstRef_ToVariant(const QJsonValueConstRef* self); +int QJsonValueConstRef_Type(const QJsonValueConstRef* self); +bool QJsonValueConstRef_IsNull(const QJsonValueConstRef* self); +bool QJsonValueConstRef_IsBool(const QJsonValueConstRef* self); +bool QJsonValueConstRef_IsDouble(const QJsonValueConstRef* self); +bool QJsonValueConstRef_IsString(const QJsonValueConstRef* self); +bool QJsonValueConstRef_IsArray(const QJsonValueConstRef* self); +bool QJsonValueConstRef_IsObject(const QJsonValueConstRef* self); +bool QJsonValueConstRef_IsUndefined(const QJsonValueConstRef* self); +bool QJsonValueConstRef_ToBool(const QJsonValueConstRef* self); +int QJsonValueConstRef_ToInt(const QJsonValueConstRef* self); +long long QJsonValueConstRef_ToInteger(const QJsonValueConstRef* self); +double QJsonValueConstRef_ToDouble(const QJsonValueConstRef* self); +struct miqt_string* QJsonValueConstRef_ToString(const QJsonValueConstRef* self); +QJsonArray* QJsonValueConstRef_ToArray(const QJsonValueConstRef* self); +QJsonObject* QJsonValueConstRef_ToObject(const QJsonValueConstRef* self); +QJsonValue* QJsonValueConstRef_OperatorSubscriptWithQsizetype(const QJsonValueConstRef* self, ptrdiff_t i); +bool QJsonValueConstRef_OperatorEqual(const QJsonValueConstRef* self, QJsonValue* other); +bool QJsonValueConstRef_OperatorNotEqual(const QJsonValueConstRef* self, QJsonValue* other); +bool QJsonValueConstRef_ToBool1(const QJsonValueConstRef* self, bool defaultValue); +int QJsonValueConstRef_ToInt1(const QJsonValueConstRef* self, int defaultValue); +long long QJsonValueConstRef_ToInteger1(const QJsonValueConstRef* self, long long defaultValue); +double QJsonValueConstRef_ToDouble1(const QJsonValueConstRef* self, double defaultValue); +struct miqt_string* QJsonValueConstRef_ToString1(const QJsonValueConstRef* self, struct miqt_string* defaultValue); +void QJsonValueConstRef_Delete(QJsonValueConstRef* self); + QJsonValueRef* QJsonValueRef_new(QJsonValueRef* param1); -QJsonValueRef* QJsonValueRef_new2(QJsonArray* array, int idx); -QJsonValueRef* QJsonValueRef_new3(QJsonObject* object, int idx); +QJsonValueRef* QJsonValueRef_new2(QJsonArray* array, ptrdiff_t idx); +QJsonValueRef* QJsonValueRef_new3(QJsonObject* object, ptrdiff_t idx); void QJsonValueRef_OperatorAssign(QJsonValueRef* self, QJsonValue* val); void QJsonValueRef_OperatorAssignWithVal(QJsonValueRef* self, QJsonValueRef* val); QVariant* QJsonValueRef_ToVariant(const QJsonValueRef* self); @@ -88,33 +115,21 @@ bool QJsonValueRef_IsObject(const QJsonValueRef* self); bool QJsonValueRef_IsUndefined(const QJsonValueRef* self); bool QJsonValueRef_ToBool(const QJsonValueRef* self); int QJsonValueRef_ToInt(const QJsonValueRef* self); +long long QJsonValueRef_ToInteger(const QJsonValueRef* self); double QJsonValueRef_ToDouble(const QJsonValueRef* self); struct miqt_string* QJsonValueRef_ToString(const QJsonValueRef* self); QJsonArray* QJsonValueRef_ToArray(const QJsonValueRef* self); QJsonObject* QJsonValueRef_ToObject(const QJsonValueRef* self); -bool QJsonValueRef_ToBoolWithDefaultValue(const QJsonValueRef* self, bool defaultValue); -int QJsonValueRef_ToIntWithDefaultValue(const QJsonValueRef* self, int defaultValue); -double QJsonValueRef_ToDoubleWithDefaultValue(const QJsonValueRef* self, double defaultValue); -struct miqt_string* QJsonValueRef_ToStringWithDefaultValue(const QJsonValueRef* self, struct miqt_string* defaultValue); +QJsonValue* QJsonValueRef_OperatorSubscriptWithQsizetype(const QJsonValueRef* self, ptrdiff_t i); bool QJsonValueRef_OperatorEqual(const QJsonValueRef* self, QJsonValue* other); bool QJsonValueRef_OperatorNotEqual(const QJsonValueRef* self, QJsonValue* other); +bool QJsonValueRef_ToBool1(const QJsonValueRef* self, bool defaultValue); +int QJsonValueRef_ToInt1(const QJsonValueRef* self, int defaultValue); +long long QJsonValueRef_ToInteger1(const QJsonValueRef* self, long long defaultValue); +double QJsonValueRef_ToDouble1(const QJsonValueRef* self, double defaultValue); +struct miqt_string* QJsonValueRef_ToString1(const QJsonValueRef* self, struct miqt_string* defaultValue); void QJsonValueRef_Delete(QJsonValueRef* self); -QJsonValuePtr* QJsonValuePtr_new(QJsonValue* val); -QJsonValuePtr* QJsonValuePtr_new2(QJsonValuePtr* param1); -QJsonValue* QJsonValuePtr_OperatorMultiply(QJsonValuePtr* self); -QJsonValue* QJsonValuePtr_OperatorMinusGreater(QJsonValuePtr* self); -void QJsonValuePtr_OperatorAssign(QJsonValuePtr* self, QJsonValuePtr* param1); -void QJsonValuePtr_Delete(QJsonValuePtr* self); - -QJsonValueRefPtr* QJsonValueRefPtr_new(QJsonArray* array, int idx); -QJsonValueRefPtr* QJsonValueRefPtr_new2(QJsonObject* object, int idx); -QJsonValueRefPtr* QJsonValueRefPtr_new3(QJsonValueRefPtr* param1); -QJsonValueRef* QJsonValueRefPtr_OperatorMultiply(QJsonValueRefPtr* self); -QJsonValueRef* QJsonValueRefPtr_OperatorMinusGreater(QJsonValueRefPtr* self); -void QJsonValueRefPtr_OperatorAssign(QJsonValueRefPtr* self, QJsonValueRefPtr* param1); -void QJsonValueRefPtr_Delete(QJsonValueRefPtr* self); - #ifdef __cplusplus } /* extern C */ #endif diff --git a/qt/gen_qkeyeventtransition.cpp b/qt/gen_qkeyeventtransition.cpp deleted file mode 100644 index 16928fd..0000000 --- a/qt/gen_qkeyeventtransition.cpp +++ /dev/null @@ -1,98 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include "qkeyeventtransition.h" -#include "gen_qkeyeventtransition.h" -#include "_cgo_export.h" - -QKeyEventTransition* QKeyEventTransition_new() { - return new QKeyEventTransition(); -} - -QKeyEventTransition* QKeyEventTransition_new2(QObject* object, int typeVal, int key) { - return new QKeyEventTransition(object, static_cast(typeVal), static_cast(key)); -} - -QKeyEventTransition* QKeyEventTransition_new3(QState* sourceState) { - return new QKeyEventTransition(sourceState); -} - -QKeyEventTransition* QKeyEventTransition_new4(QObject* object, int typeVal, int key, QState* sourceState) { - return new QKeyEventTransition(object, static_cast(typeVal), static_cast(key), sourceState); -} - -QMetaObject* QKeyEventTransition_MetaObject(const QKeyEventTransition* self) { - return (QMetaObject*) self->metaObject(); -} - -void* QKeyEventTransition_Metacast(QKeyEventTransition* self, const char* param1) { - return self->qt_metacast(param1); -} - -struct miqt_string* QKeyEventTransition_Tr(const char* s) { - QString _ret = QKeyEventTransition::tr(s); - // 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* QKeyEventTransition_TrUtf8(const char* s) { - QString _ret = QKeyEventTransition::trUtf8(s); - // 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()); -} - -int QKeyEventTransition_Key(const QKeyEventTransition* self) { - return self->key(); -} - -void QKeyEventTransition_SetKey(QKeyEventTransition* self, int key) { - self->setKey(static_cast(key)); -} - -int QKeyEventTransition_ModifierMask(const QKeyEventTransition* self) { - Qt::KeyboardModifiers _ret = self->modifierMask(); - return static_cast(_ret); -} - -void QKeyEventTransition_SetModifierMask(QKeyEventTransition* self, int modifiers) { - self->setModifierMask(static_cast(modifiers)); -} - -struct miqt_string* QKeyEventTransition_Tr2(const char* s, const char* c) { - QString _ret = QKeyEventTransition::tr(s, c); - // 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* QKeyEventTransition_Tr3(const char* s, const char* c, int n) { - QString _ret = QKeyEventTransition::tr(s, c, static_cast(n)); - // 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* QKeyEventTransition_TrUtf82(const char* s, const char* c) { - QString _ret = QKeyEventTransition::trUtf8(s, c); - // 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* QKeyEventTransition_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QKeyEventTransition::trUtf8(s, c, static_cast(n)); - // 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 QKeyEventTransition_Delete(QKeyEventTransition* self) { - delete self; -} - diff --git a/qt/gen_qkeyeventtransition.go b/qt/gen_qkeyeventtransition.go deleted file mode 100644 index bbb8345..0000000 --- a/qt/gen_qkeyeventtransition.go +++ /dev/null @@ -1,163 +0,0 @@ -package qt - -/* - -#include "gen_qkeyeventtransition.h" -#include - -*/ -import "C" - -import ( - "runtime" - "unsafe" -) - -type QKeyEventTransition struct { - h *C.QKeyEventTransition - *QEventTransition -} - -func (this *QKeyEventTransition) cPointer() *C.QKeyEventTransition { - if this == nil { - return nil - } - return this.h -} - -func newQKeyEventTransition(h *C.QKeyEventTransition) *QKeyEventTransition { - if h == nil { - return nil - } - return &QKeyEventTransition{h: h, QEventTransition: newQEventTransition_U(unsafe.Pointer(h))} -} - -func newQKeyEventTransition_U(h unsafe.Pointer) *QKeyEventTransition { - return newQKeyEventTransition((*C.QKeyEventTransition)(h)) -} - -// NewQKeyEventTransition constructs a new QKeyEventTransition object. -func NewQKeyEventTransition() *QKeyEventTransition { - ret := C.QKeyEventTransition_new() - return newQKeyEventTransition(ret) -} - -// NewQKeyEventTransition2 constructs a new QKeyEventTransition object. -func NewQKeyEventTransition2(object *QObject, typeVal QEvent__Type, key int) *QKeyEventTransition { - ret := C.QKeyEventTransition_new2(object.cPointer(), (C.int)(typeVal), (C.int)(key)) - return newQKeyEventTransition(ret) -} - -// NewQKeyEventTransition3 constructs a new QKeyEventTransition object. -func NewQKeyEventTransition3(sourceState *QState) *QKeyEventTransition { - ret := C.QKeyEventTransition_new3(sourceState.cPointer()) - return newQKeyEventTransition(ret) -} - -// 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.int)(typeVal), (C.int)(key), sourceState.cPointer()) - return newQKeyEventTransition(ret) -} - -func (this *QKeyEventTransition) MetaObject() *QMetaObject { - return newQMetaObject_U(unsafe.Pointer(C.QKeyEventTransition_MetaObject(this.h))) -} - -func (this *QKeyEventTransition) Metacast(param1 string) unsafe.Pointer { - param1_Cstring := C.CString(param1) - defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QKeyEventTransition_Metacast(this.h, param1_Cstring) -} - -func QKeyEventTransition_Tr(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QKeyEventTransition_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QKeyEventTransition_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QKeyEventTransition_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QKeyEventTransition) Key() int { - return (int)(C.QKeyEventTransition_Key(this.h)) -} - -func (this *QKeyEventTransition) SetKey(key int) { - C.QKeyEventTransition_SetKey(this.h, (C.int)(key)) -} - -func (this *QKeyEventTransition) ModifierMask() KeyboardModifier { - return (KeyboardModifier)(C.QKeyEventTransition_ModifierMask(this.h)) -} - -func (this *QKeyEventTransition) SetModifierMask(modifiers KeyboardModifier) { - C.QKeyEventTransition_SetModifierMask(this.h, (C.int)(modifiers)) -} - -func QKeyEventTransition_Tr2(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QKeyEventTransition_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QKeyEventTransition_Tr3(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QKeyEventTransition_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QKeyEventTransition_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QKeyEventTransition_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QKeyEventTransition_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QKeyEventTransition_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -// Delete this object from C++ memory. -func (this *QKeyEventTransition) Delete() { - C.QKeyEventTransition_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QKeyEventTransition) GoGC() { - runtime.SetFinalizer(this, func(this *QKeyEventTransition) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} diff --git a/qt/gen_qkeyeventtransition.h b/qt/gen_qkeyeventtransition.h deleted file mode 100644 index 5fe5983..0000000 --- a/qt/gen_qkeyeventtransition.h +++ /dev/null @@ -1,50 +0,0 @@ -#ifndef GEN_QKEYEVENTTRANSITION_H -#define GEN_QKEYEVENTTRANSITION_H - -#include -#include -#include - -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - -#include "binding.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __cplusplus -class QKeyEventTransition; -class QMetaObject; -class QObject; -class QState; -#else -typedef struct QKeyEventTransition QKeyEventTransition; -typedef struct QMetaObject QMetaObject; -typedef struct QObject QObject; -typedef struct QState QState; -#endif - -QKeyEventTransition* QKeyEventTransition_new(); -QKeyEventTransition* QKeyEventTransition_new2(QObject* object, int typeVal, int key); -QKeyEventTransition* QKeyEventTransition_new3(QState* sourceState); -QKeyEventTransition* QKeyEventTransition_new4(QObject* object, int typeVal, int key, QState* sourceState); -QMetaObject* QKeyEventTransition_MetaObject(const QKeyEventTransition* self); -void* QKeyEventTransition_Metacast(QKeyEventTransition* self, const char* param1); -struct miqt_string* QKeyEventTransition_Tr(const char* s); -struct miqt_string* QKeyEventTransition_TrUtf8(const char* s); -int QKeyEventTransition_Key(const QKeyEventTransition* self); -void QKeyEventTransition_SetKey(QKeyEventTransition* self, int key); -int QKeyEventTransition_ModifierMask(const QKeyEventTransition* self); -void QKeyEventTransition_SetModifierMask(QKeyEventTransition* self, int modifiers); -struct miqt_string* QKeyEventTransition_Tr2(const char* s, const char* c); -struct miqt_string* QKeyEventTransition_Tr3(const char* s, const char* c, int n); -struct miqt_string* QKeyEventTransition_TrUtf82(const char* s, const char* c); -struct miqt_string* QKeyEventTransition_TrUtf83(const char* s, const char* c, int n); -void QKeyEventTransition_Delete(QKeyEventTransition* self); - -#ifdef __cplusplus -} /* extern C */ -#endif - -#endif diff --git a/qt/gen_qkeysequence.cpp b/qt/gen_qkeysequence.cpp index 8345a21..954b10d 100644 --- a/qt/gen_qkeysequence.cpp +++ b/qt/gen_qkeysequence.cpp @@ -1,3 +1,4 @@ +#include #include #include #include @@ -20,31 +21,47 @@ QKeySequence* QKeySequence_new3(int k1) { return new QKeySequence(static_cast(k1)); } -QKeySequence* QKeySequence_new4(QKeySequence* ks) { +QKeySequence* QKeySequence_new4(QKeyCombination* k1) { + return new QKeySequence(*k1); +} + +QKeySequence* QKeySequence_new5(QKeySequence* ks) { return new QKeySequence(*ks); } -QKeySequence* QKeySequence_new5(int key) { +QKeySequence* QKeySequence_new6(int key) { return new QKeySequence(static_cast(key)); } -QKeySequence* QKeySequence_new6(struct miqt_string* key, int format) { +QKeySequence* QKeySequence_new7(struct miqt_string* key, int format) { QString key_QString = QString::fromUtf8(&key->data, key->len); return new QKeySequence(key_QString, static_cast(format)); } -QKeySequence* QKeySequence_new7(int k1, int k2) { +QKeySequence* QKeySequence_new8(int k1, int k2) { return new QKeySequence(static_cast(k1), static_cast(k2)); } -QKeySequence* QKeySequence_new8(int k1, int k2, int k3) { +QKeySequence* QKeySequence_new9(int k1, int k2, int k3) { return new QKeySequence(static_cast(k1), static_cast(k2), static_cast(k3)); } -QKeySequence* QKeySequence_new9(int k1, int k2, int k3, int k4) { +QKeySequence* QKeySequence_new10(int k1, int k2, int k3, int k4) { return new QKeySequence(static_cast(k1), static_cast(k2), static_cast(k3), static_cast(k4)); } +QKeySequence* QKeySequence_new11(QKeyCombination* k1, QKeyCombination* k2) { + return new QKeySequence(*k1, *k2); +} + +QKeySequence* QKeySequence_new12(QKeyCombination* k1, QKeyCombination* k2, QKeyCombination* k3) { + return new QKeySequence(*k1, *k2, *k3); +} + +QKeySequence* QKeySequence_new13(QKeyCombination* k1, QKeyCombination* k2, QKeyCombination* k3, QKeyCombination* k4) { + return new QKeySequence(*k1, *k2, *k3, *k4); +} + int QKeySequence_Count(const QKeySequence* self) { return self->count(); } @@ -115,8 +132,8 @@ struct miqt_array* QKeySequence_KeyBindings(int key) { return _out; } -int QKeySequence_OperatorSubscript(const QKeySequence* self, unsigned int i) { - return self->operator[](static_cast(i)); +QKeyCombination* QKeySequence_OperatorSubscript(const QKeySequence* self, unsigned int i) { + return new QKeyCombination(self->operator[](static_cast(i))); } void QKeySequence_OperatorAssign(QKeySequence* self, QKeySequence* other) { diff --git a/qt/gen_qkeysequence.go b/qt/gen_qkeysequence.go index bf6a892..a5a3e20 100644 --- a/qt/gen_qkeysequence.go +++ b/qt/gen_qkeysequence.go @@ -147,40 +147,64 @@ func NewQKeySequence3(k1 int) *QKeySequence { } // NewQKeySequence4 constructs a new QKeySequence object. -func NewQKeySequence4(ks *QKeySequence) *QKeySequence { - ret := C.QKeySequence_new4(ks.cPointer()) +func NewQKeySequence4(k1 QKeyCombination) *QKeySequence { + ret := C.QKeySequence_new4(k1.cPointer()) return newQKeySequence(ret) } // NewQKeySequence5 constructs a new QKeySequence object. -func NewQKeySequence5(key QKeySequence__StandardKey) *QKeySequence { - ret := C.QKeySequence_new5((C.int)(key)) +func NewQKeySequence5(ks *QKeySequence) *QKeySequence { + ret := C.QKeySequence_new5(ks.cPointer()) return newQKeySequence(ret) } // NewQKeySequence6 constructs a new QKeySequence object. -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.int)(format)) +func NewQKeySequence6(key QKeySequence__StandardKey) *QKeySequence { + ret := C.QKeySequence_new6((C.int)(key)) return newQKeySequence(ret) } // NewQKeySequence7 constructs a new QKeySequence object. -func NewQKeySequence7(k1 int, k2 int) *QKeySequence { - ret := C.QKeySequence_new7((C.int)(k1), (C.int)(k2)) +func NewQKeySequence7(key string, format QKeySequence__SequenceFormat) *QKeySequence { + key_ms := miqt_strdupg(key) + defer C.free(key_ms) + ret := C.QKeySequence_new7((*C.struct_miqt_string)(key_ms), (C.int)(format)) return newQKeySequence(ret) } // NewQKeySequence8 constructs a new QKeySequence object. -func NewQKeySequence8(k1 int, k2 int, k3 int) *QKeySequence { - ret := C.QKeySequence_new8((C.int)(k1), (C.int)(k2), (C.int)(k3)) +func NewQKeySequence8(k1 int, k2 int) *QKeySequence { + ret := C.QKeySequence_new8((C.int)(k1), (C.int)(k2)) return newQKeySequence(ret) } // NewQKeySequence9 constructs a new QKeySequence object. -func NewQKeySequence9(k1 int, k2 int, k3 int, k4 int) *QKeySequence { - ret := C.QKeySequence_new9((C.int)(k1), (C.int)(k2), (C.int)(k3), (C.int)(k4)) +func NewQKeySequence9(k1 int, k2 int, k3 int) *QKeySequence { + ret := C.QKeySequence_new9((C.int)(k1), (C.int)(k2), (C.int)(k3)) + return newQKeySequence(ret) +} + +// NewQKeySequence10 constructs a new QKeySequence object. +func NewQKeySequence10(k1 int, k2 int, k3 int, k4 int) *QKeySequence { + ret := C.QKeySequence_new10((C.int)(k1), (C.int)(k2), (C.int)(k3), (C.int)(k4)) + return newQKeySequence(ret) +} + +// NewQKeySequence11 constructs a new QKeySequence object. +func NewQKeySequence11(k1 QKeyCombination, k2 QKeyCombination) *QKeySequence { + ret := C.QKeySequence_new11(k1.cPointer(), k2.cPointer()) + return newQKeySequence(ret) +} + +// NewQKeySequence12 constructs a new QKeySequence object. +func NewQKeySequence12(k1 QKeyCombination, k2 QKeyCombination, k3 QKeyCombination) *QKeySequence { + ret := C.QKeySequence_new12(k1.cPointer(), k2.cPointer(), k3.cPointer()) + return newQKeySequence(ret) +} + +// NewQKeySequence13 constructs a new QKeySequence object. +func NewQKeySequence13(k1 QKeyCombination, k2 QKeyCombination, k3 QKeyCombination, k4 QKeyCombination) *QKeySequence { + ret := C.QKeySequence_new13(k1.cPointer(), k2.cPointer(), k3.cPointer(), k4.cPointer()) return newQKeySequence(ret) } @@ -266,8 +290,11 @@ func QKeySequence_KeyBindings(key QKeySequence__StandardKey) []QKeySequence { return _ret } -func (this *QKeySequence) OperatorSubscript(i uint) int { - return (int)(C.QKeySequence_OperatorSubscript(this.h, (C.uint)(i))) +func (this *QKeySequence) OperatorSubscript(i uint) *QKeyCombination { + _ret := C.QKeySequence_OperatorSubscript(this.h, (C.uint)(i)) + _goptr := newQKeyCombination(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr } func (this *QKeySequence) OperatorAssign(other *QKeySequence) { diff --git a/qt/gen_qkeysequence.h b/qt/gen_qkeysequence.h index d863ae0..4716536 100644 --- a/qt/gen_qkeysequence.h +++ b/qt/gen_qkeysequence.h @@ -14,20 +14,26 @@ extern "C" { #endif #ifdef __cplusplus +class QKeyCombination; class QKeySequence; #else +typedef struct QKeyCombination QKeyCombination; typedef struct QKeySequence QKeySequence; #endif QKeySequence* QKeySequence_new(); QKeySequence* QKeySequence_new2(struct miqt_string* key); QKeySequence* QKeySequence_new3(int k1); -QKeySequence* QKeySequence_new4(QKeySequence* ks); -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); +QKeySequence* QKeySequence_new4(QKeyCombination* k1); +QKeySequence* QKeySequence_new5(QKeySequence* ks); +QKeySequence* QKeySequence_new6(int key); +QKeySequence* QKeySequence_new7(struct miqt_string* key, int format); +QKeySequence* QKeySequence_new8(int k1, int k2); +QKeySequence* QKeySequence_new9(int k1, int k2, int k3); +QKeySequence* QKeySequence_new10(int k1, int k2, int k3, int k4); +QKeySequence* QKeySequence_new11(QKeyCombination* k1, QKeyCombination* k2); +QKeySequence* QKeySequence_new12(QKeyCombination* k1, QKeyCombination* k2, QKeyCombination* k3); +QKeySequence* QKeySequence_new13(QKeyCombination* k1, QKeyCombination* k2, QKeyCombination* k3, QKeyCombination* k4); int QKeySequence_Count(const QKeySequence* self); bool QKeySequence_IsEmpty(const QKeySequence* self); struct miqt_string* QKeySequence_ToString(const QKeySequence* self); @@ -37,7 +43,7 @@ struct miqt_string* QKeySequence_ListToString(struct miqt_array* /* of QKeySeque int QKeySequence_Matches(const QKeySequence* self, QKeySequence* seq); QKeySequence* QKeySequence_Mnemonic(struct miqt_string* text); struct miqt_array* QKeySequence_KeyBindings(int key); -int QKeySequence_OperatorSubscript(const QKeySequence* self, unsigned int i); +QKeyCombination* QKeySequence_OperatorSubscript(const QKeySequence* self, unsigned int i); void QKeySequence_OperatorAssign(QKeySequence* self, QKeySequence* other); void QKeySequence_Swap(QKeySequence* self, QKeySequence* other); bool QKeySequence_OperatorEqual(const QKeySequence* self, QKeySequence* other); diff --git a/qt/gen_qkeysequenceedit.cpp b/qt/gen_qkeysequenceedit.cpp index 1e2db62..890053a 100644 --- a/qt/gen_qkeysequenceedit.cpp +++ b/qt/gen_qkeysequenceedit.cpp @@ -40,17 +40,18 @@ struct miqt_string* QKeySequenceEdit_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QKeySequenceEdit_TrUtf8(const char* s) { - QString _ret = QKeySequenceEdit::trUtf8(s); - // 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* QKeySequenceEdit_KeySequence(const QKeySequenceEdit* self) { return new QKeySequence(self->keySequence()); } +void QKeySequenceEdit_SetClearButtonEnabled(QKeySequenceEdit* self, bool enable) { + self->setClearButtonEnabled(enable); +} + +bool QKeySequenceEdit_IsClearButtonEnabled(const QKeySequenceEdit* self) { + return self->isClearButtonEnabled(); +} + void QKeySequenceEdit_SetKeySequence(QKeySequenceEdit* self, QKeySequence* keySequence) { self->setKeySequence(*keySequence); } @@ -96,20 +97,6 @@ struct miqt_string* QKeySequenceEdit_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QKeySequenceEdit_TrUtf82(const char* s, const char* c) { - QString _ret = QKeySequenceEdit::trUtf8(s, c); - // 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* QKeySequenceEdit_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QKeySequenceEdit::trUtf8(s, c, static_cast(n)); - // 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 QKeySequenceEdit_Delete(QKeySequenceEdit* self) { delete self; } diff --git a/qt/gen_qkeysequenceedit.go b/qt/gen_qkeysequenceedit.go index 7b41dfc..b673fe4 100644 --- a/qt/gen_qkeysequenceedit.go +++ b/qt/gen_qkeysequenceedit.go @@ -80,15 +80,6 @@ func QKeySequenceEdit_Tr(s string) string { return _ret } -func QKeySequenceEdit_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QKeySequenceEdit_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QKeySequenceEdit) KeySequence() *QKeySequence { _ret := C.QKeySequenceEdit_KeySequence(this.h) _goptr := newQKeySequence(_ret) @@ -96,6 +87,14 @@ func (this *QKeySequenceEdit) KeySequence() *QKeySequence { return _goptr } +func (this *QKeySequenceEdit) SetClearButtonEnabled(enable bool) { + C.QKeySequenceEdit_SetClearButtonEnabled(this.h, (C.bool)(enable)) +} + +func (this *QKeySequenceEdit) IsClearButtonEnabled() bool { + return (bool)(C.QKeySequenceEdit_IsClearButtonEnabled(this.h)) +} + func (this *QKeySequenceEdit) SetKeySequence(keySequence *QKeySequence) { C.QKeySequenceEdit_SetKeySequence(this.h, keySequence.cPointer()) } @@ -163,28 +162,6 @@ func QKeySequenceEdit_Tr3(s string, c string, n int) string { return _ret } -func QKeySequenceEdit_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QKeySequenceEdit_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QKeySequenceEdit_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QKeySequenceEdit_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QKeySequenceEdit) Delete() { C.QKeySequenceEdit_Delete(this.h) diff --git a/qt/gen_qkeysequenceedit.h b/qt/gen_qkeysequenceedit.h index 744ad14..8a8d644 100644 --- a/qt/gen_qkeysequenceedit.h +++ b/qt/gen_qkeysequenceedit.h @@ -32,8 +32,9 @@ QKeySequenceEdit* QKeySequenceEdit_new4(QKeySequence* keySequence, QWidget* pare QMetaObject* QKeySequenceEdit_MetaObject(const QKeySequenceEdit* self); void* QKeySequenceEdit_Metacast(QKeySequenceEdit* self, const char* param1); struct miqt_string* QKeySequenceEdit_Tr(const char* s); -struct miqt_string* QKeySequenceEdit_TrUtf8(const char* s); QKeySequence* QKeySequenceEdit_KeySequence(const QKeySequenceEdit* self); +void QKeySequenceEdit_SetClearButtonEnabled(QKeySequenceEdit* self, bool enable); +bool QKeySequenceEdit_IsClearButtonEnabled(const QKeySequenceEdit* self); void QKeySequenceEdit_SetKeySequence(QKeySequenceEdit* self, QKeySequence* keySequence); void QKeySequenceEdit_Clear(QKeySequenceEdit* self); void QKeySequenceEdit_EditingFinished(QKeySequenceEdit* self); @@ -42,8 +43,6 @@ void QKeySequenceEdit_KeySequenceChanged(QKeySequenceEdit* self, QKeySequence* k void QKeySequenceEdit_connect_KeySequenceChanged(QKeySequenceEdit* self, void* slot); struct miqt_string* QKeySequenceEdit_Tr2(const char* s, const char* c); struct miqt_string* QKeySequenceEdit_Tr3(const char* s, const char* c, int n); -struct miqt_string* QKeySequenceEdit_TrUtf82(const char* s, const char* c); -struct miqt_string* QKeySequenceEdit_TrUtf83(const char* s, const char* c, int n); void QKeySequenceEdit_Delete(QKeySequenceEdit* self); #ifdef __cplusplus diff --git a/qt/gen_qlabel.cpp b/qt/gen_qlabel.cpp index 49bce89..03ab127 100644 --- a/qt/gen_qlabel.cpp +++ b/qt/gen_qlabel.cpp @@ -54,13 +54,6 @@ struct miqt_string* QLabel_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QLabel_TrUtf8(const char* s) { - QString _ret = QLabel::trUtf8(s); - // 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* QLabel_Text(const QLabel* self) { QString _ret = self->text(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -68,22 +61,22 @@ struct miqt_string* QLabel_Text(const QLabel* self) { return miqt_strdup(_b.data(), _b.length()); } -QPixmap* QLabel_Pixmap(const QLabel* self) { - return (QPixmap*) self->pixmap(); -} - -QPixmap* QLabel_PixmapWithQtReturnByValueConstant(const QLabel* self, int param1) { +QPixmap* QLabel_Pixmap(const QLabel* self, int param1) { return new QPixmap(self->pixmap(static_cast(param1))); } -QPicture* QLabel_Picture(const QLabel* self) { - return (QPicture*) self->picture(); +QPixmap* QLabel_Pixmap2(const QLabel* self) { + return new QPixmap(self->pixmap()); } -QPicture* QLabel_PictureWithQtReturnByValueConstant(const QLabel* self, int param1) { +QPicture* QLabel_Picture(const QLabel* self, int param1) { return new QPicture(self->picture(static_cast(param1))); } +QPicture* QLabel_Picture2(const QLabel* self) { + return new QPicture(self->picture()); +} + QMovie* QLabel_Movie(const QLabel* self) { return self->movie(); } @@ -267,20 +260,6 @@ struct miqt_string* QLabel_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QLabel_TrUtf82(const char* s, const char* c) { - QString _ret = QLabel::trUtf8(s, c); - // 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* QLabel_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QLabel::trUtf8(s, c, static_cast(n)); - // 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 QLabel_Delete(QLabel* self) { delete self; } diff --git a/qt/gen_qlabel.go b/qt/gen_qlabel.go index ee5e44a..38b1179 100644 --- a/qt/gen_qlabel.go +++ b/qt/gen_qlabel.go @@ -98,15 +98,6 @@ func QLabel_Tr(s string) string { return _ret } -func QLabel_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QLabel_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QLabel) Text() string { var _ms *C.struct_miqt_string = C.QLabel_Text(this.h) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) @@ -114,23 +105,29 @@ func (this *QLabel) Text() string { return _ret } -func (this *QLabel) Pixmap() *QPixmap { - return newQPixmap_U(unsafe.Pointer(C.QLabel_Pixmap(this.h))) -} - -func (this *QLabel) PixmapWithQtReturnByValueConstant(param1 ReturnByValueConstant) *QPixmap { - _ret := C.QLabel_PixmapWithQtReturnByValueConstant(this.h, (C.int)(param1)) +func (this *QLabel) Pixmap(param1 ReturnByValueConstant) *QPixmap { + _ret := C.QLabel_Pixmap(this.h, (C.int)(param1)) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QLabel) Picture() *QPicture { - return newQPicture_U(unsafe.Pointer(C.QLabel_Picture(this.h))) +func (this *QLabel) Pixmap2() *QPixmap { + _ret := C.QLabel_Pixmap2(this.h) + _goptr := newQPixmap(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr } -func (this *QLabel) PictureWithQtReturnByValueConstant(param1 ReturnByValueConstant) *QPicture { - _ret := C.QLabel_PictureWithQtReturnByValueConstant(this.h, (C.int)(param1)) +func (this *QLabel) Picture(param1 ReturnByValueConstant) *QPicture { + _ret := C.QLabel_Picture(this.h, (C.int)(param1)) + _goptr := newQPicture(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QLabel) Picture2() *QPicture { + _ret := C.QLabel_Picture2(this.h) _goptr := newQPicture(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -351,28 +348,6 @@ func QLabel_Tr3(s string, c string, n int) string { return _ret } -func QLabel_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QLabel_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QLabel_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QLabel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QLabel) Delete() { C.QLabel_Delete(this.h) diff --git a/qt/gen_qlabel.h b/qt/gen_qlabel.h index 53dda5d..8db0307 100644 --- a/qt/gen_qlabel.h +++ b/qt/gen_qlabel.h @@ -40,12 +40,11 @@ QLabel* QLabel_new6(struct miqt_string* text, QWidget* parent, int f); QMetaObject* QLabel_MetaObject(const QLabel* self); void* QLabel_Metacast(QLabel* self, const char* param1); 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, int param1); -QPicture* QLabel_Picture(const QLabel* self); -QPicture* QLabel_PictureWithQtReturnByValueConstant(const QLabel* self, int param1); +QPixmap* QLabel_Pixmap(const QLabel* self, int param1); +QPixmap* QLabel_Pixmap2(const QLabel* self); +QPicture* QLabel_Picture(const QLabel* self, int param1); +QPicture* QLabel_Picture2(const QLabel* self); QMovie* QLabel_Movie(const QLabel* self); int QLabel_TextFormat(const QLabel* self); void QLabel_SetTextFormat(QLabel* self, int textFormat); @@ -85,8 +84,6 @@ void QLabel_LinkHovered(QLabel* self, struct miqt_string* link); void QLabel_connect_LinkHovered(QLabel* self, void* slot); struct miqt_string* QLabel_Tr2(const char* s, const char* c); struct miqt_string* QLabel_Tr3(const char* s, const char* c, int n); -struct miqt_string* QLabel_TrUtf82(const char* s, const char* c); -struct miqt_string* QLabel_TrUtf83(const char* s, const char* c, int n); void QLabel_Delete(QLabel* self); #ifdef __cplusplus diff --git a/qt/gen_qlayout.cpp b/qt/gen_qlayout.cpp index d406e66..08600a0 100644 --- a/qt/gen_qlayout.cpp +++ b/qt/gen_qlayout.cpp @@ -27,21 +27,6 @@ struct miqt_string* QLayout_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QLayout_TrUtf8(const char* s) { - QString _ret = QLayout::trUtf8(s); - // 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()); -} - -int QLayout_Margin(const QLayout* self) { - return self->margin(); -} - -void QLayout_SetMargin(QLayout* self, int margin) { - self->setMargin(static_cast(margin)); -} - int QLayout_Spacing(const QLayout* self) { return self->spacing(); } @@ -58,6 +43,10 @@ void QLayout_SetContentsMarginsWithMargins(QLayout* self, QMargins* margins) { self->setContentsMargins(*margins); } +void QLayout_UnsetContentsMargins(QLayout* self) { + self->unsetContentsMargins(); +} + void QLayout_GetContentsMargins(const QLayout* self, int* left, int* top, int* right, int* bottom) { self->getContentsMargins(static_cast(left), static_cast(top), static_cast(right), static_cast(bottom)); } @@ -181,6 +170,10 @@ QLayoutItem* QLayout_ReplaceWidget(QLayout* self, QWidget* from, QWidget* to) { return self->replaceWidget(from, to); } +int QLayout_TotalMinimumHeightForWidth(const QLayout* self, int w) { + return self->totalMinimumHeightForWidth(static_cast(w)); +} + int QLayout_TotalHeightForWidth(const QLayout* self, int w) { return self->totalHeightForWidth(static_cast(w)); } @@ -227,20 +220,6 @@ struct miqt_string* QLayout_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QLayout_TrUtf82(const char* s, const char* c) { - QString _ret = QLayout::trUtf8(s, c); - // 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* QLayout_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QLayout::trUtf8(s, c, static_cast(n)); - // 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()); -} - QLayoutItem* QLayout_ReplaceWidget3(QLayout* self, QWidget* from, QWidget* to, int options) { return self->replaceWidget(from, to, static_cast(options)); } diff --git a/qt/gen_qlayout.go b/qt/gen_qlayout.go index 1f9b435..19b5abd 100644 --- a/qt/gen_qlayout.go +++ b/qt/gen_qlayout.go @@ -67,23 +67,6 @@ func QLayout_Tr(s string) string { return _ret } -func QLayout_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QLayout_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QLayout) Margin() int { - return (int)(C.QLayout_Margin(this.h)) -} - -func (this *QLayout) SetMargin(margin int) { - C.QLayout_SetMargin(this.h, (C.int)(margin)) -} - func (this *QLayout) Spacing() int { return (int)(C.QLayout_Spacing(this.h)) } @@ -100,6 +83,10 @@ func (this *QLayout) SetContentsMarginsWithMargins(margins *QMargins) { C.QLayout_SetContentsMarginsWithMargins(this.h, margins.cPointer()) } +func (this *QLayout) UnsetContentsMargins() { + C.QLayout_UnsetContentsMargins(this.h) +} + func (this *QLayout) GetContentsMargins(left *int, top *int, right *int, bottom *int) { C.QLayout_GetContentsMargins(this.h, (*C.int)(unsafe.Pointer(left)), (*C.int)(unsafe.Pointer(top)), (*C.int)(unsafe.Pointer(right)), (*C.int)(unsafe.Pointer(bottom))) } @@ -235,6 +222,10 @@ func (this *QLayout) ReplaceWidget(from *QWidget, to *QWidget) *QLayoutItem { return newQLayoutItem_U(unsafe.Pointer(C.QLayout_ReplaceWidget(this.h, from.cPointer(), to.cPointer()))) } +func (this *QLayout) TotalMinimumHeightForWidth(w int) int { + return (int)(C.QLayout_TotalMinimumHeightForWidth(this.h, (C.int)(w))) +} + func (this *QLayout) TotalHeightForWidth(w int) int { return (int)(C.QLayout_TotalHeightForWidth(this.h, (C.int)(w))) } @@ -301,28 +292,6 @@ func QLayout_Tr3(s string, c string, n int) string { return _ret } -func QLayout_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QLayout_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QLayout_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QLayout_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QLayout) ReplaceWidget3(from *QWidget, to *QWidget, options FindChildOption) *QLayoutItem { return newQLayoutItem_U(unsafe.Pointer(C.QLayout_ReplaceWidget3(this.h, from.cPointer(), to.cPointer(), (C.int)(options)))) } diff --git a/qt/gen_qlayout.h b/qt/gen_qlayout.h index ac12609..725c20c 100644 --- a/qt/gen_qlayout.h +++ b/qt/gen_qlayout.h @@ -34,13 +34,11 @@ typedef struct QWidget QWidget; QMetaObject* QLayout_MetaObject(const QLayout* self); void* QLayout_Metacast(QLayout* self, const char* param1); struct miqt_string* QLayout_Tr(const char* s); -struct miqt_string* QLayout_TrUtf8(const char* s); -int QLayout_Margin(const QLayout* self); -void QLayout_SetMargin(QLayout* self, int margin); int QLayout_Spacing(const QLayout* self); void QLayout_SetSpacing(QLayout* self, int spacing); void QLayout_SetContentsMargins(QLayout* self, int left, int top, int right, int bottom); void QLayout_SetContentsMarginsWithMargins(QLayout* self, QMargins* margins); +void QLayout_UnsetContentsMargins(QLayout* self); void QLayout_GetContentsMargins(const QLayout* self, int* left, int* top, int* right, int* bottom); QMargins* QLayout_ContentsMargins(const QLayout* self); QRect* QLayout_ContentsRect(const QLayout* self); @@ -71,6 +69,7 @@ int QLayout_Count(const QLayout* self); bool QLayout_IsEmpty(const QLayout* self); int QLayout_ControlTypes(const QLayout* self); QLayoutItem* QLayout_ReplaceWidget(QLayout* self, QWidget* from, QWidget* to); +int QLayout_TotalMinimumHeightForWidth(const QLayout* self, int w); int QLayout_TotalHeightForWidth(const QLayout* self, int w); QSize* QLayout_TotalMinimumSize(const QLayout* self); QSize* QLayout_TotalMaximumSize(const QLayout* self); @@ -81,8 +80,6 @@ bool QLayout_IsEnabled(const QLayout* self); QSize* QLayout_ClosestAcceptableSize(QWidget* w, QSize* s); struct miqt_string* QLayout_Tr2(const char* s, const char* c); struct miqt_string* QLayout_Tr3(const char* s, const char* c, int n); -struct miqt_string* QLayout_TrUtf82(const char* s, const char* c); -struct miqt_string* QLayout_TrUtf83(const char* s, const char* c, int n); QLayoutItem* QLayout_ReplaceWidget3(QLayout* self, QWidget* from, QWidget* to, int options); void QLayout_Delete(QLayout* self); diff --git a/qt/gen_qlayoutitem.cpp b/qt/gen_qlayoutitem.cpp index 5b062c0..19d7c39 100644 --- a/qt/gen_qlayoutitem.cpp +++ b/qt/gen_qlayoutitem.cpp @@ -56,7 +56,7 @@ void QLayoutItem_Invalidate(QLayoutItem* self) { self->invalidate(); } -QWidget* QLayoutItem_Widget(QLayoutItem* self) { +QWidget* QLayoutItem_Widget(const QLayoutItem* self) { return self->widget(); } @@ -188,7 +188,7 @@ QRect* QWidgetItem_Geometry(const QWidgetItem* self) { return new QRect(self->geometry()); } -QWidget* QWidgetItem_Widget(QWidgetItem* self) { +QWidget* QWidgetItem_Widget(const QWidgetItem* self) { return self->widget(); } @@ -200,6 +200,10 @@ int QWidgetItem_HeightForWidth(const QWidgetItem* self, int param1) { return self->heightForWidth(static_cast(param1)); } +int QWidgetItem_MinimumHeightForWidth(const QWidgetItem* self, int param1) { + return self->minimumHeightForWidth(static_cast(param1)); +} + int QWidgetItem_ControlTypes(const QWidgetItem* self) { QSizePolicy::ControlTypes _ret = self->controlTypes(); return static_cast(_ret); diff --git a/qt/gen_qlayoutitem.go b/qt/gen_qlayoutitem.go index 703b8e4..121306c 100644 --- a/qt/gen_qlayoutitem.go +++ b/qt/gen_qlayoutitem.go @@ -334,6 +334,10 @@ func (this *QWidgetItem) HeightForWidth(param1 int) int { return (int)(C.QWidgetItem_HeightForWidth(this.h, (C.int)(param1))) } +func (this *QWidgetItem) MinimumHeightForWidth(param1 int) int { + return (int)(C.QWidgetItem_MinimumHeightForWidth(this.h, (C.int)(param1))) +} + func (this *QWidgetItem) ControlTypes() QSizePolicy__ControlType { return (QSizePolicy__ControlType)(C.QWidgetItem_ControlTypes(this.h)) } diff --git a/qt/gen_qlayoutitem.h b/qt/gen_qlayoutitem.h index aafd4ca..24062c3 100644 --- a/qt/gen_qlayoutitem.h +++ b/qt/gen_qlayoutitem.h @@ -46,7 +46,7 @@ bool QLayoutItem_HasHeightForWidth(const QLayoutItem* self); int QLayoutItem_HeightForWidth(const QLayoutItem* self, int param1); int QLayoutItem_MinimumHeightForWidth(const QLayoutItem* self, int param1); void QLayoutItem_Invalidate(QLayoutItem* self); -QWidget* QLayoutItem_Widget(QLayoutItem* self); +QWidget* QLayoutItem_Widget(const QLayoutItem* self); QLayout* QLayoutItem_Layout(QLayoutItem* self); QSpacerItem* QLayoutItem_SpacerItem(QLayoutItem* self); int QLayoutItem_Alignment(const QLayoutItem* self); @@ -80,9 +80,10 @@ int QWidgetItem_ExpandingDirections(const QWidgetItem* self); bool QWidgetItem_IsEmpty(const QWidgetItem* self); void QWidgetItem_SetGeometry(QWidgetItem* self, QRect* geometry); QRect* QWidgetItem_Geometry(const QWidgetItem* self); -QWidget* QWidgetItem_Widget(QWidgetItem* self); +QWidget* QWidgetItem_Widget(const QWidgetItem* self); bool QWidgetItem_HasHeightForWidth(const QWidgetItem* self); int QWidgetItem_HeightForWidth(const QWidgetItem* self, int param1); +int QWidgetItem_MinimumHeightForWidth(const QWidgetItem* self, int param1); int QWidgetItem_ControlTypes(const QWidgetItem* self); void QWidgetItem_Delete(QWidgetItem* self); diff --git a/qt/gen_qlcdnumber.cpp b/qt/gen_qlcdnumber.cpp index cd5a5c3..f3674d0 100644 --- a/qt/gen_qlcdnumber.cpp +++ b/qt/gen_qlcdnumber.cpp @@ -40,13 +40,6 @@ struct miqt_string* QLCDNumber_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QLCDNumber_TrUtf8(const char* s) { - QString _ret = QLCDNumber::trUtf8(s); - // 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()); -} - bool QLCDNumber_SmallDecimalPoint(const QLCDNumber* self) { return self->smallDecimalPoint(); } @@ -154,20 +147,6 @@ struct miqt_string* QLCDNumber_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QLCDNumber_TrUtf82(const char* s, const char* c) { - QString _ret = QLCDNumber::trUtf8(s, c); - // 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* QLCDNumber_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QLCDNumber::trUtf8(s, c, static_cast(n)); - // 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 QLCDNumber_Delete(QLCDNumber* self) { delete self; } diff --git a/qt/gen_qlcdnumber.go b/qt/gen_qlcdnumber.go index 6fcc16d..cd4f436 100644 --- a/qt/gen_qlcdnumber.go +++ b/qt/gen_qlcdnumber.go @@ -97,15 +97,6 @@ func QLCDNumber_Tr(s string) string { return _ret } -func QLCDNumber_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QLCDNumber_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QLCDNumber) SmallDecimalPoint() bool { return (bool)(C.QLCDNumber_SmallDecimalPoint(this.h)) } @@ -230,28 +221,6 @@ func QLCDNumber_Tr3(s string, c string, n int) string { return _ret } -func QLCDNumber_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QLCDNumber_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QLCDNumber_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QLCDNumber_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QLCDNumber) Delete() { C.QLCDNumber_Delete(this.h) diff --git a/qt/gen_qlcdnumber.h b/qt/gen_qlcdnumber.h index 64c8f47..3cfca4f 100644 --- a/qt/gen_qlcdnumber.h +++ b/qt/gen_qlcdnumber.h @@ -32,7 +32,6 @@ QLCDNumber* QLCDNumber_new4(unsigned int numDigits, QWidget* parent); QMetaObject* QLCDNumber_MetaObject(const QLCDNumber* self); void* QLCDNumber_Metacast(QLCDNumber* self, const char* param1); struct miqt_string* QLCDNumber_Tr(const char* s); -struct miqt_string* QLCDNumber_TrUtf8(const char* s); bool QLCDNumber_SmallDecimalPoint(const QLCDNumber* self); int QLCDNumber_DigitCount(const QLCDNumber* self); void QLCDNumber_SetDigitCount(QLCDNumber* self, int nDigits); @@ -57,8 +56,6 @@ void QLCDNumber_Overflow(QLCDNumber* self); void QLCDNumber_connect_Overflow(QLCDNumber* self, void* slot); struct miqt_string* QLCDNumber_Tr2(const char* s, const char* c); struct miqt_string* QLCDNumber_Tr3(const char* s, const char* c, int n); -struct miqt_string* QLCDNumber_TrUtf82(const char* s, const char* c); -struct miqt_string* QLCDNumber_TrUtf83(const char* s, const char* c, int n); void QLCDNumber_Delete(QLCDNumber* self); #ifdef __cplusplus diff --git a/qt/gen_qlibrary.cpp b/qt/gen_qlibrary.cpp index d134dee..51b89d8 100644 --- a/qt/gen_qlibrary.cpp +++ b/qt/gen_qlibrary.cpp @@ -63,13 +63,6 @@ struct miqt_string* QLibrary_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QLibrary_TrUtf8(const char* s) { - QString _ret = QLibrary::trUtf8(s); - // 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()); -} - bool QLibrary_Load(QLibrary* self) { return self->load(); } @@ -140,20 +133,6 @@ struct miqt_string* QLibrary_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QLibrary_TrUtf82(const char* s, const char* c) { - QString _ret = QLibrary::trUtf8(s, c); - // 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* QLibrary_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QLibrary::trUtf8(s, c, static_cast(n)); - // 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 QLibrary_Delete(QLibrary* self) { delete self; } diff --git a/qt/gen_qlibrary.go b/qt/gen_qlibrary.go index e71c19c..791c304 100644 --- a/qt/gen_qlibrary.go +++ b/qt/gen_qlibrary.go @@ -129,15 +129,6 @@ func QLibrary_Tr(s string) string { return _ret } -func QLibrary_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QLibrary_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QLibrary) Load() bool { return (bool)(C.QLibrary_Load(this.h)) } @@ -220,28 +211,6 @@ func QLibrary_Tr3(s string, c string, n int) string { return _ret } -func QLibrary_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QLibrary_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QLibrary_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QLibrary_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QLibrary) Delete() { C.QLibrary_Delete(this.h) diff --git a/qt/gen_qlibrary.h b/qt/gen_qlibrary.h index fb62dab..a7ecf57 100644 --- a/qt/gen_qlibrary.h +++ b/qt/gen_qlibrary.h @@ -34,7 +34,6 @@ QLibrary* QLibrary_new8(struct miqt_string* fileName, struct miqt_string* versio QMetaObject* QLibrary_MetaObject(const QLibrary* self); void* QLibrary_Metacast(QLibrary* self, const char* param1); struct miqt_string* QLibrary_Tr(const char* s); -struct miqt_string* QLibrary_TrUtf8(const char* s); bool QLibrary_Load(QLibrary* self); bool QLibrary_Unload(QLibrary* self); bool QLibrary_IsLoaded(const QLibrary* self); @@ -48,8 +47,6 @@ void QLibrary_SetLoadHints(QLibrary* self, int hints); int QLibrary_LoadHints(const QLibrary* self); struct miqt_string* QLibrary_Tr2(const char* s, const char* c); struct miqt_string* QLibrary_Tr3(const char* s, const char* c, int n); -struct miqt_string* QLibrary_TrUtf82(const char* s, const char* c); -struct miqt_string* QLibrary_TrUtf83(const char* s, const char* c, int n); void QLibrary_Delete(QLibrary* self); #ifdef __cplusplus diff --git a/qt/gen_qlibraryinfo.cpp b/qt/gen_qlibraryinfo.cpp index da655c8..04e0ba0 100644 --- a/qt/gen_qlibraryinfo.cpp +++ b/qt/gen_qlibraryinfo.cpp @@ -1,4 +1,3 @@ -#include #include #include #include @@ -9,24 +8,6 @@ #include "gen_qlibraryinfo.h" #include "_cgo_export.h" -struct miqt_string* QLibraryInfo_Licensee() { - QString _ret = QLibraryInfo::licensee(); - // 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* QLibraryInfo_LicensedProducts() { - QString _ret = QLibraryInfo::licensedProducts(); - // 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* QLibraryInfo_BuildDate() { - return new QDate(QLibraryInfo::buildDate()); -} - const char* QLibraryInfo_Build() { return (const char*) QLibraryInfo::build(); } @@ -39,8 +20,15 @@ QVersionNumber* QLibraryInfo_Version() { return new QVersionNumber(QLibraryInfo::version()); } -struct miqt_string* QLibraryInfo_Location(int param1) { - QString _ret = QLibraryInfo::location(static_cast(param1)); +struct miqt_string* QLibraryInfo_Path(int p) { + QString _ret = QLibraryInfo::path(static_cast(p)); + // 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* QLibraryInfo_Location(int location) { + QString _ret = QLibraryInfo::location(static_cast(location)); // 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()); diff --git a/qt/gen_qlibraryinfo.go b/qt/gen_qlibraryinfo.go index f70195a..bb3acf8 100644 --- a/qt/gen_qlibraryinfo.go +++ b/qt/gen_qlibraryinfo.go @@ -13,24 +13,24 @@ import ( "unsafe" ) -type QLibraryInfo__LibraryLocation int +type QLibraryInfo__LibraryPath int const ( - QLibraryInfo__PrefixPath QLibraryInfo__LibraryLocation = 0 - QLibraryInfo__DocumentationPath QLibraryInfo__LibraryLocation = 1 - QLibraryInfo__HeadersPath QLibraryInfo__LibraryLocation = 2 - QLibraryInfo__LibrariesPath QLibraryInfo__LibraryLocation = 3 - QLibraryInfo__LibraryExecutablesPath QLibraryInfo__LibraryLocation = 4 - QLibraryInfo__BinariesPath QLibraryInfo__LibraryLocation = 5 - QLibraryInfo__PluginsPath QLibraryInfo__LibraryLocation = 6 - QLibraryInfo__ImportsPath QLibraryInfo__LibraryLocation = 7 - QLibraryInfo__Qml2ImportsPath QLibraryInfo__LibraryLocation = 8 - QLibraryInfo__ArchDataPath QLibraryInfo__LibraryLocation = 9 - QLibraryInfo__DataPath QLibraryInfo__LibraryLocation = 10 - QLibraryInfo__TranslationsPath QLibraryInfo__LibraryLocation = 11 - QLibraryInfo__ExamplesPath QLibraryInfo__LibraryLocation = 12 - QLibraryInfo__TestsPath QLibraryInfo__LibraryLocation = 13 - QLibraryInfo__SettingsPath QLibraryInfo__LibraryLocation = 100 + QLibraryInfo__PrefixPath QLibraryInfo__LibraryPath = 0 + QLibraryInfo__DocumentationPath QLibraryInfo__LibraryPath = 1 + QLibraryInfo__HeadersPath QLibraryInfo__LibraryPath = 2 + QLibraryInfo__LibrariesPath QLibraryInfo__LibraryPath = 3 + QLibraryInfo__LibraryExecutablesPath QLibraryInfo__LibraryPath = 4 + QLibraryInfo__BinariesPath QLibraryInfo__LibraryPath = 5 + QLibraryInfo__PluginsPath QLibraryInfo__LibraryPath = 6 + QLibraryInfo__QmlImportsPath QLibraryInfo__LibraryPath = 7 + QLibraryInfo__Qml2ImportsPath QLibraryInfo__LibraryPath = 7 + QLibraryInfo__ArchDataPath QLibraryInfo__LibraryPath = 8 + QLibraryInfo__DataPath QLibraryInfo__LibraryPath = 9 + QLibraryInfo__TranslationsPath QLibraryInfo__LibraryPath = 10 + QLibraryInfo__ExamplesPath QLibraryInfo__LibraryPath = 11 + QLibraryInfo__TestsPath QLibraryInfo__LibraryPath = 12 + QLibraryInfo__SettingsPath QLibraryInfo__LibraryPath = 100 ) type QLibraryInfo struct { @@ -55,27 +55,6 @@ func newQLibraryInfo_U(h unsafe.Pointer) *QLibraryInfo { return newQLibraryInfo((*C.QLibraryInfo)(h)) } -func QLibraryInfo_Licensee() string { - var _ms *C.struct_miqt_string = C.QLibraryInfo_Licensee() - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QLibraryInfo_LicensedProducts() string { - var _ms *C.struct_miqt_string = C.QLibraryInfo_LicensedProducts() - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QLibraryInfo_BuildDate() *QDate { - _ret := C.QLibraryInfo_BuildDate() - _goptr := newQDate(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - func QLibraryInfo_Build() unsafe.Pointer { _ret := C.QLibraryInfo_Build() return (unsafe.Pointer)(_ret) @@ -92,8 +71,15 @@ func QLibraryInfo_Version() *QVersionNumber { return _goptr } -func QLibraryInfo_Location(param1 QLibraryInfo__LibraryLocation) string { - var _ms *C.struct_miqt_string = C.QLibraryInfo_Location((C.int)(param1)) +func QLibraryInfo_Path(p QLibraryInfo__LibraryPath) string { + var _ms *C.struct_miqt_string = C.QLibraryInfo_Path((C.int)(p)) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + +func QLibraryInfo_Location(location QLibraryInfo__LibraryPath) string { + var _ms *C.struct_miqt_string = C.QLibraryInfo_Location((C.int)(location)) _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 f1ff8b4..9cc7e49 100644 --- a/qt/gen_qlibraryinfo.h +++ b/qt/gen_qlibraryinfo.h @@ -14,22 +14,18 @@ extern "C" { #endif #ifdef __cplusplus -class QDate; class QLibraryInfo; class QVersionNumber; #else -typedef struct QDate QDate; typedef struct QLibraryInfo QLibraryInfo; typedef struct QVersionNumber QVersionNumber; #endif -struct miqt_string* QLibraryInfo_Licensee(); -struct miqt_string* QLibraryInfo_LicensedProducts(); -QDate* QLibraryInfo_BuildDate(); const char* QLibraryInfo_Build(); bool QLibraryInfo_IsDebugBuild(); QVersionNumber* QLibraryInfo_Version(); -struct miqt_string* QLibraryInfo_Location(int param1); +struct miqt_string* QLibraryInfo_Path(int p); +struct miqt_string* QLibraryInfo_Location(int location); 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 c1ebb3a..7d6d41e 100644 --- a/qt/gen_qline.cpp +++ b/qt/gen_qline.cpp @@ -102,6 +102,10 @@ bool QLine_OperatorNotEqual(const QLine* self, QLine* d) { return self->operator!=(*d); } +QLineF* QLine_ToLineF(const QLine* self) { + return new QLineF(self->toLineF()); +} + void QLine_Delete(QLine* self) { delete self; } @@ -203,21 +207,11 @@ QLineF* QLineF_NormalVector(const QLineF* self) { return new QLineF(self->normalVector()); } -int QLineF_Intersects(const QLineF* self, QLineF* l, QPointF* intersectionPoint) { - QLineF::IntersectionType _ret = self->intersects(*l, intersectionPoint); +int QLineF_Intersects(const QLineF* self, QLineF* l) { + QLineF::IntersectionType _ret = self->intersects(*l); return static_cast(_ret); } -int QLineF_Intersect(const QLineF* self, QLineF* l, QPointF* intersectionPoint) { - QLineF::IntersectType _ret = self->intersect(*l, intersectionPoint); - return static_cast(_ret); -} - -double QLineF_AngleWithQLineF(const QLineF* self, QLineF* l) { - qreal _ret = self->angle(*l); - return static_cast(_ret); -} - QPointF* QLineF_PointAt(const QLineF* self, double t) { return new QPointF(self->pointAt(static_cast(t))); } @@ -270,6 +264,11 @@ QLine* QLineF_ToLine(const QLineF* self) { return new QLine(self->toLine()); } +int QLineF_Intersects2(const QLineF* self, QLineF* l, QPointF* intersectionPoint) { + QLineF::IntersectionType _ret = self->intersects(*l, intersectionPoint); + return static_cast(_ret); +} + void QLineF_Delete(QLineF* self) { delete self; } diff --git a/qt/gen_qline.go b/qt/gen_qline.go index 187ab78..b3f394c 100644 --- a/qt/gen_qline.go +++ b/qt/gen_qline.go @@ -13,12 +13,12 @@ import ( "unsafe" ) -type QLineF__IntersectType int +type QLineF__IntersectionType int const ( - QLineF__NoIntersection QLineF__IntersectType = 0 - QLineF__BoundedIntersection QLineF__IntersectType = 1 - QLineF__UnboundedIntersection QLineF__IntersectType = 2 + QLineF__NoIntersection QLineF__IntersectionType = 0 + QLineF__BoundedIntersection QLineF__IntersectionType = 1 + QLineF__UnboundedIntersection QLineF__IntersectionType = 2 ) type QLine struct { @@ -162,6 +162,13 @@ func (this *QLine) OperatorNotEqual(d *QLine) bool { return (bool)(C.QLine_OperatorNotEqual(this.h, d.cPointer())) } +func (this *QLine) ToLineF() *QLineF { + _ret := C.QLine_ToLineF(this.h) + _goptr := newQLineF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + // Delete this object from C++ memory. func (this *QLine) Delete() { C.QLine_Delete(this.h) @@ -311,16 +318,8 @@ func (this *QLineF) NormalVector() *QLineF { return _goptr } -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 { - return (QLineF__IntersectType)(C.QLineF_Intersect(this.h, l.cPointer(), intersectionPoint.cPointer())) -} - -func (this *QLineF) AngleWithQLineF(l *QLineF) float64 { - return (float64)(C.QLineF_AngleWithQLineF(this.h, l.cPointer())) +func (this *QLineF) Intersects(l *QLineF) QLineF__IntersectionType { + return (QLineF__IntersectionType)(C.QLineF_Intersects(this.h, l.cPointer())) } func (this *QLineF) PointAt(t float64) *QPointF { @@ -390,6 +389,10 @@ func (this *QLineF) ToLine() *QLine { return _goptr } +func (this *QLineF) Intersects2(l *QLineF, intersectionPoint *QPointF) QLineF__IntersectionType { + return (QLineF__IntersectionType)(C.QLineF_Intersects2(this.h, l.cPointer(), intersectionPoint.cPointer())) +} + // Delete this object from C++ memory. func (this *QLineF) Delete() { C.QLineF_Delete(this.h) diff --git a/qt/gen_qline.h b/qt/gen_qline.h index 2d9ce2b..a28acb3 100644 --- a/qt/gen_qline.h +++ b/qt/gen_qline.h @@ -49,6 +49,7 @@ void QLine_SetPoints(QLine* self, QPoint* p1, QPoint* p2); void QLine_SetLine(QLine* self, int x1, int y1, int x2, int y2); bool QLine_OperatorEqual(const QLine* self, QLine* d); bool QLine_OperatorNotEqual(const QLine* self, QLine* d); +QLineF* QLine_ToLineF(const QLine* self); void QLine_Delete(QLine* self); QLineF* QLineF_new(); @@ -73,9 +74,7 @@ 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); -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); +int QLineF_Intersects(const QLineF* self, QLineF* l); QPointF* QLineF_PointAt(const QLineF* self, double t); void QLineF_Translate(QLineF* self, QPointF* p); void QLineF_Translate2(QLineF* self, double dx, double dy); @@ -89,6 +88,7 @@ void QLineF_SetLine(QLineF* self, double x1, double y1, double x2, double y2); bool QLineF_OperatorEqual(const QLineF* self, QLineF* d); bool QLineF_OperatorNotEqual(const QLineF* self, QLineF* d); QLine* QLineF_ToLine(const QLineF* self); +int QLineF_Intersects2(const QLineF* self, QLineF* l, QPointF* intersectionPoint); void QLineF_Delete(QLineF* self); #ifdef __cplusplus diff --git a/qt/gen_qlineedit.cpp b/qt/gen_qlineedit.cpp index 38649ab..fabf9d0 100644 --- a/qt/gen_qlineedit.cpp +++ b/qt/gen_qlineedit.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -51,13 +52,6 @@ struct miqt_string* QLineEdit_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QLineEdit_TrUtf8(const char* s) { - QString _ret = QLineEdit::trUtf8(s); - // 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* QLineEdit_Text(const QLineEdit* self) { QString _ret = self->text(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -286,10 +280,6 @@ void QLineEdit_SetTextMarginsWithMargins(QLineEdit* self, QMargins* margins) { self->setTextMargins(*margins); } -void QLineEdit_GetTextMargins(const QLineEdit* self, int* left, int* top, int* right, int* bottom) { - self->getTextMargins(static_cast(left), static_cast(top), static_cast(right), static_cast(bottom)); -} - QMargins* QLineEdit_TextMargins(const QLineEdit* self) { return new QMargins(self->textMargins()); } @@ -438,6 +428,10 @@ QVariant* QLineEdit_InputMethodQuery2(const QLineEdit* self, int property, QVari return new QVariant(self->inputMethodQuery(static_cast(property), *argument)); } +void QLineEdit_TimerEvent(QLineEdit* self, QTimerEvent* param1) { + self->timerEvent(param1); +} + bool QLineEdit_Event(QLineEdit* self, QEvent* param1) { return self->event(param1); } @@ -456,20 +450,6 @@ struct miqt_string* QLineEdit_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QLineEdit_TrUtf82(const char* s, const char* c) { - QString _ret = QLineEdit::trUtf8(s, c); - // 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* QLineEdit_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QLineEdit::trUtf8(s, c, static_cast(n)); - // 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 QLineEdit_CursorForward2(QLineEdit* self, bool mark, int steps) { self->cursorForward(mark, static_cast(steps)); } diff --git a/qt/gen_qlineedit.go b/qt/gen_qlineedit.go index 6d87d8b..1153066 100644 --- a/qt/gen_qlineedit.go +++ b/qt/gen_qlineedit.go @@ -100,15 +100,6 @@ func QLineEdit_Tr(s string) string { return _ret } -func QLineEdit_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QLineEdit_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QLineEdit) Text() string { var _ms *C.struct_miqt_string = C.QLineEdit_Text(this.h) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) @@ -342,10 +333,6 @@ func (this *QLineEdit) SetTextMarginsWithMargins(margins *QMargins) { C.QLineEdit_SetTextMarginsWithMargins(this.h, margins.cPointer()) } -func (this *QLineEdit) GetTextMargins(left *int, top *int, right *int, bottom *int) { - C.QLineEdit_GetTextMargins(this.h, (*C.int)(unsafe.Pointer(left)), (*C.int)(unsafe.Pointer(top)), (*C.int)(unsafe.Pointer(right)), (*C.int)(unsafe.Pointer(bottom))) -} - func (this *QLineEdit) TextMargins() *QMargins { _ret := C.QLineEdit_TextMargins(this.h) _goptr := newQMargins(_ret) @@ -563,6 +550,10 @@ func (this *QLineEdit) InputMethodQuery2(property InputMethodQuery, argument QVa return _goptr } +func (this *QLineEdit) TimerEvent(param1 *QTimerEvent) { + C.QLineEdit_TimerEvent(this.h, param1.cPointer()) +} + func (this *QLineEdit) Event(param1 *QEvent) bool { return (bool)(C.QLineEdit_Event(this.h, param1.cPointer())) } @@ -589,28 +580,6 @@ func QLineEdit_Tr3(s string, c string, n int) string { return _ret } -func QLineEdit_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QLineEdit_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QLineEdit_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QLineEdit_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QLineEdit) CursorForward2(mark bool, steps int) { C.QLineEdit_CursorForward2(this.h, (C.bool)(mark), (C.int)(steps)) } diff --git a/qt/gen_qlineedit.h b/qt/gen_qlineedit.h index 0fff444..43c62a9 100644 --- a/qt/gen_qlineedit.h +++ b/qt/gen_qlineedit.h @@ -24,6 +24,7 @@ class QMenu; class QMetaObject; class QPoint; class QSize; +class QTimerEvent; class QValidator; class QVariant; class QWidget; @@ -38,6 +39,7 @@ typedef struct QMenu QMenu; typedef struct QMetaObject QMetaObject; typedef struct QPoint QPoint; typedef struct QSize QSize; +typedef struct QTimerEvent QTimerEvent; typedef struct QValidator QValidator; typedef struct QVariant QVariant; typedef struct QWidget QWidget; @@ -50,7 +52,6 @@ QLineEdit* QLineEdit_new4(struct miqt_string* param1, QWidget* parent); QMetaObject* QLineEdit_MetaObject(const QLineEdit* self); void* QLineEdit_Metacast(QLineEdit* self, const char* param1); struct miqt_string* QLineEdit_Tr(const char* s); -struct miqt_string* QLineEdit_TrUtf8(const char* s); struct miqt_string* QLineEdit_Text(const QLineEdit* self); struct miqt_string* QLineEdit_DisplayText(const QLineEdit* self); struct miqt_string* QLineEdit_PlaceholderText(const QLineEdit* self); @@ -103,7 +104,6 @@ void QLineEdit_SetInputMask(QLineEdit* self, struct miqt_string* inputMask); bool QLineEdit_HasAcceptableInput(const QLineEdit* self); void QLineEdit_SetTextMargins(QLineEdit* self, int left, int top, int right, int bottom); 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, int position); QAction* QLineEdit_AddAction2(QLineEdit* self, QIcon* icon, int position); @@ -134,11 +134,10 @@ void QLineEdit_InputRejected(QLineEdit* self); void QLineEdit_connect_InputRejected(QLineEdit* self, void* slot); QVariant* QLineEdit_InputMethodQuery(const QLineEdit* self, int param1); QVariant* QLineEdit_InputMethodQuery2(const QLineEdit* self, int property, QVariant* argument); +void QLineEdit_TimerEvent(QLineEdit* self, QTimerEvent* param1); 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); -struct miqt_string* QLineEdit_TrUtf82(const char* s, const char* c); -struct miqt_string* QLineEdit_TrUtf83(const char* s, const char* c, int n); void QLineEdit_CursorForward2(QLineEdit* self, bool mark, int steps); void QLineEdit_CursorBackward2(QLineEdit* self, bool mark, int steps); void QLineEdit_Delete(QLineEdit* self); diff --git a/qt/gen_qlinkedlist.cpp b/qt/gen_qlinkedlist.cpp deleted file mode 100644 index 9cd201c..0000000 --- a/qt/gen_qlinkedlist.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include -#include "qlinkedlist.h" -#include "gen_qlinkedlist.h" -#include "_cgo_export.h" - -QLinkedListData* QLinkedListData_new() { - return new QLinkedListData(); -} - -void QLinkedListData_Delete(QLinkedListData* self) { - delete self; -} - diff --git a/qt/gen_qlinkedlist.go b/qt/gen_qlinkedlist.go deleted file mode 100644 index a826f73..0000000 --- a/qt/gen_qlinkedlist.go +++ /dev/null @@ -1,56 +0,0 @@ -package qt - -/* - -#include "gen_qlinkedlist.h" -#include - -*/ -import "C" - -import ( - "runtime" - "unsafe" -) - -type QLinkedListData struct { - h *C.QLinkedListData -} - -func (this *QLinkedListData) cPointer() *C.QLinkedListData { - if this == nil { - return nil - } - return this.h -} - -func newQLinkedListData(h *C.QLinkedListData) *QLinkedListData { - if h == nil { - return nil - } - return &QLinkedListData{h: h} -} - -func newQLinkedListData_U(h unsafe.Pointer) *QLinkedListData { - return newQLinkedListData((*C.QLinkedListData)(h)) -} - -// NewQLinkedListData constructs a new QLinkedListData object. -func NewQLinkedListData() *QLinkedListData { - ret := C.QLinkedListData_new() - return newQLinkedListData(ret) -} - -// Delete this object from C++ memory. -func (this *QLinkedListData) Delete() { - C.QLinkedListData_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QLinkedListData) GoGC() { - runtime.SetFinalizer(this, func(this *QLinkedListData) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} diff --git a/qt/gen_qlistview.cpp b/qt/gen_qlistview.cpp index 296902c..d92b40e 100644 --- a/qt/gen_qlistview.cpp +++ b/qt/gen_qlistview.cpp @@ -36,13 +36,6 @@ struct miqt_string* QListView_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QListView_TrUtf8(const char* s) { - QString _ret = QListView::trUtf8(s); - // 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 QListView_SetMovement(QListView* self, int movement) { self->setMovement(static_cast(movement)); } @@ -237,20 +230,6 @@ struct miqt_string* QListView_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QListView_TrUtf82(const char* s, const char* c) { - QString _ret = QListView::trUtf8(s, c); - // 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* QListView_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QListView::trUtf8(s, c, static_cast(n)); - // 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 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 da5bcb7..dc95b51 100644 --- a/qt/gen_qlistview.go +++ b/qt/gen_qlistview.go @@ -104,15 +104,6 @@ func QListView_Tr(s string) string { return _ret } -func QListView_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QListView_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QListView) SetMovement(movement QListView__Movement) { C.QListView_SetMovement(this.h, (C.int)(movement)) } @@ -330,28 +321,6 @@ func QListView_Tr3(s string, c string, n int) string { return _ret } -func QListView_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QListView_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QListView_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QListView_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QListView) ScrollTo2(index *QModelIndex, hint QAbstractItemView__ScrollHint) { C.QListView_ScrollTo2(this.h, index.cPointer(), (C.int)(hint)) } diff --git a/qt/gen_qlistview.h b/qt/gen_qlistview.h index 0d27e7c..6ee267d 100644 --- a/qt/gen_qlistview.h +++ b/qt/gen_qlistview.h @@ -36,7 +36,6 @@ QListView* QListView_new2(QWidget* parent); QMetaObject* QListView_MetaObject(const QListView* self); void* QListView_Metacast(QListView* self, const char* param1); struct miqt_string* QListView_Tr(const char* s); -struct miqt_string* QListView_TrUtf8(const char* s); void QListView_SetMovement(QListView* self, int movement); int QListView_Movement(const QListView* self); void QListView_SetFlow(QListView* self, int flow); @@ -78,8 +77,6 @@ void QListView_IndexesMoved(QListView* self, struct miqt_array* /* of QModelInde void QListView_connect_IndexesMoved(QListView* self, void* slot); 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, int hint); void QListView_Delete(QListView* self); diff --git a/qt/gen_qlistwidget.cpp b/qt/gen_qlistwidget.cpp index 08ad2d9..62030ee 100644 --- a/qt/gen_qlistwidget.cpp +++ b/qt/gen_qlistwidget.cpp @@ -1,7 +1,5 @@ #include -#include #include -#include #include #include #include @@ -9,6 +7,8 @@ #include #include #include +#include +#include #include #include #include @@ -172,12 +172,12 @@ void QListWidgetItem_SetTextAlignment(QListWidgetItem* self, int alignment) { self->setTextAlignment(static_cast(alignment)); } -QColor* QListWidgetItem_BackgroundColor(const QListWidgetItem* self) { - return new QColor(self->backgroundColor()); +void QListWidgetItem_SetTextAlignmentWithAlignment(QListWidgetItem* self, int alignment) { + self->setTextAlignment(static_cast(alignment)); } -void QListWidgetItem_SetBackgroundColor(QListWidgetItem* self, QColor* color) { - self->setBackgroundColor(*color); +void QListWidgetItem_SetTextAlignment2(QListWidgetItem* self, int alignment) { + self->setTextAlignment(static_cast(alignment)); } QBrush* QListWidgetItem_Background(const QListWidgetItem* self) { @@ -188,14 +188,6 @@ void QListWidgetItem_SetBackground(QListWidgetItem* self, QBrush* brush) { self->setBackground(*brush); } -QColor* QListWidgetItem_TextColor(const QListWidgetItem* self) { - return new QColor(self->textColor()); -} - -void QListWidgetItem_SetTextColor(QListWidgetItem* self, QColor* color) { - self->setTextColor(*color); -} - QBrush* QListWidgetItem_Foreground(const QListWidgetItem* self) { return new QBrush(self->foreground()); } @@ -276,13 +268,6 @@ struct miqt_string* QListWidget_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QListWidget_TrUtf8(const char* s) { - QString _ret = QListWidget::trUtf8(s); - // 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 QListWidget_SetSelectionModel(QListWidget* self, QItemSelectionModel* selectionModel) { self->setSelectionModel(selectionModel); } @@ -419,14 +404,6 @@ void QListWidget_RemoveItemWidget(QListWidget* self, QListWidgetItem* item) { self->removeItemWidget(item); } -bool QListWidget_IsItemSelected(const QListWidget* self, QListWidgetItem* item) { - return self->isItemSelected(item); -} - -void QListWidget_SetItemSelected(QListWidget* self, QListWidgetItem* item, bool selectVal) { - self->setItemSelected(item, selectVal); -} - struct miqt_array* QListWidget_SelectedItems(const QListWidget* self) { QList _ret = self->selectedItems(); // Convert QList<> from C++ memory to manually-managed C memory @@ -454,16 +431,25 @@ struct miqt_array* QListWidget_FindItems(const QListWidget* self, struct miqt_st return _out; } -bool QListWidget_IsItemHidden(const QListWidget* self, QListWidgetItem* item) { - return self->isItemHidden(item); +struct miqt_array* QListWidget_Items(const QListWidget* self, QMimeData* data) { + QList _ret = self->items(data); + // 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) { + _arr[i] = _ret[i]; + } + struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); + _out->len = _ret.length(); + _out->data = static_cast(_arr); + return _out; } -void QListWidget_SetItemHidden(QListWidget* self, QListWidgetItem* item, bool hide) { - self->setItemHidden(item, hide); +QModelIndex* QListWidget_IndexFromItem(const QListWidget* self, QListWidgetItem* item) { + return new QModelIndex(self->indexFromItem(item)); } -void QListWidget_DropEvent(QListWidget* self, QDropEvent* event) { - self->dropEvent(event); +QListWidgetItem* QListWidget_ItemFromIndex(const QListWidget* self, QModelIndex* index) { + return self->itemFromIndex(*index); } void QListWidget_ScrollToItem(QListWidget* self, QListWidgetItem* item) { @@ -602,20 +588,6 @@ struct miqt_string* QListWidget_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QListWidget_TrUtf82(const char* s, const char* c) { - QString _ret = QListWidget::trUtf8(s, c); - // 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* QListWidget_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QListWidget::trUtf8(s, c, static_cast(n)); - // 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 QListWidget_SortItems1(QListWidget* self, int order) { self->sortItems(static_cast(order)); } diff --git a/qt/gen_qlistwidget.go b/qt/gen_qlistwidget.go index 1995e8b..ac07c20 100644 --- a/qt/gen_qlistwidget.go +++ b/qt/gen_qlistwidget.go @@ -229,15 +229,12 @@ func (this *QListWidgetItem) SetTextAlignment(alignment int) { C.QListWidgetItem_SetTextAlignment(this.h, (C.int)(alignment)) } -func (this *QListWidgetItem) BackgroundColor() *QColor { - _ret := C.QListWidgetItem_BackgroundColor(this.h) - _goptr := newQColor(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QListWidgetItem) SetTextAlignmentWithAlignment(alignment AlignmentFlag) { + C.QListWidgetItem_SetTextAlignmentWithAlignment(this.h, (C.int)(alignment)) } -func (this *QListWidgetItem) SetBackgroundColor(color *QColor) { - C.QListWidgetItem_SetBackgroundColor(this.h, color.cPointer()) +func (this *QListWidgetItem) SetTextAlignment2(alignment AlignmentFlag) { + C.QListWidgetItem_SetTextAlignment2(this.h, (C.int)(alignment)) } func (this *QListWidgetItem) Background() *QBrush { @@ -251,17 +248,6 @@ func (this *QListWidgetItem) SetBackground(brush *QBrush) { C.QListWidgetItem_SetBackground(this.h, brush.cPointer()) } -func (this *QListWidgetItem) TextColor() *QColor { - _ret := C.QListWidgetItem_TextColor(this.h) - _goptr := newQColor(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QListWidgetItem) SetTextColor(color *QColor) { - C.QListWidgetItem_SetTextColor(this.h, color.cPointer()) -} - func (this *QListWidgetItem) Foreground() *QBrush { _ret := C.QListWidgetItem_Foreground(this.h) _goptr := newQBrush(_ret) @@ -391,15 +377,6 @@ func QListWidget_Tr(s string) string { return _ret } -func QListWidget_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QListWidget_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QListWidget) SetSelectionModel(selectionModel *QItemSelectionModel) { C.QListWidget_SetSelectionModel(this.h, selectionModel.cPointer()) } @@ -547,14 +524,6 @@ func (this *QListWidget) RemoveItemWidget(item *QListWidgetItem) { C.QListWidget_RemoveItemWidget(this.h, item.cPointer()) } -func (this *QListWidget) IsItemSelected(item *QListWidgetItem) bool { - return (bool)(C.QListWidget_IsItemSelected(this.h, item.cPointer())) -} - -func (this *QListWidget) SetItemSelected(item *QListWidgetItem, selectVal bool) { - C.QListWidget_SetItemSelected(this.h, item.cPointer(), (C.bool)(selectVal)) -} - func (this *QListWidget) SelectedItems() []*QListWidgetItem { var _ma *C.struct_miqt_array = C.QListWidget_SelectedItems(this.h) _ret := make([]*QListWidgetItem, int(_ma.len)) @@ -579,16 +548,26 @@ func (this *QListWidget) FindItems(text string, flags MatchFlag) []*QListWidgetI return _ret } -func (this *QListWidget) IsItemHidden(item *QListWidgetItem) bool { - return (bool)(C.QListWidget_IsItemHidden(this.h, item.cPointer())) +func (this *QListWidget) Items(data *QMimeData) []*QListWidgetItem { + var _ma *C.struct_miqt_array = C.QListWidget_Items(this.h, data.cPointer()) + _ret := make([]*QListWidgetItem, int(_ma.len)) + _outCast := (*[0xffff]*C.QListWidgetItem)(unsafe.Pointer(_ma.data)) // hey ya + for i := 0; i < int(_ma.len); i++ { + _ret[i] = newQListWidgetItem_U(unsafe.Pointer(_outCast[i])) + } + C.free(unsafe.Pointer(_ma)) + return _ret } -func (this *QListWidget) SetItemHidden(item *QListWidgetItem, hide bool) { - C.QListWidget_SetItemHidden(this.h, item.cPointer(), (C.bool)(hide)) +func (this *QListWidget) IndexFromItem(item *QListWidgetItem) *QModelIndex { + _ret := C.QListWidget_IndexFromItem(this.h, item.cPointer()) + _goptr := newQModelIndex(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr } -func (this *QListWidget) DropEvent(event *QDropEvent) { - C.QListWidget_DropEvent(this.h, event.cPointer()) +func (this *QListWidget) ItemFromIndex(index *QModelIndex) *QListWidgetItem { + return newQListWidgetItem_U(unsafe.Pointer(C.QListWidget_ItemFromIndex(this.h, index.cPointer()))) } func (this *QListWidget) ScrollToItem(item *QListWidgetItem) { @@ -824,28 +803,6 @@ func QListWidget_Tr3(s string, c string, n int) string { return _ret } -func QListWidget_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QListWidget_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QListWidget_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QListWidget_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QListWidget) SortItems1(order SortOrder) { C.QListWidget_SortItems1(this.h, (C.int)(order)) } diff --git a/qt/gen_qlistwidget.h b/qt/gen_qlistwidget.h index 054b41b..80ff1c2 100644 --- a/qt/gen_qlistwidget.h +++ b/qt/gen_qlistwidget.h @@ -15,15 +15,15 @@ extern "C" { #ifdef __cplusplus class QBrush; -class QColor; class QDataStream; -class QDropEvent; class QFont; class QIcon; class QItemSelectionModel; class QListWidget; class QListWidgetItem; class QMetaObject; +class QMimeData; +class QModelIndex; class QPoint; class QRect; class QSize; @@ -31,15 +31,15 @@ class QVariant; class QWidget; #else typedef struct QBrush QBrush; -typedef struct QColor QColor; typedef struct QDataStream QDataStream; -typedef struct QDropEvent QDropEvent; typedef struct QFont QFont; typedef struct QIcon QIcon; typedef struct QItemSelectionModel QItemSelectionModel; typedef struct QListWidget QListWidget; typedef struct QListWidgetItem QListWidgetItem; typedef struct QMetaObject QMetaObject; +typedef struct QMimeData QMimeData; +typedef struct QModelIndex QModelIndex; typedef struct QPoint QPoint; typedef struct QRect QRect; typedef struct QSize QSize; @@ -79,12 +79,10 @@ QFont* QListWidgetItem_Font(const QListWidgetItem* self); void QListWidgetItem_SetFont(QListWidgetItem* self, QFont* font); int QListWidgetItem_TextAlignment(const QListWidgetItem* self); void QListWidgetItem_SetTextAlignment(QListWidgetItem* self, int alignment); -QColor* QListWidgetItem_BackgroundColor(const QListWidgetItem* self); -void QListWidgetItem_SetBackgroundColor(QListWidgetItem* self, QColor* color); +void QListWidgetItem_SetTextAlignmentWithAlignment(QListWidgetItem* self, int alignment); +void QListWidgetItem_SetTextAlignment2(QListWidgetItem* self, int alignment); QBrush* QListWidgetItem_Background(const QListWidgetItem* self); void QListWidgetItem_SetBackground(QListWidgetItem* self, QBrush* brush); -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); int QListWidgetItem_CheckState(const QListWidgetItem* self); @@ -105,7 +103,6 @@ QListWidget* QListWidget_new2(QWidget* parent); QMetaObject* QListWidget_MetaObject(const QListWidget* self); void* QListWidget_Metacast(QListWidget* self, const char* param1); struct miqt_string* QListWidget_Tr(const char* s); -struct miqt_string* QListWidget_TrUtf8(const char* s); void QListWidget_SetSelectionModel(QListWidget* self, QItemSelectionModel* selectionModel); QListWidgetItem* QListWidget_Item(const QListWidget* self, int row); int QListWidget_Row(const QListWidget* self, QListWidgetItem* item); @@ -136,13 +133,11 @@ bool QListWidget_IsPersistentEditorOpen(const QListWidget* self, QListWidgetItem QWidget* QListWidget_ItemWidget(const QListWidget* self, QListWidgetItem* item); void QListWidget_SetItemWidget(QListWidget* self, QListWidgetItem* item, QWidget* widget); void QListWidget_RemoveItemWidget(QListWidget* self, QListWidgetItem* item); -bool QListWidget_IsItemSelected(const QListWidget* self, QListWidgetItem* item); -void QListWidget_SetItemSelected(QListWidget* self, QListWidgetItem* item, bool selectVal); struct miqt_array* QListWidget_SelectedItems(const QListWidget* self); struct miqt_array* QListWidget_FindItems(const QListWidget* self, struct miqt_string* text, int flags); -bool QListWidget_IsItemHidden(const QListWidget* self, QListWidgetItem* item); -void QListWidget_SetItemHidden(QListWidget* self, QListWidgetItem* item, bool hide); -void QListWidget_DropEvent(QListWidget* self, QDropEvent* event); +struct miqt_array* QListWidget_Items(const QListWidget* self, QMimeData* data); +QModelIndex* QListWidget_IndexFromItem(const QListWidget* self, QListWidgetItem* item); +QListWidgetItem* QListWidget_ItemFromIndex(const QListWidget* self, QModelIndex* index); void QListWidget_ScrollToItem(QListWidget* self, QListWidgetItem* item); void QListWidget_Clear(QListWidget* self); void QListWidget_ItemPressed(QListWidget* self, QListWidgetItem* item); @@ -167,8 +162,6 @@ void QListWidget_ItemSelectionChanged(QListWidget* self); void QListWidget_connect_ItemSelectionChanged(QListWidget* self, void* slot); 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, int order); void QListWidget_ScrollToItem2(QListWidget* self, QListWidgetItem* item, int hint); void QListWidget_Delete(QListWidget* self); diff --git a/qt/gen_qlocale.cpp b/qt/gen_qlocale.cpp index b855bea..acd9cf0 100644 --- a/qt/gen_qlocale.cpp +++ b/qt/gen_qlocale.cpp @@ -1,5 +1,4 @@ #include -#include #include #include #include @@ -21,20 +20,24 @@ QLocale* QLocale_new2(struct miqt_string* name) { return new QLocale(name_QString); } -QLocale* QLocale_new3(int language) { - return new QLocale(static_cast(language)); +QLocale* QLocale_new3(uint16_t language, uint16_t territory) { + return new QLocale(static_cast(language), static_cast(territory)); } -QLocale* QLocale_new4(int language, int script, int country) { - return new QLocale(static_cast(language), static_cast(script), static_cast(country)); +QLocale* QLocale_new4(uint16_t language) { + return new QLocale(static_cast(language)); } QLocale* QLocale_new5(QLocale* other) { return new QLocale(*other); } -QLocale* QLocale_new6(int language, int country) { - return new QLocale(static_cast(language), static_cast(country)); +QLocale* QLocale_new6(uint16_t language, uint16_t script) { + return new QLocale(static_cast(language), static_cast(script)); +} + +QLocale* QLocale_new7(uint16_t language, uint16_t script, uint16_t territory) { + return new QLocale(static_cast(language), static_cast(script), static_cast(territory)); } void QLocale_OperatorAssign(QLocale* self, QLocale* other) { @@ -45,19 +48,24 @@ void QLocale_Swap(QLocale* self, QLocale* other) { self->swap(*other); } -int QLocale_Language(const QLocale* self) { +uint16_t QLocale_Language(const QLocale* self) { QLocale::Language _ret = self->language(); - return static_cast(_ret); + return static_cast(_ret); } -int QLocale_Script(const QLocale* self) { +uint16_t QLocale_Script(const QLocale* self) { QLocale::Script _ret = self->script(); - return static_cast(_ret); + return static_cast(_ret); } -int QLocale_Country(const QLocale* self) { +uint16_t QLocale_Territory(const QLocale* self) { + QLocale::Territory _ret = self->territory(); + return static_cast(_ret); +} + +uint16_t 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) { @@ -81,6 +89,13 @@ struct miqt_string* QLocale_NativeLanguageName(const QLocale* self) { return miqt_strdup(_b.data(), _b.length()); } +struct miqt_string* QLocale_NativeTerritoryName(const QLocale* self) { + QString _ret = self->nativeTerritoryName(); + // 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_NativeCountryName(const QLocale* self) { QString _ret = self->nativeCountryName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -199,31 +214,31 @@ struct miqt_string* QLocale_ToStringWithUint(const QLocale* self, unsigned int i return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QLocale_ToStringWithDouble(const QLocale* self, double i) { - QString _ret = self->toString(static_cast(i)); +struct miqt_string* QLocale_ToStringWithDouble(const QLocale* self, double 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(); return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QLocale_ToStringWithFloat(const QLocale* self, float i) { - QString _ret = self->toString(static_cast(i)); +struct miqt_string* QLocale_ToStringWithFloat(const QLocale* self, float 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(); return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QLocale_ToString2(const QLocale* self, QDate* date, struct miqt_string* formatStr) { - QString formatStr_QString = QString::fromUtf8(&formatStr->data, formatStr->len); - QString _ret = self->toString(*date, formatStr_QString); +struct miqt_string* QLocale_ToString2(const QLocale* self, QDate* date, struct miqt_string* format) { + QString format_QString = QString::fromUtf8(&format->data, format->len); + QString _ret = self->toString(*date, format_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()); } -struct miqt_string* QLocale_ToString3(const QLocale* self, QTime* time, struct miqt_string* formatStr) { - QString formatStr_QString = QString::fromUtf8(&formatStr->data, formatStr->len); - QString _ret = self->toString(*time, formatStr_QString); +struct miqt_string* QLocale_ToString3(const QLocale* self, QTime* time, struct miqt_string* format) { + QString format_QString = QString::fromUtf8(&format->data, format->len); + QString _ret = self->toString(*time, format_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()); @@ -348,43 +363,53 @@ 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, int format, QCalendar* cal) { - QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); - return new QTime(self->toTime(stringVal_QString, static_cast(format), *cal)); +struct miqt_string* QLocale_DecimalPoint(const QLocale* self) { + QString _ret = self->decimalPoint(); + // 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()); } -QTime* QLocale_ToTime4(const QLocale* self, struct miqt_string* stringVal, struct miqt_string* format, QCalendar* cal) { - QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); - QString format_QString = QString::fromUtf8(&format->data, format->len); - return new QTime(self->toTime(stringVal_QString, format_QString, *cal)); +struct miqt_string* QLocale_GroupSeparator(const QLocale* self) { + QString _ret = self->groupSeparator(); + // 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()); } -QChar* QLocale_DecimalPoint(const QLocale* self) { - return new QChar(self->decimalPoint()); +struct miqt_string* QLocale_Percent(const QLocale* self) { + QString _ret = self->percent(); + // 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()); } -QChar* QLocale_GroupSeparator(const QLocale* self) { - return new QChar(self->groupSeparator()); +struct miqt_string* QLocale_ZeroDigit(const QLocale* self) { + QString _ret = self->zeroDigit(); + // 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()); } -QChar* QLocale_Percent(const QLocale* self) { - return new QChar(self->percent()); +struct miqt_string* QLocale_NegativeSign(const QLocale* self) { + QString _ret = self->negativeSign(); + // 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()); } -QChar* QLocale_ZeroDigit(const QLocale* self) { - return new QChar(self->zeroDigit()); +struct miqt_string* QLocale_PositiveSign(const QLocale* self) { + QString _ret = self->positiveSign(); + // 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()); } -QChar* QLocale_NegativeSign(const QLocale* self) { - return new QChar(self->negativeSign()); -} - -QChar* QLocale_PositiveSign(const QLocale* self) { - return new QChar(self->positiveSign()); -} - -QChar* QLocale_Exponential(const QLocale* self) { - return new QChar(self->exponential()); +struct miqt_string* QLocale_Exponential(const QLocale* self) { + QString _ret = self->exponential(); + // 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_MonthName(const QLocale* self, int param1) { @@ -499,29 +524,29 @@ struct miqt_string* QLocale_ToCurrencyStringWithQulonglong(const QLocale* self, return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QLocale_ToCurrencyStringWithShort(const QLocale* self, int16_t param1) { - QString _ret = self->toCurrencyString(static_cast(param1)); +struct miqt_string* QLocale_ToCurrencyStringWithShort(const QLocale* self, int16_t i) { + QString _ret = self->toCurrencyString(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_ToCurrencyStringWithUshort(const QLocale* self, uint16_t param1) { - QString _ret = self->toCurrencyString(static_cast(param1)); +struct miqt_string* QLocale_ToCurrencyStringWithUshort(const QLocale* self, uint16_t i) { + QString _ret = self->toCurrencyString(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_ToCurrencyStringWithInt(const QLocale* self, int param1) { - QString _ret = self->toCurrencyString(static_cast(param1)); +struct miqt_string* QLocale_ToCurrencyStringWithInt(const QLocale* self, int i) { + QString _ret = self->toCurrencyString(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_ToCurrencyStringWithUint(const QLocale* self, unsigned int param1) { - QString _ret = self->toCurrencyString(static_cast(param1)); +struct miqt_string* QLocale_ToCurrencyStringWithUint(const QLocale* self, unsigned int i) { + QString _ret = self->toCurrencyString(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()); @@ -534,14 +559,6 @@ struct miqt_string* QLocale_ToCurrencyStringWithDouble(const QLocale* self, doub return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QLocale_ToCurrencyString2(const QLocale* self, double param1, struct miqt_string* symbol, int precision) { - QString symbol_QString = QString::fromUtf8(&symbol->data, symbol->len); - QString _ret = self->toCurrencyString(static_cast(param1), symbol_QString, static_cast(precision)); - // 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_ToCurrencyStringWithFloat(const QLocale* self, float i) { QString _ret = self->toCurrencyString(static_cast(i)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -549,22 +566,7 @@ struct miqt_string* QLocale_ToCurrencyStringWithFloat(const QLocale* self, float return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QLocale_ToCurrencyString3(const QLocale* self, float i, struct miqt_string* symbol, int precision) { - QString symbol_QString = QString::fromUtf8(&symbol->data, symbol->len); - QString _ret = self->toCurrencyString(static_cast(i), symbol_QString, static_cast(precision)); - // 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_FormattedDataSize(QLocale* self, long long bytes) { - QString _ret = self->formattedDataSize(static_cast(bytes)); - // 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_FormattedDataSizeWithBytes(const QLocale* self, long long bytes) { +struct miqt_string* QLocale_FormattedDataSize(const QLocale* self, long long bytes) { QString _ret = self->formattedDataSize(static_cast(bytes)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -587,29 +589,56 @@ struct miqt_array* QLocale_UiLanguages(const QLocale* self) { return _out; } -bool QLocale_OperatorEqual(const QLocale* self, QLocale* other) { - return self->operator==(*other); +struct miqt_string* QLocale_LanguageToCode(uint16_t language) { + QString _ret = QLocale::languageToCode(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()); } -bool QLocale_OperatorNotEqual(const QLocale* self, QLocale* other) { - return self->operator!=(*other); +struct miqt_string* QLocale_TerritoryToCode(uint16_t territory) { + QString _ret = QLocale::territoryToCode(static_cast(territory)); + // 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_LanguageToString(int language) { +struct miqt_string* QLocale_CountryToCode(uint16_t country) { + QString _ret = QLocale::countryToCode(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_ScriptToCode(uint16_t script) { + QString _ret = QLocale::scriptToCode(static_cast(script)); + // 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_LanguageToString(uint16_t 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(int country) { +struct miqt_string* QLocale_TerritoryToString(uint16_t territory) { + QString _ret = QLocale::territoryToString(static_cast(territory)); + // 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(uint16_t 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(int script) { +struct miqt_string* QLocale_ScriptToString(uint16_t 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(); @@ -628,8 +657,8 @@ QLocale* QLocale_System() { return new QLocale(QLocale::system()); } -struct miqt_array* QLocale_MatchingLocales(int language, int script, int country) { - QList _ret = QLocale::matchingLocales(static_cast(language), static_cast(script), static_cast(country)); +struct miqt_array* QLocale_MatchingLocales(uint16_t language, uint16_t script, uint16_t territory) { + QList _ret = QLocale::matchingLocales(static_cast(language), static_cast(script), static_cast(territory)); // Convert QList<> from C++ memory to manually-managed C memory QLocale** _arr = static_cast(malloc(sizeof(QLocale*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -641,13 +670,13 @@ struct miqt_array* QLocale_MatchingLocales(int language, int script, int country return _out; } -struct miqt_array* QLocale_CountriesForLanguage(int lang) { +struct miqt_array* QLocale_CountriesForLanguage(uint16_t lang) { QList _ret = QLocale::countriesForLanguage(static_cast(lang)); // Convert QList<> from C++ memory to manually-managed C memory - int* _arr = static_cast(malloc(sizeof(int) * _ret.length())); + uint16_t* _arr = static_cast(malloc(sizeof(uint16_t) * _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(); @@ -741,29 +770,29 @@ double QLocale_ToDouble2(const QLocale* self, struct miqt_string* s, bool* ok) { return self->toDouble(s_QString, ok); } -struct miqt_string* QLocale_ToString22(const QLocale* self, double i, char f) { - QString _ret = self->toString(static_cast(i), static_cast(f)); +struct miqt_string* QLocale_ToString22(const QLocale* self, double f, char format) { + QString _ret = self->toString(static_cast(f), 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_ToString32(const QLocale* self, double i, char f, int prec) { - QString _ret = self->toString(static_cast(i), static_cast(f), static_cast(prec)); +struct miqt_string* QLocale_ToString32(const QLocale* self, double f, char format, int precision) { + QString _ret = self->toString(static_cast(f), static_cast(format), static_cast(precision)); // 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_ToString23(const QLocale* self, float i, char f) { - QString _ret = self->toString(static_cast(i), static_cast(f)); +struct miqt_string* QLocale_ToString23(const QLocale* self, float f, char format) { + QString _ret = self->toString(static_cast(f), 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_ToString33(const QLocale* self, float i, char f, int prec) { - QString _ret = self->toString(static_cast(i), static_cast(f), static_cast(prec)); +struct miqt_string* QLocale_ToString33(const QLocale* self, float f, char format, int precision) { + QString _ret = self->toString(static_cast(f), static_cast(format), static_cast(precision)); // 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 +890,7 @@ struct miqt_string* QLocale_CurrencySymbol1(const QLocale* self, int param1) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QLocale_ToCurrencyString22(const QLocale* self, long long param1, struct miqt_string* symbol) { +struct miqt_string* QLocale_ToCurrencyString2(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); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -869,7 +898,7 @@ struct miqt_string* QLocale_ToCurrencyString22(const QLocale* self, long long pa return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QLocale_ToCurrencyString23(const QLocale* self, unsigned long long param1, struct miqt_string* symbol) { +struct miqt_string* QLocale_ToCurrencyString22(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); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -877,39 +906,39 @@ struct miqt_string* QLocale_ToCurrencyString23(const QLocale* self, unsigned lon return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QLocale_ToCurrencyString24(const QLocale* self, int16_t param1, struct miqt_string* symbol) { +struct miqt_string* QLocale_ToCurrencyString23(const QLocale* self, int16_t i, 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(i), 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()); } -struct miqt_string* QLocale_ToCurrencyString25(const QLocale* self, uint16_t param1, struct miqt_string* symbol) { +struct miqt_string* QLocale_ToCurrencyString24(const QLocale* self, uint16_t i, 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(i), 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()); } -struct miqt_string* QLocale_ToCurrencyString26(const QLocale* self, int param1, struct miqt_string* symbol) { +struct miqt_string* QLocale_ToCurrencyString25(const QLocale* self, int i, 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(i), 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()); } -struct miqt_string* QLocale_ToCurrencyString27(const QLocale* self, unsigned int param1, struct miqt_string* symbol) { +struct miqt_string* QLocale_ToCurrencyString26(const QLocale* self, unsigned int i, 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(i), 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()); } -struct miqt_string* QLocale_ToCurrencyString28(const QLocale* self, double param1, struct miqt_string* symbol) { +struct miqt_string* QLocale_ToCurrencyString27(const QLocale* self, double param1, struct miqt_string* symbol) { QString symbol_QString = QString::fromUtf8(&symbol->data, symbol->len); 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 @@ -917,7 +946,15 @@ struct miqt_string* QLocale_ToCurrencyString28(const QLocale* self, double param return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QLocale_ToCurrencyString29(const QLocale* self, float i, struct miqt_string* symbol) { +struct miqt_string* QLocale_ToCurrencyString3(const QLocale* self, double param1, struct miqt_string* symbol, int precision) { + QString symbol_QString = QString::fromUtf8(&symbol->data, symbol->len); + QString _ret = self->toCurrencyString(static_cast(param1), symbol_QString, static_cast(precision)); + // 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_ToCurrencyString28(const QLocale* self, float i, struct miqt_string* symbol) { QString symbol_QString = QString::fromUtf8(&symbol->data, symbol->len); QString _ret = self->toCurrencyString(static_cast(i), symbol_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -925,29 +962,30 @@ struct miqt_string* QLocale_ToCurrencyString29(const QLocale* self, float i, str return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QLocale_FormattedDataSize2(QLocale* self, long long bytes, int precision) { +struct miqt_string* QLocale_ToCurrencyString32(const QLocale* self, float i, struct miqt_string* symbol, int precision) { + QString symbol_QString = QString::fromUtf8(&symbol->data, symbol->len); + QString _ret = self->toCurrencyString(static_cast(i), symbol_QString, static_cast(precision)); + // 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_FormattedDataSize2(const QLocale* self, long long bytes, int precision) { QString _ret = self->formattedDataSize(static_cast(bytes), static_cast(precision)); // 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_FormattedDataSize3(QLocale* self, long long bytes, int precision, int format) { +struct miqt_string* QLocale_FormattedDataSize3(const QLocale* self, long long bytes, int precision, int format) { QString _ret = self->formattedDataSize(static_cast(bytes), static_cast(precision), 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_FormattedDataSize22(const QLocale* self, long long bytes, int precision) { - QString _ret = self->formattedDataSize(static_cast(bytes), static_cast(precision)); - // 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_FormattedDataSize32(const QLocale* self, long long bytes, int precision, int format) { - QString _ret = self->formattedDataSize(static_cast(bytes), static_cast(precision), static_cast(format)); +struct miqt_string* QLocale_LanguageToCode2(uint16_t language, int codeTypes) { + QString _ret = QLocale::languageToCode(static_cast(language), static_cast(codeTypes)); // 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()); diff --git a/qt/gen_qlocale.go b/qt/gen_qlocale.go index a0e940b..80e9a35 100644 --- a/qt/gen_qlocale.go +++ b/qt/gen_qlocale.go @@ -13,821 +13,804 @@ import ( "unsafe" ) -type QLocale__Language int +type QLocale__Language uint16 const ( QLocale__AnyLanguage QLocale__Language = 0 QLocale__C QLocale__Language = 1 QLocale__Abkhazian QLocale__Language = 2 - QLocale__Oromo QLocale__Language = 3 - QLocale__Afar QLocale__Language = 4 - QLocale__Afrikaans QLocale__Language = 5 - QLocale__Albanian QLocale__Language = 6 - QLocale__Amharic QLocale__Language = 7 - QLocale__Arabic QLocale__Language = 8 - QLocale__Armenian QLocale__Language = 9 - QLocale__Assamese QLocale__Language = 10 - QLocale__Aymara QLocale__Language = 11 - QLocale__Azerbaijani QLocale__Language = 12 - QLocale__Bashkir QLocale__Language = 13 - QLocale__Basque QLocale__Language = 14 - QLocale__Bengali QLocale__Language = 15 - QLocale__Dzongkha QLocale__Language = 16 - QLocale__Bihari QLocale__Language = 17 - QLocale__Bislama QLocale__Language = 18 - QLocale__Breton QLocale__Language = 19 - QLocale__Bulgarian QLocale__Language = 20 - QLocale__Burmese QLocale__Language = 21 - QLocale__Belarusian QLocale__Language = 22 - QLocale__Khmer QLocale__Language = 23 - QLocale__Catalan QLocale__Language = 24 - QLocale__Chinese QLocale__Language = 25 - QLocale__Corsican QLocale__Language = 26 - QLocale__Croatian QLocale__Language = 27 - QLocale__Czech QLocale__Language = 28 - QLocale__Danish QLocale__Language = 29 - QLocale__Dutch QLocale__Language = 30 - QLocale__English QLocale__Language = 31 - QLocale__Esperanto QLocale__Language = 32 - QLocale__Estonian QLocale__Language = 33 - QLocale__Faroese QLocale__Language = 34 - QLocale__Fijian QLocale__Language = 35 - QLocale__Finnish QLocale__Language = 36 - QLocale__French QLocale__Language = 37 - QLocale__WesternFrisian QLocale__Language = 38 - QLocale__Gaelic QLocale__Language = 39 - QLocale__Galician QLocale__Language = 40 - QLocale__Georgian QLocale__Language = 41 - QLocale__German QLocale__Language = 42 - QLocale__Greek QLocale__Language = 43 - QLocale__Greenlandic QLocale__Language = 44 - QLocale__Guarani QLocale__Language = 45 - QLocale__Gujarati QLocale__Language = 46 - QLocale__Hausa QLocale__Language = 47 - QLocale__Hebrew QLocale__Language = 48 - QLocale__Hindi QLocale__Language = 49 - QLocale__Hungarian QLocale__Language = 50 - QLocale__Icelandic QLocale__Language = 51 - QLocale__Indonesian QLocale__Language = 52 - QLocale__Interlingua QLocale__Language = 53 - QLocale__Interlingue QLocale__Language = 54 - QLocale__Inuktitut QLocale__Language = 55 - QLocale__Inupiak QLocale__Language = 56 - QLocale__Irish QLocale__Language = 57 - QLocale__Italian QLocale__Language = 58 - QLocale__Japanese QLocale__Language = 59 - QLocale__Javanese QLocale__Language = 60 - QLocale__Kannada QLocale__Language = 61 - QLocale__Kashmiri QLocale__Language = 62 - QLocale__Kazakh QLocale__Language = 63 - QLocale__Kinyarwanda QLocale__Language = 64 - QLocale__Kirghiz QLocale__Language = 65 - QLocale__Korean QLocale__Language = 66 - QLocale__Kurdish QLocale__Language = 67 - QLocale__Rundi QLocale__Language = 68 - QLocale__Lao QLocale__Language = 69 - QLocale__Latin QLocale__Language = 70 - QLocale__Latvian QLocale__Language = 71 - QLocale__Lingala QLocale__Language = 72 - QLocale__Lithuanian QLocale__Language = 73 - QLocale__Macedonian QLocale__Language = 74 - QLocale__Malagasy QLocale__Language = 75 - QLocale__Malay QLocale__Language = 76 - QLocale__Malayalam QLocale__Language = 77 - QLocale__Maltese QLocale__Language = 78 - QLocale__Maori QLocale__Language = 79 - QLocale__Marathi QLocale__Language = 80 - QLocale__Marshallese QLocale__Language = 81 - QLocale__Mongolian QLocale__Language = 82 - QLocale__NauruLanguage QLocale__Language = 83 - QLocale__Nepali QLocale__Language = 84 - QLocale__NorwegianBokmal QLocale__Language = 85 - QLocale__Occitan QLocale__Language = 86 - QLocale__Oriya QLocale__Language = 87 - QLocale__Pashto QLocale__Language = 88 - QLocale__Persian QLocale__Language = 89 - QLocale__Polish QLocale__Language = 90 - QLocale__Portuguese QLocale__Language = 91 - QLocale__Punjabi QLocale__Language = 92 - QLocale__Quechua QLocale__Language = 93 - QLocale__Romansh QLocale__Language = 94 - QLocale__Romanian QLocale__Language = 95 - QLocale__Russian QLocale__Language = 96 - QLocale__Samoan QLocale__Language = 97 - QLocale__Sango QLocale__Language = 98 - QLocale__Sanskrit QLocale__Language = 99 - QLocale__Serbian QLocale__Language = 100 - QLocale__Ossetic QLocale__Language = 101 - QLocale__SouthernSotho QLocale__Language = 102 - QLocale__Tswana QLocale__Language = 103 - QLocale__Shona QLocale__Language = 104 - QLocale__Sindhi QLocale__Language = 105 - QLocale__Sinhala QLocale__Language = 106 - QLocale__Swati QLocale__Language = 107 - QLocale__Slovak QLocale__Language = 108 - QLocale__Slovenian QLocale__Language = 109 - QLocale__Somali QLocale__Language = 110 - QLocale__Spanish QLocale__Language = 111 - QLocale__Sundanese QLocale__Language = 112 - QLocale__Swahili QLocale__Language = 113 - QLocale__Swedish QLocale__Language = 114 - QLocale__Sardinian QLocale__Language = 115 - QLocale__Tajik QLocale__Language = 116 - QLocale__Tamil QLocale__Language = 117 - QLocale__Tatar QLocale__Language = 118 - QLocale__Telugu QLocale__Language = 119 - QLocale__Thai QLocale__Language = 120 - QLocale__Tibetan QLocale__Language = 121 - QLocale__Tigrinya QLocale__Language = 122 - QLocale__Tongan QLocale__Language = 123 - QLocale__Tsonga QLocale__Language = 124 - QLocale__Turkish QLocale__Language = 125 - QLocale__Turkmen QLocale__Language = 126 - QLocale__Tahitian QLocale__Language = 127 - QLocale__Uighur QLocale__Language = 128 - QLocale__Ukrainian QLocale__Language = 129 - QLocale__Urdu QLocale__Language = 130 - QLocale__Uzbek QLocale__Language = 131 - QLocale__Vietnamese QLocale__Language = 132 - QLocale__Volapuk QLocale__Language = 133 - QLocale__Welsh QLocale__Language = 134 - QLocale__Wolof QLocale__Language = 135 - QLocale__Xhosa QLocale__Language = 136 - QLocale__Yiddish QLocale__Language = 137 - QLocale__Yoruba QLocale__Language = 138 - QLocale__Zhuang QLocale__Language = 139 - QLocale__Zulu QLocale__Language = 140 - QLocale__NorwegianNynorsk QLocale__Language = 141 - QLocale__Bosnian QLocale__Language = 142 - QLocale__Divehi QLocale__Language = 143 - QLocale__Manx QLocale__Language = 144 - QLocale__Cornish QLocale__Language = 145 - QLocale__Akan QLocale__Language = 146 - QLocale__Konkani QLocale__Language = 147 - QLocale__Ga QLocale__Language = 148 - QLocale__Igbo QLocale__Language = 149 - QLocale__Kamba QLocale__Language = 150 - QLocale__Syriac QLocale__Language = 151 - QLocale__Blin QLocale__Language = 152 - QLocale__Geez QLocale__Language = 153 - QLocale__Koro QLocale__Language = 154 - QLocale__Sidamo QLocale__Language = 155 - QLocale__Atsam QLocale__Language = 156 - QLocale__Tigre QLocale__Language = 157 - QLocale__Jju QLocale__Language = 158 - QLocale__Friulian QLocale__Language = 159 - QLocale__Venda QLocale__Language = 160 - QLocale__Ewe QLocale__Language = 161 - QLocale__Walamo QLocale__Language = 162 - QLocale__Hawaiian QLocale__Language = 163 - QLocale__Tyap QLocale__Language = 164 - QLocale__Nyanja QLocale__Language = 165 - QLocale__Filipino QLocale__Language = 166 - QLocale__SwissGerman QLocale__Language = 167 - QLocale__SichuanYi QLocale__Language = 168 - QLocale__Kpelle QLocale__Language = 169 - QLocale__LowGerman QLocale__Language = 170 - QLocale__SouthNdebele QLocale__Language = 171 - QLocale__NorthernSotho QLocale__Language = 172 - QLocale__NorthernSami QLocale__Language = 173 - QLocale__Taroko QLocale__Language = 174 - QLocale__Gusii QLocale__Language = 175 - QLocale__Taita QLocale__Language = 176 - QLocale__Fulah QLocale__Language = 177 - QLocale__Kikuyu QLocale__Language = 178 - QLocale__Samburu QLocale__Language = 179 - QLocale__Sena QLocale__Language = 180 - QLocale__NorthNdebele QLocale__Language = 181 - QLocale__Rombo QLocale__Language = 182 - QLocale__Tachelhit QLocale__Language = 183 - QLocale__Kabyle QLocale__Language = 184 - QLocale__Nyankole QLocale__Language = 185 - QLocale__Bena QLocale__Language = 186 - QLocale__Vunjo QLocale__Language = 187 - QLocale__Bambara QLocale__Language = 188 - QLocale__Embu QLocale__Language = 189 - QLocale__Cherokee QLocale__Language = 190 - QLocale__Morisyen QLocale__Language = 191 - QLocale__Makonde QLocale__Language = 192 - QLocale__Langi QLocale__Language = 193 - QLocale__Ganda QLocale__Language = 194 - QLocale__Bemba QLocale__Language = 195 - QLocale__Kabuverdianu QLocale__Language = 196 - QLocale__Meru QLocale__Language = 197 - QLocale__Kalenjin QLocale__Language = 198 - QLocale__Nama QLocale__Language = 199 - QLocale__Machame QLocale__Language = 200 - QLocale__Colognian QLocale__Language = 201 - QLocale__Masai QLocale__Language = 202 - QLocale__Soga QLocale__Language = 203 - QLocale__Luyia QLocale__Language = 204 - QLocale__Asu QLocale__Language = 205 - QLocale__Teso QLocale__Language = 206 - QLocale__Saho QLocale__Language = 207 - QLocale__KoyraChiini QLocale__Language = 208 - QLocale__Rwa QLocale__Language = 209 - QLocale__Luo QLocale__Language = 210 - QLocale__Chiga QLocale__Language = 211 - QLocale__CentralMoroccoTamazight QLocale__Language = 212 - QLocale__KoyraboroSenni QLocale__Language = 213 - QLocale__Shambala QLocale__Language = 214 - QLocale__Bodo QLocale__Language = 215 - QLocale__Avaric QLocale__Language = 216 - QLocale__Chamorro QLocale__Language = 217 - QLocale__Chechen QLocale__Language = 218 - QLocale__Church QLocale__Language = 219 - QLocale__Chuvash QLocale__Language = 220 - QLocale__Cree QLocale__Language = 221 - QLocale__Haitian QLocale__Language = 222 - QLocale__Herero QLocale__Language = 223 - QLocale__HiriMotu QLocale__Language = 224 - QLocale__Kanuri QLocale__Language = 225 - QLocale__Komi QLocale__Language = 226 - QLocale__Kongo QLocale__Language = 227 - QLocale__Kwanyama QLocale__Language = 228 - QLocale__Limburgish QLocale__Language = 229 - QLocale__LubaKatanga QLocale__Language = 230 - QLocale__Luxembourgish QLocale__Language = 231 - QLocale__Navaho QLocale__Language = 232 - QLocale__Ndonga QLocale__Language = 233 - QLocale__Ojibwa QLocale__Language = 234 - QLocale__Pali QLocale__Language = 235 - QLocale__Walloon QLocale__Language = 236 - QLocale__Aghem QLocale__Language = 237 - QLocale__Basaa QLocale__Language = 238 - QLocale__Zarma QLocale__Language = 239 - QLocale__Duala QLocale__Language = 240 - QLocale__JolaFonyi QLocale__Language = 241 - QLocale__Ewondo QLocale__Language = 242 - QLocale__Bafia QLocale__Language = 243 - QLocale__MakhuwaMeetto QLocale__Language = 244 - QLocale__Mundang QLocale__Language = 245 - QLocale__Kwasio QLocale__Language = 246 - QLocale__Nuer QLocale__Language = 247 - QLocale__Sakha QLocale__Language = 248 - QLocale__Sangu QLocale__Language = 249 - QLocale__CongoSwahili QLocale__Language = 250 - QLocale__Tasawaq QLocale__Language = 251 - QLocale__Vai QLocale__Language = 252 - QLocale__Walser QLocale__Language = 253 - QLocale__Yangben QLocale__Language = 254 - QLocale__Avestan QLocale__Language = 255 - QLocale__Asturian QLocale__Language = 256 - QLocale__Ngomba QLocale__Language = 257 - QLocale__Kako QLocale__Language = 258 - QLocale__Meta QLocale__Language = 259 - QLocale__Ngiemboon QLocale__Language = 260 - QLocale__Aragonese QLocale__Language = 261 - QLocale__Akkadian QLocale__Language = 262 - QLocale__AncientEgyptian QLocale__Language = 263 - QLocale__AncientGreek QLocale__Language = 264 - QLocale__Aramaic QLocale__Language = 265 - QLocale__Balinese QLocale__Language = 266 - QLocale__Bamun QLocale__Language = 267 - QLocale__BatakToba QLocale__Language = 268 - QLocale__Buginese QLocale__Language = 269 - QLocale__Buhid QLocale__Language = 270 - QLocale__Carian QLocale__Language = 271 - QLocale__Chakma QLocale__Language = 272 - QLocale__ClassicalMandaic QLocale__Language = 273 - QLocale__Coptic QLocale__Language = 274 - QLocale__Dogri QLocale__Language = 275 - QLocale__EasternCham QLocale__Language = 276 - QLocale__EasternKayah QLocale__Language = 277 - QLocale__Etruscan QLocale__Language = 278 - QLocale__Gothic QLocale__Language = 279 - QLocale__Hanunoo QLocale__Language = 280 - QLocale__Ingush QLocale__Language = 281 - QLocale__LargeFloweryMiao QLocale__Language = 282 - QLocale__Lepcha QLocale__Language = 283 - QLocale__Limbu QLocale__Language = 284 - QLocale__Lisu QLocale__Language = 285 - QLocale__Lu QLocale__Language = 286 - QLocale__Lycian QLocale__Language = 287 - QLocale__Lydian QLocale__Language = 288 - QLocale__Mandingo QLocale__Language = 289 - QLocale__Manipuri QLocale__Language = 290 - QLocale__Meroitic QLocale__Language = 291 - QLocale__NorthernThai QLocale__Language = 292 - QLocale__OldIrish QLocale__Language = 293 - QLocale__OldNorse QLocale__Language = 294 - QLocale__OldPersian QLocale__Language = 295 - QLocale__OldTurkish QLocale__Language = 296 - QLocale__Pahlavi QLocale__Language = 297 - QLocale__Parthian QLocale__Language = 298 - QLocale__Phoenician QLocale__Language = 299 - QLocale__PrakritLanguage QLocale__Language = 300 - QLocale__Rejang QLocale__Language = 301 - QLocale__Sabaean QLocale__Language = 302 - QLocale__Samaritan QLocale__Language = 303 - QLocale__Santali QLocale__Language = 304 - QLocale__Saurashtra QLocale__Language = 305 - QLocale__Sora QLocale__Language = 306 - QLocale__Sylheti QLocale__Language = 307 - QLocale__Tagbanwa QLocale__Language = 308 - QLocale__TaiDam QLocale__Language = 309 - QLocale__TaiNua QLocale__Language = 310 - QLocale__Ugaritic QLocale__Language = 311 - QLocale__Akoose QLocale__Language = 312 - QLocale__Lakota QLocale__Language = 313 - QLocale__StandardMoroccanTamazight QLocale__Language = 314 - QLocale__Mapuche QLocale__Language = 315 - QLocale__CentralKurdish QLocale__Language = 316 - QLocale__LowerSorbian QLocale__Language = 317 - QLocale__UpperSorbian QLocale__Language = 318 - QLocale__Kenyang QLocale__Language = 319 - QLocale__Mohawk QLocale__Language = 320 - QLocale__Nko QLocale__Language = 321 - QLocale__Prussian QLocale__Language = 322 - QLocale__Kiche QLocale__Language = 323 - QLocale__SouthernSami QLocale__Language = 324 - QLocale__LuleSami QLocale__Language = 325 - QLocale__InariSami QLocale__Language = 326 - QLocale__SkoltSami QLocale__Language = 327 - QLocale__Warlpiri QLocale__Language = 328 - QLocale__ManichaeanMiddlePersian QLocale__Language = 329 - QLocale__Mende QLocale__Language = 330 - QLocale__AncientNorthArabian QLocale__Language = 331 - QLocale__LinearA QLocale__Language = 332 - QLocale__HmongNjua QLocale__Language = 333 - QLocale__Ho QLocale__Language = 334 - QLocale__Lezghian QLocale__Language = 335 - QLocale__Bassa QLocale__Language = 336 - QLocale__Mono QLocale__Language = 337 - QLocale__TedimChin QLocale__Language = 338 - QLocale__Maithili QLocale__Language = 339 - QLocale__Ahom QLocale__Language = 340 - QLocale__AmericanSignLanguage QLocale__Language = 341 - QLocale__ArdhamagadhiPrakrit QLocale__Language = 342 - QLocale__Bhojpuri QLocale__Language = 343 - QLocale__HieroglyphicLuwian QLocale__Language = 344 - QLocale__LiteraryChinese QLocale__Language = 345 - QLocale__Mazanderani QLocale__Language = 346 - QLocale__Mru QLocale__Language = 347 - QLocale__Newari QLocale__Language = 348 - QLocale__NorthernLuri QLocale__Language = 349 - QLocale__Palauan QLocale__Language = 350 - QLocale__Papiamento QLocale__Language = 351 - QLocale__Saraiki QLocale__Language = 352 - QLocale__TokelauLanguage QLocale__Language = 353 - QLocale__TokPisin QLocale__Language = 354 - QLocale__TuvaluLanguage QLocale__Language = 355 - QLocale__UncodedLanguages QLocale__Language = 356 - QLocale__Cantonese QLocale__Language = 357 - QLocale__Osage QLocale__Language = 358 - QLocale__Tangut QLocale__Language = 359 - QLocale__Ido QLocale__Language = 360 - QLocale__Lojban QLocale__Language = 361 - QLocale__Sicilian QLocale__Language = 362 - QLocale__SouthernKurdish QLocale__Language = 363 - QLocale__WesternBalochi QLocale__Language = 364 - QLocale__Cebuano QLocale__Language = 365 - QLocale__Erzya QLocale__Language = 366 - QLocale__Chickasaw QLocale__Language = 367 - QLocale__Muscogee QLocale__Language = 368 - QLocale__Silesian QLocale__Language = 369 - QLocale__NigerianPidgin QLocale__Language = 370 - QLocale__Afan QLocale__Language = 3 - QLocale__Bhutani QLocale__Language = 16 - QLocale__Byelorussian QLocale__Language = 22 - QLocale__Cambodian QLocale__Language = 23 - QLocale__Chewa QLocale__Language = 165 - QLocale__Frisian QLocale__Language = 38 - QLocale__Kurundi QLocale__Language = 68 - QLocale__Moldavian QLocale__Language = 95 - QLocale__Norwegian QLocale__Language = 85 - QLocale__RhaetoRomance QLocale__Language = 94 - QLocale__SerboCroatian QLocale__Language = 100 - QLocale__Tagalog QLocale__Language = 166 - QLocale__Twi QLocale__Language = 146 - QLocale__Uigur QLocale__Language = 128 - QLocale__LastLanguage QLocale__Language = 370 + QLocale__Afar QLocale__Language = 3 + QLocale__Afrikaans QLocale__Language = 4 + QLocale__Aghem QLocale__Language = 5 + QLocale__Akan QLocale__Language = 6 + QLocale__Akkadian QLocale__Language = 7 + QLocale__Akoose QLocale__Language = 8 + QLocale__Albanian QLocale__Language = 9 + QLocale__AmericanSignLanguage QLocale__Language = 10 + QLocale__Amharic QLocale__Language = 11 + QLocale__AncientEgyptian QLocale__Language = 12 + QLocale__AncientGreek QLocale__Language = 13 + QLocale__Arabic QLocale__Language = 14 + QLocale__Aragonese QLocale__Language = 15 + QLocale__Aramaic QLocale__Language = 16 + QLocale__Armenian QLocale__Language = 17 + QLocale__Assamese QLocale__Language = 18 + QLocale__Asturian QLocale__Language = 19 + QLocale__Asu QLocale__Language = 20 + QLocale__Atsam QLocale__Language = 21 + QLocale__Avaric QLocale__Language = 22 + QLocale__Avestan QLocale__Language = 23 + QLocale__Aymara QLocale__Language = 24 + QLocale__Azerbaijani QLocale__Language = 25 + QLocale__Bafia QLocale__Language = 26 + QLocale__Balinese QLocale__Language = 27 + QLocale__Bambara QLocale__Language = 28 + QLocale__Bamun QLocale__Language = 29 + QLocale__Bangla QLocale__Language = 30 + QLocale__Basaa QLocale__Language = 31 + QLocale__Bashkir QLocale__Language = 32 + QLocale__Basque QLocale__Language = 33 + QLocale__BatakToba QLocale__Language = 34 + QLocale__Belarusian QLocale__Language = 35 + QLocale__Bemba QLocale__Language = 36 + QLocale__Bena QLocale__Language = 37 + QLocale__Bhojpuri QLocale__Language = 38 + QLocale__Bislama QLocale__Language = 39 + QLocale__Blin QLocale__Language = 40 + QLocale__Bodo QLocale__Language = 41 + QLocale__Bosnian QLocale__Language = 42 + QLocale__Breton QLocale__Language = 43 + QLocale__Buginese QLocale__Language = 44 + QLocale__Bulgarian QLocale__Language = 45 + QLocale__Burmese QLocale__Language = 46 + QLocale__Cantonese QLocale__Language = 47 + QLocale__Catalan QLocale__Language = 48 + QLocale__Cebuano QLocale__Language = 49 + QLocale__CentralAtlasTamazight QLocale__Language = 50 + QLocale__CentralKurdish QLocale__Language = 51 + QLocale__Chakma QLocale__Language = 52 + QLocale__Chamorro QLocale__Language = 53 + QLocale__Chechen QLocale__Language = 54 + QLocale__Cherokee QLocale__Language = 55 + QLocale__Chickasaw QLocale__Language = 56 + QLocale__Chiga QLocale__Language = 57 + QLocale__Chinese QLocale__Language = 58 + QLocale__Church QLocale__Language = 59 + QLocale__Chuvash QLocale__Language = 60 + QLocale__Colognian QLocale__Language = 61 + QLocale__Coptic QLocale__Language = 62 + QLocale__Cornish QLocale__Language = 63 + QLocale__Corsican QLocale__Language = 64 + QLocale__Cree QLocale__Language = 65 + QLocale__Croatian QLocale__Language = 66 + QLocale__Czech QLocale__Language = 67 + QLocale__Danish QLocale__Language = 68 + QLocale__Divehi QLocale__Language = 69 + QLocale__Dogri QLocale__Language = 70 + QLocale__Duala QLocale__Language = 71 + QLocale__Dutch QLocale__Language = 72 + QLocale__Dzongkha QLocale__Language = 73 + QLocale__Embu QLocale__Language = 74 + QLocale__English QLocale__Language = 75 + QLocale__Erzya QLocale__Language = 76 + QLocale__Esperanto QLocale__Language = 77 + QLocale__Estonian QLocale__Language = 78 + QLocale__Ewe QLocale__Language = 79 + QLocale__Ewondo QLocale__Language = 80 + QLocale__Faroese QLocale__Language = 81 + QLocale__Fijian QLocale__Language = 82 + QLocale__Filipino QLocale__Language = 83 + QLocale__Finnish QLocale__Language = 84 + QLocale__French QLocale__Language = 85 + QLocale__Friulian QLocale__Language = 86 + QLocale__Fulah QLocale__Language = 87 + QLocale__Gaelic QLocale__Language = 88 + QLocale__Ga QLocale__Language = 89 + QLocale__Galician QLocale__Language = 90 + QLocale__Ganda QLocale__Language = 91 + QLocale__Geez QLocale__Language = 92 + QLocale__Georgian QLocale__Language = 93 + QLocale__German QLocale__Language = 94 + QLocale__Gothic QLocale__Language = 95 + QLocale__Greek QLocale__Language = 96 + QLocale__Guarani QLocale__Language = 97 + QLocale__Gujarati QLocale__Language = 98 + QLocale__Gusii QLocale__Language = 99 + QLocale__Haitian QLocale__Language = 100 + QLocale__Hausa QLocale__Language = 101 + QLocale__Hawaiian QLocale__Language = 102 + QLocale__Hebrew QLocale__Language = 103 + QLocale__Herero QLocale__Language = 104 + QLocale__Hindi QLocale__Language = 105 + QLocale__HiriMotu QLocale__Language = 106 + QLocale__Hungarian QLocale__Language = 107 + QLocale__Icelandic QLocale__Language = 108 + QLocale__Ido QLocale__Language = 109 + QLocale__Igbo QLocale__Language = 110 + QLocale__InariSami QLocale__Language = 111 + QLocale__Indonesian QLocale__Language = 112 + QLocale__Ingush QLocale__Language = 113 + QLocale__Interlingua QLocale__Language = 114 + QLocale__Interlingue QLocale__Language = 115 + QLocale__Inuktitut QLocale__Language = 116 + QLocale__Inupiaq QLocale__Language = 117 + QLocale__Irish QLocale__Language = 118 + QLocale__Italian QLocale__Language = 119 + QLocale__Japanese QLocale__Language = 120 + QLocale__Javanese QLocale__Language = 121 + QLocale__Jju QLocale__Language = 122 + QLocale__JolaFonyi QLocale__Language = 123 + QLocale__Kabuverdianu QLocale__Language = 124 + QLocale__Kabyle QLocale__Language = 125 + QLocale__Kako QLocale__Language = 126 + QLocale__Kalaallisut QLocale__Language = 127 + QLocale__Kalenjin QLocale__Language = 128 + QLocale__Kamba QLocale__Language = 129 + QLocale__Kannada QLocale__Language = 130 + QLocale__Kanuri QLocale__Language = 131 + QLocale__Kashmiri QLocale__Language = 132 + QLocale__Kazakh QLocale__Language = 133 + QLocale__Kenyang QLocale__Language = 134 + QLocale__Khmer QLocale__Language = 135 + QLocale__Kiche QLocale__Language = 136 + QLocale__Kikuyu QLocale__Language = 137 + QLocale__Kinyarwanda QLocale__Language = 138 + QLocale__Komi QLocale__Language = 139 + QLocale__Kongo QLocale__Language = 140 + QLocale__Konkani QLocale__Language = 141 + QLocale__Korean QLocale__Language = 142 + QLocale__Koro QLocale__Language = 143 + QLocale__KoyraboroSenni QLocale__Language = 144 + QLocale__KoyraChiini QLocale__Language = 145 + QLocale__Kpelle QLocale__Language = 146 + QLocale__Kuanyama QLocale__Language = 147 + QLocale__Kurdish QLocale__Language = 148 + QLocale__Kwasio QLocale__Language = 149 + QLocale__Kyrgyz QLocale__Language = 150 + QLocale__Lakota QLocale__Language = 151 + QLocale__Langi QLocale__Language = 152 + QLocale__Lao QLocale__Language = 153 + QLocale__Latin QLocale__Language = 154 + QLocale__Latvian QLocale__Language = 155 + QLocale__Lezghian QLocale__Language = 156 + QLocale__Limburgish QLocale__Language = 157 + QLocale__Lingala QLocale__Language = 158 + QLocale__LiteraryChinese QLocale__Language = 159 + QLocale__Lithuanian QLocale__Language = 160 + QLocale__Lojban QLocale__Language = 161 + QLocale__LowerSorbian QLocale__Language = 162 + QLocale__LowGerman QLocale__Language = 163 + QLocale__LubaKatanga QLocale__Language = 164 + QLocale__LuleSami QLocale__Language = 165 + QLocale__Luo QLocale__Language = 166 + QLocale__Luxembourgish QLocale__Language = 167 + QLocale__Luyia QLocale__Language = 168 + QLocale__Macedonian QLocale__Language = 169 + QLocale__Machame QLocale__Language = 170 + QLocale__Maithili QLocale__Language = 171 + QLocale__MakhuwaMeetto QLocale__Language = 172 + QLocale__Makonde QLocale__Language = 173 + QLocale__Malagasy QLocale__Language = 174 + QLocale__Malayalam QLocale__Language = 175 + QLocale__Malay QLocale__Language = 176 + QLocale__Maltese QLocale__Language = 177 + QLocale__Mandingo QLocale__Language = 178 + QLocale__Manipuri QLocale__Language = 179 + QLocale__Manx QLocale__Language = 180 + QLocale__Maori QLocale__Language = 181 + QLocale__Mapuche QLocale__Language = 182 + QLocale__Marathi QLocale__Language = 183 + QLocale__Marshallese QLocale__Language = 184 + QLocale__Masai QLocale__Language = 185 + QLocale__Mazanderani QLocale__Language = 186 + QLocale__Mende QLocale__Language = 187 + QLocale__Meru QLocale__Language = 188 + QLocale__Meta QLocale__Language = 189 + QLocale__Mohawk QLocale__Language = 190 + QLocale__Mongolian QLocale__Language = 191 + QLocale__Morisyen QLocale__Language = 192 + QLocale__Mundang QLocale__Language = 193 + QLocale__Muscogee QLocale__Language = 194 + QLocale__Nama QLocale__Language = 195 + QLocale__NauruLanguage QLocale__Language = 196 + QLocale__Navajo QLocale__Language = 197 + QLocale__Ndonga QLocale__Language = 198 + QLocale__Nepali QLocale__Language = 199 + QLocale__Newari QLocale__Language = 200 + QLocale__Ngiemboon QLocale__Language = 201 + QLocale__Ngomba QLocale__Language = 202 + QLocale__NigerianPidgin QLocale__Language = 203 + QLocale__Nko QLocale__Language = 204 + QLocale__NorthernLuri QLocale__Language = 205 + QLocale__NorthernSami QLocale__Language = 206 + QLocale__NorthernSotho QLocale__Language = 207 + QLocale__NorthNdebele QLocale__Language = 208 + QLocale__NorwegianBokmal QLocale__Language = 209 + QLocale__NorwegianNynorsk QLocale__Language = 210 + QLocale__Nuer QLocale__Language = 211 + QLocale__Nyanja QLocale__Language = 212 + QLocale__Nyankole QLocale__Language = 213 + QLocale__Occitan QLocale__Language = 214 + QLocale__Odia QLocale__Language = 215 + QLocale__Ojibwa QLocale__Language = 216 + QLocale__OldIrish QLocale__Language = 217 + QLocale__OldNorse QLocale__Language = 218 + QLocale__OldPersian QLocale__Language = 219 + QLocale__Oromo QLocale__Language = 220 + QLocale__Osage QLocale__Language = 221 + QLocale__Ossetic QLocale__Language = 222 + QLocale__Pahlavi QLocale__Language = 223 + QLocale__Palauan QLocale__Language = 224 + QLocale__Pali QLocale__Language = 225 + QLocale__Papiamento QLocale__Language = 226 + QLocale__Pashto QLocale__Language = 227 + QLocale__Persian QLocale__Language = 228 + QLocale__Phoenician QLocale__Language = 229 + QLocale__Polish QLocale__Language = 230 + QLocale__Portuguese QLocale__Language = 231 + QLocale__Prussian QLocale__Language = 232 + QLocale__Punjabi QLocale__Language = 233 + QLocale__Quechua QLocale__Language = 234 + QLocale__Romanian QLocale__Language = 235 + QLocale__Romansh QLocale__Language = 236 + QLocale__Rombo QLocale__Language = 237 + QLocale__Rundi QLocale__Language = 238 + QLocale__Russian QLocale__Language = 239 + QLocale__Rwa QLocale__Language = 240 + QLocale__Saho QLocale__Language = 241 + QLocale__Sakha QLocale__Language = 242 + QLocale__Samburu QLocale__Language = 243 + QLocale__Samoan QLocale__Language = 244 + QLocale__Sango QLocale__Language = 245 + QLocale__Sangu QLocale__Language = 246 + QLocale__Sanskrit QLocale__Language = 247 + QLocale__Santali QLocale__Language = 248 + QLocale__Sardinian QLocale__Language = 249 + QLocale__Saurashtra QLocale__Language = 250 + QLocale__Sena QLocale__Language = 251 + QLocale__Serbian QLocale__Language = 252 + QLocale__Shambala QLocale__Language = 253 + QLocale__Shona QLocale__Language = 254 + QLocale__SichuanYi QLocale__Language = 255 + QLocale__Sicilian QLocale__Language = 256 + QLocale__Sidamo QLocale__Language = 257 + QLocale__Silesian QLocale__Language = 258 + QLocale__Sindhi QLocale__Language = 259 + QLocale__Sinhala QLocale__Language = 260 + QLocale__SkoltSami QLocale__Language = 261 + QLocale__Slovak QLocale__Language = 262 + QLocale__Slovenian QLocale__Language = 263 + QLocale__Soga QLocale__Language = 264 + QLocale__Somali QLocale__Language = 265 + QLocale__SouthernKurdish QLocale__Language = 266 + QLocale__SouthernSami QLocale__Language = 267 + QLocale__SouthernSotho QLocale__Language = 268 + QLocale__SouthNdebele QLocale__Language = 269 + QLocale__Spanish QLocale__Language = 270 + QLocale__StandardMoroccanTamazight QLocale__Language = 271 + QLocale__Sundanese QLocale__Language = 272 + QLocale__Swahili QLocale__Language = 273 + QLocale__Swati QLocale__Language = 274 + QLocale__Swedish QLocale__Language = 275 + QLocale__SwissGerman QLocale__Language = 276 + QLocale__Syriac QLocale__Language = 277 + QLocale__Tachelhit QLocale__Language = 278 + QLocale__Tahitian QLocale__Language = 279 + QLocale__TaiDam QLocale__Language = 280 + QLocale__Taita QLocale__Language = 281 + QLocale__Tajik QLocale__Language = 282 + QLocale__Tamil QLocale__Language = 283 + QLocale__Taroko QLocale__Language = 284 + QLocale__Tasawaq QLocale__Language = 285 + QLocale__Tatar QLocale__Language = 286 + QLocale__Telugu QLocale__Language = 287 + QLocale__Teso QLocale__Language = 288 + QLocale__Thai QLocale__Language = 289 + QLocale__Tibetan QLocale__Language = 290 + QLocale__Tigre QLocale__Language = 291 + QLocale__Tigrinya QLocale__Language = 292 + QLocale__TokelauLanguage QLocale__Language = 293 + QLocale__TokPisin QLocale__Language = 294 + QLocale__Tongan QLocale__Language = 295 + QLocale__Tsonga QLocale__Language = 296 + QLocale__Tswana QLocale__Language = 297 + QLocale__Turkish QLocale__Language = 298 + QLocale__Turkmen QLocale__Language = 299 + QLocale__TuvaluLanguage QLocale__Language = 300 + QLocale__Tyap QLocale__Language = 301 + QLocale__Ugaritic QLocale__Language = 302 + QLocale__Ukrainian QLocale__Language = 303 + QLocale__UpperSorbian QLocale__Language = 304 + QLocale__Urdu QLocale__Language = 305 + QLocale__Uyghur QLocale__Language = 306 + QLocale__Uzbek QLocale__Language = 307 + QLocale__Vai QLocale__Language = 308 + QLocale__Venda QLocale__Language = 309 + QLocale__Vietnamese QLocale__Language = 310 + QLocale__Volapuk QLocale__Language = 311 + QLocale__Vunjo QLocale__Language = 312 + QLocale__Walloon QLocale__Language = 313 + QLocale__Walser QLocale__Language = 314 + QLocale__Warlpiri QLocale__Language = 315 + QLocale__Welsh QLocale__Language = 316 + QLocale__WesternBalochi QLocale__Language = 317 + QLocale__WesternFrisian QLocale__Language = 318 + QLocale__Wolaytta QLocale__Language = 319 + QLocale__Wolof QLocale__Language = 320 + QLocale__Xhosa QLocale__Language = 321 + QLocale__Yangben QLocale__Language = 322 + QLocale__Yiddish QLocale__Language = 323 + QLocale__Yoruba QLocale__Language = 324 + QLocale__Zarma QLocale__Language = 325 + QLocale__Zhuang QLocale__Language = 326 + QLocale__Zulu QLocale__Language = 327 + QLocale__Kaingang QLocale__Language = 328 + QLocale__Nheengatu QLocale__Language = 329 + QLocale__Afan QLocale__Language = 220 + QLocale__Bengali QLocale__Language = 30 + QLocale__Bhutani QLocale__Language = 73 + QLocale__Byelorussian QLocale__Language = 35 + QLocale__Cambodian QLocale__Language = 135 + QLocale__CentralMoroccoTamazight QLocale__Language = 50 + QLocale__Chewa QLocale__Language = 212 + QLocale__Frisian QLocale__Language = 318 + QLocale__Greenlandic QLocale__Language = 127 + QLocale__Inupiak QLocale__Language = 117 + QLocale__Kirghiz QLocale__Language = 150 + QLocale__Kurundi QLocale__Language = 238 + QLocale__Kwanyama QLocale__Language = 147 + QLocale__Navaho QLocale__Language = 197 + QLocale__Oriya QLocale__Language = 215 + QLocale__RhaetoRomance QLocale__Language = 236 + QLocale__Uighur QLocale__Language = 306 + QLocale__Uigur QLocale__Language = 306 + QLocale__Walamo QLocale__Language = 319 + QLocale__LastLanguage QLocale__Language = 329 ) -type QLocale__Script int +type QLocale__Script uint16 const ( QLocale__AnyScript QLocale__Script = 0 - QLocale__ArabicScript QLocale__Script = 1 - QLocale__CyrillicScript QLocale__Script = 2 - QLocale__DeseretScript QLocale__Script = 3 - QLocale__GurmukhiScript QLocale__Script = 4 - QLocale__SimplifiedHanScript QLocale__Script = 5 - QLocale__TraditionalHanScript QLocale__Script = 6 - QLocale__LatinScript QLocale__Script = 7 - QLocale__MongolianScript QLocale__Script = 8 - QLocale__TifinaghScript QLocale__Script = 9 - QLocale__ArmenianScript QLocale__Script = 10 - QLocale__BengaliScript QLocale__Script = 11 - QLocale__CherokeeScript QLocale__Script = 12 - QLocale__DevanagariScript QLocale__Script = 13 - QLocale__EthiopicScript QLocale__Script = 14 - QLocale__GeorgianScript QLocale__Script = 15 - QLocale__GreekScript QLocale__Script = 16 - QLocale__GujaratiScript QLocale__Script = 17 - QLocale__HebrewScript QLocale__Script = 18 - QLocale__JapaneseScript QLocale__Script = 19 - QLocale__KhmerScript QLocale__Script = 20 - QLocale__KannadaScript QLocale__Script = 21 - QLocale__KoreanScript QLocale__Script = 22 - QLocale__LaoScript QLocale__Script = 23 - QLocale__MalayalamScript QLocale__Script = 24 - QLocale__MyanmarScript QLocale__Script = 25 - QLocale__OriyaScript QLocale__Script = 26 - QLocale__TamilScript QLocale__Script = 27 - QLocale__TeluguScript QLocale__Script = 28 - QLocale__ThaanaScript QLocale__Script = 29 - QLocale__ThaiScript QLocale__Script = 30 - QLocale__TibetanScript QLocale__Script = 31 - QLocale__SinhalaScript QLocale__Script = 32 - QLocale__SyriacScript QLocale__Script = 33 - QLocale__YiScript QLocale__Script = 34 - QLocale__VaiScript QLocale__Script = 35 - QLocale__AvestanScript QLocale__Script = 36 - QLocale__BalineseScript QLocale__Script = 37 - QLocale__BamumScript QLocale__Script = 38 - QLocale__BatakScript QLocale__Script = 39 - QLocale__BopomofoScript QLocale__Script = 40 - QLocale__BrahmiScript QLocale__Script = 41 - QLocale__BugineseScript QLocale__Script = 42 - QLocale__BuhidScript QLocale__Script = 43 - QLocale__CanadianAboriginalScript QLocale__Script = 44 - QLocale__CarianScript QLocale__Script = 45 - QLocale__ChakmaScript QLocale__Script = 46 - QLocale__ChamScript QLocale__Script = 47 - QLocale__CopticScript QLocale__Script = 48 - QLocale__CypriotScript QLocale__Script = 49 - QLocale__EgyptianHieroglyphsScript QLocale__Script = 50 - QLocale__FraserScript QLocale__Script = 51 - QLocale__GlagoliticScript QLocale__Script = 52 - QLocale__GothicScript QLocale__Script = 53 - QLocale__HanScript QLocale__Script = 54 - QLocale__HangulScript QLocale__Script = 55 - QLocale__HanunooScript QLocale__Script = 56 - QLocale__ImperialAramaicScript QLocale__Script = 57 - QLocale__InscriptionalPahlaviScript QLocale__Script = 58 - QLocale__InscriptionalParthianScript QLocale__Script = 59 - QLocale__JavaneseScript QLocale__Script = 60 - QLocale__KaithiScript QLocale__Script = 61 - QLocale__KatakanaScript QLocale__Script = 62 - QLocale__KayahLiScript QLocale__Script = 63 - QLocale__KharoshthiScript QLocale__Script = 64 - QLocale__LannaScript QLocale__Script = 65 - QLocale__LepchaScript QLocale__Script = 66 - QLocale__LimbuScript QLocale__Script = 67 - QLocale__LinearBScript QLocale__Script = 68 - QLocale__LycianScript QLocale__Script = 69 - QLocale__LydianScript QLocale__Script = 70 - QLocale__MandaeanScript QLocale__Script = 71 - QLocale__MeiteiMayekScript QLocale__Script = 72 - QLocale__MeroiticScript QLocale__Script = 73 - QLocale__MeroiticCursiveScript QLocale__Script = 74 - QLocale__NkoScript QLocale__Script = 75 - QLocale__NewTaiLueScript QLocale__Script = 76 - QLocale__OghamScript QLocale__Script = 77 - QLocale__OlChikiScript QLocale__Script = 78 - QLocale__OldItalicScript QLocale__Script = 79 - QLocale__OldPersianScript QLocale__Script = 80 - QLocale__OldSouthArabianScript QLocale__Script = 81 - QLocale__OrkhonScript QLocale__Script = 82 - QLocale__OsmanyaScript QLocale__Script = 83 - QLocale__PhagsPaScript QLocale__Script = 84 - QLocale__PhoenicianScript QLocale__Script = 85 - QLocale__PollardPhoneticScript QLocale__Script = 86 - QLocale__RejangScript QLocale__Script = 87 - QLocale__RunicScript QLocale__Script = 88 - QLocale__SamaritanScript QLocale__Script = 89 - QLocale__SaurashtraScript QLocale__Script = 90 - QLocale__SharadaScript QLocale__Script = 91 - QLocale__ShavianScript QLocale__Script = 92 - QLocale__SoraSompengScript QLocale__Script = 93 - QLocale__CuneiformScript QLocale__Script = 94 - QLocale__SundaneseScript QLocale__Script = 95 - QLocale__SylotiNagriScript QLocale__Script = 96 - QLocale__TagalogScript QLocale__Script = 97 - QLocale__TagbanwaScript QLocale__Script = 98 - QLocale__TaiLeScript QLocale__Script = 99 - QLocale__TaiVietScript QLocale__Script = 100 - QLocale__TakriScript QLocale__Script = 101 - QLocale__UgariticScript QLocale__Script = 102 - QLocale__BrailleScript QLocale__Script = 103 - QLocale__HiraganaScript QLocale__Script = 104 - QLocale__CaucasianAlbanianScript QLocale__Script = 105 - QLocale__BassaVahScript QLocale__Script = 106 - QLocale__DuployanScript QLocale__Script = 107 - QLocale__ElbasanScript QLocale__Script = 108 - QLocale__GranthaScript QLocale__Script = 109 - QLocale__PahawhHmongScript QLocale__Script = 110 - QLocale__KhojkiScript QLocale__Script = 111 - QLocale__LinearAScript QLocale__Script = 112 - QLocale__MahajaniScript QLocale__Script = 113 - QLocale__ManichaeanScript QLocale__Script = 114 - QLocale__MendeKikakuiScript QLocale__Script = 115 - QLocale__ModiScript QLocale__Script = 116 - QLocale__MroScript QLocale__Script = 117 - QLocale__OldNorthArabianScript QLocale__Script = 118 - QLocale__NabataeanScript QLocale__Script = 119 - QLocale__PalmyreneScript QLocale__Script = 120 - QLocale__PauCinHauScript QLocale__Script = 121 - QLocale__OldPermicScript QLocale__Script = 122 - QLocale__PsalterPahlaviScript QLocale__Script = 123 - QLocale__SiddhamScript QLocale__Script = 124 - QLocale__KhudawadiScript QLocale__Script = 125 - QLocale__TirhutaScript QLocale__Script = 126 - QLocale__VarangKshitiScript QLocale__Script = 127 - QLocale__AhomScript QLocale__Script = 128 - QLocale__AnatolianHieroglyphsScript QLocale__Script = 129 - QLocale__HatranScript QLocale__Script = 130 - QLocale__MultaniScript QLocale__Script = 131 - QLocale__OldHungarianScript QLocale__Script = 132 - QLocale__SignWritingScript QLocale__Script = 133 - QLocale__AdlamScript QLocale__Script = 134 - QLocale__BhaiksukiScript QLocale__Script = 135 - QLocale__MarchenScript QLocale__Script = 136 - QLocale__NewaScript QLocale__Script = 137 - QLocale__OsageScript QLocale__Script = 138 - QLocale__TangutScript QLocale__Script = 139 - QLocale__HanWithBopomofoScript QLocale__Script = 140 - QLocale__JamoScript QLocale__Script = 141 - QLocale__SimplifiedChineseScript QLocale__Script = 5 - QLocale__TraditionalChineseScript QLocale__Script = 6 + QLocale__AdlamScript QLocale__Script = 1 + QLocale__AhomScript QLocale__Script = 2 + QLocale__AnatolianHieroglyphsScript QLocale__Script = 3 + QLocale__ArabicScript QLocale__Script = 4 + QLocale__ArmenianScript QLocale__Script = 5 + QLocale__AvestanScript QLocale__Script = 6 + QLocale__BalineseScript QLocale__Script = 7 + QLocale__BamumScript QLocale__Script = 8 + QLocale__BanglaScript QLocale__Script = 9 + QLocale__BassaVahScript QLocale__Script = 10 + QLocale__BatakScript QLocale__Script = 11 + QLocale__BhaiksukiScript QLocale__Script = 12 + QLocale__BopomofoScript QLocale__Script = 13 + QLocale__BrahmiScript QLocale__Script = 14 + QLocale__BrailleScript QLocale__Script = 15 + QLocale__BugineseScript QLocale__Script = 16 + QLocale__BuhidScript QLocale__Script = 17 + QLocale__CanadianAboriginalScript QLocale__Script = 18 + QLocale__CarianScript QLocale__Script = 19 + QLocale__CaucasianAlbanianScript QLocale__Script = 20 + QLocale__ChakmaScript QLocale__Script = 21 + QLocale__ChamScript QLocale__Script = 22 + QLocale__CherokeeScript QLocale__Script = 23 + QLocale__CopticScript QLocale__Script = 24 + QLocale__CuneiformScript QLocale__Script = 25 + QLocale__CypriotScript QLocale__Script = 26 + QLocale__CyrillicScript QLocale__Script = 27 + QLocale__DeseretScript QLocale__Script = 28 + QLocale__DevanagariScript QLocale__Script = 29 + QLocale__DuployanScript QLocale__Script = 30 + QLocale__EgyptianHieroglyphsScript QLocale__Script = 31 + QLocale__ElbasanScript QLocale__Script = 32 + QLocale__EthiopicScript QLocale__Script = 33 + QLocale__FraserScript QLocale__Script = 34 + QLocale__GeorgianScript QLocale__Script = 35 + QLocale__GlagoliticScript QLocale__Script = 36 + QLocale__GothicScript QLocale__Script = 37 + QLocale__GranthaScript QLocale__Script = 38 + QLocale__GreekScript QLocale__Script = 39 + QLocale__GujaratiScript QLocale__Script = 40 + QLocale__GurmukhiScript QLocale__Script = 41 + QLocale__HangulScript QLocale__Script = 42 + QLocale__HanScript QLocale__Script = 43 + QLocale__HanunooScript QLocale__Script = 44 + QLocale__HanWithBopomofoScript QLocale__Script = 45 + QLocale__HatranScript QLocale__Script = 46 + QLocale__HebrewScript QLocale__Script = 47 + QLocale__HiraganaScript QLocale__Script = 48 + QLocale__ImperialAramaicScript QLocale__Script = 49 + QLocale__InscriptionalPahlaviScript QLocale__Script = 50 + QLocale__InscriptionalParthianScript QLocale__Script = 51 + QLocale__JamoScript QLocale__Script = 52 + QLocale__JapaneseScript QLocale__Script = 53 + QLocale__JavaneseScript QLocale__Script = 54 + QLocale__KaithiScript QLocale__Script = 55 + QLocale__KannadaScript QLocale__Script = 56 + QLocale__KatakanaScript QLocale__Script = 57 + QLocale__KayahLiScript QLocale__Script = 58 + QLocale__KharoshthiScript QLocale__Script = 59 + QLocale__KhmerScript QLocale__Script = 60 + QLocale__KhojkiScript QLocale__Script = 61 + QLocale__KhudawadiScript QLocale__Script = 62 + QLocale__KoreanScript QLocale__Script = 63 + QLocale__LannaScript QLocale__Script = 64 + QLocale__LaoScript QLocale__Script = 65 + QLocale__LatinScript QLocale__Script = 66 + QLocale__LepchaScript QLocale__Script = 67 + QLocale__LimbuScript QLocale__Script = 68 + QLocale__LinearAScript QLocale__Script = 69 + QLocale__LinearBScript QLocale__Script = 70 + QLocale__LycianScript QLocale__Script = 71 + QLocale__LydianScript QLocale__Script = 72 + QLocale__MahajaniScript QLocale__Script = 73 + QLocale__MalayalamScript QLocale__Script = 74 + QLocale__MandaeanScript QLocale__Script = 75 + QLocale__ManichaeanScript QLocale__Script = 76 + QLocale__MarchenScript QLocale__Script = 77 + QLocale__MeiteiMayekScript QLocale__Script = 78 + QLocale__MendeScript QLocale__Script = 79 + QLocale__MeroiticCursiveScript QLocale__Script = 80 + QLocale__MeroiticScript QLocale__Script = 81 + QLocale__ModiScript QLocale__Script = 82 + QLocale__MongolianScript QLocale__Script = 83 + QLocale__MroScript QLocale__Script = 84 + QLocale__MultaniScript QLocale__Script = 85 + QLocale__MyanmarScript QLocale__Script = 86 + QLocale__NabataeanScript QLocale__Script = 87 + QLocale__NewaScript QLocale__Script = 88 + QLocale__NewTaiLueScript QLocale__Script = 89 + QLocale__NkoScript QLocale__Script = 90 + QLocale__OdiaScript QLocale__Script = 91 + QLocale__OghamScript QLocale__Script = 92 + QLocale__OlChikiScript QLocale__Script = 93 + QLocale__OldHungarianScript QLocale__Script = 94 + QLocale__OldItalicScript QLocale__Script = 95 + QLocale__OldNorthArabianScript QLocale__Script = 96 + QLocale__OldPermicScript QLocale__Script = 97 + QLocale__OldPersianScript QLocale__Script = 98 + QLocale__OldSouthArabianScript QLocale__Script = 99 + QLocale__OrkhonScript QLocale__Script = 100 + QLocale__OsageScript QLocale__Script = 101 + QLocale__OsmanyaScript QLocale__Script = 102 + QLocale__PahawhHmongScript QLocale__Script = 103 + QLocale__PalmyreneScript QLocale__Script = 104 + QLocale__PauCinHauScript QLocale__Script = 105 + QLocale__PhagsPaScript QLocale__Script = 106 + QLocale__PhoenicianScript QLocale__Script = 107 + QLocale__PollardPhoneticScript QLocale__Script = 108 + QLocale__PsalterPahlaviScript QLocale__Script = 109 + QLocale__RejangScript QLocale__Script = 110 + QLocale__RunicScript QLocale__Script = 111 + QLocale__SamaritanScript QLocale__Script = 112 + QLocale__SaurashtraScript QLocale__Script = 113 + QLocale__SharadaScript QLocale__Script = 114 + QLocale__ShavianScript QLocale__Script = 115 + QLocale__SiddhamScript QLocale__Script = 116 + QLocale__SignWritingScript QLocale__Script = 117 + QLocale__SimplifiedHanScript QLocale__Script = 118 + QLocale__SinhalaScript QLocale__Script = 119 + QLocale__SoraSompengScript QLocale__Script = 120 + QLocale__SundaneseScript QLocale__Script = 121 + QLocale__SylotiNagriScript QLocale__Script = 122 + QLocale__SyriacScript QLocale__Script = 123 + QLocale__TagalogScript QLocale__Script = 124 + QLocale__TagbanwaScript QLocale__Script = 125 + QLocale__TaiLeScript QLocale__Script = 126 + QLocale__TaiVietScript QLocale__Script = 127 + QLocale__TakriScript QLocale__Script = 128 + QLocale__TamilScript QLocale__Script = 129 + QLocale__TangutScript QLocale__Script = 130 + QLocale__TeluguScript QLocale__Script = 131 + QLocale__ThaanaScript QLocale__Script = 132 + QLocale__ThaiScript QLocale__Script = 133 + QLocale__TibetanScript QLocale__Script = 134 + QLocale__TifinaghScript QLocale__Script = 135 + QLocale__TirhutaScript QLocale__Script = 136 + QLocale__TraditionalHanScript QLocale__Script = 137 + QLocale__UgariticScript QLocale__Script = 138 + QLocale__VaiScript QLocale__Script = 139 + QLocale__VarangKshitiScript QLocale__Script = 140 + QLocale__YiScript QLocale__Script = 141 + QLocale__BengaliScript QLocale__Script = 9 + QLocale__MendeKikakuiScript QLocale__Script = 79 + QLocale__OriyaScript QLocale__Script = 91 + QLocale__SimplifiedChineseScript QLocale__Script = 118 + QLocale__TraditionalChineseScript QLocale__Script = 137 QLocale__LastScript QLocale__Script = 141 ) -type QLocale__Country int +type QLocale__Country uint16 const ( - QLocale__AnyCountry QLocale__Country = 0 + QLocale__AnyTerritory QLocale__Country = 0 QLocale__Afghanistan QLocale__Country = 1 - QLocale__Albania QLocale__Country = 2 - QLocale__Algeria QLocale__Country = 3 - QLocale__AmericanSamoa QLocale__Country = 4 - QLocale__Andorra QLocale__Country = 5 - QLocale__Angola QLocale__Country = 6 - QLocale__Anguilla QLocale__Country = 7 - QLocale__Antarctica QLocale__Country = 8 - QLocale__AntiguaAndBarbuda QLocale__Country = 9 - QLocale__Argentina QLocale__Country = 10 - QLocale__Armenia QLocale__Country = 11 - QLocale__Aruba QLocale__Country = 12 - QLocale__Australia QLocale__Country = 13 - QLocale__Austria QLocale__Country = 14 - QLocale__Azerbaijan QLocale__Country = 15 - QLocale__Bahamas QLocale__Country = 16 - QLocale__Bahrain QLocale__Country = 17 - QLocale__Bangladesh QLocale__Country = 18 - QLocale__Barbados QLocale__Country = 19 - QLocale__Belarus QLocale__Country = 20 - QLocale__Belgium QLocale__Country = 21 - QLocale__Belize QLocale__Country = 22 - QLocale__Benin QLocale__Country = 23 - QLocale__Bermuda QLocale__Country = 24 - QLocale__Bhutan QLocale__Country = 25 - QLocale__Bolivia QLocale__Country = 26 - QLocale__BosniaAndHerzegowina QLocale__Country = 27 - QLocale__Botswana QLocale__Country = 28 - QLocale__BouvetIsland QLocale__Country = 29 - QLocale__Brazil QLocale__Country = 30 - QLocale__BritishIndianOceanTerritory QLocale__Country = 31 - QLocale__Brunei QLocale__Country = 32 - QLocale__Bulgaria QLocale__Country = 33 - QLocale__BurkinaFaso QLocale__Country = 34 - QLocale__Burundi QLocale__Country = 35 - QLocale__Cambodia QLocale__Country = 36 - QLocale__Cameroon QLocale__Country = 37 - QLocale__Canada QLocale__Country = 38 - QLocale__CapeVerde QLocale__Country = 39 - QLocale__CaymanIslands QLocale__Country = 40 - QLocale__CentralAfricanRepublic QLocale__Country = 41 - QLocale__Chad QLocale__Country = 42 - QLocale__Chile QLocale__Country = 43 - QLocale__China QLocale__Country = 44 - QLocale__ChristmasIsland QLocale__Country = 45 - QLocale__CocosIslands QLocale__Country = 46 - QLocale__Colombia QLocale__Country = 47 - QLocale__Comoros QLocale__Country = 48 - QLocale__CongoKinshasa QLocale__Country = 49 - QLocale__CongoBrazzaville QLocale__Country = 50 - QLocale__CookIslands QLocale__Country = 51 - QLocale__CostaRica QLocale__Country = 52 - QLocale__IvoryCoast QLocale__Country = 53 - QLocale__Croatia QLocale__Country = 54 - QLocale__Cuba QLocale__Country = 55 - QLocale__Cyprus QLocale__Country = 56 - QLocale__CzechRepublic QLocale__Country = 57 - QLocale__Denmark QLocale__Country = 58 - QLocale__Djibouti QLocale__Country = 59 - QLocale__Dominica QLocale__Country = 60 - QLocale__DominicanRepublic QLocale__Country = 61 - QLocale__EastTimor QLocale__Country = 62 - QLocale__Ecuador QLocale__Country = 63 - QLocale__Egypt QLocale__Country = 64 - QLocale__ElSalvador QLocale__Country = 65 - QLocale__EquatorialGuinea QLocale__Country = 66 - QLocale__Eritrea QLocale__Country = 67 - QLocale__Estonia QLocale__Country = 68 - QLocale__Ethiopia QLocale__Country = 69 - QLocale__FalklandIslands QLocale__Country = 70 - QLocale__FaroeIslands QLocale__Country = 71 - QLocale__Fiji QLocale__Country = 72 - QLocale__Finland QLocale__Country = 73 - QLocale__France QLocale__Country = 74 - QLocale__Guernsey QLocale__Country = 75 - QLocale__FrenchGuiana QLocale__Country = 76 - QLocale__FrenchPolynesia QLocale__Country = 77 - QLocale__FrenchSouthernTerritories QLocale__Country = 78 - QLocale__Gabon QLocale__Country = 79 - QLocale__Gambia QLocale__Country = 80 - QLocale__Georgia QLocale__Country = 81 - QLocale__Germany QLocale__Country = 82 - QLocale__Ghana QLocale__Country = 83 - QLocale__Gibraltar QLocale__Country = 84 - QLocale__Greece QLocale__Country = 85 - QLocale__Greenland QLocale__Country = 86 - QLocale__Grenada QLocale__Country = 87 - QLocale__Guadeloupe QLocale__Country = 88 - QLocale__Guam QLocale__Country = 89 - QLocale__Guatemala QLocale__Country = 90 - QLocale__Guinea QLocale__Country = 91 - QLocale__GuineaBissau QLocale__Country = 92 - QLocale__Guyana QLocale__Country = 93 - QLocale__Haiti QLocale__Country = 94 - QLocale__HeardAndMcDonaldIslands QLocale__Country = 95 - QLocale__Honduras QLocale__Country = 96 - QLocale__HongKong QLocale__Country = 97 - QLocale__Hungary QLocale__Country = 98 - QLocale__Iceland QLocale__Country = 99 - QLocale__India QLocale__Country = 100 - QLocale__Indonesia QLocale__Country = 101 - QLocale__Iran QLocale__Country = 102 - QLocale__Iraq QLocale__Country = 103 - QLocale__Ireland QLocale__Country = 104 - QLocale__Israel QLocale__Country = 105 - QLocale__Italy QLocale__Country = 106 - QLocale__Jamaica QLocale__Country = 107 - QLocale__Japan QLocale__Country = 108 - QLocale__Jordan QLocale__Country = 109 - QLocale__Kazakhstan QLocale__Country = 110 - QLocale__Kenya QLocale__Country = 111 - QLocale__Kiribati QLocale__Country = 112 - QLocale__NorthKorea QLocale__Country = 113 - QLocale__SouthKorea QLocale__Country = 114 - QLocale__Kuwait QLocale__Country = 115 - QLocale__Kyrgyzstan QLocale__Country = 116 - QLocale__Laos QLocale__Country = 117 - QLocale__Latvia QLocale__Country = 118 - QLocale__Lebanon QLocale__Country = 119 - QLocale__Lesotho QLocale__Country = 120 - QLocale__Liberia QLocale__Country = 121 - QLocale__Libya QLocale__Country = 122 - QLocale__Liechtenstein QLocale__Country = 123 - QLocale__Lithuania QLocale__Country = 124 - QLocale__Luxembourg QLocale__Country = 125 - QLocale__Macau QLocale__Country = 126 - QLocale__Macedonia QLocale__Country = 127 - QLocale__Madagascar QLocale__Country = 128 - QLocale__Malawi QLocale__Country = 129 - QLocale__Malaysia QLocale__Country = 130 - QLocale__Maldives QLocale__Country = 131 - QLocale__Mali QLocale__Country = 132 - QLocale__Malta QLocale__Country = 133 - QLocale__MarshallIslands QLocale__Country = 134 - QLocale__Martinique QLocale__Country = 135 - QLocale__Mauritania QLocale__Country = 136 - QLocale__Mauritius QLocale__Country = 137 - QLocale__Mayotte QLocale__Country = 138 - QLocale__Mexico QLocale__Country = 139 - QLocale__Micronesia QLocale__Country = 140 - QLocale__Moldova QLocale__Country = 141 - QLocale__Monaco QLocale__Country = 142 - QLocale__Mongolia QLocale__Country = 143 - QLocale__Montserrat QLocale__Country = 144 - QLocale__Morocco QLocale__Country = 145 - QLocale__Mozambique QLocale__Country = 146 - QLocale__Myanmar QLocale__Country = 147 - QLocale__Namibia QLocale__Country = 148 - QLocale__NauruCountry QLocale__Country = 149 - QLocale__Nepal QLocale__Country = 150 - QLocale__Netherlands QLocale__Country = 151 - QLocale__CuraSao QLocale__Country = 152 - QLocale__NewCaledonia QLocale__Country = 153 - QLocale__NewZealand QLocale__Country = 154 - QLocale__Nicaragua QLocale__Country = 155 - QLocale__Niger QLocale__Country = 156 - QLocale__Nigeria QLocale__Country = 157 - QLocale__Niue QLocale__Country = 158 - QLocale__NorfolkIsland QLocale__Country = 159 - QLocale__NorthernMarianaIslands QLocale__Country = 160 - QLocale__Norway QLocale__Country = 161 - QLocale__Oman QLocale__Country = 162 - QLocale__Pakistan QLocale__Country = 163 - QLocale__Palau QLocale__Country = 164 - QLocale__PalestinianTerritories QLocale__Country = 165 - QLocale__Panama QLocale__Country = 166 - QLocale__PapuaNewGuinea QLocale__Country = 167 - QLocale__Paraguay QLocale__Country = 168 - QLocale__Peru QLocale__Country = 169 - QLocale__Philippines QLocale__Country = 170 - QLocale__Pitcairn QLocale__Country = 171 - QLocale__Poland QLocale__Country = 172 - QLocale__Portugal QLocale__Country = 173 - QLocale__PuertoRico QLocale__Country = 174 - QLocale__Qatar QLocale__Country = 175 - QLocale__Reunion QLocale__Country = 176 - QLocale__Romania QLocale__Country = 177 - QLocale__Russia QLocale__Country = 178 - QLocale__Rwanda QLocale__Country = 179 - QLocale__SaintKittsAndNevis QLocale__Country = 180 - QLocale__SaintLucia QLocale__Country = 181 - QLocale__SaintVincentAndTheGrenadines QLocale__Country = 182 - QLocale__Samoa QLocale__Country = 183 - QLocale__SanMarino QLocale__Country = 184 - QLocale__SaoTomeAndPrincipe QLocale__Country = 185 - QLocale__SaudiArabia QLocale__Country = 186 - QLocale__Senegal QLocale__Country = 187 - QLocale__Seychelles QLocale__Country = 188 - QLocale__SierraLeone QLocale__Country = 189 - QLocale__Singapore QLocale__Country = 190 - QLocale__Slovakia QLocale__Country = 191 - QLocale__Slovenia QLocale__Country = 192 - QLocale__SolomonIslands QLocale__Country = 193 - QLocale__Somalia QLocale__Country = 194 - QLocale__SouthAfrica QLocale__Country = 195 - QLocale__SouthGeorgiaAndTheSouthSandwichIslands QLocale__Country = 196 - QLocale__Spain QLocale__Country = 197 - QLocale__SriLanka QLocale__Country = 198 - QLocale__SaintHelena QLocale__Country = 199 + QLocale__AlandIslands QLocale__Country = 2 + QLocale__Albania QLocale__Country = 3 + QLocale__Algeria QLocale__Country = 4 + QLocale__AmericanSamoa QLocale__Country = 5 + QLocale__Andorra QLocale__Country = 6 + QLocale__Angola QLocale__Country = 7 + QLocale__Anguilla QLocale__Country = 8 + QLocale__Antarctica QLocale__Country = 9 + QLocale__AntiguaAndBarbuda QLocale__Country = 10 + QLocale__Argentina QLocale__Country = 11 + QLocale__Armenia QLocale__Country = 12 + QLocale__Aruba QLocale__Country = 13 + QLocale__AscensionIsland QLocale__Country = 14 + QLocale__Australia QLocale__Country = 15 + QLocale__Austria QLocale__Country = 16 + QLocale__Azerbaijan QLocale__Country = 17 + QLocale__Bahamas QLocale__Country = 18 + QLocale__Bahrain QLocale__Country = 19 + QLocale__Bangladesh QLocale__Country = 20 + QLocale__Barbados QLocale__Country = 21 + QLocale__Belarus QLocale__Country = 22 + QLocale__Belgium QLocale__Country = 23 + QLocale__Belize QLocale__Country = 24 + QLocale__Benin QLocale__Country = 25 + QLocale__Bermuda QLocale__Country = 26 + QLocale__Bhutan QLocale__Country = 27 + QLocale__Bolivia QLocale__Country = 28 + QLocale__BosniaAndHerzegovina QLocale__Country = 29 + QLocale__Botswana QLocale__Country = 30 + QLocale__BouvetIsland QLocale__Country = 31 + QLocale__Brazil QLocale__Country = 32 + QLocale__BritishIndianOceanTerritory QLocale__Country = 33 + QLocale__BritishVirginIslands QLocale__Country = 34 + QLocale__Brunei QLocale__Country = 35 + QLocale__Bulgaria QLocale__Country = 36 + QLocale__BurkinaFaso QLocale__Country = 37 + QLocale__Burundi QLocale__Country = 38 + QLocale__Cambodia QLocale__Country = 39 + QLocale__Cameroon QLocale__Country = 40 + QLocale__Canada QLocale__Country = 41 + QLocale__CanaryIslands QLocale__Country = 42 + QLocale__CapeVerde QLocale__Country = 43 + QLocale__CaribbeanNetherlands QLocale__Country = 44 + QLocale__CaymanIslands QLocale__Country = 45 + QLocale__CentralAfricanRepublic QLocale__Country = 46 + QLocale__CeutaAndMelilla QLocale__Country = 47 + QLocale__Chad QLocale__Country = 48 + QLocale__Chile QLocale__Country = 49 + QLocale__China QLocale__Country = 50 + QLocale__ChristmasIsland QLocale__Country = 51 + QLocale__ClippertonIsland QLocale__Country = 52 + QLocale__CocosIslands QLocale__Country = 53 + QLocale__Colombia QLocale__Country = 54 + QLocale__Comoros QLocale__Country = 55 + QLocale__CongoBrazzaville QLocale__Country = 56 + QLocale__CongoKinshasa QLocale__Country = 57 + QLocale__CookIslands QLocale__Country = 58 + QLocale__CostaRica QLocale__Country = 59 + QLocale__Croatia QLocale__Country = 60 + QLocale__Cuba QLocale__Country = 61 + QLocale__Curacao QLocale__Country = 62 + QLocale__Cyprus QLocale__Country = 63 + QLocale__Czechia QLocale__Country = 64 + QLocale__Denmark QLocale__Country = 65 + QLocale__DiegoGarcia QLocale__Country = 66 + QLocale__Djibouti QLocale__Country = 67 + QLocale__Dominica QLocale__Country = 68 + QLocale__DominicanRepublic QLocale__Country = 69 + QLocale__Ecuador QLocale__Country = 70 + QLocale__Egypt QLocale__Country = 71 + QLocale__ElSalvador QLocale__Country = 72 + QLocale__EquatorialGuinea QLocale__Country = 73 + QLocale__Eritrea QLocale__Country = 74 + QLocale__Estonia QLocale__Country = 75 + QLocale__Eswatini QLocale__Country = 76 + QLocale__Ethiopia QLocale__Country = 77 + QLocale__Europe QLocale__Country = 78 + QLocale__EuropeanUnion QLocale__Country = 79 + QLocale__FalklandIslands QLocale__Country = 80 + QLocale__FaroeIslands QLocale__Country = 81 + QLocale__Fiji QLocale__Country = 82 + QLocale__Finland QLocale__Country = 83 + QLocale__France QLocale__Country = 84 + QLocale__FrenchGuiana QLocale__Country = 85 + QLocale__FrenchPolynesia QLocale__Country = 86 + QLocale__FrenchSouthernTerritories QLocale__Country = 87 + QLocale__Gabon QLocale__Country = 88 + QLocale__Gambia QLocale__Country = 89 + QLocale__Georgia QLocale__Country = 90 + QLocale__Germany QLocale__Country = 91 + QLocale__Ghana QLocale__Country = 92 + QLocale__Gibraltar QLocale__Country = 93 + QLocale__Greece QLocale__Country = 94 + QLocale__Greenland QLocale__Country = 95 + QLocale__Grenada QLocale__Country = 96 + QLocale__Guadeloupe QLocale__Country = 97 + QLocale__Guam QLocale__Country = 98 + QLocale__Guatemala QLocale__Country = 99 + QLocale__Guernsey QLocale__Country = 100 + QLocale__GuineaBissau QLocale__Country = 101 + QLocale__Guinea QLocale__Country = 102 + QLocale__Guyana QLocale__Country = 103 + QLocale__Haiti QLocale__Country = 104 + QLocale__HeardAndMcDonaldIslands QLocale__Country = 105 + QLocale__Honduras QLocale__Country = 106 + QLocale__HongKong QLocale__Country = 107 + QLocale__Hungary QLocale__Country = 108 + QLocale__Iceland QLocale__Country = 109 + QLocale__India QLocale__Country = 110 + QLocale__Indonesia QLocale__Country = 111 + QLocale__Iran QLocale__Country = 112 + QLocale__Iraq QLocale__Country = 113 + QLocale__Ireland QLocale__Country = 114 + QLocale__IsleOfMan QLocale__Country = 115 + QLocale__Israel QLocale__Country = 116 + QLocale__Italy QLocale__Country = 117 + QLocale__IvoryCoast QLocale__Country = 118 + QLocale__Jamaica QLocale__Country = 119 + QLocale__Japan QLocale__Country = 120 + QLocale__Jersey QLocale__Country = 121 + QLocale__Jordan QLocale__Country = 122 + QLocale__Kazakhstan QLocale__Country = 123 + QLocale__Kenya QLocale__Country = 124 + QLocale__Kiribati QLocale__Country = 125 + QLocale__Kosovo QLocale__Country = 126 + QLocale__Kuwait QLocale__Country = 127 + QLocale__Kyrgyzstan QLocale__Country = 128 + QLocale__Laos QLocale__Country = 129 + QLocale__LatinAmerica QLocale__Country = 130 + QLocale__Latvia QLocale__Country = 131 + QLocale__Lebanon QLocale__Country = 132 + QLocale__Lesotho QLocale__Country = 133 + QLocale__Liberia QLocale__Country = 134 + QLocale__Libya QLocale__Country = 135 + QLocale__Liechtenstein QLocale__Country = 136 + QLocale__Lithuania QLocale__Country = 137 + QLocale__Luxembourg QLocale__Country = 138 + QLocale__Macao QLocale__Country = 139 + QLocale__Macedonia QLocale__Country = 140 + QLocale__Madagascar QLocale__Country = 141 + QLocale__Malawi QLocale__Country = 142 + QLocale__Malaysia QLocale__Country = 143 + QLocale__Maldives QLocale__Country = 144 + QLocale__Mali QLocale__Country = 145 + QLocale__Malta QLocale__Country = 146 + QLocale__MarshallIslands QLocale__Country = 147 + QLocale__Martinique QLocale__Country = 148 + QLocale__Mauritania QLocale__Country = 149 + QLocale__Mauritius QLocale__Country = 150 + QLocale__Mayotte QLocale__Country = 151 + QLocale__Mexico QLocale__Country = 152 + QLocale__Micronesia QLocale__Country = 153 + QLocale__Moldova QLocale__Country = 154 + QLocale__Monaco QLocale__Country = 155 + QLocale__Mongolia QLocale__Country = 156 + QLocale__Montenegro QLocale__Country = 157 + QLocale__Montserrat QLocale__Country = 158 + QLocale__Morocco QLocale__Country = 159 + QLocale__Mozambique QLocale__Country = 160 + QLocale__Myanmar QLocale__Country = 161 + QLocale__Namibia QLocale__Country = 162 + QLocale__NauruTerritory QLocale__Country = 163 + QLocale__Nepal QLocale__Country = 164 + QLocale__Netherlands QLocale__Country = 165 + QLocale__NewCaledonia QLocale__Country = 166 + QLocale__NewZealand QLocale__Country = 167 + QLocale__Nicaragua QLocale__Country = 168 + QLocale__Nigeria QLocale__Country = 169 + QLocale__Niger QLocale__Country = 170 + QLocale__Niue QLocale__Country = 171 + QLocale__NorfolkIsland QLocale__Country = 172 + QLocale__NorthernMarianaIslands QLocale__Country = 173 + QLocale__NorthKorea QLocale__Country = 174 + QLocale__Norway QLocale__Country = 175 + QLocale__Oman QLocale__Country = 176 + QLocale__OutlyingOceania QLocale__Country = 177 + QLocale__Pakistan QLocale__Country = 178 + QLocale__Palau QLocale__Country = 179 + QLocale__PalestinianTerritories QLocale__Country = 180 + QLocale__Panama QLocale__Country = 181 + QLocale__PapuaNewGuinea QLocale__Country = 182 + QLocale__Paraguay QLocale__Country = 183 + QLocale__Peru QLocale__Country = 184 + QLocale__Philippines QLocale__Country = 185 + QLocale__Pitcairn QLocale__Country = 186 + QLocale__Poland QLocale__Country = 187 + QLocale__Portugal QLocale__Country = 188 + QLocale__PuertoRico QLocale__Country = 189 + QLocale__Qatar QLocale__Country = 190 + QLocale__Reunion QLocale__Country = 191 + QLocale__Romania QLocale__Country = 192 + QLocale__Russia QLocale__Country = 193 + QLocale__Rwanda QLocale__Country = 194 + QLocale__SaintBarthelemy QLocale__Country = 195 + QLocale__SaintHelena QLocale__Country = 196 + QLocale__SaintKittsAndNevis QLocale__Country = 197 + QLocale__SaintLucia QLocale__Country = 198 + QLocale__SaintMartin QLocale__Country = 199 QLocale__SaintPierreAndMiquelon QLocale__Country = 200 - QLocale__Sudan QLocale__Country = 201 - QLocale__Suriname QLocale__Country = 202 - QLocale__SvalbardAndJanMayenIslands QLocale__Country = 203 - QLocale__Swaziland QLocale__Country = 204 - QLocale__Sweden QLocale__Country = 205 - QLocale__Switzerland QLocale__Country = 206 - QLocale__Syria QLocale__Country = 207 - QLocale__Taiwan QLocale__Country = 208 - QLocale__Tajikistan QLocale__Country = 209 - QLocale__Tanzania QLocale__Country = 210 - QLocale__Thailand QLocale__Country = 211 - QLocale__Togo QLocale__Country = 212 - QLocale__TokelauCountry QLocale__Country = 213 - QLocale__Tonga QLocale__Country = 214 - QLocale__TrinidadAndTobago QLocale__Country = 215 - QLocale__Tunisia QLocale__Country = 216 - QLocale__Turkey QLocale__Country = 217 - QLocale__Turkmenistan QLocale__Country = 218 - QLocale__TurksAndCaicosIslands QLocale__Country = 219 - QLocale__TuvaluCountry QLocale__Country = 220 - QLocale__Uganda QLocale__Country = 221 - QLocale__Ukraine QLocale__Country = 222 - QLocale__UnitedArabEmirates QLocale__Country = 223 - QLocale__UnitedKingdom QLocale__Country = 224 - QLocale__UnitedStates QLocale__Country = 225 - QLocale__UnitedStatesMinorOutlyingIslands QLocale__Country = 226 - QLocale__Uruguay QLocale__Country = 227 - QLocale__Uzbekistan QLocale__Country = 228 - QLocale__Vanuatu QLocale__Country = 229 - QLocale__VaticanCityState QLocale__Country = 230 - QLocale__Venezuela QLocale__Country = 231 - QLocale__Vietnam QLocale__Country = 232 - QLocale__BritishVirginIslands QLocale__Country = 233 - QLocale__UnitedStatesVirginIslands QLocale__Country = 234 - QLocale__WallisAndFutunaIslands QLocale__Country = 235 - QLocale__WesternSahara QLocale__Country = 236 - QLocale__Yemen QLocale__Country = 237 - QLocale__CanaryIslands QLocale__Country = 238 - QLocale__Zambia QLocale__Country = 239 - QLocale__Zimbabwe QLocale__Country = 240 - QLocale__ClippertonIsland QLocale__Country = 241 - QLocale__Montenegro QLocale__Country = 242 - QLocale__Serbia QLocale__Country = 243 - QLocale__SaintBarthelemy QLocale__Country = 244 - QLocale__SaintMartin QLocale__Country = 245 - QLocale__LatinAmerica QLocale__Country = 246 - QLocale__AscensionIsland QLocale__Country = 247 - QLocale__AlandIslands QLocale__Country = 248 - QLocale__DiegoGarcia QLocale__Country = 249 - QLocale__CeutaAndMelilla QLocale__Country = 250 - QLocale__IsleOfMan QLocale__Country = 251 - QLocale__Jersey QLocale__Country = 252 - QLocale__TristanDaCunha QLocale__Country = 253 - QLocale__SouthSudan QLocale__Country = 254 - QLocale__Bonaire QLocale__Country = 255 - QLocale__SintMaarten QLocale__Country = 256 - QLocale__Kosovo QLocale__Country = 257 - QLocale__EuropeanUnion QLocale__Country = 258 - QLocale__OutlyingOceania QLocale__Country = 259 - QLocale__World QLocale__Country = 260 - QLocale__Europe QLocale__Country = 261 - QLocale__DemocraticRepublicOfCongo QLocale__Country = 49 - QLocale__DemocraticRepublicOfKorea QLocale__Country = 113 - QLocale__LatinAmericaAndTheCaribbean QLocale__Country = 246 - QLocale__PeoplesRepublicOfCongo QLocale__Country = 50 - QLocale__RepublicOfKorea QLocale__Country = 114 - QLocale__RussianFederation QLocale__Country = 178 - QLocale__SyrianArabRepublic QLocale__Country = 207 - QLocale__Tokelau QLocale__Country = 213 - QLocale__Tuvalu QLocale__Country = 220 + QLocale__SaintVincentAndGrenadines QLocale__Country = 201 + QLocale__Samoa QLocale__Country = 202 + QLocale__SanMarino QLocale__Country = 203 + QLocale__SaoTomeAndPrincipe QLocale__Country = 204 + QLocale__SaudiArabia QLocale__Country = 205 + QLocale__Senegal QLocale__Country = 206 + QLocale__Serbia QLocale__Country = 207 + QLocale__Seychelles QLocale__Country = 208 + QLocale__SierraLeone QLocale__Country = 209 + QLocale__Singapore QLocale__Country = 210 + QLocale__SintMaarten QLocale__Country = 211 + QLocale__Slovakia QLocale__Country = 212 + QLocale__Slovenia QLocale__Country = 213 + QLocale__SolomonIslands QLocale__Country = 214 + QLocale__Somalia QLocale__Country = 215 + QLocale__SouthAfrica QLocale__Country = 216 + QLocale__SouthGeorgiaAndSouthSandwichIslands QLocale__Country = 217 + QLocale__SouthKorea QLocale__Country = 218 + QLocale__SouthSudan QLocale__Country = 219 + QLocale__Spain QLocale__Country = 220 + QLocale__SriLanka QLocale__Country = 221 + QLocale__Sudan QLocale__Country = 222 + QLocale__Suriname QLocale__Country = 223 + QLocale__SvalbardAndJanMayen QLocale__Country = 224 + QLocale__Sweden QLocale__Country = 225 + QLocale__Switzerland QLocale__Country = 226 + QLocale__Syria QLocale__Country = 227 + QLocale__Taiwan QLocale__Country = 228 + QLocale__Tajikistan QLocale__Country = 229 + QLocale__Tanzania QLocale__Country = 230 + QLocale__Thailand QLocale__Country = 231 + QLocale__TimorLeste QLocale__Country = 232 + QLocale__Togo QLocale__Country = 233 + QLocale__TokelauTerritory QLocale__Country = 234 + QLocale__Tonga QLocale__Country = 235 + QLocale__TrinidadAndTobago QLocale__Country = 236 + QLocale__TristanDaCunha QLocale__Country = 237 + QLocale__Tunisia QLocale__Country = 238 + QLocale__Turkey QLocale__Country = 239 + QLocale__Turkmenistan QLocale__Country = 240 + QLocale__TurksAndCaicosIslands QLocale__Country = 241 + QLocale__TuvaluTerritory QLocale__Country = 242 + QLocale__Uganda QLocale__Country = 243 + QLocale__Ukraine QLocale__Country = 244 + QLocale__UnitedArabEmirates QLocale__Country = 245 + QLocale__UnitedKingdom QLocale__Country = 246 + QLocale__UnitedStatesOutlyingIslands QLocale__Country = 247 + QLocale__UnitedStates QLocale__Country = 248 + QLocale__UnitedStatesVirginIslands QLocale__Country = 249 + QLocale__Uruguay QLocale__Country = 250 + QLocale__Uzbekistan QLocale__Country = 251 + QLocale__Vanuatu QLocale__Country = 252 + QLocale__VaticanCity QLocale__Country = 253 + QLocale__Venezuela QLocale__Country = 254 + QLocale__Vietnam QLocale__Country = 255 + QLocale__WallisAndFutuna QLocale__Country = 256 + QLocale__WesternSahara QLocale__Country = 257 + QLocale__World QLocale__Country = 258 + QLocale__Yemen QLocale__Country = 259 + QLocale__Zambia QLocale__Country = 260 + QLocale__Zimbabwe QLocale__Country = 261 + QLocale__AnyCountry QLocale__Country = 0 + QLocale__Bonaire QLocale__Country = 44 + QLocale__BosniaAndHerzegowina QLocale__Country = 29 + QLocale__CuraSao QLocale__Country = 62 + QLocale__CzechRepublic QLocale__Country = 64 + QLocale__DemocraticRepublicOfCongo QLocale__Country = 57 + QLocale__DemocraticRepublicOfKorea QLocale__Country = 174 + QLocale__EastTimor QLocale__Country = 232 + QLocale__LatinAmericaAndTheCaribbean QLocale__Country = 130 + QLocale__Macau QLocale__Country = 139 + QLocale__NauruCountry QLocale__Country = 163 + QLocale__PeoplesRepublicOfCongo QLocale__Country = 56 + QLocale__RepublicOfKorea QLocale__Country = 218 + QLocale__RussianFederation QLocale__Country = 193 + QLocale__SaintVincentAndTheGrenadines QLocale__Country = 201 + QLocale__SouthGeorgiaAndTheSouthSandwichIslands QLocale__Country = 217 + QLocale__SvalbardAndJanMayenIslands QLocale__Country = 224 + QLocale__Swaziland QLocale__Country = 76 + QLocale__SyrianArabRepublic QLocale__Country = 227 + QLocale__TokelauCountry QLocale__Country = 234 + QLocale__TuvaluCountry QLocale__Country = 242 + QLocale__UnitedStatesMinorOutlyingIslands QLocale__Country = 247 + QLocale__VaticanCityState QLocale__Country = 253 + QLocale__WallisAndFutunaIslands QLocale__Country = 256 + QLocale__LastTerritory QLocale__Country = 261 QLocale__LastCountry QLocale__Country = 261 ) @@ -884,6 +867,21 @@ const ( QLocale__DataSizeSIFormat QLocale__DataSizeFormat = 3 ) +type QLocale__LanguageCodeType int + +const ( + QLocale__ISO639Part1 QLocale__LanguageCodeType = 1 + QLocale__ISO639Part2B QLocale__LanguageCodeType = 2 + QLocale__ISO639Part2T QLocale__LanguageCodeType = 4 + QLocale__ISO639Part3 QLocale__LanguageCodeType = 8 + QLocale__LegacyLanguageCode QLocale__LanguageCodeType = 32768 + QLocale__ISO639Part2 QLocale__LanguageCodeType = 6 + QLocale__ISO639Alpha2 QLocale__LanguageCodeType = 1 + QLocale__ISO639Alpha3 QLocale__LanguageCodeType = 14 + QLocale__ISO639 QLocale__LanguageCodeType = 15 + QLocale__AnyLanguageCode QLocale__LanguageCodeType = -1 +) + type QLocale__QuotationStyle int const ( @@ -928,14 +926,14 @@ func NewQLocale2(name string) *QLocale { } // NewQLocale3 constructs a new QLocale object. -func NewQLocale3(language QLocale__Language) *QLocale { - ret := C.QLocale_new3((C.int)(language)) +func NewQLocale3(language QLocale__Language, territory QLocale__Country) *QLocale { + ret := C.QLocale_new3((C.uint16_t)(language), (C.uint16_t)(territory)) 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.int)(language), (C.int)(script), (C.int)(country)) +func NewQLocale4(language QLocale__Language) *QLocale { + ret := C.QLocale_new4((C.uint16_t)(language)) return newQLocale(ret) } @@ -946,8 +944,14 @@ 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.int)(language), (C.int)(country)) +func NewQLocale6(language QLocale__Language, script QLocale__Script) *QLocale { + ret := C.QLocale_new6((C.uint16_t)(language), (C.uint16_t)(script)) + return newQLocale(ret) +} + +// NewQLocale7 constructs a new QLocale object. +func NewQLocale7(language QLocale__Language, script QLocale__Script, territory QLocale__Country) *QLocale { + ret := C.QLocale_new7((C.uint16_t)(language), (C.uint16_t)(script), (C.uint16_t)(territory)) return newQLocale(ret) } @@ -967,6 +971,10 @@ func (this *QLocale) Script() QLocale__Script { return (QLocale__Script)(C.QLocale_Script(this.h)) } +func (this *QLocale) Territory() QLocale__Country { + return (QLocale__Country)(C.QLocale_Territory(this.h)) +} + func (this *QLocale) Country() QLocale__Country { return (QLocale__Country)(C.QLocale_Country(this.h)) } @@ -992,6 +1000,13 @@ func (this *QLocale) NativeLanguageName() string { return _ret } +func (this *QLocale) NativeTerritoryName() string { + var _ms *C.struct_miqt_string = C.QLocale_NativeTerritoryName(this.h) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + func (this *QLocale) NativeCountryName() string { var _ms *C.struct_miqt_string = C.QLocale_NativeCountryName(this.h) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) @@ -1115,33 +1130,33 @@ func (this *QLocale) ToStringWithUint(i uint) string { return _ret } -func (this *QLocale) ToStringWithDouble(i float64) string { - var _ms *C.struct_miqt_string = C.QLocale_ToStringWithDouble(this.h, (C.double)(i)) +func (this *QLocale) ToStringWithDouble(f float64) string { + var _ms *C.struct_miqt_string = C.QLocale_ToStringWithDouble(this.h, (C.double)(f)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } -func (this *QLocale) ToStringWithFloat(i float32) string { - var _ms *C.struct_miqt_string = C.QLocale_ToStringWithFloat(this.h, (C.float)(i)) +func (this *QLocale) ToStringWithFloat(f float32) string { + var _ms *C.struct_miqt_string = C.QLocale_ToStringWithFloat(this.h, (C.float)(f)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } -func (this *QLocale) ToString2(date *QDate, formatStr string) string { - formatStr_ms := miqt_strdupg(formatStr) - defer C.free(formatStr_ms) - var _ms *C.struct_miqt_string = C.QLocale_ToString2(this.h, date.cPointer(), (*C.struct_miqt_string)(formatStr_ms)) +func (this *QLocale) ToString2(date QDate, format string) string { + format_ms := miqt_strdupg(format) + defer C.free(format_ms) + var _ms *C.struct_miqt_string = C.QLocale_ToString2(this.h, date.cPointer(), (*C.struct_miqt_string)(format_ms)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } -func (this *QLocale) ToString3(time *QTime, formatStr string) string { - formatStr_ms := miqt_strdupg(formatStr) - defer C.free(formatStr_ms) - var _ms *C.struct_miqt_string = C.QLocale_ToString3(this.h, time.cPointer(), (*C.struct_miqt_string)(formatStr_ms)) +func (this *QLocale) ToString3(time QTime, format string) string { + format_ms := miqt_strdupg(format) + defer C.free(format_ms) + var _ms *C.struct_miqt_string = C.QLocale_ToString3(this.h, time.cPointer(), (*C.struct_miqt_string)(format_ms)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -1156,14 +1171,14 @@ func (this *QLocale) ToString4(dateTime *QDateTime, format string) string { return _ret } -func (this *QLocale) ToStringWithDate(date *QDate) string { +func (this *QLocale) ToStringWithDate(date QDate) string { var _ms *C.struct_miqt_string = C.QLocale_ToStringWithDate(this.h, date.cPointer()) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } -func (this *QLocale) ToStringWithTime(time *QTime) string { +func (this *QLocale) ToStringWithTime(time QTime) string { var _ms *C.struct_miqt_string = C.QLocale_ToStringWithTime(this.h, time.cPointer()) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) @@ -1177,7 +1192,7 @@ func (this *QLocale) ToStringWithDateTime(dateTime *QDateTime) string { return _ret } -func (this *QLocale) ToString9(date *QDate, format QLocale__FormatType, cal QCalendar) 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.int)(format), cal.cPointer()) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) @@ -1312,73 +1327,53 @@ func (this *QLocale) ToDateTime4(stringVal string, format string, cal QCalendar) return _goptr } -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.int)(format), cal.cPointer()) - _goptr := newQTime(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QLocale) DecimalPoint() string { + var _ms *C.struct_miqt_string = C.QLocale_DecimalPoint(this.h) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret } -func (this *QLocale) ToTime4(stringVal string, format string, cal QCalendar) *QTime { - stringVal_ms := miqt_strdupg(stringVal) - defer C.free(stringVal_ms) - format_ms := miqt_strdupg(format) - defer C.free(format_ms) - _ret := C.QLocale_ToTime4(this.h, (*C.struct_miqt_string)(stringVal_ms), (*C.struct_miqt_string)(format_ms), cal.cPointer()) - _goptr := newQTime(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QLocale) GroupSeparator() string { + var _ms *C.struct_miqt_string = C.QLocale_GroupSeparator(this.h) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret } -func (this *QLocale) DecimalPoint() *QChar { - _ret := C.QLocale_DecimalPoint(this.h) - _goptr := newQChar(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QLocale) Percent() string { + var _ms *C.struct_miqt_string = C.QLocale_Percent(this.h) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret } -func (this *QLocale) GroupSeparator() *QChar { - _ret := C.QLocale_GroupSeparator(this.h) - _goptr := newQChar(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QLocale) ZeroDigit() string { + var _ms *C.struct_miqt_string = C.QLocale_ZeroDigit(this.h) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret } -func (this *QLocale) Percent() *QChar { - _ret := C.QLocale_Percent(this.h) - _goptr := newQChar(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QLocale) NegativeSign() string { + var _ms *C.struct_miqt_string = C.QLocale_NegativeSign(this.h) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret } -func (this *QLocale) ZeroDigit() *QChar { - _ret := C.QLocale_ZeroDigit(this.h) - _goptr := newQChar(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QLocale) PositiveSign() string { + var _ms *C.struct_miqt_string = C.QLocale_PositiveSign(this.h) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret } -func (this *QLocale) NegativeSign() *QChar { - _ret := C.QLocale_NegativeSign(this.h) - _goptr := newQChar(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QLocale) PositiveSign() *QChar { - _ret := C.QLocale_PositiveSign(this.h) - _goptr := newQChar(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QLocale) Exponential() *QChar { - _ret := C.QLocale_Exponential(this.h) - _goptr := newQChar(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QLocale) Exponential() string { + var _ms *C.struct_miqt_string = C.QLocale_Exponential(this.h) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret } func (this *QLocale) MonthName(param1 int) string { @@ -1492,29 +1487,29 @@ func (this *QLocale) ToCurrencyStringWithQulonglong(param1 uint64) string { return _ret } -func (this *QLocale) ToCurrencyStringWithShort(param1 int16) string { - var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyStringWithShort(this.h, (C.int16_t)(param1)) +func (this *QLocale) ToCurrencyStringWithShort(i int16) string { + var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyStringWithShort(this.h, (C.int16_t)(i)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } -func (this *QLocale) ToCurrencyStringWithUshort(param1 uint16) string { - var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyStringWithUshort(this.h, (C.uint16_t)(param1)) +func (this *QLocale) ToCurrencyStringWithUshort(i uint16) string { + var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyStringWithUshort(this.h, (C.uint16_t)(i)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } -func (this *QLocale) ToCurrencyStringWithInt(param1 int) string { - var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyStringWithInt(this.h, (C.int)(param1)) +func (this *QLocale) ToCurrencyStringWithInt(i int) string { + var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyStringWithInt(this.h, (C.int)(i)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } -func (this *QLocale) ToCurrencyStringWithUint(param1 uint) string { - var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyStringWithUint(this.h, (C.uint)(param1)) +func (this *QLocale) ToCurrencyStringWithUint(i uint) string { + var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyStringWithUint(this.h, (C.uint)(i)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -1527,15 +1522,6 @@ func (this *QLocale) ToCurrencyStringWithDouble(param1 float64) string { return _ret } -func (this *QLocale) ToCurrencyString2(param1 float64, symbol string, precision int) string { - symbol_ms := miqt_strdupg(symbol) - defer C.free(symbol_ms) - var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyString2(this.h, (C.double)(param1), (*C.struct_miqt_string)(symbol_ms), (C.int)(precision)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QLocale) ToCurrencyStringWithFloat(i float32) string { var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyStringWithFloat(this.h, (C.float)(i)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) @@ -1543,15 +1529,6 @@ func (this *QLocale) ToCurrencyStringWithFloat(i float32) string { return _ret } -func (this *QLocale) ToCurrencyString3(i float32, symbol string, precision int) string { - symbol_ms := miqt_strdupg(symbol) - defer C.free(symbol_ms) - var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyString3(this.h, (C.float)(i), (*C.struct_miqt_string)(symbol_ms), (C.int)(precision)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QLocale) FormattedDataSize(bytes int64) string { var _ms *C.struct_miqt_string = C.QLocale_FormattedDataSize(this.h, (C.longlong)(bytes)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) @@ -1559,13 +1536,6 @@ func (this *QLocale) FormattedDataSize(bytes int64) string { return _ret } -func (this *QLocale) FormattedDataSizeWithBytes(bytes int64) string { - var _ms *C.struct_miqt_string = C.QLocale_FormattedDataSizeWithBytes(this.h, (C.longlong)(bytes)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QLocale) UiLanguages() []string { var _ma *C.struct_miqt_array = C.QLocale_UiLanguages(this.h) _ret := make([]string, int(_ma.len)) @@ -1580,30 +1550,57 @@ func (this *QLocale) UiLanguages() []string { return _ret } -func (this *QLocale) OperatorEqual(other *QLocale) bool { - return (bool)(C.QLocale_OperatorEqual(this.h, other.cPointer())) +func QLocale_LanguageToCode(language QLocale__Language) string { + var _ms *C.struct_miqt_string = C.QLocale_LanguageToCode((C.uint16_t)(language)) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret } -func (this *QLocale) OperatorNotEqual(other *QLocale) bool { - return (bool)(C.QLocale_OperatorNotEqual(this.h, other.cPointer())) +func QLocale_TerritoryToCode(territory QLocale__Country) string { + var _ms *C.struct_miqt_string = C.QLocale_TerritoryToCode((C.uint16_t)(territory)) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + +func QLocale_CountryToCode(country QLocale__Country) string { + var _ms *C.struct_miqt_string = C.QLocale_CountryToCode((C.uint16_t)(country)) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + +func QLocale_ScriptToCode(script QLocale__Script) string { + var _ms *C.struct_miqt_string = C.QLocale_ScriptToCode((C.uint16_t)(script)) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret } func QLocale_LanguageToString(language QLocale__Language) string { - var _ms *C.struct_miqt_string = C.QLocale_LanguageToString((C.int)(language)) + var _ms *C.struct_miqt_string = C.QLocale_LanguageToString((C.uint16_t)(language)) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + +func QLocale_TerritoryToString(territory QLocale__Country) string { + var _ms *C.struct_miqt_string = C.QLocale_TerritoryToString((C.uint16_t)(territory)) _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.int)(country)) + var _ms *C.struct_miqt_string = C.QLocale_CountryToString((C.uint16_t)(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.int)(script)) + var _ms *C.struct_miqt_string = C.QLocale_ScriptToString((C.uint16_t)(script)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -1627,8 +1624,8 @@ func QLocale_System() *QLocale { return _goptr } -func QLocale_MatchingLocales(language QLocale__Language, script QLocale__Script, country QLocale__Country) []QLocale { - var _ma *C.struct_miqt_array = C.QLocale_MatchingLocales((C.int)(language), (C.int)(script), (C.int)(country)) +func QLocale_MatchingLocales(language QLocale__Language, script QLocale__Script, territory QLocale__Country) []QLocale { + var _ma *C.struct_miqt_array = C.QLocale_MatchingLocales((C.uint16_t)(language), (C.uint16_t)(script), (C.uint16_t)(territory)) _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 +1639,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.int)(lang)) + var _ma *C.struct_miqt_array = C.QLocale_CountriesForLanguage((C.uint16_t)(lang)) _ret := make([]QLocale__Country, int(_ma.len)) - _outCast := (*[0xffff]C.int)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.uint16_t)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { _ret[i] = (QLocale__Country)(_outCast[i]) } @@ -1746,42 +1743,42 @@ func (this *QLocale) ToDouble2(s string, ok *bool) float64 { return (float64)(C.QLocale_ToDouble2(this.h, (*C.struct_miqt_string)(s_ms), (*C.bool)(unsafe.Pointer(ok)))) } -func (this *QLocale) ToString22(i float64, f int8) string { - var _ms *C.struct_miqt_string = C.QLocale_ToString22(this.h, (C.double)(i), (C.char)(f)) +func (this *QLocale) ToString22(f float64, format int8) string { + var _ms *C.struct_miqt_string = C.QLocale_ToString22(this.h, (C.double)(f), (C.char)(format)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } -func (this *QLocale) ToString32(i float64, f int8, prec int) string { - var _ms *C.struct_miqt_string = C.QLocale_ToString32(this.h, (C.double)(i), (C.char)(f), (C.int)(prec)) +func (this *QLocale) ToString32(f float64, format int8, precision int) string { + var _ms *C.struct_miqt_string = C.QLocale_ToString32(this.h, (C.double)(f), (C.char)(format), (C.int)(precision)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } -func (this *QLocale) ToString23(i float32, f int8) string { - var _ms *C.struct_miqt_string = C.QLocale_ToString23(this.h, (C.float)(i), (C.char)(f)) +func (this *QLocale) ToString23(f float32, format int8) string { + var _ms *C.struct_miqt_string = C.QLocale_ToString23(this.h, (C.float)(f), (C.char)(format)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } -func (this *QLocale) ToString33(i float32, f int8, prec int) string { - var _ms *C.struct_miqt_string = C.QLocale_ToString33(this.h, (C.float)(i), (C.char)(f), (C.int)(prec)) +func (this *QLocale) ToString33(f float32, format int8, precision int) string { + var _ms *C.struct_miqt_string = C.QLocale_ToString33(this.h, (C.float)(f), (C.char)(format), (C.int)(precision)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } -func (this *QLocale) ToString24(date *QDate, format QLocale__FormatType) 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.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 { +func (this *QLocale) ToString25(time QTime, format QLocale__FormatType) string { 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)) @@ -1878,73 +1875,91 @@ func (this *QLocale) CurrencySymbol1(param1 QLocale__CurrencySymbolFormat) strin return _ret } -func (this *QLocale) ToCurrencyString22(param1 int64, symbol string) string { +func (this *QLocale) ToCurrencyString2(param1 int64, symbol string) string { symbol_ms := miqt_strdupg(symbol) defer C.free(symbol_ms) - var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyString22(this.h, (C.longlong)(param1), (*C.struct_miqt_string)(symbol_ms)) + var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyString2(this.h, (C.longlong)(param1), (*C.struct_miqt_string)(symbol_ms)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } -func (this *QLocale) ToCurrencyString23(param1 uint64, symbol string) string { +func (this *QLocale) ToCurrencyString22(param1 uint64, symbol string) string { symbol_ms := miqt_strdupg(symbol) defer C.free(symbol_ms) - var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyString23(this.h, (C.ulonglong)(param1), (*C.struct_miqt_string)(symbol_ms)) + var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyString22(this.h, (C.ulonglong)(param1), (*C.struct_miqt_string)(symbol_ms)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } -func (this *QLocale) ToCurrencyString24(param1 int16, symbol string) string { +func (this *QLocale) ToCurrencyString23(i int16, symbol string) string { symbol_ms := miqt_strdupg(symbol) defer C.free(symbol_ms) - var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyString24(this.h, (C.int16_t)(param1), (*C.struct_miqt_string)(symbol_ms)) + var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyString23(this.h, (C.int16_t)(i), (*C.struct_miqt_string)(symbol_ms)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } -func (this *QLocale) ToCurrencyString25(param1 uint16, symbol string) string { +func (this *QLocale) ToCurrencyString24(i uint16, symbol string) string { symbol_ms := miqt_strdupg(symbol) defer C.free(symbol_ms) - var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyString25(this.h, (C.uint16_t)(param1), (*C.struct_miqt_string)(symbol_ms)) + var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyString24(this.h, (C.uint16_t)(i), (*C.struct_miqt_string)(symbol_ms)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } -func (this *QLocale) ToCurrencyString26(param1 int, symbol string) string { +func (this *QLocale) ToCurrencyString25(i int, symbol string) string { symbol_ms := miqt_strdupg(symbol) defer C.free(symbol_ms) - var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyString26(this.h, (C.int)(param1), (*C.struct_miqt_string)(symbol_ms)) + var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyString25(this.h, (C.int)(i), (*C.struct_miqt_string)(symbol_ms)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } -func (this *QLocale) ToCurrencyString27(param1 uint, symbol string) string { +func (this *QLocale) ToCurrencyString26(i uint, symbol string) string { symbol_ms := miqt_strdupg(symbol) defer C.free(symbol_ms) - var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyString27(this.h, (C.uint)(param1), (*C.struct_miqt_string)(symbol_ms)) + var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyString26(this.h, (C.uint)(i), (*C.struct_miqt_string)(symbol_ms)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } -func (this *QLocale) ToCurrencyString28(param1 float64, symbol string) string { +func (this *QLocale) ToCurrencyString27(param1 float64, symbol string) string { symbol_ms := miqt_strdupg(symbol) defer C.free(symbol_ms) - var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyString28(this.h, (C.double)(param1), (*C.struct_miqt_string)(symbol_ms)) + var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyString27(this.h, (C.double)(param1), (*C.struct_miqt_string)(symbol_ms)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } -func (this *QLocale) ToCurrencyString29(i float32, symbol string) string { +func (this *QLocale) ToCurrencyString3(param1 float64, symbol string, precision int) string { symbol_ms := miqt_strdupg(symbol) defer C.free(symbol_ms) - var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyString29(this.h, (C.float)(i), (*C.struct_miqt_string)(symbol_ms)) + var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyString3(this.h, (C.double)(param1), (*C.struct_miqt_string)(symbol_ms), (C.int)(precision)) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + +func (this *QLocale) ToCurrencyString28(i float32, symbol string) string { + symbol_ms := miqt_strdupg(symbol) + defer C.free(symbol_ms) + var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyString28(this.h, (C.float)(i), (*C.struct_miqt_string)(symbol_ms)) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + +func (this *QLocale) ToCurrencyString32(i float32, symbol string, precision int) string { + symbol_ms := miqt_strdupg(symbol) + defer C.free(symbol_ms) + var _ms *C.struct_miqt_string = C.QLocale_ToCurrencyString32(this.h, (C.float)(i), (*C.struct_miqt_string)(symbol_ms), (C.int)(precision)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -1964,15 +1979,8 @@ func (this *QLocale) FormattedDataSize3(bytes int64, precision int, format QLoca return _ret } -func (this *QLocale) FormattedDataSize22(bytes int64, precision int) string { - var _ms *C.struct_miqt_string = C.QLocale_FormattedDataSize22(this.h, (C.longlong)(bytes), (C.int)(precision)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QLocale) FormattedDataSize32(bytes int64, precision int, format QLocale__DataSizeFormat) string { - var _ms *C.struct_miqt_string = C.QLocale_FormattedDataSize32(this.h, (C.longlong)(bytes), (C.int)(precision), (C.int)(format)) +func QLocale_LanguageToCode2(language QLocale__Language, codeTypes QLocale__LanguageCodeType) string { + var _ms *C.struct_miqt_string = C.QLocale_LanguageToCode2((C.uint16_t)(language), (C.int)(codeTypes)) _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 dc9de32..843f9cb 100644 --- a/qt/gen_qlocale.h +++ b/qt/gen_qlocale.h @@ -15,14 +15,12 @@ extern "C" { #ifdef __cplusplus class QCalendar; -class QChar; class QDate; class QDateTime; class QLocale; class QTime; #else typedef struct QCalendar QCalendar; -typedef struct QChar QChar; typedef struct QDate QDate; typedef struct QDateTime QDateTime; typedef struct QLocale QLocale; @@ -31,18 +29,21 @@ typedef struct QTime QTime; QLocale* QLocale_new(); QLocale* QLocale_new2(struct miqt_string* name); -QLocale* QLocale_new3(int language); -QLocale* QLocale_new4(int language, int script, int country); +QLocale* QLocale_new3(uint16_t language, uint16_t territory); +QLocale* QLocale_new4(uint16_t language); QLocale* QLocale_new5(QLocale* other); -QLocale* QLocale_new6(int language, int country); +QLocale* QLocale_new6(uint16_t language, uint16_t script); +QLocale* QLocale_new7(uint16_t language, uint16_t script, uint16_t territory); void QLocale_OperatorAssign(QLocale* self, QLocale* other); void QLocale_Swap(QLocale* self, QLocale* other); -int QLocale_Language(const QLocale* self); -int QLocale_Script(const QLocale* self); -int QLocale_Country(const QLocale* self); +uint16_t QLocale_Language(const QLocale* self); +uint16_t QLocale_Script(const QLocale* self); +uint16_t QLocale_Territory(const QLocale* self); +uint16_t 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); +struct miqt_string* QLocale_NativeTerritoryName(const QLocale* self); struct miqt_string* QLocale_NativeCountryName(const QLocale* self); int16_t QLocale_ToShort(const QLocale* self, struct miqt_string* s); uint16_t QLocale_ToUShort(const QLocale* self, struct miqt_string* s); @@ -62,10 +63,10 @@ struct miqt_string* QLocale_ToStringWithShort(const QLocale* self, int16_t i); struct miqt_string* QLocale_ToStringWithUshort(const QLocale* self, uint16_t i); struct miqt_string* QLocale_ToStringWithInt(const QLocale* self, int i); struct miqt_string* QLocale_ToStringWithUint(const QLocale* self, unsigned int i); -struct miqt_string* QLocale_ToStringWithDouble(const QLocale* self, double i); -struct miqt_string* QLocale_ToStringWithFloat(const QLocale* self, float i); -struct miqt_string* QLocale_ToString2(const QLocale* self, QDate* date, struct miqt_string* formatStr); -struct miqt_string* QLocale_ToString3(const QLocale* self, QTime* time, struct miqt_string* formatStr); +struct miqt_string* QLocale_ToStringWithDouble(const QLocale* self, double f); +struct miqt_string* QLocale_ToStringWithFloat(const QLocale* self, float f); +struct miqt_string* QLocale_ToString2(const QLocale* self, QDate* date, struct miqt_string* format); +struct miqt_string* QLocale_ToString3(const QLocale* self, QTime* time, struct miqt_string* format); struct miqt_string* QLocale_ToString4(const QLocale* self, QDateTime* dateTime, struct miqt_string* format); struct miqt_string* QLocale_ToStringWithDate(const QLocale* self, QDate* date); struct miqt_string* QLocale_ToStringWithTime(const QLocale* self, QTime* time); @@ -85,15 +86,13 @@ QDate* QLocale_ToDate3(const QLocale* self, struct miqt_string* stringVal, int f 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, 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); -QChar* QLocale_Percent(const QLocale* self); -QChar* QLocale_ZeroDigit(const QLocale* self); -QChar* QLocale_NegativeSign(const QLocale* self); -QChar* QLocale_PositiveSign(const QLocale* self); -QChar* QLocale_Exponential(const QLocale* self); +struct miqt_string* QLocale_DecimalPoint(const QLocale* self); +struct miqt_string* QLocale_GroupSeparator(const QLocale* self); +struct miqt_string* QLocale_Percent(const QLocale* self); +struct miqt_string* QLocale_ZeroDigit(const QLocale* self); +struct miqt_string* QLocale_NegativeSign(const QLocale* self); +struct miqt_string* QLocale_PositiveSign(const QLocale* self); +struct miqt_string* QLocale_Exponential(const QLocale* self); 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); @@ -110,27 +109,27 @@ struct miqt_string* QLocale_ToLower(const QLocale* self, struct miqt_string* str struct miqt_string* QLocale_CurrencySymbol(const QLocale* self); struct miqt_string* QLocale_ToCurrencyString(const QLocale* self, long long param1); struct miqt_string* QLocale_ToCurrencyStringWithQulonglong(const QLocale* self, unsigned long long param1); -struct miqt_string* QLocale_ToCurrencyStringWithShort(const QLocale* self, int16_t param1); -struct miqt_string* QLocale_ToCurrencyStringWithUshort(const QLocale* self, uint16_t param1); -struct miqt_string* QLocale_ToCurrencyStringWithInt(const QLocale* self, int param1); -struct miqt_string* QLocale_ToCurrencyStringWithUint(const QLocale* self, unsigned int param1); +struct miqt_string* QLocale_ToCurrencyStringWithShort(const QLocale* self, int16_t i); +struct miqt_string* QLocale_ToCurrencyStringWithUshort(const QLocale* self, uint16_t i); +struct miqt_string* QLocale_ToCurrencyStringWithInt(const QLocale* self, int i); +struct miqt_string* QLocale_ToCurrencyStringWithUint(const QLocale* self, unsigned int i); struct miqt_string* QLocale_ToCurrencyStringWithDouble(const QLocale* self, double param1); -struct miqt_string* QLocale_ToCurrencyString2(const QLocale* self, double param1, struct miqt_string* symbol, int precision); struct miqt_string* QLocale_ToCurrencyStringWithFloat(const QLocale* self, float i); -struct miqt_string* QLocale_ToCurrencyString3(const QLocale* self, float i, struct miqt_string* symbol, int precision); -struct miqt_string* QLocale_FormattedDataSize(QLocale* self, long long bytes); -struct miqt_string* QLocale_FormattedDataSizeWithBytes(const QLocale* self, long long bytes); +struct miqt_string* QLocale_FormattedDataSize(const QLocale* self, long long bytes); 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(int language); -struct miqt_string* QLocale_CountryToString(int country); -struct miqt_string* QLocale_ScriptToString(int script); +struct miqt_string* QLocale_LanguageToCode(uint16_t language); +struct miqt_string* QLocale_TerritoryToCode(uint16_t territory); +struct miqt_string* QLocale_CountryToCode(uint16_t country); +struct miqt_string* QLocale_ScriptToCode(uint16_t script); +struct miqt_string* QLocale_LanguageToString(uint16_t language); +struct miqt_string* QLocale_TerritoryToString(uint16_t territory); +struct miqt_string* QLocale_CountryToString(uint16_t country); +struct miqt_string* QLocale_ScriptToString(uint16_t script); void QLocale_SetDefault(QLocale* locale); QLocale* QLocale_C(); QLocale* QLocale_System(); -struct miqt_array* QLocale_MatchingLocales(int language, int script, int country); -struct miqt_array* QLocale_CountriesForLanguage(int lang); +struct miqt_array* QLocale_MatchingLocales(uint16_t language, uint16_t script, uint16_t territory); +struct miqt_array* QLocale_CountriesForLanguage(uint16_t 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); @@ -145,10 +144,10 @@ long long QLocale_ToLongLong2(const QLocale* self, struct miqt_string* s, bool* 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_ToString22(const QLocale* self, double f, char format); +struct miqt_string* QLocale_ToString32(const QLocale* self, double f, char format, int precision); +struct miqt_string* QLocale_ToString23(const QLocale* self, float f, char format); +struct miqt_string* QLocale_ToString33(const QLocale* self, float f, char format, int precision); 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); @@ -163,18 +162,19 @@ struct miqt_string* QLocale_StandaloneMonthName2(const QLocale* self, int param1 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); -struct miqt_string* QLocale_ToCurrencyString25(const QLocale* self, uint16_t param1, struct miqt_string* symbol); -struct miqt_string* QLocale_ToCurrencyString26(const QLocale* self, int param1, struct miqt_string* symbol); -struct miqt_string* QLocale_ToCurrencyString27(const QLocale* self, unsigned int param1, struct miqt_string* symbol); -struct miqt_string* QLocale_ToCurrencyString28(const QLocale* self, double param1, struct miqt_string* symbol); -struct miqt_string* QLocale_ToCurrencyString29(const QLocale* self, float i, struct miqt_string* symbol); -struct miqt_string* QLocale_FormattedDataSize2(QLocale* self, long long bytes, int precision); -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_ToCurrencyString2(const QLocale* self, long long param1, struct miqt_string* symbol); +struct miqt_string* QLocale_ToCurrencyString22(const QLocale* self, unsigned long long param1, struct miqt_string* symbol); +struct miqt_string* QLocale_ToCurrencyString23(const QLocale* self, int16_t i, struct miqt_string* symbol); +struct miqt_string* QLocale_ToCurrencyString24(const QLocale* self, uint16_t i, struct miqt_string* symbol); +struct miqt_string* QLocale_ToCurrencyString25(const QLocale* self, int i, struct miqt_string* symbol); +struct miqt_string* QLocale_ToCurrencyString26(const QLocale* self, unsigned int i, struct miqt_string* symbol); +struct miqt_string* QLocale_ToCurrencyString27(const QLocale* self, double param1, struct miqt_string* symbol); +struct miqt_string* QLocale_ToCurrencyString3(const QLocale* self, double param1, struct miqt_string* symbol, int precision); +struct miqt_string* QLocale_ToCurrencyString28(const QLocale* self, float i, struct miqt_string* symbol); +struct miqt_string* QLocale_ToCurrencyString32(const QLocale* self, float i, struct miqt_string* symbol, int precision); +struct miqt_string* QLocale_FormattedDataSize2(const QLocale* self, long long bytes, int precision); +struct miqt_string* QLocale_FormattedDataSize3(const QLocale* self, long long bytes, int precision, int format); +struct miqt_string* QLocale_LanguageToCode2(uint16_t language, int codeTypes); struct miqt_string* QLocale_QuoteString2(const QLocale* self, struct miqt_string* str, int style); void QLocale_Delete(QLocale* self); diff --git a/qt/gen_qlockfile.cpp b/qt/gen_qlockfile.cpp index 96f57b1..f9a580f 100644 --- a/qt/gen_qlockfile.cpp +++ b/qt/gen_qlockfile.cpp @@ -11,6 +11,13 @@ QLockFile* QLockFile_new(struct miqt_string* fileName) { return new QLockFile(fileName_QString); } +struct miqt_string* QLockFile_FileName(const QLockFile* self) { + QString _ret = self->fileName(); + // 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()); +} + bool QLockFile_Lock(QLockFile* self) { return self->lock(); } diff --git a/qt/gen_qlockfile.go b/qt/gen_qlockfile.go index 37dafd8..80c25dd 100644 --- a/qt/gen_qlockfile.go +++ b/qt/gen_qlockfile.go @@ -52,6 +52,13 @@ func NewQLockFile(fileName string) *QLockFile { return newQLockFile(ret) } +func (this *QLockFile) FileName() string { + var _ms *C.struct_miqt_string = C.QLockFile_FileName(this.h) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + func (this *QLockFile) Lock() bool { return (bool)(C.QLockFile_Lock(this.h)) } diff --git a/qt/gen_qlockfile.h b/qt/gen_qlockfile.h index ace760f..82c6bb3 100644 --- a/qt/gen_qlockfile.h +++ b/qt/gen_qlockfile.h @@ -20,6 +20,7 @@ typedef struct QLockFile QLockFile; #endif QLockFile* QLockFile_new(struct miqt_string* fileName); +struct miqt_string* QLockFile_FileName(const QLockFile* self); bool QLockFile_Lock(QLockFile* self); bool QLockFile_TryLock(QLockFile* self); void QLockFile_Unlock(QLockFile* self); diff --git a/qt/gen_qmainwindow.cpp b/qt/gen_qmainwindow.cpp index eecc49e..01081cd 100644 --- a/qt/gen_qmainwindow.cpp +++ b/qt/gen_qmainwindow.cpp @@ -44,13 +44,6 @@ struct miqt_string* QMainWindow_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QMainWindow_TrUtf8(const char* s) { - QString _ret = QMainWindow::trUtf8(s); - // 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()); -} - QSize* QMainWindow_IconSize(const QMainWindow* self) { return new QSize(self->iconSize()); } @@ -338,20 +331,6 @@ struct miqt_string* QMainWindow_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QMainWindow_TrUtf82(const char* s, const char* c) { - QString _ret = QMainWindow::trUtf8(s, c); - // 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* QMainWindow_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QMainWindow::trUtf8(s, c, static_cast(n)); - // 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 QMainWindow_AddToolBarBreak1(QMainWindow* self, int area) { self->addToolBarBreak(static_cast(area)); } diff --git a/qt/gen_qmainwindow.go b/qt/gen_qmainwindow.go index 4e35db2..cb6c409 100644 --- a/qt/gen_qmainwindow.go +++ b/qt/gen_qmainwindow.go @@ -85,15 +85,6 @@ func QMainWindow_Tr(s string) string { return _ret } -func QMainWindow_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QMainWindow_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QMainWindow) IconSize() *QSize { _ret := C.QMainWindow_IconSize(this.h) _goptr := newQSize(_ret) @@ -415,28 +406,6 @@ func QMainWindow_Tr3(s string, c string, n int) string { return _ret } -func QMainWindow_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMainWindow_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QMainWindow_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMainWindow_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QMainWindow) AddToolBarBreak1(area ToolBarArea) { C.QMainWindow_AddToolBarBreak1(this.h, (C.int)(area)) } diff --git a/qt/gen_qmainwindow.h b/qt/gen_qmainwindow.h index 9cfd6cc..ca5297c 100644 --- a/qt/gen_qmainwindow.h +++ b/qt/gen_qmainwindow.h @@ -45,7 +45,6 @@ QMainWindow* QMainWindow_new3(QWidget* parent, int flags); QMetaObject* QMainWindow_MetaObject(const QMainWindow* self); void* QMainWindow_Metacast(QMainWindow* self, const char* param1); 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); int QMainWindow_ToolButtonStyle(const QMainWindow* self); @@ -106,8 +105,6 @@ void QMainWindow_TabifiedDockWidgetActivated(QMainWindow* self, QDockWidget* doc void QMainWindow_connect_TabifiedDockWidgetActivated(QMainWindow* self, void* slot); 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, int area); QByteArray* QMainWindow_SaveState1(const QMainWindow* self, int version); bool QMainWindow_RestoreState2(QMainWindow* self, QByteArray* state, int version); diff --git a/qt/gen_qmap.cpp b/qt/gen_qmap.cpp deleted file mode 100644 index 7ada1a0..0000000 --- a/qt/gen_qmap.cpp +++ /dev/null @@ -1,91 +0,0 @@ -#include -#include -#include "qmap.h" -#include "gen_qmap.h" -#include "_cgo_export.h" - -QMapNodeBase* QMapNodeBase_new(QMapNodeBase* param1) { - return new QMapNodeBase(*param1); -} - -QMapNodeBase* QMapNodeBase_NextNode(const QMapNodeBase* self) { - return (QMapNodeBase*) self->nextNode(); -} - -QMapNodeBase* QMapNodeBase_NextNode2(QMapNodeBase* self) { - return self->nextNode(); -} - -QMapNodeBase* QMapNodeBase_PreviousNode(const QMapNodeBase* self) { - return (QMapNodeBase*) self->previousNode(); -} - -QMapNodeBase* QMapNodeBase_PreviousNode2(QMapNodeBase* self) { - return self->previousNode(); -} - -int QMapNodeBase_Color(const QMapNodeBase* self) { - QMapNodeBase::Color _ret = self->color(); - return static_cast(_ret); -} - -void QMapNodeBase_SetColor(QMapNodeBase* self, int c) { - self->setColor(static_cast(c)); -} - -QMapNodeBase* QMapNodeBase_Parent(const QMapNodeBase* self) { - return self->parent(); -} - -void QMapNodeBase_SetParent(QMapNodeBase* self, QMapNodeBase* pp) { - self->setParent(pp); -} - -void QMapNodeBase_OperatorAssign(QMapNodeBase* self, QMapNodeBase* param1) { - self->operator=(*param1); -} - -void QMapNodeBase_Delete(QMapNodeBase* self) { - delete self; -} - -void QMapDataBase_RotateLeft(QMapDataBase* self, QMapNodeBase* x) { - self->rotateLeft(x); -} - -void QMapDataBase_RotateRight(QMapDataBase* self, QMapNodeBase* x) { - self->rotateRight(x); -} - -void QMapDataBase_Rebalance(QMapDataBase* self, QMapNodeBase* x) { - self->rebalance(x); -} - -void QMapDataBase_FreeNodeAndRebalance(QMapDataBase* self, QMapNodeBase* z) { - self->freeNodeAndRebalance(z); -} - -void QMapDataBase_RecalcMostLeftNode(QMapDataBase* self) { - self->recalcMostLeftNode(); -} - -QMapNodeBase* QMapDataBase_CreateNode(QMapDataBase* self, int size, int alignment, QMapNodeBase* parent, bool left) { - return self->createNode(static_cast(size), static_cast(alignment), parent, left); -} - -void QMapDataBase_FreeTree(QMapDataBase* self, QMapNodeBase* root, int alignment) { - self->freeTree(root, static_cast(alignment)); -} - -QMapDataBase* QMapDataBase_CreateData() { - return QMapDataBase::createData(); -} - -void QMapDataBase_FreeData(QMapDataBase* d) { - QMapDataBase::freeData(d); -} - -void QMapDataBase_Delete(QMapDataBase* self) { - delete self; -} - diff --git a/qt/gen_qmap.go b/qt/gen_qmap.go deleted file mode 100644 index 2c8dd81..0000000 --- a/qt/gen_qmap.go +++ /dev/null @@ -1,177 +0,0 @@ -package qt - -/* - -#include "gen_qmap.h" -#include - -*/ -import "C" - -import ( - "runtime" - "unsafe" -) - -type QMapNodeBase__Color int - -const ( - QMapNodeBase__Red QMapNodeBase__Color = 0 - QMapNodeBase__Black QMapNodeBase__Color = 1 -) - -type QMapNodeBase__ int - -const ( - QMapNodeBase__Mask QMapNodeBase__ = 3 -) - -type QMapNodeBase struct { - h *C.QMapNodeBase -} - -func (this *QMapNodeBase) cPointer() *C.QMapNodeBase { - if this == nil { - return nil - } - return this.h -} - -func newQMapNodeBase(h *C.QMapNodeBase) *QMapNodeBase { - if h == nil { - return nil - } - return &QMapNodeBase{h: h} -} - -func newQMapNodeBase_U(h unsafe.Pointer) *QMapNodeBase { - return newQMapNodeBase((*C.QMapNodeBase)(h)) -} - -// NewQMapNodeBase constructs a new QMapNodeBase object. -func NewQMapNodeBase(param1 *QMapNodeBase) *QMapNodeBase { - ret := C.QMapNodeBase_new(param1.cPointer()) - return newQMapNodeBase(ret) -} - -func (this *QMapNodeBase) NextNode() *QMapNodeBase { - return newQMapNodeBase_U(unsafe.Pointer(C.QMapNodeBase_NextNode(this.h))) -} - -func (this *QMapNodeBase) NextNode2() *QMapNodeBase { - return newQMapNodeBase_U(unsafe.Pointer(C.QMapNodeBase_NextNode2(this.h))) -} - -func (this *QMapNodeBase) PreviousNode() *QMapNodeBase { - return newQMapNodeBase_U(unsafe.Pointer(C.QMapNodeBase_PreviousNode(this.h))) -} - -func (this *QMapNodeBase) PreviousNode2() *QMapNodeBase { - return newQMapNodeBase_U(unsafe.Pointer(C.QMapNodeBase_PreviousNode2(this.h))) -} - -func (this *QMapNodeBase) Color() QMapNodeBase__Color { - return (QMapNodeBase__Color)(C.QMapNodeBase_Color(this.h)) -} - -func (this *QMapNodeBase) SetColor(c QMapNodeBase__Color) { - C.QMapNodeBase_SetColor(this.h, (C.int)(c)) -} - -func (this *QMapNodeBase) Parent() *QMapNodeBase { - return newQMapNodeBase_U(unsafe.Pointer(C.QMapNodeBase_Parent(this.h))) -} - -func (this *QMapNodeBase) SetParent(pp *QMapNodeBase) { - C.QMapNodeBase_SetParent(this.h, pp.cPointer()) -} - -func (this *QMapNodeBase) OperatorAssign(param1 *QMapNodeBase) { - C.QMapNodeBase_OperatorAssign(this.h, param1.cPointer()) -} - -// Delete this object from C++ memory. -func (this *QMapNodeBase) Delete() { - C.QMapNodeBase_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QMapNodeBase) GoGC() { - runtime.SetFinalizer(this, func(this *QMapNodeBase) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} - -type QMapDataBase struct { - h *C.QMapDataBase -} - -func (this *QMapDataBase) cPointer() *C.QMapDataBase { - if this == nil { - return nil - } - return this.h -} - -func newQMapDataBase(h *C.QMapDataBase) *QMapDataBase { - if h == nil { - return nil - } - return &QMapDataBase{h: h} -} - -func newQMapDataBase_U(h unsafe.Pointer) *QMapDataBase { - return newQMapDataBase((*C.QMapDataBase)(h)) -} - -func (this *QMapDataBase) RotateLeft(x *QMapNodeBase) { - C.QMapDataBase_RotateLeft(this.h, x.cPointer()) -} - -func (this *QMapDataBase) RotateRight(x *QMapNodeBase) { - C.QMapDataBase_RotateRight(this.h, x.cPointer()) -} - -func (this *QMapDataBase) Rebalance(x *QMapNodeBase) { - C.QMapDataBase_Rebalance(this.h, x.cPointer()) -} - -func (this *QMapDataBase) FreeNodeAndRebalance(z *QMapNodeBase) { - C.QMapDataBase_FreeNodeAndRebalance(this.h, z.cPointer()) -} - -func (this *QMapDataBase) RecalcMostLeftNode() { - C.QMapDataBase_RecalcMostLeftNode(this.h) -} - -func (this *QMapDataBase) CreateNode(size int, alignment int, parent *QMapNodeBase, left bool) *QMapNodeBase { - return newQMapNodeBase_U(unsafe.Pointer(C.QMapDataBase_CreateNode(this.h, (C.int)(size), (C.int)(alignment), parent.cPointer(), (C.bool)(left)))) -} - -func (this *QMapDataBase) FreeTree(root *QMapNodeBase, alignment int) { - C.QMapDataBase_FreeTree(this.h, root.cPointer(), (C.int)(alignment)) -} - -func QMapDataBase_CreateData() *QMapDataBase { - return newQMapDataBase_U(unsafe.Pointer(C.QMapDataBase_CreateData())) -} - -func QMapDataBase_FreeData(d *QMapDataBase) { - C.QMapDataBase_FreeData(d.cPointer()) -} - -// Delete this object from C++ memory. -func (this *QMapDataBase) Delete() { - C.QMapDataBase_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QMapDataBase) GoGC() { - runtime.SetFinalizer(this, func(this *QMapDataBase) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} diff --git a/qt/gen_qmap.h b/qt/gen_qmap.h deleted file mode 100644 index f77455d..0000000 --- a/qt/gen_qmap.h +++ /dev/null @@ -1,51 +0,0 @@ -#ifndef GEN_QMAP_H -#define GEN_QMAP_H - -#include -#include -#include - -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - -#include "binding.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __cplusplus -class QMapDataBase; -class QMapNodeBase; -#else -typedef struct QMapDataBase QMapDataBase; -typedef struct QMapNodeBase QMapNodeBase; -#endif - -QMapNodeBase* QMapNodeBase_new(QMapNodeBase* param1); -QMapNodeBase* QMapNodeBase_NextNode(const QMapNodeBase* self); -QMapNodeBase* QMapNodeBase_NextNode2(QMapNodeBase* self); -QMapNodeBase* QMapNodeBase_PreviousNode(const QMapNodeBase* self); -QMapNodeBase* QMapNodeBase_PreviousNode2(QMapNodeBase* self); -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); -void QMapNodeBase_Delete(QMapNodeBase* self); - -void QMapDataBase_RotateLeft(QMapDataBase* self, QMapNodeBase* x); -void QMapDataBase_RotateRight(QMapDataBase* self, QMapNodeBase* x); -void QMapDataBase_Rebalance(QMapDataBase* self, QMapNodeBase* x); -void QMapDataBase_FreeNodeAndRebalance(QMapDataBase* self, QMapNodeBase* z); -void QMapDataBase_RecalcMostLeftNode(QMapDataBase* self); -QMapNodeBase* QMapDataBase_CreateNode(QMapDataBase* self, int size, int alignment, QMapNodeBase* parent, bool left); -void QMapDataBase_FreeTree(QMapDataBase* self, QMapNodeBase* root, int alignment); -QMapDataBase* QMapDataBase_CreateData(); -void QMapDataBase_FreeData(QMapDataBase* d); -void QMapDataBase_Delete(QMapDataBase* self); - -#ifdef __cplusplus -} /* extern C */ -#endif - -#endif diff --git a/qt/gen_qmargins.cpp b/qt/gen_qmargins.cpp index 99fd4ab..874b9d4 100644 --- a/qt/gen_qmargins.cpp +++ b/qt/gen_qmargins.cpp @@ -100,6 +100,10 @@ QMargins* QMargins_OperatorDivideAssignWithQreal(QMargins* self, double param1) return &_ret; } +QMarginsF* QMargins_ToMarginsF(const QMargins* self) { + return new QMarginsF(self->toMarginsF()); +} + void QMargins_Delete(QMargins* self) { delete self; } @@ -144,20 +148,20 @@ double QMarginsF_Bottom(const QMarginsF* self) { return static_cast(_ret); } -void QMarginsF_SetLeft(QMarginsF* self, double left) { - self->setLeft(static_cast(left)); +void QMarginsF_SetLeft(QMarginsF* self, double aleft) { + self->setLeft(static_cast(aleft)); } -void QMarginsF_SetTop(QMarginsF* self, double top) { - self->setTop(static_cast(top)); +void QMarginsF_SetTop(QMarginsF* self, double atop) { + self->setTop(static_cast(atop)); } -void QMarginsF_SetRight(QMarginsF* self, double right) { - self->setRight(static_cast(right)); +void QMarginsF_SetRight(QMarginsF* self, double aright) { + self->setRight(static_cast(aright)); } -void QMarginsF_SetBottom(QMarginsF* self, double bottom) { - self->setBottom(static_cast(bottom)); +void QMarginsF_SetBottom(QMarginsF* self, double abottom) { + self->setBottom(static_cast(abottom)); } QMarginsF* QMarginsF_OperatorPlusAssign(QMarginsF* self, QMarginsF* margins) { diff --git a/qt/gen_qmargins.go b/qt/gen_qmargins.go index 3745c54..a039ce5 100644 --- a/qt/gen_qmargins.go +++ b/qt/gen_qmargins.go @@ -121,6 +121,13 @@ func (this *QMargins) OperatorDivideAssignWithQreal(param1 float64) *QMargins { return newQMargins_U(unsafe.Pointer(C.QMargins_OperatorDivideAssignWithQreal(this.h, (C.double)(param1)))) } +func (this *QMargins) ToMarginsF() *QMarginsF { + _ret := C.QMargins_ToMarginsF(this.h) + _goptr := newQMarginsF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + // Delete this object from C++ memory. func (this *QMargins) Delete() { C.QMargins_Delete(this.h) @@ -201,20 +208,20 @@ func (this *QMarginsF) Bottom() float64 { return (float64)(C.QMarginsF_Bottom(this.h)) } -func (this *QMarginsF) SetLeft(left float64) { - C.QMarginsF_SetLeft(this.h, (C.double)(left)) +func (this *QMarginsF) SetLeft(aleft float64) { + C.QMarginsF_SetLeft(this.h, (C.double)(aleft)) } -func (this *QMarginsF) SetTop(top float64) { - C.QMarginsF_SetTop(this.h, (C.double)(top)) +func (this *QMarginsF) SetTop(atop float64) { + C.QMarginsF_SetTop(this.h, (C.double)(atop)) } -func (this *QMarginsF) SetRight(right float64) { - C.QMarginsF_SetRight(this.h, (C.double)(right)) +func (this *QMarginsF) SetRight(aright float64) { + C.QMarginsF_SetRight(this.h, (C.double)(aright)) } -func (this *QMarginsF) SetBottom(bottom float64) { - C.QMarginsF_SetBottom(this.h, (C.double)(bottom)) +func (this *QMarginsF) SetBottom(abottom float64) { + C.QMarginsF_SetBottom(this.h, (C.double)(abottom)) } func (this *QMarginsF) OperatorPlusAssign(margins *QMarginsF) *QMarginsF { diff --git a/qt/gen_qmargins.h b/qt/gen_qmargins.h index 5897693..15cbc21 100644 --- a/qt/gen_qmargins.h +++ b/qt/gen_qmargins.h @@ -41,6 +41,7 @@ QMargins* QMargins_OperatorMultiplyAssign(QMargins* self, int param1); QMargins* QMargins_OperatorDivideAssign(QMargins* self, int param1); QMargins* QMargins_OperatorMultiplyAssignWithQreal(QMargins* self, double param1); QMargins* QMargins_OperatorDivideAssignWithQreal(QMargins* self, double param1); +QMarginsF* QMargins_ToMarginsF(const QMargins* self); void QMargins_Delete(QMargins* self); QMarginsF* QMarginsF_new(); @@ -52,10 +53,10 @@ double QMarginsF_Left(const QMarginsF* self); double QMarginsF_Top(const QMarginsF* self); double QMarginsF_Right(const QMarginsF* self); double QMarginsF_Bottom(const QMarginsF* self); -void QMarginsF_SetLeft(QMarginsF* self, double left); -void QMarginsF_SetTop(QMarginsF* self, double top); -void QMarginsF_SetRight(QMarginsF* self, double right); -void QMarginsF_SetBottom(QMarginsF* self, double bottom); +void QMarginsF_SetLeft(QMarginsF* self, double aleft); +void QMarginsF_SetTop(QMarginsF* self, double atop); +void QMarginsF_SetRight(QMarginsF* self, double aright); +void QMarginsF_SetBottom(QMarginsF* self, double abottom); QMarginsF* QMarginsF_OperatorPlusAssign(QMarginsF* self, QMarginsF* margins); QMarginsF* QMarginsF_OperatorMinusAssign(QMarginsF* self, QMarginsF* margins); QMarginsF* QMarginsF_OperatorPlusAssignWithAddend(QMarginsF* self, double addend); diff --git a/qt/gen_qmatrix.cpp b/qt/gen_qmatrix.cpp deleted file mode 100644 index 5a9b32e..0000000 --- a/qt/gen_qmatrix.cpp +++ /dev/null @@ -1,178 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "qmatrix.h" -#include "gen_qmatrix.h" -#include "_cgo_export.h" - -QMatrix* QMatrix_new(int param1) { - return new QMatrix(static_cast(param1)); -} - -QMatrix* QMatrix_new2() { - return new QMatrix(); -} - -QMatrix* QMatrix_new3(double m11, double m12, double m21, double m22, double dx, double dy) { - return new QMatrix(static_cast(m11), static_cast(m12), static_cast(m21), static_cast(m22), static_cast(dx), static_cast(dy)); -} - -QMatrix* QMatrix_new4(QMatrix* other) { - return new QMatrix(*other); -} - -void QMatrix_OperatorAssign(QMatrix* self, QMatrix* param1) { - self->operator=(*param1); -} - -void QMatrix_SetMatrix(QMatrix* self, double m11, double m12, double m21, double m22, double dx, double dy) { - self->setMatrix(static_cast(m11), static_cast(m12), static_cast(m21), static_cast(m22), static_cast(dx), static_cast(dy)); -} - -double QMatrix_M11(const QMatrix* self) { - qreal _ret = self->m11(); - return static_cast(_ret); -} - -double QMatrix_M12(const QMatrix* self) { - qreal _ret = self->m12(); - return static_cast(_ret); -} - -double QMatrix_M21(const QMatrix* self) { - qreal _ret = self->m21(); - return static_cast(_ret); -} - -double QMatrix_M22(const QMatrix* self) { - qreal _ret = self->m22(); - return static_cast(_ret); -} - -double QMatrix_Dx(const QMatrix* self) { - qreal _ret = self->dx(); - return static_cast(_ret); -} - -double QMatrix_Dy(const QMatrix* self) { - qreal _ret = self->dy(); - return static_cast(_ret); -} - -void QMatrix_Map(const QMatrix* self, int x, int y, int* tx, int* ty) { - self->map(static_cast(x), static_cast(y), static_cast(tx), static_cast(ty)); -} - -void QMatrix_Map2(const QMatrix* self, double x, double y, double* tx, double* ty) { - self->map(static_cast(x), static_cast(y), static_cast(tx), static_cast(ty)); -} - -QRect* QMatrix_MapRect(const QMatrix* self, QRect* param1) { - return new QRect(self->mapRect(*param1)); -} - -QRectF* QMatrix_MapRectWithQRectF(const QMatrix* self, QRectF* param1) { - return new QRectF(self->mapRect(*param1)); -} - -QPoint* QMatrix_MapWithQPoint(const QMatrix* self, QPoint* p) { - return new QPoint(self->map(*p)); -} - -QPointF* QMatrix_MapWithQPointF(const QMatrix* self, QPointF* p) { - return new QPointF(self->map(*p)); -} - -QLine* QMatrix_MapWithQLine(const QMatrix* self, QLine* l) { - return new QLine(self->map(*l)); -} - -QLineF* QMatrix_MapWithQLineF(const QMatrix* self, QLineF* l) { - return new QLineF(self->map(*l)); -} - -QRegion* QMatrix_MapWithQRegion(const QMatrix* self, QRegion* r) { - return new QRegion(self->map(*r)); -} - -QPainterPath* QMatrix_MapWithQPainterPath(const QMatrix* self, QPainterPath* p) { - return new QPainterPath(self->map(*p)); -} - -void QMatrix_Reset(QMatrix* self) { - self->reset(); -} - -bool QMatrix_IsIdentity(const QMatrix* self) { - return self->isIdentity(); -} - -QMatrix* QMatrix_Translate(QMatrix* self, double dx, double dy) { - QMatrix& _ret = self->translate(static_cast(dx), static_cast(dy)); - // Cast returned reference into pointer - return &_ret; -} - -QMatrix* QMatrix_Scale(QMatrix* self, double sx, double sy) { - QMatrix& _ret = self->scale(static_cast(sx), static_cast(sy)); - // Cast returned reference into pointer - return &_ret; -} - -QMatrix* QMatrix_Shear(QMatrix* self, double sh, double sv) { - QMatrix& _ret = self->shear(static_cast(sh), static_cast(sv)); - // Cast returned reference into pointer - return &_ret; -} - -QMatrix* QMatrix_Rotate(QMatrix* self, double a) { - QMatrix& _ret = self->rotate(static_cast(a)); - // Cast returned reference into pointer - return &_ret; -} - -bool QMatrix_IsInvertible(const QMatrix* self) { - return self->isInvertible(); -} - -double QMatrix_Determinant(const QMatrix* self) { - qreal _ret = self->determinant(); - return static_cast(_ret); -} - -QMatrix* QMatrix_Inverted(const QMatrix* self) { - return new QMatrix(self->inverted()); -} - -bool QMatrix_OperatorEqual(const QMatrix* self, QMatrix* param1) { - return self->operator==(*param1); -} - -bool QMatrix_OperatorNotEqual(const QMatrix* self, QMatrix* param1) { - return self->operator!=(*param1); -} - -QMatrix* QMatrix_OperatorMultiplyAssign(QMatrix* self, QMatrix* param1) { - QMatrix& _ret = self->operator*=(*param1); - // Cast returned reference into pointer - return &_ret; -} - -QMatrix* QMatrix_OperatorMultiply(const QMatrix* self, QMatrix* o) { - return new QMatrix(self->operator*(*o)); -} - -QMatrix* QMatrix_Inverted1(const QMatrix* self, bool* invertible) { - return new QMatrix(self->inverted(invertible)); -} - -void QMatrix_Delete(QMatrix* self) { - delete self; -} - diff --git a/qt/gen_qmatrix.go b/qt/gen_qmatrix.go deleted file mode 100644 index 93be44e..0000000 --- a/qt/gen_qmatrix.go +++ /dev/null @@ -1,235 +0,0 @@ -package qt - -/* - -#include "gen_qmatrix.h" -#include - -*/ -import "C" - -import ( - "runtime" - "unsafe" -) - -type QMatrix struct { - h *C.QMatrix -} - -func (this *QMatrix) cPointer() *C.QMatrix { - if this == nil { - return nil - } - return this.h -} - -func newQMatrix(h *C.QMatrix) *QMatrix { - if h == nil { - return nil - } - return &QMatrix{h: h} -} - -func newQMatrix_U(h unsafe.Pointer) *QMatrix { - return newQMatrix((*C.QMatrix)(h)) -} - -// NewQMatrix constructs a new QMatrix object. -func NewQMatrix(param1 Initialization) *QMatrix { - ret := C.QMatrix_new((C.int)(param1)) - return newQMatrix(ret) -} - -// NewQMatrix2 constructs a new QMatrix object. -func NewQMatrix2() *QMatrix { - ret := C.QMatrix_new2() - return newQMatrix(ret) -} - -// NewQMatrix3 constructs a new QMatrix object. -func NewQMatrix3(m11 float64, m12 float64, m21 float64, m22 float64, dx float64, dy float64) *QMatrix { - ret := C.QMatrix_new3((C.double)(m11), (C.double)(m12), (C.double)(m21), (C.double)(m22), (C.double)(dx), (C.double)(dy)) - return newQMatrix(ret) -} - -// NewQMatrix4 constructs a new QMatrix object. -func NewQMatrix4(other *QMatrix) *QMatrix { - ret := C.QMatrix_new4(other.cPointer()) - return newQMatrix(ret) -} - -func (this *QMatrix) OperatorAssign(param1 *QMatrix) { - C.QMatrix_OperatorAssign(this.h, param1.cPointer()) -} - -func (this *QMatrix) SetMatrix(m11 float64, m12 float64, m21 float64, m22 float64, dx float64, dy float64) { - C.QMatrix_SetMatrix(this.h, (C.double)(m11), (C.double)(m12), (C.double)(m21), (C.double)(m22), (C.double)(dx), (C.double)(dy)) -} - -func (this *QMatrix) M11() float64 { - return (float64)(C.QMatrix_M11(this.h)) -} - -func (this *QMatrix) M12() float64 { - return (float64)(C.QMatrix_M12(this.h)) -} - -func (this *QMatrix) M21() float64 { - return (float64)(C.QMatrix_M21(this.h)) -} - -func (this *QMatrix) M22() float64 { - return (float64)(C.QMatrix_M22(this.h)) -} - -func (this *QMatrix) Dx() float64 { - return (float64)(C.QMatrix_Dx(this.h)) -} - -func (this *QMatrix) Dy() float64 { - return (float64)(C.QMatrix_Dy(this.h)) -} - -func (this *QMatrix) Map(x int, y int, tx *int, ty *int) { - C.QMatrix_Map(this.h, (C.int)(x), (C.int)(y), (*C.int)(unsafe.Pointer(tx)), (*C.int)(unsafe.Pointer(ty))) -} - -func (this *QMatrix) Map2(x float64, y float64, tx *float64, ty *float64) { - C.QMatrix_Map2(this.h, (C.double)(x), (C.double)(y), (*C.double)(unsafe.Pointer(tx)), (*C.double)(unsafe.Pointer(ty))) -} - -func (this *QMatrix) MapRect(param1 *QRect) *QRect { - _ret := C.QMatrix_MapRect(this.h, param1.cPointer()) - _goptr := newQRect(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QMatrix) MapRectWithQRectF(param1 *QRectF) *QRectF { - _ret := C.QMatrix_MapRectWithQRectF(this.h, param1.cPointer()) - _goptr := newQRectF(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QMatrix) MapWithQPoint(p *QPoint) *QPoint { - _ret := C.QMatrix_MapWithQPoint(this.h, p.cPointer()) - _goptr := newQPoint(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QMatrix) MapWithQPointF(p *QPointF) *QPointF { - _ret := C.QMatrix_MapWithQPointF(this.h, p.cPointer()) - _goptr := newQPointF(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QMatrix) MapWithQLine(l *QLine) *QLine { - _ret := C.QMatrix_MapWithQLine(this.h, l.cPointer()) - _goptr := newQLine(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QMatrix) MapWithQLineF(l *QLineF) *QLineF { - _ret := C.QMatrix_MapWithQLineF(this.h, l.cPointer()) - _goptr := newQLineF(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QMatrix) MapWithQRegion(r *QRegion) *QRegion { - _ret := C.QMatrix_MapWithQRegion(this.h, r.cPointer()) - _goptr := newQRegion(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QMatrix) MapWithQPainterPath(p *QPainterPath) *QPainterPath { - _ret := C.QMatrix_MapWithQPainterPath(this.h, p.cPointer()) - _goptr := newQPainterPath(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QMatrix) Reset() { - C.QMatrix_Reset(this.h) -} - -func (this *QMatrix) IsIdentity() bool { - return (bool)(C.QMatrix_IsIdentity(this.h)) -} - -func (this *QMatrix) Translate(dx float64, dy float64) *QMatrix { - return newQMatrix_U(unsafe.Pointer(C.QMatrix_Translate(this.h, (C.double)(dx), (C.double)(dy)))) -} - -func (this *QMatrix) Scale(sx float64, sy float64) *QMatrix { - return newQMatrix_U(unsafe.Pointer(C.QMatrix_Scale(this.h, (C.double)(sx), (C.double)(sy)))) -} - -func (this *QMatrix) Shear(sh float64, sv float64) *QMatrix { - return newQMatrix_U(unsafe.Pointer(C.QMatrix_Shear(this.h, (C.double)(sh), (C.double)(sv)))) -} - -func (this *QMatrix) Rotate(a float64) *QMatrix { - return newQMatrix_U(unsafe.Pointer(C.QMatrix_Rotate(this.h, (C.double)(a)))) -} - -func (this *QMatrix) IsInvertible() bool { - return (bool)(C.QMatrix_IsInvertible(this.h)) -} - -func (this *QMatrix) Determinant() float64 { - return (float64)(C.QMatrix_Determinant(this.h)) -} - -func (this *QMatrix) Inverted() *QMatrix { - _ret := C.QMatrix_Inverted(this.h) - _goptr := newQMatrix(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QMatrix) OperatorEqual(param1 *QMatrix) bool { - return (bool)(C.QMatrix_OperatorEqual(this.h, param1.cPointer())) -} - -func (this *QMatrix) OperatorNotEqual(param1 *QMatrix) bool { - return (bool)(C.QMatrix_OperatorNotEqual(this.h, param1.cPointer())) -} - -func (this *QMatrix) OperatorMultiplyAssign(param1 *QMatrix) *QMatrix { - return newQMatrix_U(unsafe.Pointer(C.QMatrix_OperatorMultiplyAssign(this.h, param1.cPointer()))) -} - -func (this *QMatrix) OperatorMultiply(o *QMatrix) *QMatrix { - _ret := C.QMatrix_OperatorMultiply(this.h, o.cPointer()) - _goptr := newQMatrix(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QMatrix) Inverted1(invertible *bool) *QMatrix { - _ret := C.QMatrix_Inverted1(this.h, (*C.bool)(unsafe.Pointer(invertible))) - _goptr := newQMatrix(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -// Delete this object from C++ memory. -func (this *QMatrix) Delete() { - C.QMatrix_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QMatrix) GoGC() { - runtime.SetFinalizer(this, func(this *QMatrix) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} diff --git a/qt/gen_qmatrix.h b/qt/gen_qmatrix.h deleted file mode 100644 index 037fe57..0000000 --- a/qt/gen_qmatrix.h +++ /dev/null @@ -1,80 +0,0 @@ -#ifndef GEN_QMATRIX_H -#define GEN_QMATRIX_H - -#include -#include -#include - -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - -#include "binding.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __cplusplus -class QLine; -class QLineF; -class QMatrix; -class QPainterPath; -class QPoint; -class QPointF; -class QRect; -class QRectF; -class QRegion; -#else -typedef struct QLine QLine; -typedef struct QLineF QLineF; -typedef struct QMatrix QMatrix; -typedef struct QPainterPath QPainterPath; -typedef struct QPoint QPoint; -typedef struct QPointF QPointF; -typedef struct QRect QRect; -typedef struct QRectF QRectF; -typedef struct QRegion QRegion; -#endif - -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); -void QMatrix_OperatorAssign(QMatrix* self, QMatrix* param1); -void QMatrix_SetMatrix(QMatrix* self, double m11, double m12, double m21, double m22, double dx, double dy); -double QMatrix_M11(const QMatrix* self); -double QMatrix_M12(const QMatrix* self); -double QMatrix_M21(const QMatrix* self); -double QMatrix_M22(const QMatrix* self); -double QMatrix_Dx(const QMatrix* self); -double QMatrix_Dy(const QMatrix* self); -void QMatrix_Map(const QMatrix* self, int x, int y, int* tx, int* ty); -void QMatrix_Map2(const QMatrix* self, double x, double y, double* tx, double* ty); -QRect* QMatrix_MapRect(const QMatrix* self, QRect* param1); -QRectF* QMatrix_MapRectWithQRectF(const QMatrix* self, QRectF* param1); -QPoint* QMatrix_MapWithQPoint(const QMatrix* self, QPoint* p); -QPointF* QMatrix_MapWithQPointF(const QMatrix* self, QPointF* p); -QLine* QMatrix_MapWithQLine(const QMatrix* self, QLine* l); -QLineF* QMatrix_MapWithQLineF(const QMatrix* self, QLineF* l); -QRegion* QMatrix_MapWithQRegion(const QMatrix* self, QRegion* r); -QPainterPath* QMatrix_MapWithQPainterPath(const QMatrix* self, QPainterPath* p); -void QMatrix_Reset(QMatrix* self); -bool QMatrix_IsIdentity(const QMatrix* self); -QMatrix* QMatrix_Translate(QMatrix* self, double dx, double dy); -QMatrix* QMatrix_Scale(QMatrix* self, double sx, double sy); -QMatrix* QMatrix_Shear(QMatrix* self, double sh, double sv); -QMatrix* QMatrix_Rotate(QMatrix* self, double a); -bool QMatrix_IsInvertible(const QMatrix* self); -double QMatrix_Determinant(const QMatrix* self); -QMatrix* QMatrix_Inverted(const QMatrix* self); -bool QMatrix_OperatorEqual(const QMatrix* self, QMatrix* param1); -bool QMatrix_OperatorNotEqual(const QMatrix* self, QMatrix* param1); -QMatrix* QMatrix_OperatorMultiplyAssign(QMatrix* self, QMatrix* param1); -QMatrix* QMatrix_OperatorMultiply(const QMatrix* self, QMatrix* o); -QMatrix* QMatrix_Inverted1(const QMatrix* self, bool* invertible); -void QMatrix_Delete(QMatrix* self); - -#ifdef __cplusplus -} /* extern C */ -#endif - -#endif diff --git a/qt/gen_qmatrix4x4.cpp b/qt/gen_qmatrix4x4.cpp index 3700f07..1fcf250 100644 --- a/qt/gen_qmatrix4x4.cpp +++ b/qt/gen_qmatrix4x4.cpp @@ -1,4 +1,3 @@ -#include #include #include #include @@ -36,11 +35,7 @@ QMatrix4x4* QMatrix4x4_new6(QTransform* transform) { return new QMatrix4x4(*transform); } -QMatrix4x4* QMatrix4x4_new7(QMatrix* matrix) { - return new QMatrix4x4(*matrix); -} - -QMatrix4x4* QMatrix4x4_new8(QMatrix4x4* param1) { +QMatrix4x4* QMatrix4x4_new7(QMatrix4x4* param1) { return new QMatrix4x4(*param1); } @@ -206,10 +201,6 @@ void QMatrix4x4_CopyDataTo(const QMatrix4x4* self, float* values) { self->copyDataTo(static_cast(values)); } -QMatrix* QMatrix4x4_ToAffine(const QMatrix4x4* self) { - return new QMatrix(self->toAffine()); -} - QTransform* QMatrix4x4_ToTransform(const QMatrix4x4* self) { return new QTransform(self->toTransform()); } @@ -262,6 +253,15 @@ void QMatrix4x4_Optimize(QMatrix4x4* self) { self->optimize(); } +void QMatrix4x4_ProjectedRotate(QMatrix4x4* self, float angle, float x, float y, float z) { + self->projectedRotate(static_cast(angle), static_cast(x), static_cast(y), static_cast(z)); +} + +int QMatrix4x4_Flags(const QMatrix4x4* self) { + QMatrix4x4::Flags _ret = self->flags(); + return static_cast(_ret); +} + QMatrix4x4* QMatrix4x4_Inverted1(const QMatrix4x4* self, bool* invertible) { return new QMatrix4x4(self->inverted(invertible)); } diff --git a/qt/gen_qmatrix4x4.go b/qt/gen_qmatrix4x4.go index a4aa2b7..a8eae77 100644 --- a/qt/gen_qmatrix4x4.go +++ b/qt/gen_qmatrix4x4.go @@ -13,6 +13,18 @@ import ( "unsafe" ) +type QMatrix4x4__Flag int + +const ( + QMatrix4x4__Identity QMatrix4x4__Flag = 0 + QMatrix4x4__Translation QMatrix4x4__Flag = 1 + QMatrix4x4__Scale QMatrix4x4__Flag = 2 + QMatrix4x4__Rotation2D QMatrix4x4__Flag = 4 + QMatrix4x4__Rotation QMatrix4x4__Flag = 8 + QMatrix4x4__Perspective QMatrix4x4__Flag = 16 + QMatrix4x4__General QMatrix4x4__Flag = 31 +) + type QMatrix4x4 struct { h *C.QMatrix4x4 } @@ -72,14 +84,8 @@ func NewQMatrix4x46(transform *QTransform) *QMatrix4x4 { } // NewQMatrix4x47 constructs a new QMatrix4x4 object. -func NewQMatrix4x47(matrix *QMatrix) *QMatrix4x4 { - ret := C.QMatrix4x4_new7(matrix.cPointer()) - return newQMatrix4x4(ret) -} - -// NewQMatrix4x48 constructs a new QMatrix4x4 object. -func NewQMatrix4x48(param1 *QMatrix4x4) *QMatrix4x4 { - ret := C.QMatrix4x4_new8(param1.cPointer()) +func NewQMatrix4x47(param1 *QMatrix4x4) *QMatrix4x4 { + ret := C.QMatrix4x4_new7(param1.cPointer()) return newQMatrix4x4(ret) } @@ -247,13 +253,6 @@ func (this *QMatrix4x4) CopyDataTo(values *float32) { C.QMatrix4x4_CopyDataTo(this.h, (*C.float)(unsafe.Pointer(values))) } -func (this *QMatrix4x4) ToAffine() *QMatrix { - _ret := C.QMatrix4x4_ToAffine(this.h) - _goptr := newQMatrix(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - func (this *QMatrix4x4) ToTransform() *QTransform { _ret := C.QMatrix4x4_ToTransform(this.h) _goptr := newQTransform(_ret) @@ -333,6 +332,14 @@ func (this *QMatrix4x4) Optimize() { C.QMatrix4x4_Optimize(this.h) } +func (this *QMatrix4x4) ProjectedRotate(angle float32, x float32, y float32, z float32) { + C.QMatrix4x4_ProjectedRotate(this.h, (C.float)(angle), (C.float)(x), (C.float)(y), (C.float)(z)) +} + +func (this *QMatrix4x4) Flags() QMatrix4x4__Flag { + return (QMatrix4x4__Flag)(C.QMatrix4x4_Flags(this.h)) +} + func (this *QMatrix4x4) Inverted1(invertible *bool) *QMatrix4x4 { _ret := C.QMatrix4x4_Inverted1(this.h, (*C.bool)(unsafe.Pointer(invertible))) _goptr := newQMatrix4x4(_ret) diff --git a/qt/gen_qmatrix4x4.h b/qt/gen_qmatrix4x4.h index 960e532..8be96e7 100644 --- a/qt/gen_qmatrix4x4.h +++ b/qt/gen_qmatrix4x4.h @@ -14,7 +14,6 @@ extern "C" { #endif #ifdef __cplusplus -class QMatrix; class QMatrix4x4; class QPoint; class QPointF; @@ -25,7 +24,6 @@ class QTransform; class QVector3D; class QVector4D; #else -typedef struct QMatrix QMatrix; typedef struct QMatrix4x4 QMatrix4x4; typedef struct QPoint QPoint; typedef struct QPointF QPointF; @@ -43,8 +41,7 @@ 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); QMatrix4x4* QMatrix4x4_new6(QTransform* transform); -QMatrix4x4* QMatrix4x4_new7(QMatrix* matrix); -QMatrix4x4* QMatrix4x4_new8(QMatrix4x4* param1); +QMatrix4x4* QMatrix4x4_new7(QMatrix4x4* param1); QVector4D* QMatrix4x4_Column(const QMatrix4x4* self, int index); void QMatrix4x4_SetColumn(QMatrix4x4* self, int index, QVector4D* value); QVector4D* QMatrix4x4_Row(const QMatrix4x4* self, int index); @@ -83,7 +80,6 @@ void QMatrix4x4_Viewport(QMatrix4x4* self, QRectF* rect); void QMatrix4x4_Viewport2(QMatrix4x4* self, float left, float bottom, float width, float height); void QMatrix4x4_FlipCoordinates(QMatrix4x4* self); void QMatrix4x4_CopyDataTo(const QMatrix4x4* self, float* values); -QMatrix* QMatrix4x4_ToAffine(const QMatrix4x4* self); QTransform* QMatrix4x4_ToTransform(const QMatrix4x4* self); QTransform* QMatrix4x4_ToTransformWithDistanceToPlane(const QMatrix4x4* self, float distanceToPlane); QPoint* QMatrix4x4_Map(const QMatrix4x4* self, QPoint* point); @@ -97,6 +93,8 @@ float* QMatrix4x4_Data(QMatrix4x4* self); const float* QMatrix4x4_Data2(const QMatrix4x4* self); const float* QMatrix4x4_ConstData(const QMatrix4x4* self); void QMatrix4x4_Optimize(QMatrix4x4* self); +void QMatrix4x4_ProjectedRotate(QMatrix4x4* self, float angle, float x, float y, float z); +int QMatrix4x4_Flags(const QMatrix4x4* self); QMatrix4x4* QMatrix4x4_Inverted1(const QMatrix4x4* self, bool* invertible); void QMatrix4x4_Rotate4(QMatrix4x4* self, float angle, float x, float y, float z); void QMatrix4x4_Viewport5(QMatrix4x4* self, float left, float bottom, float width, float height, float nearPlane); diff --git a/qt/gen_qmdiarea.cpp b/qt/gen_qmdiarea.cpp index 33da739..05a5c9a 100644 --- a/qt/gen_qmdiarea.cpp +++ b/qt/gen_qmdiarea.cpp @@ -35,13 +35,6 @@ struct miqt_string* QMdiArea_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QMdiArea_TrUtf8(const char* s) { - QString _ret = QMdiArea::trUtf8(s); - // 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()); -} - QSize* QMdiArea_SizeHint(const QMdiArea* self) { return new QSize(self->sizeHint()); } @@ -208,20 +201,6 @@ struct miqt_string* QMdiArea_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QMdiArea_TrUtf82(const char* s, const char* c) { - QString _ret = QMdiArea::trUtf8(s, c); - // 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* QMdiArea_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QMdiArea::trUtf8(s, c, static_cast(n)); - // 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* QMdiArea_SubWindowList1(const QMdiArea* self, int order) { QList _ret = self->subWindowList(static_cast(order)); // Convert QList<> from C++ memory to manually-managed C memory diff --git a/qt/gen_qmdiarea.go b/qt/gen_qmdiarea.go index 67c4e3f..e332feb 100644 --- a/qt/gen_qmdiarea.go +++ b/qt/gen_qmdiarea.go @@ -89,15 +89,6 @@ func QMdiArea_Tr(s string) string { return _ret } -func QMdiArea_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QMdiArea_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QMdiArea) SizeHint() *QSize { _ret := C.QMdiArea_SizeHint(this.h) _goptr := newQSize(_ret) @@ -284,28 +275,6 @@ func QMdiArea_Tr3(s string, c string, n int) string { return _ret } -func QMdiArea_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMdiArea_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QMdiArea_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMdiArea_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QMdiArea) SubWindowList1(order QMdiArea__WindowOrder) []*QMdiSubWindow { var _ma *C.struct_miqt_array = C.QMdiArea_SubWindowList1(this.h, (C.int)(order)) _ret := make([]*QMdiSubWindow, int(_ma.len)) diff --git a/qt/gen_qmdiarea.h b/qt/gen_qmdiarea.h index 469c49e..b58b5fe 100644 --- a/qt/gen_qmdiarea.h +++ b/qt/gen_qmdiarea.h @@ -34,7 +34,6 @@ QMdiArea* QMdiArea_new2(QWidget* parent); QMetaObject* QMdiArea_MetaObject(const QMdiArea* self); void* QMdiArea_Metacast(QMdiArea* self, const char* param1); struct miqt_string* QMdiArea_Tr(const char* s); -struct miqt_string* QMdiArea_TrUtf8(const char* s); QSize* QMdiArea_SizeHint(const QMdiArea* self); QSize* QMdiArea_MinimumSizeHint(const QMdiArea* self); QMdiSubWindow* QMdiArea_CurrentSubWindow(const QMdiArea* self); @@ -71,8 +70,6 @@ void QMdiArea_ActivateNextSubWindow(QMdiArea* self); void QMdiArea_ActivatePreviousSubWindow(QMdiArea* self); 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, int order); QMdiSubWindow* QMdiArea_AddSubWindow2(QMdiArea* self, QWidget* widget, int flags); void QMdiArea_SetOption2(QMdiArea* self, int option, bool on); diff --git a/qt/gen_qmdisubwindow.cpp b/qt/gen_qmdisubwindow.cpp index 7bd6fb1..abc53c3 100644 --- a/qt/gen_qmdisubwindow.cpp +++ b/qt/gen_qmdisubwindow.cpp @@ -38,13 +38,6 @@ struct miqt_string* QMdiSubWindow_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QMdiSubWindow_TrUtf8(const char* s) { - QString _ret = QMdiSubWindow::trUtf8(s); - // 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()); -} - QSize* QMdiSubWindow_SizeHint(const QMdiSubWindow* self) { return new QSize(self->sizeHint()); } @@ -155,20 +148,6 @@ struct miqt_string* QMdiSubWindow_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QMdiSubWindow_TrUtf82(const char* s, const char* c) { - QString _ret = QMdiSubWindow::trUtf8(s, c); - // 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* QMdiSubWindow_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QMdiSubWindow::trUtf8(s, c, static_cast(n)); - // 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 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 d9c56d4..995cada 100644 --- a/qt/gen_qmdisubwindow.go +++ b/qt/gen_qmdisubwindow.go @@ -83,15 +83,6 @@ func QMdiSubWindow_Tr(s string) string { return _ret } -func QMdiSubWindow_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QMdiSubWindow_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QMdiSubWindow) SizeHint() *QSize { _ret := C.QMdiSubWindow_SizeHint(this.h) _goptr := newQSize(_ret) @@ -231,28 +222,6 @@ func QMdiSubWindow_Tr3(s string, c string, n int) string { return _ret } -func QMdiSubWindow_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMdiSubWindow_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QMdiSubWindow_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMdiSubWindow_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QMdiSubWindow) SetOption2(option QMdiSubWindow__SubWindowOption, on bool) { C.QMdiSubWindow_SetOption2(this.h, (C.int)(option), (C.bool)(on)) } diff --git a/qt/gen_qmdisubwindow.h b/qt/gen_qmdisubwindow.h index 0903e13..b996256 100644 --- a/qt/gen_qmdisubwindow.h +++ b/qt/gen_qmdisubwindow.h @@ -35,7 +35,6 @@ QMdiSubWindow* QMdiSubWindow_new3(QWidget* parent, int flags); QMetaObject* QMdiSubWindow_MetaObject(const QMdiSubWindow* self); void* QMdiSubWindow_Metacast(QMdiSubWindow* self, const char* param1); struct miqt_string* QMdiSubWindow_Tr(const char* s); -struct miqt_string* QMdiSubWindow_TrUtf8(const char* s); QSize* QMdiSubWindow_SizeHint(const QMdiSubWindow* self); QSize* QMdiSubWindow_MinimumSizeHint(const QMdiSubWindow* self); void QMdiSubWindow_SetWidget(QMdiSubWindow* self, QWidget* widget); @@ -60,8 +59,6 @@ void QMdiSubWindow_ShowSystemMenu(QMdiSubWindow* self); void QMdiSubWindow_ShowShaded(QMdiSubWindow* self); 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, int option, bool on); void QMdiSubWindow_Delete(QMdiSubWindow* self); diff --git a/qt/gen_qmenu.cpp b/qt/gen_qmenu.cpp index e22caa3..a3a31c9 100644 --- a/qt/gen_qmenu.cpp +++ b/qt/gen_qmenu.cpp @@ -47,23 +47,6 @@ struct miqt_string* QMenu_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QMenu_TrUtf8(const char* s) { - QString _ret = QMenu::trUtf8(s); - // 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()); -} - -QAction* QMenu_AddAction(QMenu* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); - return self->addAction(text_QString); -} - -QAction* QMenu_AddAction2(QMenu* self, QIcon* icon, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); - return self->addAction(*icon, text_QString); -} - QAction* QMenu_AddMenu(QMenu* self, QMenu* menu) { return self->addMenu(menu); } @@ -196,6 +179,10 @@ QAction* QMenu_MenuAction(const QMenu* self) { return self->menuAction(); } +QMenu* QMenu_MenuInAction(QAction* action) { + return QMenu::menuInAction(action); +} + struct miqt_string* QMenu_Title(const QMenu* self) { QString _ret = self->title(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -292,20 +279,6 @@ struct miqt_string* QMenu_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QMenu_TrUtf82(const char* s, const char* c) { - QString _ret = QMenu::trUtf8(s, c); - // 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* QMenu_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QMenu::trUtf8(s, c, static_cast(n)); - // 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 QMenu_Popup2(QMenu* self, QPoint* pos, QAction* at) { self->popup(*pos, at); } diff --git a/qt/gen_qmenu.go b/qt/gen_qmenu.go index 47b0924..6159607 100644 --- a/qt/gen_qmenu.go +++ b/qt/gen_qmenu.go @@ -84,27 +84,6 @@ func QMenu_Tr(s string) string { return _ret } -func QMenu_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QMenu_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QMenu) AddAction(text string) *QAction { - text_ms := miqt_strdupg(text) - defer C.free(text_ms) - return newQAction_U(unsafe.Pointer(C.QMenu_AddAction(this.h, (*C.struct_miqt_string)(text_ms)))) -} - -func (this *QMenu) AddAction2(icon *QIcon, text string) *QAction { - text_ms := miqt_strdupg(text) - defer C.free(text_ms) - return newQAction_U(unsafe.Pointer(C.QMenu_AddAction2(this.h, icon.cPointer(), (*C.struct_miqt_string)(text_ms)))) -} - func (this *QMenu) AddMenu(menu *QMenu) *QAction { return newQAction_U(unsafe.Pointer(C.QMenu_AddMenu(this.h, menu.cPointer()))) } @@ -251,6 +230,10 @@ func (this *QMenu) MenuAction() *QAction { return newQAction_U(unsafe.Pointer(C.QMenu_MenuAction(this.h))) } +func QMenu_MenuInAction(action *QAction) *QMenu { + return newQMenu_U(unsafe.Pointer(C.QMenu_MenuInAction(action.cPointer()))) +} + func (this *QMenu) Title() string { var _ms *C.struct_miqt_string = C.QMenu_Title(this.h) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) @@ -391,28 +374,6 @@ func QMenu_Tr3(s string, c string, n int) string { return _ret } -func QMenu_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMenu_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QMenu_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMenu_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QMenu) Popup2(pos *QPoint, at *QAction) { C.QMenu_Popup2(this.h, pos.cPointer(), at.cPointer()) } diff --git a/qt/gen_qmenu.h b/qt/gen_qmenu.h index f93b523..7ba0eb2 100644 --- a/qt/gen_qmenu.h +++ b/qt/gen_qmenu.h @@ -40,9 +40,6 @@ QMenu* QMenu_new4(struct miqt_string* title, QWidget* parent); QMetaObject* QMenu_MetaObject(const QMenu* self); void* QMenu_Metacast(QMenu* self, const char* param1); struct miqt_string* QMenu_Tr(const char* s); -struct miqt_string* QMenu_TrUtf8(const char* s); -QAction* QMenu_AddAction(QMenu* self, struct miqt_string* text); -QAction* QMenu_AddAction2(QMenu* self, QIcon* icon, struct miqt_string* text); QAction* QMenu_AddMenu(QMenu* self, QMenu* menu); QMenu* QMenu_AddMenuWithTitle(QMenu* self, struct miqt_string* title); QMenu* QMenu_AddMenu2(QMenu* self, QIcon* icon, struct miqt_string* title); @@ -73,6 +70,7 @@ QSize* QMenu_SizeHint(const QMenu* self); QRect* QMenu_ActionGeometry(const QMenu* self, QAction* param1); QAction* QMenu_ActionAt(const QMenu* self, QPoint* param1); QAction* QMenu_MenuAction(const QMenu* self); +QMenu* QMenu_MenuInAction(QAction* action); struct miqt_string* QMenu_Title(const QMenu* self); void QMenu_SetTitle(QMenu* self, struct miqt_string* title); QIcon* QMenu_Icon(const QMenu* self); @@ -92,8 +90,6 @@ void QMenu_Hovered(QMenu* self, QAction* action); void QMenu_connect_Hovered(QMenu* self, void* slot); struct miqt_string* QMenu_Tr2(const char* s, const char* c); struct miqt_string* QMenu_Tr3(const char* s, const char* c, int n); -struct miqt_string* QMenu_TrUtf82(const char* s, const char* c); -struct miqt_string* QMenu_TrUtf83(const char* s, const char* c, int n); void QMenu_Popup2(QMenu* self, QPoint* pos, QAction* at); QAction* QMenu_Exec22(QMenu* self, QPoint* pos, QAction* at); QAction* QMenu_Exec3(struct miqt_array* /* of QAction* */ actions, QPoint* pos, QAction* at); diff --git a/qt/gen_qmenubar.cpp b/qt/gen_qmenubar.cpp index acda6ef..fa542ae 100644 --- a/qt/gen_qmenubar.cpp +++ b/qt/gen_qmenubar.cpp @@ -37,18 +37,6 @@ struct miqt_string* QMenuBar_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QMenuBar_TrUtf8(const char* s) { - QString _ret = QMenuBar::trUtf8(s); - // 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()); -} - -QAction* QMenuBar_AddAction(QMenuBar* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); - return self->addAction(text_QString); -} - QAction* QMenuBar_AddMenu(QMenuBar* self, QMenu* menu) { return self->addMenu(menu); } @@ -171,20 +159,6 @@ struct miqt_string* QMenuBar_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QMenuBar_TrUtf82(const char* s, const char* c) { - QString _ret = QMenuBar::trUtf8(s, c); - // 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* QMenuBar_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QMenuBar::trUtf8(s, c, static_cast(n)); - // 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 QMenuBar_SetCornerWidget2(QMenuBar* self, QWidget* w, int corner) { self->setCornerWidget(w, static_cast(corner)); } diff --git a/qt/gen_qmenubar.go b/qt/gen_qmenubar.go index 451da94..b578389 100644 --- a/qt/gen_qmenubar.go +++ b/qt/gen_qmenubar.go @@ -68,21 +68,6 @@ func QMenuBar_Tr(s string) string { return _ret } -func QMenuBar_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QMenuBar_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QMenuBar) AddAction(text string) *QAction { - text_ms := miqt_strdupg(text) - defer C.free(text_ms) - return newQAction_U(unsafe.Pointer(C.QMenuBar_AddAction(this.h, (*C.struct_miqt_string)(text_ms)))) -} - func (this *QMenuBar) AddMenu(menu *QMenu) *QAction { return newQAction_U(unsafe.Pointer(C.QMenuBar_AddMenu(this.h, menu.cPointer()))) } @@ -242,28 +227,6 @@ func QMenuBar_Tr3(s string, c string, n int) string { return _ret } -func QMenuBar_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMenuBar_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QMenuBar_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMenuBar_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QMenuBar) SetCornerWidget2(w *QWidget, corner Corner) { C.QMenuBar_SetCornerWidget2(this.h, w.cPointer(), (C.int)(corner)) } diff --git a/qt/gen_qmenubar.h b/qt/gen_qmenubar.h index aaa6a0e..c4d2924 100644 --- a/qt/gen_qmenubar.h +++ b/qt/gen_qmenubar.h @@ -40,8 +40,6 @@ QMenuBar* QMenuBar_new2(QWidget* parent); QMetaObject* QMenuBar_MetaObject(const QMenuBar* self); void* QMenuBar_Metacast(QMenuBar* self, const char* param1); struct miqt_string* QMenuBar_Tr(const char* s); -struct miqt_string* QMenuBar_TrUtf8(const char* s); -QAction* QMenuBar_AddAction(QMenuBar* self, struct miqt_string* text); QAction* QMenuBar_AddMenu(QMenuBar* self, QMenu* menu); QMenu* QMenuBar_AddMenuWithTitle(QMenuBar* self, struct miqt_string* title); QMenu* QMenuBar_AddMenu2(QMenuBar* self, QIcon* icon, struct miqt_string* title); @@ -69,8 +67,6 @@ void QMenuBar_Hovered(QMenuBar* self, QAction* action); void QMenuBar_connect_Hovered(QMenuBar* self, void* slot); 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, int corner); QWidget* QMenuBar_CornerWidget1(const QMenuBar* self, int corner); void QMenuBar_Delete(QMenuBar* self); diff --git a/qt/gen_qmessageauthenticationcode.cpp b/qt/gen_qmessageauthenticationcode.cpp index aa2f5db..7c7fd15 100644 --- a/qt/gen_qmessageauthenticationcode.cpp +++ b/qt/gen_qmessageauthenticationcode.cpp @@ -21,8 +21,8 @@ void QMessageAuthenticationCode_SetKey(QMessageAuthenticationCode* self, QByteAr self->setKey(*key); } -void QMessageAuthenticationCode_AddData(QMessageAuthenticationCode* self, const char* data, int length) { - self->addData(data, static_cast(length)); +void QMessageAuthenticationCode_AddData(QMessageAuthenticationCode* self, const char* data, ptrdiff_t length) { + self->addData(data, (qsizetype)(length)); } void QMessageAuthenticationCode_AddDataWithData(QMessageAuthenticationCode* self, QByteArray* data) { diff --git a/qt/gen_qmessageauthenticationcode.go b/qt/gen_qmessageauthenticationcode.go index 2728241..d53f975 100644 --- a/qt/gen_qmessageauthenticationcode.go +++ b/qt/gen_qmessageauthenticationcode.go @@ -55,10 +55,10 @@ func (this *QMessageAuthenticationCode) SetKey(key *QByteArray) { C.QMessageAuthenticationCode_SetKey(this.h, key.cPointer()) } -func (this *QMessageAuthenticationCode) AddData(data string, length int) { +func (this *QMessageAuthenticationCode) AddData(data string, length int64) { data_Cstring := C.CString(data) defer C.free(unsafe.Pointer(data_Cstring)) - C.QMessageAuthenticationCode_AddData(this.h, data_Cstring, (C.int)(length)) + C.QMessageAuthenticationCode_AddData(this.h, data_Cstring, (C.ptrdiff_t)(length)) } func (this *QMessageAuthenticationCode) AddDataWithData(data *QByteArray) { diff --git a/qt/gen_qmessageauthenticationcode.h b/qt/gen_qmessageauthenticationcode.h index 66d8360..e5866ec 100644 --- a/qt/gen_qmessageauthenticationcode.h +++ b/qt/gen_qmessageauthenticationcode.h @@ -27,7 +27,7 @@ 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_AddData(QMessageAuthenticationCode* self, const char* data, ptrdiff_t length); void QMessageAuthenticationCode_AddDataWithData(QMessageAuthenticationCode* self, QByteArray* data); bool QMessageAuthenticationCode_AddDataWithDevice(QMessageAuthenticationCode* self, QIODevice* device); QByteArray* QMessageAuthenticationCode_Result(const QMessageAuthenticationCode* self); diff --git a/qt/gen_qmessagebox.cpp b/qt/gen_qmessagebox.cpp index c98a824..f9c8d14 100644 --- a/qt/gen_qmessagebox.cpp +++ b/qt/gen_qmessagebox.cpp @@ -78,13 +78,6 @@ struct miqt_string* QMessageBox_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QMessageBox_TrUtf8(const char* s) { - QString _ret = QMessageBox::trUtf8(s); - // 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 QMessageBox_AddButton(QMessageBox* self, QAbstractButton* button, int role) { self->addButton(button, static_cast(role)); } @@ -228,6 +221,13 @@ int QMessageBox_Information(QWidget* parent, struct miqt_string* title, struct m return static_cast(_ret); } +int QMessageBox_Information2(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); +} + 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); @@ -235,6 +235,12 @@ int QMessageBox_Question(QWidget* parent, struct miqt_string* title, struct miqt return static_cast(_ret); } +int QMessageBox_Question2(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)); +} + 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); @@ -242,6 +248,12 @@ int QMessageBox_Warning(QWidget* parent, struct miqt_string* title, struct miqt_ return static_cast(_ret); } +int QMessageBox_Warning2(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)); +} + 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); @@ -249,6 +261,12 @@ int QMessageBox_Critical(QWidget* parent, struct miqt_string* title, struct miqt return static_cast(_ret); } +int QMessageBox_Critical2(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)); +} + void QMessageBox_About(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); @@ -259,83 +277,58 @@ void QMessageBox_AboutQt(QWidget* parent) { QMessageBox::aboutQt(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, int button0) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString text_QString = QString::fromUtf8(&text->data, text->len); return QMessageBox::information(parent, title_QString, text_QString, static_cast(button0)); } -int QMessageBox_Information3(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text) { +int QMessageBox_Information4(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString text_QString = QString::fromUtf8(&text->data, text->len); QString button0Text_QString = QString::fromUtf8(&button0Text->data, button0Text->len); return QMessageBox::information(parent, title_QString, text_QString, button0Text_QString); } -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); -} - -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, int button0) { 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)); } -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, struct miqt_string* button0Text) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString text_QString = QString::fromUtf8(&text->data, text->len); QString button0Text_QString = QString::fromUtf8(&button0Text->data, button0Text->len); return QMessageBox::question(parent, title_QString, text_QString, button0Text_QString); } -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)); -} - -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, 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)); } -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, struct miqt_string* button0Text) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString text_QString = QString::fromUtf8(&text->data, text->len); QString button0Text_QString = QString::fromUtf8(&button0Text->data, button0Text->len); return QMessageBox::warning(parent, title_QString, text_QString, button0Text_QString); } -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)); -} - -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, 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)); } -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, struct miqt_string* button0Text) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString text_QString = QString::fromUtf8(&text->data, text->len); QString button0Text_QString = QString::fromUtf8(&button0Text->data, button0Text->len); return QMessageBox::critical(parent, title_QString, text_QString, button0Text_QString); } -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)); -} - struct miqt_string* QMessageBox_ButtonText(const QMessageBox* self, int button) { QString _ret = self->buttonText(static_cast(button)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -410,20 +403,6 @@ struct miqt_string* QMessageBox_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QMessageBox_TrUtf82(const char* s, const char* c) { - QString _ret = QMessageBox::trUtf8(s, c); - // 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* QMessageBox_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QMessageBox::trUtf8(s, c, static_cast(n)); - // 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()); -} - 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); @@ -438,6 +417,13 @@ int QMessageBox_Information5(QWidget* parent, struct miqt_string* title, struct return static_cast(_ret); } +int QMessageBox_Information52(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); +} + 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); @@ -485,7 +471,7 @@ void QMessageBox_AboutQt2(QWidget* parent, struct miqt_string* title) { QMessageBox::aboutQt(parent, title_QString); } -int QMessageBox_Information52(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1) { +int QMessageBox_Information53(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::information(parent, title_QString, text_QString, static_cast(button0), static_cast(button1)); @@ -497,7 +483,7 @@ int QMessageBox_Information6(QWidget* parent, struct miqt_string* title, struct return QMessageBox::information(parent, title_QString, text_QString, static_cast(button0), static_cast(button1), static_cast(button2)); } -int QMessageBox_Information53(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text) { +int QMessageBox_Information54(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString text_QString = QString::fromUtf8(&text->data, text->len); QString button0Text_QString = QString::fromUtf8(&button0Text->data, button0Text->len); @@ -532,13 +518,6 @@ 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)); } -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); -} - int QMessageBox_Question52(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); diff --git a/qt/gen_qmessagebox.go b/qt/gen_qmessagebox.go index 6bbb687..cc84529 100644 --- a/qt/gen_qmessagebox.go +++ b/qt/gen_qmessagebox.go @@ -196,15 +196,6 @@ func QMessageBox_Tr(s string) string { return _ret } -func QMessageBox_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QMessageBox_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QMessageBox) AddButton(button *QAbstractButton, role QMessageBox__ButtonRole) { C.QMessageBox_AddButton(this.h, button.cPointer(), (C.int)(role)) } @@ -346,6 +337,14 @@ func QMessageBox_Information(parent *QWidget, title string, text string) QMessag return (QMessageBox__StandardButton)(C.QMessageBox_Information(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms))) } +func QMessageBox_Information2(parent *QWidget, title string, text string, button0 QMessageBox__StandardButton) QMessageBox__StandardButton { + title_ms := miqt_strdupg(title) + defer C.free(title_ms) + text_ms := miqt_strdupg(text) + defer C.free(text_ms) + return (QMessageBox__StandardButton)(C.QMessageBox_Information2(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(button0))) +} + func QMessageBox_Question(parent *QWidget, title string, text string) QMessageBox__StandardButton { title_ms := miqt_strdupg(title) defer C.free(title_ms) @@ -354,6 +353,14 @@ func QMessageBox_Question(parent *QWidget, title string, text string) QMessageBo return (QMessageBox__StandardButton)(C.QMessageBox_Question(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms))) } +func QMessageBox_Question2(parent *QWidget, title string, text string, button0 QMessageBox__StandardButton, button1 QMessageBox__StandardButton) int { + title_ms := miqt_strdupg(title) + defer C.free(title_ms) + text_ms := miqt_strdupg(text) + defer C.free(text_ms) + return (int)(C.QMessageBox_Question2(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(button0), (C.int)(button1))) +} + func QMessageBox_Warning(parent *QWidget, title string, text string) QMessageBox__StandardButton { title_ms := miqt_strdupg(title) defer C.free(title_ms) @@ -362,6 +369,14 @@ func QMessageBox_Warning(parent *QWidget, title string, text string) QMessageBox return (QMessageBox__StandardButton)(C.QMessageBox_Warning(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms))) } +func QMessageBox_Warning2(parent *QWidget, title string, text string, button0 QMessageBox__StandardButton, button1 QMessageBox__StandardButton) int { + title_ms := miqt_strdupg(title) + defer C.free(title_ms) + text_ms := miqt_strdupg(text) + defer C.free(text_ms) + return (int)(C.QMessageBox_Warning2(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(button0), (C.int)(button1))) +} + func QMessageBox_Critical(parent *QWidget, title string, text string) QMessageBox__StandardButton { title_ms := miqt_strdupg(title) defer C.free(title_ms) @@ -370,6 +385,14 @@ func QMessageBox_Critical(parent *QWidget, title string, text string) QMessageBo return (QMessageBox__StandardButton)(C.QMessageBox_Critical(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms))) } +func QMessageBox_Critical2(parent *QWidget, title string, text string, button0 QMessageBox__StandardButton, button1 QMessageBox__StandardButton) int { + title_ms := miqt_strdupg(title) + defer C.free(title_ms) + text_ms := miqt_strdupg(text) + defer C.free(text_ms) + return (int)(C.QMessageBox_Critical2(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(button0), (C.int)(button1))) +} + func QMessageBox_About(parent *QWidget, title string, text string) { title_ms := miqt_strdupg(title) defer C.free(title_ms) @@ -382,108 +405,76 @@ func QMessageBox_AboutQt(parent *QWidget) { C.QMessageBox_AboutQt(parent.cPointer()) } -func QMessageBox_Information2(parent *QWidget, title string, text string, button0 int) int { +func QMessageBox_Information3(parent *QWidget, title string, text string, button0 int) int { title_ms := miqt_strdupg(title) defer C.free(title_ms) text_ms := miqt_strdupg(text) defer C.free(text_ms) - return (int)(C.QMessageBox_Information2(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(button0))) + return (int)(C.QMessageBox_Information3(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(button0))) } -func QMessageBox_Information3(parent *QWidget, title string, text string, button0Text string) int { +func QMessageBox_Information4(parent *QWidget, title string, text string, button0Text string) int { title_ms := miqt_strdupg(title) defer C.free(title_ms) text_ms := miqt_strdupg(text) defer C.free(text_ms) button0Text_ms := miqt_strdupg(button0Text) defer C.free(button0Text_ms) - return (int)(C.QMessageBox_Information3(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (*C.struct_miqt_string)(button0Text_ms))) + return (int)(C.QMessageBox_Information4(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (*C.struct_miqt_string)(button0Text_ms))) } -func QMessageBox_Information4(parent *QWidget, title string, text string, button0 QMessageBox__StandardButton) QMessageBox__StandardButton { +func QMessageBox_Question3(parent *QWidget, title string, text string, button0 int) int { title_ms := miqt_strdupg(title) 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.int)(button0))) + return (int)(C.QMessageBox_Question3(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 { - title_ms := miqt_strdupg(title) - defer C.free(title_ms) - text_ms := miqt_strdupg(text) - defer C.free(text_ms) - return (int)(C.QMessageBox_Question2(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(button0))) -} - -func QMessageBox_Question3(parent *QWidget, title string, text string, button0Text string) int { +func QMessageBox_Question4(parent *QWidget, title string, text string, button0Text string) int { title_ms := miqt_strdupg(title) defer C.free(title_ms) text_ms := miqt_strdupg(text) defer C.free(text_ms) button0Text_ms := miqt_strdupg(button0Text) defer C.free(button0Text_ms) - return (int)(C.QMessageBox_Question3(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (*C.struct_miqt_string)(button0Text_ms))) + return (int)(C.QMessageBox_Question4(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (*C.struct_miqt_string)(button0Text_ms))) } -func QMessageBox_Question4(parent *QWidget, title string, text string, button0 QMessageBox__StandardButton, button1 QMessageBox__StandardButton) int { +func QMessageBox_Warning3(parent *QWidget, title string, text string, button0 int, button1 int) int { title_ms := miqt_strdupg(title) 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.int)(button0), (C.int)(button1))) + return (int)(C.QMessageBox_Warning3(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 { - title_ms := miqt_strdupg(title) - defer C.free(title_ms) - text_ms := miqt_strdupg(text) - defer C.free(text_ms) - return (int)(C.QMessageBox_Warning2(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(button0), (C.int)(button1))) -} - -func QMessageBox_Warning3(parent *QWidget, title string, text string, button0Text string) int { +func QMessageBox_Warning4(parent *QWidget, title string, text string, button0Text string) int { title_ms := miqt_strdupg(title) defer C.free(title_ms) text_ms := miqt_strdupg(text) defer C.free(text_ms) button0Text_ms := miqt_strdupg(button0Text) defer C.free(button0Text_ms) - return (int)(C.QMessageBox_Warning3(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (*C.struct_miqt_string)(button0Text_ms))) + return (int)(C.QMessageBox_Warning4(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (*C.struct_miqt_string)(button0Text_ms))) } -func QMessageBox_Warning4(parent *QWidget, title string, text string, button0 QMessageBox__StandardButton, button1 QMessageBox__StandardButton) int { +func QMessageBox_Critical3(parent *QWidget, title string, text string, button0 int, button1 int) int { title_ms := miqt_strdupg(title) 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.int)(button0), (C.int)(button1))) + return (int)(C.QMessageBox_Critical3(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 { - title_ms := miqt_strdupg(title) - defer C.free(title_ms) - text_ms := miqt_strdupg(text) - defer C.free(text_ms) - return (int)(C.QMessageBox_Critical2(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(button0), (C.int)(button1))) -} - -func QMessageBox_Critical3(parent *QWidget, title string, text string, button0Text string) int { +func QMessageBox_Critical4(parent *QWidget, title string, text string, button0Text string) int { title_ms := miqt_strdupg(title) defer C.free(title_ms) text_ms := miqt_strdupg(text) defer C.free(text_ms) button0Text_ms := miqt_strdupg(button0Text) defer C.free(button0Text_ms) - return (int)(C.QMessageBox_Critical3(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (*C.struct_miqt_string)(button0Text_ms))) -} - -func QMessageBox_Critical4(parent *QWidget, title string, text string, button0 QMessageBox__StandardButton, button1 QMessageBox__StandardButton) int { - title_ms := miqt_strdupg(title) - 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.int)(button0), (C.int)(button1))) + return (int)(C.QMessageBox_Critical4(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (*C.struct_miqt_string)(button0Text_ms))) } func (this *QMessageBox) ButtonText(button int) string { @@ -584,28 +575,6 @@ func QMessageBox_Tr3(s string, c string, n int) string { return _ret } -func QMessageBox_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMessageBox_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QMessageBox_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMessageBox_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func QMessageBox_Information42(parent *QWidget, title string, text string, buttons QMessageBox__StandardButton) QMessageBox__StandardButton { title_ms := miqt_strdupg(title) defer C.free(title_ms) @@ -622,6 +591,14 @@ func QMessageBox_Information5(parent *QWidget, title string, text string, button return (QMessageBox__StandardButton)(C.QMessageBox_Information5(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(buttons), (C.int)(defaultButton))) } +func QMessageBox_Information52(parent *QWidget, title string, text string, button0 QMessageBox__StandardButton, button1 QMessageBox__StandardButton) QMessageBox__StandardButton { + title_ms := miqt_strdupg(title) + defer C.free(title_ms) + text_ms := miqt_strdupg(text) + defer C.free(text_ms) + return (QMessageBox__StandardButton)(C.QMessageBox_Information52(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(button0), (C.int)(button1))) +} + func QMessageBox_Question42(parent *QWidget, title string, text string, buttons QMessageBox__StandardButton) QMessageBox__StandardButton { title_ms := miqt_strdupg(title) defer C.free(title_ms) @@ -676,12 +653,12 @@ func QMessageBox_AboutQt2(parent *QWidget, title string) { C.QMessageBox_AboutQt2(parent.cPointer(), (*C.struct_miqt_string)(title_ms)) } -func QMessageBox_Information52(parent *QWidget, title string, text string, button0 int, button1 int) int { +func QMessageBox_Information53(parent *QWidget, title string, text string, button0 int, button1 int) int { title_ms := miqt_strdupg(title) defer C.free(title_ms) text_ms := miqt_strdupg(text) defer C.free(text_ms) - return (int)(C.QMessageBox_Information52(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(button0), (C.int)(button1))) + return (int)(C.QMessageBox_Information53(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(button0), (C.int)(button1))) } func QMessageBox_Information6(parent *QWidget, title string, text string, button0 int, button1 int, button2 int) int { @@ -692,7 +669,7 @@ func QMessageBox_Information6(parent *QWidget, title string, text string, button return (int)(C.QMessageBox_Information6(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (C.int)(button0), (C.int)(button1), (C.int)(button2))) } -func QMessageBox_Information53(parent *QWidget, title string, text string, button0Text string, button1Text string) int { +func QMessageBox_Information54(parent *QWidget, title string, text string, button0Text string, button1Text string) int { title_ms := miqt_strdupg(title) defer C.free(title_ms) text_ms := miqt_strdupg(text) @@ -701,7 +678,7 @@ func QMessageBox_Information53(parent *QWidget, title string, text string, butto defer C.free(button0Text_ms) button1Text_ms := miqt_strdupg(button1Text) defer C.free(button1Text_ms) - return (int)(C.QMessageBox_Information53(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (*C.struct_miqt_string)(button0Text_ms), (*C.struct_miqt_string)(button1Text_ms))) + return (int)(C.QMessageBox_Information54(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (*C.struct_miqt_string)(button0Text_ms), (*C.struct_miqt_string)(button1Text_ms))) } func QMessageBox_Information62(parent *QWidget, title string, text string, button0Text string, button1Text string, button2Text string) int { @@ -746,14 +723,6 @@ func QMessageBox_Information8(parent *QWidget, title string, text string, button return (int)(C.QMessageBox_Information8(parent.cPointer(), (*C.struct_miqt_string)(title_ms), (*C.struct_miqt_string)(text_ms), (*C.struct_miqt_string)(button0Text_ms), (*C.struct_miqt_string)(button1Text_ms), (*C.struct_miqt_string)(button2Text_ms), (C.int)(defaultButtonNumber), (C.int)(escapeButtonNumber))) } -func QMessageBox_Information54(parent *QWidget, title string, text string, button0 QMessageBox__StandardButton, button1 QMessageBox__StandardButton) QMessageBox__StandardButton { - title_ms := miqt_strdupg(title) - 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.int)(button0), (C.int)(button1))) -} - func QMessageBox_Question52(parent *QWidget, title string, text string, button0 int, button1 int) int { title_ms := miqt_strdupg(title) defer C.free(title_ms) diff --git a/qt/gen_qmessagebox.h b/qt/gen_qmessagebox.h index a3b0e0a..3bb2764 100644 --- a/qt/gen_qmessagebox.h +++ b/qt/gen_qmessagebox.h @@ -43,7 +43,6 @@ QMessageBox* QMessageBox_new9(struct miqt_string* title, struct miqt_string* tex QMetaObject* QMessageBox_MetaObject(const QMessageBox* self); void* QMessageBox_Metacast(QMessageBox* self, const char* param1); struct miqt_string* QMessageBox_Tr(const char* s); -struct miqt_string* QMessageBox_TrUtf8(const char* s); 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); @@ -74,23 +73,23 @@ int QMessageBox_TextInteractionFlags(const QMessageBox* self); void QMessageBox_SetCheckBox(QMessageBox* self, QCheckBox* cb); QCheckBox* QMessageBox_CheckBox(const QMessageBox* self); int QMessageBox_Information(QWidget* parent, struct miqt_string* title, struct miqt_string* text); +int QMessageBox_Information2(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0); int QMessageBox_Question(QWidget* parent, struct miqt_string* title, struct miqt_string* text); +int QMessageBox_Question2(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1); int QMessageBox_Warning(QWidget* parent, struct miqt_string* title, struct miqt_string* text); +int QMessageBox_Warning2(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1); int QMessageBox_Critical(QWidget* parent, struct miqt_string* title, struct miqt_string* text); +int QMessageBox_Critical2(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1); 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); -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, 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, 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, int button0, int button1); +int QMessageBox_Information3(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0); +int QMessageBox_Information4(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text); +int QMessageBox_Question3(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0); +int QMessageBox_Question4(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text); +int QMessageBox_Warning3(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1); +int QMessageBox_Warning4(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text); +int QMessageBox_Critical3(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1); +int QMessageBox_Critical4(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text); 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); @@ -104,10 +103,9 @@ 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); 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_Information52(QWidget* parent, struct miqt_string* title, struct miqt_string* text, int button0, int button1); 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); @@ -115,13 +113,12 @@ int QMessageBox_Warning5(QWidget* parent, struct miqt_string* title, struct miqt 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_Information53(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); -int QMessageBox_Information53(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text); +int QMessageBox_Information54(QWidget* parent, struct miqt_string* title, struct miqt_string* text, struct miqt_string* button0Text, struct miqt_string* button1Text); 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); -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_qmetacontainer.cpp b/qt/gen_qmetacontainer.cpp new file mode 100644 index 0000000..bd57d79 --- /dev/null +++ b/qt/gen_qmetacontainer.cpp @@ -0,0 +1,398 @@ +#include +#include +#include +#include +#define WORKAROUND_INNER_CLASS_DEFINITION_QtMetaContainerPrivate__QMetaAssociationInterface +#define WORKAROUND_INNER_CLASS_DEFINITION_QtMetaContainerPrivate__QMetaContainerInterface +#define WORKAROUND_INNER_CLASS_DEFINITION_QtMetaContainerPrivate__QMetaSequenceInterface +#include "qmetacontainer.h" +#include "gen_qmetacontainer.h" +#include "_cgo_export.h" + +QtMetaContainerPrivate__QMetaContainerInterface* QtMetaContainerPrivate__QMetaContainerInterface_new() { + return new QtMetaContainerPrivate::QMetaContainerInterface(); +} + +void QtMetaContainerPrivate__QMetaContainerInterface_Delete(QtMetaContainerPrivate__QMetaContainerInterface* self) { + delete self; +} + +QtMetaContainerPrivate__QMetaSequenceInterface* QtMetaContainerPrivate__QMetaSequenceInterface_new() { + return new QtMetaContainerPrivate::QMetaSequenceInterface(); +} + +void QtMetaContainerPrivate__QMetaSequenceInterface_Delete(QtMetaContainerPrivate__QMetaSequenceInterface* self) { + delete self; +} + +QtMetaContainerPrivate__QMetaAssociationInterface* QtMetaContainerPrivate__QMetaAssociationInterface_new() { + return new QtMetaContainerPrivate::QMetaAssociationInterface(); +} + +void QtMetaContainerPrivate__QMetaAssociationInterface_Delete(QtMetaContainerPrivate__QMetaAssociationInterface* self) { + delete self; +} + +QMetaContainer* QMetaContainer_new() { + return new QMetaContainer(); +} + +QMetaContainer* QMetaContainer_new2(QtMetaContainerPrivate__QMetaContainerInterface* d) { + return new QMetaContainer(d); +} + +QMetaContainer* QMetaContainer_new3(QMetaContainer* param1) { + return new QMetaContainer(*param1); +} + +bool QMetaContainer_HasInputIterator(const QMetaContainer* self) { + return self->hasInputIterator(); +} + +bool QMetaContainer_HasForwardIterator(const QMetaContainer* self) { + return self->hasForwardIterator(); +} + +bool QMetaContainer_HasBidirectionalIterator(const QMetaContainer* self) { + return self->hasBidirectionalIterator(); +} + +bool QMetaContainer_HasRandomAccessIterator(const QMetaContainer* self) { + return self->hasRandomAccessIterator(); +} + +bool QMetaContainer_HasSize(const QMetaContainer* self) { + return self->hasSize(); +} + +ptrdiff_t QMetaContainer_Size(const QMetaContainer* self, const void* container) { + qsizetype _ret = self->size(container); + return static_cast(_ret); +} + +bool QMetaContainer_CanClear(const QMetaContainer* self) { + return self->canClear(); +} + +void QMetaContainer_Clear(const QMetaContainer* self, void* container) { + self->clear(container); +} + +bool QMetaContainer_HasIterator(const QMetaContainer* self) { + return self->hasIterator(); +} + +void* QMetaContainer_Begin(const QMetaContainer* self, void* container) { + return self->begin(container); +} + +void* QMetaContainer_End(const QMetaContainer* self, void* container) { + return self->end(container); +} + +void QMetaContainer_DestroyIterator(const QMetaContainer* self, const void* iterator) { + self->destroyIterator(iterator); +} + +bool QMetaContainer_CompareIterator(const QMetaContainer* self, const void* i, const void* j) { + return self->compareIterator(i, j); +} + +void QMetaContainer_CopyIterator(const QMetaContainer* self, void* target, const void* source) { + self->copyIterator(target, source); +} + +void QMetaContainer_AdvanceIterator(const QMetaContainer* self, void* iterator, ptrdiff_t step) { + self->advanceIterator(iterator, (qsizetype)(step)); +} + +ptrdiff_t QMetaContainer_DiffIterator(const QMetaContainer* self, const void* i, const void* j) { + qsizetype _ret = self->diffIterator(i, j); + return static_cast(_ret); +} + +bool QMetaContainer_HasConstIterator(const QMetaContainer* self) { + return self->hasConstIterator(); +} + +void* QMetaContainer_ConstBegin(const QMetaContainer* self, const void* container) { + return self->constBegin(container); +} + +void* QMetaContainer_ConstEnd(const QMetaContainer* self, const void* container) { + return self->constEnd(container); +} + +void QMetaContainer_DestroyConstIterator(const QMetaContainer* self, const void* iterator) { + self->destroyConstIterator(iterator); +} + +bool QMetaContainer_CompareConstIterator(const QMetaContainer* self, const void* i, const void* j) { + return self->compareConstIterator(i, j); +} + +void QMetaContainer_CopyConstIterator(const QMetaContainer* self, void* target, const void* source) { + self->copyConstIterator(target, source); +} + +void QMetaContainer_AdvanceConstIterator(const QMetaContainer* self, void* iterator, ptrdiff_t step) { + self->advanceConstIterator(iterator, (qsizetype)(step)); +} + +ptrdiff_t QMetaContainer_DiffConstIterator(const QMetaContainer* self, const void* i, const void* j) { + qsizetype _ret = self->diffConstIterator(i, j); + return static_cast(_ret); +} + +void QMetaContainer_Delete(QMetaContainer* self) { + delete self; +} + +QMetaSequence* QMetaSequence_new() { + return new QMetaSequence(); +} + +QMetaSequence* QMetaSequence_new2(QtMetaContainerPrivate__QMetaSequenceInterface* d) { + return new QMetaSequence(d); +} + +QMetaType* QMetaSequence_ValueMetaType(const QMetaSequence* self) { + return new QMetaType(self->valueMetaType()); +} + +bool QMetaSequence_IsSortable(const QMetaSequence* self) { + return self->isSortable(); +} + +bool QMetaSequence_CanAddValueAtBegin(const QMetaSequence* self) { + return self->canAddValueAtBegin(); +} + +void QMetaSequence_AddValueAtBegin(const QMetaSequence* self, void* container, const void* value) { + self->addValueAtBegin(container, value); +} + +bool QMetaSequence_CanAddValueAtEnd(const QMetaSequence* self) { + return self->canAddValueAtEnd(); +} + +void QMetaSequence_AddValueAtEnd(const QMetaSequence* self, void* container, const void* value) { + self->addValueAtEnd(container, value); +} + +bool QMetaSequence_CanRemoveValueAtBegin(const QMetaSequence* self) { + return self->canRemoveValueAtBegin(); +} + +void QMetaSequence_RemoveValueAtBegin(const QMetaSequence* self, void* container) { + self->removeValueAtBegin(container); +} + +bool QMetaSequence_CanRemoveValueAtEnd(const QMetaSequence* self) { + return self->canRemoveValueAtEnd(); +} + +void QMetaSequence_RemoveValueAtEnd(const QMetaSequence* self, void* container) { + self->removeValueAtEnd(container); +} + +bool QMetaSequence_CanGetValueAtIndex(const QMetaSequence* self) { + return self->canGetValueAtIndex(); +} + +void QMetaSequence_ValueAtIndex(const QMetaSequence* self, const void* container, ptrdiff_t index, void* result) { + self->valueAtIndex(container, (qsizetype)(index), result); +} + +bool QMetaSequence_CanSetValueAtIndex(const QMetaSequence* self) { + return self->canSetValueAtIndex(); +} + +void QMetaSequence_SetValueAtIndex(const QMetaSequence* self, void* container, ptrdiff_t index, const void* value) { + self->setValueAtIndex(container, (qsizetype)(index), value); +} + +bool QMetaSequence_CanAddValue(const QMetaSequence* self) { + return self->canAddValue(); +} + +void QMetaSequence_AddValue(const QMetaSequence* self, void* container, const void* value) { + self->addValue(container, value); +} + +bool QMetaSequence_CanRemoveValue(const QMetaSequence* self) { + return self->canRemoveValue(); +} + +void QMetaSequence_RemoveValue(const QMetaSequence* self, void* container) { + self->removeValue(container); +} + +bool QMetaSequence_CanGetValueAtIterator(const QMetaSequence* self) { + return self->canGetValueAtIterator(); +} + +void QMetaSequence_ValueAtIterator(const QMetaSequence* self, const void* iterator, void* result) { + self->valueAtIterator(iterator, result); +} + +bool QMetaSequence_CanSetValueAtIterator(const QMetaSequence* self) { + return self->canSetValueAtIterator(); +} + +void QMetaSequence_SetValueAtIterator(const QMetaSequence* self, const void* iterator, const void* value) { + self->setValueAtIterator(iterator, value); +} + +bool QMetaSequence_CanInsertValueAtIterator(const QMetaSequence* self) { + return self->canInsertValueAtIterator(); +} + +void QMetaSequence_InsertValueAtIterator(const QMetaSequence* self, void* container, const void* iterator, const void* value) { + self->insertValueAtIterator(container, iterator, value); +} + +bool QMetaSequence_CanEraseValueAtIterator(const QMetaSequence* self) { + return self->canEraseValueAtIterator(); +} + +void QMetaSequence_EraseValueAtIterator(const QMetaSequence* self, void* container, const void* iterator) { + self->eraseValueAtIterator(container, iterator); +} + +bool QMetaSequence_CanEraseRangeAtIterator(const QMetaSequence* self) { + return self->canEraseRangeAtIterator(); +} + +void QMetaSequence_EraseRangeAtIterator(const QMetaSequence* self, void* container, const void* iterator1, const void* iterator2) { + self->eraseRangeAtIterator(container, iterator1, iterator2); +} + +bool QMetaSequence_CanGetValueAtConstIterator(const QMetaSequence* self) { + return self->canGetValueAtConstIterator(); +} + +void QMetaSequence_ValueAtConstIterator(const QMetaSequence* self, const void* iterator, void* result) { + self->valueAtConstIterator(iterator, result); +} + +void QMetaSequence_Delete(QMetaSequence* self) { + delete self; +} + +QMetaAssociation* QMetaAssociation_new() { + return new QMetaAssociation(); +} + +QMetaAssociation* QMetaAssociation_new2(QtMetaContainerPrivate__QMetaAssociationInterface* d) { + return new QMetaAssociation(d); +} + +QMetaType* QMetaAssociation_KeyMetaType(const QMetaAssociation* self) { + return new QMetaType(self->keyMetaType()); +} + +QMetaType* QMetaAssociation_MappedMetaType(const QMetaAssociation* self) { + return new QMetaType(self->mappedMetaType()); +} + +bool QMetaAssociation_CanInsertKey(const QMetaAssociation* self) { + return self->canInsertKey(); +} + +void QMetaAssociation_InsertKey(const QMetaAssociation* self, void* container, const void* key) { + self->insertKey(container, key); +} + +bool QMetaAssociation_CanRemoveKey(const QMetaAssociation* self) { + return self->canRemoveKey(); +} + +void QMetaAssociation_RemoveKey(const QMetaAssociation* self, void* container, const void* key) { + self->removeKey(container, key); +} + +bool QMetaAssociation_CanContainsKey(const QMetaAssociation* self) { + return self->canContainsKey(); +} + +bool QMetaAssociation_ContainsKey(const QMetaAssociation* self, const void* container, const void* key) { + return self->containsKey(container, key); +} + +bool QMetaAssociation_CanGetMappedAtKey(const QMetaAssociation* self) { + return self->canGetMappedAtKey(); +} + +void QMetaAssociation_MappedAtKey(const QMetaAssociation* self, const void* container, const void* key, void* mapped) { + self->mappedAtKey(container, key, mapped); +} + +bool QMetaAssociation_CanSetMappedAtKey(const QMetaAssociation* self) { + return self->canSetMappedAtKey(); +} + +void QMetaAssociation_SetMappedAtKey(const QMetaAssociation* self, void* container, const void* key, const void* mapped) { + self->setMappedAtKey(container, key, mapped); +} + +bool QMetaAssociation_CanGetKeyAtIterator(const QMetaAssociation* self) { + return self->canGetKeyAtIterator(); +} + +void QMetaAssociation_KeyAtIterator(const QMetaAssociation* self, const void* iterator, void* key) { + self->keyAtIterator(iterator, key); +} + +bool QMetaAssociation_CanGetKeyAtConstIterator(const QMetaAssociation* self) { + return self->canGetKeyAtConstIterator(); +} + +void QMetaAssociation_KeyAtConstIterator(const QMetaAssociation* self, const void* iterator, void* key) { + self->keyAtConstIterator(iterator, key); +} + +bool QMetaAssociation_CanGetMappedAtIterator(const QMetaAssociation* self) { + return self->canGetMappedAtIterator(); +} + +void QMetaAssociation_MappedAtIterator(const QMetaAssociation* self, const void* iterator, void* mapped) { + self->mappedAtIterator(iterator, mapped); +} + +bool QMetaAssociation_CanGetMappedAtConstIterator(const QMetaAssociation* self) { + return self->canGetMappedAtConstIterator(); +} + +void QMetaAssociation_MappedAtConstIterator(const QMetaAssociation* self, const void* iterator, void* mapped) { + self->mappedAtConstIterator(iterator, mapped); +} + +bool QMetaAssociation_CanSetMappedAtIterator(const QMetaAssociation* self) { + return self->canSetMappedAtIterator(); +} + +void QMetaAssociation_SetMappedAtIterator(const QMetaAssociation* self, const void* iterator, const void* mapped) { + self->setMappedAtIterator(iterator, mapped); +} + +bool QMetaAssociation_CanCreateIteratorAtKey(const QMetaAssociation* self) { + return self->canCreateIteratorAtKey(); +} + +void* QMetaAssociation_CreateIteratorAtKey(const QMetaAssociation* self, void* container, const void* key) { + return self->createIteratorAtKey(container, key); +} + +bool QMetaAssociation_CanCreateConstIteratorAtKey(const QMetaAssociation* self) { + return self->canCreateConstIteratorAtKey(); +} + +void* QMetaAssociation_CreateConstIteratorAtKey(const QMetaAssociation* self, const void* container, const void* key) { + return self->createConstIteratorAtKey(container, key); +} + +void QMetaAssociation_Delete(QMetaAssociation* self) { + delete self; +} + diff --git a/qt/gen_qmetacontainer.go b/qt/gen_qmetacontainer.go new file mode 100644 index 0000000..b7624a6 --- /dev/null +++ b/qt/gen_qmetacontainer.go @@ -0,0 +1,649 @@ +package qt + +/* + +#include "gen_qmetacontainer.h" +#include + +*/ +import "C" + +import ( + "runtime" + "unsafe" +) + +type QtMetaContainerPrivate__IteratorCapability byte + +const ( + QtMetaContainerPrivate__InputCapability QtMetaContainerPrivate__IteratorCapability = 1 + QtMetaContainerPrivate__ForwardCapability QtMetaContainerPrivate__IteratorCapability = 2 + QtMetaContainerPrivate__BiDirectionalCapability QtMetaContainerPrivate__IteratorCapability = 4 + QtMetaContainerPrivate__RandomAccessCapability QtMetaContainerPrivate__IteratorCapability = 8 +) + +type QtMetaContainerPrivate__AddRemoveCapability byte + +const ( + QtMetaContainerPrivate__CanAddAtBegin QtMetaContainerPrivate__AddRemoveCapability = 1 + QtMetaContainerPrivate__CanRemoveAtBegin QtMetaContainerPrivate__AddRemoveCapability = 2 + QtMetaContainerPrivate__CanAddAtEnd QtMetaContainerPrivate__AddRemoveCapability = 4 + QtMetaContainerPrivate__CanRemoveAtEnd QtMetaContainerPrivate__AddRemoveCapability = 8 +) + +type QtMetaContainerPrivate__QMetaContainerInterface__Position byte + +const ( + QtMetaContainerPrivate__QMetaContainerInterface__AtBegin QtMetaContainerPrivate__QMetaContainerInterface__Position = 0 + QtMetaContainerPrivate__QMetaContainerInterface__AtEnd QtMetaContainerPrivate__QMetaContainerInterface__Position = 1 + QtMetaContainerPrivate__QMetaContainerInterface__Unspecified QtMetaContainerPrivate__QMetaContainerInterface__Position = 2 +) + +type QtMetaContainerPrivate__QMetaContainerInterface struct { + h *C.QtMetaContainerPrivate__QMetaContainerInterface +} + +func (this *QtMetaContainerPrivate__QMetaContainerInterface) cPointer() *C.QtMetaContainerPrivate__QMetaContainerInterface { + if this == nil { + return nil + } + return this.h +} + +func newQtMetaContainerPrivate__QMetaContainerInterface(h *C.QtMetaContainerPrivate__QMetaContainerInterface) *QtMetaContainerPrivate__QMetaContainerInterface { + if h == nil { + return nil + } + return &QtMetaContainerPrivate__QMetaContainerInterface{h: h} +} + +func newQtMetaContainerPrivate__QMetaContainerInterface_U(h unsafe.Pointer) *QtMetaContainerPrivate__QMetaContainerInterface { + return newQtMetaContainerPrivate__QMetaContainerInterface((*C.QtMetaContainerPrivate__QMetaContainerInterface)(h)) +} + +// NewQtMetaContainerPrivate__QMetaContainerInterface constructs a new QtMetaContainerPrivate::QMetaContainerInterface object. +func NewQtMetaContainerPrivate__QMetaContainerInterface() *QtMetaContainerPrivate__QMetaContainerInterface { + ret := C.QtMetaContainerPrivate__QMetaContainerInterface_new() + return newQtMetaContainerPrivate__QMetaContainerInterface(ret) +} + +// Delete this object from C++ memory. +func (this *QtMetaContainerPrivate__QMetaContainerInterface) Delete() { + C.QtMetaContainerPrivate__QMetaContainerInterface_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QtMetaContainerPrivate__QMetaContainerInterface) GoGC() { + runtime.SetFinalizer(this, func(this *QtMetaContainerPrivate__QMetaContainerInterface) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + +type QtMetaContainerPrivate__QMetaSequenceInterface struct { + h *C.QtMetaContainerPrivate__QMetaSequenceInterface + *QtMetaContainerPrivate__QMetaContainerInterface +} + +func (this *QtMetaContainerPrivate__QMetaSequenceInterface) cPointer() *C.QtMetaContainerPrivate__QMetaSequenceInterface { + if this == nil { + return nil + } + return this.h +} + +func newQtMetaContainerPrivate__QMetaSequenceInterface(h *C.QtMetaContainerPrivate__QMetaSequenceInterface) *QtMetaContainerPrivate__QMetaSequenceInterface { + if h == nil { + return nil + } + return &QtMetaContainerPrivate__QMetaSequenceInterface{h: h, QtMetaContainerPrivate__QMetaContainerInterface: newQtMetaContainerPrivate__QMetaContainerInterface_U(unsafe.Pointer(h))} +} + +func newQtMetaContainerPrivate__QMetaSequenceInterface_U(h unsafe.Pointer) *QtMetaContainerPrivate__QMetaSequenceInterface { + return newQtMetaContainerPrivate__QMetaSequenceInterface((*C.QtMetaContainerPrivate__QMetaSequenceInterface)(h)) +} + +// NewQtMetaContainerPrivate__QMetaSequenceInterface constructs a new QtMetaContainerPrivate::QMetaSequenceInterface object. +func NewQtMetaContainerPrivate__QMetaSequenceInterface() *QtMetaContainerPrivate__QMetaSequenceInterface { + ret := C.QtMetaContainerPrivate__QMetaSequenceInterface_new() + return newQtMetaContainerPrivate__QMetaSequenceInterface(ret) +} + +// Delete this object from C++ memory. +func (this *QtMetaContainerPrivate__QMetaSequenceInterface) Delete() { + C.QtMetaContainerPrivate__QMetaSequenceInterface_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QtMetaContainerPrivate__QMetaSequenceInterface) GoGC() { + runtime.SetFinalizer(this, func(this *QtMetaContainerPrivate__QMetaSequenceInterface) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + +type QtMetaContainerPrivate__QMetaAssociationInterface struct { + h *C.QtMetaContainerPrivate__QMetaAssociationInterface + *QtMetaContainerPrivate__QMetaContainerInterface +} + +func (this *QtMetaContainerPrivate__QMetaAssociationInterface) cPointer() *C.QtMetaContainerPrivate__QMetaAssociationInterface { + if this == nil { + return nil + } + return this.h +} + +func newQtMetaContainerPrivate__QMetaAssociationInterface(h *C.QtMetaContainerPrivate__QMetaAssociationInterface) *QtMetaContainerPrivate__QMetaAssociationInterface { + if h == nil { + return nil + } + return &QtMetaContainerPrivate__QMetaAssociationInterface{h: h, QtMetaContainerPrivate__QMetaContainerInterface: newQtMetaContainerPrivate__QMetaContainerInterface_U(unsafe.Pointer(h))} +} + +func newQtMetaContainerPrivate__QMetaAssociationInterface_U(h unsafe.Pointer) *QtMetaContainerPrivate__QMetaAssociationInterface { + return newQtMetaContainerPrivate__QMetaAssociationInterface((*C.QtMetaContainerPrivate__QMetaAssociationInterface)(h)) +} + +// NewQtMetaContainerPrivate__QMetaAssociationInterface constructs a new QtMetaContainerPrivate::QMetaAssociationInterface object. +func NewQtMetaContainerPrivate__QMetaAssociationInterface() *QtMetaContainerPrivate__QMetaAssociationInterface { + ret := C.QtMetaContainerPrivate__QMetaAssociationInterface_new() + return newQtMetaContainerPrivate__QMetaAssociationInterface(ret) +} + +// Delete this object from C++ memory. +func (this *QtMetaContainerPrivate__QMetaAssociationInterface) Delete() { + C.QtMetaContainerPrivate__QMetaAssociationInterface_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QtMetaContainerPrivate__QMetaAssociationInterface) GoGC() { + runtime.SetFinalizer(this, func(this *QtMetaContainerPrivate__QMetaAssociationInterface) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + +type QMetaContainer struct { + h *C.QMetaContainer +} + +func (this *QMetaContainer) cPointer() *C.QMetaContainer { + if this == nil { + return nil + } + return this.h +} + +func newQMetaContainer(h *C.QMetaContainer) *QMetaContainer { + if h == nil { + return nil + } + return &QMetaContainer{h: h} +} + +func newQMetaContainer_U(h unsafe.Pointer) *QMetaContainer { + return newQMetaContainer((*C.QMetaContainer)(h)) +} + +// NewQMetaContainer constructs a new QMetaContainer object. +func NewQMetaContainer() *QMetaContainer { + ret := C.QMetaContainer_new() + return newQMetaContainer(ret) +} + +// NewQMetaContainer2 constructs a new QMetaContainer object. +func NewQMetaContainer2(d *QtMetaContainerPrivate__QMetaContainerInterface) *QMetaContainer { + ret := C.QMetaContainer_new2(d.cPointer()) + return newQMetaContainer(ret) +} + +// NewQMetaContainer3 constructs a new QMetaContainer object. +func NewQMetaContainer3(param1 *QMetaContainer) *QMetaContainer { + ret := C.QMetaContainer_new3(param1.cPointer()) + return newQMetaContainer(ret) +} + +func (this *QMetaContainer) HasInputIterator() bool { + return (bool)(C.QMetaContainer_HasInputIterator(this.h)) +} + +func (this *QMetaContainer) HasForwardIterator() bool { + return (bool)(C.QMetaContainer_HasForwardIterator(this.h)) +} + +func (this *QMetaContainer) HasBidirectionalIterator() bool { + return (bool)(C.QMetaContainer_HasBidirectionalIterator(this.h)) +} + +func (this *QMetaContainer) HasRandomAccessIterator() bool { + return (bool)(C.QMetaContainer_HasRandomAccessIterator(this.h)) +} + +func (this *QMetaContainer) HasSize() bool { + return (bool)(C.QMetaContainer_HasSize(this.h)) +} + +func (this *QMetaContainer) Size(container unsafe.Pointer) int64 { + return (int64)(C.QMetaContainer_Size(this.h, container)) +} + +func (this *QMetaContainer) CanClear() bool { + return (bool)(C.QMetaContainer_CanClear(this.h)) +} + +func (this *QMetaContainer) Clear(container unsafe.Pointer) { + C.QMetaContainer_Clear(this.h, container) +} + +func (this *QMetaContainer) HasIterator() bool { + return (bool)(C.QMetaContainer_HasIterator(this.h)) +} + +func (this *QMetaContainer) Begin(container unsafe.Pointer) unsafe.Pointer { + return C.QMetaContainer_Begin(this.h, container) +} + +func (this *QMetaContainer) End(container unsafe.Pointer) unsafe.Pointer { + return C.QMetaContainer_End(this.h, container) +} + +func (this *QMetaContainer) DestroyIterator(iterator unsafe.Pointer) { + C.QMetaContainer_DestroyIterator(this.h, iterator) +} + +func (this *QMetaContainer) CompareIterator(i unsafe.Pointer, j unsafe.Pointer) bool { + return (bool)(C.QMetaContainer_CompareIterator(this.h, i, j)) +} + +func (this *QMetaContainer) CopyIterator(target unsafe.Pointer, source unsafe.Pointer) { + C.QMetaContainer_CopyIterator(this.h, target, source) +} + +func (this *QMetaContainer) AdvanceIterator(iterator unsafe.Pointer, step int64) { + C.QMetaContainer_AdvanceIterator(this.h, iterator, (C.ptrdiff_t)(step)) +} + +func (this *QMetaContainer) DiffIterator(i unsafe.Pointer, j unsafe.Pointer) int64 { + return (int64)(C.QMetaContainer_DiffIterator(this.h, i, j)) +} + +func (this *QMetaContainer) HasConstIterator() bool { + return (bool)(C.QMetaContainer_HasConstIterator(this.h)) +} + +func (this *QMetaContainer) ConstBegin(container unsafe.Pointer) unsafe.Pointer { + return C.QMetaContainer_ConstBegin(this.h, container) +} + +func (this *QMetaContainer) ConstEnd(container unsafe.Pointer) unsafe.Pointer { + return C.QMetaContainer_ConstEnd(this.h, container) +} + +func (this *QMetaContainer) DestroyConstIterator(iterator unsafe.Pointer) { + C.QMetaContainer_DestroyConstIterator(this.h, iterator) +} + +func (this *QMetaContainer) CompareConstIterator(i unsafe.Pointer, j unsafe.Pointer) bool { + return (bool)(C.QMetaContainer_CompareConstIterator(this.h, i, j)) +} + +func (this *QMetaContainer) CopyConstIterator(target unsafe.Pointer, source unsafe.Pointer) { + C.QMetaContainer_CopyConstIterator(this.h, target, source) +} + +func (this *QMetaContainer) AdvanceConstIterator(iterator unsafe.Pointer, step int64) { + C.QMetaContainer_AdvanceConstIterator(this.h, iterator, (C.ptrdiff_t)(step)) +} + +func (this *QMetaContainer) DiffConstIterator(i unsafe.Pointer, j unsafe.Pointer) int64 { + return (int64)(C.QMetaContainer_DiffConstIterator(this.h, i, j)) +} + +// Delete this object from C++ memory. +func (this *QMetaContainer) Delete() { + C.QMetaContainer_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QMetaContainer) GoGC() { + runtime.SetFinalizer(this, func(this *QMetaContainer) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + +type QMetaSequence struct { + h *C.QMetaSequence + *QMetaContainer +} + +func (this *QMetaSequence) cPointer() *C.QMetaSequence { + if this == nil { + return nil + } + return this.h +} + +func newQMetaSequence(h *C.QMetaSequence) *QMetaSequence { + if h == nil { + return nil + } + return &QMetaSequence{h: h, QMetaContainer: newQMetaContainer_U(unsafe.Pointer(h))} +} + +func newQMetaSequence_U(h unsafe.Pointer) *QMetaSequence { + return newQMetaSequence((*C.QMetaSequence)(h)) +} + +// NewQMetaSequence constructs a new QMetaSequence object. +func NewQMetaSequence() *QMetaSequence { + ret := C.QMetaSequence_new() + return newQMetaSequence(ret) +} + +// NewQMetaSequence2 constructs a new QMetaSequence object. +func NewQMetaSequence2(d *QtMetaContainerPrivate__QMetaSequenceInterface) *QMetaSequence { + ret := C.QMetaSequence_new2(d.cPointer()) + return newQMetaSequence(ret) +} + +func (this *QMetaSequence) ValueMetaType() *QMetaType { + _ret := C.QMetaSequence_ValueMetaType(this.h) + _goptr := newQMetaType(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QMetaSequence) IsSortable() bool { + return (bool)(C.QMetaSequence_IsSortable(this.h)) +} + +func (this *QMetaSequence) CanAddValueAtBegin() bool { + return (bool)(C.QMetaSequence_CanAddValueAtBegin(this.h)) +} + +func (this *QMetaSequence) AddValueAtBegin(container unsafe.Pointer, value unsafe.Pointer) { + C.QMetaSequence_AddValueAtBegin(this.h, container, value) +} + +func (this *QMetaSequence) CanAddValueAtEnd() bool { + return (bool)(C.QMetaSequence_CanAddValueAtEnd(this.h)) +} + +func (this *QMetaSequence) AddValueAtEnd(container unsafe.Pointer, value unsafe.Pointer) { + C.QMetaSequence_AddValueAtEnd(this.h, container, value) +} + +func (this *QMetaSequence) CanRemoveValueAtBegin() bool { + return (bool)(C.QMetaSequence_CanRemoveValueAtBegin(this.h)) +} + +func (this *QMetaSequence) RemoveValueAtBegin(container unsafe.Pointer) { + C.QMetaSequence_RemoveValueAtBegin(this.h, container) +} + +func (this *QMetaSequence) CanRemoveValueAtEnd() bool { + return (bool)(C.QMetaSequence_CanRemoveValueAtEnd(this.h)) +} + +func (this *QMetaSequence) RemoveValueAtEnd(container unsafe.Pointer) { + C.QMetaSequence_RemoveValueAtEnd(this.h, container) +} + +func (this *QMetaSequence) CanGetValueAtIndex() bool { + return (bool)(C.QMetaSequence_CanGetValueAtIndex(this.h)) +} + +func (this *QMetaSequence) ValueAtIndex(container unsafe.Pointer, index int64, result unsafe.Pointer) { + C.QMetaSequence_ValueAtIndex(this.h, container, (C.ptrdiff_t)(index), result) +} + +func (this *QMetaSequence) CanSetValueAtIndex() bool { + return (bool)(C.QMetaSequence_CanSetValueAtIndex(this.h)) +} + +func (this *QMetaSequence) SetValueAtIndex(container unsafe.Pointer, index int64, value unsafe.Pointer) { + C.QMetaSequence_SetValueAtIndex(this.h, container, (C.ptrdiff_t)(index), value) +} + +func (this *QMetaSequence) CanAddValue() bool { + return (bool)(C.QMetaSequence_CanAddValue(this.h)) +} + +func (this *QMetaSequence) AddValue(container unsafe.Pointer, value unsafe.Pointer) { + C.QMetaSequence_AddValue(this.h, container, value) +} + +func (this *QMetaSequence) CanRemoveValue() bool { + return (bool)(C.QMetaSequence_CanRemoveValue(this.h)) +} + +func (this *QMetaSequence) RemoveValue(container unsafe.Pointer) { + C.QMetaSequence_RemoveValue(this.h, container) +} + +func (this *QMetaSequence) CanGetValueAtIterator() bool { + return (bool)(C.QMetaSequence_CanGetValueAtIterator(this.h)) +} + +func (this *QMetaSequence) ValueAtIterator(iterator unsafe.Pointer, result unsafe.Pointer) { + C.QMetaSequence_ValueAtIterator(this.h, iterator, result) +} + +func (this *QMetaSequence) CanSetValueAtIterator() bool { + return (bool)(C.QMetaSequence_CanSetValueAtIterator(this.h)) +} + +func (this *QMetaSequence) SetValueAtIterator(iterator unsafe.Pointer, value unsafe.Pointer) { + C.QMetaSequence_SetValueAtIterator(this.h, iterator, value) +} + +func (this *QMetaSequence) CanInsertValueAtIterator() bool { + return (bool)(C.QMetaSequence_CanInsertValueAtIterator(this.h)) +} + +func (this *QMetaSequence) InsertValueAtIterator(container unsafe.Pointer, iterator unsafe.Pointer, value unsafe.Pointer) { + C.QMetaSequence_InsertValueAtIterator(this.h, container, iterator, value) +} + +func (this *QMetaSequence) CanEraseValueAtIterator() bool { + return (bool)(C.QMetaSequence_CanEraseValueAtIterator(this.h)) +} + +func (this *QMetaSequence) EraseValueAtIterator(container unsafe.Pointer, iterator unsafe.Pointer) { + C.QMetaSequence_EraseValueAtIterator(this.h, container, iterator) +} + +func (this *QMetaSequence) CanEraseRangeAtIterator() bool { + return (bool)(C.QMetaSequence_CanEraseRangeAtIterator(this.h)) +} + +func (this *QMetaSequence) EraseRangeAtIterator(container unsafe.Pointer, iterator1 unsafe.Pointer, iterator2 unsafe.Pointer) { + C.QMetaSequence_EraseRangeAtIterator(this.h, container, iterator1, iterator2) +} + +func (this *QMetaSequence) CanGetValueAtConstIterator() bool { + return (bool)(C.QMetaSequence_CanGetValueAtConstIterator(this.h)) +} + +func (this *QMetaSequence) ValueAtConstIterator(iterator unsafe.Pointer, result unsafe.Pointer) { + C.QMetaSequence_ValueAtConstIterator(this.h, iterator, result) +} + +// Delete this object from C++ memory. +func (this *QMetaSequence) Delete() { + C.QMetaSequence_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QMetaSequence) GoGC() { + runtime.SetFinalizer(this, func(this *QMetaSequence) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + +type QMetaAssociation struct { + h *C.QMetaAssociation + *QMetaContainer +} + +func (this *QMetaAssociation) cPointer() *C.QMetaAssociation { + if this == nil { + return nil + } + return this.h +} + +func newQMetaAssociation(h *C.QMetaAssociation) *QMetaAssociation { + if h == nil { + return nil + } + return &QMetaAssociation{h: h, QMetaContainer: newQMetaContainer_U(unsafe.Pointer(h))} +} + +func newQMetaAssociation_U(h unsafe.Pointer) *QMetaAssociation { + return newQMetaAssociation((*C.QMetaAssociation)(h)) +} + +// NewQMetaAssociation constructs a new QMetaAssociation object. +func NewQMetaAssociation() *QMetaAssociation { + ret := C.QMetaAssociation_new() + return newQMetaAssociation(ret) +} + +// NewQMetaAssociation2 constructs a new QMetaAssociation object. +func NewQMetaAssociation2(d *QtMetaContainerPrivate__QMetaAssociationInterface) *QMetaAssociation { + ret := C.QMetaAssociation_new2(d.cPointer()) + return newQMetaAssociation(ret) +} + +func (this *QMetaAssociation) KeyMetaType() *QMetaType { + _ret := C.QMetaAssociation_KeyMetaType(this.h) + _goptr := newQMetaType(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QMetaAssociation) MappedMetaType() *QMetaType { + _ret := C.QMetaAssociation_MappedMetaType(this.h) + _goptr := newQMetaType(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QMetaAssociation) CanInsertKey() bool { + return (bool)(C.QMetaAssociation_CanInsertKey(this.h)) +} + +func (this *QMetaAssociation) InsertKey(container unsafe.Pointer, key unsafe.Pointer) { + C.QMetaAssociation_InsertKey(this.h, container, key) +} + +func (this *QMetaAssociation) CanRemoveKey() bool { + return (bool)(C.QMetaAssociation_CanRemoveKey(this.h)) +} + +func (this *QMetaAssociation) RemoveKey(container unsafe.Pointer, key unsafe.Pointer) { + C.QMetaAssociation_RemoveKey(this.h, container, key) +} + +func (this *QMetaAssociation) CanContainsKey() bool { + return (bool)(C.QMetaAssociation_CanContainsKey(this.h)) +} + +func (this *QMetaAssociation) ContainsKey(container unsafe.Pointer, key unsafe.Pointer) bool { + return (bool)(C.QMetaAssociation_ContainsKey(this.h, container, key)) +} + +func (this *QMetaAssociation) CanGetMappedAtKey() bool { + return (bool)(C.QMetaAssociation_CanGetMappedAtKey(this.h)) +} + +func (this *QMetaAssociation) MappedAtKey(container unsafe.Pointer, key unsafe.Pointer, mapped unsafe.Pointer) { + C.QMetaAssociation_MappedAtKey(this.h, container, key, mapped) +} + +func (this *QMetaAssociation) CanSetMappedAtKey() bool { + return (bool)(C.QMetaAssociation_CanSetMappedAtKey(this.h)) +} + +func (this *QMetaAssociation) SetMappedAtKey(container unsafe.Pointer, key unsafe.Pointer, mapped unsafe.Pointer) { + C.QMetaAssociation_SetMappedAtKey(this.h, container, key, mapped) +} + +func (this *QMetaAssociation) CanGetKeyAtIterator() bool { + return (bool)(C.QMetaAssociation_CanGetKeyAtIterator(this.h)) +} + +func (this *QMetaAssociation) KeyAtIterator(iterator unsafe.Pointer, key unsafe.Pointer) { + C.QMetaAssociation_KeyAtIterator(this.h, iterator, key) +} + +func (this *QMetaAssociation) CanGetKeyAtConstIterator() bool { + return (bool)(C.QMetaAssociation_CanGetKeyAtConstIterator(this.h)) +} + +func (this *QMetaAssociation) KeyAtConstIterator(iterator unsafe.Pointer, key unsafe.Pointer) { + C.QMetaAssociation_KeyAtConstIterator(this.h, iterator, key) +} + +func (this *QMetaAssociation) CanGetMappedAtIterator() bool { + return (bool)(C.QMetaAssociation_CanGetMappedAtIterator(this.h)) +} + +func (this *QMetaAssociation) MappedAtIterator(iterator unsafe.Pointer, mapped unsafe.Pointer) { + C.QMetaAssociation_MappedAtIterator(this.h, iterator, mapped) +} + +func (this *QMetaAssociation) CanGetMappedAtConstIterator() bool { + return (bool)(C.QMetaAssociation_CanGetMappedAtConstIterator(this.h)) +} + +func (this *QMetaAssociation) MappedAtConstIterator(iterator unsafe.Pointer, mapped unsafe.Pointer) { + C.QMetaAssociation_MappedAtConstIterator(this.h, iterator, mapped) +} + +func (this *QMetaAssociation) CanSetMappedAtIterator() bool { + return (bool)(C.QMetaAssociation_CanSetMappedAtIterator(this.h)) +} + +func (this *QMetaAssociation) SetMappedAtIterator(iterator unsafe.Pointer, mapped unsafe.Pointer) { + C.QMetaAssociation_SetMappedAtIterator(this.h, iterator, mapped) +} + +func (this *QMetaAssociation) CanCreateIteratorAtKey() bool { + return (bool)(C.QMetaAssociation_CanCreateIteratorAtKey(this.h)) +} + +func (this *QMetaAssociation) CreateIteratorAtKey(container unsafe.Pointer, key unsafe.Pointer) unsafe.Pointer { + return C.QMetaAssociation_CreateIteratorAtKey(this.h, container, key) +} + +func (this *QMetaAssociation) CanCreateConstIteratorAtKey() bool { + return (bool)(C.QMetaAssociation_CanCreateConstIteratorAtKey(this.h)) +} + +func (this *QMetaAssociation) CreateConstIteratorAtKey(container unsafe.Pointer, key unsafe.Pointer) unsafe.Pointer { + return C.QMetaAssociation_CreateConstIteratorAtKey(this.h, container, key) +} + +// Delete this object from C++ memory. +func (this *QMetaAssociation) Delete() { + C.QMetaAssociation_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QMetaAssociation) GoGC() { + runtime.SetFinalizer(this, func(this *QMetaAssociation) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} diff --git a/qt/gen_qmetacontainer.h b/qt/gen_qmetacontainer.h new file mode 100644 index 0000000..6629535 --- /dev/null +++ b/qt/gen_qmetacontainer.h @@ -0,0 +1,152 @@ +#ifndef GEN_QMETACONTAINER_H +#define GEN_QMETACONTAINER_H + +#include +#include +#include + +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + +#include "binding.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +class QMetaAssociation; +class QMetaContainer; +class QMetaSequence; +class QMetaType; +#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QtMetaContainerPrivate__QMetaAssociationInterface) +typedef QtMetaContainerPrivate::QMetaAssociationInterface QtMetaContainerPrivate__QMetaAssociationInterface; +#else +class QtMetaContainerPrivate__QMetaAssociationInterface; +#endif +#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QtMetaContainerPrivate__QMetaContainerInterface) +typedef QtMetaContainerPrivate::QMetaContainerInterface QtMetaContainerPrivate__QMetaContainerInterface; +#else +class QtMetaContainerPrivate__QMetaContainerInterface; +#endif +#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QtMetaContainerPrivate__QMetaSequenceInterface) +typedef QtMetaContainerPrivate::QMetaSequenceInterface QtMetaContainerPrivate__QMetaSequenceInterface; +#else +class QtMetaContainerPrivate__QMetaSequenceInterface; +#endif +#else +typedef struct QMetaAssociation QMetaAssociation; +typedef struct QMetaContainer QMetaContainer; +typedef struct QMetaSequence QMetaSequence; +typedef struct QMetaType QMetaType; +typedef struct QtMetaContainerPrivate__QMetaAssociationInterface QtMetaContainerPrivate__QMetaAssociationInterface; +typedef struct QtMetaContainerPrivate__QMetaContainerInterface QtMetaContainerPrivate__QMetaContainerInterface; +typedef struct QtMetaContainerPrivate__QMetaSequenceInterface QtMetaContainerPrivate__QMetaSequenceInterface; +#endif + +QtMetaContainerPrivate__QMetaContainerInterface* QtMetaContainerPrivate__QMetaContainerInterface_new(); +void QtMetaContainerPrivate__QMetaContainerInterface_Delete(QtMetaContainerPrivate__QMetaContainerInterface* self); + +QtMetaContainerPrivate__QMetaSequenceInterface* QtMetaContainerPrivate__QMetaSequenceInterface_new(); +void QtMetaContainerPrivate__QMetaSequenceInterface_Delete(QtMetaContainerPrivate__QMetaSequenceInterface* self); + +QtMetaContainerPrivate__QMetaAssociationInterface* QtMetaContainerPrivate__QMetaAssociationInterface_new(); +void QtMetaContainerPrivate__QMetaAssociationInterface_Delete(QtMetaContainerPrivate__QMetaAssociationInterface* self); + +QMetaContainer* QMetaContainer_new(); +QMetaContainer* QMetaContainer_new2(QtMetaContainerPrivate__QMetaContainerInterface* d); +QMetaContainer* QMetaContainer_new3(QMetaContainer* param1); +bool QMetaContainer_HasInputIterator(const QMetaContainer* self); +bool QMetaContainer_HasForwardIterator(const QMetaContainer* self); +bool QMetaContainer_HasBidirectionalIterator(const QMetaContainer* self); +bool QMetaContainer_HasRandomAccessIterator(const QMetaContainer* self); +bool QMetaContainer_HasSize(const QMetaContainer* self); +ptrdiff_t QMetaContainer_Size(const QMetaContainer* self, const void* container); +bool QMetaContainer_CanClear(const QMetaContainer* self); +void QMetaContainer_Clear(const QMetaContainer* self, void* container); +bool QMetaContainer_HasIterator(const QMetaContainer* self); +void* QMetaContainer_Begin(const QMetaContainer* self, void* container); +void* QMetaContainer_End(const QMetaContainer* self, void* container); +void QMetaContainer_DestroyIterator(const QMetaContainer* self, const void* iterator); +bool QMetaContainer_CompareIterator(const QMetaContainer* self, const void* i, const void* j); +void QMetaContainer_CopyIterator(const QMetaContainer* self, void* target, const void* source); +void QMetaContainer_AdvanceIterator(const QMetaContainer* self, void* iterator, ptrdiff_t step); +ptrdiff_t QMetaContainer_DiffIterator(const QMetaContainer* self, const void* i, const void* j); +bool QMetaContainer_HasConstIterator(const QMetaContainer* self); +void* QMetaContainer_ConstBegin(const QMetaContainer* self, const void* container); +void* QMetaContainer_ConstEnd(const QMetaContainer* self, const void* container); +void QMetaContainer_DestroyConstIterator(const QMetaContainer* self, const void* iterator); +bool QMetaContainer_CompareConstIterator(const QMetaContainer* self, const void* i, const void* j); +void QMetaContainer_CopyConstIterator(const QMetaContainer* self, void* target, const void* source); +void QMetaContainer_AdvanceConstIterator(const QMetaContainer* self, void* iterator, ptrdiff_t step); +ptrdiff_t QMetaContainer_DiffConstIterator(const QMetaContainer* self, const void* i, const void* j); +void QMetaContainer_Delete(QMetaContainer* self); + +QMetaSequence* QMetaSequence_new(); +QMetaSequence* QMetaSequence_new2(QtMetaContainerPrivate__QMetaSequenceInterface* d); +QMetaType* QMetaSequence_ValueMetaType(const QMetaSequence* self); +bool QMetaSequence_IsSortable(const QMetaSequence* self); +bool QMetaSequence_CanAddValueAtBegin(const QMetaSequence* self); +void QMetaSequence_AddValueAtBegin(const QMetaSequence* self, void* container, const void* value); +bool QMetaSequence_CanAddValueAtEnd(const QMetaSequence* self); +void QMetaSequence_AddValueAtEnd(const QMetaSequence* self, void* container, const void* value); +bool QMetaSequence_CanRemoveValueAtBegin(const QMetaSequence* self); +void QMetaSequence_RemoveValueAtBegin(const QMetaSequence* self, void* container); +bool QMetaSequence_CanRemoveValueAtEnd(const QMetaSequence* self); +void QMetaSequence_RemoveValueAtEnd(const QMetaSequence* self, void* container); +bool QMetaSequence_CanGetValueAtIndex(const QMetaSequence* self); +void QMetaSequence_ValueAtIndex(const QMetaSequence* self, const void* container, ptrdiff_t index, void* result); +bool QMetaSequence_CanSetValueAtIndex(const QMetaSequence* self); +void QMetaSequence_SetValueAtIndex(const QMetaSequence* self, void* container, ptrdiff_t index, const void* value); +bool QMetaSequence_CanAddValue(const QMetaSequence* self); +void QMetaSequence_AddValue(const QMetaSequence* self, void* container, const void* value); +bool QMetaSequence_CanRemoveValue(const QMetaSequence* self); +void QMetaSequence_RemoveValue(const QMetaSequence* self, void* container); +bool QMetaSequence_CanGetValueAtIterator(const QMetaSequence* self); +void QMetaSequence_ValueAtIterator(const QMetaSequence* self, const void* iterator, void* result); +bool QMetaSequence_CanSetValueAtIterator(const QMetaSequence* self); +void QMetaSequence_SetValueAtIterator(const QMetaSequence* self, const void* iterator, const void* value); +bool QMetaSequence_CanInsertValueAtIterator(const QMetaSequence* self); +void QMetaSequence_InsertValueAtIterator(const QMetaSequence* self, void* container, const void* iterator, const void* value); +bool QMetaSequence_CanEraseValueAtIterator(const QMetaSequence* self); +void QMetaSequence_EraseValueAtIterator(const QMetaSequence* self, void* container, const void* iterator); +bool QMetaSequence_CanEraseRangeAtIterator(const QMetaSequence* self); +void QMetaSequence_EraseRangeAtIterator(const QMetaSequence* self, void* container, const void* iterator1, const void* iterator2); +bool QMetaSequence_CanGetValueAtConstIterator(const QMetaSequence* self); +void QMetaSequence_ValueAtConstIterator(const QMetaSequence* self, const void* iterator, void* result); +void QMetaSequence_Delete(QMetaSequence* self); + +QMetaAssociation* QMetaAssociation_new(); +QMetaAssociation* QMetaAssociation_new2(QtMetaContainerPrivate__QMetaAssociationInterface* d); +QMetaType* QMetaAssociation_KeyMetaType(const QMetaAssociation* self); +QMetaType* QMetaAssociation_MappedMetaType(const QMetaAssociation* self); +bool QMetaAssociation_CanInsertKey(const QMetaAssociation* self); +void QMetaAssociation_InsertKey(const QMetaAssociation* self, void* container, const void* key); +bool QMetaAssociation_CanRemoveKey(const QMetaAssociation* self); +void QMetaAssociation_RemoveKey(const QMetaAssociation* self, void* container, const void* key); +bool QMetaAssociation_CanContainsKey(const QMetaAssociation* self); +bool QMetaAssociation_ContainsKey(const QMetaAssociation* self, const void* container, const void* key); +bool QMetaAssociation_CanGetMappedAtKey(const QMetaAssociation* self); +void QMetaAssociation_MappedAtKey(const QMetaAssociation* self, const void* container, const void* key, void* mapped); +bool QMetaAssociation_CanSetMappedAtKey(const QMetaAssociation* self); +void QMetaAssociation_SetMappedAtKey(const QMetaAssociation* self, void* container, const void* key, const void* mapped); +bool QMetaAssociation_CanGetKeyAtIterator(const QMetaAssociation* self); +void QMetaAssociation_KeyAtIterator(const QMetaAssociation* self, const void* iterator, void* key); +bool QMetaAssociation_CanGetKeyAtConstIterator(const QMetaAssociation* self); +void QMetaAssociation_KeyAtConstIterator(const QMetaAssociation* self, const void* iterator, void* key); +bool QMetaAssociation_CanGetMappedAtIterator(const QMetaAssociation* self); +void QMetaAssociation_MappedAtIterator(const QMetaAssociation* self, const void* iterator, void* mapped); +bool QMetaAssociation_CanGetMappedAtConstIterator(const QMetaAssociation* self); +void QMetaAssociation_MappedAtConstIterator(const QMetaAssociation* self, const void* iterator, void* mapped); +bool QMetaAssociation_CanSetMappedAtIterator(const QMetaAssociation* self); +void QMetaAssociation_SetMappedAtIterator(const QMetaAssociation* self, const void* iterator, const void* mapped); +bool QMetaAssociation_CanCreateIteratorAtKey(const QMetaAssociation* self); +void* QMetaAssociation_CreateIteratorAtKey(const QMetaAssociation* self, void* container, const void* key); +bool QMetaAssociation_CanCreateConstIteratorAtKey(const QMetaAssociation* self); +void* QMetaAssociation_CreateConstIteratorAtKey(const QMetaAssociation* self, const void* container, const void* key); +void QMetaAssociation_Delete(QMetaAssociation* self); + +#ifdef __cplusplus +} /* extern C */ +#endif + +#endif diff --git a/qt/gen_qmetaobject.cpp b/qt/gen_qmetaobject.cpp index d20c82a..63c949a 100644 --- a/qt/gen_qmetaobject.cpp +++ b/qt/gen_qmetaobject.cpp @@ -7,7 +7,9 @@ #include #include #include +#include #include +#include #include #include "qmetaobject.h" #include "gen_qmetaobject.h" @@ -37,6 +39,10 @@ int QMetaMethod_ReturnType(const QMetaMethod* self) { return self->returnType(); } +QMetaType* QMetaMethod_ReturnMetaType(const QMetaMethod* self) { + return new QMetaType(self->returnMetaType()); +} + int QMetaMethod_ParameterCount(const QMetaMethod* self) { return self->parameterCount(); } @@ -45,6 +51,10 @@ int QMetaMethod_ParameterType(const QMetaMethod* self, int index) { return self->parameterType(static_cast(index)); } +QMetaType* QMetaMethod_ParameterMetaType(const QMetaMethod* self, int index) { + return new QMetaType(self->parameterMetaType(static_cast(index))); +} + void QMetaMethod_GetParameterTypes(const QMetaMethod* self, int* types) { self->getParameterTypes(static_cast(types)); } @@ -62,6 +72,10 @@ struct miqt_array* QMetaMethod_ParameterTypes(const QMetaMethod* self) { return _out; } +QByteArray* QMetaMethod_ParameterTypeName(const QMetaMethod* self, int index) { + return new QByteArray(self->parameterTypeName(static_cast(index))); +} + struct miqt_array* QMetaMethod_ParameterNames(const QMetaMethod* self) { QList _ret = self->parameterNames(); // Convert QList<> from C++ memory to manually-managed C memory @@ -97,10 +111,18 @@ int QMetaMethod_MethodIndex(const QMetaMethod* self) { return self->methodIndex(); } +int QMetaMethod_RelativeMethodIndex(const QMetaMethod* self) { + return self->relativeMethodIndex(); +} + int QMetaMethod_Revision(const QMetaMethod* self) { return self->revision(); } +bool QMetaMethod_IsConst(const QMetaMethod* self) { + return self->isConst(); +} + QMetaObject* QMetaMethod_EnclosingMetaObject(const QMetaMethod* self) { return (QMetaObject*) self->enclosingMetaObject(); } @@ -474,6 +496,14 @@ int QMetaProperty_UserType(const QMetaProperty* self) { return self->userType(); } +int QMetaProperty_TypeId(const QMetaProperty* self) { + return self->typeId(); +} + +QMetaType* QMetaProperty_MetaType(const QMetaProperty* self) { + return new QMetaType(self->metaType()); +} + int QMetaProperty_PropertyIndex(const QMetaProperty* self) { return self->propertyIndex(); } @@ -506,10 +536,6 @@ bool QMetaProperty_IsStored(const QMetaProperty* self) { return self->isStored(); } -bool QMetaProperty_IsEditable(const QMetaProperty* self) { - return self->isEditable(); -} - bool QMetaProperty_IsUser(const QMetaProperty* self) { return self->isUser(); } @@ -526,6 +552,10 @@ bool QMetaProperty_IsRequired(const QMetaProperty* self) { return self->isRequired(); } +bool QMetaProperty_IsBindable(const QMetaProperty* self) { + return self->isBindable(); +} + bool QMetaProperty_IsFlagType(const QMetaProperty* self) { return self->isFlagType(); } @@ -566,6 +596,10 @@ bool QMetaProperty_Reset(const QMetaProperty* self, QObject* obj) { return self->reset(obj); } +QUntypedBindable* QMetaProperty_Bindable(const QMetaProperty* self, QObject* object) { + return new QUntypedBindable(self->bindable(object)); +} + QVariant* QMetaProperty_ReadOnGadget(const QMetaProperty* self, const void* gadget) { return new QVariant(self->readOnGadget(gadget)); } @@ -582,6 +616,10 @@ bool QMetaProperty_HasStdCppSet(const QMetaProperty* self) { return self->hasStdCppSet(); } +bool QMetaProperty_IsAlias(const QMetaProperty* self) { + return self->isAlias(); +} + bool QMetaProperty_IsValid(const QMetaProperty* self) { return self->isValid(); } @@ -590,26 +628,6 @@ QMetaObject* QMetaProperty_EnclosingMetaObject(const QMetaProperty* self) { return (QMetaObject*) self->enclosingMetaObject(); } -bool QMetaProperty_IsDesignable1(const QMetaProperty* self, QObject* obj) { - return self->isDesignable(obj); -} - -bool QMetaProperty_IsScriptable1(const QMetaProperty* self, QObject* obj) { - return self->isScriptable(obj); -} - -bool QMetaProperty_IsStored1(const QMetaProperty* self, QObject* obj) { - return self->isStored(obj); -} - -bool QMetaProperty_IsEditable1(const QMetaProperty* self, QObject* obj) { - return self->isEditable(obj); -} - -bool QMetaProperty_IsUser1(const QMetaProperty* self, QObject* obj) { - return self->isUser(obj); -} - void QMetaProperty_Delete(QMetaProperty* self) { delete self; } diff --git a/qt/gen_qmetaobject.go b/qt/gen_qmetaobject.go index ba0d9fa..8c736dc 100644 --- a/qt/gen_qmetaobject.go +++ b/qt/gen_qmetaobject.go @@ -95,6 +95,13 @@ func (this *QMetaMethod) ReturnType() int { return (int)(C.QMetaMethod_ReturnType(this.h)) } +func (this *QMetaMethod) ReturnMetaType() *QMetaType { + _ret := C.QMetaMethod_ReturnMetaType(this.h) + _goptr := newQMetaType(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + func (this *QMetaMethod) ParameterCount() int { return (int)(C.QMetaMethod_ParameterCount(this.h)) } @@ -103,6 +110,13 @@ func (this *QMetaMethod) ParameterType(index int) int { return (int)(C.QMetaMethod_ParameterType(this.h, (C.int)(index))) } +func (this *QMetaMethod) ParameterMetaType(index int) *QMetaType { + _ret := C.QMetaMethod_ParameterMetaType(this.h, (C.int)(index)) + _goptr := newQMetaType(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + func (this *QMetaMethod) GetParameterTypes(types *int) { C.QMetaMethod_GetParameterTypes(this.h, (*C.int)(unsafe.Pointer(types))) } @@ -121,6 +135,13 @@ func (this *QMetaMethod) ParameterTypes() []QByteArray { return _ret } +func (this *QMetaMethod) ParameterTypeName(index int) *QByteArray { + _ret := C.QMetaMethod_ParameterTypeName(this.h, (C.int)(index)) + _goptr := newQByteArray(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + func (this *QMetaMethod) ParameterNames() []QByteArray { var _ma *C.struct_miqt_array = C.QMetaMethod_ParameterNames(this.h) _ret := make([]QByteArray, int(_ma.len)) @@ -156,10 +177,18 @@ func (this *QMetaMethod) MethodIndex() int { return (int)(C.QMetaMethod_MethodIndex(this.h)) } +func (this *QMetaMethod) RelativeMethodIndex() int { + return (int)(C.QMetaMethod_RelativeMethodIndex(this.h)) +} + func (this *QMetaMethod) Revision() int { return (int)(C.QMetaMethod_Revision(this.h)) } +func (this *QMetaMethod) IsConst() bool { + return (bool)(C.QMetaMethod_IsConst(this.h)) +} + func (this *QMetaMethod) EnclosingMetaObject() *QMetaObject { return newQMetaObject_U(unsafe.Pointer(C.QMetaMethod_EnclosingMetaObject(this.h))) } @@ -620,6 +649,17 @@ func (this *QMetaProperty) UserType() int { return (int)(C.QMetaProperty_UserType(this.h)) } +func (this *QMetaProperty) TypeId() int { + return (int)(C.QMetaProperty_TypeId(this.h)) +} + +func (this *QMetaProperty) MetaType() *QMetaType { + _ret := C.QMetaProperty_MetaType(this.h) + _goptr := newQMetaType(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + func (this *QMetaProperty) PropertyIndex() int { return (int)(C.QMetaProperty_PropertyIndex(this.h)) } @@ -652,10 +692,6 @@ func (this *QMetaProperty) IsStored() bool { return (bool)(C.QMetaProperty_IsStored(this.h)) } -func (this *QMetaProperty) IsEditable() bool { - return (bool)(C.QMetaProperty_IsEditable(this.h)) -} - func (this *QMetaProperty) IsUser() bool { return (bool)(C.QMetaProperty_IsUser(this.h)) } @@ -672,6 +708,10 @@ func (this *QMetaProperty) IsRequired() bool { return (bool)(C.QMetaProperty_IsRequired(this.h)) } +func (this *QMetaProperty) IsBindable() bool { + return (bool)(C.QMetaProperty_IsBindable(this.h)) +} + func (this *QMetaProperty) IsFlagType() bool { return (bool)(C.QMetaProperty_IsFlagType(this.h)) } @@ -721,6 +761,13 @@ func (this *QMetaProperty) Reset(obj *QObject) bool { return (bool)(C.QMetaProperty_Reset(this.h, obj.cPointer())) } +func (this *QMetaProperty) Bindable(object *QObject) *QUntypedBindable { + _ret := C.QMetaProperty_Bindable(this.h, object.cPointer()) + _goptr := newQUntypedBindable(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + func (this *QMetaProperty) ReadOnGadget(gadget unsafe.Pointer) *QVariant { _ret := C.QMetaProperty_ReadOnGadget(this.h, gadget) _goptr := newQVariant(_ret) @@ -740,6 +787,10 @@ func (this *QMetaProperty) HasStdCppSet() bool { return (bool)(C.QMetaProperty_HasStdCppSet(this.h)) } +func (this *QMetaProperty) IsAlias() bool { + return (bool)(C.QMetaProperty_IsAlias(this.h)) +} + func (this *QMetaProperty) IsValid() bool { return (bool)(C.QMetaProperty_IsValid(this.h)) } @@ -748,26 +799,6 @@ func (this *QMetaProperty) EnclosingMetaObject() *QMetaObject { return newQMetaObject_U(unsafe.Pointer(C.QMetaProperty_EnclosingMetaObject(this.h))) } -func (this *QMetaProperty) IsDesignable1(obj *QObject) bool { - return (bool)(C.QMetaProperty_IsDesignable1(this.h, obj.cPointer())) -} - -func (this *QMetaProperty) IsScriptable1(obj *QObject) bool { - return (bool)(C.QMetaProperty_IsScriptable1(this.h, obj.cPointer())) -} - -func (this *QMetaProperty) IsStored1(obj *QObject) bool { - return (bool)(C.QMetaProperty_IsStored1(this.h, obj.cPointer())) -} - -func (this *QMetaProperty) IsEditable1(obj *QObject) bool { - return (bool)(C.QMetaProperty_IsEditable1(this.h, obj.cPointer())) -} - -func (this *QMetaProperty) IsUser1(obj *QObject) bool { - return (bool)(C.QMetaProperty_IsUser1(this.h, obj.cPointer())) -} - // Delete this object from C++ memory. func (this *QMetaProperty) Delete() { C.QMetaProperty_Delete(this.h) diff --git a/qt/gen_qmetaobject.h b/qt/gen_qmetaobject.h index 5570e4f..c373404 100644 --- a/qt/gen_qmetaobject.h +++ b/qt/gen_qmetaobject.h @@ -22,7 +22,9 @@ class QMetaEnum; class QMetaMethod; class QMetaObject; class QMetaProperty; +class QMetaType; class QObject; +class QUntypedBindable; class QVariant; #else typedef struct QByteArray QByteArray; @@ -33,7 +35,9 @@ typedef struct QMetaEnum QMetaEnum; typedef struct QMetaMethod QMetaMethod; typedef struct QMetaObject QMetaObject; typedef struct QMetaProperty QMetaProperty; +typedef struct QMetaType QMetaType; typedef struct QObject QObject; +typedef struct QUntypedBindable QUntypedBindable; typedef struct QVariant QVariant; #endif @@ -43,17 +47,22 @@ QByteArray* QMetaMethod_MethodSignature(const QMetaMethod* self); QByteArray* QMetaMethod_Name(const QMetaMethod* self); const char* QMetaMethod_TypeName(const QMetaMethod* self); int QMetaMethod_ReturnType(const QMetaMethod* self); +QMetaType* QMetaMethod_ReturnMetaType(const QMetaMethod* self); int QMetaMethod_ParameterCount(const QMetaMethod* self); int QMetaMethod_ParameterType(const QMetaMethod* self, int index); +QMetaType* QMetaMethod_ParameterMetaType(const QMetaMethod* self, int index); void QMetaMethod_GetParameterTypes(const QMetaMethod* self, int* types); struct miqt_array* QMetaMethod_ParameterTypes(const QMetaMethod* self); +QByteArray* QMetaMethod_ParameterTypeName(const QMetaMethod* self, int index); struct miqt_array* QMetaMethod_ParameterNames(const QMetaMethod* self); const char* QMetaMethod_Tag(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_RelativeMethodIndex(const QMetaMethod* self); int QMetaMethod_Revision(const QMetaMethod* self); +bool QMetaMethod_IsConst(const QMetaMethod* self); QMetaObject* QMetaMethod_EnclosingMetaObject(const QMetaMethod* self); bool QMetaMethod_Invoke(const QMetaMethod* self, QObject* object, int connectionType, QGenericReturnArgument* returnValue); bool QMetaMethod_Invoke2(const QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue); @@ -149,6 +158,8 @@ const char* QMetaProperty_Name(const QMetaProperty* self); const char* QMetaProperty_TypeName(const QMetaProperty* self); int QMetaProperty_Type(const QMetaProperty* self); int QMetaProperty_UserType(const QMetaProperty* self); +int QMetaProperty_TypeId(const QMetaProperty* self); +QMetaType* QMetaProperty_MetaType(const QMetaProperty* self); int QMetaProperty_PropertyIndex(const QMetaProperty* self); int QMetaProperty_RelativePropertyIndex(const QMetaProperty* self); bool QMetaProperty_IsReadable(const QMetaProperty* self); @@ -157,11 +168,11 @@ bool QMetaProperty_IsResettable(const QMetaProperty* self); bool QMetaProperty_IsDesignable(const QMetaProperty* self); bool QMetaProperty_IsScriptable(const QMetaProperty* self); bool QMetaProperty_IsStored(const QMetaProperty* self); -bool QMetaProperty_IsEditable(const QMetaProperty* self); bool QMetaProperty_IsUser(const QMetaProperty* self); bool QMetaProperty_IsConstant(const QMetaProperty* self); bool QMetaProperty_IsFinal(const QMetaProperty* self); bool QMetaProperty_IsRequired(const QMetaProperty* self); +bool QMetaProperty_IsBindable(const QMetaProperty* self); bool QMetaProperty_IsFlagType(const QMetaProperty* self); bool QMetaProperty_IsEnumType(const QMetaProperty* self); QMetaEnum* QMetaProperty_Enumerator(const QMetaProperty* self); @@ -172,17 +183,14 @@ int QMetaProperty_Revision(const QMetaProperty* self); QVariant* QMetaProperty_Read(const QMetaProperty* self, QObject* obj); bool QMetaProperty_Write(const QMetaProperty* self, QObject* obj, QVariant* value); bool QMetaProperty_Reset(const QMetaProperty* self, QObject* obj); +QUntypedBindable* QMetaProperty_Bindable(const QMetaProperty* self, QObject* object); QVariant* QMetaProperty_ReadOnGadget(const QMetaProperty* self, const void* gadget); bool QMetaProperty_WriteOnGadget(const QMetaProperty* self, void* gadget, QVariant* value); bool QMetaProperty_ResetOnGadget(const QMetaProperty* self, void* gadget); bool QMetaProperty_HasStdCppSet(const QMetaProperty* self); +bool QMetaProperty_IsAlias(const QMetaProperty* self); bool QMetaProperty_IsValid(const QMetaProperty* self); QMetaObject* QMetaProperty_EnclosingMetaObject(const QMetaProperty* self); -bool QMetaProperty_IsDesignable1(const QMetaProperty* self, QObject* obj); -bool QMetaProperty_IsScriptable1(const QMetaProperty* self, QObject* obj); -bool QMetaProperty_IsStored1(const QMetaProperty* self, QObject* obj); -bool QMetaProperty_IsEditable1(const QMetaProperty* self, QObject* obj); -bool QMetaProperty_IsUser1(const QMetaProperty* self, QObject* obj); void QMetaProperty_Delete(QMetaProperty* self); QMetaClassInfo* QMetaClassInfo_new(); diff --git a/qt/gen_qmetatype.cpp b/qt/gen_qmetatype.cpp index a7abab5..8c361b8 100644 --- a/qt/gen_qmetatype.cpp +++ b/qt/gen_qmetatype.cpp @@ -1,62 +1,35 @@ #include +#include #include #include #include #include -#define WORKAROUND_INNER_CLASS_DEFINITION_QtMetaTypePrivate__QAssociativeIterableImpl +#include #define WORKAROUND_INNER_CLASS_DEFINITION_QtMetaTypePrivate__QPairVariantInterfaceImpl -#define WORKAROUND_INNER_CLASS_DEFINITION_QtMetaTypePrivate__QSequentialIterableImpl -#define WORKAROUND_INNER_CLASS_DEFINITION_QtMetaTypePrivate__VariantData -#define WORKAROUND_INNER_CLASS_DEFINITION_QtMetaTypePrivate__VectorBoolElements -#define WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__AbstractComparatorFunction -#define WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__AbstractConverterFunction -#define WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__AbstractDebugStreamFunction +#define WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__QMetaTypeInterface +#define WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__QTypeNormalizer #include "qmetatype.h" #include "gen_qmetatype.h" #include "_cgo_export.h" -QtPrivate__AbstractDebugStreamFunction* QtPrivate__AbstractDebugStreamFunction_new() { - return new QtPrivate::AbstractDebugStreamFunction(); -} - -void QtPrivate__AbstractDebugStreamFunction_Delete(QtPrivate__AbstractDebugStreamFunction* self) { +void QtPrivate__QMetaTypeInterface_Delete(QtPrivate__QMetaTypeInterface* self) { delete self; } -QtPrivate__AbstractComparatorFunction* QtPrivate__AbstractComparatorFunction_new() { - return new QtPrivate::AbstractComparatorFunction(); +QMetaType* QMetaType_new(int typeVal) { + return new QMetaType(static_cast(typeVal)); } -void QtPrivate__AbstractComparatorFunction_Delete(QtPrivate__AbstractComparatorFunction* self) { - delete self; -} - -QtPrivate__AbstractConverterFunction* QtPrivate__AbstractConverterFunction_new() { - return new QtPrivate::AbstractConverterFunction(); -} - -void QtPrivate__AbstractConverterFunction_Delete(QtPrivate__AbstractConverterFunction* self) { - delete self; -} - -QMetaType* QMetaType_new() { +QMetaType* QMetaType_new2() { return new QMetaType(); } -QMetaType* QMetaType_new2(const int typeVal) { - return new QMetaType(static_cast(typeVal)); +QMetaType* QMetaType_new3(QMetaType* param1) { + return new QMetaType(*param1); } -bool QMetaType_UnregisterType(int typeVal) { - return QMetaType::unregisterType(static_cast(typeVal)); -} - -int QMetaType_RegisterTypedef(const char* typeName, int aliasId) { - return QMetaType::registerTypedef(typeName, static_cast(aliasId)); -} - -int QMetaType_RegisterNormalizedTypedef(QByteArray* normalizedTypeName, int aliasId) { - return QMetaType::registerNormalizedTypedef(*normalizedTypeName, static_cast(aliasId)); +void QMetaType_RegisterNormalizedTypedef(QByteArray* normalizedTypeName, QMetaType* typeVal) { + QMetaType::registerNormalizedTypedef(*normalizedTypeName, *typeVal); } int QMetaType_Type(const char* typeName) { @@ -84,10 +57,6 @@ QMetaObject* QMetaType_MetaObjectForType(int typeVal) { return (QMetaObject*) QMetaType::metaObjectForType(static_cast(typeVal)); } -bool QMetaType_IsRegistered(int typeVal) { - return QMetaType::isRegistered(static_cast(typeVal)); -} - void* QMetaType_Create(int typeVal) { return QMetaType::create(static_cast(typeVal)); } @@ -104,12 +73,8 @@ void QMetaType_Destruct(int typeVal, void* where) { QMetaType::destruct(static_cast(typeVal), where); } -bool QMetaType_Save(QDataStream* stream, int typeVal, const void* data) { - return QMetaType::save(*stream, static_cast(typeVal), data); -} - -bool QMetaType_Load(QDataStream* stream, int typeVal, void* data) { - return QMetaType::load(*stream, static_cast(typeVal), data); +bool QMetaType_IsRegistered(int typeVal) { + return QMetaType::isRegistered(static_cast(typeVal)); } bool QMetaType_IsValid(const QMetaType* self) { @@ -124,8 +89,14 @@ int QMetaType_Id(const QMetaType* self) { return self->id(); } -int QMetaType_SizeOf2(const QMetaType* self) { - return self->sizeOf(); +ptrdiff_t QMetaType_SizeOf2(const QMetaType* self) { + qsizetype _ret = self->sizeOf(); + return static_cast(_ret); +} + +ptrdiff_t QMetaType_AlignOf(const QMetaType* self) { + qsizetype _ret = self->alignOf(); + return static_cast(_ret); } int QMetaType_Flags(const QMetaType* self) { @@ -137,8 +108,8 @@ QMetaObject* QMetaType_MetaObject(const QMetaType* self) { return (QMetaObject*) self->metaObject(); } -QByteArray* QMetaType_Name(const QMetaType* self) { - return new QByteArray(self->name()); +const char* QMetaType_Name(const QMetaType* self) { + return (const char*) self->name(); } void* QMetaType_Create2(const QMetaType* self) { @@ -157,38 +128,118 @@ void QMetaType_DestructWithData(const QMetaType* self, void* data) { self->destruct(data); } -bool QMetaType_HasRegisteredComparators(int typeId) { - return QMetaType::hasRegisteredComparators(static_cast(typeId)); +QPartialOrdering* QMetaType_Compare(const QMetaType* self, const void* lhs, const void* rhs) { + return new QPartialOrdering(self->compare(lhs, rhs)); } -bool QMetaType_HasRegisteredDebugStreamOperator(int typeId) { - return QMetaType::hasRegisteredDebugStreamOperator(static_cast(typeId)); +bool QMetaType_Equals(const QMetaType* self, const void* lhs, const void* rhs) { + return self->equals(lhs, rhs); } -bool QMetaType_Convert(const void* from, int fromTypeId, void* to, int toTypeId) { - return QMetaType::convert(from, static_cast(fromTypeId), to, static_cast(toTypeId)); +bool QMetaType_IsEqualityComparable(const QMetaType* self) { + return self->isEqualityComparable(); } -bool QMetaType_Compare(const void* lhs, const void* rhs, int typeId, int* result) { - return QMetaType::compare(lhs, rhs, static_cast(typeId), static_cast(result)); +bool QMetaType_IsOrdered(const QMetaType* self) { + return self->isOrdered(); } -bool QMetaType_Equals(const void* lhs, const void* rhs, int typeId, int* result) { - return QMetaType::equals(lhs, rhs, static_cast(typeId), static_cast(result)); +bool QMetaType_Save(const QMetaType* self, QDataStream* stream, const void* data) { + return self->save(*stream, data); } -bool QMetaType_DebugStream(QDebug* dbg, const void* rhs, int typeId) { +bool QMetaType_Load(const QMetaType* self, QDataStream* stream, void* data) { + return self->load(*stream, data); +} + +bool QMetaType_HasRegisteredDataStreamOperators(const QMetaType* self) { + return self->hasRegisteredDataStreamOperators(); +} + +bool QMetaType_Save2(QDataStream* stream, int typeVal, const void* data) { + return QMetaType::save(*stream, static_cast(typeVal), data); +} + +bool QMetaType_Load2(QDataStream* stream, int typeVal, void* data) { + return QMetaType::load(*stream, static_cast(typeVal), data); +} + +QMetaType* QMetaType_FromName(QByteArrayView* name) { + return new QMetaType(QMetaType::fromName(*name)); +} + +bool QMetaType_DebugStream(QMetaType* self, QDebug* dbg, const void* rhs) { + return self->debugStream(*dbg, rhs); +} + +bool QMetaType_HasRegisteredDebugStreamOperator(const QMetaType* self) { + return self->hasRegisteredDebugStreamOperator(); +} + +bool QMetaType_DebugStream2(QDebug* dbg, const void* rhs, int typeId) { return QMetaType::debugStream(*dbg, rhs, static_cast(typeId)); } -bool QMetaType_HasRegisteredConverterFunction(int fromTypeId, int toTypeId) { - return QMetaType::hasRegisteredConverterFunction(static_cast(fromTypeId), static_cast(toTypeId)); +bool QMetaType_HasRegisteredDebugStreamOperatorWithTypeId(int typeId) { + return QMetaType::hasRegisteredDebugStreamOperator(static_cast(typeId)); +} + +bool QMetaType_Convert(QMetaType* fromType, const void* from, QMetaType* toType, void* to) { + return QMetaType::convert(*fromType, from, *toType, to); +} + +bool QMetaType_CanConvert(QMetaType* fromType, QMetaType* toType) { + return QMetaType::canConvert(*fromType, *toType); +} + +bool QMetaType_View(QMetaType* fromType, void* from, QMetaType* toType, void* to) { + return QMetaType::view(*fromType, from, *toType, to); +} + +bool QMetaType_CanView(QMetaType* fromType, QMetaType* toType) { + return QMetaType::canView(*fromType, *toType); +} + +bool QMetaType_Convert2(const void* from, int fromTypeId, void* to, int toTypeId) { + return QMetaType::convert(from, static_cast(fromTypeId), to, static_cast(toTypeId)); +} + +bool QMetaType_Compare2(const void* lhs, const void* rhs, int typeId, int* result) { + return QMetaType::compare(lhs, rhs, static_cast(typeId), static_cast(result)); +} + +bool QMetaType_Equals2(const void* lhs, const void* rhs, int typeId, int* result) { + return QMetaType::equals(lhs, rhs, static_cast(typeId), static_cast(result)); +} + +bool QMetaType_HasRegisteredConverterFunction(QMetaType* fromType, QMetaType* toType) { + return QMetaType::hasRegisteredConverterFunction(*fromType, *toType); +} + +bool QMetaType_HasRegisteredMutableViewFunction(QMetaType* fromType, QMetaType* toType) { + return QMetaType::hasRegisteredMutableViewFunction(*fromType, *toType); +} + +void QMetaType_UnregisterConverterFunction(QMetaType* from, QMetaType* to) { + QMetaType::unregisterConverterFunction(*from, *to); +} + +void QMetaType_UnregisterMutableViewFunction(QMetaType* from, QMetaType* to) { + QMetaType::unregisterMutableViewFunction(*from, *to); +} + +void QMetaType_UnregisterMetaType(QMetaType* typeVal) { + QMetaType::unregisterMetaType(*typeVal); } void* QMetaType_Create22(int typeVal, const void* copyVal) { return QMetaType::create(static_cast(typeVal), copyVal); } +int QMetaType_Id1(const QMetaType* self, int param1) { + return self->id(static_cast(param1)); +} + void* QMetaType_Create1(const QMetaType* self, const void* copyVal) { return self->create(copyVal); } @@ -201,153 +252,6 @@ void QMetaType_Delete(QMetaType* self) { delete self; } -QtMetaTypePrivate__VariantData* QtMetaTypePrivate__VariantData_new(const int metaTypeId_, const void* data_, const unsigned int flags_) { - return new QtMetaTypePrivate::VariantData(static_cast(metaTypeId_), data_, static_cast(flags_)); -} - -QtMetaTypePrivate__VariantData* QtMetaTypePrivate__VariantData_new2(QtMetaTypePrivate__VariantData* other) { - return new QtMetaTypePrivate::VariantData(*other); -} - -void QtMetaTypePrivate__VariantData_Delete(QtMetaTypePrivate__VariantData* self) { - delete self; -} - -void QtMetaTypePrivate__VectorBoolElements_Delete(QtMetaTypePrivate__VectorBoolElements* self) { - delete self; -} - -QtMetaTypePrivate__QSequentialIterableImpl* QtMetaTypePrivate__QSequentialIterableImpl_new() { - return new QtMetaTypePrivate::QSequentialIterableImpl(); -} - -QtMetaTypePrivate__QSequentialIterableImpl* QtMetaTypePrivate__QSequentialIterableImpl_new2(QtMetaTypePrivate__QSequentialIterableImpl* param1) { - return new QtMetaTypePrivate::QSequentialIterableImpl(*param1); -} - -int QtMetaTypePrivate__QSequentialIterableImpl_IteratorCapabilities(QtMetaTypePrivate__QSequentialIterableImpl* self) { - QtMetaTypePrivate::IteratorCapability _ret = self->iteratorCapabilities(); - return static_cast(_ret); -} - -unsigned int QtMetaTypePrivate__QSequentialIterableImpl_Revision(QtMetaTypePrivate__QSequentialIterableImpl* self) { - uint _ret = self->revision(); - return static_cast(_ret); -} - -unsigned int QtMetaTypePrivate__QSequentialIterableImpl_ContainerCapabilities(QtMetaTypePrivate__QSequentialIterableImpl* self) { - uint _ret = self->containerCapabilities(); - return static_cast(_ret); -} - -void QtMetaTypePrivate__QSequentialIterableImpl_MoveToBegin(QtMetaTypePrivate__QSequentialIterableImpl* self) { - self->moveToBegin(); -} - -void QtMetaTypePrivate__QSequentialIterableImpl_MoveToEnd(QtMetaTypePrivate__QSequentialIterableImpl* self) { - self->moveToEnd(); -} - -bool QtMetaTypePrivate__QSequentialIterableImpl_Equal(const QtMetaTypePrivate__QSequentialIterableImpl* self, QtMetaTypePrivate__QSequentialIterableImpl* other) { - 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; -} - -void QtMetaTypePrivate__QSequentialIterableImpl_Append(QtMetaTypePrivate__QSequentialIterableImpl* self, const void* newElement) { - self->append(newElement); -} - -QtMetaTypePrivate__VariantData* QtMetaTypePrivate__QSequentialIterableImpl_GetCurrent(const QtMetaTypePrivate__QSequentialIterableImpl* self) { - return new QtMetaTypePrivate::VariantData(self->getCurrent()); -} - -QtMetaTypePrivate__VariantData* QtMetaTypePrivate__QSequentialIterableImpl_At(const QtMetaTypePrivate__QSequentialIterableImpl* self, int idx) { - return new QtMetaTypePrivate::VariantData(self->at(static_cast(idx))); -} - -int QtMetaTypePrivate__QSequentialIterableImpl_Size(const QtMetaTypePrivate__QSequentialIterableImpl* self) { - return self->size(); -} - -void QtMetaTypePrivate__QSequentialIterableImpl_DestroyIter(QtMetaTypePrivate__QSequentialIterableImpl* self) { - self->destroyIter(); -} - -void QtMetaTypePrivate__QSequentialIterableImpl_Copy(QtMetaTypePrivate__QSequentialIterableImpl* self, QtMetaTypePrivate__QSequentialIterableImpl* other) { - 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; -} - -QtMetaTypePrivate__QAssociativeIterableImpl* QtMetaTypePrivate__QAssociativeIterableImpl_new() { - return new QtMetaTypePrivate::QAssociativeIterableImpl(); -} - -QtMetaTypePrivate__QAssociativeIterableImpl* QtMetaTypePrivate__QAssociativeIterableImpl_new2(QtMetaTypePrivate__QAssociativeIterableImpl* param1) { - return new QtMetaTypePrivate::QAssociativeIterableImpl(*param1); -} - -void QtMetaTypePrivate__QAssociativeIterableImpl_Begin(QtMetaTypePrivate__QAssociativeIterableImpl* self) { - self->begin(); -} - -void QtMetaTypePrivate__QAssociativeIterableImpl_End(QtMetaTypePrivate__QAssociativeIterableImpl* self) { - self->end(); -} - -bool QtMetaTypePrivate__QAssociativeIterableImpl_Equal(const QtMetaTypePrivate__QAssociativeIterableImpl* self, QtMetaTypePrivate__QAssociativeIterableImpl* other) { - 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(); -} - -QtMetaTypePrivate__VariantData* QtMetaTypePrivate__QAssociativeIterableImpl_GetCurrentKey(const QtMetaTypePrivate__QAssociativeIterableImpl* self) { - return new QtMetaTypePrivate::VariantData(self->getCurrentKey()); -} - -QtMetaTypePrivate__VariantData* QtMetaTypePrivate__QAssociativeIterableImpl_GetCurrentValue(const QtMetaTypePrivate__QAssociativeIterableImpl* self) { - return new QtMetaTypePrivate::VariantData(self->getCurrentValue()); -} - -void QtMetaTypePrivate__QAssociativeIterableImpl_Find(QtMetaTypePrivate__QAssociativeIterableImpl* self, QtMetaTypePrivate__VariantData* key) { - self->find(*key); -} - -int QtMetaTypePrivate__QAssociativeIterableImpl_Size(const QtMetaTypePrivate__QAssociativeIterableImpl* self) { - return self->size(); -} - -void QtMetaTypePrivate__QAssociativeIterableImpl_Copy(QtMetaTypePrivate__QAssociativeIterableImpl* self, QtMetaTypePrivate__QAssociativeIterableImpl* other) { - 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; -} - QtMetaTypePrivate__QPairVariantInterfaceImpl* QtMetaTypePrivate__QPairVariantInterfaceImpl_new() { return new QtMetaTypePrivate::QPairVariantInterfaceImpl(); } @@ -356,15 +260,31 @@ QtMetaTypePrivate__QPairVariantInterfaceImpl* QtMetaTypePrivate__QPairVariantInt return new QtMetaTypePrivate::QPairVariantInterfaceImpl(*param1); } -QtMetaTypePrivate__VariantData* QtMetaTypePrivate__QPairVariantInterfaceImpl_First(const QtMetaTypePrivate__QPairVariantInterfaceImpl* self) { - return new QtMetaTypePrivate::VariantData(self->first()); +void QtMetaTypePrivate__QPairVariantInterfaceImpl_First(const QtMetaTypePrivate__QPairVariantInterfaceImpl* self, void* dataPtr) { + self->first(dataPtr); } -QtMetaTypePrivate__VariantData* QtMetaTypePrivate__QPairVariantInterfaceImpl_Second(const QtMetaTypePrivate__QPairVariantInterfaceImpl* self) { - return new QtMetaTypePrivate::VariantData(self->second()); +void QtMetaTypePrivate__QPairVariantInterfaceImpl_Second(const QtMetaTypePrivate__QPairVariantInterfaceImpl* self, void* dataPtr) { + self->second(dataPtr); } void QtMetaTypePrivate__QPairVariantInterfaceImpl_Delete(QtMetaTypePrivate__QPairVariantInterfaceImpl* self) { delete self; } +int QtPrivate__QTypeNormalizer_NormalizeTypeFromSignature(QtPrivate__QTypeNormalizer* self, const char* begin, const char* end) { + return self->normalizeTypeFromSignature(begin, end); +} + +int QtPrivate__QTypeNormalizer_NormalizeType(QtPrivate__QTypeNormalizer* self, const char* begin, const char* end) { + return self->normalizeType(begin, end); +} + +int QtPrivate__QTypeNormalizer_NormalizeType3(QtPrivate__QTypeNormalizer* self, const char* begin, const char* end, bool adjustConst) { + return self->normalizeType(begin, end, adjustConst); +} + +void QtPrivate__QTypeNormalizer_Delete(QtPrivate__QTypeNormalizer* self) { + delete self; +} + diff --git a/qt/gen_qmetatype.go b/qt/gen_qmetatype.go index a883e31..8f74359 100644 --- a/qt/gen_qmetatype.go +++ b/qt/gen_qmetatype.go @@ -13,24 +13,9 @@ import ( "unsafe" ) -type QtMetaTypePrivate__IteratorCapability int - -const ( - QtMetaTypePrivate__ForwardCapability QtMetaTypePrivate__IteratorCapability = 1 - QtMetaTypePrivate__BiDirectionalCapability QtMetaTypePrivate__IteratorCapability = 2 - QtMetaTypePrivate__RandomAccessCapability QtMetaTypePrivate__IteratorCapability = 4 -) - -type QtMetaTypePrivate__ContainerCapability int - -const ( - QtMetaTypePrivate__ContainerIsAppendable QtMetaTypePrivate__ContainerCapability = 1 -) - type QMetaType__Type int const ( - QMetaType__Void QMetaType__Type = 43 QMetaType__Bool QMetaType__Type = 1 QMetaType__Int QMetaType__Type = 2 QMetaType__UInt QMetaType__Type = 3 @@ -40,6 +25,8 @@ const ( QMetaType__Long QMetaType__Type = 32 QMetaType__Short QMetaType__Type = 33 QMetaType__Char QMetaType__Type = 34 + QMetaType__Char16 QMetaType__Type = 56 + QMetaType__Char32 QMetaType__Type = 57 QMetaType__ULong QMetaType__Type = 35 QMetaType__UShort QMetaType__Type = 36 QMetaType__UChar QMetaType__Type = 37 @@ -47,10 +34,10 @@ const ( QMetaType__SChar QMetaType__Type = 40 QMetaType__Nullptr QMetaType__Type = 51 QMetaType__QCborSimpleType QMetaType__Type = 52 + QMetaType__Void QMetaType__Type = 43 QMetaType__VoidStar QMetaType__Type = 31 QMetaType__QChar QMetaType__Type = 7 QMetaType__QString QMetaType__Type = 10 - QMetaType__QStringList QMetaType__Type = 11 QMetaType__QByteArray QMetaType__Type = 12 QMetaType__QBitArray QMetaType__Type = 13 QMetaType__QDate QMetaType__Type = 14 @@ -66,7 +53,6 @@ const ( QMetaType__QLineF QMetaType__Type = 24 QMetaType__QPoint QMetaType__Type = 25 QMetaType__QPointF QMetaType__Type = 26 - QMetaType__QRegExp QMetaType__Type = 27 QMetaType__QEasingCurve QMetaType__Type = 29 QMetaType__QUuid QMetaType__Type = 30 QMetaType__QVariant QMetaType__Type = 41 @@ -84,42 +70,43 @@ const ( QMetaType__QVariantMap QMetaType__Type = 8 QMetaType__QVariantList QMetaType__Type = 9 QMetaType__QVariantHash QMetaType__Type = 28 + QMetaType__QVariantPair QMetaType__Type = 58 QMetaType__QByteArrayList QMetaType__Type = 49 - QMetaType__QFont QMetaType__Type = 64 - QMetaType__QPixmap QMetaType__Type = 65 - QMetaType__QBrush QMetaType__Type = 66 - QMetaType__QColor QMetaType__Type = 67 - QMetaType__QPalette QMetaType__Type = 68 - QMetaType__QIcon QMetaType__Type = 69 - QMetaType__QImage QMetaType__Type = 70 - QMetaType__QPolygon QMetaType__Type = 71 - QMetaType__QRegion QMetaType__Type = 72 - QMetaType__QBitmap QMetaType__Type = 73 - QMetaType__QCursor QMetaType__Type = 74 - QMetaType__QKeySequence QMetaType__Type = 75 - QMetaType__QPen QMetaType__Type = 76 - QMetaType__QTextLength QMetaType__Type = 77 - QMetaType__QTextFormat QMetaType__Type = 78 - QMetaType__QMatrix QMetaType__Type = 79 - QMetaType__QTransform QMetaType__Type = 80 - QMetaType__QMatrix4x4 QMetaType__Type = 81 - QMetaType__QVector2D QMetaType__Type = 82 - QMetaType__QVector3D QMetaType__Type = 83 - QMetaType__QVector4D QMetaType__Type = 84 - QMetaType__QQuaternion QMetaType__Type = 85 - QMetaType__QPolygonF QMetaType__Type = 86 - QMetaType__QColorSpace QMetaType__Type = 87 - QMetaType__QSizePolicy QMetaType__Type = 121 + QMetaType__QStringList QMetaType__Type = 11 + QMetaType__QFont QMetaType__Type = 4096 + QMetaType__QPixmap QMetaType__Type = 4097 + QMetaType__QBrush QMetaType__Type = 4098 + QMetaType__QColor QMetaType__Type = 4099 + QMetaType__QPalette QMetaType__Type = 4100 + QMetaType__QIcon QMetaType__Type = 4101 + QMetaType__QImage QMetaType__Type = 4102 + QMetaType__QPolygon QMetaType__Type = 4103 + QMetaType__QRegion QMetaType__Type = 4104 + QMetaType__QBitmap QMetaType__Type = 4105 + QMetaType__QCursor QMetaType__Type = 4106 + QMetaType__QKeySequence QMetaType__Type = 4107 + QMetaType__QPen QMetaType__Type = 4108 + QMetaType__QTextLength QMetaType__Type = 4109 + QMetaType__QTextFormat QMetaType__Type = 4110 + QMetaType__QTransform QMetaType__Type = 4112 + QMetaType__QMatrix4x4 QMetaType__Type = 4113 + QMetaType__QVector2D QMetaType__Type = 4114 + QMetaType__QVector3D QMetaType__Type = 4115 + QMetaType__QVector4D QMetaType__Type = 4116 + QMetaType__QQuaternion QMetaType__Type = 4117 + QMetaType__QPolygonF QMetaType__Type = 4118 + QMetaType__QColorSpace QMetaType__Type = 4119 + QMetaType__QSizePolicy QMetaType__Type = 8192 QMetaType__FirstCoreType QMetaType__Type = 1 - QMetaType__LastCoreType QMetaType__Type = 55 - QMetaType__FirstGuiType QMetaType__Type = 64 - QMetaType__LastGuiType QMetaType__Type = 87 - QMetaType__FirstWidgetsType QMetaType__Type = 121 - QMetaType__LastWidgetsType QMetaType__Type = 121 - QMetaType__HighestInternalId QMetaType__Type = 121 + QMetaType__LastCoreType QMetaType__Type = 58 + QMetaType__FirstGuiType QMetaType__Type = 4096 + QMetaType__LastGuiType QMetaType__Type = 4119 + QMetaType__FirstWidgetsType QMetaType__Type = 8192 + QMetaType__LastWidgetsType QMetaType__Type = 8192 + QMetaType__HighestInternalId QMetaType__Type = 8192 QMetaType__QReal QMetaType__Type = 6 QMetaType__UnknownType QMetaType__Type = 0 - QMetaType__User QMetaType__Type = 1024 + QMetaType__User QMetaType__Type = 65536 ) type QMetaType__TypeFlag int @@ -127,145 +114,52 @@ type QMetaType__TypeFlag int const ( QMetaType__NeedsConstruction QMetaType__TypeFlag = 1 QMetaType__NeedsDestruction QMetaType__TypeFlag = 2 + QMetaType__RelocatableType QMetaType__TypeFlag = 4 QMetaType__MovableType QMetaType__TypeFlag = 4 QMetaType__PointerToQObject QMetaType__TypeFlag = 8 QMetaType__IsEnumeration QMetaType__TypeFlag = 16 QMetaType__SharedPointerToQObject QMetaType__TypeFlag = 32 QMetaType__WeakPointerToQObject QMetaType__TypeFlag = 64 QMetaType__TrackingPointerToQObject QMetaType__TypeFlag = 128 - QMetaType__WasDeclaredAsMetaType QMetaType__TypeFlag = 256 + QMetaType__IsUnsignedEnumeration QMetaType__TypeFlag = 256 QMetaType__IsGadget QMetaType__TypeFlag = 512 QMetaType__PointerToGadget QMetaType__TypeFlag = 1024 + QMetaType__IsPointer QMetaType__TypeFlag = 2048 + QMetaType__IsQmlList QMetaType__TypeFlag = 4096 + QMetaType__IsConst QMetaType__TypeFlag = 8192 ) -type QtMetaTypePrivate__QSequentialIterableImpl__Position int - -const ( - QtMetaTypePrivate__QSequentialIterableImpl__ToBegin QtMetaTypePrivate__QSequentialIterableImpl__Position = 0 - QtMetaTypePrivate__QSequentialIterableImpl__ToEnd QtMetaTypePrivate__QSequentialIterableImpl__Position = 1 -) - -type QtPrivate__AbstractDebugStreamFunction struct { - h *C.QtPrivate__AbstractDebugStreamFunction +type QtPrivate__QMetaTypeInterface struct { + h *C.QtPrivate__QMetaTypeInterface } -func (this *QtPrivate__AbstractDebugStreamFunction) cPointer() *C.QtPrivate__AbstractDebugStreamFunction { +func (this *QtPrivate__QMetaTypeInterface) cPointer() *C.QtPrivate__QMetaTypeInterface { if this == nil { return nil } return this.h } -func newQtPrivate__AbstractDebugStreamFunction(h *C.QtPrivate__AbstractDebugStreamFunction) *QtPrivate__AbstractDebugStreamFunction { +func newQtPrivate__QMetaTypeInterface(h *C.QtPrivate__QMetaTypeInterface) *QtPrivate__QMetaTypeInterface { if h == nil { return nil } - return &QtPrivate__AbstractDebugStreamFunction{h: h} + return &QtPrivate__QMetaTypeInterface{h: h} } -func newQtPrivate__AbstractDebugStreamFunction_U(h unsafe.Pointer) *QtPrivate__AbstractDebugStreamFunction { - return newQtPrivate__AbstractDebugStreamFunction((*C.QtPrivate__AbstractDebugStreamFunction)(h)) -} - -// NewQtPrivate__AbstractDebugStreamFunction constructs a new QtPrivate::AbstractDebugStreamFunction object. -func NewQtPrivate__AbstractDebugStreamFunction() *QtPrivate__AbstractDebugStreamFunction { - ret := C.QtPrivate__AbstractDebugStreamFunction_new() - return newQtPrivate__AbstractDebugStreamFunction(ret) +func newQtPrivate__QMetaTypeInterface_U(h unsafe.Pointer) *QtPrivate__QMetaTypeInterface { + return newQtPrivate__QMetaTypeInterface((*C.QtPrivate__QMetaTypeInterface)(h)) } // Delete this object from C++ memory. -func (this *QtPrivate__AbstractDebugStreamFunction) Delete() { - C.QtPrivate__AbstractDebugStreamFunction_Delete(this.h) +func (this *QtPrivate__QMetaTypeInterface) Delete() { + C.QtPrivate__QMetaTypeInterface_Delete(this.h) } // GoGC adds a Go Finalizer to this pointer, so that it will be deleted // from C++ memory once it is unreachable from Go memory. -func (this *QtPrivate__AbstractDebugStreamFunction) GoGC() { - runtime.SetFinalizer(this, func(this *QtPrivate__AbstractDebugStreamFunction) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} - -type QtPrivate__AbstractComparatorFunction struct { - h *C.QtPrivate__AbstractComparatorFunction -} - -func (this *QtPrivate__AbstractComparatorFunction) cPointer() *C.QtPrivate__AbstractComparatorFunction { - if this == nil { - return nil - } - return this.h -} - -func newQtPrivate__AbstractComparatorFunction(h *C.QtPrivate__AbstractComparatorFunction) *QtPrivate__AbstractComparatorFunction { - if h == nil { - return nil - } - return &QtPrivate__AbstractComparatorFunction{h: h} -} - -func newQtPrivate__AbstractComparatorFunction_U(h unsafe.Pointer) *QtPrivate__AbstractComparatorFunction { - return newQtPrivate__AbstractComparatorFunction((*C.QtPrivate__AbstractComparatorFunction)(h)) -} - -// NewQtPrivate__AbstractComparatorFunction constructs a new QtPrivate::AbstractComparatorFunction object. -func NewQtPrivate__AbstractComparatorFunction() *QtPrivate__AbstractComparatorFunction { - ret := C.QtPrivate__AbstractComparatorFunction_new() - return newQtPrivate__AbstractComparatorFunction(ret) -} - -// Delete this object from C++ memory. -func (this *QtPrivate__AbstractComparatorFunction) Delete() { - C.QtPrivate__AbstractComparatorFunction_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QtPrivate__AbstractComparatorFunction) GoGC() { - runtime.SetFinalizer(this, func(this *QtPrivate__AbstractComparatorFunction) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} - -type QtPrivate__AbstractConverterFunction struct { - h *C.QtPrivate__AbstractConverterFunction -} - -func (this *QtPrivate__AbstractConverterFunction) cPointer() *C.QtPrivate__AbstractConverterFunction { - if this == nil { - return nil - } - return this.h -} - -func newQtPrivate__AbstractConverterFunction(h *C.QtPrivate__AbstractConverterFunction) *QtPrivate__AbstractConverterFunction { - if h == nil { - return nil - } - return &QtPrivate__AbstractConverterFunction{h: h} -} - -func newQtPrivate__AbstractConverterFunction_U(h unsafe.Pointer) *QtPrivate__AbstractConverterFunction { - return newQtPrivate__AbstractConverterFunction((*C.QtPrivate__AbstractConverterFunction)(h)) -} - -// NewQtPrivate__AbstractConverterFunction constructs a new QtPrivate::AbstractConverterFunction object. -func NewQtPrivate__AbstractConverterFunction() *QtPrivate__AbstractConverterFunction { - ret := C.QtPrivate__AbstractConverterFunction_new() - return newQtPrivate__AbstractConverterFunction(ret) -} - -// Delete this object from C++ memory. -func (this *QtPrivate__AbstractConverterFunction) Delete() { - C.QtPrivate__AbstractConverterFunction_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QtPrivate__AbstractConverterFunction) GoGC() { - runtime.SetFinalizer(this, func(this *QtPrivate__AbstractConverterFunction) { +func (this *QtPrivate__QMetaTypeInterface) GoGC() { + runtime.SetFinalizer(this, func(this *QtPrivate__QMetaTypeInterface) { this.Delete() runtime.KeepAlive(this.h) }) @@ -294,29 +188,25 @@ func newQMetaType_U(h unsafe.Pointer) *QMetaType { } // NewQMetaType constructs a new QMetaType object. -func NewQMetaType() *QMetaType { - ret := C.QMetaType_new() +func NewQMetaType(typeVal int) *QMetaType { + ret := C.QMetaType_new((C.int)(typeVal)) return newQMetaType(ret) } // NewQMetaType2 constructs a new QMetaType object. -func NewQMetaType2(typeVal int) *QMetaType { - ret := C.QMetaType_new2((C.int)(typeVal)) +func NewQMetaType2() *QMetaType { + ret := C.QMetaType_new2() return newQMetaType(ret) } -func QMetaType_UnregisterType(typeVal int) bool { - return (bool)(C.QMetaType_UnregisterType((C.int)(typeVal))) +// NewQMetaType3 constructs a new QMetaType object. +func NewQMetaType3(param1 *QMetaType) *QMetaType { + ret := C.QMetaType_new3(param1.cPointer()) + return newQMetaType(ret) } -func QMetaType_RegisterTypedef(typeName string, aliasId int) int { - typeName_Cstring := C.CString(typeName) - defer C.free(unsafe.Pointer(typeName_Cstring)) - return (int)(C.QMetaType_RegisterTypedef(typeName_Cstring, (C.int)(aliasId))) -} - -func QMetaType_RegisterNormalizedTypedef(normalizedTypeName *QByteArray, aliasId int) int { - return (int)(C.QMetaType_RegisterNormalizedTypedef(normalizedTypeName.cPointer(), (C.int)(aliasId))) +func QMetaType_RegisterNormalizedTypedef(normalizedTypeName *QByteArray, typeVal QMetaType) { + C.QMetaType_RegisterNormalizedTypedef(normalizedTypeName.cPointer(), typeVal.cPointer()) } func QMetaType_Type(typeName string) int { @@ -346,10 +236,6 @@ func QMetaType_MetaObjectForType(typeVal int) *QMetaObject { return newQMetaObject_U(unsafe.Pointer(C.QMetaType_MetaObjectForType((C.int)(typeVal)))) } -func QMetaType_IsRegistered(typeVal int) bool { - return (bool)(C.QMetaType_IsRegistered((C.int)(typeVal))) -} - func QMetaType_Create(typeVal int) unsafe.Pointer { return C.QMetaType_Create((C.int)(typeVal)) } @@ -366,12 +252,8 @@ func QMetaType_Destruct(typeVal int, where unsafe.Pointer) { C.QMetaType_Destruct((C.int)(typeVal), where) } -func QMetaType_Save(stream *QDataStream, typeVal int, data unsafe.Pointer) bool { - return (bool)(C.QMetaType_Save(stream.cPointer(), (C.int)(typeVal), data)) -} - -func QMetaType_Load(stream *QDataStream, typeVal int, data unsafe.Pointer) bool { - return (bool)(C.QMetaType_Load(stream.cPointer(), (C.int)(typeVal), data)) +func QMetaType_IsRegistered(typeVal int) bool { + return (bool)(C.QMetaType_IsRegistered((C.int)(typeVal))) } func (this *QMetaType) IsValid() bool { @@ -386,8 +268,12 @@ func (this *QMetaType) Id() int { return (int)(C.QMetaType_Id(this.h)) } -func (this *QMetaType) SizeOf2() int { - return (int)(C.QMetaType_SizeOf2(this.h)) +func (this *QMetaType) SizeOf2() int64 { + return (int64)(C.QMetaType_SizeOf2(this.h)) +} + +func (this *QMetaType) AlignOf() int64 { + return (int64)(C.QMetaType_AlignOf(this.h)) } func (this *QMetaType) Flags() QMetaType__TypeFlag { @@ -398,11 +284,9 @@ func (this *QMetaType) MetaObject() *QMetaObject { return newQMetaObject_U(unsafe.Pointer(C.QMetaType_MetaObject(this.h))) } -func (this *QMetaType) Name() *QByteArray { +func (this *QMetaType) Name() unsafe.Pointer { _ret := C.QMetaType_Name(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr + return (unsafe.Pointer)(_ret) } func (this *QMetaType) Create2() unsafe.Pointer { @@ -421,38 +305,124 @@ func (this *QMetaType) DestructWithData(data unsafe.Pointer) { C.QMetaType_DestructWithData(this.h, data) } -func QMetaType_HasRegisteredComparators(typeId int) bool { - return (bool)(C.QMetaType_HasRegisteredComparators((C.int)(typeId))) +func (this *QMetaType) Compare(lhs unsafe.Pointer, rhs unsafe.Pointer) *QPartialOrdering { + _ret := C.QMetaType_Compare(this.h, lhs, rhs) + _goptr := newQPartialOrdering(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr } -func QMetaType_HasRegisteredDebugStreamOperator(typeId int) bool { - return (bool)(C.QMetaType_HasRegisteredDebugStreamOperator((C.int)(typeId))) +func (this *QMetaType) Equals(lhs unsafe.Pointer, rhs unsafe.Pointer) bool { + return (bool)(C.QMetaType_Equals(this.h, lhs, rhs)) } -func QMetaType_Convert(from unsafe.Pointer, fromTypeId int, to unsafe.Pointer, toTypeId int) bool { - return (bool)(C.QMetaType_Convert(from, (C.int)(fromTypeId), to, (C.int)(toTypeId))) +func (this *QMetaType) IsEqualityComparable() bool { + return (bool)(C.QMetaType_IsEqualityComparable(this.h)) } -func QMetaType_Compare(lhs unsafe.Pointer, rhs unsafe.Pointer, typeId int, result *int) bool { - return (bool)(C.QMetaType_Compare(lhs, rhs, (C.int)(typeId), (*C.int)(unsafe.Pointer(result)))) +func (this *QMetaType) IsOrdered() bool { + return (bool)(C.QMetaType_IsOrdered(this.h)) } -func QMetaType_Equals(lhs unsafe.Pointer, rhs unsafe.Pointer, typeId int, result *int) bool { - return (bool)(C.QMetaType_Equals(lhs, rhs, (C.int)(typeId), (*C.int)(unsafe.Pointer(result)))) +func (this *QMetaType) Save(stream *QDataStream, data unsafe.Pointer) bool { + return (bool)(C.QMetaType_Save(this.h, stream.cPointer(), data)) } -func QMetaType_DebugStream(dbg *QDebug, rhs unsafe.Pointer, typeId int) bool { - return (bool)(C.QMetaType_DebugStream(dbg.cPointer(), rhs, (C.int)(typeId))) +func (this *QMetaType) Load(stream *QDataStream, data unsafe.Pointer) bool { + return (bool)(C.QMetaType_Load(this.h, stream.cPointer(), data)) } -func QMetaType_HasRegisteredConverterFunction(fromTypeId int, toTypeId int) bool { - return (bool)(C.QMetaType_HasRegisteredConverterFunction((C.int)(fromTypeId), (C.int)(toTypeId))) +func (this *QMetaType) HasRegisteredDataStreamOperators() bool { + return (bool)(C.QMetaType_HasRegisteredDataStreamOperators(this.h)) +} + +func QMetaType_Save2(stream *QDataStream, typeVal int, data unsafe.Pointer) bool { + return (bool)(C.QMetaType_Save2(stream.cPointer(), (C.int)(typeVal), data)) +} + +func QMetaType_Load2(stream *QDataStream, typeVal int, data unsafe.Pointer) bool { + return (bool)(C.QMetaType_Load2(stream.cPointer(), (C.int)(typeVal), data)) +} + +func QMetaType_FromName(name QByteArrayView) *QMetaType { + _ret := C.QMetaType_FromName(name.cPointer()) + _goptr := newQMetaType(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QMetaType) DebugStream(dbg *QDebug, rhs unsafe.Pointer) bool { + return (bool)(C.QMetaType_DebugStream(this.h, dbg.cPointer(), rhs)) +} + +func (this *QMetaType) HasRegisteredDebugStreamOperator() bool { + return (bool)(C.QMetaType_HasRegisteredDebugStreamOperator(this.h)) +} + +func QMetaType_DebugStream2(dbg *QDebug, rhs unsafe.Pointer, typeId int) bool { + return (bool)(C.QMetaType_DebugStream2(dbg.cPointer(), rhs, (C.int)(typeId))) +} + +func QMetaType_HasRegisteredDebugStreamOperatorWithTypeId(typeId int) bool { + return (bool)(C.QMetaType_HasRegisteredDebugStreamOperatorWithTypeId((C.int)(typeId))) +} + +func QMetaType_Convert(fromType QMetaType, from unsafe.Pointer, toType QMetaType, to unsafe.Pointer) bool { + return (bool)(C.QMetaType_Convert(fromType.cPointer(), from, toType.cPointer(), to)) +} + +func QMetaType_CanConvert(fromType QMetaType, toType QMetaType) bool { + return (bool)(C.QMetaType_CanConvert(fromType.cPointer(), toType.cPointer())) +} + +func QMetaType_View(fromType QMetaType, from unsafe.Pointer, toType QMetaType, to unsafe.Pointer) bool { + return (bool)(C.QMetaType_View(fromType.cPointer(), from, toType.cPointer(), to)) +} + +func QMetaType_CanView(fromType QMetaType, toType QMetaType) bool { + return (bool)(C.QMetaType_CanView(fromType.cPointer(), toType.cPointer())) +} + +func QMetaType_Convert2(from unsafe.Pointer, fromTypeId int, to unsafe.Pointer, toTypeId int) bool { + return (bool)(C.QMetaType_Convert2(from, (C.int)(fromTypeId), to, (C.int)(toTypeId))) +} + +func QMetaType_Compare2(lhs unsafe.Pointer, rhs unsafe.Pointer, typeId int, result *int) bool { + return (bool)(C.QMetaType_Compare2(lhs, rhs, (C.int)(typeId), (*C.int)(unsafe.Pointer(result)))) +} + +func QMetaType_Equals2(lhs unsafe.Pointer, rhs unsafe.Pointer, typeId int, result *int) bool { + return (bool)(C.QMetaType_Equals2(lhs, rhs, (C.int)(typeId), (*C.int)(unsafe.Pointer(result)))) +} + +func QMetaType_HasRegisteredConverterFunction(fromType QMetaType, toType QMetaType) bool { + return (bool)(C.QMetaType_HasRegisteredConverterFunction(fromType.cPointer(), toType.cPointer())) +} + +func QMetaType_HasRegisteredMutableViewFunction(fromType QMetaType, toType QMetaType) bool { + return (bool)(C.QMetaType_HasRegisteredMutableViewFunction(fromType.cPointer(), toType.cPointer())) +} + +func QMetaType_UnregisterConverterFunction(from QMetaType, to QMetaType) { + C.QMetaType_UnregisterConverterFunction(from.cPointer(), to.cPointer()) +} + +func QMetaType_UnregisterMutableViewFunction(from QMetaType, to QMetaType) { + C.QMetaType_UnregisterMutableViewFunction(from.cPointer(), to.cPointer()) +} + +func QMetaType_UnregisterMetaType(typeVal QMetaType) { + C.QMetaType_UnregisterMetaType(typeVal.cPointer()) } func QMetaType_Create22(typeVal int, copyVal unsafe.Pointer) unsafe.Pointer { return C.QMetaType_Create22((C.int)(typeVal), copyVal) } +func (this *QMetaType) Id1(param1 int) int { + return (int)(C.QMetaType_Id1(this.h, (C.int)(param1))) +} + func (this *QMetaType) Create1(copyVal unsafe.Pointer) unsafe.Pointer { return C.QMetaType_Create1(this.h, copyVal) } @@ -475,298 +445,6 @@ func (this *QMetaType) GoGC() { }) } -type QtMetaTypePrivate__VariantData struct { - h *C.QtMetaTypePrivate__VariantData -} - -func (this *QtMetaTypePrivate__VariantData) cPointer() *C.QtMetaTypePrivate__VariantData { - if this == nil { - return nil - } - return this.h -} - -func newQtMetaTypePrivate__VariantData(h *C.QtMetaTypePrivate__VariantData) *QtMetaTypePrivate__VariantData { - if h == nil { - return nil - } - return &QtMetaTypePrivate__VariantData{h: h} -} - -func newQtMetaTypePrivate__VariantData_U(h unsafe.Pointer) *QtMetaTypePrivate__VariantData { - return newQtMetaTypePrivate__VariantData((*C.QtMetaTypePrivate__VariantData)(h)) -} - -// NewQtMetaTypePrivate__VariantData constructs a new QtMetaTypePrivate::VariantData object. -func NewQtMetaTypePrivate__VariantData(metaTypeId_ int, data_ unsafe.Pointer, flags_ uint) *QtMetaTypePrivate__VariantData { - ret := C.QtMetaTypePrivate__VariantData_new((C.int)(metaTypeId_), data_, (C.uint)(flags_)) - return newQtMetaTypePrivate__VariantData(ret) -} - -// NewQtMetaTypePrivate__VariantData2 constructs a new QtMetaTypePrivate::VariantData object. -func NewQtMetaTypePrivate__VariantData2(other *QtMetaTypePrivate__VariantData) *QtMetaTypePrivate__VariantData { - ret := C.QtMetaTypePrivate__VariantData_new2(other.cPointer()) - return newQtMetaTypePrivate__VariantData(ret) -} - -// Delete this object from C++ memory. -func (this *QtMetaTypePrivate__VariantData) Delete() { - C.QtMetaTypePrivate__VariantData_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QtMetaTypePrivate__VariantData) GoGC() { - runtime.SetFinalizer(this, func(this *QtMetaTypePrivate__VariantData) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} - -type QtMetaTypePrivate__VectorBoolElements struct { - h *C.QtMetaTypePrivate__VectorBoolElements -} - -func (this *QtMetaTypePrivate__VectorBoolElements) cPointer() *C.QtMetaTypePrivate__VectorBoolElements { - if this == nil { - return nil - } - return this.h -} - -func newQtMetaTypePrivate__VectorBoolElements(h *C.QtMetaTypePrivate__VectorBoolElements) *QtMetaTypePrivate__VectorBoolElements { - if h == nil { - return nil - } - return &QtMetaTypePrivate__VectorBoolElements{h: h} -} - -func newQtMetaTypePrivate__VectorBoolElements_U(h unsafe.Pointer) *QtMetaTypePrivate__VectorBoolElements { - return newQtMetaTypePrivate__VectorBoolElements((*C.QtMetaTypePrivate__VectorBoolElements)(h)) -} - -// Delete this object from C++ memory. -func (this *QtMetaTypePrivate__VectorBoolElements) Delete() { - C.QtMetaTypePrivate__VectorBoolElements_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QtMetaTypePrivate__VectorBoolElements) GoGC() { - runtime.SetFinalizer(this, func(this *QtMetaTypePrivate__VectorBoolElements) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} - -type QtMetaTypePrivate__QSequentialIterableImpl struct { - h *C.QtMetaTypePrivate__QSequentialIterableImpl -} - -func (this *QtMetaTypePrivate__QSequentialIterableImpl) cPointer() *C.QtMetaTypePrivate__QSequentialIterableImpl { - if this == nil { - return nil - } - return this.h -} - -func newQtMetaTypePrivate__QSequentialIterableImpl(h *C.QtMetaTypePrivate__QSequentialIterableImpl) *QtMetaTypePrivate__QSequentialIterableImpl { - if h == nil { - return nil - } - return &QtMetaTypePrivate__QSequentialIterableImpl{h: h} -} - -func newQtMetaTypePrivate__QSequentialIterableImpl_U(h unsafe.Pointer) *QtMetaTypePrivate__QSequentialIterableImpl { - return newQtMetaTypePrivate__QSequentialIterableImpl((*C.QtMetaTypePrivate__QSequentialIterableImpl)(h)) -} - -// NewQtMetaTypePrivate__QSequentialIterableImpl constructs a new QtMetaTypePrivate::QSequentialIterableImpl object. -func NewQtMetaTypePrivate__QSequentialIterableImpl() *QtMetaTypePrivate__QSequentialIterableImpl { - ret := C.QtMetaTypePrivate__QSequentialIterableImpl_new() - return newQtMetaTypePrivate__QSequentialIterableImpl(ret) -} - -// NewQtMetaTypePrivate__QSequentialIterableImpl2 constructs a new QtMetaTypePrivate::QSequentialIterableImpl object. -func NewQtMetaTypePrivate__QSequentialIterableImpl2(param1 *QtMetaTypePrivate__QSequentialIterableImpl) *QtMetaTypePrivate__QSequentialIterableImpl { - ret := C.QtMetaTypePrivate__QSequentialIterableImpl_new2(param1.cPointer()) - return newQtMetaTypePrivate__QSequentialIterableImpl(ret) -} - -func (this *QtMetaTypePrivate__QSequentialIterableImpl) IteratorCapabilities() QtMetaTypePrivate__IteratorCapability { - return (QtMetaTypePrivate__IteratorCapability)(C.QtMetaTypePrivate__QSequentialIterableImpl_IteratorCapabilities(this.h)) -} - -func (this *QtMetaTypePrivate__QSequentialIterableImpl) Revision() uint { - return (uint)(C.QtMetaTypePrivate__QSequentialIterableImpl_Revision(this.h)) -} - -func (this *QtMetaTypePrivate__QSequentialIterableImpl) ContainerCapabilities() uint { - return (uint)(C.QtMetaTypePrivate__QSequentialIterableImpl_ContainerCapabilities(this.h)) -} - -func (this *QtMetaTypePrivate__QSequentialIterableImpl) MoveToBegin() { - C.QtMetaTypePrivate__QSequentialIterableImpl_MoveToBegin(this.h) -} - -func (this *QtMetaTypePrivate__QSequentialIterableImpl) MoveToEnd() { - C.QtMetaTypePrivate__QSequentialIterableImpl_MoveToEnd(this.h) -} - -func (this *QtMetaTypePrivate__QSequentialIterableImpl) Equal(other *QtMetaTypePrivate__QSequentialIterableImpl) bool { - 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) Append(newElement unsafe.Pointer) { - C.QtMetaTypePrivate__QSequentialIterableImpl_Append(this.h, newElement) -} - -func (this *QtMetaTypePrivate__QSequentialIterableImpl) GetCurrent() *QtMetaTypePrivate__VariantData { - _ret := C.QtMetaTypePrivate__QSequentialIterableImpl_GetCurrent(this.h) - _goptr := newQtMetaTypePrivate__VariantData(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QtMetaTypePrivate__QSequentialIterableImpl) At(idx int) *QtMetaTypePrivate__VariantData { - _ret := C.QtMetaTypePrivate__QSequentialIterableImpl_At(this.h, (C.int)(idx)) - _goptr := newQtMetaTypePrivate__VariantData(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QtMetaTypePrivate__QSequentialIterableImpl) Size() int { - return (int)(C.QtMetaTypePrivate__QSequentialIterableImpl_Size(this.h)) -} - -func (this *QtMetaTypePrivate__QSequentialIterableImpl) DestroyIter() { - C.QtMetaTypePrivate__QSequentialIterableImpl_DestroyIter(this.h) -} - -func (this *QtMetaTypePrivate__QSequentialIterableImpl) Copy(other *QtMetaTypePrivate__QSequentialIterableImpl) { - 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) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QtMetaTypePrivate__QSequentialIterableImpl) GoGC() { - runtime.SetFinalizer(this, func(this *QtMetaTypePrivate__QSequentialIterableImpl) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} - -type QtMetaTypePrivate__QAssociativeIterableImpl struct { - h *C.QtMetaTypePrivate__QAssociativeIterableImpl -} - -func (this *QtMetaTypePrivate__QAssociativeIterableImpl) cPointer() *C.QtMetaTypePrivate__QAssociativeIterableImpl { - if this == nil { - return nil - } - return this.h -} - -func newQtMetaTypePrivate__QAssociativeIterableImpl(h *C.QtMetaTypePrivate__QAssociativeIterableImpl) *QtMetaTypePrivate__QAssociativeIterableImpl { - if h == nil { - return nil - } - return &QtMetaTypePrivate__QAssociativeIterableImpl{h: h} -} - -func newQtMetaTypePrivate__QAssociativeIterableImpl_U(h unsafe.Pointer) *QtMetaTypePrivate__QAssociativeIterableImpl { - return newQtMetaTypePrivate__QAssociativeIterableImpl((*C.QtMetaTypePrivate__QAssociativeIterableImpl)(h)) -} - -// NewQtMetaTypePrivate__QAssociativeIterableImpl constructs a new QtMetaTypePrivate::QAssociativeIterableImpl object. -func NewQtMetaTypePrivate__QAssociativeIterableImpl() *QtMetaTypePrivate__QAssociativeIterableImpl { - ret := C.QtMetaTypePrivate__QAssociativeIterableImpl_new() - return newQtMetaTypePrivate__QAssociativeIterableImpl(ret) -} - -// NewQtMetaTypePrivate__QAssociativeIterableImpl2 constructs a new QtMetaTypePrivate::QAssociativeIterableImpl object. -func NewQtMetaTypePrivate__QAssociativeIterableImpl2(param1 *QtMetaTypePrivate__QAssociativeIterableImpl) *QtMetaTypePrivate__QAssociativeIterableImpl { - ret := C.QtMetaTypePrivate__QAssociativeIterableImpl_new2(param1.cPointer()) - return newQtMetaTypePrivate__QAssociativeIterableImpl(ret) -} - -func (this *QtMetaTypePrivate__QAssociativeIterableImpl) Begin() { - C.QtMetaTypePrivate__QAssociativeIterableImpl_Begin(this.h) -} - -func (this *QtMetaTypePrivate__QAssociativeIterableImpl) End() { - C.QtMetaTypePrivate__QAssociativeIterableImpl_End(this.h) -} - -func (this *QtMetaTypePrivate__QAssociativeIterableImpl) Equal(other *QtMetaTypePrivate__QAssociativeIterableImpl) bool { - 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) -} - -func (this *QtMetaTypePrivate__QAssociativeIterableImpl) GetCurrentKey() *QtMetaTypePrivate__VariantData { - _ret := C.QtMetaTypePrivate__QAssociativeIterableImpl_GetCurrentKey(this.h) - _goptr := newQtMetaTypePrivate__VariantData(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QtMetaTypePrivate__QAssociativeIterableImpl) GetCurrentValue() *QtMetaTypePrivate__VariantData { - _ret := C.QtMetaTypePrivate__QAssociativeIterableImpl_GetCurrentValue(this.h) - _goptr := newQtMetaTypePrivate__VariantData(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QtMetaTypePrivate__QAssociativeIterableImpl) Find(key *QtMetaTypePrivate__VariantData) { - C.QtMetaTypePrivate__QAssociativeIterableImpl_Find(this.h, key.cPointer()) -} - -func (this *QtMetaTypePrivate__QAssociativeIterableImpl) Size() int { - return (int)(C.QtMetaTypePrivate__QAssociativeIterableImpl_Size(this.h)) -} - -func (this *QtMetaTypePrivate__QAssociativeIterableImpl) Copy(other *QtMetaTypePrivate__QAssociativeIterableImpl) { - 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) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QtMetaTypePrivate__QAssociativeIterableImpl) GoGC() { - runtime.SetFinalizer(this, func(this *QtMetaTypePrivate__QAssociativeIterableImpl) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} - type QtMetaTypePrivate__QPairVariantInterfaceImpl struct { h *C.QtMetaTypePrivate__QPairVariantInterfaceImpl } @@ -801,18 +479,12 @@ func NewQtMetaTypePrivate__QPairVariantInterfaceImpl2(param1 *QtMetaTypePrivate_ return newQtMetaTypePrivate__QPairVariantInterfaceImpl(ret) } -func (this *QtMetaTypePrivate__QPairVariantInterfaceImpl) First() *QtMetaTypePrivate__VariantData { - _ret := C.QtMetaTypePrivate__QPairVariantInterfaceImpl_First(this.h) - _goptr := newQtMetaTypePrivate__VariantData(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QtMetaTypePrivate__QPairVariantInterfaceImpl) First(dataPtr unsafe.Pointer) { + C.QtMetaTypePrivate__QPairVariantInterfaceImpl_First(this.h, dataPtr) } -func (this *QtMetaTypePrivate__QPairVariantInterfaceImpl) Second() *QtMetaTypePrivate__VariantData { - _ret := C.QtMetaTypePrivate__QPairVariantInterfaceImpl_Second(this.h) - _goptr := newQtMetaTypePrivate__VariantData(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QtMetaTypePrivate__QPairVariantInterfaceImpl) Second(dataPtr unsafe.Pointer) { + C.QtMetaTypePrivate__QPairVariantInterfaceImpl_Second(this.h, dataPtr) } // Delete this object from C++ memory. @@ -828,3 +500,63 @@ func (this *QtMetaTypePrivate__QPairVariantInterfaceImpl) GoGC() { runtime.KeepAlive(this.h) }) } + +type QtPrivate__QTypeNormalizer struct { + h *C.QtPrivate__QTypeNormalizer +} + +func (this *QtPrivate__QTypeNormalizer) cPointer() *C.QtPrivate__QTypeNormalizer { + if this == nil { + return nil + } + return this.h +} + +func newQtPrivate__QTypeNormalizer(h *C.QtPrivate__QTypeNormalizer) *QtPrivate__QTypeNormalizer { + if h == nil { + return nil + } + return &QtPrivate__QTypeNormalizer{h: h} +} + +func newQtPrivate__QTypeNormalizer_U(h unsafe.Pointer) *QtPrivate__QTypeNormalizer { + return newQtPrivate__QTypeNormalizer((*C.QtPrivate__QTypeNormalizer)(h)) +} + +func (this *QtPrivate__QTypeNormalizer) NormalizeTypeFromSignature(begin string, end string) int { + begin_Cstring := C.CString(begin) + defer C.free(unsafe.Pointer(begin_Cstring)) + end_Cstring := C.CString(end) + defer C.free(unsafe.Pointer(end_Cstring)) + return (int)(C.QtPrivate__QTypeNormalizer_NormalizeTypeFromSignature(this.h, begin_Cstring, end_Cstring)) +} + +func (this *QtPrivate__QTypeNormalizer) NormalizeType(begin string, end string) int { + begin_Cstring := C.CString(begin) + defer C.free(unsafe.Pointer(begin_Cstring)) + end_Cstring := C.CString(end) + defer C.free(unsafe.Pointer(end_Cstring)) + return (int)(C.QtPrivate__QTypeNormalizer_NormalizeType(this.h, begin_Cstring, end_Cstring)) +} + +func (this *QtPrivate__QTypeNormalizer) NormalizeType3(begin string, end string, adjustConst bool) int { + begin_Cstring := C.CString(begin) + defer C.free(unsafe.Pointer(begin_Cstring)) + end_Cstring := C.CString(end) + defer C.free(unsafe.Pointer(end_Cstring)) + return (int)(C.QtPrivate__QTypeNormalizer_NormalizeType3(this.h, begin_Cstring, end_Cstring, (C.bool)(adjustConst))) +} + +// Delete this object from C++ memory. +func (this *QtPrivate__QTypeNormalizer) Delete() { + C.QtPrivate__QTypeNormalizer_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QtPrivate__QTypeNormalizer) GoGC() { + runtime.SetFinalizer(this, func(this *QtPrivate__QTypeNormalizer) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} diff --git a/qt/gen_qmetatype.h b/qt/gen_qmetatype.h index 9fd172c..c4459fb 100644 --- a/qt/gen_qmetatype.h +++ b/qt/gen_qmetatype.h @@ -15,161 +15,112 @@ extern "C" { #ifdef __cplusplus class QByteArray; +class QByteArrayView; class QDataStream; class QDebug; class QMetaObject; class QMetaType; -#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QtMetaTypePrivate__QAssociativeIterableImpl) -typedef QtMetaTypePrivate::QAssociativeIterableImpl QtMetaTypePrivate__QAssociativeIterableImpl; -#else -class QtMetaTypePrivate__QAssociativeIterableImpl; -#endif +class QPartialOrdering; #if defined(WORKAROUND_INNER_CLASS_DEFINITION_QtMetaTypePrivate__QPairVariantInterfaceImpl) typedef QtMetaTypePrivate::QPairVariantInterfaceImpl QtMetaTypePrivate__QPairVariantInterfaceImpl; #else class QtMetaTypePrivate__QPairVariantInterfaceImpl; #endif -#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QtMetaTypePrivate__QSequentialIterableImpl) -typedef QtMetaTypePrivate::QSequentialIterableImpl QtMetaTypePrivate__QSequentialIterableImpl; +#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__QMetaTypeInterface) +typedef QtPrivate::QMetaTypeInterface QtPrivate__QMetaTypeInterface; #else -class QtMetaTypePrivate__QSequentialIterableImpl; +class QtPrivate__QMetaTypeInterface; #endif -#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QtMetaTypePrivate__VariantData) -typedef QtMetaTypePrivate::VariantData QtMetaTypePrivate__VariantData; +#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__QTypeNormalizer) +typedef QtPrivate::QTypeNormalizer QtPrivate__QTypeNormalizer; #else -class QtMetaTypePrivate__VariantData; -#endif -#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QtMetaTypePrivate__VectorBoolElements) -typedef QtMetaTypePrivate::VectorBoolElements QtMetaTypePrivate__VectorBoolElements; -#else -class QtMetaTypePrivate__VectorBoolElements; -#endif -#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__AbstractComparatorFunction) -typedef QtPrivate::AbstractComparatorFunction QtPrivate__AbstractComparatorFunction; -#else -class QtPrivate__AbstractComparatorFunction; -#endif -#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__AbstractConverterFunction) -typedef QtPrivate::AbstractConverterFunction QtPrivate__AbstractConverterFunction; -#else -class QtPrivate__AbstractConverterFunction; -#endif -#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__AbstractDebugStreamFunction) -typedef QtPrivate::AbstractDebugStreamFunction QtPrivate__AbstractDebugStreamFunction; -#else -class QtPrivate__AbstractDebugStreamFunction; +class QtPrivate__QTypeNormalizer; #endif #else typedef struct QByteArray QByteArray; +typedef struct QByteArrayView QByteArrayView; typedef struct QDataStream QDataStream; typedef struct QDebug QDebug; typedef struct QMetaObject QMetaObject; typedef struct QMetaType QMetaType; -typedef struct QtMetaTypePrivate__QAssociativeIterableImpl QtMetaTypePrivate__QAssociativeIterableImpl; +typedef struct QPartialOrdering QPartialOrdering; typedef struct QtMetaTypePrivate__QPairVariantInterfaceImpl QtMetaTypePrivate__QPairVariantInterfaceImpl; -typedef struct QtMetaTypePrivate__QSequentialIterableImpl QtMetaTypePrivate__QSequentialIterableImpl; -typedef struct QtMetaTypePrivate__VariantData QtMetaTypePrivate__VariantData; -typedef struct QtMetaTypePrivate__VectorBoolElements QtMetaTypePrivate__VectorBoolElements; -typedef struct QtPrivate__AbstractComparatorFunction QtPrivate__AbstractComparatorFunction; -typedef struct QtPrivate__AbstractConverterFunction QtPrivate__AbstractConverterFunction; -typedef struct QtPrivate__AbstractDebugStreamFunction QtPrivate__AbstractDebugStreamFunction; +typedef struct QtPrivate__QMetaTypeInterface QtPrivate__QMetaTypeInterface; +typedef struct QtPrivate__QTypeNormalizer QtPrivate__QTypeNormalizer; #endif -QtPrivate__AbstractDebugStreamFunction* QtPrivate__AbstractDebugStreamFunction_new(); -void QtPrivate__AbstractDebugStreamFunction_Delete(QtPrivate__AbstractDebugStreamFunction* self); +void QtPrivate__QMetaTypeInterface_Delete(QtPrivate__QMetaTypeInterface* self); -QtPrivate__AbstractComparatorFunction* QtPrivate__AbstractComparatorFunction_new(); -void QtPrivate__AbstractComparatorFunction_Delete(QtPrivate__AbstractComparatorFunction* self); - -QtPrivate__AbstractConverterFunction* QtPrivate__AbstractConverterFunction_new(); -void QtPrivate__AbstractConverterFunction_Delete(QtPrivate__AbstractConverterFunction* self); - -QMetaType* QMetaType_new(); -QMetaType* QMetaType_new2(const int typeVal); -bool QMetaType_UnregisterType(int typeVal); -int QMetaType_RegisterTypedef(const char* typeName, int aliasId); -int QMetaType_RegisterNormalizedTypedef(QByteArray* normalizedTypeName, int aliasId); +QMetaType* QMetaType_new(int typeVal); +QMetaType* QMetaType_new2(); +QMetaType* QMetaType_new3(QMetaType* param1); +void QMetaType_RegisterNormalizedTypedef(QByteArray* normalizedTypeName, QMetaType* typeVal); int QMetaType_Type(const char* typeName); int QMetaType_TypeWithTypeName(QByteArray* typeName); const char* QMetaType_TypeName(int typeVal); int QMetaType_SizeOf(int typeVal); int QMetaType_TypeFlags(int typeVal); QMetaObject* QMetaType_MetaObjectForType(int typeVal); -bool QMetaType_IsRegistered(int typeVal); void* QMetaType_Create(int typeVal); void QMetaType_Destroy(int typeVal, void* data); void* QMetaType_Construct(int typeVal, void* where, const void* copyVal); void QMetaType_Destruct(int typeVal, void* where); -bool QMetaType_Save(QDataStream* stream, int typeVal, const void* data); -bool QMetaType_Load(QDataStream* stream, int typeVal, void* data); +bool QMetaType_IsRegistered(int typeVal); bool QMetaType_IsValid(const QMetaType* self); bool QMetaType_IsRegistered2(const QMetaType* self); int QMetaType_Id(const QMetaType* self); -int QMetaType_SizeOf2(const QMetaType* self); +ptrdiff_t QMetaType_SizeOf2(const QMetaType* self); +ptrdiff_t QMetaType_AlignOf(const QMetaType* self); int QMetaType_Flags(const QMetaType* self); QMetaObject* QMetaType_MetaObject(const QMetaType* self); -QByteArray* QMetaType_Name(const QMetaType* self); +const char* QMetaType_Name(const QMetaType* self); void* QMetaType_Create2(const QMetaType* self); void QMetaType_DestroyWithData(const QMetaType* self, void* data); void* QMetaType_ConstructWithWhere(const QMetaType* self, void* where); void QMetaType_DestructWithData(const QMetaType* self, void* data); -bool QMetaType_HasRegisteredComparators(int typeId); -bool QMetaType_HasRegisteredDebugStreamOperator(int typeId); -bool QMetaType_Convert(const void* from, int fromTypeId, void* to, int toTypeId); -bool QMetaType_Compare(const void* lhs, const void* rhs, int typeId, int* result); -bool QMetaType_Equals(const void* lhs, const void* rhs, int typeId, int* result); -bool QMetaType_DebugStream(QDebug* dbg, const void* rhs, int typeId); -bool QMetaType_HasRegisteredConverterFunction(int fromTypeId, int toTypeId); +QPartialOrdering* QMetaType_Compare(const QMetaType* self, const void* lhs, const void* rhs); +bool QMetaType_Equals(const QMetaType* self, const void* lhs, const void* rhs); +bool QMetaType_IsEqualityComparable(const QMetaType* self); +bool QMetaType_IsOrdered(const QMetaType* self); +bool QMetaType_Save(const QMetaType* self, QDataStream* stream, const void* data); +bool QMetaType_Load(const QMetaType* self, QDataStream* stream, void* data); +bool QMetaType_HasRegisteredDataStreamOperators(const QMetaType* self); +bool QMetaType_Save2(QDataStream* stream, int typeVal, const void* data); +bool QMetaType_Load2(QDataStream* stream, int typeVal, void* data); +QMetaType* QMetaType_FromName(QByteArrayView* name); +bool QMetaType_DebugStream(QMetaType* self, QDebug* dbg, const void* rhs); +bool QMetaType_HasRegisteredDebugStreamOperator(const QMetaType* self); +bool QMetaType_DebugStream2(QDebug* dbg, const void* rhs, int typeId); +bool QMetaType_HasRegisteredDebugStreamOperatorWithTypeId(int typeId); +bool QMetaType_Convert(QMetaType* fromType, const void* from, QMetaType* toType, void* to); +bool QMetaType_CanConvert(QMetaType* fromType, QMetaType* toType); +bool QMetaType_View(QMetaType* fromType, void* from, QMetaType* toType, void* to); +bool QMetaType_CanView(QMetaType* fromType, QMetaType* toType); +bool QMetaType_Convert2(const void* from, int fromTypeId, void* to, int toTypeId); +bool QMetaType_Compare2(const void* lhs, const void* rhs, int typeId, int* result); +bool QMetaType_Equals2(const void* lhs, const void* rhs, int typeId, int* result); +bool QMetaType_HasRegisteredConverterFunction(QMetaType* fromType, QMetaType* toType); +bool QMetaType_HasRegisteredMutableViewFunction(QMetaType* fromType, QMetaType* toType); +void QMetaType_UnregisterConverterFunction(QMetaType* from, QMetaType* to); +void QMetaType_UnregisterMutableViewFunction(QMetaType* from, QMetaType* to); +void QMetaType_UnregisterMetaType(QMetaType* typeVal); void* QMetaType_Create22(int typeVal, const void* copyVal); +int QMetaType_Id1(const QMetaType* self, int param1); void* QMetaType_Create1(const QMetaType* self, const void* copyVal); void* QMetaType_Construct2(const QMetaType* self, void* where, const void* copyVal); void QMetaType_Delete(QMetaType* self); -QtMetaTypePrivate__VariantData* QtMetaTypePrivate__VariantData_new(const int metaTypeId_, const void* data_, const unsigned int flags_); -QtMetaTypePrivate__VariantData* QtMetaTypePrivate__VariantData_new2(QtMetaTypePrivate__VariantData* other); -void QtMetaTypePrivate__VariantData_Delete(QtMetaTypePrivate__VariantData* self); - -void QtMetaTypePrivate__VectorBoolElements_Delete(QtMetaTypePrivate__VectorBoolElements* self); - -QtMetaTypePrivate__QSequentialIterableImpl* QtMetaTypePrivate__QSequentialIterableImpl_new(); -QtMetaTypePrivate__QSequentialIterableImpl* QtMetaTypePrivate__QSequentialIterableImpl_new2(QtMetaTypePrivate__QSequentialIterableImpl* param1); -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); -void QtMetaTypePrivate__QSequentialIterableImpl_Append(QtMetaTypePrivate__QSequentialIterableImpl* self, const void* newElement); -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(); -QtMetaTypePrivate__QAssociativeIterableImpl* QtMetaTypePrivate__QAssociativeIterableImpl_new2(QtMetaTypePrivate__QAssociativeIterableImpl* param1); -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(); QtMetaTypePrivate__QPairVariantInterfaceImpl* QtMetaTypePrivate__QPairVariantInterfaceImpl_new2(QtMetaTypePrivate__QPairVariantInterfaceImpl* param1); -QtMetaTypePrivate__VariantData* QtMetaTypePrivate__QPairVariantInterfaceImpl_First(const QtMetaTypePrivate__QPairVariantInterfaceImpl* self); -QtMetaTypePrivate__VariantData* QtMetaTypePrivate__QPairVariantInterfaceImpl_Second(const QtMetaTypePrivate__QPairVariantInterfaceImpl* self); +void QtMetaTypePrivate__QPairVariantInterfaceImpl_First(const QtMetaTypePrivate__QPairVariantInterfaceImpl* self, void* dataPtr); +void QtMetaTypePrivate__QPairVariantInterfaceImpl_Second(const QtMetaTypePrivate__QPairVariantInterfaceImpl* self, void* dataPtr); void QtMetaTypePrivate__QPairVariantInterfaceImpl_Delete(QtMetaTypePrivate__QPairVariantInterfaceImpl* self); +int QtPrivate__QTypeNormalizer_NormalizeTypeFromSignature(QtPrivate__QTypeNormalizer* self, const char* begin, const char* end); +int QtPrivate__QTypeNormalizer_NormalizeType(QtPrivate__QTypeNormalizer* self, const char* begin, const char* end); +int QtPrivate__QTypeNormalizer_NormalizeType3(QtPrivate__QTypeNormalizer* self, const char* begin, const char* end, bool adjustConst); +void QtPrivate__QTypeNormalizer_Delete(QtPrivate__QTypeNormalizer* self); + #ifdef __cplusplus } /* extern C */ #endif diff --git a/qt/gen_qmimedata.cpp b/qt/gen_qmimedata.cpp index 6ed9667..96fd888 100644 --- a/qt/gen_qmimedata.cpp +++ b/qt/gen_qmimedata.cpp @@ -30,13 +30,6 @@ struct miqt_string* QMimeData_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QMimeData_TrUtf8(const char* s) { - QString _ret = QMimeData::trUtf8(s); - // 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* QMimeData_Urls(const QMimeData* self) { QList _ret = self->urls(); // Convert QList<> from C++ memory to manually-managed C memory @@ -174,20 +167,6 @@ struct miqt_string* QMimeData_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QMimeData_TrUtf82(const char* s, const char* c) { - QString _ret = QMimeData::trUtf8(s, c); - // 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* QMimeData_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QMimeData::trUtf8(s, c, static_cast(n)); - // 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 QMimeData_Delete(QMimeData* self) { delete self; } diff --git a/qt/gen_qmimedata.go b/qt/gen_qmimedata.go index a61c22c..186bebb 100644 --- a/qt/gen_qmimedata.go +++ b/qt/gen_qmimedata.go @@ -61,15 +61,6 @@ func QMimeData_Tr(s string) string { return _ret } -func QMimeData_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QMimeData_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QMimeData) Urls() []QUrl { var _ma *C.struct_miqt_array = C.QMimeData_Urls(this.h) _ret := make([]QUrl, int(_ma.len)) @@ -231,28 +222,6 @@ func QMimeData_Tr3(s string, c string, n int) string { return _ret } -func QMimeData_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMimeData_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QMimeData_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMimeData_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QMimeData) Delete() { C.QMimeData_Delete(this.h) diff --git a/qt/gen_qmimedata.h b/qt/gen_qmimedata.h index 4e79f09..ce6abb6 100644 --- a/qt/gen_qmimedata.h +++ b/qt/gen_qmimedata.h @@ -31,7 +31,6 @@ QMimeData* QMimeData_new(); QMetaObject* QMimeData_MetaObject(const QMimeData* self); void* QMimeData_Metacast(QMimeData* self, const char* param1); struct miqt_string* QMimeData_Tr(const char* s); -struct miqt_string* QMimeData_TrUtf8(const char* s); struct miqt_array* QMimeData_Urls(const QMimeData* self); void QMimeData_SetUrls(QMimeData* self, struct miqt_array* /* of QUrl* */ urls); bool QMimeData_HasUrls(const QMimeData* self); @@ -55,8 +54,6 @@ struct miqt_array* QMimeData_Formats(const QMimeData* self); void QMimeData_Clear(QMimeData* self); struct miqt_string* QMimeData_Tr2(const char* s, const char* c); struct miqt_string* QMimeData_Tr3(const char* s, const char* c, int n); -struct miqt_string* QMimeData_TrUtf82(const char* s, const char* c); -struct miqt_string* QMimeData_TrUtf83(const char* s, const char* c, int n); void QMimeData_Delete(QMimeData* self); #ifdef __cplusplus diff --git a/qt/gen_qmouseeventtransition.cpp b/qt/gen_qmouseeventtransition.cpp deleted file mode 100644 index 3e0d9e7..0000000 --- a/qt/gen_qmouseeventtransition.cpp +++ /dev/null @@ -1,108 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include "qmouseeventtransition.h" -#include "gen_qmouseeventtransition.h" -#include "_cgo_export.h" - -QMouseEventTransition* QMouseEventTransition_new() { - return new QMouseEventTransition(); -} - -QMouseEventTransition* QMouseEventTransition_new2(QObject* object, int typeVal, int button) { - return new QMouseEventTransition(object, static_cast(typeVal), static_cast(button)); -} - -QMouseEventTransition* QMouseEventTransition_new3(QState* sourceState) { - return new QMouseEventTransition(sourceState); -} - -QMouseEventTransition* QMouseEventTransition_new4(QObject* object, int typeVal, int button, QState* sourceState) { - return new QMouseEventTransition(object, static_cast(typeVal), static_cast(button), sourceState); -} - -QMetaObject* QMouseEventTransition_MetaObject(const QMouseEventTransition* self) { - return (QMetaObject*) self->metaObject(); -} - -void* QMouseEventTransition_Metacast(QMouseEventTransition* self, const char* param1) { - return self->qt_metacast(param1); -} - -struct miqt_string* QMouseEventTransition_Tr(const char* s) { - QString _ret = QMouseEventTransition::tr(s); - // 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* QMouseEventTransition_TrUtf8(const char* s) { - QString _ret = QMouseEventTransition::trUtf8(s); - // 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()); -} - -int QMouseEventTransition_Button(const QMouseEventTransition* self) { - Qt::MouseButton _ret = self->button(); - return static_cast(_ret); -} - -void QMouseEventTransition_SetButton(QMouseEventTransition* self, int button) { - self->setButton(static_cast(button)); -} - -int QMouseEventTransition_ModifierMask(const QMouseEventTransition* self) { - Qt::KeyboardModifiers _ret = self->modifierMask(); - return static_cast(_ret); -} - -void QMouseEventTransition_SetModifierMask(QMouseEventTransition* self, int modifiers) { - self->setModifierMask(static_cast(modifiers)); -} - -QPainterPath* QMouseEventTransition_HitTestPath(const QMouseEventTransition* self) { - return new QPainterPath(self->hitTestPath()); -} - -void QMouseEventTransition_SetHitTestPath(QMouseEventTransition* self, QPainterPath* path) { - self->setHitTestPath(*path); -} - -struct miqt_string* QMouseEventTransition_Tr2(const char* s, const char* c) { - QString _ret = QMouseEventTransition::tr(s, c); - // 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* QMouseEventTransition_Tr3(const char* s, const char* c, int n) { - QString _ret = QMouseEventTransition::tr(s, c, static_cast(n)); - // 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* QMouseEventTransition_TrUtf82(const char* s, const char* c) { - QString _ret = QMouseEventTransition::trUtf8(s, c); - // 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* QMouseEventTransition_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QMouseEventTransition::trUtf8(s, c, static_cast(n)); - // 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 QMouseEventTransition_Delete(QMouseEventTransition* self) { - delete self; -} - diff --git a/qt/gen_qmouseeventtransition.go b/qt/gen_qmouseeventtransition.go deleted file mode 100644 index b5a518c..0000000 --- a/qt/gen_qmouseeventtransition.go +++ /dev/null @@ -1,174 +0,0 @@ -package qt - -/* - -#include "gen_qmouseeventtransition.h" -#include - -*/ -import "C" - -import ( - "runtime" - "unsafe" -) - -type QMouseEventTransition struct { - h *C.QMouseEventTransition - *QEventTransition -} - -func (this *QMouseEventTransition) cPointer() *C.QMouseEventTransition { - if this == nil { - return nil - } - return this.h -} - -func newQMouseEventTransition(h *C.QMouseEventTransition) *QMouseEventTransition { - if h == nil { - return nil - } - return &QMouseEventTransition{h: h, QEventTransition: newQEventTransition_U(unsafe.Pointer(h))} -} - -func newQMouseEventTransition_U(h unsafe.Pointer) *QMouseEventTransition { - return newQMouseEventTransition((*C.QMouseEventTransition)(h)) -} - -// NewQMouseEventTransition constructs a new QMouseEventTransition object. -func NewQMouseEventTransition() *QMouseEventTransition { - ret := C.QMouseEventTransition_new() - return newQMouseEventTransition(ret) -} - -// NewQMouseEventTransition2 constructs a new QMouseEventTransition object. -func NewQMouseEventTransition2(object *QObject, typeVal QEvent__Type, button MouseButton) *QMouseEventTransition { - ret := C.QMouseEventTransition_new2(object.cPointer(), (C.int)(typeVal), (C.int)(button)) - return newQMouseEventTransition(ret) -} - -// NewQMouseEventTransition3 constructs a new QMouseEventTransition object. -func NewQMouseEventTransition3(sourceState *QState) *QMouseEventTransition { - ret := C.QMouseEventTransition_new3(sourceState.cPointer()) - return newQMouseEventTransition(ret) -} - -// 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.int)(typeVal), (C.int)(button), sourceState.cPointer()) - return newQMouseEventTransition(ret) -} - -func (this *QMouseEventTransition) MetaObject() *QMetaObject { - return newQMetaObject_U(unsafe.Pointer(C.QMouseEventTransition_MetaObject(this.h))) -} - -func (this *QMouseEventTransition) Metacast(param1 string) unsafe.Pointer { - param1_Cstring := C.CString(param1) - defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QMouseEventTransition_Metacast(this.h, param1_Cstring) -} - -func QMouseEventTransition_Tr(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QMouseEventTransition_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QMouseEventTransition_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QMouseEventTransition_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QMouseEventTransition) Button() MouseButton { - return (MouseButton)(C.QMouseEventTransition_Button(this.h)) -} - -func (this *QMouseEventTransition) SetButton(button MouseButton) { - C.QMouseEventTransition_SetButton(this.h, (C.int)(button)) -} - -func (this *QMouseEventTransition) ModifierMask() KeyboardModifier { - return (KeyboardModifier)(C.QMouseEventTransition_ModifierMask(this.h)) -} - -func (this *QMouseEventTransition) SetModifierMask(modifiers KeyboardModifier) { - C.QMouseEventTransition_SetModifierMask(this.h, (C.int)(modifiers)) -} - -func (this *QMouseEventTransition) HitTestPath() *QPainterPath { - _ret := C.QMouseEventTransition_HitTestPath(this.h) - _goptr := newQPainterPath(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QMouseEventTransition) SetHitTestPath(path *QPainterPath) { - C.QMouseEventTransition_SetHitTestPath(this.h, path.cPointer()) -} - -func QMouseEventTransition_Tr2(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMouseEventTransition_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QMouseEventTransition_Tr3(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMouseEventTransition_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QMouseEventTransition_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMouseEventTransition_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QMouseEventTransition_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMouseEventTransition_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -// Delete this object from C++ memory. -func (this *QMouseEventTransition) Delete() { - C.QMouseEventTransition_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QMouseEventTransition) GoGC() { - runtime.SetFinalizer(this, func(this *QMouseEventTransition) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} diff --git a/qt/gen_qmouseeventtransition.h b/qt/gen_qmouseeventtransition.h deleted file mode 100644 index 4aab0fa..0000000 --- a/qt/gen_qmouseeventtransition.h +++ /dev/null @@ -1,54 +0,0 @@ -#ifndef GEN_QMOUSEEVENTTRANSITION_H -#define GEN_QMOUSEEVENTTRANSITION_H - -#include -#include -#include - -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - -#include "binding.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __cplusplus -class QMetaObject; -class QMouseEventTransition; -class QObject; -class QPainterPath; -class QState; -#else -typedef struct QMetaObject QMetaObject; -typedef struct QMouseEventTransition QMouseEventTransition; -typedef struct QObject QObject; -typedef struct QPainterPath QPainterPath; -typedef struct QState QState; -#endif - -QMouseEventTransition* QMouseEventTransition_new(); -QMouseEventTransition* QMouseEventTransition_new2(QObject* object, int typeVal, int button); -QMouseEventTransition* QMouseEventTransition_new3(QState* sourceState); -QMouseEventTransition* QMouseEventTransition_new4(QObject* object, int typeVal, int button, QState* sourceState); -QMetaObject* QMouseEventTransition_MetaObject(const QMouseEventTransition* self); -void* QMouseEventTransition_Metacast(QMouseEventTransition* self, const char* param1); -struct miqt_string* QMouseEventTransition_Tr(const char* s); -struct miqt_string* QMouseEventTransition_TrUtf8(const char* s); -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); -void QMouseEventTransition_SetHitTestPath(QMouseEventTransition* self, QPainterPath* path); -struct miqt_string* QMouseEventTransition_Tr2(const char* s, const char* c); -struct miqt_string* QMouseEventTransition_Tr3(const char* s, const char* c, int n); -struct miqt_string* QMouseEventTransition_TrUtf82(const char* s, const char* c); -struct miqt_string* QMouseEventTransition_TrUtf83(const char* s, const char* c, int n); -void QMouseEventTransition_Delete(QMouseEventTransition* self); - -#ifdef __cplusplus -} /* extern C */ -#endif - -#endif diff --git a/qt/gen_qmovie.cpp b/qt/gen_qmovie.cpp index 70d9050..6e906ab 100644 --- a/qt/gen_qmovie.cpp +++ b/qt/gen_qmovie.cpp @@ -66,13 +66,6 @@ struct miqt_string* QMovie_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QMovie_TrUtf8(const char* s) { - QString _ret = QMovie::trUtf8(s); - // 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* QMovie_SupportedFormats() { QList _ret = QMovie::supportedFormats(); // Convert QList<> from C++ memory to manually-managed C memory @@ -311,20 +304,6 @@ struct miqt_string* QMovie_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QMovie_TrUtf82(const char* s, const char* c) { - QString _ret = QMovie::trUtf8(s, c); - // 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* QMovie_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QMovie::trUtf8(s, c, static_cast(n)); - // 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 QMovie_Delete(QMovie* self) { delete self; } diff --git a/qt/gen_qmovie.go b/qt/gen_qmovie.go index e4ef212..3f04067 100644 --- a/qt/gen_qmovie.go +++ b/qt/gen_qmovie.go @@ -125,15 +125,6 @@ func QMovie_Tr(s string) string { return _ret } -func QMovie_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QMovie_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func QMovie_SupportedFormats() []QByteArray { var _ma *C.struct_miqt_array = C.QMovie_SupportedFormats() _ret := make([]QByteArray, int(_ma.len)) @@ -450,28 +441,6 @@ func QMovie_Tr3(s string, c string, n int) string { return _ret } -func QMovie_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMovie_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QMovie_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QMovie_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QMovie) Delete() { C.QMovie_Delete(this.h) diff --git a/qt/gen_qmovie.h b/qt/gen_qmovie.h index aa96712..997b4b0 100644 --- a/qt/gen_qmovie.h +++ b/qt/gen_qmovie.h @@ -48,7 +48,6 @@ QMovie* QMovie_new8(struct miqt_string* fileName, QByteArray* format, QObject* p QMetaObject* QMovie_MetaObject(const QMovie* self); void* QMovie_Metacast(QMovie* self, const char* param1); struct miqt_string* QMovie_Tr(const char* s); -struct miqt_string* QMovie_TrUtf8(const char* s); struct miqt_array* QMovie_SupportedFormats(); void QMovie_SetDevice(QMovie* self, QIODevice* device); QIODevice* QMovie_Device(const QMovie* self); @@ -96,8 +95,6 @@ void QMovie_Stop(QMovie* self); void QMovie_SetSpeed(QMovie* self, int percentSpeed); struct miqt_string* QMovie_Tr2(const char* s, const char* c); struct miqt_string* QMovie_Tr3(const char* s, const char* c, int n); -struct miqt_string* QMovie_TrUtf82(const char* s, const char* c); -struct miqt_string* QMovie_TrUtf83(const char* s, const char* c, int n); void QMovie_Delete(QMovie* self); #ifdef __cplusplus diff --git a/qt/gen_qmutex.cpp b/qt/gen_qmutex.cpp index 3941dc3..b5926d7 100644 --- a/qt/gen_qmutex.cpp +++ b/qt/gen_qmutex.cpp @@ -1,6 +1,5 @@ #include #include -#include #include #include "qmutex.h" #include "gen_qmutex.h" @@ -26,14 +25,6 @@ bool QBasicMutex_TryLock2(QBasicMutex* self) { return self->try_lock(); } -bool QBasicMutex_IsRecursive(QBasicMutex* self) { - return self->isRecursive(); -} - -bool QBasicMutex_IsRecursive2(const QBasicMutex* self) { - return self->isRecursive(); -} - void QBasicMutex_Delete(QBasicMutex* self) { delete self; } @@ -42,31 +33,11 @@ QMutex* QMutex_new() { return new QMutex(); } -QMutex* QMutex_new2(int mode) { - return new QMutex(static_cast(mode)); -} - -void QMutex_Lock(QMutex* self) { - self->lock(); -} - bool QMutex_TryLock(QMutex* self) { - return self->tryLock(); -} - -void QMutex_Unlock(QMutex* self) { - self->unlock(); -} - -bool QMutex_TryLock2(QMutex* self) { return self->try_lock(); } -bool QMutex_IsRecursive(const QMutex* self) { - return self->isRecursive(); -} - -bool QMutex_TryLock1(QMutex* self, int timeout) { +bool QMutex_TryLockWithTimeout(QMutex* self, int timeout) { return self->tryLock(static_cast(timeout)); } @@ -78,31 +49,27 @@ QRecursiveMutex* QRecursiveMutex_new() { return new QRecursiveMutex(); } +void QRecursiveMutex_Lock(QRecursiveMutex* self) { + self->lock(); +} + +bool QRecursiveMutex_TryLock(QRecursiveMutex* self) { + return self->tryLock(); +} + +void QRecursiveMutex_Unlock(QRecursiveMutex* self) { + self->unlock(); +} + +bool QRecursiveMutex_TryLock2(QRecursiveMutex* self) { + return self->try_lock(); +} + +bool QRecursiveMutex_TryLock1(QRecursiveMutex* self, int timeout) { + return self->tryLock(static_cast(timeout)); +} + void QRecursiveMutex_Delete(QRecursiveMutex* self) { delete self; } -QMutexLocker* QMutexLocker_new(QBasicMutex* m) { - return new QMutexLocker(m); -} - -QMutexLocker* QMutexLocker_new2(QRecursiveMutex* m) { - return new QMutexLocker(m); -} - -void QMutexLocker_Unlock(QMutexLocker* self) { - self->unlock(); -} - -void QMutexLocker_Relock(QMutexLocker* self) { - self->relock(); -} - -QMutex* QMutexLocker_Mutex(const QMutexLocker* self) { - return self->mutex(); -} - -void QMutexLocker_Delete(QMutexLocker* self) { - delete self; -} - diff --git a/qt/gen_qmutex.go b/qt/gen_qmutex.go index 3da0060..779da1b 100644 --- a/qt/gen_qmutex.go +++ b/qt/gen_qmutex.go @@ -13,13 +13,6 @@ import ( "unsafe" ) -type QMutex__RecursionMode int - -const ( - QMutex__NonRecursive QMutex__RecursionMode = 0 - QMutex__Recursive QMutex__RecursionMode = 1 -) - type QBasicMutex struct { h *C.QBasicMutex } @@ -64,14 +57,6 @@ func (this *QBasicMutex) TryLock2() bool { return (bool)(C.QBasicMutex_TryLock2(this.h)) } -func (this *QBasicMutex) IsRecursive() bool { - return (bool)(C.QBasicMutex_IsRecursive(this.h)) -} - -func (this *QBasicMutex) IsRecursive2() bool { - return (bool)(C.QBasicMutex_IsRecursive2(this.h)) -} - // Delete this object from C++ memory. func (this *QBasicMutex) Delete() { C.QBasicMutex_Delete(this.h) @@ -115,34 +100,12 @@ func NewQMutex() *QMutex { return newQMutex(ret) } -// NewQMutex2 constructs a new QMutex object. -func NewQMutex2(mode QMutex__RecursionMode) *QMutex { - ret := C.QMutex_new2((C.int)(mode)) - return newQMutex(ret) -} - -func (this *QMutex) Lock() { - C.QMutex_Lock(this.h) -} - func (this *QMutex) TryLock() bool { return (bool)(C.QMutex_TryLock(this.h)) } -func (this *QMutex) Unlock() { - C.QMutex_Unlock(this.h) -} - -func (this *QMutex) TryLock2() bool { - return (bool)(C.QMutex_TryLock2(this.h)) -} - -func (this *QMutex) IsRecursive() bool { - return (bool)(C.QMutex_IsRecursive(this.h)) -} - -func (this *QMutex) TryLock1(timeout int) bool { - return (bool)(C.QMutex_TryLock1(this.h, (C.int)(timeout))) +func (this *QMutex) TryLockWithTimeout(timeout int) bool { + return (bool)(C.QMutex_TryLockWithTimeout(this.h, (C.int)(timeout))) } // Delete this object from C++ memory. @@ -187,6 +150,26 @@ func NewQRecursiveMutex() *QRecursiveMutex { return newQRecursiveMutex(ret) } +func (this *QRecursiveMutex) Lock() { + C.QRecursiveMutex_Lock(this.h) +} + +func (this *QRecursiveMutex) TryLock() bool { + return (bool)(C.QRecursiveMutex_TryLock(this.h)) +} + +func (this *QRecursiveMutex) Unlock() { + C.QRecursiveMutex_Unlock(this.h) +} + +func (this *QRecursiveMutex) TryLock2() bool { + return (bool)(C.QRecursiveMutex_TryLock2(this.h)) +} + +func (this *QRecursiveMutex) TryLock1(timeout int) bool { + return (bool)(C.QRecursiveMutex_TryLock1(this.h, (C.int)(timeout))) +} + // Delete this object from C++ memory. func (this *QRecursiveMutex) Delete() { C.QRecursiveMutex_Delete(this.h) @@ -200,63 +183,3 @@ func (this *QRecursiveMutex) GoGC() { runtime.KeepAlive(this.h) }) } - -type QMutexLocker struct { - h *C.QMutexLocker -} - -func (this *QMutexLocker) cPointer() *C.QMutexLocker { - if this == nil { - return nil - } - return this.h -} - -func newQMutexLocker(h *C.QMutexLocker) *QMutexLocker { - if h == nil { - return nil - } - return &QMutexLocker{h: h} -} - -func newQMutexLocker_U(h unsafe.Pointer) *QMutexLocker { - return newQMutexLocker((*C.QMutexLocker)(h)) -} - -// NewQMutexLocker constructs a new QMutexLocker object. -func NewQMutexLocker(m *QBasicMutex) *QMutexLocker { - ret := C.QMutexLocker_new(m.cPointer()) - return newQMutexLocker(ret) -} - -// NewQMutexLocker2 constructs a new QMutexLocker object. -func NewQMutexLocker2(m *QRecursiveMutex) *QMutexLocker { - ret := C.QMutexLocker_new2(m.cPointer()) - return newQMutexLocker(ret) -} - -func (this *QMutexLocker) Unlock() { - C.QMutexLocker_Unlock(this.h) -} - -func (this *QMutexLocker) Relock() { - C.QMutexLocker_Relock(this.h) -} - -func (this *QMutexLocker) Mutex() *QMutex { - return newQMutex_U(unsafe.Pointer(C.QMutexLocker_Mutex(this.h))) -} - -// Delete this object from C++ memory. -func (this *QMutexLocker) Delete() { - C.QMutexLocker_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QMutexLocker) GoGC() { - runtime.SetFinalizer(this, func(this *QMutexLocker) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} diff --git a/qt/gen_qmutex.h b/qt/gen_qmutex.h index 8990dc1..c65cdef 100644 --- a/qt/gen_qmutex.h +++ b/qt/gen_qmutex.h @@ -16,12 +16,10 @@ extern "C" { #ifdef __cplusplus class QBasicMutex; class QMutex; -class QMutexLocker; class QRecursiveMutex; #else typedef struct QBasicMutex QBasicMutex; typedef struct QMutex QMutex; -typedef struct QMutexLocker QMutexLocker; typedef struct QRecursiveMutex QRecursiveMutex; #endif @@ -30,30 +28,21 @@ void QBasicMutex_Lock(QBasicMutex* self); void QBasicMutex_Unlock(QBasicMutex* self); bool QBasicMutex_TryLock(QBasicMutex* self); bool QBasicMutex_TryLock2(QBasicMutex* self); -bool QBasicMutex_IsRecursive(QBasicMutex* self); -bool QBasicMutex_IsRecursive2(const QBasicMutex* self); void QBasicMutex_Delete(QBasicMutex* self); QMutex* QMutex_new(); -QMutex* QMutex_new2(int mode); -void QMutex_Lock(QMutex* self); bool QMutex_TryLock(QMutex* self); -void QMutex_Unlock(QMutex* self); -bool QMutex_TryLock2(QMutex* self); -bool QMutex_IsRecursive(const QMutex* self); -bool QMutex_TryLock1(QMutex* self, int timeout); +bool QMutex_TryLockWithTimeout(QMutex* self, int timeout); void QMutex_Delete(QMutex* self); QRecursiveMutex* QRecursiveMutex_new(); +void QRecursiveMutex_Lock(QRecursiveMutex* self); +bool QRecursiveMutex_TryLock(QRecursiveMutex* self); +void QRecursiveMutex_Unlock(QRecursiveMutex* self); +bool QRecursiveMutex_TryLock2(QRecursiveMutex* self); +bool QRecursiveMutex_TryLock1(QRecursiveMutex* self, int timeout); void QRecursiveMutex_Delete(QRecursiveMutex* self); -QMutexLocker* QMutexLocker_new(QBasicMutex* m); -QMutexLocker* QMutexLocker_new2(QRecursiveMutex* m); -void QMutexLocker_Unlock(QMutexLocker* self); -void QMutexLocker_Relock(QMutexLocker* self); -QMutex* QMutexLocker_Mutex(const QMutexLocker* self); -void QMutexLocker_Delete(QMutexLocker* self); - #ifdef __cplusplus } /* extern C */ #endif diff --git a/qt/gen_qnamespace.cpp b/qt/gen_qnamespace.cpp index 5a491cf..7d74e58 100644 --- a/qt/gen_qnamespace.cpp +++ b/qt/gen_qnamespace.cpp @@ -1,9 +1,73 @@ #include +#include +#define WORKAROUND_INNER_CLASS_DEFINITION_Disambiguated_t #include "qnamespace.h" #include "gen_qnamespace.h" #include "_cgo_export.h" +Disambiguated_t* Disambiguated_t_new() { + return new Qt::Disambiguated_t(); +} + +Disambiguated_t* Disambiguated_t_new2(Disambiguated_t* param1) { + return new Qt::Disambiguated_t(*param1); +} + +void Disambiguated_t_Delete(Disambiguated_t* self) { + delete self; +} + void QInternal_Delete(QInternal* self) { delete self; } +QKeyCombination* QKeyCombination_new() { + return new QKeyCombination(); +} + +QKeyCombination* QKeyCombination_new2(int modifiers) { + return new QKeyCombination(static_cast(modifiers)); +} + +QKeyCombination* QKeyCombination_new3(int modifiers) { + return new QKeyCombination(static_cast(modifiers)); +} + +QKeyCombination* QKeyCombination_new4(QKeyCombination* param1) { + return new QKeyCombination(*param1); +} + +QKeyCombination* QKeyCombination_new5(int key) { + return new QKeyCombination(static_cast(key)); +} + +QKeyCombination* QKeyCombination_new6(int modifiers, int key) { + return new QKeyCombination(static_cast(modifiers), static_cast(key)); +} + +QKeyCombination* QKeyCombination_new7(int modifiers, int key) { + return new QKeyCombination(static_cast(modifiers), static_cast(key)); +} + +int QKeyCombination_KeyboardModifiers(const QKeyCombination* self) { + Qt::KeyboardModifiers _ret = self->keyboardModifiers(); + return static_cast(_ret); +} + +int QKeyCombination_Key(const QKeyCombination* self) { + Qt::Key _ret = self->key(); + return static_cast(_ret); +} + +QKeyCombination* QKeyCombination_FromCombined(int combined) { + return new QKeyCombination(QKeyCombination::fromCombined(static_cast(combined))); +} + +int QKeyCombination_ToCombined(const QKeyCombination* self) { + return self->toCombined(); +} + +void QKeyCombination_Delete(QKeyCombination* self) { + delete self; +} + diff --git a/qt/gen_qnamespace.go b/qt/gen_qnamespace.go index 181a5fb..d575190 100644 --- a/qt/gen_qnamespace.go +++ b/qt/gen_qnamespace.go @@ -38,30 +38,6 @@ const ( Transparent GlobalColor = 19 ) -type KeyboardModifier int - -const ( - NoModifier KeyboardModifier = 0 - ShiftModifier KeyboardModifier = 33554432 - ControlModifier KeyboardModifier = 67108864 - AltModifier KeyboardModifier = 134217728 - MetaModifier KeyboardModifier = 268435456 - KeypadModifier KeyboardModifier = 536870912 - GroupSwitchModifier KeyboardModifier = 1073741824 - KeyboardModifierMask KeyboardModifier = 4261412864 -) - -type Modifier int - -const ( - META Modifier = 268435456 - SHIFT Modifier = 33554432 - CTRL Modifier = 67108864 - ALT Modifier = 134217728 - MODIFIER_MASK Modifier = 4261412864 - UNICODE_ACCEL Modifier = 0 -) - type MouseButton int const ( @@ -69,7 +45,6 @@ const ( LeftButton MouseButton = 1 RightButton MouseButton = 2 MiddleButton MouseButton = 4 - MidButton MouseButton = 4 BackButton MouseButton = 8 XButton1 MouseButton = 8 ExtraButton1 MouseButton = 8 @@ -187,7 +162,6 @@ const ( TextForceLeftToRight TextFlag = 131072 TextForceRightToLeft TextFlag = 262144 TextLongestVariant TextFlag = 524288 - TextBypassShaping TextFlag = 1048576 ) type TextElideMode int @@ -293,16 +267,13 @@ const ( WA_Disabled WidgetAttribute = 0 WA_UnderMouse WidgetAttribute = 1 WA_MouseTracking WidgetAttribute = 2 - WA_ContentsPropagated WidgetAttribute = 3 WA_OpaquePaintEvent WidgetAttribute = 4 - WA_NoBackground WidgetAttribute = 4 WA_StaticContents WidgetAttribute = 5 WA_LaidOut WidgetAttribute = 7 WA_PaintOnScreen WidgetAttribute = 8 WA_NoSystemBackground WidgetAttribute = 9 WA_UpdatesDisabled WidgetAttribute = 10 WA_Mapped WidgetAttribute = 11 - WA_MacNoClickThrough WidgetAttribute = 12 WA_InputMethodEnabled WidgetAttribute = 14 WA_WState_Visible WidgetAttribute = 15 WA_WState_Hidden WidgetAttribute = 16 @@ -319,8 +290,6 @@ const ( WA_Moved WidgetAttribute = 43 WA_PendingUpdate WidgetAttribute = 44 WA_InvalidSize WidgetAttribute = 45 - WA_MacBrushedMetal WidgetAttribute = 46 - WA_MacMetalStyle WidgetAttribute = 46 WA_CustomWhatsThis WidgetAttribute = 47 WA_LayoutOnEntireRect WidgetAttribute = 48 WA_OutsideWSRange WidgetAttribute = 49 @@ -340,12 +309,10 @@ const ( WA_WState_Reparented WidgetAttribute = 63 WA_WState_ConfigPending WidgetAttribute = 64 WA_WState_Polished WidgetAttribute = 66 - WA_WState_DND WidgetAttribute = 67 WA_WState_OwnSizePolicy WidgetAttribute = 68 WA_WState_ExplicitShowHide WidgetAttribute = 69 WA_ShowModal WidgetAttribute = 70 WA_MouseNoMask WidgetAttribute = 71 - WA_GroupLeader WidgetAttribute = 72 WA_NoMousePropagation WidgetAttribute = 73 WA_Hover WidgetAttribute = 74 WA_InputMethodTransparent WidgetAttribute = 75 @@ -353,7 +320,6 @@ const ( WA_KeyboardFocusChange WidgetAttribute = 77 WA_AcceptDrops WidgetAttribute = 78 WA_DropSiteRegistered WidgetAttribute = 79 - WA_ForceAcceptDrops WidgetAttribute = 79 WA_WindowPropagation WidgetAttribute = 80 WA_NoX11EventCompression WidgetAttribute = 81 WA_TintedBackground WidgetAttribute = 82 @@ -368,7 +334,6 @@ const ( WA_MacMiniSize WidgetAttribute = 91 WA_LayoutUsesWidgetRect WidgetAttribute = 92 WA_StyledBackground WidgetAttribute = 93 - WA_MSWindowsUseDirect3D WidgetAttribute = 94 WA_CanHostQMdiSubWindowTitleBar WidgetAttribute = 95 WA_MacAlwaysShowToolWindow WidgetAttribute = 96 WA_StyleSheet WidgetAttribute = 97 @@ -376,7 +341,6 @@ const ( WA_X11BypassTransientForHint WidgetAttribute = 99 WA_NativeWindow WidgetAttribute = 100 WA_DontCreateNativeAncestors WidgetAttribute = 101 - WA_MacVariableSize WidgetAttribute = 102 WA_DontShowOnScreen WidgetAttribute = 103 WA_X11NetWmWindowTypeDesktop WidgetAttribute = 104 WA_X11NetWmWindowTypeDock WidgetAttribute = 105 @@ -391,7 +355,6 @@ const ( WA_X11NetWmWindowTypeNotification WidgetAttribute = 114 WA_X11NetWmWindowTypeCombo WidgetAttribute = 115 WA_X11NetWmWindowTypeDND WidgetAttribute = 116 - WA_MacFrameworkScaled WidgetAttribute = 117 WA_SetWindowModality WidgetAttribute = 118 WA_WState_WindowOpacitySet WidgetAttribute = 119 WA_TranslucentBackground WidgetAttribute = 120 @@ -399,7 +362,6 @@ const ( WA_WState_AcceptedTouchBeginEvent WidgetAttribute = 122 WA_TouchPadAcceptSingleTouchEvents WidgetAttribute = 123 WA_X11DoNotAcceptFocus WidgetAttribute = 126 - WA_MacNoShadow WidgetAttribute = 127 WA_AlwaysStackOnTop WidgetAttribute = 128 WA_TabletTracking WidgetAttribute = 129 WA_ContentsMarginsRespectsSafeArea WidgetAttribute = 130 @@ -410,18 +372,14 @@ const ( type ApplicationAttribute int const ( - AA_ImmediateWidgetCreation ApplicationAttribute = 0 - AA_MSWindowsUseDirect3DByDefault ApplicationAttribute = 1 AA_DontShowIconsInMenus ApplicationAttribute = 2 AA_NativeWindows ApplicationAttribute = 3 AA_DontCreateNativeWidgetSiblings ApplicationAttribute = 4 AA_PluginApplication ApplicationAttribute = 5 - AA_MacPluginApplication ApplicationAttribute = 5 AA_DontUseNativeMenuBar ApplicationAttribute = 6 AA_MacDontSwapCtrlAndMeta ApplicationAttribute = 7 AA_Use96Dpi ApplicationAttribute = 8 AA_DisableNativeVirtualKeyboard ApplicationAttribute = 9 - AA_X11InitThreads ApplicationAttribute = 10 AA_SynthesizeTouchForUnhandledMouseEvents ApplicationAttribute = 11 AA_SynthesizeMouseForUnhandledTouchEvents ApplicationAttribute = 12 AA_UseHighDpiPixmaps ApplicationAttribute = 13 @@ -441,7 +399,6 @@ const ( AA_DisableShaderDiskCache ApplicationAttribute = 27 AA_DontShowShortcutsInContextMenus ApplicationAttribute = 28 AA_CompressTabletEvents ApplicationAttribute = 29 - AA_DisableWindowContextHelpButton ApplicationAttribute = 30 AA_DisableSessionManager ApplicationAttribute = 31 AA_AttributeCount ApplicationAttribute = 32 ) @@ -480,76 +437,6 @@ const ( type Key int const ( - Key_Escape Key = 16777216 - Key_Tab Key = 16777217 - Key_Backtab Key = 16777218 - Key_Backspace Key = 16777219 - Key_Return Key = 16777220 - Key_Enter Key = 16777221 - Key_Insert Key = 16777222 - Key_Delete Key = 16777223 - Key_Pause Key = 16777224 - Key_Print Key = 16777225 - Key_SysReq Key = 16777226 - Key_Clear Key = 16777227 - Key_Home Key = 16777232 - Key_End Key = 16777233 - Key_Left Key = 16777234 - Key_Up Key = 16777235 - Key_Right Key = 16777236 - Key_Down Key = 16777237 - Key_PageUp Key = 16777238 - Key_PageDown Key = 16777239 - Key_Shift Key = 16777248 - Key_Control Key = 16777249 - Key_Meta Key = 16777250 - Key_Alt Key = 16777251 - Key_CapsLock Key = 16777252 - Key_NumLock Key = 16777253 - Key_ScrollLock Key = 16777254 - Key_F1 Key = 16777264 - Key_F2 Key = 16777265 - Key_F3 Key = 16777266 - Key_F4 Key = 16777267 - Key_F5 Key = 16777268 - Key_F6 Key = 16777269 - Key_F7 Key = 16777270 - Key_F8 Key = 16777271 - Key_F9 Key = 16777272 - Key_F10 Key = 16777273 - Key_F11 Key = 16777274 - Key_F12 Key = 16777275 - Key_F13 Key = 16777276 - Key_F14 Key = 16777277 - Key_F15 Key = 16777278 - Key_F16 Key = 16777279 - Key_F17 Key = 16777280 - Key_F18 Key = 16777281 - Key_F19 Key = 16777282 - Key_F20 Key = 16777283 - Key_F21 Key = 16777284 - Key_F22 Key = 16777285 - Key_F23 Key = 16777286 - Key_F24 Key = 16777287 - Key_F25 Key = 16777288 - Key_F26 Key = 16777289 - Key_F27 Key = 16777290 - Key_F28 Key = 16777291 - Key_F29 Key = 16777292 - Key_F30 Key = 16777293 - Key_F31 Key = 16777294 - Key_F32 Key = 16777295 - Key_F33 Key = 16777296 - Key_F34 Key = 16777297 - Key_F35 Key = 16777298 - Key_Super_L Key = 16777299 - Key_Super_R Key = 16777300 - Key_Menu Key = 16777301 - Key_Hyper_L Key = 16777302 - Key_Hyper_R Key = 16777303 - Key_Help Key = 16777304 - Key_Direction_L Key = 16777305 - Key_Direction_R Key = 16777312 Key_Space Key = 32 Key_Any Key = 32 Key_Exclam Key = 33 @@ -686,6 +573,76 @@ const ( Key_ssharp Key = 223 Key_division Key = 247 Key_ydiaeresis Key = 255 + Key_Escape Key = 16777216 + Key_Tab Key = 16777217 + Key_Backtab Key = 16777218 + Key_Backspace Key = 16777219 + Key_Return Key = 16777220 + Key_Enter Key = 16777221 + Key_Insert Key = 16777222 + Key_Delete Key = 16777223 + Key_Pause Key = 16777224 + Key_Print Key = 16777225 + Key_SysReq Key = 16777226 + Key_Clear Key = 16777227 + Key_Home Key = 16777232 + Key_End Key = 16777233 + Key_Left Key = 16777234 + Key_Up Key = 16777235 + Key_Right Key = 16777236 + Key_Down Key = 16777237 + Key_PageUp Key = 16777238 + Key_PageDown Key = 16777239 + Key_Shift Key = 16777248 + Key_Control Key = 16777249 + Key_Meta Key = 16777250 + Key_Alt Key = 16777251 + Key_CapsLock Key = 16777252 + Key_NumLock Key = 16777253 + Key_ScrollLock Key = 16777254 + Key_F1 Key = 16777264 + Key_F2 Key = 16777265 + Key_F3 Key = 16777266 + Key_F4 Key = 16777267 + Key_F5 Key = 16777268 + Key_F6 Key = 16777269 + Key_F7 Key = 16777270 + Key_F8 Key = 16777271 + Key_F9 Key = 16777272 + Key_F10 Key = 16777273 + Key_F11 Key = 16777274 + Key_F12 Key = 16777275 + Key_F13 Key = 16777276 + Key_F14 Key = 16777277 + Key_F15 Key = 16777278 + Key_F16 Key = 16777279 + Key_F17 Key = 16777280 + Key_F18 Key = 16777281 + Key_F19 Key = 16777282 + Key_F20 Key = 16777283 + Key_F21 Key = 16777284 + Key_F22 Key = 16777285 + Key_F23 Key = 16777286 + Key_F24 Key = 16777287 + Key_F25 Key = 16777288 + Key_F26 Key = 16777289 + Key_F27 Key = 16777290 + Key_F28 Key = 16777291 + Key_F29 Key = 16777292 + Key_F30 Key = 16777293 + Key_F31 Key = 16777294 + Key_F32 Key = 16777295 + Key_F33 Key = 16777296 + Key_F34 Key = 16777297 + Key_F35 Key = 16777298 + Key_Super_L Key = 16777299 + Key_Super_R Key = 16777300 + Key_Menu Key = 16777301 + Key_Hyper_L Key = 16777302 + Key_Hyper_R Key = 16777303 + Key_Help Key = 16777304 + Key_Direction_L Key = 16777305 + Key_Direction_R Key = 16777312 Key_AltGr Key = 16781571 Key_Multi_key Key = 16781600 Key_Codeinput Key = 16781623 @@ -951,6 +908,29 @@ const ( Key_unknown Key = 33554431 ) +type KeyboardModifier int + +const ( + NoModifier KeyboardModifier = 0 + ShiftModifier KeyboardModifier = 33554432 + ControlModifier KeyboardModifier = 67108864 + AltModifier KeyboardModifier = 134217728 + MetaModifier KeyboardModifier = 268435456 + KeypadModifier KeyboardModifier = 536870912 + GroupSwitchModifier KeyboardModifier = 1073741824 + KeyboardModifierMask KeyboardModifier = 4261412864 +) + +type Modifier int + +const ( + META Modifier = 268435456 + SHIFT Modifier = 33554432 + CTRL Modifier = 67108864 + ALT Modifier = 134217728 + MODIFIER_MASK Modifier = 4261412864 +) + type ArrowType int const ( @@ -1122,17 +1102,10 @@ const ( type DateFormat int const ( - TextDate DateFormat = 0 - ISODate DateFormat = 1 - SystemLocaleDate DateFormat = 2 - LocalDate DateFormat = 2 - LocaleDate DateFormat = 3 - SystemLocaleShortDate DateFormat = 4 - SystemLocaleLongDate DateFormat = 5 - DefaultLocaleShortDate DateFormat = 6 - DefaultLocaleLongDate DateFormat = 7 - RFC2822Date DateFormat = 8 - ISODateWithMs DateFormat = 9 + TextDate DateFormat = 0 + ISODate DateFormat = 1 + RFC2822Date DateFormat = 8 + ISODateWithMs DateFormat = 9 ) type TimeSpec int @@ -1197,6 +1170,7 @@ const ( QueuedConnection ConnectionType = 2 BlockingQueuedConnection ConnectionType = 3 UniqueConnection ConnectionType = 128 + SingleShotConnection ConnectionType = 256 ) type ShortcutContext int @@ -1290,7 +1264,6 @@ type InputMethodQuery int const ( ImEnabled InputMethodQuery = 1 ImCursorRectangle InputMethodQuery = 2 - ImMicroFocus InputMethodQuery = 2 ImFont InputMethodQuery = 4 ImCursorPosition InputMethodQuery = 8 ImSurroundingText InputMethodQuery = 16 @@ -1305,6 +1278,7 @@ const ( ImEnterKeyType InputMethodQuery = 8192 ImAnchorRectangle InputMethodQuery = 16384 ImInputItemClipRectangle InputMethodQuery = 32768 + ImReadOnly InputMethodQuery = 65536 ImPlatformData InputMethodQuery = 2147483648 ImQueryInput InputMethodQuery = 16570 ImQueryAll InputMethodQuery = 4294967295 @@ -1419,8 +1393,6 @@ const ( TextAlignmentRole ItemDataRole = 7 BackgroundRole ItemDataRole = 8 ForegroundRole ItemDataRole = 9 - BackgroundColorRole ItemDataRole = 8 - TextColorRole ItemDataRole = 9 CheckStateRole ItemDataRole = 10 AccessibleTextRole ItemDataRole = 11 AccessibleDescriptionRole ItemDataRole = 12 @@ -1445,7 +1417,6 @@ const ( ItemIsUserCheckable ItemFlag = 16 ItemIsEnabled ItemFlag = 32 ItemIsAutoTristate ItemFlag = 64 - ItemIsTristate ItemFlag = 64 ItemNeverHasChildren ItemFlag = 128 ItemIsUserTristate ItemFlag = 256 ) @@ -1457,10 +1428,10 @@ const ( MatchContains MatchFlag = 1 MatchStartsWith MatchFlag = 2 MatchEndsWith MatchFlag = 3 - MatchRegExp MatchFlag = 4 + MatchRegularExpression MatchFlag = 4 MatchWildcard MatchFlag = 5 MatchFixedString MatchFlag = 8 - MatchRegularExpression MatchFlag = 9 + MatchTypeMask MatchFlag = 15 MatchCaseSensitive MatchFlag = 16 MatchWrap MatchFlag = 32 MatchRecursive MatchFlag = 64 @@ -1536,10 +1507,11 @@ const ( type TouchPointState int const ( - TouchPointPressed TouchPointState = 1 - TouchPointMoved TouchPointState = 2 - TouchPointStationary TouchPointState = 4 - TouchPointReleased TouchPointState = 8 + TouchPointUnknownState TouchPointState = 0 + TouchPointPressed TouchPointState = 1 + TouchPointMoved TouchPointState = 2 + TouchPointStationary TouchPointState = 4 + TouchPointReleased TouchPointState = 8 ) type GestureState int @@ -1631,6 +1603,7 @@ const ( type MouseEventFlag int const ( + NoMouseEventFlag MouseEventFlag = 0 MouseEventCreatedDoubleClick MouseEventFlag = 1 MouseEventFlagMask MouseEventFlag = 255 ) @@ -1671,7 +1644,6 @@ const ( QInternal__PaintDeviceFlags__Pbuffer QInternal__PaintDeviceFlags = 6 QInternal__PaintDeviceFlags__FramebufferObject QInternal__PaintDeviceFlags = 7 QInternal__PaintDeviceFlags__CustomRaster QInternal__PaintDeviceFlags = 8 - QInternal__PaintDeviceFlags__MacQuartz QInternal__PaintDeviceFlags = 9 QInternal__PaintDeviceFlags__PaintBuffer QInternal__PaintDeviceFlags = 10 QInternal__PaintDeviceFlags__OpenGL QInternal__PaintDeviceFlags = 11 ) @@ -1701,6 +1673,54 @@ const ( QInternal__LastCallback QInternal__Callback = 1 ) +type Disambiguated_t struct { + h *C.Disambiguated_t +} + +func (this *Disambiguated_t) cPointer() *C.Disambiguated_t { + if this == nil { + return nil + } + return this.h +} + +func newDisambiguated_t(h *C.Disambiguated_t) *Disambiguated_t { + if h == nil { + return nil + } + return &Disambiguated_t{h: h} +} + +func newDisambiguated_t_U(h unsafe.Pointer) *Disambiguated_t { + return newDisambiguated_t((*C.Disambiguated_t)(h)) +} + +// NewDisambiguated_t constructs a new Qt::Disambiguated_t object. +func NewDisambiguated_t() *Disambiguated_t { + ret := C.Disambiguated_t_new() + return newDisambiguated_t(ret) +} + +// NewDisambiguated_t2 constructs a new Qt::Disambiguated_t object. +func NewDisambiguated_t2(param1 *Disambiguated_t) *Disambiguated_t { + ret := C.Disambiguated_t_new2(param1.cPointer()) + return newDisambiguated_t(ret) +} + +// Delete this object from C++ memory. +func (this *Disambiguated_t) Delete() { + C.Disambiguated_t_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *Disambiguated_t) GoGC() { + runtime.SetFinalizer(this, func(this *Disambiguated_t) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + type QInternal struct { h *C.QInternal } @@ -1736,3 +1756,100 @@ func (this *QInternal) GoGC() { runtime.KeepAlive(this.h) }) } + +type QKeyCombination struct { + h *C.QKeyCombination +} + +func (this *QKeyCombination) cPointer() *C.QKeyCombination { + if this == nil { + return nil + } + return this.h +} + +func newQKeyCombination(h *C.QKeyCombination) *QKeyCombination { + if h == nil { + return nil + } + return &QKeyCombination{h: h} +} + +func newQKeyCombination_U(h unsafe.Pointer) *QKeyCombination { + return newQKeyCombination((*C.QKeyCombination)(h)) +} + +// NewQKeyCombination constructs a new QKeyCombination object. +func NewQKeyCombination() *QKeyCombination { + ret := C.QKeyCombination_new() + return newQKeyCombination(ret) +} + +// NewQKeyCombination2 constructs a new QKeyCombination object. +func NewQKeyCombination2(modifiers Modifier) *QKeyCombination { + ret := C.QKeyCombination_new2((C.int)(modifiers)) + return newQKeyCombination(ret) +} + +// NewQKeyCombination3 constructs a new QKeyCombination object. +func NewQKeyCombination3(modifiers KeyboardModifier) *QKeyCombination { + ret := C.QKeyCombination_new3((C.int)(modifiers)) + return newQKeyCombination(ret) +} + +// NewQKeyCombination4 constructs a new QKeyCombination object. +func NewQKeyCombination4(param1 *QKeyCombination) *QKeyCombination { + ret := C.QKeyCombination_new4(param1.cPointer()) + return newQKeyCombination(ret) +} + +// NewQKeyCombination5 constructs a new QKeyCombination object. +func NewQKeyCombination5(key Key) *QKeyCombination { + ret := C.QKeyCombination_new5((C.int)(key)) + return newQKeyCombination(ret) +} + +// NewQKeyCombination6 constructs a new QKeyCombination object. +func NewQKeyCombination6(modifiers Modifier, key Key) *QKeyCombination { + ret := C.QKeyCombination_new6((C.int)(modifiers), (C.int)(key)) + return newQKeyCombination(ret) +} + +// NewQKeyCombination7 constructs a new QKeyCombination object. +func NewQKeyCombination7(modifiers KeyboardModifier, key Key) *QKeyCombination { + ret := C.QKeyCombination_new7((C.int)(modifiers), (C.int)(key)) + return newQKeyCombination(ret) +} + +func (this *QKeyCombination) KeyboardModifiers() KeyboardModifier { + return (KeyboardModifier)(C.QKeyCombination_KeyboardModifiers(this.h)) +} + +func (this *QKeyCombination) Key() Key { + return (Key)(C.QKeyCombination_Key(this.h)) +} + +func QKeyCombination_FromCombined(combined int) *QKeyCombination { + _ret := C.QKeyCombination_FromCombined((C.int)(combined)) + _goptr := newQKeyCombination(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QKeyCombination) ToCombined() int { + return (int)(C.QKeyCombination_ToCombined(this.h)) +} + +// Delete this object from C++ memory. +func (this *QKeyCombination) Delete() { + C.QKeyCombination_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QKeyCombination) GoGC() { + runtime.SetFinalizer(this, func(this *QKeyCombination) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} diff --git a/qt/gen_qnamespace.h b/qt/gen_qnamespace.h index acebe7f..8bd74ca 100644 --- a/qt/gen_qnamespace.h +++ b/qt/gen_qnamespace.h @@ -15,12 +15,37 @@ extern "C" { #ifdef __cplusplus class QInternal; +class QKeyCombination; +#if defined(WORKAROUND_INNER_CLASS_DEFINITION_Disambiguated_t) +typedef Qt::Disambiguated_t Disambiguated_t; +#else +class Disambiguated_t; +#endif #else typedef struct QInternal QInternal; +typedef struct QKeyCombination QKeyCombination; +typedef struct Disambiguated_t Disambiguated_t; #endif +Disambiguated_t* Disambiguated_t_new(); +Disambiguated_t* Disambiguated_t_new2(Disambiguated_t* param1); +void Disambiguated_t_Delete(Disambiguated_t* self); + void QInternal_Delete(QInternal* self); +QKeyCombination* QKeyCombination_new(); +QKeyCombination* QKeyCombination_new2(int modifiers); +QKeyCombination* QKeyCombination_new3(int modifiers); +QKeyCombination* QKeyCombination_new4(QKeyCombination* param1); +QKeyCombination* QKeyCombination_new5(int key); +QKeyCombination* QKeyCombination_new6(int modifiers, int key); +QKeyCombination* QKeyCombination_new7(int modifiers, int key); +int QKeyCombination_KeyboardModifiers(const QKeyCombination* self); +int QKeyCombination_Key(const QKeyCombination* self); +QKeyCombination* QKeyCombination_FromCombined(int combined); +int QKeyCombination_ToCombined(const QKeyCombination* self); +void QKeyCombination_Delete(QKeyCombination* self); + #ifdef __cplusplus } /* extern C */ #endif diff --git a/qt/gen_qobject.cpp b/qt/gen_qobject.cpp index bb72a41..329edfe 100644 --- a/qt/gen_qobject.cpp +++ b/qt/gen_qobject.cpp @@ -1,3 +1,5 @@ +#include +#include #include #include #include @@ -6,7 +8,6 @@ #define WORKAROUND_INNER_CLASS_DEFINITION_QMetaObject__Connection #include #include -#include #include #include #include @@ -48,13 +49,6 @@ struct miqt_string* QObject_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QObject_TrUtf8(const char* s) { - QString _ret = QObject::trUtf8(s); - // 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()); -} - bool QObject_Event(QObject* self, QEvent* event) { return self->event(event); } @@ -70,9 +64,8 @@ struct miqt_string* QObject_ObjectName(const QObject* self) { return miqt_strdup(_b.data(), _b.length()); } -void QObject_SetObjectName(QObject* self, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); - self->setObjectName(name_QString); +void QObject_SetObjectName(QObject* self, QAnyStringView* name) { + self->setObjectName(*name); } bool QObject_IsWidgetType(const QObject* self) { @@ -83,6 +76,10 @@ bool QObject_IsWindowType(const QObject* self) { return self->isWindowType(); } +bool QObject_IsQuickItemType(const QObject* self) { + return self->isQuickItemType(); +} + bool QObject_SignalsBlocked(const QObject* self) { return self->signalsBlocked(); } @@ -148,19 +145,11 @@ bool QObject_DisconnectWithQMetaObjectConnection(QMetaObject__Connection* param1 return QObject::disconnect(*param1); } -void QObject_DumpObjectTree(QObject* self) { +void QObject_DumpObjectTree(const QObject* self) { self->dumpObjectTree(); } -void QObject_DumpObjectInfo(QObject* self) { - self->dumpObjectInfo(); -} - -void QObject_DumpObjectTree2(const QObject* self) { - self->dumpObjectTree(); -} - -void QObject_DumpObjectInfo2(const QObject* self) { +void QObject_DumpObjectInfo(const QObject* self) { self->dumpObjectInfo(); } @@ -185,17 +174,12 @@ struct miqt_array* QObject_DynamicPropertyNames(const QObject* self) { return _out; } -unsigned int QObject_RegisterUserData() { - uint _ret = QObject::registerUserData(); - return static_cast(_ret); +QBindingStorage* QObject_BindingStorage(QObject* self) { + return self->bindingStorage(); } -void QObject_SetUserData(QObject* self, unsigned int id, QObjectUserData* data) { - self->setUserData(static_cast(id), data); -} - -QObjectUserData* QObject_UserData(const QObject* self, unsigned int id) { - return self->userData(static_cast(id)); +QBindingStorage* QObject_BindingStorage2(const QObject* self) { + return (QBindingStorage*) self->bindingStorage(); } void QObject_Destroyed(QObject* self) { @@ -234,20 +218,6 @@ struct miqt_string* QObject_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QObject_TrUtf82(const char* s, const char* c) { - QString _ret = QObject::trUtf8(s, c); - // 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* QObject_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QObject::trUtf8(s, c, static_cast(n)); - // 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()); -} - int QObject_StartTimer2(QObject* self, int interval, int timerType) { return self->startTimer(static_cast(interval), static_cast(timerType)); } @@ -275,14 +245,6 @@ void QObject_Delete(QObject* self) { delete self; } -QObjectUserData* QObjectUserData_new() { - return new QObjectUserData(); -} - -void QObjectUserData_Delete(QObjectUserData* self) { - delete self; -} - QSignalBlocker* QSignalBlocker_new(QObject* o) { return new QSignalBlocker(o); } diff --git a/qt/gen_qobject.go b/qt/gen_qobject.go index c115095..991112a 100644 --- a/qt/gen_qobject.go +++ b/qt/gen_qobject.go @@ -113,15 +113,6 @@ func QObject_Tr(s string) string { return _ret } -func QObject_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QObject_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QObject) Event(event *QEvent) bool { return (bool)(C.QObject_Event(this.h, event.cPointer())) } @@ -137,10 +128,8 @@ func (this *QObject) ObjectName() string { return _ret } -func (this *QObject) SetObjectName(name string) { - name_ms := miqt_strdupg(name) - defer C.free(name_ms) - C.QObject_SetObjectName(this.h, (*C.struct_miqt_string)(name_ms)) +func (this *QObject) SetObjectName(name QAnyStringView) { + C.QObject_SetObjectName(this.h, name.cPointer()) } func (this *QObject) IsWidgetType() bool { @@ -151,6 +140,10 @@ func (this *QObject) IsWindowType() bool { return (bool)(C.QObject_IsWindowType(this.h)) } +func (this *QObject) IsQuickItemType() bool { + return (bool)(C.QObject_IsQuickItemType(this.h)) +} + func (this *QObject) SignalsBlocked() bool { return (bool)(C.QObject_SignalsBlocked(this.h)) } @@ -232,14 +225,6 @@ func (this *QObject) DumpObjectInfo() { C.QObject_DumpObjectInfo(this.h) } -func (this *QObject) DumpObjectTree2() { - C.QObject_DumpObjectTree2(this.h) -} - -func (this *QObject) DumpObjectInfo2() { - C.QObject_DumpObjectInfo2(this.h) -} - func (this *QObject) SetProperty(name string, value *QVariant) bool { name_Cstring := C.CString(name) defer C.free(unsafe.Pointer(name_Cstring)) @@ -269,16 +254,12 @@ func (this *QObject) DynamicPropertyNames() []QByteArray { return _ret } -func QObject_RegisterUserData() uint { - return (uint)(C.QObject_RegisterUserData()) +func (this *QObject) BindingStorage() *QBindingStorage { + return newQBindingStorage_U(unsafe.Pointer(C.QObject_BindingStorage(this.h))) } -func (this *QObject) SetUserData(id uint, data *QObjectUserData) { - C.QObject_SetUserData(this.h, (C.uint)(id), data.cPointer()) -} - -func (this *QObject) UserData(id uint) *QObjectUserData { - return newQObjectUserData_U(unsafe.Pointer(C.QObject_UserData(this.h, (C.uint)(id)))) +func (this *QObject) BindingStorage2() *QBindingStorage { + return newQBindingStorage_U(unsafe.Pointer(C.QObject_BindingStorage2(this.h))) } func (this *QObject) Destroyed() { @@ -334,28 +315,6 @@ func QObject_Tr3(s string, c string, n int) string { return _ret } -func QObject_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QObject_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QObject_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QObject_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QObject) StartTimer2(interval int, timerType TimerType) int { return (int)(C.QObject_StartTimer2(this.h, (C.int)(interval), (C.int)(timerType))) } @@ -412,48 +371,6 @@ func (this *QObject) GoGC() { }) } -type QObjectUserData struct { - h *C.QObjectUserData -} - -func (this *QObjectUserData) cPointer() *C.QObjectUserData { - if this == nil { - return nil - } - return this.h -} - -func newQObjectUserData(h *C.QObjectUserData) *QObjectUserData { - if h == nil { - return nil - } - return &QObjectUserData{h: h} -} - -func newQObjectUserData_U(h unsafe.Pointer) *QObjectUserData { - return newQObjectUserData((*C.QObjectUserData)(h)) -} - -// NewQObjectUserData constructs a new QObjectUserData object. -func NewQObjectUserData() *QObjectUserData { - ret := C.QObjectUserData_new() - return newQObjectUserData(ret) -} - -// Delete this object from C++ memory. -func (this *QObjectUserData) Delete() { - C.QObjectUserData_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QObjectUserData) GoGC() { - runtime.SetFinalizer(this, func(this *QObjectUserData) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} - type QSignalBlocker struct { h *C.QSignalBlocker } diff --git a/qt/gen_qobject.h b/qt/gen_qobject.h index 5f8a566..bdff0aa 100644 --- a/qt/gen_qobject.h +++ b/qt/gen_qobject.h @@ -14,6 +14,8 @@ extern "C" { #endif #ifdef __cplusplus +class QAnyStringView; +class QBindingStorage; class QByteArray; class QEvent; class QMetaMethod; @@ -25,11 +27,12 @@ class QMetaObject__Connection; #endif class QObject; class QObjectData; -class QObjectUserData; class QSignalBlocker; class QThread; class QVariant; #else +typedef struct QAnyStringView QAnyStringView; +typedef struct QBindingStorage QBindingStorage; typedef struct QByteArray QByteArray; typedef struct QEvent QEvent; typedef struct QMetaMethod QMetaMethod; @@ -37,7 +40,6 @@ typedef struct QMetaObject QMetaObject; typedef struct QMetaObject__Connection QMetaObject__Connection; typedef struct QObject QObject; typedef struct QObjectData QObjectData; -typedef struct QObjectUserData QObjectUserData; typedef struct QSignalBlocker QSignalBlocker; typedef struct QThread QThread; typedef struct QVariant QVariant; @@ -51,13 +53,13 @@ QObject* QObject_new2(QObject* parent); QMetaObject* QObject_MetaObject(const QObject* self); void* QObject_Metacast(QObject* self, const char* param1); struct miqt_string* QObject_Tr(const char* s); -struct miqt_string* QObject_TrUtf8(const char* s); bool QObject_Event(QObject* self, QEvent* event); bool QObject_EventFilter(QObject* self, QObject* watched, QEvent* event); struct miqt_string* QObject_ObjectName(const QObject* self); -void QObject_SetObjectName(QObject* self, struct miqt_string* name); +void QObject_SetObjectName(QObject* self, QAnyStringView* name); bool QObject_IsWidgetType(const QObject* self); bool QObject_IsWindowType(const QObject* self); +bool QObject_IsQuickItemType(const QObject* self); bool QObject_SignalsBlocked(const QObject* self); bool QObject_BlockSignals(QObject* self, bool b); QThread* QObject_Thread(const QObject* self); @@ -72,16 +74,13 @@ QMetaObject__Connection* QObject_Connect(QObject* sender, QMetaMethod* signal, Q QMetaObject__Connection* QObject_Connect2(const QObject* self, QObject* sender, const char* signal, const char* member); bool QObject_Disconnect(QObject* sender, QMetaMethod* signal, QObject* receiver, QMetaMethod* member); bool QObject_DisconnectWithQMetaObjectConnection(QMetaObject__Connection* param1); -void QObject_DumpObjectTree(QObject* self); -void QObject_DumpObjectInfo(QObject* self); -void QObject_DumpObjectTree2(const QObject* self); -void QObject_DumpObjectInfo2(const QObject* self); +void QObject_DumpObjectTree(const QObject* self); +void QObject_DumpObjectInfo(const QObject* self); bool QObject_SetProperty(QObject* self, const char* name, QVariant* value); QVariant* QObject_Property(const QObject* self, const char* name); struct miqt_array* QObject_DynamicPropertyNames(const QObject* self); -unsigned int QObject_RegisterUserData(); -void QObject_SetUserData(QObject* self, unsigned int id, QObjectUserData* data); -QObjectUserData* QObject_UserData(const QObject* self, unsigned int id); +QBindingStorage* QObject_BindingStorage(QObject* self); +QBindingStorage* QObject_BindingStorage2(const QObject* self); void QObject_Destroyed(QObject* self); void QObject_connect_Destroyed(QObject* self, void* slot); QObject* QObject_Parent(const QObject* self); @@ -89,8 +88,6 @@ bool QObject_Inherits(const QObject* self, const char* classname); void QObject_DeleteLater(QObject* self); 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, 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); @@ -98,9 +95,6 @@ void QObject_Destroyed1(QObject* self, QObject* param1); void QObject_connect_Destroyed1(QObject* self, void* slot); void QObject_Delete(QObject* self); -QObjectUserData* QObjectUserData_new(); -void QObjectUserData_Delete(QObjectUserData* self); - QSignalBlocker* QSignalBlocker_new(QObject* o); QSignalBlocker* QSignalBlocker_new2(QObject* o); void QSignalBlocker_Reblock(QSignalBlocker* self); diff --git a/qt/gen_qobjectcleanuphandler.cpp b/qt/gen_qobjectcleanuphandler.cpp index 5d9280e..7b8305d 100644 --- a/qt/gen_qobjectcleanuphandler.cpp +++ b/qt/gen_qobjectcleanuphandler.cpp @@ -27,13 +27,6 @@ struct miqt_string* QObjectCleanupHandler_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QObjectCleanupHandler_TrUtf8(const char* s) { - QString _ret = QObjectCleanupHandler::trUtf8(s); - // 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()); -} - QObject* QObjectCleanupHandler_Add(QObjectCleanupHandler* self, QObject* object) { return self->add(object); } @@ -64,20 +57,6 @@ struct miqt_string* QObjectCleanupHandler_Tr3(const char* s, const char* c, int return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QObjectCleanupHandler_TrUtf82(const char* s, const char* c) { - QString _ret = QObjectCleanupHandler::trUtf8(s, c); - // 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* QObjectCleanupHandler_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QObjectCleanupHandler::trUtf8(s, c, static_cast(n)); - // 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 QObjectCleanupHandler_Delete(QObjectCleanupHandler* self) { delete self; } diff --git a/qt/gen_qobjectcleanuphandler.go b/qt/gen_qobjectcleanuphandler.go index 82a4483..7bbbe87 100644 --- a/qt/gen_qobjectcleanuphandler.go +++ b/qt/gen_qobjectcleanuphandler.go @@ -61,15 +61,6 @@ func QObjectCleanupHandler_Tr(s string) string { return _ret } -func QObjectCleanupHandler_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QObjectCleanupHandler_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QObjectCleanupHandler) Add(object *QObject) *QObject { return newQObject_U(unsafe.Pointer(C.QObjectCleanupHandler_Add(this.h, object.cPointer()))) } @@ -108,28 +99,6 @@ func QObjectCleanupHandler_Tr3(s string, c string, n int) string { return _ret } -func QObjectCleanupHandler_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QObjectCleanupHandler_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QObjectCleanupHandler_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QObjectCleanupHandler_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QObjectCleanupHandler) Delete() { C.QObjectCleanupHandler_Delete(this.h) diff --git a/qt/gen_qobjectcleanuphandler.h b/qt/gen_qobjectcleanuphandler.h index 462d30f..cd3bb8f 100644 --- a/qt/gen_qobjectcleanuphandler.h +++ b/qt/gen_qobjectcleanuphandler.h @@ -27,15 +27,12 @@ QObjectCleanupHandler* QObjectCleanupHandler_new(); QMetaObject* QObjectCleanupHandler_MetaObject(const QObjectCleanupHandler* self); void* QObjectCleanupHandler_Metacast(QObjectCleanupHandler* self, const char* param1); struct miqt_string* QObjectCleanupHandler_Tr(const char* s); -struct miqt_string* QObjectCleanupHandler_TrUtf8(const char* s); QObject* QObjectCleanupHandler_Add(QObjectCleanupHandler* self, QObject* object); void QObjectCleanupHandler_Remove(QObjectCleanupHandler* self, QObject* object); bool QObjectCleanupHandler_IsEmpty(const QObjectCleanupHandler* self); void QObjectCleanupHandler_Clear(QObjectCleanupHandler* self); struct miqt_string* QObjectCleanupHandler_Tr2(const char* s, const char* c); struct miqt_string* QObjectCleanupHandler_Tr3(const char* s, const char* c, int n); -struct miqt_string* QObjectCleanupHandler_TrUtf82(const char* s, const char* c); -struct miqt_string* QObjectCleanupHandler_TrUtf83(const char* s, const char* c, int n); void QObjectCleanupHandler_Delete(QObjectCleanupHandler* self); #ifdef __cplusplus diff --git a/qt/gen_qobjectdefs.cpp b/qt/gen_qobjectdefs.cpp index af3ed77..8a86b98 100644 --- a/qt/gen_qobjectdefs.cpp +++ b/qt/gen_qobjectdefs.cpp @@ -6,8 +6,11 @@ #include #include #define WORKAROUND_INNER_CLASS_DEFINITION_QMetaObject__Connection +#define WORKAROUND_INNER_CLASS_DEFINITION_QMetaObject__Data #define WORKAROUND_INNER_CLASS_DEFINITION_QMetaObject__SuperData #include +#include +#include #include #include #include @@ -16,6 +19,10 @@ #include "gen_qobjectdefs.h" #include "_cgo_export.h" +void QMethodRawArguments_Delete(QMethodRawArguments* self) { + delete self; +} + QGenericArgument* QGenericArgument_new() { return new QGenericArgument(); } @@ -99,6 +106,10 @@ struct miqt_string* QMetaObject_Tr(const QMetaObject* self, const char* s, const return miqt_strdup(_b.data(), _b.length()); } +QMetaType* QMetaObject_MetaType(const QMetaObject* self) { + return new QMetaType(self->metaType()); +} + int QMetaObject_MethodOffset(const QMetaObject* self) { return self->methodOffset(); } @@ -470,6 +481,10 @@ void QMetaObject__Connection_OperatorAssign(QMetaObject__Connection* self, QMeta self->operator=(*other); } +void QMetaObject__Connection_Swap(QMetaObject__Connection* self, QMetaObject__Connection* other) { + self->swap(*other); +} + void QMetaObject__Connection_Delete(QMetaObject__Connection* self) { delete self; } @@ -498,3 +513,19 @@ void QMetaObject__SuperData_Delete(QMetaObject__SuperData* self) { delete self; } +QMetaObject__Data* QMetaObject__Data_new() { + return new QMetaObject::Data(); +} + +QMetaObject__Data* QMetaObject__Data_new2(QMetaObject__Data* param1) { + return new QMetaObject::Data(*param1); +} + +void QMetaObject__Data_OperatorAssign(QMetaObject__Data* self, QMetaObject__Data* param1) { + self->operator=(*param1); +} + +void QMetaObject__Data_Delete(QMetaObject__Data* self) { + delete self; +} + diff --git a/qt/gen_qobjectdefs.go b/qt/gen_qobjectdefs.go index f89b34a..0f80592 100644 --- a/qt/gen_qobjectdefs.go +++ b/qt/gen_qobjectdefs.go @@ -20,17 +20,50 @@ const ( QMetaObject__ReadProperty QMetaObject__Call = 1 QMetaObject__WriteProperty QMetaObject__Call = 2 QMetaObject__ResetProperty QMetaObject__Call = 3 - QMetaObject__QueryPropertyDesignable QMetaObject__Call = 4 - QMetaObject__QueryPropertyScriptable QMetaObject__Call = 5 - QMetaObject__QueryPropertyStored QMetaObject__Call = 6 - QMetaObject__QueryPropertyEditable QMetaObject__Call = 7 - QMetaObject__QueryPropertyUser QMetaObject__Call = 8 - QMetaObject__CreateInstance QMetaObject__Call = 9 - QMetaObject__IndexOfMethod QMetaObject__Call = 10 - QMetaObject__RegisterPropertyMetaType QMetaObject__Call = 11 - QMetaObject__RegisterMethodArgumentMetaType QMetaObject__Call = 12 + QMetaObject__CreateInstance QMetaObject__Call = 4 + QMetaObject__IndexOfMethod QMetaObject__Call = 5 + QMetaObject__RegisterPropertyMetaType QMetaObject__Call = 6 + QMetaObject__RegisterMethodArgumentMetaType QMetaObject__Call = 7 + QMetaObject__BindableProperty QMetaObject__Call = 8 + QMetaObject__CustomCall QMetaObject__Call = 9 ) +type QMethodRawArguments struct { + h *C.QMethodRawArguments +} + +func (this *QMethodRawArguments) cPointer() *C.QMethodRawArguments { + if this == nil { + return nil + } + return this.h +} + +func newQMethodRawArguments(h *C.QMethodRawArguments) *QMethodRawArguments { + if h == nil { + return nil + } + return &QMethodRawArguments{h: h} +} + +func newQMethodRawArguments_U(h unsafe.Pointer) *QMethodRawArguments { + return newQMethodRawArguments((*C.QMethodRawArguments)(h)) +} + +// Delete this object from C++ memory. +func (this *QMethodRawArguments) Delete() { + C.QMethodRawArguments_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QMethodRawArguments) GoGC() { + runtime.SetFinalizer(this, func(this *QMethodRawArguments) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + type QGenericArgument struct { h *C.QGenericArgument } @@ -235,6 +268,13 @@ func (this *QMetaObject) Tr(s string, c string) string { return _ret } +func (this *QMetaObject) MetaType() *QMetaType { + _ret := C.QMetaObject_MetaType(this.h) + _goptr := newQMetaType(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + func (this *QMetaObject) MethodOffset() int { return (int)(C.QMetaObject_MethodOffset(this.h)) } @@ -789,6 +829,10 @@ func (this *QMetaObject__Connection) OperatorAssign(other *QMetaObject__Connecti C.QMetaObject__Connection_OperatorAssign(this.h, other.cPointer()) } +func (this *QMetaObject__Connection) Swap(other *QMetaObject__Connection) { + C.QMetaObject__Connection_Swap(this.h, other.cPointer()) +} + // Delete this object from C++ memory. func (this *QMetaObject__Connection) Delete() { C.QMetaObject__Connection_Delete(this.h) @@ -864,3 +908,55 @@ func (this *QMetaObject__SuperData) GoGC() { runtime.KeepAlive(this.h) }) } + +type QMetaObject__Data struct { + h *C.QMetaObject__Data +} + +func (this *QMetaObject__Data) cPointer() *C.QMetaObject__Data { + if this == nil { + return nil + } + return this.h +} + +func newQMetaObject__Data(h *C.QMetaObject__Data) *QMetaObject__Data { + if h == nil { + return nil + } + return &QMetaObject__Data{h: h} +} + +func newQMetaObject__Data_U(h unsafe.Pointer) *QMetaObject__Data { + return newQMetaObject__Data((*C.QMetaObject__Data)(h)) +} + +// NewQMetaObject__Data constructs a new QMetaObject::Data object. +func NewQMetaObject__Data() *QMetaObject__Data { + ret := C.QMetaObject__Data_new() + return newQMetaObject__Data(ret) +} + +// NewQMetaObject__Data2 constructs a new QMetaObject::Data object. +func NewQMetaObject__Data2(param1 *QMetaObject__Data) *QMetaObject__Data { + ret := C.QMetaObject__Data_new2(param1.cPointer()) + return newQMetaObject__Data(ret) +} + +func (this *QMetaObject__Data) OperatorAssign(param1 *QMetaObject__Data) { + C.QMetaObject__Data_OperatorAssign(this.h, param1.cPointer()) +} + +// Delete this object from C++ memory. +func (this *QMetaObject__Data) Delete() { + C.QMetaObject__Data_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QMetaObject__Data) GoGC() { + runtime.SetFinalizer(this, func(this *QMetaObject__Data) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} diff --git a/qt/gen_qobjectdefs.h b/qt/gen_qobjectdefs.h index 6ad0658..edddc3e 100644 --- a/qt/gen_qobjectdefs.h +++ b/qt/gen_qobjectdefs.h @@ -26,12 +26,19 @@ typedef QMetaObject::Connection QMetaObject__Connection; #else class QMetaObject__Connection; #endif +#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QMetaObject__Data) +typedef QMetaObject::Data QMetaObject__Data; +#else +class QMetaObject__Data; +#endif #if defined(WORKAROUND_INNER_CLASS_DEFINITION_QMetaObject__SuperData) typedef QMetaObject::SuperData QMetaObject__SuperData; #else class QMetaObject__SuperData; #endif class QMetaProperty; +class QMetaType; +class QMethodRawArguments; class QObject; #else typedef struct QByteArray QByteArray; @@ -42,11 +49,16 @@ typedef struct QMetaEnum QMetaEnum; typedef struct QMetaMethod QMetaMethod; typedef struct QMetaObject QMetaObject; typedef struct QMetaObject__Connection QMetaObject__Connection; +typedef struct QMetaObject__Data QMetaObject__Data; typedef struct QMetaObject__SuperData QMetaObject__SuperData; typedef struct QMetaProperty QMetaProperty; +typedef struct QMetaType QMetaType; +typedef struct QMethodRawArguments QMethodRawArguments; typedef struct QObject QObject; #endif +void QMethodRawArguments_Delete(QMethodRawArguments* self); + QGenericArgument* QGenericArgument_new(); QGenericArgument* QGenericArgument_new2(QGenericArgument* param1); QGenericArgument* QGenericArgument_new3(const char* aName); @@ -69,6 +81,7 @@ bool QMetaObject_Inherits(const QMetaObject* self, QMetaObject* metaObject); QObject* QMetaObject_Cast(const QMetaObject* self, QObject* obj); QObject* QMetaObject_CastWithObj(const QMetaObject* self, QObject* obj); struct miqt_string* QMetaObject_Tr(const QMetaObject* self, const char* s, const char* c); +QMetaType* QMetaObject_MetaType(const QMetaObject* self); int QMetaObject_MethodOffset(const QMetaObject* self); int QMetaObject_EnumeratorOffset(const QMetaObject* self); int QMetaObject_PropertyOffset(const QMetaObject* self); @@ -162,6 +175,7 @@ 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_Swap(QMetaObject__Connection* self, QMetaObject__Connection* other); void QMetaObject__Connection_Delete(QMetaObject__Connection* self); QMetaObject__SuperData* QMetaObject__SuperData_new(); @@ -171,6 +185,11 @@ QMetaObject* QMetaObject__SuperData_OperatorMinusGreater(const QMetaObject__Supe void QMetaObject__SuperData_OperatorAssign(QMetaObject__SuperData* self, QMetaObject__SuperData* param1); void QMetaObject__SuperData_Delete(QMetaObject__SuperData* self); +QMetaObject__Data* QMetaObject__Data_new(); +QMetaObject__Data* QMetaObject__Data_new2(QMetaObject__Data* param1); +void QMetaObject__Data_OperatorAssign(QMetaObject__Data* self, QMetaObject__Data* param1); +void QMetaObject__Data_Delete(QMetaObject__Data* self); + #ifdef __cplusplus } /* extern C */ #endif diff --git a/qt/gen_qoffscreensurface.cpp b/qt/gen_qoffscreensurface.cpp index efac358..283cd9d 100644 --- a/qt/gen_qoffscreensurface.cpp +++ b/qt/gen_qoffscreensurface.cpp @@ -11,18 +11,18 @@ #include "gen_qoffscreensurface.h" #include "_cgo_export.h" -QOffscreenSurface* QOffscreenSurface_new(QScreen* screen, QObject* parent) { - return new QOffscreenSurface(screen, parent); -} - -QOffscreenSurface* QOffscreenSurface_new2() { +QOffscreenSurface* QOffscreenSurface_new() { return new QOffscreenSurface(); } -QOffscreenSurface* QOffscreenSurface_new3(QScreen* screen) { +QOffscreenSurface* QOffscreenSurface_new2(QScreen* screen) { return new QOffscreenSurface(screen); } +QOffscreenSurface* QOffscreenSurface_new3(QScreen* screen, QObject* parent) { + return new QOffscreenSurface(screen, parent); +} + QMetaObject* QOffscreenSurface_MetaObject(const QOffscreenSurface* self) { return (QMetaObject*) self->metaObject(); } @@ -38,13 +38,6 @@ struct miqt_string* QOffscreenSurface_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QOffscreenSurface_TrUtf8(const char* s) { - QString _ret = QOffscreenSurface::trUtf8(s); - // 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()); -} - int QOffscreenSurface_SurfaceType(const QOffscreenSurface* self) { QSurface::SurfaceType _ret = self->surfaceType(); return static_cast(_ret); @@ -86,14 +79,6 @@ void QOffscreenSurface_SetScreen(QOffscreenSurface* self, QScreen* screen) { self->setScreen(screen); } -void* QOffscreenSurface_NativeHandle(const QOffscreenSurface* self) { - return self->nativeHandle(); -} - -void QOffscreenSurface_SetNativeHandle(QOffscreenSurface* self, void* handle) { - self->setNativeHandle(handle); -} - void QOffscreenSurface_ScreenChanged(QOffscreenSurface* self, QScreen* screen) { self->screenChanged(screen); } @@ -119,20 +104,6 @@ struct miqt_string* QOffscreenSurface_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QOffscreenSurface_TrUtf82(const char* s, const char* c) { - QString _ret = QOffscreenSurface::trUtf8(s, c); - // 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* QOffscreenSurface_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QOffscreenSurface::trUtf8(s, c, static_cast(n)); - // 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 QOffscreenSurface_Delete(QOffscreenSurface* self) { delete self; } diff --git a/qt/gen_qoffscreensurface.go b/qt/gen_qoffscreensurface.go index d57539d..44e6bf5 100644 --- a/qt/gen_qoffscreensurface.go +++ b/qt/gen_qoffscreensurface.go @@ -39,20 +39,20 @@ func newQOffscreenSurface_U(h unsafe.Pointer) *QOffscreenSurface { } // NewQOffscreenSurface constructs a new QOffscreenSurface object. -func NewQOffscreenSurface(screen *QScreen, parent *QObject) *QOffscreenSurface { - ret := C.QOffscreenSurface_new(screen.cPointer(), parent.cPointer()) +func NewQOffscreenSurface() *QOffscreenSurface { + ret := C.QOffscreenSurface_new() return newQOffscreenSurface(ret) } // NewQOffscreenSurface2 constructs a new QOffscreenSurface object. -func NewQOffscreenSurface2() *QOffscreenSurface { - ret := C.QOffscreenSurface_new2() +func NewQOffscreenSurface2(screen *QScreen) *QOffscreenSurface { + ret := C.QOffscreenSurface_new2(screen.cPointer()) return newQOffscreenSurface(ret) } // NewQOffscreenSurface3 constructs a new QOffscreenSurface object. -func NewQOffscreenSurface3(screen *QScreen) *QOffscreenSurface { - ret := C.QOffscreenSurface_new3(screen.cPointer()) +func NewQOffscreenSurface3(screen *QScreen, parent *QObject) *QOffscreenSurface { + ret := C.QOffscreenSurface_new3(screen.cPointer(), parent.cPointer()) return newQOffscreenSurface(ret) } @@ -75,15 +75,6 @@ func QOffscreenSurface_Tr(s string) string { return _ret } -func QOffscreenSurface_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QOffscreenSurface_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QOffscreenSurface) SurfaceType() QSurface__SurfaceType { return (QSurface__SurfaceType)(C.QOffscreenSurface_SurfaceType(this.h)) } @@ -133,14 +124,6 @@ func (this *QOffscreenSurface) SetScreen(screen *QScreen) { C.QOffscreenSurface_SetScreen(this.h, screen.cPointer()) } -func (this *QOffscreenSurface) NativeHandle() unsafe.Pointer { - return C.QOffscreenSurface_NativeHandle(this.h) -} - -func (this *QOffscreenSurface) SetNativeHandle(handle unsafe.Pointer) { - C.QOffscreenSurface_SetNativeHandle(this.h, handle) -} - func (this *QOffscreenSurface) ScreenChanged(screen *QScreen) { C.QOffscreenSurface_ScreenChanged(this.h, screen.cPointer()) } @@ -183,28 +166,6 @@ func QOffscreenSurface_Tr3(s string, c string, n int) string { return _ret } -func QOffscreenSurface_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QOffscreenSurface_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QOffscreenSurface_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QOffscreenSurface_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QOffscreenSurface) Delete() { C.QOffscreenSurface_Delete(this.h) diff --git a/qt/gen_qoffscreensurface.h b/qt/gen_qoffscreensurface.h index 3d462a4..f618be5 100644 --- a/qt/gen_qoffscreensurface.h +++ b/qt/gen_qoffscreensurface.h @@ -29,13 +29,12 @@ typedef struct QSize QSize; typedef struct QSurfaceFormat QSurfaceFormat; #endif -QOffscreenSurface* QOffscreenSurface_new(QScreen* screen, QObject* parent); -QOffscreenSurface* QOffscreenSurface_new2(); -QOffscreenSurface* QOffscreenSurface_new3(QScreen* screen); +QOffscreenSurface* QOffscreenSurface_new(); +QOffscreenSurface* QOffscreenSurface_new2(QScreen* screen); +QOffscreenSurface* QOffscreenSurface_new3(QScreen* screen, QObject* parent); QMetaObject* QOffscreenSurface_MetaObject(const QOffscreenSurface* self); void* QOffscreenSurface_Metacast(QOffscreenSurface* self, const char* param1); struct miqt_string* QOffscreenSurface_Tr(const char* s); -struct miqt_string* QOffscreenSurface_TrUtf8(const char* s); int QOffscreenSurface_SurfaceType(const QOffscreenSurface* self); void QOffscreenSurface_Create(QOffscreenSurface* self); void QOffscreenSurface_Destroy(QOffscreenSurface* self); @@ -46,14 +45,10 @@ QSurfaceFormat* QOffscreenSurface_RequestedFormat(const QOffscreenSurface* self) QSize* QOffscreenSurface_Size(const QOffscreenSurface* self); QScreen* QOffscreenSurface_Screen(const QOffscreenSurface* self); void QOffscreenSurface_SetScreen(QOffscreenSurface* self, QScreen* screen); -void* QOffscreenSurface_NativeHandle(const QOffscreenSurface* self); -void QOffscreenSurface_SetNativeHandle(QOffscreenSurface* self, void* handle); void QOffscreenSurface_ScreenChanged(QOffscreenSurface* self, QScreen* screen); void QOffscreenSurface_connect_ScreenChanged(QOffscreenSurface* self, void* slot); struct miqt_string* QOffscreenSurface_Tr2(const char* s, const char* c); struct miqt_string* QOffscreenSurface_Tr3(const char* s, const char* c, int n); -struct miqt_string* QOffscreenSurface_TrUtf82(const char* s, const char* c); -struct miqt_string* QOffscreenSurface_TrUtf83(const char* s, const char* c, int n); void QOffscreenSurface_Delete(QOffscreenSurface* self); #ifdef __cplusplus diff --git a/qt/gen_qoperatingsystemversion.cpp b/qt/gen_qoperatingsystemversion.cpp index 66b5a87..c2ef9fc 100644 --- a/qt/gen_qoperatingsystemversion.cpp +++ b/qt/gen_qoperatingsystemversion.cpp @@ -1,20 +1,98 @@ #include +#include #include #include #include +#include #include "qoperatingsystemversion.h" #include "gen_qoperatingsystemversion.h" #include "_cgo_export.h" -QOperatingSystemVersion* QOperatingSystemVersion_new(int osType, int vmajor) { +QOperatingSystemVersionBase* QOperatingSystemVersionBase_new(int osType, int vmajor) { + return new QOperatingSystemVersionBase(static_cast(osType), static_cast(vmajor)); +} + +QOperatingSystemVersionBase* QOperatingSystemVersionBase_new2(QOperatingSystemVersionBase* param1) { + return new QOperatingSystemVersionBase(*param1); +} + +QOperatingSystemVersionBase* QOperatingSystemVersionBase_new3(int osType, int vmajor, int vminor) { + return new QOperatingSystemVersionBase(static_cast(osType), static_cast(vmajor), static_cast(vminor)); +} + +QOperatingSystemVersionBase* QOperatingSystemVersionBase_new4(int osType, int vmajor, int vminor, int vmicro) { + return new QOperatingSystemVersionBase(static_cast(osType), static_cast(vmajor), static_cast(vminor), static_cast(vmicro)); +} + +QOperatingSystemVersionBase* QOperatingSystemVersionBase_Current() { + return new QOperatingSystemVersionBase(QOperatingSystemVersionBase::current()); +} + +struct miqt_string* QOperatingSystemVersionBase_Name(QOperatingSystemVersionBase* osversion) { + QString _ret = QOperatingSystemVersionBase::name(*osversion); + // 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()); +} + +int QOperatingSystemVersionBase_CurrentType() { + QOperatingSystemVersionBase::OSType _ret = QOperatingSystemVersionBase::currentType(); + return static_cast(_ret); +} + +QVersionNumber* QOperatingSystemVersionBase_Version(const QOperatingSystemVersionBase* self) { + return new QVersionNumber(self->version()); +} + +int QOperatingSystemVersionBase_MajorVersion(const QOperatingSystemVersionBase* self) { + return self->majorVersion(); +} + +int QOperatingSystemVersionBase_MinorVersion(const QOperatingSystemVersionBase* self) { + return self->minorVersion(); +} + +int QOperatingSystemVersionBase_MicroVersion(const QOperatingSystemVersionBase* self) { + return self->microVersion(); +} + +int QOperatingSystemVersionBase_SegmentCount(const QOperatingSystemVersionBase* self) { + return self->segmentCount(); +} + +int QOperatingSystemVersionBase_Type(const QOperatingSystemVersionBase* self) { + QOperatingSystemVersionBase::OSType _ret = self->type(); + return static_cast(_ret); +} + +struct miqt_string* QOperatingSystemVersionBase_Name2(const QOperatingSystemVersionBase* self) { + QString _ret = self->name(); + // 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 QOperatingSystemVersionBase_Delete(QOperatingSystemVersionBase* self) { + delete self; +} + +QOperatingSystemVersion* QOperatingSystemVersion_new(QOperatingSystemVersionBase* osversion) { + return new QOperatingSystemVersion(*osversion); +} + +QOperatingSystemVersion* QOperatingSystemVersion_new2(int osType, int vmajor) { return new QOperatingSystemVersion(static_cast(osType), static_cast(vmajor)); } -QOperatingSystemVersion* QOperatingSystemVersion_new2(int osType, int vmajor, int vminor) { +QOperatingSystemVersion* QOperatingSystemVersion_new3(QOperatingSystemVersion* param1) { + return new QOperatingSystemVersion(*param1); +} + +QOperatingSystemVersion* QOperatingSystemVersion_new4(int osType, int vmajor, int vminor) { return new QOperatingSystemVersion(static_cast(osType), static_cast(vmajor), static_cast(vminor)); } -QOperatingSystemVersion* QOperatingSystemVersion_new3(int osType, int vmajor, int vminor, int vmicro) { +QOperatingSystemVersion* QOperatingSystemVersion_new5(int osType, int vmajor, int vminor, int vmicro) { return new QOperatingSystemVersion(static_cast(osType), static_cast(vmajor), static_cast(vminor), static_cast(vmicro)); } @@ -27,6 +105,10 @@ int QOperatingSystemVersion_CurrentType() { return static_cast(_ret); } +QVersionNumber* QOperatingSystemVersion_Version(const QOperatingSystemVersion* self) { + return new QVersionNumber(self->version()); +} + int QOperatingSystemVersion_MajorVersion(const QOperatingSystemVersion* self) { return self->majorVersion(); } diff --git a/qt/gen_qoperatingsystemversion.go b/qt/gen_qoperatingsystemversion.go index f256022..47565a1 100644 --- a/qt/gen_qoperatingsystemversion.go +++ b/qt/gen_qoperatingsystemversion.go @@ -13,20 +13,145 @@ import ( "unsafe" ) +type QOperatingSystemVersionBase__OSType int + +const ( + QOperatingSystemVersionBase__OSType__Unknown QOperatingSystemVersionBase__OSType = 0 + QOperatingSystemVersionBase__OSType__Windows QOperatingSystemVersionBase__OSType = 1 + QOperatingSystemVersionBase__OSType__MacOS QOperatingSystemVersionBase__OSType = 2 + QOperatingSystemVersionBase__OSType__IOS QOperatingSystemVersionBase__OSType = 3 + QOperatingSystemVersionBase__OSType__TvOS QOperatingSystemVersionBase__OSType = 4 + QOperatingSystemVersionBase__OSType__WatchOS QOperatingSystemVersionBase__OSType = 5 + QOperatingSystemVersionBase__OSType__Android QOperatingSystemVersionBase__OSType = 6 +) + type QOperatingSystemVersion__OSType int const ( - QOperatingSystemVersion__Unknown QOperatingSystemVersion__OSType = 0 - QOperatingSystemVersion__Windows QOperatingSystemVersion__OSType = 1 - QOperatingSystemVersion__MacOS QOperatingSystemVersion__OSType = 2 - QOperatingSystemVersion__IOS QOperatingSystemVersion__OSType = 3 - QOperatingSystemVersion__TvOS QOperatingSystemVersion__OSType = 4 - QOperatingSystemVersion__WatchOS QOperatingSystemVersion__OSType = 5 - QOperatingSystemVersion__Android QOperatingSystemVersion__OSType = 6 + QOperatingSystemVersion__OSType__Unknown QOperatingSystemVersion__OSType = 0 + QOperatingSystemVersion__OSType__Windows QOperatingSystemVersion__OSType = 1 + QOperatingSystemVersion__OSType__MacOS QOperatingSystemVersion__OSType = 2 + QOperatingSystemVersion__OSType__IOS QOperatingSystemVersion__OSType = 3 + QOperatingSystemVersion__OSType__TvOS QOperatingSystemVersion__OSType = 4 + QOperatingSystemVersion__OSType__WatchOS QOperatingSystemVersion__OSType = 5 + QOperatingSystemVersion__OSType__Android QOperatingSystemVersion__OSType = 6 ) +type QOperatingSystemVersionBase struct { + h *C.QOperatingSystemVersionBase +} + +func (this *QOperatingSystemVersionBase) cPointer() *C.QOperatingSystemVersionBase { + if this == nil { + return nil + } + return this.h +} + +func newQOperatingSystemVersionBase(h *C.QOperatingSystemVersionBase) *QOperatingSystemVersionBase { + if h == nil { + return nil + } + return &QOperatingSystemVersionBase{h: h} +} + +func newQOperatingSystemVersionBase_U(h unsafe.Pointer) *QOperatingSystemVersionBase { + return newQOperatingSystemVersionBase((*C.QOperatingSystemVersionBase)(h)) +} + +// NewQOperatingSystemVersionBase constructs a new QOperatingSystemVersionBase object. +func NewQOperatingSystemVersionBase(osType QOperatingSystemVersionBase__OSType, vmajor int) *QOperatingSystemVersionBase { + ret := C.QOperatingSystemVersionBase_new((C.int)(osType), (C.int)(vmajor)) + return newQOperatingSystemVersionBase(ret) +} + +// NewQOperatingSystemVersionBase2 constructs a new QOperatingSystemVersionBase object. +func NewQOperatingSystemVersionBase2(param1 *QOperatingSystemVersionBase) *QOperatingSystemVersionBase { + ret := C.QOperatingSystemVersionBase_new2(param1.cPointer()) + return newQOperatingSystemVersionBase(ret) +} + +// NewQOperatingSystemVersionBase3 constructs a new QOperatingSystemVersionBase object. +func NewQOperatingSystemVersionBase3(osType QOperatingSystemVersionBase__OSType, vmajor int, vminor int) *QOperatingSystemVersionBase { + ret := C.QOperatingSystemVersionBase_new3((C.int)(osType), (C.int)(vmajor), (C.int)(vminor)) + return newQOperatingSystemVersionBase(ret) +} + +// NewQOperatingSystemVersionBase4 constructs a new QOperatingSystemVersionBase object. +func NewQOperatingSystemVersionBase4(osType QOperatingSystemVersionBase__OSType, vmajor int, vminor int, vmicro int) *QOperatingSystemVersionBase { + ret := C.QOperatingSystemVersionBase_new4((C.int)(osType), (C.int)(vmajor), (C.int)(vminor), (C.int)(vmicro)) + return newQOperatingSystemVersionBase(ret) +} + +func QOperatingSystemVersionBase_Current() *QOperatingSystemVersionBase { + _ret := C.QOperatingSystemVersionBase_Current() + _goptr := newQOperatingSystemVersionBase(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func QOperatingSystemVersionBase_Name(osversion QOperatingSystemVersionBase) string { + var _ms *C.struct_miqt_string = C.QOperatingSystemVersionBase_Name(osversion.cPointer()) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + +func QOperatingSystemVersionBase_CurrentType() QOperatingSystemVersionBase__OSType { + return (QOperatingSystemVersionBase__OSType)(C.QOperatingSystemVersionBase_CurrentType()) +} + +func (this *QOperatingSystemVersionBase) Version() *QVersionNumber { + _ret := C.QOperatingSystemVersionBase_Version(this.h) + _goptr := newQVersionNumber(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QOperatingSystemVersionBase) MajorVersion() int { + return (int)(C.QOperatingSystemVersionBase_MajorVersion(this.h)) +} + +func (this *QOperatingSystemVersionBase) MinorVersion() int { + return (int)(C.QOperatingSystemVersionBase_MinorVersion(this.h)) +} + +func (this *QOperatingSystemVersionBase) MicroVersion() int { + return (int)(C.QOperatingSystemVersionBase_MicroVersion(this.h)) +} + +func (this *QOperatingSystemVersionBase) SegmentCount() int { + return (int)(C.QOperatingSystemVersionBase_SegmentCount(this.h)) +} + +func (this *QOperatingSystemVersionBase) Type() QOperatingSystemVersionBase__OSType { + return (QOperatingSystemVersionBase__OSType)(C.QOperatingSystemVersionBase_Type(this.h)) +} + +func (this *QOperatingSystemVersionBase) Name2() string { + var _ms *C.struct_miqt_string = C.QOperatingSystemVersionBase_Name2(this.h) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + +// Delete this object from C++ memory. +func (this *QOperatingSystemVersionBase) Delete() { + C.QOperatingSystemVersionBase_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QOperatingSystemVersionBase) GoGC() { + runtime.SetFinalizer(this, func(this *QOperatingSystemVersionBase) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + type QOperatingSystemVersion struct { h *C.QOperatingSystemVersion + *QOperatingSystemVersionBase } func (this *QOperatingSystemVersion) cPointer() *C.QOperatingSystemVersion { @@ -40,7 +165,7 @@ func newQOperatingSystemVersion(h *C.QOperatingSystemVersion) *QOperatingSystemV if h == nil { return nil } - return &QOperatingSystemVersion{h: h} + return &QOperatingSystemVersion{h: h, QOperatingSystemVersionBase: newQOperatingSystemVersionBase_U(unsafe.Pointer(h))} } func newQOperatingSystemVersion_U(h unsafe.Pointer) *QOperatingSystemVersion { @@ -48,20 +173,32 @@ 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.int)(osType), (C.int)(vmajor)) +func NewQOperatingSystemVersion(osversion *QOperatingSystemVersionBase) *QOperatingSystemVersion { + ret := C.QOperatingSystemVersion_new(osversion.cPointer()) return newQOperatingSystemVersion(ret) } // NewQOperatingSystemVersion2 constructs a new QOperatingSystemVersion object. -func NewQOperatingSystemVersion2(osType QOperatingSystemVersion__OSType, vmajor int, vminor int) *QOperatingSystemVersion { - ret := C.QOperatingSystemVersion_new2((C.int)(osType), (C.int)(vmajor), (C.int)(vminor)) +func NewQOperatingSystemVersion2(osType QOperatingSystemVersion__OSType, vmajor int) *QOperatingSystemVersion { + ret := C.QOperatingSystemVersion_new2((C.int)(osType), (C.int)(vmajor)) 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.int)(osType), (C.int)(vmajor), (C.int)(vminor), (C.int)(vmicro)) +func NewQOperatingSystemVersion3(param1 *QOperatingSystemVersion) *QOperatingSystemVersion { + ret := C.QOperatingSystemVersion_new3(param1.cPointer()) + return newQOperatingSystemVersion(ret) +} + +// NewQOperatingSystemVersion4 constructs a new QOperatingSystemVersion object. +func NewQOperatingSystemVersion4(osType QOperatingSystemVersion__OSType, vmajor int, vminor int) *QOperatingSystemVersion { + ret := C.QOperatingSystemVersion_new4((C.int)(osType), (C.int)(vmajor), (C.int)(vminor)) + return newQOperatingSystemVersion(ret) +} + +// NewQOperatingSystemVersion5 constructs a new QOperatingSystemVersion object. +func NewQOperatingSystemVersion5(osType QOperatingSystemVersion__OSType, vmajor int, vminor int, vmicro int) *QOperatingSystemVersion { + ret := C.QOperatingSystemVersion_new5((C.int)(osType), (C.int)(vmajor), (C.int)(vminor), (C.int)(vmicro)) return newQOperatingSystemVersion(ret) } @@ -76,6 +213,13 @@ func QOperatingSystemVersion_CurrentType() QOperatingSystemVersion__OSType { return (QOperatingSystemVersion__OSType)(C.QOperatingSystemVersion_CurrentType()) } +func (this *QOperatingSystemVersion) Version() *QVersionNumber { + _ret := C.QOperatingSystemVersion_Version(this.h) + _goptr := newQVersionNumber(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + func (this *QOperatingSystemVersion) MajorVersion() int { return (int)(C.QOperatingSystemVersion_MajorVersion(this.h)) } diff --git a/qt/gen_qoperatingsystemversion.h b/qt/gen_qoperatingsystemversion.h index bb500b8..e995425 100644 --- a/qt/gen_qoperatingsystemversion.h +++ b/qt/gen_qoperatingsystemversion.h @@ -15,15 +15,38 @@ extern "C" { #ifdef __cplusplus class QOperatingSystemVersion; +class QOperatingSystemVersionBase; +class QVersionNumber; #else typedef struct QOperatingSystemVersion QOperatingSystemVersion; +typedef struct QOperatingSystemVersionBase QOperatingSystemVersionBase; +typedef struct QVersionNumber QVersionNumber; #endif -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); +QOperatingSystemVersionBase* QOperatingSystemVersionBase_new(int osType, int vmajor); +QOperatingSystemVersionBase* QOperatingSystemVersionBase_new2(QOperatingSystemVersionBase* param1); +QOperatingSystemVersionBase* QOperatingSystemVersionBase_new3(int osType, int vmajor, int vminor); +QOperatingSystemVersionBase* QOperatingSystemVersionBase_new4(int osType, int vmajor, int vminor, int vmicro); +QOperatingSystemVersionBase* QOperatingSystemVersionBase_Current(); +struct miqt_string* QOperatingSystemVersionBase_Name(QOperatingSystemVersionBase* osversion); +int QOperatingSystemVersionBase_CurrentType(); +QVersionNumber* QOperatingSystemVersionBase_Version(const QOperatingSystemVersionBase* self); +int QOperatingSystemVersionBase_MajorVersion(const QOperatingSystemVersionBase* self); +int QOperatingSystemVersionBase_MinorVersion(const QOperatingSystemVersionBase* self); +int QOperatingSystemVersionBase_MicroVersion(const QOperatingSystemVersionBase* self); +int QOperatingSystemVersionBase_SegmentCount(const QOperatingSystemVersionBase* self); +int QOperatingSystemVersionBase_Type(const QOperatingSystemVersionBase* self); +struct miqt_string* QOperatingSystemVersionBase_Name2(const QOperatingSystemVersionBase* self); +void QOperatingSystemVersionBase_Delete(QOperatingSystemVersionBase* self); + +QOperatingSystemVersion* QOperatingSystemVersion_new(QOperatingSystemVersionBase* osversion); +QOperatingSystemVersion* QOperatingSystemVersion_new2(int osType, int vmajor); +QOperatingSystemVersion* QOperatingSystemVersion_new3(QOperatingSystemVersion* param1); +QOperatingSystemVersion* QOperatingSystemVersion_new4(int osType, int vmajor, int vminor); +QOperatingSystemVersion* QOperatingSystemVersion_new5(int osType, int vmajor, int vminor, int vmicro); QOperatingSystemVersion* QOperatingSystemVersion_Current(); int QOperatingSystemVersion_CurrentType(); +QVersionNumber* QOperatingSystemVersion_Version(const QOperatingSystemVersion* self); int QOperatingSystemVersion_MajorVersion(const QOperatingSystemVersion* self); int QOperatingSystemVersion_MinorVersion(const QOperatingSystemVersion* self); int QOperatingSystemVersion_MicroVersion(const QOperatingSystemVersion* self); diff --git a/qt/gen_qpagedpaintdevice.cpp b/qt/gen_qpagedpaintdevice.cpp index 2a2e45e..0695c48 100644 --- a/qt/gen_qpagedpaintdevice.cpp +++ b/qt/gen_qpagedpaintdevice.cpp @@ -1,9 +1,8 @@ #include #include +#include #include #include -#define WORKAROUND_INNER_CLASS_DEFINITION_QPagedPaintDevice__Margins -#include #include "qpagedpaintdevice.h" #include "gen_qpagedpaintdevice.h" #include "_cgo_export.h" @@ -28,44 +27,23 @@ bool QPagedPaintDevice_SetPageMargins(QPagedPaintDevice* self, QMarginsF* margin return self->setPageMargins(*margins); } -bool QPagedPaintDevice_SetPageMargins2(QPagedPaintDevice* self, QMarginsF* margins, int units) { - return self->setPageMargins(*margins, static_cast(units)); -} - QPageLayout* QPagedPaintDevice_PageLayout(const QPagedPaintDevice* self) { return new QPageLayout(self->pageLayout()); } -void QPagedPaintDevice_SetPageSizeWithSize(QPagedPaintDevice* self, int size) { - self->setPageSize(static_cast(size)); +void QPagedPaintDevice_SetPageRanges(QPagedPaintDevice* self, QPageRanges* ranges) { + self->setPageRanges(*ranges); } -int QPagedPaintDevice_PageSize(const QPagedPaintDevice* self) { - QPagedPaintDevice::PageSize _ret = self->pageSize(); - return static_cast(_ret); +QPageRanges* QPagedPaintDevice_PageRanges(const QPagedPaintDevice* self) { + return new QPageRanges(self->pageRanges()); } -void QPagedPaintDevice_SetPageSizeMM(QPagedPaintDevice* self, QSizeF* size) { - self->setPageSizeMM(*size); -} - -QSizeF* QPagedPaintDevice_PageSizeMM(const QPagedPaintDevice* self) { - return new QSizeF(self->pageSizeMM()); -} - -void QPagedPaintDevice_SetMargins(QPagedPaintDevice* self, QPagedPaintDevice__Margins* margins) { - self->setMargins(*margins); -} - -QPagedPaintDevice__Margins* QPagedPaintDevice_Margins(const QPagedPaintDevice* self) { - return new QPagedPaintDevice::Margins(self->margins()); +bool QPagedPaintDevice_SetPageMargins2(QPagedPaintDevice* self, QMarginsF* margins, int units) { + return self->setPageMargins(*margins, static_cast(units)); } void QPagedPaintDevice_Delete(QPagedPaintDevice* self) { delete self; } -void QPagedPaintDevice__Margins_Delete(QPagedPaintDevice__Margins* self) { - delete self; -} - diff --git a/qt/gen_qpagedpaintdevice.go b/qt/gen_qpagedpaintdevice.go index c0cf856..50e18fb 100644 --- a/qt/gen_qpagedpaintdevice.go +++ b/qt/gen_qpagedpaintdevice.go @@ -13,138 +13,6 @@ import ( "unsafe" ) -type QPagedPaintDevice__PageSize int - -const ( - QPagedPaintDevice__A4 QPagedPaintDevice__PageSize = 0 - QPagedPaintDevice__B5 QPagedPaintDevice__PageSize = 1 - QPagedPaintDevice__Letter QPagedPaintDevice__PageSize = 2 - QPagedPaintDevice__Legal QPagedPaintDevice__PageSize = 3 - QPagedPaintDevice__Executive QPagedPaintDevice__PageSize = 4 - QPagedPaintDevice__A0 QPagedPaintDevice__PageSize = 5 - QPagedPaintDevice__A1 QPagedPaintDevice__PageSize = 6 - QPagedPaintDevice__A2 QPagedPaintDevice__PageSize = 7 - QPagedPaintDevice__A3 QPagedPaintDevice__PageSize = 8 - QPagedPaintDevice__A5 QPagedPaintDevice__PageSize = 9 - QPagedPaintDevice__A6 QPagedPaintDevice__PageSize = 10 - QPagedPaintDevice__A7 QPagedPaintDevice__PageSize = 11 - QPagedPaintDevice__A8 QPagedPaintDevice__PageSize = 12 - QPagedPaintDevice__A9 QPagedPaintDevice__PageSize = 13 - QPagedPaintDevice__B0 QPagedPaintDevice__PageSize = 14 - QPagedPaintDevice__B1 QPagedPaintDevice__PageSize = 15 - QPagedPaintDevice__B10 QPagedPaintDevice__PageSize = 16 - QPagedPaintDevice__B2 QPagedPaintDevice__PageSize = 17 - QPagedPaintDevice__B3 QPagedPaintDevice__PageSize = 18 - QPagedPaintDevice__B4 QPagedPaintDevice__PageSize = 19 - QPagedPaintDevice__B6 QPagedPaintDevice__PageSize = 20 - QPagedPaintDevice__B7 QPagedPaintDevice__PageSize = 21 - QPagedPaintDevice__B8 QPagedPaintDevice__PageSize = 22 - QPagedPaintDevice__B9 QPagedPaintDevice__PageSize = 23 - QPagedPaintDevice__C5E QPagedPaintDevice__PageSize = 24 - QPagedPaintDevice__Comm10E QPagedPaintDevice__PageSize = 25 - QPagedPaintDevice__DLE QPagedPaintDevice__PageSize = 26 - QPagedPaintDevice__Folio QPagedPaintDevice__PageSize = 27 - QPagedPaintDevice__Ledger QPagedPaintDevice__PageSize = 28 - QPagedPaintDevice__Tabloid QPagedPaintDevice__PageSize = 29 - QPagedPaintDevice__Custom QPagedPaintDevice__PageSize = 30 - QPagedPaintDevice__A10 QPagedPaintDevice__PageSize = 31 - QPagedPaintDevice__A3Extra QPagedPaintDevice__PageSize = 32 - QPagedPaintDevice__A4Extra QPagedPaintDevice__PageSize = 33 - QPagedPaintDevice__A4Plus QPagedPaintDevice__PageSize = 34 - QPagedPaintDevice__A4Small QPagedPaintDevice__PageSize = 35 - QPagedPaintDevice__A5Extra QPagedPaintDevice__PageSize = 36 - QPagedPaintDevice__B5Extra QPagedPaintDevice__PageSize = 37 - QPagedPaintDevice__JisB0 QPagedPaintDevice__PageSize = 38 - QPagedPaintDevice__JisB1 QPagedPaintDevice__PageSize = 39 - QPagedPaintDevice__JisB2 QPagedPaintDevice__PageSize = 40 - QPagedPaintDevice__JisB3 QPagedPaintDevice__PageSize = 41 - QPagedPaintDevice__JisB4 QPagedPaintDevice__PageSize = 42 - QPagedPaintDevice__JisB5 QPagedPaintDevice__PageSize = 43 - QPagedPaintDevice__JisB6 QPagedPaintDevice__PageSize = 44 - QPagedPaintDevice__JisB7 QPagedPaintDevice__PageSize = 45 - QPagedPaintDevice__JisB8 QPagedPaintDevice__PageSize = 46 - QPagedPaintDevice__JisB9 QPagedPaintDevice__PageSize = 47 - QPagedPaintDevice__JisB10 QPagedPaintDevice__PageSize = 48 - QPagedPaintDevice__AnsiC QPagedPaintDevice__PageSize = 49 - QPagedPaintDevice__AnsiD QPagedPaintDevice__PageSize = 50 - QPagedPaintDevice__AnsiE QPagedPaintDevice__PageSize = 51 - QPagedPaintDevice__LegalExtra QPagedPaintDevice__PageSize = 52 - QPagedPaintDevice__LetterExtra QPagedPaintDevice__PageSize = 53 - QPagedPaintDevice__LetterPlus QPagedPaintDevice__PageSize = 54 - QPagedPaintDevice__LetterSmall QPagedPaintDevice__PageSize = 55 - QPagedPaintDevice__TabloidExtra QPagedPaintDevice__PageSize = 56 - QPagedPaintDevice__ArchA QPagedPaintDevice__PageSize = 57 - QPagedPaintDevice__ArchB QPagedPaintDevice__PageSize = 58 - QPagedPaintDevice__ArchC QPagedPaintDevice__PageSize = 59 - QPagedPaintDevice__ArchD QPagedPaintDevice__PageSize = 60 - QPagedPaintDevice__ArchE QPagedPaintDevice__PageSize = 61 - QPagedPaintDevice__Imperial7x9 QPagedPaintDevice__PageSize = 62 - QPagedPaintDevice__Imperial8x10 QPagedPaintDevice__PageSize = 63 - QPagedPaintDevice__Imperial9x11 QPagedPaintDevice__PageSize = 64 - QPagedPaintDevice__Imperial9x12 QPagedPaintDevice__PageSize = 65 - QPagedPaintDevice__Imperial10x11 QPagedPaintDevice__PageSize = 66 - QPagedPaintDevice__Imperial10x13 QPagedPaintDevice__PageSize = 67 - QPagedPaintDevice__Imperial10x14 QPagedPaintDevice__PageSize = 68 - QPagedPaintDevice__Imperial12x11 QPagedPaintDevice__PageSize = 69 - QPagedPaintDevice__Imperial15x11 QPagedPaintDevice__PageSize = 70 - QPagedPaintDevice__ExecutiveStandard QPagedPaintDevice__PageSize = 71 - QPagedPaintDevice__Note QPagedPaintDevice__PageSize = 72 - QPagedPaintDevice__Quarto QPagedPaintDevice__PageSize = 73 - QPagedPaintDevice__Statement QPagedPaintDevice__PageSize = 74 - QPagedPaintDevice__SuperA QPagedPaintDevice__PageSize = 75 - QPagedPaintDevice__SuperB QPagedPaintDevice__PageSize = 76 - QPagedPaintDevice__Postcard QPagedPaintDevice__PageSize = 77 - QPagedPaintDevice__DoublePostcard QPagedPaintDevice__PageSize = 78 - QPagedPaintDevice__Prc16K QPagedPaintDevice__PageSize = 79 - QPagedPaintDevice__Prc32K QPagedPaintDevice__PageSize = 80 - QPagedPaintDevice__Prc32KBig QPagedPaintDevice__PageSize = 81 - QPagedPaintDevice__FanFoldUS QPagedPaintDevice__PageSize = 82 - QPagedPaintDevice__FanFoldGerman QPagedPaintDevice__PageSize = 83 - QPagedPaintDevice__FanFoldGermanLegal QPagedPaintDevice__PageSize = 84 - QPagedPaintDevice__EnvelopeB4 QPagedPaintDevice__PageSize = 85 - QPagedPaintDevice__EnvelopeB5 QPagedPaintDevice__PageSize = 86 - QPagedPaintDevice__EnvelopeB6 QPagedPaintDevice__PageSize = 87 - QPagedPaintDevice__EnvelopeC0 QPagedPaintDevice__PageSize = 88 - QPagedPaintDevice__EnvelopeC1 QPagedPaintDevice__PageSize = 89 - QPagedPaintDevice__EnvelopeC2 QPagedPaintDevice__PageSize = 90 - QPagedPaintDevice__EnvelopeC3 QPagedPaintDevice__PageSize = 91 - QPagedPaintDevice__EnvelopeC4 QPagedPaintDevice__PageSize = 92 - QPagedPaintDevice__EnvelopeC6 QPagedPaintDevice__PageSize = 93 - QPagedPaintDevice__EnvelopeC65 QPagedPaintDevice__PageSize = 94 - QPagedPaintDevice__EnvelopeC7 QPagedPaintDevice__PageSize = 95 - QPagedPaintDevice__Envelope9 QPagedPaintDevice__PageSize = 96 - QPagedPaintDevice__Envelope11 QPagedPaintDevice__PageSize = 97 - QPagedPaintDevice__Envelope12 QPagedPaintDevice__PageSize = 98 - QPagedPaintDevice__Envelope14 QPagedPaintDevice__PageSize = 99 - QPagedPaintDevice__EnvelopeMonarch QPagedPaintDevice__PageSize = 100 - QPagedPaintDevice__EnvelopePersonal QPagedPaintDevice__PageSize = 101 - QPagedPaintDevice__EnvelopeChou3 QPagedPaintDevice__PageSize = 102 - QPagedPaintDevice__EnvelopeChou4 QPagedPaintDevice__PageSize = 103 - QPagedPaintDevice__EnvelopeInvite QPagedPaintDevice__PageSize = 104 - QPagedPaintDevice__EnvelopeItalian QPagedPaintDevice__PageSize = 105 - QPagedPaintDevice__EnvelopeKaku2 QPagedPaintDevice__PageSize = 106 - QPagedPaintDevice__EnvelopeKaku3 QPagedPaintDevice__PageSize = 107 - QPagedPaintDevice__EnvelopePrc1 QPagedPaintDevice__PageSize = 108 - QPagedPaintDevice__EnvelopePrc2 QPagedPaintDevice__PageSize = 109 - QPagedPaintDevice__EnvelopePrc3 QPagedPaintDevice__PageSize = 110 - QPagedPaintDevice__EnvelopePrc4 QPagedPaintDevice__PageSize = 111 - QPagedPaintDevice__EnvelopePrc5 QPagedPaintDevice__PageSize = 112 - QPagedPaintDevice__EnvelopePrc6 QPagedPaintDevice__PageSize = 113 - QPagedPaintDevice__EnvelopePrc7 QPagedPaintDevice__PageSize = 114 - QPagedPaintDevice__EnvelopePrc8 QPagedPaintDevice__PageSize = 115 - QPagedPaintDevice__EnvelopePrc9 QPagedPaintDevice__PageSize = 116 - QPagedPaintDevice__EnvelopePrc10 QPagedPaintDevice__PageSize = 117 - QPagedPaintDevice__EnvelopeYou4 QPagedPaintDevice__PageSize = 118 - QPagedPaintDevice__LastPageSize QPagedPaintDevice__PageSize = 118 - QPagedPaintDevice__NPageSize QPagedPaintDevice__PageSize = 118 - QPagedPaintDevice__NPaperSize QPagedPaintDevice__PageSize = 118 - QPagedPaintDevice__AnsiA QPagedPaintDevice__PageSize = 2 - QPagedPaintDevice__AnsiB QPagedPaintDevice__PageSize = 28 - QPagedPaintDevice__EnvelopeC5 QPagedPaintDevice__PageSize = 24 - QPagedPaintDevice__EnvelopeDL QPagedPaintDevice__PageSize = 26 - QPagedPaintDevice__Envelope10 QPagedPaintDevice__PageSize = 25 -) - type QPagedPaintDevice__PdfVersion int const ( @@ -196,10 +64,6 @@ func (this *QPagedPaintDevice) SetPageMargins(margins *QMarginsF) bool { return (bool)(C.QPagedPaintDevice_SetPageMargins(this.h, margins.cPointer())) } -func (this *QPagedPaintDevice) SetPageMargins2(margins *QMarginsF, units QPageLayout__Unit) bool { - return (bool)(C.QPagedPaintDevice_SetPageMargins2(this.h, margins.cPointer(), (C.int)(units))) -} - func (this *QPagedPaintDevice) PageLayout() *QPageLayout { _ret := C.QPagedPaintDevice_PageLayout(this.h) _goptr := newQPageLayout(_ret) @@ -207,34 +71,19 @@ func (this *QPagedPaintDevice) PageLayout() *QPageLayout { return _goptr } -func (this *QPagedPaintDevice) SetPageSizeWithSize(size QPagedPaintDevice__PageSize) { - C.QPagedPaintDevice_SetPageSizeWithSize(this.h, (C.int)(size)) +func (this *QPagedPaintDevice) SetPageRanges(ranges *QPageRanges) { + C.QPagedPaintDevice_SetPageRanges(this.h, ranges.cPointer()) } -func (this *QPagedPaintDevice) PageSize() QPagedPaintDevice__PageSize { - return (QPagedPaintDevice__PageSize)(C.QPagedPaintDevice_PageSize(this.h)) -} - -func (this *QPagedPaintDevice) SetPageSizeMM(size *QSizeF) { - C.QPagedPaintDevice_SetPageSizeMM(this.h, size.cPointer()) -} - -func (this *QPagedPaintDevice) PageSizeMM() *QSizeF { - _ret := C.QPagedPaintDevice_PageSizeMM(this.h) - _goptr := newQSizeF(_ret) +func (this *QPagedPaintDevice) PageRanges() *QPageRanges { + _ret := C.QPagedPaintDevice_PageRanges(this.h) + _goptr := newQPageRanges(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QPagedPaintDevice) SetMargins(margins *QPagedPaintDevice__Margins) { - C.QPagedPaintDevice_SetMargins(this.h, margins.cPointer()) -} - -func (this *QPagedPaintDevice) Margins() *QPagedPaintDevice__Margins { - _ret := C.QPagedPaintDevice_Margins(this.h) - _goptr := newQPagedPaintDevice__Margins(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QPagedPaintDevice) SetPageMargins2(margins *QMarginsF, units QPageLayout__Unit) bool { + return (bool)(C.QPagedPaintDevice_SetPageMargins2(this.h, margins.cPointer(), (C.int)(units))) } // Delete this object from C++ memory. @@ -250,39 +99,3 @@ func (this *QPagedPaintDevice) GoGC() { runtime.KeepAlive(this.h) }) } - -type QPagedPaintDevice__Margins struct { - h *C.QPagedPaintDevice__Margins -} - -func (this *QPagedPaintDevice__Margins) cPointer() *C.QPagedPaintDevice__Margins { - if this == nil { - return nil - } - return this.h -} - -func newQPagedPaintDevice__Margins(h *C.QPagedPaintDevice__Margins) *QPagedPaintDevice__Margins { - if h == nil { - return nil - } - return &QPagedPaintDevice__Margins{h: h} -} - -func newQPagedPaintDevice__Margins_U(h unsafe.Pointer) *QPagedPaintDevice__Margins { - return newQPagedPaintDevice__Margins((*C.QPagedPaintDevice__Margins)(h)) -} - -// Delete this object from C++ memory. -func (this *QPagedPaintDevice__Margins) Delete() { - C.QPagedPaintDevice__Margins_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QPagedPaintDevice__Margins) GoGC() { - runtime.SetFinalizer(this, func(this *QPagedPaintDevice__Margins) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} diff --git a/qt/gen_qpagedpaintdevice.h b/qt/gen_qpagedpaintdevice.h index bf94cfb..f1cd53b 100644 --- a/qt/gen_qpagedpaintdevice.h +++ b/qt/gen_qpagedpaintdevice.h @@ -16,21 +16,15 @@ extern "C" { #ifdef __cplusplus class QMarginsF; class QPageLayout; +class QPageRanges; class QPageSize; class QPagedPaintDevice; -#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QPagedPaintDevice__Margins) -typedef QPagedPaintDevice::Margins QPagedPaintDevice__Margins; -#else -class QPagedPaintDevice__Margins; -#endif -class QSizeF; #else typedef struct QMarginsF QMarginsF; typedef struct QPageLayout QPageLayout; +typedef struct QPageRanges QPageRanges; typedef struct QPageSize QPageSize; typedef struct QPagedPaintDevice QPagedPaintDevice; -typedef struct QPagedPaintDevice__Margins QPagedPaintDevice__Margins; -typedef struct QSizeF QSizeF; #endif bool QPagedPaintDevice_NewPage(QPagedPaintDevice* self); @@ -38,18 +32,12 @@ bool QPagedPaintDevice_SetPageLayout(QPagedPaintDevice* self, QPageLayout* pageL bool QPagedPaintDevice_SetPageSize(QPagedPaintDevice* self, QPageSize* pageSize); bool QPagedPaintDevice_SetPageOrientation(QPagedPaintDevice* self, int orientation); bool QPagedPaintDevice_SetPageMargins(QPagedPaintDevice* self, QMarginsF* margins); -bool QPagedPaintDevice_SetPageMargins2(QPagedPaintDevice* self, QMarginsF* margins, int units); QPageLayout* QPagedPaintDevice_PageLayout(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); -QPagedPaintDevice__Margins* QPagedPaintDevice_Margins(const QPagedPaintDevice* self); +void QPagedPaintDevice_SetPageRanges(QPagedPaintDevice* self, QPageRanges* ranges); +QPageRanges* QPagedPaintDevice_PageRanges(const QPagedPaintDevice* self); +bool QPagedPaintDevice_SetPageMargins2(QPagedPaintDevice* self, QMarginsF* margins, int units); void QPagedPaintDevice_Delete(QPagedPaintDevice* self); -void QPagedPaintDevice__Margins_Delete(QPagedPaintDevice__Margins* self); - #ifdef __cplusplus } /* extern C */ #endif diff --git a/qt/gen_qpageranges.cpp b/qt/gen_qpageranges.cpp new file mode 100644 index 0000000..10dc64f --- /dev/null +++ b/qt/gen_qpageranges.cpp @@ -0,0 +1,103 @@ +#include +#include +#define WORKAROUND_INNER_CLASS_DEFINITION_QPageRanges__Range +#include +#include +#include +#include "qpageranges.h" +#include "gen_qpageranges.h" +#include "_cgo_export.h" + +QPageRanges* QPageRanges_new() { + return new QPageRanges(); +} + +QPageRanges* QPageRanges_new2(QPageRanges* other) { + return new QPageRanges(*other); +} + +void QPageRanges_OperatorAssign(QPageRanges* self, QPageRanges* other) { + self->operator=(*other); +} + +void QPageRanges_Swap(QPageRanges* self, QPageRanges* other) { + self->swap(*other); +} + +void QPageRanges_AddPage(QPageRanges* self, int pageNumber) { + self->addPage(static_cast(pageNumber)); +} + +void QPageRanges_AddRange(QPageRanges* self, int from, int to) { + self->addRange(static_cast(from), static_cast(to)); +} + +struct miqt_array* QPageRanges_ToRangeList(const QPageRanges* self) { + QList _ret = self->toRangeList(); + // Convert QList<> from C++ memory to manually-managed C memory + QPageRanges__Range** _arr = static_cast(malloc(sizeof(QPageRanges__Range*) * _ret.length())); + for (size_t i = 0, e = _ret.length(); i < e; ++i) { + _arr[i] = new QPageRanges::Range(_ret[i]); + } + struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); + _out->len = _ret.length(); + _out->data = static_cast(_arr); + return _out; +} + +void QPageRanges_Clear(QPageRanges* self) { + self->clear(); +} + +struct miqt_string* QPageRanges_ToString(const QPageRanges* self) { + QString _ret = self->toString(); + // 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()); +} + +QPageRanges* QPageRanges_FromString(struct miqt_string* ranges) { + QString ranges_QString = QString::fromUtf8(&ranges->data, ranges->len); + return new QPageRanges(QPageRanges::fromString(ranges_QString)); +} + +bool QPageRanges_Contains(const QPageRanges* self, int pageNumber) { + return self->contains(static_cast(pageNumber)); +} + +bool QPageRanges_IsEmpty(const QPageRanges* self) { + return self->isEmpty(); +} + +int QPageRanges_FirstPage(const QPageRanges* self) { + return self->firstPage(); +} + +int QPageRanges_LastPage(const QPageRanges* self) { + return self->lastPage(); +} + +void QPageRanges_Detach(QPageRanges* self) { + self->detach(); +} + +void QPageRanges_Delete(QPageRanges* self) { + delete self; +} + +QPageRanges__Range* QPageRanges__Range_new() { + return new QPageRanges::Range(); +} + +QPageRanges__Range* QPageRanges__Range_new2(QPageRanges__Range* param1) { + return new QPageRanges::Range(*param1); +} + +bool QPageRanges__Range_Contains(const QPageRanges__Range* self, int pageNumber) { + return self->contains(static_cast(pageNumber)); +} + +void QPageRanges__Range_Delete(QPageRanges__Range* self) { + delete self; +} + diff --git a/qt/gen_qpageranges.go b/qt/gen_qpageranges.go new file mode 100644 index 0000000..af6b0db --- /dev/null +++ b/qt/gen_qpageranges.go @@ -0,0 +1,184 @@ +package qt + +/* + +#include "gen_qpageranges.h" +#include + +*/ +import "C" + +import ( + "runtime" + "unsafe" +) + +type QPageRanges struct { + h *C.QPageRanges +} + +func (this *QPageRanges) cPointer() *C.QPageRanges { + if this == nil { + return nil + } + return this.h +} + +func newQPageRanges(h *C.QPageRanges) *QPageRanges { + if h == nil { + return nil + } + return &QPageRanges{h: h} +} + +func newQPageRanges_U(h unsafe.Pointer) *QPageRanges { + return newQPageRanges((*C.QPageRanges)(h)) +} + +// NewQPageRanges constructs a new QPageRanges object. +func NewQPageRanges() *QPageRanges { + ret := C.QPageRanges_new() + return newQPageRanges(ret) +} + +// NewQPageRanges2 constructs a new QPageRanges object. +func NewQPageRanges2(other *QPageRanges) *QPageRanges { + ret := C.QPageRanges_new2(other.cPointer()) + return newQPageRanges(ret) +} + +func (this *QPageRanges) OperatorAssign(other *QPageRanges) { + C.QPageRanges_OperatorAssign(this.h, other.cPointer()) +} + +func (this *QPageRanges) Swap(other *QPageRanges) { + C.QPageRanges_Swap(this.h, other.cPointer()) +} + +func (this *QPageRanges) AddPage(pageNumber int) { + C.QPageRanges_AddPage(this.h, (C.int)(pageNumber)) +} + +func (this *QPageRanges) AddRange(from int, to int) { + C.QPageRanges_AddRange(this.h, (C.int)(from), (C.int)(to)) +} + +func (this *QPageRanges) ToRangeList() []QPageRanges__Range { + var _ma *C.struct_miqt_array = C.QPageRanges_ToRangeList(this.h) + _ret := make([]QPageRanges__Range, int(_ma.len)) + _outCast := (*[0xffff]*C.QPageRanges__Range)(unsafe.Pointer(_ma.data)) // hey ya + for i := 0; i < int(_ma.len); i++ { + _lv_ret := _outCast[i] + _lv_goptr := newQPageRanges__Range(_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 *QPageRanges) Clear() { + C.QPageRanges_Clear(this.h) +} + +func (this *QPageRanges) ToString() string { + var _ms *C.struct_miqt_string = C.QPageRanges_ToString(this.h) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + +func QPageRanges_FromString(ranges string) *QPageRanges { + ranges_ms := miqt_strdupg(ranges) + defer C.free(ranges_ms) + _ret := C.QPageRanges_FromString((*C.struct_miqt_string)(ranges_ms)) + _goptr := newQPageRanges(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QPageRanges) Contains(pageNumber int) bool { + return (bool)(C.QPageRanges_Contains(this.h, (C.int)(pageNumber))) +} + +func (this *QPageRanges) IsEmpty() bool { + return (bool)(C.QPageRanges_IsEmpty(this.h)) +} + +func (this *QPageRanges) FirstPage() int { + return (int)(C.QPageRanges_FirstPage(this.h)) +} + +func (this *QPageRanges) LastPage() int { + return (int)(C.QPageRanges_LastPage(this.h)) +} + +func (this *QPageRanges) Detach() { + C.QPageRanges_Detach(this.h) +} + +// Delete this object from C++ memory. +func (this *QPageRanges) Delete() { + C.QPageRanges_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QPageRanges) GoGC() { + runtime.SetFinalizer(this, func(this *QPageRanges) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + +type QPageRanges__Range struct { + h *C.QPageRanges__Range +} + +func (this *QPageRanges__Range) cPointer() *C.QPageRanges__Range { + if this == nil { + return nil + } + return this.h +} + +func newQPageRanges__Range(h *C.QPageRanges__Range) *QPageRanges__Range { + if h == nil { + return nil + } + return &QPageRanges__Range{h: h} +} + +func newQPageRanges__Range_U(h unsafe.Pointer) *QPageRanges__Range { + return newQPageRanges__Range((*C.QPageRanges__Range)(h)) +} + +// NewQPageRanges__Range constructs a new QPageRanges::Range object. +func NewQPageRanges__Range() *QPageRanges__Range { + ret := C.QPageRanges__Range_new() + return newQPageRanges__Range(ret) +} + +// NewQPageRanges__Range2 constructs a new QPageRanges::Range object. +func NewQPageRanges__Range2(param1 *QPageRanges__Range) *QPageRanges__Range { + ret := C.QPageRanges__Range_new2(param1.cPointer()) + return newQPageRanges__Range(ret) +} + +func (this *QPageRanges__Range) Contains(pageNumber int) bool { + return (bool)(C.QPageRanges__Range_Contains(this.h, (C.int)(pageNumber))) +} + +// Delete this object from C++ memory. +func (this *QPageRanges__Range) Delete() { + C.QPageRanges__Range_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QPageRanges__Range) GoGC() { + runtime.SetFinalizer(this, func(this *QPageRanges__Range) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} diff --git a/qt/gen_qpageranges.h b/qt/gen_qpageranges.h new file mode 100644 index 0000000..92314a5 --- /dev/null +++ b/qt/gen_qpageranges.h @@ -0,0 +1,54 @@ +#ifndef GEN_QPAGERANGES_H +#define GEN_QPAGERANGES_H + +#include +#include +#include + +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + +#include "binding.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +class QPageRanges; +#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QPageRanges__Range) +typedef QPageRanges::Range QPageRanges__Range; +#else +class QPageRanges__Range; +#endif +#else +typedef struct QPageRanges QPageRanges; +typedef struct QPageRanges__Range QPageRanges__Range; +#endif + +QPageRanges* QPageRanges_new(); +QPageRanges* QPageRanges_new2(QPageRanges* other); +void QPageRanges_OperatorAssign(QPageRanges* self, QPageRanges* other); +void QPageRanges_Swap(QPageRanges* self, QPageRanges* other); +void QPageRanges_AddPage(QPageRanges* self, int pageNumber); +void QPageRanges_AddRange(QPageRanges* self, int from, int to); +struct miqt_array* QPageRanges_ToRangeList(const QPageRanges* self); +void QPageRanges_Clear(QPageRanges* self); +struct miqt_string* QPageRanges_ToString(const QPageRanges* self); +QPageRanges* QPageRanges_FromString(struct miqt_string* ranges); +bool QPageRanges_Contains(const QPageRanges* self, int pageNumber); +bool QPageRanges_IsEmpty(const QPageRanges* self); +int QPageRanges_FirstPage(const QPageRanges* self); +int QPageRanges_LastPage(const QPageRanges* self); +void QPageRanges_Detach(QPageRanges* self); +void QPageRanges_Delete(QPageRanges* self); + +QPageRanges__Range* QPageRanges__Range_new(); +QPageRanges__Range* QPageRanges__Range_new2(QPageRanges__Range* param1); +bool QPageRanges__Range_Contains(const QPageRanges__Range* self, int pageNumber); +void QPageRanges__Range_Delete(QPageRanges__Range* self); + +#ifdef __cplusplus +} /* extern C */ +#endif + +#endif diff --git a/qt/gen_qpagesize.go b/qt/gen_qpagesize.go index bd96892..2986963 100644 --- a/qt/gen_qpagesize.go +++ b/qt/gen_qpagesize.go @@ -16,38 +16,38 @@ import ( type QPageSize__PageSizeId int const ( - QPageSize__A4 QPageSize__PageSizeId = 0 - QPageSize__B5 QPageSize__PageSizeId = 1 - QPageSize__Letter QPageSize__PageSizeId = 2 - QPageSize__Legal QPageSize__PageSizeId = 3 - QPageSize__Executive QPageSize__PageSizeId = 4 - QPageSize__A0 QPageSize__PageSizeId = 5 - QPageSize__A1 QPageSize__PageSizeId = 6 - QPageSize__A2 QPageSize__PageSizeId = 7 - QPageSize__A3 QPageSize__PageSizeId = 8 - QPageSize__A5 QPageSize__PageSizeId = 9 - QPageSize__A6 QPageSize__PageSizeId = 10 - QPageSize__A7 QPageSize__PageSizeId = 11 - QPageSize__A8 QPageSize__PageSizeId = 12 - QPageSize__A9 QPageSize__PageSizeId = 13 + QPageSize__Letter QPageSize__PageSizeId = 0 + QPageSize__Legal QPageSize__PageSizeId = 1 + QPageSize__Executive QPageSize__PageSizeId = 2 + QPageSize__A0 QPageSize__PageSizeId = 3 + QPageSize__A1 QPageSize__PageSizeId = 4 + QPageSize__A2 QPageSize__PageSizeId = 5 + QPageSize__A3 QPageSize__PageSizeId = 6 + QPageSize__A4 QPageSize__PageSizeId = 7 + QPageSize__A5 QPageSize__PageSizeId = 8 + QPageSize__A6 QPageSize__PageSizeId = 9 + QPageSize__A7 QPageSize__PageSizeId = 10 + QPageSize__A8 QPageSize__PageSizeId = 11 + QPageSize__A9 QPageSize__PageSizeId = 12 + QPageSize__A10 QPageSize__PageSizeId = 13 QPageSize__B0 QPageSize__PageSizeId = 14 QPageSize__B1 QPageSize__PageSizeId = 15 - QPageSize__B10 QPageSize__PageSizeId = 16 - QPageSize__B2 QPageSize__PageSizeId = 17 - QPageSize__B3 QPageSize__PageSizeId = 18 - QPageSize__B4 QPageSize__PageSizeId = 19 + QPageSize__B2 QPageSize__PageSizeId = 16 + QPageSize__B3 QPageSize__PageSizeId = 17 + QPageSize__B4 QPageSize__PageSizeId = 18 + QPageSize__B5 QPageSize__PageSizeId = 19 QPageSize__B6 QPageSize__PageSizeId = 20 QPageSize__B7 QPageSize__PageSizeId = 21 QPageSize__B8 QPageSize__PageSizeId = 22 QPageSize__B9 QPageSize__PageSizeId = 23 - QPageSize__C5E QPageSize__PageSizeId = 24 - QPageSize__Comm10E QPageSize__PageSizeId = 25 - QPageSize__DLE QPageSize__PageSizeId = 26 - QPageSize__Folio QPageSize__PageSizeId = 27 - QPageSize__Ledger QPageSize__PageSizeId = 28 - QPageSize__Tabloid QPageSize__PageSizeId = 29 - QPageSize__Custom QPageSize__PageSizeId = 30 - QPageSize__A10 QPageSize__PageSizeId = 31 + QPageSize__B10 QPageSize__PageSizeId = 24 + QPageSize__C5E QPageSize__PageSizeId = 25 + QPageSize__Comm10E QPageSize__PageSizeId = 26 + QPageSize__DLE QPageSize__PageSizeId = 27 + QPageSize__Folio QPageSize__PageSizeId = 28 + QPageSize__Ledger QPageSize__PageSizeId = 29 + QPageSize__Tabloid QPageSize__PageSizeId = 30 + QPageSize__Custom QPageSize__PageSizeId = 31 QPageSize__A3Extra QPageSize__PageSizeId = 32 QPageSize__A4Extra QPageSize__PageSizeId = 33 QPageSize__A4Plus QPageSize__PageSizeId = 34 @@ -136,13 +136,11 @@ const ( QPageSize__EnvelopePrc10 QPageSize__PageSizeId = 117 QPageSize__EnvelopeYou4 QPageSize__PageSizeId = 118 QPageSize__LastPageSize QPageSize__PageSizeId = 118 - QPageSize__NPageSize QPageSize__PageSizeId = 118 - QPageSize__NPaperSize QPageSize__PageSizeId = 118 - QPageSize__AnsiA QPageSize__PageSizeId = 2 - QPageSize__AnsiB QPageSize__PageSizeId = 28 - QPageSize__EnvelopeC5 QPageSize__PageSizeId = 24 - QPageSize__EnvelopeDL QPageSize__PageSizeId = 26 - QPageSize__Envelope10 QPageSize__PageSizeId = 25 + QPageSize__AnsiA QPageSize__PageSizeId = 0 + QPageSize__AnsiB QPageSize__PageSizeId = 29 + QPageSize__EnvelopeC5 QPageSize__PageSizeId = 25 + QPageSize__EnvelopeDL QPageSize__PageSizeId = 27 + QPageSize__Envelope10 QPageSize__PageSizeId = 26 ) type QPageSize__Unit int diff --git a/qt/gen_qpaintdevice.cpp b/qt/gen_qpaintdevice.cpp index db277c7..ce90da7 100644 --- a/qt/gen_qpaintdevice.cpp +++ b/qt/gen_qpaintdevice.cpp @@ -48,8 +48,9 @@ int QPaintDevice_PhysicalDpiY(const QPaintDevice* self) { return self->physicalDpiY(); } -int QPaintDevice_DevicePixelRatio(const QPaintDevice* self) { - return self->devicePixelRatio(); +double QPaintDevice_DevicePixelRatio(const QPaintDevice* self) { + qreal _ret = self->devicePixelRatio(); + return static_cast(_ret); } double QPaintDevice_DevicePixelRatioF(const QPaintDevice* self) { diff --git a/qt/gen_qpaintdevice.go b/qt/gen_qpaintdevice.go index 1b5c82f..f86253a 100644 --- a/qt/gen_qpaintdevice.go +++ b/qt/gen_qpaintdevice.go @@ -96,8 +96,8 @@ func (this *QPaintDevice) PhysicalDpiY() int { return (int)(C.QPaintDevice_PhysicalDpiY(this.h)) } -func (this *QPaintDevice) DevicePixelRatio() int { - return (int)(C.QPaintDevice_DevicePixelRatio(this.h)) +func (this *QPaintDevice) DevicePixelRatio() float64 { + return (float64)(C.QPaintDevice_DevicePixelRatio(this.h)) } func (this *QPaintDevice) DevicePixelRatioF() float64 { diff --git a/qt/gen_qpaintdevice.h b/qt/gen_qpaintdevice.h index d4f34c7..6ebf539 100644 --- a/qt/gen_qpaintdevice.h +++ b/qt/gen_qpaintdevice.h @@ -32,7 +32,7 @@ int QPaintDevice_LogicalDpiX(const QPaintDevice* self); int QPaintDevice_LogicalDpiY(const QPaintDevice* self); int QPaintDevice_PhysicalDpiX(const QPaintDevice* self); int QPaintDevice_PhysicalDpiY(const QPaintDevice* self); -int QPaintDevice_DevicePixelRatio(const QPaintDevice* self); +double QPaintDevice_DevicePixelRatio(const QPaintDevice* self); double QPaintDevice_DevicePixelRatioF(const QPaintDevice* self); int QPaintDevice_ColorCount(const QPaintDevice* self); int QPaintDevice_Depth(const QPaintDevice* self); diff --git a/qt/gen_qpaintdevicewindow.cpp b/qt/gen_qpaintdevicewindow.cpp index e390f3d..f54ef51 100644 --- a/qt/gen_qpaintdevicewindow.cpp +++ b/qt/gen_qpaintdevicewindow.cpp @@ -24,13 +24,6 @@ struct miqt_string* QPaintDeviceWindow_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QPaintDeviceWindow_TrUtf8(const char* s) { - QString _ret = QPaintDeviceWindow::trUtf8(s); - // 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 QPaintDeviceWindow_Update(QPaintDeviceWindow* self, QRect* rect) { self->update(*rect); } @@ -57,20 +50,6 @@ struct miqt_string* QPaintDeviceWindow_Tr3(const char* s, const char* c, int n) return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QPaintDeviceWindow_TrUtf82(const char* s, const char* c) { - QString _ret = QPaintDeviceWindow::trUtf8(s, c); - // 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* QPaintDeviceWindow_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QPaintDeviceWindow::trUtf8(s, c, static_cast(n)); - // 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 QPaintDeviceWindow_Delete(QPaintDeviceWindow* self) { delete self; } diff --git a/qt/gen_qpaintdevicewindow.go b/qt/gen_qpaintdevicewindow.go index 9a70560..1229b84 100644 --- a/qt/gen_qpaintdevicewindow.go +++ b/qt/gen_qpaintdevicewindow.go @@ -56,15 +56,6 @@ func QPaintDeviceWindow_Tr(s string) string { return _ret } -func QPaintDeviceWindow_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPaintDeviceWindow_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QPaintDeviceWindow) Update(rect *QRect) { C.QPaintDeviceWindow_Update(this.h, rect.cPointer()) } @@ -99,28 +90,6 @@ func QPaintDeviceWindow_Tr3(s string, c string, n int) string { return _ret } -func QPaintDeviceWindow_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPaintDeviceWindow_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QPaintDeviceWindow_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPaintDeviceWindow_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QPaintDeviceWindow) Delete() { C.QPaintDeviceWindow_Delete(this.h) diff --git a/qt/gen_qpaintdevicewindow.h b/qt/gen_qpaintdevicewindow.h index 841d122..d2dee87 100644 --- a/qt/gen_qpaintdevicewindow.h +++ b/qt/gen_qpaintdevicewindow.h @@ -28,14 +28,11 @@ typedef struct QRegion QRegion; QMetaObject* QPaintDeviceWindow_MetaObject(const QPaintDeviceWindow* self); void* QPaintDeviceWindow_Metacast(QPaintDeviceWindow* self, const char* param1); struct miqt_string* QPaintDeviceWindow_Tr(const char* s); -struct miqt_string* QPaintDeviceWindow_TrUtf8(const char* s); void QPaintDeviceWindow_Update(QPaintDeviceWindow* self, QRect* rect); void QPaintDeviceWindow_UpdateWithRegion(QPaintDeviceWindow* self, QRegion* region); void QPaintDeviceWindow_Update2(QPaintDeviceWindow* self); struct miqt_string* QPaintDeviceWindow_Tr2(const char* s, const char* c); struct miqt_string* QPaintDeviceWindow_Tr3(const char* s, const char* c, int n); -struct miqt_string* QPaintDeviceWindow_TrUtf82(const char* s, const char* c); -struct miqt_string* QPaintDeviceWindow_TrUtf83(const char* s, const char* c, int n); void QPaintDeviceWindow_Delete(QPaintDeviceWindow* self); #ifdef __cplusplus diff --git a/qt/gen_qpaintengine.cpp b/qt/gen_qpaintengine.cpp index 91a1f8d..aad0668 100644 --- a/qt/gen_qpaintengine.cpp +++ b/qt/gen_qpaintengine.cpp @@ -3,7 +3,6 @@ #include #include #include -#include #include #include #include @@ -16,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -205,10 +205,22 @@ bool QPaintEngine_IsExtended(const QPaintEngine* self) { return self->isExtended(); } +QPixmap* QPaintEngine_CreatePixmap(QPaintEngine* self, QSize* size) { + return new QPixmap(self->createPixmap(*size)); +} + +QPixmap* QPaintEngine_CreatePixmapFromImage(QPaintEngine* self, QImage* image) { + return new QPixmap(self->createPixmapFromImage(*image)); +} + void QPaintEngine_DrawImage4(QPaintEngine* self, QRectF* r, QImage* pm, QRectF* sr, int flags) { self->drawImage(*r, *pm, *sr, static_cast(flags)); } +QPixmap* QPaintEngine_CreatePixmapFromImage2(QPaintEngine* self, QImage* image, int flags) { + return new QPixmap(self->createPixmapFromImage(*image, static_cast(flags))); +} + void QPaintEngine_Delete(QPaintEngine* self) { delete self; } @@ -243,10 +255,6 @@ QFont* QPaintEngineState_Font(const QPaintEngineState* self) { return new QFont(self->font()); } -QMatrix* QPaintEngineState_Matrix(const QPaintEngineState* self) { - return new QMatrix(self->matrix()); -} - QTransform* QPaintEngineState_Transform(const QPaintEngineState* self) { return new QTransform(self->transform()); } diff --git a/qt/gen_qpaintengine.go b/qt/gen_qpaintengine.go index f8e760b..155b320 100644 --- a/qt/gen_qpaintengine.go +++ b/qt/gen_qpaintengine.go @@ -85,18 +85,17 @@ const ( QPaintEngine__CoreGraphics QPaintEngine__Type = 3 QPaintEngine__MacPrinter QPaintEngine__Type = 4 QPaintEngine__QWindowSystem QPaintEngine__Type = 5 - QPaintEngine__PostScript QPaintEngine__Type = 6 - QPaintEngine__OpenGL QPaintEngine__Type = 7 - QPaintEngine__Picture QPaintEngine__Type = 8 - QPaintEngine__SVG QPaintEngine__Type = 9 - QPaintEngine__Raster QPaintEngine__Type = 10 - QPaintEngine__Direct3D QPaintEngine__Type = 11 - QPaintEngine__Pdf QPaintEngine__Type = 12 - QPaintEngine__OpenVG QPaintEngine__Type = 13 - QPaintEngine__OpenGL2 QPaintEngine__Type = 14 - QPaintEngine__PaintBuffer QPaintEngine__Type = 15 - QPaintEngine__Blitter QPaintEngine__Type = 16 - QPaintEngine__Direct2D QPaintEngine__Type = 17 + QPaintEngine__OpenGL QPaintEngine__Type = 6 + QPaintEngine__Picture QPaintEngine__Type = 7 + QPaintEngine__SVG QPaintEngine__Type = 8 + QPaintEngine__Raster QPaintEngine__Type = 9 + QPaintEngine__Direct3D QPaintEngine__Type = 10 + QPaintEngine__Pdf QPaintEngine__Type = 11 + QPaintEngine__OpenVG QPaintEngine__Type = 12 + QPaintEngine__OpenGL2 QPaintEngine__Type = 13 + QPaintEngine__PaintBuffer QPaintEngine__Type = 14 + QPaintEngine__Blitter QPaintEngine__Type = 15 + QPaintEngine__Direct2D QPaintEngine__Type = 16 QPaintEngine__User QPaintEngine__Type = 50 QPaintEngine__MaxUser QPaintEngine__Type = 100 ) @@ -342,10 +341,31 @@ func (this *QPaintEngine) IsExtended() bool { return (bool)(C.QPaintEngine_IsExtended(this.h)) } +func (this *QPaintEngine) CreatePixmap(size QSize) *QPixmap { + _ret := C.QPaintEngine_CreatePixmap(this.h, size.cPointer()) + _goptr := newQPixmap(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QPaintEngine) CreatePixmapFromImage(image QImage) *QPixmap { + _ret := C.QPaintEngine_CreatePixmapFromImage(this.h, image.cPointer()) + _goptr := newQPixmap(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + func (this *QPaintEngine) DrawImage4(r *QRectF, pm *QImage, sr *QRectF, flags ImageConversionFlag) { C.QPaintEngine_DrawImage4(this.h, r.cPointer(), pm.cPointer(), sr.cPointer(), (C.int)(flags)) } +func (this *QPaintEngine) CreatePixmapFromImage2(image QImage, flags ImageConversionFlag) *QPixmap { + _ret := C.QPaintEngine_CreatePixmapFromImage2(this.h, image.cPointer(), (C.int)(flags)) + _goptr := newQPixmap(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + // Delete this object from C++ memory. func (this *QPaintEngine) Delete() { C.QPaintEngine_Delete(this.h) @@ -425,13 +445,6 @@ func (this *QPaintEngineState) Font() *QFont { return _goptr } -func (this *QPaintEngineState) Matrix() *QMatrix { - _ret := C.QPaintEngineState_Matrix(this.h) - _goptr := newQMatrix(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - func (this *QPaintEngineState) Transform() *QTransform { _ret := C.QPaintEngineState_Transform(this.h) _goptr := newQTransform(_ret) diff --git a/qt/gen_qpaintengine.h b/qt/gen_qpaintengine.h index 40264bc..4716df8 100644 --- a/qt/gen_qpaintengine.h +++ b/qt/gen_qpaintengine.h @@ -19,7 +19,6 @@ class QFont; class QImage; class QLine; class QLineF; -class QMatrix; class QPaintDevice; class QPaintEngine; class QPaintEngineState; @@ -32,6 +31,7 @@ class QPointF; class QRect; class QRectF; class QRegion; +class QSize; class QTextItem; class QTransform; #else @@ -40,7 +40,6 @@ typedef struct QFont QFont; typedef struct QImage QImage; typedef struct QLine QLine; typedef struct QLineF QLineF; -typedef struct QMatrix QMatrix; typedef struct QPaintDevice QPaintDevice; typedef struct QPaintEngine QPaintEngine; typedef struct QPaintEngineState QPaintEngineState; @@ -53,6 +52,7 @@ typedef struct QPointF QPointF; typedef struct QRect QRect; typedef struct QRectF QRectF; typedef struct QRegion QRegion; +typedef struct QSize QSize; typedef struct QTextItem QTextItem; typedef struct QTransform QTransform; #endif @@ -101,7 +101,10 @@ bool QPaintEngine_HasFeature(const QPaintEngine* self, int feature); QPainter* QPaintEngine_Painter(const QPaintEngine* self); void QPaintEngine_SyncState(QPaintEngine* self); bool QPaintEngine_IsExtended(const QPaintEngine* self); +QPixmap* QPaintEngine_CreatePixmap(QPaintEngine* self, QSize* size); +QPixmap* QPaintEngine_CreatePixmapFromImage(QPaintEngine* self, QImage* image); void QPaintEngine_DrawImage4(QPaintEngine* self, QRectF* r, QImage* pm, QRectF* sr, int flags); +QPixmap* QPaintEngine_CreatePixmapFromImage2(QPaintEngine* self, QImage* image, int flags); void QPaintEngine_Delete(QPaintEngine* self); int QPaintEngineState_State(const QPaintEngineState* self); @@ -111,7 +114,6 @@ QPointF* QPaintEngineState_BrushOrigin(const QPaintEngineState* self); QBrush* QPaintEngineState_BackgroundBrush(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); int QPaintEngineState_ClipOperation(const QPaintEngineState* self); QRegion* QPaintEngineState_ClipRegion(const QPaintEngineState* self); diff --git a/qt/gen_qpainter.cpp b/qt/gen_qpainter.cpp index 159b529..fc43d5c 100644 --- a/qt/gen_qpainter.cpp +++ b/qt/gen_qpainter.cpp @@ -8,7 +8,6 @@ #include #include #include -#include #include #include #include @@ -57,10 +56,6 @@ bool QPainter_IsActive(const QPainter* self) { return self->isActive(); } -void QPainter_InitFrom(QPainter* self, QPaintDevice* device) { - self->initFrom(device); -} - void QPainter_SetCompositionMode(QPainter* self, int mode) { self->setCompositionMode(static_cast(mode)); } @@ -212,26 +207,6 @@ void QPainter_Restore(QPainter* self) { self->restore(); } -void QPainter_SetMatrix(QPainter* self, QMatrix* matrix) { - self->setMatrix(*matrix); -} - -QMatrix* QPainter_Matrix(const QPainter* self) { - const QMatrix& _ret = self->matrix(); - // Cast returned reference into pointer - return const_cast(&_ret); -} - -QMatrix* QPainter_DeviceMatrix(const QPainter* self) { - const QMatrix& _ret = self->deviceMatrix(); - // Cast returned reference into pointer - return const_cast(&_ret); -} - -void QPainter_ResetMatrix(QPainter* self) { - self->resetMatrix(); -} - void QPainter_SetTransform(QPainter* self, QTransform* transform) { self->setTransform(*transform); } @@ -252,28 +227,6 @@ void QPainter_ResetTransform(QPainter* self) { self->resetTransform(); } -void QPainter_SetWorldMatrix(QPainter* self, QMatrix* matrix) { - self->setWorldMatrix(*matrix); -} - -QMatrix* QPainter_WorldMatrix(const QPainter* self) { - const QMatrix& _ret = self->worldMatrix(); - // Cast returned reference into pointer - return const_cast(&_ret); -} - -QMatrix* QPainter_CombinedMatrix(const QPainter* self) { - return new QMatrix(self->combinedMatrix()); -} - -void QPainter_SetMatrixEnabled(QPainter* self, bool enabled) { - self->setMatrixEnabled(enabled); -} - -bool QPainter_MatrixEnabled(const QPainter* self) { - return self->matrixEnabled(); -} - void QPainter_SetWorldTransform(QPainter* self, QTransform* matrix) { self->setWorldTransform(*matrix); } @@ -409,7 +362,7 @@ void QPainter_DrawLines(QPainter* self, QLineF* lines, int lineCount) { } void QPainter_DrawLinesWithLines(QPainter* self, struct miqt_array* /* of QLineF* */ lines) { - QVector lines_QList; + QList lines_QList; lines_QList.reserve(lines->len); QLineF** lines_arr = static_cast(lines->data); for(size_t i = 0; i < lines->len; ++i) { @@ -423,7 +376,7 @@ void QPainter_DrawLines2(QPainter* self, QPointF* pointPairs, int lineCount) { } void QPainter_DrawLinesWithPointPairs(QPainter* self, struct miqt_array* /* of QPointF* */ pointPairs) { - QVector pointPairs_QList; + QList pointPairs_QList; pointPairs_QList.reserve(pointPairs->len); QPointF** pointPairs_arr = static_cast(pointPairs->data); for(size_t i = 0; i < pointPairs->len; ++i) { @@ -437,7 +390,7 @@ void QPainter_DrawLines3(QPainter* self, QLine* lines, int lineCount) { } void QPainter_DrawLines4(QPainter* self, struct miqt_array* /* of QLine* */ lines) { - QVector lines_QList; + QList lines_QList; lines_QList.reserve(lines->len); QLine** lines_arr = static_cast(lines->data); for(size_t i = 0; i < lines->len; ++i) { @@ -451,7 +404,7 @@ void QPainter_DrawLines5(QPainter* self, QPoint* pointPairs, int lineCount) { } void QPainter_DrawLines6(QPainter* self, struct miqt_array* /* of QPoint* */ pointPairs) { - QVector pointPairs_QList; + QList pointPairs_QList; pointPairs_QList.reserve(pointPairs->len); QPoint** pointPairs_arr = static_cast(pointPairs->data); for(size_t i = 0; i < pointPairs->len; ++i) { @@ -477,7 +430,7 @@ void QPainter_DrawRects(QPainter* self, QRectF* rects, int rectCount) { } void QPainter_DrawRectsWithRectangles(QPainter* self, struct miqt_array* /* of QRectF* */ rectangles) { - QVector rectangles_QList; + QList rectangles_QList; rectangles_QList.reserve(rectangles->len); QRectF** rectangles_arr = static_cast(rectangles->data); for(size_t i = 0; i < rectangles->len; ++i) { @@ -491,7 +444,7 @@ void QPainter_DrawRects2(QPainter* self, QRect* rects, int rectCount) { } void QPainter_DrawRects3(QPainter* self, struct miqt_array* /* of QRect* */ rectangles) { - QVector rectangles_QList; + QList rectangles_QList; rectangles_QList.reserve(rectangles->len); QRect** rectangles_arr = static_cast(rectangles->data); for(size_t i = 0; i < rectangles->len; ++i) { @@ -592,18 +545,6 @@ void QPainter_DrawRoundedRect3(QPainter* self, QRect* rect, double xRadius, doub self->drawRoundedRect(*rect, static_cast(xRadius), static_cast(yRadius)); } -void QPainter_DrawRoundRect(QPainter* self, QRectF* r) { - self->drawRoundRect(*r); -} - -void QPainter_DrawRoundRect2(QPainter* self, int x, int y, int w, int h) { - self->drawRoundRect(static_cast(x), static_cast(y), static_cast(w), static_cast(h)); -} - -void QPainter_DrawRoundRectWithQRect(QPainter* self, QRect* r) { - self->drawRoundRect(*r); -} - void QPainter_DrawTiledPixmap(QPainter* self, QRectF* rect, QPixmap* pm) { self->drawTiledPixmap(*rect, *pm); } @@ -902,18 +843,6 @@ QPaintEngine* QPainter_PaintEngine(const QPainter* self) { return self->paintEngine(); } -void QPainter_SetRedirected(QPaintDevice* device, QPaintDevice* replacement) { - QPainter::setRedirected(device, replacement); -} - -QPaintDevice* QPainter_Redirected(QPaintDevice* device) { - return QPainter::redirected(device); -} - -void QPainter_RestoreRedirected(QPaintDevice* device) { - QPainter::restoreRedirected(device); -} - void QPainter_BeginNativePainting(QPainter* self) { self->beginNativePainting(); } @@ -942,18 +871,10 @@ void QPainter_SetClipPath2(QPainter* self, QPainterPath* path, int op) { self->setClipPath(*path, static_cast(op)); } -void QPainter_SetMatrix2(QPainter* self, QMatrix* matrix, bool combine) { - self->setMatrix(*matrix, combine); -} - void QPainter_SetTransform2(QPainter* self, QTransform* transform, bool combine) { self->setTransform(*transform, combine); } -void QPainter_SetWorldMatrix2(QPainter* self, QMatrix* matrix, bool combine) { - self->setWorldMatrix(*matrix, combine); -} - void QPainter_SetWorldTransform2(QPainter* self, QTransform* matrix, bool combine) { self->setWorldTransform(*matrix, combine); } @@ -978,30 +899,6 @@ void QPainter_DrawRoundedRect42(QPainter* self, QRect* rect, double xRadius, dou self->drawRoundedRect(*rect, static_cast(xRadius), static_cast(yRadius), static_cast(mode)); } -void QPainter_DrawRoundRect22(QPainter* self, QRectF* r, int xround) { - self->drawRoundRect(*r, static_cast(xround)); -} - -void QPainter_DrawRoundRect3(QPainter* self, QRectF* r, int xround, int yround) { - self->drawRoundRect(*r, static_cast(xround), static_cast(yround)); -} - -void QPainter_DrawRoundRect5(QPainter* self, int x, int y, int w, int h, int param5) { - self->drawRoundRect(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(param5)); -} - -void QPainter_DrawRoundRect6(QPainter* self, int x, int y, int w, int h, int param5, int param6) { - self->drawRoundRect(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(param5), static_cast(param6)); -} - -void QPainter_DrawRoundRect23(QPainter* self, QRect* r, int xround) { - self->drawRoundRect(*r, static_cast(xround)); -} - -void QPainter_DrawRoundRect32(QPainter* self, QRect* r, int xround, int yround) { - self->drawRoundRect(*r, static_cast(xround), static_cast(yround)); -} - void QPainter_DrawTiledPixmap32(QPainter* self, QRectF* rect, QPixmap* pm, QPointF* offset) { self->drawTiledPixmap(*rect, *pm, *offset); } @@ -1091,14 +988,6 @@ void QPainter_SetRenderHints2(QPainter* self, int hints, bool on) { self->setRenderHints(static_cast(hints), on); } -void QPainter_SetRedirected3(QPaintDevice* device, QPaintDevice* replacement, QPoint* offset) { - QPainter::setRedirected(device, replacement, *offset); -} - -QPaintDevice* QPainter_Redirected2(QPaintDevice* device, QPoint* offset) { - return QPainter::redirected(device, offset); -} - void QPainter_Delete(QPainter* self) { delete self; } diff --git a/qt/gen_qpainter.go b/qt/gen_qpainter.go index 5868f5d..23bd9e4 100644 --- a/qt/gen_qpainter.go +++ b/qt/gen_qpainter.go @@ -16,13 +16,12 @@ import ( type QPainter__RenderHint int const ( - QPainter__Antialiasing QPainter__RenderHint = 1 - QPainter__TextAntialiasing QPainter__RenderHint = 2 - QPainter__SmoothPixmapTransform QPainter__RenderHint = 4 - QPainter__HighQualityAntialiasing QPainter__RenderHint = 8 - QPainter__NonCosmeticDefaultPen QPainter__RenderHint = 16 - QPainter__Qt4CompatiblePainting QPainter__RenderHint = 32 - QPainter__LosslessImageRendering QPainter__RenderHint = 64 + QPainter__Antialiasing QPainter__RenderHint = 1 + QPainter__TextAntialiasing QPainter__RenderHint = 2 + QPainter__SmoothPixmapTransform QPainter__RenderHint = 4 + QPainter__VerticalSubpixelPositioning QPainter__RenderHint = 8 + QPainter__LosslessImageRendering QPainter__RenderHint = 64 + QPainter__NonCosmeticBrushPatterns QPainter__RenderHint = 128 ) type QPainter__PixmapFragmentHint int @@ -124,10 +123,6 @@ func (this *QPainter) IsActive() bool { return (bool)(C.QPainter_IsActive(this.h)) } -func (this *QPainter) InitFrom(device *QPaintDevice) { - C.QPainter_InitFrom(this.h, device.cPointer()) -} - func (this *QPainter) SetCompositionMode(mode QPainter__CompositionMode) { C.QPainter_SetCompositionMode(this.h, (C.int)(mode)) } @@ -286,22 +281,6 @@ func (this *QPainter) Restore() { C.QPainter_Restore(this.h) } -func (this *QPainter) SetMatrix(matrix *QMatrix) { - C.QPainter_SetMatrix(this.h, matrix.cPointer()) -} - -func (this *QPainter) Matrix() *QMatrix { - return newQMatrix_U(unsafe.Pointer(C.QPainter_Matrix(this.h))) -} - -func (this *QPainter) DeviceMatrix() *QMatrix { - return newQMatrix_U(unsafe.Pointer(C.QPainter_DeviceMatrix(this.h))) -} - -func (this *QPainter) ResetMatrix() { - C.QPainter_ResetMatrix(this.h) -} - func (this *QPainter) SetTransform(transform *QTransform) { C.QPainter_SetTransform(this.h, transform.cPointer()) } @@ -318,29 +297,6 @@ func (this *QPainter) ResetTransform() { C.QPainter_ResetTransform(this.h) } -func (this *QPainter) SetWorldMatrix(matrix *QMatrix) { - C.QPainter_SetWorldMatrix(this.h, matrix.cPointer()) -} - -func (this *QPainter) WorldMatrix() *QMatrix { - return newQMatrix_U(unsafe.Pointer(C.QPainter_WorldMatrix(this.h))) -} - -func (this *QPainter) CombinedMatrix() *QMatrix { - _ret := C.QPainter_CombinedMatrix(this.h) - _goptr := newQMatrix(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QPainter) SetMatrixEnabled(enabled bool) { - C.QPainter_SetMatrixEnabled(this.h, (C.bool)(enabled)) -} - -func (this *QPainter) MatrixEnabled() bool { - return (bool)(C.QPainter_MatrixEnabled(this.h)) -} - func (this *QPainter) SetWorldTransform(matrix *QTransform) { C.QPainter_SetWorldTransform(this.h, matrix.cPointer()) } @@ -678,18 +634,6 @@ func (this *QPainter) DrawRoundedRect3(rect *QRect, xRadius float64, yRadius flo C.QPainter_DrawRoundedRect3(this.h, rect.cPointer(), (C.double)(xRadius), (C.double)(yRadius)) } -func (this *QPainter) DrawRoundRect(r *QRectF) { - C.QPainter_DrawRoundRect(this.h, r.cPointer()) -} - -func (this *QPainter) DrawRoundRect2(x int, y int, w int, h int) { - C.QPainter_DrawRoundRect2(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h)) -} - -func (this *QPainter) DrawRoundRectWithQRect(r *QRect) { - C.QPainter_DrawRoundRectWithQRect(this.h, r.cPointer()) -} - func (this *QPainter) DrawTiledPixmap(rect *QRectF, pm *QPixmap) { C.QPainter_DrawTiledPixmap(this.h, rect.cPointer(), pm.cPointer()) } @@ -1010,18 +954,6 @@ func (this *QPainter) PaintEngine() *QPaintEngine { return newQPaintEngine_U(unsafe.Pointer(C.QPainter_PaintEngine(this.h))) } -func QPainter_SetRedirected(device *QPaintDevice, replacement *QPaintDevice) { - C.QPainter_SetRedirected(device.cPointer(), replacement.cPointer()) -} - -func QPainter_Redirected(device *QPaintDevice) *QPaintDevice { - return newQPaintDevice_U(unsafe.Pointer(C.QPainter_Redirected(device.cPointer()))) -} - -func QPainter_RestoreRedirected(device *QPaintDevice) { - C.QPainter_RestoreRedirected(device.cPointer()) -} - func (this *QPainter) BeginNativePainting() { C.QPainter_BeginNativePainting(this.h) } @@ -1050,18 +982,10 @@ func (this *QPainter) SetClipPath2(path *QPainterPath, op ClipOperation) { C.QPainter_SetClipPath2(this.h, path.cPointer(), (C.int)(op)) } -func (this *QPainter) SetMatrix2(matrix *QMatrix, combine bool) { - C.QPainter_SetMatrix2(this.h, matrix.cPointer(), (C.bool)(combine)) -} - func (this *QPainter) SetTransform2(transform *QTransform, combine bool) { C.QPainter_SetTransform2(this.h, transform.cPointer(), (C.bool)(combine)) } -func (this *QPainter) SetWorldMatrix2(matrix *QMatrix, combine bool) { - C.QPainter_SetWorldMatrix2(this.h, matrix.cPointer(), (C.bool)(combine)) -} - func (this *QPainter) SetWorldTransform2(matrix *QTransform, combine bool) { C.QPainter_SetWorldTransform2(this.h, matrix.cPointer(), (C.bool)(combine)) } @@ -1086,30 +1010,6 @@ func (this *QPainter) DrawRoundedRect42(rect *QRect, xRadius float64, yRadius fl C.QPainter_DrawRoundedRect42(this.h, rect.cPointer(), (C.double)(xRadius), (C.double)(yRadius), (C.int)(mode)) } -func (this *QPainter) DrawRoundRect22(r *QRectF, xround int) { - C.QPainter_DrawRoundRect22(this.h, r.cPointer(), (C.int)(xround)) -} - -func (this *QPainter) DrawRoundRect3(r *QRectF, xround int, yround int) { - C.QPainter_DrawRoundRect3(this.h, r.cPointer(), (C.int)(xround), (C.int)(yround)) -} - -func (this *QPainter) DrawRoundRect5(x int, y int, w int, h int, param5 int) { - C.QPainter_DrawRoundRect5(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.int)(param5)) -} - -func (this *QPainter) DrawRoundRect6(x int, y int, w int, h int, param5 int, param6 int) { - C.QPainter_DrawRoundRect6(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.int)(param5), (C.int)(param6)) -} - -func (this *QPainter) DrawRoundRect23(r *QRect, xround int) { - C.QPainter_DrawRoundRect23(this.h, r.cPointer(), (C.int)(xround)) -} - -func (this *QPainter) DrawRoundRect32(r *QRect, xround int, yround int) { - C.QPainter_DrawRoundRect32(this.h, r.cPointer(), (C.int)(xround), (C.int)(yround)) -} - func (this *QPainter) DrawTiledPixmap32(rect *QRectF, pm *QPixmap, offset *QPointF) { C.QPainter_DrawTiledPixmap32(this.h, rect.cPointer(), pm.cPointer(), offset.cPointer()) } @@ -1207,14 +1107,6 @@ func (this *QPainter) SetRenderHints2(hints QPainter__RenderHint, on bool) { C.QPainter_SetRenderHints2(this.h, (C.int)(hints), (C.bool)(on)) } -func QPainter_SetRedirected3(device *QPaintDevice, replacement *QPaintDevice, offset *QPoint) { - C.QPainter_SetRedirected3(device.cPointer(), replacement.cPointer(), offset.cPointer()) -} - -func QPainter_Redirected2(device *QPaintDevice, offset *QPoint) *QPaintDevice { - return newQPaintDevice_U(unsafe.Pointer(C.QPainter_Redirected2(device.cPointer(), offset.cPointer()))) -} - // Delete this object from C++ memory. func (this *QPainter) Delete() { C.QPainter_Delete(this.h) diff --git a/qt/gen_qpainter.h b/qt/gen_qpainter.h index b510b16..ded7565 100644 --- a/qt/gen_qpainter.h +++ b/qt/gen_qpainter.h @@ -23,7 +23,6 @@ class QGlyphRun; class QImage; class QLine; class QLineF; -class QMatrix; class QPaintDevice; class QPaintEngine; class QPainter; @@ -55,7 +54,6 @@ typedef struct QGlyphRun QGlyphRun; typedef struct QImage QImage; typedef struct QLine QLine; typedef struct QLineF QLineF; -typedef struct QMatrix QMatrix; typedef struct QPaintDevice QPaintDevice; typedef struct QPaintEngine QPaintEngine; typedef struct QPainter QPainter; @@ -81,7 +79,6 @@ QPaintDevice* QPainter_Device(const QPainter* self); 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, int mode); int QPainter_CompositionMode(const QPainter* self); QFont* QPainter_Font(const QPainter* self); @@ -117,19 +114,10 @@ bool QPainter_HasClipping(const QPainter* self); QRectF* QPainter_ClipBoundingRect(const QPainter* self); void QPainter_Save(QPainter* self); void QPainter_Restore(QPainter* self); -void QPainter_SetMatrix(QPainter* self, QMatrix* matrix); -QMatrix* QPainter_Matrix(const QPainter* self); -QMatrix* QPainter_DeviceMatrix(const QPainter* self); -void QPainter_ResetMatrix(QPainter* self); void QPainter_SetTransform(QPainter* self, QTransform* transform); QTransform* QPainter_Transform(const QPainter* self); QTransform* QPainter_DeviceTransform(const QPainter* self); void QPainter_ResetTransform(QPainter* self); -void QPainter_SetWorldMatrix(QPainter* self, QMatrix* matrix); -QMatrix* QPainter_WorldMatrix(const QPainter* self); -QMatrix* QPainter_CombinedMatrix(const QPainter* self); -void QPainter_SetMatrixEnabled(QPainter* self, bool enabled); -bool QPainter_MatrixEnabled(const QPainter* self); void QPainter_SetWorldTransform(QPainter* self, QTransform* matrix); QTransform* QPainter_WorldTransform(const QPainter* self); QTransform* QPainter_CombinedTransform(const QPainter* self); @@ -200,9 +188,6 @@ void QPainter_DrawChord3(QPainter* self, QRect* param1, int a, int alen); void QPainter_DrawRoundedRect(QPainter* self, QRectF* rect, double xRadius, double yRadius); void QPainter_DrawRoundedRect2(QPainter* self, int x, int y, int w, int h, double xRadius, double yRadius); void QPainter_DrawRoundedRect3(QPainter* self, QRect* rect, double xRadius, double yRadius); -void QPainter_DrawRoundRect(QPainter* self, QRectF* r); -void QPainter_DrawRoundRect2(QPainter* self, int x, int y, int w, int h); -void QPainter_DrawRoundRectWithQRect(QPainter* self, QRect* r); void QPainter_DrawTiledPixmap(QPainter* self, QRectF* rect, QPixmap* pm); void QPainter_DrawTiledPixmap2(QPainter* self, int x, int y, int w, int h, QPixmap* param5); void QPainter_DrawTiledPixmap3(QPainter* self, QRect* param1, QPixmap* param2); @@ -274,9 +259,6 @@ void QPainter_SetRenderHints(QPainter* self, int hints); int QPainter_RenderHints(const QPainter* self); 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, int op); @@ -284,21 +266,13 @@ 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, 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); -void QPainter_DrawRoundRect6(QPainter* self, int x, int y, int w, int h, int param5, int param6); -void QPainter_DrawRoundRect23(QPainter* self, QRect* r, int xround); -void QPainter_DrawRoundRect32(QPainter* self, QRect* r, int xround, int yround); void QPainter_DrawTiledPixmap32(QPainter* self, QRectF* rect, QPixmap* pm, QPointF* offset); void QPainter_DrawTiledPixmap6(QPainter* self, int x, int y, int w, int h, QPixmap* param5, int sx); void QPainter_DrawTiledPixmap7(QPainter* self, int x, int y, int w, int h, QPixmap* param5, int sx, int sy); @@ -320,8 +294,6 @@ void QPainter_DrawText32(QPainter* self, QRectF* r, struct miqt_string* text, QT QRectF* QPainter_BoundingRect32(QPainter* self, QRectF* rect, struct miqt_string* text, QTextOption* o); 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); void QPainter_Delete(QPainter* self); QPainter__PixmapFragment* QPainter__PixmapFragment_Create(QPointF* pos, QRectF* sourceRect); diff --git a/qt/gen_qpainterpath.cpp b/qt/gen_qpainterpath.cpp index ffd6d1a..ccf1e47 100644 --- a/qt/gen_qpainterpath.cpp +++ b/qt/gen_qpainterpath.cpp @@ -148,22 +148,6 @@ void QPainterPath_AddRoundedRect2(QPainterPath* self, double x, double y, double self->addRoundedRect(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(xRadius), static_cast(yRadius)); } -void QPainterPath_AddRoundRect(QPainterPath* self, QRectF* rect, int xRnd, int yRnd) { - self->addRoundRect(*rect, static_cast(xRnd), static_cast(yRnd)); -} - -void QPainterPath_AddRoundRect2(QPainterPath* self, double x, double y, double w, double h, int xRnd, int yRnd) { - self->addRoundRect(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(xRnd), static_cast(yRnd)); -} - -void QPainterPath_AddRoundRect3(QPainterPath* self, QRectF* rect, int roundness) { - self->addRoundRect(*rect, static_cast(roundness)); -} - -void QPainterPath_AddRoundRect4(QPainterPath* self, double x, double y, double w, double h, int roundness) { - self->addRoundRect(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(roundness)); -} - void QPainterPath_ConnectPath(QPainterPath* self, QPainterPath* path) { self->connectPath(*path); } @@ -277,10 +261,6 @@ QPainterPath* QPainterPath_Subtracted(const QPainterPath* self, QPainterPath* r) return new QPainterPath(self->subtracted(*r)); } -QPainterPath* QPainterPath_SubtractedInverted(const QPainterPath* self, QPainterPath* r) { - return new QPainterPath(self->subtractedInverted(*r)); -} - QPainterPath* QPainterPath_Simplified(const QPainterPath* self) { return new QPainterPath(self->simplified()); } @@ -399,7 +379,7 @@ void QPainterPathStroker_SetDashPattern(QPainterPathStroker* self, int dashPatte } void QPainterPathStroker_SetDashPatternWithDashPattern(QPainterPathStroker* self, struct miqt_array* /* of double */ dashPattern) { - QVector dashPattern_QList; + QList dashPattern_QList; dashPattern_QList.reserve(dashPattern->len); double* dashPattern_arr = static_cast(dashPattern->data); for(size_t i = 0; i < dashPattern->len; ++i) { @@ -409,7 +389,7 @@ void QPainterPathStroker_SetDashPatternWithDashPattern(QPainterPathStroker* self } struct miqt_array* QPainterPathStroker_DashPattern(const QPainterPathStroker* self) { - QVector _ret = self->dashPattern(); + QList _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) { diff --git a/qt/gen_qpainterpath.go b/qt/gen_qpainterpath.go index 0b483cb..a5d07b4 100644 --- a/qt/gen_qpainterpath.go +++ b/qt/gen_qpainterpath.go @@ -189,22 +189,6 @@ func (this *QPainterPath) AddRoundedRect2(x float64, y float64, w float64, h flo C.QPainterPath_AddRoundedRect2(this.h, (C.double)(x), (C.double)(y), (C.double)(w), (C.double)(h), (C.double)(xRadius), (C.double)(yRadius)) } -func (this *QPainterPath) AddRoundRect(rect *QRectF, xRnd int, yRnd int) { - C.QPainterPath_AddRoundRect(this.h, rect.cPointer(), (C.int)(xRnd), (C.int)(yRnd)) -} - -func (this *QPainterPath) AddRoundRect2(x float64, y float64, w float64, h float64, xRnd int, yRnd int) { - C.QPainterPath_AddRoundRect2(this.h, (C.double)(x), (C.double)(y), (C.double)(w), (C.double)(h), (C.int)(xRnd), (C.int)(yRnd)) -} - -func (this *QPainterPath) AddRoundRect3(rect *QRectF, roundness int) { - C.QPainterPath_AddRoundRect3(this.h, rect.cPointer(), (C.int)(roundness)) -} - -func (this *QPainterPath) AddRoundRect4(x float64, y float64, w float64, h float64, roundness int) { - C.QPainterPath_AddRoundRect4(this.h, (C.double)(x), (C.double)(y), (C.double)(w), (C.double)(h), (C.int)(roundness)) -} - func (this *QPainterPath) ConnectPath(path *QPainterPath) { C.QPainterPath_ConnectPath(this.h, path.cPointer()) } @@ -343,13 +327,6 @@ func (this *QPainterPath) Subtracted(r *QPainterPath) *QPainterPath { return _goptr } -func (this *QPainterPath) SubtractedInverted(r *QPainterPath) *QPainterPath { - _ret := C.QPainterPath_SubtractedInverted(this.h, r.cPointer()) - _goptr := newQPainterPath(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - func (this *QPainterPath) Simplified() *QPainterPath { _ret := C.QPainterPath_Simplified(this.h) _goptr := newQPainterPath(_ret) diff --git a/qt/gen_qpainterpath.h b/qt/gen_qpainterpath.h index 7b46c58..39bd367 100644 --- a/qt/gen_qpainterpath.h +++ b/qt/gen_qpainterpath.h @@ -70,10 +70,6 @@ void QPainterPath_AddPath(QPainterPath* self, QPainterPath* path); void QPainterPath_AddRegion(QPainterPath* self, QRegion* region); void QPainterPath_AddRoundedRect(QPainterPath* self, QRectF* rect, double xRadius, double yRadius); void QPainterPath_AddRoundedRect2(QPainterPath* self, double x, double y, double w, double h, double xRadius, double yRadius); -void QPainterPath_AddRoundRect(QPainterPath* self, QRectF* rect, int xRnd, int yRnd); -void QPainterPath_AddRoundRect2(QPainterPath* self, double x, double y, double w, double h, int xRnd, int yRnd); -void QPainterPath_AddRoundRect3(QPainterPath* self, QRectF* rect, int roundness); -void QPainterPath_AddRoundRect4(QPainterPath* self, double x, double y, double w, double h, int roundness); void QPainterPath_ConnectPath(QPainterPath* self, QPainterPath* path); bool QPainterPath_Contains(const QPainterPath* self, QPointF* pt); bool QPainterPath_ContainsWithRect(const QPainterPath* self, QRectF* rect); @@ -101,7 +97,6 @@ bool QPainterPath_ContainsWithQPainterPath(const QPainterPath* self, QPainterPat QPainterPath* QPainterPath_United(const QPainterPath* self, QPainterPath* r); QPainterPath* QPainterPath_Intersected(const QPainterPath* self, QPainterPath* r); QPainterPath* QPainterPath_Subtracted(const QPainterPath* self, QPainterPath* r); -QPainterPath* QPainterPath_SubtractedInverted(const QPainterPath* self, QPainterPath* r); QPainterPath* QPainterPath_Simplified(const QPainterPath* self); bool QPainterPath_OperatorEqual(const QPainterPath* self, QPainterPath* other); bool QPainterPath_OperatorNotEqual(const QPainterPath* self, QPainterPath* other); diff --git a/qt/gen_qpalette.cpp b/qt/gen_qpalette.cpp index 9ac6a34..110325d 100644 --- a/qt/gen_qpalette.cpp +++ b/qt/gen_qpalette.cpp @@ -222,18 +222,6 @@ QBrush* QPalette_PlaceholderText(const QPalette* self) { return const_cast(&_ret); } -QBrush* QPalette_Foreground(const QPalette* self) { - const QBrush& _ret = self->foreground(); - // Cast returned reference into pointer - return const_cast(&_ret); -} - -QBrush* QPalette_Background(const QPalette* self) { - const QBrush& _ret = self->background(); - // Cast returned reference into pointer - return const_cast(&_ret); -} - bool QPalette_OperatorEqual(const QPalette* self, QPalette* p) { return self->operator==(*p); } @@ -251,17 +239,17 @@ long long QPalette_CacheKey(const QPalette* self) { return static_cast(_ret); } -QPalette* QPalette_Resolve(const QPalette* self, QPalette* param1) { - return new QPalette(self->resolve(*param1)); +QPalette* QPalette_Resolve(const QPalette* self, QPalette* other) { + return new QPalette(self->resolve(*other)); } -unsigned int QPalette_Resolve2(const QPalette* self) { - uint _ret = self->resolve(); - return static_cast(_ret); +unsigned long long QPalette_ResolveMask(const QPalette* self) { + QPalette::ResolveMask _ret = self->resolveMask(); + return static_cast(_ret); } -void QPalette_ResolveWithMask(QPalette* self, unsigned int mask) { - self->resolve(static_cast(mask)); +void QPalette_SetResolveMask(QPalette* self, unsigned long long mask) { + self->setResolveMask(static_cast(mask)); } void QPalette_Delete(QPalette* self) { diff --git a/qt/gen_qpalette.go b/qt/gen_qpalette.go index 38f0b7d..85e147a 100644 --- a/qt/gen_qpalette.go +++ b/qt/gen_qpalette.go @@ -50,8 +50,6 @@ const ( QPalette__ToolTipText QPalette__ColorRole = 19 QPalette__PlaceholderText QPalette__ColorRole = 20 QPalette__NColorRoles QPalette__ColorRole = 21 - QPalette__Foreground QPalette__ColorRole = 0 - QPalette__Background QPalette__ColorRole = 10 ) type QPalette struct { @@ -258,14 +256,6 @@ func (this *QPalette) PlaceholderText() *QBrush { return newQBrush_U(unsafe.Pointer(C.QPalette_PlaceholderText(this.h))) } -func (this *QPalette) Foreground() *QBrush { - return newQBrush_U(unsafe.Pointer(C.QPalette_Foreground(this.h))) -} - -func (this *QPalette) Background() *QBrush { - return newQBrush_U(unsafe.Pointer(C.QPalette_Background(this.h))) -} - func (this *QPalette) OperatorEqual(p *QPalette) bool { return (bool)(C.QPalette_OperatorEqual(this.h, p.cPointer())) } @@ -282,19 +272,19 @@ func (this *QPalette) CacheKey() int64 { return (int64)(C.QPalette_CacheKey(this.h)) } -func (this *QPalette) Resolve(param1 *QPalette) *QPalette { - _ret := C.QPalette_Resolve(this.h, param1.cPointer()) +func (this *QPalette) Resolve(other *QPalette) *QPalette { + _ret := C.QPalette_Resolve(this.h, other.cPointer()) _goptr := newQPalette(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QPalette) Resolve2() uint { - return (uint)(C.QPalette_Resolve2(this.h)) +func (this *QPalette) ResolveMask() uint64 { + return (uint64)(C.QPalette_ResolveMask(this.h)) } -func (this *QPalette) ResolveWithMask(mask uint) { - C.QPalette_ResolveWithMask(this.h, (C.uint)(mask)) +func (this *QPalette) SetResolveMask(mask uint64) { + C.QPalette_SetResolveMask(this.h, (C.ulonglong)(mask)) } // Delete this object from C++ memory. diff --git a/qt/gen_qpalette.h b/qt/gen_qpalette.h index 0486308..e331fc0 100644 --- a/qt/gen_qpalette.h +++ b/qt/gen_qpalette.h @@ -65,15 +65,13 @@ QBrush* QPalette_HighlightedText(const QPalette* self); QBrush* QPalette_Link(const QPalette* self); QBrush* QPalette_LinkVisited(const QPalette* self); QBrush* QPalette_PlaceholderText(const QPalette* self); -QBrush* QPalette_Foreground(const QPalette* self); -QBrush* QPalette_Background(const QPalette* self); bool QPalette_OperatorEqual(const QPalette* self, QPalette* p); bool QPalette_OperatorNotEqual(const QPalette* self, QPalette* p); bool QPalette_IsCopyOf(const QPalette* self, QPalette* p); long long QPalette_CacheKey(const QPalette* self); -QPalette* QPalette_Resolve(const QPalette* self, QPalette* param1); -unsigned int QPalette_Resolve2(const QPalette* self); -void QPalette_ResolveWithMask(QPalette* self, unsigned int mask); +QPalette* QPalette_Resolve(const QPalette* self, QPalette* other); +unsigned long long QPalette_ResolveMask(const QPalette* self); +void QPalette_SetResolveMask(QPalette* self, unsigned long long mask); void QPalette_Delete(QPalette* self); #ifdef __cplusplus diff --git a/qt/gen_qparallelanimationgroup.cpp b/qt/gen_qparallelanimationgroup.cpp index 8360e1b..0a87b34 100644 --- a/qt/gen_qparallelanimationgroup.cpp +++ b/qt/gen_qparallelanimationgroup.cpp @@ -31,13 +31,6 @@ struct miqt_string* QParallelAnimationGroup_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QParallelAnimationGroup_TrUtf8(const char* s) { - QString _ret = QParallelAnimationGroup::trUtf8(s); - // 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()); -} - int QParallelAnimationGroup_Duration(const QParallelAnimationGroup* self) { return self->duration(); } @@ -56,20 +49,6 @@ struct miqt_string* QParallelAnimationGroup_Tr3(const char* s, const char* c, in return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QParallelAnimationGroup_TrUtf82(const char* s, const char* c) { - QString _ret = QParallelAnimationGroup::trUtf8(s, c); - // 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* QParallelAnimationGroup_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QParallelAnimationGroup::trUtf8(s, c, static_cast(n)); - // 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 QParallelAnimationGroup_Delete(QParallelAnimationGroup* self) { delete self; } diff --git a/qt/gen_qparallelanimationgroup.go b/qt/gen_qparallelanimationgroup.go index f7470e7..54b9f2c 100644 --- a/qt/gen_qparallelanimationgroup.go +++ b/qt/gen_qparallelanimationgroup.go @@ -67,15 +67,6 @@ func QParallelAnimationGroup_Tr(s string) string { return _ret } -func QParallelAnimationGroup_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QParallelAnimationGroup_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QParallelAnimationGroup) Duration() int { return (int)(C.QParallelAnimationGroup_Duration(this.h)) } @@ -102,28 +93,6 @@ func QParallelAnimationGroup_Tr3(s string, c string, n int) string { return _ret } -func QParallelAnimationGroup_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QParallelAnimationGroup_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QParallelAnimationGroup_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QParallelAnimationGroup_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QParallelAnimationGroup) Delete() { C.QParallelAnimationGroup_Delete(this.h) diff --git a/qt/gen_qparallelanimationgroup.h b/qt/gen_qparallelanimationgroup.h index cee576e..b217048 100644 --- a/qt/gen_qparallelanimationgroup.h +++ b/qt/gen_qparallelanimationgroup.h @@ -28,12 +28,9 @@ QParallelAnimationGroup* QParallelAnimationGroup_new2(QObject* parent); QMetaObject* QParallelAnimationGroup_MetaObject(const QParallelAnimationGroup* self); void* QParallelAnimationGroup_Metacast(QParallelAnimationGroup* self, const char* param1); struct miqt_string* QParallelAnimationGroup_Tr(const char* s); -struct miqt_string* QParallelAnimationGroup_TrUtf8(const char* s); int QParallelAnimationGroup_Duration(const QParallelAnimationGroup* self); struct miqt_string* QParallelAnimationGroup_Tr2(const char* s, const char* c); struct miqt_string* QParallelAnimationGroup_Tr3(const char* s, const char* c, int n); -struct miqt_string* QParallelAnimationGroup_TrUtf82(const char* s, const char* c); -struct miqt_string* QParallelAnimationGroup_TrUtf83(const char* s, const char* c, int n); void QParallelAnimationGroup_Delete(QParallelAnimationGroup* self); #ifdef __cplusplus diff --git a/qt/gen_qpauseanimation.cpp b/qt/gen_qpauseanimation.cpp index 07b0eec..7c8bc60 100644 --- a/qt/gen_qpauseanimation.cpp +++ b/qt/gen_qpauseanimation.cpp @@ -39,13 +39,6 @@ struct miqt_string* QPauseAnimation_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QPauseAnimation_TrUtf8(const char* s) { - QString _ret = QPauseAnimation::trUtf8(s); - // 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()); -} - int QPauseAnimation_Duration(const QPauseAnimation* self) { return self->duration(); } @@ -68,20 +61,6 @@ struct miqt_string* QPauseAnimation_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QPauseAnimation_TrUtf82(const char* s, const char* c) { - QString _ret = QPauseAnimation::trUtf8(s, c); - // 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* QPauseAnimation_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QPauseAnimation::trUtf8(s, c, static_cast(n)); - // 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 QPauseAnimation_Delete(QPauseAnimation* self) { delete self; } diff --git a/qt/gen_qpauseanimation.go b/qt/gen_qpauseanimation.go index d0b6d8e..52ed403 100644 --- a/qt/gen_qpauseanimation.go +++ b/qt/gen_qpauseanimation.go @@ -79,15 +79,6 @@ func QPauseAnimation_Tr(s string) string { return _ret } -func QPauseAnimation_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPauseAnimation_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QPauseAnimation) Duration() int { return (int)(C.QPauseAnimation_Duration(this.h)) } @@ -118,28 +109,6 @@ func QPauseAnimation_Tr3(s string, c string, n int) string { return _ret } -func QPauseAnimation_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPauseAnimation_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QPauseAnimation_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPauseAnimation_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QPauseAnimation) Delete() { C.QPauseAnimation_Delete(this.h) diff --git a/qt/gen_qpauseanimation.h b/qt/gen_qpauseanimation.h index 05cf442..5d51c8b 100644 --- a/qt/gen_qpauseanimation.h +++ b/qt/gen_qpauseanimation.h @@ -30,13 +30,10 @@ QPauseAnimation* QPauseAnimation_new4(int msecs, QObject* parent); QMetaObject* QPauseAnimation_MetaObject(const QPauseAnimation* self); void* QPauseAnimation_Metacast(QPauseAnimation* self, const char* param1); struct miqt_string* QPauseAnimation_Tr(const char* s); -struct miqt_string* QPauseAnimation_TrUtf8(const char* s); int QPauseAnimation_Duration(const QPauseAnimation* self); void QPauseAnimation_SetDuration(QPauseAnimation* self, int msecs); struct miqt_string* QPauseAnimation_Tr2(const char* s, const char* c); struct miqt_string* QPauseAnimation_Tr3(const char* s, const char* c, int n); -struct miqt_string* QPauseAnimation_TrUtf82(const char* s, const char* c); -struct miqt_string* QPauseAnimation_TrUtf83(const char* s, const char* c, int n); void QPauseAnimation_Delete(QPauseAnimation* self); #ifdef __cplusplus diff --git a/qt/gen_qpdfwriter.cpp b/qt/gen_qpdfwriter.cpp index c842c0d..b56cdc9 100644 --- a/qt/gen_qpdfwriter.cpp +++ b/qt/gen_qpdfwriter.cpp @@ -1,9 +1,7 @@ #include #include #include -#define WORKAROUND_INNER_CLASS_DEFINITION_QPagedPaintDevice__Margins #include -#include #include #include #include @@ -35,13 +33,6 @@ struct miqt_string* QPdfWriter_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QPdfWriter_TrUtf8(const char* s) { - QString _ret = QPdfWriter::trUtf8(s); - // 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 QPdfWriter_SetPdfVersion(QPdfWriter* self, int version) { self->setPdfVersion(static_cast(version)); } @@ -100,18 +91,6 @@ void QPdfWriter_AddFileAttachment(QPdfWriter* self, struct miqt_string* fileName self->addFileAttachment(fileName_QString, *data); } -void QPdfWriter_SetPageSize(QPdfWriter* self, int size) { - self->setPageSize(static_cast(size)); -} - -void QPdfWriter_SetPageSizeMM(QPdfWriter* self, QSizeF* size) { - self->setPageSizeMM(*size); -} - -void QPdfWriter_SetMargins(QPdfWriter* self, QPagedPaintDevice__Margins* m) { - self->setMargins(*m); -} - struct miqt_string* QPdfWriter_Tr2(const char* s, const char* c) { QString _ret = QPdfWriter::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -126,20 +105,6 @@ struct miqt_string* QPdfWriter_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QPdfWriter_TrUtf82(const char* s, const char* c) { - QString _ret = QPdfWriter::trUtf8(s, c); - // 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* QPdfWriter_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QPdfWriter::trUtf8(s, c, static_cast(n)); - // 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 QPdfWriter_AddFileAttachment3(QPdfWriter* self, struct miqt_string* fileName, QByteArray* data, struct miqt_string* mimeType) { QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); QString mimeType_QString = QString::fromUtf8(&mimeType->data, mimeType->len); diff --git a/qt/gen_qpdfwriter.go b/qt/gen_qpdfwriter.go index 1e29c23..5735a54 100644 --- a/qt/gen_qpdfwriter.go +++ b/qt/gen_qpdfwriter.go @@ -70,15 +70,6 @@ func QPdfWriter_Tr(s string) string { return _ret } -func QPdfWriter_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPdfWriter_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QPdfWriter) SetPdfVersion(version QPagedPaintDevice__PdfVersion) { C.QPdfWriter_SetPdfVersion(this.h, (C.int)(version)) } @@ -142,18 +133,6 @@ func (this *QPdfWriter) AddFileAttachment(fileName string, data *QByteArray) { C.QPdfWriter_AddFileAttachment(this.h, (*C.struct_miqt_string)(fileName_ms), data.cPointer()) } -func (this *QPdfWriter) SetPageSize(size QPagedPaintDevice__PageSize) { - C.QPdfWriter_SetPageSize(this.h, (C.int)(size)) -} - -func (this *QPdfWriter) SetPageSizeMM(size *QSizeF) { - C.QPdfWriter_SetPageSizeMM(this.h, size.cPointer()) -} - -func (this *QPdfWriter) SetMargins(m *QPagedPaintDevice__Margins) { - C.QPdfWriter_SetMargins(this.h, m.cPointer()) -} - func QPdfWriter_Tr2(s string, c string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) @@ -176,28 +155,6 @@ func QPdfWriter_Tr3(s string, c string, n int) string { return _ret } -func QPdfWriter_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPdfWriter_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QPdfWriter_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPdfWriter_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QPdfWriter) AddFileAttachment3(fileName string, data *QByteArray, mimeType string) { fileName_ms := miqt_strdupg(fileName) defer C.free(fileName_ms) diff --git a/qt/gen_qpdfwriter.h b/qt/gen_qpdfwriter.h index 9055959..5fbe8a3 100644 --- a/qt/gen_qpdfwriter.h +++ b/qt/gen_qpdfwriter.h @@ -17,20 +17,12 @@ extern "C" { class QByteArray; class QIODevice; class QMetaObject; -#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QPagedPaintDevice__Margins) -typedef QPagedPaintDevice::Margins QPagedPaintDevice__Margins; -#else -class QPagedPaintDevice__Margins; -#endif class QPdfWriter; -class QSizeF; #else typedef struct QByteArray QByteArray; typedef struct QIODevice QIODevice; typedef struct QMetaObject QMetaObject; -typedef struct QPagedPaintDevice__Margins QPagedPaintDevice__Margins; typedef struct QPdfWriter QPdfWriter; -typedef struct QSizeF QSizeF; #endif QPdfWriter* QPdfWriter_new(struct miqt_string* filename); @@ -38,7 +30,6 @@ QPdfWriter* QPdfWriter_new2(QIODevice* device); QMetaObject* QPdfWriter_MetaObject(const QPdfWriter* self); void* QPdfWriter_Metacast(QPdfWriter* self, const char* param1); struct miqt_string* QPdfWriter_Tr(const char* s); -struct miqt_string* QPdfWriter_TrUtf8(const char* s); void QPdfWriter_SetPdfVersion(QPdfWriter* self, int version); int QPdfWriter_PdfVersion(const QPdfWriter* self); struct miqt_string* QPdfWriter_Title(const QPdfWriter* self); @@ -51,13 +42,8 @@ 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, 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); struct miqt_string* QPdfWriter_Tr3(const char* s, const char* c, int n); -struct miqt_string* QPdfWriter_TrUtf82(const char* s, const char* c); -struct miqt_string* QPdfWriter_TrUtf83(const char* s, const char* c, int n); void QPdfWriter_AddFileAttachment3(QPdfWriter* self, struct miqt_string* fileName, QByteArray* data, struct miqt_string* mimeType); void QPdfWriter_Delete(QPdfWriter* self); diff --git a/qt/gen_qpen.cpp b/qt/gen_qpen.cpp index 46c4750..75cf0a8 100644 --- a/qt/gen_qpen.cpp +++ b/qt/gen_qpen.cpp @@ -56,7 +56,7 @@ void QPen_SetStyle(QPen* self, int style) { } struct miqt_array* QPen_DashPattern(const QPen* self) { - QVector _ret = self->dashPattern(); + QList _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) { @@ -69,7 +69,7 @@ struct miqt_array* QPen_DashPattern(const QPen* self) { } void QPen_SetDashPattern(QPen* self, struct miqt_array* /* of double */ pattern) { - QVector pattern_QList; + QList pattern_QList; pattern_QList.reserve(pattern->len); double* pattern_arr = static_cast(pattern->data); for(size_t i = 0; i < pattern->len; ++i) { diff --git a/qt/gen_qpicture.cpp b/qt/gen_qpicture.cpp index d2a060a..c8b2c77 100644 --- a/qt/gen_qpicture.cpp +++ b/qt/gen_qpicture.cpp @@ -1,10 +1,7 @@ -#include #include -#include #include #include #include -#include #include #include #include @@ -92,234 +89,11 @@ bool QPicture_IsDetached(const QPicture* self) { return self->isDetached(); } -const char* QPicture_PictureFormat(struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); - return (const char*) QPicture::pictureFormat(fileName_QString); -} - -struct miqt_array* QPicture_InputFormats() { - QList _ret = QPicture::inputFormats(); - // Convert QList<> from C++ memory to manually-managed C memory - QByteArray** _arr = static_cast(malloc(sizeof(QByteArray*) * _ret.length())); - for (size_t i = 0, e = _ret.length(); i < e; ++i) { - _arr[i] = new QByteArray(_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_array* QPicture_OutputFormats() { - QList _ret = QPicture::outputFormats(); - // Convert QList<> from C++ memory to manually-managed C memory - QByteArray** _arr = static_cast(malloc(sizeof(QByteArray*) * _ret.length())); - for (size_t i = 0, e = _ret.length(); i < e; ++i) { - _arr[i] = new QByteArray(_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_array* QPicture_InputFormatList() { - QStringList _ret = QPicture::inputFormatList(); - // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); - for (size_t i = 0, e = _ret.length(); i < e; ++i) { - QString _lv_ret = _ret[i]; - // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory - QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); - } - struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); - _out->len = _ret.length(); - _out->data = static_cast(_arr); - return _out; -} - -struct miqt_array* QPicture_OutputFormatList() { - QStringList _ret = QPicture::outputFormatList(); - // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); - for (size_t i = 0, e = _ret.length(); i < e; ++i) { - QString _lv_ret = _ret[i]; - // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory - QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); - } - struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); - _out->len = _ret.length(); - _out->data = static_cast(_arr); - return _out; -} - QPaintEngine* QPicture_PaintEngine(const QPicture* self) { return self->paintEngine(); } -bool QPicture_Load2(QPicture* self, QIODevice* dev, const char* format) { - return self->load(dev, format); -} - -bool QPicture_Load22(QPicture* self, struct miqt_string* fileName, const char* format) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); - return self->load(fileName_QString, format); -} - -bool QPicture_Save2(QPicture* self, QIODevice* dev, const char* format) { - return self->save(dev, format); -} - -bool QPicture_Save22(QPicture* self, struct miqt_string* fileName, const char* format) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); - return self->save(fileName_QString, format); -} - void QPicture_Delete(QPicture* self) { delete self; } -QPictureIO* QPictureIO_new() { - return new QPictureIO(); -} - -QPictureIO* QPictureIO_new2(QIODevice* ioDevice, const char* format) { - return new QPictureIO(ioDevice, format); -} - -QPictureIO* QPictureIO_new3(struct miqt_string* fileName, const char* format) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); - return new QPictureIO(fileName_QString, format); -} - -QPicture* QPictureIO_Picture(const QPictureIO* self) { - const QPicture& _ret = self->picture(); - // Cast returned reference into pointer - return const_cast(&_ret); -} - -int QPictureIO_Status(const QPictureIO* self) { - return self->status(); -} - -const char* QPictureIO_Format(const QPictureIO* self) { - return (const char*) self->format(); -} - -QIODevice* QPictureIO_IoDevice(const QPictureIO* self) { - return self->ioDevice(); -} - -struct miqt_string* QPictureIO_FileName(const QPictureIO* self) { - QString _ret = self->fileName(); - // 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()); -} - -int QPictureIO_Quality(const QPictureIO* self) { - return self->quality(); -} - -struct miqt_string* QPictureIO_Description(const QPictureIO* self) { - QString _ret = self->description(); - // 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()); -} - -const char* QPictureIO_Parameters(const QPictureIO* self) { - return (const char*) self->parameters(); -} - -float QPictureIO_Gamma(const QPictureIO* self) { - return self->gamma(); -} - -void QPictureIO_SetPicture(QPictureIO* self, QPicture* picture) { - self->setPicture(*picture); -} - -void QPictureIO_SetStatus(QPictureIO* self, int status) { - self->setStatus(static_cast(status)); -} - -void QPictureIO_SetFormat(QPictureIO* self, const char* format) { - self->setFormat(format); -} - -void QPictureIO_SetIODevice(QPictureIO* self, QIODevice* iODevice) { - self->setIODevice(iODevice); -} - -void QPictureIO_SetFileName(QPictureIO* self, struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); - self->setFileName(fileName_QString); -} - -void QPictureIO_SetQuality(QPictureIO* self, int quality) { - self->setQuality(static_cast(quality)); -} - -void QPictureIO_SetDescription(QPictureIO* self, struct miqt_string* description) { - QString description_QString = QString::fromUtf8(&description->data, description->len); - self->setDescription(description_QString); -} - -void QPictureIO_SetParameters(QPictureIO* self, const char* parameters) { - self->setParameters(parameters); -} - -void QPictureIO_SetGamma(QPictureIO* self, float gamma) { - self->setGamma(static_cast(gamma)); -} - -bool QPictureIO_Read(QPictureIO* self) { - return self->read(); -} - -bool QPictureIO_Write(QPictureIO* self) { - return self->write(); -} - -QByteArray* QPictureIO_PictureFormat(struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); - return new QByteArray(QPictureIO::pictureFormat(fileName_QString)); -} - -QByteArray* QPictureIO_PictureFormatWithQIODevice(QIODevice* param1) { - return new QByteArray(QPictureIO::pictureFormat(param1)); -} - -struct miqt_array* QPictureIO_InputFormats() { - QList _ret = QPictureIO::inputFormats(); - // Convert QList<> from C++ memory to manually-managed C memory - QByteArray** _arr = static_cast(malloc(sizeof(QByteArray*) * _ret.length())); - for (size_t i = 0, e = _ret.length(); i < e; ++i) { - _arr[i] = new QByteArray(_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_array* QPictureIO_OutputFormats() { - QList _ret = QPictureIO::outputFormats(); - // Convert QList<> from C++ memory to manually-managed C memory - QByteArray** _arr = static_cast(malloc(sizeof(QByteArray*) * _ret.length())); - for (size_t i = 0, e = _ret.length(); i < e; ++i) { - _arr[i] = new QByteArray(_ret[i]); - } - struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); - _out->len = _ret.length(); - _out->data = static_cast(_arr); - return _out; -} - -void QPictureIO_Delete(QPictureIO* self) { - delete self; -} - diff --git a/qt/gen_qpicture.go b/qt/gen_qpicture.go index 77c113b..cf7701a 100644 --- a/qt/gen_qpicture.go +++ b/qt/gen_qpicture.go @@ -128,101 +128,10 @@ func (this *QPicture) IsDetached() bool { return (bool)(C.QPicture_IsDetached(this.h)) } -func QPicture_PictureFormat(fileName string) unsafe.Pointer { - fileName_ms := miqt_strdupg(fileName) - defer C.free(fileName_ms) - _ret := C.QPicture_PictureFormat((*C.struct_miqt_string)(fileName_ms)) - return (unsafe.Pointer)(_ret) -} - -func QPicture_InputFormats() []QByteArray { - var _ma *C.struct_miqt_array = C.QPicture_InputFormats() - _ret := make([]QByteArray, int(_ma.len)) - _outCast := (*[0xffff]*C.QByteArray)(unsafe.Pointer(_ma.data)) // hey ya - for i := 0; i < int(_ma.len); i++ { - _lv_ret := _outCast[i] - _lv_goptr := newQByteArray(_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 QPicture_OutputFormats() []QByteArray { - var _ma *C.struct_miqt_array = C.QPicture_OutputFormats() - _ret := make([]QByteArray, int(_ma.len)) - _outCast := (*[0xffff]*C.QByteArray)(unsafe.Pointer(_ma.data)) // hey ya - for i := 0; i < int(_ma.len); i++ { - _lv_ret := _outCast[i] - _lv_goptr := newQByteArray(_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 QPicture_InputFormatList() []string { - var _ma *C.struct_miqt_array = C.QPicture_InputFormatList() - _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++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) - _ret[i] = _lv_ret - } - C.free(unsafe.Pointer(_ma)) - return _ret -} - -func QPicture_OutputFormatList() []string { - var _ma *C.struct_miqt_array = C.QPicture_OutputFormatList() - _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++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) - _ret[i] = _lv_ret - } - C.free(unsafe.Pointer(_ma)) - return _ret -} - func (this *QPicture) PaintEngine() *QPaintEngine { return newQPaintEngine_U(unsafe.Pointer(C.QPicture_PaintEngine(this.h))) } -func (this *QPicture) Load2(dev *QIODevice, format string) bool { - format_Cstring := C.CString(format) - defer C.free(unsafe.Pointer(format_Cstring)) - return (bool)(C.QPicture_Load2(this.h, dev.cPointer(), format_Cstring)) -} - -func (this *QPicture) Load22(fileName string, format string) bool { - fileName_ms := miqt_strdupg(fileName) - defer C.free(fileName_ms) - format_Cstring := C.CString(format) - defer C.free(unsafe.Pointer(format_Cstring)) - return (bool)(C.QPicture_Load22(this.h, (*C.struct_miqt_string)(fileName_ms), format_Cstring)) -} - -func (this *QPicture) Save2(dev *QIODevice, format string) bool { - format_Cstring := C.CString(format) - defer C.free(unsafe.Pointer(format_Cstring)) - return (bool)(C.QPicture_Save2(this.h, dev.cPointer(), format_Cstring)) -} - -func (this *QPicture) Save22(fileName string, format string) bool { - fileName_ms := miqt_strdupg(fileName) - defer C.free(fileName_ms) - format_Cstring := C.CString(format) - defer C.free(unsafe.Pointer(format_Cstring)) - return (bool)(C.QPicture_Save22(this.h, (*C.struct_miqt_string)(fileName_ms), format_Cstring)) -} - // Delete this object from C++ memory. func (this *QPicture) Delete() { C.QPicture_Delete(this.h) @@ -236,203 +145,3 @@ func (this *QPicture) GoGC() { runtime.KeepAlive(this.h) }) } - -type QPictureIO struct { - h *C.QPictureIO -} - -func (this *QPictureIO) cPointer() *C.QPictureIO { - if this == nil { - return nil - } - return this.h -} - -func newQPictureIO(h *C.QPictureIO) *QPictureIO { - if h == nil { - return nil - } - return &QPictureIO{h: h} -} - -func newQPictureIO_U(h unsafe.Pointer) *QPictureIO { - return newQPictureIO((*C.QPictureIO)(h)) -} - -// NewQPictureIO constructs a new QPictureIO object. -func NewQPictureIO() *QPictureIO { - ret := C.QPictureIO_new() - return newQPictureIO(ret) -} - -// NewQPictureIO2 constructs a new QPictureIO object. -func NewQPictureIO2(ioDevice *QIODevice, format string) *QPictureIO { - format_Cstring := C.CString(format) - defer C.free(unsafe.Pointer(format_Cstring)) - ret := C.QPictureIO_new2(ioDevice.cPointer(), format_Cstring) - return newQPictureIO(ret) -} - -// NewQPictureIO3 constructs a new QPictureIO object. -func NewQPictureIO3(fileName string, format string) *QPictureIO { - fileName_ms := miqt_strdupg(fileName) - defer C.free(fileName_ms) - format_Cstring := C.CString(format) - defer C.free(unsafe.Pointer(format_Cstring)) - ret := C.QPictureIO_new3((*C.struct_miqt_string)(fileName_ms), format_Cstring) - return newQPictureIO(ret) -} - -func (this *QPictureIO) Picture() *QPicture { - return newQPicture_U(unsafe.Pointer(C.QPictureIO_Picture(this.h))) -} - -func (this *QPictureIO) Status() int { - return (int)(C.QPictureIO_Status(this.h)) -} - -func (this *QPictureIO) Format() unsafe.Pointer { - _ret := C.QPictureIO_Format(this.h) - return (unsafe.Pointer)(_ret) -} - -func (this *QPictureIO) IoDevice() *QIODevice { - return newQIODevice_U(unsafe.Pointer(C.QPictureIO_IoDevice(this.h))) -} - -func (this *QPictureIO) FileName() string { - var _ms *C.struct_miqt_string = C.QPictureIO_FileName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QPictureIO) Quality() int { - return (int)(C.QPictureIO_Quality(this.h)) -} - -func (this *QPictureIO) Description() string { - var _ms *C.struct_miqt_string = C.QPictureIO_Description(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QPictureIO) Parameters() unsafe.Pointer { - _ret := C.QPictureIO_Parameters(this.h) - return (unsafe.Pointer)(_ret) -} - -func (this *QPictureIO) Gamma() float32 { - return (float32)(C.QPictureIO_Gamma(this.h)) -} - -func (this *QPictureIO) SetPicture(picture *QPicture) { - C.QPictureIO_SetPicture(this.h, picture.cPointer()) -} - -func (this *QPictureIO) SetStatus(status int) { - C.QPictureIO_SetStatus(this.h, (C.int)(status)) -} - -func (this *QPictureIO) SetFormat(format string) { - format_Cstring := C.CString(format) - defer C.free(unsafe.Pointer(format_Cstring)) - C.QPictureIO_SetFormat(this.h, format_Cstring) -} - -func (this *QPictureIO) SetIODevice(iODevice *QIODevice) { - C.QPictureIO_SetIODevice(this.h, iODevice.cPointer()) -} - -func (this *QPictureIO) SetFileName(fileName string) { - fileName_ms := miqt_strdupg(fileName) - defer C.free(fileName_ms) - C.QPictureIO_SetFileName(this.h, (*C.struct_miqt_string)(fileName_ms)) -} - -func (this *QPictureIO) SetQuality(quality int) { - C.QPictureIO_SetQuality(this.h, (C.int)(quality)) -} - -func (this *QPictureIO) SetDescription(description string) { - description_ms := miqt_strdupg(description) - defer C.free(description_ms) - C.QPictureIO_SetDescription(this.h, (*C.struct_miqt_string)(description_ms)) -} - -func (this *QPictureIO) SetParameters(parameters string) { - parameters_Cstring := C.CString(parameters) - defer C.free(unsafe.Pointer(parameters_Cstring)) - C.QPictureIO_SetParameters(this.h, parameters_Cstring) -} - -func (this *QPictureIO) SetGamma(gamma float32) { - C.QPictureIO_SetGamma(this.h, (C.float)(gamma)) -} - -func (this *QPictureIO) Read() bool { - return (bool)(C.QPictureIO_Read(this.h)) -} - -func (this *QPictureIO) Write() bool { - return (bool)(C.QPictureIO_Write(this.h)) -} - -func QPictureIO_PictureFormat(fileName string) *QByteArray { - fileName_ms := miqt_strdupg(fileName) - defer C.free(fileName_ms) - _ret := C.QPictureIO_PictureFormat((*C.struct_miqt_string)(fileName_ms)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QPictureIO_PictureFormatWithQIODevice(param1 *QIODevice) *QByteArray { - _ret := C.QPictureIO_PictureFormatWithQIODevice(param1.cPointer()) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QPictureIO_InputFormats() []QByteArray { - var _ma *C.struct_miqt_array = C.QPictureIO_InputFormats() - _ret := make([]QByteArray, int(_ma.len)) - _outCast := (*[0xffff]*C.QByteArray)(unsafe.Pointer(_ma.data)) // hey ya - for i := 0; i < int(_ma.len); i++ { - _lv_ret := _outCast[i] - _lv_goptr := newQByteArray(_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 QPictureIO_OutputFormats() []QByteArray { - var _ma *C.struct_miqt_array = C.QPictureIO_OutputFormats() - _ret := make([]QByteArray, int(_ma.len)) - _outCast := (*[0xffff]*C.QByteArray)(unsafe.Pointer(_ma.data)) // hey ya - for i := 0; i < int(_ma.len); i++ { - _lv_ret := _outCast[i] - _lv_goptr := newQByteArray(_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 -} - -// Delete this object from C++ memory. -func (this *QPictureIO) Delete() { - C.QPictureIO_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QPictureIO) GoGC() { - runtime.SetFinalizer(this, func(this *QPictureIO) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} diff --git a/qt/gen_qpicture.h b/qt/gen_qpicture.h index 593a761..d3dc765 100644 --- a/qt/gen_qpicture.h +++ b/qt/gen_qpicture.h @@ -14,20 +14,16 @@ extern "C" { #endif #ifdef __cplusplus -class QByteArray; class QIODevice; class QPaintEngine; class QPainter; class QPicture; -class QPictureIO; class QRect; #else -typedef struct QByteArray QByteArray; typedef struct QIODevice QIODevice; typedef struct QPaintEngine QPaintEngine; typedef struct QPainter QPainter; typedef struct QPicture QPicture; -typedef struct QPictureIO QPictureIO; typedef struct QRect QRect; #endif @@ -50,47 +46,9 @@ void QPicture_OperatorAssign(QPicture* self, QPicture* p); void QPicture_Swap(QPicture* self, QPicture* other); void QPicture_Detach(QPicture* self); bool QPicture_IsDetached(const QPicture* self); -const char* QPicture_PictureFormat(struct miqt_string* fileName); -struct miqt_array* QPicture_InputFormats(); -struct miqt_array* QPicture_OutputFormats(); -struct miqt_array* QPicture_InputFormatList(); -struct miqt_array* QPicture_OutputFormatList(); QPaintEngine* QPicture_PaintEngine(const QPicture* self); -bool QPicture_Load2(QPicture* self, QIODevice* dev, const char* format); -bool QPicture_Load22(QPicture* self, struct miqt_string* fileName, const char* format); -bool QPicture_Save2(QPicture* self, QIODevice* dev, const char* format); -bool QPicture_Save22(QPicture* self, struct miqt_string* fileName, const char* format); void QPicture_Delete(QPicture* self); -QPictureIO* QPictureIO_new(); -QPictureIO* QPictureIO_new2(QIODevice* ioDevice, const char* format); -QPictureIO* QPictureIO_new3(struct miqt_string* fileName, const char* format); -QPicture* QPictureIO_Picture(const QPictureIO* self); -int QPictureIO_Status(const QPictureIO* self); -const char* QPictureIO_Format(const QPictureIO* self); -QIODevice* QPictureIO_IoDevice(const QPictureIO* self); -struct miqt_string* QPictureIO_FileName(const QPictureIO* self); -int QPictureIO_Quality(const QPictureIO* self); -struct miqt_string* QPictureIO_Description(const QPictureIO* self); -const char* QPictureIO_Parameters(const QPictureIO* self); -float QPictureIO_Gamma(const QPictureIO* self); -void QPictureIO_SetPicture(QPictureIO* self, QPicture* picture); -void QPictureIO_SetStatus(QPictureIO* self, int status); -void QPictureIO_SetFormat(QPictureIO* self, const char* format); -void QPictureIO_SetIODevice(QPictureIO* self, QIODevice* iODevice); -void QPictureIO_SetFileName(QPictureIO* self, struct miqt_string* fileName); -void QPictureIO_SetQuality(QPictureIO* self, int quality); -void QPictureIO_SetDescription(QPictureIO* self, struct miqt_string* description); -void QPictureIO_SetParameters(QPictureIO* self, const char* parameters); -void QPictureIO_SetGamma(QPictureIO* self, float gamma); -bool QPictureIO_Read(QPictureIO* self); -bool QPictureIO_Write(QPictureIO* self); -QByteArray* QPictureIO_PictureFormat(struct miqt_string* fileName); -QByteArray* QPictureIO_PictureFormatWithQIODevice(QIODevice* param1); -struct miqt_array* QPictureIO_InputFormats(); -struct miqt_array* QPictureIO_OutputFormats(); -void QPictureIO_Delete(QPictureIO* self); - #ifdef __cplusplus } /* extern C */ #endif diff --git a/qt/gen_qpictureformatplugin.cpp b/qt/gen_qpictureformatplugin.cpp deleted file mode 100644 index 62b9634..0000000 --- a/qt/gen_qpictureformatplugin.cpp +++ /dev/null @@ -1,81 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include "qpictureformatplugin.h" -#include "gen_qpictureformatplugin.h" -#include "_cgo_export.h" - -QMetaObject* QPictureFormatPlugin_MetaObject(const QPictureFormatPlugin* self) { - return (QMetaObject*) self->metaObject(); -} - -void* QPictureFormatPlugin_Metacast(QPictureFormatPlugin* self, const char* param1) { - return self->qt_metacast(param1); -} - -struct miqt_string* QPictureFormatPlugin_Tr(const char* s) { - QString _ret = QPictureFormatPlugin::tr(s); - // 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* QPictureFormatPlugin_TrUtf8(const char* s) { - QString _ret = QPictureFormatPlugin::trUtf8(s); - // 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()); -} - -bool QPictureFormatPlugin_LoadPicture(QPictureFormatPlugin* self, struct miqt_string* format, struct miqt_string* filename, QPicture* pic) { - QString format_QString = QString::fromUtf8(&format->data, format->len); - QString filename_QString = QString::fromUtf8(&filename->data, filename->len); - return self->loadPicture(format_QString, filename_QString, pic); -} - -bool QPictureFormatPlugin_SavePicture(QPictureFormatPlugin* self, struct miqt_string* format, struct miqt_string* filename, QPicture* pic) { - QString format_QString = QString::fromUtf8(&format->data, format->len); - QString filename_QString = QString::fromUtf8(&filename->data, filename->len); - return self->savePicture(format_QString, filename_QString, *pic); -} - -bool QPictureFormatPlugin_InstallIOHandler(QPictureFormatPlugin* self, struct miqt_string* format) { - QString format_QString = QString::fromUtf8(&format->data, format->len); - return self->installIOHandler(format_QString); -} - -struct miqt_string* QPictureFormatPlugin_Tr2(const char* s, const char* c) { - QString _ret = QPictureFormatPlugin::tr(s, c); - // 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* QPictureFormatPlugin_Tr3(const char* s, const char* c, int n) { - QString _ret = QPictureFormatPlugin::tr(s, c, static_cast(n)); - // 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* QPictureFormatPlugin_TrUtf82(const char* s, const char* c) { - QString _ret = QPictureFormatPlugin::trUtf8(s, c); - // 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* QPictureFormatPlugin_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QPictureFormatPlugin::trUtf8(s, c, static_cast(n)); - // 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 QPictureFormatPlugin_Delete(QPictureFormatPlugin* self) { - delete self; -} - diff --git a/qt/gen_qpictureformatplugin.go b/qt/gen_qpictureformatplugin.go deleted file mode 100644 index d1d8a68..0000000 --- a/qt/gen_qpictureformatplugin.go +++ /dev/null @@ -1,145 +0,0 @@ -package qt - -/* - -#include "gen_qpictureformatplugin.h" -#include - -*/ -import "C" - -import ( - "runtime" - "unsafe" -) - -type QPictureFormatPlugin struct { - h *C.QPictureFormatPlugin - *QObject -} - -func (this *QPictureFormatPlugin) cPointer() *C.QPictureFormatPlugin { - if this == nil { - return nil - } - return this.h -} - -func newQPictureFormatPlugin(h *C.QPictureFormatPlugin) *QPictureFormatPlugin { - if h == nil { - return nil - } - return &QPictureFormatPlugin{h: h, QObject: newQObject_U(unsafe.Pointer(h))} -} - -func newQPictureFormatPlugin_U(h unsafe.Pointer) *QPictureFormatPlugin { - return newQPictureFormatPlugin((*C.QPictureFormatPlugin)(h)) -} - -func (this *QPictureFormatPlugin) MetaObject() *QMetaObject { - return newQMetaObject_U(unsafe.Pointer(C.QPictureFormatPlugin_MetaObject(this.h))) -} - -func (this *QPictureFormatPlugin) Metacast(param1 string) unsafe.Pointer { - param1_Cstring := C.CString(param1) - defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QPictureFormatPlugin_Metacast(this.h, param1_Cstring) -} - -func QPictureFormatPlugin_Tr(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPictureFormatPlugin_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QPictureFormatPlugin_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPictureFormatPlugin_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QPictureFormatPlugin) LoadPicture(format string, filename string, pic *QPicture) bool { - format_ms := miqt_strdupg(format) - defer C.free(format_ms) - filename_ms := miqt_strdupg(filename) - defer C.free(filename_ms) - return (bool)(C.QPictureFormatPlugin_LoadPicture(this.h, (*C.struct_miqt_string)(format_ms), (*C.struct_miqt_string)(filename_ms), pic.cPointer())) -} - -func (this *QPictureFormatPlugin) SavePicture(format string, filename string, pic *QPicture) bool { - format_ms := miqt_strdupg(format) - defer C.free(format_ms) - filename_ms := miqt_strdupg(filename) - defer C.free(filename_ms) - return (bool)(C.QPictureFormatPlugin_SavePicture(this.h, (*C.struct_miqt_string)(format_ms), (*C.struct_miqt_string)(filename_ms), pic.cPointer())) -} - -func (this *QPictureFormatPlugin) InstallIOHandler(format string) bool { - format_ms := miqt_strdupg(format) - defer C.free(format_ms) - return (bool)(C.QPictureFormatPlugin_InstallIOHandler(this.h, (*C.struct_miqt_string)(format_ms))) -} - -func QPictureFormatPlugin_Tr2(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPictureFormatPlugin_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QPictureFormatPlugin_Tr3(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPictureFormatPlugin_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QPictureFormatPlugin_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPictureFormatPlugin_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QPictureFormatPlugin_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPictureFormatPlugin_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -// Delete this object from C++ memory. -func (this *QPictureFormatPlugin) Delete() { - C.QPictureFormatPlugin_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QPictureFormatPlugin) GoGC() { - runtime.SetFinalizer(this, func(this *QPictureFormatPlugin) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} diff --git a/qt/gen_qpictureformatplugin.h b/qt/gen_qpictureformatplugin.h deleted file mode 100644 index 7c6f975..0000000 --- a/qt/gen_qpictureformatplugin.h +++ /dev/null @@ -1,43 +0,0 @@ -#ifndef GEN_QPICTUREFORMATPLUGIN_H -#define GEN_QPICTUREFORMATPLUGIN_H - -#include -#include -#include - -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - -#include "binding.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __cplusplus -class QMetaObject; -class QPicture; -class QPictureFormatPlugin; -#else -typedef struct QMetaObject QMetaObject; -typedef struct QPicture QPicture; -typedef struct QPictureFormatPlugin QPictureFormatPlugin; -#endif - -QMetaObject* QPictureFormatPlugin_MetaObject(const QPictureFormatPlugin* self); -void* QPictureFormatPlugin_Metacast(QPictureFormatPlugin* self, const char* param1); -struct miqt_string* QPictureFormatPlugin_Tr(const char* s); -struct miqt_string* QPictureFormatPlugin_TrUtf8(const char* s); -bool QPictureFormatPlugin_LoadPicture(QPictureFormatPlugin* self, struct miqt_string* format, struct miqt_string* filename, QPicture* pic); -bool QPictureFormatPlugin_SavePicture(QPictureFormatPlugin* self, struct miqt_string* format, struct miqt_string* filename, QPicture* pic); -bool QPictureFormatPlugin_InstallIOHandler(QPictureFormatPlugin* self, struct miqt_string* format); -struct miqt_string* QPictureFormatPlugin_Tr2(const char* s, const char* c); -struct miqt_string* QPictureFormatPlugin_Tr3(const char* s, const char* c, int n); -struct miqt_string* QPictureFormatPlugin_TrUtf82(const char* s, const char* c); -struct miqt_string* QPictureFormatPlugin_TrUtf83(const char* s, const char* c, int n); -void QPictureFormatPlugin_Delete(QPictureFormatPlugin* self); - -#ifdef __cplusplus -} /* extern C */ -#endif - -#endif diff --git a/qt/gen_qpixmap.cpp b/qt/gen_qpixmap.cpp index b02d909..b59ab33 100644 --- a/qt/gen_qpixmap.cpp +++ b/qt/gen_qpixmap.cpp @@ -4,15 +4,12 @@ #include #include #include -#include -#include -#include #include #include -#include #include #include #include +#include #include #include #include @@ -96,14 +93,6 @@ void QPixmap_Fill(QPixmap* self) { self->fill(); } -void QPixmap_Fill2(QPixmap* self, QPaintDevice* device, QPoint* ofs) { - self->fill(device, *ofs); -} - -void QPixmap_Fill3(QPixmap* self, QPaintDevice* device, int xofs, int yofs) { - self->fill(device, static_cast(xofs), static_cast(yofs)); -} - QBitmap* QPixmap_Mask(const QPixmap* self) { return new QBitmap(self->mask()); } @@ -121,6 +110,10 @@ void QPixmap_SetDevicePixelRatio(QPixmap* self, double scaleFactor) { self->setDevicePixelRatio(static_cast(scaleFactor)); } +QSizeF* QPixmap_DeviceIndependentSize(const QPixmap* self) { + return new QSizeF(self->deviceIndependentSize()); +} + bool QPixmap_HasAlpha(const QPixmap* self) { return self->hasAlpha(); } @@ -137,18 +130,6 @@ QBitmap* QPixmap_CreateMaskFromColor(const QPixmap* self, QColor* maskColor) { return new QBitmap(self->createMaskFromColor(*maskColor)); } -QPixmap* QPixmap_GrabWindow(uintptr_t param1) { - return new QPixmap(QPixmap::grabWindow(static_cast(param1))); -} - -QPixmap* QPixmap_GrabWidget(QObject* widget, QRect* rect) { - return new QPixmap(QPixmap::grabWidget(widget, *rect)); -} - -QPixmap* QPixmap_GrabWidgetWithWidget(QObject* widget) { - return new QPixmap(QPixmap::grabWidget(widget)); -} - QPixmap* QPixmap_Scaled(const QPixmap* self, int w, int h) { return new QPixmap(self->scaled(static_cast(w), static_cast(h))); } @@ -165,19 +146,11 @@ QPixmap* QPixmap_ScaledToHeight(const QPixmap* self, int h) { return new QPixmap(self->scaledToHeight(static_cast(h))); } -QPixmap* QPixmap_Transformed(const QPixmap* self, QMatrix* param1) { +QPixmap* QPixmap_Transformed(const QPixmap* self, QTransform* param1) { return new QPixmap(self->transformed(*param1)); } -QMatrix* QPixmap_TrueMatrix(QMatrix* m, int w, int h) { - return new QMatrix(QPixmap::trueMatrix(*m, static_cast(w), static_cast(h))); -} - -QPixmap* QPixmap_TransformedWithQTransform(const QPixmap* self, QTransform* param1) { - return new QPixmap(self->transformed(*param1)); -} - -QTransform* QPixmap_TrueMatrix2(QTransform* m, int w, int h) { +QTransform* QPixmap_TrueMatrix(QTransform* m, int w, int h) { return new QTransform(QPixmap::trueMatrix(*m, static_cast(w), static_cast(h))); } @@ -272,38 +245,6 @@ QBitmap* QPixmap_CreateMaskFromColor2(const QPixmap* self, QColor* maskColor, in 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))); -} - -QPixmap* QPixmap_GrabWindow3(uintptr_t param1, int x, int 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))); -} - -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))); -} - -QPixmap* QPixmap_GrabWidget2(QObject* widget, int x) { - return new QPixmap(QPixmap::grabWidget(widget, static_cast(x))); -} - -QPixmap* QPixmap_GrabWidget3(QObject* widget, int x, int y) { - return new QPixmap(QPixmap::grabWidget(widget, static_cast(x), static_cast(y))); -} - -QPixmap* QPixmap_GrabWidget4(QObject* widget, int x, int y, int w) { - return new QPixmap(QPixmap::grabWidget(widget, static_cast(x), static_cast(y), static_cast(w))); -} - -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, int aspectMode) { return new QPixmap(self->scaled(static_cast(w), static_cast(h), static_cast(aspectMode))); } @@ -328,11 +269,7 @@ 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, int mode) { - return new QPixmap(self->transformed(*param1, static_cast(mode))); -} - -QPixmap* QPixmap_Transformed22(const QPixmap* self, QTransform* param1, int mode) { +QPixmap* QPixmap_Transformed2(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 cad087f..ff25ee9 100644 --- a/qt/gen_qpixmap.go +++ b/qt/gen_qpixmap.go @@ -138,14 +138,6 @@ func (this *QPixmap) Fill() { C.QPixmap_Fill(this.h) } -func (this *QPixmap) Fill2(device *QPaintDevice, ofs *QPoint) { - C.QPixmap_Fill2(this.h, device.cPointer(), ofs.cPointer()) -} - -func (this *QPixmap) Fill3(device *QPaintDevice, xofs int, yofs int) { - C.QPixmap_Fill3(this.h, device.cPointer(), (C.int)(xofs), (C.int)(yofs)) -} - func (this *QPixmap) Mask() *QBitmap { _ret := C.QPixmap_Mask(this.h) _goptr := newQBitmap(_ret) @@ -165,6 +157,13 @@ func (this *QPixmap) SetDevicePixelRatio(scaleFactor float64) { C.QPixmap_SetDevicePixelRatio(this.h, (C.double)(scaleFactor)) } +func (this *QPixmap) DeviceIndependentSize() *QSizeF { + _ret := C.QPixmap_DeviceIndependentSize(this.h) + _goptr := newQSizeF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + func (this *QPixmap) HasAlpha() bool { return (bool)(C.QPixmap_HasAlpha(this.h)) } @@ -187,27 +186,6 @@ func (this *QPixmap) CreateMaskFromColor(maskColor *QColor) *QBitmap { return _goptr } -func QPixmap_GrabWindow(param1 uintptr) *QPixmap { - _ret := C.QPixmap_GrabWindow((C.uintptr_t)(param1)) - _goptr := newQPixmap(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QPixmap_GrabWidget(widget *QObject, rect *QRect) *QPixmap { - _ret := C.QPixmap_GrabWidget(widget.cPointer(), rect.cPointer()) - _goptr := newQPixmap(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QPixmap_GrabWidgetWithWidget(widget *QObject) *QPixmap { - _ret := C.QPixmap_GrabWidgetWithWidget(widget.cPointer()) - _goptr := newQPixmap(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - func (this *QPixmap) Scaled(w int, h int) *QPixmap { _ret := C.QPixmap_Scaled(this.h, (C.int)(w), (C.int)(h)) _goptr := newQPixmap(_ret) @@ -236,29 +214,15 @@ func (this *QPixmap) ScaledToHeight(h int) *QPixmap { return _goptr } -func (this *QPixmap) Transformed(param1 *QMatrix) *QPixmap { +func (this *QPixmap) Transformed(param1 *QTransform) *QPixmap { _ret := C.QPixmap_Transformed(this.h, param1.cPointer()) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QPixmap_TrueMatrix(m *QMatrix, w int, h int) *QMatrix { +func QPixmap_TrueMatrix(m *QTransform, w int, h int) *QTransform { _ret := C.QPixmap_TrueMatrix(m.cPointer(), (C.int)(w), (C.int)(h)) - _goptr := newQMatrix(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QPixmap) TransformedWithQTransform(param1 *QTransform) *QPixmap { - _ret := C.QPixmap_TransformedWithQTransform(this.h, param1.cPointer()) - _goptr := newQPixmap(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QPixmap_TrueMatrix2(m *QTransform, w int, h int) *QTransform { - _ret := C.QPixmap_TrueMatrix2(m.cPointer(), (C.int)(w), (C.int)(h)) _goptr := newQTransform(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -377,62 +341,6 @@ func (this *QPixmap) CreateMaskFromColor2(maskColor *QColor, mode MaskMode) *QBi return _goptr } -func QPixmap_GrabWindow2(param1 uintptr, x int) *QPixmap { - _ret := C.QPixmap_GrabWindow2((C.uintptr_t)(param1), (C.int)(x)) - _goptr := newQPixmap(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QPixmap_GrabWindow3(param1 uintptr, x int, y int) *QPixmap { - _ret := C.QPixmap_GrabWindow3((C.uintptr_t)(param1), (C.int)(x), (C.int)(y)) - _goptr := newQPixmap(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QPixmap_GrabWindow4(param1 uintptr, x int, y int, w int) *QPixmap { - _ret := C.QPixmap_GrabWindow4((C.uintptr_t)(param1), (C.int)(x), (C.int)(y), (C.int)(w)) - _goptr := newQPixmap(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QPixmap_GrabWindow5(param1 uintptr, x int, y int, w int, h int) *QPixmap { - _ret := C.QPixmap_GrabWindow5((C.uintptr_t)(param1), (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h)) - _goptr := newQPixmap(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QPixmap_GrabWidget2(widget *QObject, x int) *QPixmap { - _ret := C.QPixmap_GrabWidget2(widget.cPointer(), (C.int)(x)) - _goptr := newQPixmap(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QPixmap_GrabWidget3(widget *QObject, x int, y int) *QPixmap { - _ret := C.QPixmap_GrabWidget3(widget.cPointer(), (C.int)(x), (C.int)(y)) - _goptr := newQPixmap(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QPixmap_GrabWidget4(widget *QObject, x int, y int, w int) *QPixmap { - _ret := C.QPixmap_GrabWidget4(widget.cPointer(), (C.int)(x), (C.int)(y), (C.int)(w)) - _goptr := newQPixmap(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QPixmap_GrabWidget5(widget *QObject, x int, y int, w int, h int) *QPixmap { - _ret := C.QPixmap_GrabWidget5(widget.cPointer(), (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h)) - _goptr := newQPixmap(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - func (this *QPixmap) Scaled3(w int, h int, aspectMode AspectRatioMode) *QPixmap { _ret := C.QPixmap_Scaled3(this.h, (C.int)(w), (C.int)(h), (C.int)(aspectMode)) _goptr := newQPixmap(_ret) @@ -475,20 +383,13 @@ func (this *QPixmap) ScaledToHeight2(h int, mode TransformationMode) *QPixmap { return _goptr } -func (this *QPixmap) Transformed2(param1 *QMatrix, mode TransformationMode) *QPixmap { +func (this *QPixmap) Transformed2(param1 *QTransform, mode TransformationMode) *QPixmap { _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.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 ImageConversionFlag) *QPixmap { _ret := C.QPixmap_FromImage2(image.cPointer(), (C.int)(flags)) _goptr := newQPixmap(_ret) diff --git a/qt/gen_qpixmap.h b/qt/gen_qpixmap.h index 60d5bb6..a56353e 100644 --- a/qt/gen_qpixmap.h +++ b/qt/gen_qpixmap.h @@ -20,15 +20,12 @@ class QColor; class QIODevice; class QImage; class QImageReader; -class QMatrix; -class QObject; -class QPaintDevice; class QPaintEngine; class QPixmap; -class QPoint; class QRect; class QRegion; class QSize; +class QSizeF; class QTransform; #else typedef struct QBitmap QBitmap; @@ -37,15 +34,12 @@ typedef struct QColor QColor; typedef struct QIODevice QIODevice; typedef struct QImage QImage; typedef struct QImageReader QImageReader; -typedef struct QMatrix QMatrix; -typedef struct QObject QObject; -typedef struct QPaintDevice QPaintDevice; typedef struct QPaintEngine QPaintEngine; typedef struct QPixmap QPixmap; -typedef struct QPoint QPoint; typedef struct QRect QRect; typedef struct QRegion QRegion; typedef struct QSize QSize; +typedef struct QSizeF QSizeF; typedef struct QTransform QTransform; #endif @@ -67,27 +61,21 @@ QRect* QPixmap_Rect(const QPixmap* self); int QPixmap_Depth(const QPixmap* self); int QPixmap_DefaultDepth(); void QPixmap_Fill(QPixmap* self); -void QPixmap_Fill2(QPixmap* self, QPaintDevice* device, QPoint* ofs); -void QPixmap_Fill3(QPixmap* self, QPaintDevice* device, int xofs, int yofs); QBitmap* QPixmap_Mask(const QPixmap* self); void QPixmap_SetMask(QPixmap* self, QBitmap* mask); double QPixmap_DevicePixelRatio(const QPixmap* self); void QPixmap_SetDevicePixelRatio(QPixmap* self, double scaleFactor); +QSizeF* QPixmap_DeviceIndependentSize(const QPixmap* self); bool QPixmap_HasAlpha(const QPixmap* self); bool QPixmap_HasAlphaChannel(const QPixmap* self); QBitmap* QPixmap_CreateHeuristicMask(const QPixmap* self); QBitmap* QPixmap_CreateMaskFromColor(const QPixmap* self, QColor* maskColor); -QPixmap* QPixmap_GrabWindow(uintptr_t param1); -QPixmap* QPixmap_GrabWidget(QObject* widget, QRect* rect); -QPixmap* QPixmap_GrabWidgetWithWidget(QObject* widget); QPixmap* QPixmap_Scaled(const QPixmap* self, int w, int h); QPixmap* QPixmap_ScaledWithQSize(const QPixmap* self, QSize* s); QPixmap* QPixmap_ScaledToWidth(const QPixmap* self, int w); QPixmap* QPixmap_ScaledToHeight(const QPixmap* self, int h); -QPixmap* QPixmap_Transformed(const QPixmap* self, QMatrix* param1); -QMatrix* QPixmap_TrueMatrix(QMatrix* m, int w, int h); -QPixmap* QPixmap_TransformedWithQTransform(const QPixmap* self, QTransform* param1); -QTransform* QPixmap_TrueMatrix2(QTransform* m, int w, int h); +QPixmap* QPixmap_Transformed(const QPixmap* self, QTransform* param1); +QTransform* QPixmap_TrueMatrix(QTransform* m, int w, int h); QImage* QPixmap_ToImage(const QPixmap* self); QPixmap* QPixmap_FromImage(QImage* image); QPixmap* QPixmap_FromImageReader(QImageReader* imageReader); @@ -110,22 +98,13 @@ 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, 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); -QPixmap* QPixmap_GrabWindow5(uintptr_t param1, int x, int y, int w, int h); -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, 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_Transformed2(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 3b8eaa9..3b4383d 100644 --- a/qt/gen_qpixmapcache.cpp +++ b/qt/gen_qpixmapcache.cpp @@ -16,22 +16,12 @@ void QPixmapCache_SetCacheLimit(int cacheLimit) { QPixmapCache::setCacheLimit(static_cast(cacheLimit)); } -QPixmap* QPixmapCache_Find(struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); - return QPixmapCache::find(key_QString); -} - -bool QPixmapCache_Find2(struct miqt_string* key, QPixmap* pixmap) { - QString key_QString = QString::fromUtf8(&key->data, key->len); - return QPixmapCache::find(key_QString, *pixmap); -} - -bool QPixmapCache_Find3(struct miqt_string* key, QPixmap* pixmap) { +bool QPixmapCache_Find(struct miqt_string* key, QPixmap* pixmap) { QString key_QString = QString::fromUtf8(&key->data, key->len); return QPixmapCache::find(key_QString, pixmap); } -bool QPixmapCache_Find4(QPixmapCache__Key* key, QPixmap* pixmap) { +bool QPixmapCache_Find2(QPixmapCache__Key* key, QPixmap* pixmap) { return QPixmapCache::find(*key, pixmap); } diff --git a/qt/gen_qpixmapcache.go b/qt/gen_qpixmapcache.go index d42425f..21f1cdc 100644 --- a/qt/gen_qpixmapcache.go +++ b/qt/gen_qpixmapcache.go @@ -43,26 +43,14 @@ func QPixmapCache_SetCacheLimit(cacheLimit int) { C.QPixmapCache_SetCacheLimit((C.int)(cacheLimit)) } -func QPixmapCache_Find(key string) *QPixmap { +func QPixmapCache_Find(key string, pixmap *QPixmap) bool { key_ms := miqt_strdupg(key) defer C.free(key_ms) - return newQPixmap_U(unsafe.Pointer(C.QPixmapCache_Find((*C.struct_miqt_string)(key_ms)))) + return (bool)(C.QPixmapCache_Find((*C.struct_miqt_string)(key_ms), pixmap.cPointer())) } -func QPixmapCache_Find2(key string, pixmap *QPixmap) bool { - key_ms := miqt_strdupg(key) - defer C.free(key_ms) - return (bool)(C.QPixmapCache_Find2((*C.struct_miqt_string)(key_ms), pixmap.cPointer())) -} - -func QPixmapCache_Find3(key string, pixmap *QPixmap) bool { - key_ms := miqt_strdupg(key) - defer C.free(key_ms) - return (bool)(C.QPixmapCache_Find3((*C.struct_miqt_string)(key_ms), pixmap.cPointer())) -} - -func QPixmapCache_Find4(key *QPixmapCache__Key, pixmap *QPixmap) bool { - return (bool)(C.QPixmapCache_Find4(key.cPointer(), pixmap.cPointer())) +func QPixmapCache_Find2(key *QPixmapCache__Key, pixmap *QPixmap) bool { + return (bool)(C.QPixmapCache_Find2(key.cPointer(), pixmap.cPointer())) } func QPixmapCache_Insert(key string, pixmap *QPixmap) bool { diff --git a/qt/gen_qpixmapcache.h b/qt/gen_qpixmapcache.h index 4f303f0..bf5d4b0 100644 --- a/qt/gen_qpixmapcache.h +++ b/qt/gen_qpixmapcache.h @@ -29,10 +29,8 @@ typedef struct QPixmapCache__Key QPixmapCache__Key; int QPixmapCache_CacheLimit(); void QPixmapCache_SetCacheLimit(int cacheLimit); -QPixmap* QPixmapCache_Find(struct miqt_string* key); -bool QPixmapCache_Find2(struct miqt_string* key, QPixmap* pixmap); -bool QPixmapCache_Find3(struct miqt_string* key, QPixmap* pixmap); -bool QPixmapCache_Find4(QPixmapCache__Key* key, QPixmap* pixmap); +bool QPixmapCache_Find(struct miqt_string* key, QPixmap* pixmap); +bool QPixmapCache_Find2(QPixmapCache__Key* key, QPixmap* pixmap); bool QPixmapCache_Insert(struct miqt_string* key, QPixmap* pixmap); QPixmapCache__Key* QPixmapCache_InsertWithPixmap(QPixmap* pixmap); bool QPixmapCache_Replace(QPixmapCache__Key* key, QPixmap* pixmap); diff --git a/qt/gen_qplaintextedit.cpp b/qt/gen_qplaintextedit.cpp index edd499d..07e48db 100644 --- a/qt/gen_qplaintextedit.cpp +++ b/qt/gen_qplaintextedit.cpp @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include @@ -62,13 +61,6 @@ struct miqt_string* QPlainTextEdit_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QPlainTextEdit_TrUtf8(const char* s) { - QString _ret = QPlainTextEdit::trUtf8(s); - // 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 QPlainTextEdit_SetDocument(QPlainTextEdit* self, QTextDocument* document) { self->setDocument(document); } @@ -201,11 +193,7 @@ bool QPlainTextEdit_Find(QPlainTextEdit* self, struct miqt_string* exp) { return self->find(exp_QString); } -bool QPlainTextEdit_FindWithExp(QPlainTextEdit* self, QRegExp* exp) { - return self->find(*exp); -} - -bool QPlainTextEdit_Find2(QPlainTextEdit* self, QRegularExpression* exp) { +bool QPlainTextEdit_FindWithExp(QPlainTextEdit* self, QRegularExpression* exp) { return self->find(*exp); } @@ -259,14 +247,6 @@ void QPlainTextEdit_SetOverwriteMode(QPlainTextEdit* self, bool overwrite) { self->setOverwriteMode(overwrite); } -int QPlainTextEdit_TabStopWidth(const QPlainTextEdit* self) { - return self->tabStopWidth(); -} - -void QPlainTextEdit_SetTabStopWidth(QPlainTextEdit* self, int width) { - self->setTabStopWidth(static_cast(width)); -} - double QPlainTextEdit_TabStopDistance(const QPlainTextEdit* self) { qreal _ret = self->tabStopDistance(); return static_cast(_ret); @@ -504,30 +484,12 @@ struct miqt_string* QPlainTextEdit_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QPlainTextEdit_TrUtf82(const char* s, const char* c) { - QString _ret = QPlainTextEdit::trUtf8(s, c); - // 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* QPlainTextEdit_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QPlainTextEdit::trUtf8(s, c, static_cast(n)); - // 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()); -} - -bool QPlainTextEdit_Find22(QPlainTextEdit* self, struct miqt_string* exp, int options) { +bool QPlainTextEdit_Find2(QPlainTextEdit* self, struct miqt_string* exp, int options) { QString exp_QString = QString::fromUtf8(&exp->data, exp->len); return self->find(exp_QString, static_cast(options)); } -bool QPlainTextEdit_Find23(QPlainTextEdit* self, QRegExp* exp, int options) { - return self->find(*exp, static_cast(options)); -} - -bool QPlainTextEdit_Find24(QPlainTextEdit* self, QRegularExpression* exp, int options) { +bool QPlainTextEdit_Find22(QPlainTextEdit* self, QRegularExpression* exp, int options) { return self->find(*exp, static_cast(options)); } @@ -566,13 +528,6 @@ struct miqt_string* QPlainTextDocumentLayout_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QPlainTextDocumentLayout_TrUtf8(const char* s) { - QString _ret = QPlainTextDocumentLayout::trUtf8(s); - // 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 QPlainTextDocumentLayout_Draw(QPlainTextDocumentLayout* self, QPainter* param1, QAbstractTextDocumentLayout__PaintContext* param2) { self->draw(param1, *param2); } @@ -627,20 +582,6 @@ struct miqt_string* QPlainTextDocumentLayout_Tr3(const char* s, const char* c, i return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QPlainTextDocumentLayout_TrUtf82(const char* s, const char* c) { - QString _ret = QPlainTextDocumentLayout::trUtf8(s, c); - // 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* QPlainTextDocumentLayout_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QPlainTextDocumentLayout::trUtf8(s, c, static_cast(n)); - // 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 QPlainTextDocumentLayout_Delete(QPlainTextDocumentLayout* self) { delete self; } diff --git a/qt/gen_qplaintextedit.go b/qt/gen_qplaintextedit.go index 0f45a4f..3fc93c2 100644 --- a/qt/gen_qplaintextedit.go +++ b/qt/gen_qplaintextedit.go @@ -91,15 +91,6 @@ func QPlainTextEdit_Tr(s string) string { return _ret } -func QPlainTextEdit_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPlainTextEdit_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QPlainTextEdit) SetDocument(document *QTextDocument) { C.QPlainTextEdit_SetDocument(this.h, document.cPointer()) } @@ -238,14 +229,10 @@ func (this *QPlainTextEdit) Find(exp string) bool { return (bool)(C.QPlainTextEdit_Find(this.h, (*C.struct_miqt_string)(exp_ms))) } -func (this *QPlainTextEdit) FindWithExp(exp *QRegExp) bool { +func (this *QPlainTextEdit) FindWithExp(exp *QRegularExpression) bool { return (bool)(C.QPlainTextEdit_FindWithExp(this.h, exp.cPointer())) } -func (this *QPlainTextEdit) Find2(exp *QRegularExpression) bool { - return (bool)(C.QPlainTextEdit_Find2(this.h, exp.cPointer())) -} - func (this *QPlainTextEdit) ToPlainText() string { var _ms *C.struct_miqt_string = C.QPlainTextEdit_ToPlainText(this.h) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) @@ -308,14 +295,6 @@ func (this *QPlainTextEdit) SetOverwriteMode(overwrite bool) { C.QPlainTextEdit_SetOverwriteMode(this.h, (C.bool)(overwrite)) } -func (this *QPlainTextEdit) TabStopWidth() int { - return (int)(C.QPlainTextEdit_TabStopWidth(this.h)) -} - -func (this *QPlainTextEdit) SetTabStopWidth(width int) { - C.QPlainTextEdit_SetTabStopWidth(this.h, (C.int)(width)) -} - func (this *QPlainTextEdit) TabStopDistance() float64 { return (float64)(C.QPlainTextEdit_TabStopDistance(this.h)) } @@ -646,40 +625,14 @@ func QPlainTextEdit_Tr3(s string, c string, n int) string { return _ret } -func QPlainTextEdit_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPlainTextEdit_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QPlainTextEdit_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPlainTextEdit_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QPlainTextEdit) Find22(exp string, options QTextDocument__FindFlag) bool { +func (this *QPlainTextEdit) Find2(exp string, options QTextDocument__FindFlag) 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_Find2(this.h, (*C.struct_miqt_string)(exp_ms), (C.int)(options))) } -func (this *QPlainTextEdit) Find23(exp *QRegExp, options QTextDocument__FindFlag) bool { - return (bool)(C.QPlainTextEdit_Find23(this.h, exp.cPointer(), (C.int)(options))) -} - -func (this *QPlainTextEdit) Find24(exp *QRegularExpression, options QTextDocument__FindFlag) bool { - return (bool)(C.QPlainTextEdit_Find24(this.h, exp.cPointer(), (C.int)(options))) +func (this *QPlainTextEdit) Find22(exp *QRegularExpression, options QTextDocument__FindFlag) bool { + return (bool)(C.QPlainTextEdit_Find22(this.h, exp.cPointer(), (C.int)(options))) } func (this *QPlainTextEdit) MoveCursor2(operation QTextCursor__MoveOperation, mode QTextCursor__MoveMode) { @@ -756,15 +709,6 @@ func QPlainTextDocumentLayout_Tr(s string) string { return _ret } -func QPlainTextDocumentLayout_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPlainTextDocumentLayout_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QPlainTextDocumentLayout) Draw(param1 *QPainter, param2 *QAbstractTextDocumentLayout__PaintContext) { C.QPlainTextDocumentLayout_Draw(this.h, param1.cPointer(), param2.cPointer()) } @@ -836,28 +780,6 @@ func QPlainTextDocumentLayout_Tr3(s string, c string, n int) string { return _ret } -func QPlainTextDocumentLayout_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPlainTextDocumentLayout_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QPlainTextDocumentLayout_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPlainTextDocumentLayout_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QPlainTextDocumentLayout) Delete() { C.QPlainTextDocumentLayout_Delete(this.h) diff --git a/qt/gen_qplaintextedit.h b/qt/gen_qplaintextedit.h index 7084ce2..ed63577 100644 --- a/qt/gen_qplaintextedit.h +++ b/qt/gen_qplaintextedit.h @@ -29,7 +29,6 @@ class QPoint; class QPointF; class QRect; class QRectF; -class QRegExp; class QRegularExpression; class QSizeF; class QTextBlock; @@ -57,7 +56,6 @@ typedef struct QPoint QPoint; typedef struct QPointF QPointF; typedef struct QRect QRect; typedef struct QRectF QRectF; -typedef struct QRegExp QRegExp; typedef struct QRegularExpression QRegularExpression; typedef struct QSizeF QSizeF; typedef struct QTextBlock QTextBlock; @@ -78,7 +76,6 @@ QPlainTextEdit* QPlainTextEdit_new4(struct miqt_string* text, QWidget* parent); QMetaObject* QPlainTextEdit_MetaObject(const QPlainTextEdit* self); void* QPlainTextEdit_Metacast(QPlainTextEdit* self, const char* param1); struct miqt_string* QPlainTextEdit_Tr(const char* s); -struct miqt_string* QPlainTextEdit_TrUtf8(const char* s); void QPlainTextEdit_SetDocument(QPlainTextEdit* self, QTextDocument* document); QTextDocument* QPlainTextEdit_Document(const QPlainTextEdit* self); void QPlainTextEdit_SetPlaceholderText(QPlainTextEdit* self, struct miqt_string* placeholderText); @@ -109,8 +106,7 @@ bool QPlainTextEdit_BackgroundVisible(const QPlainTextEdit* self); void QPlainTextEdit_SetCenterOnScroll(QPlainTextEdit* self, bool enabled); bool QPlainTextEdit_CenterOnScroll(const QPlainTextEdit* self); bool QPlainTextEdit_Find(QPlainTextEdit* self, struct miqt_string* exp); -bool QPlainTextEdit_FindWithExp(QPlainTextEdit* self, QRegExp* exp); -bool QPlainTextEdit_Find2(QPlainTextEdit* self, QRegularExpression* exp); +bool QPlainTextEdit_FindWithExp(QPlainTextEdit* self, QRegularExpression* exp); struct miqt_string* QPlainTextEdit_ToPlainText(const QPlainTextEdit* self); void QPlainTextEdit_EnsureCursorVisible(QPlainTextEdit* self); QVariant* QPlainTextEdit_LoadResource(QPlainTextEdit* self, int typeVal, QUrl* name); @@ -122,8 +118,6 @@ QRect* QPlainTextEdit_CursorRect2(const QPlainTextEdit* self); struct miqt_string* QPlainTextEdit_AnchorAt(const QPlainTextEdit* self, QPoint* pos); bool QPlainTextEdit_OverwriteMode(const QPlainTextEdit* self); void QPlainTextEdit_SetOverwriteMode(QPlainTextEdit* self, bool overwrite); -int QPlainTextEdit_TabStopWidth(const QPlainTextEdit* self); -void QPlainTextEdit_SetTabStopWidth(QPlainTextEdit* self, int width); double QPlainTextEdit_TabStopDistance(const QPlainTextEdit* self); void QPlainTextEdit_SetTabStopDistance(QPlainTextEdit* self, double distance); int QPlainTextEdit_CursorWidth(const QPlainTextEdit* self); @@ -170,11 +164,8 @@ void QPlainTextEdit_ModificationChanged(QPlainTextEdit* self, bool param1); void QPlainTextEdit_connect_ModificationChanged(QPlainTextEdit* self, void* slot); struct miqt_string* QPlainTextEdit_Tr2(const char* s, const char* c); struct miqt_string* QPlainTextEdit_Tr3(const char* s, const char* c, int n); -struct miqt_string* QPlainTextEdit_TrUtf82(const char* s, const char* c); -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); +bool QPlainTextEdit_Find2(QPlainTextEdit* self, struct miqt_string* exp, int options); +bool QPlainTextEdit_Find22(QPlainTextEdit* self, QRegularExpression* exp, int options); void QPlainTextEdit_MoveCursor2(QPlainTextEdit* self, int operation, int mode); void QPlainTextEdit_ZoomIn1(QPlainTextEdit* self, int rangeVal); void QPlainTextEdit_ZoomOut1(QPlainTextEdit* self, int rangeVal); @@ -184,7 +175,6 @@ QPlainTextDocumentLayout* QPlainTextDocumentLayout_new(QTextDocument* document); QMetaObject* QPlainTextDocumentLayout_MetaObject(const QPlainTextDocumentLayout* self); void* QPlainTextDocumentLayout_Metacast(QPlainTextDocumentLayout* self, const char* param1); 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, int param2); int QPlainTextDocumentLayout_PageCount(const QPlainTextDocumentLayout* self); @@ -197,8 +187,6 @@ int QPlainTextDocumentLayout_CursorWidth(const QPlainTextDocumentLayout* self); void QPlainTextDocumentLayout_RequestUpdate(QPlainTextDocumentLayout* self); struct miqt_string* QPlainTextDocumentLayout_Tr2(const char* s, const char* c); struct miqt_string* QPlainTextDocumentLayout_Tr3(const char* s, const char* c, int n); -struct miqt_string* QPlainTextDocumentLayout_TrUtf82(const char* s, const char* c); -struct miqt_string* QPlainTextDocumentLayout_TrUtf83(const char* s, const char* c, int n); void QPlainTextDocumentLayout_Delete(QPlainTextDocumentLayout* self); #ifdef __cplusplus diff --git a/qt/gen_qplugin.cpp b/qt/gen_qplugin.cpp index eb34748..deb89d7 100644 --- a/qt/gen_qplugin.cpp +++ b/qt/gen_qplugin.cpp @@ -1,9 +1,22 @@ #include +#include +#define WORKAROUND_INNER_CLASS_DEFINITION_QPluginMetaData__ElfNoteHeader +#define WORKAROUND_INNER_CLASS_DEFINITION_QPluginMetaData__Header +#define WORKAROUND_INNER_CLASS_DEFINITION_QPluginMetaData__MagicHeader #include #include "qplugin.h" #include "gen_qplugin.h" #include "_cgo_export.h" +unsigned char QPluginMetaData_ArchRequirements() { + quint8 _ret = QPluginMetaData::archRequirements(); + return static_cast(_ret); +} + +void QPluginMetaData_Delete(QPluginMetaData* self) { + delete self; +} + QJsonObject* QStaticPlugin_MetaData(const QStaticPlugin* self) { return new QJsonObject(self->metaData()); } @@ -12,3 +25,31 @@ void QStaticPlugin_Delete(QStaticPlugin* self) { delete self; } +QPluginMetaData__Header* QPluginMetaData__Header_new(QPluginMetaData__Header* param1) { + return new QPluginMetaData::Header(*param1); +} + +void QPluginMetaData__Header_Delete(QPluginMetaData__Header* self) { + delete self; +} + +QPluginMetaData__MagicHeader* QPluginMetaData__MagicHeader_new() { + return new QPluginMetaData::MagicHeader(); +} + +void QPluginMetaData__MagicHeader_Delete(QPluginMetaData__MagicHeader* self) { + delete self; +} + +QPluginMetaData__ElfNoteHeader* QPluginMetaData__ElfNoteHeader_new(unsigned int payloadSize) { + return new QPluginMetaData::ElfNoteHeader(static_cast(payloadSize)); +} + +QPluginMetaData__ElfNoteHeader* QPluginMetaData__ElfNoteHeader_new2(QPluginMetaData__ElfNoteHeader* param1) { + return new QPluginMetaData::ElfNoteHeader(*param1); +} + +void QPluginMetaData__ElfNoteHeader_Delete(QPluginMetaData__ElfNoteHeader* self) { + delete self; +} + diff --git a/qt/gen_qplugin.go b/qt/gen_qplugin.go index abf67eb..7ddc5fc 100644 --- a/qt/gen_qplugin.go +++ b/qt/gen_qplugin.go @@ -13,6 +13,46 @@ import ( "unsafe" ) +type QPluginMetaData struct { + h *C.QPluginMetaData +} + +func (this *QPluginMetaData) cPointer() *C.QPluginMetaData { + if this == nil { + return nil + } + return this.h +} + +func newQPluginMetaData(h *C.QPluginMetaData) *QPluginMetaData { + if h == nil { + return nil + } + return &QPluginMetaData{h: h} +} + +func newQPluginMetaData_U(h unsafe.Pointer) *QPluginMetaData { + return newQPluginMetaData((*C.QPluginMetaData)(h)) +} + +func QPluginMetaData_ArchRequirements() byte { + return (byte)(C.QPluginMetaData_ArchRequirements()) +} + +// Delete this object from C++ memory. +func (this *QPluginMetaData) Delete() { + C.QPluginMetaData_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QPluginMetaData) GoGC() { + runtime.SetFinalizer(this, func(this *QPluginMetaData) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + type QStaticPlugin struct { h *C.QStaticPlugin } @@ -55,3 +95,135 @@ func (this *QStaticPlugin) GoGC() { runtime.KeepAlive(this.h) }) } + +type QPluginMetaData__Header struct { + h *C.QPluginMetaData__Header +} + +func (this *QPluginMetaData__Header) cPointer() *C.QPluginMetaData__Header { + if this == nil { + return nil + } + return this.h +} + +func newQPluginMetaData__Header(h *C.QPluginMetaData__Header) *QPluginMetaData__Header { + if h == nil { + return nil + } + return &QPluginMetaData__Header{h: h} +} + +func newQPluginMetaData__Header_U(h unsafe.Pointer) *QPluginMetaData__Header { + return newQPluginMetaData__Header((*C.QPluginMetaData__Header)(h)) +} + +// NewQPluginMetaData__Header constructs a new QPluginMetaData::Header object. +func NewQPluginMetaData__Header(param1 *QPluginMetaData__Header) *QPluginMetaData__Header { + ret := C.QPluginMetaData__Header_new(param1.cPointer()) + return newQPluginMetaData__Header(ret) +} + +// Delete this object from C++ memory. +func (this *QPluginMetaData__Header) Delete() { + C.QPluginMetaData__Header_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QPluginMetaData__Header) GoGC() { + runtime.SetFinalizer(this, func(this *QPluginMetaData__Header) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + +type QPluginMetaData__MagicHeader struct { + h *C.QPluginMetaData__MagicHeader +} + +func (this *QPluginMetaData__MagicHeader) cPointer() *C.QPluginMetaData__MagicHeader { + if this == nil { + return nil + } + return this.h +} + +func newQPluginMetaData__MagicHeader(h *C.QPluginMetaData__MagicHeader) *QPluginMetaData__MagicHeader { + if h == nil { + return nil + } + return &QPluginMetaData__MagicHeader{h: h} +} + +func newQPluginMetaData__MagicHeader_U(h unsafe.Pointer) *QPluginMetaData__MagicHeader { + return newQPluginMetaData__MagicHeader((*C.QPluginMetaData__MagicHeader)(h)) +} + +// NewQPluginMetaData__MagicHeader constructs a new QPluginMetaData::MagicHeader object. +func NewQPluginMetaData__MagicHeader() *QPluginMetaData__MagicHeader { + ret := C.QPluginMetaData__MagicHeader_new() + return newQPluginMetaData__MagicHeader(ret) +} + +// Delete this object from C++ memory. +func (this *QPluginMetaData__MagicHeader) Delete() { + C.QPluginMetaData__MagicHeader_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QPluginMetaData__MagicHeader) GoGC() { + runtime.SetFinalizer(this, func(this *QPluginMetaData__MagicHeader) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + +type QPluginMetaData__ElfNoteHeader struct { + h *C.QPluginMetaData__ElfNoteHeader +} + +func (this *QPluginMetaData__ElfNoteHeader) cPointer() *C.QPluginMetaData__ElfNoteHeader { + if this == nil { + return nil + } + return this.h +} + +func newQPluginMetaData__ElfNoteHeader(h *C.QPluginMetaData__ElfNoteHeader) *QPluginMetaData__ElfNoteHeader { + if h == nil { + return nil + } + return &QPluginMetaData__ElfNoteHeader{h: h} +} + +func newQPluginMetaData__ElfNoteHeader_U(h unsafe.Pointer) *QPluginMetaData__ElfNoteHeader { + return newQPluginMetaData__ElfNoteHeader((*C.QPluginMetaData__ElfNoteHeader)(h)) +} + +// NewQPluginMetaData__ElfNoteHeader constructs a new QPluginMetaData::ElfNoteHeader object. +func NewQPluginMetaData__ElfNoteHeader(payloadSize uint) *QPluginMetaData__ElfNoteHeader { + ret := C.QPluginMetaData__ElfNoteHeader_new((C.uint)(payloadSize)) + return newQPluginMetaData__ElfNoteHeader(ret) +} + +// NewQPluginMetaData__ElfNoteHeader2 constructs a new QPluginMetaData::ElfNoteHeader object. +func NewQPluginMetaData__ElfNoteHeader2(param1 *QPluginMetaData__ElfNoteHeader) *QPluginMetaData__ElfNoteHeader { + ret := C.QPluginMetaData__ElfNoteHeader_new2(param1.cPointer()) + return newQPluginMetaData__ElfNoteHeader(ret) +} + +// Delete this object from C++ memory. +func (this *QPluginMetaData__ElfNoteHeader) Delete() { + C.QPluginMetaData__ElfNoteHeader_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QPluginMetaData__ElfNoteHeader) GoGC() { + runtime.SetFinalizer(this, func(this *QPluginMetaData__ElfNoteHeader) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} diff --git a/qt/gen_qplugin.h b/qt/gen_qplugin.h index 89cbf38..eb32031 100644 --- a/qt/gen_qplugin.h +++ b/qt/gen_qplugin.h @@ -15,15 +15,48 @@ extern "C" { #ifdef __cplusplus class QJsonObject; +class QPluginMetaData; +#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QPluginMetaData__ElfNoteHeader) +typedef QPluginMetaData::ElfNoteHeader QPluginMetaData__ElfNoteHeader; +#else +class QPluginMetaData__ElfNoteHeader; +#endif +#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QPluginMetaData__Header) +typedef QPluginMetaData::Header QPluginMetaData__Header; +#else +class QPluginMetaData__Header; +#endif +#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QPluginMetaData__MagicHeader) +typedef QPluginMetaData::MagicHeader QPluginMetaData__MagicHeader; +#else +class QPluginMetaData__MagicHeader; +#endif class QStaticPlugin; #else typedef struct QJsonObject QJsonObject; +typedef struct QPluginMetaData QPluginMetaData; +typedef struct QPluginMetaData__ElfNoteHeader QPluginMetaData__ElfNoteHeader; +typedef struct QPluginMetaData__Header QPluginMetaData__Header; +typedef struct QPluginMetaData__MagicHeader QPluginMetaData__MagicHeader; typedef struct QStaticPlugin QStaticPlugin; #endif +unsigned char QPluginMetaData_ArchRequirements(); +void QPluginMetaData_Delete(QPluginMetaData* self); + QJsonObject* QStaticPlugin_MetaData(const QStaticPlugin* self); void QStaticPlugin_Delete(QStaticPlugin* self); +QPluginMetaData__Header* QPluginMetaData__Header_new(QPluginMetaData__Header* param1); +void QPluginMetaData__Header_Delete(QPluginMetaData__Header* self); + +QPluginMetaData__MagicHeader* QPluginMetaData__MagicHeader_new(); +void QPluginMetaData__MagicHeader_Delete(QPluginMetaData__MagicHeader* self); + +QPluginMetaData__ElfNoteHeader* QPluginMetaData__ElfNoteHeader_new(unsigned int payloadSize); +QPluginMetaData__ElfNoteHeader* QPluginMetaData__ElfNoteHeader_new2(QPluginMetaData__ElfNoteHeader* param1); +void QPluginMetaData__ElfNoteHeader_Delete(QPluginMetaData__ElfNoteHeader* self); + #ifdef __cplusplus } /* extern C */ #endif diff --git a/qt/gen_qpluginloader.cpp b/qt/gen_qpluginloader.cpp index b1a438a..5efe12d 100644 --- a/qt/gen_qpluginloader.cpp +++ b/qt/gen_qpluginloader.cpp @@ -44,13 +44,6 @@ struct miqt_string* QPluginLoader_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QPluginLoader_TrUtf8(const char* s) { - QString _ret = QPluginLoader::trUtf8(s); - // 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()); -} - QObject* QPluginLoader_Instance(QPluginLoader* self) { return self->instance(); } @@ -73,7 +66,7 @@ struct miqt_array* QPluginLoader_StaticInstances() { } struct miqt_array* QPluginLoader_StaticPlugins() { - QVector _ret = QPluginLoader::staticPlugins(); + QList _ret = QPluginLoader::staticPlugins(); // Convert QList<> from C++ memory to manually-managed C memory QStaticPlugin** _arr = static_cast(malloc(sizeof(QStaticPlugin*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -139,20 +132,6 @@ struct miqt_string* QPluginLoader_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QPluginLoader_TrUtf82(const char* s, const char* c) { - QString _ret = QPluginLoader::trUtf8(s, c); - // 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* QPluginLoader_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QPluginLoader::trUtf8(s, c, static_cast(n)); - // 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 QPluginLoader_Delete(QPluginLoader* self) { delete self; } diff --git a/qt/gen_qpluginloader.go b/qt/gen_qpluginloader.go index 409e371..2b8a5f9 100644 --- a/qt/gen_qpluginloader.go +++ b/qt/gen_qpluginloader.go @@ -83,15 +83,6 @@ func QPluginLoader_Tr(s string) string { return _ret } -func QPluginLoader_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPluginLoader_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QPluginLoader) Instance() *QObject { return newQObject_U(unsafe.Pointer(C.QPluginLoader_Instance(this.h))) } @@ -119,10 +110,10 @@ func QPluginLoader_StaticPlugins() []QStaticPlugin { _ret := make([]QStaticPlugin, int(_ma.len)) _outCast := (*[0xffff]*C.QStaticPlugin)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _vv_ret := _outCast[i] - _vv_goptr := newQStaticPlugin(_vv_ret) - _vv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_vv_goptr + _lv_ret := _outCast[i] + _lv_goptr := newQStaticPlugin(_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 @@ -190,28 +181,6 @@ func QPluginLoader_Tr3(s string, c string, n int) string { return _ret } -func QPluginLoader_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPluginLoader_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QPluginLoader_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPluginLoader_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QPluginLoader) Delete() { C.QPluginLoader_Delete(this.h) diff --git a/qt/gen_qpluginloader.h b/qt/gen_qpluginloader.h index 4b8e3fc..3ad0515 100644 --- a/qt/gen_qpluginloader.h +++ b/qt/gen_qpluginloader.h @@ -34,7 +34,6 @@ QPluginLoader* QPluginLoader_new4(struct miqt_string* fileName, QObject* parent) QMetaObject* QPluginLoader_MetaObject(const QPluginLoader* self); void* QPluginLoader_Metacast(QPluginLoader* self, const char* param1); struct miqt_string* QPluginLoader_Tr(const char* s); -struct miqt_string* QPluginLoader_TrUtf8(const char* s); QObject* QPluginLoader_Instance(QPluginLoader* self); QJsonObject* QPluginLoader_MetaData(const QPluginLoader* self); struct miqt_array* QPluginLoader_StaticInstances(); @@ -49,8 +48,6 @@ void QPluginLoader_SetLoadHints(QPluginLoader* self, int loadHints); int QPluginLoader_LoadHints(const QPluginLoader* self); struct miqt_string* QPluginLoader_Tr2(const char* s, const char* c); struct miqt_string* QPluginLoader_Tr3(const char* s, const char* c, int n); -struct miqt_string* QPluginLoader_TrUtf82(const char* s, const char* c); -struct miqt_string* QPluginLoader_TrUtf83(const char* s, const char* c, int n); void QPluginLoader_Delete(QPluginLoader* self); #ifdef __cplusplus diff --git a/qt/gen_qpoint.cpp b/qt/gen_qpoint.cpp index 3ceaab5..5cab997 100644 --- a/qt/gen_qpoint.cpp +++ b/qt/gen_qpoint.cpp @@ -84,6 +84,10 @@ int QPoint_DotProduct(QPoint* p1, QPoint* p2) { return QPoint::dotProduct(*p1, *p2); } +QPointF* QPoint_ToPointF(const QPoint* self) { + return new QPointF(self->toPointF()); +} + void QPoint_Delete(QPoint* self) { delete self; } diff --git a/qt/gen_qpoint.go b/qt/gen_qpoint.go index 5696edf..1f6d756 100644 --- a/qt/gen_qpoint.go +++ b/qt/gen_qpoint.go @@ -112,6 +112,13 @@ func QPoint_DotProduct(p1 *QPoint, p2 *QPoint) int { return (int)(C.QPoint_DotProduct(p1.cPointer(), p2.cPointer())) } +func (this *QPoint) ToPointF() *QPointF { + _ret := C.QPoint_ToPointF(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + // Delete this object from C++ memory. func (this *QPoint) Delete() { C.QPoint_Delete(this.h) diff --git a/qt/gen_qpoint.h b/qt/gen_qpoint.h index 80e140b..cbce8d1 100644 --- a/qt/gen_qpoint.h +++ b/qt/gen_qpoint.h @@ -38,6 +38,7 @@ QPoint* QPoint_OperatorMultiplyAssignWithFactor(QPoint* self, double factor); QPoint* QPoint_OperatorMultiplyAssign2(QPoint* self, int factor); QPoint* QPoint_OperatorDivideAssign(QPoint* self, double divisor); int QPoint_DotProduct(QPoint* p1, QPoint* p2); +QPointF* QPoint_ToPointF(const QPoint* self); void QPoint_Delete(QPoint* self); QPointF* QPointF_new(); diff --git a/qt/gen_qpointingdevice.cpp b/qt/gen_qpointingdevice.cpp new file mode 100644 index 0000000..95150f0 --- /dev/null +++ b/qt/gen_qpointingdevice.cpp @@ -0,0 +1,161 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "qpointingdevice.h" +#include "gen_qpointingdevice.h" +#include "_cgo_export.h" + +QPointingDeviceUniqueId* QPointingDeviceUniqueId_new() { + return new QPointingDeviceUniqueId(); +} + +QPointingDeviceUniqueId* QPointingDeviceUniqueId_new2(QPointingDeviceUniqueId* param1) { + return new QPointingDeviceUniqueId(*param1); +} + +QPointingDeviceUniqueId* QPointingDeviceUniqueId_FromNumericId(long long id) { + return new QPointingDeviceUniqueId(QPointingDeviceUniqueId::fromNumericId(static_cast(id))); +} + +bool QPointingDeviceUniqueId_IsValid(const QPointingDeviceUniqueId* self) { + return self->isValid(); +} + +long long QPointingDeviceUniqueId_NumericId(const QPointingDeviceUniqueId* self) { + qint64 _ret = self->numericId(); + return static_cast(_ret); +} + +void QPointingDeviceUniqueId_Delete(QPointingDeviceUniqueId* self) { + delete self; +} + +QPointingDevice* QPointingDevice_new() { + return new QPointingDevice(); +} + +QPointingDevice* QPointingDevice_new2(struct miqt_string* name, long long systemId, int devType, int pType, int caps, int maxPoints, int buttonCount) { + QString name_QString = QString::fromUtf8(&name->data, name->len); + return new QPointingDevice(name_QString, static_cast(systemId), static_cast(devType), static_cast(pType), static_cast(caps), static_cast(maxPoints), static_cast(buttonCount)); +} + +QPointingDevice* QPointingDevice_new3(QObject* parent) { + return new QPointingDevice(parent); +} + +QPointingDevice* QPointingDevice_new4(struct miqt_string* name, long long systemId, int devType, int pType, int caps, int maxPoints, int buttonCount, struct miqt_string* seatName) { + QString name_QString = QString::fromUtf8(&name->data, name->len); + QString seatName_QString = QString::fromUtf8(&seatName->data, seatName->len); + return new QPointingDevice(name_QString, static_cast(systemId), static_cast(devType), static_cast(pType), static_cast(caps), static_cast(maxPoints), static_cast(buttonCount), seatName_QString); +} + +QPointingDevice* QPointingDevice_new5(struct miqt_string* name, long long systemId, int devType, int pType, int caps, int maxPoints, int buttonCount, struct miqt_string* seatName, QPointingDeviceUniqueId* uniqueId) { + QString name_QString = QString::fromUtf8(&name->data, name->len); + QString seatName_QString = QString::fromUtf8(&seatName->data, seatName->len); + return new QPointingDevice(name_QString, static_cast(systemId), static_cast(devType), static_cast(pType), static_cast(caps), static_cast(maxPoints), static_cast(buttonCount), seatName_QString, *uniqueId); +} + +QPointingDevice* QPointingDevice_new6(struct miqt_string* name, long long systemId, int devType, int pType, int caps, int maxPoints, int buttonCount, struct miqt_string* seatName, QPointingDeviceUniqueId* uniqueId, QObject* parent) { + QString name_QString = QString::fromUtf8(&name->data, name->len); + QString seatName_QString = QString::fromUtf8(&seatName->data, seatName->len); + return new QPointingDevice(name_QString, static_cast(systemId), static_cast(devType), static_cast(pType), static_cast(caps), static_cast(maxPoints), static_cast(buttonCount), seatName_QString, *uniqueId, parent); +} + +QMetaObject* QPointingDevice_MetaObject(const QPointingDevice* self) { + return (QMetaObject*) self->metaObject(); +} + +void* QPointingDevice_Metacast(QPointingDevice* self, const char* param1) { + return self->qt_metacast(param1); +} + +struct miqt_string* QPointingDevice_Tr(const char* s) { + QString _ret = QPointingDevice::tr(s); + // 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 QPointingDevice_SetType(QPointingDevice* self, int devType) { + self->setType(static_cast(devType)); +} + +void QPointingDevice_SetCapabilities(QPointingDevice* self, int caps) { + self->setCapabilities(static_cast(caps)); +} + +void QPointingDevice_SetMaximumTouchPoints(QPointingDevice* self, int c) { + self->setMaximumTouchPoints(static_cast(c)); +} + +int QPointingDevice_PointerType(const QPointingDevice* self) { + QPointingDevice::PointerType _ret = self->pointerType(); + return static_cast(_ret); +} + +int QPointingDevice_MaximumPoints(const QPointingDevice* self) { + return self->maximumPoints(); +} + +int QPointingDevice_ButtonCount(const QPointingDevice* self) { + return self->buttonCount(); +} + +QPointingDeviceUniqueId* QPointingDevice_UniqueId(const QPointingDevice* self) { + return new QPointingDeviceUniqueId(self->uniqueId()); +} + +QPointingDevice* QPointingDevice_PrimaryPointingDevice() { + return (QPointingDevice*) QPointingDevice::primaryPointingDevice(); +} + +bool QPointingDevice_OperatorEqual(const QPointingDevice* self, QPointingDevice* other) { + return self->operator==(*other); +} + +void QPointingDevice_GrabChanged(const QPointingDevice* self, QObject* grabber, int transition, QPointerEvent* event, QEventPoint* point) { + self->grabChanged(grabber, static_cast(transition), event, *point); +} + +void QPointingDevice_connect_GrabChanged(QPointingDevice* self, void* slot) { + QPointingDevice::connect(self, static_cast(&QPointingDevice::grabChanged), self, [=](QObject* grabber, QPointingDevice::GrabTransition transition, const QPointerEvent* event, const QEventPoint& point) { + QObject* sigval1 = grabber; + QPointingDevice::GrabTransition transition_ret = transition; + int sigval2 = static_cast(transition_ret); + QPointerEvent* sigval3 = (QPointerEvent*) event; + const QEventPoint& point_ret = point; + // Cast returned reference into pointer + QEventPoint* sigval4 = const_cast(&point_ret); + miqt_exec_callback_QPointingDevice_GrabChanged(slot, sigval1, sigval2, sigval3, sigval4); + }); +} + +struct miqt_string* QPointingDevice_Tr2(const char* s, const char* c) { + QString _ret = QPointingDevice::tr(s, c); + // 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* QPointingDevice_Tr3(const char* s, const char* c, int n) { + QString _ret = QPointingDevice::tr(s, c, static_cast(n)); + // 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()); +} + +QPointingDevice* QPointingDevice_PrimaryPointingDevice1(struct miqt_string* seatName) { + QString seatName_QString = QString::fromUtf8(&seatName->data, seatName->len); + return (QPointingDevice*) QPointingDevice::primaryPointingDevice(seatName_QString); +} + +void QPointingDevice_Delete(QPointingDevice* self) { + delete self; +} + diff --git a/qt/gen_qpointingdevice.go b/qt/gen_qpointingdevice.go new file mode 100644 index 0000000..85dacff --- /dev/null +++ b/qt/gen_qpointingdevice.go @@ -0,0 +1,299 @@ +package qt + +/* + +#include "gen_qpointingdevice.h" +#include + +*/ +import "C" + +import ( + "runtime" + "runtime/cgo" + "unsafe" +) + +type QPointingDevice__PointerType int + +const ( + QPointingDevice__Unknown QPointingDevice__PointerType = 0 + QPointingDevice__Generic QPointingDevice__PointerType = 1 + QPointingDevice__Finger QPointingDevice__PointerType = 2 + QPointingDevice__Pen QPointingDevice__PointerType = 4 + QPointingDevice__Eraser QPointingDevice__PointerType = 8 + QPointingDevice__Cursor QPointingDevice__PointerType = 16 + QPointingDevice__AllPointerTypes QPointingDevice__PointerType = 32767 +) + +type QPointingDevice__GrabTransition int + +const ( + QPointingDevice__GrabPassive QPointingDevice__GrabTransition = 1 + QPointingDevice__UngrabPassive QPointingDevice__GrabTransition = 2 + QPointingDevice__CancelGrabPassive QPointingDevice__GrabTransition = 3 + QPointingDevice__OverrideGrabPassive QPointingDevice__GrabTransition = 4 + QPointingDevice__GrabExclusive QPointingDevice__GrabTransition = 16 + QPointingDevice__UngrabExclusive QPointingDevice__GrabTransition = 32 + QPointingDevice__CancelGrabExclusive QPointingDevice__GrabTransition = 48 +) + +type QPointingDeviceUniqueId struct { + h *C.QPointingDeviceUniqueId +} + +func (this *QPointingDeviceUniqueId) cPointer() *C.QPointingDeviceUniqueId { + if this == nil { + return nil + } + return this.h +} + +func newQPointingDeviceUniqueId(h *C.QPointingDeviceUniqueId) *QPointingDeviceUniqueId { + if h == nil { + return nil + } + return &QPointingDeviceUniqueId{h: h} +} + +func newQPointingDeviceUniqueId_U(h unsafe.Pointer) *QPointingDeviceUniqueId { + return newQPointingDeviceUniqueId((*C.QPointingDeviceUniqueId)(h)) +} + +// NewQPointingDeviceUniqueId constructs a new QPointingDeviceUniqueId object. +func NewQPointingDeviceUniqueId() *QPointingDeviceUniqueId { + ret := C.QPointingDeviceUniqueId_new() + return newQPointingDeviceUniqueId(ret) +} + +// NewQPointingDeviceUniqueId2 constructs a new QPointingDeviceUniqueId object. +func NewQPointingDeviceUniqueId2(param1 *QPointingDeviceUniqueId) *QPointingDeviceUniqueId { + ret := C.QPointingDeviceUniqueId_new2(param1.cPointer()) + return newQPointingDeviceUniqueId(ret) +} + +func QPointingDeviceUniqueId_FromNumericId(id int64) *QPointingDeviceUniqueId { + _ret := C.QPointingDeviceUniqueId_FromNumericId((C.longlong)(id)) + _goptr := newQPointingDeviceUniqueId(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QPointingDeviceUniqueId) IsValid() bool { + return (bool)(C.QPointingDeviceUniqueId_IsValid(this.h)) +} + +func (this *QPointingDeviceUniqueId) NumericId() int64 { + return (int64)(C.QPointingDeviceUniqueId_NumericId(this.h)) +} + +// Delete this object from C++ memory. +func (this *QPointingDeviceUniqueId) Delete() { + C.QPointingDeviceUniqueId_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QPointingDeviceUniqueId) GoGC() { + runtime.SetFinalizer(this, func(this *QPointingDeviceUniqueId) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + +type QPointingDevice struct { + h *C.QPointingDevice + *QInputDevice +} + +func (this *QPointingDevice) cPointer() *C.QPointingDevice { + if this == nil { + return nil + } + return this.h +} + +func newQPointingDevice(h *C.QPointingDevice) *QPointingDevice { + if h == nil { + return nil + } + return &QPointingDevice{h: h, QInputDevice: newQInputDevice_U(unsafe.Pointer(h))} +} + +func newQPointingDevice_U(h unsafe.Pointer) *QPointingDevice { + return newQPointingDevice((*C.QPointingDevice)(h)) +} + +// NewQPointingDevice constructs a new QPointingDevice object. +func NewQPointingDevice() *QPointingDevice { + ret := C.QPointingDevice_new() + return newQPointingDevice(ret) +} + +// NewQPointingDevice2 constructs a new QPointingDevice object. +func NewQPointingDevice2(name string, systemId int64, devType QInputDevice__DeviceType, pType QPointingDevice__PointerType, caps QInputDevice__Capability, maxPoints int, buttonCount int) *QPointingDevice { + name_ms := miqt_strdupg(name) + defer C.free(name_ms) + ret := C.QPointingDevice_new2((*C.struct_miqt_string)(name_ms), (C.longlong)(systemId), (C.int)(devType), (C.int)(pType), (C.int)(caps), (C.int)(maxPoints), (C.int)(buttonCount)) + return newQPointingDevice(ret) +} + +// NewQPointingDevice3 constructs a new QPointingDevice object. +func NewQPointingDevice3(parent *QObject) *QPointingDevice { + ret := C.QPointingDevice_new3(parent.cPointer()) + return newQPointingDevice(ret) +} + +// NewQPointingDevice4 constructs a new QPointingDevice object. +func NewQPointingDevice4(name string, systemId int64, devType QInputDevice__DeviceType, pType QPointingDevice__PointerType, caps QInputDevice__Capability, maxPoints int, buttonCount int, seatName string) *QPointingDevice { + name_ms := miqt_strdupg(name) + defer C.free(name_ms) + seatName_ms := miqt_strdupg(seatName) + defer C.free(seatName_ms) + ret := C.QPointingDevice_new4((*C.struct_miqt_string)(name_ms), (C.longlong)(systemId), (C.int)(devType), (C.int)(pType), (C.int)(caps), (C.int)(maxPoints), (C.int)(buttonCount), (*C.struct_miqt_string)(seatName_ms)) + return newQPointingDevice(ret) +} + +// NewQPointingDevice5 constructs a new QPointingDevice object. +func NewQPointingDevice5(name string, systemId int64, devType QInputDevice__DeviceType, pType QPointingDevice__PointerType, caps QInputDevice__Capability, maxPoints int, buttonCount int, seatName string, uniqueId QPointingDeviceUniqueId) *QPointingDevice { + name_ms := miqt_strdupg(name) + defer C.free(name_ms) + seatName_ms := miqt_strdupg(seatName) + defer C.free(seatName_ms) + ret := C.QPointingDevice_new5((*C.struct_miqt_string)(name_ms), (C.longlong)(systemId), (C.int)(devType), (C.int)(pType), (C.int)(caps), (C.int)(maxPoints), (C.int)(buttonCount), (*C.struct_miqt_string)(seatName_ms), uniqueId.cPointer()) + return newQPointingDevice(ret) +} + +// NewQPointingDevice6 constructs a new QPointingDevice object. +func NewQPointingDevice6(name string, systemId int64, devType QInputDevice__DeviceType, pType QPointingDevice__PointerType, caps QInputDevice__Capability, maxPoints int, buttonCount int, seatName string, uniqueId QPointingDeviceUniqueId, parent *QObject) *QPointingDevice { + name_ms := miqt_strdupg(name) + defer C.free(name_ms) + seatName_ms := miqt_strdupg(seatName) + defer C.free(seatName_ms) + ret := C.QPointingDevice_new6((*C.struct_miqt_string)(name_ms), (C.longlong)(systemId), (C.int)(devType), (C.int)(pType), (C.int)(caps), (C.int)(maxPoints), (C.int)(buttonCount), (*C.struct_miqt_string)(seatName_ms), uniqueId.cPointer(), parent.cPointer()) + return newQPointingDevice(ret) +} + +func (this *QPointingDevice) MetaObject() *QMetaObject { + return newQMetaObject_U(unsafe.Pointer(C.QPointingDevice_MetaObject(this.h))) +} + +func (this *QPointingDevice) Metacast(param1 string) unsafe.Pointer { + param1_Cstring := C.CString(param1) + defer C.free(unsafe.Pointer(param1_Cstring)) + return C.QPointingDevice_Metacast(this.h, param1_Cstring) +} + +func QPointingDevice_Tr(s string) string { + s_Cstring := C.CString(s) + defer C.free(unsafe.Pointer(s_Cstring)) + var _ms *C.struct_miqt_string = C.QPointingDevice_Tr(s_Cstring) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + +func (this *QPointingDevice) SetType(devType QInputDevice__DeviceType) { + C.QPointingDevice_SetType(this.h, (C.int)(devType)) +} + +func (this *QPointingDevice) SetCapabilities(caps QInputDevice__Capability) { + C.QPointingDevice_SetCapabilities(this.h, (C.int)(caps)) +} + +func (this *QPointingDevice) SetMaximumTouchPoints(c int) { + C.QPointingDevice_SetMaximumTouchPoints(this.h, (C.int)(c)) +} + +func (this *QPointingDevice) PointerType() QPointingDevice__PointerType { + return (QPointingDevice__PointerType)(C.QPointingDevice_PointerType(this.h)) +} + +func (this *QPointingDevice) MaximumPoints() int { + return (int)(C.QPointingDevice_MaximumPoints(this.h)) +} + +func (this *QPointingDevice) ButtonCount() int { + return (int)(C.QPointingDevice_ButtonCount(this.h)) +} + +func (this *QPointingDevice) UniqueId() *QPointingDeviceUniqueId { + _ret := C.QPointingDevice_UniqueId(this.h) + _goptr := newQPointingDeviceUniqueId(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func QPointingDevice_PrimaryPointingDevice() *QPointingDevice { + return newQPointingDevice_U(unsafe.Pointer(C.QPointingDevice_PrimaryPointingDevice())) +} + +func (this *QPointingDevice) OperatorEqual(other *QPointingDevice) bool { + return (bool)(C.QPointingDevice_OperatorEqual(this.h, other.cPointer())) +} + +func (this *QPointingDevice) GrabChanged(grabber *QObject, transition QPointingDevice__GrabTransition, event *QPointerEvent, point *QEventPoint) { + C.QPointingDevice_GrabChanged(this.h, grabber.cPointer(), (C.int)(transition), event.cPointer(), point.cPointer()) +} +func (this *QPointingDevice) OnGrabChanged(slot func(grabber *QObject, transition QPointingDevice__GrabTransition, event *QPointerEvent, point *QEventPoint)) { + C.QPointingDevice_connect_GrabChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) +} + +//export miqt_exec_callback_QPointingDevice_GrabChanged +func miqt_exec_callback_QPointingDevice_GrabChanged(cb *C.void, grabber *C.QObject, transition C.int, event *C.QPointerEvent, point *C.QEventPoint) { + gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(grabber *QObject, transition QPointingDevice__GrabTransition, event *QPointerEvent, point *QEventPoint)) + if !ok { + panic("miqt: callback of non-callback type (heap corruption?)") + } + + // Convert all CABI parameters to Go parameters + slotval1 := newQObject_U(unsafe.Pointer(grabber)) + slotval2 := (QPointingDevice__GrabTransition)(transition) + + slotval3 := newQPointerEvent_U(unsafe.Pointer(event)) + slotval4 := newQEventPoint_U(unsafe.Pointer(point)) + + gofunc(slotval1, slotval2, slotval3, slotval4) +} + +func QPointingDevice_Tr2(s string, c string) string { + s_Cstring := C.CString(s) + defer C.free(unsafe.Pointer(s_Cstring)) + c_Cstring := C.CString(c) + defer C.free(unsafe.Pointer(c_Cstring)) + var _ms *C.struct_miqt_string = C.QPointingDevice_Tr2(s_Cstring, c_Cstring) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + +func QPointingDevice_Tr3(s string, c string, n int) string { + s_Cstring := C.CString(s) + defer C.free(unsafe.Pointer(s_Cstring)) + c_Cstring := C.CString(c) + defer C.free(unsafe.Pointer(c_Cstring)) + var _ms *C.struct_miqt_string = C.QPointingDevice_Tr3(s_Cstring, c_Cstring, (C.int)(n)) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + +func QPointingDevice_PrimaryPointingDevice1(seatName string) *QPointingDevice { + seatName_ms := miqt_strdupg(seatName) + defer C.free(seatName_ms) + return newQPointingDevice_U(unsafe.Pointer(C.QPointingDevice_PrimaryPointingDevice1((*C.struct_miqt_string)(seatName_ms)))) +} + +// Delete this object from C++ memory. +func (this *QPointingDevice) Delete() { + C.QPointingDevice_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QPointingDevice) GoGC() { + runtime.SetFinalizer(this, func(this *QPointingDevice) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} diff --git a/qt/gen_qpointingdevice.h b/qt/gen_qpointingdevice.h new file mode 100644 index 0000000..86add37 --- /dev/null +++ b/qt/gen_qpointingdevice.h @@ -0,0 +1,68 @@ +#ifndef GEN_QPOINTINGDEVICE_H +#define GEN_QPOINTINGDEVICE_H + +#include +#include +#include + +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + +#include "binding.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +class QEventPoint; +class QMetaObject; +class QObject; +class QPointerEvent; +class QPointingDevice; +class QPointingDeviceUniqueId; +#else +typedef struct QEventPoint QEventPoint; +typedef struct QMetaObject QMetaObject; +typedef struct QObject QObject; +typedef struct QPointerEvent QPointerEvent; +typedef struct QPointingDevice QPointingDevice; +typedef struct QPointingDeviceUniqueId QPointingDeviceUniqueId; +#endif + +QPointingDeviceUniqueId* QPointingDeviceUniqueId_new(); +QPointingDeviceUniqueId* QPointingDeviceUniqueId_new2(QPointingDeviceUniqueId* param1); +QPointingDeviceUniqueId* QPointingDeviceUniqueId_FromNumericId(long long id); +bool QPointingDeviceUniqueId_IsValid(const QPointingDeviceUniqueId* self); +long long QPointingDeviceUniqueId_NumericId(const QPointingDeviceUniqueId* self); +void QPointingDeviceUniqueId_Delete(QPointingDeviceUniqueId* self); + +QPointingDevice* QPointingDevice_new(); +QPointingDevice* QPointingDevice_new2(struct miqt_string* name, long long systemId, int devType, int pType, int caps, int maxPoints, int buttonCount); +QPointingDevice* QPointingDevice_new3(QObject* parent); +QPointingDevice* QPointingDevice_new4(struct miqt_string* name, long long systemId, int devType, int pType, int caps, int maxPoints, int buttonCount, struct miqt_string* seatName); +QPointingDevice* QPointingDevice_new5(struct miqt_string* name, long long systemId, int devType, int pType, int caps, int maxPoints, int buttonCount, struct miqt_string* seatName, QPointingDeviceUniqueId* uniqueId); +QPointingDevice* QPointingDevice_new6(struct miqt_string* name, long long systemId, int devType, int pType, int caps, int maxPoints, int buttonCount, struct miqt_string* seatName, QPointingDeviceUniqueId* uniqueId, QObject* parent); +QMetaObject* QPointingDevice_MetaObject(const QPointingDevice* self); +void* QPointingDevice_Metacast(QPointingDevice* self, const char* param1); +struct miqt_string* QPointingDevice_Tr(const char* s); +void QPointingDevice_SetType(QPointingDevice* self, int devType); +void QPointingDevice_SetCapabilities(QPointingDevice* self, int caps); +void QPointingDevice_SetMaximumTouchPoints(QPointingDevice* self, int c); +int QPointingDevice_PointerType(const QPointingDevice* self); +int QPointingDevice_MaximumPoints(const QPointingDevice* self); +int QPointingDevice_ButtonCount(const QPointingDevice* self); +QPointingDeviceUniqueId* QPointingDevice_UniqueId(const QPointingDevice* self); +QPointingDevice* QPointingDevice_PrimaryPointingDevice(); +bool QPointingDevice_OperatorEqual(const QPointingDevice* self, QPointingDevice* other); +void QPointingDevice_GrabChanged(const QPointingDevice* self, QObject* grabber, int transition, QPointerEvent* event, QEventPoint* point); +void QPointingDevice_connect_GrabChanged(QPointingDevice* self, void* slot); +struct miqt_string* QPointingDevice_Tr2(const char* s, const char* c); +struct miqt_string* QPointingDevice_Tr3(const char* s, const char* c, int n); +QPointingDevice* QPointingDevice_PrimaryPointingDevice1(struct miqt_string* seatName); +void QPointingDevice_Delete(QPointingDevice* self); + +#ifdef __cplusplus +} /* extern C */ +#endif + +#endif diff --git a/qt/gen_qprocess.cpp b/qt/gen_qprocess.cpp index bb18938..a9e5c2e 100644 --- a/qt/gen_qprocess.cpp +++ b/qt/gen_qprocess.cpp @@ -15,7 +15,11 @@ QProcessEnvironment* QProcessEnvironment_new() { return new QProcessEnvironment(); } -QProcessEnvironment* QProcessEnvironment_new2(QProcessEnvironment* other) { +QProcessEnvironment* QProcessEnvironment_new2(int param1) { + return new QProcessEnvironment(static_cast(param1)); +} + +QProcessEnvironment* QProcessEnvironment_new3(QProcessEnvironment* other) { return new QProcessEnvironment(*other); } @@ -39,6 +43,10 @@ bool QProcessEnvironment_IsEmpty(const QProcessEnvironment* self) { return self->isEmpty(); } +bool QProcessEnvironment_InheritsFromParent(const QProcessEnvironment* self) { + return self->inheritsFromParent(); +} + void QProcessEnvironment_Clear(QProcessEnvironment* self) { self->clear(); } @@ -143,34 +151,20 @@ struct miqt_string* QProcess_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QProcess_TrUtf8(const char* s) { - QString _ret = QProcess::trUtf8(s); - // 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 QProcess_Start(QProcess* self, struct miqt_string* program, struct miqt_array* /* of struct miqt_string* */ arguments) { +void QProcess_Start(QProcess* self, struct miqt_string* program) { QString program_QString = QString::fromUtf8(&program->data, program->len); - QList arguments_QList; - arguments_QList.reserve(arguments->len); - struct miqt_string** arguments_arr = static_cast(arguments->data); - for(size_t i = 0; i < arguments->len; ++i) { - QString arguments_arr_i_QString = QString::fromUtf8(&arguments_arr[i]->data, arguments_arr[i]->len); - arguments_QList.push_back(arguments_arr_i_QString); - } - self->start(program_QString, arguments_QList); -} - -void QProcess_StartWithCommand(QProcess* self, struct miqt_string* command) { - QString command_QString = QString::fromUtf8(&command->data, command->len); - self->start(command_QString); + self->start(program_QString); } void QProcess_Start2(QProcess* self) { self->start(); } +void QProcess_StartCommand(QProcess* self, struct miqt_string* command) { + QString command_QString = QString::fromUtf8(&command->data, command->len); + self->startCommand(command_QString); +} + bool QProcess_StartDetached(QProcess* self) { return self->startDetached(); } @@ -218,15 +212,6 @@ void QProcess_SetArguments(QProcess* self, struct miqt_array* /* of struct miqt_ self->setArguments(arguments_QList); } -int QProcess_ReadChannelMode(const QProcess* self) { - QProcess::ProcessChannelMode _ret = self->readChannelMode(); - return static_cast(_ret); -} - -void QProcess_SetReadChannelMode(QProcess* self, int mode) { - self->setReadChannelMode(static_cast(mode)); -} - int QProcess_ProcessChannelMode(const QProcess* self) { QProcess::ProcessChannelMode _ret = self->processChannelMode(); return static_cast(_ret); @@ -338,16 +323,6 @@ int QProcess_State(const QProcess* self) { return static_cast(_ret); } -long long QProcess_Pid(const QProcess* self) { -#ifdef Q_OS_LINUX - Q_PID _ret = self->pid(); - return static_cast(_ret); -#else - long long _ret_invalidOS; - return _ret_invalidOS; -#endif -} - long long QProcess_ProcessId(const QProcess* self) { qint64 _ret = self->processId(); return static_cast(_ret); @@ -386,11 +361,6 @@ int QProcess_ExitStatus(const QProcess* self) { return static_cast(_ret); } -long long QProcess_BytesAvailable(const QProcess* self) { - qint64 _ret = self->bytesAvailable(); - return static_cast(_ret); -} - long long QProcess_BytesToWrite(const QProcess* self) { qint64 _ret = self->bytesToWrite(); return static_cast(_ret); @@ -400,63 +370,18 @@ bool QProcess_IsSequential(const QProcess* self) { return self->isSequential(); } -bool QProcess_CanReadLine(const QProcess* self) { - return self->canReadLine(); -} - void QProcess_Close(QProcess* self) { self->close(); } -bool QProcess_AtEnd(const QProcess* self) { - return self->atEnd(); -} - -int QProcess_Execute(struct miqt_string* program, struct miqt_array* /* of struct miqt_string* */ arguments) { +int QProcess_Execute(struct miqt_string* program) { QString program_QString = QString::fromUtf8(&program->data, program->len); - QList arguments_QList; - arguments_QList.reserve(arguments->len); - struct miqt_string** arguments_arr = static_cast(arguments->data); - for(size_t i = 0; i < arguments->len; ++i) { - QString arguments_arr_i_QString = QString::fromUtf8(&arguments_arr[i]->data, arguments_arr[i]->len); - arguments_QList.push_back(arguments_arr_i_QString); - } - return QProcess::execute(program_QString, arguments_QList); + return QProcess::execute(program_QString); } -int QProcess_ExecuteWithCommand(struct miqt_string* command) { - QString command_QString = QString::fromUtf8(&command->data, command->len); - return QProcess::execute(command_QString); -} - -bool QProcess_StartDetached2(struct miqt_string* program, struct miqt_array* /* of struct miqt_string* */ arguments, struct miqt_string* workingDirectory) { +bool QProcess_StartDetachedWithProgram(struct miqt_string* program) { QString program_QString = QString::fromUtf8(&program->data, program->len); - QList arguments_QList; - arguments_QList.reserve(arguments->len); - struct miqt_string** arguments_arr = static_cast(arguments->data); - for(size_t i = 0; i < arguments->len; ++i) { - QString arguments_arr_i_QString = QString::fromUtf8(&arguments_arr[i]->data, arguments_arr[i]->len); - arguments_QList.push_back(arguments_arr_i_QString); - } - QString workingDirectory_QString = QString::fromUtf8(&workingDirectory->data, workingDirectory->len); - return QProcess::startDetached(program_QString, arguments_QList, workingDirectory_QString); -} - -bool QProcess_StartDetached3(struct miqt_string* program, struct miqt_array* /* of struct miqt_string* */ arguments) { - QString program_QString = QString::fromUtf8(&program->data, program->len); - QList arguments_QList; - arguments_QList.reserve(arguments->len); - struct miqt_string** arguments_arr = static_cast(arguments->data); - for(size_t i = 0; i < arguments->len; ++i) { - QString arguments_arr_i_QString = QString::fromUtf8(&arguments_arr[i]->data, arguments_arr[i]->len); - arguments_QList.push_back(arguments_arr_i_QString); - } - return QProcess::startDetached(program_QString, arguments_QList); -} - -bool QProcess_StartDetachedWithCommand(struct miqt_string* command) { - QString command_QString = QString::fromUtf8(&command->data, command->len); - return QProcess::startDetached(command_QString); + return QProcess::startDetached(program_QString); } struct miqt_array* QProcess_SystemEnvironment() { @@ -495,37 +420,12 @@ void QProcess_Finished(QProcess* self, int exitCode) { } void QProcess_connect_Finished(QProcess* self, void* slot) { - QProcess::connect(self, static_cast(&QProcess::finished), self, [=](int exitCode) { + QProcess::connect(self, static_cast(&QProcess::finished), self, [=](int exitCode) { int sigval1 = exitCode; miqt_exec_callback_QProcess_Finished(slot, sigval1); }); } -void QProcess_Finished2(QProcess* self, int exitCode, int exitStatus) { - self->finished(static_cast(exitCode), static_cast(exitStatus)); -} - -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; - int sigval2 = static_cast(exitStatus_ret); - miqt_exec_callback_QProcess_Finished2(slot, sigval1, sigval2); - }); -} - -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; - int sigval1 = static_cast(error_ret); - miqt_exec_callback_QProcess_ErrorWithError(slot, sigval1); - }); -} - void QProcess_ErrorOccurred(QProcess* self, int error) { self->errorOccurred(static_cast(error)); } @@ -552,18 +452,16 @@ struct miqt_string* QProcess_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QProcess_TrUtf82(const char* s, const char* c) { - QString _ret = QProcess::trUtf8(s, c); - // 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* QProcess_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QProcess::trUtf8(s, c, static_cast(n)); - // 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 QProcess_Start22(QProcess* self, struct miqt_string* program, struct miqt_array* /* of struct miqt_string* */ arguments) { + QString program_QString = QString::fromUtf8(&program->data, program->len); + QList arguments_QList; + arguments_QList.reserve(arguments->len); + struct miqt_string** arguments_arr = static_cast(arguments->data); + for(size_t i = 0; i < arguments->len; ++i) { + QString arguments_arr_i_QString = QString::fromUtf8(&arguments_arr[i]->data, arguments_arr[i]->len); + arguments_QList.push_back(arguments_arr_i_QString); + } + self->start(program_QString, arguments_QList); } void QProcess_Start3(QProcess* self, struct miqt_string* program, struct miqt_array* /* of struct miqt_string* */ arguments, int mode) { @@ -575,16 +473,16 @@ void QProcess_Start3(QProcess* self, struct miqt_string* program, struct miqt_ar QString arguments_arr_i_QString = QString::fromUtf8(&arguments_arr[i]->data, arguments_arr[i]->len); arguments_QList.push_back(arguments_arr_i_QString); } - self->start(program_QString, arguments_QList, static_cast(mode)); -} - -void QProcess_Start22(QProcess* self, struct miqt_string* command, int mode) { - QString command_QString = QString::fromUtf8(&command->data, command->len); - self->start(command_QString, static_cast(mode)); + self->start(program_QString, arguments_QList, static_cast(mode)); } void QProcess_Start1(QProcess* self, int mode) { - self->start(static_cast(mode)); + self->start(static_cast(mode)); +} + +void QProcess_StartCommand2(QProcess* self, struct miqt_string* command, int mode) { + QString command_QString = QString::fromUtf8(&command->data, command->len); + self->startCommand(command_QString, static_cast(mode)); } bool QProcess_StartDetached1(QProcess* self, long long* pid) { @@ -592,17 +490,17 @@ bool QProcess_StartDetached1(QProcess* self, long long* pid) { } bool QProcess_Open1(QProcess* self, int mode) { - return self->open(static_cast(mode)); + return self->open(static_cast(mode)); } void QProcess_SetStandardOutputFile2(QProcess* self, struct miqt_string* fileName, int mode) { QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); - self->setStandardOutputFile(fileName_QString, static_cast(mode)); + self->setStandardOutputFile(fileName_QString, static_cast(mode)); } void QProcess_SetStandardErrorFile2(QProcess* self, struct miqt_string* fileName, int mode) { QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); - self->setStandardErrorFile(fileName_QString, static_cast(mode)); + self->setStandardErrorFile(fileName_QString, static_cast(mode)); } bool QProcess_WaitForStarted1(QProcess* self, int msecs) { @@ -621,6 +519,43 @@ bool QProcess_WaitForFinished1(QProcess* self, int msecs) { return self->waitForFinished(static_cast(msecs)); } +int QProcess_Execute2(struct miqt_string* program, struct miqt_array* /* of struct miqt_string* */ arguments) { + QString program_QString = QString::fromUtf8(&program->data, program->len); + QList arguments_QList; + arguments_QList.reserve(arguments->len); + struct miqt_string** arguments_arr = static_cast(arguments->data); + for(size_t i = 0; i < arguments->len; ++i) { + QString arguments_arr_i_QString = QString::fromUtf8(&arguments_arr[i]->data, arguments_arr[i]->len); + arguments_QList.push_back(arguments_arr_i_QString); + } + return QProcess::execute(program_QString, arguments_QList); +} + +bool QProcess_StartDetached2(struct miqt_string* program, struct miqt_array* /* of struct miqt_string* */ arguments) { + QString program_QString = QString::fromUtf8(&program->data, program->len); + QList arguments_QList; + arguments_QList.reserve(arguments->len); + struct miqt_string** arguments_arr = static_cast(arguments->data); + for(size_t i = 0; i < arguments->len; ++i) { + QString arguments_arr_i_QString = QString::fromUtf8(&arguments_arr[i]->data, arguments_arr[i]->len); + arguments_QList.push_back(arguments_arr_i_QString); + } + return QProcess::startDetached(program_QString, arguments_QList); +} + +bool QProcess_StartDetached3(struct miqt_string* program, struct miqt_array* /* of struct miqt_string* */ arguments, struct miqt_string* workingDirectory) { + QString program_QString = QString::fromUtf8(&program->data, program->len); + QList arguments_QList; + arguments_QList.reserve(arguments->len); + struct miqt_string** arguments_arr = static_cast(arguments->data); + for(size_t i = 0; i < arguments->len; ++i) { + QString arguments_arr_i_QString = QString::fromUtf8(&arguments_arr[i]->data, arguments_arr[i]->len); + arguments_QList.push_back(arguments_arr_i_QString); + } + QString workingDirectory_QString = QString::fromUtf8(&workingDirectory->data, workingDirectory->len); + return QProcess::startDetached(program_QString, arguments_QList, workingDirectory_QString); +} + bool QProcess_StartDetached4(struct miqt_string* program, struct miqt_array* /* of struct miqt_string* */ arguments, struct miqt_string* workingDirectory, long long* pid) { QString program_QString = QString::fromUtf8(&program->data, program->len); QList arguments_QList; @@ -634,6 +569,19 @@ bool QProcess_StartDetached4(struct miqt_string* program, struct miqt_array* /* return QProcess::startDetached(program_QString, arguments_QList, workingDirectory_QString, static_cast(pid)); } +void QProcess_Finished2(QProcess* self, int exitCode, int exitStatus) { + self->finished(static_cast(exitCode), static_cast(exitStatus)); +} + +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; + int sigval2 = static_cast(exitStatus_ret); + miqt_exec_callback_QProcess_Finished2(slot, sigval1, sigval2); + }); +} + void QProcess_Delete(QProcess* self) { delete self; } diff --git a/qt/gen_qprocess.go b/qt/gen_qprocess.go index c350f46..5ef7b61 100644 --- a/qt/gen_qprocess.go +++ b/qt/gen_qprocess.go @@ -14,6 +14,12 @@ import ( "unsafe" ) +type QProcessEnvironment__Initialization int + +const ( + QProcessEnvironment__InheritFromParent QProcessEnvironment__Initialization = 0 +) + type QProcess__ProcessError int const ( @@ -93,8 +99,14 @@ func NewQProcessEnvironment() *QProcessEnvironment { } // NewQProcessEnvironment2 constructs a new QProcessEnvironment object. -func NewQProcessEnvironment2(other *QProcessEnvironment) *QProcessEnvironment { - ret := C.QProcessEnvironment_new2(other.cPointer()) +func NewQProcessEnvironment2(param1 QProcessEnvironment__Initialization) *QProcessEnvironment { + ret := C.QProcessEnvironment_new2((C.int)(param1)) + return newQProcessEnvironment(ret) +} + +// NewQProcessEnvironment3 constructs a new QProcessEnvironment object. +func NewQProcessEnvironment3(other *QProcessEnvironment) *QProcessEnvironment { + ret := C.QProcessEnvironment_new3(other.cPointer()) return newQProcessEnvironment(ret) } @@ -118,6 +130,10 @@ func (this *QProcessEnvironment) IsEmpty() bool { return (bool)(C.QProcessEnvironment_IsEmpty(this.h)) } +func (this *QProcessEnvironment) InheritsFromParent() bool { + return (bool)(C.QProcessEnvironment_InheritsFromParent(this.h)) +} + func (this *QProcessEnvironment) Clear() { C.QProcessEnvironment_Clear(this.h) } @@ -269,41 +285,22 @@ func QProcess_Tr(s string) string { return _ret } -func QProcess_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QProcess_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QProcess) Start(program string, arguments []string) { +func (this *QProcess) Start(program string) { program_ms := miqt_strdupg(program) defer C.free(program_ms) - // For the C ABI, malloc a C array of raw pointers - arguments_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(arguments)))) - defer C.free(unsafe.Pointer(arguments_CArray)) - for i := range arguments { - arguments_i_ms := miqt_strdupg(arguments[i]) - defer C.free(arguments_i_ms) - arguments_CArray[i] = (*C.struct_miqt_string)(arguments_i_ms) - } - 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_Start(this.h, (*C.struct_miqt_string)(program_ms), arguments_ma) -} - -func (this *QProcess) StartWithCommand(command string) { - command_ms := miqt_strdupg(command) - defer C.free(command_ms) - C.QProcess_StartWithCommand(this.h, (*C.struct_miqt_string)(command_ms)) + C.QProcess_Start(this.h, (*C.struct_miqt_string)(program_ms)) } func (this *QProcess) Start2() { C.QProcess_Start2(this.h) } +func (this *QProcess) StartCommand(command string) { + command_ms := miqt_strdupg(command) + defer C.free(command_ms) + C.QProcess_StartCommand(this.h, (*C.struct_miqt_string)(command_ms)) +} + func (this *QProcess) StartDetached() bool { return (bool)(C.QProcess_StartDetached(this.h)) } @@ -353,14 +350,6 @@ func (this *QProcess) SetArguments(arguments []string) { C.QProcess_SetArguments(this.h, arguments_ma) } -func (this *QProcess) ReadChannelMode() QProcess__ProcessChannelMode { - return (QProcess__ProcessChannelMode)(C.QProcess_ReadChannelMode(this.h)) -} - -func (this *QProcess) SetReadChannelMode(mode QProcess__ProcessChannelMode) { - C.QProcess_SetReadChannelMode(this.h, (C.int)(mode)) -} - func (this *QProcess) ProcessChannelMode() QProcess__ProcessChannelMode { return (QProcess__ProcessChannelMode)(C.QProcess_ProcessChannelMode(this.h)) } @@ -475,14 +464,6 @@ func (this *QProcess) State() QProcess__ProcessState { return (QProcess__ProcessState)(C.QProcess_State(this.h)) } -func (this *QProcess) Pid() int64 { - if runtime.GOOS != "linux" { - panic("Unsupported OS") - } - - return (int64)(C.QProcess_Pid(this.h)) -} - func (this *QProcess) ProcessId() int64 { return (int64)(C.QProcess_ProcessId(this.h)) } @@ -525,10 +506,6 @@ func (this *QProcess) ExitStatus() QProcess__ExitStatus { return (QProcess__ExitStatus)(C.QProcess_ExitStatus(this.h)) } -func (this *QProcess) BytesAvailable() int64 { - return (int64)(C.QProcess_BytesAvailable(this.h)) -} - func (this *QProcess) BytesToWrite() int64 { return (int64)(C.QProcess_BytesToWrite(this.h)) } @@ -537,78 +514,20 @@ func (this *QProcess) IsSequential() bool { return (bool)(C.QProcess_IsSequential(this.h)) } -func (this *QProcess) CanReadLine() bool { - return (bool)(C.QProcess_CanReadLine(this.h)) -} - func (this *QProcess) Close() { C.QProcess_Close(this.h) } -func (this *QProcess) AtEnd() bool { - return (bool)(C.QProcess_AtEnd(this.h)) -} - -func QProcess_Execute(program string, arguments []string) int { +func QProcess_Execute(program string) int { program_ms := miqt_strdupg(program) defer C.free(program_ms) - // For the C ABI, malloc a C array of raw pointers - arguments_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(arguments)))) - defer C.free(unsafe.Pointer(arguments_CArray)) - for i := range arguments { - arguments_i_ms := miqt_strdupg(arguments[i]) - defer C.free(arguments_i_ms) - arguments_CArray[i] = (*C.struct_miqt_string)(arguments_i_ms) - } - arguments_ma := &C.struct_miqt_array{len: C.size_t(len(arguments)), data: unsafe.Pointer(arguments_CArray)} - defer runtime.KeepAlive(unsafe.Pointer(arguments_ma)) - return (int)(C.QProcess_Execute((*C.struct_miqt_string)(program_ms), arguments_ma)) + return (int)(C.QProcess_Execute((*C.struct_miqt_string)(program_ms))) } -func QProcess_ExecuteWithCommand(command string) int { - command_ms := miqt_strdupg(command) - defer C.free(command_ms) - return (int)(C.QProcess_ExecuteWithCommand((*C.struct_miqt_string)(command_ms))) -} - -func QProcess_StartDetached2(program string, arguments []string, workingDirectory string) bool { +func QProcess_StartDetachedWithProgram(program string) bool { program_ms := miqt_strdupg(program) defer C.free(program_ms) - // For the C ABI, malloc a C array of raw pointers - arguments_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(arguments)))) - defer C.free(unsafe.Pointer(arguments_CArray)) - for i := range arguments { - arguments_i_ms := miqt_strdupg(arguments[i]) - defer C.free(arguments_i_ms) - arguments_CArray[i] = (*C.struct_miqt_string)(arguments_i_ms) - } - arguments_ma := &C.struct_miqt_array{len: C.size_t(len(arguments)), data: unsafe.Pointer(arguments_CArray)} - defer runtime.KeepAlive(unsafe.Pointer(arguments_ma)) - workingDirectory_ms := miqt_strdupg(workingDirectory) - defer C.free(workingDirectory_ms) - return (bool)(C.QProcess_StartDetached2((*C.struct_miqt_string)(program_ms), arguments_ma, (*C.struct_miqt_string)(workingDirectory_ms))) -} - -func QProcess_StartDetached3(program string, arguments []string) bool { - program_ms := miqt_strdupg(program) - defer C.free(program_ms) - // For the C ABI, malloc a C array of raw pointers - arguments_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(arguments)))) - defer C.free(unsafe.Pointer(arguments_CArray)) - for i := range arguments { - arguments_i_ms := miqt_strdupg(arguments[i]) - defer C.free(arguments_i_ms) - arguments_CArray[i] = (*C.struct_miqt_string)(arguments_i_ms) - } - arguments_ma := &C.struct_miqt_array{len: C.size_t(len(arguments)), data: unsafe.Pointer(arguments_CArray)} - defer runtime.KeepAlive(unsafe.Pointer(arguments_ma)) - return (bool)(C.QProcess_StartDetached3((*C.struct_miqt_string)(program_ms), arguments_ma)) -} - -func QProcess_StartDetachedWithCommand(command string) bool { - command_ms := miqt_strdupg(command) - defer C.free(command_ms) - return (bool)(C.QProcess_StartDetachedWithCommand((*C.struct_miqt_string)(command_ms))) + return (bool)(C.QProcess_StartDetachedWithProgram((*C.struct_miqt_string)(program_ms))) } func QProcess_SystemEnvironment() []string { @@ -660,48 +579,6 @@ func miqt_exec_callback_QProcess_Finished(cb *C.void, exitCode C.int) { gofunc(slotval1) } -func (this *QProcess) Finished2(exitCode int, exitStatus QProcess__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.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?)") - } - - // Convert all CABI parameters to Go parameters - slotval1 := (int)(exitCode) - - slotval2 := (QProcess__ExitStatus)(exitStatus) - - gofunc(slotval1, slotval2) -} - -func (this *QProcess) ErrorWithError(error QProcess__ProcessError) { - 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.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?)") - } - - // Convert all CABI parameters to Go parameters - slotval1 := (QProcess__ProcessError)(error) - - gofunc(slotval1) -} - func (this *QProcess) ErrorOccurred(error QProcess__ProcessError) { C.QProcess_ErrorOccurred(this.h, (C.int)(error)) } @@ -744,29 +621,23 @@ func QProcess_Tr3(s string, c string, n int) string { return _ret } -func QProcess_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QProcess_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret +func (this *QProcess) Start22(program string, arguments []string) { + program_ms := miqt_strdupg(program) + defer C.free(program_ms) + // For the C ABI, malloc a C array of raw pointers + arguments_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(arguments)))) + defer C.free(unsafe.Pointer(arguments_CArray)) + for i := range arguments { + arguments_i_ms := miqt_strdupg(arguments[i]) + defer C.free(arguments_i_ms) + arguments_CArray[i] = (*C.struct_miqt_string)(arguments_i_ms) + } + 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_Start22(this.h, (*C.struct_miqt_string)(program_ms), arguments_ma) } -func QProcess_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QProcess_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QProcess) Start3(program string, arguments []string, mode QIODevice__OpenModeFlag) { +func (this *QProcess) Start3(program string, arguments []string, mode QIODeviceBase__OpenModeFlag) { program_ms := miqt_strdupg(program) defer C.free(program_ms) // For the C ABI, malloc a C array of raw pointers @@ -782,31 +653,31 @@ func (this *QProcess) Start3(program string, arguments []string, mode QIODevice_ C.QProcess_Start3(this.h, (*C.struct_miqt_string)(program_ms), arguments_ma, (C.int)(mode)) } -func (this *QProcess) Start22(command string, mode QIODevice__OpenModeFlag) { - command_ms := miqt_strdupg(command) - defer C.free(command_ms) - C.QProcess_Start22(this.h, (*C.struct_miqt_string)(command_ms), (C.int)(mode)) +func (this *QProcess) Start1(mode QIODeviceBase__OpenModeFlag) { + C.QProcess_Start1(this.h, (C.int)(mode)) } -func (this *QProcess) Start1(mode QIODevice__OpenModeFlag) { - C.QProcess_Start1(this.h, (C.int)(mode)) +func (this *QProcess) StartCommand2(command string, mode QIODeviceBase__OpenModeFlag) { + command_ms := miqt_strdupg(command) + defer C.free(command_ms) + C.QProcess_StartCommand2(this.h, (*C.struct_miqt_string)(command_ms), (C.int)(mode)) } func (this *QProcess) StartDetached1(pid *int64) bool { return (bool)(C.QProcess_StartDetached1(this.h, (*C.longlong)(unsafe.Pointer(pid)))) } -func (this *QProcess) Open1(mode QIODevice__OpenModeFlag) bool { +func (this *QProcess) Open1(mode QIODeviceBase__OpenModeFlag) bool { return (bool)(C.QProcess_Open1(this.h, (C.int)(mode))) } -func (this *QProcess) SetStandardOutputFile2(fileName string, mode QIODevice__OpenModeFlag) { +func (this *QProcess) SetStandardOutputFile2(fileName string, mode QIODeviceBase__OpenModeFlag) { fileName_ms := miqt_strdupg(fileName) defer C.free(fileName_ms) C.QProcess_SetStandardOutputFile2(this.h, (*C.struct_miqt_string)(fileName_ms), (C.int)(mode)) } -func (this *QProcess) SetStandardErrorFile2(fileName string, mode QIODevice__OpenModeFlag) { +func (this *QProcess) SetStandardErrorFile2(fileName string, mode QIODeviceBase__OpenModeFlag) { fileName_ms := miqt_strdupg(fileName) defer C.free(fileName_ms) C.QProcess_SetStandardErrorFile2(this.h, (*C.struct_miqt_string)(fileName_ms), (C.int)(mode)) @@ -828,6 +699,56 @@ func (this *QProcess) WaitForFinished1(msecs int) bool { return (bool)(C.QProcess_WaitForFinished1(this.h, (C.int)(msecs))) } +func QProcess_Execute2(program string, arguments []string) int { + program_ms := miqt_strdupg(program) + defer C.free(program_ms) + // For the C ABI, malloc a C array of raw pointers + arguments_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(arguments)))) + defer C.free(unsafe.Pointer(arguments_CArray)) + for i := range arguments { + arguments_i_ms := miqt_strdupg(arguments[i]) + defer C.free(arguments_i_ms) + arguments_CArray[i] = (*C.struct_miqt_string)(arguments_i_ms) + } + arguments_ma := &C.struct_miqt_array{len: C.size_t(len(arguments)), data: unsafe.Pointer(arguments_CArray)} + defer runtime.KeepAlive(unsafe.Pointer(arguments_ma)) + return (int)(C.QProcess_Execute2((*C.struct_miqt_string)(program_ms), arguments_ma)) +} + +func QProcess_StartDetached2(program string, arguments []string) bool { + program_ms := miqt_strdupg(program) + defer C.free(program_ms) + // For the C ABI, malloc a C array of raw pointers + arguments_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(arguments)))) + defer C.free(unsafe.Pointer(arguments_CArray)) + for i := range arguments { + arguments_i_ms := miqt_strdupg(arguments[i]) + defer C.free(arguments_i_ms) + arguments_CArray[i] = (*C.struct_miqt_string)(arguments_i_ms) + } + arguments_ma := &C.struct_miqt_array{len: C.size_t(len(arguments)), data: unsafe.Pointer(arguments_CArray)} + defer runtime.KeepAlive(unsafe.Pointer(arguments_ma)) + return (bool)(C.QProcess_StartDetached2((*C.struct_miqt_string)(program_ms), arguments_ma)) +} + +func QProcess_StartDetached3(program string, arguments []string, workingDirectory string) bool { + program_ms := miqt_strdupg(program) + defer C.free(program_ms) + // For the C ABI, malloc a C array of raw pointers + arguments_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(arguments)))) + defer C.free(unsafe.Pointer(arguments_CArray)) + for i := range arguments { + arguments_i_ms := miqt_strdupg(arguments[i]) + defer C.free(arguments_i_ms) + arguments_CArray[i] = (*C.struct_miqt_string)(arguments_i_ms) + } + arguments_ma := &C.struct_miqt_array{len: C.size_t(len(arguments)), data: unsafe.Pointer(arguments_CArray)} + defer runtime.KeepAlive(unsafe.Pointer(arguments_ma)) + workingDirectory_ms := miqt_strdupg(workingDirectory) + defer C.free(workingDirectory_ms) + return (bool)(C.QProcess_StartDetached3((*C.struct_miqt_string)(program_ms), arguments_ma, (*C.struct_miqt_string)(workingDirectory_ms))) +} + func QProcess_StartDetached4(program string, arguments []string, workingDirectory string, pid *int64) bool { program_ms := miqt_strdupg(program) defer C.free(program_ms) @@ -846,6 +767,28 @@ func QProcess_StartDetached4(program string, arguments []string, workingDirector return (bool)(C.QProcess_StartDetached4((*C.struct_miqt_string)(program_ms), arguments_ma, (*C.struct_miqt_string)(workingDirectory_ms), (*C.longlong)(unsafe.Pointer(pid)))) } +func (this *QProcess) Finished2(exitCode int, exitStatus QProcess__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.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?)") + } + + // Convert all CABI parameters to Go parameters + slotval1 := (int)(exitCode) + + slotval2 := (QProcess__ExitStatus)(exitStatus) + + gofunc(slotval1, slotval2) +} + // Delete this object from C++ memory. func (this *QProcess) Delete() { C.QProcess_Delete(this.h) diff --git a/qt/gen_qprocess.h b/qt/gen_qprocess.h index d8da0ea..6425907 100644 --- a/qt/gen_qprocess.h +++ b/qt/gen_qprocess.h @@ -28,12 +28,14 @@ typedef struct QProcessEnvironment QProcessEnvironment; #endif QProcessEnvironment* QProcessEnvironment_new(); -QProcessEnvironment* QProcessEnvironment_new2(QProcessEnvironment* other); +QProcessEnvironment* QProcessEnvironment_new2(int param1); +QProcessEnvironment* QProcessEnvironment_new3(QProcessEnvironment* other); void QProcessEnvironment_OperatorAssign(QProcessEnvironment* self, QProcessEnvironment* other); void QProcessEnvironment_Swap(QProcessEnvironment* self, QProcessEnvironment* other); bool QProcessEnvironment_OperatorEqual(const QProcessEnvironment* self, QProcessEnvironment* other); bool QProcessEnvironment_OperatorNotEqual(const QProcessEnvironment* self, QProcessEnvironment* other); bool QProcessEnvironment_IsEmpty(const QProcessEnvironment* self); +bool QProcessEnvironment_InheritsFromParent(const QProcessEnvironment* self); void QProcessEnvironment_Clear(QProcessEnvironment* self); bool QProcessEnvironment_Contains(const QProcessEnvironment* self, struct miqt_string* name); void QProcessEnvironment_Insert(QProcessEnvironment* self, struct miqt_string* name, struct miqt_string* value); @@ -51,18 +53,15 @@ QProcess* QProcess_new2(QObject* parent); QMetaObject* QProcess_MetaObject(const QProcess* self); void* QProcess_Metacast(QProcess* self, const char* param1); struct miqt_string* QProcess_Tr(const char* s); -struct miqt_string* QProcess_TrUtf8(const char* s); -void QProcess_Start(QProcess* self, struct miqt_string* program, struct miqt_array* /* of struct miqt_string* */ arguments); -void QProcess_StartWithCommand(QProcess* self, struct miqt_string* command); +void QProcess_Start(QProcess* self, struct miqt_string* program); void QProcess_Start2(QProcess* self); +void QProcess_StartCommand(QProcess* self, struct miqt_string* command); bool QProcess_StartDetached(QProcess* self); bool QProcess_Open(QProcess* self); 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); -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); @@ -83,7 +82,6 @@ void QProcess_SetProcessEnvironment(QProcess* self, QProcessEnvironment* environ QProcessEnvironment* QProcess_ProcessEnvironment(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); @@ -93,36 +91,25 @@ QByteArray* QProcess_ReadAllStandardOutput(QProcess* self); QByteArray* QProcess_ReadAllStandardError(QProcess* self); int QProcess_ExitCode(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); -bool QProcess_CanReadLine(const QProcess* self); void QProcess_Close(QProcess* self); -bool QProcess_AtEnd(const QProcess* self); -int QProcess_Execute(struct miqt_string* program, struct miqt_array* /* of struct miqt_string* */ arguments); -int QProcess_ExecuteWithCommand(struct miqt_string* command); -bool QProcess_StartDetached2(struct miqt_string* program, struct miqt_array* /* of struct miqt_string* */ arguments, struct miqt_string* workingDirectory); -bool QProcess_StartDetached3(struct miqt_string* program, struct miqt_array* /* of struct miqt_string* */ arguments); -bool QProcess_StartDetachedWithCommand(struct miqt_string* command); +int QProcess_Execute(struct miqt_string* program); +bool QProcess_StartDetachedWithProgram(struct miqt_string* program); struct miqt_array* QProcess_SystemEnvironment(); struct miqt_string* QProcess_NullDevice(); 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, int exitStatus); -void QProcess_connect_Finished2(QProcess* self, void* slot); -void QProcess_ErrorWithError(QProcess* self, int error); -void QProcess_connect_ErrorWithError(QProcess* self, void* slot); 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); -struct miqt_string* QProcess_TrUtf82(const char* s, const char* c); -struct miqt_string* QProcess_TrUtf83(const char* s, const char* c, int n); +void QProcess_Start22(QProcess* self, struct miqt_string* program, struct miqt_array* /* of struct miqt_string* */ arguments); void QProcess_Start3(QProcess* self, struct miqt_string* program, struct miqt_array* /* of struct miqt_string* */ arguments, int mode); -void QProcess_Start22(QProcess* self, struct miqt_string* command, int mode); void QProcess_Start1(QProcess* self, int mode); +void QProcess_StartCommand2(QProcess* self, struct miqt_string* command, int mode); bool QProcess_StartDetached1(QProcess* self, long long* pid); bool QProcess_Open1(QProcess* self, int mode); void QProcess_SetStandardOutputFile2(QProcess* self, struct miqt_string* fileName, int mode); @@ -131,7 +118,12 @@ bool QProcess_WaitForStarted1(QProcess* self, int msecs); bool QProcess_WaitForReadyRead1(QProcess* self, int msecs); bool QProcess_WaitForBytesWritten1(QProcess* self, int msecs); bool QProcess_WaitForFinished1(QProcess* self, int msecs); +int QProcess_Execute2(struct miqt_string* program, struct miqt_array* /* of struct miqt_string* */ arguments); +bool QProcess_StartDetached2(struct miqt_string* program, struct miqt_array* /* of struct miqt_string* */ arguments); +bool QProcess_StartDetached3(struct miqt_string* program, struct miqt_array* /* of struct miqt_string* */ arguments, struct miqt_string* workingDirectory); bool QProcess_StartDetached4(struct miqt_string* program, struct miqt_array* /* of struct miqt_string* */ arguments, struct miqt_string* workingDirectory, long long* pid); +void QProcess_Finished2(QProcess* self, int exitCode, int exitStatus); +void QProcess_connect_Finished2(QProcess* self, void* slot); void QProcess_Delete(QProcess* self); #ifdef __cplusplus diff --git a/qt/gen_qprogressbar.cpp b/qt/gen_qprogressbar.cpp index 9c5f5d3..71b747a 100644 --- a/qt/gen_qprogressbar.cpp +++ b/qt/gen_qprogressbar.cpp @@ -32,13 +32,6 @@ struct miqt_string* QProgressBar_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QProgressBar_TrUtf8(const char* s) { - QString _ret = QProgressBar::trUtf8(s); - // 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()); -} - int QProgressBar_Minimum(const QProgressBar* self) { return self->minimum(); } @@ -170,20 +163,6 @@ struct miqt_string* QProgressBar_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QProgressBar_TrUtf82(const char* s, const char* c) { - QString _ret = QProgressBar::trUtf8(s, c); - // 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* QProgressBar_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QProgressBar::trUtf8(s, c, static_cast(n)); - // 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 QProgressBar_Delete(QProgressBar* self) { delete self; } diff --git a/qt/gen_qprogressbar.go b/qt/gen_qprogressbar.go index c826b12..6694661 100644 --- a/qt/gen_qprogressbar.go +++ b/qt/gen_qprogressbar.go @@ -75,15 +75,6 @@ func QProgressBar_Tr(s string) string { return _ret } -func QProgressBar_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QProgressBar_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QProgressBar) Minimum() int { return (int)(C.QProgressBar_Minimum(this.h)) } @@ -236,28 +227,6 @@ func QProgressBar_Tr3(s string, c string, n int) string { return _ret } -func QProgressBar_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QProgressBar_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QProgressBar_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QProgressBar_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QProgressBar) Delete() { C.QProgressBar_Delete(this.h) diff --git a/qt/gen_qprogressbar.h b/qt/gen_qprogressbar.h index d1c643f..c0b4691 100644 --- a/qt/gen_qprogressbar.h +++ b/qt/gen_qprogressbar.h @@ -30,7 +30,6 @@ QProgressBar* QProgressBar_new2(QWidget* parent); QMetaObject* QProgressBar_MetaObject(const QProgressBar* self); void* QProgressBar_Metacast(QProgressBar* self, const char* param1); struct miqt_string* QProgressBar_Tr(const char* s); -struct miqt_string* QProgressBar_TrUtf8(const char* s); int QProgressBar_Minimum(const QProgressBar* self); int QProgressBar_Maximum(const QProgressBar* self); int QProgressBar_Value(const QProgressBar* self); @@ -59,8 +58,6 @@ 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); struct miqt_string* QProgressBar_Tr3(const char* s, const char* c, int n); -struct miqt_string* QProgressBar_TrUtf82(const char* s, const char* c); -struct miqt_string* QProgressBar_TrUtf83(const char* s, const char* c, int n); void QProgressBar_Delete(QProgressBar* self); #ifdef __cplusplus diff --git a/qt/gen_qprogressdialog.cpp b/qt/gen_qprogressdialog.cpp index 663b3f1..7cdb637 100644 --- a/qt/gen_qprogressdialog.cpp +++ b/qt/gen_qprogressdialog.cpp @@ -57,13 +57,6 @@ struct miqt_string* QProgressDialog_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QProgressDialog_TrUtf8(const char* s) { - QString _ret = QProgressDialog::trUtf8(s); - // 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 QProgressDialog_SetLabel(QProgressDialog* self, QLabel* label) { self->setLabel(label); } @@ -185,20 +178,6 @@ struct miqt_string* QProgressDialog_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QProgressDialog_TrUtf82(const char* s, const char* c) { - QString _ret = QProgressDialog::trUtf8(s, c); - // 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* QProgressDialog_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QProgressDialog::trUtf8(s, c, static_cast(n)); - // 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 QProgressDialog_Delete(QProgressDialog* self) { delete self; } diff --git a/qt/gen_qprogressdialog.go b/qt/gen_qprogressdialog.go index 8a59178..c2fa471 100644 --- a/qt/gen_qprogressdialog.go +++ b/qt/gen_qprogressdialog.go @@ -104,15 +104,6 @@ func QProgressDialog_Tr(s string) string { return _ret } -func QProgressDialog_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QProgressDialog_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QProgressDialog) SetLabel(label *QLabel) { C.QProgressDialog_SetLabel(this.h, label.cPointer()) } @@ -254,28 +245,6 @@ func QProgressDialog_Tr3(s string, c string, n int) string { return _ret } -func QProgressDialog_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QProgressDialog_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QProgressDialog_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QProgressDialog_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QProgressDialog) Delete() { C.QProgressDialog_Delete(this.h) diff --git a/qt/gen_qprogressdialog.h b/qt/gen_qprogressdialog.h index b71517e..4e143cc 100644 --- a/qt/gen_qprogressdialog.h +++ b/qt/gen_qprogressdialog.h @@ -40,7 +40,6 @@ QProgressDialog* QProgressDialog_new6(struct miqt_string* labelText, struct miqt QMetaObject* QProgressDialog_MetaObject(const QProgressDialog* self); void* QProgressDialog_Metacast(QProgressDialog* self, const char* param1); struct miqt_string* QProgressDialog_Tr(const char* s); -struct miqt_string* QProgressDialog_TrUtf8(const char* s); void QProgressDialog_SetLabel(QProgressDialog* self, QLabel* label); void QProgressDialog_SetCancelButton(QProgressDialog* self, QPushButton* button); void QProgressDialog_SetBar(QProgressDialog* self, QProgressBar* bar); @@ -68,8 +67,6 @@ void QProgressDialog_Canceled(QProgressDialog* self); void QProgressDialog_connect_Canceled(QProgressDialog* self, void* slot); struct miqt_string* QProgressDialog_Tr2(const char* s, const char* c); struct miqt_string* QProgressDialog_Tr3(const char* s, const char* c, int n); -struct miqt_string* QProgressDialog_TrUtf82(const char* s, const char* c); -struct miqt_string* QProgressDialog_TrUtf83(const char* s, const char* c, int n); void QProgressDialog_Delete(QProgressDialog* self); #ifdef __cplusplus diff --git a/qt/gen_qproperty.cpp b/qt/gen_qproperty.cpp new file mode 100644 index 0000000..64d3d18 --- /dev/null +++ b/qt/gen_qproperty.cpp @@ -0,0 +1,185 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#define WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__QBindableInterface +#include "qproperty.h" +#include "gen_qproperty.h" +#include "_cgo_export.h" + +QPropertyBindingSourceLocation* QPropertyBindingSourceLocation_new() { + return new QPropertyBindingSourceLocation(); +} + +QPropertyBindingSourceLocation* QPropertyBindingSourceLocation_new2(QPropertyBindingSourceLocation* param1) { + return new QPropertyBindingSourceLocation(*param1); +} + +void QPropertyBindingSourceLocation_Delete(QPropertyBindingSourceLocation* self) { + delete self; +} + +QPropertyBindingError* QPropertyBindingError_new() { + return new QPropertyBindingError(); +} + +QPropertyBindingError* QPropertyBindingError_new2(int typeVal) { + return new QPropertyBindingError(static_cast(typeVal)); +} + +QPropertyBindingError* QPropertyBindingError_new3(QPropertyBindingError* other) { + return new QPropertyBindingError(*other); +} + +QPropertyBindingError* QPropertyBindingError_new4(int typeVal, struct miqt_string* description) { + QString description_QString = QString::fromUtf8(&description->data, description->len); + return new QPropertyBindingError(static_cast(typeVal), description_QString); +} + +void QPropertyBindingError_OperatorAssign(QPropertyBindingError* self, QPropertyBindingError* other) { + self->operator=(*other); +} + +bool QPropertyBindingError_HasError(const QPropertyBindingError* self) { + return self->hasError(); +} + +int QPropertyBindingError_Type(const QPropertyBindingError* self) { + QPropertyBindingError::Type _ret = self->type(); + return static_cast(_ret); +} + +struct miqt_string* QPropertyBindingError_Description(const QPropertyBindingError* self) { + QString _ret = self->description(); + // 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 QPropertyBindingError_Delete(QPropertyBindingError* self) { + delete self; +} + +QUntypedPropertyBinding* QUntypedPropertyBinding_new() { + return new QUntypedPropertyBinding(); +} + +QUntypedPropertyBinding* QUntypedPropertyBinding_new2(QUntypedPropertyBinding* other) { + return new QUntypedPropertyBinding(*other); +} + +void QUntypedPropertyBinding_OperatorAssign(QUntypedPropertyBinding* self, QUntypedPropertyBinding* other) { + self->operator=(*other); +} + +bool QUntypedPropertyBinding_IsNull(const QUntypedPropertyBinding* self) { + return self->isNull(); +} + +QPropertyBindingError* QUntypedPropertyBinding_Error(const QUntypedPropertyBinding* self) { + return new QPropertyBindingError(self->error()); +} + +QMetaType* QUntypedPropertyBinding_ValueMetaType(const QUntypedPropertyBinding* self) { + return new QMetaType(self->valueMetaType()); +} + +void QUntypedPropertyBinding_Delete(QUntypedPropertyBinding* self) { + delete self; +} + +QPropertyObserverBase* QPropertyObserverBase_new() { + return new QPropertyObserverBase(); +} + +QPropertyObserverBase* QPropertyObserverBase_new2(QPropertyObserverBase* param1) { + return new QPropertyObserverBase(*param1); +} + +void QPropertyObserverBase_Delete(QPropertyObserverBase* self) { + delete self; +} + +QPropertyObserver* QPropertyObserver_new() { + return new QPropertyObserver(); +} + +void QPropertyObserver_Delete(QPropertyObserver* self) { + delete self; +} + +QPropertyNotifier* QPropertyNotifier_new() { + return new QPropertyNotifier(); +} + +void QPropertyNotifier_Delete(QPropertyNotifier* self) { + delete self; +} + +void QtPrivate__QBindableInterface_Delete(QtPrivate__QBindableInterface* self) { + delete self; +} + +QUntypedBindable* QUntypedBindable_new() { + return new QUntypedBindable(); +} + +QUntypedBindable* QUntypedBindable_new2(QUntypedBindable* param1) { + return new QUntypedBindable(*param1); +} + +bool QUntypedBindable_IsValid(const QUntypedBindable* self) { + return self->isValid(); +} + +bool QUntypedBindable_IsBindable(const QUntypedBindable* self) { + return self->isBindable(); +} + +bool QUntypedBindable_IsReadOnly(const QUntypedBindable* self) { + return self->isReadOnly(); +} + +QUntypedPropertyBinding* QUntypedBindable_MakeBinding(const QUntypedBindable* self) { + return new QUntypedPropertyBinding(self->makeBinding()); +} + +QUntypedPropertyBinding* QUntypedBindable_TakeBinding(QUntypedBindable* self) { + return new QUntypedPropertyBinding(self->takeBinding()); +} + +void QUntypedBindable_Observe(const QUntypedBindable* self, QPropertyObserver* observer) { + self->observe(observer); +} + +QUntypedPropertyBinding* QUntypedBindable_Binding(const QUntypedBindable* self) { + return new QUntypedPropertyBinding(self->binding()); +} + +bool QUntypedBindable_SetBinding(QUntypedBindable* self, QUntypedPropertyBinding* binding) { + return self->setBinding(*binding); +} + +bool QUntypedBindable_HasBinding(const QUntypedBindable* self) { + return self->hasBinding(); +} + +QMetaType* QUntypedBindable_MetaType(const QUntypedBindable* self) { + return new QMetaType(self->metaType()); +} + +QUntypedPropertyBinding* QUntypedBindable_MakeBinding1(const QUntypedBindable* self, QPropertyBindingSourceLocation* location) { + return new QUntypedPropertyBinding(self->makeBinding(*location)); +} + +void QUntypedBindable_Delete(QUntypedBindable* self) { + delete self; +} + diff --git a/qt/gen_qproperty.go b/qt/gen_qproperty.go new file mode 100644 index 0000000..0034502 --- /dev/null +++ b/qt/gen_qproperty.go @@ -0,0 +1,516 @@ +package qt + +/* + +#include "gen_qproperty.h" +#include + +*/ +import "C" + +import ( + "runtime" + "unsafe" +) + +type BindableWarnings__Reason int + +const ( + BindableWarnings__InvalidInterface BindableWarnings__Reason = 0 + BindableWarnings__NonBindableInterface BindableWarnings__Reason = 1 + BindableWarnings__ReadOnlyInterface BindableWarnings__Reason = 2 +) + +type QPropertyBindingError__Type int + +const ( + QPropertyBindingError__NoError QPropertyBindingError__Type = 0 + QPropertyBindingError__BindingLoop QPropertyBindingError__Type = 1 + QPropertyBindingError__EvaluationError QPropertyBindingError__Type = 2 + QPropertyBindingError__UnknownError QPropertyBindingError__Type = 3 +) + +type QPropertyObserverBase__ObserverTag int + +const ( + QPropertyObserverBase__ObserverNotifiesBinding QPropertyObserverBase__ObserverTag = 0 + QPropertyObserverBase__ObserverNotifiesChangeHandler QPropertyObserverBase__ObserverTag = 1 + QPropertyObserverBase__ObserverIsPlaceholder QPropertyObserverBase__ObserverTag = 2 + QPropertyObserverBase__ObserverIsAlias QPropertyObserverBase__ObserverTag = 3 +) + +type QPropertyBindingSourceLocation struct { + h *C.QPropertyBindingSourceLocation +} + +func (this *QPropertyBindingSourceLocation) cPointer() *C.QPropertyBindingSourceLocation { + if this == nil { + return nil + } + return this.h +} + +func newQPropertyBindingSourceLocation(h *C.QPropertyBindingSourceLocation) *QPropertyBindingSourceLocation { + if h == nil { + return nil + } + return &QPropertyBindingSourceLocation{h: h} +} + +func newQPropertyBindingSourceLocation_U(h unsafe.Pointer) *QPropertyBindingSourceLocation { + return newQPropertyBindingSourceLocation((*C.QPropertyBindingSourceLocation)(h)) +} + +// NewQPropertyBindingSourceLocation constructs a new QPropertyBindingSourceLocation object. +func NewQPropertyBindingSourceLocation() *QPropertyBindingSourceLocation { + ret := C.QPropertyBindingSourceLocation_new() + return newQPropertyBindingSourceLocation(ret) +} + +// NewQPropertyBindingSourceLocation2 constructs a new QPropertyBindingSourceLocation object. +func NewQPropertyBindingSourceLocation2(param1 *QPropertyBindingSourceLocation) *QPropertyBindingSourceLocation { + ret := C.QPropertyBindingSourceLocation_new2(param1.cPointer()) + return newQPropertyBindingSourceLocation(ret) +} + +// Delete this object from C++ memory. +func (this *QPropertyBindingSourceLocation) Delete() { + C.QPropertyBindingSourceLocation_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QPropertyBindingSourceLocation) GoGC() { + runtime.SetFinalizer(this, func(this *QPropertyBindingSourceLocation) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + +type QPropertyBindingError struct { + h *C.QPropertyBindingError +} + +func (this *QPropertyBindingError) cPointer() *C.QPropertyBindingError { + if this == nil { + return nil + } + return this.h +} + +func newQPropertyBindingError(h *C.QPropertyBindingError) *QPropertyBindingError { + if h == nil { + return nil + } + return &QPropertyBindingError{h: h} +} + +func newQPropertyBindingError_U(h unsafe.Pointer) *QPropertyBindingError { + return newQPropertyBindingError((*C.QPropertyBindingError)(h)) +} + +// NewQPropertyBindingError constructs a new QPropertyBindingError object. +func NewQPropertyBindingError() *QPropertyBindingError { + ret := C.QPropertyBindingError_new() + return newQPropertyBindingError(ret) +} + +// NewQPropertyBindingError2 constructs a new QPropertyBindingError object. +func NewQPropertyBindingError2(typeVal QPropertyBindingError__Type) *QPropertyBindingError { + ret := C.QPropertyBindingError_new2((C.int)(typeVal)) + return newQPropertyBindingError(ret) +} + +// NewQPropertyBindingError3 constructs a new QPropertyBindingError object. +func NewQPropertyBindingError3(other *QPropertyBindingError) *QPropertyBindingError { + ret := C.QPropertyBindingError_new3(other.cPointer()) + return newQPropertyBindingError(ret) +} + +// NewQPropertyBindingError4 constructs a new QPropertyBindingError object. +func NewQPropertyBindingError4(typeVal QPropertyBindingError__Type, description string) *QPropertyBindingError { + description_ms := miqt_strdupg(description) + defer C.free(description_ms) + ret := C.QPropertyBindingError_new4((C.int)(typeVal), (*C.struct_miqt_string)(description_ms)) + return newQPropertyBindingError(ret) +} + +func (this *QPropertyBindingError) OperatorAssign(other *QPropertyBindingError) { + C.QPropertyBindingError_OperatorAssign(this.h, other.cPointer()) +} + +func (this *QPropertyBindingError) HasError() bool { + return (bool)(C.QPropertyBindingError_HasError(this.h)) +} + +func (this *QPropertyBindingError) Type() QPropertyBindingError__Type { + return (QPropertyBindingError__Type)(C.QPropertyBindingError_Type(this.h)) +} + +func (this *QPropertyBindingError) Description() string { + var _ms *C.struct_miqt_string = C.QPropertyBindingError_Description(this.h) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + +// Delete this object from C++ memory. +func (this *QPropertyBindingError) Delete() { + C.QPropertyBindingError_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QPropertyBindingError) GoGC() { + runtime.SetFinalizer(this, func(this *QPropertyBindingError) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + +type QUntypedPropertyBinding struct { + h *C.QUntypedPropertyBinding +} + +func (this *QUntypedPropertyBinding) cPointer() *C.QUntypedPropertyBinding { + if this == nil { + return nil + } + return this.h +} + +func newQUntypedPropertyBinding(h *C.QUntypedPropertyBinding) *QUntypedPropertyBinding { + if h == nil { + return nil + } + return &QUntypedPropertyBinding{h: h} +} + +func newQUntypedPropertyBinding_U(h unsafe.Pointer) *QUntypedPropertyBinding { + return newQUntypedPropertyBinding((*C.QUntypedPropertyBinding)(h)) +} + +// NewQUntypedPropertyBinding constructs a new QUntypedPropertyBinding object. +func NewQUntypedPropertyBinding() *QUntypedPropertyBinding { + ret := C.QUntypedPropertyBinding_new() + return newQUntypedPropertyBinding(ret) +} + +// NewQUntypedPropertyBinding2 constructs a new QUntypedPropertyBinding object. +func NewQUntypedPropertyBinding2(other *QUntypedPropertyBinding) *QUntypedPropertyBinding { + ret := C.QUntypedPropertyBinding_new2(other.cPointer()) + return newQUntypedPropertyBinding(ret) +} + +func (this *QUntypedPropertyBinding) OperatorAssign(other *QUntypedPropertyBinding) { + C.QUntypedPropertyBinding_OperatorAssign(this.h, other.cPointer()) +} + +func (this *QUntypedPropertyBinding) IsNull() bool { + return (bool)(C.QUntypedPropertyBinding_IsNull(this.h)) +} + +func (this *QUntypedPropertyBinding) Error() *QPropertyBindingError { + _ret := C.QUntypedPropertyBinding_Error(this.h) + _goptr := newQPropertyBindingError(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QUntypedPropertyBinding) ValueMetaType() *QMetaType { + _ret := C.QUntypedPropertyBinding_ValueMetaType(this.h) + _goptr := newQMetaType(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +// Delete this object from C++ memory. +func (this *QUntypedPropertyBinding) Delete() { + C.QUntypedPropertyBinding_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QUntypedPropertyBinding) GoGC() { + runtime.SetFinalizer(this, func(this *QUntypedPropertyBinding) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + +type QPropertyObserverBase struct { + h *C.QPropertyObserverBase +} + +func (this *QPropertyObserverBase) cPointer() *C.QPropertyObserverBase { + if this == nil { + return nil + } + return this.h +} + +func newQPropertyObserverBase(h *C.QPropertyObserverBase) *QPropertyObserverBase { + if h == nil { + return nil + } + return &QPropertyObserverBase{h: h} +} + +func newQPropertyObserverBase_U(h unsafe.Pointer) *QPropertyObserverBase { + return newQPropertyObserverBase((*C.QPropertyObserverBase)(h)) +} + +// NewQPropertyObserverBase constructs a new QPropertyObserverBase object. +func NewQPropertyObserverBase() *QPropertyObserverBase { + ret := C.QPropertyObserverBase_new() + return newQPropertyObserverBase(ret) +} + +// NewQPropertyObserverBase2 constructs a new QPropertyObserverBase object. +func NewQPropertyObserverBase2(param1 *QPropertyObserverBase) *QPropertyObserverBase { + ret := C.QPropertyObserverBase_new2(param1.cPointer()) + return newQPropertyObserverBase(ret) +} + +// Delete this object from C++ memory. +func (this *QPropertyObserverBase) Delete() { + C.QPropertyObserverBase_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QPropertyObserverBase) GoGC() { + runtime.SetFinalizer(this, func(this *QPropertyObserverBase) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + +type QPropertyObserver struct { + h *C.QPropertyObserver + *QPropertyObserverBase +} + +func (this *QPropertyObserver) cPointer() *C.QPropertyObserver { + if this == nil { + return nil + } + return this.h +} + +func newQPropertyObserver(h *C.QPropertyObserver) *QPropertyObserver { + if h == nil { + return nil + } + return &QPropertyObserver{h: h, QPropertyObserverBase: newQPropertyObserverBase_U(unsafe.Pointer(h))} +} + +func newQPropertyObserver_U(h unsafe.Pointer) *QPropertyObserver { + return newQPropertyObserver((*C.QPropertyObserver)(h)) +} + +// NewQPropertyObserver constructs a new QPropertyObserver object. +func NewQPropertyObserver() *QPropertyObserver { + ret := C.QPropertyObserver_new() + return newQPropertyObserver(ret) +} + +// Delete this object from C++ memory. +func (this *QPropertyObserver) Delete() { + C.QPropertyObserver_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QPropertyObserver) GoGC() { + runtime.SetFinalizer(this, func(this *QPropertyObserver) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + +type QPropertyNotifier struct { + h *C.QPropertyNotifier + *QPropertyObserver +} + +func (this *QPropertyNotifier) cPointer() *C.QPropertyNotifier { + if this == nil { + return nil + } + return this.h +} + +func newQPropertyNotifier(h *C.QPropertyNotifier) *QPropertyNotifier { + if h == nil { + return nil + } + return &QPropertyNotifier{h: h, QPropertyObserver: newQPropertyObserver_U(unsafe.Pointer(h))} +} + +func newQPropertyNotifier_U(h unsafe.Pointer) *QPropertyNotifier { + return newQPropertyNotifier((*C.QPropertyNotifier)(h)) +} + +// NewQPropertyNotifier constructs a new QPropertyNotifier object. +func NewQPropertyNotifier() *QPropertyNotifier { + ret := C.QPropertyNotifier_new() + return newQPropertyNotifier(ret) +} + +// Delete this object from C++ memory. +func (this *QPropertyNotifier) Delete() { + C.QPropertyNotifier_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QPropertyNotifier) GoGC() { + runtime.SetFinalizer(this, func(this *QPropertyNotifier) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + +type QtPrivate__QBindableInterface struct { + h *C.QtPrivate__QBindableInterface +} + +func (this *QtPrivate__QBindableInterface) cPointer() *C.QtPrivate__QBindableInterface { + if this == nil { + return nil + } + return this.h +} + +func newQtPrivate__QBindableInterface(h *C.QtPrivate__QBindableInterface) *QtPrivate__QBindableInterface { + if h == nil { + return nil + } + return &QtPrivate__QBindableInterface{h: h} +} + +func newQtPrivate__QBindableInterface_U(h unsafe.Pointer) *QtPrivate__QBindableInterface { + return newQtPrivate__QBindableInterface((*C.QtPrivate__QBindableInterface)(h)) +} + +// Delete this object from C++ memory. +func (this *QtPrivate__QBindableInterface) Delete() { + C.QtPrivate__QBindableInterface_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QtPrivate__QBindableInterface) GoGC() { + runtime.SetFinalizer(this, func(this *QtPrivate__QBindableInterface) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + +type QUntypedBindable struct { + h *C.QUntypedBindable +} + +func (this *QUntypedBindable) cPointer() *C.QUntypedBindable { + if this == nil { + return nil + } + return this.h +} + +func newQUntypedBindable(h *C.QUntypedBindable) *QUntypedBindable { + if h == nil { + return nil + } + return &QUntypedBindable{h: h} +} + +func newQUntypedBindable_U(h unsafe.Pointer) *QUntypedBindable { + return newQUntypedBindable((*C.QUntypedBindable)(h)) +} + +// NewQUntypedBindable constructs a new QUntypedBindable object. +func NewQUntypedBindable() *QUntypedBindable { + ret := C.QUntypedBindable_new() + return newQUntypedBindable(ret) +} + +// NewQUntypedBindable2 constructs a new QUntypedBindable object. +func NewQUntypedBindable2(param1 *QUntypedBindable) *QUntypedBindable { + ret := C.QUntypedBindable_new2(param1.cPointer()) + return newQUntypedBindable(ret) +} + +func (this *QUntypedBindable) IsValid() bool { + return (bool)(C.QUntypedBindable_IsValid(this.h)) +} + +func (this *QUntypedBindable) IsBindable() bool { + return (bool)(C.QUntypedBindable_IsBindable(this.h)) +} + +func (this *QUntypedBindable) IsReadOnly() bool { + return (bool)(C.QUntypedBindable_IsReadOnly(this.h)) +} + +func (this *QUntypedBindable) MakeBinding() *QUntypedPropertyBinding { + _ret := C.QUntypedBindable_MakeBinding(this.h) + _goptr := newQUntypedPropertyBinding(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QUntypedBindable) TakeBinding() *QUntypedPropertyBinding { + _ret := C.QUntypedBindable_TakeBinding(this.h) + _goptr := newQUntypedPropertyBinding(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QUntypedBindable) Observe(observer *QPropertyObserver) { + C.QUntypedBindable_Observe(this.h, observer.cPointer()) +} + +func (this *QUntypedBindable) Binding() *QUntypedPropertyBinding { + _ret := C.QUntypedBindable_Binding(this.h) + _goptr := newQUntypedPropertyBinding(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QUntypedBindable) SetBinding(binding *QUntypedPropertyBinding) bool { + return (bool)(C.QUntypedBindable_SetBinding(this.h, binding.cPointer())) +} + +func (this *QUntypedBindable) HasBinding() bool { + return (bool)(C.QUntypedBindable_HasBinding(this.h)) +} + +func (this *QUntypedBindable) MetaType() *QMetaType { + _ret := C.QUntypedBindable_MetaType(this.h) + _goptr := newQMetaType(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QUntypedBindable) MakeBinding1(location *QPropertyBindingSourceLocation) *QUntypedPropertyBinding { + _ret := C.QUntypedBindable_MakeBinding1(this.h, location.cPointer()) + _goptr := newQUntypedPropertyBinding(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +// Delete this object from C++ memory. +func (this *QUntypedBindable) Delete() { + C.QUntypedBindable_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QUntypedBindable) GoGC() { + runtime.SetFinalizer(this, func(this *QUntypedBindable) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} diff --git a/qt/gen_qproperty.h b/qt/gen_qproperty.h new file mode 100644 index 0000000..412abb7 --- /dev/null +++ b/qt/gen_qproperty.h @@ -0,0 +1,95 @@ +#ifndef GEN_QPROPERTY_H +#define GEN_QPROPERTY_H + +#include +#include +#include + +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + +#include "binding.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +class QMetaType; +class QPropertyBindingError; +class QPropertyBindingSourceLocation; +class QPropertyNotifier; +class QPropertyObserver; +class QPropertyObserverBase; +class QUntypedBindable; +class QUntypedPropertyBinding; +#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__QBindableInterface) +typedef QtPrivate::QBindableInterface QtPrivate__QBindableInterface; +#else +class QtPrivate__QBindableInterface; +#endif +#else +typedef struct QMetaType QMetaType; +typedef struct QPropertyBindingError QPropertyBindingError; +typedef struct QPropertyBindingSourceLocation QPropertyBindingSourceLocation; +typedef struct QPropertyNotifier QPropertyNotifier; +typedef struct QPropertyObserver QPropertyObserver; +typedef struct QPropertyObserverBase QPropertyObserverBase; +typedef struct QUntypedBindable QUntypedBindable; +typedef struct QUntypedPropertyBinding QUntypedPropertyBinding; +typedef struct QtPrivate__QBindableInterface QtPrivate__QBindableInterface; +#endif + +QPropertyBindingSourceLocation* QPropertyBindingSourceLocation_new(); +QPropertyBindingSourceLocation* QPropertyBindingSourceLocation_new2(QPropertyBindingSourceLocation* param1); +void QPropertyBindingSourceLocation_Delete(QPropertyBindingSourceLocation* self); + +QPropertyBindingError* QPropertyBindingError_new(); +QPropertyBindingError* QPropertyBindingError_new2(int typeVal); +QPropertyBindingError* QPropertyBindingError_new3(QPropertyBindingError* other); +QPropertyBindingError* QPropertyBindingError_new4(int typeVal, struct miqt_string* description); +void QPropertyBindingError_OperatorAssign(QPropertyBindingError* self, QPropertyBindingError* other); +bool QPropertyBindingError_HasError(const QPropertyBindingError* self); +int QPropertyBindingError_Type(const QPropertyBindingError* self); +struct miqt_string* QPropertyBindingError_Description(const QPropertyBindingError* self); +void QPropertyBindingError_Delete(QPropertyBindingError* self); + +QUntypedPropertyBinding* QUntypedPropertyBinding_new(); +QUntypedPropertyBinding* QUntypedPropertyBinding_new2(QUntypedPropertyBinding* other); +void QUntypedPropertyBinding_OperatorAssign(QUntypedPropertyBinding* self, QUntypedPropertyBinding* other); +bool QUntypedPropertyBinding_IsNull(const QUntypedPropertyBinding* self); +QPropertyBindingError* QUntypedPropertyBinding_Error(const QUntypedPropertyBinding* self); +QMetaType* QUntypedPropertyBinding_ValueMetaType(const QUntypedPropertyBinding* self); +void QUntypedPropertyBinding_Delete(QUntypedPropertyBinding* self); + +QPropertyObserverBase* QPropertyObserverBase_new(); +QPropertyObserverBase* QPropertyObserverBase_new2(QPropertyObserverBase* param1); +void QPropertyObserverBase_Delete(QPropertyObserverBase* self); + +QPropertyObserver* QPropertyObserver_new(); +void QPropertyObserver_Delete(QPropertyObserver* self); + +QPropertyNotifier* QPropertyNotifier_new(); +void QPropertyNotifier_Delete(QPropertyNotifier* self); + +void QtPrivate__QBindableInterface_Delete(QtPrivate__QBindableInterface* self); + +QUntypedBindable* QUntypedBindable_new(); +QUntypedBindable* QUntypedBindable_new2(QUntypedBindable* param1); +bool QUntypedBindable_IsValid(const QUntypedBindable* self); +bool QUntypedBindable_IsBindable(const QUntypedBindable* self); +bool QUntypedBindable_IsReadOnly(const QUntypedBindable* self); +QUntypedPropertyBinding* QUntypedBindable_MakeBinding(const QUntypedBindable* self); +QUntypedPropertyBinding* QUntypedBindable_TakeBinding(QUntypedBindable* self); +void QUntypedBindable_Observe(const QUntypedBindable* self, QPropertyObserver* observer); +QUntypedPropertyBinding* QUntypedBindable_Binding(const QUntypedBindable* self); +bool QUntypedBindable_SetBinding(QUntypedBindable* self, QUntypedPropertyBinding* binding); +bool QUntypedBindable_HasBinding(const QUntypedBindable* self); +QMetaType* QUntypedBindable_MetaType(const QUntypedBindable* self); +QUntypedPropertyBinding* QUntypedBindable_MakeBinding1(const QUntypedBindable* self, QPropertyBindingSourceLocation* location); +void QUntypedBindable_Delete(QUntypedBindable* self); + +#ifdef __cplusplus +} /* extern C */ +#endif + +#endif diff --git a/qt/gen_qpropertyanimation.cpp b/qt/gen_qpropertyanimation.cpp index 49a7825..ae8892c 100644 --- a/qt/gen_qpropertyanimation.cpp +++ b/qt/gen_qpropertyanimation.cpp @@ -40,13 +40,6 @@ struct miqt_string* QPropertyAnimation_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QPropertyAnimation_TrUtf8(const char* s) { - QString _ret = QPropertyAnimation::trUtf8(s); - // 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()); -} - QObject* QPropertyAnimation_TargetObject(const QPropertyAnimation* self) { return self->targetObject(); } @@ -77,20 +70,6 @@ struct miqt_string* QPropertyAnimation_Tr3(const char* s, const char* c, int n) return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QPropertyAnimation_TrUtf82(const char* s, const char* c) { - QString _ret = QPropertyAnimation::trUtf8(s, c); - // 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* QPropertyAnimation_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QPropertyAnimation::trUtf8(s, c, static_cast(n)); - // 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 QPropertyAnimation_Delete(QPropertyAnimation* self) { delete self; } diff --git a/qt/gen_qpropertyanimation.go b/qt/gen_qpropertyanimation.go index 03fc7db..92481b3 100644 --- a/qt/gen_qpropertyanimation.go +++ b/qt/gen_qpropertyanimation.go @@ -79,15 +79,6 @@ func QPropertyAnimation_Tr(s string) string { return _ret } -func QPropertyAnimation_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPropertyAnimation_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QPropertyAnimation) TargetObject() *QObject { return newQObject_U(unsafe.Pointer(C.QPropertyAnimation_TargetObject(this.h))) } @@ -129,28 +120,6 @@ func QPropertyAnimation_Tr3(s string, c string, n int) string { return _ret } -func QPropertyAnimation_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPropertyAnimation_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QPropertyAnimation_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPropertyAnimation_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QPropertyAnimation) Delete() { C.QPropertyAnimation_Delete(this.h) diff --git a/qt/gen_qpropertyanimation.h b/qt/gen_qpropertyanimation.h index c4d1aed..0ff9ea3 100644 --- a/qt/gen_qpropertyanimation.h +++ b/qt/gen_qpropertyanimation.h @@ -32,15 +32,12 @@ QPropertyAnimation* QPropertyAnimation_new4(QObject* target, QByteArray* propert QMetaObject* QPropertyAnimation_MetaObject(const QPropertyAnimation* self); void* QPropertyAnimation_Metacast(QPropertyAnimation* self, const char* param1); struct miqt_string* QPropertyAnimation_Tr(const char* s); -struct miqt_string* QPropertyAnimation_TrUtf8(const char* s); QObject* QPropertyAnimation_TargetObject(const QPropertyAnimation* self); void QPropertyAnimation_SetTargetObject(QPropertyAnimation* self, QObject* target); QByteArray* QPropertyAnimation_PropertyName(const QPropertyAnimation* self); void QPropertyAnimation_SetPropertyName(QPropertyAnimation* self, QByteArray* propertyName); struct miqt_string* QPropertyAnimation_Tr2(const char* s, const char* c); struct miqt_string* QPropertyAnimation_Tr3(const char* s, const char* c, int n); -struct miqt_string* QPropertyAnimation_TrUtf82(const char* s, const char* c); -struct miqt_string* QPropertyAnimation_TrUtf83(const char* s, const char* c, int n); void QPropertyAnimation_Delete(QPropertyAnimation* self); #ifdef __cplusplus diff --git a/qt/gen_qpropertyprivate.cpp b/qt/gen_qpropertyprivate.cpp new file mode 100644 index 0000000..79b2fad --- /dev/null +++ b/qt/gen_qpropertyprivate.cpp @@ -0,0 +1,90 @@ +#include +#include +#include +#include +#define WORKAROUND_INNER_CLASS_DEFINITION_QUntypedPropertyData__InheritsQUntypedPropertyData +#define WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__BindingFunctionVTable +#define WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__MSVCWorkAround +#define WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__QPropertyBindingData +#define WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__QPropertyBindingFunction +#define WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__RefCounted +#include "qpropertyprivate.h" +#include "gen_qpropertyprivate.h" +#include "_cgo_export.h" + +void QtPrivate__RefCounted_AddRef(QtPrivate__RefCounted* self) { + self->addRef(); +} + +bool QtPrivate__RefCounted_Deref(QtPrivate__RefCounted* self) { + return self->deref(); +} + +void QtPrivate__RefCounted_Delete(QtPrivate__RefCounted* self) { + delete self; +} + +void QUntypedPropertyData_Delete(QUntypedPropertyData* self) { + delete self; +} + +void QPropertyProxyBindingData_Delete(QPropertyProxyBindingData* self) { + delete self; +} + +void QtPrivate__MSVCWorkAround_Delete(QtPrivate__MSVCWorkAround* self) { + delete self; +} + +void QtPrivate__BindingFunctionVTable_Delete(QtPrivate__BindingFunctionVTable* self) { + delete self; +} + +void QtPrivate__QPropertyBindingFunction_Delete(QtPrivate__QPropertyBindingFunction* self) { + delete self; +} + +QtPrivate__QPropertyBindingData* QtPrivate__QPropertyBindingData_new() { + return new QtPrivate::QPropertyBindingData(); +} + +bool QtPrivate__QPropertyBindingData_HasBinding(const QtPrivate__QPropertyBindingData* self) { + return self->hasBinding(); +} + +bool QtPrivate__QPropertyBindingData_IsNotificationDelayed(const QtPrivate__QPropertyBindingData* self) { + return self->isNotificationDelayed(); +} + +QUntypedPropertyBinding* QtPrivate__QPropertyBindingData_SetBinding(QtPrivate__QPropertyBindingData* self, QUntypedPropertyBinding* newBinding, QUntypedPropertyData* propertyDataPtr) { + return new QUntypedPropertyBinding(self->setBinding(*newBinding, propertyDataPtr)); +} + +void QtPrivate__QPropertyBindingData_EvaluateIfDirty(const QtPrivate__QPropertyBindingData* self, QUntypedPropertyData* param1) { + self->evaluateIfDirty(param1); +} + +void QtPrivate__QPropertyBindingData_RemoveBinding(QtPrivate__QPropertyBindingData* self) { + self->removeBinding(); +} + +void QtPrivate__QPropertyBindingData_RegisterWithCurrentlyEvaluatingBinding2(const QtPrivate__QPropertyBindingData* self) { + self->registerWithCurrentlyEvaluatingBinding(); +} + +void QtPrivate__QPropertyBindingData_NotifyObservers(const QtPrivate__QPropertyBindingData* self, QUntypedPropertyData* propertyDataPtr) { + self->notifyObservers(propertyDataPtr); +} + +void QtPrivate__QPropertyBindingData_NotifyObservers2(const QtPrivate__QPropertyBindingData* self, QUntypedPropertyData* propertyDataPtr, QBindingStorage* storage) { + self->notifyObservers(propertyDataPtr, storage); +} + +void QtPrivate__QPropertyBindingData_Delete(QtPrivate__QPropertyBindingData* self) { + delete self; +} + +void QUntypedPropertyData__InheritsQUntypedPropertyData_Delete(QUntypedPropertyData__InheritsQUntypedPropertyData* self) { + delete self; +} + diff --git a/qt/gen_qpropertyprivate.go b/qt/gen_qpropertyprivate.go new file mode 100644 index 0000000..ba2de68 --- /dev/null +++ b/qt/gen_qpropertyprivate.go @@ -0,0 +1,351 @@ +package qt + +/* + +#include "gen_qpropertyprivate.h" +#include + +*/ +import "C" + +import ( + "runtime" + "unsafe" +) + +type QtPrivate__RefCounted struct { + h *C.QtPrivate__RefCounted +} + +func (this *QtPrivate__RefCounted) cPointer() *C.QtPrivate__RefCounted { + if this == nil { + return nil + } + return this.h +} + +func newQtPrivate__RefCounted(h *C.QtPrivate__RefCounted) *QtPrivate__RefCounted { + if h == nil { + return nil + } + return &QtPrivate__RefCounted{h: h} +} + +func newQtPrivate__RefCounted_U(h unsafe.Pointer) *QtPrivate__RefCounted { + return newQtPrivate__RefCounted((*C.QtPrivate__RefCounted)(h)) +} + +func (this *QtPrivate__RefCounted) AddRef() { + C.QtPrivate__RefCounted_AddRef(this.h) +} + +func (this *QtPrivate__RefCounted) Deref() bool { + return (bool)(C.QtPrivate__RefCounted_Deref(this.h)) +} + +// Delete this object from C++ memory. +func (this *QtPrivate__RefCounted) Delete() { + C.QtPrivate__RefCounted_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QtPrivate__RefCounted) GoGC() { + runtime.SetFinalizer(this, func(this *QtPrivate__RefCounted) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + +type QUntypedPropertyData struct { + h *C.QUntypedPropertyData +} + +func (this *QUntypedPropertyData) cPointer() *C.QUntypedPropertyData { + if this == nil { + return nil + } + return this.h +} + +func newQUntypedPropertyData(h *C.QUntypedPropertyData) *QUntypedPropertyData { + if h == nil { + return nil + } + return &QUntypedPropertyData{h: h} +} + +func newQUntypedPropertyData_U(h unsafe.Pointer) *QUntypedPropertyData { + return newQUntypedPropertyData((*C.QUntypedPropertyData)(h)) +} + +// Delete this object from C++ memory. +func (this *QUntypedPropertyData) Delete() { + C.QUntypedPropertyData_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QUntypedPropertyData) GoGC() { + runtime.SetFinalizer(this, func(this *QUntypedPropertyData) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + +type QPropertyProxyBindingData struct { + h *C.QPropertyProxyBindingData +} + +func (this *QPropertyProxyBindingData) cPointer() *C.QPropertyProxyBindingData { + if this == nil { + return nil + } + return this.h +} + +func newQPropertyProxyBindingData(h *C.QPropertyProxyBindingData) *QPropertyProxyBindingData { + if h == nil { + return nil + } + return &QPropertyProxyBindingData{h: h} +} + +func newQPropertyProxyBindingData_U(h unsafe.Pointer) *QPropertyProxyBindingData { + return newQPropertyProxyBindingData((*C.QPropertyProxyBindingData)(h)) +} + +// Delete this object from C++ memory. +func (this *QPropertyProxyBindingData) Delete() { + C.QPropertyProxyBindingData_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QPropertyProxyBindingData) GoGC() { + runtime.SetFinalizer(this, func(this *QPropertyProxyBindingData) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + +type QtPrivate__MSVCWorkAround struct { + h *C.QtPrivate__MSVCWorkAround +} + +func (this *QtPrivate__MSVCWorkAround) cPointer() *C.QtPrivate__MSVCWorkAround { + if this == nil { + return nil + } + return this.h +} + +func newQtPrivate__MSVCWorkAround(h *C.QtPrivate__MSVCWorkAround) *QtPrivate__MSVCWorkAround { + if h == nil { + return nil + } + return &QtPrivate__MSVCWorkAround{h: h} +} + +func newQtPrivate__MSVCWorkAround_U(h unsafe.Pointer) *QtPrivate__MSVCWorkAround { + return newQtPrivate__MSVCWorkAround((*C.QtPrivate__MSVCWorkAround)(h)) +} + +// Delete this object from C++ memory. +func (this *QtPrivate__MSVCWorkAround) Delete() { + C.QtPrivate__MSVCWorkAround_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QtPrivate__MSVCWorkAround) GoGC() { + runtime.SetFinalizer(this, func(this *QtPrivate__MSVCWorkAround) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + +type QtPrivate__BindingFunctionVTable struct { + h *C.QtPrivate__BindingFunctionVTable +} + +func (this *QtPrivate__BindingFunctionVTable) cPointer() *C.QtPrivate__BindingFunctionVTable { + if this == nil { + return nil + } + return this.h +} + +func newQtPrivate__BindingFunctionVTable(h *C.QtPrivate__BindingFunctionVTable) *QtPrivate__BindingFunctionVTable { + if h == nil { + return nil + } + return &QtPrivate__BindingFunctionVTable{h: h} +} + +func newQtPrivate__BindingFunctionVTable_U(h unsafe.Pointer) *QtPrivate__BindingFunctionVTable { + return newQtPrivate__BindingFunctionVTable((*C.QtPrivate__BindingFunctionVTable)(h)) +} + +// Delete this object from C++ memory. +func (this *QtPrivate__BindingFunctionVTable) Delete() { + C.QtPrivate__BindingFunctionVTable_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QtPrivate__BindingFunctionVTable) GoGC() { + runtime.SetFinalizer(this, func(this *QtPrivate__BindingFunctionVTable) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + +type QtPrivate__QPropertyBindingFunction struct { + h *C.QtPrivate__QPropertyBindingFunction +} + +func (this *QtPrivate__QPropertyBindingFunction) cPointer() *C.QtPrivate__QPropertyBindingFunction { + if this == nil { + return nil + } + return this.h +} + +func newQtPrivate__QPropertyBindingFunction(h *C.QtPrivate__QPropertyBindingFunction) *QtPrivate__QPropertyBindingFunction { + if h == nil { + return nil + } + return &QtPrivate__QPropertyBindingFunction{h: h} +} + +func newQtPrivate__QPropertyBindingFunction_U(h unsafe.Pointer) *QtPrivate__QPropertyBindingFunction { + return newQtPrivate__QPropertyBindingFunction((*C.QtPrivate__QPropertyBindingFunction)(h)) +} + +// Delete this object from C++ memory. +func (this *QtPrivate__QPropertyBindingFunction) Delete() { + C.QtPrivate__QPropertyBindingFunction_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QtPrivate__QPropertyBindingFunction) GoGC() { + runtime.SetFinalizer(this, func(this *QtPrivate__QPropertyBindingFunction) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + +type QtPrivate__QPropertyBindingData struct { + h *C.QtPrivate__QPropertyBindingData +} + +func (this *QtPrivate__QPropertyBindingData) cPointer() *C.QtPrivate__QPropertyBindingData { + if this == nil { + return nil + } + return this.h +} + +func newQtPrivate__QPropertyBindingData(h *C.QtPrivate__QPropertyBindingData) *QtPrivate__QPropertyBindingData { + if h == nil { + return nil + } + return &QtPrivate__QPropertyBindingData{h: h} +} + +func newQtPrivate__QPropertyBindingData_U(h unsafe.Pointer) *QtPrivate__QPropertyBindingData { + return newQtPrivate__QPropertyBindingData((*C.QtPrivate__QPropertyBindingData)(h)) +} + +// NewQtPrivate__QPropertyBindingData constructs a new QtPrivate::QPropertyBindingData object. +func NewQtPrivate__QPropertyBindingData() *QtPrivate__QPropertyBindingData { + ret := C.QtPrivate__QPropertyBindingData_new() + return newQtPrivate__QPropertyBindingData(ret) +} + +func (this *QtPrivate__QPropertyBindingData) HasBinding() bool { + return (bool)(C.QtPrivate__QPropertyBindingData_HasBinding(this.h)) +} + +func (this *QtPrivate__QPropertyBindingData) IsNotificationDelayed() bool { + return (bool)(C.QtPrivate__QPropertyBindingData_IsNotificationDelayed(this.h)) +} + +func (this *QtPrivate__QPropertyBindingData) SetBinding(newBinding *QUntypedPropertyBinding, propertyDataPtr *QUntypedPropertyData) *QUntypedPropertyBinding { + _ret := C.QtPrivate__QPropertyBindingData_SetBinding(this.h, newBinding.cPointer(), propertyDataPtr.cPointer()) + _goptr := newQUntypedPropertyBinding(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QtPrivate__QPropertyBindingData) EvaluateIfDirty(param1 *QUntypedPropertyData) { + C.QtPrivate__QPropertyBindingData_EvaluateIfDirty(this.h, param1.cPointer()) +} + +func (this *QtPrivate__QPropertyBindingData) RemoveBinding() { + C.QtPrivate__QPropertyBindingData_RemoveBinding(this.h) +} + +func (this *QtPrivate__QPropertyBindingData) RegisterWithCurrentlyEvaluatingBinding2() { + C.QtPrivate__QPropertyBindingData_RegisterWithCurrentlyEvaluatingBinding2(this.h) +} + +func (this *QtPrivate__QPropertyBindingData) NotifyObservers(propertyDataPtr *QUntypedPropertyData) { + C.QtPrivate__QPropertyBindingData_NotifyObservers(this.h, propertyDataPtr.cPointer()) +} + +func (this *QtPrivate__QPropertyBindingData) NotifyObservers2(propertyDataPtr *QUntypedPropertyData, storage *QBindingStorage) { + C.QtPrivate__QPropertyBindingData_NotifyObservers2(this.h, propertyDataPtr.cPointer(), storage.cPointer()) +} + +// Delete this object from C++ memory. +func (this *QtPrivate__QPropertyBindingData) Delete() { + C.QtPrivate__QPropertyBindingData_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QtPrivate__QPropertyBindingData) GoGC() { + runtime.SetFinalizer(this, func(this *QtPrivate__QPropertyBindingData) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + +type QUntypedPropertyData__InheritsQUntypedPropertyData struct { + h *C.QUntypedPropertyData__InheritsQUntypedPropertyData +} + +func (this *QUntypedPropertyData__InheritsQUntypedPropertyData) cPointer() *C.QUntypedPropertyData__InheritsQUntypedPropertyData { + if this == nil { + return nil + } + return this.h +} + +func newQUntypedPropertyData__InheritsQUntypedPropertyData(h *C.QUntypedPropertyData__InheritsQUntypedPropertyData) *QUntypedPropertyData__InheritsQUntypedPropertyData { + if h == nil { + return nil + } + return &QUntypedPropertyData__InheritsQUntypedPropertyData{h: h} +} + +func newQUntypedPropertyData__InheritsQUntypedPropertyData_U(h unsafe.Pointer) *QUntypedPropertyData__InheritsQUntypedPropertyData { + return newQUntypedPropertyData__InheritsQUntypedPropertyData((*C.QUntypedPropertyData__InheritsQUntypedPropertyData)(h)) +} + +// Delete this object from C++ memory. +func (this *QUntypedPropertyData__InheritsQUntypedPropertyData) Delete() { + C.QUntypedPropertyData__InheritsQUntypedPropertyData_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QUntypedPropertyData__InheritsQUntypedPropertyData) GoGC() { + runtime.SetFinalizer(this, func(this *QUntypedPropertyData__InheritsQUntypedPropertyData) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} diff --git a/qt/gen_qpropertyprivate.h b/qt/gen_qpropertyprivate.h new file mode 100644 index 0000000..7aacbf4 --- /dev/null +++ b/qt/gen_qpropertyprivate.h @@ -0,0 +1,95 @@ +#ifndef GEN_QPROPERTYPRIVATE_H +#define GEN_QPROPERTYPRIVATE_H + +#include +#include +#include + +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + +#include "binding.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +class QBindingStorage; +class QPropertyProxyBindingData; +class QUntypedPropertyBinding; +class QUntypedPropertyData; +#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QUntypedPropertyData__InheritsQUntypedPropertyData) +typedef QUntypedPropertyData::InheritsQUntypedPropertyData QUntypedPropertyData__InheritsQUntypedPropertyData; +#else +class QUntypedPropertyData__InheritsQUntypedPropertyData; +#endif +#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__BindingFunctionVTable) +typedef QtPrivate::BindingFunctionVTable QtPrivate__BindingFunctionVTable; +#else +class QtPrivate__BindingFunctionVTable; +#endif +#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__MSVCWorkAround) +typedef QtPrivate::MSVCWorkAround QtPrivate__MSVCWorkAround; +#else +class QtPrivate__MSVCWorkAround; +#endif +#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__QPropertyBindingData) +typedef QtPrivate::QPropertyBindingData QtPrivate__QPropertyBindingData; +#else +class QtPrivate__QPropertyBindingData; +#endif +#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__QPropertyBindingFunction) +typedef QtPrivate::QPropertyBindingFunction QtPrivate__QPropertyBindingFunction; +#else +class QtPrivate__QPropertyBindingFunction; +#endif +#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__RefCounted) +typedef QtPrivate::RefCounted QtPrivate__RefCounted; +#else +class QtPrivate__RefCounted; +#endif +#else +typedef struct QBindingStorage QBindingStorage; +typedef struct QPropertyProxyBindingData QPropertyProxyBindingData; +typedef struct QUntypedPropertyBinding QUntypedPropertyBinding; +typedef struct QUntypedPropertyData QUntypedPropertyData; +typedef struct QUntypedPropertyData__InheritsQUntypedPropertyData QUntypedPropertyData__InheritsQUntypedPropertyData; +typedef struct QtPrivate__BindingFunctionVTable QtPrivate__BindingFunctionVTable; +typedef struct QtPrivate__MSVCWorkAround QtPrivate__MSVCWorkAround; +typedef struct QtPrivate__QPropertyBindingData QtPrivate__QPropertyBindingData; +typedef struct QtPrivate__QPropertyBindingFunction QtPrivate__QPropertyBindingFunction; +typedef struct QtPrivate__RefCounted QtPrivate__RefCounted; +#endif + +void QtPrivate__RefCounted_AddRef(QtPrivate__RefCounted* self); +bool QtPrivate__RefCounted_Deref(QtPrivate__RefCounted* self); +void QtPrivate__RefCounted_Delete(QtPrivate__RefCounted* self); + +void QUntypedPropertyData_Delete(QUntypedPropertyData* self); + +void QPropertyProxyBindingData_Delete(QPropertyProxyBindingData* self); + +void QtPrivate__MSVCWorkAround_Delete(QtPrivate__MSVCWorkAround* self); + +void QtPrivate__BindingFunctionVTable_Delete(QtPrivate__BindingFunctionVTable* self); + +void QtPrivate__QPropertyBindingFunction_Delete(QtPrivate__QPropertyBindingFunction* self); + +QtPrivate__QPropertyBindingData* QtPrivate__QPropertyBindingData_new(); +bool QtPrivate__QPropertyBindingData_HasBinding(const QtPrivate__QPropertyBindingData* self); +bool QtPrivate__QPropertyBindingData_IsNotificationDelayed(const QtPrivate__QPropertyBindingData* self); +QUntypedPropertyBinding* QtPrivate__QPropertyBindingData_SetBinding(QtPrivate__QPropertyBindingData* self, QUntypedPropertyBinding* newBinding, QUntypedPropertyData* propertyDataPtr); +void QtPrivate__QPropertyBindingData_EvaluateIfDirty(const QtPrivate__QPropertyBindingData* self, QUntypedPropertyData* param1); +void QtPrivate__QPropertyBindingData_RemoveBinding(QtPrivate__QPropertyBindingData* self); +void QtPrivate__QPropertyBindingData_RegisterWithCurrentlyEvaluatingBinding2(const QtPrivate__QPropertyBindingData* self); +void QtPrivate__QPropertyBindingData_NotifyObservers(const QtPrivate__QPropertyBindingData* self, QUntypedPropertyData* propertyDataPtr); +void QtPrivate__QPropertyBindingData_NotifyObservers2(const QtPrivate__QPropertyBindingData* self, QUntypedPropertyData* propertyDataPtr, QBindingStorage* storage); +void QtPrivate__QPropertyBindingData_Delete(QtPrivate__QPropertyBindingData* self); + +void QUntypedPropertyData__InheritsQUntypedPropertyData_Delete(QUntypedPropertyData__InheritsQUntypedPropertyData* self); + +#ifdef __cplusplus +} /* extern C */ +#endif + +#endif diff --git a/qt/gen_qproxystyle.cpp b/qt/gen_qproxystyle.cpp index 0403650..d447f86 100644 --- a/qt/gen_qproxystyle.cpp +++ b/qt/gen_qproxystyle.cpp @@ -49,13 +49,6 @@ struct miqt_string* QProxyStyle_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QProxyStyle_TrUtf8(const char* s) { - QString _ret = QProxyStyle::trUtf8(s); - // 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()); -} - QStyle* QProxyStyle_BaseStyle(const QProxyStyle* self) { return self->baseStyle(); } @@ -173,20 +166,6 @@ struct miqt_string* QProxyStyle_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QProxyStyle_TrUtf82(const char* s, const char* c) { - QString _ret = QProxyStyle::trUtf8(s, c); - // 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* QProxyStyle_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QProxyStyle::trUtf8(s, c, static_cast(n)); - // 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 QProxyStyle_DrawPrimitive4(const QProxyStyle* self, int element, QStyleOption* option, QPainter* painter, QWidget* widget) { self->drawPrimitive(static_cast(element), option, painter, widget); } diff --git a/qt/gen_qproxystyle.go b/qt/gen_qproxystyle.go index 3c345a1..3d5ef77 100644 --- a/qt/gen_qproxystyle.go +++ b/qt/gen_qproxystyle.go @@ -75,15 +75,6 @@ func QProxyStyle_Tr(s string) string { return _ret } -func QProxyStyle_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QProxyStyle_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QProxyStyle) BaseStyle() *QStyle { return newQStyle_U(unsafe.Pointer(C.QProxyStyle_BaseStyle(this.h))) } @@ -237,28 +228,6 @@ func QProxyStyle_Tr3(s string, c string, n int) string { return _ret } -func QProxyStyle_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QProxyStyle_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QProxyStyle_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QProxyStyle_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QProxyStyle) DrawPrimitive4(element QStyle__PrimitiveElement, option *QStyleOption, painter *QPainter, widget *QWidget) { C.QProxyStyle_DrawPrimitive4(this.h, (C.int)(element), option.cPointer(), painter.cPointer(), widget.cPointer()) } diff --git a/qt/gen_qproxystyle.h b/qt/gen_qproxystyle.h index 6a3a35e..90b1713 100644 --- a/qt/gen_qproxystyle.h +++ b/qt/gen_qproxystyle.h @@ -55,7 +55,6 @@ QProxyStyle* QProxyStyle_new3(QStyle* style); QMetaObject* QProxyStyle_MetaObject(const QProxyStyle* self); void* QProxyStyle_Metacast(QProxyStyle* self, const char* param1); 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, int element, QStyleOption* option, QPainter* painter); @@ -83,8 +82,6 @@ void QProxyStyle_Unpolish(QProxyStyle* self, QWidget* widget); void QProxyStyle_UnpolishWithApp(QProxyStyle* self, QApplication* app); 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, 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); diff --git a/qt/gen_qpushbutton.cpp b/qt/gen_qpushbutton.cpp index 2fa0ff3..25a9e6e 100644 --- a/qt/gen_qpushbutton.cpp +++ b/qt/gen_qpushbutton.cpp @@ -54,13 +54,6 @@ struct miqt_string* QPushButton_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QPushButton_TrUtf8(const char* s) { - QString _ret = QPushButton::trUtf8(s); - // 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()); -} - QSize* QPushButton_SizeHint(const QPushButton* self) { return new QSize(self->sizeHint()); } @@ -119,20 +112,6 @@ struct miqt_string* QPushButton_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QPushButton_TrUtf82(const char* s, const char* c) { - QString _ret = QPushButton::trUtf8(s, c); - // 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* QPushButton_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QPushButton::trUtf8(s, c, static_cast(n)); - // 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 QPushButton_Delete(QPushButton* self) { delete self; } diff --git a/qt/gen_qpushbutton.go b/qt/gen_qpushbutton.go index 548eb42..2a46ced 100644 --- a/qt/gen_qpushbutton.go +++ b/qt/gen_qpushbutton.go @@ -99,15 +99,6 @@ func QPushButton_Tr(s string) string { return _ret } -func QPushButton_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QPushButton_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QPushButton) SizeHint() *QSize { _ret := C.QPushButton_SizeHint(this.h) _goptr := newQSize(_ret) @@ -180,28 +171,6 @@ func QPushButton_Tr3(s string, c string, n int) string { return _ret } -func QPushButton_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPushButton_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QPushButton_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QPushButton_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QPushButton) Delete() { C.QPushButton_Delete(this.h) diff --git a/qt/gen_qpushbutton.h b/qt/gen_qpushbutton.h index 62521c3..8bfb25f 100644 --- a/qt/gen_qpushbutton.h +++ b/qt/gen_qpushbutton.h @@ -38,7 +38,6 @@ QPushButton* QPushButton_new6(QIcon* icon, struct miqt_string* text, QWidget* pa QMetaObject* QPushButton_MetaObject(const QPushButton* self); void* QPushButton_Metacast(QPushButton* self, const char* param1); struct miqt_string* QPushButton_Tr(const char* s); -struct miqt_string* QPushButton_TrUtf8(const char* s); QSize* QPushButton_SizeHint(const QPushButton* self); QSize* QPushButton_MinimumSizeHint(const QPushButton* self); bool QPushButton_AutoDefault(const QPushButton* self); @@ -52,8 +51,6 @@ bool QPushButton_IsFlat(const QPushButton* self); void QPushButton_ShowMenu(QPushButton* self); struct miqt_string* QPushButton_Tr2(const char* s, const char* c); struct miqt_string* QPushButton_Tr3(const char* s, const char* c, int n); -struct miqt_string* QPushButton_TrUtf82(const char* s, const char* c); -struct miqt_string* QPushButton_TrUtf83(const char* s, const char* c, int n); void QPushButton_Delete(QPushButton* self); #ifdef __cplusplus diff --git a/qt/gen_qquaternion.cpp b/qt/gen_qquaternion.cpp index 6353632..2cb76a9 100644 --- a/qt/gen_qquaternion.cpp +++ b/qt/gen_qquaternion.cpp @@ -109,10 +109,6 @@ QQuaternion* QQuaternion_Conjugated(const QQuaternion* self) { return new QQuaternion(self->conjugated()); } -QQuaternion* QQuaternion_Conjugate(const QQuaternion* self) { - return new QQuaternion(self->conjugate()); -} - QVector3D* QQuaternion_RotatedVector(const QQuaternion* self, QVector3D* vector) { return new QVector3D(self->rotatedVector(*vector)); } diff --git a/qt/gen_qquaternion.go b/qt/gen_qquaternion.go index 5df9cda..219a00d 100644 --- a/qt/gen_qquaternion.go +++ b/qt/gen_qquaternion.go @@ -163,13 +163,6 @@ func (this *QQuaternion) Conjugated() *QQuaternion { return _goptr } -func (this *QQuaternion) Conjugate() *QQuaternion { - _ret := C.QQuaternion_Conjugate(this.h) - _goptr := newQQuaternion(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - func (this *QQuaternion) RotatedVector(vector *QVector3D) *QVector3D { _ret := C.QQuaternion_RotatedVector(this.h, vector.cPointer()) _goptr := newQVector3D(_ret) diff --git a/qt/gen_qquaternion.h b/qt/gen_qquaternion.h index b3146c0..26f4d50 100644 --- a/qt/gen_qquaternion.h +++ b/qt/gen_qquaternion.h @@ -49,7 +49,6 @@ QQuaternion* QQuaternion_Normalized(const QQuaternion* self); void QQuaternion_Normalize(QQuaternion* self); QQuaternion* QQuaternion_Inverted(const QQuaternion* self); QQuaternion* QQuaternion_Conjugated(const QQuaternion* self); -QQuaternion* QQuaternion_Conjugate(const QQuaternion* self); QVector3D* QQuaternion_RotatedVector(const QQuaternion* self, QVector3D* vector); QQuaternion* QQuaternion_OperatorPlusAssign(QQuaternion* self, QQuaternion* quaternion); QQuaternion* QQuaternion_OperatorMinusAssign(QQuaternion* self, QQuaternion* quaternion); diff --git a/qt/gen_qradiobutton.cpp b/qt/gen_qradiobutton.cpp index 305fc07..5cb709d 100644 --- a/qt/gen_qradiobutton.cpp +++ b/qt/gen_qradiobutton.cpp @@ -42,13 +42,6 @@ struct miqt_string* QRadioButton_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QRadioButton_TrUtf8(const char* s) { - QString _ret = QRadioButton::trUtf8(s); - // 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()); -} - QSize* QRadioButton_SizeHint(const QRadioButton* self) { return new QSize(self->sizeHint()); } @@ -71,20 +64,6 @@ struct miqt_string* QRadioButton_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QRadioButton_TrUtf82(const char* s, const char* c) { - QString _ret = QRadioButton::trUtf8(s, c); - // 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* QRadioButton_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QRadioButton::trUtf8(s, c, static_cast(n)); - // 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 QRadioButton_Delete(QRadioButton* self) { delete self; } diff --git a/qt/gen_qradiobutton.go b/qt/gen_qradiobutton.go index 3a0888a..3155968 100644 --- a/qt/gen_qradiobutton.go +++ b/qt/gen_qradiobutton.go @@ -83,15 +83,6 @@ func QRadioButton_Tr(s string) string { return _ret } -func QRadioButton_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QRadioButton_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QRadioButton) SizeHint() *QSize { _ret := C.QRadioButton_SizeHint(this.h) _goptr := newQSize(_ret) @@ -128,28 +119,6 @@ func QRadioButton_Tr3(s string, c string, n int) string { return _ret } -func QRadioButton_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QRadioButton_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QRadioButton_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QRadioButton_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QRadioButton) Delete() { C.QRadioButton_Delete(this.h) diff --git a/qt/gen_qradiobutton.h b/qt/gen_qradiobutton.h index 5de2b8e..0d6b61a 100644 --- a/qt/gen_qradiobutton.h +++ b/qt/gen_qradiobutton.h @@ -32,13 +32,10 @@ QRadioButton* QRadioButton_new4(struct miqt_string* text, QWidget* parent); QMetaObject* QRadioButton_MetaObject(const QRadioButton* self); void* QRadioButton_Metacast(QRadioButton* self, const char* param1); struct miqt_string* QRadioButton_Tr(const char* s); -struct miqt_string* QRadioButton_TrUtf8(const char* s); QSize* QRadioButton_SizeHint(const QRadioButton* self); QSize* QRadioButton_MinimumSizeHint(const QRadioButton* self); struct miqt_string* QRadioButton_Tr2(const char* s, const char* c); struct miqt_string* QRadioButton_Tr3(const char* s, const char* c, int n); -struct miqt_string* QRadioButton_TrUtf82(const char* s, const char* c); -struct miqt_string* QRadioButton_TrUtf83(const char* s, const char* c, int n); void QRadioButton_Delete(QRadioButton* self); #ifdef __cplusplus diff --git a/qt/gen_qrandom.cpp b/qt/gen_qrandom.cpp index e17fa12..efced0f 100644 --- a/qt/gen_qrandom.cpp +++ b/qt/gen_qrandom.cpp @@ -64,6 +64,46 @@ int QRandomGenerator_Bounded4(QRandomGenerator* self, int lowest, int highest) { return self->bounded(static_cast(lowest), static_cast(highest)); } +unsigned long long QRandomGenerator_Bounded5(QRandomGenerator* self, unsigned long long highest) { + quint64 _ret = self->bounded(static_cast(highest)); + return static_cast(_ret); +} + +unsigned long long QRandomGenerator_Bounded6(QRandomGenerator* self, unsigned long long lowest, unsigned long long highest) { + quint64 _ret = self->bounded(static_cast(lowest), static_cast(highest)); + return static_cast(_ret); +} + +long long QRandomGenerator_Bounded7(QRandomGenerator* self, long long highest) { + qint64 _ret = self->bounded(static_cast(highest)); + return static_cast(_ret); +} + +long long QRandomGenerator_Bounded8(QRandomGenerator* self, long long lowest, long long highest) { + qint64 _ret = self->bounded(static_cast(lowest), static_cast(highest)); + return static_cast(_ret); +} + +long long QRandomGenerator_Bounded9(QRandomGenerator* self, int lowest, long long highest) { + qint64 _ret = self->bounded(static_cast(lowest), static_cast(highest)); + return static_cast(_ret); +} + +long long QRandomGenerator_Bounded10(QRandomGenerator* self, long long lowest, int highest) { + qint64 _ret = self->bounded(static_cast(lowest), static_cast(highest)); + return static_cast(_ret); +} + +unsigned long long QRandomGenerator_Bounded11(QRandomGenerator* self, unsigned int lowest, unsigned long long highest) { + quint64 _ret = self->bounded(static_cast(lowest), static_cast(highest)); + return static_cast(_ret); +} + +unsigned long long QRandomGenerator_Bounded12(QRandomGenerator* self, unsigned long long lowest, unsigned int highest) { + quint64 _ret = self->bounded(static_cast(lowest), static_cast(highest)); + return static_cast(_ret); +} + void QRandomGenerator_Generate2(QRandomGenerator* self, unsigned int* begin, unsigned int* end) { self->generate(static_cast(begin), static_cast(end)); } diff --git a/qt/gen_qrandom.go b/qt/gen_qrandom.go index bf3524f..369262c 100644 --- a/qt/gen_qrandom.go +++ b/qt/gen_qrandom.go @@ -101,6 +101,38 @@ func (this *QRandomGenerator) Bounded4(lowest int, highest int) int { return (int)(C.QRandomGenerator_Bounded4(this.h, (C.int)(lowest), (C.int)(highest))) } +func (this *QRandomGenerator) Bounded5(highest uint64) uint64 { + return (uint64)(C.QRandomGenerator_Bounded5(this.h, (C.ulonglong)(highest))) +} + +func (this *QRandomGenerator) Bounded6(lowest uint64, highest uint64) uint64 { + return (uint64)(C.QRandomGenerator_Bounded6(this.h, (C.ulonglong)(lowest), (C.ulonglong)(highest))) +} + +func (this *QRandomGenerator) Bounded7(highest int64) int64 { + return (int64)(C.QRandomGenerator_Bounded7(this.h, (C.longlong)(highest))) +} + +func (this *QRandomGenerator) Bounded8(lowest int64, highest int64) int64 { + return (int64)(C.QRandomGenerator_Bounded8(this.h, (C.longlong)(lowest), (C.longlong)(highest))) +} + +func (this *QRandomGenerator) Bounded9(lowest int, highest int64) int64 { + return (int64)(C.QRandomGenerator_Bounded9(this.h, (C.int)(lowest), (C.longlong)(highest))) +} + +func (this *QRandomGenerator) Bounded10(lowest int64, highest int) int64 { + return (int64)(C.QRandomGenerator_Bounded10(this.h, (C.longlong)(lowest), (C.int)(highest))) +} + +func (this *QRandomGenerator) Bounded11(lowest uint, highest uint64) uint64 { + return (uint64)(C.QRandomGenerator_Bounded11(this.h, (C.uint)(lowest), (C.ulonglong)(highest))) +} + +func (this *QRandomGenerator) Bounded12(lowest uint64, highest uint) uint64 { + return (uint64)(C.QRandomGenerator_Bounded12(this.h, (C.ulonglong)(lowest), (C.uint)(highest))) +} + func (this *QRandomGenerator) Generate2(begin *uint, end *uint) { C.QRandomGenerator_Generate2(this.h, (*C.uint)(unsafe.Pointer(begin)), (*C.uint)(unsafe.Pointer(end))) } diff --git a/qt/gen_qrandom.h b/qt/gen_qrandom.h index 9928844..489a9bc 100644 --- a/qt/gen_qrandom.h +++ b/qt/gen_qrandom.h @@ -35,6 +35,14 @@ unsigned int QRandomGenerator_BoundedWithHighest(QRandomGenerator* self, unsigne unsigned int QRandomGenerator_Bounded2(QRandomGenerator* self, unsigned int lowest, unsigned int highest); int QRandomGenerator_Bounded3(QRandomGenerator* self, int highest); int QRandomGenerator_Bounded4(QRandomGenerator* self, int lowest, int highest); +unsigned long long QRandomGenerator_Bounded5(QRandomGenerator* self, unsigned long long highest); +unsigned long long QRandomGenerator_Bounded6(QRandomGenerator* self, unsigned long long lowest, unsigned long long highest); +long long QRandomGenerator_Bounded7(QRandomGenerator* self, long long highest); +long long QRandomGenerator_Bounded8(QRandomGenerator* self, long long lowest, long long highest); +long long QRandomGenerator_Bounded9(QRandomGenerator* self, int lowest, long long highest); +long long QRandomGenerator_Bounded10(QRandomGenerator* self, long long lowest, int highest); +unsigned long long QRandomGenerator_Bounded11(QRandomGenerator* self, unsigned int lowest, unsigned long long highest); +unsigned long long QRandomGenerator_Bounded12(QRandomGenerator* self, unsigned long long lowest, unsigned int highest); void QRandomGenerator_Generate2(QRandomGenerator* self, unsigned int* begin, unsigned int* end); unsigned int QRandomGenerator_OperatorCall(QRandomGenerator* self); void QRandomGenerator_Seed(QRandomGenerator* self); diff --git a/qt/gen_qrasterwindow.cpp b/qt/gen_qrasterwindow.cpp index ce482ec..fd3ff53 100644 --- a/qt/gen_qrasterwindow.cpp +++ b/qt/gen_qrasterwindow.cpp @@ -31,13 +31,6 @@ struct miqt_string* QRasterWindow_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QRasterWindow_TrUtf8(const char* s) { - QString _ret = QRasterWindow::trUtf8(s); - // 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* QRasterWindow_Tr2(const char* s, const char* c) { QString _ret = QRasterWindow::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -52,20 +45,6 @@ struct miqt_string* QRasterWindow_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QRasterWindow_TrUtf82(const char* s, const char* c) { - QString _ret = QRasterWindow::trUtf8(s, c); - // 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* QRasterWindow_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QRasterWindow::trUtf8(s, c, static_cast(n)); - // 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 QRasterWindow_Delete(QRasterWindow* self) { delete self; } diff --git a/qt/gen_qrasterwindow.go b/qt/gen_qrasterwindow.go index 17368e2..e75a053 100644 --- a/qt/gen_qrasterwindow.go +++ b/qt/gen_qrasterwindow.go @@ -67,15 +67,6 @@ func QRasterWindow_Tr(s string) string { return _ret } -func QRasterWindow_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QRasterWindow_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func QRasterWindow_Tr2(s string, c string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) @@ -98,28 +89,6 @@ func QRasterWindow_Tr3(s string, c string, n int) string { return _ret } -func QRasterWindow_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QRasterWindow_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QRasterWindow_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QRasterWindow_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QRasterWindow) Delete() { C.QRasterWindow_Delete(this.h) diff --git a/qt/gen_qrasterwindow.h b/qt/gen_qrasterwindow.h index 716968a..d7b5733 100644 --- a/qt/gen_qrasterwindow.h +++ b/qt/gen_qrasterwindow.h @@ -28,11 +28,8 @@ QRasterWindow* QRasterWindow_new2(QWindow* parent); QMetaObject* QRasterWindow_MetaObject(const QRasterWindow* self); void* QRasterWindow_Metacast(QRasterWindow* self, const char* param1); struct miqt_string* QRasterWindow_Tr(const char* s); -struct miqt_string* QRasterWindow_TrUtf8(const char* s); struct miqt_string* QRasterWindow_Tr2(const char* s, const char* c); struct miqt_string* QRasterWindow_Tr3(const char* s, const char* c, int n); -struct miqt_string* QRasterWindow_TrUtf82(const char* s, const char* c); -struct miqt_string* QRasterWindow_TrUtf83(const char* s, const char* c, int n); void QRasterWindow_Delete(QRasterWindow* self); #ifdef __cplusplus diff --git a/qt/gen_qrawfont.cpp b/qt/gen_qrawfont.cpp index d703bbc..1c6f546 100644 --- a/qt/gen_qrawfont.cpp +++ b/qt/gen_qrawfont.cpp @@ -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); + QList _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) { @@ -99,13 +99,13 @@ struct miqt_array* QRawFont_GlyphIndexesForString(const QRawFont* self, struct m } struct miqt_array* QRawFont_AdvancesForGlyphIndexes(const QRawFont* self, struct miqt_array* /* of unsigned int */ glyphIndexes) { - QVector glyphIndexes_QList; + QList glyphIndexes_QList; glyphIndexes_QList.reserve(glyphIndexes->len); unsigned int* glyphIndexes_arr = static_cast(glyphIndexes->data); for(size_t i = 0; i < glyphIndexes->len; ++i) { glyphIndexes_QList.push_back(static_cast(glyphIndexes_arr[i])); } - QVector _ret = self->advancesForGlyphIndexes(glyphIndexes_QList); + QList _ret = self->advancesForGlyphIndexes(glyphIndexes_QList); // Convert QList<> from C++ memory to manually-managed C memory QPointF** _arr = static_cast(malloc(sizeof(QPointF*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -118,13 +118,13 @@ struct miqt_array* QRawFont_AdvancesForGlyphIndexes(const QRawFont* self, struct } struct miqt_array* QRawFont_AdvancesForGlyphIndexes2(const QRawFont* self, struct miqt_array* /* of unsigned int */ glyphIndexes, int layoutFlags) { - QVector glyphIndexes_QList; + QList glyphIndexes_QList; glyphIndexes_QList.reserve(glyphIndexes->len); unsigned int* glyphIndexes_arr = static_cast(glyphIndexes->data); for(size_t i = 0; i < glyphIndexes->len; ++i) { glyphIndexes_QList.push_back(static_cast(glyphIndexes_arr[i])); } - QVector _ret = self->advancesForGlyphIndexes(glyphIndexes_QList, static_cast(layoutFlags)); + QList _ret = self->advancesForGlyphIndexes(glyphIndexes_QList, static_cast(layoutFlags)); // Convert QList<> from C++ memory to manually-managed C memory QPointF** _arr = static_cast(malloc(sizeof(QPointF*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { diff --git a/qt/gen_qrawfont.go b/qt/gen_qrawfont.go index d185032..8b7eadb 100644 --- a/qt/gen_qrawfont.go +++ b/qt/gen_qrawfont.go @@ -158,10 +158,10 @@ func (this *QRawFont) AdvancesForGlyphIndexes(glyphIndexes []uint) []QPointF { _ret := make([]QPointF, int(_ma.len)) _outCast := (*[0xffff]*C.QPointF)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _vv_ret := _outCast[i] - _vv_goptr := newQPointF(_vv_ret) - _vv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_vv_goptr + _lv_ret := _outCast[i] + _lv_goptr := newQPointF(_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 @@ -180,10 +180,10 @@ func (this *QRawFont) AdvancesForGlyphIndexes2(glyphIndexes []uint, 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++ { - _vv_ret := _outCast[i] - _vv_goptr := newQPointF(_vv_ret) - _vv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_vv_goptr + _lv_ret := _outCast[i] + _lv_goptr := newQPointF(_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 diff --git a/qt/gen_qrect.cpp b/qt/gen_qrect.cpp index e0f21f1..9d16745 100644 --- a/qt/gen_qrect.cpp +++ b/qt/gen_qrect.cpp @@ -306,6 +306,14 @@ QRect* QRect_OperatorMinusAssign(QRect* self, QMargins* margins) { return &_ret; } +QRect* QRect_Span(QPoint* p1, QPoint* p2) { + return new QRect(QRect::span(*p1, *p2)); +} + +QRectF* QRect_ToRectF(const QRect* self) { + return new QRectF(self->toRectF()); +} + bool QRect_Contains22(const QRect* self, QRect* r, bool proper) { return self->contains(*r, proper); } diff --git a/qt/gen_qrect.go b/qt/gen_qrect.go index 9ae2a2a..19a8478 100644 --- a/qt/gen_qrect.go +++ b/qt/gen_qrect.go @@ -388,6 +388,20 @@ func (this *QRect) OperatorMinusAssign(margins *QMargins) *QRect { return newQRect_U(unsafe.Pointer(C.QRect_OperatorMinusAssign(this.h, margins.cPointer()))) } +func QRect_Span(p1 *QPoint, p2 *QPoint) *QRect { + _ret := C.QRect_Span(p1.cPointer(), p2.cPointer()) + _goptr := newQRect(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QRect) ToRectF() *QRectF { + _ret := C.QRect_ToRectF(this.h) + _goptr := newQRectF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + func (this *QRect) Contains22(r *QRect, proper bool) bool { return (bool)(C.QRect_Contains22(this.h, r.cPointer(), (C.bool)(proper))) } diff --git a/qt/gen_qrect.h b/qt/gen_qrect.h index 829b541..a4df1c7 100644 --- a/qt/gen_qrect.h +++ b/qt/gen_qrect.h @@ -106,6 +106,8 @@ QRect* QRect_MarginsAdded(const QRect* self, QMargins* margins); QRect* QRect_MarginsRemoved(const QRect* self, QMargins* margins); QRect* QRect_OperatorPlusAssign(QRect* self, QMargins* margins); QRect* QRect_OperatorMinusAssign(QRect* self, QMargins* margins); +QRect* QRect_Span(QPoint* p1, QPoint* p2); +QRectF* QRect_ToRectF(const QRect* self); bool QRect_Contains22(const QRect* self, QRect* r, bool proper); bool QRect_Contains23(const QRect* self, QPoint* p, bool proper); void QRect_Delete(QRect* self); diff --git a/qt/gen_qrefcount.cpp b/qt/gen_qrefcount.cpp index d5e637e..aa11f5d 100644 --- a/qt/gen_qrefcount.cpp +++ b/qt/gen_qrefcount.cpp @@ -11,14 +11,6 @@ bool QtPrivate__RefCount_Deref(QtPrivate__RefCount* self) { return self->deref(); } -bool QtPrivate__RefCount_SetSharable(QtPrivate__RefCount* self, bool sharable) { - return self->setSharable(sharable); -} - -bool QtPrivate__RefCount_IsSharable(const QtPrivate__RefCount* self) { - return self->isSharable(); -} - bool QtPrivate__RefCount_IsStatic(const QtPrivate__RefCount* self) { return self->isStatic(); } diff --git a/qt/gen_qrefcount.go b/qt/gen_qrefcount.go index 5586cae..6286ede 100644 --- a/qt/gen_qrefcount.go +++ b/qt/gen_qrefcount.go @@ -43,14 +43,6 @@ func (this *QtPrivate__RefCount) Deref() bool { return (bool)(C.QtPrivate__RefCount_Deref(this.h)) } -func (this *QtPrivate__RefCount) SetSharable(sharable bool) bool { - return (bool)(C.QtPrivate__RefCount_SetSharable(this.h, (C.bool)(sharable))) -} - -func (this *QtPrivate__RefCount) IsSharable() bool { - return (bool)(C.QtPrivate__RefCount_IsSharable(this.h)) -} - func (this *QtPrivate__RefCount) IsStatic() bool { return (bool)(C.QtPrivate__RefCount_IsStatic(this.h)) } diff --git a/qt/gen_qrefcount.h b/qt/gen_qrefcount.h index 4f0d6f7..4a20778 100644 --- a/qt/gen_qrefcount.h +++ b/qt/gen_qrefcount.h @@ -25,8 +25,6 @@ typedef struct QtPrivate__RefCount QtPrivate__RefCount; bool QtPrivate__RefCount_Ref(QtPrivate__RefCount* self); bool QtPrivate__RefCount_Deref(QtPrivate__RefCount* self); -bool QtPrivate__RefCount_SetSharable(QtPrivate__RefCount* self, bool sharable); -bool QtPrivate__RefCount_IsSharable(const QtPrivate__RefCount* self); bool QtPrivate__RefCount_IsStatic(const QtPrivate__RefCount* self); bool QtPrivate__RefCount_IsShared(const QtPrivate__RefCount* self); void QtPrivate__RefCount_InitializeOwned(QtPrivate__RefCount* self); diff --git a/qt/gen_qregexp.cpp b/qt/gen_qregexp.cpp deleted file mode 100644 index 5988b8a..0000000 --- a/qt/gen_qregexp.cpp +++ /dev/null @@ -1,239 +0,0 @@ -#include -#include -#include -#include -#include -#include "qregexp.h" -#include "gen_qregexp.h" -#include "_cgo_export.h" - -QRegExp* QRegExp_new() { - return new QRegExp(); -} - -QRegExp* QRegExp_new2(struct miqt_string* pattern) { - QString pattern_QString = QString::fromUtf8(&pattern->data, pattern->len); - return new QRegExp(pattern_QString); -} - -QRegExp* QRegExp_new3(QRegExp* rx) { - return new QRegExp(*rx); -} - -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, int cs, int syntax) { - QString pattern_QString = QString::fromUtf8(&pattern->data, pattern->len); - return new QRegExp(pattern_QString, static_cast(cs), static_cast(syntax)); -} - -void QRegExp_OperatorAssign(QRegExp* self, QRegExp* rx) { - self->operator=(*rx); -} - -void QRegExp_Swap(QRegExp* self, QRegExp* other) { - self->swap(*other); -} - -bool QRegExp_OperatorEqual(const QRegExp* self, QRegExp* rx) { - return self->operator==(*rx); -} - -bool QRegExp_OperatorNotEqual(const QRegExp* self, QRegExp* rx) { - return self->operator!=(*rx); -} - -bool QRegExp_IsEmpty(const QRegExp* self) { - return self->isEmpty(); -} - -bool QRegExp_IsValid(const QRegExp* self) { - return self->isValid(); -} - -struct miqt_string* QRegExp_Pattern(const QRegExp* self) { - QString _ret = self->pattern(); - // 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 QRegExp_SetPattern(QRegExp* self, struct miqt_string* pattern) { - QString pattern_QString = QString::fromUtf8(&pattern->data, pattern->len); - self->setPattern(pattern_QString); -} - -int QRegExp_CaseSensitivity(const QRegExp* self) { - Qt::CaseSensitivity _ret = self->caseSensitivity(); - return static_cast(_ret); -} - -void QRegExp_SetCaseSensitivity(QRegExp* self, int cs) { - self->setCaseSensitivity(static_cast(cs)); -} - -int QRegExp_PatternSyntax(const QRegExp* self) { - QRegExp::PatternSyntax _ret = self->patternSyntax(); - return static_cast(_ret); -} - -void QRegExp_SetPatternSyntax(QRegExp* self, int syntax) { - self->setPatternSyntax(static_cast(syntax)); -} - -bool QRegExp_IsMinimal(const QRegExp* self) { - return self->isMinimal(); -} - -void QRegExp_SetMinimal(QRegExp* self, bool minimal) { - self->setMinimal(minimal); -} - -bool QRegExp_ExactMatch(const QRegExp* self, struct miqt_string* str) { - QString str_QString = QString::fromUtf8(&str->data, str->len); - return self->exactMatch(str_QString); -} - -int QRegExp_IndexIn(const QRegExp* self, struct miqt_string* str) { - QString str_QString = QString::fromUtf8(&str->data, str->len); - return self->indexIn(str_QString); -} - -int QRegExp_LastIndexIn(const QRegExp* self, struct miqt_string* str) { - QString str_QString = QString::fromUtf8(&str->data, str->len); - return self->lastIndexIn(str_QString); -} - -int QRegExp_MatchedLength(const QRegExp* self) { - return self->matchedLength(); -} - -int QRegExp_CaptureCount(const QRegExp* self) { - return self->captureCount(); -} - -struct miqt_array* QRegExp_CapturedTexts(const QRegExp* self) { - QStringList _ret = self->capturedTexts(); - // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); - for (size_t i = 0, e = _ret.length(); i < e; ++i) { - QString _lv_ret = _ret[i]; - // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory - QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); - } - struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); - _out->len = _ret.length(); - _out->data = static_cast(_arr); - return _out; -} - -struct miqt_array* QRegExp_CapturedTexts2(QRegExp* self) { - QStringList _ret = self->capturedTexts(); - // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); - for (size_t i = 0, e = _ret.length(); i < e; ++i) { - QString _lv_ret = _ret[i]; - // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory - QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); - } - 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* QRegExp_Cap(const QRegExp* self) { - QString _ret = self->cap(); - // 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* QRegExp_Cap2(QRegExp* self) { - QString _ret = self->cap(); - // 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()); -} - -int QRegExp_Pos(const QRegExp* self) { - return self->pos(); -} - -int QRegExp_Pos2(QRegExp* self) { - return self->pos(); -} - -struct miqt_string* QRegExp_ErrorString(const QRegExp* self) { - QString _ret = self->errorString(); - // 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* QRegExp_ErrorString2(QRegExp* self) { - QString _ret = self->errorString(); - // 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* QRegExp_Escape(struct miqt_string* str) { - QString str_QString = QString::fromUtf8(&str->data, str->len); - QString _ret = QRegExp::escape(str_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()); -} - -int QRegExp_IndexIn2(const QRegExp* self, struct miqt_string* str, int offset) { - QString str_QString = QString::fromUtf8(&str->data, str->len); - return self->indexIn(str_QString, static_cast(offset)); -} - -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)); -} - -int QRegExp_LastIndexIn2(const QRegExp* self, struct miqt_string* str, int offset) { - QString str_QString = QString::fromUtf8(&str->data, str->len); - return self->lastIndexIn(str_QString, static_cast(offset)); -} - -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)); -} - -struct miqt_string* QRegExp_Cap1(const QRegExp* self, int nth) { - QString _ret = self->cap(static_cast(nth)); - // 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* QRegExp_Cap1WithNth(QRegExp* self, int nth) { - QString _ret = self->cap(static_cast(nth)); - // 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()); -} - -int QRegExp_Pos1(const QRegExp* self, int nth) { - return self->pos(static_cast(nth)); -} - -int QRegExp_Pos1WithNth(QRegExp* self, int nth) { - return self->pos(static_cast(nth)); -} - -void QRegExp_Delete(QRegExp* self) { - delete self; -} - diff --git a/qt/gen_qregexp.go b/qt/gen_qregexp.go deleted file mode 100644 index 5ef7945..0000000 --- a/qt/gen_qregexp.go +++ /dev/null @@ -1,311 +0,0 @@ -package qt - -/* - -#include "gen_qregexp.h" -#include - -*/ -import "C" - -import ( - "runtime" - "unsafe" -) - -type QRegExp__PatternSyntax int - -const ( - QRegExp__RegExp QRegExp__PatternSyntax = 0 - QRegExp__Wildcard QRegExp__PatternSyntax = 1 - QRegExp__FixedString QRegExp__PatternSyntax = 2 - QRegExp__RegExp2 QRegExp__PatternSyntax = 3 - QRegExp__WildcardUnix QRegExp__PatternSyntax = 4 - QRegExp__W3CXmlSchema11 QRegExp__PatternSyntax = 5 -) - -type QRegExp__CaretMode int - -const ( - QRegExp__CaretAtZero QRegExp__CaretMode = 0 - QRegExp__CaretAtOffset QRegExp__CaretMode = 1 - QRegExp__CaretWontMatch QRegExp__CaretMode = 2 -) - -type QRegExp struct { - h *C.QRegExp -} - -func (this *QRegExp) cPointer() *C.QRegExp { - if this == nil { - return nil - } - return this.h -} - -func newQRegExp(h *C.QRegExp) *QRegExp { - if h == nil { - return nil - } - return &QRegExp{h: h} -} - -func newQRegExp_U(h unsafe.Pointer) *QRegExp { - return newQRegExp((*C.QRegExp)(h)) -} - -// NewQRegExp constructs a new QRegExp object. -func NewQRegExp() *QRegExp { - ret := C.QRegExp_new() - return newQRegExp(ret) -} - -// NewQRegExp2 constructs a new QRegExp object. -func NewQRegExp2(pattern string) *QRegExp { - pattern_ms := miqt_strdupg(pattern) - defer C.free(pattern_ms) - ret := C.QRegExp_new2((*C.struct_miqt_string)(pattern_ms)) - return newQRegExp(ret) -} - -// NewQRegExp3 constructs a new QRegExp object. -func NewQRegExp3(rx *QRegExp) *QRegExp { - ret := C.QRegExp_new3(rx.cPointer()) - return newQRegExp(ret) -} - -// NewQRegExp4 constructs a new QRegExp object. -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.int)(cs)) - return newQRegExp(ret) -} - -// NewQRegExp5 constructs a new QRegExp object. -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.int)(cs), (C.int)(syntax)) - return newQRegExp(ret) -} - -func (this *QRegExp) OperatorAssign(rx *QRegExp) { - C.QRegExp_OperatorAssign(this.h, rx.cPointer()) -} - -func (this *QRegExp) Swap(other *QRegExp) { - C.QRegExp_Swap(this.h, other.cPointer()) -} - -func (this *QRegExp) OperatorEqual(rx *QRegExp) bool { - return (bool)(C.QRegExp_OperatorEqual(this.h, rx.cPointer())) -} - -func (this *QRegExp) OperatorNotEqual(rx *QRegExp) bool { - return (bool)(C.QRegExp_OperatorNotEqual(this.h, rx.cPointer())) -} - -func (this *QRegExp) IsEmpty() bool { - return (bool)(C.QRegExp_IsEmpty(this.h)) -} - -func (this *QRegExp) IsValid() bool { - return (bool)(C.QRegExp_IsValid(this.h)) -} - -func (this *QRegExp) Pattern() string { - var _ms *C.struct_miqt_string = C.QRegExp_Pattern(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QRegExp) SetPattern(pattern string) { - pattern_ms := miqt_strdupg(pattern) - defer C.free(pattern_ms) - C.QRegExp_SetPattern(this.h, (*C.struct_miqt_string)(pattern_ms)) -} - -func (this *QRegExp) CaseSensitivity() CaseSensitivity { - return (CaseSensitivity)(C.QRegExp_CaseSensitivity(this.h)) -} - -func (this *QRegExp) SetCaseSensitivity(cs CaseSensitivity) { - C.QRegExp_SetCaseSensitivity(this.h, (C.int)(cs)) -} - -func (this *QRegExp) PatternSyntax() QRegExp__PatternSyntax { - return (QRegExp__PatternSyntax)(C.QRegExp_PatternSyntax(this.h)) -} - -func (this *QRegExp) SetPatternSyntax(syntax QRegExp__PatternSyntax) { - C.QRegExp_SetPatternSyntax(this.h, (C.int)(syntax)) -} - -func (this *QRegExp) IsMinimal() bool { - return (bool)(C.QRegExp_IsMinimal(this.h)) -} - -func (this *QRegExp) SetMinimal(minimal bool) { - C.QRegExp_SetMinimal(this.h, (C.bool)(minimal)) -} - -func (this *QRegExp) ExactMatch(str string) bool { - str_ms := miqt_strdupg(str) - defer C.free(str_ms) - return (bool)(C.QRegExp_ExactMatch(this.h, (*C.struct_miqt_string)(str_ms))) -} - -func (this *QRegExp) IndexIn(str string) int { - str_ms := miqt_strdupg(str) - defer C.free(str_ms) - return (int)(C.QRegExp_IndexIn(this.h, (*C.struct_miqt_string)(str_ms))) -} - -func (this *QRegExp) LastIndexIn(str string) int { - str_ms := miqt_strdupg(str) - defer C.free(str_ms) - return (int)(C.QRegExp_LastIndexIn(this.h, (*C.struct_miqt_string)(str_ms))) -} - -func (this *QRegExp) MatchedLength() int { - return (int)(C.QRegExp_MatchedLength(this.h)) -} - -func (this *QRegExp) CaptureCount() int { - return (int)(C.QRegExp_CaptureCount(this.h)) -} - -func (this *QRegExp) CapturedTexts() []string { - var _ma *C.struct_miqt_array = C.QRegExp_CapturedTexts(this.h) - _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++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) - _ret[i] = _lv_ret - } - C.free(unsafe.Pointer(_ma)) - return _ret -} - -func (this *QRegExp) CapturedTexts2() []string { - var _ma *C.struct_miqt_array = C.QRegExp_CapturedTexts2(this.h) - _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++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) - _ret[i] = _lv_ret - } - C.free(unsafe.Pointer(_ma)) - return _ret -} - -func (this *QRegExp) Cap() string { - var _ms *C.struct_miqt_string = C.QRegExp_Cap(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QRegExp) Cap2() string { - var _ms *C.struct_miqt_string = C.QRegExp_Cap2(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QRegExp) Pos() int { - return (int)(C.QRegExp_Pos(this.h)) -} - -func (this *QRegExp) Pos2() int { - return (int)(C.QRegExp_Pos2(this.h)) -} - -func (this *QRegExp) ErrorString() string { - var _ms *C.struct_miqt_string = C.QRegExp_ErrorString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QRegExp) ErrorString2() string { - var _ms *C.struct_miqt_string = C.QRegExp_ErrorString2(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QRegExp_Escape(str string) string { - str_ms := miqt_strdupg(str) - defer C.free(str_ms) - var _ms *C.struct_miqt_string = C.QRegExp_Escape((*C.struct_miqt_string)(str_ms)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QRegExp) IndexIn2(str string, offset int) int { - str_ms := miqt_strdupg(str) - defer C.free(str_ms) - return (int)(C.QRegExp_IndexIn2(this.h, (*C.struct_miqt_string)(str_ms), (C.int)(offset))) -} - -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.int)(caretMode))) -} - -func (this *QRegExp) LastIndexIn2(str string, offset int) int { - str_ms := miqt_strdupg(str) - defer C.free(str_ms) - return (int)(C.QRegExp_LastIndexIn2(this.h, (*C.struct_miqt_string)(str_ms), (C.int)(offset))) -} - -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.int)(caretMode))) -} - -func (this *QRegExp) Cap1(nth int) string { - var _ms *C.struct_miqt_string = C.QRegExp_Cap1(this.h, (C.int)(nth)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QRegExp) Cap1WithNth(nth int) string { - var _ms *C.struct_miqt_string = C.QRegExp_Cap1WithNth(this.h, (C.int)(nth)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QRegExp) Pos1(nth int) int { - return (int)(C.QRegExp_Pos1(this.h, (C.int)(nth))) -} - -func (this *QRegExp) Pos1WithNth(nth int) int { - return (int)(C.QRegExp_Pos1WithNth(this.h, (C.int)(nth))) -} - -// Delete this object from C++ memory. -func (this *QRegExp) Delete() { - C.QRegExp_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QRegExp) GoGC() { - runtime.SetFinalizer(this, func(this *QRegExp) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} diff --git a/qt/gen_qregexp.h b/qt/gen_qregexp.h deleted file mode 100644 index 7bf4872..0000000 --- a/qt/gen_qregexp.h +++ /dev/null @@ -1,69 +0,0 @@ -#ifndef GEN_QREGEXP_H -#define GEN_QREGEXP_H - -#include -#include -#include - -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - -#include "binding.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __cplusplus -class QRegExp; -#else -typedef struct QRegExp QRegExp; -#endif - -QRegExp* QRegExp_new(); -QRegExp* QRegExp_new2(struct miqt_string* pattern); -QRegExp* QRegExp_new3(QRegExp* rx); -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); -bool QRegExp_OperatorNotEqual(const QRegExp* self, QRegExp* rx); -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); -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); -int QRegExp_IndexIn(const QRegExp* self, struct miqt_string* str); -int QRegExp_LastIndexIn(const QRegExp* self, struct miqt_string* str); -int QRegExp_MatchedLength(const QRegExp* self); -int QRegExp_CaptureCount(const QRegExp* self); -struct miqt_array* QRegExp_CapturedTexts(const QRegExp* self); -struct miqt_array* QRegExp_CapturedTexts2(QRegExp* self); -struct miqt_string* QRegExp_Cap(const QRegExp* self); -struct miqt_string* QRegExp_Cap2(QRegExp* self); -int QRegExp_Pos(const QRegExp* self); -int QRegExp_Pos2(QRegExp* self); -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, 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, 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); -int QRegExp_Pos1WithNth(QRegExp* self, int nth); -void QRegExp_Delete(QRegExp* self); - -#ifdef __cplusplus -} /* extern C */ -#endif - -#endif diff --git a/qt/gen_qregion.cpp b/qt/gen_qregion.cpp index ff1e4a0..0ea2edf 100644 --- a/qt/gen_qregion.cpp +++ b/qt/gen_qregion.cpp @@ -1,5 +1,4 @@ #include -#include #include #include #include @@ -131,19 +130,6 @@ QRect* QRegion_BoundingRect(const QRegion* self) { return new QRect(self->boundingRect()); } -struct miqt_array* QRegion_Rects(const QRegion* self) { - QVector _ret = self->rects(); - // Convert QList<> from C++ memory to manually-managed C memory - QRect** _arr = static_cast(malloc(sizeof(QRect*) * _ret.length())); - for (size_t i = 0, e = _ret.length(); i < e; ++i) { - _arr[i] = new QRect(_ret[i]); - } - struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); - _out->len = _ret.length(); - _out->data = static_cast(_arr); - return _out; -} - void QRegion_SetRects(QRegion* self, QRect* rect, int num) { self->setRects(rect, static_cast(num)); } diff --git a/qt/gen_qregion.go b/qt/gen_qregion.go index a4f2015..1aadf0d 100644 --- a/qt/gen_qregion.go +++ b/qt/gen_qregion.go @@ -203,20 +203,6 @@ func (this *QRegion) BoundingRect() *QRect { return _goptr } -func (this *QRegion) Rects() []QRect { - var _ma *C.struct_miqt_array = C.QRegion_Rects(this.h) - _ret := make([]QRect, int(_ma.len)) - _outCast := (*[0xffff]*C.QRect)(unsafe.Pointer(_ma.data)) // hey ya - for i := 0; i < int(_ma.len); i++ { - _vv_ret := _outCast[i] - _vv_goptr := newQRect(_vv_ret) - _vv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_vv_goptr - } - C.free(unsafe.Pointer(_ma)) - return _ret -} - func (this *QRegion) SetRects(rect *QRect, num int) { C.QRegion_SetRects(this.h, rect.cPointer(), (C.int)(num)) } diff --git a/qt/gen_qregion.h b/qt/gen_qregion.h index 7d2ecd5..e1e0d5e 100644 --- a/qt/gen_qregion.h +++ b/qt/gen_qregion.h @@ -55,7 +55,6 @@ QRegion* QRegion_Xored(const QRegion* self, QRegion* r); bool QRegion_Intersects(const QRegion* self, QRegion* r); bool QRegion_IntersectsWithQRect(const QRegion* self, QRect* r); QRect* QRegion_BoundingRect(const QRegion* self); -struct miqt_array* QRegion_Rects(const QRegion* self); void QRegion_SetRects(QRegion* self, QRect* rect, int num); int QRegion_RectCount(const QRegion* self); QRegion* QRegion_OperatorBitwiseOr(const QRegion* self, QRegion* r); diff --git a/qt/gen_qregularexpression.cpp b/qt/gen_qregularexpression.cpp index 59ac612..d863cbd 100644 --- a/qt/gen_qregularexpression.cpp +++ b/qt/gen_qregularexpression.cpp @@ -5,6 +5,8 @@ #include #include #include +#define WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator +#define WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel #include "qregularexpression.h" #include "gen_qregularexpression.h" #include "_cgo_export.h" @@ -60,8 +62,9 @@ bool QRegularExpression_IsValid(const QRegularExpression* self) { return self->isValid(); } -int QRegularExpression_PatternErrorOffset(const QRegularExpression* self) { - return self->patternErrorOffset(); +ptrdiff_t QRegularExpression_PatternErrorOffset(const QRegularExpression* self) { + qsizetype _ret = self->patternErrorOffset(); + return static_cast(_ret); } struct miqt_string* QRegularExpression_ErrorString(const QRegularExpression* self) { @@ -137,34 +140,42 @@ bool QRegularExpression_OperatorNotEqual(const QRegularExpression* self, QRegula return self->operator!=(*re); } -QRegularExpressionMatch* QRegularExpression_Match2(const QRegularExpression* self, struct miqt_string* subject, int offset) { +QRegularExpressionMatch* QRegularExpression_Match2(const QRegularExpression* self, struct miqt_string* subject, ptrdiff_t offset) { QString subject_QString = QString::fromUtf8(&subject->data, subject->len); - return new QRegularExpressionMatch(self->match(subject_QString, static_cast(offset))); + return new QRegularExpressionMatch(self->match(subject_QString, (qsizetype)(offset))); } -QRegularExpressionMatch* QRegularExpression_Match3(const QRegularExpression* self, struct miqt_string* subject, int offset, int matchType) { +QRegularExpressionMatch* QRegularExpression_Match3(const QRegularExpression* self, struct miqt_string* subject, ptrdiff_t 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))); + return new QRegularExpressionMatch(self->match(subject_QString, (qsizetype)(offset), static_cast(matchType))); } -QRegularExpressionMatch* QRegularExpression_Match4(const QRegularExpression* self, struct miqt_string* subject, int offset, int matchType, int matchOptions) { +QRegularExpressionMatch* QRegularExpression_Match4(const QRegularExpression* self, struct miqt_string* subject, ptrdiff_t 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))); + return new QRegularExpressionMatch(self->match(subject_QString, (qsizetype)(offset), static_cast(matchType), static_cast(matchOptions))); } -QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch2(const QRegularExpression* self, struct miqt_string* subject, int offset) { +QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch2(const QRegularExpression* self, struct miqt_string* subject, ptrdiff_t offset) { QString subject_QString = QString::fromUtf8(&subject->data, subject->len); - return new QRegularExpressionMatchIterator(self->globalMatch(subject_QString, static_cast(offset))); + return new QRegularExpressionMatchIterator(self->globalMatch(subject_QString, (qsizetype)(offset))); } -QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch3(const QRegularExpression* self, struct miqt_string* subject, int offset, int matchType) { +QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch3(const QRegularExpression* self, struct miqt_string* subject, ptrdiff_t 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))); + return new QRegularExpressionMatchIterator(self->globalMatch(subject_QString, (qsizetype)(offset), static_cast(matchType))); } -QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch4(const QRegularExpression* self, struct miqt_string* subject, int offset, int matchType, int matchOptions) { +QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch4(const QRegularExpression* self, struct miqt_string* subject, ptrdiff_t 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))); + return new QRegularExpressionMatchIterator(self->globalMatch(subject_QString, (qsizetype)(offset), static_cast(matchType), static_cast(matchOptions))); +} + +struct miqt_string* QRegularExpression_WildcardToRegularExpression2(struct miqt_string* str, int options) { + QString str_QString = QString::fromUtf8(&str->data, str->len); + QString _ret = QRegularExpression::wildcardToRegularExpression(str_QString, static_cast(options)); + // 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 QRegularExpression_Delete(QRegularExpression* self) { @@ -217,6 +228,15 @@ int QRegularExpressionMatch_LastCapturedIndex(const QRegularExpressionMatch* sel return self->lastCapturedIndex(); } +bool QRegularExpressionMatch_HasCaptured(const QRegularExpressionMatch* self, struct miqt_string* name) { + QString name_QString = QString::fromUtf8(&name->data, name->len); + return self->hasCaptured(name_QString); +} + +bool QRegularExpressionMatch_HasCapturedWithNth(const QRegularExpressionMatch* self, int nth) { + return self->hasCaptured(static_cast(nth)); +} + struct miqt_string* QRegularExpressionMatch_Captured(const QRegularExpressionMatch* self) { QString _ret = self->captured(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -248,31 +268,37 @@ struct miqt_array* QRegularExpressionMatch_CapturedTexts(const QRegularExpressio return _out; } -int QRegularExpressionMatch_CapturedStart(const QRegularExpressionMatch* self) { - return self->capturedStart(); +ptrdiff_t QRegularExpressionMatch_CapturedStart(const QRegularExpressionMatch* self) { + qsizetype _ret = self->capturedStart(); + return static_cast(_ret); } -int QRegularExpressionMatch_CapturedLength(const QRegularExpressionMatch* self) { - return self->capturedLength(); +ptrdiff_t QRegularExpressionMatch_CapturedLength(const QRegularExpressionMatch* self) { + qsizetype _ret = self->capturedLength(); + return static_cast(_ret); } -int QRegularExpressionMatch_CapturedEnd(const QRegularExpressionMatch* self) { - return self->capturedEnd(); +ptrdiff_t QRegularExpressionMatch_CapturedEnd(const QRegularExpressionMatch* self) { + qsizetype _ret = self->capturedEnd(); + return static_cast(_ret); } -int QRegularExpressionMatch_CapturedStartWithName(const QRegularExpressionMatch* self, struct miqt_string* name) { +ptrdiff_t QRegularExpressionMatch_CapturedStartWithName(const QRegularExpressionMatch* self, struct miqt_string* name) { QString name_QString = QString::fromUtf8(&name->data, name->len); - return self->capturedStart(name_QString); + qsizetype _ret = self->capturedStart(name_QString); + return static_cast(_ret); } -int QRegularExpressionMatch_CapturedLengthWithName(const QRegularExpressionMatch* self, struct miqt_string* name) { +ptrdiff_t QRegularExpressionMatch_CapturedLengthWithName(const QRegularExpressionMatch* self, struct miqt_string* name) { QString name_QString = QString::fromUtf8(&name->data, name->len); - return self->capturedLength(name_QString); + qsizetype _ret = self->capturedLength(name_QString); + return static_cast(_ret); } -int QRegularExpressionMatch_CapturedEndWithName(const QRegularExpressionMatch* self, struct miqt_string* name) { +ptrdiff_t QRegularExpressionMatch_CapturedEndWithName(const QRegularExpressionMatch* self, struct miqt_string* name) { QString name_QString = QString::fromUtf8(&name->data, name->len); - return self->capturedEnd(name_QString); + qsizetype _ret = self->capturedEnd(name_QString); + return static_cast(_ret); } struct miqt_string* QRegularExpressionMatch_Captured1(const QRegularExpressionMatch* self, int nth) { @@ -282,22 +308,33 @@ struct miqt_string* QRegularExpressionMatch_Captured1(const QRegularExpressionMa return miqt_strdup(_b.data(), _b.length()); } -int QRegularExpressionMatch_CapturedStart1(const QRegularExpressionMatch* self, int nth) { - return self->capturedStart(static_cast(nth)); +ptrdiff_t QRegularExpressionMatch_CapturedStart1(const QRegularExpressionMatch* self, int nth) { + qsizetype _ret = self->capturedStart(static_cast(nth)); + return static_cast(_ret); } -int QRegularExpressionMatch_CapturedLength1(const QRegularExpressionMatch* self, int nth) { - return self->capturedLength(static_cast(nth)); +ptrdiff_t QRegularExpressionMatch_CapturedLength1(const QRegularExpressionMatch* self, int nth) { + qsizetype _ret = self->capturedLength(static_cast(nth)); + return static_cast(_ret); } -int QRegularExpressionMatch_CapturedEnd1(const QRegularExpressionMatch* self, int nth) { - return self->capturedEnd(static_cast(nth)); +ptrdiff_t QRegularExpressionMatch_CapturedEnd1(const QRegularExpressionMatch* self, int nth) { + qsizetype _ret = self->capturedEnd(static_cast(nth)); + return static_cast(_ret); } void QRegularExpressionMatch_Delete(QRegularExpressionMatch* self) { delete self; } +QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel* QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel_new() { + return new QtPrivate::QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel(); +} + +void QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel_Delete(QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel* self) { + delete self; +} + QRegularExpressionMatchIterator* QRegularExpressionMatchIterator_new() { return new QRegularExpressionMatchIterator(); } @@ -348,3 +385,21 @@ void QRegularExpressionMatchIterator_Delete(QRegularExpressionMatchIterator* sel delete self; } +QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator* QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator_new() { + return new QtPrivate::QRegularExpressionMatchIteratorRangeBasedForIterator(); +} + +QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator* QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator_new2(QRegularExpressionMatchIterator* iterator) { + return new QtPrivate::QRegularExpressionMatchIteratorRangeBasedForIterator(*iterator); +} + +QRegularExpressionMatch* QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator_OperatorMultiply(const QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator* self) { + const QRegularExpressionMatch& _ret = self->operator*(); + // Cast returned reference into pointer + return const_cast(&_ret); +} + +void QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator_Delete(QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator* self) { + delete self; +} + diff --git a/qt/gen_qregularexpression.go b/qt/gen_qregularexpression.go index 9d6c5ac..d1ccdf5 100644 --- a/qt/gen_qregularexpression.go +++ b/qt/gen_qregularexpression.go @@ -16,16 +16,14 @@ import ( type QRegularExpression__PatternOption int const ( - QRegularExpression__NoPatternOption QRegularExpression__PatternOption = 0 - QRegularExpression__CaseInsensitiveOption QRegularExpression__PatternOption = 1 - QRegularExpression__DotMatchesEverythingOption QRegularExpression__PatternOption = 2 - QRegularExpression__MultilineOption QRegularExpression__PatternOption = 4 - QRegularExpression__ExtendedPatternSyntaxOption QRegularExpression__PatternOption = 8 - QRegularExpression__InvertedGreedinessOption QRegularExpression__PatternOption = 16 - QRegularExpression__DontCaptureOption QRegularExpression__PatternOption = 32 - QRegularExpression__UseUnicodePropertiesOption QRegularExpression__PatternOption = 64 - QRegularExpression__OptimizeOnFirstUsageOption QRegularExpression__PatternOption = 128 - QRegularExpression__DontAutomaticallyOptimizeOption QRegularExpression__PatternOption = 256 + QRegularExpression__NoPatternOption QRegularExpression__PatternOption = 0 + QRegularExpression__CaseInsensitiveOption QRegularExpression__PatternOption = 1 + QRegularExpression__DotMatchesEverythingOption QRegularExpression__PatternOption = 2 + QRegularExpression__MultilineOption QRegularExpression__PatternOption = 4 + QRegularExpression__ExtendedPatternSyntaxOption QRegularExpression__PatternOption = 8 + QRegularExpression__InvertedGreedinessOption QRegularExpression__PatternOption = 16 + QRegularExpression__DontCaptureOption QRegularExpression__PatternOption = 32 + QRegularExpression__UseUnicodePropertiesOption QRegularExpression__PatternOption = 64 ) type QRegularExpression__MatchType int @@ -41,10 +39,18 @@ type QRegularExpression__MatchOption int const ( QRegularExpression__NoMatchOption QRegularExpression__MatchOption = 0 + QRegularExpression__AnchorAtOffsetMatchOption QRegularExpression__MatchOption = 1 QRegularExpression__AnchoredMatchOption QRegularExpression__MatchOption = 1 QRegularExpression__DontCheckSubjectStringMatchOption QRegularExpression__MatchOption = 2 ) +type QRegularExpression__WildcardConversionOption int + +const ( + QRegularExpression__DefaultWildcardConversion QRegularExpression__WildcardConversionOption = 0 + QRegularExpression__UnanchoredWildcardConversion QRegularExpression__WildcardConversionOption = 1 +) + type QRegularExpression struct { h *C.QRegularExpression } @@ -128,8 +134,8 @@ func (this *QRegularExpression) IsValid() bool { return (bool)(C.QRegularExpression_IsValid(this.h)) } -func (this *QRegularExpression) PatternErrorOffset() int { - return (int)(C.QRegularExpression_PatternErrorOffset(this.h)) +func (this *QRegularExpression) PatternErrorOffset() int64 { + return (int64)(C.QRegularExpression_PatternErrorOffset(this.h)) } func (this *QRegularExpression) ErrorString() string { @@ -214,60 +220,69 @@ func (this *QRegularExpression) OperatorNotEqual(re *QRegularExpression) bool { return (bool)(C.QRegularExpression_OperatorNotEqual(this.h, re.cPointer())) } -func (this *QRegularExpression) Match2(subject string, offset int) *QRegularExpressionMatch { +func (this *QRegularExpression) Match2(subject string, offset int64) *QRegularExpressionMatch { subject_ms := miqt_strdupg(subject) defer C.free(subject_ms) - _ret := C.QRegularExpression_Match2(this.h, (*C.struct_miqt_string)(subject_ms), (C.int)(offset)) + _ret := C.QRegularExpression_Match2(this.h, (*C.struct_miqt_string)(subject_ms), (C.ptrdiff_t)(offset)) _goptr := newQRegularExpressionMatch(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QRegularExpression) Match3(subject string, offset int, matchType QRegularExpression__MatchType) *QRegularExpressionMatch { +func (this *QRegularExpression) Match3(subject string, offset int64, 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.int)(matchType)) + _ret := C.QRegularExpression_Match3(this.h, (*C.struct_miqt_string)(subject_ms), (C.ptrdiff_t)(offset), (C.int)(matchType)) _goptr := newQRegularExpressionMatch(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QRegularExpression) Match4(subject string, offset int, matchType QRegularExpression__MatchType, matchOptions QRegularExpression__MatchOption) *QRegularExpressionMatch { +func (this *QRegularExpression) Match4(subject string, offset int64, matchType QRegularExpression__MatchType, matchOptions QRegularExpression__MatchOption) *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.int)(matchType), (C.int)(matchOptions)) + _ret := C.QRegularExpression_Match4(this.h, (*C.struct_miqt_string)(subject_ms), (C.ptrdiff_t)(offset), (C.int)(matchType), (C.int)(matchOptions)) _goptr := newQRegularExpressionMatch(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QRegularExpression) GlobalMatch2(subject string, offset int) *QRegularExpressionMatchIterator { +func (this *QRegularExpression) GlobalMatch2(subject string, offset int64) *QRegularExpressionMatchIterator { subject_ms := miqt_strdupg(subject) defer C.free(subject_ms) - _ret := C.QRegularExpression_GlobalMatch2(this.h, (*C.struct_miqt_string)(subject_ms), (C.int)(offset)) + _ret := C.QRegularExpression_GlobalMatch2(this.h, (*C.struct_miqt_string)(subject_ms), (C.ptrdiff_t)(offset)) _goptr := newQRegularExpressionMatchIterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QRegularExpression) GlobalMatch3(subject string, offset int, matchType QRegularExpression__MatchType) *QRegularExpressionMatchIterator { +func (this *QRegularExpression) GlobalMatch3(subject string, offset int64, 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.int)(matchType)) + _ret := C.QRegularExpression_GlobalMatch3(this.h, (*C.struct_miqt_string)(subject_ms), (C.ptrdiff_t)(offset), (C.int)(matchType)) _goptr := newQRegularExpressionMatchIterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QRegularExpression) GlobalMatch4(subject string, offset int, matchType QRegularExpression__MatchType, matchOptions QRegularExpression__MatchOption) *QRegularExpressionMatchIterator { +func (this *QRegularExpression) GlobalMatch4(subject string, offset int64, matchType QRegularExpression__MatchType, matchOptions QRegularExpression__MatchOption) *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.int)(matchType), (C.int)(matchOptions)) + _ret := C.QRegularExpression_GlobalMatch4(this.h, (*C.struct_miqt_string)(subject_ms), (C.ptrdiff_t)(offset), (C.int)(matchType), (C.int)(matchOptions)) _goptr := newQRegularExpressionMatchIterator(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } +func QRegularExpression_WildcardToRegularExpression2(str string, options QRegularExpression__WildcardConversionOption) string { + str_ms := miqt_strdupg(str) + defer C.free(str_ms) + var _ms *C.struct_miqt_string = C.QRegularExpression_WildcardToRegularExpression2((*C.struct_miqt_string)(str_ms), (C.int)(options)) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + // Delete this object from C++ memory. func (this *QRegularExpression) Delete() { C.QRegularExpression_Delete(this.h) @@ -355,6 +370,16 @@ func (this *QRegularExpressionMatch) LastCapturedIndex() int { return (int)(C.QRegularExpressionMatch_LastCapturedIndex(this.h)) } +func (this *QRegularExpressionMatch) HasCaptured(name string) bool { + name_ms := miqt_strdupg(name) + defer C.free(name_ms) + return (bool)(C.QRegularExpressionMatch_HasCaptured(this.h, (*C.struct_miqt_string)(name_ms))) +} + +func (this *QRegularExpressionMatch) HasCapturedWithNth(nth int) bool { + return (bool)(C.QRegularExpressionMatch_HasCapturedWithNth(this.h, (C.int)(nth))) +} + func (this *QRegularExpressionMatch) Captured() string { var _ms *C.struct_miqt_string = C.QRegularExpressionMatch_Captured(this.h) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) @@ -385,34 +410,34 @@ func (this *QRegularExpressionMatch) CapturedTexts() []string { return _ret } -func (this *QRegularExpressionMatch) CapturedStart() int { - return (int)(C.QRegularExpressionMatch_CapturedStart(this.h)) +func (this *QRegularExpressionMatch) CapturedStart() int64 { + return (int64)(C.QRegularExpressionMatch_CapturedStart(this.h)) } -func (this *QRegularExpressionMatch) CapturedLength() int { - return (int)(C.QRegularExpressionMatch_CapturedLength(this.h)) +func (this *QRegularExpressionMatch) CapturedLength() int64 { + return (int64)(C.QRegularExpressionMatch_CapturedLength(this.h)) } -func (this *QRegularExpressionMatch) CapturedEnd() int { - return (int)(C.QRegularExpressionMatch_CapturedEnd(this.h)) +func (this *QRegularExpressionMatch) CapturedEnd() int64 { + return (int64)(C.QRegularExpressionMatch_CapturedEnd(this.h)) } -func (this *QRegularExpressionMatch) CapturedStartWithName(name string) int { +func (this *QRegularExpressionMatch) CapturedStartWithName(name string) int64 { name_ms := miqt_strdupg(name) defer C.free(name_ms) - return (int)(C.QRegularExpressionMatch_CapturedStartWithName(this.h, (*C.struct_miqt_string)(name_ms))) + return (int64)(C.QRegularExpressionMatch_CapturedStartWithName(this.h, (*C.struct_miqt_string)(name_ms))) } -func (this *QRegularExpressionMatch) CapturedLengthWithName(name string) int { +func (this *QRegularExpressionMatch) CapturedLengthWithName(name string) int64 { name_ms := miqt_strdupg(name) defer C.free(name_ms) - return (int)(C.QRegularExpressionMatch_CapturedLengthWithName(this.h, (*C.struct_miqt_string)(name_ms))) + return (int64)(C.QRegularExpressionMatch_CapturedLengthWithName(this.h, (*C.struct_miqt_string)(name_ms))) } -func (this *QRegularExpressionMatch) CapturedEndWithName(name string) int { +func (this *QRegularExpressionMatch) CapturedEndWithName(name string) int64 { name_ms := miqt_strdupg(name) defer C.free(name_ms) - return (int)(C.QRegularExpressionMatch_CapturedEndWithName(this.h, (*C.struct_miqt_string)(name_ms))) + return (int64)(C.QRegularExpressionMatch_CapturedEndWithName(this.h, (*C.struct_miqt_string)(name_ms))) } func (this *QRegularExpressionMatch) Captured1(nth int) string { @@ -422,16 +447,16 @@ func (this *QRegularExpressionMatch) Captured1(nth int) string { return _ret } -func (this *QRegularExpressionMatch) CapturedStart1(nth int) int { - return (int)(C.QRegularExpressionMatch_CapturedStart1(this.h, (C.int)(nth))) +func (this *QRegularExpressionMatch) CapturedStart1(nth int) int64 { + return (int64)(C.QRegularExpressionMatch_CapturedStart1(this.h, (C.int)(nth))) } -func (this *QRegularExpressionMatch) CapturedLength1(nth int) int { - return (int)(C.QRegularExpressionMatch_CapturedLength1(this.h, (C.int)(nth))) +func (this *QRegularExpressionMatch) CapturedLength1(nth int) int64 { + return (int64)(C.QRegularExpressionMatch_CapturedLength1(this.h, (C.int)(nth))) } -func (this *QRegularExpressionMatch) CapturedEnd1(nth int) int { - return (int)(C.QRegularExpressionMatch_CapturedEnd1(this.h, (C.int)(nth))) +func (this *QRegularExpressionMatch) CapturedEnd1(nth int) int64 { + return (int64)(C.QRegularExpressionMatch_CapturedEnd1(this.h, (C.int)(nth))) } // Delete this object from C++ memory. @@ -448,6 +473,48 @@ func (this *QRegularExpressionMatch) GoGC() { }) } +type QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel struct { + h *C.QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel +} + +func (this *QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel) cPointer() *C.QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel { + if this == nil { + return nil + } + return this.h +} + +func newQtPrivate__QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel(h *C.QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel) *QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel { + if h == nil { + return nil + } + return &QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel{h: h} +} + +func newQtPrivate__QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel_U(h unsafe.Pointer) *QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel { + return newQtPrivate__QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel((*C.QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel)(h)) +} + +// NewQtPrivate__QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel constructs a new QtPrivate::QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel object. +func NewQtPrivate__QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel() *QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel { + ret := C.QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel_new() + return newQtPrivate__QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel(ret) +} + +// Delete this object from C++ memory. +func (this *QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel) Delete() { + C.QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel) GoGC() { + runtime.SetFinalizer(this, func(this *QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + type QRegularExpressionMatchIterator struct { h *C.QRegularExpressionMatchIterator } @@ -540,3 +607,55 @@ func (this *QRegularExpressionMatchIterator) GoGC() { runtime.KeepAlive(this.h) }) } + +type QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator struct { + h *C.QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator +} + +func (this *QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator) cPointer() *C.QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator { + if this == nil { + return nil + } + return this.h +} + +func newQtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator(h *C.QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator) *QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator { + if h == nil { + return nil + } + return &QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator{h: h} +} + +func newQtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator_U(h unsafe.Pointer) *QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator { + return newQtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator((*C.QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator)(h)) +} + +// NewQtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator constructs a new QtPrivate::QRegularExpressionMatchIteratorRangeBasedForIterator object. +func NewQtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator() *QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator { + ret := C.QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator_new() + return newQtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator(ret) +} + +// NewQtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator2 constructs a new QtPrivate::QRegularExpressionMatchIteratorRangeBasedForIterator object. +func NewQtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator2(iterator *QRegularExpressionMatchIterator) *QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator { + ret := C.QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator_new2(iterator.cPointer()) + return newQtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator(ret) +} + +func (this *QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator) OperatorMultiply() *QRegularExpressionMatch { + return newQRegularExpressionMatch_U(unsafe.Pointer(C.QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator_OperatorMultiply(this.h))) +} + +// Delete this object from C++ memory. +func (this *QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator) Delete() { + C.QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator) GoGC() { + runtime.SetFinalizer(this, func(this *QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} diff --git a/qt/gen_qregularexpression.h b/qt/gen_qregularexpression.h index 500cfb1..ee9ee08 100644 --- a/qt/gen_qregularexpression.h +++ b/qt/gen_qregularexpression.h @@ -17,10 +17,22 @@ extern "C" { class QRegularExpression; class QRegularExpressionMatch; class QRegularExpressionMatchIterator; +#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator) +typedef QtPrivate::QRegularExpressionMatchIteratorRangeBasedForIterator QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator; +#else +class QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator; +#endif +#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel) +typedef QtPrivate::QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel; +#else +class QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel; +#endif #else typedef struct QRegularExpression QRegularExpression; typedef struct QRegularExpressionMatch QRegularExpressionMatch; typedef struct QRegularExpressionMatchIterator QRegularExpressionMatchIterator; +typedef struct QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator; +typedef struct QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel; #endif QRegularExpression* QRegularExpression_new(); @@ -34,7 +46,7 @@ void QRegularExpression_Swap(QRegularExpression* self, QRegularExpression* other struct miqt_string* QRegularExpression_Pattern(const QRegularExpression* self); void QRegularExpression_SetPattern(QRegularExpression* self, struct miqt_string* pattern); bool QRegularExpression_IsValid(const QRegularExpression* self); -int QRegularExpression_PatternErrorOffset(const QRegularExpression* self); +ptrdiff_t QRegularExpression_PatternErrorOffset(const QRegularExpression* self); struct miqt_string* QRegularExpression_ErrorString(const QRegularExpression* self); int QRegularExpression_CaptureCount(const QRegularExpression* self); struct miqt_array* QRegularExpression_NamedCaptureGroups(const QRegularExpression* self); @@ -46,12 +58,13 @@ struct miqt_string* QRegularExpression_WildcardToRegularExpression(struct miqt_s struct miqt_string* QRegularExpression_AnchoredPattern(struct miqt_string* expression); 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, 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, int matchType); -QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch4(const QRegularExpression* self, struct miqt_string* subject, int offset, int matchType, int matchOptions); +QRegularExpressionMatch* QRegularExpression_Match2(const QRegularExpression* self, struct miqt_string* subject, ptrdiff_t offset); +QRegularExpressionMatch* QRegularExpression_Match3(const QRegularExpression* self, struct miqt_string* subject, ptrdiff_t offset, int matchType); +QRegularExpressionMatch* QRegularExpression_Match4(const QRegularExpression* self, struct miqt_string* subject, ptrdiff_t offset, int matchType, int matchOptions); +QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch2(const QRegularExpression* self, struct miqt_string* subject, ptrdiff_t offset); +QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch3(const QRegularExpression* self, struct miqt_string* subject, ptrdiff_t offset, int matchType); +QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch4(const QRegularExpression* self, struct miqt_string* subject, ptrdiff_t offset, int matchType, int matchOptions); +struct miqt_string* QRegularExpression_WildcardToRegularExpression2(struct miqt_string* str, int options); void QRegularExpression_Delete(QRegularExpression* self); QRegularExpressionMatch* QRegularExpressionMatch_new(); @@ -65,21 +78,26 @@ bool QRegularExpressionMatch_HasMatch(const QRegularExpressionMatch* self); bool QRegularExpressionMatch_HasPartialMatch(const QRegularExpressionMatch* self); bool QRegularExpressionMatch_IsValid(const QRegularExpressionMatch* self); int QRegularExpressionMatch_LastCapturedIndex(const QRegularExpressionMatch* self); +bool QRegularExpressionMatch_HasCaptured(const QRegularExpressionMatch* self, struct miqt_string* name); +bool QRegularExpressionMatch_HasCapturedWithNth(const QRegularExpressionMatch* self, int nth); struct miqt_string* QRegularExpressionMatch_Captured(const QRegularExpressionMatch* self); struct miqt_string* QRegularExpressionMatch_CapturedWithName(const QRegularExpressionMatch* self, struct miqt_string* name); struct miqt_array* QRegularExpressionMatch_CapturedTexts(const QRegularExpressionMatch* self); -int QRegularExpressionMatch_CapturedStart(const QRegularExpressionMatch* self); -int QRegularExpressionMatch_CapturedLength(const QRegularExpressionMatch* self); -int QRegularExpressionMatch_CapturedEnd(const QRegularExpressionMatch* self); -int QRegularExpressionMatch_CapturedStartWithName(const QRegularExpressionMatch* self, struct miqt_string* name); -int QRegularExpressionMatch_CapturedLengthWithName(const QRegularExpressionMatch* self, struct miqt_string* name); -int QRegularExpressionMatch_CapturedEndWithName(const QRegularExpressionMatch* self, struct miqt_string* name); +ptrdiff_t QRegularExpressionMatch_CapturedStart(const QRegularExpressionMatch* self); +ptrdiff_t QRegularExpressionMatch_CapturedLength(const QRegularExpressionMatch* self); +ptrdiff_t QRegularExpressionMatch_CapturedEnd(const QRegularExpressionMatch* self); +ptrdiff_t QRegularExpressionMatch_CapturedStartWithName(const QRegularExpressionMatch* self, struct miqt_string* name); +ptrdiff_t QRegularExpressionMatch_CapturedLengthWithName(const QRegularExpressionMatch* self, struct miqt_string* name); +ptrdiff_t QRegularExpressionMatch_CapturedEndWithName(const QRegularExpressionMatch* self, struct miqt_string* name); struct miqt_string* QRegularExpressionMatch_Captured1(const QRegularExpressionMatch* self, int nth); -int QRegularExpressionMatch_CapturedStart1(const QRegularExpressionMatch* self, int nth); -int QRegularExpressionMatch_CapturedLength1(const QRegularExpressionMatch* self, int nth); -int QRegularExpressionMatch_CapturedEnd1(const QRegularExpressionMatch* self, int nth); +ptrdiff_t QRegularExpressionMatch_CapturedStart1(const QRegularExpressionMatch* self, int nth); +ptrdiff_t QRegularExpressionMatch_CapturedLength1(const QRegularExpressionMatch* self, int nth); +ptrdiff_t QRegularExpressionMatch_CapturedEnd1(const QRegularExpressionMatch* self, int nth); void QRegularExpressionMatch_Delete(QRegularExpressionMatch* self); +QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel* QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel_new(); +void QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel_Delete(QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIteratorSentinel* self); + QRegularExpressionMatchIterator* QRegularExpressionMatchIterator_new(); QRegularExpressionMatchIterator* QRegularExpressionMatchIterator_new2(QRegularExpressionMatchIterator* iterator); void QRegularExpressionMatchIterator_OperatorAssign(QRegularExpressionMatchIterator* self, QRegularExpressionMatchIterator* iterator); @@ -93,6 +111,11 @@ int QRegularExpressionMatchIterator_MatchType(const QRegularExpressionMatchItera int QRegularExpressionMatchIterator_MatchOptions(const QRegularExpressionMatchIterator* self); void QRegularExpressionMatchIterator_Delete(QRegularExpressionMatchIterator* self); +QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator* QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator_new(); +QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator* QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator_new2(QRegularExpressionMatchIterator* iterator); +QRegularExpressionMatch* QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator_OperatorMultiply(const QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator* self); +void QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator_Delete(QtPrivate__QRegularExpressionMatchIteratorRangeBasedForIterator* self); + #ifdef __cplusplus } /* extern C */ #endif diff --git a/qt/gen_qresource.cpp b/qt/gen_qresource.cpp index 8f58f83..c4e39c4 100644 --- a/qt/gen_qresource.cpp +++ b/qt/gen_qresource.cpp @@ -1,6 +1,5 @@ #include #include -#include #include #include #include @@ -83,31 +82,6 @@ QDateTime* QResource_LastModified(const QResource* self) { return new QDateTime(self->lastModified()); } -void QResource_AddSearchPath(struct miqt_string* path) { - QString path_QString = QString::fromUtf8(&path->data, path->len); - QResource::addSearchPath(path_QString); -} - -struct miqt_array* QResource_SearchPaths() { - QStringList _ret = QResource::searchPaths(); - // Convert QList<> from C++ memory to manually-managed C memory - struct miqt_string** _arr = static_cast(malloc(sizeof(struct miqt_string*) * _ret.length())); - for (size_t i = 0, e = _ret.length(); i < e; ++i) { - QString _lv_ret = _ret[i]; - // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory - QByteArray _lv_b = _lv_ret.toUtf8(); - _arr[i] = miqt_strdup(_lv_b.data(), _lv_b.length()); - } - struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); - _out->len = _ret.length(); - _out->data = static_cast(_arr); - return _out; -} - -bool QResource_IsCompressed(const QResource* self) { - return self->isCompressed(); -} - bool QResource_RegisterResource(struct miqt_string* rccFilename) { QString rccFilename_QString = QString::fromUtf8(&rccFilename->data, rccFilename->len); return QResource::registerResource(rccFilename_QString); diff --git a/qt/gen_qresource.go b/qt/gen_qresource.go index 735f4cd..513d96d 100644 --- a/qt/gen_qresource.go +++ b/qt/gen_qresource.go @@ -130,30 +130,6 @@ func (this *QResource) LastModified() *QDateTime { return _goptr } -func QResource_AddSearchPath(path string) { - path_ms := miqt_strdupg(path) - defer C.free(path_ms) - C.QResource_AddSearchPath((*C.struct_miqt_string)(path_ms)) -} - -func QResource_SearchPaths() []string { - var _ma *C.struct_miqt_array = C.QResource_SearchPaths() - _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++ { - var _lv_ms *C.struct_miqt_string = _outCast[i] - _lv_ret := C.GoStringN(&_lv_ms.data, C.int(int64(_lv_ms.len))) - C.free(unsafe.Pointer(_lv_ms)) - _ret[i] = _lv_ret - } - C.free(unsafe.Pointer(_ma)) - return _ret -} - -func (this *QResource) IsCompressed() bool { - return (bool)(C.QResource_IsCompressed(this.h)) -} - func QResource_RegisterResource(rccFilename string) bool { rccFilename_ms := miqt_strdupg(rccFilename) defer C.free(rccFilename_ms) diff --git a/qt/gen_qresource.h b/qt/gen_qresource.h index 79fbc63..2d8bf27 100644 --- a/qt/gen_qresource.h +++ b/qt/gen_qresource.h @@ -40,9 +40,6 @@ const unsigned char* QResource_Data(const QResource* self); long long QResource_UncompressedSize(const QResource* self); QByteArray* QResource_UncompressedData(const QResource* self); QDateTime* QResource_LastModified(const QResource* self); -void QResource_AddSearchPath(struct miqt_string* path); -struct miqt_array* QResource_SearchPaths(); -bool QResource_IsCompressed(const QResource* self); bool QResource_RegisterResource(struct miqt_string* rccFilename); bool QResource_UnregisterResource(struct miqt_string* rccFilename); bool QResource_RegisterResourceWithRccData(const unsigned char* rccData); diff --git a/qt/gen_qresultstore.cpp b/qt/gen_qresultstore.cpp index db0f28e..dafc5c1 100644 --- a/qt/gen_qresultstore.cpp +++ b/qt/gen_qresultstore.cpp @@ -45,10 +45,6 @@ int QtPrivate__ResultIteratorBase_ResultIndex(const QtPrivate__ResultIteratorBas return self->resultIndex(); } -QtPrivate__ResultIteratorBase* QtPrivate__ResultIteratorBase_OperatorPlusPlus(QtPrivate__ResultIteratorBase* self) { - return new QtPrivate::ResultIteratorBase(self->operator++()); -} - int QtPrivate__ResultIteratorBase_BatchSize(const QtPrivate__ResultIteratorBase* self) { return self->batchSize(); } @@ -57,14 +53,6 @@ void QtPrivate__ResultIteratorBase_BatchedAdvance(QtPrivate__ResultIteratorBase* self->batchedAdvance(); } -bool QtPrivate__ResultIteratorBase_OperatorEqual(const QtPrivate__ResultIteratorBase* self, QtPrivate__ResultIteratorBase* other) { - return self->operator==(*other); -} - -bool QtPrivate__ResultIteratorBase_OperatorNotEqual(const QtPrivate__ResultIteratorBase* self, QtPrivate__ResultIteratorBase* other) { - return self->operator!=(*other); -} - bool QtPrivate__ResultIteratorBase_IsVector(const QtPrivate__ResultIteratorBase* self) { return self->isVector(); } @@ -73,6 +61,10 @@ bool QtPrivate__ResultIteratorBase_CanIncrementVectorIndex(const QtPrivate__Resu return self->canIncrementVectorIndex(); } +bool QtPrivate__ResultIteratorBase_IsValid(const QtPrivate__ResultIteratorBase* self) { + return self->isValid(); +} + void QtPrivate__ResultIteratorBase_Delete(QtPrivate__ResultIteratorBase* self) { delete self; } @@ -81,10 +73,6 @@ QtPrivate__ResultStoreBase* QtPrivate__ResultStoreBase_new() { return new QtPrivate::ResultStoreBase(); } -QtPrivate__ResultStoreBase* QtPrivate__ResultStoreBase_new2(QtPrivate__ResultStoreBase* param1) { - return new QtPrivate::ResultStoreBase(*param1); -} - void QtPrivate__ResultStoreBase_SetFilterMode(QtPrivate__ResultStoreBase* self, bool enable) { self->setFilterMode(enable); } @@ -101,22 +89,10 @@ int QtPrivate__ResultStoreBase_AddResults(QtPrivate__ResultStoreBase* self, int return self->addResults(static_cast(index), results, static_cast(vectorSize), static_cast(logicalCount)); } -QtPrivate__ResultIteratorBase* QtPrivate__ResultStoreBase_Begin(const QtPrivate__ResultStoreBase* self) { - return new QtPrivate::ResultIteratorBase(self->begin()); -} - -QtPrivate__ResultIteratorBase* QtPrivate__ResultStoreBase_End(const QtPrivate__ResultStoreBase* self) { - return new QtPrivate::ResultIteratorBase(self->end()); -} - bool QtPrivate__ResultStoreBase_HasNextResult(const QtPrivate__ResultStoreBase* self) { return self->hasNextResult(); } -QtPrivate__ResultIteratorBase* QtPrivate__ResultStoreBase_ResultAt(const QtPrivate__ResultStoreBase* self, int index) { - return new QtPrivate::ResultIteratorBase(self->resultAt(static_cast(index))); -} - bool QtPrivate__ResultStoreBase_Contains(const QtPrivate__ResultStoreBase* self, int index) { return self->contains(static_cast(index)); } @@ -129,10 +105,6 @@ 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 e332ebc..d05ee01 100644 --- a/qt/gen_qresultstore.go +++ b/qt/gen_qresultstore.go @@ -115,13 +115,6 @@ func (this *QtPrivate__ResultIteratorBase) ResultIndex() int { return (int)(C.QtPrivate__ResultIteratorBase_ResultIndex(this.h)) } -func (this *QtPrivate__ResultIteratorBase) OperatorPlusPlus() *QtPrivate__ResultIteratorBase { - _ret := C.QtPrivate__ResultIteratorBase_OperatorPlusPlus(this.h) - _goptr := newQtPrivate__ResultIteratorBase(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - func (this *QtPrivate__ResultIteratorBase) BatchSize() int { return (int)(C.QtPrivate__ResultIteratorBase_BatchSize(this.h)) } @@ -130,14 +123,6 @@ func (this *QtPrivate__ResultIteratorBase) BatchedAdvance() { C.QtPrivate__ResultIteratorBase_BatchedAdvance(this.h) } -func (this *QtPrivate__ResultIteratorBase) OperatorEqual(other *QtPrivate__ResultIteratorBase) bool { - return (bool)(C.QtPrivate__ResultIteratorBase_OperatorEqual(this.h, other.cPointer())) -} - -func (this *QtPrivate__ResultIteratorBase) OperatorNotEqual(other *QtPrivate__ResultIteratorBase) bool { - return (bool)(C.QtPrivate__ResultIteratorBase_OperatorNotEqual(this.h, other.cPointer())) -} - func (this *QtPrivate__ResultIteratorBase) IsVector() bool { return (bool)(C.QtPrivate__ResultIteratorBase_IsVector(this.h)) } @@ -146,6 +131,10 @@ func (this *QtPrivate__ResultIteratorBase) CanIncrementVectorIndex() bool { return (bool)(C.QtPrivate__ResultIteratorBase_CanIncrementVectorIndex(this.h)) } +func (this *QtPrivate__ResultIteratorBase) IsValid() bool { + return (bool)(C.QtPrivate__ResultIteratorBase_IsValid(this.h)) +} + // Delete this object from C++ memory. func (this *QtPrivate__ResultIteratorBase) Delete() { C.QtPrivate__ResultIteratorBase_Delete(this.h) @@ -188,12 +177,6 @@ func NewQtPrivate__ResultStoreBase() *QtPrivate__ResultStoreBase { return newQtPrivate__ResultStoreBase(ret) } -// NewQtPrivate__ResultStoreBase2 constructs a new QtPrivate::ResultStoreBase object. -func NewQtPrivate__ResultStoreBase2(param1 *QtPrivate__ResultStoreBase) *QtPrivate__ResultStoreBase { - ret := C.QtPrivate__ResultStoreBase_new2(param1.cPointer()) - return newQtPrivate__ResultStoreBase(ret) -} - func (this *QtPrivate__ResultStoreBase) SetFilterMode(enable bool) { C.QtPrivate__ResultStoreBase_SetFilterMode(this.h, (C.bool)(enable)) } @@ -210,31 +193,10 @@ func (this *QtPrivate__ResultStoreBase) AddResults(index int, results unsafe.Poi return (int)(C.QtPrivate__ResultStoreBase_AddResults(this.h, (C.int)(index), results, (C.int)(vectorSize), (C.int)(logicalCount))) } -func (this *QtPrivate__ResultStoreBase) Begin() *QtPrivate__ResultIteratorBase { - _ret := C.QtPrivate__ResultStoreBase_Begin(this.h) - _goptr := newQtPrivate__ResultIteratorBase(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QtPrivate__ResultStoreBase) End() *QtPrivate__ResultIteratorBase { - _ret := C.QtPrivate__ResultStoreBase_End(this.h) - _goptr := newQtPrivate__ResultIteratorBase(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - func (this *QtPrivate__ResultStoreBase) HasNextResult() bool { return (bool)(C.QtPrivate__ResultStoreBase_HasNextResult(this.h)) } -func (this *QtPrivate__ResultStoreBase) ResultAt(index int) *QtPrivate__ResultIteratorBase { - _ret := C.QtPrivate__ResultStoreBase_ResultAt(this.h, (C.int)(index)) - _goptr := newQtPrivate__ResultIteratorBase(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - func (this *QtPrivate__ResultStoreBase) Contains(index int) bool { return (bool)(C.QtPrivate__ResultStoreBase_Contains(this.h, (C.int)(index))) } @@ -247,10 +209,6 @@ 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 27b1ec1..fd9553a 100644 --- a/qt/gen_qresultstore.h +++ b/qt/gen_qresultstore.h @@ -46,29 +46,22 @@ void QtPrivate__ResultItem_Delete(QtPrivate__ResultItem* self); QtPrivate__ResultIteratorBase* QtPrivate__ResultIteratorBase_new(); int QtPrivate__ResultIteratorBase_VectorIndex(const QtPrivate__ResultIteratorBase* self); int QtPrivate__ResultIteratorBase_ResultIndex(const QtPrivate__ResultIteratorBase* self); -QtPrivate__ResultIteratorBase* QtPrivate__ResultIteratorBase_OperatorPlusPlus(QtPrivate__ResultIteratorBase* self); int QtPrivate__ResultIteratorBase_BatchSize(const QtPrivate__ResultIteratorBase* self); void QtPrivate__ResultIteratorBase_BatchedAdvance(QtPrivate__ResultIteratorBase* self); -bool QtPrivate__ResultIteratorBase_OperatorEqual(const QtPrivate__ResultIteratorBase* self, QtPrivate__ResultIteratorBase* other); -bool QtPrivate__ResultIteratorBase_OperatorNotEqual(const QtPrivate__ResultIteratorBase* self, QtPrivate__ResultIteratorBase* other); bool QtPrivate__ResultIteratorBase_IsVector(const QtPrivate__ResultIteratorBase* self); bool QtPrivate__ResultIteratorBase_CanIncrementVectorIndex(const QtPrivate__ResultIteratorBase* self); +bool QtPrivate__ResultIteratorBase_IsValid(const QtPrivate__ResultIteratorBase* self); void QtPrivate__ResultIteratorBase_Delete(QtPrivate__ResultIteratorBase* self); QtPrivate__ResultStoreBase* QtPrivate__ResultStoreBase_new(); -QtPrivate__ResultStoreBase* QtPrivate__ResultStoreBase_new2(QtPrivate__ResultStoreBase* param1); void QtPrivate__ResultStoreBase_SetFilterMode(QtPrivate__ResultStoreBase* self, bool enable); bool QtPrivate__ResultStoreBase_FilterMode(const QtPrivate__ResultStoreBase* self); int QtPrivate__ResultStoreBase_AddResult(QtPrivate__ResultStoreBase* self, int index, const void* result); int QtPrivate__ResultStoreBase_AddResults(QtPrivate__ResultStoreBase* self, int index, const void* results, int vectorSize, int logicalCount); -QtPrivate__ResultIteratorBase* QtPrivate__ResultStoreBase_Begin(const QtPrivate__ResultStoreBase* self); -QtPrivate__ResultIteratorBase* QtPrivate__ResultStoreBase_End(const QtPrivate__ResultStoreBase* self); bool QtPrivate__ResultStoreBase_HasNextResult(const QtPrivate__ResultStoreBase* self); -QtPrivate__ResultIteratorBase* QtPrivate__ResultStoreBase_ResultAt(const QtPrivate__ResultStoreBase* self, int index); 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_qrgbafloat.cpp b/qt/gen_qrgbafloat.cpp new file mode 100644 index 0000000..928bd6b --- /dev/null +++ b/qt/gen_qrgbafloat.cpp @@ -0,0 +1,4 @@ +#include "qrgbafloat.h" +#include "gen_qrgbafloat.h" +#include "_cgo_export.h" + diff --git a/qt/gen_qcontainerfwd.go b/qt/gen_qrgbafloat.go similarity index 62% rename from qt/gen_qcontainerfwd.go rename to qt/gen_qrgbafloat.go index b3d915a..1da08d5 100644 --- a/qt/gen_qcontainerfwd.go +++ b/qt/gen_qrgbafloat.go @@ -2,7 +2,7 @@ package qt /* -#include "gen_qcontainerfwd.h" +#include "gen_qrgbafloat.h" #include */ diff --git a/qt/gen_qcontainerfwd.h b/qt/gen_qrgbafloat.h similarity index 82% rename from qt/gen_qcontainerfwd.h rename to qt/gen_qrgbafloat.h index c796f30..51740c5 100644 --- a/qt/gen_qcontainerfwd.h +++ b/qt/gen_qrgbafloat.h @@ -1,5 +1,5 @@ -#ifndef GEN_QCONTAINERFWD_H -#define GEN_QCONTAINERFWD_H +#ifndef GEN_QRGBAFLOAT_H +#define GEN_QRGBAFLOAT_H #include #include diff --git a/qt/gen_qrubberband.cpp b/qt/gen_qrubberband.cpp index dd55a5e..ec85d58 100644 --- a/qt/gen_qrubberband.cpp +++ b/qt/gen_qrubberband.cpp @@ -34,13 +34,6 @@ struct miqt_string* QRubberBand_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QRubberBand_TrUtf8(const char* s) { - QString _ret = QRubberBand::trUtf8(s); - // 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()); -} - int QRubberBand_Shape(const QRubberBand* self) { QRubberBand::Shape _ret = self->shape(); return static_cast(_ret); @@ -84,20 +77,6 @@ struct miqt_string* QRubberBand_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QRubberBand_TrUtf82(const char* s, const char* c) { - QString _ret = QRubberBand::trUtf8(s, c); - // 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* QRubberBand_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QRubberBand::trUtf8(s, c, static_cast(n)); - // 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 QRubberBand_Delete(QRubberBand* self) { delete self; } diff --git a/qt/gen_qrubberband.go b/qt/gen_qrubberband.go index 3c4bf40..fba78bb 100644 --- a/qt/gen_qrubberband.go +++ b/qt/gen_qrubberband.go @@ -74,15 +74,6 @@ func QRubberBand_Tr(s string) string { return _ret } -func QRubberBand_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QRubberBand_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QRubberBand) Shape() QRubberBand__Shape { return (QRubberBand__Shape)(C.QRubberBand_Shape(this.h)) } @@ -133,28 +124,6 @@ func QRubberBand_Tr3(s string, c string, n int) string { return _ret } -func QRubberBand_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QRubberBand_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QRubberBand_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QRubberBand_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QRubberBand) Delete() { C.QRubberBand_Delete(this.h) diff --git a/qt/gen_qrubberband.h b/qt/gen_qrubberband.h index 56b2033..96725c6 100644 --- a/qt/gen_qrubberband.h +++ b/qt/gen_qrubberband.h @@ -34,7 +34,6 @@ QRubberBand* QRubberBand_new2(int param1, QWidget* param2); QMetaObject* QRubberBand_MetaObject(const QRubberBand* self); void* QRubberBand_Metacast(QRubberBand* self, const char* param1); struct miqt_string* QRubberBand_Tr(const char* s); -struct miqt_string* QRubberBand_TrUtf8(const char* s); 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); @@ -44,8 +43,6 @@ void QRubberBand_Resize(QRubberBand* self, int w, int h); void QRubberBand_ResizeWithQSize(QRubberBand* self, QSize* s); struct miqt_string* QRubberBand_Tr2(const char* s, const char* c); struct miqt_string* QRubberBand_Tr3(const char* s, const char* c, int n); -struct miqt_string* QRubberBand_TrUtf82(const char* s, const char* c); -struct miqt_string* QRubberBand_TrUtf83(const char* s, const char* c, int n); void QRubberBand_Delete(QRubberBand* self); #ifdef __cplusplus diff --git a/qt/gen_qrunnable.cpp b/qt/gen_qrunnable.cpp index 3d86cf4..12deef8 100644 --- a/qt/gen_qrunnable.cpp +++ b/qt/gen_qrunnable.cpp @@ -11,12 +11,8 @@ bool QRunnable_AutoDelete(const QRunnable* self) { return self->autoDelete(); } -void QRunnable_SetAutoDelete(QRunnable* self, bool _autoDelete) { - self->setAutoDelete(_autoDelete); -} - -void QRunnable_OperatorAssign(QRunnable* self, QRunnable* param1) { - self->operator=(*param1); +void QRunnable_SetAutoDelete(QRunnable* self, bool autoDelete) { + self->setAutoDelete(autoDelete); } void QRunnable_Delete(QRunnable* self) { diff --git a/qt/gen_qrunnable.go b/qt/gen_qrunnable.go index a3a7ca0..523e93d 100644 --- a/qt/gen_qrunnable.go +++ b/qt/gen_qrunnable.go @@ -43,12 +43,8 @@ func (this *QRunnable) AutoDelete() bool { return (bool)(C.QRunnable_AutoDelete(this.h)) } -func (this *QRunnable) SetAutoDelete(_autoDelete bool) { - C.QRunnable_SetAutoDelete(this.h, (C.bool)(_autoDelete)) -} - -func (this *QRunnable) OperatorAssign(param1 *QRunnable) { - C.QRunnable_OperatorAssign(this.h, param1.cPointer()) +func (this *QRunnable) SetAutoDelete(autoDelete bool) { + C.QRunnable_SetAutoDelete(this.h, (C.bool)(autoDelete)) } // Delete this object from C++ memory. diff --git a/qt/gen_qrunnable.h b/qt/gen_qrunnable.h index da811ac..7e018aa 100644 --- a/qt/gen_qrunnable.h +++ b/qt/gen_qrunnable.h @@ -21,8 +21,7 @@ typedef struct QRunnable QRunnable; void QRunnable_Run(QRunnable* self); bool QRunnable_AutoDelete(const QRunnable* self); -void QRunnable_SetAutoDelete(QRunnable* self, bool _autoDelete); -void QRunnable_OperatorAssign(QRunnable* self, QRunnable* param1); +void QRunnable_SetAutoDelete(QRunnable* self, bool autoDelete); void QRunnable_Delete(QRunnable* self); #ifdef __cplusplus diff --git a/qt/gen_qsavefile.cpp b/qt/gen_qsavefile.cpp index 0706f7e..b98c866 100644 --- a/qt/gen_qsavefile.cpp +++ b/qt/gen_qsavefile.cpp @@ -41,13 +41,6 @@ struct miqt_string* QSaveFile_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QSaveFile_TrUtf8(const char* s) { - QString _ret = QSaveFile::trUtf8(s); - // 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* QSaveFile_FileName(const QSaveFile* self) { QString _ret = self->fileName(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -61,7 +54,7 @@ void QSaveFile_SetFileName(QSaveFile* self, struct miqt_string* name) { } bool QSaveFile_Open(QSaveFile* self, int flags) { - return self->open(static_cast(flags)); + return self->open(static_cast(flags)); } bool QSaveFile_Commit(QSaveFile* self) { @@ -94,20 +87,6 @@ struct miqt_string* QSaveFile_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QSaveFile_TrUtf82(const char* s, const char* c) { - QString _ret = QSaveFile::trUtf8(s, c); - // 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* QSaveFile_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QSaveFile::trUtf8(s, c, static_cast(n)); - // 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 QSaveFile_Delete(QSaveFile* self) { delete self; } diff --git a/qt/gen_qsavefile.go b/qt/gen_qsavefile.go index e589582..806c228 100644 --- a/qt/gen_qsavefile.go +++ b/qt/gen_qsavefile.go @@ -83,15 +83,6 @@ func QSaveFile_Tr(s string) string { return _ret } -func QSaveFile_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSaveFile_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QSaveFile) FileName() string { var _ms *C.struct_miqt_string = C.QSaveFile_FileName(this.h) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) @@ -105,7 +96,7 @@ func (this *QSaveFile) SetFileName(name string) { C.QSaveFile_SetFileName(this.h, (*C.struct_miqt_string)(name_ms)) } -func (this *QSaveFile) Open(flags QIODevice__OpenModeFlag) bool { +func (this *QSaveFile) Open(flags QIODeviceBase__OpenModeFlag) bool { return (bool)(C.QSaveFile_Open(this.h, (C.int)(flags))) } @@ -147,28 +138,6 @@ func QSaveFile_Tr3(s string, c string, n int) string { return _ret } -func QSaveFile_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSaveFile_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QSaveFile_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSaveFile_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QSaveFile) Delete() { C.QSaveFile_Delete(this.h) diff --git a/qt/gen_qsavefile.h b/qt/gen_qsavefile.h index f79ddb0..3d5aa76 100644 --- a/qt/gen_qsavefile.h +++ b/qt/gen_qsavefile.h @@ -30,7 +30,6 @@ QSaveFile* QSaveFile_new4(QObject* parent); QMetaObject* QSaveFile_MetaObject(const QSaveFile* self); void* QSaveFile_Metacast(QSaveFile* self, const char* param1); struct miqt_string* QSaveFile_Tr(const char* s); -struct miqt_string* QSaveFile_TrUtf8(const char* s); struct miqt_string* QSaveFile_FileName(const QSaveFile* self); void QSaveFile_SetFileName(QSaveFile* self, struct miqt_string* name); bool QSaveFile_Open(QSaveFile* self, int flags); @@ -40,8 +39,6 @@ void QSaveFile_SetDirectWriteFallback(QSaveFile* self, bool enabled); bool QSaveFile_DirectWriteFallback(const QSaveFile* self); struct miqt_string* QSaveFile_Tr2(const char* s, const char* c); struct miqt_string* QSaveFile_Tr3(const char* s, const char* c, int n); -struct miqt_string* QSaveFile_TrUtf82(const char* s, const char* c); -struct miqt_string* QSaveFile_TrUtf83(const char* s, const char* c, int n); void QSaveFile_Delete(QSaveFile* self); #ifdef __cplusplus diff --git a/qt/gen_qscopedpointer.cpp b/qt/gen_qscopedpointer.cpp index fcaccf0..c3bf655 100644 --- a/qt/gen_qscopedpointer.cpp +++ b/qt/gen_qscopedpointer.cpp @@ -7,6 +7,10 @@ void QScopedPointerPodDeleter_Cleanup(void* pointer) { QScopedPointerPodDeleter::cleanup(pointer); } +void QScopedPointerPodDeleter_OperatorCall(const QScopedPointerPodDeleter* self, void* pointer) { + self->operator()(pointer); +} + void QScopedPointerPodDeleter_Delete(QScopedPointerPodDeleter* self) { delete self; } diff --git a/qt/gen_qscopedpointer.go b/qt/gen_qscopedpointer.go index d7d4579..39bc4eb 100644 --- a/qt/gen_qscopedpointer.go +++ b/qt/gen_qscopedpointer.go @@ -39,6 +39,10 @@ func QScopedPointerPodDeleter_Cleanup(pointer unsafe.Pointer) { C.QScopedPointerPodDeleter_Cleanup(pointer) } +func (this *QScopedPointerPodDeleter) OperatorCall(pointer unsafe.Pointer) { + C.QScopedPointerPodDeleter_OperatorCall(this.h, pointer) +} + // Delete this object from C++ memory. func (this *QScopedPointerPodDeleter) Delete() { C.QScopedPointerPodDeleter_Delete(this.h) diff --git a/qt/gen_qscopedpointer.h b/qt/gen_qscopedpointer.h index 9299c71..ba95a90 100644 --- a/qt/gen_qscopedpointer.h +++ b/qt/gen_qscopedpointer.h @@ -20,6 +20,7 @@ typedef struct QScopedPointerPodDeleter QScopedPointerPodDeleter; #endif void QScopedPointerPodDeleter_Cleanup(void* pointer); +void QScopedPointerPodDeleter_OperatorCall(const QScopedPointerPodDeleter* self, void* pointer); void QScopedPointerPodDeleter_Delete(QScopedPointerPodDeleter* self); #ifdef __cplusplus diff --git a/qt/gen_qscreen.cpp b/qt/gen_qscreen.cpp index 1dd89aa..f2f180c 100644 --- a/qt/gen_qscreen.cpp +++ b/qt/gen_qscreen.cpp @@ -29,13 +29,6 @@ struct miqt_string* QScreen_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QScreen_TrUtf8(const char* s) { - QString _ret = QScreen::trUtf8(s); - // 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* QScreen_Name(const QScreen* self) { QString _ret = self->name(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -171,15 +164,6 @@ int QScreen_NativeOrientation(const QScreen* self) { return static_cast(_ret); } -int QScreen_OrientationUpdateMask(const QScreen* self) { - Qt::ScreenOrientations _ret = self->orientationUpdateMask(); - return static_cast(_ret); -} - -void QScreen_SetOrientationUpdateMask(QScreen* self, int mask) { - self->setOrientationUpdateMask(static_cast(mask)); -} - int QScreen_AngleBetween(const QScreen* self, int a, int b) { return self->angleBetween(static_cast(a), static_cast(b)); } @@ -200,8 +184,8 @@ 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))); +QPixmap* QScreen_GrabWindow(QScreen* self) { + return new QPixmap(self->grabWindow()); } double QScreen_RefreshRate(const QScreen* self) { @@ -335,18 +319,8 @@ struct miqt_string* QScreen_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QScreen_TrUtf82(const char* s, const char* c) { - QString _ret = QScreen::trUtf8(s, c); - // 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* QScreen_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QScreen::trUtf8(s, c, static_cast(n)); - // 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()); +QPixmap* QScreen_GrabWindow1(QScreen* self, uintptr_t window) { + return new QPixmap(self->grabWindow(static_cast(window))); } QPixmap* QScreen_GrabWindow2(QScreen* self, uintptr_t window, int x) { diff --git a/qt/gen_qscreen.go b/qt/gen_qscreen.go index bce31c2..682215b 100644 --- a/qt/gen_qscreen.go +++ b/qt/gen_qscreen.go @@ -56,15 +56,6 @@ func QScreen_Tr(s string) string { return _ret } -func QScreen_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QScreen_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QScreen) Name() string { var _ms *C.struct_miqt_string = C.QScreen_Name(this.h) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) @@ -215,14 +206,6 @@ func (this *QScreen) NativeOrientation() ScreenOrientation { return (ScreenOrientation)(C.QScreen_NativeOrientation(this.h)) } -func (this *QScreen) OrientationUpdateMask() ScreenOrientation { - return (ScreenOrientation)(C.QScreen_OrientationUpdateMask(this.h)) -} - -func (this *QScreen) SetOrientationUpdateMask(mask ScreenOrientation) { - C.QScreen_SetOrientationUpdateMask(this.h, (C.int)(mask)) -} - func (this *QScreen) AngleBetween(a ScreenOrientation, b ScreenOrientation) int { return (int)(C.QScreen_AngleBetween(this.h, (C.int)(a), (C.int)(b))) } @@ -249,8 +232,8 @@ func (this *QScreen) IsLandscape(orientation ScreenOrientation) bool { return (bool)(C.QScreen_IsLandscape(this.h, (C.int)(orientation))) } -func (this *QScreen) GrabWindow(window uintptr) *QPixmap { - _ret := C.QScreen_GrabWindow(this.h, (C.uintptr_t)(window)) +func (this *QScreen) GrabWindow() *QPixmap { + _ret := C.QScreen_GrabWindow(this.h) _goptr := newQPixmap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -462,26 +445,11 @@ func QScreen_Tr3(s string, c string, n int) string { return _ret } -func QScreen_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QScreen_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QScreen_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QScreen_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret +func (this *QScreen) GrabWindow1(window uintptr) *QPixmap { + _ret := C.QScreen_GrabWindow1(this.h, (C.uintptr_t)(window)) + _goptr := newQPixmap(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr } func (this *QScreen) GrabWindow2(window uintptr, x int) *QPixmap { diff --git a/qt/gen_qscreen.h b/qt/gen_qscreen.h index 905775f..7db68d3 100644 --- a/qt/gen_qscreen.h +++ b/qt/gen_qscreen.h @@ -36,7 +36,6 @@ typedef struct QTransform QTransform; QMetaObject* QScreen_MetaObject(const QScreen* self); void* QScreen_Metacast(QScreen* self, const char* param1); struct miqt_string* QScreen_Tr(const char* s); -struct miqt_string* QScreen_TrUtf8(const char* s); struct miqt_string* QScreen_Name(const QScreen* self); struct miqt_string* QScreen_Manufacturer(const QScreen* self); struct miqt_string* QScreen_Model(const QScreen* self); @@ -63,14 +62,12 @@ QRect* QScreen_AvailableVirtualGeometry(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, 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); +QPixmap* QScreen_GrabWindow(QScreen* self); double QScreen_RefreshRate(const QScreen* self); void QScreen_GeometryChanged(QScreen* self, QRect* geometry); void QScreen_connect_GeometryChanged(QScreen* self, void* slot); @@ -92,8 +89,7 @@ void QScreen_RefreshRateChanged(QScreen* self, double refreshRate); void QScreen_connect_RefreshRateChanged(QScreen* self, void* slot); struct miqt_string* QScreen_Tr2(const char* s, const char* c); struct miqt_string* QScreen_Tr3(const char* s, const char* c, int n); -struct miqt_string* QScreen_TrUtf82(const char* s, const char* c); -struct miqt_string* QScreen_TrUtf83(const char* s, const char* c, int n); +QPixmap* QScreen_GrabWindow1(QScreen* self, uintptr_t window); QPixmap* QScreen_GrabWindow2(QScreen* self, uintptr_t window, int x); QPixmap* QScreen_GrabWindow3(QScreen* self, uintptr_t window, int x, int y); QPixmap* QScreen_GrabWindow4(QScreen* self, uintptr_t window, int x, int y, int w); diff --git a/qt/gen_qscrollarea.cpp b/qt/gen_qscrollarea.cpp index c6f4472..59b6a54 100644 --- a/qt/gen_qscrollarea.cpp +++ b/qt/gen_qscrollarea.cpp @@ -32,13 +32,6 @@ struct miqt_string* QScrollArea_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QScrollArea_TrUtf8(const char* s) { - QString _ret = QScrollArea::trUtf8(s); - // 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()); -} - QWidget* QScrollArea_Widget(const QScrollArea* self) { return self->widget(); } @@ -98,20 +91,6 @@ struct miqt_string* QScrollArea_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QScrollArea_TrUtf82(const char* s, const char* c) { - QString _ret = QScrollArea::trUtf8(s, c); - // 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* QScrollArea_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QScrollArea::trUtf8(s, c, static_cast(n)); - // 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 QScrollArea_EnsureVisible3(QScrollArea* self, int x, int y, int xmargin) { self->ensureVisible(static_cast(x), static_cast(y), static_cast(xmargin)); } diff --git a/qt/gen_qscrollarea.go b/qt/gen_qscrollarea.go index 6aea3a7..25d6bb9 100644 --- a/qt/gen_qscrollarea.go +++ b/qt/gen_qscrollarea.go @@ -67,15 +67,6 @@ func QScrollArea_Tr(s string) string { return _ret } -func QScrollArea_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QScrollArea_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QScrollArea) Widget() *QWidget { return newQWidget_U(unsafe.Pointer(C.QScrollArea_Widget(this.h))) } @@ -145,28 +136,6 @@ func QScrollArea_Tr3(s string, c string, n int) string { return _ret } -func QScrollArea_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QScrollArea_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QScrollArea_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QScrollArea_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QScrollArea) EnsureVisible3(x int, y int, xmargin int) { C.QScrollArea_EnsureVisible3(this.h, (C.int)(x), (C.int)(y), (C.int)(xmargin)) } diff --git a/qt/gen_qscrollarea.h b/qt/gen_qscrollarea.h index d84d60a..ce086d6 100644 --- a/qt/gen_qscrollarea.h +++ b/qt/gen_qscrollarea.h @@ -30,7 +30,6 @@ QScrollArea* QScrollArea_new2(QWidget* parent); QMetaObject* QScrollArea_MetaObject(const QScrollArea* self); void* QScrollArea_Metacast(QScrollArea* self, const char* param1); struct miqt_string* QScrollArea_Tr(const char* s); -struct miqt_string* QScrollArea_TrUtf8(const char* s); QWidget* QScrollArea_Widget(const QScrollArea* self); void QScrollArea_SetWidget(QScrollArea* self, QWidget* widget); QWidget* QScrollArea_TakeWidget(QScrollArea* self); @@ -44,8 +43,6 @@ void QScrollArea_EnsureVisible(QScrollArea* self, int x, int y); void QScrollArea_EnsureWidgetVisible(QScrollArea* self, QWidget* childWidget); struct miqt_string* QScrollArea_Tr2(const char* s, const char* c); struct miqt_string* QScrollArea_Tr3(const char* s, const char* c, int n); -struct miqt_string* QScrollArea_TrUtf82(const char* s, const char* c); -struct miqt_string* QScrollArea_TrUtf83(const char* s, const char* c, int n); void QScrollArea_EnsureVisible3(QScrollArea* self, int x, int y, int xmargin); void QScrollArea_EnsureVisible4(QScrollArea* self, int x, int y, int xmargin, int ymargin); void QScrollArea_EnsureWidgetVisible2(QScrollArea* self, QWidget* childWidget, int xmargin); diff --git a/qt/gen_qscrollbar.cpp b/qt/gen_qscrollbar.cpp index 84bcfe7..fca8bf9 100644 --- a/qt/gen_qscrollbar.cpp +++ b/qt/gen_qscrollbar.cpp @@ -41,13 +41,6 @@ struct miqt_string* QScrollBar_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QScrollBar_TrUtf8(const char* s) { - QString _ret = QScrollBar::trUtf8(s); - // 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()); -} - QSize* QScrollBar_SizeHint(const QScrollBar* self) { return new QSize(self->sizeHint()); } @@ -70,20 +63,6 @@ struct miqt_string* QScrollBar_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QScrollBar_TrUtf82(const char* s, const char* c) { - QString _ret = QScrollBar::trUtf8(s, c); - // 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* QScrollBar_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QScrollBar::trUtf8(s, c, static_cast(n)); - // 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 QScrollBar_Delete(QScrollBar* self) { delete self; } diff --git a/qt/gen_qscrollbar.go b/qt/gen_qscrollbar.go index 9e08083..e439f33 100644 --- a/qt/gen_qscrollbar.go +++ b/qt/gen_qscrollbar.go @@ -79,15 +79,6 @@ func QScrollBar_Tr(s string) string { return _ret } -func QScrollBar_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QScrollBar_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QScrollBar) SizeHint() *QSize { _ret := C.QScrollBar_SizeHint(this.h) _goptr := newQSize(_ret) @@ -121,28 +112,6 @@ func QScrollBar_Tr3(s string, c string, n int) string { return _ret } -func QScrollBar_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QScrollBar_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QScrollBar_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QScrollBar_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QScrollBar) Delete() { C.QScrollBar_Delete(this.h) diff --git a/qt/gen_qscrollbar.h b/qt/gen_qscrollbar.h index 6d322ac..2ad495d 100644 --- a/qt/gen_qscrollbar.h +++ b/qt/gen_qscrollbar.h @@ -34,13 +34,10 @@ QScrollBar* QScrollBar_new4(int param1, QWidget* parent); QMetaObject* QScrollBar_MetaObject(const QScrollBar* self); void* QScrollBar_Metacast(QScrollBar* self, const char* param1); struct miqt_string* QScrollBar_Tr(const char* s); -struct miqt_string* QScrollBar_TrUtf8(const char* s); QSize* QScrollBar_SizeHint(const QScrollBar* self); bool QScrollBar_Event(QScrollBar* self, QEvent* event); struct miqt_string* QScrollBar_Tr2(const char* s, const char* c); struct miqt_string* QScrollBar_Tr3(const char* s, const char* c, int n); -struct miqt_string* QScrollBar_TrUtf82(const char* s, const char* c); -struct miqt_string* QScrollBar_TrUtf83(const char* s, const char* c, int n); void QScrollBar_Delete(QScrollBar* self); #ifdef __cplusplus diff --git a/qt/gen_qscroller.cpp b/qt/gen_qscroller.cpp index f55a9a7..43ef3fe 100644 --- a/qt/gen_qscroller.cpp +++ b/qt/gen_qscroller.cpp @@ -27,13 +27,6 @@ struct miqt_string* QScroller_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QScroller_TrUtf8(const char* s) { - QString _ret = QScroller::trUtf8(s); - // 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()); -} - bool QScroller_HasScroller(QObject* target) { return QScroller::hasScroller(target); } @@ -197,20 +190,6 @@ struct miqt_string* QScroller_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QScroller_TrUtf82(const char* s, const char* c) { - QString _ret = QScroller::trUtf8(s, c); - // 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* QScroller_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QScroller::trUtf8(s, c, static_cast(n)); - // 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()); -} - int QScroller_GrabGesture2(QObject* target, int gestureType) { Qt::GestureType _ret = QScroller::grabGesture(target, static_cast(gestureType)); return static_cast(_ret); diff --git a/qt/gen_qscroller.go b/qt/gen_qscroller.go index 660ebbf..a4768c7 100644 --- a/qt/gen_qscroller.go +++ b/qt/gen_qscroller.go @@ -82,15 +82,6 @@ func QScroller_Tr(s string) string { return _ret } -func QScroller_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QScroller_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func QScroller_HasScroller(target *QObject) bool { return (bool)(C.QScroller_HasScroller(target.cPointer())) } @@ -288,28 +279,6 @@ func QScroller_Tr3(s string, c string, n int) string { return _ret } -func QScroller_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QScroller_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QScroller_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QScroller_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func QScroller_GrabGesture2(target *QObject, gestureType QScroller__ScrollerGestureType) GestureType { return (GestureType)(C.QScroller_GrabGesture2(target.cPointer(), (C.int)(gestureType))) } diff --git a/qt/gen_qscroller.h b/qt/gen_qscroller.h index 9c27a77..1abe4ec 100644 --- a/qt/gen_qscroller.h +++ b/qt/gen_qscroller.h @@ -32,7 +32,6 @@ typedef struct QScrollerProperties QScrollerProperties; QMetaObject* QScroller_MetaObject(const QScroller* self); void* QScroller_Metacast(QScroller* self, const char* param1); struct miqt_string* QScroller_Tr(const char* s); -struct miqt_string* QScroller_TrUtf8(const char* s); bool QScroller_HasScroller(QObject* target); QScroller* QScroller_Scroller(QObject* target); QScroller* QScroller_ScrollerWithTarget(QObject* target); @@ -64,8 +63,6 @@ void QScroller_ScrollerPropertiesChanged(QScroller* self, QScrollerProperties* p void QScroller_connect_ScrollerPropertiesChanged(QScroller* self, void* slot); 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); int QScroller_GrabGesture2(QObject* target, int gestureType); bool QScroller_HandleInput3(QScroller* self, int input, QPointF* position, long long timestamp); diff --git a/qt/gen_qsemaphore.cpp b/qt/gen_qsemaphore.cpp index 37ad754..f3865cf 100644 --- a/qt/gen_qsemaphore.cpp +++ b/qt/gen_qsemaphore.cpp @@ -32,6 +32,10 @@ int QSemaphore_Available(const QSemaphore* self) { return self->available(); } +bool QSemaphore_TryAcquire3(QSemaphore* self) { + return self->try_acquire(); +} + void QSemaphore_Acquire1(QSemaphore* self, int n) { self->acquire(static_cast(n)); } diff --git a/qt/gen_qsemaphore.go b/qt/gen_qsemaphore.go index bd4d9d0..60879ba 100644 --- a/qt/gen_qsemaphore.go +++ b/qt/gen_qsemaphore.go @@ -67,6 +67,10 @@ func (this *QSemaphore) Available() int { return (int)(C.QSemaphore_Available(this.h)) } +func (this *QSemaphore) TryAcquire3() bool { + return (bool)(C.QSemaphore_TryAcquire3(this.h)) +} + func (this *QSemaphore) Acquire1(n int) { C.QSemaphore_Acquire1(this.h, (C.int)(n)) } diff --git a/qt/gen_qsemaphore.h b/qt/gen_qsemaphore.h index 9ee4bc1..6ad3bd6 100644 --- a/qt/gen_qsemaphore.h +++ b/qt/gen_qsemaphore.h @@ -28,6 +28,7 @@ bool QSemaphore_TryAcquire(QSemaphore* self); bool QSemaphore_TryAcquire2(QSemaphore* self, int n, int timeout); void QSemaphore_Release(QSemaphore* self); int QSemaphore_Available(const QSemaphore* self); +bool QSemaphore_TryAcquire3(QSemaphore* self); void QSemaphore_Acquire1(QSemaphore* self, int n); bool QSemaphore_TryAcquire1(QSemaphore* self, int n); void QSemaphore_Release1(QSemaphore* self, int n); diff --git a/qt/gen_qsequentialanimationgroup.cpp b/qt/gen_qsequentialanimationgroup.cpp index 8c67c5f..e6fde23 100644 --- a/qt/gen_qsequentialanimationgroup.cpp +++ b/qt/gen_qsequentialanimationgroup.cpp @@ -33,13 +33,6 @@ struct miqt_string* QSequentialAnimationGroup_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QSequentialAnimationGroup_TrUtf8(const char* s) { - QString _ret = QSequentialAnimationGroup::trUtf8(s); - // 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()); -} - QPauseAnimation* QSequentialAnimationGroup_AddPause(QSequentialAnimationGroup* self, int msecs) { return self->addPause(static_cast(msecs)); } @@ -81,20 +74,6 @@ struct miqt_string* QSequentialAnimationGroup_Tr3(const char* s, const char* c, return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QSequentialAnimationGroup_TrUtf82(const char* s, const char* c) { - QString _ret = QSequentialAnimationGroup::trUtf8(s, c); - // 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* QSequentialAnimationGroup_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QSequentialAnimationGroup::trUtf8(s, c, static_cast(n)); - // 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 QSequentialAnimationGroup_Delete(QSequentialAnimationGroup* self) { delete self; } diff --git a/qt/gen_qsequentialanimationgroup.go b/qt/gen_qsequentialanimationgroup.go index a0dc3fe..e56545b 100644 --- a/qt/gen_qsequentialanimationgroup.go +++ b/qt/gen_qsequentialanimationgroup.go @@ -68,15 +68,6 @@ func QSequentialAnimationGroup_Tr(s string) string { return _ret } -func QSequentialAnimationGroup_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSequentialAnimationGroup_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QSequentialAnimationGroup) AddPause(msecs int) *QPauseAnimation { return newQPauseAnimation_U(unsafe.Pointer(C.QSequentialAnimationGroup_AddPause(this.h, (C.int)(msecs)))) } @@ -135,28 +126,6 @@ func QSequentialAnimationGroup_Tr3(s string, c string, n int) string { return _ret } -func QSequentialAnimationGroup_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSequentialAnimationGroup_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QSequentialAnimationGroup_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSequentialAnimationGroup_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QSequentialAnimationGroup) Delete() { C.QSequentialAnimationGroup_Delete(this.h) diff --git a/qt/gen_qsequentialanimationgroup.h b/qt/gen_qsequentialanimationgroup.h index a8ef694..b4cc7b4 100644 --- a/qt/gen_qsequentialanimationgroup.h +++ b/qt/gen_qsequentialanimationgroup.h @@ -32,7 +32,6 @@ QSequentialAnimationGroup* QSequentialAnimationGroup_new2(QObject* parent); QMetaObject* QSequentialAnimationGroup_MetaObject(const QSequentialAnimationGroup* self); void* QSequentialAnimationGroup_Metacast(QSequentialAnimationGroup* self, const char* param1); struct miqt_string* QSequentialAnimationGroup_Tr(const char* s); -struct miqt_string* QSequentialAnimationGroup_TrUtf8(const char* s); QPauseAnimation* QSequentialAnimationGroup_AddPause(QSequentialAnimationGroup* self, int msecs); QPauseAnimation* QSequentialAnimationGroup_InsertPause(QSequentialAnimationGroup* self, int index, int msecs); QAbstractAnimation* QSequentialAnimationGroup_CurrentAnimation(const QSequentialAnimationGroup* self); @@ -41,8 +40,6 @@ void QSequentialAnimationGroup_CurrentAnimationChanged(QSequentialAnimationGroup void QSequentialAnimationGroup_connect_CurrentAnimationChanged(QSequentialAnimationGroup* self, void* slot); struct miqt_string* QSequentialAnimationGroup_Tr2(const char* s, const char* c); struct miqt_string* QSequentialAnimationGroup_Tr3(const char* s, const char* c, int n); -struct miqt_string* QSequentialAnimationGroup_TrUtf82(const char* s, const char* c); -struct miqt_string* QSequentialAnimationGroup_TrUtf83(const char* s, const char* c, int n); void QSequentialAnimationGroup_Delete(QSequentialAnimationGroup* self); #ifdef __cplusplus diff --git a/qt/gen_qsessionmanager.cpp b/qt/gen_qsessionmanager.cpp index c3ad6e2..6d34049 100644 --- a/qt/gen_qsessionmanager.cpp +++ b/qt/gen_qsessionmanager.cpp @@ -23,13 +23,6 @@ struct miqt_string* QSessionManager_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QSessionManager_TrUtf8(const char* s) { - QString _ret = QSessionManager::trUtf8(s); - // 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* QSessionManager_SessionId(const QSessionManager* self) { QString _ret = self->sessionId(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -163,17 +156,3 @@ struct miqt_string* QSessionManager_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QSessionManager_TrUtf82(const char* s, const char* c) { - QString _ret = QSessionManager::trUtf8(s, c); - // 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* QSessionManager_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QSessionManager::trUtf8(s, c, static_cast(n)); - // 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()); -} - diff --git a/qt/gen_qsessionmanager.go b/qt/gen_qsessionmanager.go index 51481a4..7c6a481 100644 --- a/qt/gen_qsessionmanager.go +++ b/qt/gen_qsessionmanager.go @@ -64,15 +64,6 @@ func QSessionManager_Tr(s string) string { return _ret } -func QSessionManager_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSessionManager_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QSessionManager) SessionId() string { var _ms *C.struct_miqt_string = C.QSessionManager_SessionId(this.h) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) @@ -220,25 +211,3 @@ func QSessionManager_Tr3(s string, c string, n int) string { C.free(unsafe.Pointer(_ms)) return _ret } - -func QSessionManager_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSessionManager_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QSessionManager_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSessionManager_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} diff --git a/qt/gen_qsessionmanager.h b/qt/gen_qsessionmanager.h index 210b2c1..202f61c 100644 --- a/qt/gen_qsessionmanager.h +++ b/qt/gen_qsessionmanager.h @@ -24,7 +24,6 @@ typedef struct QSessionManager QSessionManager; QMetaObject* QSessionManager_MetaObject(const QSessionManager* self); void* QSessionManager_Metacast(QSessionManager* self, const char* param1); struct miqt_string* QSessionManager_Tr(const char* s); -struct miqt_string* QSessionManager_TrUtf8(const char* s); struct miqt_string* QSessionManager_SessionId(const QSessionManager* self); struct miqt_string* QSessionManager_SessionKey(const QSessionManager* self); bool QSessionManager_AllowsInteraction(QSessionManager* self); @@ -43,8 +42,6 @@ bool QSessionManager_IsPhase2(const QSessionManager* self); void QSessionManager_RequestPhase2(QSessionManager* self); struct miqt_string* QSessionManager_Tr2(const char* s, const char* c); struct miqt_string* QSessionManager_Tr3(const char* s, const char* c, int n); -struct miqt_string* QSessionManager_TrUtf82(const char* s, const char* c); -struct miqt_string* QSessionManager_TrUtf83(const char* s, const char* c, int n); #ifdef __cplusplus } /* extern C */ diff --git a/qt/gen_qsettings.cpp b/qt/gen_qsettings.cpp index 1c7271f..a96fa4c 100644 --- a/qt/gen_qsettings.cpp +++ b/qt/gen_qsettings.cpp @@ -1,3 +1,4 @@ +#include #include #include #include @@ -5,7 +6,6 @@ #include #include #include -#include #include #include "qsettings.h" #include "gen_qsettings.h" @@ -103,13 +103,6 @@ struct miqt_string* QSettings_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QSettings_TrUtf8(const char* s) { - QString _ret = QSettings::trUtf8(s); - // 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 QSettings_Clear(QSettings* self) { self->clear(); } @@ -131,9 +124,8 @@ void QSettings_SetAtomicSyncRequired(QSettings* self, bool enable) { self->setAtomicSyncRequired(enable); } -void QSettings_BeginGroup(QSettings* self, struct miqt_string* prefix) { - QString prefix_QString = QString::fromUtf8(&prefix->data, prefix->len); - self->beginGroup(prefix_QString); +void QSettings_BeginGroup(QSettings* self, QAnyStringView* prefix) { + self->beginGroup(*prefix); } void QSettings_EndGroup(QSettings* self) { @@ -147,14 +139,12 @@ struct miqt_string* QSettings_Group(const QSettings* self) { return miqt_strdup(_b.data(), _b.length()); } -int QSettings_BeginReadArray(QSettings* self, struct miqt_string* prefix) { - QString prefix_QString = QString::fromUtf8(&prefix->data, prefix->len); - return self->beginReadArray(prefix_QString); +int QSettings_BeginReadArray(QSettings* self, QAnyStringView* prefix) { + return self->beginReadArray(*prefix); } -void QSettings_BeginWriteArray(QSettings* self, struct miqt_string* prefix) { - QString prefix_QString = QString::fromUtf8(&prefix->data, prefix->len); - self->beginWriteArray(prefix_QString); +void QSettings_BeginWriteArray(QSettings* self, QAnyStringView* prefix) { + self->beginWriteArray(*prefix); } void QSettings_EndArray(QSettings* self) { @@ -217,24 +207,24 @@ bool QSettings_IsWritable(const QSettings* self) { return self->isWritable(); } -void QSettings_SetValue(QSettings* self, struct miqt_string* key, QVariant* value) { - QString key_QString = QString::fromUtf8(&key->data, key->len); - self->setValue(key_QString, *value); +void QSettings_SetValue(QSettings* self, QAnyStringView* key, QVariant* value) { + self->setValue(*key, *value); } -QVariant* QSettings_Value(const QSettings* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); - return new QVariant(self->value(key_QString)); +QVariant* QSettings_Value(const QSettings* self, QAnyStringView* key, QVariant* defaultValue) { + return new QVariant(self->value(*key, *defaultValue)); } -void QSettings_Remove(QSettings* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); - self->remove(key_QString); +QVariant* QSettings_ValueWithKey(const QSettings* self, QAnyStringView* key) { + return new QVariant(self->value(*key)); } -bool QSettings_Contains(const QSettings* self, struct miqt_string* key) { - QString key_QString = QString::fromUtf8(&key->data, key->len); - return self->contains(key_QString); +void QSettings_Remove(QSettings* self, QAnyStringView* key) { + self->remove(*key); +} + +bool QSettings_Contains(const QSettings* self, QAnyStringView* key) { + return self->contains(*key); } void QSettings_SetFallbacksEnabled(QSettings* self, bool b) { @@ -276,18 +266,6 @@ struct miqt_string* QSettings_ApplicationName(const QSettings* self) { return miqt_strdup(_b.data(), _b.length()); } -void QSettings_SetIniCodec(QSettings* self, QTextCodec* codec) { - self->setIniCodec(codec); -} - -void QSettings_SetIniCodecWithCodecName(QSettings* self, const char* codecName) { - self->setIniCodec(codecName); -} - -QTextCodec* QSettings_IniCodec(const QSettings* self) { - return self->iniCodec(); -} - void QSettings_SetDefaultFormat(int format) { QSettings::setDefaultFormat(static_cast(format)); } @@ -297,16 +275,6 @@ int QSettings_DefaultFormat() { return static_cast(_ret); } -void QSettings_SetSystemIniPath(struct miqt_string* dir) { - QString dir_QString = QString::fromUtf8(&dir->data, dir->len); - QSettings::setSystemIniPath(dir_QString); -} - -void QSettings_SetUserIniPath(struct miqt_string* dir) { - QString dir_QString = QString::fromUtf8(&dir->data, dir->len); - QSettings::setUserIniPath(dir_QString); -} - 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); @@ -326,28 +294,8 @@ struct miqt_string* QSettings_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QSettings_TrUtf82(const char* s, const char* c) { - QString _ret = QSettings::trUtf8(s, c); - // 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* QSettings_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QSettings::trUtf8(s, c, static_cast(n)); - // 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 QSettings_BeginWriteArray2(QSettings* self, struct miqt_string* prefix, int size) { - QString prefix_QString = QString::fromUtf8(&prefix->data, prefix->len); - self->beginWriteArray(prefix_QString, static_cast(size)); -} - -QVariant* QSettings_Value2(const QSettings* self, struct miqt_string* key, QVariant* defaultValue) { - QString key_QString = QString::fromUtf8(&key->data, key->len); - return new QVariant(self->value(key_QString, *defaultValue)); +void QSettings_BeginWriteArray2(QSettings* self, QAnyStringView* prefix, int size) { + self->beginWriteArray(*prefix, static_cast(size)); } void QSettings_Delete(QSettings* self) { diff --git a/qt/gen_qsettings.go b/qt/gen_qsettings.go index 45bde62..917f036 100644 --- a/qt/gen_qsettings.go +++ b/qt/gen_qsettings.go @@ -218,15 +218,6 @@ func QSettings_Tr(s string) string { return _ret } -func QSettings_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSettings_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QSettings) Clear() { C.QSettings_Clear(this.h) } @@ -247,10 +238,8 @@ func (this *QSettings) SetAtomicSyncRequired(enable bool) { C.QSettings_SetAtomicSyncRequired(this.h, (C.bool)(enable)) } -func (this *QSettings) BeginGroup(prefix string) { - prefix_ms := miqt_strdupg(prefix) - defer C.free(prefix_ms) - C.QSettings_BeginGroup(this.h, (*C.struct_miqt_string)(prefix_ms)) +func (this *QSettings) BeginGroup(prefix QAnyStringView) { + C.QSettings_BeginGroup(this.h, prefix.cPointer()) } func (this *QSettings) EndGroup() { @@ -264,16 +253,12 @@ func (this *QSettings) Group() string { return _ret } -func (this *QSettings) BeginReadArray(prefix string) int { - prefix_ms := miqt_strdupg(prefix) - defer C.free(prefix_ms) - return (int)(C.QSettings_BeginReadArray(this.h, (*C.struct_miqt_string)(prefix_ms))) +func (this *QSettings) BeginReadArray(prefix QAnyStringView) int { + return (int)(C.QSettings_BeginReadArray(this.h, prefix.cPointer())) } -func (this *QSettings) BeginWriteArray(prefix string) { - prefix_ms := miqt_strdupg(prefix) - defer C.free(prefix_ms) - C.QSettings_BeginWriteArray(this.h, (*C.struct_miqt_string)(prefix_ms)) +func (this *QSettings) BeginWriteArray(prefix QAnyStringView) { + C.QSettings_BeginWriteArray(this.h, prefix.cPointer()) } func (this *QSettings) EndArray() { @@ -330,31 +315,30 @@ func (this *QSettings) IsWritable() bool { return (bool)(C.QSettings_IsWritable(this.h)) } -func (this *QSettings) SetValue(key string, value *QVariant) { - key_ms := miqt_strdupg(key) - defer C.free(key_ms) - C.QSettings_SetValue(this.h, (*C.struct_miqt_string)(key_ms), value.cPointer()) +func (this *QSettings) SetValue(key QAnyStringView, value *QVariant) { + C.QSettings_SetValue(this.h, key.cPointer(), value.cPointer()) } -func (this *QSettings) Value(key string) *QVariant { - key_ms := miqt_strdupg(key) - defer C.free(key_ms) - _ret := C.QSettings_Value(this.h, (*C.struct_miqt_string)(key_ms)) +func (this *QSettings) Value(key QAnyStringView, defaultValue *QVariant) *QVariant { + _ret := C.QSettings_Value(this.h, key.cPointer(), defaultValue.cPointer()) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QSettings) Remove(key string) { - key_ms := miqt_strdupg(key) - defer C.free(key_ms) - C.QSettings_Remove(this.h, (*C.struct_miqt_string)(key_ms)) +func (this *QSettings) ValueWithKey(key QAnyStringView) *QVariant { + _ret := C.QSettings_ValueWithKey(this.h, key.cPointer()) + _goptr := newQVariant(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr } -func (this *QSettings) Contains(key string) bool { - key_ms := miqt_strdupg(key) - defer C.free(key_ms) - return (bool)(C.QSettings_Contains(this.h, (*C.struct_miqt_string)(key_ms))) +func (this *QSettings) Remove(key QAnyStringView) { + C.QSettings_Remove(this.h, key.cPointer()) +} + +func (this *QSettings) Contains(key QAnyStringView) bool { + return (bool)(C.QSettings_Contains(this.h, key.cPointer())) } func (this *QSettings) SetFallbacksEnabled(b bool) { @@ -394,20 +378,6 @@ func (this *QSettings) ApplicationName() string { return _ret } -func (this *QSettings) SetIniCodec(codec *QTextCodec) { - C.QSettings_SetIniCodec(this.h, codec.cPointer()) -} - -func (this *QSettings) SetIniCodecWithCodecName(codecName string) { - codecName_Cstring := C.CString(codecName) - defer C.free(unsafe.Pointer(codecName_Cstring)) - C.QSettings_SetIniCodecWithCodecName(this.h, codecName_Cstring) -} - -func (this *QSettings) IniCodec() *QTextCodec { - return newQTextCodec_U(unsafe.Pointer(C.QSettings_IniCodec(this.h))) -} - func QSettings_SetDefaultFormat(format QSettings__Format) { C.QSettings_SetDefaultFormat((C.int)(format)) } @@ -416,18 +386,6 @@ func QSettings_DefaultFormat() QSettings__Format { return (QSettings__Format)(C.QSettings_DefaultFormat()) } -func QSettings_SetSystemIniPath(dir string) { - dir_ms := miqt_strdupg(dir) - defer C.free(dir_ms) - C.QSettings_SetSystemIniPath((*C.struct_miqt_string)(dir_ms)) -} - -func QSettings_SetUserIniPath(dir string) { - dir_ms := miqt_strdupg(dir) - defer C.free(dir_ms) - C.QSettings_SetUserIniPath((*C.struct_miqt_string)(dir_ms)) -} - func QSettings_SetPath(format QSettings__Format, scope QSettings__Scope, path string) { path_ms := miqt_strdupg(path) defer C.free(path_ms) @@ -456,41 +414,8 @@ func QSettings_Tr3(s string, c string, n int) string { return _ret } -func QSettings_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSettings_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QSettings_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSettings_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QSettings) BeginWriteArray2(prefix string, size int) { - prefix_ms := miqt_strdupg(prefix) - defer C.free(prefix_ms) - C.QSettings_BeginWriteArray2(this.h, (*C.struct_miqt_string)(prefix_ms), (C.int)(size)) -} - -func (this *QSettings) Value2(key string, defaultValue *QVariant) *QVariant { - key_ms := miqt_strdupg(key) - defer C.free(key_ms) - _ret := C.QSettings_Value2(this.h, (*C.struct_miqt_string)(key_ms), defaultValue.cPointer()) - _goptr := newQVariant(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QSettings) BeginWriteArray2(prefix QAnyStringView, size int) { + C.QSettings_BeginWriteArray2(this.h, prefix.cPointer(), (C.int)(size)) } // Delete this object from C++ memory. diff --git a/qt/gen_qsettings.h b/qt/gen_qsettings.h index 7c41c7b..0595996 100644 --- a/qt/gen_qsettings.h +++ b/qt/gen_qsettings.h @@ -14,16 +14,16 @@ extern "C" { #endif #ifdef __cplusplus +class QAnyStringView; class QMetaObject; class QObject; class QSettings; -class QTextCodec; class QVariant; #else +typedef struct QAnyStringView QAnyStringView; typedef struct QMetaObject QMetaObject; typedef struct QObject QObject; typedef struct QSettings QSettings; -typedef struct QTextCodec QTextCodec; typedef struct QVariant QVariant; #endif @@ -45,27 +45,27 @@ QSettings* QSettings_new15(int scope, QObject* parent); QMetaObject* QSettings_MetaObject(const QSettings* self); void* QSettings_Metacast(QSettings* self, const char* param1); 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); 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); +void QSettings_BeginGroup(QSettings* self, QAnyStringView* prefix); void QSettings_EndGroup(QSettings* self); struct miqt_string* QSettings_Group(const QSettings* self); -int QSettings_BeginReadArray(QSettings* self, struct miqt_string* prefix); -void QSettings_BeginWriteArray(QSettings* self, struct miqt_string* prefix); +int QSettings_BeginReadArray(QSettings* self, QAnyStringView* prefix); +void QSettings_BeginWriteArray(QSettings* self, QAnyStringView* prefix); void QSettings_EndArray(QSettings* self); void QSettings_SetArrayIndex(QSettings* self, int i); struct miqt_array* QSettings_AllKeys(const QSettings* self); struct miqt_array* QSettings_ChildKeys(const QSettings* self); struct miqt_array* QSettings_ChildGroups(const QSettings* self); bool QSettings_IsWritable(const QSettings* self); -void QSettings_SetValue(QSettings* self, struct miqt_string* key, QVariant* value); -QVariant* QSettings_Value(const QSettings* self, struct miqt_string* key); -void QSettings_Remove(QSettings* self, struct miqt_string* key); -bool QSettings_Contains(const QSettings* self, struct miqt_string* key); +void QSettings_SetValue(QSettings* self, QAnyStringView* key, QVariant* value); +QVariant* QSettings_Value(const QSettings* self, QAnyStringView* key, QVariant* defaultValue); +QVariant* QSettings_ValueWithKey(const QSettings* self, QAnyStringView* key); +void QSettings_Remove(QSettings* self, QAnyStringView* key); +bool QSettings_Contains(const QSettings* self, QAnyStringView* key); void QSettings_SetFallbacksEnabled(QSettings* self, bool b); bool QSettings_FallbacksEnabled(const QSettings* self); struct miqt_string* QSettings_FileName(const QSettings* self); @@ -73,20 +73,12 @@ 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(int format); int QSettings_DefaultFormat(); -void QSettings_SetSystemIniPath(struct miqt_string* dir); -void QSettings_SetUserIniPath(struct miqt_string* dir); 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); -struct miqt_string* QSettings_TrUtf83(const char* s, const char* c, int n); -void QSettings_BeginWriteArray2(QSettings* self, struct miqt_string* prefix, int size); -QVariant* QSettings_Value2(const QSettings* self, struct miqt_string* key, QVariant* defaultValue); +void QSettings_BeginWriteArray2(QSettings* self, QAnyStringView* prefix, int size); void QSettings_Delete(QSettings* self); #ifdef __cplusplus diff --git a/qt/gen_qshareddata.cpp b/qt/gen_qshareddata.cpp index 0c03000..7aa51b5 100644 --- a/qt/gen_qshareddata.cpp +++ b/qt/gen_qshareddata.cpp @@ -1,3 +1,4 @@ +#include #include #include "qshareddata.h" #include "gen_qshareddata.h" @@ -15,3 +16,11 @@ void QSharedData_Delete(QSharedData* self) { delete self; } +QAdoptSharedDataTag* QAdoptSharedDataTag_new() { + return new QAdoptSharedDataTag(); +} + +void QAdoptSharedDataTag_Delete(QAdoptSharedDataTag* self) { + delete self; +} + diff --git a/qt/gen_qshareddata.go b/qt/gen_qshareddata.go index 3edf082..ed1cc26 100644 --- a/qt/gen_qshareddata.go +++ b/qt/gen_qshareddata.go @@ -60,3 +60,45 @@ func (this *QSharedData) GoGC() { runtime.KeepAlive(this.h) }) } + +type QAdoptSharedDataTag struct { + h *C.QAdoptSharedDataTag +} + +func (this *QAdoptSharedDataTag) cPointer() *C.QAdoptSharedDataTag { + if this == nil { + return nil + } + return this.h +} + +func newQAdoptSharedDataTag(h *C.QAdoptSharedDataTag) *QAdoptSharedDataTag { + if h == nil { + return nil + } + return &QAdoptSharedDataTag{h: h} +} + +func newQAdoptSharedDataTag_U(h unsafe.Pointer) *QAdoptSharedDataTag { + return newQAdoptSharedDataTag((*C.QAdoptSharedDataTag)(h)) +} + +// NewQAdoptSharedDataTag constructs a new QAdoptSharedDataTag object. +func NewQAdoptSharedDataTag() *QAdoptSharedDataTag { + ret := C.QAdoptSharedDataTag_new() + return newQAdoptSharedDataTag(ret) +} + +// Delete this object from C++ memory. +func (this *QAdoptSharedDataTag) Delete() { + C.QAdoptSharedDataTag_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QAdoptSharedDataTag) GoGC() { + runtime.SetFinalizer(this, func(this *QAdoptSharedDataTag) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} diff --git a/qt/gen_qshareddata.h b/qt/gen_qshareddata.h index 69e280d..3256fec 100644 --- a/qt/gen_qshareddata.h +++ b/qt/gen_qshareddata.h @@ -14,8 +14,10 @@ extern "C" { #endif #ifdef __cplusplus +class QAdoptSharedDataTag; class QSharedData; #else +typedef struct QAdoptSharedDataTag QAdoptSharedDataTag; typedef struct QSharedData QSharedData; #endif @@ -23,6 +25,9 @@ QSharedData* QSharedData_new(); QSharedData* QSharedData_new2(QSharedData* param1); void QSharedData_Delete(QSharedData* self); +QAdoptSharedDataTag* QAdoptSharedDataTag_new(); +void QAdoptSharedDataTag_Delete(QAdoptSharedDataTag* self); + #ifdef __cplusplus } /* extern C */ #endif diff --git a/qt/gen_qsharedmemory.cpp b/qt/gen_qsharedmemory.cpp index d3e4243..65525d0 100644 --- a/qt/gen_qsharedmemory.cpp +++ b/qt/gen_qsharedmemory.cpp @@ -41,13 +41,6 @@ struct miqt_string* QSharedMemory_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QSharedMemory_TrUtf8(const char* s) { - QString _ret = QSharedMemory::trUtf8(s); - // 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 QSharedMemory_SetKey(QSharedMemory* self, struct miqt_string* key) { QString key_QString = QString::fromUtf8(&key->data, key->len); self->setKey(key_QString); @@ -72,12 +65,13 @@ struct miqt_string* QSharedMemory_NativeKey(const QSharedMemory* self) { return miqt_strdup(_b.data(), _b.length()); } -bool QSharedMemory_Create(QSharedMemory* self, int size) { - return self->create(static_cast(size)); +bool QSharedMemory_Create(QSharedMemory* self, ptrdiff_t size) { + return self->create((qsizetype)(size)); } -int QSharedMemory_Size(const QSharedMemory* self) { - return self->size(); +ptrdiff_t QSharedMemory_Size(const QSharedMemory* self) { + qsizetype _ret = self->size(); + return static_cast(_ret); } bool QSharedMemory_Attach(QSharedMemory* self) { @@ -138,22 +132,8 @@ struct miqt_string* QSharedMemory_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QSharedMemory_TrUtf82(const char* s, const char* c) { - QString _ret = QSharedMemory::trUtf8(s, c); - // 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* QSharedMemory_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QSharedMemory::trUtf8(s, c, static_cast(n)); - // 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()); -} - -bool QSharedMemory_Create2(QSharedMemory* self, int size, int mode) { - return self->create(static_cast(size), static_cast(mode)); +bool QSharedMemory_Create2(QSharedMemory* self, ptrdiff_t size, int mode) { + return self->create((qsizetype)(size), static_cast(mode)); } bool QSharedMemory_Attach1(QSharedMemory* self, int mode) { diff --git a/qt/gen_qsharedmemory.go b/qt/gen_qsharedmemory.go index 3008ed8..1d8f24a 100644 --- a/qt/gen_qsharedmemory.go +++ b/qt/gen_qsharedmemory.go @@ -104,15 +104,6 @@ func QSharedMemory_Tr(s string) string { return _ret } -func QSharedMemory_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSharedMemory_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QSharedMemory) SetKey(key string) { key_ms := miqt_strdupg(key) defer C.free(key_ms) @@ -139,12 +130,12 @@ func (this *QSharedMemory) NativeKey() string { return _ret } -func (this *QSharedMemory) Create(size int) bool { - return (bool)(C.QSharedMemory_Create(this.h, (C.int)(size))) +func (this *QSharedMemory) Create(size int64) bool { + return (bool)(C.QSharedMemory_Create(this.h, (C.ptrdiff_t)(size))) } -func (this *QSharedMemory) Size() int { - return (int)(C.QSharedMemory_Size(this.h)) +func (this *QSharedMemory) Size() int64 { + return (int64)(C.QSharedMemory_Size(this.h)) } func (this *QSharedMemory) Attach() bool { @@ -212,30 +203,8 @@ func QSharedMemory_Tr3(s string, c string, n int) string { return _ret } -func QSharedMemory_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSharedMemory_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QSharedMemory_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSharedMemory_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QSharedMemory) Create2(size int, mode QSharedMemory__AccessMode) bool { - return (bool)(C.QSharedMemory_Create2(this.h, (C.int)(size), (C.int)(mode))) +func (this *QSharedMemory) Create2(size int64, mode QSharedMemory__AccessMode) bool { + return (bool)(C.QSharedMemory_Create2(this.h, (C.ptrdiff_t)(size), (C.int)(mode))) } func (this *QSharedMemory) Attach1(mode QSharedMemory__AccessMode) bool { diff --git a/qt/gen_qsharedmemory.h b/qt/gen_qsharedmemory.h index edf223a..a9d2607 100644 --- a/qt/gen_qsharedmemory.h +++ b/qt/gen_qsharedmemory.h @@ -30,13 +30,12 @@ QSharedMemory* QSharedMemory_new4(struct miqt_string* key, QObject* parent); QMetaObject* QSharedMemory_MetaObject(const QSharedMemory* self); void* QSharedMemory_Metacast(QSharedMemory* self, const char* param1); struct miqt_string* QSharedMemory_Tr(const char* s); -struct miqt_string* QSharedMemory_TrUtf8(const char* s); void QSharedMemory_SetKey(QSharedMemory* self, struct miqt_string* key); struct miqt_string* QSharedMemory_Key(const QSharedMemory* self); void QSharedMemory_SetNativeKey(QSharedMemory* self, struct miqt_string* key); struct miqt_string* QSharedMemory_NativeKey(const QSharedMemory* self); -bool QSharedMemory_Create(QSharedMemory* self, int size); -int QSharedMemory_Size(const QSharedMemory* self); +bool QSharedMemory_Create(QSharedMemory* self, ptrdiff_t size); +ptrdiff_t QSharedMemory_Size(const QSharedMemory* self); bool QSharedMemory_Attach(QSharedMemory* self); bool QSharedMemory_IsAttached(const QSharedMemory* self); bool QSharedMemory_Detach(QSharedMemory* self); @@ -49,9 +48,7 @@ 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, int mode); +bool QSharedMemory_Create2(QSharedMemory* self, ptrdiff_t size, int mode); bool QSharedMemory_Attach1(QSharedMemory* self, int mode); void QSharedMemory_Delete(QSharedMemory* self); diff --git a/qt/gen_qshortcut.cpp b/qt/gen_qshortcut.cpp index f483a96..298fe47 100644 --- a/qt/gen_qshortcut.cpp +++ b/qt/gen_qshortcut.cpp @@ -1,32 +1,49 @@ #include +#include #include +#include #include #include #include #include -#include #include "qshortcut.h" #include "gen_qshortcut.h" #include "_cgo_export.h" -QShortcut* QShortcut_new(QWidget* parent) { +QShortcut* QShortcut_new(QObject* parent) { return new QShortcut(parent); } -QShortcut* QShortcut_new2(QKeySequence* key, QWidget* parent) { +QShortcut* QShortcut_new2(QKeySequence* key, QObject* parent) { return new QShortcut(*key, parent); } -QShortcut* QShortcut_new3(QKeySequence* key, QWidget* parent, const char* member) { +QShortcut* QShortcut_new3(int key, QObject* parent) { + return new QShortcut(static_cast(key), parent); +} + +QShortcut* QShortcut_new4(QKeySequence* key, QObject* parent, const char* member) { return new QShortcut(*key, parent, member); } -QShortcut* QShortcut_new4(QKeySequence* key, QWidget* parent, const char* member, const char* ambiguousMember) { +QShortcut* QShortcut_new5(QKeySequence* key, QObject* parent, const char* member, const char* ambiguousMember) { return new QShortcut(*key, parent, member, ambiguousMember); } -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)); +QShortcut* QShortcut_new6(QKeySequence* key, QObject* parent, const char* member, const char* ambiguousMember, int context) { + return new QShortcut(*key, parent, member, ambiguousMember, static_cast(context)); +} + +QShortcut* QShortcut_new7(int key, QObject* parent, const char* member) { + return new QShortcut(static_cast(key), parent, member); +} + +QShortcut* QShortcut_new8(int key, QObject* parent, const char* member, const char* ambiguousMember) { + return new QShortcut(static_cast(key), parent, member, ambiguousMember); +} + +QShortcut* QShortcut_new9(int key, QObject* parent, const char* member, const char* ambiguousMember, int context) { + return new QShortcut(static_cast(key), parent, member, ambiguousMember, static_cast(context)); } QMetaObject* QShortcut_MetaObject(const QShortcut* self) { @@ -44,13 +61,6 @@ struct miqt_string* QShortcut_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QShortcut_TrUtf8(const char* s) { - QString _ret = QShortcut::trUtf8(s); - // 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 QShortcut_SetKey(QShortcut* self, QKeySequence* key) { self->setKey(*key); } @@ -59,6 +69,33 @@ QKeySequence* QShortcut_Key(const QShortcut* self) { return new QKeySequence(self->key()); } +void QShortcut_SetKeys(QShortcut* self, int key) { + self->setKeys(static_cast(key)); +} + +void QShortcut_SetKeysWithKeys(QShortcut* self, struct miqt_array* /* of QKeySequence* */ keys) { + QList keys_QList; + keys_QList.reserve(keys->len); + QKeySequence** keys_arr = static_cast(keys->data); + for(size_t i = 0; i < keys->len; ++i) { + keys_QList.push_back(*(keys_arr[i])); + } + self->setKeys(keys_QList); +} + +struct miqt_array* QShortcut_Keys(const QShortcut* self) { + QList _ret = self->keys(); + // Convert QList<> from C++ memory to manually-managed C memory + QKeySequence** _arr = static_cast(malloc(sizeof(QKeySequence*) * _ret.length())); + for (size_t i = 0, e = _ret.length(); i < e; ++i) { + _arr[i] = new QKeySequence(_ret[i]); + } + struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); + _out->len = _ret.length(); + _out->data = static_cast(_arr); + return _out; +} + void QShortcut_SetEnabled(QShortcut* self, bool enable) { self->setEnabled(enable); } @@ -76,18 +113,6 @@ int QShortcut_Context(const QShortcut* self) { return static_cast(_ret); } -void QShortcut_SetWhatsThis(QShortcut* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); - self->setWhatsThis(text_QString); -} - -struct miqt_string* QShortcut_WhatsThis(const QShortcut* self) { - QString _ret = self->whatsThis(); - // 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 QShortcut_SetAutoRepeat(QShortcut* self, bool on) { self->setAutoRepeat(on); } @@ -100,8 +125,16 @@ int QShortcut_Id(const QShortcut* self) { return self->id(); } -QWidget* QShortcut_ParentWidget(const QShortcut* self) { - return self->parentWidget(); +void QShortcut_SetWhatsThis(QShortcut* self, struct miqt_string* text) { + QString text_QString = QString::fromUtf8(&text->data, text->len); + self->setWhatsThis(text_QString); +} + +struct miqt_string* QShortcut_WhatsThis(const QShortcut* self) { + QString _ret = self->whatsThis(); + // 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 QShortcut_Activated(QShortcut* self) { @@ -138,20 +171,6 @@ struct miqt_string* QShortcut_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QShortcut_TrUtf82(const char* s, const char* c) { - QString _ret = QShortcut::trUtf8(s, c); - // 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* QShortcut_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QShortcut::trUtf8(s, c, static_cast(n)); - // 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 QShortcut_Delete(QShortcut* self) { delete self; } diff --git a/qt/gen_qshortcut.go b/qt/gen_qshortcut.go index 58cb009..6df2a51 100644 --- a/qt/gen_qshortcut.go +++ b/qt/gen_qshortcut.go @@ -38,42 +38,76 @@ func newQShortcut_U(h unsafe.Pointer) *QShortcut { } // NewQShortcut constructs a new QShortcut object. -func NewQShortcut(parent *QWidget) *QShortcut { +func NewQShortcut(parent *QObject) *QShortcut { ret := C.QShortcut_new(parent.cPointer()) return newQShortcut(ret) } // NewQShortcut2 constructs a new QShortcut object. -func NewQShortcut2(key *QKeySequence, parent *QWidget) *QShortcut { +func NewQShortcut2(key *QKeySequence, parent *QObject) *QShortcut { ret := C.QShortcut_new2(key.cPointer(), parent.cPointer()) return newQShortcut(ret) } // NewQShortcut3 constructs a new QShortcut object. -func NewQShortcut3(key *QKeySequence, parent *QWidget, member string) *QShortcut { - member_Cstring := C.CString(member) - defer C.free(unsafe.Pointer(member_Cstring)) - ret := C.QShortcut_new3(key.cPointer(), parent.cPointer(), member_Cstring) +func NewQShortcut3(key QKeySequence__StandardKey, parent *QObject) *QShortcut { + ret := C.QShortcut_new3((C.int)(key), parent.cPointer()) return newQShortcut(ret) } // NewQShortcut4 constructs a new QShortcut object. -func NewQShortcut4(key *QKeySequence, parent *QWidget, member string, ambiguousMember string) *QShortcut { +func NewQShortcut4(key *QKeySequence, parent *QObject, member string) *QShortcut { member_Cstring := C.CString(member) defer C.free(unsafe.Pointer(member_Cstring)) - ambiguousMember_Cstring := C.CString(ambiguousMember) - defer C.free(unsafe.Pointer(ambiguousMember_Cstring)) - ret := C.QShortcut_new4(key.cPointer(), parent.cPointer(), member_Cstring, ambiguousMember_Cstring) + ret := C.QShortcut_new4(key.cPointer(), parent.cPointer(), member_Cstring) return newQShortcut(ret) } // NewQShortcut5 constructs a new QShortcut object. -func NewQShortcut5(key *QKeySequence, parent *QWidget, member string, ambiguousMember string, shortcutContext ShortcutContext) *QShortcut { +func NewQShortcut5(key *QKeySequence, parent *QObject, member string, ambiguousMember string) *QShortcut { member_Cstring := C.CString(member) 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.int)(shortcutContext)) + ret := C.QShortcut_new5(key.cPointer(), parent.cPointer(), member_Cstring, ambiguousMember_Cstring) + return newQShortcut(ret) +} + +// NewQShortcut6 constructs a new QShortcut object. +func NewQShortcut6(key *QKeySequence, parent *QObject, member string, ambiguousMember string, context ShortcutContext) *QShortcut { + member_Cstring := C.CString(member) + defer C.free(unsafe.Pointer(member_Cstring)) + ambiguousMember_Cstring := C.CString(ambiguousMember) + defer C.free(unsafe.Pointer(ambiguousMember_Cstring)) + ret := C.QShortcut_new6(key.cPointer(), parent.cPointer(), member_Cstring, ambiguousMember_Cstring, (C.int)(context)) + return newQShortcut(ret) +} + +// NewQShortcut7 constructs a new QShortcut object. +func NewQShortcut7(key QKeySequence__StandardKey, parent *QObject, member string) *QShortcut { + member_Cstring := C.CString(member) + defer C.free(unsafe.Pointer(member_Cstring)) + ret := C.QShortcut_new7((C.int)(key), parent.cPointer(), member_Cstring) + return newQShortcut(ret) +} + +// NewQShortcut8 constructs a new QShortcut object. +func NewQShortcut8(key QKeySequence__StandardKey, parent *QObject, member string, ambiguousMember string) *QShortcut { + member_Cstring := C.CString(member) + defer C.free(unsafe.Pointer(member_Cstring)) + ambiguousMember_Cstring := C.CString(ambiguousMember) + defer C.free(unsafe.Pointer(ambiguousMember_Cstring)) + ret := C.QShortcut_new8((C.int)(key), parent.cPointer(), member_Cstring, ambiguousMember_Cstring) + return newQShortcut(ret) +} + +// NewQShortcut9 constructs a new QShortcut object. +func NewQShortcut9(key QKeySequence__StandardKey, parent *QObject, member string, ambiguousMember string, context ShortcutContext) *QShortcut { + member_Cstring := C.CString(member) + defer C.free(unsafe.Pointer(member_Cstring)) + ambiguousMember_Cstring := C.CString(ambiguousMember) + defer C.free(unsafe.Pointer(ambiguousMember_Cstring)) + ret := C.QShortcut_new9((C.int)(key), parent.cPointer(), member_Cstring, ambiguousMember_Cstring, (C.int)(context)) return newQShortcut(ret) } @@ -96,15 +130,6 @@ func QShortcut_Tr(s string) string { return _ret } -func QShortcut_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QShortcut_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QShortcut) SetKey(key *QKeySequence) { C.QShortcut_SetKey(this.h, key.cPointer()) } @@ -116,6 +141,36 @@ func (this *QShortcut) Key() *QKeySequence { return _goptr } +func (this *QShortcut) SetKeys(key QKeySequence__StandardKey) { + C.QShortcut_SetKeys(this.h, (C.int)(key)) +} + +func (this *QShortcut) SetKeysWithKeys(keys []QKeySequence) { + // For the C ABI, malloc a C array of raw pointers + keys_CArray := (*[0xffff]*C.QKeySequence)(C.malloc(C.size_t(8 * len(keys)))) + defer C.free(unsafe.Pointer(keys_CArray)) + for i := range keys { + keys_CArray[i] = keys[i].cPointer() + } + keys_ma := &C.struct_miqt_array{len: C.size_t(len(keys)), data: unsafe.Pointer(keys_CArray)} + defer runtime.KeepAlive(unsafe.Pointer(keys_ma)) + C.QShortcut_SetKeysWithKeys(this.h, keys_ma) +} + +func (this *QShortcut) Keys() []QKeySequence { + var _ma *C.struct_miqt_array = C.QShortcut_Keys(this.h) + _ret := make([]QKeySequence, int(_ma.len)) + _outCast := (*[0xffff]*C.QKeySequence)(unsafe.Pointer(_ma.data)) // hey ya + for i := 0; i < int(_ma.len); i++ { + _lv_ret := _outCast[i] + _lv_goptr := newQKeySequence(_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 *QShortcut) SetEnabled(enable bool) { C.QShortcut_SetEnabled(this.h, (C.bool)(enable)) } @@ -132,19 +187,6 @@ func (this *QShortcut) Context() ShortcutContext { return (ShortcutContext)(C.QShortcut_Context(this.h)) } -func (this *QShortcut) SetWhatsThis(text string) { - text_ms := miqt_strdupg(text) - defer C.free(text_ms) - C.QShortcut_SetWhatsThis(this.h, (*C.struct_miqt_string)(text_ms)) -} - -func (this *QShortcut) WhatsThis() string { - var _ms *C.struct_miqt_string = C.QShortcut_WhatsThis(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QShortcut) SetAutoRepeat(on bool) { C.QShortcut_SetAutoRepeat(this.h, (C.bool)(on)) } @@ -157,8 +199,17 @@ func (this *QShortcut) Id() int { return (int)(C.QShortcut_Id(this.h)) } -func (this *QShortcut) ParentWidget() *QWidget { - return newQWidget_U(unsafe.Pointer(C.QShortcut_ParentWidget(this.h))) +func (this *QShortcut) SetWhatsThis(text string) { + text_ms := miqt_strdupg(text) + defer C.free(text_ms) + C.QShortcut_SetWhatsThis(this.h, (*C.struct_miqt_string)(text_ms)) +} + +func (this *QShortcut) WhatsThis() string { + var _ms *C.struct_miqt_string = C.QShortcut_WhatsThis(this.h) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret } func (this *QShortcut) Activated() { @@ -217,28 +268,6 @@ func QShortcut_Tr3(s string, c string, n int) string { return _ret } -func QShortcut_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QShortcut_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QShortcut_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QShortcut_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QShortcut) Delete() { C.QShortcut_Delete(this.h) diff --git a/qt/gen_qshortcut.h b/qt/gen_qshortcut.h index 4257d9a..3b30f62 100644 --- a/qt/gen_qshortcut.h +++ b/qt/gen_qshortcut.h @@ -16,44 +16,47 @@ extern "C" { #ifdef __cplusplus class QKeySequence; class QMetaObject; +class QObject; class QShortcut; -class QWidget; #else typedef struct QKeySequence QKeySequence; typedef struct QMetaObject QMetaObject; +typedef struct QObject QObject; typedef struct QShortcut QShortcut; -typedef struct QWidget QWidget; #endif -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, int shortcutContext); +QShortcut* QShortcut_new(QObject* parent); +QShortcut* QShortcut_new2(QKeySequence* key, QObject* parent); +QShortcut* QShortcut_new3(int key, QObject* parent); +QShortcut* QShortcut_new4(QKeySequence* key, QObject* parent, const char* member); +QShortcut* QShortcut_new5(QKeySequence* key, QObject* parent, const char* member, const char* ambiguousMember); +QShortcut* QShortcut_new6(QKeySequence* key, QObject* parent, const char* member, const char* ambiguousMember, int context); +QShortcut* QShortcut_new7(int key, QObject* parent, const char* member); +QShortcut* QShortcut_new8(int key, QObject* parent, const char* member, const char* ambiguousMember); +QShortcut* QShortcut_new9(int key, QObject* parent, const char* member, const char* ambiguousMember, int context); QMetaObject* QShortcut_MetaObject(const QShortcut* self); void* QShortcut_Metacast(QShortcut* self, const char* param1); struct miqt_string* QShortcut_Tr(const char* s); -struct miqt_string* QShortcut_TrUtf8(const char* s); void QShortcut_SetKey(QShortcut* self, QKeySequence* key); QKeySequence* QShortcut_Key(const QShortcut* self); +void QShortcut_SetKeys(QShortcut* self, int key); +void QShortcut_SetKeysWithKeys(QShortcut* self, struct miqt_array* /* of QKeySequence* */ keys); +struct miqt_array* QShortcut_Keys(const QShortcut* self); void QShortcut_SetEnabled(QShortcut* self, bool enable); bool QShortcut_IsEnabled(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); bool QShortcut_AutoRepeat(const QShortcut* self); int QShortcut_Id(const QShortcut* self); -QWidget* QShortcut_ParentWidget(const QShortcut* self); +void QShortcut_SetWhatsThis(QShortcut* self, struct miqt_string* text); +struct miqt_string* QShortcut_WhatsThis(const QShortcut* self); void QShortcut_Activated(QShortcut* self); void QShortcut_connect_Activated(QShortcut* self, void* slot); void QShortcut_ActivatedAmbiguously(QShortcut* self); void QShortcut_connect_ActivatedAmbiguously(QShortcut* self, void* slot); struct miqt_string* QShortcut_Tr2(const char* s, const char* c); struct miqt_string* QShortcut_Tr3(const char* s, const char* c, int n); -struct miqt_string* QShortcut_TrUtf82(const char* s, const char* c); -struct miqt_string* QShortcut_TrUtf83(const char* s, const char* c, int n); void QShortcut_Delete(QShortcut* self); #ifdef __cplusplus diff --git a/qt/gen_qsignalmapper.cpp b/qt/gen_qsignalmapper.cpp index e5097f9..b6f1315 100644 --- a/qt/gen_qsignalmapper.cpp +++ b/qt/gen_qsignalmapper.cpp @@ -4,7 +4,6 @@ #include #include #include -#include #include "qsignalmapper.h" #include "gen_qsignalmapper.h" #include "_cgo_export.h" @@ -32,13 +31,6 @@ struct miqt_string* QSignalMapper_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QSignalMapper_TrUtf8(const char* s) { - QString _ret = QSignalMapper::trUtf8(s); - // 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 QSignalMapper_SetMapping(QSignalMapper* self, QObject* sender, int id) { self->setMapping(sender, static_cast(id)); } @@ -48,11 +40,7 @@ void QSignalMapper_SetMapping2(QSignalMapper* self, QObject* sender, struct miqt self->setMapping(sender, text_QString); } -void QSignalMapper_SetMapping3(QSignalMapper* self, QObject* sender, QWidget* widget) { - self->setMapping(sender, widget); -} - -void QSignalMapper_SetMapping4(QSignalMapper* self, QObject* sender, QObject* object) { +void QSignalMapper_SetMapping3(QSignalMapper* self, QObject* sender, QObject* object) { self->setMapping(sender, object); } @@ -69,62 +57,10 @@ QObject* QSignalMapper_MappingWithText(const QSignalMapper* self, struct miqt_st return self->mapping(text_QString); } -QObject* QSignalMapper_MappingWithWidget(const QSignalMapper* self, QWidget* widget) { - return self->mapping(widget); -} - QObject* QSignalMapper_MappingWithObject(const QSignalMapper* self, QObject* object) { return self->mapping(object); } -void QSignalMapper_Mapped(QSignalMapper* self, int param1) { - self->mapped(static_cast(param1)); -} - -void QSignalMapper_connect_Mapped(QSignalMapper* self, void* slot) { - QSignalMapper::connect(self, static_cast(&QSignalMapper::mapped), self, [=](int param1) { - int sigval1 = param1; - miqt_exec_callback_QSignalMapper_Mapped(slot, sigval1); - }); -} - -void QSignalMapper_MappedWithQString(QSignalMapper* self, struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); - self->mapped(param1_QString); -} - -void QSignalMapper_connect_MappedWithQString(QSignalMapper* self, void* slot) { - QSignalMapper::connect(self, static_cast(&QSignalMapper::mapped), self, [=](const QString& param1) { - const QString param1_ret = param1; - // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory - QByteArray param1_b = param1_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(param1_b.data(), param1_b.length()); - miqt_exec_callback_QSignalMapper_MappedWithQString(slot, sigval1); - }); -} - -void QSignalMapper_MappedWithQWidget(QSignalMapper* self, QWidget* param1) { - self->mapped(param1); -} - -void QSignalMapper_connect_MappedWithQWidget(QSignalMapper* self, void* slot) { - QSignalMapper::connect(self, static_cast(&QSignalMapper::mapped), self, [=](QWidget* param1) { - QWidget* sigval1 = param1; - miqt_exec_callback_QSignalMapper_MappedWithQWidget(slot, sigval1); - }); -} - -void QSignalMapper_MappedWithQObject(QSignalMapper* self, QObject* param1) { - self->mapped(param1); -} - -void QSignalMapper_connect_MappedWithQObject(QSignalMapper* self, void* slot) { - QSignalMapper::connect(self, static_cast(&QSignalMapper::mapped), self, [=](QObject* param1) { - QObject* sigval1 = param1; - miqt_exec_callback_QSignalMapper_MappedWithQObject(slot, sigval1); - }); -} - void QSignalMapper_MappedInt(QSignalMapper* self, int param1) { self->mappedInt(static_cast(param1)); } @@ -151,17 +87,6 @@ void QSignalMapper_connect_MappedString(QSignalMapper* self, void* slot) { }); } -void QSignalMapper_MappedWidget(QSignalMapper* self, QWidget* param1) { - self->mappedWidget(param1); -} - -void QSignalMapper_connect_MappedWidget(QSignalMapper* self, void* slot) { - QSignalMapper::connect(self, static_cast(&QSignalMapper::mappedWidget), self, [=](QWidget* param1) { - QWidget* sigval1 = param1; - miqt_exec_callback_QSignalMapper_MappedWidget(slot, sigval1); - }); -} - void QSignalMapper_MappedObject(QSignalMapper* self, QObject* param1) { self->mappedObject(param1); } @@ -195,20 +120,6 @@ struct miqt_string* QSignalMapper_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QSignalMapper_TrUtf82(const char* s, const char* c) { - QString _ret = QSignalMapper::trUtf8(s, c); - // 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* QSignalMapper_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QSignalMapper::trUtf8(s, c, static_cast(n)); - // 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 QSignalMapper_Delete(QSignalMapper* self) { delete self; } diff --git a/qt/gen_qsignalmapper.go b/qt/gen_qsignalmapper.go index 45de7b8..7193836 100644 --- a/qt/gen_qsignalmapper.go +++ b/qt/gen_qsignalmapper.go @@ -68,15 +68,6 @@ func QSignalMapper_Tr(s string) string { return _ret } -func QSignalMapper_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSignalMapper_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QSignalMapper) SetMapping(sender *QObject, id int) { C.QSignalMapper_SetMapping(this.h, sender.cPointer(), (C.int)(id)) } @@ -87,12 +78,8 @@ func (this *QSignalMapper) SetMapping2(sender *QObject, text string) { C.QSignalMapper_SetMapping2(this.h, sender.cPointer(), (*C.struct_miqt_string)(text_ms)) } -func (this *QSignalMapper) SetMapping3(sender *QObject, widget *QWidget) { - C.QSignalMapper_SetMapping3(this.h, sender.cPointer(), widget.cPointer()) -} - -func (this *QSignalMapper) SetMapping4(sender *QObject, object *QObject) { - C.QSignalMapper_SetMapping4(this.h, sender.cPointer(), object.cPointer()) +func (this *QSignalMapper) SetMapping3(sender *QObject, object *QObject) { + C.QSignalMapper_SetMapping3(this.h, sender.cPointer(), object.cPointer()) } func (this *QSignalMapper) RemoveMappings(sender *QObject) { @@ -109,99 +96,10 @@ func (this *QSignalMapper) MappingWithText(text string) *QObject { return newQObject_U(unsafe.Pointer(C.QSignalMapper_MappingWithText(this.h, (*C.struct_miqt_string)(text_ms)))) } -func (this *QSignalMapper) MappingWithWidget(widget *QWidget) *QObject { - return newQObject_U(unsafe.Pointer(C.QSignalMapper_MappingWithWidget(this.h, widget.cPointer()))) -} - func (this *QSignalMapper) MappingWithObject(object *QObject) *QObject { return newQObject_U(unsafe.Pointer(C.QSignalMapper_MappingWithObject(this.h, object.cPointer()))) } -func (this *QSignalMapper) Mapped(param1 int) { - C.QSignalMapper_Mapped(this.h, (C.int)(param1)) -} -func (this *QSignalMapper) OnMapped(slot func(param1 int)) { - C.QSignalMapper_connect_Mapped(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) -} - -//export miqt_exec_callback_QSignalMapper_Mapped -func miqt_exec_callback_QSignalMapper_Mapped(cb *C.void, param1 C.int) { - gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 int)) - if !ok { - panic("miqt: callback of non-callback type (heap corruption?)") - } - - // Convert all CABI parameters to Go parameters - slotval1 := (int)(param1) - - gofunc(slotval1) -} - -func (this *QSignalMapper) MappedWithQString(param1 string) { - param1_ms := miqt_strdupg(param1) - defer C.free(param1_ms) - C.QSignalMapper_MappedWithQString(this.h, (*C.struct_miqt_string)(param1_ms)) -} -func (this *QSignalMapper) OnMappedWithQString(slot func(param1 string)) { - C.QSignalMapper_connect_MappedWithQString(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) -} - -//export miqt_exec_callback_QSignalMapper_MappedWithQString -func miqt_exec_callback_QSignalMapper_MappedWithQString(cb *C.void, param1 *C.struct_miqt_string) { - gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 string)) - if !ok { - panic("miqt: callback of non-callback type (heap corruption?)") - } - - // Convert all CABI parameters to Go parameters - var param1_ms *C.struct_miqt_string = param1 - param1_ret := C.GoStringN(¶m1_ms.data, C.int(int64(param1_ms.len))) - C.free(unsafe.Pointer(param1_ms)) - slotval1 := param1_ret - - gofunc(slotval1) -} - -func (this *QSignalMapper) MappedWithQWidget(param1 *QWidget) { - C.QSignalMapper_MappedWithQWidget(this.h, param1.cPointer()) -} -func (this *QSignalMapper) OnMappedWithQWidget(slot func(param1 *QWidget)) { - C.QSignalMapper_connect_MappedWithQWidget(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) -} - -//export miqt_exec_callback_QSignalMapper_MappedWithQWidget -func miqt_exec_callback_QSignalMapper_MappedWithQWidget(cb *C.void, param1 *C.QWidget) { - gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 *QWidget)) - if !ok { - panic("miqt: callback of non-callback type (heap corruption?)") - } - - // Convert all CABI parameters to Go parameters - slotval1 := newQWidget_U(unsafe.Pointer(param1)) - - gofunc(slotval1) -} - -func (this *QSignalMapper) MappedWithQObject(param1 *QObject) { - C.QSignalMapper_MappedWithQObject(this.h, param1.cPointer()) -} -func (this *QSignalMapper) OnMappedWithQObject(slot func(param1 *QObject)) { - C.QSignalMapper_connect_MappedWithQObject(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) -} - -//export miqt_exec_callback_QSignalMapper_MappedWithQObject -func miqt_exec_callback_QSignalMapper_MappedWithQObject(cb *C.void, param1 *C.QObject) { - gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 *QObject)) - if !ok { - panic("miqt: callback of non-callback type (heap corruption?)") - } - - // Convert all CABI parameters to Go parameters - slotval1 := newQObject_U(unsafe.Pointer(param1)) - - gofunc(slotval1) -} - func (this *QSignalMapper) MappedInt(param1 int) { C.QSignalMapper_MappedInt(this.h, (C.int)(param1)) } @@ -247,26 +145,6 @@ func miqt_exec_callback_QSignalMapper_MappedString(cb *C.void, param1 *C.struct_ gofunc(slotval1) } -func (this *QSignalMapper) MappedWidget(param1 *QWidget) { - C.QSignalMapper_MappedWidget(this.h, param1.cPointer()) -} -func (this *QSignalMapper) OnMappedWidget(slot func(param1 *QWidget)) { - C.QSignalMapper_connect_MappedWidget(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) -} - -//export miqt_exec_callback_QSignalMapper_MappedWidget -func miqt_exec_callback_QSignalMapper_MappedWidget(cb *C.void, param1 *C.QWidget) { - gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 *QWidget)) - if !ok { - panic("miqt: callback of non-callback type (heap corruption?)") - } - - // Convert all CABI parameters to Go parameters - slotval1 := newQWidget_U(unsafe.Pointer(param1)) - - gofunc(slotval1) -} - func (this *QSignalMapper) MappedObject(param1 *QObject) { C.QSignalMapper_MappedObject(this.h, param1.cPointer()) } @@ -317,28 +195,6 @@ func QSignalMapper_Tr3(s string, c string, n int) string { return _ret } -func QSignalMapper_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSignalMapper_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QSignalMapper_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSignalMapper_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QSignalMapper) Delete() { C.QSignalMapper_Delete(this.h) diff --git a/qt/gen_qsignalmapper.h b/qt/gen_qsignalmapper.h index 37125c2..4998727 100644 --- a/qt/gen_qsignalmapper.h +++ b/qt/gen_qsignalmapper.h @@ -17,12 +17,10 @@ extern "C" { class QMetaObject; class QObject; class QSignalMapper; -class QWidget; #else typedef struct QMetaObject QMetaObject; typedef struct QObject QObject; typedef struct QSignalMapper QSignalMapper; -typedef struct QWidget QWidget; #endif QSignalMapper* QSignalMapper_new(); @@ -30,38 +28,23 @@ QSignalMapper* QSignalMapper_new2(QObject* parent); QMetaObject* QSignalMapper_MetaObject(const QSignalMapper* self); void* QSignalMapper_Metacast(QSignalMapper* self, const char* param1); struct miqt_string* QSignalMapper_Tr(const char* s); -struct miqt_string* QSignalMapper_TrUtf8(const char* s); void QSignalMapper_SetMapping(QSignalMapper* self, QObject* sender, int id); void QSignalMapper_SetMapping2(QSignalMapper* self, QObject* sender, struct miqt_string* text); -void QSignalMapper_SetMapping3(QSignalMapper* self, QObject* sender, QWidget* widget); -void QSignalMapper_SetMapping4(QSignalMapper* self, QObject* sender, QObject* object); +void QSignalMapper_SetMapping3(QSignalMapper* self, QObject* sender, QObject* object); void QSignalMapper_RemoveMappings(QSignalMapper* self, QObject* sender); QObject* QSignalMapper_Mapping(const QSignalMapper* self, int id); QObject* QSignalMapper_MappingWithText(const QSignalMapper* self, struct miqt_string* text); -QObject* QSignalMapper_MappingWithWidget(const QSignalMapper* self, QWidget* widget); QObject* QSignalMapper_MappingWithObject(const QSignalMapper* self, QObject* object); -void QSignalMapper_Mapped(QSignalMapper* self, int param1); -void QSignalMapper_connect_Mapped(QSignalMapper* self, void* slot); -void QSignalMapper_MappedWithQString(QSignalMapper* self, struct miqt_string* param1); -void QSignalMapper_connect_MappedWithQString(QSignalMapper* self, void* slot); -void QSignalMapper_MappedWithQWidget(QSignalMapper* self, QWidget* param1); -void QSignalMapper_connect_MappedWithQWidget(QSignalMapper* self, void* slot); -void QSignalMapper_MappedWithQObject(QSignalMapper* self, QObject* param1); -void QSignalMapper_connect_MappedWithQObject(QSignalMapper* self, void* slot); void QSignalMapper_MappedInt(QSignalMapper* self, int param1); void QSignalMapper_connect_MappedInt(QSignalMapper* self, void* slot); void QSignalMapper_MappedString(QSignalMapper* self, struct miqt_string* param1); void QSignalMapper_connect_MappedString(QSignalMapper* self, void* slot); -void QSignalMapper_MappedWidget(QSignalMapper* self, QWidget* param1); -void QSignalMapper_connect_MappedWidget(QSignalMapper* self, void* slot); void QSignalMapper_MappedObject(QSignalMapper* self, QObject* param1); void QSignalMapper_connect_MappedObject(QSignalMapper* self, void* slot); void QSignalMapper_Map(QSignalMapper* self); void QSignalMapper_MapWithSender(QSignalMapper* self, QObject* sender); struct miqt_string* QSignalMapper_Tr2(const char* s, const char* c); struct miqt_string* QSignalMapper_Tr3(const char* s, const char* c, int n); -struct miqt_string* QSignalMapper_TrUtf82(const char* s, const char* c); -struct miqt_string* QSignalMapper_TrUtf83(const char* s, const char* c, int n); void QSignalMapper_Delete(QSignalMapper* self); #ifdef __cplusplus diff --git a/qt/gen_qsignaltransition.cpp b/qt/gen_qsignaltransition.cpp deleted file mode 100644 index 89a57b6..0000000 --- a/qt/gen_qsignaltransition.cpp +++ /dev/null @@ -1,98 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include "qsignaltransition.h" -#include "gen_qsignaltransition.h" -#include "_cgo_export.h" - -QSignalTransition* QSignalTransition_new() { - return new QSignalTransition(); -} - -QSignalTransition* QSignalTransition_new2(QObject* sender, const char* signal) { - return new QSignalTransition(sender, signal); -} - -QSignalTransition* QSignalTransition_new3(QState* sourceState) { - return new QSignalTransition(sourceState); -} - -QSignalTransition* QSignalTransition_new4(QObject* sender, const char* signal, QState* sourceState) { - return new QSignalTransition(sender, signal, sourceState); -} - -QMetaObject* QSignalTransition_MetaObject(const QSignalTransition* self) { - return (QMetaObject*) self->metaObject(); -} - -void* QSignalTransition_Metacast(QSignalTransition* self, const char* param1) { - return self->qt_metacast(param1); -} - -struct miqt_string* QSignalTransition_Tr(const char* s) { - QString _ret = QSignalTransition::tr(s); - // 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* QSignalTransition_TrUtf8(const char* s) { - QString _ret = QSignalTransition::trUtf8(s); - // 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()); -} - -QObject* QSignalTransition_SenderObject(const QSignalTransition* self) { - return self->senderObject(); -} - -void QSignalTransition_SetSenderObject(QSignalTransition* self, QObject* sender) { - self->setSenderObject(sender); -} - -QByteArray* QSignalTransition_Signal(const QSignalTransition* self) { - return new QByteArray(self->signal()); -} - -void QSignalTransition_SetSignal(QSignalTransition* self, QByteArray* signal) { - self->setSignal(*signal); -} - -struct miqt_string* QSignalTransition_Tr2(const char* s, const char* c) { - QString _ret = QSignalTransition::tr(s, c); - // 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* QSignalTransition_Tr3(const char* s, const char* c, int n) { - QString _ret = QSignalTransition::tr(s, c, static_cast(n)); - // 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* QSignalTransition_TrUtf82(const char* s, const char* c) { - QString _ret = QSignalTransition::trUtf8(s, c); - // 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* QSignalTransition_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QSignalTransition::trUtf8(s, c, static_cast(n)); - // 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 QSignalTransition_Delete(QSignalTransition* self) { - delete self; -} - diff --git a/qt/gen_qsignaltransition.go b/qt/gen_qsignaltransition.go deleted file mode 100644 index 97867da..0000000 --- a/qt/gen_qsignaltransition.go +++ /dev/null @@ -1,170 +0,0 @@ -package qt - -/* - -#include "gen_qsignaltransition.h" -#include - -*/ -import "C" - -import ( - "runtime" - "unsafe" -) - -type QSignalTransition struct { - h *C.QSignalTransition - *QAbstractTransition -} - -func (this *QSignalTransition) cPointer() *C.QSignalTransition { - if this == nil { - return nil - } - return this.h -} - -func newQSignalTransition(h *C.QSignalTransition) *QSignalTransition { - if h == nil { - return nil - } - return &QSignalTransition{h: h, QAbstractTransition: newQAbstractTransition_U(unsafe.Pointer(h))} -} - -func newQSignalTransition_U(h unsafe.Pointer) *QSignalTransition { - return newQSignalTransition((*C.QSignalTransition)(h)) -} - -// NewQSignalTransition constructs a new QSignalTransition object. -func NewQSignalTransition() *QSignalTransition { - ret := C.QSignalTransition_new() - return newQSignalTransition(ret) -} - -// NewQSignalTransition2 constructs a new QSignalTransition object. -func NewQSignalTransition2(sender *QObject, signal string) *QSignalTransition { - signal_Cstring := C.CString(signal) - defer C.free(unsafe.Pointer(signal_Cstring)) - ret := C.QSignalTransition_new2(sender.cPointer(), signal_Cstring) - return newQSignalTransition(ret) -} - -// NewQSignalTransition3 constructs a new QSignalTransition object. -func NewQSignalTransition3(sourceState *QState) *QSignalTransition { - ret := C.QSignalTransition_new3(sourceState.cPointer()) - return newQSignalTransition(ret) -} - -// NewQSignalTransition4 constructs a new QSignalTransition object. -func NewQSignalTransition4(sender *QObject, signal string, sourceState *QState) *QSignalTransition { - signal_Cstring := C.CString(signal) - defer C.free(unsafe.Pointer(signal_Cstring)) - ret := C.QSignalTransition_new4(sender.cPointer(), signal_Cstring, sourceState.cPointer()) - return newQSignalTransition(ret) -} - -func (this *QSignalTransition) MetaObject() *QMetaObject { - return newQMetaObject_U(unsafe.Pointer(C.QSignalTransition_MetaObject(this.h))) -} - -func (this *QSignalTransition) Metacast(param1 string) unsafe.Pointer { - param1_Cstring := C.CString(param1) - defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QSignalTransition_Metacast(this.h, param1_Cstring) -} - -func QSignalTransition_Tr(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSignalTransition_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QSignalTransition_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSignalTransition_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QSignalTransition) SenderObject() *QObject { - return newQObject_U(unsafe.Pointer(C.QSignalTransition_SenderObject(this.h))) -} - -func (this *QSignalTransition) SetSenderObject(sender *QObject) { - C.QSignalTransition_SetSenderObject(this.h, sender.cPointer()) -} - -func (this *QSignalTransition) Signal() *QByteArray { - _ret := C.QSignalTransition_Signal(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QSignalTransition) SetSignal(signal *QByteArray) { - C.QSignalTransition_SetSignal(this.h, signal.cPointer()) -} - -func QSignalTransition_Tr2(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSignalTransition_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QSignalTransition_Tr3(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSignalTransition_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QSignalTransition_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSignalTransition_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QSignalTransition_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSignalTransition_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -// Delete this object from C++ memory. -func (this *QSignalTransition) Delete() { - C.QSignalTransition_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QSignalTransition) GoGC() { - runtime.SetFinalizer(this, func(this *QSignalTransition) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} diff --git a/qt/gen_qsignaltransition.h b/qt/gen_qsignaltransition.h deleted file mode 100644 index 60171c5..0000000 --- a/qt/gen_qsignaltransition.h +++ /dev/null @@ -1,52 +0,0 @@ -#ifndef GEN_QSIGNALTRANSITION_H -#define GEN_QSIGNALTRANSITION_H - -#include -#include -#include - -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - -#include "binding.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __cplusplus -class QByteArray; -class QMetaObject; -class QObject; -class QSignalTransition; -class QState; -#else -typedef struct QByteArray QByteArray; -typedef struct QMetaObject QMetaObject; -typedef struct QObject QObject; -typedef struct QSignalTransition QSignalTransition; -typedef struct QState QState; -#endif - -QSignalTransition* QSignalTransition_new(); -QSignalTransition* QSignalTransition_new2(QObject* sender, const char* signal); -QSignalTransition* QSignalTransition_new3(QState* sourceState); -QSignalTransition* QSignalTransition_new4(QObject* sender, const char* signal, QState* sourceState); -QMetaObject* QSignalTransition_MetaObject(const QSignalTransition* self); -void* QSignalTransition_Metacast(QSignalTransition* self, const char* param1); -struct miqt_string* QSignalTransition_Tr(const char* s); -struct miqt_string* QSignalTransition_TrUtf8(const char* s); -QObject* QSignalTransition_SenderObject(const QSignalTransition* self); -void QSignalTransition_SetSenderObject(QSignalTransition* self, QObject* sender); -QByteArray* QSignalTransition_Signal(const QSignalTransition* self); -void QSignalTransition_SetSignal(QSignalTransition* self, QByteArray* signal); -struct miqt_string* QSignalTransition_Tr2(const char* s, const char* c); -struct miqt_string* QSignalTransition_Tr3(const char* s, const char* c, int n); -struct miqt_string* QSignalTransition_TrUtf82(const char* s, const char* c); -struct miqt_string* QSignalTransition_TrUtf83(const char* s, const char* c, int n); -void QSignalTransition_Delete(QSignalTransition* self); - -#ifdef __cplusplus -} /* extern C */ -#endif - -#endif diff --git a/qt/gen_qsize.cpp b/qt/gen_qsize.cpp index 0d740dd..83254bd 100644 --- a/qt/gen_qsize.cpp +++ b/qt/gen_qsize.cpp @@ -110,6 +110,10 @@ QSize* QSize_OperatorDivideAssign(QSize* self, double c) { return &_ret; } +QSizeF* QSize_ToSizeF(const QSize* self) { + return new QSizeF(self->toSizeF()); +} + void QSize_Delete(QSize* self) { delete self; } diff --git a/qt/gen_qsize.go b/qt/gen_qsize.go index 1ee353e..42d81de 100644 --- a/qt/gen_qsize.go +++ b/qt/gen_qsize.go @@ -158,6 +158,13 @@ func (this *QSize) OperatorDivideAssign(c float64) *QSize { return newQSize_U(unsafe.Pointer(C.QSize_OperatorDivideAssign(this.h, (C.double)(c)))) } +func (this *QSize) ToSizeF() *QSizeF { + _ret := C.QSize_ToSizeF(this.h) + _goptr := newQSizeF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + // Delete this object from C++ memory. func (this *QSize) Delete() { C.QSize_Delete(this.h) diff --git a/qt/gen_qsize.h b/qt/gen_qsize.h index 4fcddd7..8b62453 100644 --- a/qt/gen_qsize.h +++ b/qt/gen_qsize.h @@ -49,6 +49,7 @@ QSize* QSize_OperatorPlusAssign(QSize* self, QSize* param1); QSize* QSize_OperatorMinusAssign(QSize* self, QSize* param1); QSize* QSize_OperatorMultiplyAssign(QSize* self, double c); QSize* QSize_OperatorDivideAssign(QSize* self, double c); +QSizeF* QSize_ToSizeF(const QSize* self); void QSize_Delete(QSize* self); QSizeF* QSizeF_new(); diff --git a/qt/gen_qsizegrip.cpp b/qt/gen_qsizegrip.cpp index 70038cb..3728df6 100644 --- a/qt/gen_qsizegrip.cpp +++ b/qt/gen_qsizegrip.cpp @@ -28,13 +28,6 @@ struct miqt_string* QSizeGrip_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QSizeGrip_TrUtf8(const char* s) { - QString _ret = QSizeGrip::trUtf8(s); - // 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()); -} - QSize* QSizeGrip_SizeHint(const QSizeGrip* self) { return new QSize(self->sizeHint()); } @@ -57,20 +50,6 @@ struct miqt_string* QSizeGrip_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QSizeGrip_TrUtf82(const char* s, const char* c) { - QString _ret = QSizeGrip::trUtf8(s, c); - // 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* QSizeGrip_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QSizeGrip::trUtf8(s, c, static_cast(n)); - // 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 QSizeGrip_Delete(QSizeGrip* self) { delete self; } diff --git a/qt/gen_qsizegrip.go b/qt/gen_qsizegrip.go index dc04cbf..6be24b9 100644 --- a/qt/gen_qsizegrip.go +++ b/qt/gen_qsizegrip.go @@ -61,15 +61,6 @@ func QSizeGrip_Tr(s string) string { return _ret } -func QSizeGrip_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSizeGrip_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QSizeGrip) SizeHint() *QSize { _ret := C.QSizeGrip_SizeHint(this.h) _goptr := newQSize(_ret) @@ -103,28 +94,6 @@ func QSizeGrip_Tr3(s string, c string, n int) string { return _ret } -func QSizeGrip_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSizeGrip_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QSizeGrip_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSizeGrip_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QSizeGrip) Delete() { C.QSizeGrip_Delete(this.h) diff --git a/qt/gen_qsizegrip.h b/qt/gen_qsizegrip.h index 7b27097..0cc92ef 100644 --- a/qt/gen_qsizegrip.h +++ b/qt/gen_qsizegrip.h @@ -29,13 +29,10 @@ QSizeGrip* QSizeGrip_new(QWidget* parent); QMetaObject* QSizeGrip_MetaObject(const QSizeGrip* self); void* QSizeGrip_Metacast(QSizeGrip* self, const char* param1); struct miqt_string* QSizeGrip_Tr(const char* s); -struct miqt_string* QSizeGrip_TrUtf8(const char* s); QSize* QSizeGrip_SizeHint(const QSizeGrip* self); void QSizeGrip_SetVisible(QSizeGrip* self, bool visible); struct miqt_string* QSizeGrip_Tr2(const char* s, const char* c); struct miqt_string* QSizeGrip_Tr3(const char* s, const char* c, int n); -struct miqt_string* QSizeGrip_TrUtf82(const char* s, const char* c); -struct miqt_string* QSizeGrip_TrUtf83(const char* s, const char* c, int n); void QSizeGrip_Delete(QSizeGrip* self); #ifdef __cplusplus diff --git a/qt/gen_qslider.cpp b/qt/gen_qslider.cpp index c3bfccc..f60b773 100644 --- a/qt/gen_qslider.cpp +++ b/qt/gen_qslider.cpp @@ -41,13 +41,6 @@ struct miqt_string* QSlider_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QSlider_TrUtf8(const char* s) { - QString _ret = QSlider::trUtf8(s); - // 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()); -} - QSize* QSlider_SizeHint(const QSlider* self) { return new QSize(self->sizeHint()); } @@ -91,20 +84,6 @@ struct miqt_string* QSlider_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QSlider_TrUtf82(const char* s, const char* c) { - QString _ret = QSlider::trUtf8(s, c); - // 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* QSlider_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QSlider::trUtf8(s, c, static_cast(n)); - // 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 QSlider_Delete(QSlider* self) { delete self; } diff --git a/qt/gen_qslider.go b/qt/gen_qslider.go index decc09e..6237249 100644 --- a/qt/gen_qslider.go +++ b/qt/gen_qslider.go @@ -90,15 +90,6 @@ func QSlider_Tr(s string) string { return _ret } -func QSlider_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSlider_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QSlider) SizeHint() *QSize { _ret := C.QSlider_SizeHint(this.h) _goptr := newQSize(_ret) @@ -155,28 +146,6 @@ func QSlider_Tr3(s string, c string, n int) string { return _ret } -func QSlider_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSlider_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QSlider_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSlider_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QSlider) Delete() { C.QSlider_Delete(this.h) diff --git a/qt/gen_qslider.h b/qt/gen_qslider.h index 27806dd..083889a 100644 --- a/qt/gen_qslider.h +++ b/qt/gen_qslider.h @@ -34,7 +34,6 @@ QSlider* QSlider_new4(int orientation, QWidget* parent); QMetaObject* QSlider_MetaObject(const QSlider* self); void* QSlider_Metacast(QSlider* self, const char* param1); 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, int position); @@ -44,8 +43,6 @@ int QSlider_TickInterval(const QSlider* self); bool QSlider_Event(QSlider* self, QEvent* event); struct miqt_string* QSlider_Tr2(const char* s, const char* c); struct miqt_string* QSlider_Tr3(const char* s, const char* c, int n); -struct miqt_string* QSlider_TrUtf82(const char* s, const char* c); -struct miqt_string* QSlider_TrUtf83(const char* s, const char* c, int n); void QSlider_Delete(QSlider* self); #ifdef __cplusplus diff --git a/qt/gen_qsocketnotifier.cpp b/qt/gen_qsocketnotifier.cpp index 58add22..dfda0c3 100644 --- a/qt/gen_qsocketnotifier.cpp +++ b/qt/gen_qsocketnotifier.cpp @@ -9,11 +9,19 @@ #include "gen_qsocketnotifier.h" #include "_cgo_export.h" -QSocketNotifier* QSocketNotifier_new(intptr_t socket, int param2) { +QSocketNotifier* QSocketNotifier_new(int param1) { + return new QSocketNotifier(static_cast(param1)); +} + +QSocketNotifier* QSocketNotifier_new2(intptr_t socket, int param2) { return new QSocketNotifier((qintptr)(socket), static_cast(param2)); } -QSocketNotifier* QSocketNotifier_new2(intptr_t socket, int param2, QObject* parent) { +QSocketNotifier* QSocketNotifier_new3(int param1, QObject* parent) { + return new QSocketNotifier(static_cast(param1), parent); +} + +QSocketNotifier* QSocketNotifier_new4(intptr_t socket, int param2, QObject* parent) { return new QSocketNotifier((qintptr)(socket), static_cast(param2), parent); } @@ -32,11 +40,8 @@ struct miqt_string* QSocketNotifier_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QSocketNotifier_TrUtf8(const char* s) { - QString _ret = QSocketNotifier::trUtf8(s); - // 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 QSocketNotifier_SetSocket(QSocketNotifier* self, intptr_t socket) { + self->setSocket((qintptr)(socket)); } intptr_t QSocketNotifier_Socket(const QSocketNotifier* self) { @@ -49,6 +54,10 @@ int QSocketNotifier_Type(const QSocketNotifier* self) { return static_cast(_ret); } +bool QSocketNotifier_IsValid(const QSocketNotifier* self) { + return self->isValid(); +} + bool QSocketNotifier_IsEnabled(const QSocketNotifier* self) { return self->isEnabled(); } @@ -71,20 +80,6 @@ struct miqt_string* QSocketNotifier_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QSocketNotifier_TrUtf82(const char* s, const char* c) { - QString _ret = QSocketNotifier::trUtf8(s, c); - // 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* QSocketNotifier_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QSocketNotifier::trUtf8(s, c, static_cast(n)); - // 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 QSocketNotifier_Delete(QSocketNotifier* self) { delete self; } diff --git a/qt/gen_qsocketnotifier.go b/qt/gen_qsocketnotifier.go index 0479a5e..2e335ee 100644 --- a/qt/gen_qsocketnotifier.go +++ b/qt/gen_qsocketnotifier.go @@ -45,14 +45,26 @@ 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.intptr_t)(socket), (C.int)(param2)) +func NewQSocketNotifier(param1 QSocketNotifier__Type) *QSocketNotifier { + ret := C.QSocketNotifier_new((C.int)(param1)) return newQSocketNotifier(ret) } // NewQSocketNotifier2 constructs a new QSocketNotifier object. -func NewQSocketNotifier2(socket uintptr, param2 QSocketNotifier__Type, parent *QObject) *QSocketNotifier { - ret := C.QSocketNotifier_new2((C.intptr_t)(socket), (C.int)(param2), parent.cPointer()) +func NewQSocketNotifier2(socket uintptr, param2 QSocketNotifier__Type) *QSocketNotifier { + ret := C.QSocketNotifier_new2((C.intptr_t)(socket), (C.int)(param2)) + return newQSocketNotifier(ret) +} + +// NewQSocketNotifier3 constructs a new QSocketNotifier object. +func NewQSocketNotifier3(param1 QSocketNotifier__Type, parent *QObject) *QSocketNotifier { + ret := C.QSocketNotifier_new3((C.int)(param1), parent.cPointer()) + return newQSocketNotifier(ret) +} + +// NewQSocketNotifier4 constructs a new QSocketNotifier object. +func NewQSocketNotifier4(socket uintptr, param2 QSocketNotifier__Type, parent *QObject) *QSocketNotifier { + ret := C.QSocketNotifier_new4((C.intptr_t)(socket), (C.int)(param2), parent.cPointer()) return newQSocketNotifier(ret) } @@ -75,13 +87,8 @@ func QSocketNotifier_Tr(s string) string { return _ret } -func QSocketNotifier_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSocketNotifier_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret +func (this *QSocketNotifier) SetSocket(socket uintptr) { + C.QSocketNotifier_SetSocket(this.h, (C.intptr_t)(socket)) } func (this *QSocketNotifier) Socket() uintptr { @@ -92,6 +99,10 @@ func (this *QSocketNotifier) Type() QSocketNotifier__Type { return (QSocketNotifier__Type)(C.QSocketNotifier_Type(this.h)) } +func (this *QSocketNotifier) IsValid() bool { + return (bool)(C.QSocketNotifier_IsValid(this.h)) +} + func (this *QSocketNotifier) IsEnabled() bool { return (bool)(C.QSocketNotifier_IsEnabled(this.h)) } @@ -122,28 +133,6 @@ func QSocketNotifier_Tr3(s string, c string, n int) string { return _ret } -func QSocketNotifier_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSocketNotifier_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QSocketNotifier_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSocketNotifier_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QSocketNotifier) Delete() { C.QSocketNotifier_Delete(this.h) diff --git a/qt/gen_qsocketnotifier.h b/qt/gen_qsocketnotifier.h index 96813ce..220d835 100644 --- a/qt/gen_qsocketnotifier.h +++ b/qt/gen_qsocketnotifier.h @@ -25,20 +25,21 @@ typedef struct QSocketDescriptor QSocketDescriptor; typedef struct QSocketNotifier QSocketNotifier; #endif -QSocketNotifier* QSocketNotifier_new(intptr_t socket, int param2); -QSocketNotifier* QSocketNotifier_new2(intptr_t socket, int param2, QObject* parent); +QSocketNotifier* QSocketNotifier_new(int param1); +QSocketNotifier* QSocketNotifier_new2(intptr_t socket, int param2); +QSocketNotifier* QSocketNotifier_new3(int param1, QObject* parent); +QSocketNotifier* QSocketNotifier_new4(intptr_t socket, int param2, QObject* parent); QMetaObject* QSocketNotifier_MetaObject(const QSocketNotifier* self); void* QSocketNotifier_Metacast(QSocketNotifier* self, const char* param1); struct miqt_string* QSocketNotifier_Tr(const char* s); -struct miqt_string* QSocketNotifier_TrUtf8(const char* s); +void QSocketNotifier_SetSocket(QSocketNotifier* self, intptr_t socket); intptr_t QSocketNotifier_Socket(const QSocketNotifier* self); int QSocketNotifier_Type(const QSocketNotifier* self); +bool QSocketNotifier_IsValid(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); struct miqt_string* QSocketNotifier_Tr3(const char* s, const char* c, int n); -struct miqt_string* QSocketNotifier_TrUtf82(const char* s, const char* c); -struct miqt_string* QSocketNotifier_TrUtf83(const char* s, const char* c, int n); void QSocketNotifier_Delete(QSocketNotifier* self); QSocketDescriptor* QSocketDescriptor_new(); diff --git a/qt/gen_qsortfilterproxymodel.cpp b/qt/gen_qsortfilterproxymodel.cpp index 93ccb06..d3bf631 100644 --- a/qt/gen_qsortfilterproxymodel.cpp +++ b/qt/gen_qsortfilterproxymodel.cpp @@ -4,7 +4,6 @@ #include #include #include -#include #include #include #include @@ -39,13 +38,6 @@ struct miqt_string* QSortFilterProxyModel_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QSortFilterProxyModel_TrUtf8(const char* s) { - QString _ret = QSortFilterProxyModel::trUtf8(s); - // 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 QSortFilterProxyModel_SetSourceModel(QSortFilterProxyModel* self, QAbstractItemModel* sourceModel) { self->setSourceModel(sourceModel); } @@ -58,10 +50,6 @@ QModelIndex* QSortFilterProxyModel_MapFromSource(const QSortFilterProxyModel* se return new QModelIndex(self->mapFromSource(*sourceIndex)); } -QRegExp* QSortFilterProxyModel_FilterRegExp(const QSortFilterProxyModel* self) { - return new QRegExp(self->filterRegExp()); -} - QRegularExpression* QSortFilterProxyModel_FilterRegularExpression(const QSortFilterProxyModel* self) { return new QRegularExpression(self->filterRegularExpression()); } @@ -141,13 +129,12 @@ void QSortFilterProxyModel_SetRecursiveFilteringEnabled(QSortFilterProxyModel* s self->setRecursiveFilteringEnabled(recursive); } -void QSortFilterProxyModel_SetFilterRegExp(QSortFilterProxyModel* self, struct miqt_string* pattern) { - QString pattern_QString = QString::fromUtf8(&pattern->data, pattern->len); - self->setFilterRegExp(pattern_QString); +bool QSortFilterProxyModel_AutoAcceptChildRows(const QSortFilterProxyModel* self) { + return self->autoAcceptChildRows(); } -void QSortFilterProxyModel_SetFilterRegExpWithRegExp(QSortFilterProxyModel* self, QRegExp* regExp) { - self->setFilterRegExp(*regExp); +void QSortFilterProxyModel_SetAutoAcceptChildRows(QSortFilterProxyModel* self, bool accept) { + self->setAutoAcceptChildRows(accept); } void QSortFilterProxyModel_SetFilterRegularExpression(QSortFilterProxyModel* self, struct miqt_string* pattern) { @@ -169,10 +156,6 @@ void QSortFilterProxyModel_SetFilterFixedString(QSortFilterProxyModel* self, str self->setFilterFixedString(pattern_QString); } -void QSortFilterProxyModel_Clear(QSortFilterProxyModel* self) { - self->clear(); -} - void QSortFilterProxyModel_Invalidate(QSortFilterProxyModel* self) { self->invalidate(); } @@ -385,6 +368,17 @@ void QSortFilterProxyModel_connect_RecursiveFilteringEnabledChanged(QSortFilterP }); } +void QSortFilterProxyModel_AutoAcceptChildRowsChanged(QSortFilterProxyModel* self, bool autoAcceptChildRows) { + self->autoAcceptChildRowsChanged(autoAcceptChildRows); +} + +void QSortFilterProxyModel_connect_AutoAcceptChildRowsChanged(QSortFilterProxyModel* self, void* slot) { + QSortFilterProxyModel::connect(self, static_cast(&QSortFilterProxyModel::autoAcceptChildRowsChanged), self, [=](bool autoAcceptChildRows) { + bool sigval1 = autoAcceptChildRows; + miqt_exec_callback_QSortFilterProxyModel_AutoAcceptChildRowsChanged(slot, sigval1); + }); +} + struct miqt_string* QSortFilterProxyModel_Tr2(const char* s, const char* c) { QString _ret = QSortFilterProxyModel::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -399,20 +393,6 @@ struct miqt_string* QSortFilterProxyModel_Tr3(const char* s, const char* c, int return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QSortFilterProxyModel_TrUtf82(const char* s, const char* c) { - QString _ret = QSortFilterProxyModel::trUtf8(s, c); - // 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* QSortFilterProxyModel_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QSortFilterProxyModel::trUtf8(s, c, static_cast(n)); - // 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()); -} - QModelIndex* QSortFilterProxyModel_Index3(const QSortFilterProxyModel* self, int row, int column, QModelIndex* parent) { return new QModelIndex(self->index(static_cast(row), static_cast(column), *parent)); } diff --git a/qt/gen_qsortfilterproxymodel.go b/qt/gen_qsortfilterproxymodel.go index d0ddd0f..3187f21 100644 --- a/qt/gen_qsortfilterproxymodel.go +++ b/qt/gen_qsortfilterproxymodel.go @@ -68,15 +68,6 @@ func QSortFilterProxyModel_Tr(s string) string { return _ret } -func QSortFilterProxyModel_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSortFilterProxyModel_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QSortFilterProxyModel) SetSourceModel(sourceModel *QAbstractItemModel) { C.QSortFilterProxyModel_SetSourceModel(this.h, sourceModel.cPointer()) } @@ -95,13 +86,6 @@ func (this *QSortFilterProxyModel) MapFromSource(sourceIndex *QModelIndex) *QMod return _goptr } -func (this *QSortFilterProxyModel) FilterRegExp() *QRegExp { - _ret := C.QSortFilterProxyModel_FilterRegExp(this.h) - _goptr := newQRegExp(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - func (this *QSortFilterProxyModel) FilterRegularExpression() *QRegularExpression { _ret := C.QSortFilterProxyModel_FilterRegularExpression(this.h) _goptr := newQRegularExpression(_ret) @@ -181,14 +165,12 @@ func (this *QSortFilterProxyModel) SetRecursiveFilteringEnabled(recursive bool) C.QSortFilterProxyModel_SetRecursiveFilteringEnabled(this.h, (C.bool)(recursive)) } -func (this *QSortFilterProxyModel) SetFilterRegExp(pattern string) { - pattern_ms := miqt_strdupg(pattern) - defer C.free(pattern_ms) - C.QSortFilterProxyModel_SetFilterRegExp(this.h, (*C.struct_miqt_string)(pattern_ms)) +func (this *QSortFilterProxyModel) AutoAcceptChildRows() bool { + return (bool)(C.QSortFilterProxyModel_AutoAcceptChildRows(this.h)) } -func (this *QSortFilterProxyModel) SetFilterRegExpWithRegExp(regExp *QRegExp) { - C.QSortFilterProxyModel_SetFilterRegExpWithRegExp(this.h, regExp.cPointer()) +func (this *QSortFilterProxyModel) SetAutoAcceptChildRows(accept bool) { + C.QSortFilterProxyModel_SetAutoAcceptChildRows(this.h, (C.bool)(accept)) } func (this *QSortFilterProxyModel) SetFilterRegularExpression(pattern string) { @@ -213,10 +195,6 @@ func (this *QSortFilterProxyModel) SetFilterFixedString(pattern string) { C.QSortFilterProxyModel_SetFilterFixedString(this.h, (*C.struct_miqt_string)(pattern_ms)) } -func (this *QSortFilterProxyModel) Clear() { - C.QSortFilterProxyModel_Clear(this.h) -} - func (this *QSortFilterProxyModel) Invalidate() { C.QSortFilterProxyModel_Invalidate(this.h) } @@ -510,6 +488,26 @@ func miqt_exec_callback_QSortFilterProxyModel_RecursiveFilteringEnabledChanged(c gofunc(slotval1) } +func (this *QSortFilterProxyModel) AutoAcceptChildRowsChanged(autoAcceptChildRows bool) { + C.QSortFilterProxyModel_AutoAcceptChildRowsChanged(this.h, (C.bool)(autoAcceptChildRows)) +} +func (this *QSortFilterProxyModel) OnAutoAcceptChildRowsChanged(slot func(autoAcceptChildRows bool)) { + C.QSortFilterProxyModel_connect_AutoAcceptChildRowsChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) +} + +//export miqt_exec_callback_QSortFilterProxyModel_AutoAcceptChildRowsChanged +func miqt_exec_callback_QSortFilterProxyModel_AutoAcceptChildRowsChanged(cb *C.void, autoAcceptChildRows C.bool) { + gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(autoAcceptChildRows bool)) + if !ok { + panic("miqt: callback of non-callback type (heap corruption?)") + } + + // Convert all CABI parameters to Go parameters + slotval1 := (bool)(autoAcceptChildRows) + + gofunc(slotval1) +} + func QSortFilterProxyModel_Tr2(s string, c string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) @@ -532,28 +530,6 @@ func QSortFilterProxyModel_Tr3(s string, c string, n int) string { return _ret } -func QSortFilterProxyModel_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSortFilterProxyModel_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QSortFilterProxyModel_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSortFilterProxyModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QSortFilterProxyModel) Index3(row int, column int, parent *QModelIndex) *QModelIndex { _ret := C.QSortFilterProxyModel_Index3(this.h, (C.int)(row), (C.int)(column), parent.cPointer()) _goptr := newQModelIndex(_ret) diff --git a/qt/gen_qsortfilterproxymodel.h b/qt/gen_qsortfilterproxymodel.h index e357a18..bf79fc8 100644 --- a/qt/gen_qsortfilterproxymodel.h +++ b/qt/gen_qsortfilterproxymodel.h @@ -19,7 +19,6 @@ class QMetaObject; class QMimeData; class QModelIndex; class QObject; -class QRegExp; class QRegularExpression; class QSize; class QSortFilterProxyModel; @@ -30,7 +29,6 @@ typedef struct QMetaObject QMetaObject; typedef struct QMimeData QMimeData; typedef struct QModelIndex QModelIndex; typedef struct QObject QObject; -typedef struct QRegExp QRegExp; typedef struct QRegularExpression QRegularExpression; typedef struct QSize QSize; typedef struct QSortFilterProxyModel QSortFilterProxyModel; @@ -42,11 +40,9 @@ QSortFilterProxyModel* QSortFilterProxyModel_new2(QObject* parent); QMetaObject* QSortFilterProxyModel_MetaObject(const QSortFilterProxyModel* self); void* QSortFilterProxyModel_Metacast(QSortFilterProxyModel* self, const char* param1); struct miqt_string* QSortFilterProxyModel_Tr(const char* s); -struct miqt_string* QSortFilterProxyModel_TrUtf8(const char* s); void QSortFilterProxyModel_SetSourceModel(QSortFilterProxyModel* self, QAbstractItemModel* sourceModel); QModelIndex* QSortFilterProxyModel_MapToSource(const QSortFilterProxyModel* self, QModelIndex* proxyIndex); QModelIndex* QSortFilterProxyModel_MapFromSource(const QSortFilterProxyModel* self, QModelIndex* sourceIndex); -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); @@ -66,13 +62,12 @@ int QSortFilterProxyModel_FilterRole(const QSortFilterProxyModel* self); void QSortFilterProxyModel_SetFilterRole(QSortFilterProxyModel* self, int role); bool QSortFilterProxyModel_IsRecursiveFilteringEnabled(const QSortFilterProxyModel* self); void QSortFilterProxyModel_SetRecursiveFilteringEnabled(QSortFilterProxyModel* self, bool recursive); -void QSortFilterProxyModel_SetFilterRegExp(QSortFilterProxyModel* self, struct miqt_string* pattern); -void QSortFilterProxyModel_SetFilterRegExpWithRegExp(QSortFilterProxyModel* self, QRegExp* regExp); +bool QSortFilterProxyModel_AutoAcceptChildRows(const QSortFilterProxyModel* self); +void QSortFilterProxyModel_SetAutoAcceptChildRows(QSortFilterProxyModel* self, bool accept); void QSortFilterProxyModel_SetFilterRegularExpression(QSortFilterProxyModel* self, struct miqt_string* pattern); void QSortFilterProxyModel_SetFilterRegularExpressionWithRegularExpression(QSortFilterProxyModel* self, QRegularExpression* regularExpression); void QSortFilterProxyModel_SetFilterWildcard(QSortFilterProxyModel* self, struct miqt_string* pattern); void QSortFilterProxyModel_SetFilterFixedString(QSortFilterProxyModel* self, struct miqt_string* pattern); -void QSortFilterProxyModel_Clear(QSortFilterProxyModel* self); void QSortFilterProxyModel_Invalidate(QSortFilterProxyModel* self); QModelIndex* QSortFilterProxyModel_Index(const QSortFilterProxyModel* self, int row, int column); QModelIndex* QSortFilterProxyModel_Parent(const QSortFilterProxyModel* self, QModelIndex* child); @@ -113,10 +108,10 @@ void QSortFilterProxyModel_FilterRoleChanged(QSortFilterProxyModel* self, int fi void QSortFilterProxyModel_connect_FilterRoleChanged(QSortFilterProxyModel* self, void* slot); void QSortFilterProxyModel_RecursiveFilteringEnabledChanged(QSortFilterProxyModel* self, bool recursiveFilteringEnabled); void QSortFilterProxyModel_connect_RecursiveFilteringEnabledChanged(QSortFilterProxyModel* self, void* slot); +void QSortFilterProxyModel_AutoAcceptChildRowsChanged(QSortFilterProxyModel* self, bool autoAcceptChildRows); +void QSortFilterProxyModel_connect_AutoAcceptChildRowsChanged(QSortFilterProxyModel* self, void* slot); struct miqt_string* QSortFilterProxyModel_Tr2(const char* s, const char* c); struct miqt_string* QSortFilterProxyModel_Tr3(const char* s, const char* c, int n); -struct miqt_string* QSortFilterProxyModel_TrUtf82(const char* s, const char* c); -struct miqt_string* QSortFilterProxyModel_TrUtf83(const char* s, const char* c, int n); QModelIndex* QSortFilterProxyModel_Index3(const QSortFilterProxyModel* self, int row, int column, QModelIndex* parent); int QSortFilterProxyModel_RowCount1(const QSortFilterProxyModel* self, QModelIndex* parent); int QSortFilterProxyModel_ColumnCount1(const QSortFilterProxyModel* self, QModelIndex* parent); diff --git a/qt/gen_qspinbox.cpp b/qt/gen_qspinbox.cpp index a9b40ce..9786e57 100644 --- a/qt/gen_qspinbox.cpp +++ b/qt/gen_qspinbox.cpp @@ -32,13 +32,6 @@ struct miqt_string* QSpinBox_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QSpinBox_TrUtf8(const char* s) { - QString _ret = QSpinBox::trUtf8(s); - // 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()); -} - int QSpinBox_Value(const QSpinBox* self) { return self->value(); } @@ -149,21 +142,6 @@ void QSpinBox_connect_TextChanged(QSpinBox* self, void* slot) { }); } -void QSpinBox_ValueChangedWithQString(QSpinBox* self, struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); - self->valueChanged(param1_QString); -} - -void QSpinBox_connect_ValueChangedWithQString(QSpinBox* self, void* slot) { - QSpinBox::connect(self, static_cast(&QSpinBox::valueChanged), self, [=](const QString& param1) { - const QString param1_ret = param1; - // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory - QByteArray param1_b = param1_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(param1_b.data(), param1_b.length()); - miqt_exec_callback_QSpinBox_ValueChangedWithQString(slot, sigval1); - }); -} - struct miqt_string* QSpinBox_Tr2(const char* s, const char* c) { QString _ret = QSpinBox::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -178,20 +156,6 @@ struct miqt_string* QSpinBox_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QSpinBox_TrUtf82(const char* s, const char* c) { - QString _ret = QSpinBox::trUtf8(s, c); - // 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* QSpinBox_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QSpinBox::trUtf8(s, c, static_cast(n)); - // 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 QSpinBox_Delete(QSpinBox* self) { delete self; } @@ -219,13 +183,6 @@ struct miqt_string* QDoubleSpinBox_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QDoubleSpinBox_TrUtf8(const char* s) { - QString _ret = QDoubleSpinBox::trUtf8(s); - // 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()); -} - double QDoubleSpinBox_Value(const QDoubleSpinBox* self) { return self->value(); } @@ -359,21 +316,6 @@ void QDoubleSpinBox_connect_TextChanged(QDoubleSpinBox* self, void* slot) { }); } -void QDoubleSpinBox_ValueChangedWithQString(QDoubleSpinBox* self, struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); - self->valueChanged(param1_QString); -} - -void QDoubleSpinBox_connect_ValueChangedWithQString(QDoubleSpinBox* self, void* slot) { - QDoubleSpinBox::connect(self, static_cast(&QDoubleSpinBox::valueChanged), self, [=](const QString& param1) { - const QString param1_ret = param1; - // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory - QByteArray param1_b = param1_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(param1_b.data(), param1_b.length()); - miqt_exec_callback_QDoubleSpinBox_ValueChangedWithQString(slot, sigval1); - }); -} - struct miqt_string* QDoubleSpinBox_Tr2(const char* s, const char* c) { QString _ret = QDoubleSpinBox::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -388,20 +330,6 @@ struct miqt_string* QDoubleSpinBox_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QDoubleSpinBox_TrUtf82(const char* s, const char* c) { - QString _ret = QDoubleSpinBox::trUtf8(s, c); - // 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* QDoubleSpinBox_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QDoubleSpinBox::trUtf8(s, c, static_cast(n)); - // 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 QDoubleSpinBox_Delete(QDoubleSpinBox* self) { delete self; } diff --git a/qt/gen_qspinbox.go b/qt/gen_qspinbox.go index 43f7d46..60015cd 100644 --- a/qt/gen_qspinbox.go +++ b/qt/gen_qspinbox.go @@ -68,15 +68,6 @@ func QSpinBox_Tr(s string) string { return _ret } -func QSpinBox_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSpinBox_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QSpinBox) Value() int { return (int)(C.QSpinBox_Value(this.h)) } @@ -207,31 +198,6 @@ func miqt_exec_callback_QSpinBox_TextChanged(cb *C.void, param1 *C.struct_miqt_s gofunc(slotval1) } -func (this *QSpinBox) ValueChangedWithQString(param1 string) { - param1_ms := miqt_strdupg(param1) - defer C.free(param1_ms) - C.QSpinBox_ValueChangedWithQString(this.h, (*C.struct_miqt_string)(param1_ms)) -} -func (this *QSpinBox) OnValueChangedWithQString(slot func(param1 string)) { - C.QSpinBox_connect_ValueChangedWithQString(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) -} - -//export miqt_exec_callback_QSpinBox_ValueChangedWithQString -func miqt_exec_callback_QSpinBox_ValueChangedWithQString(cb *C.void, param1 *C.struct_miqt_string) { - gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 string)) - if !ok { - panic("miqt: callback of non-callback type (heap corruption?)") - } - - // Convert all CABI parameters to Go parameters - var param1_ms *C.struct_miqt_string = param1 - param1_ret := C.GoStringN(¶m1_ms.data, C.int(int64(param1_ms.len))) - C.free(unsafe.Pointer(param1_ms)) - slotval1 := param1_ret - - gofunc(slotval1) -} - func QSpinBox_Tr2(s string, c string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) @@ -254,28 +220,6 @@ func QSpinBox_Tr3(s string, c string, n int) string { return _ret } -func QSpinBox_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSpinBox_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QSpinBox_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSpinBox_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QSpinBox) Delete() { C.QSpinBox_Delete(this.h) @@ -344,15 +288,6 @@ func QDoubleSpinBox_Tr(s string) string { return _ret } -func QDoubleSpinBox_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDoubleSpinBox_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QDoubleSpinBox) Value() float64 { return (float64)(C.QDoubleSpinBox_Value(this.h)) } @@ -508,31 +443,6 @@ func miqt_exec_callback_QDoubleSpinBox_TextChanged(cb *C.void, param1 *C.struct_ gofunc(slotval1) } -func (this *QDoubleSpinBox) ValueChangedWithQString(param1 string) { - param1_ms := miqt_strdupg(param1) - defer C.free(param1_ms) - C.QDoubleSpinBox_ValueChangedWithQString(this.h, (*C.struct_miqt_string)(param1_ms)) -} -func (this *QDoubleSpinBox) OnValueChangedWithQString(slot func(param1 string)) { - C.QDoubleSpinBox_connect_ValueChangedWithQString(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) -} - -//export miqt_exec_callback_QDoubleSpinBox_ValueChangedWithQString -func miqt_exec_callback_QDoubleSpinBox_ValueChangedWithQString(cb *C.void, param1 *C.struct_miqt_string) { - gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 string)) - if !ok { - panic("miqt: callback of non-callback type (heap corruption?)") - } - - // Convert all CABI parameters to Go parameters - var param1_ms *C.struct_miqt_string = param1 - param1_ret := C.GoStringN(¶m1_ms.data, C.int(int64(param1_ms.len))) - C.free(unsafe.Pointer(param1_ms)) - slotval1 := param1_ret - - gofunc(slotval1) -} - func QDoubleSpinBox_Tr2(s string, c string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) @@ -555,28 +465,6 @@ func QDoubleSpinBox_Tr3(s string, c string, n int) string { return _ret } -func QDoubleSpinBox_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDoubleSpinBox_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QDoubleSpinBox_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDoubleSpinBox_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QDoubleSpinBox) Delete() { C.QDoubleSpinBox_Delete(this.h) diff --git a/qt/gen_qspinbox.h b/qt/gen_qspinbox.h index 294a6e2..0f837ec 100644 --- a/qt/gen_qspinbox.h +++ b/qt/gen_qspinbox.h @@ -30,7 +30,6 @@ QSpinBox* QSpinBox_new2(QWidget* parent); QMetaObject* QSpinBox_MetaObject(const QSpinBox* self); void* QSpinBox_Metacast(QSpinBox* self, const char* param1); struct miqt_string* QSpinBox_Tr(const char* s); -struct miqt_string* QSpinBox_TrUtf8(const char* s); int QSpinBox_Value(const QSpinBox* self); struct miqt_string* QSpinBox_Prefix(const QSpinBox* self); void QSpinBox_SetPrefix(QSpinBox* self, struct miqt_string* prefix); @@ -53,12 +52,8 @@ void QSpinBox_ValueChanged(QSpinBox* self, int param1); void QSpinBox_connect_ValueChanged(QSpinBox* self, void* slot); void QSpinBox_TextChanged(QSpinBox* self, struct miqt_string* param1); void QSpinBox_connect_TextChanged(QSpinBox* self, void* slot); -void QSpinBox_ValueChangedWithQString(QSpinBox* self, struct miqt_string* param1); -void QSpinBox_connect_ValueChangedWithQString(QSpinBox* self, void* slot); struct miqt_string* QSpinBox_Tr2(const char* s, const char* c); struct miqt_string* QSpinBox_Tr3(const char* s, const char* c, int n); -struct miqt_string* QSpinBox_TrUtf82(const char* s, const char* c); -struct miqt_string* QSpinBox_TrUtf83(const char* s, const char* c, int n); void QSpinBox_Delete(QSpinBox* self); QDoubleSpinBox* QDoubleSpinBox_new(); @@ -66,7 +61,6 @@ QDoubleSpinBox* QDoubleSpinBox_new2(QWidget* parent); QMetaObject* QDoubleSpinBox_MetaObject(const QDoubleSpinBox* self); void* QDoubleSpinBox_Metacast(QDoubleSpinBox* self, const char* param1); struct miqt_string* QDoubleSpinBox_Tr(const char* s); -struct miqt_string* QDoubleSpinBox_TrUtf8(const char* s); double QDoubleSpinBox_Value(const QDoubleSpinBox* self); struct miqt_string* QDoubleSpinBox_Prefix(const QDoubleSpinBox* self); void QDoubleSpinBox_SetPrefix(QDoubleSpinBox* self, struct miqt_string* prefix); @@ -93,12 +87,8 @@ void QDoubleSpinBox_ValueChanged(QDoubleSpinBox* self, double param1); void QDoubleSpinBox_connect_ValueChanged(QDoubleSpinBox* self, void* slot); void QDoubleSpinBox_TextChanged(QDoubleSpinBox* self, struct miqt_string* param1); void QDoubleSpinBox_connect_TextChanged(QDoubleSpinBox* self, void* slot); -void QDoubleSpinBox_ValueChangedWithQString(QDoubleSpinBox* self, struct miqt_string* param1); -void QDoubleSpinBox_connect_ValueChangedWithQString(QDoubleSpinBox* self, void* slot); struct miqt_string* QDoubleSpinBox_Tr2(const char* s, const char* c); struct miqt_string* QDoubleSpinBox_Tr3(const char* s, const char* c, int n); -struct miqt_string* QDoubleSpinBox_TrUtf82(const char* s, const char* c); -struct miqt_string* QDoubleSpinBox_TrUtf83(const char* s, const char* c, int n); void QDoubleSpinBox_Delete(QDoubleSpinBox* self); #ifdef __cplusplus diff --git a/qt/gen_qsplashscreen.cpp b/qt/gen_qsplashscreen.cpp index b8e4a65..1b20cf6 100644 --- a/qt/gen_qsplashscreen.cpp +++ b/qt/gen_qsplashscreen.cpp @@ -19,34 +19,22 @@ QSplashScreen* QSplashScreen_new2(QScreen* screen) { return new QSplashScreen(screen); } -QSplashScreen* QSplashScreen_new3(QWidget* parent) { - return new QSplashScreen(parent); -} - -QSplashScreen* QSplashScreen_new4(QPixmap* pixmap) { +QSplashScreen* QSplashScreen_new3(QPixmap* pixmap) { return new QSplashScreen(*pixmap); } -QSplashScreen* QSplashScreen_new5(QPixmap* pixmap, int f) { +QSplashScreen* QSplashScreen_new4(QPixmap* pixmap, int f) { return new QSplashScreen(*pixmap, static_cast(f)); } -QSplashScreen* QSplashScreen_new6(QScreen* screen, QPixmap* pixmap) { +QSplashScreen* QSplashScreen_new5(QScreen* screen, QPixmap* pixmap) { return new QSplashScreen(screen, *pixmap); } -QSplashScreen* QSplashScreen_new7(QScreen* screen, QPixmap* pixmap, int f) { +QSplashScreen* QSplashScreen_new6(QScreen* screen, QPixmap* pixmap, int f) { return new QSplashScreen(screen, *pixmap, static_cast(f)); } -QSplashScreen* QSplashScreen_new8(QWidget* parent, QPixmap* pixmap) { - return new QSplashScreen(parent, *pixmap); -} - -QSplashScreen* QSplashScreen_new9(QWidget* parent, QPixmap* pixmap, int f) { - return new QSplashScreen(parent, *pixmap, static_cast(f)); -} - QMetaObject* QSplashScreen_MetaObject(const QSplashScreen* self) { return (QMetaObject*) self->metaObject(); } @@ -62,13 +50,6 @@ struct miqt_string* QSplashScreen_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QSplashScreen_TrUtf8(const char* s) { - QString _ret = QSplashScreen::trUtf8(s); - // 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 QSplashScreen_SetPixmap(QSplashScreen* self, QPixmap* pixmap) { self->setPixmap(*pixmap); } @@ -130,20 +111,6 @@ struct miqt_string* QSplashScreen_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QSplashScreen_TrUtf82(const char* s, const char* c) { - QString _ret = QSplashScreen::trUtf8(s, c); - // 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* QSplashScreen_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QSplashScreen::trUtf8(s, c, static_cast(n)); - // 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 QSplashScreen_ShowMessage2(QSplashScreen* self, struct miqt_string* message, int alignment) { QString message_QString = QString::fromUtf8(&message->data, message->len); self->showMessage(message_QString, static_cast(alignment)); diff --git a/qt/gen_qsplashscreen.go b/qt/gen_qsplashscreen.go index 44cad8f..155dc27 100644 --- a/qt/gen_qsplashscreen.go +++ b/qt/gen_qsplashscreen.go @@ -50,44 +50,26 @@ func NewQSplashScreen2(screen *QScreen) *QSplashScreen { } // NewQSplashScreen3 constructs a new QSplashScreen object. -func NewQSplashScreen3(parent *QWidget) *QSplashScreen { - ret := C.QSplashScreen_new3(parent.cPointer()) +func NewQSplashScreen3(pixmap *QPixmap) *QSplashScreen { + ret := C.QSplashScreen_new3(pixmap.cPointer()) return newQSplashScreen(ret) } // NewQSplashScreen4 constructs a new QSplashScreen object. -func NewQSplashScreen4(pixmap *QPixmap) *QSplashScreen { - ret := C.QSplashScreen_new4(pixmap.cPointer()) +func NewQSplashScreen4(pixmap *QPixmap, f WindowType) *QSplashScreen { + ret := C.QSplashScreen_new4(pixmap.cPointer(), (C.int)(f)) return newQSplashScreen(ret) } // NewQSplashScreen5 constructs a new QSplashScreen object. -func NewQSplashScreen5(pixmap *QPixmap, f WindowType) *QSplashScreen { - ret := C.QSplashScreen_new5(pixmap.cPointer(), (C.int)(f)) +func NewQSplashScreen5(screen *QScreen, pixmap *QPixmap) *QSplashScreen { + ret := C.QSplashScreen_new5(screen.cPointer(), pixmap.cPointer()) return newQSplashScreen(ret) } // NewQSplashScreen6 constructs a new QSplashScreen object. -func NewQSplashScreen6(screen *QScreen, pixmap *QPixmap) *QSplashScreen { - ret := C.QSplashScreen_new6(screen.cPointer(), pixmap.cPointer()) - return newQSplashScreen(ret) -} - -// NewQSplashScreen7 constructs a new QSplashScreen object. -func NewQSplashScreen7(screen *QScreen, pixmap *QPixmap, f WindowType) *QSplashScreen { - ret := C.QSplashScreen_new7(screen.cPointer(), pixmap.cPointer(), (C.int)(f)) - return newQSplashScreen(ret) -} - -// NewQSplashScreen8 constructs a new QSplashScreen object. -func NewQSplashScreen8(parent *QWidget, pixmap *QPixmap) *QSplashScreen { - ret := C.QSplashScreen_new8(parent.cPointer(), pixmap.cPointer()) - return newQSplashScreen(ret) -} - -// NewQSplashScreen9 constructs a new QSplashScreen object. -func NewQSplashScreen9(parent *QWidget, pixmap *QPixmap, f WindowType) *QSplashScreen { - ret := C.QSplashScreen_new9(parent.cPointer(), pixmap.cPointer(), (C.int)(f)) +func NewQSplashScreen6(screen *QScreen, pixmap *QPixmap, f WindowType) *QSplashScreen { + ret := C.QSplashScreen_new6(screen.cPointer(), pixmap.cPointer(), (C.int)(f)) return newQSplashScreen(ret) } @@ -110,15 +92,6 @@ func QSplashScreen_Tr(s string) string { return _ret } -func QSplashScreen_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSplashScreen_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QSplashScreen) SetPixmap(pixmap *QPixmap) { C.QSplashScreen_SetPixmap(this.h, pixmap.cPointer()) } @@ -202,28 +175,6 @@ func QSplashScreen_Tr3(s string, c string, n int) string { return _ret } -func QSplashScreen_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSplashScreen_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QSplashScreen_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSplashScreen_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QSplashScreen) ShowMessage2(message string, alignment int) { message_ms := miqt_strdupg(message) defer C.free(message_ms) diff --git a/qt/gen_qsplashscreen.h b/qt/gen_qsplashscreen.h index 2de7287..0b81a7b 100644 --- a/qt/gen_qsplashscreen.h +++ b/qt/gen_qsplashscreen.h @@ -31,17 +31,13 @@ typedef struct QWidget QWidget; QSplashScreen* QSplashScreen_new(); QSplashScreen* QSplashScreen_new2(QScreen* screen); -QSplashScreen* QSplashScreen_new3(QWidget* parent); -QSplashScreen* QSplashScreen_new4(QPixmap* pixmap); -QSplashScreen* QSplashScreen_new5(QPixmap* pixmap, int f); -QSplashScreen* QSplashScreen_new6(QScreen* screen, QPixmap* pixmap); -QSplashScreen* QSplashScreen_new7(QScreen* screen, QPixmap* pixmap, int f); -QSplashScreen* QSplashScreen_new8(QWidget* parent, QPixmap* pixmap); -QSplashScreen* QSplashScreen_new9(QWidget* parent, QPixmap* pixmap, int f); +QSplashScreen* QSplashScreen_new3(QPixmap* pixmap); +QSplashScreen* QSplashScreen_new4(QPixmap* pixmap, int f); +QSplashScreen* QSplashScreen_new5(QScreen* screen, QPixmap* pixmap); +QSplashScreen* QSplashScreen_new6(QScreen* screen, QPixmap* pixmap, int f); QMetaObject* QSplashScreen_MetaObject(const QSplashScreen* self); void* QSplashScreen_Metacast(QSplashScreen* self, const char* param1); struct miqt_string* QSplashScreen_Tr(const char* s); -struct miqt_string* QSplashScreen_TrUtf8(const char* s); void QSplashScreen_SetPixmap(QSplashScreen* self, QPixmap* pixmap); QPixmap* QSplashScreen_Pixmap(const QSplashScreen* self); void QSplashScreen_Finish(QSplashScreen* self, QWidget* w); @@ -53,8 +49,6 @@ void QSplashScreen_MessageChanged(QSplashScreen* self, struct miqt_string* messa void QSplashScreen_connect_MessageChanged(QSplashScreen* self, void* slot); struct miqt_string* QSplashScreen_Tr2(const char* s, const char* c); struct miqt_string* QSplashScreen_Tr3(const char* s, const char* c, int n); -struct miqt_string* QSplashScreen_TrUtf82(const char* s, const char* c); -struct miqt_string* QSplashScreen_TrUtf83(const char* s, const char* c, int n); void QSplashScreen_ShowMessage2(QSplashScreen* self, struct miqt_string* message, int alignment); void QSplashScreen_ShowMessage3(QSplashScreen* self, struct miqt_string* message, int alignment, QColor* color); void QSplashScreen_Delete(QSplashScreen* self); diff --git a/qt/gen_qsplitter.cpp b/qt/gen_qsplitter.cpp index bfc03a3..a4878af 100644 --- a/qt/gen_qsplitter.cpp +++ b/qt/gen_qsplitter.cpp @@ -43,13 +43,6 @@ struct miqt_string* QSplitter_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QSplitter_TrUtf8(const char* s) { - QString _ret = QSplitter::trUtf8(s); - // 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 QSplitter_AddWidget(QSplitter* self, QWidget* widget) { self->addWidget(widget); } @@ -196,20 +189,6 @@ struct miqt_string* QSplitter_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QSplitter_TrUtf82(const char* s, const char* c) { - QString _ret = QSplitter::trUtf8(s, c); - // 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* QSplitter_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QSplitter::trUtf8(s, c, static_cast(n)); - // 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 QSplitter_SetOpaqueResize1(QSplitter* self, bool opaque) { self->setOpaqueResize(opaque); } @@ -237,13 +216,6 @@ struct miqt_string* QSplitterHandle_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QSplitterHandle_TrUtf8(const char* s) { - QString _ret = QSplitterHandle::trUtf8(s); - // 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 QSplitterHandle_SetOrientation(QSplitterHandle* self, int o) { self->setOrientation(static_cast(o)); } @@ -279,20 +251,6 @@ struct miqt_string* QSplitterHandle_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QSplitterHandle_TrUtf82(const char* s, const char* c) { - QString _ret = QSplitterHandle::trUtf8(s, c); - // 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* QSplitterHandle_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QSplitterHandle::trUtf8(s, c, static_cast(n)); - // 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 QSplitterHandle_Delete(QSplitterHandle* self) { delete self; } diff --git a/qt/gen_qsplitter.go b/qt/gen_qsplitter.go index 217a0e2..2dac0c7 100644 --- a/qt/gen_qsplitter.go +++ b/qt/gen_qsplitter.go @@ -80,15 +80,6 @@ func QSplitter_Tr(s string) string { return _ret } -func QSplitter_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSplitter_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QSplitter) AddWidget(widget *QWidget) { C.QSplitter_AddWidget(this.h, widget.cPointer()) } @@ -261,28 +252,6 @@ func QSplitter_Tr3(s string, c string, n int) string { return _ret } -func QSplitter_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSplitter_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QSplitter_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSplitter_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QSplitter) SetOpaqueResize1(opaque bool) { C.QSplitter_SetOpaqueResize1(this.h, (C.bool)(opaque)) } @@ -349,15 +318,6 @@ func QSplitterHandle_Tr(s string) string { return _ret } -func QSplitterHandle_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSplitterHandle_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QSplitterHandle) SetOrientation(o Orientation) { C.QSplitterHandle_SetOrientation(this.h, (C.int)(o)) } @@ -403,28 +363,6 @@ func QSplitterHandle_Tr3(s string, c string, n int) string { return _ret } -func QSplitterHandle_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSplitterHandle_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QSplitterHandle_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSplitterHandle_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QSplitterHandle) Delete() { C.QSplitterHandle_Delete(this.h) diff --git a/qt/gen_qsplitter.h b/qt/gen_qsplitter.h index add965b..c4ad7b5 100644 --- a/qt/gen_qsplitter.h +++ b/qt/gen_qsplitter.h @@ -36,7 +36,6 @@ QSplitter* QSplitter_new4(int param1, QWidget* parent); QMetaObject* QSplitter_MetaObject(const QSplitter* self); void* QSplitter_Metacast(QSplitter* self, const char* param1); 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); @@ -67,8 +66,6 @@ void QSplitter_SplitterMoved(QSplitter* self, int pos, int index); void QSplitter_connect_SplitterMoved(QSplitter* self, void* slot); struct miqt_string* QSplitter_Tr2(const char* s, const char* c); struct miqt_string* QSplitter_Tr3(const char* s, const char* c, int n); -struct miqt_string* QSplitter_TrUtf82(const char* s, const char* c); -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); @@ -76,7 +73,6 @@ QSplitterHandle* QSplitterHandle_new(int o, QSplitter* parent); QMetaObject* QSplitterHandle_MetaObject(const QSplitterHandle* self); void* QSplitterHandle_Metacast(QSplitterHandle* self, const char* param1); struct miqt_string* QSplitterHandle_Tr(const char* s); -struct miqt_string* QSplitterHandle_TrUtf8(const char* s); void QSplitterHandle_SetOrientation(QSplitterHandle* self, int o); int QSplitterHandle_Orientation(const QSplitterHandle* self); bool QSplitterHandle_OpaqueResize(const QSplitterHandle* self); @@ -84,8 +80,6 @@ QSplitter* QSplitterHandle_Splitter(const QSplitterHandle* self); QSize* QSplitterHandle_SizeHint(const QSplitterHandle* self); struct miqt_string* QSplitterHandle_Tr2(const char* s, const char* c); struct miqt_string* QSplitterHandle_Tr3(const char* s, const char* c, int n); -struct miqt_string* QSplitterHandle_TrUtf82(const char* s, const char* c); -struct miqt_string* QSplitterHandle_TrUtf83(const char* s, const char* c, int n); void QSplitterHandle_Delete(QSplitterHandle* self); #ifdef __cplusplus diff --git a/qt/gen_qstackedlayout.cpp b/qt/gen_qstackedlayout.cpp index bb1b2df..eeb8208 100644 --- a/qt/gen_qstackedlayout.cpp +++ b/qt/gen_qstackedlayout.cpp @@ -39,13 +39,6 @@ struct miqt_string* QStackedLayout_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QStackedLayout_TrUtf8(const char* s) { - QString _ret = QStackedLayout::trUtf8(s); - // 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()); -} - int QStackedLayout_AddWidget(QStackedLayout* self, QWidget* w) { return self->addWidget(w); } @@ -155,20 +148,6 @@ struct miqt_string* QStackedLayout_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QStackedLayout_TrUtf82(const char* s, const char* c) { - QString _ret = QStackedLayout::trUtf8(s, c); - // 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* QStackedLayout_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QStackedLayout::trUtf8(s, c, static_cast(n)); - // 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 QStackedLayout_Delete(QStackedLayout* self) { delete self; } diff --git a/qt/gen_qstackedlayout.go b/qt/gen_qstackedlayout.go index 15520c8..ccf07b5 100644 --- a/qt/gen_qstackedlayout.go +++ b/qt/gen_qstackedlayout.go @@ -81,15 +81,6 @@ func QStackedLayout_Tr(s string) string { return _ret } -func QStackedLayout_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QStackedLayout_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QStackedLayout) AddWidget(w *QWidget) int { return (int)(C.QStackedLayout_AddWidget(this.h, w.cPointer())) } @@ -230,28 +221,6 @@ func QStackedLayout_Tr3(s string, c string, n int) string { return _ret } -func QStackedLayout_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStackedLayout_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QStackedLayout_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStackedLayout_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QStackedLayout) Delete() { C.QStackedLayout_Delete(this.h) diff --git a/qt/gen_qstackedlayout.h b/qt/gen_qstackedlayout.h index ef42f69..894992a 100644 --- a/qt/gen_qstackedlayout.h +++ b/qt/gen_qstackedlayout.h @@ -37,7 +37,6 @@ QStackedLayout* QStackedLayout_new3(QLayout* parentLayout); QMetaObject* QStackedLayout_MetaObject(const QStackedLayout* self); void* QStackedLayout_Metacast(QStackedLayout* self, const char* param1); struct miqt_string* QStackedLayout_Tr(const char* s); -struct miqt_string* QStackedLayout_TrUtf8(const char* s); int QStackedLayout_AddWidget(QStackedLayout* self, QWidget* w); int QStackedLayout_InsertWidget(QStackedLayout* self, int index, QWidget* w); QWidget* QStackedLayout_CurrentWidget(const QStackedLayout* self); @@ -62,8 +61,6 @@ void QStackedLayout_SetCurrentIndex(QStackedLayout* self, int index); void QStackedLayout_SetCurrentWidget(QStackedLayout* self, QWidget* w); struct miqt_string* QStackedLayout_Tr2(const char* s, const char* c); struct miqt_string* QStackedLayout_Tr3(const char* s, const char* c, int n); -struct miqt_string* QStackedLayout_TrUtf82(const char* s, const char* c); -struct miqt_string* QStackedLayout_TrUtf83(const char* s, const char* c, int n); void QStackedLayout_Delete(QStackedLayout* self); #ifdef __cplusplus diff --git a/qt/gen_qstackedwidget.cpp b/qt/gen_qstackedwidget.cpp index c642623..19eda28 100644 --- a/qt/gen_qstackedwidget.cpp +++ b/qt/gen_qstackedwidget.cpp @@ -31,13 +31,6 @@ struct miqt_string* QStackedWidget_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QStackedWidget_TrUtf8(const char* s) { - QString _ret = QStackedWidget::trUtf8(s); - // 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()); -} - int QStackedWidget_AddWidget(QStackedWidget* self, QWidget* w) { return self->addWidget(w); } @@ -114,20 +107,6 @@ struct miqt_string* QStackedWidget_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QStackedWidget_TrUtf82(const char* s, const char* c) { - QString _ret = QStackedWidget::trUtf8(s, c); - // 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* QStackedWidget_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QStackedWidget::trUtf8(s, c, static_cast(n)); - // 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 QStackedWidget_Delete(QStackedWidget* self) { delete self; } diff --git a/qt/gen_qstackedwidget.go b/qt/gen_qstackedwidget.go index 11d37e2..1835e9a 100644 --- a/qt/gen_qstackedwidget.go +++ b/qt/gen_qstackedwidget.go @@ -68,15 +68,6 @@ func QStackedWidget_Tr(s string) string { return _ret } -func QStackedWidget_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QStackedWidget_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QStackedWidget) AddWidget(w *QWidget) int { return (int)(C.QStackedWidget_AddWidget(this.h, w.cPointer())) } @@ -179,28 +170,6 @@ func QStackedWidget_Tr3(s string, c string, n int) string { return _ret } -func QStackedWidget_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStackedWidget_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QStackedWidget_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStackedWidget_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QStackedWidget) Delete() { C.QStackedWidget_Delete(this.h) diff --git a/qt/gen_qstackedwidget.h b/qt/gen_qstackedwidget.h index 5823b05..7fcd51f 100644 --- a/qt/gen_qstackedwidget.h +++ b/qt/gen_qstackedwidget.h @@ -28,7 +28,6 @@ QStackedWidget* QStackedWidget_new2(QWidget* parent); QMetaObject* QStackedWidget_MetaObject(const QStackedWidget* self); void* QStackedWidget_Metacast(QStackedWidget* self, const char* param1); struct miqt_string* QStackedWidget_Tr(const char* s); -struct miqt_string* QStackedWidget_TrUtf8(const char* s); int QStackedWidget_AddWidget(QStackedWidget* self, QWidget* w); int QStackedWidget_InsertWidget(QStackedWidget* self, int index, QWidget* w); void QStackedWidget_RemoveWidget(QStackedWidget* self, QWidget* w); @@ -45,8 +44,6 @@ void QStackedWidget_WidgetRemoved(QStackedWidget* self, int index); void QStackedWidget_connect_WidgetRemoved(QStackedWidget* self, void* slot); struct miqt_string* QStackedWidget_Tr2(const char* s, const char* c); struct miqt_string* QStackedWidget_Tr3(const char* s, const char* c, int n); -struct miqt_string* QStackedWidget_TrUtf82(const char* s, const char* c); -struct miqt_string* QStackedWidget_TrUtf83(const char* s, const char* c, int n); void QStackedWidget_Delete(QStackedWidget* self); #ifdef __cplusplus diff --git a/qt/gen_qstandarditemmodel.cpp b/qt/gen_qstandarditemmodel.cpp index 2ec3e68..3a6d2da 100644 --- a/qt/gen_qstandarditemmodel.cpp +++ b/qt/gen_qstandarditemmodel.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -44,6 +45,10 @@ QVariant* QStandardItem_Data(const QStandardItem* self) { return new QVariant(self->data()); } +void QStandardItem_MultiData(const QStandardItem* self, QModelRoleDataSpan* roleDataSpan) { + self->multiData(*roleDataSpan); +} + void QStandardItem_SetData(QStandardItem* self, QVariant* value) { self->setData(*value); } @@ -239,14 +244,6 @@ void QStandardItem_SetUserTristate(QStandardItem* self, bool tristate) { self->setUserTristate(tristate); } -bool QStandardItem_IsTristate(const QStandardItem* self) { - return self->isTristate(); -} - -void QStandardItem_SetTristate(QStandardItem* self, bool tristate) { - self->setTristate(tristate); -} - bool QStandardItem_IsDragEnabled(const QStandardItem* self) { return self->isDragEnabled(); } @@ -516,13 +513,6 @@ struct miqt_string* QStandardItemModel_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QStandardItemModel_TrUtf8(const char* s) { - QString _ret = QStandardItemModel::trUtf8(s); - // 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()); -} - QModelIndex* QStandardItemModel_Index(const QStandardItemModel* self, int row, int column) { return new QModelIndex(self->index(static_cast(row), static_cast(column))); } @@ -543,14 +533,14 @@ bool QStandardItemModel_HasChildren(const QStandardItemModel* self) { return self->hasChildren(); } -QModelIndex* QStandardItemModel_Sibling(const QStandardItemModel* self, int row, int column, QModelIndex* idx) { - return new QModelIndex(self->sibling(static_cast(row), static_cast(column), *idx)); -} - QVariant* QStandardItemModel_Data(const QStandardItemModel* self, QModelIndex* index) { return new QVariant(self->data(*index)); } +void QStandardItemModel_MultiData(const QStandardItemModel* self, QModelIndex* index, QModelRoleDataSpan* roleDataSpan) { + self->multiData(*index, *roleDataSpan); +} + bool QStandardItemModel_SetData(QStandardItemModel* self, QModelIndex* index, QVariant* value) { return self->setData(*index, *value); } @@ -850,20 +840,6 @@ struct miqt_string* QStandardItemModel_Tr3(const char* s, const char* c, int n) return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QStandardItemModel_TrUtf82(const char* s, const char* c) { - QString _ret = QStandardItemModel::trUtf8(s, c); - // 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* QStandardItemModel_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QStandardItemModel::trUtf8(s, c, static_cast(n)); - // 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()); -} - QModelIndex* QStandardItemModel_Index3(const QStandardItemModel* self, int row, int column, QModelIndex* parent) { return new QModelIndex(self->index(static_cast(row), static_cast(column), *parent)); } diff --git a/qt/gen_qstandarditemmodel.go b/qt/gen_qstandarditemmodel.go index f57f519..d0fce0f 100644 --- a/qt/gen_qstandarditemmodel.go +++ b/qt/gen_qstandarditemmodel.go @@ -84,6 +84,10 @@ func (this *QStandardItem) Data() *QVariant { return _goptr } +func (this *QStandardItem) MultiData(roleDataSpan QModelRoleDataSpan) { + C.QStandardItem_MultiData(this.h, roleDataSpan.cPointer()) +} + func (this *QStandardItem) SetData(value *QVariant) { C.QStandardItem_SetData(this.h, value.cPointer()) } @@ -297,14 +301,6 @@ func (this *QStandardItem) SetUserTristate(tristate bool) { C.QStandardItem_SetUserTristate(this.h, (C.bool)(tristate)) } -func (this *QStandardItem) IsTristate() bool { - return (bool)(C.QStandardItem_IsTristate(this.h)) -} - -func (this *QStandardItem) SetTristate(tristate bool) { - C.QStandardItem_SetTristate(this.h, (C.bool)(tristate)) -} - func (this *QStandardItem) IsDragEnabled() bool { return (bool)(C.QStandardItem_IsDragEnabled(this.h)) } @@ -633,15 +629,6 @@ func QStandardItemModel_Tr(s string) string { return _ret } -func QStandardItemModel_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QStandardItemModel_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QStandardItemModel) Index(row int, column int) *QModelIndex { _ret := C.QStandardItemModel_Index(this.h, (C.int)(row), (C.int)(column)) _goptr := newQModelIndex(_ret) @@ -668,13 +655,6 @@ func (this *QStandardItemModel) HasChildren() bool { return (bool)(C.QStandardItemModel_HasChildren(this.h)) } -func (this *QStandardItemModel) Sibling(row int, column int, idx *QModelIndex) *QModelIndex { - _ret := C.QStandardItemModel_Sibling(this.h, (C.int)(row), (C.int)(column), idx.cPointer()) - _goptr := newQModelIndex(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - func (this *QStandardItemModel) Data(index *QModelIndex) *QVariant { _ret := C.QStandardItemModel_Data(this.h, index.cPointer()) _goptr := newQVariant(_ret) @@ -682,6 +662,10 @@ func (this *QStandardItemModel) Data(index *QModelIndex) *QVariant { return _goptr } +func (this *QStandardItemModel) MultiData(index *QModelIndex, roleDataSpan QModelRoleDataSpan) { + C.QStandardItemModel_MultiData(this.h, index.cPointer(), roleDataSpan.cPointer()) +} + func (this *QStandardItemModel) SetData(index *QModelIndex, value *QVariant) bool { return (bool)(C.QStandardItemModel_SetData(this.h, index.cPointer(), value.cPointer())) } @@ -1011,28 +995,6 @@ func QStandardItemModel_Tr3(s string, c string, n int) string { return _ret } -func QStandardItemModel_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStandardItemModel_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QStandardItemModel_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStandardItemModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QStandardItemModel) Index3(row int, column int, parent *QModelIndex) *QModelIndex { _ret := C.QStandardItemModel_Index3(this.h, (C.int)(row), (C.int)(column), parent.cPointer()) _goptr := newQModelIndex(_ret) diff --git a/qt/gen_qstandarditemmodel.h b/qt/gen_qstandarditemmodel.h index a905d58..74dd84e 100644 --- a/qt/gen_qstandarditemmodel.h +++ b/qt/gen_qstandarditemmodel.h @@ -21,6 +21,7 @@ class QIcon; class QMetaObject; class QMimeData; class QModelIndex; +class QModelRoleDataSpan; class QObject; class QSize; class QStandardItem; @@ -34,6 +35,7 @@ typedef struct QIcon QIcon; typedef struct QMetaObject QMetaObject; typedef struct QMimeData QMimeData; typedef struct QModelIndex QModelIndex; +typedef struct QModelRoleDataSpan QModelRoleDataSpan; typedef struct QObject QObject; typedef struct QSize QSize; typedef struct QStandardItem QStandardItem; @@ -47,6 +49,7 @@ QStandardItem* QStandardItem_new3(QIcon* icon, struct miqt_string* text); QStandardItem* QStandardItem_new4(int rows); QStandardItem* QStandardItem_new5(int rows, int columns); QVariant* QStandardItem_Data(const QStandardItem* self); +void QStandardItem_MultiData(const QStandardItem* self, QModelRoleDataSpan* roleDataSpan); void QStandardItem_SetData(QStandardItem* self, QVariant* value); void QStandardItem_ClearData(QStandardItem* self); struct miqt_string* QStandardItem_Text(const QStandardItem* self); @@ -89,8 +92,6 @@ bool QStandardItem_IsAutoTristate(const QStandardItem* self); void QStandardItem_SetAutoTristate(QStandardItem* self, bool tristate); bool QStandardItem_IsUserTristate(const QStandardItem* self); void QStandardItem_SetUserTristate(QStandardItem* self, bool tristate); -bool QStandardItem_IsTristate(const QStandardItem* self); -void QStandardItem_SetTristate(QStandardItem* self, bool tristate); bool QStandardItem_IsDragEnabled(const QStandardItem* self); void QStandardItem_SetDragEnabled(QStandardItem* self, bool dragEnabled); bool QStandardItem_IsDropEnabled(const QStandardItem* self); @@ -145,14 +146,13 @@ QStandardItemModel* QStandardItemModel_new4(int rows, int columns, QObject* pare QMetaObject* QStandardItemModel_MetaObject(const QStandardItemModel* self); void* QStandardItemModel_Metacast(QStandardItemModel* self, const char* param1); struct miqt_string* QStandardItemModel_Tr(const char* s); -struct miqt_string* QStandardItemModel_TrUtf8(const char* s); QModelIndex* QStandardItemModel_Index(const QStandardItemModel* self, int row, int column); QModelIndex* QStandardItemModel_Parent(const QStandardItemModel* self, QModelIndex* child); int QStandardItemModel_RowCount(const QStandardItemModel* self); int QStandardItemModel_ColumnCount(const QStandardItemModel* self); bool QStandardItemModel_HasChildren(const QStandardItemModel* self); -QModelIndex* QStandardItemModel_Sibling(const QStandardItemModel* self, int row, int column, QModelIndex* idx); QVariant* QStandardItemModel_Data(const QStandardItemModel* self, QModelIndex* index); +void QStandardItemModel_MultiData(const QStandardItemModel* self, QModelIndex* index, QModelRoleDataSpan* roleDataSpan); bool QStandardItemModel_SetData(QStandardItemModel* self, QModelIndex* index, QVariant* value); bool QStandardItemModel_ClearItemData(QStandardItemModel* self, QModelIndex* index); QVariant* QStandardItemModel_HeaderData(const QStandardItemModel* self, int section, int orientation); @@ -204,8 +204,6 @@ void QStandardItemModel_ItemChanged(QStandardItemModel* self, QStandardItem* ite void QStandardItemModel_connect_ItemChanged(QStandardItemModel* self, void* slot); struct miqt_string* QStandardItemModel_Tr2(const char* s, const char* c); struct miqt_string* QStandardItemModel_Tr3(const char* s, const char* c, int n); -struct miqt_string* QStandardItemModel_TrUtf82(const char* s, const char* c); -struct miqt_string* QStandardItemModel_TrUtf83(const char* s, const char* c, int n); QModelIndex* QStandardItemModel_Index3(const QStandardItemModel* self, int row, int column, QModelIndex* parent); int QStandardItemModel_RowCount1(const QStandardItemModel* self, QModelIndex* parent); int QStandardItemModel_ColumnCount1(const QStandardItemModel* self, QModelIndex* parent); diff --git a/qt/gen_qstandardpaths.cpp b/qt/gen_qstandardpaths.cpp index 4812099..52d17dc 100644 --- a/qt/gen_qstandardpaths.cpp +++ b/qt/gen_qstandardpaths.cpp @@ -70,10 +70,6 @@ struct miqt_string* QStandardPaths_FindExecutable(struct miqt_string* executable return miqt_strdup(_b.data(), _b.length()); } -void QStandardPaths_EnableTestMode(bool testMode) { - QStandardPaths::enableTestMode(testMode); -} - void QStandardPaths_SetTestModeEnabled(bool testMode) { QStandardPaths::setTestModeEnabled(testMode); } diff --git a/qt/gen_qstandardpaths.go b/qt/gen_qstandardpaths.go index 3b9f3c0..97df93f 100644 --- a/qt/gen_qstandardpaths.go +++ b/qt/gen_qstandardpaths.go @@ -25,7 +25,7 @@ const ( QStandardPaths__PicturesLocation QStandardPaths__StandardLocation = 6 QStandardPaths__TempLocation QStandardPaths__StandardLocation = 7 QStandardPaths__HomeLocation QStandardPaths__StandardLocation = 8 - QStandardPaths__DataLocation QStandardPaths__StandardLocation = 9 + QStandardPaths__AppLocalDataLocation QStandardPaths__StandardLocation = 9 QStandardPaths__CacheLocation QStandardPaths__StandardLocation = 10 QStandardPaths__GenericDataLocation QStandardPaths__StandardLocation = 11 QStandardPaths__RuntimeLocation QStandardPaths__StandardLocation = 12 @@ -35,7 +35,8 @@ const ( QStandardPaths__GenericConfigLocation QStandardPaths__StandardLocation = 16 QStandardPaths__AppDataLocation QStandardPaths__StandardLocation = 17 QStandardPaths__AppConfigLocation QStandardPaths__StandardLocation = 18 - QStandardPaths__AppLocalDataLocation QStandardPaths__StandardLocation = 9 + QStandardPaths__PublicShareLocation QStandardPaths__StandardLocation = 19 + QStandardPaths__TemplatesLocation QStandardPaths__StandardLocation = 20 ) type QStandardPaths__LocateOption int @@ -129,10 +130,6 @@ func QStandardPaths_FindExecutable(executableName string) string { return _ret } -func QStandardPaths_EnableTestMode(testMode bool) { - C.QStandardPaths_EnableTestMode((C.bool)(testMode)) -} - func QStandardPaths_SetTestModeEnabled(testMode bool) { C.QStandardPaths_SetTestModeEnabled((C.bool)(testMode)) } diff --git a/qt/gen_qstandardpaths.h b/qt/gen_qstandardpaths.h index c5c5066..5a59a0e 100644 --- a/qt/gen_qstandardpaths.h +++ b/qt/gen_qstandardpaths.h @@ -25,7 +25,6 @@ struct miqt_string* QStandardPaths_Locate(int typeVal, struct miqt_string* fileN 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(int typeVal, struct miqt_string* fileName, int options); diff --git a/qt/gen_qstate.cpp b/qt/gen_qstate.cpp deleted file mode 100644 index c9f9a7e..0000000 --- a/qt/gen_qstate.cpp +++ /dev/null @@ -1,143 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "qstate.h" -#include "gen_qstate.h" -#include "_cgo_export.h" - -QState* QState_new() { - return new QState(); -} - -QState* QState_new2(int childMode) { - return new QState(static_cast(childMode)); -} - -QState* QState_new3(QState* parent) { - return new QState(parent); -} - -QState* QState_new4(int childMode, QState* parent) { - return new QState(static_cast(childMode), parent); -} - -QMetaObject* QState_MetaObject(const QState* self) { - return (QMetaObject*) self->metaObject(); -} - -void* QState_Metacast(QState* self, const char* param1) { - return self->qt_metacast(param1); -} - -struct miqt_string* QState_Tr(const char* s) { - QString _ret = QState::tr(s); - // 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* QState_TrUtf8(const char* s) { - QString _ret = QState::trUtf8(s); - // 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()); -} - -QAbstractState* QState_ErrorState(const QState* self) { - return self->errorState(); -} - -void QState_SetErrorState(QState* self, QAbstractState* state) { - self->setErrorState(state); -} - -void QState_AddTransition(QState* self, QAbstractTransition* transition) { - self->addTransition(transition); -} - -QSignalTransition* QState_AddTransition2(QState* self, QObject* sender, const char* signal, QAbstractState* target) { - return self->addTransition(sender, signal, target); -} - -QAbstractTransition* QState_AddTransitionWithTarget(QState* self, QAbstractState* target) { - return self->addTransition(target); -} - -void QState_RemoveTransition(QState* self, QAbstractTransition* transition) { - self->removeTransition(transition); -} - -struct miqt_array* QState_Transitions(const QState* self) { - 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) { - _arr[i] = _ret[i]; - } - struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); - _out->len = _ret.length(); - _out->data = static_cast(_arr); - return _out; -} - -QAbstractState* QState_InitialState(const QState* self) { - return self->initialState(); -} - -void QState_SetInitialState(QState* self, QAbstractState* state) { - self->setInitialState(state); -} - -int QState_ChildMode(const QState* self) { - QState::ChildMode _ret = self->childMode(); - return static_cast(_ret); -} - -void QState_SetChildMode(QState* self, int mode) { - self->setChildMode(static_cast(mode)); -} - -void QState_AssignProperty(QState* self, QObject* object, const char* name, QVariant* value) { - self->assignProperty(object, name, *value); -} - -struct miqt_string* QState_Tr2(const char* s, const char* c) { - QString _ret = QState::tr(s, c); - // 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* QState_Tr3(const char* s, const char* c, int n) { - QString _ret = QState::tr(s, c, static_cast(n)); - // 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* QState_TrUtf82(const char* s, const char* c) { - QString _ret = QState::trUtf8(s, c); - // 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* QState_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QState::trUtf8(s, c, static_cast(n)); - // 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 QState_Delete(QState* self) { - delete self; -} - diff --git a/qt/gen_qstate.go b/qt/gen_qstate.go deleted file mode 100644 index da45a7a..0000000 --- a/qt/gen_qstate.go +++ /dev/null @@ -1,220 +0,0 @@ -package qt - -/* - -#include "gen_qstate.h" -#include - -*/ -import "C" - -import ( - "runtime" - "unsafe" -) - -type QState__ChildMode int - -const ( - QState__ExclusiveStates QState__ChildMode = 0 - QState__ParallelStates QState__ChildMode = 1 -) - -type QState__RestorePolicy int - -const ( - QState__DontRestoreProperties QState__RestorePolicy = 0 - QState__RestoreProperties QState__RestorePolicy = 1 -) - -type QState struct { - h *C.QState - *QAbstractState -} - -func (this *QState) cPointer() *C.QState { - if this == nil { - return nil - } - return this.h -} - -func newQState(h *C.QState) *QState { - if h == nil { - return nil - } - return &QState{h: h, QAbstractState: newQAbstractState_U(unsafe.Pointer(h))} -} - -func newQState_U(h unsafe.Pointer) *QState { - return newQState((*C.QState)(h)) -} - -// NewQState constructs a new QState object. -func NewQState() *QState { - ret := C.QState_new() - return newQState(ret) -} - -// NewQState2 constructs a new QState object. -func NewQState2(childMode QState__ChildMode) *QState { - ret := C.QState_new2((C.int)(childMode)) - return newQState(ret) -} - -// NewQState3 constructs a new QState object. -func NewQState3(parent *QState) *QState { - ret := C.QState_new3(parent.cPointer()) - return newQState(ret) -} - -// NewQState4 constructs a new QState object. -func NewQState4(childMode QState__ChildMode, parent *QState) *QState { - ret := C.QState_new4((C.int)(childMode), parent.cPointer()) - return newQState(ret) -} - -func (this *QState) MetaObject() *QMetaObject { - return newQMetaObject_U(unsafe.Pointer(C.QState_MetaObject(this.h))) -} - -func (this *QState) Metacast(param1 string) unsafe.Pointer { - param1_Cstring := C.CString(param1) - defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QState_Metacast(this.h, param1_Cstring) -} - -func QState_Tr(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QState_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QState_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QState_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QState) ErrorState() *QAbstractState { - return newQAbstractState_U(unsafe.Pointer(C.QState_ErrorState(this.h))) -} - -func (this *QState) SetErrorState(state *QAbstractState) { - C.QState_SetErrorState(this.h, state.cPointer()) -} - -func (this *QState) AddTransition(transition *QAbstractTransition) { - C.QState_AddTransition(this.h, transition.cPointer()) -} - -func (this *QState) AddTransition2(sender *QObject, signal string, target *QAbstractState) *QSignalTransition { - signal_Cstring := C.CString(signal) - defer C.free(unsafe.Pointer(signal_Cstring)) - return newQSignalTransition_U(unsafe.Pointer(C.QState_AddTransition2(this.h, sender.cPointer(), signal_Cstring, target.cPointer()))) -} - -func (this *QState) AddTransitionWithTarget(target *QAbstractState) *QAbstractTransition { - return newQAbstractTransition_U(unsafe.Pointer(C.QState_AddTransitionWithTarget(this.h, target.cPointer()))) -} - -func (this *QState) RemoveTransition(transition *QAbstractTransition) { - C.QState_RemoveTransition(this.h, transition.cPointer()) -} - -func (this *QState) Transitions() []*QAbstractTransition { - var _ma *C.struct_miqt_array = C.QState_Transitions(this.h) - _ret := make([]*QAbstractTransition, int(_ma.len)) - _outCast := (*[0xffff]*C.QAbstractTransition)(unsafe.Pointer(_ma.data)) // hey ya - for i := 0; i < int(_ma.len); i++ { - _ret[i] = newQAbstractTransition_U(unsafe.Pointer(_outCast[i])) - } - C.free(unsafe.Pointer(_ma)) - return _ret -} - -func (this *QState) InitialState() *QAbstractState { - return newQAbstractState_U(unsafe.Pointer(C.QState_InitialState(this.h))) -} - -func (this *QState) SetInitialState(state *QAbstractState) { - C.QState_SetInitialState(this.h, state.cPointer()) -} - -func (this *QState) ChildMode() QState__ChildMode { - return (QState__ChildMode)(C.QState_ChildMode(this.h)) -} - -func (this *QState) SetChildMode(mode QState__ChildMode) { - C.QState_SetChildMode(this.h, (C.int)(mode)) -} - -func (this *QState) AssignProperty(object *QObject, name string, value *QVariant) { - name_Cstring := C.CString(name) - defer C.free(unsafe.Pointer(name_Cstring)) - C.QState_AssignProperty(this.h, object.cPointer(), name_Cstring, value.cPointer()) -} - -func QState_Tr2(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QState_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QState_Tr3(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QState_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QState_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QState_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QState_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QState_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -// Delete this object from C++ memory. -func (this *QState) Delete() { - C.QState_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QState) GoGC() { - runtime.SetFinalizer(this, func(this *QState) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} diff --git a/qt/gen_qstate.h b/qt/gen_qstate.h deleted file mode 100644 index c1eb761..0000000 --- a/qt/gen_qstate.h +++ /dev/null @@ -1,64 +0,0 @@ -#ifndef GEN_QSTATE_H -#define GEN_QSTATE_H - -#include -#include -#include - -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - -#include "binding.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __cplusplus -class QAbstractState; -class QAbstractTransition; -class QMetaObject; -class QObject; -class QSignalTransition; -class QState; -class QVariant; -#else -typedef struct QAbstractState QAbstractState; -typedef struct QAbstractTransition QAbstractTransition; -typedef struct QMetaObject QMetaObject; -typedef struct QObject QObject; -typedef struct QSignalTransition QSignalTransition; -typedef struct QState QState; -typedef struct QVariant QVariant; -#endif - -QState* QState_new(); -QState* QState_new2(int childMode); -QState* QState_new3(QState* parent); -QState* QState_new4(int childMode, QState* parent); -QMetaObject* QState_MetaObject(const QState* self); -void* QState_Metacast(QState* self, const char* param1); -struct miqt_string* QState_Tr(const char* s); -struct miqt_string* QState_TrUtf8(const char* s); -QAbstractState* QState_ErrorState(const QState* self); -void QState_SetErrorState(QState* self, QAbstractState* state); -void QState_AddTransition(QState* self, QAbstractTransition* transition); -QSignalTransition* QState_AddTransition2(QState* self, QObject* sender, const char* signal, QAbstractState* target); -QAbstractTransition* QState_AddTransitionWithTarget(QState* self, QAbstractState* target); -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); -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); -struct miqt_string* QState_TrUtf82(const char* s, const char* c); -struct miqt_string* QState_TrUtf83(const char* s, const char* c, int n); -void QState_Delete(QState* self); - -#ifdef __cplusplus -} /* extern C */ -#endif - -#endif diff --git a/qt/gen_qstatemachine.cpp b/qt/gen_qstatemachine.cpp deleted file mode 100644 index 181aa49..0000000 --- a/qt/gen_qstatemachine.cpp +++ /dev/null @@ -1,246 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#define WORKAROUND_INNER_CLASS_DEFINITION_QStateMachine__SignalEvent -#define WORKAROUND_INNER_CLASS_DEFINITION_QStateMachine__WrappedEvent -#include -#include -#include -#include "qstatemachine.h" -#include "gen_qstatemachine.h" -#include "_cgo_export.h" - -QStateMachine* QStateMachine_new() { - return new QStateMachine(); -} - -QStateMachine* QStateMachine_new2(int childMode) { - return new QStateMachine(static_cast(childMode)); -} - -QStateMachine* QStateMachine_new3(QObject* parent) { - return new QStateMachine(parent); -} - -QStateMachine* QStateMachine_new4(int childMode, QObject* parent) { - return new QStateMachine(static_cast(childMode), parent); -} - -QMetaObject* QStateMachine_MetaObject(const QStateMachine* self) { - return (QMetaObject*) self->metaObject(); -} - -void* QStateMachine_Metacast(QStateMachine* self, const char* param1) { - return self->qt_metacast(param1); -} - -struct miqt_string* QStateMachine_Tr(const char* s) { - QString _ret = QStateMachine::tr(s); - // 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* QStateMachine_TrUtf8(const char* s) { - QString _ret = QStateMachine::trUtf8(s); - // 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 QStateMachine_AddState(QStateMachine* self, QAbstractState* state) { - self->addState(state); -} - -void QStateMachine_RemoveState(QStateMachine* self, QAbstractState* state) { - self->removeState(state); -} - -int QStateMachine_Error(const QStateMachine* self) { - QStateMachine::Error _ret = self->error(); - return static_cast(_ret); -} - -struct miqt_string* QStateMachine_ErrorString(const QStateMachine* self) { - QString _ret = self->errorString(); - // 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 QStateMachine_ClearError(QStateMachine* self) { - self->clearError(); -} - -bool QStateMachine_IsRunning(const QStateMachine* self) { - return self->isRunning(); -} - -bool QStateMachine_IsAnimated(const QStateMachine* self) { - return self->isAnimated(); -} - -void QStateMachine_SetAnimated(QStateMachine* self, bool enabled) { - self->setAnimated(enabled); -} - -void QStateMachine_AddDefaultAnimation(QStateMachine* self, QAbstractAnimation* animation) { - self->addDefaultAnimation(animation); -} - -struct miqt_array* QStateMachine_DefaultAnimations(const QStateMachine* self) { - 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) { - _arr[i] = _ret[i]; - } - struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); - _out->len = _ret.length(); - _out->data = static_cast(_arr); - return _out; -} - -void QStateMachine_RemoveDefaultAnimation(QStateMachine* self, QAbstractAnimation* animation) { - self->removeDefaultAnimation(animation); -} - -int QStateMachine_GlobalRestorePolicy(const QStateMachine* self) { - QState::RestorePolicy _ret = self->globalRestorePolicy(); - return static_cast(_ret); -} - -void QStateMachine_SetGlobalRestorePolicy(QStateMachine* self, int restorePolicy) { - self->setGlobalRestorePolicy(static_cast(restorePolicy)); -} - -void QStateMachine_PostEvent(QStateMachine* self, QEvent* event) { - self->postEvent(event); -} - -int QStateMachine_PostDelayedEvent(QStateMachine* self, QEvent* event, int delay) { - return self->postDelayedEvent(event, static_cast(delay)); -} - -bool QStateMachine_CancelDelayedEvent(QStateMachine* self, int id) { - return self->cancelDelayedEvent(static_cast(id)); -} - -struct miqt_array* QStateMachine_Configuration(const QStateMachine* self) { - QSet _ret = self->configuration(); - // Convert QList<> from C++ memory to manually-managed C memory - QAbstractState** _arr = static_cast(malloc(sizeof(QAbstractState*) * _ret.size())); - int _ctr = 0; - QSetIterator _itr(_ret); - while (_itr.hasNext()) { - _arr[_ctr++] = _itr.next(); - } - struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); - _out->len = _ret.size(); - _out->data = static_cast(_arr); - return _out; -} - -bool QStateMachine_EventFilter(QStateMachine* self, QObject* watched, QEvent* event) { - return self->eventFilter(watched, event); -} - -void QStateMachine_Start(QStateMachine* self) { - self->start(); -} - -void QStateMachine_Stop(QStateMachine* self) { - self->stop(); -} - -void QStateMachine_SetRunning(QStateMachine* self, bool running) { - self->setRunning(running); -} - -void QStateMachine_RunningChanged(QStateMachine* self, bool running) { - self->runningChanged(running); -} - -void QStateMachine_connect_RunningChanged(QStateMachine* self, void* slot) { - QStateMachine::connect(self, static_cast(&QStateMachine::runningChanged), self, [=](bool running) { - bool sigval1 = running; - miqt_exec_callback_QStateMachine_RunningChanged(slot, sigval1); - }); -} - -struct miqt_string* QStateMachine_Tr2(const char* s, const char* c) { - QString _ret = QStateMachine::tr(s, c); - // 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* QStateMachine_Tr3(const char* s, const char* c, int n) { - QString _ret = QStateMachine::tr(s, c, static_cast(n)); - // 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* QStateMachine_TrUtf82(const char* s, const char* c) { - QString _ret = QStateMachine::trUtf8(s, c); - // 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* QStateMachine_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QStateMachine::trUtf8(s, c, static_cast(n)); - // 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 QStateMachine_PostEvent2(QStateMachine* self, QEvent* event, int priority) { - self->postEvent(event, static_cast(priority)); -} - -void QStateMachine_Delete(QStateMachine* self) { - delete self; -} - -QStateMachine__SignalEvent* QStateMachine__SignalEvent_new(QStateMachine__SignalEvent* param1) { - return new QStateMachine::SignalEvent(*param1); -} - -QObject* QStateMachine__SignalEvent_Sender(const QStateMachine__SignalEvent* self) { - return self->sender(); -} - -int QStateMachine__SignalEvent_SignalIndex(const QStateMachine__SignalEvent* self) { - return self->signalIndex(); -} - -void QStateMachine__SignalEvent_Delete(QStateMachine__SignalEvent* self) { - delete self; -} - -QStateMachine__WrappedEvent* QStateMachine__WrappedEvent_new(QObject* object, QEvent* event) { - return new QStateMachine::WrappedEvent(object, event); -} - -QStateMachine__WrappedEvent* QStateMachine__WrappedEvent_new2(QStateMachine__WrappedEvent* param1) { - return new QStateMachine::WrappedEvent(*param1); -} - -QObject* QStateMachine__WrappedEvent_Object(const QStateMachine__WrappedEvent* self) { - return self->object(); -} - -QEvent* QStateMachine__WrappedEvent_Event(const QStateMachine__WrappedEvent* self) { - return self->event(); -} - -void QStateMachine__WrappedEvent_Delete(QStateMachine__WrappedEvent* self) { - delete self; -} - diff --git a/qt/gen_qstatemachine.go b/qt/gen_qstatemachine.go deleted file mode 100644 index 304ac00..0000000 --- a/qt/gen_qstatemachine.go +++ /dev/null @@ -1,399 +0,0 @@ -package qt - -/* - -#include "gen_qstatemachine.h" -#include - -*/ -import "C" - -import ( - "runtime" - "runtime/cgo" - "unsafe" -) - -type QStateMachine__EventPriority int - -const ( - QStateMachine__NormalPriority QStateMachine__EventPriority = 0 - QStateMachine__HighPriority QStateMachine__EventPriority = 1 -) - -type QStateMachine__Error int - -const ( - QStateMachine__NoError QStateMachine__Error = 0 - QStateMachine__NoInitialStateError QStateMachine__Error = 1 - QStateMachine__NoDefaultStateInHistoryStateError QStateMachine__Error = 2 - QStateMachine__NoCommonAncestorForTransitionError QStateMachine__Error = 3 - QStateMachine__StateMachineChildModeSetToParallelError QStateMachine__Error = 4 -) - -type QStateMachine struct { - h *C.QStateMachine - *QState -} - -func (this *QStateMachine) cPointer() *C.QStateMachine { - if this == nil { - return nil - } - return this.h -} - -func newQStateMachine(h *C.QStateMachine) *QStateMachine { - if h == nil { - return nil - } - return &QStateMachine{h: h, QState: newQState_U(unsafe.Pointer(h))} -} - -func newQStateMachine_U(h unsafe.Pointer) *QStateMachine { - return newQStateMachine((*C.QStateMachine)(h)) -} - -// NewQStateMachine constructs a new QStateMachine object. -func NewQStateMachine() *QStateMachine { - ret := C.QStateMachine_new() - return newQStateMachine(ret) -} - -// NewQStateMachine2 constructs a new QStateMachine object. -func NewQStateMachine2(childMode QState__ChildMode) *QStateMachine { - ret := C.QStateMachine_new2((C.int)(childMode)) - return newQStateMachine(ret) -} - -// NewQStateMachine3 constructs a new QStateMachine object. -func NewQStateMachine3(parent *QObject) *QStateMachine { - ret := C.QStateMachine_new3(parent.cPointer()) - return newQStateMachine(ret) -} - -// NewQStateMachine4 constructs a new QStateMachine object. -func NewQStateMachine4(childMode QState__ChildMode, parent *QObject) *QStateMachine { - ret := C.QStateMachine_new4((C.int)(childMode), parent.cPointer()) - return newQStateMachine(ret) -} - -func (this *QStateMachine) MetaObject() *QMetaObject { - return newQMetaObject_U(unsafe.Pointer(C.QStateMachine_MetaObject(this.h))) -} - -func (this *QStateMachine) Metacast(param1 string) unsafe.Pointer { - param1_Cstring := C.CString(param1) - defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QStateMachine_Metacast(this.h, param1_Cstring) -} - -func QStateMachine_Tr(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QStateMachine_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QStateMachine_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QStateMachine_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QStateMachine) AddState(state *QAbstractState) { - C.QStateMachine_AddState(this.h, state.cPointer()) -} - -func (this *QStateMachine) RemoveState(state *QAbstractState) { - C.QStateMachine_RemoveState(this.h, state.cPointer()) -} - -func (this *QStateMachine) Error() QStateMachine__Error { - return (QStateMachine__Error)(C.QStateMachine_Error(this.h)) -} - -func (this *QStateMachine) ErrorString() string { - var _ms *C.struct_miqt_string = C.QStateMachine_ErrorString(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QStateMachine) ClearError() { - C.QStateMachine_ClearError(this.h) -} - -func (this *QStateMachine) IsRunning() bool { - return (bool)(C.QStateMachine_IsRunning(this.h)) -} - -func (this *QStateMachine) IsAnimated() bool { - return (bool)(C.QStateMachine_IsAnimated(this.h)) -} - -func (this *QStateMachine) SetAnimated(enabled bool) { - C.QStateMachine_SetAnimated(this.h, (C.bool)(enabled)) -} - -func (this *QStateMachine) AddDefaultAnimation(animation *QAbstractAnimation) { - C.QStateMachine_AddDefaultAnimation(this.h, animation.cPointer()) -} - -func (this *QStateMachine) DefaultAnimations() []*QAbstractAnimation { - var _ma *C.struct_miqt_array = C.QStateMachine_DefaultAnimations(this.h) - _ret := make([]*QAbstractAnimation, int(_ma.len)) - _outCast := (*[0xffff]*C.QAbstractAnimation)(unsafe.Pointer(_ma.data)) // hey ya - for i := 0; i < int(_ma.len); i++ { - _ret[i] = newQAbstractAnimation_U(unsafe.Pointer(_outCast[i])) - } - C.free(unsafe.Pointer(_ma)) - return _ret -} - -func (this *QStateMachine) RemoveDefaultAnimation(animation *QAbstractAnimation) { - C.QStateMachine_RemoveDefaultAnimation(this.h, animation.cPointer()) -} - -func (this *QStateMachine) GlobalRestorePolicy() QState__RestorePolicy { - return (QState__RestorePolicy)(C.QStateMachine_GlobalRestorePolicy(this.h)) -} - -func (this *QStateMachine) SetGlobalRestorePolicy(restorePolicy QState__RestorePolicy) { - C.QStateMachine_SetGlobalRestorePolicy(this.h, (C.int)(restorePolicy)) -} - -func (this *QStateMachine) PostEvent(event *QEvent) { - C.QStateMachine_PostEvent(this.h, event.cPointer()) -} - -func (this *QStateMachine) PostDelayedEvent(event *QEvent, delay int) int { - return (int)(C.QStateMachine_PostDelayedEvent(this.h, event.cPointer(), (C.int)(delay))) -} - -func (this *QStateMachine) CancelDelayedEvent(id int) bool { - return (bool)(C.QStateMachine_CancelDelayedEvent(this.h, (C.int)(id))) -} - -func (this *QStateMachine) Configuration() map[*QAbstractState]struct{} { - var _ma *C.struct_miqt_array = C.QStateMachine_Configuration(this.h) - _ret := make(map[*QAbstractState]struct{}, int(_ma.len)) - _outCast := (*[0xffff]*C.QAbstractState)(unsafe.Pointer(_ma.data)) // hey ya - for i := 0; i < int(_ma.len); i++ { - _element := newQAbstractState_U(unsafe.Pointer(_outCast[i])) - _ret[_element] = struct{}{} - } - C.free(unsafe.Pointer(_ma)) - return _ret -} - -func (this *QStateMachine) EventFilter(watched *QObject, event *QEvent) bool { - return (bool)(C.QStateMachine_EventFilter(this.h, watched.cPointer(), event.cPointer())) -} - -func (this *QStateMachine) Start() { - C.QStateMachine_Start(this.h) -} - -func (this *QStateMachine) Stop() { - C.QStateMachine_Stop(this.h) -} - -func (this *QStateMachine) SetRunning(running bool) { - C.QStateMachine_SetRunning(this.h, (C.bool)(running)) -} - -func (this *QStateMachine) RunningChanged(running bool) { - C.QStateMachine_RunningChanged(this.h, (C.bool)(running)) -} -func (this *QStateMachine) OnRunningChanged(slot func(running bool)) { - C.QStateMachine_connect_RunningChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) -} - -//export miqt_exec_callback_QStateMachine_RunningChanged -func miqt_exec_callback_QStateMachine_RunningChanged(cb *C.void, running C.bool) { - gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(running bool)) - if !ok { - panic("miqt: callback of non-callback type (heap corruption?)") - } - - // Convert all CABI parameters to Go parameters - slotval1 := (bool)(running) - - gofunc(slotval1) -} - -func QStateMachine_Tr2(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStateMachine_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QStateMachine_Tr3(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStateMachine_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QStateMachine_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStateMachine_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QStateMachine_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStateMachine_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QStateMachine) PostEvent2(event *QEvent, priority QStateMachine__EventPriority) { - C.QStateMachine_PostEvent2(this.h, event.cPointer(), (C.int)(priority)) -} - -// Delete this object from C++ memory. -func (this *QStateMachine) Delete() { - C.QStateMachine_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QStateMachine) GoGC() { - runtime.SetFinalizer(this, func(this *QStateMachine) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} - -type QStateMachine__SignalEvent struct { - h *C.QStateMachine__SignalEvent - *QEvent -} - -func (this *QStateMachine__SignalEvent) cPointer() *C.QStateMachine__SignalEvent { - if this == nil { - return nil - } - return this.h -} - -func newQStateMachine__SignalEvent(h *C.QStateMachine__SignalEvent) *QStateMachine__SignalEvent { - if h == nil { - return nil - } - return &QStateMachine__SignalEvent{h: h, QEvent: newQEvent_U(unsafe.Pointer(h))} -} - -func newQStateMachine__SignalEvent_U(h unsafe.Pointer) *QStateMachine__SignalEvent { - return newQStateMachine__SignalEvent((*C.QStateMachine__SignalEvent)(h)) -} - -// NewQStateMachine__SignalEvent constructs a new QStateMachine::SignalEvent object. -func NewQStateMachine__SignalEvent(param1 *QStateMachine__SignalEvent) *QStateMachine__SignalEvent { - ret := C.QStateMachine__SignalEvent_new(param1.cPointer()) - return newQStateMachine__SignalEvent(ret) -} - -func (this *QStateMachine__SignalEvent) Sender() *QObject { - return newQObject_U(unsafe.Pointer(C.QStateMachine__SignalEvent_Sender(this.h))) -} - -func (this *QStateMachine__SignalEvent) SignalIndex() int { - return (int)(C.QStateMachine__SignalEvent_SignalIndex(this.h)) -} - -// Delete this object from C++ memory. -func (this *QStateMachine__SignalEvent) Delete() { - C.QStateMachine__SignalEvent_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QStateMachine__SignalEvent) GoGC() { - runtime.SetFinalizer(this, func(this *QStateMachine__SignalEvent) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} - -type QStateMachine__WrappedEvent struct { - h *C.QStateMachine__WrappedEvent - *QEvent -} - -func (this *QStateMachine__WrappedEvent) cPointer() *C.QStateMachine__WrappedEvent { - if this == nil { - return nil - } - return this.h -} - -func newQStateMachine__WrappedEvent(h *C.QStateMachine__WrappedEvent) *QStateMachine__WrappedEvent { - if h == nil { - return nil - } - return &QStateMachine__WrappedEvent{h: h, QEvent: newQEvent_U(unsafe.Pointer(h))} -} - -func newQStateMachine__WrappedEvent_U(h unsafe.Pointer) *QStateMachine__WrappedEvent { - return newQStateMachine__WrappedEvent((*C.QStateMachine__WrappedEvent)(h)) -} - -// NewQStateMachine__WrappedEvent constructs a new QStateMachine::WrappedEvent object. -func NewQStateMachine__WrappedEvent(object *QObject, event *QEvent) *QStateMachine__WrappedEvent { - ret := C.QStateMachine__WrappedEvent_new(object.cPointer(), event.cPointer()) - return newQStateMachine__WrappedEvent(ret) -} - -// NewQStateMachine__WrappedEvent2 constructs a new QStateMachine::WrappedEvent object. -func NewQStateMachine__WrappedEvent2(param1 *QStateMachine__WrappedEvent) *QStateMachine__WrappedEvent { - ret := C.QStateMachine__WrappedEvent_new2(param1.cPointer()) - return newQStateMachine__WrappedEvent(ret) -} - -func (this *QStateMachine__WrappedEvent) Object() *QObject { - return newQObject_U(unsafe.Pointer(C.QStateMachine__WrappedEvent_Object(this.h))) -} - -func (this *QStateMachine__WrappedEvent) Event() *QEvent { - return newQEvent_U(unsafe.Pointer(C.QStateMachine__WrappedEvent_Event(this.h))) -} - -// Delete this object from C++ memory. -func (this *QStateMachine__WrappedEvent) Delete() { - C.QStateMachine__WrappedEvent_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QStateMachine__WrappedEvent) GoGC() { - runtime.SetFinalizer(this, func(this *QStateMachine__WrappedEvent) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} diff --git a/qt/gen_qstatemachine.h b/qt/gen_qstatemachine.h deleted file mode 100644 index a5a9c01..0000000 --- a/qt/gen_qstatemachine.h +++ /dev/null @@ -1,97 +0,0 @@ -#ifndef GEN_QSTATEMACHINE_H -#define GEN_QSTATEMACHINE_H - -#include -#include -#include - -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - -#include "binding.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __cplusplus -class QAbstractAnimation; -class QAbstractState; -class QEvent; -class QMetaObject; -class QObject; -class QStateMachine; -#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QStateMachine__SignalEvent) -typedef QStateMachine::SignalEvent QStateMachine__SignalEvent; -#else -class QStateMachine__SignalEvent; -#endif -#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QStateMachine__WrappedEvent) -typedef QStateMachine::WrappedEvent QStateMachine__WrappedEvent; -#else -class QStateMachine__WrappedEvent; -#endif -#else -typedef struct QAbstractAnimation QAbstractAnimation; -typedef struct QAbstractState QAbstractState; -typedef struct QEvent QEvent; -typedef struct QMetaObject QMetaObject; -typedef struct QObject QObject; -typedef struct QStateMachine QStateMachine; -typedef struct QStateMachine__SignalEvent QStateMachine__SignalEvent; -typedef struct QStateMachine__WrappedEvent QStateMachine__WrappedEvent; -#endif - -QStateMachine* QStateMachine_new(); -QStateMachine* QStateMachine_new2(int childMode); -QStateMachine* QStateMachine_new3(QObject* parent); -QStateMachine* QStateMachine_new4(int childMode, QObject* parent); -QMetaObject* QStateMachine_MetaObject(const QStateMachine* self); -void* QStateMachine_Metacast(QStateMachine* self, const char* param1); -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); -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); -bool QStateMachine_IsAnimated(const QStateMachine* self); -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); -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); -struct miqt_array* QStateMachine_Configuration(const QStateMachine* self); -bool QStateMachine_EventFilter(QStateMachine* self, QObject* watched, QEvent* event); -void QStateMachine_Start(QStateMachine* self); -void QStateMachine_Stop(QStateMachine* self); -void QStateMachine_SetRunning(QStateMachine* self, bool running); -void QStateMachine_RunningChanged(QStateMachine* self, bool running); -void QStateMachine_connect_RunningChanged(QStateMachine* self, void* slot); -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, int priority); -void QStateMachine_Delete(QStateMachine* self); - -QStateMachine__SignalEvent* QStateMachine__SignalEvent_new(QStateMachine__SignalEvent* param1); -QObject* QStateMachine__SignalEvent_Sender(const QStateMachine__SignalEvent* self); -int QStateMachine__SignalEvent_SignalIndex(const QStateMachine__SignalEvent* self); -void QStateMachine__SignalEvent_Delete(QStateMachine__SignalEvent* self); - -QStateMachine__WrappedEvent* QStateMachine__WrappedEvent_new(QObject* object, QEvent* event); -QStateMachine__WrappedEvent* QStateMachine__WrappedEvent_new2(QStateMachine__WrappedEvent* param1); -QObject* QStateMachine__WrappedEvent_Object(const QStateMachine__WrappedEvent* self); -QEvent* QStateMachine__WrappedEvent_Event(const QStateMachine__WrappedEvent* self); -void QStateMachine__WrappedEvent_Delete(QStateMachine__WrappedEvent* self); - -#ifdef __cplusplus -} /* extern C */ -#endif - -#endif diff --git a/qt/gen_qstatusbar.cpp b/qt/gen_qstatusbar.cpp index 4556d25..93e6654 100644 --- a/qt/gen_qstatusbar.cpp +++ b/qt/gen_qstatusbar.cpp @@ -31,13 +31,6 @@ struct miqt_string* QStatusBar_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QStatusBar_TrUtf8(const char* s) { - QString _ret = QStatusBar::trUtf8(s); - // 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 QStatusBar_AddWidget(QStatusBar* self, QWidget* widget) { self->addWidget(widget); } @@ -111,20 +104,6 @@ struct miqt_string* QStatusBar_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QStatusBar_TrUtf82(const char* s, const char* c) { - QString _ret = QStatusBar::trUtf8(s, c); - // 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* QStatusBar_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QStatusBar::trUtf8(s, c, static_cast(n)); - // 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 QStatusBar_AddWidget2(QStatusBar* self, QWidget* widget, int stretch) { self->addWidget(widget, static_cast(stretch)); } diff --git a/qt/gen_qstatusbar.go b/qt/gen_qstatusbar.go index cee8b09..87f665f 100644 --- a/qt/gen_qstatusbar.go +++ b/qt/gen_qstatusbar.go @@ -68,15 +68,6 @@ func QStatusBar_Tr(s string) string { return _ret } -func QStatusBar_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QStatusBar_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QStatusBar) AddWidget(widget *QWidget) { C.QStatusBar_AddWidget(this.h, widget.cPointer()) } @@ -169,28 +160,6 @@ func QStatusBar_Tr3(s string, c string, n int) string { return _ret } -func QStatusBar_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStatusBar_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QStatusBar_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStatusBar_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QStatusBar) AddWidget2(widget *QWidget, stretch int) { C.QStatusBar_AddWidget2(this.h, widget.cPointer(), (C.int)(stretch)) } diff --git a/qt/gen_qstatusbar.h b/qt/gen_qstatusbar.h index de827cf..ffd9975 100644 --- a/qt/gen_qstatusbar.h +++ b/qt/gen_qstatusbar.h @@ -28,7 +28,6 @@ QStatusBar* QStatusBar_new2(QWidget* parent); QMetaObject* QStatusBar_MetaObject(const QStatusBar* self); void* QStatusBar_Metacast(QStatusBar* self, const char* param1); struct miqt_string* QStatusBar_Tr(const char* s); -struct miqt_string* QStatusBar_TrUtf8(const char* s); void QStatusBar_AddWidget(QStatusBar* self, QWidget* widget); int QStatusBar_InsertWidget(QStatusBar* self, int index, QWidget* widget); void QStatusBar_AddPermanentWidget(QStatusBar* self, QWidget* widget); @@ -43,8 +42,6 @@ void QStatusBar_MessageChanged(QStatusBar* self, struct miqt_string* text); void QStatusBar_connect_MessageChanged(QStatusBar* self, void* slot); struct miqt_string* QStatusBar_Tr2(const char* s, const char* c); struct miqt_string* QStatusBar_Tr3(const char* s, const char* c, int n); -struct miqt_string* QStatusBar_TrUtf82(const char* s, const char* c); -struct miqt_string* QStatusBar_TrUtf83(const char* s, const char* c, int n); void QStatusBar_AddWidget2(QStatusBar* self, QWidget* widget, int stretch); int QStatusBar_InsertWidget3(QStatusBar* self, int index, QWidget* widget, int stretch); void QStatusBar_AddPermanentWidget2(QStatusBar* self, QWidget* widget, int stretch); diff --git a/qt/gen_qstringconverter.cpp b/qt/gen_qstringconverter.cpp new file mode 100644 index 0000000..3915f87 --- /dev/null +++ b/qt/gen_qstringconverter.cpp @@ -0,0 +1,74 @@ +#include +#include +#include +#include +#include "qstringconverter.h" +#include "gen_qstringconverter.h" +#include "_cgo_export.h" + +QStringEncoder* QStringEncoder_new() { + return new QStringEncoder(); +} + +QStringEncoder* QStringEncoder_new2(int encoding) { + return new QStringEncoder(static_cast(encoding)); +} + +QStringEncoder* QStringEncoder_new3(const char* name) { + return new QStringEncoder(name); +} + +QStringEncoder* QStringEncoder_new4(int encoding, int flags) { + return new QStringEncoder(static_cast(encoding), static_cast(flags)); +} + +QStringEncoder* QStringEncoder_new5(const char* name, int flags) { + return new QStringEncoder(name, static_cast(flags)); +} + +ptrdiff_t QStringEncoder_RequiredSpace(const QStringEncoder* self, ptrdiff_t inputLength) { + qsizetype _ret = self->requiredSpace((qsizetype)(inputLength)); + return static_cast(_ret); +} + +void QStringEncoder_Delete(QStringEncoder* self) { + delete self; +} + +QStringDecoder* QStringDecoder_new(int encoding) { + return new QStringDecoder(static_cast(encoding)); +} + +QStringDecoder* QStringDecoder_new2() { + return new QStringDecoder(); +} + +QStringDecoder* QStringDecoder_new3(const char* name) { + return new QStringDecoder(name); +} + +QStringDecoder* QStringDecoder_new4(int encoding, int flags) { + return new QStringDecoder(static_cast(encoding), static_cast(flags)); +} + +QStringDecoder* QStringDecoder_new5(const char* name, int f) { + return new QStringDecoder(name, static_cast(f)); +} + +ptrdiff_t QStringDecoder_RequiredSpace(const QStringDecoder* self, ptrdiff_t inputLength) { + qsizetype _ret = self->requiredSpace((qsizetype)(inputLength)); + return static_cast(_ret); +} + +QChar* QStringDecoder_AppendToBuffer(QStringDecoder* self, QChar* out, QByteArrayView* ba) { + return self->appendToBuffer(out, *ba); +} + +QStringDecoder* QStringDecoder_DecoderForHtml(QByteArrayView* data) { + return new QStringDecoder(QStringDecoder::decoderForHtml(*data)); +} + +void QStringDecoder_Delete(QStringDecoder* self) { + delete self; +} + diff --git a/qt/gen_qstringconverter.go b/qt/gen_qstringconverter.go new file mode 100644 index 0000000..6016340 --- /dev/null +++ b/qt/gen_qstringconverter.go @@ -0,0 +1,175 @@ +package qt + +/* + +#include "gen_qstringconverter.h" +#include + +*/ +import "C" + +import ( + "runtime" + "unsafe" +) + +type QStringEncoder struct { + h *C.QStringEncoder + *QStringConverter +} + +func (this *QStringEncoder) cPointer() *C.QStringEncoder { + if this == nil { + return nil + } + return this.h +} + +func newQStringEncoder(h *C.QStringEncoder) *QStringEncoder { + if h == nil { + return nil + } + return &QStringEncoder{h: h, QStringConverter: newQStringConverter_U(unsafe.Pointer(h))} +} + +func newQStringEncoder_U(h unsafe.Pointer) *QStringEncoder { + return newQStringEncoder((*C.QStringEncoder)(h)) +} + +// NewQStringEncoder constructs a new QStringEncoder object. +func NewQStringEncoder() *QStringEncoder { + ret := C.QStringEncoder_new() + return newQStringEncoder(ret) +} + +// NewQStringEncoder2 constructs a new QStringEncoder object. +func NewQStringEncoder2(encoding QStringConverter__Encoding) *QStringEncoder { + ret := C.QStringEncoder_new2((C.int)(encoding)) + return newQStringEncoder(ret) +} + +// NewQStringEncoder3 constructs a new QStringEncoder object. +func NewQStringEncoder3(name string) *QStringEncoder { + name_Cstring := C.CString(name) + defer C.free(unsafe.Pointer(name_Cstring)) + ret := C.QStringEncoder_new3(name_Cstring) + return newQStringEncoder(ret) +} + +// NewQStringEncoder4 constructs a new QStringEncoder object. +func NewQStringEncoder4(encoding QStringConverter__Encoding, flags QStringConverterBase__Flag) *QStringEncoder { + ret := C.QStringEncoder_new4((C.int)(encoding), (C.int)(flags)) + return newQStringEncoder(ret) +} + +// NewQStringEncoder5 constructs a new QStringEncoder object. +func NewQStringEncoder5(name string, flags QStringConverterBase__Flag) *QStringEncoder { + name_Cstring := C.CString(name) + defer C.free(unsafe.Pointer(name_Cstring)) + ret := C.QStringEncoder_new5(name_Cstring, (C.int)(flags)) + return newQStringEncoder(ret) +} + +func (this *QStringEncoder) RequiredSpace(inputLength int64) int64 { + return (int64)(C.QStringEncoder_RequiredSpace(this.h, (C.ptrdiff_t)(inputLength))) +} + +// Delete this object from C++ memory. +func (this *QStringEncoder) Delete() { + C.QStringEncoder_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QStringEncoder) GoGC() { + runtime.SetFinalizer(this, func(this *QStringEncoder) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + +type QStringDecoder struct { + h *C.QStringDecoder + *QStringConverter +} + +func (this *QStringDecoder) cPointer() *C.QStringDecoder { + if this == nil { + return nil + } + return this.h +} + +func newQStringDecoder(h *C.QStringDecoder) *QStringDecoder { + if h == nil { + return nil + } + return &QStringDecoder{h: h, QStringConverter: newQStringConverter_U(unsafe.Pointer(h))} +} + +func newQStringDecoder_U(h unsafe.Pointer) *QStringDecoder { + return newQStringDecoder((*C.QStringDecoder)(h)) +} + +// NewQStringDecoder constructs a new QStringDecoder object. +func NewQStringDecoder(encoding QStringConverter__Encoding) *QStringDecoder { + ret := C.QStringDecoder_new((C.int)(encoding)) + return newQStringDecoder(ret) +} + +// NewQStringDecoder2 constructs a new QStringDecoder object. +func NewQStringDecoder2() *QStringDecoder { + ret := C.QStringDecoder_new2() + return newQStringDecoder(ret) +} + +// NewQStringDecoder3 constructs a new QStringDecoder object. +func NewQStringDecoder3(name string) *QStringDecoder { + name_Cstring := C.CString(name) + defer C.free(unsafe.Pointer(name_Cstring)) + ret := C.QStringDecoder_new3(name_Cstring) + return newQStringDecoder(ret) +} + +// NewQStringDecoder4 constructs a new QStringDecoder object. +func NewQStringDecoder4(encoding QStringConverter__Encoding, flags QStringConverterBase__Flag) *QStringDecoder { + ret := C.QStringDecoder_new4((C.int)(encoding), (C.int)(flags)) + return newQStringDecoder(ret) +} + +// NewQStringDecoder5 constructs a new QStringDecoder object. +func NewQStringDecoder5(name string, f QStringConverterBase__Flag) *QStringDecoder { + name_Cstring := C.CString(name) + defer C.free(unsafe.Pointer(name_Cstring)) + ret := C.QStringDecoder_new5(name_Cstring, (C.int)(f)) + return newQStringDecoder(ret) +} + +func (this *QStringDecoder) RequiredSpace(inputLength int64) int64 { + return (int64)(C.QStringDecoder_RequiredSpace(this.h, (C.ptrdiff_t)(inputLength))) +} + +func (this *QStringDecoder) AppendToBuffer(out *QChar, ba QByteArrayView) *QChar { + return newQChar_U(unsafe.Pointer(C.QStringDecoder_AppendToBuffer(this.h, out.cPointer(), ba.cPointer()))) +} + +func QStringDecoder_DecoderForHtml(data QByteArrayView) *QStringDecoder { + _ret := C.QStringDecoder_DecoderForHtml(data.cPointer()) + _goptr := newQStringDecoder(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +// Delete this object from C++ memory. +func (this *QStringDecoder) Delete() { + C.QStringDecoder_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QStringDecoder) GoGC() { + runtime.SetFinalizer(this, func(this *QStringDecoder) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} diff --git a/qt/gen_qstringconverter.h b/qt/gen_qstringconverter.h new file mode 100644 index 0000000..8fa0c92 --- /dev/null +++ b/qt/gen_qstringconverter.h @@ -0,0 +1,50 @@ +#ifndef GEN_QSTRINGCONVERTER_H +#define GEN_QSTRINGCONVERTER_H + +#include +#include +#include + +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + +#include "binding.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +class QByteArrayView; +class QChar; +class QStringDecoder; +class QStringEncoder; +#else +typedef struct QByteArrayView QByteArrayView; +typedef struct QChar QChar; +typedef struct QStringDecoder QStringDecoder; +typedef struct QStringEncoder QStringEncoder; +#endif + +QStringEncoder* QStringEncoder_new(); +QStringEncoder* QStringEncoder_new2(int encoding); +QStringEncoder* QStringEncoder_new3(const char* name); +QStringEncoder* QStringEncoder_new4(int encoding, int flags); +QStringEncoder* QStringEncoder_new5(const char* name, int flags); +ptrdiff_t QStringEncoder_RequiredSpace(const QStringEncoder* self, ptrdiff_t inputLength); +void QStringEncoder_Delete(QStringEncoder* self); + +QStringDecoder* QStringDecoder_new(int encoding); +QStringDecoder* QStringDecoder_new2(); +QStringDecoder* QStringDecoder_new3(const char* name); +QStringDecoder* QStringDecoder_new4(int encoding, int flags); +QStringDecoder* QStringDecoder_new5(const char* name, int f); +ptrdiff_t QStringDecoder_RequiredSpace(const QStringDecoder* self, ptrdiff_t inputLength); +QChar* QStringDecoder_AppendToBuffer(QStringDecoder* self, QChar* out, QByteArrayView* ba); +QStringDecoder* QStringDecoder_DecoderForHtml(QByteArrayView* data); +void QStringDecoder_Delete(QStringDecoder* self); + +#ifdef __cplusplus +} /* extern C */ +#endif + +#endif diff --git a/qt/gen_qstringconverter_base.cpp b/qt/gen_qstringconverter_base.cpp new file mode 100644 index 0000000..8ee0dc6 --- /dev/null +++ b/qt/gen_qstringconverter_base.cpp @@ -0,0 +1,55 @@ +#include +#include +#define WORKAROUND_INNER_CLASS_DEFINITION_QStringConverterBase__State +#include "qstringconverter_base.h" +#include "gen_qstringconverter_base.h" +#include "_cgo_export.h" + +QStringConverterBase* QStringConverterBase_new(QStringConverterBase* param1) { + return new QStringConverterBase(*param1); +} + +QStringConverterBase* QStringConverterBase_new2() { + return new QStringConverterBase(); +} + +bool QStringConverter_IsValid(const QStringConverter* self) { + return self->isValid(); +} + +void QStringConverter_ResetState(QStringConverter* self) { + self->resetState(); +} + +bool QStringConverter_HasError(const QStringConverter* self) { + return self->hasError(); +} + +const char* QStringConverter_Name(const QStringConverter* self) { + return (const char*) self->name(); +} + +const char* QStringConverter_NameForEncoding(int e) { + return (const char*) QStringConverter::nameForEncoding(static_cast(e)); +} + +QStringConverterBase__State* QStringConverterBase__State_new() { + return new QStringConverterBase::State(); +} + +QStringConverterBase__State* QStringConverterBase__State_new2(int f) { + return new QStringConverterBase::State(static_cast(f)); +} + +void QStringConverterBase__State_Clear(QStringConverterBase__State* self) { + self->clear(); +} + +void QStringConverterBase__State_Reset(QStringConverterBase__State* self) { + self->reset(); +} + +void QStringConverterBase__State_Delete(QStringConverterBase__State* self) { + delete self; +} + diff --git a/qt/gen_qstringconverter_base.go b/qt/gen_qstringconverter_base.go new file mode 100644 index 0000000..d9c8203 --- /dev/null +++ b/qt/gen_qstringconverter_base.go @@ -0,0 +1,175 @@ +package qt + +/* + +#include "gen_qstringconverter_base.h" +#include + +*/ +import "C" + +import ( + "runtime" + "unsafe" +) + +type QStringConverterBase__Flag int + +const ( + QStringConverterBase__Default QStringConverterBase__Flag = 0 + QStringConverterBase__Stateless QStringConverterBase__Flag = 1 + QStringConverterBase__ConvertInvalidToNull QStringConverterBase__Flag = 2 + QStringConverterBase__WriteBom QStringConverterBase__Flag = 4 + QStringConverterBase__ConvertInitialBom QStringConverterBase__Flag = 8 + QStringConverterBase__UsesIcu QStringConverterBase__Flag = 16 +) + +type QStringConverter__Encoding int + +const ( + QStringConverter__Utf8 QStringConverter__Encoding = 0 + QStringConverter__Utf16 QStringConverter__Encoding = 1 + QStringConverter__Utf16LE QStringConverter__Encoding = 2 + QStringConverter__Utf16BE QStringConverter__Encoding = 3 + QStringConverter__Utf32 QStringConverter__Encoding = 4 + QStringConverter__Utf32LE QStringConverter__Encoding = 5 + QStringConverter__Utf32BE QStringConverter__Encoding = 6 + QStringConverter__Latin1 QStringConverter__Encoding = 7 + QStringConverter__System QStringConverter__Encoding = 8 + QStringConverter__LastEncoding QStringConverter__Encoding = 8 +) + +type QStringConverterBase struct { + h *C.QStringConverterBase +} + +func (this *QStringConverterBase) cPointer() *C.QStringConverterBase { + if this == nil { + return nil + } + return this.h +} + +func newQStringConverterBase(h *C.QStringConverterBase) *QStringConverterBase { + if h == nil { + return nil + } + return &QStringConverterBase{h: h} +} + +func newQStringConverterBase_U(h unsafe.Pointer) *QStringConverterBase { + return newQStringConverterBase((*C.QStringConverterBase)(h)) +} + +// NewQStringConverterBase constructs a new QStringConverterBase object. +func NewQStringConverterBase(param1 *QStringConverterBase) *QStringConverterBase { + ret := C.QStringConverterBase_new(param1.cPointer()) + return newQStringConverterBase(ret) +} + +// NewQStringConverterBase2 constructs a new QStringConverterBase object. +func NewQStringConverterBase2() *QStringConverterBase { + ret := C.QStringConverterBase_new2() + return newQStringConverterBase(ret) +} + +type QStringConverter struct { + h *C.QStringConverter + *QStringConverterBase +} + +func (this *QStringConverter) cPointer() *C.QStringConverter { + if this == nil { + return nil + } + return this.h +} + +func newQStringConverter(h *C.QStringConverter) *QStringConverter { + if h == nil { + return nil + } + return &QStringConverter{h: h, QStringConverterBase: newQStringConverterBase_U(unsafe.Pointer(h))} +} + +func newQStringConverter_U(h unsafe.Pointer) *QStringConverter { + return newQStringConverter((*C.QStringConverter)(h)) +} + +func (this *QStringConverter) IsValid() bool { + return (bool)(C.QStringConverter_IsValid(this.h)) +} + +func (this *QStringConverter) ResetState() { + C.QStringConverter_ResetState(this.h) +} + +func (this *QStringConverter) HasError() bool { + return (bool)(C.QStringConverter_HasError(this.h)) +} + +func (this *QStringConverter) Name() unsafe.Pointer { + _ret := C.QStringConverter_Name(this.h) + return (unsafe.Pointer)(_ret) +} + +func QStringConverter_NameForEncoding(e QStringConverter__Encoding) unsafe.Pointer { + _ret := C.QStringConverter_NameForEncoding((C.int)(e)) + return (unsafe.Pointer)(_ret) +} + +type QStringConverterBase__State struct { + h *C.QStringConverterBase__State +} + +func (this *QStringConverterBase__State) cPointer() *C.QStringConverterBase__State { + if this == nil { + return nil + } + return this.h +} + +func newQStringConverterBase__State(h *C.QStringConverterBase__State) *QStringConverterBase__State { + if h == nil { + return nil + } + return &QStringConverterBase__State{h: h} +} + +func newQStringConverterBase__State_U(h unsafe.Pointer) *QStringConverterBase__State { + return newQStringConverterBase__State((*C.QStringConverterBase__State)(h)) +} + +// NewQStringConverterBase__State constructs a new QStringConverterBase::State object. +func NewQStringConverterBase__State() *QStringConverterBase__State { + ret := C.QStringConverterBase__State_new() + return newQStringConverterBase__State(ret) +} + +// NewQStringConverterBase__State2 constructs a new QStringConverterBase::State object. +func NewQStringConverterBase__State2(f QStringConverterBase__Flag) *QStringConverterBase__State { + ret := C.QStringConverterBase__State_new2((C.int)(f)) + return newQStringConverterBase__State(ret) +} + +func (this *QStringConverterBase__State) Clear() { + C.QStringConverterBase__State_Clear(this.h) +} + +func (this *QStringConverterBase__State) Reset() { + C.QStringConverterBase__State_Reset(this.h) +} + +// Delete this object from C++ memory. +func (this *QStringConverterBase__State) Delete() { + C.QStringConverterBase__State_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QStringConverterBase__State) GoGC() { + runtime.SetFinalizer(this, func(this *QStringConverterBase__State) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} diff --git a/qt/gen_qstringconverter_base.h b/qt/gen_qstringconverter_base.h new file mode 100644 index 0000000..ff82065 --- /dev/null +++ b/qt/gen_qstringconverter_base.h @@ -0,0 +1,49 @@ +#ifndef GEN_QSTRINGCONVERTER_BASE_H +#define GEN_QSTRINGCONVERTER_BASE_H + +#include +#include +#include + +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + +#include "binding.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +class QStringConverter; +class QStringConverterBase; +#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QStringConverterBase__State) +typedef QStringConverterBase::State QStringConverterBase__State; +#else +class QStringConverterBase__State; +#endif +#else +typedef struct QStringConverter QStringConverter; +typedef struct QStringConverterBase QStringConverterBase; +typedef struct QStringConverterBase__State QStringConverterBase__State; +#endif + +QStringConverterBase* QStringConverterBase_new(QStringConverterBase* param1); +QStringConverterBase* QStringConverterBase_new2(); + +bool QStringConverter_IsValid(const QStringConverter* self); +void QStringConverter_ResetState(QStringConverter* self); +bool QStringConverter_HasError(const QStringConverter* self); +const char* QStringConverter_Name(const QStringConverter* self); +const char* QStringConverter_NameForEncoding(int e); + +QStringConverterBase__State* QStringConverterBase__State_new(); +QStringConverterBase__State* QStringConverterBase__State_new2(int f); +void QStringConverterBase__State_Clear(QStringConverterBase__State* self); +void QStringConverterBase__State_Reset(QStringConverterBase__State* self); +void QStringConverterBase__State_Delete(QStringConverterBase__State* self); + +#ifdef __cplusplus +} /* extern C */ +#endif + +#endif diff --git a/qt/gen_qstringfwd.cpp b/qt/gen_qstringfwd.cpp new file mode 100644 index 0000000..2d8dea6 --- /dev/null +++ b/qt/gen_qstringfwd.cpp @@ -0,0 +1,4 @@ +#include "qstringfwd.h" +#include "gen_qstringfwd.h" +#include "_cgo_export.h" + diff --git a/qt/gen_qstringfwd.go b/qt/gen_qstringfwd.go new file mode 100644 index 0000000..1372e9d --- /dev/null +++ b/qt/gen_qstringfwd.go @@ -0,0 +1,9 @@ +package qt + +/* + +#include "gen_qstringfwd.h" +#include + +*/ +import "C" diff --git a/qt/gen_qstringfwd.h b/qt/gen_qstringfwd.h new file mode 100644 index 0000000..3b8d71e --- /dev/null +++ b/qt/gen_qstringfwd.h @@ -0,0 +1,24 @@ +#ifndef GEN_QSTRINGFWD_H +#define GEN_QSTRINGFWD_H + +#include +#include +#include + +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + +#include "binding.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +#else +#endif + +#ifdef __cplusplus +} /* extern C */ +#endif + +#endif diff --git a/qt/gen_qstringlistmodel.cpp b/qt/gen_qstringlistmodel.cpp index e23a365..10e283d 100644 --- a/qt/gen_qstringlistmodel.cpp +++ b/qt/gen_qstringlistmodel.cpp @@ -56,13 +56,6 @@ struct miqt_string* QStringListModel_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QStringListModel_TrUtf8(const char* s) { - QString _ret = QStringListModel::trUtf8(s); - // 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()); -} - int QStringListModel_RowCount(const QStringListModel* self) { return self->rowCount(); } @@ -79,6 +72,10 @@ bool QStringListModel_SetData(QStringListModel* self, QModelIndex* index, QVaria return self->setData(*index, *value); } +bool QStringListModel_ClearItemData(QStringListModel* self, QModelIndex* index) { + return self->clearItemData(*index); +} + int QStringListModel_Flags(const QStringListModel* self, QModelIndex* index) { Qt::ItemFlags _ret = self->flags(*index); return static_cast(_ret); @@ -146,20 +143,6 @@ struct miqt_string* QStringListModel_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QStringListModel_TrUtf82(const char* s, const char* c) { - QString _ret = QStringListModel::trUtf8(s, c); - // 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* QStringListModel_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QStringListModel::trUtf8(s, c, static_cast(n)); - // 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()); -} - int QStringListModel_RowCount1(const QStringListModel* self, QModelIndex* parent) { return self->rowCount(*parent); } diff --git a/qt/gen_qstringlistmodel.go b/qt/gen_qstringlistmodel.go index b19b31c..d2afb87 100644 --- a/qt/gen_qstringlistmodel.go +++ b/qt/gen_qstringlistmodel.go @@ -99,15 +99,6 @@ func QStringListModel_Tr(s string) string { return _ret } -func QStringListModel_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QStringListModel_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QStringListModel) RowCount() int { return (int)(C.QStringListModel_RowCount(this.h)) } @@ -130,6 +121,10 @@ func (this *QStringListModel) SetData(index *QModelIndex, value *QVariant) bool return (bool)(C.QStringListModel_SetData(this.h, index.cPointer(), value.cPointer())) } +func (this *QStringListModel) ClearItemData(index *QModelIndex) bool { + return (bool)(C.QStringListModel_ClearItemData(this.h, index.cPointer())) +} + func (this *QStringListModel) Flags(index *QModelIndex) ItemFlag { return (ItemFlag)(C.QStringListModel_Flags(this.h, index.cPointer())) } @@ -204,28 +199,6 @@ func QStringListModel_Tr3(s string, c string, n int) string { return _ret } -func QStringListModel_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStringListModel_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QStringListModel_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStringListModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QStringListModel) RowCount1(parent *QModelIndex) int { return (int)(C.QStringListModel_RowCount1(this.h, parent.cPointer())) } diff --git a/qt/gen_qstringlistmodel.h b/qt/gen_qstringlistmodel.h index 607bf48..56e2ffc 100644 --- a/qt/gen_qstringlistmodel.h +++ b/qt/gen_qstringlistmodel.h @@ -34,11 +34,11 @@ QStringListModel* QStringListModel_new4(struct miqt_array* /* of struct miqt_str QMetaObject* QStringListModel_MetaObject(const QStringListModel* self); void* QStringListModel_Metacast(QStringListModel* self, const char* param1); struct miqt_string* QStringListModel_Tr(const char* s); -struct miqt_string* QStringListModel_TrUtf8(const char* s); int QStringListModel_RowCount(const QStringListModel* self); QModelIndex* QStringListModel_Sibling(const QStringListModel* self, int row, int column, QModelIndex* idx); QVariant* QStringListModel_Data(const QStringListModel* self, QModelIndex* index); bool QStringListModel_SetData(QStringListModel* self, QModelIndex* index, QVariant* value); +bool QStringListModel_ClearItemData(QStringListModel* self, QModelIndex* index); int QStringListModel_Flags(const QStringListModel* self, QModelIndex* index); bool QStringListModel_InsertRows(QStringListModel* self, int row, int count); bool QStringListModel_RemoveRows(QStringListModel* self, int row, int count); @@ -49,8 +49,6 @@ void QStringListModel_SetStringList(QStringListModel* self, struct miqt_array* / int QStringListModel_SupportedDropActions(const QStringListModel* self); struct miqt_string* QStringListModel_Tr2(const char* s, const char* c); struct miqt_string* QStringListModel_Tr3(const char* s, const char* c, int n); -struct miqt_string* QStringListModel_TrUtf82(const char* s, const char* c); -struct miqt_string* QStringListModel_TrUtf83(const char* s, const char* c, int n); int QStringListModel_RowCount1(const QStringListModel* self, QModelIndex* parent); QVariant* QStringListModel_Data2(const QStringListModel* self, QModelIndex* index, int role); bool QStringListModel_SetData3(QStringListModel* self, QModelIndex* index, QVariant* value, int role); diff --git a/qt/gen_qstringliteral.cpp b/qt/gen_qstringliteral.cpp index 9f563ec..8c0b9a2 100644 --- a/qt/gen_qstringliteral.cpp +++ b/qt/gen_qstringliteral.cpp @@ -1,9 +1,4 @@ -#include #include "qstringliteral.h" #include "gen_qstringliteral.h" #include "_cgo_export.h" -void QStringDataPtr_Delete(QStringDataPtr* self) { - delete self; -} - diff --git a/qt/gen_qstringliteral.go b/qt/gen_qstringliteral.go index 852f460..703fc07 100644 --- a/qt/gen_qstringliteral.go +++ b/qt/gen_qstringliteral.go @@ -7,44 +7,3 @@ package qt */ import "C" - -import ( - "runtime" - "unsafe" -) - -type QStringDataPtr struct { - h *C.QStringDataPtr -} - -func (this *QStringDataPtr) cPointer() *C.QStringDataPtr { - if this == nil { - return nil - } - return this.h -} - -func newQStringDataPtr(h *C.QStringDataPtr) *QStringDataPtr { - if h == nil { - return nil - } - return &QStringDataPtr{h: h} -} - -func newQStringDataPtr_U(h unsafe.Pointer) *QStringDataPtr { - return newQStringDataPtr((*C.QStringDataPtr)(h)) -} - -// Delete this object from C++ memory. -func (this *QStringDataPtr) Delete() { - C.QStringDataPtr_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QStringDataPtr) GoGC() { - runtime.SetFinalizer(this, func(this *QStringDataPtr) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} diff --git a/qt/gen_qstringliteral.h b/qt/gen_qstringliteral.h index 8a6dd61..dfcb3c3 100644 --- a/qt/gen_qstringliteral.h +++ b/qt/gen_qstringliteral.h @@ -14,13 +14,9 @@ extern "C" { #endif #ifdef __cplusplus -class QStringDataPtr; #else -typedef struct QStringDataPtr QStringDataPtr; #endif -void QStringDataPtr_Delete(QStringDataPtr* self); - #ifdef __cplusplus } /* extern C */ #endif diff --git a/qt/gen_qstringmatcher.cpp b/qt/gen_qstringmatcher.cpp index 8f54245..b3eed94 100644 --- a/qt/gen_qstringmatcher.cpp +++ b/qt/gen_qstringmatcher.cpp @@ -16,8 +16,8 @@ QStringMatcher* QStringMatcher_new2(struct miqt_string* pattern) { return new QStringMatcher(pattern_QString); } -QStringMatcher* QStringMatcher_new3(QChar* uc, int lenVal) { - return new QStringMatcher(uc, static_cast(lenVal)); +QStringMatcher* QStringMatcher_new3(QChar* uc, ptrdiff_t lenVal) { + return new QStringMatcher(uc, (qsizetype)(lenVal)); } QStringMatcher* QStringMatcher_new4(QStringMatcher* other) { @@ -29,8 +29,8 @@ QStringMatcher* QStringMatcher_new5(struct miqt_string* pattern, int cs) { return new QStringMatcher(pattern_QString, static_cast(cs)); } -QStringMatcher* QStringMatcher_new6(QChar* uc, int lenVal, int cs) { - return new QStringMatcher(uc, static_cast(lenVal), static_cast(cs)); +QStringMatcher* QStringMatcher_new6(QChar* uc, ptrdiff_t lenVal, int cs) { + return new QStringMatcher(uc, (qsizetype)(lenVal), static_cast(cs)); } void QStringMatcher_OperatorAssign(QStringMatcher* self, QStringMatcher* other) { @@ -46,13 +46,15 @@ void QStringMatcher_SetCaseSensitivity(QStringMatcher* self, int cs) { self->setCaseSensitivity(static_cast(cs)); } -int QStringMatcher_IndexIn(const QStringMatcher* self, struct miqt_string* str) { +ptrdiff_t QStringMatcher_IndexIn(const QStringMatcher* self, struct miqt_string* str) { QString str_QString = QString::fromUtf8(&str->data, str->len); - return self->indexIn(str_QString); + qsizetype _ret = self->indexIn(str_QString); + return static_cast(_ret); } -int QStringMatcher_IndexIn2(const QStringMatcher* self, QChar* str, int length) { - return self->indexIn(str, static_cast(length)); +ptrdiff_t QStringMatcher_IndexIn2(const QStringMatcher* self, QChar* str, ptrdiff_t length) { + qsizetype _ret = self->indexIn(str, (qsizetype)(length)); + return static_cast(_ret); } struct miqt_string* QStringMatcher_Pattern(const QStringMatcher* self) { @@ -67,13 +69,15 @@ int QStringMatcher_CaseSensitivity(const QStringMatcher* self) { return static_cast(_ret); } -int QStringMatcher_IndexIn22(const QStringMatcher* self, struct miqt_string* str, int from) { +ptrdiff_t QStringMatcher_IndexIn22(const QStringMatcher* self, struct miqt_string* str, ptrdiff_t from) { QString str_QString = QString::fromUtf8(&str->data, str->len); - return self->indexIn(str_QString, static_cast(from)); + qsizetype _ret = self->indexIn(str_QString, (qsizetype)(from)); + return static_cast(_ret); } -int QStringMatcher_IndexIn3(const QStringMatcher* self, QChar* str, int length, int from) { - return self->indexIn(str, static_cast(length), static_cast(from)); +ptrdiff_t QStringMatcher_IndexIn3(const QStringMatcher* self, QChar* str, ptrdiff_t length, ptrdiff_t from) { + qsizetype _ret = self->indexIn(str, (qsizetype)(length), (qsizetype)(from)); + return static_cast(_ret); } void QStringMatcher_Delete(QStringMatcher* self) { diff --git a/qt/gen_qstringmatcher.go b/qt/gen_qstringmatcher.go index 8fd8634..ee6b092 100644 --- a/qt/gen_qstringmatcher.go +++ b/qt/gen_qstringmatcher.go @@ -50,8 +50,8 @@ func NewQStringMatcher2(pattern string) *QStringMatcher { } // NewQStringMatcher3 constructs a new QStringMatcher object. -func NewQStringMatcher3(uc *QChar, lenVal int) *QStringMatcher { - ret := C.QStringMatcher_new3(uc.cPointer(), (C.int)(lenVal)) +func NewQStringMatcher3(uc *QChar, lenVal int64) *QStringMatcher { + ret := C.QStringMatcher_new3(uc.cPointer(), (C.ptrdiff_t)(lenVal)) return newQStringMatcher(ret) } @@ -70,8 +70,8 @@ func NewQStringMatcher5(pattern string, cs CaseSensitivity) *QStringMatcher { } // 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.int)(cs)) +func NewQStringMatcher6(uc *QChar, lenVal int64, cs CaseSensitivity) *QStringMatcher { + ret := C.QStringMatcher_new6(uc.cPointer(), (C.ptrdiff_t)(lenVal), (C.int)(cs)) return newQStringMatcher(ret) } @@ -89,14 +89,14 @@ func (this *QStringMatcher) SetCaseSensitivity(cs CaseSensitivity) { C.QStringMatcher_SetCaseSensitivity(this.h, (C.int)(cs)) } -func (this *QStringMatcher) IndexIn(str string) int { +func (this *QStringMatcher) IndexIn(str string) int64 { str_ms := miqt_strdupg(str) defer C.free(str_ms) - return (int)(C.QStringMatcher_IndexIn(this.h, (*C.struct_miqt_string)(str_ms))) + return (int64)(C.QStringMatcher_IndexIn(this.h, (*C.struct_miqt_string)(str_ms))) } -func (this *QStringMatcher) IndexIn2(str *QChar, length int) int { - return (int)(C.QStringMatcher_IndexIn2(this.h, str.cPointer(), (C.int)(length))) +func (this *QStringMatcher) IndexIn2(str *QChar, length int64) int64 { + return (int64)(C.QStringMatcher_IndexIn2(this.h, str.cPointer(), (C.ptrdiff_t)(length))) } func (this *QStringMatcher) Pattern() string { @@ -110,14 +110,14 @@ func (this *QStringMatcher) CaseSensitivity() CaseSensitivity { return (CaseSensitivity)(C.QStringMatcher_CaseSensitivity(this.h)) } -func (this *QStringMatcher) IndexIn22(str string, from int) int { +func (this *QStringMatcher) IndexIn22(str string, from int64) int64 { str_ms := miqt_strdupg(str) defer C.free(str_ms) - return (int)(C.QStringMatcher_IndexIn22(this.h, (*C.struct_miqt_string)(str_ms), (C.int)(from))) + return (int64)(C.QStringMatcher_IndexIn22(this.h, (*C.struct_miqt_string)(str_ms), (C.ptrdiff_t)(from))) } -func (this *QStringMatcher) IndexIn3(str *QChar, length int, from int) int { - return (int)(C.QStringMatcher_IndexIn3(this.h, str.cPointer(), (C.int)(length), (C.int)(from))) +func (this *QStringMatcher) IndexIn3(str *QChar, length int64, from int64) int64 { + return (int64)(C.QStringMatcher_IndexIn3(this.h, str.cPointer(), (C.ptrdiff_t)(length), (C.ptrdiff_t)(from))) } // Delete this object from C++ memory. diff --git a/qt/gen_qstringmatcher.h b/qt/gen_qstringmatcher.h index 1325f8b..9538c33 100644 --- a/qt/gen_qstringmatcher.h +++ b/qt/gen_qstringmatcher.h @@ -23,19 +23,19 @@ typedef struct QStringMatcher QStringMatcher; QStringMatcher* QStringMatcher_new(); QStringMatcher* QStringMatcher_new2(struct miqt_string* pattern); -QStringMatcher* QStringMatcher_new3(QChar* uc, int lenVal); +QStringMatcher* QStringMatcher_new3(QChar* uc, ptrdiff_t lenVal); QStringMatcher* QStringMatcher_new4(QStringMatcher* other); QStringMatcher* QStringMatcher_new5(struct miqt_string* pattern, int cs); -QStringMatcher* QStringMatcher_new6(QChar* uc, int lenVal, int cs); +QStringMatcher* QStringMatcher_new6(QChar* uc, ptrdiff_t lenVal, int cs); void QStringMatcher_OperatorAssign(QStringMatcher* self, QStringMatcher* other); void QStringMatcher_SetPattern(QStringMatcher* self, struct miqt_string* pattern); 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); +ptrdiff_t QStringMatcher_IndexIn(const QStringMatcher* self, struct miqt_string* str); +ptrdiff_t QStringMatcher_IndexIn2(const QStringMatcher* self, QChar* str, ptrdiff_t length); struct miqt_string* QStringMatcher_Pattern(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); +ptrdiff_t QStringMatcher_IndexIn22(const QStringMatcher* self, struct miqt_string* str, ptrdiff_t from); +ptrdiff_t QStringMatcher_IndexIn3(const QStringMatcher* self, QChar* str, ptrdiff_t length, ptrdiff_t from); void QStringMatcher_Delete(QStringMatcher* self); #ifdef __cplusplus diff --git a/qt/gen_qstringtokenizer.cpp b/qt/gen_qstringtokenizer.cpp new file mode 100644 index 0000000..685fec5 --- /dev/null +++ b/qt/gen_qstringtokenizer.cpp @@ -0,0 +1,9 @@ +#include +#include "qstringtokenizer.h" +#include "gen_qstringtokenizer.h" +#include "_cgo_export.h" + +QStringTokenizerBaseBase* QStringTokenizerBaseBase_new(QStringTokenizerBaseBase* param1) { + return new QStringTokenizerBaseBase(*param1); +} + diff --git a/qt/gen_qstringtokenizer.go b/qt/gen_qstringtokenizer.go new file mode 100644 index 0000000..b9d931d --- /dev/null +++ b/qt/gen_qstringtokenizer.go @@ -0,0 +1,41 @@ +package qt + +/* + +#include "gen_qstringtokenizer.h" +#include + +*/ +import "C" + +import ( + "unsafe" +) + +type QStringTokenizerBaseBase struct { + h *C.QStringTokenizerBaseBase +} + +func (this *QStringTokenizerBaseBase) cPointer() *C.QStringTokenizerBaseBase { + if this == nil { + return nil + } + return this.h +} + +func newQStringTokenizerBaseBase(h *C.QStringTokenizerBaseBase) *QStringTokenizerBaseBase { + if h == nil { + return nil + } + return &QStringTokenizerBaseBase{h: h} +} + +func newQStringTokenizerBaseBase_U(h unsafe.Pointer) *QStringTokenizerBaseBase { + return newQStringTokenizerBaseBase((*C.QStringTokenizerBaseBase)(h)) +} + +// NewQStringTokenizerBaseBase constructs a new QStringTokenizerBaseBase object. +func NewQStringTokenizerBaseBase(param1 *QStringTokenizerBaseBase) *QStringTokenizerBaseBase { + ret := C.QStringTokenizerBaseBase_new(param1.cPointer()) + return newQStringTokenizerBaseBase(ret) +} diff --git a/qt/gen_qstringtokenizer.h b/qt/gen_qstringtokenizer.h new file mode 100644 index 0000000..80bc17c --- /dev/null +++ b/qt/gen_qstringtokenizer.h @@ -0,0 +1,28 @@ +#ifndef GEN_QSTRINGTOKENIZER_H +#define GEN_QSTRINGTOKENIZER_H + +#include +#include +#include + +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + +#include "binding.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +class QStringTokenizerBaseBase; +#else +typedef struct QStringTokenizerBaseBase QStringTokenizerBaseBase; +#endif + +QStringTokenizerBaseBase* QStringTokenizerBaseBase_new(QStringTokenizerBaseBase* param1); + +#ifdef __cplusplus +} /* extern C */ +#endif + +#endif diff --git a/qt/gen_qstringview.cpp b/qt/gen_qstringview.cpp index e101cbc..9069222 100644 --- a/qt/gen_qstringview.cpp +++ b/qt/gen_qstringview.cpp @@ -1,6 +1,8 @@ #include #include #include +#include +#include #include #include #include @@ -30,6 +32,11 @@ QChar* QStringView_Data(const QStringView* self) { return const_cast(static_cast(_ret)); } +QChar* QStringView_ConstData(const QStringView* self) { + QStringView::const_pointer _ret = self->constData(); + return const_cast(static_cast(_ret)); +} + QChar* QStringView_OperatorSubscript(const QStringView* self, ptrdiff_t n) { return new QChar(self->operator[]((qsizetype)(n))); } @@ -47,7 +54,7 @@ QByteArray* QStringView_ToLocal8Bit(const QStringView* self) { } struct miqt_array* QStringView_ToUcs4(const QStringView* self) { - QVector _ret = self->toUcs4(); + QList _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) { @@ -114,6 +121,30 @@ ptrdiff_t QStringView_LastIndexOf(const QStringView* self, QChar* c) { return static_cast(_ret); } +ptrdiff_t QStringView_LastIndexOf2(const QStringView* self, QChar* c, ptrdiff_t from) { + qsizetype _ret = self->lastIndexOf(*c, (qsizetype)(from)); + return static_cast(_ret); +} + +ptrdiff_t QStringView_IndexOfWithRe(const QStringView* self, QRegularExpression* re) { + qsizetype _ret = self->indexOf(*re); + return static_cast(_ret); +} + +ptrdiff_t QStringView_LastIndexOf5(const QStringView* self, QRegularExpression* re, ptrdiff_t from) { + qsizetype _ret = self->lastIndexOf(*re, (qsizetype)(from)); + return static_cast(_ret); +} + +bool QStringView_ContainsWithRe(const QStringView* self, QRegularExpression* re) { + return self->contains(*re); +} + +ptrdiff_t QStringView_CountWithRe(const QStringView* self, QRegularExpression* re) { + qsizetype _ret = self->count(*re); + return static_cast(_ret); +} + bool QStringView_IsRightToLeft(const QStringView* self) { return self->isRightToLeft(); } @@ -199,6 +230,16 @@ QChar* QStringView_Back(const QStringView* self) { return new QChar(self->back()); } +QChar* QStringView_ConstBegin(const QStringView* self) { + QStringView::const_iterator _ret = self->constBegin(); + return const_cast(static_cast(_ret)); +} + +QChar* QStringView_ConstEnd(const QStringView* self) { + QStringView::const_iterator _ret = self->constEnd(); + return const_cast(static_cast(_ret)); +} + bool QStringView_IsNull(const QStringView* self) { return self->isNull(); } @@ -207,15 +248,16 @@ bool QStringView_IsEmpty(const QStringView* self) { return self->isEmpty(); } -int QStringView_Length(const QStringView* self) { - return self->length(); +ptrdiff_t QStringView_Length(const QStringView* self) { + qsizetype _ret = self->length(); + return static_cast(_ret); } -QChar* QStringView_First(const QStringView* self) { +QChar* QStringView_First2(const QStringView* self) { return new QChar(self->first()); } -QChar* QStringView_Last(const QStringView* self) { +QChar* QStringView_Last2(const QStringView* self) { return new QChar(self->last()); } @@ -238,16 +280,35 @@ ptrdiff_t QStringView_Count2(const QStringView* self, QChar* c, int cs) { return static_cast(_ret); } -ptrdiff_t QStringView_LastIndexOf2(const QStringView* self, QChar* c, ptrdiff_t from) { - qsizetype _ret = self->lastIndexOf(*c, (qsizetype)(from)); +ptrdiff_t QStringView_LastIndexOf22(const QStringView* self, QChar* c, int cs) { + qsizetype _ret = self->lastIndexOf(*c, static_cast(cs)); return static_cast(_ret); } -ptrdiff_t QStringView_LastIndexOf3(const QStringView* self, QChar* c, ptrdiff_t from, int cs) { +ptrdiff_t QStringView_LastIndexOf32(const QStringView* self, QChar* c, ptrdiff_t from, int cs) { qsizetype _ret = self->lastIndexOf(*c, (qsizetype)(from), static_cast(cs)); return static_cast(_ret); } +ptrdiff_t QStringView_IndexOf24(const QStringView* self, QRegularExpression* re, ptrdiff_t from) { + qsizetype _ret = self->indexOf(*re, (qsizetype)(from)); + return static_cast(_ret); +} + +ptrdiff_t QStringView_IndexOf34(const QStringView* self, QRegularExpression* re, ptrdiff_t from, QRegularExpressionMatch* rmatch) { + qsizetype _ret = self->indexOf(*re, (qsizetype)(from), rmatch); + return static_cast(_ret); +} + +ptrdiff_t QStringView_LastIndexOf35(const QStringView* self, QRegularExpression* re, ptrdiff_t from, QRegularExpressionMatch* rmatch) { + qsizetype _ret = self->lastIndexOf(*re, (qsizetype)(from), rmatch); + return static_cast(_ret); +} + +bool QStringView_Contains24(const QStringView* self, QRegularExpression* re, QRegularExpressionMatch* rmatch) { + return self->contains(*re, rmatch); +} + int16_t QStringView_ToShort1(const QStringView* self, bool* ok) { return self->toShort(ok); } diff --git a/qt/gen_qstringview.go b/qt/gen_qstringview.go index 07a8f9e..a1ae8b5 100644 --- a/qt/gen_qstringview.go +++ b/qt/gen_qstringview.go @@ -56,6 +56,10 @@ func (this *QStringView) Data() *QChar { return newQChar_U(unsafe.Pointer(C.QStringView_Data(this.h))) } +func (this *QStringView) ConstData() *QChar { + return newQChar_U(unsafe.Pointer(C.QStringView_ConstData(this.h))) +} + func (this *QStringView) OperatorSubscript(n int64) *QChar { _ret := C.QStringView_OperatorSubscript(this.h, (C.ptrdiff_t)(n)) _goptr := newQChar(_ret) @@ -150,6 +154,26 @@ func (this *QStringView) LastIndexOf(c QChar) int64 { return (int64)(C.QStringView_LastIndexOf(this.h, c.cPointer())) } +func (this *QStringView) LastIndexOf2(c QChar, from int64) int64 { + return (int64)(C.QStringView_LastIndexOf2(this.h, c.cPointer(), (C.ptrdiff_t)(from))) +} + +func (this *QStringView) IndexOfWithRe(re *QRegularExpression) int64 { + return (int64)(C.QStringView_IndexOfWithRe(this.h, re.cPointer())) +} + +func (this *QStringView) LastIndexOf5(re *QRegularExpression, from int64) int64 { + return (int64)(C.QStringView_LastIndexOf5(this.h, re.cPointer(), (C.ptrdiff_t)(from))) +} + +func (this *QStringView) ContainsWithRe(re *QRegularExpression) bool { + return (bool)(C.QStringView_ContainsWithRe(this.h, re.cPointer())) +} + +func (this *QStringView) CountWithRe(re *QRegularExpression) int64 { + return (int64)(C.QStringView_CountWithRe(this.h, re.cPointer())) +} + func (this *QStringView) IsRightToLeft() bool { return (bool)(C.QStringView_IsRightToLeft(this.h)) } @@ -232,6 +256,14 @@ func (this *QStringView) Back() *QChar { return _goptr } +func (this *QStringView) ConstBegin() *QChar { + return newQChar_U(unsafe.Pointer(C.QStringView_ConstBegin(this.h))) +} + +func (this *QStringView) ConstEnd() *QChar { + return newQChar_U(unsafe.Pointer(C.QStringView_ConstEnd(this.h))) +} + func (this *QStringView) IsNull() bool { return (bool)(C.QStringView_IsNull(this.h)) } @@ -240,19 +272,19 @@ func (this *QStringView) IsEmpty() bool { return (bool)(C.QStringView_IsEmpty(this.h)) } -func (this *QStringView) Length() int { - return (int)(C.QStringView_Length(this.h)) +func (this *QStringView) Length() int64 { + return (int64)(C.QStringView_Length(this.h)) } -func (this *QStringView) First() *QChar { - _ret := C.QStringView_First(this.h) +func (this *QStringView) First2() *QChar { + _ret := C.QStringView_First2(this.h) _goptr := newQChar(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QStringView) Last() *QChar { - _ret := C.QStringView_Last(this.h) +func (this *QStringView) Last2() *QChar { + _ret := C.QStringView_Last2(this.h) _goptr := newQChar(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -274,12 +306,28 @@ func (this *QStringView) Count2(c QChar, cs CaseSensitivity) int64 { return (int64)(C.QStringView_Count2(this.h, c.cPointer(), (C.int)(cs))) } -func (this *QStringView) LastIndexOf2(c QChar, from int64) int64 { - return (int64)(C.QStringView_LastIndexOf2(this.h, c.cPointer(), (C.ptrdiff_t)(from))) +func (this *QStringView) LastIndexOf22(c QChar, cs CaseSensitivity) int64 { + return (int64)(C.QStringView_LastIndexOf22(this.h, c.cPointer(), (C.int)(cs))) } -func (this *QStringView) LastIndexOf3(c QChar, from int64, cs CaseSensitivity) int64 { - return (int64)(C.QStringView_LastIndexOf3(this.h, c.cPointer(), (C.ptrdiff_t)(from), (C.int)(cs))) +func (this *QStringView) LastIndexOf32(c QChar, from int64, cs CaseSensitivity) int64 { + return (int64)(C.QStringView_LastIndexOf32(this.h, c.cPointer(), (C.ptrdiff_t)(from), (C.int)(cs))) +} + +func (this *QStringView) IndexOf24(re *QRegularExpression, from int64) int64 { + return (int64)(C.QStringView_IndexOf24(this.h, re.cPointer(), (C.ptrdiff_t)(from))) +} + +func (this *QStringView) IndexOf34(re *QRegularExpression, from int64, rmatch *QRegularExpressionMatch) int64 { + return (int64)(C.QStringView_IndexOf34(this.h, re.cPointer(), (C.ptrdiff_t)(from), rmatch.cPointer())) +} + +func (this *QStringView) LastIndexOf35(re *QRegularExpression, from int64, rmatch *QRegularExpressionMatch) int64 { + return (int64)(C.QStringView_LastIndexOf35(this.h, re.cPointer(), (C.ptrdiff_t)(from), rmatch.cPointer())) +} + +func (this *QStringView) Contains24(re *QRegularExpression, rmatch *QRegularExpressionMatch) bool { + return (bool)(C.QStringView_Contains24(this.h, re.cPointer(), rmatch.cPointer())) } func (this *QStringView) ToShort1(ok *bool) int16 { diff --git a/qt/gen_qstringview.h b/qt/gen_qstringview.h index e9cf14d..4f26ef3 100644 --- a/qt/gen_qstringview.h +++ b/qt/gen_qstringview.h @@ -16,10 +16,14 @@ extern "C" { #ifdef __cplusplus class QByteArray; class QChar; +class QRegularExpression; +class QRegularExpressionMatch; class QStringView; #else typedef struct QByteArray QByteArray; typedef struct QChar QChar; +typedef struct QRegularExpression QRegularExpression; +typedef struct QRegularExpressionMatch QRegularExpressionMatch; typedef struct QStringView QStringView; #endif @@ -27,6 +31,7 @@ QStringView* QStringView_new(); struct miqt_string* QStringView_ToString(const QStringView* self); ptrdiff_t QStringView_Size(const QStringView* self); QChar* QStringView_Data(const QStringView* self); +QChar* QStringView_ConstData(const QStringView* self); QChar* QStringView_OperatorSubscript(const QStringView* self, ptrdiff_t n); QByteArray* QStringView_ToLatin1(const QStringView* self); QByteArray* QStringView_ToUtf8(const QStringView* self); @@ -45,6 +50,11 @@ ptrdiff_t QStringView_IndexOf(const QStringView* self, QChar* c); bool QStringView_Contains(const QStringView* self, QChar* c); ptrdiff_t QStringView_Count(const QStringView* self, QChar* c); ptrdiff_t QStringView_LastIndexOf(const QStringView* self, QChar* c); +ptrdiff_t QStringView_LastIndexOf2(const QStringView* self, QChar* c, ptrdiff_t from); +ptrdiff_t QStringView_IndexOfWithRe(const QStringView* self, QRegularExpression* re); +ptrdiff_t QStringView_LastIndexOf5(const QStringView* self, QRegularExpression* re, ptrdiff_t from); +bool QStringView_ContainsWithRe(const QStringView* self, QRegularExpression* re); +ptrdiff_t QStringView_CountWithRe(const QStringView* self, QRegularExpression* re); bool QStringView_IsRightToLeft(const QStringView* self); bool QStringView_IsValidUtf16(const QStringView* self); int16_t QStringView_ToShort(const QStringView* self); @@ -64,17 +74,23 @@ QChar* QStringView_Cend(const QStringView* self); bool QStringView_Empty(const QStringView* self); QChar* QStringView_Front(const QStringView* self); QChar* QStringView_Back(const QStringView* self); +QChar* QStringView_ConstBegin(const QStringView* self); +QChar* QStringView_ConstEnd(const QStringView* self); bool QStringView_IsNull(const QStringView* self); bool QStringView_IsEmpty(const QStringView* self); -int QStringView_Length(const QStringView* self); -QChar* QStringView_First(const QStringView* self); -QChar* QStringView_Last(const QStringView* self); +ptrdiff_t QStringView_Length(const QStringView* self); +QChar* QStringView_First2(const QStringView* self); +QChar* QStringView_Last2(const QStringView* self); ptrdiff_t QStringView_IndexOf2(const QStringView* self, QChar* c, ptrdiff_t from); ptrdiff_t QStringView_IndexOf3(const QStringView* self, QChar* c, ptrdiff_t from, int cs); bool QStringView_Contains2(const QStringView* self, QChar* c, int cs); ptrdiff_t QStringView_Count2(const QStringView* self, QChar* c, int cs); -ptrdiff_t QStringView_LastIndexOf2(const QStringView* self, QChar* c, ptrdiff_t from); -ptrdiff_t QStringView_LastIndexOf3(const QStringView* self, QChar* c, ptrdiff_t from, int cs); +ptrdiff_t QStringView_LastIndexOf22(const QStringView* self, QChar* c, int cs); +ptrdiff_t QStringView_LastIndexOf32(const QStringView* self, QChar* c, ptrdiff_t from, int cs); +ptrdiff_t QStringView_IndexOf24(const QStringView* self, QRegularExpression* re, ptrdiff_t from); +ptrdiff_t QStringView_IndexOf34(const QStringView* self, QRegularExpression* re, ptrdiff_t from, QRegularExpressionMatch* rmatch); +ptrdiff_t QStringView_LastIndexOf35(const QStringView* self, QRegularExpression* re, ptrdiff_t from, QRegularExpressionMatch* rmatch); +bool QStringView_Contains24(const QStringView* self, QRegularExpression* re, QRegularExpressionMatch* rmatch); 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); diff --git a/qt/gen_qstyle.cpp b/qt/gen_qstyle.cpp index e282374..89df288 100644 --- a/qt/gen_qstyle.cpp +++ b/qt/gen_qstyle.cpp @@ -35,8 +35,8 @@ struct miqt_string* QStyle_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QStyle_TrUtf8(const char* s) { - QString _ret = QStyle::trUtf8(s); +struct miqt_string* QStyle_Name(const QStyle* self) { + QString _ret = self->name(); // 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()); @@ -184,20 +184,6 @@ struct miqt_string* QStyle_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QStyle_TrUtf82(const char* s, const char* c) { - QString _ret = QStyle::trUtf8(s, c); - // 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* QStyle_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QStyle::trUtf8(s, c, static_cast(n)); - // 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 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)); diff --git a/qt/gen_qstyle.go b/qt/gen_qstyle.go index 5341646..2236eba 100644 --- a/qt/gen_qstyle.go +++ b/qt/gen_qstyle.go @@ -57,7 +57,6 @@ const ( QStyle__PE_FrameLineEdit QStyle__PrimitiveElement = 5 QStyle__PE_FrameMenu QStyle__PrimitiveElement = 6 QStyle__PE_FrameStatusBarItem QStyle__PrimitiveElement = 7 - QStyle__PE_FrameStatusBar QStyle__PrimitiveElement = 7 QStyle__PE_FrameTabWidget QStyle__PrimitiveElement = 8 QStyle__PE_FrameWindow QStyle__PrimitiveElement = 9 QStyle__PE_FrameButtonBevel QStyle__PrimitiveElement = 10 @@ -76,7 +75,6 @@ const ( QStyle__PE_IndicatorBranch QStyle__PrimitiveElement = 23 QStyle__PE_IndicatorButtonDropDown QStyle__PrimitiveElement = 24 QStyle__PE_IndicatorItemViewItemCheck QStyle__PrimitiveElement = 25 - QStyle__PE_IndicatorViewItemCheck QStyle__PrimitiveElement = 25 QStyle__PE_IndicatorCheckBox QStyle__PrimitiveElement = 26 QStyle__PE_IndicatorDockWidgetResizeHandle QStyle__PrimitiveElement = 27 QStyle__PE_IndicatorHeaderArrow QStyle__PrimitiveElement = 28 @@ -185,7 +183,6 @@ const ( QStyle__SE_TabWidgetLeftCorner QStyle__SubElement = 21 QStyle__SE_TabWidgetRightCorner QStyle__SubElement = 22 QStyle__SE_ItemViewItemCheckIndicator QStyle__SubElement = 23 - QStyle__SE_ViewItemCheckIndicator QStyle__SubElement = 23 QStyle__SE_TabBarTearIndicator QStyle__SubElement = 24 QStyle__SE_TabBarTearIndicatorLeft QStyle__SubElement = 24 QStyle__SE_TreeViewDisclosureItem QStyle__SubElement = 25 @@ -198,29 +195,28 @@ const ( QStyle__SE_CheckBoxLayoutItem QStyle__SubElement = 32 QStyle__SE_ComboBoxLayoutItem QStyle__SubElement = 33 QStyle__SE_DateTimeEditLayoutItem QStyle__SubElement = 34 - QStyle__SE_DialogButtonBoxLayoutItem QStyle__SubElement = 35 - QStyle__SE_LabelLayoutItem QStyle__SubElement = 36 - QStyle__SE_ProgressBarLayoutItem QStyle__SubElement = 37 - QStyle__SE_PushButtonLayoutItem QStyle__SubElement = 38 - QStyle__SE_RadioButtonLayoutItem QStyle__SubElement = 39 - QStyle__SE_SliderLayoutItem QStyle__SubElement = 40 - QStyle__SE_SpinBoxLayoutItem QStyle__SubElement = 41 - QStyle__SE_ToolButtonLayoutItem QStyle__SubElement = 42 - QStyle__SE_FrameLayoutItem QStyle__SubElement = 43 - QStyle__SE_GroupBoxLayoutItem QStyle__SubElement = 44 - QStyle__SE_TabWidgetLayoutItem QStyle__SubElement = 45 - QStyle__SE_ItemViewItemDecoration QStyle__SubElement = 46 - QStyle__SE_ItemViewItemText QStyle__SubElement = 47 - QStyle__SE_ItemViewItemFocusRect QStyle__SubElement = 48 - QStyle__SE_TabBarTabLeftButton QStyle__SubElement = 49 - QStyle__SE_TabBarTabRightButton QStyle__SubElement = 50 - QStyle__SE_TabBarTabText QStyle__SubElement = 51 - QStyle__SE_ShapedFrameContents QStyle__SubElement = 52 - QStyle__SE_ToolBarHandle QStyle__SubElement = 53 - QStyle__SE_TabBarScrollLeftButton QStyle__SubElement = 54 - QStyle__SE_TabBarScrollRightButton QStyle__SubElement = 55 - QStyle__SE_TabBarTearIndicatorRight QStyle__SubElement = 56 - QStyle__SE_PushButtonBevel QStyle__SubElement = 57 + QStyle__SE_LabelLayoutItem QStyle__SubElement = 35 + QStyle__SE_ProgressBarLayoutItem QStyle__SubElement = 36 + QStyle__SE_PushButtonLayoutItem QStyle__SubElement = 37 + QStyle__SE_RadioButtonLayoutItem QStyle__SubElement = 38 + QStyle__SE_SliderLayoutItem QStyle__SubElement = 39 + QStyle__SE_SpinBoxLayoutItem QStyle__SubElement = 40 + QStyle__SE_ToolButtonLayoutItem QStyle__SubElement = 41 + QStyle__SE_FrameLayoutItem QStyle__SubElement = 42 + QStyle__SE_GroupBoxLayoutItem QStyle__SubElement = 43 + QStyle__SE_TabWidgetLayoutItem QStyle__SubElement = 44 + QStyle__SE_ItemViewItemDecoration QStyle__SubElement = 45 + QStyle__SE_ItemViewItemText QStyle__SubElement = 46 + QStyle__SE_ItemViewItemFocusRect QStyle__SubElement = 47 + QStyle__SE_TabBarTabLeftButton QStyle__SubElement = 48 + QStyle__SE_TabBarTabRightButton QStyle__SubElement = 49 + QStyle__SE_TabBarTabText QStyle__SubElement = 50 + QStyle__SE_ShapedFrameContents QStyle__SubElement = 51 + QStyle__SE_ToolBarHandle QStyle__SubElement = 52 + QStyle__SE_TabBarScrollLeftButton QStyle__SubElement = 53 + QStyle__SE_TabBarScrollRightButton QStyle__SubElement = 54 + QStyle__SE_TabBarTearIndicatorRight QStyle__SubElement = 55 + QStyle__SE_PushButtonBevel QStyle__SubElement = 56 QStyle__SE_CustomBase QStyle__SubElement = 4026531840 ) @@ -336,8 +332,6 @@ const ( QStyle__PM_DialogButtonsButtonHeight QStyle__PixelMetric = 43 QStyle__PM_MdiSubWindowFrameWidth QStyle__PixelMetric = 44 QStyle__PM_MdiSubWindowMinimizedWidth QStyle__PixelMetric = 45 - QStyle__PM_MDIFrameWidth QStyle__PixelMetric = 44 - QStyle__PM_MDIMinimizedWidth QStyle__PixelMetric = 45 QStyle__PM_HeaderMargin QStyle__PixelMetric = 46 QStyle__PM_HeaderMarkSize QStyle__PixelMetric = 47 QStyle__PM_HeaderGripMargin QStyle__PixelMetric = 48 @@ -351,43 +345,42 @@ const ( QStyle__PM_ToolBarSeparatorExtent QStyle__PixelMetric = 56 QStyle__PM_ToolBarExtensionExtent QStyle__PixelMetric = 57 QStyle__PM_SpinBoxSliderHeight QStyle__PixelMetric = 58 - QStyle__PM_DefaultTopLevelMargin QStyle__PixelMetric = 59 - QStyle__PM_DefaultChildMargin QStyle__PixelMetric = 60 - QStyle__PM_DefaultLayoutSpacing QStyle__PixelMetric = 61 - QStyle__PM_ToolBarIconSize QStyle__PixelMetric = 62 - QStyle__PM_ListViewIconSize QStyle__PixelMetric = 63 - QStyle__PM_IconViewIconSize QStyle__PixelMetric = 64 - QStyle__PM_SmallIconSize QStyle__PixelMetric = 65 - QStyle__PM_LargeIconSize QStyle__PixelMetric = 66 - QStyle__PM_FocusFrameVMargin QStyle__PixelMetric = 67 - QStyle__PM_FocusFrameHMargin QStyle__PixelMetric = 68 - QStyle__PM_ToolTipLabelFrameWidth QStyle__PixelMetric = 69 - QStyle__PM_CheckBoxLabelSpacing QStyle__PixelMetric = 70 - QStyle__PM_TabBarIconSize QStyle__PixelMetric = 71 - QStyle__PM_SizeGripSize QStyle__PixelMetric = 72 - QStyle__PM_DockWidgetTitleMargin QStyle__PixelMetric = 73 - QStyle__PM_MessageBoxIconSize QStyle__PixelMetric = 74 - QStyle__PM_ButtonIconSize QStyle__PixelMetric = 75 - QStyle__PM_DockWidgetTitleBarButtonMargin QStyle__PixelMetric = 76 - QStyle__PM_RadioButtonLabelSpacing QStyle__PixelMetric = 77 - QStyle__PM_LayoutLeftMargin QStyle__PixelMetric = 78 - QStyle__PM_LayoutTopMargin QStyle__PixelMetric = 79 - QStyle__PM_LayoutRightMargin QStyle__PixelMetric = 80 - QStyle__PM_LayoutBottomMargin QStyle__PixelMetric = 81 - QStyle__PM_LayoutHorizontalSpacing QStyle__PixelMetric = 82 - QStyle__PM_LayoutVerticalSpacing QStyle__PixelMetric = 83 - QStyle__PM_TabBar_ScrollButtonOverlap QStyle__PixelMetric = 84 - QStyle__PM_TextCursorWidth QStyle__PixelMetric = 85 - QStyle__PM_TabCloseIndicatorWidth QStyle__PixelMetric = 86 - QStyle__PM_TabCloseIndicatorHeight QStyle__PixelMetric = 87 - QStyle__PM_ScrollView_ScrollBarSpacing QStyle__PixelMetric = 88 - QStyle__PM_ScrollView_ScrollBarOverlap QStyle__PixelMetric = 89 - QStyle__PM_SubMenuOverlap QStyle__PixelMetric = 90 - QStyle__PM_TreeViewIndentation QStyle__PixelMetric = 91 - QStyle__PM_HeaderDefaultSectionSizeHorizontal QStyle__PixelMetric = 92 - QStyle__PM_HeaderDefaultSectionSizeVertical QStyle__PixelMetric = 93 - QStyle__PM_TitleBarButtonIconSize QStyle__PixelMetric = 94 - QStyle__PM_TitleBarButtonSize QStyle__PixelMetric = 95 + QStyle__PM_ToolBarIconSize QStyle__PixelMetric = 59 + QStyle__PM_ListViewIconSize QStyle__PixelMetric = 60 + QStyle__PM_IconViewIconSize QStyle__PixelMetric = 61 + QStyle__PM_SmallIconSize QStyle__PixelMetric = 62 + QStyle__PM_LargeIconSize QStyle__PixelMetric = 63 + QStyle__PM_FocusFrameVMargin QStyle__PixelMetric = 64 + QStyle__PM_FocusFrameHMargin QStyle__PixelMetric = 65 + QStyle__PM_ToolTipLabelFrameWidth QStyle__PixelMetric = 66 + QStyle__PM_CheckBoxLabelSpacing QStyle__PixelMetric = 67 + QStyle__PM_TabBarIconSize QStyle__PixelMetric = 68 + QStyle__PM_SizeGripSize QStyle__PixelMetric = 69 + QStyle__PM_DockWidgetTitleMargin QStyle__PixelMetric = 70 + QStyle__PM_MessageBoxIconSize QStyle__PixelMetric = 71 + QStyle__PM_ButtonIconSize QStyle__PixelMetric = 72 + QStyle__PM_DockWidgetTitleBarButtonMargin QStyle__PixelMetric = 73 + QStyle__PM_RadioButtonLabelSpacing QStyle__PixelMetric = 74 + QStyle__PM_LayoutLeftMargin QStyle__PixelMetric = 75 + QStyle__PM_LayoutTopMargin QStyle__PixelMetric = 76 + QStyle__PM_LayoutRightMargin QStyle__PixelMetric = 77 + QStyle__PM_LayoutBottomMargin QStyle__PixelMetric = 78 + QStyle__PM_LayoutHorizontalSpacing QStyle__PixelMetric = 79 + QStyle__PM_LayoutVerticalSpacing QStyle__PixelMetric = 80 + QStyle__PM_TabBar_ScrollButtonOverlap QStyle__PixelMetric = 81 + QStyle__PM_TextCursorWidth QStyle__PixelMetric = 82 + QStyle__PM_TabCloseIndicatorWidth QStyle__PixelMetric = 83 + QStyle__PM_TabCloseIndicatorHeight QStyle__PixelMetric = 84 + QStyle__PM_ScrollView_ScrollBarSpacing QStyle__PixelMetric = 85 + QStyle__PM_ScrollView_ScrollBarOverlap QStyle__PixelMetric = 86 + QStyle__PM_SubMenuOverlap QStyle__PixelMetric = 87 + QStyle__PM_TreeViewIndentation QStyle__PixelMetric = 88 + QStyle__PM_HeaderDefaultSectionSizeHorizontal QStyle__PixelMetric = 89 + QStyle__PM_HeaderDefaultSectionSizeVertical QStyle__PixelMetric = 90 + QStyle__PM_TitleBarButtonIconSize QStyle__PixelMetric = 91 + QStyle__PM_TitleBarButtonSize QStyle__PixelMetric = 92 + QStyle__PM_LineEditIconSize QStyle__PixelMetric = 93 + QStyle__PM_LineEditIconMargin QStyle__PixelMetric = 94 QStyle__PM_CustomBase QStyle__PixelMetric = 4026531840 ) @@ -458,7 +451,6 @@ const ( QStyle__SH_ComboBox_Popup QStyle__StyleHint = 25 QStyle__SH_TitleBar_NoBorder QStyle__StyleHint = 26 QStyle__SH_Slider_StopMouseOverSlider QStyle__StyleHint = 27 - QStyle__SH_ScrollBar_StopMouseOverSlider QStyle__StyleHint = 27 QStyle__SH_BlinkCursorWhenTextSelected QStyle__StyleHint = 28 QStyle__SH_RichText_FullWidthSelection QStyle__StyleHint = 29 QStyle__SH_Menu_Scrollable QStyle__StyleHint = 30 @@ -503,52 +495,54 @@ const ( QStyle__SH_ComboBox_PopupFrameStyle QStyle__StyleHint = 69 QStyle__SH_MessageBox_TextInteractionFlags QStyle__StyleHint = 70 QStyle__SH_DialogButtonBox_ButtonsHaveIcons QStyle__StyleHint = 71 - QStyle__SH_SpellCheckUnderlineStyle QStyle__StyleHint = 72 - QStyle__SH_MessageBox_CenterButtons QStyle__StyleHint = 73 - QStyle__SH_Menu_SelectionWrap QStyle__StyleHint = 74 - QStyle__SH_ItemView_MovementWithoutUpdatingSelection QStyle__StyleHint = 75 - QStyle__SH_ToolTip_Mask QStyle__StyleHint = 76 - QStyle__SH_FocusFrame_AboveWidget QStyle__StyleHint = 77 - QStyle__SH_TextControl_FocusIndicatorTextCharFormat QStyle__StyleHint = 78 - QStyle__SH_WizardStyle QStyle__StyleHint = 79 - QStyle__SH_ItemView_ArrowKeysNavigateIntoChildren QStyle__StyleHint = 80 - QStyle__SH_Menu_Mask QStyle__StyleHint = 81 - QStyle__SH_Menu_FlashTriggeredItem QStyle__StyleHint = 82 - QStyle__SH_Menu_FadeOutOnHide QStyle__StyleHint = 83 - QStyle__SH_SpinBox_ClickAutoRepeatThreshold QStyle__StyleHint = 84 - QStyle__SH_ItemView_PaintAlternatingRowColorsForEmptyArea QStyle__StyleHint = 85 - QStyle__SH_FormLayoutWrapPolicy QStyle__StyleHint = 86 - QStyle__SH_TabWidget_DefaultTabPosition QStyle__StyleHint = 87 - QStyle__SH_ToolBar_Movable QStyle__StyleHint = 88 - QStyle__SH_FormLayoutFieldGrowthPolicy QStyle__StyleHint = 89 - QStyle__SH_FormLayoutFormAlignment QStyle__StyleHint = 90 - QStyle__SH_FormLayoutLabelAlignment QStyle__StyleHint = 91 - QStyle__SH_ItemView_DrawDelegateFrame QStyle__StyleHint = 92 - QStyle__SH_TabBar_CloseButtonPosition QStyle__StyleHint = 93 - QStyle__SH_DockWidget_ButtonsHaveFrame QStyle__StyleHint = 94 - QStyle__SH_ToolButtonStyle QStyle__StyleHint = 95 - QStyle__SH_RequestSoftwareInputPanel QStyle__StyleHint = 96 - QStyle__SH_ScrollBar_Transient QStyle__StyleHint = 97 - QStyle__SH_Menu_SupportsSections QStyle__StyleHint = 98 - QStyle__SH_ToolTip_WakeUpDelay QStyle__StyleHint = 99 - QStyle__SH_ToolTip_FallAsleepDelay QStyle__StyleHint = 100 - QStyle__SH_Widget_Animate QStyle__StyleHint = 101 - QStyle__SH_Splitter_OpaqueResize QStyle__StyleHint = 102 - QStyle__SH_ComboBox_UseNativePopup QStyle__StyleHint = 103 - QStyle__SH_LineEdit_PasswordMaskDelay QStyle__StyleHint = 104 - QStyle__SH_TabBar_ChangeCurrentDelay QStyle__StyleHint = 105 - QStyle__SH_Menu_SubMenuUniDirection QStyle__StyleHint = 106 - QStyle__SH_Menu_SubMenuUniDirectionFailCount QStyle__StyleHint = 107 - QStyle__SH_Menu_SubMenuSloppySelectOtherActions QStyle__StyleHint = 108 - QStyle__SH_Menu_SubMenuSloppyCloseTimeout QStyle__StyleHint = 109 - QStyle__SH_Menu_SubMenuResetWhenReenteringParent QStyle__StyleHint = 110 - QStyle__SH_Menu_SubMenuDontStartSloppyOnLeave QStyle__StyleHint = 111 - QStyle__SH_ItemView_ScrollMode QStyle__StyleHint = 112 - QStyle__SH_TitleBar_ShowToolTipsOnButtons QStyle__StyleHint = 113 - QStyle__SH_Widget_Animation_Duration QStyle__StyleHint = 114 - QStyle__SH_ComboBox_AllowWheelScrolling QStyle__StyleHint = 115 - QStyle__SH_SpinBox_ButtonsInsideFrame QStyle__StyleHint = 116 - QStyle__SH_SpinBox_StepModifier QStyle__StyleHint = 117 + QStyle__SH_MessageBox_CenterButtons QStyle__StyleHint = 72 + QStyle__SH_Menu_SelectionWrap QStyle__StyleHint = 73 + QStyle__SH_ItemView_MovementWithoutUpdatingSelection QStyle__StyleHint = 74 + QStyle__SH_ToolTip_Mask QStyle__StyleHint = 75 + QStyle__SH_FocusFrame_AboveWidget QStyle__StyleHint = 76 + QStyle__SH_TextControl_FocusIndicatorTextCharFormat QStyle__StyleHint = 77 + QStyle__SH_WizardStyle QStyle__StyleHint = 78 + QStyle__SH_ItemView_ArrowKeysNavigateIntoChildren QStyle__StyleHint = 79 + QStyle__SH_Menu_Mask QStyle__StyleHint = 80 + QStyle__SH_Menu_FlashTriggeredItem QStyle__StyleHint = 81 + QStyle__SH_Menu_FadeOutOnHide QStyle__StyleHint = 82 + QStyle__SH_SpinBox_ClickAutoRepeatThreshold QStyle__StyleHint = 83 + QStyle__SH_ItemView_PaintAlternatingRowColorsForEmptyArea QStyle__StyleHint = 84 + QStyle__SH_FormLayoutWrapPolicy QStyle__StyleHint = 85 + QStyle__SH_TabWidget_DefaultTabPosition QStyle__StyleHint = 86 + QStyle__SH_ToolBar_Movable QStyle__StyleHint = 87 + QStyle__SH_FormLayoutFieldGrowthPolicy QStyle__StyleHint = 88 + QStyle__SH_FormLayoutFormAlignment QStyle__StyleHint = 89 + QStyle__SH_FormLayoutLabelAlignment QStyle__StyleHint = 90 + QStyle__SH_ItemView_DrawDelegateFrame QStyle__StyleHint = 91 + QStyle__SH_TabBar_CloseButtonPosition QStyle__StyleHint = 92 + QStyle__SH_DockWidget_ButtonsHaveFrame QStyle__StyleHint = 93 + QStyle__SH_ToolButtonStyle QStyle__StyleHint = 94 + QStyle__SH_RequestSoftwareInputPanel QStyle__StyleHint = 95 + QStyle__SH_ScrollBar_Transient QStyle__StyleHint = 96 + QStyle__SH_Menu_SupportsSections QStyle__StyleHint = 97 + QStyle__SH_ToolTip_WakeUpDelay QStyle__StyleHint = 98 + QStyle__SH_ToolTip_FallAsleepDelay QStyle__StyleHint = 99 + QStyle__SH_Widget_Animate QStyle__StyleHint = 100 + QStyle__SH_Splitter_OpaqueResize QStyle__StyleHint = 101 + QStyle__SH_ComboBox_UseNativePopup QStyle__StyleHint = 102 + QStyle__SH_LineEdit_PasswordMaskDelay QStyle__StyleHint = 103 + QStyle__SH_TabBar_ChangeCurrentDelay QStyle__StyleHint = 104 + QStyle__SH_Menu_SubMenuUniDirection QStyle__StyleHint = 105 + QStyle__SH_Menu_SubMenuUniDirectionFailCount QStyle__StyleHint = 106 + QStyle__SH_Menu_SubMenuSloppySelectOtherActions QStyle__StyleHint = 107 + QStyle__SH_Menu_SubMenuSloppyCloseTimeout QStyle__StyleHint = 108 + QStyle__SH_Menu_SubMenuResetWhenReenteringParent QStyle__StyleHint = 109 + QStyle__SH_Menu_SubMenuDontStartSloppyOnLeave QStyle__StyleHint = 110 + QStyle__SH_ItemView_ScrollMode QStyle__StyleHint = 111 + QStyle__SH_TitleBar_ShowToolTipsOnButtons QStyle__StyleHint = 112 + QStyle__SH_Widget_Animation_Duration QStyle__StyleHint = 113 + QStyle__SH_ComboBox_AllowWheelScrolling QStyle__StyleHint = 114 + QStyle__SH_SpinBox_ButtonsInsideFrame QStyle__StyleHint = 115 + QStyle__SH_SpinBox_StepModifier QStyle__StyleHint = 116 + QStyle__SH_TabBar_AllowWheelScrolling QStyle__StyleHint = 117 + QStyle__SH_Table_AlwaysDrawLeftTopGridLines QStyle__StyleHint = 118 + QStyle__SH_SpinBox_SelectOnStep QStyle__StyleHint = 119 QStyle__SH_CustomBase QStyle__StyleHint = 4026531840 ) @@ -633,6 +627,8 @@ const ( QStyle__SP_DialogRetryButton QStyle__StandardPixmap = 75 QStyle__SP_DialogIgnoreButton QStyle__StandardPixmap = 76 QStyle__SP_RestoreDefaultsButton QStyle__StandardPixmap = 77 + QStyle__SP_TabCloseButton QStyle__StandardPixmap = 78 + QStyle__NStandardPixmap QStyle__StandardPixmap = 79 QStyle__SP_CustomBase QStyle__StandardPixmap = 4026531840 ) @@ -678,10 +674,8 @@ func QStyle_Tr(s string) string { return _ret } -func QStyle_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QStyle_TrUtf8(s_Cstring) +func (this *QStyle) Name() string { + var _ms *C.struct_miqt_string = C.QStyle_Name(this.h) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -873,28 +867,6 @@ func QStyle_Tr3(s string, c string, n int) string { return _ret } -func QStyle_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStyle_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QStyle_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStyle_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - 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) diff --git a/qt/gen_qstyle.h b/qt/gen_qstyle.h index 5235330..0bf2411 100644 --- a/qt/gen_qstyle.h +++ b/qt/gen_qstyle.h @@ -50,7 +50,7 @@ typedef struct QWidget QWidget; QMetaObject* QStyle_MetaObject(const QStyle* self); void* QStyle_Metacast(QStyle* self, const char* param1); struct miqt_string* QStyle_Tr(const char* s); -struct miqt_string* QStyle_TrUtf8(const char* s); +struct miqt_string* QStyle_Name(const QStyle* self); void QStyle_Polish(QStyle* self, QWidget* widget); void QStyle_Unpolish(QStyle* self, QWidget* widget); void QStyle_PolishWithApplication(QStyle* self, QApplication* application); @@ -84,8 +84,6 @@ int QStyle_CombinedLayoutSpacing(const QStyle* self, int controls1, int controls 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, 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); diff --git a/qt/gen_qstyleditemdelegate.cpp b/qt/gen_qstyleditemdelegate.cpp index 6a16824..1f8e46c 100644 --- a/qt/gen_qstyleditemdelegate.cpp +++ b/qt/gen_qstyleditemdelegate.cpp @@ -40,13 +40,6 @@ struct miqt_string* QStyledItemDelegate_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QStyledItemDelegate_TrUtf8(const char* s) { - QString _ret = QStyledItemDelegate::trUtf8(s); - // 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 QStyledItemDelegate_Paint(const QStyledItemDelegate* self, QPainter* painter, QStyleOptionViewItem* option, QModelIndex* index) { self->paint(painter, *option, *index); } @@ -100,20 +93,6 @@ struct miqt_string* QStyledItemDelegate_Tr3(const char* s, const char* c, int n) return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QStyledItemDelegate_TrUtf82(const char* s, const char* c) { - QString _ret = QStyledItemDelegate::trUtf8(s, c); - // 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* QStyledItemDelegate_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QStyledItemDelegate::trUtf8(s, c, static_cast(n)); - // 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 QStyledItemDelegate_Delete(QStyledItemDelegate* self) { delete self; } diff --git a/qt/gen_qstyleditemdelegate.go b/qt/gen_qstyleditemdelegate.go index a8190f9..a7c6abd 100644 --- a/qt/gen_qstyleditemdelegate.go +++ b/qt/gen_qstyleditemdelegate.go @@ -67,15 +67,6 @@ func QStyledItemDelegate_Tr(s string) string { return _ret } -func QStyledItemDelegate_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QStyledItemDelegate_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QStyledItemDelegate) Paint(painter *QPainter, option *QStyleOptionViewItem, index *QModelIndex) { C.QStyledItemDelegate_Paint(this.h, painter.cPointer(), option.cPointer(), index.cPointer()) } @@ -140,28 +131,6 @@ func QStyledItemDelegate_Tr3(s string, c string, n int) string { return _ret } -func QStyledItemDelegate_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStyledItemDelegate_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QStyledItemDelegate_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStyledItemDelegate_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QStyledItemDelegate) Delete() { C.QStyledItemDelegate_Delete(this.h) diff --git a/qt/gen_qstyleditemdelegate.h b/qt/gen_qstyleditemdelegate.h index 31598a5..b1b14e3 100644 --- a/qt/gen_qstyleditemdelegate.h +++ b/qt/gen_qstyleditemdelegate.h @@ -46,7 +46,6 @@ QStyledItemDelegate* QStyledItemDelegate_new2(QObject* parent); QMetaObject* QStyledItemDelegate_MetaObject(const QStyledItemDelegate* self); void* QStyledItemDelegate_Metacast(QStyledItemDelegate* self, const char* param1); struct miqt_string* QStyledItemDelegate_Tr(const char* s); -struct miqt_string* QStyledItemDelegate_TrUtf8(const char* s); void QStyledItemDelegate_Paint(const QStyledItemDelegate* self, QPainter* painter, QStyleOptionViewItem* option, QModelIndex* index); QSize* QStyledItemDelegate_SizeHint(const QStyledItemDelegate* self, QStyleOptionViewItem* option, QModelIndex* index); QWidget* QStyledItemDelegate_CreateEditor(const QStyledItemDelegate* self, QWidget* parent, QStyleOptionViewItem* option, QModelIndex* index); @@ -58,8 +57,6 @@ void QStyledItemDelegate_SetItemEditorFactory(QStyledItemDelegate* self, QItemEd struct miqt_string* QStyledItemDelegate_DisplayText(const QStyledItemDelegate* self, QVariant* value, QLocale* locale); struct miqt_string* QStyledItemDelegate_Tr2(const char* s, const char* c); struct miqt_string* QStyledItemDelegate_Tr3(const char* s, const char* c, int n); -struct miqt_string* QStyledItemDelegate_TrUtf82(const char* s, const char* c); -struct miqt_string* QStyledItemDelegate_TrUtf83(const char* s, const char* c, int n); void QStyledItemDelegate_Delete(QStyledItemDelegate* self); #ifdef __cplusplus diff --git a/qt/gen_qstylehints.cpp b/qt/gen_qstylehints.cpp index 977f3ca..a9e352d 100644 --- a/qt/gen_qstylehints.cpp +++ b/qt/gen_qstylehints.cpp @@ -23,13 +23,6 @@ struct miqt_string* QStyleHints_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QStyleHints_TrUtf8(const char* s) { - QString _ret = QStyleHints::trUtf8(s); - // 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 QStyleHints_SetMouseDoubleClickInterval(QStyleHints* self, int mouseDoubleClickInterval) { self->setMouseDoubleClickInterval(static_cast(mouseDoubleClickInterval)); } @@ -304,20 +297,6 @@ struct miqt_string* QStyleHints_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QStyleHints_TrUtf82(const char* s, const char* c) { - QString _ret = QStyleHints::trUtf8(s, c); - // 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* QStyleHints_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QStyleHints::trUtf8(s, c, static_cast(n)); - // 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 QStyleHints_Delete(QStyleHints* self) { delete self; } diff --git a/qt/gen_qstylehints.go b/qt/gen_qstylehints.go index c948691..eb71399 100644 --- a/qt/gen_qstylehints.go +++ b/qt/gen_qstylehints.go @@ -56,15 +56,6 @@ func QStyleHints_Tr(s string) string { return _ret } -func QStyleHints_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QStyleHints_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QStyleHints) SetMouseDoubleClickInterval(mouseDoubleClickInterval int) { C.QStyleHints_SetMouseDoubleClickInterval(this.h, (C.int)(mouseDoubleClickInterval)) } @@ -446,28 +437,6 @@ func QStyleHints_Tr3(s string, c string, n int) string { return _ret } -func QStyleHints_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStyleHints_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QStyleHints_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStyleHints_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QStyleHints) Delete() { C.QStyleHints_Delete(this.h) diff --git a/qt/gen_qstylehints.h b/qt/gen_qstylehints.h index f679234..d89f4c7 100644 --- a/qt/gen_qstylehints.h +++ b/qt/gen_qstylehints.h @@ -26,7 +26,6 @@ typedef struct QStyleHints QStyleHints; QMetaObject* QStyleHints_MetaObject(const QStyleHints* self); void* QStyleHints_Metacast(QStyleHints* self, const char* param1); struct miqt_string* QStyleHints_Tr(const char* s); -struct miqt_string* QStyleHints_TrUtf8(const char* s); void QStyleHints_SetMouseDoubleClickInterval(QStyleHints* self, int mouseDoubleClickInterval); int QStyleHints_MouseDoubleClickInterval(const QStyleHints* self); int QStyleHints_MouseDoubleClickDistance(const QStyleHints* self); @@ -85,8 +84,6 @@ void QStyleHints_MouseQuickSelectionThresholdChanged(QStyleHints* self, int thre void QStyleHints_connect_MouseQuickSelectionThresholdChanged(QStyleHints* self, void* slot); struct miqt_string* QStyleHints_Tr2(const char* s, const char* c); struct miqt_string* QStyleHints_Tr3(const char* s, const char* c, int n); -struct miqt_string* QStyleHints_TrUtf82(const char* s, const char* c); -struct miqt_string* QStyleHints_TrUtf83(const char* s, const char* c, int n); void QStyleHints_Delete(QStyleHints* self); #ifdef __cplusplus diff --git a/qt/gen_qstyleoption.cpp b/qt/gen_qstyleoption.cpp index 693ec20..01fff8d 100644 --- a/qt/gen_qstyleoption.cpp +++ b/qt/gen_qstyleoption.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -19,7 +20,6 @@ #include #include #include -#include #include #include #include @@ -48,10 +48,6 @@ QStyleOption* QStyleOption_new4(int version, int typeVal) { return new QStyleOption(static_cast(version), static_cast(typeVal)); } -void QStyleOption_Init(QStyleOption* self, QWidget* w) { - self->init(w); -} - void QStyleOption_InitFrom(QStyleOption* self, QWidget* w) { self->initFrom(w); } @@ -124,6 +120,18 @@ void QStyleOptionHeader_Delete(QStyleOptionHeader* self) { delete self; } +QStyleOptionHeaderV2* QStyleOptionHeaderV2_new() { + return new QStyleOptionHeaderV2(); +} + +QStyleOptionHeaderV2* QStyleOptionHeaderV2_new2(QStyleOptionHeaderV2* other) { + return new QStyleOptionHeaderV2(*other); +} + +void QStyleOptionHeaderV2_Delete(QStyleOptionHeaderV2* self) { + delete self; +} + QStyleOptionButton* QStyleOptionButton_new() { return new QStyleOptionButton(); } @@ -148,22 +156,6 @@ void QStyleOptionTab_Delete(QStyleOptionTab* self) { delete self; } -QStyleOptionTabV4* QStyleOptionTabV4_new() { - return new QStyleOptionTabV4(); -} - -QStyleOptionTabV4* QStyleOptionTabV4_new2(QStyleOptionTabV4* param1) { - return new QStyleOptionTabV4(*param1); -} - -void QStyleOptionTabV4_OperatorAssign(QStyleOptionTabV4* self, QStyleOptionTabV4* param1) { - self->operator=(*param1); -} - -void QStyleOptionTabV4_Delete(QStyleOptionTabV4* self) { - delete self; -} - QStyleOptionToolBar* QStyleOptionToolBar_new() { return new QStyleOptionToolBar(); } diff --git a/qt/gen_qstyleoption.go b/qt/gen_qstyleoption.go index b1595e3..e0a0152 100644 --- a/qt/gen_qstyleoption.go +++ b/qt/gen_qstyleoption.go @@ -77,7 +77,7 @@ const ( type QStyleOptionFrame__StyleOptionVersion int const ( - QStyleOptionFrame__StyleOptionVersion__Version QStyleOptionFrame__StyleOptionVersion = 3 + QStyleOptionFrame__StyleOptionVersion__Version QStyleOptionFrame__StyleOptionVersion = 1 ) type QStyleOptionFrame__FrameFeature int @@ -97,7 +97,7 @@ const ( type QStyleOptionTabWidgetFrame__StyleOptionVersion int const ( - QStyleOptionTabWidgetFrame__StyleOptionVersion__Version QStyleOptionTabWidgetFrame__StyleOptionVersion = 2 + QStyleOptionTabWidgetFrame__StyleOptionVersion__Version QStyleOptionTabWidgetFrame__StyleOptionVersion = 1 ) type QStyleOptionTabBarBase__StyleOptionType int @@ -109,7 +109,7 @@ const ( type QStyleOptionTabBarBase__StyleOptionVersion int const ( - QStyleOptionTabBarBase__StyleOptionVersion__Version QStyleOptionTabBarBase__StyleOptionVersion = 2 + QStyleOptionTabBarBase__StyleOptionVersion__Version QStyleOptionTabBarBase__StyleOptionVersion = 1 ) type QStyleOptionHeader__StyleOptionType int @@ -150,6 +150,18 @@ const ( QStyleOptionHeader__SortIndicator__SortDown QStyleOptionHeader__SortIndicator = 2 ) +type QStyleOptionHeaderV2__StyleOptionType int + +const ( + QStyleOptionHeaderV2__StyleOptionType__Type QStyleOptionHeaderV2__StyleOptionType = 8 +) + +type QStyleOptionHeaderV2__StyleOptionVersion int + +const ( + QStyleOptionHeaderV2__StyleOptionVersion__Version QStyleOptionHeaderV2__StyleOptionVersion = 2 +) + type QStyleOptionButton__StyleOptionType int const ( @@ -182,7 +194,7 @@ const ( type QStyleOptionTab__StyleOptionVersion int const ( - QStyleOptionTab__StyleOptionVersion__Version QStyleOptionTab__StyleOptionVersion = 3 + QStyleOptionTab__StyleOptionVersion__Version QStyleOptionTab__StyleOptionVersion = 1 ) type QStyleOptionTab__TabPosition int @@ -217,12 +229,6 @@ const ( QStyleOptionTab__TabFeature__HasFrame QStyleOptionTab__TabFeature = 1 ) -type QStyleOptionTabV4__StyleOptionVersion int - -const ( - QStyleOptionTabV4__StyleOptionVersion__Version QStyleOptionTabV4__StyleOptionVersion = 4 -) - type QStyleOptionToolBar__StyleOptionType int const ( @@ -260,7 +266,7 @@ const ( type QStyleOptionProgressBar__StyleOptionVersion int const ( - QStyleOptionProgressBar__StyleOptionVersion__Version QStyleOptionProgressBar__StyleOptionVersion = 2 + QStyleOptionProgressBar__StyleOptionVersion__Version QStyleOptionProgressBar__StyleOptionVersion = 1 ) type QStyleOptionMenuItem__StyleOptionType int @@ -305,7 +311,7 @@ const ( type QStyleOptionDockWidget__StyleOptionVersion int const ( - QStyleOptionDockWidget__StyleOptionVersion__Version QStyleOptionDockWidget__StyleOptionVersion = 2 + QStyleOptionDockWidget__StyleOptionVersion__Version QStyleOptionDockWidget__StyleOptionVersion = 1 ) type QStyleOptionViewItem__StyleOptionType int @@ -317,7 +323,7 @@ const ( type QStyleOptionViewItem__StyleOptionVersion int const ( - QStyleOptionViewItem__StyleOptionVersion__Version QStyleOptionViewItem__StyleOptionVersion = 4 + QStyleOptionViewItem__StyleOptionVersion__Version QStyleOptionViewItem__StyleOptionVersion = 1 ) type QStyleOptionViewItem__Position int @@ -359,7 +365,7 @@ const ( type QStyleOptionToolBox__StyleOptionVersion int const ( - QStyleOptionToolBox__StyleOptionVersion__Version QStyleOptionToolBox__StyleOptionVersion = 2 + QStyleOptionToolBox__StyleOptionVersion__Version QStyleOptionToolBox__StyleOptionVersion = 1 ) type QStyleOptionToolBox__TabPosition int @@ -600,10 +606,6 @@ func NewQStyleOption4(version int, typeVal int) *QStyleOption { return newQStyleOption(ret) } -func (this *QStyleOption) Init(w *QWidget) { - C.QStyleOption_Init(this.h, w.cPointer()) -} - func (this *QStyleOption) InitFrom(w *QWidget) { C.QStyleOption_InitFrom(this.h, w.cPointer()) } @@ -871,6 +873,55 @@ func (this *QStyleOptionHeader) GoGC() { }) } +type QStyleOptionHeaderV2 struct { + h *C.QStyleOptionHeaderV2 + *QStyleOptionHeader +} + +func (this *QStyleOptionHeaderV2) cPointer() *C.QStyleOptionHeaderV2 { + if this == nil { + return nil + } + return this.h +} + +func newQStyleOptionHeaderV2(h *C.QStyleOptionHeaderV2) *QStyleOptionHeaderV2 { + if h == nil { + return nil + } + return &QStyleOptionHeaderV2{h: h, QStyleOptionHeader: newQStyleOptionHeader_U(unsafe.Pointer(h))} +} + +func newQStyleOptionHeaderV2_U(h unsafe.Pointer) *QStyleOptionHeaderV2 { + return newQStyleOptionHeaderV2((*C.QStyleOptionHeaderV2)(h)) +} + +// NewQStyleOptionHeaderV2 constructs a new QStyleOptionHeaderV2 object. +func NewQStyleOptionHeaderV2() *QStyleOptionHeaderV2 { + ret := C.QStyleOptionHeaderV2_new() + return newQStyleOptionHeaderV2(ret) +} + +// NewQStyleOptionHeaderV22 constructs a new QStyleOptionHeaderV2 object. +func NewQStyleOptionHeaderV22(other *QStyleOptionHeaderV2) *QStyleOptionHeaderV2 { + ret := C.QStyleOptionHeaderV2_new2(other.cPointer()) + return newQStyleOptionHeaderV2(ret) +} + +// Delete this object from C++ memory. +func (this *QStyleOptionHeaderV2) Delete() { + C.QStyleOptionHeaderV2_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QStyleOptionHeaderV2) GoGC() { + runtime.SetFinalizer(this, func(this *QStyleOptionHeaderV2) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + type QStyleOptionButton struct { h *C.QStyleOptionButton *QStyleOption @@ -969,59 +1020,6 @@ func (this *QStyleOptionTab) GoGC() { }) } -type QStyleOptionTabV4 struct { - h *C.QStyleOptionTabV4 - *QStyleOptionTab -} - -func (this *QStyleOptionTabV4) cPointer() *C.QStyleOptionTabV4 { - if this == nil { - return nil - } - return this.h -} - -func newQStyleOptionTabV4(h *C.QStyleOptionTabV4) *QStyleOptionTabV4 { - if h == nil { - return nil - } - return &QStyleOptionTabV4{h: h, QStyleOptionTab: newQStyleOptionTab_U(unsafe.Pointer(h))} -} - -func newQStyleOptionTabV4_U(h unsafe.Pointer) *QStyleOptionTabV4 { - return newQStyleOptionTabV4((*C.QStyleOptionTabV4)(h)) -} - -// NewQStyleOptionTabV4 constructs a new QStyleOptionTabV4 object. -func NewQStyleOptionTabV4() *QStyleOptionTabV4 { - ret := C.QStyleOptionTabV4_new() - return newQStyleOptionTabV4(ret) -} - -// NewQStyleOptionTabV42 constructs a new QStyleOptionTabV4 object. -func NewQStyleOptionTabV42(param1 *QStyleOptionTabV4) *QStyleOptionTabV4 { - ret := C.QStyleOptionTabV4_new2(param1.cPointer()) - return newQStyleOptionTabV4(ret) -} - -func (this *QStyleOptionTabV4) OperatorAssign(param1 *QStyleOptionTabV4) { - C.QStyleOptionTabV4_OperatorAssign(this.h, param1.cPointer()) -} - -// Delete this object from C++ memory. -func (this *QStyleOptionTabV4) Delete() { - C.QStyleOptionTabV4_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QStyleOptionTabV4) GoGC() { - runtime.SetFinalizer(this, func(this *QStyleOptionTabV4) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} - type QStyleOptionToolBar struct { h *C.QStyleOptionToolBar *QStyleOption diff --git a/qt/gen_qstyleoption.h b/qt/gen_qstyleoption.h index b2b0374..8c1a3ac 100644 --- a/qt/gen_qstyleoption.h +++ b/qt/gen_qstyleoption.h @@ -27,6 +27,7 @@ class QStyleOptionFrame; class QStyleOptionGraphicsItem; class QStyleOptionGroupBox; class QStyleOptionHeader; +class QStyleOptionHeaderV2; class QStyleOptionMenuItem; class QStyleOptionProgressBar; class QStyleOptionRubberBand; @@ -35,7 +36,6 @@ class QStyleOptionSlider; class QStyleOptionSpinBox; class QStyleOptionTab; class QStyleOptionTabBarBase; -class QStyleOptionTabV4; class QStyleOptionTabWidgetFrame; class QStyleOptionTitleBar; class QStyleOptionToolBar; @@ -58,6 +58,7 @@ typedef struct QStyleOptionFrame QStyleOptionFrame; typedef struct QStyleOptionGraphicsItem QStyleOptionGraphicsItem; typedef struct QStyleOptionGroupBox QStyleOptionGroupBox; typedef struct QStyleOptionHeader QStyleOptionHeader; +typedef struct QStyleOptionHeaderV2 QStyleOptionHeaderV2; typedef struct QStyleOptionMenuItem QStyleOptionMenuItem; typedef struct QStyleOptionProgressBar QStyleOptionProgressBar; typedef struct QStyleOptionRubberBand QStyleOptionRubberBand; @@ -66,7 +67,6 @@ typedef struct QStyleOptionSlider QStyleOptionSlider; typedef struct QStyleOptionSpinBox QStyleOptionSpinBox; typedef struct QStyleOptionTab QStyleOptionTab; typedef struct QStyleOptionTabBarBase QStyleOptionTabBarBase; -typedef struct QStyleOptionTabV4 QStyleOptionTabV4; typedef struct QStyleOptionTabWidgetFrame QStyleOptionTabWidgetFrame; typedef struct QStyleOptionTitleBar QStyleOptionTitleBar; typedef struct QStyleOptionToolBar QStyleOptionToolBar; @@ -81,7 +81,6 @@ QStyleOption* QStyleOption_new(); QStyleOption* QStyleOption_new2(QStyleOption* other); QStyleOption* QStyleOption_new3(int version); QStyleOption* QStyleOption_new4(int version, int typeVal); -void QStyleOption_Init(QStyleOption* self, QWidget* w); void QStyleOption_InitFrom(QStyleOption* self, QWidget* w); void QStyleOption_OperatorAssign(QStyleOption* self, QStyleOption* other); void QStyleOption_Delete(QStyleOption* self); @@ -106,6 +105,10 @@ QStyleOptionHeader* QStyleOptionHeader_new(); QStyleOptionHeader* QStyleOptionHeader_new2(QStyleOptionHeader* other); void QStyleOptionHeader_Delete(QStyleOptionHeader* self); +QStyleOptionHeaderV2* QStyleOptionHeaderV2_new(); +QStyleOptionHeaderV2* QStyleOptionHeaderV2_new2(QStyleOptionHeaderV2* other); +void QStyleOptionHeaderV2_Delete(QStyleOptionHeaderV2* self); + QStyleOptionButton* QStyleOptionButton_new(); QStyleOptionButton* QStyleOptionButton_new2(QStyleOptionButton* other); void QStyleOptionButton_Delete(QStyleOptionButton* self); @@ -114,11 +117,6 @@ QStyleOptionTab* QStyleOptionTab_new(); QStyleOptionTab* QStyleOptionTab_new2(QStyleOptionTab* other); void QStyleOptionTab_Delete(QStyleOptionTab* self); -QStyleOptionTabV4* QStyleOptionTabV4_new(); -QStyleOptionTabV4* QStyleOptionTabV4_new2(QStyleOptionTabV4* param1); -void QStyleOptionTabV4_OperatorAssign(QStyleOptionTabV4* self, QStyleOptionTabV4* param1); -void QStyleOptionTabV4_Delete(QStyleOptionTabV4* self); - QStyleOptionToolBar* QStyleOptionToolBar_new(); QStyleOptionToolBar* QStyleOptionToolBar_new2(QStyleOptionToolBar* other); void QStyleOptionToolBar_Delete(QStyleOptionToolBar* self); diff --git a/qt/gen_qstyleplugin.cpp b/qt/gen_qstyleplugin.cpp index 5b0d72c..680b296 100644 --- a/qt/gen_qstyleplugin.cpp +++ b/qt/gen_qstyleplugin.cpp @@ -23,13 +23,6 @@ struct miqt_string* QStylePlugin_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QStylePlugin_TrUtf8(const char* s) { - QString _ret = QStylePlugin::trUtf8(s); - // 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()); -} - QStyle* QStylePlugin_Create(QStylePlugin* self, struct miqt_string* key) { QString key_QString = QString::fromUtf8(&key->data, key->len); return self->create(key_QString); @@ -49,20 +42,6 @@ struct miqt_string* QStylePlugin_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QStylePlugin_TrUtf82(const char* s, const char* c) { - QString _ret = QStylePlugin::trUtf8(s, c); - // 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* QStylePlugin_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QStylePlugin::trUtf8(s, c, static_cast(n)); - // 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 QStylePlugin_Delete(QStylePlugin* self) { delete self; } diff --git a/qt/gen_qstyleplugin.go b/qt/gen_qstyleplugin.go index 2ab8a98..66a8c36 100644 --- a/qt/gen_qstyleplugin.go +++ b/qt/gen_qstyleplugin.go @@ -55,15 +55,6 @@ func QStylePlugin_Tr(s string) string { return _ret } -func QStylePlugin_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QStylePlugin_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QStylePlugin) Create(key string) *QStyle { key_ms := miqt_strdupg(key) defer C.free(key_ms) @@ -92,28 +83,6 @@ func QStylePlugin_Tr3(s string, c string, n int) string { return _ret } -func QStylePlugin_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStylePlugin_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QStylePlugin_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QStylePlugin_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QStylePlugin) Delete() { C.QStylePlugin_Delete(this.h) diff --git a/qt/gen_qstyleplugin.h b/qt/gen_qstyleplugin.h index 2a419b0..34bd51d 100644 --- a/qt/gen_qstyleplugin.h +++ b/qt/gen_qstyleplugin.h @@ -26,12 +26,9 @@ typedef struct QStylePlugin QStylePlugin; QMetaObject* QStylePlugin_MetaObject(const QStylePlugin* self); void* QStylePlugin_Metacast(QStylePlugin* self, const char* param1); struct miqt_string* QStylePlugin_Tr(const char* s); -struct miqt_string* QStylePlugin_TrUtf8(const char* s); QStyle* QStylePlugin_Create(QStylePlugin* self, struct miqt_string* key); struct miqt_string* QStylePlugin_Tr2(const char* s, const char* c); struct miqt_string* QStylePlugin_Tr3(const char* s, const char* c, int n); -struct miqt_string* QStylePlugin_TrUtf82(const char* s, const char* c); -struct miqt_string* QStylePlugin_TrUtf83(const char* s, const char* c, int n); void QStylePlugin_Delete(QStylePlugin* self); #ifdef __cplusplus diff --git a/qt/gen_qsurface.go b/qt/gen_qsurface.go index ebfcd33..2f95c99 100644 --- a/qt/gen_qsurface.go +++ b/qt/gen_qsurface.go @@ -29,6 +29,7 @@ const ( QSurface__OpenVGSurface QSurface__SurfaceType = 3 QSurface__VulkanSurface QSurface__SurfaceType = 4 QSurface__MetalSurface QSurface__SurfaceType = 5 + QSurface__Direct3DSurface QSurface__SurfaceType = 6 ) type QSurface struct { diff --git a/qt/gen_qsurfaceformat.cpp b/qt/gen_qsurfaceformat.cpp index 10044f2..c5c0561 100644 --- a/qt/gen_qsurfaceformat.cpp +++ b/qt/gen_qsurfaceformat.cpp @@ -1,3 +1,4 @@ +#include #include #include "qsurfaceformat.h" #include "gen_qsurfaceformat.h" @@ -134,23 +135,15 @@ void QSurfaceFormat_SetStereo(QSurfaceFormat* self, bool enable) { self->setStereo(enable); } -void QSurfaceFormat_SetOption(QSurfaceFormat* self, int opt) { - self->setOption(static_cast(opt)); -} - -bool QSurfaceFormat_TestOption(const QSurfaceFormat* self, int opt) { - return self->testOption(static_cast(opt)); -} - void QSurfaceFormat_SetOptions(QSurfaceFormat* self, int options) { self->setOptions(static_cast(options)); } -void QSurfaceFormat_SetOptionWithOption(QSurfaceFormat* self, int option) { +void QSurfaceFormat_SetOption(QSurfaceFormat* self, int option) { self->setOption(static_cast(option)); } -bool QSurfaceFormat_TestOptionWithOption(const QSurfaceFormat* self, int option) { +bool QSurfaceFormat_TestOption(const QSurfaceFormat* self, int option) { return self->testOption(static_cast(option)); } @@ -167,12 +160,17 @@ void QSurfaceFormat_SetSwapInterval(QSurfaceFormat* self, int interval) { self->setSwapInterval(static_cast(interval)); } -int QSurfaceFormat_ColorSpace(const QSurfaceFormat* self) { - QSurfaceFormat::ColorSpace _ret = self->colorSpace(); - return static_cast(_ret); +QColorSpace* QSurfaceFormat_ColorSpace(const QSurfaceFormat* self) { + const QColorSpace& _ret = self->colorSpace(); + // Cast returned reference into pointer + return const_cast(&_ret); } -void QSurfaceFormat_SetColorSpace(QSurfaceFormat* self, int colorSpace) { +void QSurfaceFormat_SetColorSpace(QSurfaceFormat* self, QColorSpace* colorSpace) { + self->setColorSpace(*colorSpace); +} + +void QSurfaceFormat_SetColorSpaceWithColorSpace(QSurfaceFormat* self, int colorSpace) { self->setColorSpace(static_cast(colorSpace)); } diff --git a/qt/gen_qsurfaceformat.go b/qt/gen_qsurfaceformat.go index f7cf7b8..6559394 100644 --- a/qt/gen_qsurfaceformat.go +++ b/qt/gen_qsurfaceformat.go @@ -20,6 +20,7 @@ const ( QSurfaceFormat__DebugContext QSurfaceFormat__FormatOption = 2 QSurfaceFormat__DeprecatedFunctions QSurfaceFormat__FormatOption = 4 QSurfaceFormat__ResetNotification QSurfaceFormat__FormatOption = 8 + QSurfaceFormat__ProtectedContent QSurfaceFormat__FormatOption = 16 ) type QSurfaceFormat__SwapBehavior int @@ -211,24 +212,16 @@ func (this *QSurfaceFormat) SetStereo(enable bool) { C.QSurfaceFormat_SetStereo(this.h, (C.bool)(enable)) } -func (this *QSurfaceFormat) SetOption(opt QSurfaceFormat__FormatOption) { - C.QSurfaceFormat_SetOption(this.h, (C.int)(opt)) -} - -func (this *QSurfaceFormat) TestOption(opt QSurfaceFormat__FormatOption) bool { - return (bool)(C.QSurfaceFormat_TestOption(this.h, (C.int)(opt))) -} - func (this *QSurfaceFormat) SetOptions(options QSurfaceFormat__FormatOption) { C.QSurfaceFormat_SetOptions(this.h, (C.int)(options)) } -func (this *QSurfaceFormat) SetOptionWithOption(option QSurfaceFormat__FormatOption) { - C.QSurfaceFormat_SetOptionWithOption(this.h, (C.int)(option)) +func (this *QSurfaceFormat) SetOption(option QSurfaceFormat__FormatOption) { + C.QSurfaceFormat_SetOption(this.h, (C.int)(option)) } -func (this *QSurfaceFormat) TestOptionWithOption(option QSurfaceFormat__FormatOption) bool { - return (bool)(C.QSurfaceFormat_TestOptionWithOption(this.h, (C.int)(option))) +func (this *QSurfaceFormat) TestOption(option QSurfaceFormat__FormatOption) bool { + return (bool)(C.QSurfaceFormat_TestOption(this.h, (C.int)(option))) } func (this *QSurfaceFormat) Options() QSurfaceFormat__FormatOption { @@ -243,12 +236,16 @@ func (this *QSurfaceFormat) SetSwapInterval(interval int) { C.QSurfaceFormat_SetSwapInterval(this.h, (C.int)(interval)) } -func (this *QSurfaceFormat) ColorSpace() QSurfaceFormat__ColorSpace { - return (QSurfaceFormat__ColorSpace)(C.QSurfaceFormat_ColorSpace(this.h)) +func (this *QSurfaceFormat) ColorSpace() *QColorSpace { + return newQColorSpace_U(unsafe.Pointer(C.QSurfaceFormat_ColorSpace(this.h))) } -func (this *QSurfaceFormat) SetColorSpace(colorSpace QSurfaceFormat__ColorSpace) { - C.QSurfaceFormat_SetColorSpace(this.h, (C.int)(colorSpace)) +func (this *QSurfaceFormat) SetColorSpace(colorSpace *QColorSpace) { + C.QSurfaceFormat_SetColorSpace(this.h, colorSpace.cPointer()) +} + +func (this *QSurfaceFormat) SetColorSpaceWithColorSpace(colorSpace QSurfaceFormat__ColorSpace) { + C.QSurfaceFormat_SetColorSpaceWithColorSpace(this.h, (C.int)(colorSpace)) } func QSurfaceFormat_SetDefaultFormat(format *QSurfaceFormat) { diff --git a/qt/gen_qsurfaceformat.h b/qt/gen_qsurfaceformat.h index 9b93ebd..0e34708 100644 --- a/qt/gen_qsurfaceformat.h +++ b/qt/gen_qsurfaceformat.h @@ -14,8 +14,10 @@ extern "C" { #endif #ifdef __cplusplus +class QColorSpace; class QSurfaceFormat; #else +typedef struct QColorSpace QColorSpace; typedef struct QSurfaceFormat QSurfaceFormat; #endif @@ -51,16 +53,15 @@ int QSurfaceFormat_MinorVersion(const QSurfaceFormat* self); void QSurfaceFormat_SetVersion(QSurfaceFormat* self, int major, int minor); bool QSurfaceFormat_Stereo(const QSurfaceFormat* self); 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, int option); -bool QSurfaceFormat_TestOptionWithOption(const QSurfaceFormat* self, int option); +void QSurfaceFormat_SetOption(QSurfaceFormat* self, int option); +bool QSurfaceFormat_TestOption(const QSurfaceFormat* self, int option); int QSurfaceFormat_Options(const QSurfaceFormat* self); int QSurfaceFormat_SwapInterval(const QSurfaceFormat* self); void QSurfaceFormat_SetSwapInterval(QSurfaceFormat* self, int interval); -int QSurfaceFormat_ColorSpace(const QSurfaceFormat* self); -void QSurfaceFormat_SetColorSpace(QSurfaceFormat* self, int colorSpace); +QColorSpace* QSurfaceFormat_ColorSpace(const QSurfaceFormat* self); +void QSurfaceFormat_SetColorSpace(QSurfaceFormat* self, QColorSpace* colorSpace); +void QSurfaceFormat_SetColorSpaceWithColorSpace(QSurfaceFormat* self, int colorSpace); void QSurfaceFormat_SetDefaultFormat(QSurfaceFormat* format); QSurfaceFormat* QSurfaceFormat_DefaultFormat(); void QSurfaceFormat_SetOption2(QSurfaceFormat* self, int option, bool on); diff --git a/qt/gen_qsyntaxhighlighter.cpp b/qt/gen_qsyntaxhighlighter.cpp index 01bedbe..180f9c0 100644 --- a/qt/gen_qsyntaxhighlighter.cpp +++ b/qt/gen_qsyntaxhighlighter.cpp @@ -24,13 +24,6 @@ struct miqt_string* QSyntaxHighlighter_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QSyntaxHighlighter_TrUtf8(const char* s) { - QString _ret = QSyntaxHighlighter::trUtf8(s); - // 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 QSyntaxHighlighter_SetDocument(QSyntaxHighlighter* self, QTextDocument* doc) { self->setDocument(doc); } @@ -61,20 +54,6 @@ struct miqt_string* QSyntaxHighlighter_Tr3(const char* s, const char* c, int n) return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QSyntaxHighlighter_TrUtf82(const char* s, const char* c) { - QString _ret = QSyntaxHighlighter::trUtf8(s, c); - // 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* QSyntaxHighlighter_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QSyntaxHighlighter::trUtf8(s, c, static_cast(n)); - // 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 QSyntaxHighlighter_Delete(QSyntaxHighlighter* self) { delete self; } diff --git a/qt/gen_qsyntaxhighlighter.go b/qt/gen_qsyntaxhighlighter.go index ab910c2..1bb74f0 100644 --- a/qt/gen_qsyntaxhighlighter.go +++ b/qt/gen_qsyntaxhighlighter.go @@ -55,15 +55,6 @@ func QSyntaxHighlighter_Tr(s string) string { return _ret } -func QSyntaxHighlighter_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSyntaxHighlighter_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QSyntaxHighlighter) SetDocument(doc *QTextDocument) { C.QSyntaxHighlighter_SetDocument(this.h, doc.cPointer()) } @@ -102,28 +93,6 @@ func QSyntaxHighlighter_Tr3(s string, c string, n int) string { return _ret } -func QSyntaxHighlighter_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSyntaxHighlighter_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QSyntaxHighlighter_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSyntaxHighlighter_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QSyntaxHighlighter) Delete() { C.QSyntaxHighlighter_Delete(this.h) diff --git a/qt/gen_qsyntaxhighlighter.h b/qt/gen_qsyntaxhighlighter.h index d864f11..2a9e82c 100644 --- a/qt/gen_qsyntaxhighlighter.h +++ b/qt/gen_qsyntaxhighlighter.h @@ -28,15 +28,12 @@ typedef struct QTextDocument QTextDocument; QMetaObject* QSyntaxHighlighter_MetaObject(const QSyntaxHighlighter* self); void* QSyntaxHighlighter_Metacast(QSyntaxHighlighter* self, const char* param1); struct miqt_string* QSyntaxHighlighter_Tr(const char* s); -struct miqt_string* QSyntaxHighlighter_TrUtf8(const char* s); void QSyntaxHighlighter_SetDocument(QSyntaxHighlighter* self, QTextDocument* doc); QTextDocument* QSyntaxHighlighter_Document(const QSyntaxHighlighter* self); void QSyntaxHighlighter_Rehighlight(QSyntaxHighlighter* self); void QSyntaxHighlighter_RehighlightBlock(QSyntaxHighlighter* self, QTextBlock* block); struct miqt_string* QSyntaxHighlighter_Tr2(const char* s, const char* c); struct miqt_string* QSyntaxHighlighter_Tr3(const char* s, const char* c, int n); -struct miqt_string* QSyntaxHighlighter_TrUtf82(const char* s, const char* c); -struct miqt_string* QSyntaxHighlighter_TrUtf83(const char* s, const char* c, int n); void QSyntaxHighlighter_Delete(QSyntaxHighlighter* self); #ifdef __cplusplus diff --git a/qt/gen_qsystemsemaphore.cpp b/qt/gen_qsystemsemaphore.cpp index 3e71a7b..72d3614 100644 --- a/qt/gen_qsystemsemaphore.cpp +++ b/qt/gen_qsystemsemaphore.cpp @@ -21,6 +21,13 @@ QSystemSemaphore* QSystemSemaphore_new3(struct miqt_string* key, int initialValu return new QSystemSemaphore(key_QString, static_cast(initialValue), static_cast(mode)); } +struct miqt_string* QSystemSemaphore_Tr(const char* sourceText) { + QString _ret = QSystemSemaphore::tr(sourceText); + // 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 QSystemSemaphore_SetKey(QSystemSemaphore* self, struct miqt_string* key) { QString key_QString = QString::fromUtf8(&key->data, key->len); self->setKey(key_QString); @@ -53,6 +60,20 @@ struct miqt_string* QSystemSemaphore_ErrorString(const QSystemSemaphore* self) { return miqt_strdup(_b.data(), _b.length()); } +struct miqt_string* QSystemSemaphore_Tr2(const char* sourceText, const char* disambiguation) { + QString _ret = QSystemSemaphore::tr(sourceText, disambiguation); + // 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* QSystemSemaphore_Tr3(const char* sourceText, const char* disambiguation, int n) { + QString _ret = QSystemSemaphore::tr(sourceText, disambiguation, static_cast(n)); + // 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 QSystemSemaphore_SetKey2(QSystemSemaphore* self, struct miqt_string* key, int initialValue) { QString key_QString = QString::fromUtf8(&key->data, key->len); self->setKey(key_QString, static_cast(initialValue)); diff --git a/qt/gen_qsystemsemaphore.go b/qt/gen_qsystemsemaphore.go index 781884d..6dcdca4 100644 --- a/qt/gen_qsystemsemaphore.go +++ b/qt/gen_qsystemsemaphore.go @@ -78,6 +78,15 @@ func NewQSystemSemaphore3(key string, initialValue int, mode QSystemSemaphore__A return newQSystemSemaphore(ret) } +func QSystemSemaphore_Tr(sourceText string) string { + sourceText_Cstring := C.CString(sourceText) + defer C.free(unsafe.Pointer(sourceText_Cstring)) + var _ms *C.struct_miqt_string = C.QSystemSemaphore_Tr(sourceText_Cstring) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + func (this *QSystemSemaphore) SetKey(key string) { key_ms := miqt_strdupg(key) defer C.free(key_ms) @@ -110,6 +119,28 @@ func (this *QSystemSemaphore) ErrorString() string { return _ret } +func QSystemSemaphore_Tr2(sourceText string, disambiguation string) string { + sourceText_Cstring := C.CString(sourceText) + defer C.free(unsafe.Pointer(sourceText_Cstring)) + disambiguation_Cstring := C.CString(disambiguation) + defer C.free(unsafe.Pointer(disambiguation_Cstring)) + var _ms *C.struct_miqt_string = C.QSystemSemaphore_Tr2(sourceText_Cstring, disambiguation_Cstring) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + +func QSystemSemaphore_Tr3(sourceText string, disambiguation string, n int) string { + sourceText_Cstring := C.CString(sourceText) + defer C.free(unsafe.Pointer(sourceText_Cstring)) + disambiguation_Cstring := C.CString(disambiguation) + defer C.free(unsafe.Pointer(disambiguation_Cstring)) + var _ms *C.struct_miqt_string = C.QSystemSemaphore_Tr3(sourceText_Cstring, disambiguation_Cstring, (C.int)(n)) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + func (this *QSystemSemaphore) SetKey2(key string, initialValue int) { key_ms := miqt_strdupg(key) defer C.free(key_ms) diff --git a/qt/gen_qsystemsemaphore.h b/qt/gen_qsystemsemaphore.h index 77f71ac..0123e99 100644 --- a/qt/gen_qsystemsemaphore.h +++ b/qt/gen_qsystemsemaphore.h @@ -22,12 +22,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, int mode); +struct miqt_string* QSystemSemaphore_Tr(const char* sourceText); 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); int QSystemSemaphore_Error(const QSystemSemaphore* self); struct miqt_string* QSystemSemaphore_ErrorString(const QSystemSemaphore* self); +struct miqt_string* QSystemSemaphore_Tr2(const char* sourceText, const char* disambiguation); +struct miqt_string* QSystemSemaphore_Tr3(const char* sourceText, const char* disambiguation, int n); void QSystemSemaphore_SetKey2(QSystemSemaphore* self, struct miqt_string* key, int initialValue); void QSystemSemaphore_SetKey3(QSystemSemaphore* self, struct miqt_string* key, int initialValue, int mode); bool QSystemSemaphore_Release1(QSystemSemaphore* self, int n); diff --git a/qt/gen_qsystemtrayicon.cpp b/qt/gen_qsystemtrayicon.cpp index 4f144c1..5967a06 100644 --- a/qt/gen_qsystemtrayicon.cpp +++ b/qt/gen_qsystemtrayicon.cpp @@ -42,13 +42,6 @@ struct miqt_string* QSystemTrayIcon_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QSystemTrayIcon_TrUtf8(const char* s) { - QString _ret = QSystemTrayIcon::trUtf8(s); - // 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 QSystemTrayIcon_SetContextMenu(QSystemTrayIcon* self, QMenu* menu) { self->setContextMenu(menu); } @@ -153,20 +146,6 @@ struct miqt_string* QSystemTrayIcon_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QSystemTrayIcon_TrUtf82(const char* s, const char* c) { - QString _ret = QSystemTrayIcon::trUtf8(s, c); - // 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* QSystemTrayIcon_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QSystemTrayIcon::trUtf8(s, c, static_cast(n)); - // 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 QSystemTrayIcon_ShowMessage4(QSystemTrayIcon* self, struct miqt_string* title, struct miqt_string* msg, QIcon* icon, int msecs) { QString title_QString = QString::fromUtf8(&title->data, title->len); QString msg_QString = QString::fromUtf8(&msg->data, msg->len); diff --git a/qt/gen_qsystemtrayicon.go b/qt/gen_qsystemtrayicon.go index 9df4520..92d28be 100644 --- a/qt/gen_qsystemtrayicon.go +++ b/qt/gen_qsystemtrayicon.go @@ -99,15 +99,6 @@ func QSystemTrayIcon_Tr(s string) string { return _ret } -func QSystemTrayIcon_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QSystemTrayIcon_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QSystemTrayIcon) SetContextMenu(menu *QMenu) { C.QSystemTrayIcon_SetContextMenu(this.h, menu.cPointer()) } @@ -246,28 +237,6 @@ func QSystemTrayIcon_Tr3(s string, c string, n int) string { return _ret } -func QSystemTrayIcon_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSystemTrayIcon_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QSystemTrayIcon_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QSystemTrayIcon_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QSystemTrayIcon) ShowMessage4(title string, msg string, icon *QIcon, msecs int) { title_ms := miqt_strdupg(title) defer C.free(title_ms) diff --git a/qt/gen_qsystemtrayicon.h b/qt/gen_qsystemtrayicon.h index b31814a..1e86a4b 100644 --- a/qt/gen_qsystemtrayicon.h +++ b/qt/gen_qsystemtrayicon.h @@ -36,7 +36,6 @@ QSystemTrayIcon* QSystemTrayIcon_new4(QIcon* icon, QObject* parent); QMetaObject* QSystemTrayIcon_MetaObject(const QSystemTrayIcon* self); void* QSystemTrayIcon_Metacast(QSystemTrayIcon* self, const char* param1); struct miqt_string* QSystemTrayIcon_Tr(const char* s); -struct miqt_string* QSystemTrayIcon_TrUtf8(const char* s); void QSystemTrayIcon_SetContextMenu(QSystemTrayIcon* self, QMenu* menu); QMenu* QSystemTrayIcon_ContextMenu(const QSystemTrayIcon* self); QIcon* QSystemTrayIcon_Icon(const QSystemTrayIcon* self); @@ -58,8 +57,6 @@ void QSystemTrayIcon_MessageClicked(QSystemTrayIcon* self); void QSystemTrayIcon_connect_MessageClicked(QSystemTrayIcon* self, void* slot); struct miqt_string* QSystemTrayIcon_Tr2(const char* s, const char* c); 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, int icon); void QSystemTrayIcon_ShowMessage42(QSystemTrayIcon* self, struct miqt_string* title, struct miqt_string* msg, int icon, int msecs); diff --git a/qt/gen_qtabbar.cpp b/qt/gen_qtabbar.cpp index 939da2f..381899a 100644 --- a/qt/gen_qtabbar.cpp +++ b/qt/gen_qtabbar.cpp @@ -37,13 +37,6 @@ struct miqt_string* QTabBar_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTabBar_TrUtf8(const char* s) { - QString _ret = QTabBar::trUtf8(s); - // 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()); -} - int QTabBar_Shape(const QTabBar* self) { QTabBar::Shape _ret = self->shape(); return static_cast(_ret); @@ -365,20 +358,6 @@ struct miqt_string* QTabBar_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTabBar_TrUtf82(const char* s, const char* c) { - QString _ret = QTabBar::trUtf8(s, c); - // 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* QTabBar_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QTabBar::trUtf8(s, c, static_cast(n)); - // 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 QTabBar_Delete(QTabBar* self) { delete self; } diff --git a/qt/gen_qtabbar.go b/qt/gen_qtabbar.go index e3ae97b..3d851c8 100644 --- a/qt/gen_qtabbar.go +++ b/qt/gen_qtabbar.go @@ -96,15 +96,6 @@ func QTabBar_Tr(s string) string { return _ret } -func QTabBar_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTabBar_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QTabBar) Shape() QTabBar__Shape { return (QTabBar__Shape)(C.QTabBar_Shape(this.h)) } @@ -506,28 +497,6 @@ func QTabBar_Tr3(s string, c string, n int) string { return _ret } -func QTabBar_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTabBar_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QTabBar_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTabBar_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QTabBar) Delete() { C.QTabBar_Delete(this.h) diff --git a/qt/gen_qtabbar.h b/qt/gen_qtabbar.h index 35346e1..84fe257 100644 --- a/qt/gen_qtabbar.h +++ b/qt/gen_qtabbar.h @@ -40,7 +40,6 @@ QTabBar* QTabBar_new2(QWidget* parent); QMetaObject* QTabBar_MetaObject(const QTabBar* self); void* QTabBar_Metacast(QTabBar* self, const char* param1); struct miqt_string* QTabBar_Tr(const char* s); -struct miqt_string* QTabBar_TrUtf8(const char* s); int QTabBar_Shape(const QTabBar* self); void QTabBar_SetShape(QTabBar* self, int shape); int QTabBar_AddTab(QTabBar* self, struct miqt_string* text); @@ -110,8 +109,6 @@ void QTabBar_TabBarDoubleClicked(QTabBar* self, int index); void QTabBar_connect_TabBarDoubleClicked(QTabBar* self, void* slot); struct miqt_string* QTabBar_Tr2(const char* s, const char* c); struct miqt_string* QTabBar_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTabBar_TrUtf82(const char* s, const char* c); -struct miqt_string* QTabBar_TrUtf83(const char* s, const char* c, int n); void QTabBar_Delete(QTabBar* self); #ifdef __cplusplus diff --git a/qt/gen_qtableview.cpp b/qt/gen_qtableview.cpp index 723e43c..19665f7 100644 --- a/qt/gen_qtableview.cpp +++ b/qt/gen_qtableview.cpp @@ -37,13 +37,6 @@ struct miqt_string* QTableView_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTableView_TrUtf8(const char* s) { - QString _ret = QTableView::trUtf8(s); - // 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 QTableView_SetModel(QTableView* self, QAbstractItemModel* model) { self->setModel(model); } @@ -229,11 +222,7 @@ void QTableView_ResizeColumnsToContents(QTableView* self) { self->resizeColumnsToContents(); } -void QTableView_SortByColumn(QTableView* self, int column) { - self->sortByColumn(static_cast(column)); -} - -void QTableView_SortByColumn2(QTableView* self, int column, int order) { +void QTableView_SortByColumn(QTableView* self, int column, int order) { self->sortByColumn(static_cast(column), static_cast(order)); } @@ -255,20 +244,6 @@ struct miqt_string* QTableView_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTableView_TrUtf82(const char* s, const char* c) { - QString _ret = QTableView::trUtf8(s, c); - // 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* QTableView_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QTableView::trUtf8(s, c, static_cast(n)); - // 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 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 59b6fbe..2f369cd 100644 --- a/qt/gen_qtableview.go +++ b/qt/gen_qtableview.go @@ -67,15 +67,6 @@ func QTableView_Tr(s string) string { return _ret } -func QTableView_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTableView_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QTableView) SetModel(model *QAbstractItemModel) { C.QTableView_SetModel(this.h, model.cPointer()) } @@ -266,12 +257,8 @@ func (this *QTableView) ResizeColumnsToContents() { C.QTableView_ResizeColumnsToContents(this.h) } -func (this *QTableView) SortByColumn(column int) { - C.QTableView_SortByColumn(this.h, (C.int)(column)) -} - -func (this *QTableView) SortByColumn2(column int, order SortOrder) { - C.QTableView_SortByColumn2(this.h, (C.int)(column), (C.int)(order)) +func (this *QTableView) SortByColumn(column int, order SortOrder) { + C.QTableView_SortByColumn(this.h, (C.int)(column), (C.int)(order)) } func (this *QTableView) SetShowGrid(show bool) { @@ -300,28 +287,6 @@ func QTableView_Tr3(s string, c string, n int) string { return _ret } -func QTableView_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTableView_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QTableView_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTableView_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QTableView) ScrollTo2(index *QModelIndex, hint QAbstractItemView__ScrollHint) { C.QTableView_ScrollTo2(this.h, index.cPointer(), (C.int)(hint)) } diff --git a/qt/gen_qtableview.h b/qt/gen_qtableview.h index d2dadfd..2ed4418 100644 --- a/qt/gen_qtableview.h +++ b/qt/gen_qtableview.h @@ -40,7 +40,6 @@ QTableView* QTableView_new2(QWidget* parent); QMetaObject* QTableView_MetaObject(const QTableView* self); void* QTableView_Metacast(QTableView* self, const char* param1); struct miqt_string* QTableView_Tr(const char* s); -struct miqt_string* QTableView_TrUtf8(const char* s); void QTableView_SetModel(QTableView* self, QAbstractItemModel* model); void QTableView_SetRootIndex(QTableView* self, QModelIndex* index); void QTableView_SetSelectionModel(QTableView* self, QItemSelectionModel* selectionModel); @@ -87,13 +86,10 @@ void QTableView_ResizeRowToContents(QTableView* self, int row); 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, int order); +void QTableView_SortByColumn(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, int hint); void QTableView_Delete(QTableView* self); diff --git a/qt/gen_qtablewidget.cpp b/qt/gen_qtablewidget.cpp index de97327..6f43169 100644 --- a/qt/gen_qtablewidget.cpp +++ b/qt/gen_qtablewidget.cpp @@ -1,10 +1,11 @@ #include -#include #include #include #include #include #include +#include +#include #include #include #include @@ -28,14 +29,6 @@ QTableWidgetSelectionRange* QTableWidgetSelectionRange_new2(int top, int left, i return new QTableWidgetSelectionRange(static_cast(top), static_cast(left), static_cast(bottom), static_cast(right)); } -QTableWidgetSelectionRange* QTableWidgetSelectionRange_new3(QTableWidgetSelectionRange* other) { - return new QTableWidgetSelectionRange(*other); -} - -void QTableWidgetSelectionRange_OperatorAssign(QTableWidgetSelectionRange* self, QTableWidgetSelectionRange* other) { - self->operator=(*other); -} - int QTableWidgetSelectionRange_TopRow(const QTableWidgetSelectionRange* self) { return self->topRow(); } @@ -201,12 +194,12 @@ void QTableWidgetItem_SetTextAlignment(QTableWidgetItem* self, int alignment) { self->setTextAlignment(static_cast(alignment)); } -QColor* QTableWidgetItem_BackgroundColor(const QTableWidgetItem* self) { - return new QColor(self->backgroundColor()); +void QTableWidgetItem_SetTextAlignmentWithAlignment(QTableWidgetItem* self, int alignment) { + self->setTextAlignment(static_cast(alignment)); } -void QTableWidgetItem_SetBackgroundColor(QTableWidgetItem* self, QColor* color) { - self->setBackgroundColor(*color); +void QTableWidgetItem_SetTextAlignment2(QTableWidgetItem* self, int alignment) { + self->setTextAlignment(static_cast(alignment)); } QBrush* QTableWidgetItem_Background(const QTableWidgetItem* self) { @@ -217,14 +210,6 @@ void QTableWidgetItem_SetBackground(QTableWidgetItem* self, QBrush* brush) { self->setBackground(*brush); } -QColor* QTableWidgetItem_TextColor(const QTableWidgetItem* self) { - return new QColor(self->textColor()); -} - -void QTableWidgetItem_SetTextColor(QTableWidgetItem* self, QColor* color) { - self->setTextColor(*color); -} - QBrush* QTableWidgetItem_Foreground(const QTableWidgetItem* self) { return new QBrush(self->foreground()); } @@ -313,13 +298,6 @@ struct miqt_string* QTableWidget_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTableWidget_TrUtf8(const char* s) { - QString _ret = QTableWidget::trUtf8(s); - // 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 QTableWidget_SetRowCount(QTableWidget* self, int rows) { self->setRowCount(static_cast(rows)); } @@ -356,6 +334,27 @@ QTableWidgetItem* QTableWidget_TakeItem(QTableWidget* self, int row, int column) return self->takeItem(static_cast(row), static_cast(column)); } +struct miqt_array* QTableWidget_Items(const QTableWidget* self, QMimeData* data) { + QList _ret = self->items(data); + // 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) { + _arr[i] = _ret[i]; + } + struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); + _out->len = _ret.length(); + _out->data = static_cast(_arr); + return _out; +} + +QModelIndex* QTableWidget_IndexFromItem(const QTableWidget* self, QTableWidgetItem* item) { + return new QModelIndex(self->indexFromItem(item)); +} + +QTableWidgetItem* QTableWidget_ItemFromIndex(const QTableWidget* self, QModelIndex* index) { + return self->itemFromIndex(*index); +} + QTableWidgetItem* QTableWidget_VerticalHeaderItem(const QTableWidget* self, int row) { return self->verticalHeaderItem(static_cast(row)); } @@ -470,14 +469,6 @@ void QTableWidget_RemoveCellWidget(QTableWidget* self, int row, int column) { self->removeCellWidget(static_cast(row), static_cast(column)); } -bool QTableWidget_IsItemSelected(const QTableWidget* self, QTableWidgetItem* item) { - return self->isItemSelected(item); -} - -void QTableWidget_SetItemSelected(QTableWidget* self, QTableWidgetItem* item, bool selectVal) { - self->setItemSelected(item, selectVal); -} - void QTableWidget_SetRangeSelected(QTableWidget* self, QTableWidgetSelectionRange* rangeVal, bool selectVal) { self->setRangeSelected(*rangeVal, selectVal); } @@ -766,20 +757,6 @@ struct miqt_string* QTableWidget_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTableWidget_TrUtf82(const char* s, const char* c) { - QString _ret = QTableWidget::trUtf8(s, c); - // 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* QTableWidget_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QTableWidget::trUtf8(s, c, static_cast(n)); - // 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 QTableWidget_SortItems2(QTableWidget* self, int column, int order) { self->sortItems(static_cast(column), static_cast(order)); } diff --git a/qt/gen_qtablewidget.go b/qt/gen_qtablewidget.go index 2f49272..12d5780 100644 --- a/qt/gen_qtablewidget.go +++ b/qt/gen_qtablewidget.go @@ -55,16 +55,6 @@ func NewQTableWidgetSelectionRange2(top int, left int, bottom int, right int) *Q return newQTableWidgetSelectionRange(ret) } -// NewQTableWidgetSelectionRange3 constructs a new QTableWidgetSelectionRange object. -func NewQTableWidgetSelectionRange3(other *QTableWidgetSelectionRange) *QTableWidgetSelectionRange { - ret := C.QTableWidgetSelectionRange_new3(other.cPointer()) - return newQTableWidgetSelectionRange(ret) -} - -func (this *QTableWidgetSelectionRange) OperatorAssign(other *QTableWidgetSelectionRange) { - C.QTableWidgetSelectionRange_OperatorAssign(this.h, other.cPointer()) -} - func (this *QTableWidgetSelectionRange) TopRow() int { return (int)(C.QTableWidgetSelectionRange_TopRow(this.h)) } @@ -289,15 +279,12 @@ func (this *QTableWidgetItem) SetTextAlignment(alignment int) { C.QTableWidgetItem_SetTextAlignment(this.h, (C.int)(alignment)) } -func (this *QTableWidgetItem) BackgroundColor() *QColor { - _ret := C.QTableWidgetItem_BackgroundColor(this.h) - _goptr := newQColor(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QTableWidgetItem) SetTextAlignmentWithAlignment(alignment AlignmentFlag) { + C.QTableWidgetItem_SetTextAlignmentWithAlignment(this.h, (C.int)(alignment)) } -func (this *QTableWidgetItem) SetBackgroundColor(color *QColor) { - C.QTableWidgetItem_SetBackgroundColor(this.h, color.cPointer()) +func (this *QTableWidgetItem) SetTextAlignment2(alignment AlignmentFlag) { + C.QTableWidgetItem_SetTextAlignment2(this.h, (C.int)(alignment)) } func (this *QTableWidgetItem) Background() *QBrush { @@ -311,17 +298,6 @@ func (this *QTableWidgetItem) SetBackground(brush *QBrush) { C.QTableWidgetItem_SetBackground(this.h, brush.cPointer()) } -func (this *QTableWidgetItem) TextColor() *QColor { - _ret := C.QTableWidgetItem_TextColor(this.h) - _goptr := newQColor(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QTableWidgetItem) SetTextColor(color *QColor) { - C.QTableWidgetItem_SetTextColor(this.h, color.cPointer()) -} - func (this *QTableWidgetItem) Foreground() *QBrush { _ret := C.QTableWidgetItem_Foreground(this.h) _goptr := newQBrush(_ret) @@ -463,15 +439,6 @@ func QTableWidget_Tr(s string) string { return _ret } -func QTableWidget_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTableWidget_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QTableWidget) SetRowCount(rows int) { C.QTableWidget_SetRowCount(this.h, (C.int)(rows)) } @@ -508,6 +475,28 @@ func (this *QTableWidget) TakeItem(row int, column int) *QTableWidgetItem { return newQTableWidgetItem_U(unsafe.Pointer(C.QTableWidget_TakeItem(this.h, (C.int)(row), (C.int)(column)))) } +func (this *QTableWidget) Items(data *QMimeData) []*QTableWidgetItem { + var _ma *C.struct_miqt_array = C.QTableWidget_Items(this.h, data.cPointer()) + _ret := make([]*QTableWidgetItem, int(_ma.len)) + _outCast := (*[0xffff]*C.QTableWidgetItem)(unsafe.Pointer(_ma.data)) // hey ya + for i := 0; i < int(_ma.len); i++ { + _ret[i] = newQTableWidgetItem_U(unsafe.Pointer(_outCast[i])) + } + C.free(unsafe.Pointer(_ma)) + return _ret +} + +func (this *QTableWidget) IndexFromItem(item *QTableWidgetItem) *QModelIndex { + _ret := C.QTableWidget_IndexFromItem(this.h, item.cPointer()) + _goptr := newQModelIndex(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QTableWidget) ItemFromIndex(index *QModelIndex) *QTableWidgetItem { + return newQTableWidgetItem_U(unsafe.Pointer(C.QTableWidget_ItemFromIndex(this.h, index.cPointer()))) +} + func (this *QTableWidget) VerticalHeaderItem(row int) *QTableWidgetItem { return newQTableWidgetItem_U(unsafe.Pointer(C.QTableWidget_VerticalHeaderItem(this.h, (C.int)(row)))) } @@ -628,14 +617,6 @@ func (this *QTableWidget) RemoveCellWidget(row int, column int) { C.QTableWidget_RemoveCellWidget(this.h, (C.int)(row), (C.int)(column)) } -func (this *QTableWidget) IsItemSelected(item *QTableWidgetItem) bool { - return (bool)(C.QTableWidget_IsItemSelected(this.h, item.cPointer())) -} - -func (this *QTableWidget) SetItemSelected(item *QTableWidgetItem, selectVal bool) { - C.QTableWidget_SetItemSelected(this.h, item.cPointer(), (C.bool)(selectVal)) -} - func (this *QTableWidget) SetRangeSelected(rangeVal *QTableWidgetSelectionRange, selectVal bool) { C.QTableWidget_SetRangeSelected(this.h, rangeVal.cPointer(), (C.bool)(selectVal)) } @@ -1075,28 +1056,6 @@ func QTableWidget_Tr3(s string, c string, n int) string { return _ret } -func QTableWidget_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTableWidget_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QTableWidget_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTableWidget_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QTableWidget) SortItems2(column int, order SortOrder) { C.QTableWidget_SortItems2(this.h, (C.int)(column), (C.int)(order)) } diff --git a/qt/gen_qtablewidget.h b/qt/gen_qtablewidget.h index c3a7882..ebd0bd1 100644 --- a/qt/gen_qtablewidget.h +++ b/qt/gen_qtablewidget.h @@ -15,11 +15,12 @@ extern "C" { #ifdef __cplusplus class QBrush; -class QColor; class QDataStream; class QFont; class QIcon; class QMetaObject; +class QMimeData; +class QModelIndex; class QPoint; class QRect; class QSize; @@ -30,11 +31,12 @@ class QVariant; class QWidget; #else typedef struct QBrush QBrush; -typedef struct QColor QColor; typedef struct QDataStream QDataStream; typedef struct QFont QFont; typedef struct QIcon QIcon; typedef struct QMetaObject QMetaObject; +typedef struct QMimeData QMimeData; +typedef struct QModelIndex QModelIndex; typedef struct QPoint QPoint; typedef struct QRect QRect; typedef struct QSize QSize; @@ -47,8 +49,6 @@ typedef struct QWidget QWidget; QTableWidgetSelectionRange* QTableWidgetSelectionRange_new(); QTableWidgetSelectionRange* QTableWidgetSelectionRange_new2(int top, int left, int bottom, int right); -QTableWidgetSelectionRange* QTableWidgetSelectionRange_new3(QTableWidgetSelectionRange* other); -void QTableWidgetSelectionRange_OperatorAssign(QTableWidgetSelectionRange* self, QTableWidgetSelectionRange* other); int QTableWidgetSelectionRange_TopRow(const QTableWidgetSelectionRange* self); int QTableWidgetSelectionRange_BottomRow(const QTableWidgetSelectionRange* self); int QTableWidgetSelectionRange_LeftColumn(const QTableWidgetSelectionRange* self); @@ -86,12 +86,10 @@ QFont* QTableWidgetItem_Font(const QTableWidgetItem* self); void QTableWidgetItem_SetFont(QTableWidgetItem* self, QFont* font); int QTableWidgetItem_TextAlignment(const QTableWidgetItem* self); void QTableWidgetItem_SetTextAlignment(QTableWidgetItem* self, int alignment); -QColor* QTableWidgetItem_BackgroundColor(const QTableWidgetItem* self); -void QTableWidgetItem_SetBackgroundColor(QTableWidgetItem* self, QColor* color); +void QTableWidgetItem_SetTextAlignmentWithAlignment(QTableWidgetItem* self, int alignment); +void QTableWidgetItem_SetTextAlignment2(QTableWidgetItem* self, int alignment); QBrush* QTableWidgetItem_Background(const QTableWidgetItem* self); void QTableWidgetItem_SetBackground(QTableWidgetItem* self, QBrush* brush); -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); int QTableWidgetItem_CheckState(const QTableWidgetItem* self); @@ -114,7 +112,6 @@ QTableWidget* QTableWidget_new4(int rows, int columns, QWidget* parent); QMetaObject* QTableWidget_MetaObject(const QTableWidget* self); void* QTableWidget_Metacast(QTableWidget* self, const char* param1); struct miqt_string* QTableWidget_Tr(const char* s); -struct miqt_string* QTableWidget_TrUtf8(const char* s); void QTableWidget_SetRowCount(QTableWidget* self, int rows); int QTableWidget_RowCount(const QTableWidget* self); void QTableWidget_SetColumnCount(QTableWidget* self, int columns); @@ -124,6 +121,9 @@ int QTableWidget_Column(const QTableWidget* self, QTableWidgetItem* item); QTableWidgetItem* QTableWidget_Item(const QTableWidget* self, int row, int column); void QTableWidget_SetItem(QTableWidget* self, int row, int column, QTableWidgetItem* item); QTableWidgetItem* QTableWidget_TakeItem(QTableWidget* self, int row, int column); +struct miqt_array* QTableWidget_Items(const QTableWidget* self, QMimeData* data); +QModelIndex* QTableWidget_IndexFromItem(const QTableWidget* self, QTableWidgetItem* item); +QTableWidgetItem* QTableWidget_ItemFromIndex(const QTableWidget* self, QModelIndex* index); QTableWidgetItem* QTableWidget_VerticalHeaderItem(const QTableWidget* self, int row); void QTableWidget_SetVerticalHeaderItem(QTableWidget* self, int row, QTableWidgetItem* item); QTableWidgetItem* QTableWidget_TakeVerticalHeaderItem(QTableWidget* self, int row); @@ -149,8 +149,6 @@ bool QTableWidget_IsPersistentEditorOpen(const QTableWidget* self, QTableWidgetI QWidget* QTableWidget_CellWidget(const QTableWidget* self, int row, int column); void QTableWidget_SetCellWidget(QTableWidget* self, int row, int column, QWidget* widget); void QTableWidget_RemoveCellWidget(QTableWidget* self, int row, int column); -bool QTableWidget_IsItemSelected(const QTableWidget* self, QTableWidgetItem* item); -void QTableWidget_SetItemSelected(QTableWidget* self, QTableWidgetItem* item, bool selectVal); void QTableWidget_SetRangeSelected(QTableWidget* self, QTableWidgetSelectionRange* rangeVal, bool selectVal); struct miqt_array* QTableWidget_SelectedRanges(const QTableWidget* self); struct miqt_array* QTableWidget_SelectedItems(const QTableWidget* self); @@ -201,8 +199,6 @@ void QTableWidget_CurrentCellChanged(QTableWidget* self, int currentRow, int cur void QTableWidget_connect_CurrentCellChanged(QTableWidget* self, void* slot); 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, int order); void QTableWidget_ScrollToItem2(QTableWidget* self, QTableWidgetItem* item, int hint); void QTableWidget_Delete(QTableWidget* self); diff --git a/qt/gen_qtabwidget.cpp b/qt/gen_qtabwidget.cpp index c68e64f..7f9aa8a 100644 --- a/qt/gen_qtabwidget.cpp +++ b/qt/gen_qtabwidget.cpp @@ -34,13 +34,6 @@ struct miqt_string* QTabWidget_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTabWidget_TrUtf8(const char* s) { - QString _ret = QTabWidget::trUtf8(s); - // 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()); -} - int QTabWidget_AddTab(QTabWidget* self, QWidget* widget, struct miqt_string* param2) { QString param2_QString = QString::fromUtf8(¶m2->data, param2->len); return self->addTab(widget, param2_QString); @@ -318,20 +311,6 @@ struct miqt_string* QTabWidget_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTabWidget_TrUtf82(const char* s, const char* c) { - QString _ret = QTabWidget::trUtf8(s, c); - // 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* QTabWidget_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QTabWidget::trUtf8(s, c, static_cast(n)); - // 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 QTabWidget_SetCornerWidget2(QTabWidget* self, QWidget* w, int corner) { self->setCornerWidget(w, static_cast(corner)); } diff --git a/qt/gen_qtabwidget.go b/qt/gen_qtabwidget.go index 3f72af2..f37097c 100644 --- a/qt/gen_qtabwidget.go +++ b/qt/gen_qtabwidget.go @@ -84,15 +84,6 @@ func QTabWidget_Tr(s string) string { return _ret } -func QTabWidget_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTabWidget_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QTabWidget) AddTab(widget *QWidget, param2 string) int { param2_ms := miqt_strdupg(param2) defer C.free(param2_ms) @@ -430,28 +421,6 @@ func QTabWidget_Tr3(s string, c string, n int) string { return _ret } -func QTabWidget_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTabWidget_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QTabWidget_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTabWidget_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QTabWidget) SetCornerWidget2(w *QWidget, corner Corner) { C.QTabWidget_SetCornerWidget2(this.h, w.cPointer(), (C.int)(corner)) } diff --git a/qt/gen_qtabwidget.h b/qt/gen_qtabwidget.h index 479ec6f..cbb1f29 100644 --- a/qt/gen_qtabwidget.h +++ b/qt/gen_qtabwidget.h @@ -34,7 +34,6 @@ QTabWidget* QTabWidget_new2(QWidget* parent); QMetaObject* QTabWidget_MetaObject(const QTabWidget* self); void* QTabWidget_Metacast(QTabWidget* self, const char* param1); struct miqt_string* QTabWidget_Tr(const char* s); -struct miqt_string* QTabWidget_TrUtf8(const char* s); int QTabWidget_AddTab(QTabWidget* self, QWidget* widget, struct miqt_string* param2); int QTabWidget_AddTab2(QTabWidget* self, QWidget* widget, QIcon* icon, struct miqt_string* label); int QTabWidget_InsertTab(QTabWidget* self, int index, QWidget* widget, struct miqt_string* param3); @@ -95,8 +94,6 @@ void QTabWidget_TabBarDoubleClicked(QTabWidget* self, int index); void QTabWidget_connect_TabBarDoubleClicked(QTabWidget* self, void* slot); 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, int corner); QWidget* QTabWidget_CornerWidget1(const QTabWidget* self, int corner); void QTabWidget_Delete(QTabWidget* self); diff --git a/qt/gen_qtemporarydir.cpp b/qt/gen_qtemporarydir.cpp index 451237e..7b03dff 100644 --- a/qt/gen_qtemporarydir.cpp +++ b/qt/gen_qtemporarydir.cpp @@ -15,6 +15,10 @@ QTemporaryDir* QTemporaryDir_new2(struct miqt_string* templateName) { return new QTemporaryDir(templateName_QString); } +void QTemporaryDir_Swap(QTemporaryDir* self, QTemporaryDir* other) { + self->swap(*other); +} + bool QTemporaryDir_IsValid(const QTemporaryDir* self) { return self->isValid(); } diff --git a/qt/gen_qtemporarydir.go b/qt/gen_qtemporarydir.go index ed57525..2eaf90d 100644 --- a/qt/gen_qtemporarydir.go +++ b/qt/gen_qtemporarydir.go @@ -49,6 +49,10 @@ func NewQTemporaryDir2(templateName string) *QTemporaryDir { return newQTemporaryDir(ret) } +func (this *QTemporaryDir) Swap(other *QTemporaryDir) { + C.QTemporaryDir_Swap(this.h, other.cPointer()) +} + func (this *QTemporaryDir) IsValid() bool { return (bool)(C.QTemporaryDir_IsValid(this.h)) } diff --git a/qt/gen_qtemporarydir.h b/qt/gen_qtemporarydir.h index 3df0c9f..c31645f 100644 --- a/qt/gen_qtemporarydir.h +++ b/qt/gen_qtemporarydir.h @@ -21,6 +21,7 @@ typedef struct QTemporaryDir QTemporaryDir; QTemporaryDir* QTemporaryDir_new(); QTemporaryDir* QTemporaryDir_new2(struct miqt_string* templateName); +void QTemporaryDir_Swap(QTemporaryDir* self, QTemporaryDir* other); bool QTemporaryDir_IsValid(const QTemporaryDir* self); struct miqt_string* QTemporaryDir_ErrorString(const QTemporaryDir* self); bool QTemporaryDir_AutoRemove(const QTemporaryDir* self); diff --git a/qt/gen_qtemporaryfile.cpp b/qt/gen_qtemporaryfile.cpp index 5c06736..86d945a 100644 --- a/qt/gen_qtemporaryfile.cpp +++ b/qt/gen_qtemporaryfile.cpp @@ -42,13 +42,6 @@ struct miqt_string* QTemporaryFile_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTemporaryFile_TrUtf8(const char* s) { - QString _ret = QTemporaryFile::trUtf8(s); - // 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()); -} - bool QTemporaryFile_AutoRemove(const QTemporaryFile* self) { return self->autoRemove(); } @@ -85,15 +78,6 @@ bool QTemporaryFile_Rename(QTemporaryFile* self, struct miqt_string* newName) { return self->rename(newName_QString); } -QTemporaryFile* QTemporaryFile_CreateLocalFile(struct miqt_string* fileName) { - QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); - return QTemporaryFile::createLocalFile(fileName_QString); -} - -QTemporaryFile* QTemporaryFile_CreateLocalFileWithFile(QFile* file) { - return QTemporaryFile::createLocalFile(*file); -} - QTemporaryFile* QTemporaryFile_CreateNativeFile(struct miqt_string* fileName) { QString fileName_QString = QString::fromUtf8(&fileName->data, fileName->len); return QTemporaryFile::createNativeFile(fileName_QString); @@ -117,20 +101,6 @@ struct miqt_string* QTemporaryFile_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTemporaryFile_TrUtf82(const char* s, const char* c) { - QString _ret = QTemporaryFile::trUtf8(s, c); - // 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* QTemporaryFile_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QTemporaryFile::trUtf8(s, c, static_cast(n)); - // 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 QTemporaryFile_Delete(QTemporaryFile* self) { delete self; } diff --git a/qt/gen_qtemporaryfile.go b/qt/gen_qtemporaryfile.go index 150f574..3202684 100644 --- a/qt/gen_qtemporaryfile.go +++ b/qt/gen_qtemporaryfile.go @@ -83,15 +83,6 @@ func QTemporaryFile_Tr(s string) string { return _ret } -func QTemporaryFile_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTemporaryFile_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QTemporaryFile) AutoRemove() bool { return (bool)(C.QTemporaryFile_AutoRemove(this.h)) } @@ -130,16 +121,6 @@ func (this *QTemporaryFile) Rename(newName string) bool { return (bool)(C.QTemporaryFile_Rename(this.h, (*C.struct_miqt_string)(newName_ms))) } -func QTemporaryFile_CreateLocalFile(fileName string) *QTemporaryFile { - fileName_ms := miqt_strdupg(fileName) - defer C.free(fileName_ms) - return newQTemporaryFile_U(unsafe.Pointer(C.QTemporaryFile_CreateLocalFile((*C.struct_miqt_string)(fileName_ms)))) -} - -func QTemporaryFile_CreateLocalFileWithFile(file *QFile) *QTemporaryFile { - return newQTemporaryFile_U(unsafe.Pointer(C.QTemporaryFile_CreateLocalFileWithFile(file.cPointer()))) -} - func QTemporaryFile_CreateNativeFile(fileName string) *QTemporaryFile { fileName_ms := miqt_strdupg(fileName) defer C.free(fileName_ms) @@ -172,28 +153,6 @@ func QTemporaryFile_Tr3(s string, c string, n int) string { return _ret } -func QTemporaryFile_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTemporaryFile_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QTemporaryFile_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTemporaryFile_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QTemporaryFile) Delete() { C.QTemporaryFile_Delete(this.h) diff --git a/qt/gen_qtemporaryfile.h b/qt/gen_qtemporaryfile.h index 45c4e26..67ab3f5 100644 --- a/qt/gen_qtemporaryfile.h +++ b/qt/gen_qtemporaryfile.h @@ -32,7 +32,6 @@ QTemporaryFile* QTemporaryFile_new4(struct miqt_string* templateName, QObject* p QMetaObject* QTemporaryFile_MetaObject(const QTemporaryFile* self); void* QTemporaryFile_Metacast(QTemporaryFile* self, const char* param1); struct miqt_string* QTemporaryFile_Tr(const char* s); -struct miqt_string* QTemporaryFile_TrUtf8(const char* s); bool QTemporaryFile_AutoRemove(const QTemporaryFile* self); void QTemporaryFile_SetAutoRemove(QTemporaryFile* self, bool b); bool QTemporaryFile_Open(QTemporaryFile* self); @@ -40,14 +39,10 @@ struct miqt_string* QTemporaryFile_FileName(const QTemporaryFile* self); struct miqt_string* QTemporaryFile_FileTemplate(const QTemporaryFile* self); void QTemporaryFile_SetFileTemplate(QTemporaryFile* self, struct miqt_string* name); bool QTemporaryFile_Rename(QTemporaryFile* self, struct miqt_string* newName); -QTemporaryFile* QTemporaryFile_CreateLocalFile(struct miqt_string* fileName); -QTemporaryFile* QTemporaryFile_CreateLocalFileWithFile(QFile* file); QTemporaryFile* QTemporaryFile_CreateNativeFile(struct miqt_string* fileName); QTemporaryFile* QTemporaryFile_CreateNativeFileWithFile(QFile* file); struct miqt_string* QTemporaryFile_Tr2(const char* s, const char* c); struct miqt_string* QTemporaryFile_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTemporaryFile_TrUtf82(const char* s, const char* c); -struct miqt_string* QTemporaryFile_TrUtf83(const char* s, const char* c, int n); void QTemporaryFile_Delete(QTemporaryFile* self); #ifdef __cplusplus diff --git a/qt/gen_qtestsupport_gui.cpp b/qt/gen_qtestsupport_gui.cpp new file mode 100644 index 0000000..1ee31e0 --- /dev/null +++ b/qt/gen_qtestsupport_gui.cpp @@ -0,0 +1,61 @@ +#include +#define WORKAROUND_INNER_CLASS_DEFINITION_QTest__QTouchEventSequence +#include +#include "qtestsupport_gui.h" +#include "gen_qtestsupport_gui.h" +#include "_cgo_export.h" + +QTest__QTouchEventSequence* QTest__QTouchEventSequence_Press(QTest__QTouchEventSequence* self, int touchId, QPoint* pt) { + QTest::QTouchEventSequence& _ret = self->press(static_cast(touchId), *pt); + // Cast returned reference into pointer + return &_ret; +} + +QTest__QTouchEventSequence* QTest__QTouchEventSequence_Move(QTest__QTouchEventSequence* self, int touchId, QPoint* pt) { + QTest::QTouchEventSequence& _ret = self->move(static_cast(touchId), *pt); + // Cast returned reference into pointer + return &_ret; +} + +QTest__QTouchEventSequence* QTest__QTouchEventSequence_Release(QTest__QTouchEventSequence* self, int touchId, QPoint* pt) { + QTest::QTouchEventSequence& _ret = self->release(static_cast(touchId), *pt); + // Cast returned reference into pointer + return &_ret; +} + +QTest__QTouchEventSequence* QTest__QTouchEventSequence_Stationary(QTest__QTouchEventSequence* self, int touchId) { + QTest::QTouchEventSequence& _ret = self->stationary(static_cast(touchId)); + // Cast returned reference into pointer + return &_ret; +} + +bool QTest__QTouchEventSequence_Commit(QTest__QTouchEventSequence* self) { + return self->commit(); +} + +QTest__QTouchEventSequence* QTest__QTouchEventSequence_Press3(QTest__QTouchEventSequence* self, int touchId, QPoint* pt, QWindow* window) { + QTest::QTouchEventSequence& _ret = self->press(static_cast(touchId), *pt, window); + // Cast returned reference into pointer + return &_ret; +} + +QTest__QTouchEventSequence* QTest__QTouchEventSequence_Move3(QTest__QTouchEventSequence* self, int touchId, QPoint* pt, QWindow* window) { + QTest::QTouchEventSequence& _ret = self->move(static_cast(touchId), *pt, window); + // Cast returned reference into pointer + return &_ret; +} + +QTest__QTouchEventSequence* QTest__QTouchEventSequence_Release3(QTest__QTouchEventSequence* self, int touchId, QPoint* pt, QWindow* window) { + QTest::QTouchEventSequence& _ret = self->release(static_cast(touchId), *pt, window); + // Cast returned reference into pointer + return &_ret; +} + +bool QTest__QTouchEventSequence_Commit1(QTest__QTouchEventSequence* self, bool processEvents) { + return self->commit(processEvents); +} + +void QTest__QTouchEventSequence_Delete(QTest__QTouchEventSequence* self) { + delete self; +} + diff --git a/qt/gen_qtestsupport_gui.go b/qt/gen_qtestsupport_gui.go new file mode 100644 index 0000000..4bdac4b --- /dev/null +++ b/qt/gen_qtestsupport_gui.go @@ -0,0 +1,86 @@ +package qt + +/* + +#include "gen_qtestsupport_gui.h" +#include + +*/ +import "C" + +import ( + "runtime" + "unsafe" +) + +type QTest__QTouchEventSequence struct { + h *C.QTest__QTouchEventSequence +} + +func (this *QTest__QTouchEventSequence) cPointer() *C.QTest__QTouchEventSequence { + if this == nil { + return nil + } + return this.h +} + +func newQTest__QTouchEventSequence(h *C.QTest__QTouchEventSequence) *QTest__QTouchEventSequence { + if h == nil { + return nil + } + return &QTest__QTouchEventSequence{h: h} +} + +func newQTest__QTouchEventSequence_U(h unsafe.Pointer) *QTest__QTouchEventSequence { + return newQTest__QTouchEventSequence((*C.QTest__QTouchEventSequence)(h)) +} + +func (this *QTest__QTouchEventSequence) Press(touchId int, pt *QPoint) *QTest__QTouchEventSequence { + return newQTest__QTouchEventSequence_U(unsafe.Pointer(C.QTest__QTouchEventSequence_Press(this.h, (C.int)(touchId), pt.cPointer()))) +} + +func (this *QTest__QTouchEventSequence) Move(touchId int, pt *QPoint) *QTest__QTouchEventSequence { + return newQTest__QTouchEventSequence_U(unsafe.Pointer(C.QTest__QTouchEventSequence_Move(this.h, (C.int)(touchId), pt.cPointer()))) +} + +func (this *QTest__QTouchEventSequence) Release(touchId int, pt *QPoint) *QTest__QTouchEventSequence { + return newQTest__QTouchEventSequence_U(unsafe.Pointer(C.QTest__QTouchEventSequence_Release(this.h, (C.int)(touchId), pt.cPointer()))) +} + +func (this *QTest__QTouchEventSequence) Stationary(touchId int) *QTest__QTouchEventSequence { + return newQTest__QTouchEventSequence_U(unsafe.Pointer(C.QTest__QTouchEventSequence_Stationary(this.h, (C.int)(touchId)))) +} + +func (this *QTest__QTouchEventSequence) Commit() bool { + return (bool)(C.QTest__QTouchEventSequence_Commit(this.h)) +} + +func (this *QTest__QTouchEventSequence) Press3(touchId int, pt *QPoint, window *QWindow) *QTest__QTouchEventSequence { + return newQTest__QTouchEventSequence_U(unsafe.Pointer(C.QTest__QTouchEventSequence_Press3(this.h, (C.int)(touchId), pt.cPointer(), window.cPointer()))) +} + +func (this *QTest__QTouchEventSequence) Move3(touchId int, pt *QPoint, window *QWindow) *QTest__QTouchEventSequence { + return newQTest__QTouchEventSequence_U(unsafe.Pointer(C.QTest__QTouchEventSequence_Move3(this.h, (C.int)(touchId), pt.cPointer(), window.cPointer()))) +} + +func (this *QTest__QTouchEventSequence) Release3(touchId int, pt *QPoint, window *QWindow) *QTest__QTouchEventSequence { + return newQTest__QTouchEventSequence_U(unsafe.Pointer(C.QTest__QTouchEventSequence_Release3(this.h, (C.int)(touchId), pt.cPointer(), window.cPointer()))) +} + +func (this *QTest__QTouchEventSequence) Commit1(processEvents bool) bool { + return (bool)(C.QTest__QTouchEventSequence_Commit1(this.h, (C.bool)(processEvents))) +} + +// Delete this object from C++ memory. +func (this *QTest__QTouchEventSequence) Delete() { + C.QTest__QTouchEventSequence_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QTest__QTouchEventSequence) GoGC() { + runtime.SetFinalizer(this, func(this *QTest__QTouchEventSequence) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} diff --git a/qt/gen_qtestsupport_gui.h b/qt/gen_qtestsupport_gui.h new file mode 100644 index 0000000..833e515 --- /dev/null +++ b/qt/gen_qtestsupport_gui.h @@ -0,0 +1,45 @@ +#ifndef GEN_QTESTSUPPORT_GUI_H +#define GEN_QTESTSUPPORT_GUI_H + +#include +#include +#include + +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + +#include "binding.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +class QPoint; +#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QTest__QTouchEventSequence) +typedef QTest::QTouchEventSequence QTest__QTouchEventSequence; +#else +class QTest__QTouchEventSequence; +#endif +class QWindow; +#else +typedef struct QPoint QPoint; +typedef struct QTest__QTouchEventSequence QTest__QTouchEventSequence; +typedef struct QWindow QWindow; +#endif + +QTest__QTouchEventSequence* QTest__QTouchEventSequence_Press(QTest__QTouchEventSequence* self, int touchId, QPoint* pt); +QTest__QTouchEventSequence* QTest__QTouchEventSequence_Move(QTest__QTouchEventSequence* self, int touchId, QPoint* pt); +QTest__QTouchEventSequence* QTest__QTouchEventSequence_Release(QTest__QTouchEventSequence* self, int touchId, QPoint* pt); +QTest__QTouchEventSequence* QTest__QTouchEventSequence_Stationary(QTest__QTouchEventSequence* self, int touchId); +bool QTest__QTouchEventSequence_Commit(QTest__QTouchEventSequence* self); +QTest__QTouchEventSequence* QTest__QTouchEventSequence_Press3(QTest__QTouchEventSequence* self, int touchId, QPoint* pt, QWindow* window); +QTest__QTouchEventSequence* QTest__QTouchEventSequence_Move3(QTest__QTouchEventSequence* self, int touchId, QPoint* pt, QWindow* window); +QTest__QTouchEventSequence* QTest__QTouchEventSequence_Release3(QTest__QTouchEventSequence* self, int touchId, QPoint* pt, QWindow* window); +bool QTest__QTouchEventSequence_Commit1(QTest__QTouchEventSequence* self, bool processEvents); +void QTest__QTouchEventSequence_Delete(QTest__QTouchEventSequence* self); + +#ifdef __cplusplus +} /* extern C */ +#endif + +#endif diff --git a/qt/gen_qtestsupport_widgets.cpp b/qt/gen_qtestsupport_widgets.cpp new file mode 100644 index 0000000..15875ef --- /dev/null +++ b/qt/gen_qtestsupport_widgets.cpp @@ -0,0 +1,65 @@ +#include +#define WORKAROUND_INNER_CLASS_DEFINITION_QTest__QTouchEventWidgetSequence +#include +#include "qtestsupport_widgets.h" +#include "gen_qtestsupport_widgets.h" +#include "_cgo_export.h" + +QTest__QTouchEventWidgetSequence* QTest__QTouchEventWidgetSequence_new(QTest__QTouchEventWidgetSequence* param1) { + return new QTest::QTouchEventWidgetSequence(*param1); +} + +QTest__QTouchEventWidgetSequence* QTest__QTouchEventWidgetSequence_Press(QTest__QTouchEventWidgetSequence* self, int touchId, QPoint* pt) { + QTest::QTouchEventWidgetSequence& _ret = self->press(static_cast(touchId), *pt); + // Cast returned reference into pointer + return &_ret; +} + +QTest__QTouchEventWidgetSequence* QTest__QTouchEventWidgetSequence_Move(QTest__QTouchEventWidgetSequence* self, int touchId, QPoint* pt) { + QTest::QTouchEventWidgetSequence& _ret = self->move(static_cast(touchId), *pt); + // Cast returned reference into pointer + return &_ret; +} + +QTest__QTouchEventWidgetSequence* QTest__QTouchEventWidgetSequence_Release(QTest__QTouchEventWidgetSequence* self, int touchId, QPoint* pt) { + QTest::QTouchEventWidgetSequence& _ret = self->release(static_cast(touchId), *pt); + // Cast returned reference into pointer + return &_ret; +} + +QTest__QTouchEventWidgetSequence* QTest__QTouchEventWidgetSequence_Stationary(QTest__QTouchEventWidgetSequence* self, int touchId) { + QTest::QTouchEventWidgetSequence& _ret = self->stationary(static_cast(touchId)); + // Cast returned reference into pointer + return &_ret; +} + +bool QTest__QTouchEventWidgetSequence_Commit(QTest__QTouchEventWidgetSequence* self) { + return self->commit(); +} + +QTest__QTouchEventWidgetSequence* QTest__QTouchEventWidgetSequence_Press3(QTest__QTouchEventWidgetSequence* self, int touchId, QPoint* pt, QWidget* widget) { + QTest::QTouchEventWidgetSequence& _ret = self->press(static_cast(touchId), *pt, widget); + // Cast returned reference into pointer + return &_ret; +} + +QTest__QTouchEventWidgetSequence* QTest__QTouchEventWidgetSequence_Move3(QTest__QTouchEventWidgetSequence* self, int touchId, QPoint* pt, QWidget* widget) { + QTest::QTouchEventWidgetSequence& _ret = self->move(static_cast(touchId), *pt, widget); + // Cast returned reference into pointer + return &_ret; +} + +QTest__QTouchEventWidgetSequence* QTest__QTouchEventWidgetSequence_Release3(QTest__QTouchEventWidgetSequence* self, int touchId, QPoint* pt, QWidget* widget) { + QTest::QTouchEventWidgetSequence& _ret = self->release(static_cast(touchId), *pt, widget); + // Cast returned reference into pointer + return &_ret; +} + +bool QTest__QTouchEventWidgetSequence_Commit1(QTest__QTouchEventWidgetSequence* self, bool processEvents) { + return self->commit(processEvents); +} + +void QTest__QTouchEventWidgetSequence_Delete(QTest__QTouchEventWidgetSequence* self) { + delete self; +} + diff --git a/qt/gen_qtestsupport_widgets.go b/qt/gen_qtestsupport_widgets.go new file mode 100644 index 0000000..0f54f08 --- /dev/null +++ b/qt/gen_qtestsupport_widgets.go @@ -0,0 +1,93 @@ +package qt + +/* + +#include "gen_qtestsupport_widgets.h" +#include + +*/ +import "C" + +import ( + "runtime" + "unsafe" +) + +type QTest__QTouchEventWidgetSequence struct { + h *C.QTest__QTouchEventWidgetSequence + *QTest__QTouchEventSequence +} + +func (this *QTest__QTouchEventWidgetSequence) cPointer() *C.QTest__QTouchEventWidgetSequence { + if this == nil { + return nil + } + return this.h +} + +func newQTest__QTouchEventWidgetSequence(h *C.QTest__QTouchEventWidgetSequence) *QTest__QTouchEventWidgetSequence { + if h == nil { + return nil + } + return &QTest__QTouchEventWidgetSequence{h: h, QTest__QTouchEventSequence: newQTest__QTouchEventSequence_U(unsafe.Pointer(h))} +} + +func newQTest__QTouchEventWidgetSequence_U(h unsafe.Pointer) *QTest__QTouchEventWidgetSequence { + return newQTest__QTouchEventWidgetSequence((*C.QTest__QTouchEventWidgetSequence)(h)) +} + +// NewQTest__QTouchEventWidgetSequence constructs a new QTest::QTouchEventWidgetSequence object. +func NewQTest__QTouchEventWidgetSequence(param1 *QTest__QTouchEventWidgetSequence) *QTest__QTouchEventWidgetSequence { + ret := C.QTest__QTouchEventWidgetSequence_new(param1.cPointer()) + return newQTest__QTouchEventWidgetSequence(ret) +} + +func (this *QTest__QTouchEventWidgetSequence) Press(touchId int, pt *QPoint) *QTest__QTouchEventWidgetSequence { + return newQTest__QTouchEventWidgetSequence_U(unsafe.Pointer(C.QTest__QTouchEventWidgetSequence_Press(this.h, (C.int)(touchId), pt.cPointer()))) +} + +func (this *QTest__QTouchEventWidgetSequence) Move(touchId int, pt *QPoint) *QTest__QTouchEventWidgetSequence { + return newQTest__QTouchEventWidgetSequence_U(unsafe.Pointer(C.QTest__QTouchEventWidgetSequence_Move(this.h, (C.int)(touchId), pt.cPointer()))) +} + +func (this *QTest__QTouchEventWidgetSequence) Release(touchId int, pt *QPoint) *QTest__QTouchEventWidgetSequence { + return newQTest__QTouchEventWidgetSequence_U(unsafe.Pointer(C.QTest__QTouchEventWidgetSequence_Release(this.h, (C.int)(touchId), pt.cPointer()))) +} + +func (this *QTest__QTouchEventWidgetSequence) Stationary(touchId int) *QTest__QTouchEventWidgetSequence { + return newQTest__QTouchEventWidgetSequence_U(unsafe.Pointer(C.QTest__QTouchEventWidgetSequence_Stationary(this.h, (C.int)(touchId)))) +} + +func (this *QTest__QTouchEventWidgetSequence) Commit() bool { + return (bool)(C.QTest__QTouchEventWidgetSequence_Commit(this.h)) +} + +func (this *QTest__QTouchEventWidgetSequence) Press3(touchId int, pt *QPoint, widget *QWidget) *QTest__QTouchEventWidgetSequence { + return newQTest__QTouchEventWidgetSequence_U(unsafe.Pointer(C.QTest__QTouchEventWidgetSequence_Press3(this.h, (C.int)(touchId), pt.cPointer(), widget.cPointer()))) +} + +func (this *QTest__QTouchEventWidgetSequence) Move3(touchId int, pt *QPoint, widget *QWidget) *QTest__QTouchEventWidgetSequence { + return newQTest__QTouchEventWidgetSequence_U(unsafe.Pointer(C.QTest__QTouchEventWidgetSequence_Move3(this.h, (C.int)(touchId), pt.cPointer(), widget.cPointer()))) +} + +func (this *QTest__QTouchEventWidgetSequence) Release3(touchId int, pt *QPoint, widget *QWidget) *QTest__QTouchEventWidgetSequence { + return newQTest__QTouchEventWidgetSequence_U(unsafe.Pointer(C.QTest__QTouchEventWidgetSequence_Release3(this.h, (C.int)(touchId), pt.cPointer(), widget.cPointer()))) +} + +func (this *QTest__QTouchEventWidgetSequence) Commit1(processEvents bool) bool { + return (bool)(C.QTest__QTouchEventWidgetSequence_Commit1(this.h, (C.bool)(processEvents))) +} + +// Delete this object from C++ memory. +func (this *QTest__QTouchEventWidgetSequence) Delete() { + C.QTest__QTouchEventWidgetSequence_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QTest__QTouchEventWidgetSequence) GoGC() { + runtime.SetFinalizer(this, func(this *QTest__QTouchEventWidgetSequence) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} diff --git a/qt/gen_qtestsupport_widgets.h b/qt/gen_qtestsupport_widgets.h new file mode 100644 index 0000000..cd2e252 --- /dev/null +++ b/qt/gen_qtestsupport_widgets.h @@ -0,0 +1,46 @@ +#ifndef GEN_QTESTSUPPORT_WIDGETS_H +#define GEN_QTESTSUPPORT_WIDGETS_H + +#include +#include +#include + +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + +#include "binding.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +class QPoint; +#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QTest__QTouchEventWidgetSequence) +typedef QTest::QTouchEventWidgetSequence QTest__QTouchEventWidgetSequence; +#else +class QTest__QTouchEventWidgetSequence; +#endif +class QWidget; +#else +typedef struct QPoint QPoint; +typedef struct QTest__QTouchEventWidgetSequence QTest__QTouchEventWidgetSequence; +typedef struct QWidget QWidget; +#endif + +QTest__QTouchEventWidgetSequence* QTest__QTouchEventWidgetSequence_new(QTest__QTouchEventWidgetSequence* param1); +QTest__QTouchEventWidgetSequence* QTest__QTouchEventWidgetSequence_Press(QTest__QTouchEventWidgetSequence* self, int touchId, QPoint* pt); +QTest__QTouchEventWidgetSequence* QTest__QTouchEventWidgetSequence_Move(QTest__QTouchEventWidgetSequence* self, int touchId, QPoint* pt); +QTest__QTouchEventWidgetSequence* QTest__QTouchEventWidgetSequence_Release(QTest__QTouchEventWidgetSequence* self, int touchId, QPoint* pt); +QTest__QTouchEventWidgetSequence* QTest__QTouchEventWidgetSequence_Stationary(QTest__QTouchEventWidgetSequence* self, int touchId); +bool QTest__QTouchEventWidgetSequence_Commit(QTest__QTouchEventWidgetSequence* self); +QTest__QTouchEventWidgetSequence* QTest__QTouchEventWidgetSequence_Press3(QTest__QTouchEventWidgetSequence* self, int touchId, QPoint* pt, QWidget* widget); +QTest__QTouchEventWidgetSequence* QTest__QTouchEventWidgetSequence_Move3(QTest__QTouchEventWidgetSequence* self, int touchId, QPoint* pt, QWidget* widget); +QTest__QTouchEventWidgetSequence* QTest__QTouchEventWidgetSequence_Release3(QTest__QTouchEventWidgetSequence* self, int touchId, QPoint* pt, QWidget* widget); +bool QTest__QTouchEventWidgetSequence_Commit1(QTest__QTouchEventWidgetSequence* self, bool processEvents); +void QTest__QTouchEventWidgetSequence_Delete(QTest__QTouchEventWidgetSequence* self); + +#ifdef __cplusplus +} /* extern C */ +#endif + +#endif diff --git a/qt/gen_qtextboundaryfinder.cpp b/qt/gen_qtextboundaryfinder.cpp index 998f87b..056211d 100644 --- a/qt/gen_qtextboundaryfinder.cpp +++ b/qt/gen_qtextboundaryfinder.cpp @@ -20,16 +20,16 @@ QTextBoundaryFinder* QTextBoundaryFinder_new3(int typeVal, struct miqt_string* s return new QTextBoundaryFinder(static_cast(typeVal), stringVal_QString); } -QTextBoundaryFinder* QTextBoundaryFinder_new4(int typeVal, QChar* chars, int length) { - return new QTextBoundaryFinder(static_cast(typeVal), chars, static_cast(length)); +QTextBoundaryFinder* QTextBoundaryFinder_new4(int typeVal, QChar* chars, ptrdiff_t length) { + return new QTextBoundaryFinder(static_cast(typeVal), chars, (qsizetype)(length)); } -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_new5(int typeVal, QChar* chars, ptrdiff_t length, unsigned char* buffer) { + return new QTextBoundaryFinder(static_cast(typeVal), chars, (qsizetype)(length), static_cast(buffer)); } -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)); +QTextBoundaryFinder* QTextBoundaryFinder_new6(int typeVal, QChar* chars, ptrdiff_t length, unsigned char* buffer, ptrdiff_t bufferSize) { + return new QTextBoundaryFinder(static_cast(typeVal), chars, (qsizetype)(length), static_cast(buffer), (qsizetype)(bufferSize)); } void QTextBoundaryFinder_OperatorAssign(QTextBoundaryFinder* self, QTextBoundaryFinder* other) { @@ -60,20 +60,23 @@ void QTextBoundaryFinder_ToEnd(QTextBoundaryFinder* self) { self->toEnd(); } -int QTextBoundaryFinder_Position(const QTextBoundaryFinder* self) { - return self->position(); +ptrdiff_t QTextBoundaryFinder_Position(const QTextBoundaryFinder* self) { + qsizetype _ret = self->position(); + return static_cast(_ret); } -void QTextBoundaryFinder_SetPosition(QTextBoundaryFinder* self, int position) { - self->setPosition(static_cast(position)); +void QTextBoundaryFinder_SetPosition(QTextBoundaryFinder* self, ptrdiff_t position) { + self->setPosition((qsizetype)(position)); } -int QTextBoundaryFinder_ToNextBoundary(QTextBoundaryFinder* self) { - return self->toNextBoundary(); +ptrdiff_t QTextBoundaryFinder_ToNextBoundary(QTextBoundaryFinder* self) { + qsizetype _ret = self->toNextBoundary(); + return static_cast(_ret); } -int QTextBoundaryFinder_ToPreviousBoundary(QTextBoundaryFinder* self) { - return self->toPreviousBoundary(); +ptrdiff_t QTextBoundaryFinder_ToPreviousBoundary(QTextBoundaryFinder* self) { + qsizetype _ret = self->toPreviousBoundary(); + return static_cast(_ret); } bool QTextBoundaryFinder_IsAtBoundary(const QTextBoundaryFinder* self) { diff --git a/qt/gen_qtextboundaryfinder.go b/qt/gen_qtextboundaryfinder.go index 6579e37..bb084df 100644 --- a/qt/gen_qtextboundaryfinder.go +++ b/qt/gen_qtextboundaryfinder.go @@ -76,20 +76,20 @@ func NewQTextBoundaryFinder3(typeVal QTextBoundaryFinder__BoundaryType, stringVa } // NewQTextBoundaryFinder4 constructs a new QTextBoundaryFinder object. -func NewQTextBoundaryFinder4(typeVal QTextBoundaryFinder__BoundaryType, chars *QChar, length int) *QTextBoundaryFinder { - ret := C.QTextBoundaryFinder_new4((C.int)(typeVal), chars.cPointer(), (C.int)(length)) +func NewQTextBoundaryFinder4(typeVal QTextBoundaryFinder__BoundaryType, chars *QChar, length int64) *QTextBoundaryFinder { + ret := C.QTextBoundaryFinder_new4((C.int)(typeVal), chars.cPointer(), (C.ptrdiff_t)(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.int)(typeVal), chars.cPointer(), (C.int)(length), (*C.uchar)(unsafe.Pointer(buffer))) +func NewQTextBoundaryFinder5(typeVal QTextBoundaryFinder__BoundaryType, chars *QChar, length int64, buffer *byte) *QTextBoundaryFinder { + ret := C.QTextBoundaryFinder_new5((C.int)(typeVal), chars.cPointer(), (C.ptrdiff_t)(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.int)(typeVal), chars.cPointer(), (C.int)(length), (*C.uchar)(unsafe.Pointer(buffer)), (C.int)(bufferSize)) +func NewQTextBoundaryFinder6(typeVal QTextBoundaryFinder__BoundaryType, chars *QChar, length int64, buffer *byte, bufferSize int64) *QTextBoundaryFinder { + ret := C.QTextBoundaryFinder_new6((C.int)(typeVal), chars.cPointer(), (C.ptrdiff_t)(length), (*C.uchar)(unsafe.Pointer(buffer)), (C.ptrdiff_t)(bufferSize)) return newQTextBoundaryFinder(ret) } @@ -120,20 +120,20 @@ func (this *QTextBoundaryFinder) ToEnd() { C.QTextBoundaryFinder_ToEnd(this.h) } -func (this *QTextBoundaryFinder) Position() int { - return (int)(C.QTextBoundaryFinder_Position(this.h)) +func (this *QTextBoundaryFinder) Position() int64 { + return (int64)(C.QTextBoundaryFinder_Position(this.h)) } -func (this *QTextBoundaryFinder) SetPosition(position int) { - C.QTextBoundaryFinder_SetPosition(this.h, (C.int)(position)) +func (this *QTextBoundaryFinder) SetPosition(position int64) { + C.QTextBoundaryFinder_SetPosition(this.h, (C.ptrdiff_t)(position)) } -func (this *QTextBoundaryFinder) ToNextBoundary() int { - return (int)(C.QTextBoundaryFinder_ToNextBoundary(this.h)) +func (this *QTextBoundaryFinder) ToNextBoundary() int64 { + return (int64)(C.QTextBoundaryFinder_ToNextBoundary(this.h)) } -func (this *QTextBoundaryFinder) ToPreviousBoundary() int { - return (int)(C.QTextBoundaryFinder_ToPreviousBoundary(this.h)) +func (this *QTextBoundaryFinder) ToPreviousBoundary() int64 { + return (int64)(C.QTextBoundaryFinder_ToPreviousBoundary(this.h)) } func (this *QTextBoundaryFinder) IsAtBoundary() bool { diff --git a/qt/gen_qtextboundaryfinder.h b/qt/gen_qtextboundaryfinder.h index d978bb4..5a2b4f3 100644 --- a/qt/gen_qtextboundaryfinder.h +++ b/qt/gen_qtextboundaryfinder.h @@ -24,19 +24,19 @@ typedef struct QTextBoundaryFinder QTextBoundaryFinder; QTextBoundaryFinder* QTextBoundaryFinder_new(); QTextBoundaryFinder* QTextBoundaryFinder_new2(QTextBoundaryFinder* other); 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); +QTextBoundaryFinder* QTextBoundaryFinder_new4(int typeVal, QChar* chars, ptrdiff_t length); +QTextBoundaryFinder* QTextBoundaryFinder_new5(int typeVal, QChar* chars, ptrdiff_t length, unsigned char* buffer); +QTextBoundaryFinder* QTextBoundaryFinder_new6(int typeVal, QChar* chars, ptrdiff_t length, unsigned char* buffer, ptrdiff_t bufferSize); void QTextBoundaryFinder_OperatorAssign(QTextBoundaryFinder* self, QTextBoundaryFinder* other); bool QTextBoundaryFinder_IsValid(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); -int QTextBoundaryFinder_Position(const QTextBoundaryFinder* self); -void QTextBoundaryFinder_SetPosition(QTextBoundaryFinder* self, int position); -int QTextBoundaryFinder_ToNextBoundary(QTextBoundaryFinder* self); -int QTextBoundaryFinder_ToPreviousBoundary(QTextBoundaryFinder* self); +ptrdiff_t QTextBoundaryFinder_Position(const QTextBoundaryFinder* self); +void QTextBoundaryFinder_SetPosition(QTextBoundaryFinder* self, ptrdiff_t position); +ptrdiff_t QTextBoundaryFinder_ToNextBoundary(QTextBoundaryFinder* self); +ptrdiff_t QTextBoundaryFinder_ToPreviousBoundary(QTextBoundaryFinder* self); bool QTextBoundaryFinder_IsAtBoundary(const QTextBoundaryFinder* self); int QTextBoundaryFinder_BoundaryReasons(const QTextBoundaryFinder* self); void QTextBoundaryFinder_Delete(QTextBoundaryFinder* self); diff --git a/qt/gen_qtextbrowser.cpp b/qt/gen_qtextbrowser.cpp index 1606d39..531e1ff 100644 --- a/qt/gen_qtextbrowser.cpp +++ b/qt/gen_qtextbrowser.cpp @@ -34,13 +34,6 @@ struct miqt_string* QTextBrowser_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTextBrowser_TrUtf8(const char* s) { - QString _ret = QTextBrowser::trUtf8(s); - // 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()); -} - QUrl* QTextBrowser_Source(const QTextBrowser* self) { return new QUrl(self->source()); } @@ -132,10 +125,6 @@ void QTextBrowser_SetSource(QTextBrowser* self, QUrl* name) { self->setSource(*name); } -void QTextBrowser_SetSource2(QTextBrowser* self, QUrl* name, int typeVal) { - self->setSource(*name, static_cast(typeVal)); -} - void QTextBrowser_Backward(QTextBrowser* self) { self->backward(); } @@ -210,21 +199,6 @@ void QTextBrowser_connect_Highlighted(QTextBrowser* self, void* slot) { }); } -void QTextBrowser_HighlightedWithQString(QTextBrowser* self, struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); - self->highlighted(param1_QString); -} - -void QTextBrowser_connect_HighlightedWithQString(QTextBrowser* self, void* slot) { - QTextBrowser::connect(self, static_cast(&QTextBrowser::highlighted), self, [=](const QString& param1) { - const QString param1_ret = param1; - // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory - QByteArray param1_b = param1_ret.toUtf8(); - struct miqt_string* sigval1 = miqt_strdup(param1_b.data(), param1_b.length()); - miqt_exec_callback_QTextBrowser_HighlightedWithQString(slot, sigval1); - }); -} - void QTextBrowser_AnchorClicked(QTextBrowser* self, QUrl* param1) { self->anchorClicked(*param1); } @@ -252,18 +226,8 @@ struct miqt_string* QTextBrowser_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTextBrowser_TrUtf82(const char* s, const char* c) { - QString _ret = QTextBrowser::trUtf8(s, c); - // 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* QTextBrowser_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QTextBrowser::trUtf8(s, c, static_cast(n)); - // 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 QTextBrowser_SetSource2(QTextBrowser* self, QUrl* name, int typeVal) { + self->setSource(*name, static_cast(typeVal)); } void QTextBrowser_Delete(QTextBrowser* self) { diff --git a/qt/gen_qtextbrowser.go b/qt/gen_qtextbrowser.go index 6438b2b..8a4473e 100644 --- a/qt/gen_qtextbrowser.go +++ b/qt/gen_qtextbrowser.go @@ -68,15 +68,6 @@ func QTextBrowser_Tr(s string) string { return _ret } -func QTextBrowser_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTextBrowser_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QTextBrowser) Source() *QUrl { _ret := C.QTextBrowser_Source(this.h) _goptr := newQUrl(_ret) @@ -177,10 +168,6 @@ func (this *QTextBrowser) SetSource(name *QUrl) { C.QTextBrowser_SetSource(this.h, name.cPointer()) } -func (this *QTextBrowser) SetSource2(name *QUrl, typeVal QTextDocument__ResourceType) { - C.QTextBrowser_SetSource2(this.h, name.cPointer(), (C.int)(typeVal)) -} - func (this *QTextBrowser) Backward() { C.QTextBrowser_Backward(this.h) } @@ -294,31 +281,6 @@ func miqt_exec_callback_QTextBrowser_Highlighted(cb *C.void, param1 *C.QUrl) { gofunc(slotval1) } -func (this *QTextBrowser) HighlightedWithQString(param1 string) { - param1_ms := miqt_strdupg(param1) - defer C.free(param1_ms) - C.QTextBrowser_HighlightedWithQString(this.h, (*C.struct_miqt_string)(param1_ms)) -} -func (this *QTextBrowser) OnHighlightedWithQString(slot func(param1 string)) { - C.QTextBrowser_connect_HighlightedWithQString(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) -} - -//export miqt_exec_callback_QTextBrowser_HighlightedWithQString -func miqt_exec_callback_QTextBrowser_HighlightedWithQString(cb *C.void, param1 *C.struct_miqt_string) { - gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 string)) - if !ok { - panic("miqt: callback of non-callback type (heap corruption?)") - } - - // Convert all CABI parameters to Go parameters - var param1_ms *C.struct_miqt_string = param1 - param1_ret := C.GoStringN(¶m1_ms.data, C.int(int64(param1_ms.len))) - C.free(unsafe.Pointer(param1_ms)) - slotval1 := param1_ret - - gofunc(slotval1) -} - func (this *QTextBrowser) AnchorClicked(param1 *QUrl) { C.QTextBrowser_AnchorClicked(this.h, param1.cPointer()) } @@ -361,26 +323,8 @@ func QTextBrowser_Tr3(s string, c string, n int) string { return _ret } -func QTextBrowser_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextBrowser_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QTextBrowser_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextBrowser_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret +func (this *QTextBrowser) SetSource2(name *QUrl, typeVal QTextDocument__ResourceType) { + C.QTextBrowser_SetSource2(this.h, name.cPointer(), (C.int)(typeVal)) } // Delete this object from C++ memory. diff --git a/qt/gen_qtextbrowser.h b/qt/gen_qtextbrowser.h index cc021bf..4bff2e5 100644 --- a/qt/gen_qtextbrowser.h +++ b/qt/gen_qtextbrowser.h @@ -32,7 +32,6 @@ QTextBrowser* QTextBrowser_new2(QWidget* parent); QMetaObject* QTextBrowser_MetaObject(const QTextBrowser* self); void* QTextBrowser_Metacast(QTextBrowser* self, const char* param1); struct miqt_string* QTextBrowser_Tr(const char* s); -struct miqt_string* QTextBrowser_TrUtf8(const char* s); QUrl* QTextBrowser_Source(const QTextBrowser* self); int QTextBrowser_SourceType(const QTextBrowser* self); struct miqt_array* QTextBrowser_SearchPaths(const QTextBrowser* self); @@ -50,7 +49,6 @@ 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, int typeVal); void QTextBrowser_Backward(QTextBrowser* self); void QTextBrowser_Forward(QTextBrowser* self); void QTextBrowser_Home(QTextBrowser* self); @@ -65,14 +63,11 @@ void QTextBrowser_SourceChanged(QTextBrowser* self, QUrl* param1); void QTextBrowser_connect_SourceChanged(QTextBrowser* self, void* slot); void QTextBrowser_Highlighted(QTextBrowser* self, QUrl* param1); void QTextBrowser_connect_Highlighted(QTextBrowser* self, void* slot); -void QTextBrowser_HighlightedWithQString(QTextBrowser* self, struct miqt_string* param1); -void QTextBrowser_connect_HighlightedWithQString(QTextBrowser* self, void* slot); void QTextBrowser_AnchorClicked(QTextBrowser* self, QUrl* param1); void QTextBrowser_connect_AnchorClicked(QTextBrowser* self, void* slot); struct miqt_string* QTextBrowser_Tr2(const char* s, const char* c); struct miqt_string* QTextBrowser_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTextBrowser_TrUtf82(const char* s, const char* c); -struct miqt_string* QTextBrowser_TrUtf83(const char* s, const char* c, int n); +void QTextBrowser_SetSource2(QTextBrowser* self, QUrl* name, int typeVal); void QTextBrowser_Delete(QTextBrowser* self); #ifdef __cplusplus diff --git a/qt/gen_qtextcodec.cpp b/qt/gen_qtextcodec.cpp deleted file mode 100644 index bea43ff..0000000 --- a/qt/gen_qtextcodec.cpp +++ /dev/null @@ -1,234 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#define WORKAROUND_INNER_CLASS_DEFINITION_QTextCodec__ConverterState -#include -#include -#include "qtextcodec.h" -#include "gen_qtextcodec.h" -#include "_cgo_export.h" - -QTextCodec* QTextCodec_CodecForName(QByteArray* name) { - return QTextCodec::codecForName(*name); -} - -QTextCodec* QTextCodec_CodecForNameWithName(const char* name) { - return QTextCodec::codecForName(name); -} - -QTextCodec* QTextCodec_CodecForMib(int mib) { - return QTextCodec::codecForMib(static_cast(mib)); -} - -struct miqt_array* QTextCodec_AvailableCodecs() { - QList _ret = QTextCodec::availableCodecs(); - // Convert QList<> from C++ memory to manually-managed C memory - QByteArray** _arr = static_cast(malloc(sizeof(QByteArray*) * _ret.length())); - for (size_t i = 0, e = _ret.length(); i < e; ++i) { - _arr[i] = new QByteArray(_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_array* QTextCodec_AvailableMibs() { - QList _ret = QTextCodec::availableMibs(); - // Convert QList<> from C++ memory to manually-managed C memory - int* _arr = static_cast(malloc(sizeof(int) * _ret.length())); - for (size_t i = 0, e = _ret.length(); i < e; ++i) { - _arr[i] = _ret[i]; - } - struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); - _out->len = _ret.length(); - _out->data = static_cast(_arr); - return _out; -} - -QTextCodec* QTextCodec_CodecForLocale() { - return QTextCodec::codecForLocale(); -} - -void QTextCodec_SetCodecForLocale(QTextCodec* c) { - QTextCodec::setCodecForLocale(c); -} - -QTextCodec* QTextCodec_CodecForHtml(QByteArray* ba) { - return QTextCodec::codecForHtml(*ba); -} - -QTextCodec* QTextCodec_CodecForHtml2(QByteArray* ba, QTextCodec* defaultCodec) { - return QTextCodec::codecForHtml(*ba, defaultCodec); -} - -QTextCodec* QTextCodec_CodecForUtfText(QByteArray* ba) { - return QTextCodec::codecForUtfText(*ba); -} - -QTextCodec* QTextCodec_CodecForUtfText2(QByteArray* ba, QTextCodec* defaultCodec) { - return QTextCodec::codecForUtfText(*ba, defaultCodec); -} - -bool QTextCodec_CanEncode(const QTextCodec* self, QChar* param1) { - return self->canEncode(*param1); -} - -bool QTextCodec_CanEncodeWithQString(const QTextCodec* self, struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); - return self->canEncode(param1_QString); -} - -struct miqt_string* QTextCodec_ToUnicode(const QTextCodec* self, QByteArray* param1) { - QString _ret = self->toUnicode(*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* QTextCodec_ToUnicodeWithChars(const QTextCodec* self, const char* chars) { - QString _ret = self->toUnicode(chars); - // 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()); -} - -QByteArray* QTextCodec_FromUnicode(const QTextCodec* self, struct miqt_string* uc) { - QString uc_QString = QString::fromUtf8(&uc->data, uc->len); - return new QByteArray(self->fromUnicode(uc_QString)); -} - -struct miqt_string* QTextCodec_ToUnicode2(const QTextCodec* self, const char* in, int length) { - QString _ret = self->toUnicode(in, static_cast(length)); - // 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()); -} - -QByteArray* QTextCodec_FromUnicode2(const QTextCodec* self, QChar* in, int length) { - return new QByteArray(self->fromUnicode(in, static_cast(length))); -} - -QTextDecoder* QTextCodec_MakeDecoder(const QTextCodec* self) { - return self->makeDecoder(); -} - -QTextEncoder* QTextCodec_MakeEncoder(const QTextCodec* self) { - return self->makeEncoder(); -} - -QByteArray* QTextCodec_Name(const QTextCodec* self) { - return new QByteArray(self->name()); -} - -struct miqt_array* QTextCodec_Aliases(const QTextCodec* self) { - QList _ret = self->aliases(); - // Convert QList<> from C++ memory to manually-managed C memory - QByteArray** _arr = static_cast(malloc(sizeof(QByteArray*) * _ret.length())); - for (size_t i = 0, e = _ret.length(); i < e; ++i) { - _arr[i] = new QByteArray(_ret[i]); - } - struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); - _out->len = _ret.length(); - _out->data = static_cast(_arr); - return _out; -} - -int QTextCodec_MibEnum(const QTextCodec* self) { - return self->mibEnum(); -} - -struct miqt_string* QTextCodec_ToUnicode3(const QTextCodec* self, const char* in, int length, QTextCodec__ConverterState* state) { - QString _ret = self->toUnicode(in, static_cast(length), state); - // 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()); -} - -QByteArray* QTextCodec_FromUnicode3(const QTextCodec* self, QChar* in, int length, QTextCodec__ConverterState* state) { - return new QByteArray(self->fromUnicode(in, static_cast(length), state)); -} - -QTextDecoder* QTextCodec_MakeDecoder1(const QTextCodec* self, int flags) { - return self->makeDecoder(static_cast(flags)); -} - -QTextEncoder* QTextCodec_MakeEncoder1(const QTextCodec* self, int flags) { - return self->makeEncoder(static_cast(flags)); -} - -QTextEncoder* QTextEncoder_new(QTextCodec* codec) { - return new QTextEncoder(codec); -} - -QTextEncoder* QTextEncoder_new2(QTextCodec* codec, int flags) { - return new QTextEncoder(codec, static_cast(flags)); -} - -QByteArray* QTextEncoder_FromUnicode(QTextEncoder* self, struct miqt_string* str) { - QString str_QString = QString::fromUtf8(&str->data, str->len); - return new QByteArray(self->fromUnicode(str_QString)); -} - -QByteArray* QTextEncoder_FromUnicode2(QTextEncoder* self, QChar* uc, int lenVal) { - return new QByteArray(self->fromUnicode(uc, static_cast(lenVal))); -} - -bool QTextEncoder_HasFailure(const QTextEncoder* self) { - return self->hasFailure(); -} - -void QTextEncoder_Delete(QTextEncoder* self) { - delete self; -} - -QTextDecoder* QTextDecoder_new(QTextCodec* codec) { - return new QTextDecoder(codec); -} - -QTextDecoder* QTextDecoder_new2(QTextCodec* codec, int flags) { - return new QTextDecoder(codec, static_cast(flags)); -} - -struct miqt_string* QTextDecoder_ToUnicode(QTextDecoder* self, const char* chars, int lenVal) { - QString _ret = self->toUnicode(chars, static_cast(lenVal)); - // 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* QTextDecoder_ToUnicodeWithBa(QTextDecoder* self, QByteArray* ba) { - QString _ret = self->toUnicode(*ba); - // 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()); -} - -bool QTextDecoder_HasFailure(const QTextDecoder* self) { - return self->hasFailure(); -} - -bool QTextDecoder_NeedsMoreData(const QTextDecoder* self) { - return self->needsMoreData(); -} - -void QTextDecoder_Delete(QTextDecoder* self) { - delete self; -} - -QTextCodec__ConverterState* QTextCodec__ConverterState_new() { - return new QTextCodec::ConverterState(); -} - -QTextCodec__ConverterState* QTextCodec__ConverterState_new2(int f) { - return new QTextCodec::ConverterState(static_cast(f)); -} - -void QTextCodec__ConverterState_Delete(QTextCodec__ConverterState* self) { - delete self; -} - diff --git a/qt/gen_qtextcodec.go b/qt/gen_qtextcodec.go deleted file mode 100644 index 80d6fde..0000000 --- a/qt/gen_qtextcodec.go +++ /dev/null @@ -1,404 +0,0 @@ -package qt - -/* - -#include "gen_qtextcodec.h" -#include - -*/ -import "C" - -import ( - "runtime" - "unsafe" -) - -type QTextCodec__ConversionFlag int - -const ( - QTextCodec__DefaultConversion QTextCodec__ConversionFlag = 0 - QTextCodec__ConvertInvalidToNull QTextCodec__ConversionFlag = 2147483648 - QTextCodec__IgnoreHeader QTextCodec__ConversionFlag = 1 - QTextCodec__FreeFunction QTextCodec__ConversionFlag = 2 -) - -type QTextCodec struct { - h *C.QTextCodec -} - -func (this *QTextCodec) cPointer() *C.QTextCodec { - if this == nil { - return nil - } - return this.h -} - -func newQTextCodec(h *C.QTextCodec) *QTextCodec { - if h == nil { - return nil - } - return &QTextCodec{h: h} -} - -func newQTextCodec_U(h unsafe.Pointer) *QTextCodec { - return newQTextCodec((*C.QTextCodec)(h)) -} - -func QTextCodec_CodecForName(name *QByteArray) *QTextCodec { - return newQTextCodec_U(unsafe.Pointer(C.QTextCodec_CodecForName(name.cPointer()))) -} - -func QTextCodec_CodecForNameWithName(name string) *QTextCodec { - name_Cstring := C.CString(name) - defer C.free(unsafe.Pointer(name_Cstring)) - return newQTextCodec_U(unsafe.Pointer(C.QTextCodec_CodecForNameWithName(name_Cstring))) -} - -func QTextCodec_CodecForMib(mib int) *QTextCodec { - return newQTextCodec_U(unsafe.Pointer(C.QTextCodec_CodecForMib((C.int)(mib)))) -} - -func QTextCodec_AvailableCodecs() []QByteArray { - var _ma *C.struct_miqt_array = C.QTextCodec_AvailableCodecs() - _ret := make([]QByteArray, int(_ma.len)) - _outCast := (*[0xffff]*C.QByteArray)(unsafe.Pointer(_ma.data)) // hey ya - for i := 0; i < int(_ma.len); i++ { - _lv_ret := _outCast[i] - _lv_goptr := newQByteArray(_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 QTextCodec_AvailableMibs() []int { - var _ma *C.struct_miqt_array = C.QTextCodec_AvailableMibs() - _ret := make([]int, int(_ma.len)) - _outCast := (*[0xffff]C.int)(unsafe.Pointer(_ma.data)) // hey ya - for i := 0; i < int(_ma.len); i++ { - _ret[i] = (int)(_outCast[i]) - } - C.free(unsafe.Pointer(_ma)) - return _ret -} - -func QTextCodec_CodecForLocale() *QTextCodec { - return newQTextCodec_U(unsafe.Pointer(C.QTextCodec_CodecForLocale())) -} - -func QTextCodec_SetCodecForLocale(c *QTextCodec) { - C.QTextCodec_SetCodecForLocale(c.cPointer()) -} - -func QTextCodec_CodecForHtml(ba *QByteArray) *QTextCodec { - return newQTextCodec_U(unsafe.Pointer(C.QTextCodec_CodecForHtml(ba.cPointer()))) -} - -func QTextCodec_CodecForHtml2(ba *QByteArray, defaultCodec *QTextCodec) *QTextCodec { - return newQTextCodec_U(unsafe.Pointer(C.QTextCodec_CodecForHtml2(ba.cPointer(), defaultCodec.cPointer()))) -} - -func QTextCodec_CodecForUtfText(ba *QByteArray) *QTextCodec { - return newQTextCodec_U(unsafe.Pointer(C.QTextCodec_CodecForUtfText(ba.cPointer()))) -} - -func QTextCodec_CodecForUtfText2(ba *QByteArray, defaultCodec *QTextCodec) *QTextCodec { - return newQTextCodec_U(unsafe.Pointer(C.QTextCodec_CodecForUtfText2(ba.cPointer(), defaultCodec.cPointer()))) -} - -func (this *QTextCodec) CanEncode(param1 QChar) bool { - return (bool)(C.QTextCodec_CanEncode(this.h, param1.cPointer())) -} - -func (this *QTextCodec) CanEncodeWithQString(param1 string) bool { - param1_ms := miqt_strdupg(param1) - defer C.free(param1_ms) - return (bool)(C.QTextCodec_CanEncodeWithQString(this.h, (*C.struct_miqt_string)(param1_ms))) -} - -func (this *QTextCodec) ToUnicode(param1 *QByteArray) string { - var _ms *C.struct_miqt_string = C.QTextCodec_ToUnicode(this.h, param1.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QTextCodec) ToUnicodeWithChars(chars string) string { - chars_Cstring := C.CString(chars) - defer C.free(unsafe.Pointer(chars_Cstring)) - var _ms *C.struct_miqt_string = C.QTextCodec_ToUnicodeWithChars(this.h, chars_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QTextCodec) FromUnicode(uc string) *QByteArray { - uc_ms := miqt_strdupg(uc) - defer C.free(uc_ms) - _ret := C.QTextCodec_FromUnicode(this.h, (*C.struct_miqt_string)(uc_ms)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QTextCodec) ToUnicode2(in string, length int) string { - in_Cstring := C.CString(in) - defer C.free(unsafe.Pointer(in_Cstring)) - var _ms *C.struct_miqt_string = C.QTextCodec_ToUnicode2(this.h, in_Cstring, (C.int)(length)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QTextCodec) FromUnicode2(in *QChar, length int) *QByteArray { - _ret := C.QTextCodec_FromUnicode2(this.h, in.cPointer(), (C.int)(length)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QTextCodec) MakeDecoder() *QTextDecoder { - return newQTextDecoder_U(unsafe.Pointer(C.QTextCodec_MakeDecoder(this.h))) -} - -func (this *QTextCodec) MakeEncoder() *QTextEncoder { - return newQTextEncoder_U(unsafe.Pointer(C.QTextCodec_MakeEncoder(this.h))) -} - -func (this *QTextCodec) Name() *QByteArray { - _ret := C.QTextCodec_Name(this.h) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QTextCodec) Aliases() []QByteArray { - var _ma *C.struct_miqt_array = C.QTextCodec_Aliases(this.h) - _ret := make([]QByteArray, int(_ma.len)) - _outCast := (*[0xffff]*C.QByteArray)(unsafe.Pointer(_ma.data)) // hey ya - for i := 0; i < int(_ma.len); i++ { - _lv_ret := _outCast[i] - _lv_goptr := newQByteArray(_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 *QTextCodec) MibEnum() int { - return (int)(C.QTextCodec_MibEnum(this.h)) -} - -func (this *QTextCodec) ToUnicode3(in string, length int, state *QTextCodec__ConverterState) string { - in_Cstring := C.CString(in) - defer C.free(unsafe.Pointer(in_Cstring)) - var _ms *C.struct_miqt_string = C.QTextCodec_ToUnicode3(this.h, in_Cstring, (C.int)(length), state.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QTextCodec) FromUnicode3(in *QChar, length int, state *QTextCodec__ConverterState) *QByteArray { - _ret := C.QTextCodec_FromUnicode3(this.h, in.cPointer(), (C.int)(length), state.cPointer()) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QTextCodec) MakeDecoder1(flags QTextCodec__ConversionFlag) *QTextDecoder { - return newQTextDecoder_U(unsafe.Pointer(C.QTextCodec_MakeDecoder1(this.h, (C.int)(flags)))) -} - -func (this *QTextCodec) MakeEncoder1(flags QTextCodec__ConversionFlag) *QTextEncoder { - return newQTextEncoder_U(unsafe.Pointer(C.QTextCodec_MakeEncoder1(this.h, (C.int)(flags)))) -} - -type QTextEncoder struct { - h *C.QTextEncoder -} - -func (this *QTextEncoder) cPointer() *C.QTextEncoder { - if this == nil { - return nil - } - return this.h -} - -func newQTextEncoder(h *C.QTextEncoder) *QTextEncoder { - if h == nil { - return nil - } - return &QTextEncoder{h: h} -} - -func newQTextEncoder_U(h unsafe.Pointer) *QTextEncoder { - return newQTextEncoder((*C.QTextEncoder)(h)) -} - -// NewQTextEncoder constructs a new QTextEncoder object. -func NewQTextEncoder(codec *QTextCodec) *QTextEncoder { - ret := C.QTextEncoder_new(codec.cPointer()) - return newQTextEncoder(ret) -} - -// NewQTextEncoder2 constructs a new QTextEncoder object. -func NewQTextEncoder2(codec *QTextCodec, flags QTextCodec__ConversionFlag) *QTextEncoder { - ret := C.QTextEncoder_new2(codec.cPointer(), (C.int)(flags)) - return newQTextEncoder(ret) -} - -func (this *QTextEncoder) FromUnicode(str string) *QByteArray { - str_ms := miqt_strdupg(str) - defer C.free(str_ms) - _ret := C.QTextEncoder_FromUnicode(this.h, (*C.struct_miqt_string)(str_ms)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QTextEncoder) FromUnicode2(uc *QChar, lenVal int) *QByteArray { - _ret := C.QTextEncoder_FromUnicode2(this.h, uc.cPointer(), (C.int)(lenVal)) - _goptr := newQByteArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QTextEncoder) HasFailure() bool { - return (bool)(C.QTextEncoder_HasFailure(this.h)) -} - -// Delete this object from C++ memory. -func (this *QTextEncoder) Delete() { - C.QTextEncoder_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QTextEncoder) GoGC() { - runtime.SetFinalizer(this, func(this *QTextEncoder) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} - -type QTextDecoder struct { - h *C.QTextDecoder -} - -func (this *QTextDecoder) cPointer() *C.QTextDecoder { - if this == nil { - return nil - } - return this.h -} - -func newQTextDecoder(h *C.QTextDecoder) *QTextDecoder { - if h == nil { - return nil - } - return &QTextDecoder{h: h} -} - -func newQTextDecoder_U(h unsafe.Pointer) *QTextDecoder { - return newQTextDecoder((*C.QTextDecoder)(h)) -} - -// NewQTextDecoder constructs a new QTextDecoder object. -func NewQTextDecoder(codec *QTextCodec) *QTextDecoder { - ret := C.QTextDecoder_new(codec.cPointer()) - return newQTextDecoder(ret) -} - -// NewQTextDecoder2 constructs a new QTextDecoder object. -func NewQTextDecoder2(codec *QTextCodec, flags QTextCodec__ConversionFlag) *QTextDecoder { - ret := C.QTextDecoder_new2(codec.cPointer(), (C.int)(flags)) - return newQTextDecoder(ret) -} - -func (this *QTextDecoder) ToUnicode(chars string, lenVal int) string { - chars_Cstring := C.CString(chars) - defer C.free(unsafe.Pointer(chars_Cstring)) - var _ms *C.struct_miqt_string = C.QTextDecoder_ToUnicode(this.h, chars_Cstring, (C.int)(lenVal)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QTextDecoder) ToUnicodeWithBa(ba *QByteArray) string { - var _ms *C.struct_miqt_string = C.QTextDecoder_ToUnicodeWithBa(this.h, ba.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QTextDecoder) HasFailure() bool { - return (bool)(C.QTextDecoder_HasFailure(this.h)) -} - -func (this *QTextDecoder) NeedsMoreData() bool { - return (bool)(C.QTextDecoder_NeedsMoreData(this.h)) -} - -// Delete this object from C++ memory. -func (this *QTextDecoder) Delete() { - C.QTextDecoder_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QTextDecoder) GoGC() { - runtime.SetFinalizer(this, func(this *QTextDecoder) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} - -type QTextCodec__ConverterState struct { - h *C.QTextCodec__ConverterState -} - -func (this *QTextCodec__ConverterState) cPointer() *C.QTextCodec__ConverterState { - if this == nil { - return nil - } - return this.h -} - -func newQTextCodec__ConverterState(h *C.QTextCodec__ConverterState) *QTextCodec__ConverterState { - if h == nil { - return nil - } - return &QTextCodec__ConverterState{h: h} -} - -func newQTextCodec__ConverterState_U(h unsafe.Pointer) *QTextCodec__ConverterState { - return newQTextCodec__ConverterState((*C.QTextCodec__ConverterState)(h)) -} - -// NewQTextCodec__ConverterState constructs a new QTextCodec::ConverterState object. -func NewQTextCodec__ConverterState() *QTextCodec__ConverterState { - ret := C.QTextCodec__ConverterState_new() - return newQTextCodec__ConverterState(ret) -} - -// NewQTextCodec__ConverterState2 constructs a new QTextCodec::ConverterState object. -func NewQTextCodec__ConverterState2(f QTextCodec__ConversionFlag) *QTextCodec__ConverterState { - ret := C.QTextCodec__ConverterState_new2((C.int)(f)) - return newQTextCodec__ConverterState(ret) -} - -// Delete this object from C++ memory. -func (this *QTextCodec__ConverterState) Delete() { - C.QTextCodec__ConverterState_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QTextCodec__ConverterState) GoGC() { - runtime.SetFinalizer(this, func(this *QTextCodec__ConverterState) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} diff --git a/qt/gen_qtextcodec.h b/qt/gen_qtextcodec.h deleted file mode 100644 index d494043..0000000 --- a/qt/gen_qtextcodec.h +++ /dev/null @@ -1,87 +0,0 @@ -#ifndef GEN_QTEXTCODEC_H -#define GEN_QTEXTCODEC_H - -#include -#include -#include - -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - -#include "binding.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __cplusplus -class QByteArray; -class QChar; -class QTextCodec; -#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QTextCodec__ConverterState) -typedef QTextCodec::ConverterState QTextCodec__ConverterState; -#else -class QTextCodec__ConverterState; -#endif -class QTextDecoder; -class QTextEncoder; -#else -typedef struct QByteArray QByteArray; -typedef struct QChar QChar; -typedef struct QTextCodec QTextCodec; -typedef struct QTextCodec__ConverterState QTextCodec__ConverterState; -typedef struct QTextDecoder QTextDecoder; -typedef struct QTextEncoder QTextEncoder; -#endif - -QTextCodec* QTextCodec_CodecForName(QByteArray* name); -QTextCodec* QTextCodec_CodecForNameWithName(const char* name); -QTextCodec* QTextCodec_CodecForMib(int mib); -struct miqt_array* QTextCodec_AvailableCodecs(); -struct miqt_array* QTextCodec_AvailableMibs(); -QTextCodec* QTextCodec_CodecForLocale(); -void QTextCodec_SetCodecForLocale(QTextCodec* c); -QTextCodec* QTextCodec_CodecForHtml(QByteArray* ba); -QTextCodec* QTextCodec_CodecForHtml2(QByteArray* ba, QTextCodec* defaultCodec); -QTextCodec* QTextCodec_CodecForUtfText(QByteArray* ba); -QTextCodec* QTextCodec_CodecForUtfText2(QByteArray* ba, QTextCodec* defaultCodec); -bool QTextCodec_CanEncode(const QTextCodec* self, QChar* param1); -bool QTextCodec_CanEncodeWithQString(const QTextCodec* self, struct miqt_string* param1); -struct miqt_string* QTextCodec_ToUnicode(const QTextCodec* self, QByteArray* param1); -struct miqt_string* QTextCodec_ToUnicodeWithChars(const QTextCodec* self, const char* chars); -QByteArray* QTextCodec_FromUnicode(const QTextCodec* self, struct miqt_string* uc); -struct miqt_string* QTextCodec_ToUnicode2(const QTextCodec* self, const char* in, int length); -QByteArray* QTextCodec_FromUnicode2(const QTextCodec* self, QChar* in, int length); -QTextDecoder* QTextCodec_MakeDecoder(const QTextCodec* self); -QTextEncoder* QTextCodec_MakeEncoder(const QTextCodec* self); -QByteArray* QTextCodec_Name(const QTextCodec* self); -struct miqt_array* QTextCodec_Aliases(const QTextCodec* self); -int QTextCodec_MibEnum(const QTextCodec* self); -struct miqt_string* QTextCodec_ToUnicode3(const QTextCodec* self, const char* in, int length, QTextCodec__ConverterState* state); -QByteArray* QTextCodec_FromUnicode3(const QTextCodec* self, QChar* in, int length, QTextCodec__ConverterState* state); -QTextDecoder* QTextCodec_MakeDecoder1(const QTextCodec* self, int flags); -QTextEncoder* QTextCodec_MakeEncoder1(const QTextCodec* self, int flags); - -QTextEncoder* QTextEncoder_new(QTextCodec* codec); -QTextEncoder* QTextEncoder_new2(QTextCodec* codec, int flags); -QByteArray* QTextEncoder_FromUnicode(QTextEncoder* self, struct miqt_string* str); -QByteArray* QTextEncoder_FromUnicode2(QTextEncoder* self, QChar* uc, int lenVal); -bool QTextEncoder_HasFailure(const QTextEncoder* self); -void QTextEncoder_Delete(QTextEncoder* self); - -QTextDecoder* QTextDecoder_new(QTextCodec* codec); -QTextDecoder* QTextDecoder_new2(QTextCodec* codec, int flags); -struct miqt_string* QTextDecoder_ToUnicode(QTextDecoder* self, const char* chars, int lenVal); -struct miqt_string* QTextDecoder_ToUnicodeWithBa(QTextDecoder* self, QByteArray* ba); -bool QTextDecoder_HasFailure(const QTextDecoder* self); -bool QTextDecoder_NeedsMoreData(const QTextDecoder* self); -void QTextDecoder_Delete(QTextDecoder* self); - -QTextCodec__ConverterState* QTextCodec__ConverterState_new(); -QTextCodec__ConverterState* QTextCodec__ConverterState_new2(int f); -void QTextCodec__ConverterState_Delete(QTextCodec__ConverterState* self); - -#ifdef __cplusplus -} /* extern C */ -#endif - -#endif diff --git a/qt/gen_qtextcursor.cpp b/qt/gen_qtextcursor.cpp index 525cb5a..c0a2ce5 100644 --- a/qt/gen_qtextcursor.cpp +++ b/qt/gen_qtextcursor.cpp @@ -273,6 +273,11 @@ void QTextCursor_InsertHtml(QTextCursor* self, struct miqt_string* html) { self->insertHtml(html_QString); } +void QTextCursor_InsertMarkdown(QTextCursor* self, struct miqt_string* markdown) { + QString markdown_QString = QString::fromUtf8(&markdown->data, markdown->len); + self->insertMarkdown(markdown_QString); +} + void QTextCursor_InsertImage(QTextCursor* self, QTextImageFormat* format, int alignment) { self->insertImage(*format, static_cast(alignment)); } @@ -354,6 +359,11 @@ bool QTextCursor_MovePosition3(QTextCursor* self, int op, int param2, int n) { return self->movePosition(static_cast(op), static_cast(param2), static_cast(n)); } +void QTextCursor_InsertMarkdown2(QTextCursor* self, struct miqt_string* markdown, int features) { + QString markdown_QString = QString::fromUtf8(&markdown->data, markdown->len); + self->insertMarkdown(markdown_QString, static_cast(features)); +} + void QTextCursor_InsertImage2(QTextCursor* self, QImage* image, struct miqt_string* name) { QString name_QString = QString::fromUtf8(&name->data, name->len); self->insertImage(*image, name_QString); diff --git a/qt/gen_qtextcursor.go b/qt/gen_qtextcursor.go index 34d317f..1463e41 100644 --- a/qt/gen_qtextcursor.go +++ b/qt/gen_qtextcursor.go @@ -363,6 +363,12 @@ func (this *QTextCursor) InsertHtml(html string) { C.QTextCursor_InsertHtml(this.h, (*C.struct_miqt_string)(html_ms)) } +func (this *QTextCursor) InsertMarkdown(markdown string) { + markdown_ms := miqt_strdupg(markdown) + defer C.free(markdown_ms) + C.QTextCursor_InsertMarkdown(this.h, (*C.struct_miqt_string)(markdown_ms)) +} + func (this *QTextCursor) InsertImage(format *QTextImageFormat, alignment QTextFrameFormat__Position) { C.QTextCursor_InsertImage(this.h, format.cPointer(), (C.int)(alignment)) } @@ -445,6 +451,12 @@ func (this *QTextCursor) MovePosition3(op QTextCursor__MoveOperation, param2 QTe return (bool)(C.QTextCursor_MovePosition3(this.h, (C.int)(op), (C.int)(param2), (C.int)(n))) } +func (this *QTextCursor) InsertMarkdown2(markdown string, features QTextDocument__MarkdownFeature) { + markdown_ms := miqt_strdupg(markdown) + defer C.free(markdown_ms) + C.QTextCursor_InsertMarkdown2(this.h, (*C.struct_miqt_string)(markdown_ms), (C.int)(features)) +} + func (this *QTextCursor) InsertImage2(image *QImage, name string) { name_ms := miqt_strdupg(name) defer C.free(name_ms) diff --git a/qt/gen_qtextcursor.h b/qt/gen_qtextcursor.h index 0375461..b1a12b6 100644 --- a/qt/gen_qtextcursor.h +++ b/qt/gen_qtextcursor.h @@ -107,6 +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_InsertMarkdown(QTextCursor* self, struct miqt_string* markdown); 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); @@ -127,6 +128,7 @@ QTextDocument* QTextCursor_Document(const QTextCursor* self); 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_InsertMarkdown2(QTextCursor* self, struct miqt_string* markdown, int features); 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 cb9c27c..71075b4 100644 --- a/qt/gen_qtextdocument.cpp +++ b/qt/gen_qtextdocument.cpp @@ -1,6 +1,5 @@ #include #include -#include #include #include #include @@ -9,7 +8,6 @@ #include #include #include -#include #include #include #include @@ -77,13 +75,6 @@ struct miqt_string* QTextDocument_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTextDocument_TrUtf8(const char* s) { - QString _ret = QTextDocument::trUtf8(s); - // 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()); -} - QTextDocument* QTextDocument_Clone(const QTextDocument* self) { return self->clone(); } @@ -201,19 +192,11 @@ QTextCursor* QTextDocument_Find2(const QTextDocument* self, struct miqt_string* return new QTextCursor(self->find(subString_QString, *cursor)); } -QTextCursor* QTextDocument_FindWithExpr(const QTextDocument* self, QRegExp* expr) { +QTextCursor* QTextDocument_FindWithExpr(const QTextDocument* self, QRegularExpression* expr) { return new QTextCursor(self->find(*expr)); } -QTextCursor* QTextDocument_Find3(const QTextDocument* self, QRegExp* expr, QTextCursor* cursor) { - return new QTextCursor(self->find(*expr, *cursor)); -} - -QTextCursor* QTextDocument_Find4(const QTextDocument* self, QRegularExpression* expr) { - return new QTextCursor(self->find(*expr)); -} - -QTextCursor* QTextDocument_Find5(const QTextDocument* self, QRegularExpression* expr, QTextCursor* cursor) { +QTextCursor* QTextDocument_Find3(const QTextDocument* self, QRegularExpression* expr, QTextCursor* cursor) { return new QTextCursor(self->find(*expr, *cursor)); } @@ -277,6 +260,33 @@ QFont* QTextDocument_DefaultFont(const QTextDocument* self) { return new QFont(self->defaultFont()); } +void QTextDocument_SetSuperScriptBaseline(QTextDocument* self, double baseline) { + self->setSuperScriptBaseline(static_cast(baseline)); +} + +double QTextDocument_SuperScriptBaseline(const QTextDocument* self) { + qreal _ret = self->superScriptBaseline(); + return static_cast(_ret); +} + +void QTextDocument_SetSubScriptBaseline(QTextDocument* self, double baseline) { + self->setSubScriptBaseline(static_cast(baseline)); +} + +double QTextDocument_SubScriptBaseline(const QTextDocument* self) { + qreal _ret = self->subScriptBaseline(); + return static_cast(_ret); +} + +void QTextDocument_SetBaselineOffset(QTextDocument* self, double baseline) { + self->setBaselineOffset(static_cast(baseline)); +} + +double QTextDocument_BaselineOffset(const QTextDocument* self) { + qreal _ret = self->baselineOffset(); + return static_cast(_ret); +} + int QTextDocument_PageCount(const QTextDocument* self) { return self->pageCount(); } @@ -298,7 +308,7 @@ void QTextDocument_AddResource(QTextDocument* self, int typeVal, QUrl* name, QVa } struct miqt_array* QTextDocument_AllFormats(const QTextDocument* self) { - QVector _ret = self->allFormats(); + QList _ret = self->allFormats(); // Convert QList<> from C++ memory to manually-managed C memory QTextFormat** _arr = static_cast(malloc(sizeof(QTextFormat*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -322,6 +332,14 @@ bool QTextDocument_UseDesignMetrics(const QTextDocument* self) { return self->useDesignMetrics(); } +void QTextDocument_SetLayoutEnabled(QTextDocument* self, bool b) { + self->setLayoutEnabled(b); +} + +bool QTextDocument_IsLayoutEnabled(const QTextDocument* self) { + return self->isLayoutEnabled(); +} + void QTextDocument_DrawContents(QTextDocument* self, QPainter* painter) { self->drawContents(painter); } @@ -578,31 +596,10 @@ struct miqt_string* QTextDocument_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTextDocument_TrUtf82(const char* s, const char* c) { - QString _ret = QTextDocument::trUtf8(s, c); - // 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* QTextDocument_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QTextDocument::trUtf8(s, c, static_cast(n)); - // 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()); -} - QTextDocument* QTextDocument_Clone1(const QTextDocument* self, QObject* parent) { return self->clone(parent); } -struct miqt_string* QTextDocument_ToHtml1(const QTextDocument* self, QByteArray* encoding) { - QString _ret = self->toHtml(*encoding); - // 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* QTextDocument_ToMarkdown1(const QTextDocument* self, int features) { QString _ret = self->toMarkdown(static_cast(features)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -630,27 +627,15 @@ QTextCursor* QTextDocument_Find33(const QTextDocument* self, struct miqt_string* return new QTextCursor(self->find(subString_QString, *cursor, static_cast(options))); } -QTextCursor* QTextDocument_Find23(const QTextDocument* self, QRegExp* expr, int from) { +QTextCursor* QTextDocument_Find23(const QTextDocument* self, QRegularExpression* expr, int from) { return new QTextCursor(self->find(*expr, static_cast(from))); } -QTextCursor* QTextDocument_Find34(const QTextDocument* self, QRegExp* expr, int from, int options) { +QTextCursor* QTextDocument_Find34(const QTextDocument* self, QRegularExpression* expr, int from, int options) { return new QTextCursor(self->find(*expr, static_cast(from), static_cast(options))); } -QTextCursor* QTextDocument_Find35(const QTextDocument* self, QRegExp* expr, QTextCursor* cursor, int options) { - return new QTextCursor(self->find(*expr, *cursor, static_cast(options))); -} - -QTextCursor* QTextDocument_Find24(const QTextDocument* self, QRegularExpression* expr, int from) { - return new QTextCursor(self->find(*expr, static_cast(from))); -} - -QTextCursor* QTextDocument_Find36(const QTextDocument* self, QRegularExpression* expr, int from, int options) { - return new QTextCursor(self->find(*expr, static_cast(from), static_cast(options))); -} - -QTextCursor* QTextDocument_Find37(const QTextDocument* self, QRegularExpression* expr, QTextCursor* cursor, int options) { +QTextCursor* QTextDocument_Find35(const QTextDocument* self, QRegularExpression* expr, QTextCursor* cursor, int options) { return new QTextCursor(self->find(*expr, *cursor, static_cast(options))); } diff --git a/qt/gen_qtextdocument.go b/qt/gen_qtextdocument.go index e6074b4..be13f56 100644 --- a/qt/gen_qtextdocument.go +++ b/qt/gen_qtextdocument.go @@ -19,6 +19,7 @@ type QTextDocument__MetaInformation int const ( QTextDocument__DocumentTitle QTextDocument__MetaInformation = 0 QTextDocument__DocumentUrl QTextDocument__MetaInformation = 1 + QTextDocument__CssMedia QTextDocument__MetaInformation = 2 ) type QTextDocument__MarkdownFeature int @@ -26,7 +27,7 @@ type QTextDocument__MarkdownFeature int const ( QTextDocument__MarkdownNoHTML QTextDocument__MarkdownFeature = 96 QTextDocument__MarkdownDialectCommonMark QTextDocument__MarkdownFeature = 0 - QTextDocument__MarkdownDialectGitHub QTextDocument__MarkdownFeature = 3852 + QTextDocument__MarkdownDialectGitHub QTextDocument__MarkdownFeature = 20236 ) type QTextDocument__FindFlag int @@ -174,15 +175,6 @@ func QTextDocument_Tr(s string) string { return _ret } -func QTextDocument_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTextDocument_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QTextDocument) Clone() *QTextDocument { return newQTextDocument_U(unsafe.Pointer(C.QTextDocument_Clone(this.h))) } @@ -315,34 +307,20 @@ func (this *QTextDocument) Find2(subString string, cursor *QTextCursor) *QTextCu return _goptr } -func (this *QTextDocument) FindWithExpr(expr *QRegExp) *QTextCursor { +func (this *QTextDocument) FindWithExpr(expr *QRegularExpression) *QTextCursor { _ret := C.QTextDocument_FindWithExpr(this.h, expr.cPointer()) _goptr := newQTextCursor(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QTextDocument) Find3(expr *QRegExp, cursor *QTextCursor) *QTextCursor { +func (this *QTextDocument) Find3(expr *QRegularExpression, cursor *QTextCursor) *QTextCursor { _ret := C.QTextDocument_Find3(this.h, expr.cPointer(), cursor.cPointer()) _goptr := newQTextCursor(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QTextDocument) Find4(expr *QRegularExpression) *QTextCursor { - _ret := C.QTextDocument_Find4(this.h, expr.cPointer()) - _goptr := newQTextCursor(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QTextDocument) Find5(expr *QRegularExpression, cursor *QTextCursor) *QTextCursor { - _ret := C.QTextDocument_Find5(this.h, expr.cPointer(), cursor.cPointer()) - _goptr := newQTextCursor(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - func (this *QTextDocument) FrameAt(pos int) *QTextFrame { return newQTextFrame_U(unsafe.Pointer(C.QTextDocument_FrameAt(this.h, (C.int)(pos)))) } @@ -430,6 +408,30 @@ func (this *QTextDocument) DefaultFont() *QFont { return _goptr } +func (this *QTextDocument) SetSuperScriptBaseline(baseline float64) { + C.QTextDocument_SetSuperScriptBaseline(this.h, (C.double)(baseline)) +} + +func (this *QTextDocument) SuperScriptBaseline() float64 { + return (float64)(C.QTextDocument_SuperScriptBaseline(this.h)) +} + +func (this *QTextDocument) SetSubScriptBaseline(baseline float64) { + C.QTextDocument_SetSubScriptBaseline(this.h, (C.double)(baseline)) +} + +func (this *QTextDocument) SubScriptBaseline() float64 { + return (float64)(C.QTextDocument_SubScriptBaseline(this.h)) +} + +func (this *QTextDocument) SetBaselineOffset(baseline float64) { + C.QTextDocument_SetBaselineOffset(this.h, (C.double)(baseline)) +} + +func (this *QTextDocument) BaselineOffset() float64 { + return (float64)(C.QTextDocument_BaselineOffset(this.h)) +} + func (this *QTextDocument) PageCount() int { return (int)(C.QTextDocument_PageCount(this.h)) } @@ -458,10 +460,10 @@ func (this *QTextDocument) AllFormats() []QTextFormat { _ret := make([]QTextFormat, int(_ma.len)) _outCast := (*[0xffff]*C.QTextFormat)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _vv_ret := _outCast[i] - _vv_goptr := newQTextFormat(_vv_ret) - _vv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_vv_goptr + _lv_ret := _outCast[i] + _lv_goptr := newQTextFormat(_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 @@ -479,6 +481,14 @@ func (this *QTextDocument) UseDesignMetrics() bool { return (bool)(C.QTextDocument_UseDesignMetrics(this.h)) } +func (this *QTextDocument) SetLayoutEnabled(b bool) { + C.QTextDocument_SetLayoutEnabled(this.h, (C.bool)(b)) +} + +func (this *QTextDocument) IsLayoutEnabled() bool { + return (bool)(C.QTextDocument_IsLayoutEnabled(this.h)) +} + func (this *QTextDocument) DrawContents(painter *QPainter) { C.QTextDocument_DrawContents(this.h, painter.cPointer()) } @@ -830,39 +840,10 @@ func QTextDocument_Tr3(s string, c string, n int) string { return _ret } -func QTextDocument_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextDocument_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QTextDocument_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextDocument_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QTextDocument) Clone1(parent *QObject) *QTextDocument { return newQTextDocument_U(unsafe.Pointer(C.QTextDocument_Clone1(this.h, parent.cPointer()))) } -func (this *QTextDocument) ToHtml1(encoding *QByteArray) string { - var _ms *C.struct_miqt_string = C.QTextDocument_ToHtml1(this.h, encoding.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QTextDocument) ToMarkdown1(features QTextDocument__MarkdownFeature) string { var _ms *C.struct_miqt_string = C.QTextDocument_ToMarkdown1(this.h, (C.int)(features)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) @@ -903,48 +884,27 @@ func (this *QTextDocument) Find33(subString string, cursor *QTextCursor, options return _goptr } -func (this *QTextDocument) Find23(expr *QRegExp, from int) *QTextCursor { +func (this *QTextDocument) Find23(expr *QRegularExpression, from int) *QTextCursor { _ret := C.QTextDocument_Find23(this.h, expr.cPointer(), (C.int)(from)) _goptr := newQTextCursor(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QTextDocument) Find34(expr *QRegExp, from int, options QTextDocument__FindFlag) *QTextCursor { +func (this *QTextDocument) Find34(expr *QRegularExpression, from int, options QTextDocument__FindFlag) *QTextCursor { _ret := C.QTextDocument_Find34(this.h, expr.cPointer(), (C.int)(from), (C.int)(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 QTextDocument__FindFlag) *QTextCursor { +func (this *QTextDocument) Find35(expr *QRegularExpression, cursor *QTextCursor, options QTextDocument__FindFlag) *QTextCursor { _ret := C.QTextDocument_Find35(this.h, expr.cPointer(), cursor.cPointer(), (C.int)(options)) _goptr := newQTextCursor(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QTextDocument) Find24(expr *QRegularExpression, from int) *QTextCursor { - _ret := C.QTextDocument_Find24(this.h, expr.cPointer(), (C.int)(from)) - _goptr := newQTextCursor(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QTextDocument) Find36(expr *QRegularExpression, from int, options QTextDocument__FindFlag) *QTextCursor { - _ret := C.QTextDocument_Find36(this.h, expr.cPointer(), (C.int)(from), (C.int)(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 QTextDocument__FindFlag) *QTextCursor { - _ret := C.QTextDocument_Find37(this.h, expr.cPointer(), cursor.cPointer(), (C.int)(options)) - _goptr := newQTextCursor(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - func (this *QTextDocument) DrawContents2(painter *QPainter, rect *QRectF) { C.QTextDocument_DrawContents2(this.h, painter.cPointer(), rect.cPointer()) } diff --git a/qt/gen_qtextdocument.h b/qt/gen_qtextdocument.h index 53978c5..8663bb3 100644 --- a/qt/gen_qtextdocument.h +++ b/qt/gen_qtextdocument.h @@ -16,7 +16,6 @@ extern "C" { #ifdef __cplusplus class QAbstractTextDocumentLayout; class QAbstractUndoItem; -class QByteArray; class QChar; class QFont; class QMetaObject; @@ -24,7 +23,6 @@ class QObject; class QPagedPaintDevice; class QPainter; class QRectF; -class QRegExp; class QRegularExpression; class QSizeF; class QTextBlock; @@ -39,7 +37,6 @@ class QVariant; #else typedef struct QAbstractTextDocumentLayout QAbstractTextDocumentLayout; typedef struct QAbstractUndoItem QAbstractUndoItem; -typedef struct QByteArray QByteArray; typedef struct QChar QChar; typedef struct QFont QFont; typedef struct QMetaObject QMetaObject; @@ -47,7 +44,6 @@ typedef struct QObject QObject; typedef struct QPagedPaintDevice QPagedPaintDevice; typedef struct QPainter QPainter; typedef struct QRectF QRectF; -typedef struct QRegExp QRegExp; typedef struct QRegularExpression QRegularExpression; typedef struct QSizeF QSizeF; typedef struct QTextBlock QTextBlock; @@ -73,7 +69,6 @@ QTextDocument* QTextDocument_new4(struct miqt_string* text, QObject* parent); QMetaObject* QTextDocument_MetaObject(const QTextDocument* self); void* QTextDocument_Metacast(QTextDocument* self, const char* param1); struct miqt_string* QTextDocument_Tr(const char* s); -struct miqt_string* QTextDocument_TrUtf8(const char* s); QTextDocument* QTextDocument_Clone(const QTextDocument* self); bool QTextDocument_IsEmpty(const QTextDocument* self); void QTextDocument_Clear(QTextDocument* self); @@ -98,10 +93,8 @@ void QTextDocument_SetPlainText(QTextDocument* self, struct miqt_string* text); QChar* QTextDocument_CharacterAt(const QTextDocument* self, int pos); QTextCursor* QTextDocument_Find(const QTextDocument* self, struct miqt_string* subString); QTextCursor* QTextDocument_Find2(const QTextDocument* self, struct miqt_string* subString, QTextCursor* cursor); -QTextCursor* QTextDocument_FindWithExpr(const QTextDocument* self, QRegExp* expr); -QTextCursor* QTextDocument_Find3(const QTextDocument* self, QRegExp* expr, QTextCursor* cursor); -QTextCursor* QTextDocument_Find4(const QTextDocument* self, QRegularExpression* expr); -QTextCursor* QTextDocument_Find5(const QTextDocument* self, QRegularExpression* expr, QTextCursor* cursor); +QTextCursor* QTextDocument_FindWithExpr(const QTextDocument* self, QRegularExpression* expr); +QTextCursor* QTextDocument_Find3(const QTextDocument* self, QRegularExpression* expr, QTextCursor* cursor); QTextFrame* QTextDocument_FrameAt(const QTextDocument* self, int pos); QTextFrame* QTextDocument_RootFrame(const QTextDocument* self); QTextObject* QTextDocument_Object(const QTextDocument* self, int objectIndex); @@ -117,6 +110,12 @@ void QTextDocument_SetPageSize(QTextDocument* self, QSizeF* size); QSizeF* QTextDocument_PageSize(const QTextDocument* self); void QTextDocument_SetDefaultFont(QTextDocument* self, QFont* font); QFont* QTextDocument_DefaultFont(const QTextDocument* self); +void QTextDocument_SetSuperScriptBaseline(QTextDocument* self, double baseline); +double QTextDocument_SuperScriptBaseline(const QTextDocument* self); +void QTextDocument_SetSubScriptBaseline(QTextDocument* self, double baseline); +double QTextDocument_SubScriptBaseline(const QTextDocument* self); +void QTextDocument_SetBaselineOffset(QTextDocument* self, double baseline); +double QTextDocument_BaselineOffset(const QTextDocument* self); int QTextDocument_PageCount(const QTextDocument* self); bool QTextDocument_IsModified(const QTextDocument* self); void QTextDocument_Print(const QTextDocument* self, QPagedPaintDevice* printer); @@ -126,6 +125,8 @@ struct miqt_array* QTextDocument_AllFormats(const QTextDocument* self); void QTextDocument_MarkContentsDirty(QTextDocument* self, int from, int length); void QTextDocument_SetUseDesignMetrics(QTextDocument* self, bool b); bool QTextDocument_UseDesignMetrics(const QTextDocument* self); +void QTextDocument_SetLayoutEnabled(QTextDocument* self, bool b); +bool QTextDocument_IsLayoutEnabled(const QTextDocument* self); void QTextDocument_DrawContents(QTextDocument* self, QPainter* painter); void QTextDocument_SetTextWidth(QTextDocument* self, double width); double QTextDocument_TextWidth(const QTextDocument* self); @@ -178,21 +179,15 @@ void QTextDocument_AppendUndoItem(QTextDocument* self, QAbstractUndoItem* param1 void QTextDocument_SetModified(QTextDocument* self); struct miqt_string* QTextDocument_Tr2(const char* s, const char* c); struct miqt_string* QTextDocument_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTextDocument_TrUtf82(const char* s, const char* c); -struct miqt_string* QTextDocument_TrUtf83(const char* s, const char* c, int n); QTextDocument* QTextDocument_Clone1(const QTextDocument* self, QObject* parent); -struct miqt_string* QTextDocument_ToHtml1(const QTextDocument* self, QByteArray* encoding); struct miqt_string* QTextDocument_ToMarkdown1(const QTextDocument* self, int features); void QTextDocument_SetMarkdown2(QTextDocument* self, struct miqt_string* markdown, int features); QTextCursor* QTextDocument_Find22(const QTextDocument* self, struct miqt_string* subString, int from); QTextCursor* QTextDocument_Find32(const QTextDocument* self, struct miqt_string* subString, int from, int options); QTextCursor* QTextDocument_Find33(const QTextDocument* self, struct miqt_string* subString, QTextCursor* cursor, int options); -QTextCursor* QTextDocument_Find23(const QTextDocument* self, QRegExp* expr, int from); -QTextCursor* QTextDocument_Find34(const QTextDocument* self, QRegExp* expr, int from, int options); -QTextCursor* QTextDocument_Find35(const QTextDocument* self, QRegExp* expr, QTextCursor* cursor, int options); -QTextCursor* QTextDocument_Find24(const QTextDocument* self, QRegularExpression* expr, int from); -QTextCursor* QTextDocument_Find36(const QTextDocument* self, QRegularExpression* expr, int from, int options); -QTextCursor* QTextDocument_Find37(const QTextDocument* self, QRegularExpression* expr, QTextCursor* cursor, int options); +QTextCursor* QTextDocument_Find23(const QTextDocument* self, QRegularExpression* expr, int from); +QTextCursor* QTextDocument_Find34(const QTextDocument* self, QRegularExpression* expr, int from, int options); +QTextCursor* QTextDocument_Find35(const QTextDocument* self, QRegularExpression* expr, QTextCursor* cursor, int options); void QTextDocument_DrawContents2(QTextDocument* self, QPainter* painter, QRectF* rect); void QTextDocument_ClearUndoRedoStacks1(QTextDocument* self, int historyToClear); void QTextDocument_SetModified1(QTextDocument* self, bool m); diff --git a/qt/gen_qtextdocumentfragment.cpp b/qt/gen_qtextdocumentfragment.cpp index 5918ee1..f653daf 100644 --- a/qt/gen_qtextdocumentfragment.cpp +++ b/qt/gen_qtextdocumentfragment.cpp @@ -1,4 +1,3 @@ -#include #include #include #include @@ -40,6 +39,13 @@ struct miqt_string* QTextDocumentFragment_ToPlainText(const QTextDocumentFragmen return miqt_strdup(_b.data(), _b.length()); } +struct miqt_string* QTextDocumentFragment_ToRawText(const QTextDocumentFragment* self) { + QString _ret = self->toRawText(); + // 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* QTextDocumentFragment_ToHtml(const QTextDocumentFragment* self) { QString _ret = self->toHtml(); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -47,6 +53,13 @@ struct miqt_string* QTextDocumentFragment_ToHtml(const QTextDocumentFragment* se return miqt_strdup(_b.data(), _b.length()); } +struct miqt_string* QTextDocumentFragment_ToMarkdown(const QTextDocumentFragment* self) { + QString _ret = self->toMarkdown(); + // 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()); +} + QTextDocumentFragment* QTextDocumentFragment_FromPlainText(struct miqt_string* plainText) { QString plainText_QString = QString::fromUtf8(&plainText->data, plainText->len); return new QTextDocumentFragment(QTextDocumentFragment::fromPlainText(plainText_QString)); @@ -57,16 +70,26 @@ QTextDocumentFragment* QTextDocumentFragment_FromHtml(struct miqt_string* html) return new QTextDocumentFragment(QTextDocumentFragment::fromHtml(html_QString)); } +QTextDocumentFragment* QTextDocumentFragment_FromMarkdown(struct miqt_string* markdown) { + QString markdown_QString = QString::fromUtf8(&markdown->data, markdown->len); + return new QTextDocumentFragment(QTextDocumentFragment::fromMarkdown(markdown_QString)); +} + +struct miqt_string* QTextDocumentFragment_ToMarkdown1(const QTextDocumentFragment* self, int features) { + QString _ret = self->toMarkdown(static_cast(features)); + // 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()); +} + QTextDocumentFragment* QTextDocumentFragment_FromHtml2(struct miqt_string* html, QTextDocument* resourceProvider) { QString html_QString = QString::fromUtf8(&html->data, html->len); return new QTextDocumentFragment(QTextDocumentFragment::fromHtml(html_QString, resourceProvider)); } -struct miqt_string* QTextDocumentFragment_ToHtml1(const QTextDocumentFragment* self, QByteArray* encoding) { - QString _ret = self->toHtml(*encoding); - // 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()); +QTextDocumentFragment* QTextDocumentFragment_FromMarkdown2(struct miqt_string* markdown, int features) { + QString markdown_QString = QString::fromUtf8(&markdown->data, markdown->len); + return new QTextDocumentFragment(QTextDocumentFragment::fromMarkdown(markdown_QString, static_cast(features))); } void QTextDocumentFragment_Delete(QTextDocumentFragment* self) { diff --git a/qt/gen_qtextdocumentfragment.go b/qt/gen_qtextdocumentfragment.go index 9291fc1..9ef254b 100644 --- a/qt/gen_qtextdocumentfragment.go +++ b/qt/gen_qtextdocumentfragment.go @@ -74,6 +74,13 @@ func (this *QTextDocumentFragment) ToPlainText() string { return _ret } +func (this *QTextDocumentFragment) ToRawText() string { + var _ms *C.struct_miqt_string = C.QTextDocumentFragment_ToRawText(this.h) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + func (this *QTextDocumentFragment) ToHtml() string { var _ms *C.struct_miqt_string = C.QTextDocumentFragment_ToHtml(this.h) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) @@ -81,6 +88,13 @@ func (this *QTextDocumentFragment) ToHtml() string { return _ret } +func (this *QTextDocumentFragment) ToMarkdown() string { + var _ms *C.struct_miqt_string = C.QTextDocumentFragment_ToMarkdown(this.h) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + func QTextDocumentFragment_FromPlainText(plainText string) *QTextDocumentFragment { plainText_ms := miqt_strdupg(plainText) defer C.free(plainText_ms) @@ -99,6 +113,22 @@ func QTextDocumentFragment_FromHtml(html string) *QTextDocumentFragment { return _goptr } +func QTextDocumentFragment_FromMarkdown(markdown string) *QTextDocumentFragment { + markdown_ms := miqt_strdupg(markdown) + defer C.free(markdown_ms) + _ret := C.QTextDocumentFragment_FromMarkdown((*C.struct_miqt_string)(markdown_ms)) + _goptr := newQTextDocumentFragment(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QTextDocumentFragment) ToMarkdown1(features QTextDocument__MarkdownFeature) string { + var _ms *C.struct_miqt_string = C.QTextDocumentFragment_ToMarkdown1(this.h, (C.int)(features)) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + func QTextDocumentFragment_FromHtml2(html string, resourceProvider *QTextDocument) *QTextDocumentFragment { html_ms := miqt_strdupg(html) defer C.free(html_ms) @@ -108,11 +138,13 @@ func QTextDocumentFragment_FromHtml2(html string, resourceProvider *QTextDocumen return _goptr } -func (this *QTextDocumentFragment) ToHtml1(encoding *QByteArray) string { - var _ms *C.struct_miqt_string = C.QTextDocumentFragment_ToHtml1(this.h, encoding.cPointer()) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret +func QTextDocumentFragment_FromMarkdown2(markdown string, features QTextDocument__MarkdownFeature) *QTextDocumentFragment { + markdown_ms := miqt_strdupg(markdown) + defer C.free(markdown_ms) + _ret := C.QTextDocumentFragment_FromMarkdown2((*C.struct_miqt_string)(markdown_ms), (C.int)(features)) + _goptr := newQTextDocumentFragment(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr } // Delete this object from C++ memory. diff --git a/qt/gen_qtextdocumentfragment.h b/qt/gen_qtextdocumentfragment.h index b80b94b..dbd6506 100644 --- a/qt/gen_qtextdocumentfragment.h +++ b/qt/gen_qtextdocumentfragment.h @@ -14,12 +14,10 @@ extern "C" { #endif #ifdef __cplusplus -class QByteArray; class QTextCursor; class QTextDocument; class QTextDocumentFragment; #else -typedef struct QByteArray QByteArray; typedef struct QTextCursor QTextCursor; typedef struct QTextDocument QTextDocument; typedef struct QTextDocumentFragment QTextDocumentFragment; @@ -32,11 +30,15 @@ QTextDocumentFragment* QTextDocumentFragment_new4(QTextDocumentFragment* rhs); void QTextDocumentFragment_OperatorAssign(QTextDocumentFragment* self, QTextDocumentFragment* rhs); bool QTextDocumentFragment_IsEmpty(const QTextDocumentFragment* self); struct miqt_string* QTextDocumentFragment_ToPlainText(const QTextDocumentFragment* self); +struct miqt_string* QTextDocumentFragment_ToRawText(const QTextDocumentFragment* self); struct miqt_string* QTextDocumentFragment_ToHtml(const QTextDocumentFragment* self); +struct miqt_string* QTextDocumentFragment_ToMarkdown(const QTextDocumentFragment* self); QTextDocumentFragment* QTextDocumentFragment_FromPlainText(struct miqt_string* plainText); QTextDocumentFragment* QTextDocumentFragment_FromHtml(struct miqt_string* html); +QTextDocumentFragment* QTextDocumentFragment_FromMarkdown(struct miqt_string* markdown); +struct miqt_string* QTextDocumentFragment_ToMarkdown1(const QTextDocumentFragment* self, int features); QTextDocumentFragment* QTextDocumentFragment_FromHtml2(struct miqt_string* html, QTextDocument* resourceProvider); -struct miqt_string* QTextDocumentFragment_ToHtml1(const QTextDocumentFragment* self, QByteArray* encoding); +QTextDocumentFragment* QTextDocumentFragment_FromMarkdown2(struct miqt_string* markdown, int features); void QTextDocumentFragment_Delete(QTextDocumentFragment* self); #ifdef __cplusplus diff --git a/qt/gen_qtextdocumentwriter.cpp b/qt/gen_qtextdocumentwriter.cpp index f32c105..a6fb2b3 100644 --- a/qt/gen_qtextdocumentwriter.cpp +++ b/qt/gen_qtextdocumentwriter.cpp @@ -4,7 +4,6 @@ #include #include #include -#include #include #include #include @@ -66,14 +65,6 @@ bool QTextDocumentWriter_WriteWithFragment(QTextDocumentWriter* self, QTextDocum return self->write(*fragment); } -void QTextDocumentWriter_SetCodec(QTextDocumentWriter* self, QTextCodec* codec) { - self->setCodec(codec); -} - -QTextCodec* QTextDocumentWriter_Codec(const QTextDocumentWriter* self) { - return self->codec(); -} - struct miqt_array* QTextDocumentWriter_SupportedDocumentFormats() { QList _ret = QTextDocumentWriter::supportedDocumentFormats(); // Convert QList<> from C++ memory to manually-managed C memory diff --git a/qt/gen_qtextdocumentwriter.go b/qt/gen_qtextdocumentwriter.go index 91af033..b38e7c9 100644 --- a/qt/gen_qtextdocumentwriter.go +++ b/qt/gen_qtextdocumentwriter.go @@ -103,14 +103,6 @@ func (this *QTextDocumentWriter) WriteWithFragment(fragment *QTextDocumentFragme return (bool)(C.QTextDocumentWriter_WriteWithFragment(this.h, fragment.cPointer())) } -func (this *QTextDocumentWriter) SetCodec(codec *QTextCodec) { - C.QTextDocumentWriter_SetCodec(this.h, codec.cPointer()) -} - -func (this *QTextDocumentWriter) Codec() *QTextCodec { - return newQTextCodec_U(unsafe.Pointer(C.QTextDocumentWriter_Codec(this.h))) -} - func QTextDocumentWriter_SupportedDocumentFormats() []QByteArray { var _ma *C.struct_miqt_array = C.QTextDocumentWriter_SupportedDocumentFormats() _ret := make([]QByteArray, int(_ma.len)) diff --git a/qt/gen_qtextdocumentwriter.h b/qt/gen_qtextdocumentwriter.h index ace1ba3..4a2bff2 100644 --- a/qt/gen_qtextdocumentwriter.h +++ b/qt/gen_qtextdocumentwriter.h @@ -16,14 +16,12 @@ extern "C" { #ifdef __cplusplus class QByteArray; class QIODevice; -class QTextCodec; class QTextDocument; class QTextDocumentFragment; class QTextDocumentWriter; #else typedef struct QByteArray QByteArray; typedef struct QIODevice QIODevice; -typedef struct QTextCodec QTextCodec; typedef struct QTextDocument QTextDocument; typedef struct QTextDocumentFragment QTextDocumentFragment; typedef struct QTextDocumentWriter QTextDocumentWriter; @@ -41,8 +39,6 @@ void QTextDocumentWriter_SetFileName(QTextDocumentWriter* self, struct miqt_stri struct miqt_string* QTextDocumentWriter_FileName(const QTextDocumentWriter* self); bool QTextDocumentWriter_Write(QTextDocumentWriter* self, QTextDocument* document); bool QTextDocumentWriter_WriteWithFragment(QTextDocumentWriter* self, QTextDocumentFragment* fragment); -void QTextDocumentWriter_SetCodec(QTextDocumentWriter* self, QTextCodec* codec); -QTextCodec* QTextDocumentWriter_Codec(const QTextDocumentWriter* self); struct miqt_array* QTextDocumentWriter_SupportedDocumentFormats(); void QTextDocumentWriter_Delete(QTextDocumentWriter* self); diff --git a/qt/gen_qtextedit.cpp b/qt/gen_qtextedit.cpp index 8476153..c162496 100644 --- a/qt/gen_qtextedit.cpp +++ b/qt/gen_qtextedit.cpp @@ -6,7 +6,6 @@ #include #include #include -#include #include #include #include @@ -56,13 +55,6 @@ struct miqt_string* QTextEdit_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTextEdit_TrUtf8(const char* s) { - QString _ret = QTextEdit::trUtf8(s); - // 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 QTextEdit_SetDocument(QTextEdit* self, QTextDocument* document) { self->setDocument(document); } @@ -229,11 +221,7 @@ bool QTextEdit_Find(QTextEdit* self, struct miqt_string* exp) { return self->find(exp_QString); } -bool QTextEdit_FindWithExp(QTextEdit* self, QRegExp* exp) { - return self->find(*exp); -} - -bool QTextEdit_Find2(QTextEdit* self, QRegularExpression* exp) { +bool QTextEdit_FindWithExp(QTextEdit* self, QRegularExpression* exp) { return self->find(*exp); } @@ -301,14 +289,6 @@ void QTextEdit_SetOverwriteMode(QTextEdit* self, bool overwrite) { self->setOverwriteMode(overwrite); } -int QTextEdit_TabStopWidth(const QTextEdit* self) { - return self->tabStopWidth(); -} - -void QTextEdit_SetTabStopWidth(QTextEdit* self, int width) { - self->setTabStopWidth(static_cast(width)); -} - double QTextEdit_TabStopDistance(const QTextEdit* self) { qreal _ret = self->tabStopDistance(); return static_cast(_ret); @@ -580,30 +560,12 @@ struct miqt_string* QTextEdit_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTextEdit_TrUtf82(const char* s, const char* c) { - QString _ret = QTextEdit::trUtf8(s, c); - // 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* QTextEdit_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QTextEdit::trUtf8(s, c, static_cast(n)); - // 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()); -} - -bool QTextEdit_Find22(QTextEdit* self, struct miqt_string* exp, int options) { +bool QTextEdit_Find2(QTextEdit* self, struct miqt_string* exp, int options) { QString exp_QString = QString::fromUtf8(&exp->data, exp->len); return self->find(exp_QString, static_cast(options)); } -bool QTextEdit_Find23(QTextEdit* self, QRegExp* exp, int options) { - return self->find(*exp, static_cast(options)); -} - -bool QTextEdit_Find24(QTextEdit* self, QRegularExpression* exp, int options) { +bool QTextEdit_Find22(QTextEdit* self, QRegularExpression* exp, int options) { return self->find(*exp, static_cast(options)); } diff --git a/qt/gen_qtextedit.go b/qt/gen_qtextedit.go index a8f403d..4c8e30b 100644 --- a/qt/gen_qtextedit.go +++ b/qt/gen_qtextedit.go @@ -101,15 +101,6 @@ func QTextEdit_Tr(s string) string { return _ret } -func QTextEdit_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTextEdit_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QTextEdit) SetDocument(document *QTextDocument) { C.QTextEdit_SetDocument(this.h, document.cPointer()) } @@ -288,14 +279,10 @@ func (this *QTextEdit) Find(exp string) bool { return (bool)(C.QTextEdit_Find(this.h, (*C.struct_miqt_string)(exp_ms))) } -func (this *QTextEdit) FindWithExp(exp *QRegExp) bool { +func (this *QTextEdit) FindWithExp(exp *QRegularExpression) bool { return (bool)(C.QTextEdit_FindWithExp(this.h, exp.cPointer())) } -func (this *QTextEdit) Find2(exp *QRegularExpression) bool { - return (bool)(C.QTextEdit_Find2(this.h, exp.cPointer())) -} - func (this *QTextEdit) ToPlainText() string { var _ms *C.struct_miqt_string = C.QTextEdit_ToPlainText(this.h) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) @@ -372,14 +359,6 @@ func (this *QTextEdit) SetOverwriteMode(overwrite bool) { C.QTextEdit_SetOverwriteMode(this.h, (C.bool)(overwrite)) } -func (this *QTextEdit) TabStopWidth() int { - return (int)(C.QTextEdit_TabStopWidth(this.h)) -} - -func (this *QTextEdit) SetTabStopWidth(width int) { - C.QTextEdit_SetTabStopWidth(this.h, (C.int)(width)) -} - func (this *QTextEdit) TabStopDistance() float64 { return (float64)(C.QTextEdit_TabStopDistance(this.h)) } @@ -731,40 +710,14 @@ func QTextEdit_Tr3(s string, c string, n int) string { return _ret } -func QTextEdit_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextEdit_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QTextEdit_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextEdit_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QTextEdit) Find22(exp string, options QTextDocument__FindFlag) bool { +func (this *QTextEdit) Find2(exp string, options QTextDocument__FindFlag) 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_Find2(this.h, (*C.struct_miqt_string)(exp_ms), (C.int)(options))) } -func (this *QTextEdit) Find23(exp *QRegExp, options QTextDocument__FindFlag) bool { - return (bool)(C.QTextEdit_Find23(this.h, exp.cPointer(), (C.int)(options))) -} - -func (this *QTextEdit) Find24(exp *QRegularExpression, options QTextDocument__FindFlag) bool { - return (bool)(C.QTextEdit_Find24(this.h, exp.cPointer(), (C.int)(options))) +func (this *QTextEdit) Find22(exp *QRegularExpression, options QTextDocument__FindFlag) bool { + return (bool)(C.QTextEdit_Find22(this.h, exp.cPointer(), (C.int)(options))) } func (this *QTextEdit) ToMarkdown1(features QTextDocument__MarkdownFeature) string { diff --git a/qt/gen_qtextedit.h b/qt/gen_qtextedit.h index 199064d..a410ceb 100644 --- a/qt/gen_qtextedit.h +++ b/qt/gen_qtextedit.h @@ -21,7 +21,6 @@ class QMetaObject; class QPagedPaintDevice; class QPoint; class QRect; -class QRegExp; class QRegularExpression; class QTextCharFormat; class QTextCursor; @@ -43,7 +42,6 @@ typedef struct QMetaObject QMetaObject; typedef struct QPagedPaintDevice QPagedPaintDevice; typedef struct QPoint QPoint; typedef struct QRect QRect; -typedef struct QRegExp QRegExp; typedef struct QRegularExpression QRegularExpression; typedef struct QTextCharFormat QTextCharFormat; typedef struct QTextCursor QTextCursor; @@ -62,7 +60,6 @@ QTextEdit* QTextEdit_new4(struct miqt_string* text, QWidget* parent); QMetaObject* QTextEdit_MetaObject(const QTextEdit* self); void* QTextEdit_Metacast(QTextEdit* self, const char* param1); struct miqt_string* QTextEdit_Tr(const char* s); -struct miqt_string* QTextEdit_TrUtf8(const char* s); void QTextEdit_SetDocument(QTextEdit* self, QTextDocument* document); QTextDocument* QTextEdit_Document(const QTextEdit* self); void QTextEdit_SetPlaceholderText(QTextEdit* self, struct miqt_string* placeholderText); @@ -100,8 +97,7 @@ void QTextEdit_SetLineWrapColumnOrWidth(QTextEdit* self, int w); 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); +bool QTextEdit_FindWithExp(QTextEdit* self, QRegularExpression* exp); struct miqt_string* QTextEdit_ToPlainText(const QTextEdit* self); struct miqt_string* QTextEdit_ToHtml(const QTextEdit* self); struct miqt_string* QTextEdit_ToMarkdown(const QTextEdit* self); @@ -115,8 +111,6 @@ QRect* QTextEdit_CursorRect2(const QTextEdit* self); struct miqt_string* QTextEdit_AnchorAt(const QTextEdit* self, QPoint* pos); bool QTextEdit_OverwriteMode(const QTextEdit* self); void QTextEdit_SetOverwriteMode(QTextEdit* self, bool overwrite); -int QTextEdit_TabStopWidth(const QTextEdit* self); -void QTextEdit_SetTabStopWidth(QTextEdit* self, int width); double QTextEdit_TabStopDistance(const QTextEdit* self); void QTextEdit_SetTabStopDistance(QTextEdit* self, double distance); int QTextEdit_CursorWidth(const QTextEdit* self); @@ -172,11 +166,8 @@ void QTextEdit_CursorPositionChanged(QTextEdit* self); void QTextEdit_connect_CursorPositionChanged(QTextEdit* self, void* slot); struct miqt_string* QTextEdit_Tr2(const char* s, const char* c); struct miqt_string* QTextEdit_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTextEdit_TrUtf82(const char* s, const char* c); -struct miqt_string* QTextEdit_TrUtf83(const char* s, const char* c, int n); -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); +bool QTextEdit_Find2(QTextEdit* self, struct miqt_string* exp, int options); +bool QTextEdit_Find22(QTextEdit* self, QRegularExpression* exp, int options); struct miqt_string* QTextEdit_ToMarkdown1(const QTextEdit* self, int features); void QTextEdit_MoveCursor2(QTextEdit* self, int operation, int mode); void QTextEdit_ZoomIn1(QTextEdit* self, int rangeVal); diff --git a/qt/gen_qtextformat.cpp b/qt/gen_qtextformat.cpp index 7570bf5..95b09df 100644 --- a/qt/gen_qtextformat.cpp +++ b/qt/gen_qtextformat.cpp @@ -157,7 +157,7 @@ QTextLength* QTextFormat_LengthProperty(const QTextFormat* self, int propertyId) } struct miqt_array* QTextFormat_LengthVectorProperty(const QTextFormat* self, int propertyId) { - QVector _ret = self->lengthVectorProperty(static_cast(propertyId)); + QList _ret = self->lengthVectorProperty(static_cast(propertyId)); // Convert QList<> from C++ memory to manually-managed C memory QTextLength** _arr = static_cast(malloc(sizeof(QTextLength*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -170,7 +170,7 @@ struct miqt_array* QTextFormat_LengthVectorProperty(const QTextFormat* self, int } void QTextFormat_SetProperty2(QTextFormat* self, int propertyId, struct miqt_array* /* of QTextLength* */ lengths) { - QVector lengths_QList; + QList lengths_QList; lengths_QList.reserve(lengths->len); QTextLength** lengths_arr = static_cast(lengths->data); for(size_t i = 0; i < lengths->len; ++i) { @@ -304,11 +304,7 @@ bool QTextCharFormat_IsValid(const QTextCharFormat* self) { return self->isValid(); } -void QTextCharFormat_SetFont(QTextCharFormat* self, QFont* font, int behavior) { - self->setFont(*font, static_cast(behavior)); -} - -void QTextCharFormat_SetFontWithFont(QTextCharFormat* self, QFont* font) { +void QTextCharFormat_SetFont(QTextCharFormat* self, QFont* font) { self->setFont(*font); } @@ -534,6 +530,33 @@ struct miqt_string* QTextCharFormat_ToolTip(const QTextCharFormat* self) { return miqt_strdup(_b.data(), _b.length()); } +void QTextCharFormat_SetSuperScriptBaseline(QTextCharFormat* self, double baseline) { + self->setSuperScriptBaseline(static_cast(baseline)); +} + +double QTextCharFormat_SuperScriptBaseline(const QTextCharFormat* self) { + qreal _ret = self->superScriptBaseline(); + return static_cast(_ret); +} + +void QTextCharFormat_SetSubScriptBaseline(QTextCharFormat* self, double baseline) { + self->setSubScriptBaseline(static_cast(baseline)); +} + +double QTextCharFormat_SubScriptBaseline(const QTextCharFormat* self) { + qreal _ret = self->subScriptBaseline(); + return static_cast(_ret); +} + +void QTextCharFormat_SetBaselineOffset(QTextCharFormat* self, double baseline) { + self->setBaselineOffset(static_cast(baseline)); +} + +double QTextCharFormat_BaselineOffset(const QTextCharFormat* self) { + qreal _ret = self->baselineOffset(); + return static_cast(_ret); +} + void QTextCharFormat_SetAnchor(QTextCharFormat* self, bool anchor) { self->setAnchor(anchor); } @@ -554,18 +577,6 @@ struct miqt_string* QTextCharFormat_AnchorHref(const QTextCharFormat* self) { return miqt_strdup(_b.data(), _b.length()); } -void QTextCharFormat_SetAnchorName(QTextCharFormat* self, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); - self->setAnchorName(name_QString); -} - -struct miqt_string* QTextCharFormat_AnchorName(const QTextCharFormat* self) { - QString _ret = self->anchorName(); - // 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 QTextCharFormat_SetAnchorNames(QTextCharFormat* self, struct miqt_array* /* of struct miqt_string* */ names) { QList names_QList; names_QList.reserve(names->len); @@ -609,6 +620,10 @@ int QTextCharFormat_TableCellColumnSpan(const QTextCharFormat* self) { return self->tableCellColumnSpan(); } +void QTextCharFormat_SetFont2(QTextCharFormat* self, QFont* font, int behavior) { + self->setFont(*font, static_cast(behavior)); +} + void QTextCharFormat_SetFontStyleHint2(QTextCharFormat* self, int hint, int strategy) { self->setFontStyleHint(static_cast(hint), static_cast(strategy)); } @@ -865,7 +880,11 @@ double QTextImageFormat_Height(const QTextImageFormat* self) { return static_cast(_ret); } -void QTextImageFormat_SetQuality(QTextImageFormat* self) { +void QTextImageFormat_SetQuality(QTextImageFormat* self, int quality) { + self->setQuality(static_cast(quality)); +} + +void QTextImageFormat_SetQuality2(QTextImageFormat* self) { self->setQuality(); } @@ -873,10 +892,6 @@ int QTextImageFormat_Quality(const QTextImageFormat* self) { return self->quality(); } -void QTextImageFormat_SetQuality1(QTextImageFormat* self, int quality) { - self->setQuality(static_cast(quality)); -} - void QTextImageFormat_Delete(QTextImageFormat* self) { delete self; } @@ -1036,7 +1051,7 @@ void QTextTableFormat_SetColumns(QTextTableFormat* self, int columns) { } void QTextTableFormat_SetColumnWidthConstraints(QTextTableFormat* self, struct miqt_array* /* of QTextLength* */ constraints) { - QVector constraints_QList; + QList constraints_QList; constraints_QList.reserve(constraints->len); QTextLength** constraints_arr = static_cast(constraints->data); for(size_t i = 0; i < constraints->len; ++i) { @@ -1046,7 +1061,7 @@ void QTextTableFormat_SetColumnWidthConstraints(QTextTableFormat* self, struct m } struct miqt_array* QTextTableFormat_ColumnWidthConstraints(const QTextTableFormat* self) { - QVector _ret = self->columnWidthConstraints(); + QList _ret = self->columnWidthConstraints(); // Convert QList<> from C++ memory to manually-managed C memory QTextLength** _arr = static_cast(malloc(sizeof(QTextLength*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { diff --git a/qt/gen_qtextformat.go b/qt/gen_qtextformat.go index 0259f20..a5f1eed 100644 --- a/qt/gen_qtextformat.go +++ b/qt/gen_qtextformat.go @@ -28,7 +28,6 @@ const ( QTextFormat__BlockFormat QTextFormat__FormatType = 1 QTextFormat__CharFormat QTextFormat__FormatType = 2 QTextFormat__ListFormat QTextFormat__FormatType = 3 - QTextFormat__TableFormat QTextFormat__FormatType = 4 QTextFormat__FrameFormat QTextFormat__FormatType = 5 QTextFormat__UserFormat QTextFormat__FormatType = 100 ) @@ -62,16 +61,16 @@ const ( QTextFormat__BlockMarker QTextFormat__Property = 4256 QTextFormat__FirstFontProperty QTextFormat__Property = 8160 QTextFormat__FontCapitalization QTextFormat__Property = 8160 - QTextFormat__FontLetterSpacingType QTextFormat__Property = 8243 QTextFormat__FontLetterSpacing QTextFormat__Property = 8161 QTextFormat__FontWordSpacing QTextFormat__Property = 8162 - QTextFormat__FontStretch QTextFormat__Property = 8244 QTextFormat__FontStyleHint QTextFormat__Property = 8163 QTextFormat__FontStyleStrategy QTextFormat__Property = 8164 QTextFormat__FontKerning QTextFormat__Property = 8165 QTextFormat__FontHintingPreference QTextFormat__Property = 8166 QTextFormat__FontFamilies QTextFormat__Property = 8167 QTextFormat__FontStyleName QTextFormat__Property = 8168 + QTextFormat__FontLetterSpacingType QTextFormat__Property = 8169 + QTextFormat__FontStretch QTextFormat__Property = 8170 QTextFormat__FontFamily QTextFormat__Property = 8192 QTextFormat__FontPointSize QTextFormat__Property = 8193 QTextFormat__FontSizeAdjustment QTextFormat__Property = 8194 @@ -84,14 +83,21 @@ const ( QTextFormat__FontFixedPitch QTextFormat__Property = 8200 QTextFormat__FontPixelSize QTextFormat__Property = 8201 QTextFormat__LastFontProperty QTextFormat__Property = 8201 - QTextFormat__TextUnderlineColor QTextFormat__Property = 8208 + QTextFormat__TextUnderlineColor QTextFormat__Property = 8224 QTextFormat__TextVerticalAlignment QTextFormat__Property = 8225 QTextFormat__TextOutline QTextFormat__Property = 8226 QTextFormat__TextUnderlineStyle QTextFormat__Property = 8227 QTextFormat__TextToolTip QTextFormat__Property = 8228 + QTextFormat__TextSuperScriptBaseline QTextFormat__Property = 8229 + QTextFormat__TextSubScriptBaseline QTextFormat__Property = 8230 + QTextFormat__TextBaselineOffset QTextFormat__Property = 8231 QTextFormat__IsAnchor QTextFormat__Property = 8240 QTextFormat__AnchorHref QTextFormat__Property = 8241 QTextFormat__AnchorName QTextFormat__Property = 8242 + QTextFormat__OldFontLetterSpacingType QTextFormat__Property = 8243 + QTextFormat__OldFontStretch QTextFormat__Property = 8244 + QTextFormat__OldTextUnderlineColor QTextFormat__Property = 8208 + QTextFormat__OldFontFamily QTextFormat__Property = 8192 QTextFormat__ObjectType QTextFormat__Property = 12032 QTextFormat__ListStyle QTextFormat__Property = 12288 QTextFormat__ListIndent QTextFormat__Property = 12289 @@ -466,10 +472,10 @@ func (this *QTextFormat) LengthVectorProperty(propertyId int) []QTextLength { _ret := make([]QTextLength, int(_ma.len)) _outCast := (*[0xffff]*C.QTextLength)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _vv_ret := _outCast[i] - _vv_goptr := newQTextLength(_vv_ret) - _vv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_vv_goptr + _lv_ret := _outCast[i] + _lv_goptr := newQTextLength(_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 @@ -675,12 +681,8 @@ func (this *QTextCharFormat) IsValid() bool { return (bool)(C.QTextCharFormat_IsValid(this.h)) } -func (this *QTextCharFormat) SetFont(font *QFont, behavior QTextCharFormat__FontPropertiesInheritanceBehavior) { - C.QTextCharFormat_SetFont(this.h, font.cPointer(), (C.int)(behavior)) -} - -func (this *QTextCharFormat) SetFontWithFont(font *QFont) { - C.QTextCharFormat_SetFontWithFont(this.h, font.cPointer()) +func (this *QTextCharFormat) SetFont(font *QFont) { + C.QTextCharFormat_SetFont(this.h, font.cPointer()) } func (this *QTextCharFormat) Font() *QFont { @@ -916,6 +918,30 @@ func (this *QTextCharFormat) ToolTip() string { return _ret } +func (this *QTextCharFormat) SetSuperScriptBaseline(baseline float64) { + C.QTextCharFormat_SetSuperScriptBaseline(this.h, (C.double)(baseline)) +} + +func (this *QTextCharFormat) SuperScriptBaseline() float64 { + return (float64)(C.QTextCharFormat_SuperScriptBaseline(this.h)) +} + +func (this *QTextCharFormat) SetSubScriptBaseline(baseline float64) { + C.QTextCharFormat_SetSubScriptBaseline(this.h, (C.double)(baseline)) +} + +func (this *QTextCharFormat) SubScriptBaseline() float64 { + return (float64)(C.QTextCharFormat_SubScriptBaseline(this.h)) +} + +func (this *QTextCharFormat) SetBaselineOffset(baseline float64) { + C.QTextCharFormat_SetBaselineOffset(this.h, (C.double)(baseline)) +} + +func (this *QTextCharFormat) BaselineOffset() float64 { + return (float64)(C.QTextCharFormat_BaselineOffset(this.h)) +} + func (this *QTextCharFormat) SetAnchor(anchor bool) { C.QTextCharFormat_SetAnchor(this.h, (C.bool)(anchor)) } @@ -937,19 +963,6 @@ func (this *QTextCharFormat) AnchorHref() string { return _ret } -func (this *QTextCharFormat) SetAnchorName(name string) { - name_ms := miqt_strdupg(name) - defer C.free(name_ms) - C.QTextCharFormat_SetAnchorName(this.h, (*C.struct_miqt_string)(name_ms)) -} - -func (this *QTextCharFormat) AnchorName() string { - var _ms *C.struct_miqt_string = C.QTextCharFormat_AnchorName(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QTextCharFormat) SetAnchorNames(names []string) { // For the C ABI, malloc a C array of raw pointers names_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(names)))) @@ -994,6 +1007,10 @@ func (this *QTextCharFormat) TableCellColumnSpan() int { return (int)(C.QTextCharFormat_TableCellColumnSpan(this.h)) } +func (this *QTextCharFormat) SetFont2(font *QFont, behavior QTextCharFormat__FontPropertiesInheritanceBehavior) { + C.QTextCharFormat_SetFont2(this.h, font.cPointer(), (C.int)(behavior)) +} + func (this *QTextCharFormat) SetFontStyleHint2(hint QFont__StyleHint, strategy QFont__StyleStrategy) { C.QTextCharFormat_SetFontStyleHint2(this.h, (C.int)(hint), (C.int)(strategy)) } @@ -1352,18 +1369,18 @@ func (this *QTextImageFormat) Height() float64 { return (float64)(C.QTextImageFormat_Height(this.h)) } -func (this *QTextImageFormat) SetQuality() { - C.QTextImageFormat_SetQuality(this.h) +func (this *QTextImageFormat) SetQuality(quality int) { + C.QTextImageFormat_SetQuality(this.h, (C.int)(quality)) +} + +func (this *QTextImageFormat) SetQuality2() { + C.QTextImageFormat_SetQuality2(this.h) } func (this *QTextImageFormat) Quality() int { return (int)(C.QTextImageFormat_Quality(this.h)) } -func (this *QTextImageFormat) SetQuality1(quality int) { - C.QTextImageFormat_SetQuality1(this.h, (C.int)(quality)) -} - // Delete this object from C++ memory. func (this *QTextImageFormat) Delete() { C.QTextImageFormat_Delete(this.h) @@ -1610,10 +1627,10 @@ func (this *QTextTableFormat) ColumnWidthConstraints() []QTextLength { _ret := make([]QTextLength, int(_ma.len)) _outCast := (*[0xffff]*C.QTextLength)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _vv_ret := _outCast[i] - _vv_goptr := newQTextLength(_vv_ret) - _vv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_vv_goptr + _lv_ret := _outCast[i] + _lv_goptr := newQTextLength(_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 diff --git a/qt/gen_qtextformat.h b/qt/gen_qtextformat.h index 77d1847..d92d061 100644 --- a/qt/gen_qtextformat.h +++ b/qt/gen_qtextformat.h @@ -118,8 +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, int behavior); -void QTextCharFormat_SetFontWithFont(QTextCharFormat* self, QFont* font); +void QTextCharFormat_SetFont(QTextCharFormat* self, QFont* font); QFont* QTextCharFormat_Font(const QTextCharFormat* self); void QTextCharFormat_SetFontFamily(QTextCharFormat* self, struct miqt_string* family); struct miqt_string* QTextCharFormat_FontFamily(const QTextCharFormat* self); @@ -169,18 +168,23 @@ void QTextCharFormat_SetTextOutline(QTextCharFormat* self, QPen* pen); QPen* QTextCharFormat_TextOutline(const QTextCharFormat* self); void QTextCharFormat_SetToolTip(QTextCharFormat* self, struct miqt_string* tip); struct miqt_string* QTextCharFormat_ToolTip(const QTextCharFormat* self); +void QTextCharFormat_SetSuperScriptBaseline(QTextCharFormat* self, double baseline); +double QTextCharFormat_SuperScriptBaseline(const QTextCharFormat* self); +void QTextCharFormat_SetSubScriptBaseline(QTextCharFormat* self, double baseline); +double QTextCharFormat_SubScriptBaseline(const QTextCharFormat* self); +void QTextCharFormat_SetBaselineOffset(QTextCharFormat* self, double baseline); +double QTextCharFormat_BaselineOffset(const QTextCharFormat* self); void QTextCharFormat_SetAnchor(QTextCharFormat* self, bool anchor); bool QTextCharFormat_IsAnchor(const QTextCharFormat* self); void QTextCharFormat_SetAnchorHref(QTextCharFormat* self, struct miqt_string* value); struct miqt_string* QTextCharFormat_AnchorHref(const QTextCharFormat* self); -void QTextCharFormat_SetAnchorName(QTextCharFormat* self, struct miqt_string* name); -struct miqt_string* QTextCharFormat_AnchorName(const QTextCharFormat* self); void QTextCharFormat_SetAnchorNames(QTextCharFormat* self, struct miqt_array* /* of struct miqt_string* */ names); struct miqt_array* QTextCharFormat_AnchorNames(const QTextCharFormat* self); void QTextCharFormat_SetTableCellRowSpan(QTextCharFormat* self, int tableCellRowSpan); int QTextCharFormat_TableCellRowSpan(const QTextCharFormat* self); void QTextCharFormat_SetTableCellColumnSpan(QTextCharFormat* self, int tableCellColumnSpan); int QTextCharFormat_TableCellColumnSpan(const QTextCharFormat* self); +void QTextCharFormat_SetFont2(QTextCharFormat* self, QFont* font, int behavior); void QTextCharFormat_SetFontStyleHint2(QTextCharFormat* self, int hint, int strategy); void QTextCharFormat_Delete(QTextCharFormat* self); @@ -238,9 +242,9 @@ void QTextImageFormat_SetWidth(QTextImageFormat* self, double width); double QTextImageFormat_Width(const QTextImageFormat* self); void QTextImageFormat_SetHeight(QTextImageFormat* self, double height); double QTextImageFormat_Height(const QTextImageFormat* self); -void QTextImageFormat_SetQuality(QTextImageFormat* self); +void QTextImageFormat_SetQuality(QTextImageFormat* self, int quality); +void QTextImageFormat_SetQuality2(QTextImageFormat* self); int QTextImageFormat_Quality(const QTextImageFormat* self); -void QTextImageFormat_SetQuality1(QTextImageFormat* self, int quality); void QTextImageFormat_Delete(QTextImageFormat* self); QTextFrameFormat* QTextFrameFormat_new(); diff --git a/qt/gen_qtextlayout.cpp b/qt/gen_qtextlayout.cpp index 2942f0c..76959e9 100644 --- a/qt/gen_qtextlayout.cpp +++ b/qt/gen_qtextlayout.cpp @@ -158,35 +158,8 @@ struct miqt_string* QTextLayout_PreeditAreaText(const QTextLayout* self) { return miqt_strdup(_b.data(), _b.length()); } -void QTextLayout_SetAdditionalFormats(QTextLayout* self, struct miqt_array* /* of QTextLayout__FormatRange* */ overrides) { - QList overrides_QList; - overrides_QList.reserve(overrides->len); - QTextLayout__FormatRange** overrides_arr = static_cast(overrides->data); - for(size_t i = 0; i < overrides->len; ++i) { - overrides_QList.push_back(*(overrides_arr[i])); - } - self->setAdditionalFormats(overrides_QList); -} - -struct miqt_array* QTextLayout_AdditionalFormats(const QTextLayout* self) { - QList _ret = self->additionalFormats(); - // Convert QList<> from C++ memory to manually-managed C memory - QTextLayout__FormatRange** _arr = static_cast(malloc(sizeof(QTextLayout__FormatRange*) * _ret.length())); - for (size_t i = 0, e = _ret.length(); i < e; ++i) { - _arr[i] = new QTextLayout::FormatRange(_ret[i]); - } - struct miqt_array* _out = static_cast(malloc(sizeof(struct miqt_array))); - _out->len = _ret.length(); - _out->data = static_cast(_arr); - return _out; -} - -void QTextLayout_ClearAdditionalFormats(QTextLayout* self) { - self->clearAdditionalFormats(); -} - void QTextLayout_SetFormats(QTextLayout* self, struct miqt_array* /* of QTextLayout__FormatRange* */ overrides) { - QVector overrides_QList; + QList overrides_QList; overrides_QList.reserve(overrides->len); QTextLayout__FormatRange** overrides_arr = static_cast(overrides->data); for(size_t i = 0; i < overrides->len; ++i) { @@ -196,7 +169,7 @@ void QTextLayout_SetFormats(QTextLayout* self, struct miqt_array* /* of QTextLay } struct miqt_array* QTextLayout_Formats(const QTextLayout* self) { - QVector _ret = self->formats(); + QList _ret = self->formats(); // Convert QList<> from C++ memory to manually-managed C memory QTextLayout__FormatRange** _arr = static_cast(malloc(sizeof(QTextLayout__FormatRange*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -337,7 +310,7 @@ int QTextLayout_PreviousCursorPosition2(const QTextLayout* self, int oldPos, int } void QTextLayout_Draw3(const QTextLayout* self, QPainter* p, QPointF* pos, struct miqt_array* /* of QTextLayout__FormatRange* */ selections) { - QVector selections_QList; + QList selections_QList; selections_QList.reserve(selections->len); QTextLayout__FormatRange** selections_arr = static_cast(selections->data); for(size_t i = 0; i < selections->len; ++i) { @@ -347,7 +320,7 @@ void QTextLayout_Draw3(const QTextLayout* self, QPainter* p, QPointF* pos, struc } void QTextLayout_Draw4(const QTextLayout* self, QPainter* p, QPointF* pos, struct miqt_array* /* of QTextLayout__FormatRange* */ selections, QRectF* clip) { - QVector selections_QList; + QList selections_QList; selections_QList.reserve(selections->len); QTextLayout__FormatRange** selections_arr = static_cast(selections->data); for(size_t i = 0; i < selections->len; ++i) { @@ -501,8 +474,8 @@ int QTextLine_LineNumber(const QTextLine* self) { return self->lineNumber(); } -void QTextLine_Draw(const QTextLine* self, QPainter* p, QPointF* point) { - self->draw(p, *point); +void QTextLine_Draw(const QTextLine* self, QPainter* painter, QPointF* position) { + self->draw(painter, *position); } struct miqt_array* QTextLine_GlyphRuns(const QTextLine* self) { @@ -532,10 +505,6 @@ int QTextLine_XToCursor2(const QTextLine* self, double x, int param2) { return self->xToCursor(static_cast(x), static_cast(param2)); } -void QTextLine_Draw3(const QTextLine* self, QPainter* p, QPointF* point, QTextLayout__FormatRange* selection) { - self->draw(p, *point, selection); -} - struct miqt_array* QTextLine_GlyphRuns1(const QTextLine* self, int from) { QList _ret = self->glyphRuns(static_cast(from)); // Convert QList<> from C++ memory to manually-managed C memory @@ -566,6 +535,14 @@ void QTextLine_Delete(QTextLine* self) { delete self; } +QTextLayout__FormatRange* QTextLayout__FormatRange_new(QTextLayout__FormatRange* param1) { + return new QTextLayout::FormatRange(*param1); +} + +void QTextLayout__FormatRange_OperatorAssign(QTextLayout__FormatRange* self, QTextLayout__FormatRange* param1) { + self->operator=(*param1); +} + void QTextLayout__FormatRange_Delete(QTextLayout__FormatRange* self) { delete self; } diff --git a/qt/gen_qtextlayout.go b/qt/gen_qtextlayout.go index 5c91e1f..e39787e 100644 --- a/qt/gen_qtextlayout.go +++ b/qt/gen_qtextlayout.go @@ -245,36 +245,6 @@ func (this *QTextLayout) PreeditAreaText() string { return _ret } -func (this *QTextLayout) SetAdditionalFormats(overrides []QTextLayout__FormatRange) { - // For the C ABI, malloc a C array of raw pointers - overrides_CArray := (*[0xffff]*C.QTextLayout__FormatRange)(C.malloc(C.size_t(8 * len(overrides)))) - defer C.free(unsafe.Pointer(overrides_CArray)) - for i := range overrides { - overrides_CArray[i] = overrides[i].cPointer() - } - overrides_ma := &C.struct_miqt_array{len: C.size_t(len(overrides)), data: unsafe.Pointer(overrides_CArray)} - defer runtime.KeepAlive(unsafe.Pointer(overrides_ma)) - C.QTextLayout_SetAdditionalFormats(this.h, overrides_ma) -} - -func (this *QTextLayout) AdditionalFormats() []QTextLayout__FormatRange { - var _ma *C.struct_miqt_array = C.QTextLayout_AdditionalFormats(this.h) - _ret := make([]QTextLayout__FormatRange, int(_ma.len)) - _outCast := (*[0xffff]*C.QTextLayout__FormatRange)(unsafe.Pointer(_ma.data)) // hey ya - for i := 0; i < int(_ma.len); i++ { - _lv_ret := _outCast[i] - _lv_goptr := newQTextLayout__FormatRange(_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 *QTextLayout) ClearAdditionalFormats() { - C.QTextLayout_ClearAdditionalFormats(this.h) -} - func (this *QTextLayout) SetFormats(overrides []QTextLayout__FormatRange) { // For the C ABI, malloc a C array of raw pointers overrides_CArray := (*[0xffff]*C.QTextLayout__FormatRange)(C.malloc(C.size_t(8 * len(overrides)))) @@ -292,10 +262,10 @@ func (this *QTextLayout) Formats() []QTextLayout__FormatRange { _ret := make([]QTextLayout__FormatRange, int(_ma.len)) _outCast := (*[0xffff]*C.QTextLayout__FormatRange)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _vv_ret := _outCast[i] - _vv_goptr := newQTextLayout__FormatRange(_vv_ret) - _vv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_vv_goptr + _lv_ret := _outCast[i] + _lv_goptr := newQTextLayout__FormatRange(_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 @@ -645,8 +615,8 @@ func (this *QTextLine) LineNumber() int { return (int)(C.QTextLine_LineNumber(this.h)) } -func (this *QTextLine) Draw(p *QPainter, point *QPointF) { - C.QTextLine_Draw(this.h, p.cPointer(), point.cPointer()) +func (this *QTextLine) Draw(painter *QPainter, position *QPointF) { + C.QTextLine_Draw(this.h, painter.cPointer(), position.cPointer()) } func (this *QTextLine) GlyphRuns() []QGlyphRun { @@ -675,10 +645,6 @@ func (this *QTextLine) XToCursor2(x float64, param2 QTextLine__CursorPosition) i return (int)(C.QTextLine_XToCursor2(this.h, (C.double)(x), (C.int)(param2))) } -func (this *QTextLine) Draw3(p *QPainter, point *QPointF, selection *QTextLayout__FormatRange) { - C.QTextLine_Draw3(this.h, p.cPointer(), point.cPointer(), selection.cPointer()) -} - func (this *QTextLine) GlyphRuns1(from int) []QGlyphRun { var _ma *C.struct_miqt_array = C.QTextLine_GlyphRuns1(this.h, (C.int)(from)) _ret := make([]QGlyphRun, int(_ma.len)) @@ -743,6 +709,16 @@ func newQTextLayout__FormatRange_U(h unsafe.Pointer) *QTextLayout__FormatRange { return newQTextLayout__FormatRange((*C.QTextLayout__FormatRange)(h)) } +// NewQTextLayout__FormatRange constructs a new QTextLayout::FormatRange object. +func NewQTextLayout__FormatRange(param1 *QTextLayout__FormatRange) *QTextLayout__FormatRange { + ret := C.QTextLayout__FormatRange_new(param1.cPointer()) + return newQTextLayout__FormatRange(ret) +} + +func (this *QTextLayout__FormatRange) OperatorAssign(param1 *QTextLayout__FormatRange) { + C.QTextLayout__FormatRange_OperatorAssign(this.h, param1.cPointer()) +} + // Delete this object from C++ memory. func (this *QTextLayout__FormatRange) Delete() { C.QTextLayout__FormatRange_Delete(this.h) diff --git a/qt/gen_qtextlayout.h b/qt/gen_qtextlayout.h index a080307..2a97e3c 100644 --- a/qt/gen_qtextlayout.h +++ b/qt/gen_qtextlayout.h @@ -80,9 +80,6 @@ QTextOption* QTextLayout_TextOption(const QTextLayout* self); void QTextLayout_SetPreeditArea(QTextLayout* self, int position, struct miqt_string* text); int QTextLayout_PreeditAreaPosition(const QTextLayout* self); struct miqt_string* QTextLayout_PreeditAreaText(const QTextLayout* self); -void QTextLayout_SetAdditionalFormats(QTextLayout* self, struct miqt_array* /* of QTextLayout__FormatRange* */ overrides); -struct miqt_array* QTextLayout_AdditionalFormats(const QTextLayout* self); -void QTextLayout_ClearAdditionalFormats(QTextLayout* self); void QTextLayout_SetFormats(QTextLayout* self, struct miqt_array* /* of QTextLayout__FormatRange* */ overrides); struct miqt_array* QTextLayout_Formats(const QTextLayout* self); void QTextLayout_ClearFormats(QTextLayout* self); @@ -146,16 +143,17 @@ QPointF* QTextLine_Position(const QTextLine* self); int QTextLine_TextStart(const QTextLine* self); int QTextLine_TextLength(const QTextLine* self); int QTextLine_LineNumber(const QTextLine* self); -void QTextLine_Draw(const QTextLine* self, QPainter* p, QPointF* point); +void QTextLine_Draw(const QTextLine* self, QPainter* painter, QPointF* position); struct miqt_array* QTextLine_GlyphRuns(const QTextLine* self); 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); void QTextLine_Delete(QTextLine* self); +QTextLayout__FormatRange* QTextLayout__FormatRange_new(QTextLayout__FormatRange* param1); +void QTextLayout__FormatRange_OperatorAssign(QTextLayout__FormatRange* self, QTextLayout__FormatRange* param1); void QTextLayout__FormatRange_Delete(QTextLayout__FormatRange* self); #ifdef __cplusplus diff --git a/qt/gen_qtextlist.cpp b/qt/gen_qtextlist.cpp index 10b7100..0be6244 100644 --- a/qt/gen_qtextlist.cpp +++ b/qt/gen_qtextlist.cpp @@ -29,21 +29,10 @@ struct miqt_string* QTextList_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTextList_TrUtf8(const char* s) { - QString _ret = QTextList::trUtf8(s); - // 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()); -} - int QTextList_Count(const QTextList* self) { return self->count(); } -bool QTextList_IsEmpty(const QTextList* self) { - return self->isEmpty(); -} - QTextBlock* QTextList_Item(const QTextList* self, int i) { return new QTextBlock(self->item(static_cast(i))); } @@ -93,20 +82,6 @@ struct miqt_string* QTextList_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTextList_TrUtf82(const char* s, const char* c) { - QString _ret = QTextList::trUtf8(s, c); - // 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* QTextList_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QTextList::trUtf8(s, c, static_cast(n)); - // 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 QTextList_Delete(QTextList* self) { delete self; } diff --git a/qt/gen_qtextlist.go b/qt/gen_qtextlist.go index b5747e0..dd33e7d 100644 --- a/qt/gen_qtextlist.go +++ b/qt/gen_qtextlist.go @@ -61,23 +61,10 @@ func QTextList_Tr(s string) string { return _ret } -func QTextList_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTextList_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QTextList) Count() int { return (int)(C.QTextList_Count(this.h)) } -func (this *QTextList) IsEmpty() bool { - return (bool)(C.QTextList_IsEmpty(this.h)) -} - func (this *QTextList) Item(i int) *QTextBlock { _ret := C.QTextList_Item(this.h, (C.int)(i)) _goptr := newQTextBlock(_ret) @@ -141,28 +128,6 @@ func QTextList_Tr3(s string, c string, n int) string { return _ret } -func QTextList_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextList_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QTextList_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextList_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QTextList) Delete() { C.QTextList_Delete(this.h) diff --git a/qt/gen_qtextlist.h b/qt/gen_qtextlist.h index 9c7cc92..9422aaf 100644 --- a/qt/gen_qtextlist.h +++ b/qt/gen_qtextlist.h @@ -31,9 +31,7 @@ QTextList* QTextList_new(QTextDocument* doc); QMetaObject* QTextList_MetaObject(const QTextList* self); void* QTextList_Metacast(QTextList* self, const char* param1); struct miqt_string* QTextList_Tr(const char* s); -struct miqt_string* QTextList_TrUtf8(const char* s); int QTextList_Count(const QTextList* self); -bool QTextList_IsEmpty(const QTextList* self); QTextBlock* QTextList_Item(const QTextList* self, int i); int QTextList_ItemNumber(const QTextList* self, QTextBlock* param1); struct miqt_string* QTextList_ItemText(const QTextList* self, QTextBlock* param1); @@ -44,8 +42,6 @@ void QTextList_SetFormat(QTextList* self, QTextListFormat* format); QTextListFormat* QTextList_Format(const QTextList* self); struct miqt_string* QTextList_Tr2(const char* s, const char* c); struct miqt_string* QTextList_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTextList_TrUtf82(const char* s, const char* c); -struct miqt_string* QTextList_TrUtf83(const char* s, const char* c, int n); void QTextList_Delete(QTextList* self); #ifdef __cplusplus diff --git a/qt/gen_qtextobject.cpp b/qt/gen_qtextobject.cpp index 9e130d4..36af931 100644 --- a/qt/gen_qtextobject.cpp +++ b/qt/gen_qtextobject.cpp @@ -41,13 +41,6 @@ struct miqt_string* QTextObject_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTextObject_TrUtf8(const char* s) { - QString _ret = QTextObject::trUtf8(s); - // 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()); -} - QTextFormat* QTextObject_Format(const QTextObject* self) { return new QTextFormat(self->format()); } @@ -78,20 +71,6 @@ struct miqt_string* QTextObject_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTextObject_TrUtf82(const char* s, const char* c) { - QString _ret = QTextObject::trUtf8(s, c); - // 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* QTextObject_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QTextObject::trUtf8(s, c, static_cast(n)); - // 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()); -} - QMetaObject* QTextBlockGroup_MetaObject(const QTextBlockGroup* self) { return (QMetaObject*) self->metaObject(); } @@ -107,13 +86,6 @@ struct miqt_string* QTextBlockGroup_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTextBlockGroup_TrUtf8(const char* s) { - QString _ret = QTextBlockGroup::trUtf8(s); - // 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* QTextBlockGroup_Tr2(const char* s, const char* c) { QString _ret = QTextBlockGroup::tr(s, c); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -128,20 +100,6 @@ struct miqt_string* QTextBlockGroup_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTextBlockGroup_TrUtf82(const char* s, const char* c) { - QString _ret = QTextBlockGroup::trUtf8(s, c); - // 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* QTextBlockGroup_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QTextBlockGroup::trUtf8(s, c, static_cast(n)); - // 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 QTextFrameLayoutData_OperatorAssign(QTextFrameLayoutData* self, QTextFrameLayoutData* param1) { self->operator=(*param1); } @@ -169,13 +127,6 @@ struct miqt_string* QTextFrame_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTextFrame_TrUtf8(const char* s) { - QString _ret = QTextFrame::trUtf8(s); - // 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 QTextFrame_SetFrameFormat(QTextFrame* self, QTextFrameFormat* format) { self->setFrameFormat(*format); } @@ -247,20 +198,6 @@ struct miqt_string* QTextFrame_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTextFrame_TrUtf82(const char* s, const char* c) { - QString _ret = QTextFrame::trUtf8(s, c); - // 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* QTextFrame_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QTextFrame::trUtf8(s, c, static_cast(n)); - // 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 QTextFrame_Delete(QTextFrame* self) { delete self; } @@ -350,7 +287,7 @@ struct miqt_string* QTextBlock_Text(const QTextBlock* self) { } struct miqt_array* QTextBlock_TextFormats(const QTextBlock* self) { - QVector _ret = self->textFormats(); + QList _ret = self->textFormats(); // Convert QList<> from C++ memory to manually-managed C memory QTextLayout__FormatRange** _arr = static_cast(malloc(sizeof(QTextLayout__FormatRange*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -544,12 +481,8 @@ QTextFrame__iterator* QTextFrame__iterator_new() { return new QTextFrame::iterator(); } -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__iterator* QTextFrame__iterator_new2(QTextFrame__iterator* param1) { + return new QTextFrame::iterator(*param1); } QTextFrame* QTextFrame__iterator_ParentFrame(const QTextFrame__iterator* self) { @@ -604,12 +537,8 @@ QTextBlock__iterator* QTextBlock__iterator_new() { return new QTextBlock::iterator(); } -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); +QTextBlock__iterator* QTextBlock__iterator_new2(QTextBlock__iterator* param1) { + return new QTextBlock::iterator(*param1); } QTextFragment* QTextBlock__iterator_Fragment(const QTextBlock__iterator* self) { diff --git a/qt/gen_qtextobject.go b/qt/gen_qtextobject.go index d72ab9a..071441b 100644 --- a/qt/gen_qtextobject.go +++ b/qt/gen_qtextobject.go @@ -55,15 +55,6 @@ func QTextObject_Tr(s string) string { return _ret } -func QTextObject_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTextObject_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QTextObject) Format() *QTextFormat { _ret := C.QTextObject_Format(this.h) _goptr := newQTextFormat(_ret) @@ -105,28 +96,6 @@ func QTextObject_Tr3(s string, c string, n int) string { return _ret } -func QTextObject_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextObject_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QTextObject_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextObject_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - type QTextBlockGroup struct { h *C.QTextBlockGroup *QTextObject @@ -169,15 +138,6 @@ func QTextBlockGroup_Tr(s string) string { return _ret } -func QTextBlockGroup_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTextBlockGroup_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func QTextBlockGroup_Tr2(s string, c string) string { s_Cstring := C.CString(s) defer C.free(unsafe.Pointer(s_Cstring)) @@ -200,28 +160,6 @@ func QTextBlockGroup_Tr3(s string, c string, n int) string { return _ret } -func QTextBlockGroup_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextBlockGroup_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QTextBlockGroup_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextBlockGroup_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - type QTextFrameLayoutData struct { h *C.QTextFrameLayoutData } @@ -310,15 +248,6 @@ func QTextFrame_Tr(s string) string { return _ret } -func QTextFrame_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTextFrame_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QTextFrame) SetFrameFormat(format *QTextFrameFormat) { C.QTextFrame_SetFrameFormat(this.h, format.cPointer()) } @@ -411,28 +340,6 @@ func QTextFrame_Tr3(s string, c string, n int) string { return _ret } -func QTextFrame_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextFrame_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QTextFrame_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextFrame_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QTextFrame) Delete() { C.QTextFrame_Delete(this.h) @@ -599,10 +506,10 @@ func (this *QTextBlock) TextFormats() []QTextLayout__FormatRange { _ret := make([]QTextLayout__FormatRange, int(_ma.len)) _outCast := (*[0xffff]*C.QTextLayout__FormatRange)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _vv_ret := _outCast[i] - _vv_goptr := newQTextLayout__FormatRange(_vv_ret) - _vv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_vv_goptr + _lv_ret := _outCast[i] + _lv_goptr := newQTextLayout__FormatRange(_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 @@ -879,15 +786,11 @@ func NewQTextFrame__iterator() *QTextFrame__iterator { } // NewQTextFrame__iterator2 constructs a new QTextFrame::iterator object. -func NewQTextFrame__iterator2(o *QTextFrame__iterator) *QTextFrame__iterator { - ret := C.QTextFrame__iterator_new2(o.cPointer()) +func NewQTextFrame__iterator2(param1 *QTextFrame__iterator) *QTextFrame__iterator { + ret := C.QTextFrame__iterator_new2(param1.cPointer()) 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))) } @@ -980,15 +883,11 @@ func NewQTextBlock__iterator() *QTextBlock__iterator { } // NewQTextBlock__iterator2 constructs a new QTextBlock::iterator object. -func NewQTextBlock__iterator2(o *QTextBlock__iterator) *QTextBlock__iterator { - ret := C.QTextBlock__iterator_new2(o.cPointer()) +func NewQTextBlock__iterator2(param1 *QTextBlock__iterator) *QTextBlock__iterator { + ret := C.QTextBlock__iterator_new2(param1.cPointer()) 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) diff --git a/qt/gen_qtextobject.h b/qt/gen_qtextobject.h index ed10931..2f3e1f5 100644 --- a/qt/gen_qtextobject.h +++ b/qt/gen_qtextobject.h @@ -72,24 +72,18 @@ typedef struct QTextObject QTextObject; QMetaObject* QTextObject_MetaObject(const QTextObject* self); void* QTextObject_Metacast(QTextObject* self, const char* param1); struct miqt_string* QTextObject_Tr(const char* s); -struct miqt_string* QTextObject_TrUtf8(const char* s); QTextFormat* QTextObject_Format(const QTextObject* self); int QTextObject_FormatIndex(const QTextObject* self); QTextDocument* QTextObject_Document(const QTextObject* self); int QTextObject_ObjectIndex(const QTextObject* self); struct miqt_string* QTextObject_Tr2(const char* s, const char* c); struct miqt_string* QTextObject_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTextObject_TrUtf82(const char* s, const char* c); -struct miqt_string* QTextObject_TrUtf83(const char* s, const char* c, int n); QMetaObject* QTextBlockGroup_MetaObject(const QTextBlockGroup* self); void* QTextBlockGroup_Metacast(QTextBlockGroup* self, const char* param1); struct miqt_string* QTextBlockGroup_Tr(const char* s); -struct miqt_string* QTextBlockGroup_TrUtf8(const char* s); struct miqt_string* QTextBlockGroup_Tr2(const char* s, const char* c); struct miqt_string* QTextBlockGroup_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTextBlockGroup_TrUtf82(const char* s, const char* c); -struct miqt_string* QTextBlockGroup_TrUtf83(const char* s, const char* c, int n); void QTextFrameLayoutData_OperatorAssign(QTextFrameLayoutData* self, QTextFrameLayoutData* param1); void QTextFrameLayoutData_Delete(QTextFrameLayoutData* self); @@ -98,7 +92,6 @@ QTextFrame* QTextFrame_new(QTextDocument* doc); QMetaObject* QTextFrame_MetaObject(const QTextFrame* self); void* QTextFrame_Metacast(QTextFrame* self, const char* param1); struct miqt_string* QTextFrame_Tr(const char* s); -struct miqt_string* QTextFrame_TrUtf8(const char* s); void QTextFrame_SetFrameFormat(QTextFrame* self, QTextFrameFormat* format); QTextFrameFormat* QTextFrame_FrameFormat(const QTextFrame* self); QTextCursor* QTextFrame_FirstCursorPosition(const QTextFrame* self); @@ -113,8 +106,6 @@ QTextFrame__iterator* QTextFrame_Begin(const QTextFrame* self); QTextFrame__iterator* QTextFrame_End(const QTextFrame* self); struct miqt_string* QTextFrame_Tr2(const char* s, const char* c); struct miqt_string* QTextFrame_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTextFrame_TrUtf82(const char* s, const char* c); -struct miqt_string* QTextFrame_TrUtf83(const char* s, const char* c, int n); void QTextFrame_Delete(QTextFrame* self); void QTextBlockUserData_OperatorAssign(QTextBlockUserData* self, QTextBlockUserData* param1); @@ -179,8 +170,7 @@ struct miqt_array* QTextFragment_GlyphRuns2(const QTextFragment* self, int from, 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__iterator* QTextFrame__iterator_new2(QTextFrame__iterator* param1); QTextFrame* QTextFrame__iterator_ParentFrame(const QTextFrame__iterator* self); QTextFrame* QTextFrame__iterator_CurrentFrame(const QTextFrame__iterator* self); QTextBlock* QTextFrame__iterator_CurrentBlock(const QTextFrame__iterator* self); @@ -194,8 +184,7 @@ QTextFrame__iterator* QTextFrame__iterator_OperatorMinusMinusWithInt(QTextFrame_ 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); +QTextBlock__iterator* QTextBlock__iterator_new2(QTextBlock__iterator* param1); 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); diff --git a/qt/gen_qtextoption.cpp b/qt/gen_qtextoption.cpp index b1ac162..e69dcaa 100644 --- a/qt/gen_qtextoption.cpp +++ b/qt/gen_qtextoption.cpp @@ -58,15 +58,6 @@ int QTextOption_Flags(const QTextOption* self) { return static_cast(_ret); } -void QTextOption_SetTabStop(QTextOption* self, double tabStop) { - self->setTabStop(static_cast(tabStop)); -} - -double QTextOption_TabStop(const QTextOption* self) { - qreal _ret = self->tabStop(); - return static_cast(_ret); -} - void QTextOption_SetTabStopDistance(QTextOption* self, double tabStopDistance) { self->setTabStopDistance(static_cast(tabStopDistance)); } @@ -142,11 +133,7 @@ QTextOption__Tab* QTextOption__Tab_new2(double pos, int tabType) { return new QTextOption::Tab(static_cast(pos), static_cast(tabType)); } -QTextOption__Tab* QTextOption__Tab_new3(QTextOption__Tab* param1) { - return new QTextOption::Tab(*param1); -} - -QTextOption__Tab* QTextOption__Tab_new4(double pos, int tabType, QChar* delim) { +QTextOption__Tab* QTextOption__Tab_new3(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 5e84ea0..c9733a0 100644 --- a/qt/gen_qtextoption.go +++ b/qt/gen_qtextoption.go @@ -119,14 +119,6 @@ func (this *QTextOption) Flags() QTextOption__Flag { return (QTextOption__Flag)(C.QTextOption_Flags(this.h)) } -func (this *QTextOption) SetTabStop(tabStop float64) { - C.QTextOption_SetTabStop(this.h, (C.double)(tabStop)) -} - -func (this *QTextOption) TabStop() float64 { - return (float64)(C.QTextOption_TabStop(this.h)) -} - func (this *QTextOption) SetTabStopDistance(tabStopDistance float64) { C.QTextOption_SetTabStopDistance(this.h, (C.double)(tabStopDistance)) } @@ -241,14 +233,8 @@ func NewQTextOption__Tab2(pos float64, tabType QTextOption__TabType) *QTextOptio } // NewQTextOption__Tab3 constructs a new QTextOption::Tab object. -func NewQTextOption__Tab3(param1 *QTextOption__Tab) *QTextOption__Tab { - ret := C.QTextOption__Tab_new3(param1.cPointer()) - return newQTextOption__Tab(ret) -} - -// 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.int)(tabType), delim.cPointer()) +func NewQTextOption__Tab3(pos float64, tabType QTextOption__TabType, delim QChar) *QTextOption__Tab { + ret := C.QTextOption__Tab_new3((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 31f59aa..e4e1b73 100644 --- a/qt/gen_qtextoption.h +++ b/qt/gen_qtextoption.h @@ -39,8 +39,6 @@ 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); -double QTextOption_TabStop(const QTextOption* self); void QTextOption_SetTabStopDistance(QTextOption* self, double tabStopDistance); double QTextOption_TabStopDistance(const QTextOption* self); void QTextOption_SetTabArray(QTextOption* self, struct miqt_array* /* of double */ tabStops); @@ -53,8 +51,7 @@ void QTextOption_Delete(QTextOption* self); QTextOption__Tab* QTextOption__Tab_new(); QTextOption__Tab* QTextOption__Tab_new2(double pos, int tabType); -QTextOption__Tab* QTextOption__Tab_new3(QTextOption__Tab* param1); -QTextOption__Tab* QTextOption__Tab_new4(double pos, int tabType, QChar* delim); +QTextOption__Tab* QTextOption__Tab_new3(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 4ee7250..36d7fc0 100644 --- a/qt/gen_qtextstream.cpp +++ b/qt/gen_qtextstream.cpp @@ -5,7 +5,6 @@ #include #include #include -#include #include #include "qtextstream.h" #include "gen_qtextstream.h" @@ -28,23 +27,20 @@ QTextStream* QTextStream_new4(QByteArray* array) { } QTextStream* QTextStream_new5(QByteArray* array, int openMode) { - return new QTextStream(array, static_cast(openMode)); + return new QTextStream(array, static_cast(openMode)); } QTextStream* QTextStream_new6(QByteArray* array, int openMode) { - return new QTextStream(*array, static_cast(openMode)); + return new QTextStream(*array, static_cast(openMode)); } -void QTextStream_SetCodec(QTextStream* self, QTextCodec* codec) { - self->setCodec(codec); +void QTextStream_SetEncoding(QTextStream* self, int encoding) { + self->setEncoding(static_cast(encoding)); } -void QTextStream_SetCodecWithCodecName(QTextStream* self, const char* codecName) { - self->setCodec(codecName); -} - -QTextCodec* QTextStream_Codec(const QTextStream* self) { - return self->codec(); +int QTextStream_Encoding(const QTextStream* self) { + QStringConverter::Encoding _ret = self->encoding(); + return static_cast(_ret); } void QTextStream_SetAutoDetectUnicode(QTextStream* self, bool enabled) { diff --git a/qt/gen_qtextstream.go b/qt/gen_qtextstream.go index 0d746c6..0a48540 100644 --- a/qt/gen_qtextstream.go +++ b/qt/gen_qtextstream.go @@ -51,6 +51,7 @@ const ( type QTextStream struct { h *C.QTextStream + *QIODeviceBase } func (this *QTextStream) cPointer() *C.QTextStream { @@ -64,7 +65,7 @@ func newQTextStream(h *C.QTextStream) *QTextStream { if h == nil { return nil } - return &QTextStream{h: h} + return &QTextStream{h: h, QIODeviceBase: newQIODeviceBase_U(unsafe.Pointer(h))} } func newQTextStream_U(h unsafe.Pointer) *QTextStream { @@ -96,29 +97,23 @@ func NewQTextStream4(array *QByteArray) *QTextStream { } // NewQTextStream5 constructs a new QTextStream object. -func NewQTextStream5(array *QByteArray, openMode QIODevice__OpenModeFlag) *QTextStream { +func NewQTextStream5(array *QByteArray, openMode QIODeviceBase__OpenModeFlag) *QTextStream { ret := C.QTextStream_new5(array.cPointer(), (C.int)(openMode)) return newQTextStream(ret) } // NewQTextStream6 constructs a new QTextStream object. -func NewQTextStream6(array *QByteArray, openMode QIODevice__OpenModeFlag) *QTextStream { +func NewQTextStream6(array *QByteArray, openMode QIODeviceBase__OpenModeFlag) *QTextStream { ret := C.QTextStream_new6(array.cPointer(), (C.int)(openMode)) return newQTextStream(ret) } -func (this *QTextStream) SetCodec(codec *QTextCodec) { - C.QTextStream_SetCodec(this.h, codec.cPointer()) +func (this *QTextStream) SetEncoding(encoding QStringConverter__Encoding) { + C.QTextStream_SetEncoding(this.h, (C.int)(encoding)) } -func (this *QTextStream) SetCodecWithCodecName(codecName string) { - codecName_Cstring := C.CString(codecName) - defer C.free(unsafe.Pointer(codecName_Cstring)) - C.QTextStream_SetCodecWithCodecName(this.h, codecName_Cstring) -} - -func (this *QTextStream) Codec() *QTextCodec { - return newQTextCodec_U(unsafe.Pointer(C.QTextStream_Codec(this.h))) +func (this *QTextStream) Encoding() QStringConverter__Encoding { + return (QStringConverter__Encoding)(C.QTextStream_Encoding(this.h)) } func (this *QTextStream) SetAutoDetectUnicode(enabled bool) { diff --git a/qt/gen_qtextstream.h b/qt/gen_qtextstream.h index f8c9a46..a0003dd 100644 --- a/qt/gen_qtextstream.h +++ b/qt/gen_qtextstream.h @@ -18,14 +18,12 @@ class QByteArray; class QChar; class QIODevice; class QLocale; -class QTextCodec; class QTextStream; #else typedef struct QByteArray QByteArray; typedef struct QChar QChar; typedef struct QIODevice QIODevice; typedef struct QLocale QLocale; -typedef struct QTextCodec QTextCodec; typedef struct QTextStream QTextStream; #endif @@ -35,9 +33,8 @@ QTextStream* QTextStream_new3(QByteArray* array); QTextStream* QTextStream_new4(QByteArray* array); QTextStream* QTextStream_new5(QByteArray* array, int openMode); QTextStream* QTextStream_new6(QByteArray* array, int openMode); -void QTextStream_SetCodec(QTextStream* self, QTextCodec* codec); -void QTextStream_SetCodecWithCodecName(QTextStream* self, const char* codecName); -QTextCodec* QTextStream_Codec(const QTextStream* self); +void QTextStream_SetEncoding(QTextStream* self, int encoding); +int QTextStream_Encoding(const QTextStream* self); void QTextStream_SetAutoDetectUnicode(QTextStream* self, bool enabled); bool QTextStream_AutoDetectUnicode(const QTextStream* self); void QTextStream_SetGenerateByteOrderMark(QTextStream* self, bool generate); diff --git a/qt/gen_qtexttable.cpp b/qt/gen_qtexttable.cpp index b89e415..48e022d 100644 --- a/qt/gen_qtexttable.cpp +++ b/qt/gen_qtexttable.cpp @@ -112,13 +112,6 @@ struct miqt_string* QTextTable_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTextTable_TrUtf8(const char* s) { - QString _ret = QTextTable::trUtf8(s); - // 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 QTextTable_Resize(QTextTable* self, int rows, int cols) { self->resize(static_cast(rows), static_cast(cols)); } @@ -209,20 +202,6 @@ struct miqt_string* QTextTable_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTextTable_TrUtf82(const char* s, const char* c) { - QString _ret = QTextTable::trUtf8(s, c); - // 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* QTextTable_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QTextTable::trUtf8(s, c, static_cast(n)); - // 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 QTextTable_Delete(QTextTable* self) { delete self; } diff --git a/qt/gen_qtexttable.go b/qt/gen_qtexttable.go index 18d0690..f476266 100644 --- a/qt/gen_qtexttable.go +++ b/qt/gen_qtexttable.go @@ -192,15 +192,6 @@ func QTextTable_Tr(s string) string { return _ret } -func QTextTable_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTextTable_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QTextTable) Resize(rows int, cols int) { C.QTextTable_Resize(this.h, (C.int)(rows), (C.int)(cols)) } @@ -317,28 +308,6 @@ func QTextTable_Tr3(s string, c string, n int) string { return _ret } -func QTextTable_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextTable_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QTextTable_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTextTable_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QTextTable) Delete() { C.QTextTable_Delete(this.h) diff --git a/qt/gen_qtexttable.h b/qt/gen_qtexttable.h index 7a03bfb..cf0a54e 100644 --- a/qt/gen_qtexttable.h +++ b/qt/gen_qtexttable.h @@ -62,7 +62,6 @@ QTextTable* QTextTable_new(QTextDocument* doc); QMetaObject* QTextTable_MetaObject(const QTextTable* self); void* QTextTable_Metacast(QTextTable* self, const char* param1); struct miqt_string* QTextTable_Tr(const char* s); -struct miqt_string* QTextTable_TrUtf8(const char* s); void QTextTable_Resize(QTextTable* self, int rows, int cols); void QTextTable_InsertRows(QTextTable* self, int pos, int num); void QTextTable_InsertColumns(QTextTable* self, int pos, int num); @@ -84,8 +83,6 @@ void QTextTable_SetFormat(QTextTable* self, QTextTableFormat* format); QTextTableFormat* QTextTable_Format(const QTextTable* self); struct miqt_string* QTextTable_Tr2(const char* s, const char* c); struct miqt_string* QTextTable_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTextTable_TrUtf82(const char* s, const char* c); -struct miqt_string* QTextTable_TrUtf83(const char* s, const char* c, int n); void QTextTable_Delete(QTextTable* self); #ifdef __cplusplus diff --git a/qt/gen_qthread.cpp b/qt/gen_qthread.cpp index bb45677..3ec3de3 100644 --- a/qt/gen_qthread.cpp +++ b/qt/gen_qthread.cpp @@ -34,13 +34,6 @@ struct miqt_string* QThread_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QThread_TrUtf8(const char* s) { - QString _ret = QThread::trUtf8(s); - // 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* QThread_CurrentThreadId() { Qt::HANDLE _ret = QThread::currentThreadId(); return static_cast(_ret); @@ -92,10 +85,6 @@ unsigned int QThread_StackSize(const QThread* self) { return static_cast(_ret); } -void QThread_Exit(QThread* self) { - self->exit(); -} - QAbstractEventDispatcher* QThread_EventDispatcher(const QThread* self) { return self->eventDispatcher(); } @@ -120,6 +109,10 @@ void QThread_Terminate(QThread* self) { self->terminate(); } +void QThread_Exit(QThread* self) { + self->exit(); +} + void QThread_Quit(QThread* self) { self->quit(); } @@ -158,28 +151,14 @@ struct miqt_string* QThread_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QThread_TrUtf82(const char* s, const char* c) { - QString _ret = QThread::trUtf8(s, c); - // 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* QThread_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QThread::trUtf8(s, c, static_cast(n)); - // 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 QThread_Start1(QThread* self, int param1) { + self->start(static_cast(param1)); } void QThread_Exit1(QThread* self, int retcode) { self->exit(static_cast(retcode)); } -void QThread_Start1(QThread* self, int param1) { - self->start(static_cast(param1)); -} - bool QThread_Wait1(QThread* self, QDeadlineTimer* deadline) { return self->wait(*deadline); } diff --git a/qt/gen_qthread.go b/qt/gen_qthread.go index b1cb5b3..ef068b4 100644 --- a/qt/gen_qthread.go +++ b/qt/gen_qthread.go @@ -80,15 +80,6 @@ func QThread_Tr(s string) string { return _ret } -func QThread_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QThread_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func QThread_CurrentThreadId() unsafe.Pointer { return C.QThread_CurrentThreadId() } @@ -137,10 +128,6 @@ func (this *QThread) StackSize() uint { return (uint)(C.QThread_StackSize(this.h)) } -func (this *QThread) Exit() { - C.QThread_Exit(this.h) -} - func (this *QThread) EventDispatcher() *QAbstractEventDispatcher { return newQAbstractEventDispatcher_U(unsafe.Pointer(C.QThread_EventDispatcher(this.h))) } @@ -165,6 +152,10 @@ func (this *QThread) Terminate() { C.QThread_Terminate(this.h) } +func (this *QThread) Exit() { + C.QThread_Exit(this.h) +} + func (this *QThread) Quit() { C.QThread_Quit(this.h) } @@ -211,36 +202,14 @@ func QThread_Tr3(s string, c string, n int) string { return _ret } -func QThread_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QThread_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QThread_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QThread_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret +func (this *QThread) Start1(param1 QThread__Priority) { + C.QThread_Start1(this.h, (C.int)(param1)) } func (this *QThread) Exit1(retcode int) { C.QThread_Exit1(this.h, (C.int)(retcode)) } -func (this *QThread) Start1(param1 QThread__Priority) { - C.QThread_Start1(this.h, (C.int)(param1)) -} - func (this *QThread) Wait1(deadline QDeadlineTimer) bool { return (bool)(C.QThread_Wait1(this.h, deadline.cPointer())) } diff --git a/qt/gen_qthread.h b/qt/gen_qthread.h index 2fc08a8..4079680 100644 --- a/qt/gen_qthread.h +++ b/qt/gen_qthread.h @@ -34,7 +34,6 @@ QThread* QThread_new2(QObject* parent); QMetaObject* QThread_MetaObject(const QThread* self); void* QThread_Metacast(QThread* self, const char* param1); struct miqt_string* QThread_Tr(const char* s); -struct miqt_string* QThread_TrUtf8(const char* s); void* QThread_CurrentThreadId(); QThread* QThread_CurrentThread(); int QThread_IdealThreadCount(); @@ -47,13 +46,13 @@ void QThread_RequestInterruption(QThread* self); bool QThread_IsInterruptionRequested(const QThread* self); void QThread_SetStackSize(QThread* self, unsigned int stackSize); unsigned int QThread_StackSize(const QThread* self); -void QThread_Exit(QThread* self); QAbstractEventDispatcher* QThread_EventDispatcher(const QThread* self); void QThread_SetEventDispatcher(QThread* self, QAbstractEventDispatcher* eventDispatcher); bool QThread_Event(QThread* self, QEvent* event); int QThread_LoopLevel(const QThread* self); void QThread_Start(QThread* self); void QThread_Terminate(QThread* self); +void QThread_Exit(QThread* self); void QThread_Quit(QThread* self); bool QThread_Wait(QThread* self); bool QThread_WaitWithTime(QThread* self, unsigned long time); @@ -62,10 +61,8 @@ void QThread_Msleep(unsigned long param1); void QThread_Usleep(unsigned long param1); struct miqt_string* QThread_Tr2(const char* s, const char* c); 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, int param1); +void QThread_Exit1(QThread* self, int retcode); 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 d7b199e..c415503 100644 --- a/qt/gen_qthreadpool.cpp +++ b/qt/gen_qthreadpool.cpp @@ -33,13 +33,6 @@ struct miqt_string* QThreadPool_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QThreadPool_TrUtf8(const char* s) { - QString _ret = QThreadPool::trUtf8(s); - // 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()); -} - QThreadPool* QThreadPool_GlobalInstance() { return QThreadPool::globalInstance(); } @@ -52,6 +45,10 @@ bool QThreadPool_TryStart(QThreadPool* self, QRunnable* runnable) { return self->tryStart(runnable); } +void QThreadPool_StartOnReservedThread(QThreadPool* self, QRunnable* runnable) { + self->startOnReservedThread(runnable); +} + int QThreadPool_ExpiryTimeout(const QThreadPool* self) { return self->expiryTimeout(); } @@ -81,6 +78,15 @@ unsigned int QThreadPool_StackSize(const QThreadPool* self) { return static_cast(_ret); } +void QThreadPool_SetThreadPriority(QThreadPool* self, int priority) { + self->setThreadPriority(static_cast(priority)); +} + +int QThreadPool_ThreadPriority(const QThreadPool* self) { + QThread::Priority _ret = self->threadPriority(); + return static_cast(_ret); +} + void QThreadPool_ReserveThread(QThreadPool* self) { self->reserveThread(); } @@ -101,10 +107,6 @@ bool QThreadPool_Contains(const QThreadPool* self, QThread* thread) { return self->contains(thread); } -void QThreadPool_Cancel(QThreadPool* self, QRunnable* runnable) { - self->cancel(runnable); -} - bool QThreadPool_TryTake(QThreadPool* self, QRunnable* runnable) { return self->tryTake(runnable); } @@ -123,20 +125,6 @@ struct miqt_string* QThreadPool_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QThreadPool_TrUtf82(const char* s, const char* c) { - QString _ret = QThreadPool::trUtf8(s, c); - // 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* QThreadPool_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QThreadPool::trUtf8(s, c, static_cast(n)); - // 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 QThreadPool_Start2(QThreadPool* self, QRunnable* runnable, int priority) { self->start(runnable, static_cast(priority)); } diff --git a/qt/gen_qthreadpool.go b/qt/gen_qthreadpool.go index 8491225..a0df488 100644 --- a/qt/gen_qthreadpool.go +++ b/qt/gen_qthreadpool.go @@ -67,15 +67,6 @@ func QThreadPool_Tr(s string) string { return _ret } -func QThreadPool_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QThreadPool_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func QThreadPool_GlobalInstance() *QThreadPool { return newQThreadPool_U(unsafe.Pointer(C.QThreadPool_GlobalInstance())) } @@ -88,6 +79,10 @@ func (this *QThreadPool) TryStart(runnable *QRunnable) bool { return (bool)(C.QThreadPool_TryStart(this.h, runnable.cPointer())) } +func (this *QThreadPool) StartOnReservedThread(runnable *QRunnable) { + C.QThreadPool_StartOnReservedThread(this.h, runnable.cPointer()) +} + func (this *QThreadPool) ExpiryTimeout() int { return (int)(C.QThreadPool_ExpiryTimeout(this.h)) } @@ -116,6 +111,14 @@ func (this *QThreadPool) StackSize() uint { return (uint)(C.QThreadPool_StackSize(this.h)) } +func (this *QThreadPool) SetThreadPriority(priority QThread__Priority) { + C.QThreadPool_SetThreadPriority(this.h, (C.int)(priority)) +} + +func (this *QThreadPool) ThreadPriority() QThread__Priority { + return (QThread__Priority)(C.QThreadPool_ThreadPriority(this.h)) +} + func (this *QThreadPool) ReserveThread() { C.QThreadPool_ReserveThread(this.h) } @@ -136,10 +139,6 @@ func (this *QThreadPool) Contains(thread *QThread) bool { return (bool)(C.QThreadPool_Contains(this.h, thread.cPointer())) } -func (this *QThreadPool) Cancel(runnable *QRunnable) { - C.QThreadPool_Cancel(this.h, runnable.cPointer()) -} - func (this *QThreadPool) TryTake(runnable *QRunnable) bool { return (bool)(C.QThreadPool_TryTake(this.h, runnable.cPointer())) } @@ -166,28 +165,6 @@ func QThreadPool_Tr3(s string, c string, n int) string { return _ret } -func QThreadPool_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QThreadPool_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QThreadPool_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QThreadPool_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QThreadPool) Start2(runnable *QRunnable, priority int) { C.QThreadPool_Start2(this.h, runnable.cPointer(), (C.int)(priority)) } diff --git a/qt/gen_qthreadpool.h b/qt/gen_qthreadpool.h index 28ff662..ee35c2c 100644 --- a/qt/gen_qthreadpool.h +++ b/qt/gen_qthreadpool.h @@ -32,10 +32,10 @@ QThreadPool* QThreadPool_new2(QObject* parent); QMetaObject* QThreadPool_MetaObject(const QThreadPool* self); void* QThreadPool_Metacast(QThreadPool* self, const char* param1); struct miqt_string* QThreadPool_Tr(const char* s); -struct miqt_string* QThreadPool_TrUtf8(const char* s); QThreadPool* QThreadPool_GlobalInstance(); void QThreadPool_Start(QThreadPool* self, QRunnable* runnable); bool QThreadPool_TryStart(QThreadPool* self, QRunnable* runnable); +void QThreadPool_StartOnReservedThread(QThreadPool* self, QRunnable* runnable); int QThreadPool_ExpiryTimeout(const QThreadPool* self); void QThreadPool_SetExpiryTimeout(QThreadPool* self, int expiryTimeout); int QThreadPool_MaxThreadCount(const QThreadPool* self); @@ -43,17 +43,16 @@ void QThreadPool_SetMaxThreadCount(QThreadPool* self, int maxThreadCount); int QThreadPool_ActiveThreadCount(const QThreadPool* self); void QThreadPool_SetStackSize(QThreadPool* self, unsigned int stackSize); unsigned int QThreadPool_StackSize(const QThreadPool* self); +void QThreadPool_SetThreadPriority(QThreadPool* self, int priority); +int QThreadPool_ThreadPriority(const QThreadPool* self); void QThreadPool_ReserveThread(QThreadPool* self); void QThreadPool_ReleaseThread(QThreadPool* self); bool QThreadPool_WaitForDone(QThreadPool* self); void QThreadPool_Clear(QThreadPool* self); bool QThreadPool_Contains(const QThreadPool* self, QThread* thread); -void QThreadPool_Cancel(QThreadPool* self, QRunnable* runnable); bool QThreadPool_TryTake(QThreadPool* self, QRunnable* runnable); struct miqt_string* QThreadPool_Tr2(const char* s, const char* c); struct miqt_string* QThreadPool_Tr3(const char* s, const char* c, int n); -struct miqt_string* QThreadPool_TrUtf82(const char* s, const char* c); -struct miqt_string* QThreadPool_TrUtf83(const char* s, const char* c, int n); void QThreadPool_Start2(QThreadPool* self, QRunnable* runnable, int priority); bool QThreadPool_WaitForDone1(QThreadPool* self, int msecs); void QThreadPool_Delete(QThreadPool* self); diff --git a/qt/gen_qtimeline.cpp b/qt/gen_qtimeline.cpp index e5db9dc..aca0c66 100644 --- a/qt/gen_qtimeline.cpp +++ b/qt/gen_qtimeline.cpp @@ -36,13 +36,6 @@ struct miqt_string* QTimeLine_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTimeLine_TrUtf8(const char* s) { - QString _ret = QTimeLine::trUtf8(s); - // 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()); -} - int QTimeLine_State(const QTimeLine* self) { QTimeLine::State _ret = self->state(); return static_cast(_ret); @@ -101,15 +94,6 @@ void QTimeLine_SetUpdateInterval(QTimeLine* self, int interval) { self->setUpdateInterval(static_cast(interval)); } -int QTimeLine_CurveShape(const QTimeLine* self) { - QTimeLine::CurveShape _ret = self->curveShape(); - return static_cast(_ret); -} - -void QTimeLine_SetCurveShape(QTimeLine* self, int shape) { - self->setCurveShape(static_cast(shape)); -} - QEasingCurve* QTimeLine_EasingCurve(const QTimeLine* self) { return new QEasingCurve(self->easingCurve()); } @@ -178,20 +162,6 @@ struct miqt_string* QTimeLine_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTimeLine_TrUtf82(const char* s, const char* c) { - QString _ret = QTimeLine::trUtf8(s, c); - // 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* QTimeLine_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QTimeLine::trUtf8(s, c, static_cast(n)); - // 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 QTimeLine_Delete(QTimeLine* self) { delete self; } diff --git a/qt/gen_qtimeline.go b/qt/gen_qtimeline.go index 848b634..7241a19 100644 --- a/qt/gen_qtimeline.go +++ b/qt/gen_qtimeline.go @@ -28,17 +28,6 @@ const ( QTimeLine__Backward QTimeLine__Direction = 1 ) -type QTimeLine__CurveShape int - -const ( - QTimeLine__EaseInCurve QTimeLine__CurveShape = 0 - QTimeLine__EaseOutCurve QTimeLine__CurveShape = 1 - QTimeLine__EaseInOutCurve QTimeLine__CurveShape = 2 - QTimeLine__LinearCurve QTimeLine__CurveShape = 3 - QTimeLine__SineCurve QTimeLine__CurveShape = 4 - QTimeLine__CosineCurve QTimeLine__CurveShape = 5 -) - type QTimeLine struct { h *C.QTimeLine *QObject @@ -99,15 +88,6 @@ func QTimeLine_Tr(s string) string { return _ret } -func QTimeLine_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTimeLine_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QTimeLine) State() QTimeLine__State { return (QTimeLine__State)(C.QTimeLine_State(this.h)) } @@ -164,14 +144,6 @@ func (this *QTimeLine) SetUpdateInterval(interval int) { C.QTimeLine_SetUpdateInterval(this.h, (C.int)(interval)) } -func (this *QTimeLine) CurveShape() QTimeLine__CurveShape { - return (QTimeLine__CurveShape)(C.QTimeLine_CurveShape(this.h)) -} - -func (this *QTimeLine) SetCurveShape(shape QTimeLine__CurveShape) { - C.QTimeLine_SetCurveShape(this.h, (C.int)(shape)) -} - func (this *QTimeLine) EasingCurve() *QEasingCurve { _ret := C.QTimeLine_EasingCurve(this.h) _goptr := newQEasingCurve(_ret) @@ -249,28 +221,6 @@ func QTimeLine_Tr3(s string, c string, n int) string { return _ret } -func QTimeLine_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTimeLine_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QTimeLine_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTimeLine_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QTimeLine) Delete() { C.QTimeLine_Delete(this.h) diff --git a/qt/gen_qtimeline.h b/qt/gen_qtimeline.h index a424d86..776c36c 100644 --- a/qt/gen_qtimeline.h +++ b/qt/gen_qtimeline.h @@ -31,7 +31,6 @@ QTimeLine* QTimeLine_new3(int duration, QObject* parent); QMetaObject* QTimeLine_MetaObject(const QTimeLine* self); void* QTimeLine_Metacast(QTimeLine* self, const char* param1); struct miqt_string* QTimeLine_Tr(const char* s); -struct miqt_string* QTimeLine_TrUtf8(const char* s); int QTimeLine_State(const QTimeLine* self); int QTimeLine_LoopCount(const QTimeLine* self); void QTimeLine_SetLoopCount(QTimeLine* self, int count); @@ -46,8 +45,6 @@ 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); -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); @@ -63,8 +60,6 @@ void QTimeLine_SetCurrentTime(QTimeLine* self, int msec); void QTimeLine_ToggleDirection(QTimeLine* self); struct miqt_string* QTimeLine_Tr2(const char* s, const char* c); struct miqt_string* QTimeLine_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTimeLine_TrUtf82(const char* s, const char* c); -struct miqt_string* QTimeLine_TrUtf83(const char* s, const char* c, int n); void QTimeLine_Delete(QTimeLine* self); #ifdef __cplusplus diff --git a/qt/gen_qtimer.cpp b/qt/gen_qtimer.cpp index 295438e..ce257c7 100644 --- a/qt/gen_qtimer.cpp +++ b/qt/gen_qtimer.cpp @@ -31,13 +31,6 @@ struct miqt_string* QTimer_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTimer_TrUtf8(const char* s) { - QString _ret = QTimer::trUtf8(s); - // 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()); -} - bool QTimer_IsActive(const QTimer* self) { return self->isActive(); } @@ -101,20 +94,6 @@ struct miqt_string* QTimer_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTimer_TrUtf82(const char* s, const char* c) { - QString _ret = QTimer::trUtf8(s, c); - // 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* QTimer_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QTimer::trUtf8(s, c, static_cast(n)); - // 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 QTimer_Delete(QTimer* self) { delete self; } diff --git a/qt/gen_qtimer.go b/qt/gen_qtimer.go index bc09d16..a631ba9 100644 --- a/qt/gen_qtimer.go +++ b/qt/gen_qtimer.go @@ -67,15 +67,6 @@ func QTimer_Tr(s string) string { return _ret } -func QTimer_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTimer_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QTimer) IsActive() bool { return (bool)(C.QTimer_IsActive(this.h)) } @@ -146,28 +137,6 @@ func QTimer_Tr3(s string, c string, n int) string { return _ret } -func QTimer_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTimer_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QTimer_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTimer_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QTimer) Delete() { C.QTimer_Delete(this.h) diff --git a/qt/gen_qtimer.h b/qt/gen_qtimer.h index cbd475b..d933e12 100644 --- a/qt/gen_qtimer.h +++ b/qt/gen_qtimer.h @@ -28,7 +28,6 @@ QTimer* QTimer_new2(QObject* parent); QMetaObject* QTimer_MetaObject(const QTimer* self); void* QTimer_Metacast(QTimer* self, const char* param1); struct miqt_string* QTimer_Tr(const char* s); -struct miqt_string* QTimer_TrUtf8(const char* s); bool QTimer_IsActive(const QTimer* self); int QTimer_TimerId(const QTimer* self); void QTimer_SetInterval(QTimer* self, int msec); @@ -43,8 +42,6 @@ void QTimer_Start2(QTimer* self); void QTimer_Stop(QTimer* self); struct miqt_string* QTimer_Tr2(const char* s, const char* c); struct miqt_string* QTimer_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTimer_TrUtf82(const char* s, const char* c); -struct miqt_string* QTimer_TrUtf83(const char* s, const char* c, int n); void QTimer_Delete(QTimer* self); #ifdef __cplusplus diff --git a/qt/gen_qtimezone.cpp b/qt/gen_qtimezone.cpp index 84fb402..a841c9c 100644 --- a/qt/gen_qtimezone.cpp +++ b/qt/gen_qtimezone.cpp @@ -33,17 +33,17 @@ QTimeZone* QTimeZone_new5(QTimeZone* other) { return new QTimeZone(*other); } -QTimeZone* QTimeZone_new6(QByteArray* zoneId, int offsetSeconds, struct miqt_string* name, struct miqt_string* abbreviation, int country) { +QTimeZone* QTimeZone_new6(QByteArray* zoneId, int offsetSeconds, struct miqt_string* name, struct miqt_string* abbreviation, uint16_t territory) { 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)); + return new QTimeZone(*zoneId, static_cast(offsetSeconds), name_QString, abbreviation_QString, static_cast(territory)); } -QTimeZone* QTimeZone_new7(QByteArray* zoneId, int offsetSeconds, struct miqt_string* name, struct miqt_string* abbreviation, int country, struct miqt_string* comment) { +QTimeZone* QTimeZone_new7(QByteArray* zoneId, int offsetSeconds, struct miqt_string* name, struct miqt_string* abbreviation, uint16_t territory, 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); - return new QTimeZone(*zoneId, static_cast(offsetSeconds), name_QString, abbreviation_QString, static_cast(country), comment_QString); + return new QTimeZone(*zoneId, static_cast(offsetSeconds), name_QString, abbreviation_QString, static_cast(territory), comment_QString); } void QTimeZone_OperatorAssign(QTimeZone* self, QTimeZone* other) { @@ -70,9 +70,14 @@ QByteArray* QTimeZone_Id(const QTimeZone* self) { return new QByteArray(self->id()); } -int QTimeZone_Country(const QTimeZone* self) { +uint16_t QTimeZone_Territory(const QTimeZone* self) { + QLocale::Territory _ret = self->territory(); + return static_cast(_ret); +} + +uint16_t 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) { @@ -181,8 +186,8 @@ struct miqt_array* QTimeZone_AvailableTimeZoneIds() { return _out; } -struct miqt_array* QTimeZone_AvailableTimeZoneIdsWithCountry(int country) { - QList _ret = QTimeZone::availableTimeZoneIds(static_cast(country)); +struct miqt_array* QTimeZone_AvailableTimeZoneIdsWithTerritory(uint16_t territory) { + QList _ret = QTimeZone::availableTimeZoneIds(static_cast(territory)); // Convert QList<> from C++ memory to manually-managed C memory QByteArray** _arr = static_cast(malloc(sizeof(QByteArray*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -215,8 +220,8 @@ QByteArray* QTimeZone_WindowsIdToDefaultIanaId(QByteArray* windowsId) { return new QByteArray(QTimeZone::windowsIdToDefaultIanaId(*windowsId)); } -QByteArray* QTimeZone_WindowsIdToDefaultIanaId2(QByteArray* windowsId, int country) { - return new QByteArray(QTimeZone::windowsIdToDefaultIanaId(*windowsId, static_cast(country))); +QByteArray* QTimeZone_WindowsIdToDefaultIanaId2(QByteArray* windowsId, uint16_t territory) { + return new QByteArray(QTimeZone::windowsIdToDefaultIanaId(*windowsId, static_cast(territory))); } struct miqt_array* QTimeZone_WindowsIdToIanaIds(QByteArray* windowsId) { @@ -232,8 +237,8 @@ struct miqt_array* QTimeZone_WindowsIdToIanaIds(QByteArray* windowsId) { return _out; } -struct miqt_array* QTimeZone_WindowsIdToIanaIds2(QByteArray* windowsId, int country) { - QList _ret = QTimeZone::windowsIdToIanaIds(*windowsId, static_cast(country)); +struct miqt_array* QTimeZone_WindowsIdToIanaIds2(QByteArray* windowsId, uint16_t territory) { + QList _ret = QTimeZone::windowsIdToIanaIds(*windowsId, static_cast(territory)); // Convert QList<> from C++ memory to manually-managed C memory QByteArray** _arr = static_cast(malloc(sizeof(QByteArray*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { diff --git a/qt/gen_qtimezone.go b/qt/gen_qtimezone.go index c12a603..488df04 100644 --- a/qt/gen_qtimezone.go +++ b/qt/gen_qtimezone.go @@ -94,24 +94,24 @@ func NewQTimeZone5(other *QTimeZone) *QTimeZone { } // NewQTimeZone6 constructs a new QTimeZone object. -func NewQTimeZone6(zoneId *QByteArray, offsetSeconds int, name string, abbreviation string, country QLocale__Country) *QTimeZone { +func NewQTimeZone6(zoneId *QByteArray, offsetSeconds int, name string, abbreviation string, territory QLocale__Country) *QTimeZone { name_ms := miqt_strdupg(name) 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.int)(country)) + ret := C.QTimeZone_new6(zoneId.cPointer(), (C.int)(offsetSeconds), (*C.struct_miqt_string)(name_ms), (*C.struct_miqt_string)(abbreviation_ms), (C.uint16_t)(territory)) return newQTimeZone(ret) } // NewQTimeZone7 constructs a new QTimeZone object. -func NewQTimeZone7(zoneId *QByteArray, offsetSeconds int, name string, abbreviation string, country QLocale__Country, comment string) *QTimeZone { +func NewQTimeZone7(zoneId *QByteArray, offsetSeconds int, name string, abbreviation string, territory QLocale__Country, comment string) *QTimeZone { name_ms := miqt_strdupg(name) defer C.free(name_ms) abbreviation_ms := miqt_strdupg(abbreviation) 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.int)(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.uint16_t)(territory), (*C.struct_miqt_string)(comment_ms)) return newQTimeZone(ret) } @@ -142,6 +142,10 @@ func (this *QTimeZone) Id() *QByteArray { return _goptr } +func (this *QTimeZone) Territory() QLocale__Country { + return (QLocale__Country)(C.QTimeZone_Territory(this.h)) +} + func (this *QTimeZone) Country() QLocale__Country { return (QLocale__Country)(C.QTimeZone_Country(this.h)) } @@ -224,10 +228,10 @@ func (this *QTimeZone) Transitions(fromDateTime *QDateTime, toDateTime *QDateTim _ret := make([]QTimeZone__OffsetData, int(_ma.len)) _outCast := (*[0xffff]*C.QTimeZone__OffsetData)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _vv_ret := _outCast[i] - _vv_goptr := newQTimeZone__OffsetData(_vv_ret) - _vv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_vv_goptr + _lv_ret := _outCast[i] + _lv_goptr := newQTimeZone__OffsetData(_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 @@ -272,8 +276,8 @@ func QTimeZone_AvailableTimeZoneIds() []QByteArray { return _ret } -func QTimeZone_AvailableTimeZoneIdsWithCountry(country QLocale__Country) []QByteArray { - var _ma *C.struct_miqt_array = C.QTimeZone_AvailableTimeZoneIdsWithCountry((C.int)(country)) +func QTimeZone_AvailableTimeZoneIdsWithTerritory(territory QLocale__Country) []QByteArray { + var _ma *C.struct_miqt_array = C.QTimeZone_AvailableTimeZoneIdsWithTerritory((C.uint16_t)(territory)) _ret := make([]QByteArray, int(_ma.len)) _outCast := (*[0xffff]*C.QByteArray)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -314,8 +318,8 @@ func QTimeZone_WindowsIdToDefaultIanaId(windowsId *QByteArray) *QByteArray { return _goptr } -func QTimeZone_WindowsIdToDefaultIanaId2(windowsId *QByteArray, country QLocale__Country) *QByteArray { - _ret := C.QTimeZone_WindowsIdToDefaultIanaId2(windowsId.cPointer(), (C.int)(country)) +func QTimeZone_WindowsIdToDefaultIanaId2(windowsId *QByteArray, territory QLocale__Country) *QByteArray { + _ret := C.QTimeZone_WindowsIdToDefaultIanaId2(windowsId.cPointer(), (C.uint16_t)(territory)) _goptr := newQByteArray(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -335,8 +339,8 @@ func QTimeZone_WindowsIdToIanaIds(windowsId *QByteArray) []QByteArray { return _ret } -func QTimeZone_WindowsIdToIanaIds2(windowsId *QByteArray, country QLocale__Country) []QByteArray { - var _ma *C.struct_miqt_array = C.QTimeZone_WindowsIdToIanaIds2(windowsId.cPointer(), (C.int)(country)) +func QTimeZone_WindowsIdToIanaIds2(windowsId *QByteArray, territory QLocale__Country) []QByteArray { + var _ma *C.struct_miqt_array = C.QTimeZone_WindowsIdToIanaIds2(windowsId.cPointer(), (C.uint16_t)(territory)) _ret := make([]QByteArray, int(_ma.len)) _outCast := (*[0xffff]*C.QByteArray)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { diff --git a/qt/gen_qtimezone.h b/qt/gen_qtimezone.h index c3cf9a0..8a1398e 100644 --- a/qt/gen_qtimezone.h +++ b/qt/gen_qtimezone.h @@ -36,15 +36,16 @@ 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, int country); -QTimeZone* QTimeZone_new7(QByteArray* zoneId, int offsetSeconds, struct miqt_string* name, struct miqt_string* abbreviation, int country, struct miqt_string* comment); +QTimeZone* QTimeZone_new6(QByteArray* zoneId, int offsetSeconds, struct miqt_string* name, struct miqt_string* abbreviation, uint16_t territory); +QTimeZone* QTimeZone_new7(QByteArray* zoneId, int offsetSeconds, struct miqt_string* name, struct miqt_string* abbreviation, uint16_t territory, 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); -int QTimeZone_Country(const QTimeZone* self); +uint16_t QTimeZone_Territory(const QTimeZone* self); +uint16_t 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, int timeType); @@ -64,13 +65,13 @@ QTimeZone* QTimeZone_SystemTimeZone(); QTimeZone* QTimeZone_Utc(); bool QTimeZone_IsTimeZoneIdAvailable(QByteArray* ianaId); struct miqt_array* QTimeZone_AvailableTimeZoneIds(); -struct miqt_array* QTimeZone_AvailableTimeZoneIdsWithCountry(int country); +struct miqt_array* QTimeZone_AvailableTimeZoneIdsWithTerritory(uint16_t territory); struct miqt_array* QTimeZone_AvailableTimeZoneIdsWithOffsetSeconds(int offsetSeconds); QByteArray* QTimeZone_IanaIdToWindowsId(QByteArray* ianaId); QByteArray* QTimeZone_WindowsIdToDefaultIanaId(QByteArray* windowsId); -QByteArray* QTimeZone_WindowsIdToDefaultIanaId2(QByteArray* windowsId, int country); +QByteArray* QTimeZone_WindowsIdToDefaultIanaId2(QByteArray* windowsId, uint16_t territory); struct miqt_array* QTimeZone_WindowsIdToIanaIds(QByteArray* windowsId); -struct miqt_array* QTimeZone_WindowsIdToIanaIds2(QByteArray* windowsId, int country); +struct miqt_array* QTimeZone_WindowsIdToIanaIds2(QByteArray* windowsId, uint16_t territory); 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); diff --git a/qt/gen_qtoolbar.cpp b/qt/gen_qtoolbar.cpp index 13c0ec4..42f79d2 100644 --- a/qt/gen_qtoolbar.cpp +++ b/qt/gen_qtoolbar.cpp @@ -1,5 +1,4 @@ #include -#include #include #include #include @@ -46,13 +45,6 @@ struct miqt_string* QToolBar_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QToolBar_TrUtf8(const char* s) { - QString _ret = QToolBar::trUtf8(s); - // 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 QToolBar_SetMovable(QToolBar* self, bool movable) { self->setMovable(movable); } @@ -87,16 +79,6 @@ void QToolBar_Clear(QToolBar* self) { self->clear(); } -QAction* QToolBar_AddAction(QToolBar* self, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); - return self->addAction(text_QString); -} - -QAction* QToolBar_AddAction2(QToolBar* self, QIcon* icon, struct miqt_string* text) { - QString text_QString = QString::fromUtf8(&text->data, text->len); - return self->addAction(*icon, text_QString); -} - QAction* QToolBar_AddSeparator(QToolBar* self) { return self->addSeparator(); } @@ -269,20 +251,6 @@ struct miqt_string* QToolBar_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QToolBar_TrUtf82(const char* s, const char* c) { - QString _ret = QToolBar::trUtf8(s, c); - // 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* QToolBar_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QToolBar::trUtf8(s, c, static_cast(n)); - // 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 QToolBar_Delete(QToolBar* self) { delete self; } diff --git a/qt/gen_qtoolbar.go b/qt/gen_qtoolbar.go index 14f00ad..3ead64d 100644 --- a/qt/gen_qtoolbar.go +++ b/qt/gen_qtoolbar.go @@ -84,15 +84,6 @@ func QToolBar_Tr(s string) string { return _ret } -func QToolBar_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QToolBar_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QToolBar) SetMovable(movable bool) { C.QToolBar_SetMovable(this.h, (C.bool)(movable)) } @@ -125,18 +116,6 @@ func (this *QToolBar) Clear() { C.QToolBar_Clear(this.h) } -func (this *QToolBar) AddAction(text string) *QAction { - text_ms := miqt_strdupg(text) - defer C.free(text_ms) - return newQAction_U(unsafe.Pointer(C.QToolBar_AddAction(this.h, (*C.struct_miqt_string)(text_ms)))) -} - -func (this *QToolBar) AddAction2(icon *QIcon, text string) *QAction { - text_ms := miqt_strdupg(text) - defer C.free(text_ms) - return newQAction_U(unsafe.Pointer(C.QToolBar_AddAction2(this.h, icon.cPointer(), (*C.struct_miqt_string)(text_ms)))) -} - func (this *QToolBar) AddSeparator() *QAction { return newQAction_U(unsafe.Pointer(C.QToolBar_AddSeparator(this.h))) } @@ -389,28 +368,6 @@ func QToolBar_Tr3(s string, c string, n int) string { return _ret } -func QToolBar_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QToolBar_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QToolBar_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QToolBar_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QToolBar) Delete() { C.QToolBar_Delete(this.h) diff --git a/qt/gen_qtoolbar.h b/qt/gen_qtoolbar.h index 8ea9dc4..045f5c3 100644 --- a/qt/gen_qtoolbar.h +++ b/qt/gen_qtoolbar.h @@ -15,7 +15,6 @@ extern "C" { #ifdef __cplusplus class QAction; -class QIcon; class QMetaObject; class QPoint; class QRect; @@ -24,7 +23,6 @@ class QToolBar; class QWidget; #else typedef struct QAction QAction; -typedef struct QIcon QIcon; typedef struct QMetaObject QMetaObject; typedef struct QPoint QPoint; typedef struct QRect QRect; @@ -40,7 +38,6 @@ QToolBar* QToolBar_new4(QWidget* parent); QMetaObject* QToolBar_MetaObject(const QToolBar* self); void* QToolBar_Metacast(QToolBar* self, const char* param1); struct miqt_string* QToolBar_Tr(const char* s); -struct miqt_string* QToolBar_TrUtf8(const char* s); void QToolBar_SetMovable(QToolBar* self, bool movable); bool QToolBar_IsMovable(const QToolBar* self); void QToolBar_SetAllowedAreas(QToolBar* self, int areas); @@ -49,8 +46,6 @@ 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); QAction* QToolBar_AddSeparator(QToolBar* self); QAction* QToolBar_InsertSeparator(QToolBar* self, QAction* before); QAction* QToolBar_AddWidget(QToolBar* self, QWidget* widget); @@ -85,8 +80,6 @@ void QToolBar_VisibilityChanged(QToolBar* self, bool visible); void QToolBar_connect_VisibilityChanged(QToolBar* self, void* slot); struct miqt_string* QToolBar_Tr2(const char* s, const char* c); struct miqt_string* QToolBar_Tr3(const char* s, const char* c, int n); -struct miqt_string* QToolBar_TrUtf82(const char* s, const char* c); -struct miqt_string* QToolBar_TrUtf83(const char* s, const char* c, int n); void QToolBar_Delete(QToolBar* self); #ifdef __cplusplus diff --git a/qt/gen_qtoolbox.cpp b/qt/gen_qtoolbox.cpp index 97cb3ab..ba2db40 100644 --- a/qt/gen_qtoolbox.cpp +++ b/qt/gen_qtoolbox.cpp @@ -36,13 +36,6 @@ struct miqt_string* QToolBox_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QToolBox_TrUtf8(const char* s) { - QString _ret = QToolBox::trUtf8(s); - // 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()); -} - int QToolBox_AddItem(QToolBox* self, QWidget* widget, struct miqt_string* text) { QString text_QString = QString::fromUtf8(&text->data, text->len); return self->addItem(widget, text_QString); @@ -160,20 +153,6 @@ struct miqt_string* QToolBox_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QToolBox_TrUtf82(const char* s, const char* c) { - QString _ret = QToolBox::trUtf8(s, c); - // 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* QToolBox_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QToolBox::trUtf8(s, c, static_cast(n)); - // 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 QToolBox_Delete(QToolBox* self) { delete self; } diff --git a/qt/gen_qtoolbox.go b/qt/gen_qtoolbox.go index 252c1ab..4071970 100644 --- a/qt/gen_qtoolbox.go +++ b/qt/gen_qtoolbox.go @@ -74,15 +74,6 @@ func QToolBox_Tr(s string) string { return _ret } -func QToolBox_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QToolBox_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QToolBox) AddItem(widget *QWidget, text string) int { text_ms := miqt_strdupg(text) defer C.free(text_ms) @@ -226,28 +217,6 @@ func QToolBox_Tr3(s string, c string, n int) string { return _ret } -func QToolBox_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QToolBox_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QToolBox_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QToolBox_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QToolBox) Delete() { C.QToolBox_Delete(this.h) diff --git a/qt/gen_qtoolbox.h b/qt/gen_qtoolbox.h index b7abbcb..88f2e05 100644 --- a/qt/gen_qtoolbox.h +++ b/qt/gen_qtoolbox.h @@ -31,7 +31,6 @@ QToolBox* QToolBox_new3(QWidget* parent, int f); QMetaObject* QToolBox_MetaObject(const QToolBox* self); void* QToolBox_Metacast(QToolBox* self, const char* param1); struct miqt_string* QToolBox_Tr(const char* s); -struct miqt_string* QToolBox_TrUtf8(const char* s); int QToolBox_AddItem(QToolBox* self, QWidget* widget, struct miqt_string* text); int QToolBox_AddItem2(QToolBox* self, QWidget* widget, QIcon* icon, struct miqt_string* text); int QToolBox_InsertItem(QToolBox* self, int index, QWidget* widget, struct miqt_string* text); @@ -56,8 +55,6 @@ void QToolBox_CurrentChanged(QToolBox* self, int index); void QToolBox_connect_CurrentChanged(QToolBox* self, void* slot); struct miqt_string* QToolBox_Tr2(const char* s, const char* c); struct miqt_string* QToolBox_Tr3(const char* s, const char* c, int n); -struct miqt_string* QToolBox_TrUtf82(const char* s, const char* c); -struct miqt_string* QToolBox_TrUtf83(const char* s, const char* c, int n); void QToolBox_Delete(QToolBox* self); #ifdef __cplusplus diff --git a/qt/gen_qtoolbutton.cpp b/qt/gen_qtoolbutton.cpp index cb21aa8..e065f21 100644 --- a/qt/gen_qtoolbutton.cpp +++ b/qt/gen_qtoolbutton.cpp @@ -34,13 +34,6 @@ struct miqt_string* QToolButton_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QToolButton_TrUtf8(const char* s) { - QString _ret = QToolButton::trUtf8(s); - // 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()); -} - QSize* QToolButton_SizeHint(const QToolButton* self) { return new QSize(self->sizeHint()); } @@ -129,20 +122,6 @@ struct miqt_string* QToolButton_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QToolButton_TrUtf82(const char* s, const char* c) { - QString _ret = QToolButton::trUtf8(s, c); - // 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* QToolButton_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QToolButton::trUtf8(s, c, static_cast(n)); - // 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 QToolButton_Delete(QToolButton* self) { delete self; } diff --git a/qt/gen_qtoolbutton.go b/qt/gen_qtoolbutton.go index 43c24bc..093b034 100644 --- a/qt/gen_qtoolbutton.go +++ b/qt/gen_qtoolbutton.go @@ -76,15 +76,6 @@ func QToolButton_Tr(s string) string { return _ret } -func QToolButton_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QToolButton_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QToolButton) SizeHint() *QSize { _ret := C.QToolButton_SizeHint(this.h) _goptr := newQSize(_ret) @@ -193,28 +184,6 @@ func QToolButton_Tr3(s string, c string, n int) string { return _ret } -func QToolButton_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QToolButton_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QToolButton_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QToolButton_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QToolButton) Delete() { C.QToolButton_Delete(this.h) diff --git a/qt/gen_qtoolbutton.h b/qt/gen_qtoolbutton.h index 40abc7c..f9c733c 100644 --- a/qt/gen_qtoolbutton.h +++ b/qt/gen_qtoolbutton.h @@ -34,7 +34,6 @@ QToolButton* QToolButton_new2(QWidget* parent); QMetaObject* QToolButton_MetaObject(const QToolButton* self); void* QToolButton_Metacast(QToolButton* self, const char* param1); 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); int QToolButton_ToolButtonStyle(const QToolButton* self); @@ -54,8 +53,6 @@ void QToolButton_Triggered(QToolButton* self, QAction* param1); void QToolButton_connect_Triggered(QToolButton* self, void* slot); struct miqt_string* QToolButton_Tr2(const char* s, const char* c); struct miqt_string* QToolButton_Tr3(const char* s, const char* c, int n); -struct miqt_string* QToolButton_TrUtf82(const char* s, const char* c); -struct miqt_string* QToolButton_TrUtf83(const char* s, const char* c, int n); void QToolButton_Delete(QToolButton* self); #ifdef __cplusplus diff --git a/qt/gen_qtooltip.cpp b/qt/gen_qtooltip.cpp index 109be63..c358ff4 100644 --- a/qt/gen_qtooltip.cpp +++ b/qt/gen_qtooltip.cpp @@ -16,16 +16,6 @@ void QToolTip_ShowText(QPoint* pos, struct miqt_string* text) { QToolTip::showText(*pos, text_QString); } -void QToolTip_ShowText2(QPoint* pos, struct miqt_string* text, QWidget* w, QRect* rect) { - QString text_QString = QString::fromUtf8(&text->data, text->len); - QToolTip::showText(*pos, text_QString, w, *rect); -} - -void QToolTip_ShowText3(QPoint* pos, struct miqt_string* text, QWidget* w, QRect* rect, int msecShowTime) { - QString text_QString = QString::fromUtf8(&text->data, text->len); - QToolTip::showText(*pos, text_QString, w, *rect, static_cast(msecShowTime)); -} - void QToolTip_HideText() { QToolTip::hideText(); } @@ -57,11 +47,21 @@ void QToolTip_SetFont(QFont* font) { QToolTip::setFont(*font); } -void QToolTip_ShowText32(QPoint* pos, struct miqt_string* text, QWidget* w) { +void QToolTip_ShowText3(QPoint* pos, struct miqt_string* text, QWidget* w) { QString text_QString = QString::fromUtf8(&text->data, text->len); QToolTip::showText(*pos, text_QString, w); } +void QToolTip_ShowText4(QPoint* pos, struct miqt_string* text, QWidget* w, QRect* rect) { + QString text_QString = QString::fromUtf8(&text->data, text->len); + QToolTip::showText(*pos, text_QString, w, *rect); +} + +void QToolTip_ShowText5(QPoint* pos, struct miqt_string* text, QWidget* w, QRect* rect, int msecShowTime) { + QString text_QString = QString::fromUtf8(&text->data, text->len); + QToolTip::showText(*pos, text_QString, w, *rect, static_cast(msecShowTime)); +} + void QToolTip_Delete(QToolTip* self) { delete self; } diff --git a/qt/gen_qtooltip.go b/qt/gen_qtooltip.go index d76d6e8..f246afa 100644 --- a/qt/gen_qtooltip.go +++ b/qt/gen_qtooltip.go @@ -41,18 +41,6 @@ func QToolTip_ShowText(pos *QPoint, text string) { C.QToolTip_ShowText(pos.cPointer(), (*C.struct_miqt_string)(text_ms)) } -func QToolTip_ShowText2(pos *QPoint, text string, w *QWidget, rect *QRect) { - text_ms := miqt_strdupg(text) - defer C.free(text_ms) - C.QToolTip_ShowText2(pos.cPointer(), (*C.struct_miqt_string)(text_ms), w.cPointer(), rect.cPointer()) -} - -func QToolTip_ShowText3(pos *QPoint, text string, w *QWidget, rect *QRect, msecShowTime int) { - text_ms := miqt_strdupg(text) - defer C.free(text_ms) - C.QToolTip_ShowText3(pos.cPointer(), (*C.struct_miqt_string)(text_ms), w.cPointer(), rect.cPointer(), (C.int)(msecShowTime)) -} - func QToolTip_HideText() { C.QToolTip_HideText() } @@ -90,10 +78,22 @@ func QToolTip_SetFont(font *QFont) { C.QToolTip_SetFont(font.cPointer()) } -func QToolTip_ShowText32(pos *QPoint, text string, w *QWidget) { +func QToolTip_ShowText3(pos *QPoint, text string, w *QWidget) { text_ms := miqt_strdupg(text) defer C.free(text_ms) - C.QToolTip_ShowText32(pos.cPointer(), (*C.struct_miqt_string)(text_ms), w.cPointer()) + C.QToolTip_ShowText3(pos.cPointer(), (*C.struct_miqt_string)(text_ms), w.cPointer()) +} + +func QToolTip_ShowText4(pos *QPoint, text string, w *QWidget, rect *QRect) { + text_ms := miqt_strdupg(text) + defer C.free(text_ms) + C.QToolTip_ShowText4(pos.cPointer(), (*C.struct_miqt_string)(text_ms), w.cPointer(), rect.cPointer()) +} + +func QToolTip_ShowText5(pos *QPoint, text string, w *QWidget, rect *QRect, msecShowTime int) { + text_ms := miqt_strdupg(text) + defer C.free(text_ms) + C.QToolTip_ShowText5(pos.cPointer(), (*C.struct_miqt_string)(text_ms), w.cPointer(), rect.cPointer(), (C.int)(msecShowTime)) } // Delete this object from C++ memory. diff --git a/qt/gen_qtooltip.h b/qt/gen_qtooltip.h index 5a729b9..873f89d 100644 --- a/qt/gen_qtooltip.h +++ b/qt/gen_qtooltip.h @@ -30,8 +30,6 @@ typedef struct QWidget QWidget; #endif void QToolTip_ShowText(QPoint* pos, struct miqt_string* text); -void QToolTip_ShowText2(QPoint* pos, struct miqt_string* text, QWidget* w, QRect* rect); -void QToolTip_ShowText3(QPoint* pos, struct miqt_string* text, QWidget* w, QRect* rect, int msecShowTime); void QToolTip_HideText(); bool QToolTip_IsVisible(); struct miqt_string* QToolTip_Text(); @@ -39,7 +37,9 @@ QPalette* QToolTip_Palette(); void QToolTip_SetPalette(QPalette* palette); QFont* QToolTip_Font(); void QToolTip_SetFont(QFont* font); -void QToolTip_ShowText32(QPoint* pos, struct miqt_string* text, QWidget* w); +void QToolTip_ShowText3(QPoint* pos, struct miqt_string* text, QWidget* w); +void QToolTip_ShowText4(QPoint* pos, struct miqt_string* text, QWidget* w, QRect* rect); +void QToolTip_ShowText5(QPoint* pos, struct miqt_string* text, QWidget* w, QRect* rect, int msecShowTime); void QToolTip_Delete(QToolTip* self); #ifdef __cplusplus diff --git a/qt/gen_qtouchdevice.cpp b/qt/gen_qtouchdevice.cpp deleted file mode 100644 index 09c598f..0000000 --- a/qt/gen_qtouchdevice.cpp +++ /dev/null @@ -1,68 +0,0 @@ -#include -#include -#include -#include -#include -#include "qtouchdevice.h" -#include "gen_qtouchdevice.h" -#include "_cgo_export.h" - -QTouchDevice* QTouchDevice_new() { - return new QTouchDevice(); -} - -struct miqt_array* 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) { - _arr[i] = (QTouchDevice*) _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* QTouchDevice_Name(const QTouchDevice* self) { - QString _ret = self->name(); - // 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()); -} - -int QTouchDevice_Type(const QTouchDevice* self) { - QTouchDevice::DeviceType _ret = self->type(); - return static_cast(_ret); -} - -int QTouchDevice_Capabilities(const QTouchDevice* self) { - QTouchDevice::Capabilities _ret = self->capabilities(); - return static_cast(_ret); -} - -int QTouchDevice_MaximumTouchPoints(const QTouchDevice* self) { - return self->maximumTouchPoints(); -} - -void QTouchDevice_SetName(QTouchDevice* self, struct miqt_string* name) { - QString name_QString = QString::fromUtf8(&name->data, name->len); - self->setName(name_QString); -} - -void QTouchDevice_SetType(QTouchDevice* self, int devType) { - self->setType(static_cast(devType)); -} - -void QTouchDevice_SetCapabilities(QTouchDevice* self, int caps) { - self->setCapabilities(static_cast(caps)); -} - -void QTouchDevice_SetMaximumTouchPoints(QTouchDevice* self, int max) { - self->setMaximumTouchPoints(static_cast(max)); -} - -void QTouchDevice_Delete(QTouchDevice* self) { - delete self; -} - diff --git a/qt/gen_qtouchdevice.go b/qt/gen_qtouchdevice.go deleted file mode 100644 index a80541c..0000000 --- a/qt/gen_qtouchdevice.go +++ /dev/null @@ -1,123 +0,0 @@ -package qt - -/* - -#include "gen_qtouchdevice.h" -#include - -*/ -import "C" - -import ( - "runtime" - "unsafe" -) - -type QTouchDevice__DeviceType int - -const ( - QTouchDevice__TouchScreen QTouchDevice__DeviceType = 0 - QTouchDevice__TouchPad QTouchDevice__DeviceType = 1 -) - -type QTouchDevice__CapabilityFlag int - -const ( - QTouchDevice__Position QTouchDevice__CapabilityFlag = 1 - QTouchDevice__Area QTouchDevice__CapabilityFlag = 2 - QTouchDevice__Pressure QTouchDevice__CapabilityFlag = 4 - QTouchDevice__Velocity QTouchDevice__CapabilityFlag = 8 - QTouchDevice__RawPositions QTouchDevice__CapabilityFlag = 16 - QTouchDevice__NormalizedPosition QTouchDevice__CapabilityFlag = 32 - QTouchDevice__MouseEmulation QTouchDevice__CapabilityFlag = 64 -) - -type QTouchDevice struct { - h *C.QTouchDevice -} - -func (this *QTouchDevice) cPointer() *C.QTouchDevice { - if this == nil { - return nil - } - return this.h -} - -func newQTouchDevice(h *C.QTouchDevice) *QTouchDevice { - if h == nil { - return nil - } - return &QTouchDevice{h: h} -} - -func newQTouchDevice_U(h unsafe.Pointer) *QTouchDevice { - return newQTouchDevice((*C.QTouchDevice)(h)) -} - -// NewQTouchDevice constructs a new QTouchDevice object. -func NewQTouchDevice() *QTouchDevice { - ret := C.QTouchDevice_new() - return newQTouchDevice(ret) -} - -func QTouchDevice_Devices() []*QTouchDevice { - var _ma *C.struct_miqt_array = C.QTouchDevice_Devices() - _ret := make([]*QTouchDevice, int(_ma.len)) - _outCast := (*[0xffff]*C.QTouchDevice)(unsafe.Pointer(_ma.data)) // hey ya - for i := 0; i < int(_ma.len); i++ { - _ret[i] = newQTouchDevice_U(unsafe.Pointer(_outCast[i])) - } - C.free(unsafe.Pointer(_ma)) - return _ret -} - -func (this *QTouchDevice) Name() string { - var _ms *C.struct_miqt_string = C.QTouchDevice_Name(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QTouchDevice) Type() QTouchDevice__DeviceType { - return (QTouchDevice__DeviceType)(C.QTouchDevice_Type(this.h)) -} - -func (this *QTouchDevice) Capabilities() QTouchDevice__CapabilityFlag { - return (QTouchDevice__CapabilityFlag)(C.QTouchDevice_Capabilities(this.h)) -} - -func (this *QTouchDevice) MaximumTouchPoints() int { - return (int)(C.QTouchDevice_MaximumTouchPoints(this.h)) -} - -func (this *QTouchDevice) SetName(name string) { - name_ms := miqt_strdupg(name) - defer C.free(name_ms) - C.QTouchDevice_SetName(this.h, (*C.struct_miqt_string)(name_ms)) -} - -func (this *QTouchDevice) SetType(devType QTouchDevice__DeviceType) { - C.QTouchDevice_SetType(this.h, (C.int)(devType)) -} - -func (this *QTouchDevice) SetCapabilities(caps QTouchDevice__CapabilityFlag) { - C.QTouchDevice_SetCapabilities(this.h, (C.int)(caps)) -} - -func (this *QTouchDevice) SetMaximumTouchPoints(max int) { - C.QTouchDevice_SetMaximumTouchPoints(this.h, (C.int)(max)) -} - -// Delete this object from C++ memory. -func (this *QTouchDevice) Delete() { - C.QTouchDevice_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QTouchDevice) GoGC() { - runtime.SetFinalizer(this, func(this *QTouchDevice) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} diff --git a/qt/gen_qtouchdevice.h b/qt/gen_qtouchdevice.h deleted file mode 100644 index c658d9f..0000000 --- a/qt/gen_qtouchdevice.h +++ /dev/null @@ -1,38 +0,0 @@ -#ifndef GEN_QTOUCHDEVICE_H -#define GEN_QTOUCHDEVICE_H - -#include -#include -#include - -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - -#include "binding.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __cplusplus -class QTouchDevice; -#else -typedef struct QTouchDevice QTouchDevice; -#endif - -QTouchDevice* QTouchDevice_new(); -struct miqt_array* QTouchDevice_Devices(); -struct miqt_string* QTouchDevice_Name(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, int devType); -void QTouchDevice_SetCapabilities(QTouchDevice* self, int caps); -void QTouchDevice_SetMaximumTouchPoints(QTouchDevice* self, int max); -void QTouchDevice_Delete(QTouchDevice* self); - -#ifdef __cplusplus -} /* extern C */ -#endif - -#endif diff --git a/qt/gen_qtransform.cpp b/qt/gen_qtransform.cpp index 97647c4..83384d9 100644 --- a/qt/gen_qtransform.cpp +++ b/qt/gen_qtransform.cpp @@ -1,6 +1,5 @@ #include #include -#include #include #include #include @@ -20,26 +19,18 @@ QTransform* QTransform_new2() { return new QTransform(); } -QTransform* QTransform_new3(double h11, double h12, double h13, double h21, double h22, double h23, double h31, double h32) { - return new QTransform(static_cast(h11), static_cast(h12), static_cast(h13), static_cast(h21), static_cast(h22), static_cast(h23), static_cast(h31), static_cast(h32)); +QTransform* QTransform_new3(double h11, double h12, double h13, double h21, double h22, double h23, double h31, double h32, double h33) { + return new QTransform(static_cast(h11), static_cast(h12), static_cast(h13), static_cast(h21), static_cast(h22), static_cast(h23), static_cast(h31), static_cast(h32), static_cast(h33)); } QTransform* QTransform_new4(double h11, double h12, double h21, double h22, double dx, double dy) { return new QTransform(static_cast(h11), static_cast(h12), static_cast(h21), static_cast(h22), static_cast(dx), static_cast(dy)); } -QTransform* QTransform_new5(QMatrix* mtx) { - return new QTransform(*mtx); -} - -QTransform* QTransform_new6(QTransform* other) { +QTransform* QTransform_new5(QTransform* other) { return new QTransform(*other); } -QTransform* QTransform_new7(double h11, double h12, double h13, double h21, double h22, double h23, double h31, double h32, double h33) { - return new QTransform(static_cast(h11), static_cast(h12), static_cast(h13), static_cast(h21), static_cast(h22), static_cast(h23), static_cast(h31), static_cast(h32), static_cast(h33)); -} - void QTransform_OperatorAssign(QTransform* self, QTransform* param1) { self->operator=(*param1); } @@ -78,11 +69,6 @@ double QTransform_Determinant(const QTransform* self) { return static_cast(_ret); } -double QTransform_Det(const QTransform* self) { - qreal _ret = self->det(); - return static_cast(_ret); -} - double QTransform_M11(const QTransform* self) { qreal _ret = self->m11(); return static_cast(_ret); @@ -246,12 +232,6 @@ void QTransform_Map3(const QTransform* self, double x, double y, double* tx, dou self->map(static_cast(x), static_cast(y), static_cast(tx), static_cast(ty)); } -QMatrix* QTransform_ToAffine(const QTransform* self) { - const QMatrix& _ret = self->toAffine(); - // Cast returned reference into pointer - return const_cast(&_ret); -} - QTransform* QTransform_OperatorMultiplyAssignWithDiv(QTransform* self, double div) { QTransform& _ret = self->operator*=(static_cast(div)); // Cast returned reference into pointer diff --git a/qt/gen_qtransform.go b/qt/gen_qtransform.go index 780817c..5f553f5 100644 --- a/qt/gen_qtransform.go +++ b/qt/gen_qtransform.go @@ -59,8 +59,8 @@ func NewQTransform2() *QTransform { } // NewQTransform3 constructs a new QTransform object. -func NewQTransform3(h11 float64, h12 float64, h13 float64, h21 float64, h22 float64, h23 float64, h31 float64, h32 float64) *QTransform { - ret := C.QTransform_new3((C.double)(h11), (C.double)(h12), (C.double)(h13), (C.double)(h21), (C.double)(h22), (C.double)(h23), (C.double)(h31), (C.double)(h32)) +func NewQTransform3(h11 float64, h12 float64, h13 float64, h21 float64, h22 float64, h23 float64, h31 float64, h32 float64, h33 float64) *QTransform { + ret := C.QTransform_new3((C.double)(h11), (C.double)(h12), (C.double)(h13), (C.double)(h21), (C.double)(h22), (C.double)(h23), (C.double)(h31), (C.double)(h32), (C.double)(h33)) return newQTransform(ret) } @@ -71,20 +71,8 @@ func NewQTransform4(h11 float64, h12 float64, h21 float64, h22 float64, dx float } // NewQTransform5 constructs a new QTransform object. -func NewQTransform5(mtx *QMatrix) *QTransform { - ret := C.QTransform_new5(mtx.cPointer()) - return newQTransform(ret) -} - -// NewQTransform6 constructs a new QTransform object. -func NewQTransform6(other *QTransform) *QTransform { - ret := C.QTransform_new6(other.cPointer()) - return newQTransform(ret) -} - -// NewQTransform7 constructs a new QTransform object. -func NewQTransform7(h11 float64, h12 float64, h13 float64, h21 float64, h22 float64, h23 float64, h31 float64, h32 float64, h33 float64) *QTransform { - ret := C.QTransform_new7((C.double)(h11), (C.double)(h12), (C.double)(h13), (C.double)(h21), (C.double)(h22), (C.double)(h23), (C.double)(h31), (C.double)(h32), (C.double)(h33)) +func NewQTransform5(other *QTransform) *QTransform { + ret := C.QTransform_new5(other.cPointer()) return newQTransform(ret) } @@ -124,10 +112,6 @@ func (this *QTransform) Determinant() float64 { return (float64)(C.QTransform_Determinant(this.h)) } -func (this *QTransform) Det() float64 { - return (float64)(C.QTransform_Det(this.h)) -} - func (this *QTransform) M11() float64 { return (float64)(C.QTransform_M11(this.h)) } @@ -304,10 +288,6 @@ func (this *QTransform) Map3(x float64, y float64, tx *float64, ty *float64) { C.QTransform_Map3(this.h, (C.double)(x), (C.double)(y), (*C.double)(unsafe.Pointer(tx)), (*C.double)(unsafe.Pointer(ty))) } -func (this *QTransform) ToAffine() *QMatrix { - return newQMatrix_U(unsafe.Pointer(C.QTransform_ToAffine(this.h))) -} - func (this *QTransform) OperatorMultiplyAssignWithDiv(div float64) *QTransform { return newQTransform_U(unsafe.Pointer(C.QTransform_OperatorMultiplyAssignWithDiv(this.h, (C.double)(div)))) } diff --git a/qt/gen_qtransform.h b/qt/gen_qtransform.h index d736a88..c9b29a6 100644 --- a/qt/gen_qtransform.h +++ b/qt/gen_qtransform.h @@ -16,7 +16,6 @@ extern "C" { #ifdef __cplusplus class QLine; class QLineF; -class QMatrix; class QPainterPath; class QPoint; class QPointF; @@ -27,7 +26,6 @@ class QTransform; #else typedef struct QLine QLine; typedef struct QLineF QLineF; -typedef struct QMatrix QMatrix; typedef struct QPainterPath QPainterPath; typedef struct QPoint QPoint; typedef struct QPointF QPointF; @@ -39,11 +37,9 @@ typedef struct QTransform QTransform; 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_new3(double h11, double h12, double h13, double h21, double h22, double h23, double h31, double h32, double h33); QTransform* QTransform_new4(double h11, double h12, double h21, double h22, double dx, double dy); -QTransform* QTransform_new5(QMatrix* mtx); -QTransform* QTransform_new6(QTransform* other); -QTransform* QTransform_new7(double h11, double h12, double h13, double h21, double h22, double h23, double h31, double h32, double h33); +QTransform* QTransform_new5(QTransform* other); void QTransform_OperatorAssign(QTransform* self, QTransform* param1); bool QTransform_IsAffine(const QTransform* self); bool QTransform_IsIdentity(const QTransform* self); @@ -53,7 +49,6 @@ bool QTransform_IsRotating(const QTransform* self); bool QTransform_IsTranslating(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); double QTransform_M12(const QTransform* self); double QTransform_M13(const QTransform* self); @@ -89,7 +84,6 @@ QRect* QTransform_MapRect(const QTransform* self, QRect* param1); QRectF* QTransform_MapRectWithQRectF(const QTransform* self, QRectF* param1); void QTransform_Map2(const QTransform* self, int x, int y, int* tx, int* ty); void QTransform_Map3(const QTransform* self, double x, double y, double* tx, double* ty); -QMatrix* QTransform_ToAffine(const QTransform* self); QTransform* QTransform_OperatorMultiplyAssignWithDiv(QTransform* self, double div); QTransform* QTransform_OperatorDivideAssign(QTransform* self, double div); QTransform* QTransform_OperatorPlusAssign(QTransform* self, double div); diff --git a/qt/gen_qtranslator.cpp b/qt/gen_qtranslator.cpp index 58c39b7..cb958dc 100644 --- a/qt/gen_qtranslator.cpp +++ b/qt/gen_qtranslator.cpp @@ -32,13 +32,6 @@ struct miqt_string* QTranslator_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTranslator_TrUtf8(const char* s) { - QString _ret = QTranslator::trUtf8(s); - // 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* QTranslator_Translate(const QTranslator* self, const char* context, const char* sourceText) { QString _ret = self->translate(context, sourceText); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -92,20 +85,6 @@ struct miqt_string* QTranslator_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTranslator_TrUtf82(const char* s, const char* c) { - QString _ret = QTranslator::trUtf8(s, c); - // 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* QTranslator_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QTranslator::trUtf8(s, c, static_cast(n)); - // 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* QTranslator_Translate3(const QTranslator* self, const char* context, const char* sourceText, const char* disambiguation) { QString _ret = self->translate(context, sourceText, disambiguation); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory diff --git a/qt/gen_qtranslator.go b/qt/gen_qtranslator.go index 4f784dd..90a048b 100644 --- a/qt/gen_qtranslator.go +++ b/qt/gen_qtranslator.go @@ -67,15 +67,6 @@ func QTranslator_Tr(s string) string { return _ret } -func QTranslator_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTranslator_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QTranslator) Translate(context string, sourceText string) string { context_Cstring := C.CString(context) defer C.free(unsafe.Pointer(context_Cstring)) @@ -143,28 +134,6 @@ func QTranslator_Tr3(s string, c string, n int) string { return _ret } -func QTranslator_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTranslator_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QTranslator_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTranslator_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QTranslator) Translate3(context string, sourceText string, disambiguation string) string { context_Cstring := C.CString(context) defer C.free(unsafe.Pointer(context_Cstring)) diff --git a/qt/gen_qtranslator.h b/qt/gen_qtranslator.h index 155bc19..98bccf6 100644 --- a/qt/gen_qtranslator.h +++ b/qt/gen_qtranslator.h @@ -30,7 +30,6 @@ QTranslator* QTranslator_new2(QObject* parent); QMetaObject* QTranslator_MetaObject(const QTranslator* self); void* QTranslator_Metacast(QTranslator* self, const char* param1); struct miqt_string* QTranslator_Tr(const char* s); -struct miqt_string* QTranslator_TrUtf8(const char* s); struct miqt_string* QTranslator_Translate(const QTranslator* self, const char* context, const char* sourceText); bool QTranslator_IsEmpty(const QTranslator* self); struct miqt_string* QTranslator_Language(const QTranslator* self); @@ -40,8 +39,6 @@ bool QTranslator_Load2(QTranslator* self, QLocale* locale, struct miqt_string* f bool QTranslator_Load3(QTranslator* self, const unsigned char* data, int lenVal); struct miqt_string* QTranslator_Tr2(const char* s, const char* c); struct miqt_string* QTranslator_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTranslator_TrUtf82(const char* s, const char* c); -struct miqt_string* QTranslator_TrUtf83(const char* s, const char* c, int n); struct miqt_string* QTranslator_Translate3(const QTranslator* self, const char* context, const char* sourceText, const char* disambiguation); struct miqt_string* QTranslator_Translate4(const QTranslator* self, const char* context, const char* sourceText, const char* disambiguation, int n); bool QTranslator_Load22(QTranslator* self, struct miqt_string* filename, struct miqt_string* directory); diff --git a/qt/gen_qtransposeproxymodel.cpp b/qt/gen_qtransposeproxymodel.cpp index 9a207d5..3e7f3fa 100644 --- a/qt/gen_qtransposeproxymodel.cpp +++ b/qt/gen_qtransposeproxymodel.cpp @@ -35,13 +35,6 @@ struct miqt_string* QTransposeProxyModel_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTransposeProxyModel_TrUtf8(const char* s) { - QString _ret = QTransposeProxyModel::trUtf8(s); - // 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 QTransposeProxyModel_SetSourceModel(QTransposeProxyModel* self, QAbstractItemModel* newSourceModel) { self->setSourceModel(newSourceModel); } @@ -124,20 +117,6 @@ struct miqt_string* QTransposeProxyModel_Tr3(const char* s, const char* c, int n return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTransposeProxyModel_TrUtf82(const char* s, const char* c) { - QString _ret = QTransposeProxyModel::trUtf8(s, c); - // 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* QTransposeProxyModel_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QTransposeProxyModel::trUtf8(s, c, static_cast(n)); - // 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()); -} - int QTransposeProxyModel_RowCount1(const QTransposeProxyModel* self, QModelIndex* parent) { return self->rowCount(*parent); } diff --git a/qt/gen_qtransposeproxymodel.go b/qt/gen_qtransposeproxymodel.go index 6d94534..21765d6 100644 --- a/qt/gen_qtransposeproxymodel.go +++ b/qt/gen_qtransposeproxymodel.go @@ -67,15 +67,6 @@ func QTransposeProxyModel_Tr(s string) string { return _ret } -func QTransposeProxyModel_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTransposeProxyModel_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QTransposeProxyModel) SetSourceModel(newSourceModel *QAbstractItemModel) { C.QTransposeProxyModel_SetSourceModel(this.h, newSourceModel.cPointer()) } @@ -184,28 +175,6 @@ func QTransposeProxyModel_Tr3(s string, c string, n int) string { return _ret } -func QTransposeProxyModel_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTransposeProxyModel_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QTransposeProxyModel_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTransposeProxyModel_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QTransposeProxyModel) RowCount1(parent *QModelIndex) int { return (int)(C.QTransposeProxyModel_RowCount1(this.h, parent.cPointer())) } diff --git a/qt/gen_qtransposeproxymodel.h b/qt/gen_qtransposeproxymodel.h index f254e89..1f104cd 100644 --- a/qt/gen_qtransposeproxymodel.h +++ b/qt/gen_qtransposeproxymodel.h @@ -36,7 +36,6 @@ QTransposeProxyModel* QTransposeProxyModel_new2(QObject* parent); QMetaObject* QTransposeProxyModel_MetaObject(const QTransposeProxyModel* self); void* QTransposeProxyModel_Metacast(QTransposeProxyModel* self, const char* param1); struct miqt_string* QTransposeProxyModel_Tr(const char* s); -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); @@ -56,8 +55,6 @@ bool QTransposeProxyModel_MoveColumns(QTransposeProxyModel* self, QModelIndex* s void QTransposeProxyModel_Sort(QTransposeProxyModel* self, int column); struct miqt_string* QTransposeProxyModel_Tr2(const char* s, const char* c); struct miqt_string* QTransposeProxyModel_Tr3(const char* s, const char* c, int n); -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, int orientation, int role); diff --git a/qt/gen_qtreeview.cpp b/qt/gen_qtreeview.cpp index 80c2392..54e1eec 100644 --- a/qt/gen_qtreeview.cpp +++ b/qt/gen_qtreeview.cpp @@ -38,13 +38,6 @@ struct miqt_string* QTreeView_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTreeView_TrUtf8(const char* s) { - QString _ret = QTreeView::trUtf8(s); - // 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 QTreeView_SetModel(QTreeView* self, QAbstractItemModel* model) { self->setModel(model); } @@ -300,11 +293,7 @@ void QTreeView_ResizeColumnToContents(QTreeView* self, int column) { self->resizeColumnToContents(static_cast(column)); } -void QTreeView_SortByColumn(QTreeView* self, int column) { - self->sortByColumn(static_cast(column)); -} - -void QTreeView_SortByColumn2(QTreeView* self, int column, int order) { +void QTreeView_SortByColumn(QTreeView* self, int column, int order) { self->sortByColumn(static_cast(column), static_cast(order)); } @@ -338,26 +327,12 @@ struct miqt_string* QTreeView_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTreeView_TrUtf82(const char* s, const char* c) { - QString _ret = QTreeView::trUtf8(s, c); - // 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* QTreeView_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QTreeView::trUtf8(s, c, static_cast(n)); - // 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 QTreeView_ScrollTo2(QTreeView* self, QModelIndex* index, int hint) { self->scrollTo(*index, static_cast(hint)); } void QTreeView_DataChanged3(QTreeView* self, QModelIndex* topLeft, QModelIndex* bottomRight, struct miqt_array* /* of int */ roles) { - QVector roles_QList; + QList roles_QList; roles_QList.reserve(roles->len); int* roles_arr = static_cast(roles->data); for(size_t i = 0; i < roles->len; ++i) { diff --git a/qt/gen_qtreeview.go b/qt/gen_qtreeview.go index 29b8aaf..4079f60 100644 --- a/qt/gen_qtreeview.go +++ b/qt/gen_qtreeview.go @@ -68,15 +68,6 @@ func QTreeView_Tr(s string) string { return _ret } -func QTreeView_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTreeView_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QTreeView) SetModel(model *QAbstractItemModel) { C.QTreeView_SetModel(this.h, model.cPointer()) } @@ -359,12 +350,8 @@ func (this *QTreeView) ResizeColumnToContents(column int) { C.QTreeView_ResizeColumnToContents(this.h, (C.int)(column)) } -func (this *QTreeView) SortByColumn(column int) { - C.QTreeView_SortByColumn(this.h, (C.int)(column)) -} - -func (this *QTreeView) SortByColumn2(column int, order SortOrder) { - C.QTreeView_SortByColumn2(this.h, (C.int)(column), (C.int)(order)) +func (this *QTreeView) SortByColumn(column int, order SortOrder) { + C.QTreeView_SortByColumn(this.h, (C.int)(column), (C.int)(order)) } func (this *QTreeView) ExpandAll() { @@ -405,28 +392,6 @@ func QTreeView_Tr3(s string, c string, n int) string { return _ret } -func QTreeView_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTreeView_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QTreeView_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTreeView_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QTreeView) ScrollTo2(index *QModelIndex, hint QAbstractItemView__ScrollHint) { C.QTreeView_ScrollTo2(this.h, index.cPointer(), (C.int)(hint)) } diff --git a/qt/gen_qtreeview.h b/qt/gen_qtreeview.h index 09ef350..8572da9 100644 --- a/qt/gen_qtreeview.h +++ b/qt/gen_qtreeview.h @@ -40,7 +40,6 @@ QTreeView* QTreeView_new2(QWidget* parent); QMetaObject* QTreeView_MetaObject(const QTreeView* self); void* QTreeView_Metacast(QTreeView* self, const char* param1); struct miqt_string* QTreeView_Tr(const char* s); -struct miqt_string* QTreeView_TrUtf8(const char* s); void QTreeView_SetModel(QTreeView* self, QAbstractItemModel* model); void QTreeView_SetRootIndex(QTreeView* self, QModelIndex* index); void QTreeView_SetSelectionModel(QTreeView* self, QItemSelectionModel* selectionModel); @@ -102,16 +101,13 @@ void QTreeView_ShowColumn(QTreeView* self, int column); 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, int order); +void QTreeView_SortByColumn(QTreeView* self, int column, int order); void QTreeView_ExpandAll(QTreeView* self); void QTreeView_ExpandRecursively(QTreeView* self, QModelIndex* index); void QTreeView_CollapseAll(QTreeView* self); void QTreeView_ExpandToDepth(QTreeView* self, int depth); 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, 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); diff --git a/qt/gen_qtreewidget.cpp b/qt/gen_qtreewidget.cpp index 85d298c..3d6d46c 100644 --- a/qt/gen_qtreewidget.cpp +++ b/qt/gen_qtreewidget.cpp @@ -1,11 +1,11 @@ #include -#include #include #include #include #include #include #include +#include #include #include #include @@ -268,12 +268,12 @@ void QTreeWidgetItem_SetTextAlignment(QTreeWidgetItem* self, int column, int ali self->setTextAlignment(static_cast(column), static_cast(alignment)); } -QColor* QTreeWidgetItem_BackgroundColor(const QTreeWidgetItem* self, int column) { - return new QColor(self->backgroundColor(static_cast(column))); +void QTreeWidgetItem_SetTextAlignment2(QTreeWidgetItem* self, int column, int alignment) { + self->setTextAlignment(static_cast(column), static_cast(alignment)); } -void QTreeWidgetItem_SetBackgroundColor(QTreeWidgetItem* self, int column, QColor* color) { - self->setBackgroundColor(static_cast(column), *color); +void QTreeWidgetItem_SetTextAlignment3(QTreeWidgetItem* self, int column, int alignment) { + self->setTextAlignment(static_cast(column), static_cast(alignment)); } QBrush* QTreeWidgetItem_Background(const QTreeWidgetItem* self, int column) { @@ -284,14 +284,6 @@ void QTreeWidgetItem_SetBackground(QTreeWidgetItem* self, int column, QBrush* br self->setBackground(static_cast(column), *brush); } -QColor* QTreeWidgetItem_TextColor(const QTreeWidgetItem* self, int column) { - return new QColor(self->textColor(static_cast(column))); -} - -void QTreeWidgetItem_SetTextColor(QTreeWidgetItem* self, int column, QColor* color) { - self->setTextColor(static_cast(column), *color); -} - QBrush* QTreeWidgetItem_Foreground(const QTreeWidgetItem* self, int column) { return new QBrush(self->foreground(static_cast(column))); } @@ -445,13 +437,6 @@ struct miqt_string* QTreeWidget_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTreeWidget_TrUtf8(const char* s) { - QString _ret = QTreeWidget::trUtf8(s); - // 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()); -} - int QTreeWidget_ColumnCount(const QTreeWidget* self) { return self->columnCount(); } @@ -600,14 +585,6 @@ void QTreeWidget_RemoveItemWidget(QTreeWidget* self, QTreeWidgetItem* item, int self->removeItemWidget(item, static_cast(column)); } -bool QTreeWidget_IsItemSelected(const QTreeWidget* self, QTreeWidgetItem* item) { - return self->isItemSelected(item); -} - -void QTreeWidget_SetItemSelected(QTreeWidget* self, QTreeWidgetItem* item, bool selectVal) { - self->setItemSelected(item, selectVal); -} - struct miqt_array* QTreeWidget_SelectedItems(const QTreeWidget* self) { QList _ret = self->selectedItems(); // Convert QList<> from C++ memory to manually-managed C memory @@ -635,30 +612,6 @@ struct miqt_array* QTreeWidget_FindItems(const QTreeWidget* self, struct miqt_st return _out; } -bool QTreeWidget_IsItemHidden(const QTreeWidget* self, QTreeWidgetItem* item) { - return self->isItemHidden(item); -} - -void QTreeWidget_SetItemHidden(QTreeWidget* self, QTreeWidgetItem* item, bool hide) { - self->setItemHidden(item, hide); -} - -bool QTreeWidget_IsItemExpanded(const QTreeWidget* self, QTreeWidgetItem* item) { - return self->isItemExpanded(item); -} - -void QTreeWidget_SetItemExpanded(QTreeWidget* self, QTreeWidgetItem* item, bool expand) { - self->setItemExpanded(item, expand); -} - -bool QTreeWidget_IsFirstItemColumnSpanned(const QTreeWidget* self, QTreeWidgetItem* item) { - return self->isFirstItemColumnSpanned(item); -} - -void QTreeWidget_SetFirstItemColumnSpanned(QTreeWidget* self, QTreeWidgetItem* item, bool span) { - self->setFirstItemColumnSpanned(item, span); -} - QTreeWidgetItem* QTreeWidget_ItemAbove(const QTreeWidget* self, QTreeWidgetItem* item) { return self->itemAbove(item); } @@ -667,6 +620,14 @@ QTreeWidgetItem* QTreeWidget_ItemBelow(const QTreeWidget* self, QTreeWidgetItem* return self->itemBelow(item); } +QModelIndex* QTreeWidget_IndexFromItem(const QTreeWidget* self, QTreeWidgetItem* item) { + return new QModelIndex(self->indexFromItem(item)); +} + +QTreeWidgetItem* QTreeWidget_ItemFromIndex(const QTreeWidget* self, QModelIndex* index) { + return self->itemFromIndex(*index); +} + void QTreeWidget_SetSelectionModel(QTreeWidget* self, QItemSelectionModel* selectionModel) { self->setSelectionModel(selectionModel); } @@ -817,20 +778,6 @@ struct miqt_string* QTreeWidget_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QTreeWidget_TrUtf82(const char* s, const char* c) { - QString _ret = QTreeWidget::trUtf8(s, c); - // 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* QTreeWidget_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QTreeWidget::trUtf8(s, c, static_cast(n)); - // 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 QTreeWidget_EditItem2(QTreeWidget* self, QTreeWidgetItem* item, int column) { self->editItem(item, static_cast(column)); } @@ -861,6 +808,10 @@ struct miqt_array* QTreeWidget_FindItems3(const QTreeWidget* self, struct miqt_s return _out; } +QModelIndex* QTreeWidget_IndexFromItem2(const QTreeWidget* self, QTreeWidgetItem* item, int column) { + return new QModelIndex(self->indexFromItem(item, static_cast(column))); +} + 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 20073b4..936647c 100644 --- a/qt/gen_qtreewidget.go +++ b/qt/gen_qtreewidget.go @@ -359,15 +359,12 @@ func (this *QTreeWidgetItem) SetTextAlignment(column int, alignment int) { C.QTreeWidgetItem_SetTextAlignment(this.h, (C.int)(column), (C.int)(alignment)) } -func (this *QTreeWidgetItem) BackgroundColor(column int) *QColor { - _ret := C.QTreeWidgetItem_BackgroundColor(this.h, (C.int)(column)) - _goptr := newQColor(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr +func (this *QTreeWidgetItem) SetTextAlignment2(column int, alignment AlignmentFlag) { + C.QTreeWidgetItem_SetTextAlignment2(this.h, (C.int)(column), (C.int)(alignment)) } -func (this *QTreeWidgetItem) SetBackgroundColor(column int, color *QColor) { - C.QTreeWidgetItem_SetBackgroundColor(this.h, (C.int)(column), color.cPointer()) +func (this *QTreeWidgetItem) SetTextAlignment3(column int, alignment AlignmentFlag) { + C.QTreeWidgetItem_SetTextAlignment3(this.h, (C.int)(column), (C.int)(alignment)) } func (this *QTreeWidgetItem) Background(column int) *QBrush { @@ -381,17 +378,6 @@ func (this *QTreeWidgetItem) SetBackground(column int, brush *QBrush) { C.QTreeWidgetItem_SetBackground(this.h, (C.int)(column), brush.cPointer()) } -func (this *QTreeWidgetItem) TextColor(column int) *QColor { - _ret := C.QTreeWidgetItem_TextColor(this.h, (C.int)(column)) - _goptr := newQColor(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QTreeWidgetItem) SetTextColor(column int, color *QColor) { - C.QTreeWidgetItem_SetTextColor(this.h, (C.int)(column), color.cPointer()) -} - func (this *QTreeWidgetItem) Foreground(column int) *QBrush { _ret := C.QTreeWidgetItem_Foreground(this.h, (C.int)(column)) _goptr := newQBrush(_ret) @@ -596,15 +582,6 @@ func QTreeWidget_Tr(s string) string { return _ret } -func QTreeWidget_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QTreeWidget_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QTreeWidget) ColumnCount() int { return (int)(C.QTreeWidget_ColumnCount(this.h)) } @@ -764,14 +741,6 @@ func (this *QTreeWidget) RemoveItemWidget(item *QTreeWidgetItem, column int) { C.QTreeWidget_RemoveItemWidget(this.h, item.cPointer(), (C.int)(column)) } -func (this *QTreeWidget) IsItemSelected(item *QTreeWidgetItem) bool { - return (bool)(C.QTreeWidget_IsItemSelected(this.h, item.cPointer())) -} - -func (this *QTreeWidget) SetItemSelected(item *QTreeWidgetItem, selectVal bool) { - C.QTreeWidget_SetItemSelected(this.h, item.cPointer(), (C.bool)(selectVal)) -} - func (this *QTreeWidget) SelectedItems() []*QTreeWidgetItem { var _ma *C.struct_miqt_array = C.QTreeWidget_SelectedItems(this.h) _ret := make([]*QTreeWidgetItem, int(_ma.len)) @@ -796,30 +765,6 @@ func (this *QTreeWidget) FindItems(text string, flags MatchFlag) []*QTreeWidgetI return _ret } -func (this *QTreeWidget) IsItemHidden(item *QTreeWidgetItem) bool { - return (bool)(C.QTreeWidget_IsItemHidden(this.h, item.cPointer())) -} - -func (this *QTreeWidget) SetItemHidden(item *QTreeWidgetItem, hide bool) { - C.QTreeWidget_SetItemHidden(this.h, item.cPointer(), (C.bool)(hide)) -} - -func (this *QTreeWidget) IsItemExpanded(item *QTreeWidgetItem) bool { - return (bool)(C.QTreeWidget_IsItemExpanded(this.h, item.cPointer())) -} - -func (this *QTreeWidget) SetItemExpanded(item *QTreeWidgetItem, expand bool) { - C.QTreeWidget_SetItemExpanded(this.h, item.cPointer(), (C.bool)(expand)) -} - -func (this *QTreeWidget) IsFirstItemColumnSpanned(item *QTreeWidgetItem) bool { - return (bool)(C.QTreeWidget_IsFirstItemColumnSpanned(this.h, item.cPointer())) -} - -func (this *QTreeWidget) SetFirstItemColumnSpanned(item *QTreeWidgetItem, span bool) { - C.QTreeWidget_SetFirstItemColumnSpanned(this.h, item.cPointer(), (C.bool)(span)) -} - func (this *QTreeWidget) ItemAbove(item *QTreeWidgetItem) *QTreeWidgetItem { return newQTreeWidgetItem_U(unsafe.Pointer(C.QTreeWidget_ItemAbove(this.h, item.cPointer()))) } @@ -828,6 +773,17 @@ func (this *QTreeWidget) ItemBelow(item *QTreeWidgetItem) *QTreeWidgetItem { return newQTreeWidgetItem_U(unsafe.Pointer(C.QTreeWidget_ItemBelow(this.h, item.cPointer()))) } +func (this *QTreeWidget) IndexFromItem(item *QTreeWidgetItem) *QModelIndex { + _ret := C.QTreeWidget_IndexFromItem(this.h, item.cPointer()) + _goptr := newQModelIndex(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QTreeWidget) ItemFromIndex(index *QModelIndex) *QTreeWidgetItem { + return newQTreeWidgetItem_U(unsafe.Pointer(C.QTreeWidget_ItemFromIndex(this.h, index.cPointer()))) +} + func (this *QTreeWidget) SetSelectionModel(selectionModel *QItemSelectionModel) { C.QTreeWidget_SetSelectionModel(this.h, selectionModel.cPointer()) } @@ -1074,28 +1030,6 @@ func QTreeWidget_Tr3(s string, c string, n int) string { return _ret } -func QTreeWidget_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTreeWidget_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QTreeWidget_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QTreeWidget_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QTreeWidget) EditItem2(item *QTreeWidgetItem, column int) { C.QTreeWidget_EditItem2(this.h, item.cPointer(), (C.int)(column)) } @@ -1125,6 +1059,13 @@ func (this *QTreeWidget) FindItems3(text string, flags MatchFlag, column int) [] return _ret } +func (this *QTreeWidget) IndexFromItem2(item *QTreeWidgetItem, column int) *QModelIndex { + _ret := C.QTreeWidget_IndexFromItem2(this.h, item.cPointer(), (C.int)(column)) + _goptr := newQModelIndex(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + func (this *QTreeWidget) ScrollToItem2(item *QTreeWidgetItem, hint QAbstractItemView__ScrollHint) { C.QTreeWidget_ScrollToItem2(this.h, item.cPointer(), (C.int)(hint)) } diff --git a/qt/gen_qtreewidget.h b/qt/gen_qtreewidget.h index 719107c..a75cb1d 100644 --- a/qt/gen_qtreewidget.h +++ b/qt/gen_qtreewidget.h @@ -15,12 +15,12 @@ extern "C" { #ifdef __cplusplus class QBrush; -class QColor; class QDataStream; class QFont; class QIcon; class QItemSelectionModel; class QMetaObject; +class QModelIndex; class QPoint; class QRect; class QSize; @@ -30,12 +30,12 @@ class QVariant; class QWidget; #else typedef struct QBrush QBrush; -typedef struct QColor QColor; typedef struct QDataStream QDataStream; typedef struct QFont QFont; typedef struct QIcon QIcon; typedef struct QItemSelectionModel QItemSelectionModel; typedef struct QMetaObject QMetaObject; +typedef struct QModelIndex QModelIndex; typedef struct QPoint QPoint; typedef struct QRect QRect; typedef struct QSize QSize; @@ -92,12 +92,10 @@ QFont* QTreeWidgetItem_Font(const QTreeWidgetItem* self, int column); void QTreeWidgetItem_SetFont(QTreeWidgetItem* self, int column, QFont* font); int QTreeWidgetItem_TextAlignment(const QTreeWidgetItem* self, int column); void QTreeWidgetItem_SetTextAlignment(QTreeWidgetItem* self, int column, int alignment); -QColor* QTreeWidgetItem_BackgroundColor(const QTreeWidgetItem* self, int column); -void QTreeWidgetItem_SetBackgroundColor(QTreeWidgetItem* self, int column, QColor* color); +void QTreeWidgetItem_SetTextAlignment2(QTreeWidgetItem* self, int column, int alignment); +void QTreeWidgetItem_SetTextAlignment3(QTreeWidgetItem* self, int column, int alignment); QBrush* QTreeWidgetItem_Background(const QTreeWidgetItem* self, int column); void QTreeWidgetItem_SetBackground(QTreeWidgetItem* self, int column, QBrush* brush); -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); int QTreeWidgetItem_CheckState(const QTreeWidgetItem* self, int column); @@ -131,7 +129,6 @@ QTreeWidget* QTreeWidget_new2(QWidget* parent); QMetaObject* QTreeWidget_MetaObject(const QTreeWidget* self); void* QTreeWidget_Metacast(QTreeWidget* self, const char* param1); struct miqt_string* QTreeWidget_Tr(const char* s); -struct miqt_string* QTreeWidget_TrUtf8(const char* s); int QTreeWidget_ColumnCount(const QTreeWidget* self); void QTreeWidget_SetColumnCount(QTreeWidget* self, int columns); QTreeWidgetItem* QTreeWidget_InvisibleRootItem(const QTreeWidget* self); @@ -164,18 +161,12 @@ bool QTreeWidget_IsPersistentEditorOpen(const QTreeWidget* self, QTreeWidgetItem QWidget* QTreeWidget_ItemWidget(const QTreeWidget* self, QTreeWidgetItem* item, int column); void QTreeWidget_SetItemWidget(QTreeWidget* self, QTreeWidgetItem* item, int column, QWidget* widget); void QTreeWidget_RemoveItemWidget(QTreeWidget* self, QTreeWidgetItem* item, int column); -bool QTreeWidget_IsItemSelected(const QTreeWidget* self, QTreeWidgetItem* item); -void QTreeWidget_SetItemSelected(QTreeWidget* self, QTreeWidgetItem* item, bool selectVal); struct miqt_array* QTreeWidget_SelectedItems(const QTreeWidget* self); struct miqt_array* QTreeWidget_FindItems(const QTreeWidget* self, struct miqt_string* text, int flags); -bool QTreeWidget_IsItemHidden(const QTreeWidget* self, QTreeWidgetItem* item); -void QTreeWidget_SetItemHidden(QTreeWidget* self, QTreeWidgetItem* item, bool hide); -bool QTreeWidget_IsItemExpanded(const QTreeWidget* self, QTreeWidgetItem* item); -void QTreeWidget_SetItemExpanded(QTreeWidget* self, QTreeWidgetItem* item, bool expand); -bool QTreeWidget_IsFirstItemColumnSpanned(const QTreeWidget* self, QTreeWidgetItem* item); -void QTreeWidget_SetFirstItemColumnSpanned(QTreeWidget* self, QTreeWidgetItem* item, bool span); QTreeWidgetItem* QTreeWidget_ItemAbove(const QTreeWidget* self, QTreeWidgetItem* item); QTreeWidgetItem* QTreeWidget_ItemBelow(const QTreeWidget* self, QTreeWidgetItem* item); +QModelIndex* QTreeWidget_IndexFromItem(const QTreeWidget* self, QTreeWidgetItem* item); +QTreeWidgetItem* QTreeWidget_ItemFromIndex(const QTreeWidget* self, QModelIndex* index); void QTreeWidget_SetSelectionModel(QTreeWidget* self, QItemSelectionModel* selectionModel); void QTreeWidget_ScrollToItem(QTreeWidget* self, QTreeWidgetItem* item); void QTreeWidget_ExpandItem(QTreeWidget* self, QTreeWidgetItem* item); @@ -203,13 +194,12 @@ void QTreeWidget_ItemSelectionChanged(QTreeWidget* self); void QTreeWidget_connect_ItemSelectionChanged(QTreeWidget* self, void* slot); struct miqt_string* QTreeWidget_Tr2(const char* s, const char* c); struct miqt_string* QTreeWidget_Tr3(const char* s, const char* c, int n); -struct miqt_string* QTreeWidget_TrUtf82(const char* s, const char* c); -struct miqt_string* QTreeWidget_TrUtf83(const char* s, const char* c, int n); void QTreeWidget_EditItem2(QTreeWidget* self, QTreeWidgetItem* item, int column); void QTreeWidget_OpenPersistentEditor2(QTreeWidget* self, QTreeWidgetItem* item, int column); 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); +QModelIndex* QTreeWidget_IndexFromItem2(const QTreeWidget* self, QTreeWidgetItem* item, int column); void QTreeWidget_ScrollToItem2(QTreeWidget* self, QTreeWidgetItem* item, int hint); void QTreeWidget_Delete(QTreeWidget* self); diff --git a/qt/gen_qundogroup.cpp b/qt/gen_qundogroup.cpp index e16e6e6..ef2d1dd 100644 --- a/qt/gen_qundogroup.cpp +++ b/qt/gen_qundogroup.cpp @@ -34,13 +34,6 @@ struct miqt_string* QUndoGroup_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QUndoGroup_TrUtf8(const char* s) { - QString _ret = QUndoGroup::trUtf8(s); - // 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 QUndoGroup_AddStack(QUndoGroup* self, QUndoStack* stack) { self->addStack(stack); } @@ -211,20 +204,6 @@ struct miqt_string* QUndoGroup_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QUndoGroup_TrUtf82(const char* s, const char* c) { - QString _ret = QUndoGroup::trUtf8(s, c); - // 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* QUndoGroup_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QUndoGroup::trUtf8(s, c, static_cast(n)); - // 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()); -} - QAction* QUndoGroup_CreateUndoAction2(const QUndoGroup* self, QObject* parent, struct miqt_string* prefix) { QString prefix_QString = QString::fromUtf8(&prefix->data, prefix->len); return self->createUndoAction(parent, prefix_QString); diff --git a/qt/gen_qundogroup.go b/qt/gen_qundogroup.go index 520ff70..87d9fbb 100644 --- a/qt/gen_qundogroup.go +++ b/qt/gen_qundogroup.go @@ -68,15 +68,6 @@ func QUndoGroup_Tr(s string) string { return _ret } -func QUndoGroup_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QUndoGroup_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QUndoGroup) AddStack(stack *QUndoStack) { C.QUndoGroup_AddStack(this.h, stack.cPointer()) } @@ -318,28 +309,6 @@ func QUndoGroup_Tr3(s string, c string, n int) string { return _ret } -func QUndoGroup_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QUndoGroup_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QUndoGroup_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QUndoGroup_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QUndoGroup) CreateUndoAction2(parent *QObject, prefix string) *QAction { prefix_ms := miqt_strdupg(prefix) defer C.free(prefix_ms) diff --git a/qt/gen_qundogroup.h b/qt/gen_qundogroup.h index 6c927fc..74a7a4e 100644 --- a/qt/gen_qundogroup.h +++ b/qt/gen_qundogroup.h @@ -32,7 +32,6 @@ QUndoGroup* QUndoGroup_new2(QObject* parent); QMetaObject* QUndoGroup_MetaObject(const QUndoGroup* self); void* QUndoGroup_Metacast(QUndoGroup* self, const char* param1); struct miqt_string* QUndoGroup_Tr(const char* s); -struct miqt_string* QUndoGroup_TrUtf8(const char* s); void QUndoGroup_AddStack(QUndoGroup* self, QUndoStack* stack); void QUndoGroup_RemoveStack(QUndoGroup* self, QUndoStack* stack); struct miqt_array* QUndoGroup_Stacks(const QUndoGroup* self); @@ -63,8 +62,6 @@ void QUndoGroup_RedoTextChanged(QUndoGroup* self, struct miqt_string* redoText); void QUndoGroup_connect_RedoTextChanged(QUndoGroup* self, void* slot); struct miqt_string* QUndoGroup_Tr2(const char* s, const char* c); struct miqt_string* QUndoGroup_Tr3(const char* s, const char* c, int n); -struct miqt_string* QUndoGroup_TrUtf82(const char* s, const char* c); -struct miqt_string* QUndoGroup_TrUtf83(const char* s, const char* c, int n); QAction* QUndoGroup_CreateUndoAction2(const QUndoGroup* self, QObject* parent, struct miqt_string* prefix); QAction* QUndoGroup_CreateRedoAction2(const QUndoGroup* self, QObject* parent, struct miqt_string* prefix); void QUndoGroup_Delete(QUndoGroup* self); diff --git a/qt/gen_qundostack.cpp b/qt/gen_qundostack.cpp index fc504bf..0b83718 100644 --- a/qt/gen_qundostack.cpp +++ b/qt/gen_qundostack.cpp @@ -106,13 +106,6 @@ struct miqt_string* QUndoStack_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QUndoStack_TrUtf8(const char* s) { - QString _ret = QUndoStack::trUtf8(s); - // 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 QUndoStack_Clear(QUndoStack* self) { self->clear(); } @@ -311,20 +304,6 @@ struct miqt_string* QUndoStack_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QUndoStack_TrUtf82(const char* s, const char* c) { - QString _ret = QUndoStack::trUtf8(s, c); - // 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* QUndoStack_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QUndoStack::trUtf8(s, c, static_cast(n)); - // 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()); -} - QAction* QUndoStack_CreateUndoAction2(const QUndoStack* self, QObject* parent, struct miqt_string* prefix) { QString prefix_QString = QString::fromUtf8(&prefix->data, prefix->len); return self->createUndoAction(parent, prefix_QString); diff --git a/qt/gen_qundostack.go b/qt/gen_qundostack.go index e7df97a..c87b5e1 100644 --- a/qt/gen_qundostack.go +++ b/qt/gen_qundostack.go @@ -184,15 +184,6 @@ func QUndoStack_Tr(s string) string { return _ret } -func QUndoStack_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QUndoStack_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QUndoStack) Clear() { C.QUndoStack_Clear(this.h) } @@ -456,28 +447,6 @@ func QUndoStack_Tr3(s string, c string, n int) string { return _ret } -func QUndoStack_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QUndoStack_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QUndoStack_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QUndoStack_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QUndoStack) CreateUndoAction2(parent *QObject, prefix string) *QAction { prefix_ms := miqt_strdupg(prefix) defer C.free(prefix_ms) diff --git a/qt/gen_qundostack.h b/qt/gen_qundostack.h index 88e5eba..5301910 100644 --- a/qt/gen_qundostack.h +++ b/qt/gen_qundostack.h @@ -49,7 +49,6 @@ QUndoStack* QUndoStack_new2(QObject* parent); QMetaObject* QUndoStack_MetaObject(const QUndoStack* self); void* QUndoStack_Metacast(QUndoStack* self, const char* param1); struct miqt_string* QUndoStack_Tr(const char* s); -struct miqt_string* QUndoStack_TrUtf8(const char* s); void QUndoStack_Clear(QUndoStack* self); void QUndoStack_Push(QUndoStack* self, QUndoCommand* cmd); bool QUndoStack_CanUndo(const QUndoStack* self); @@ -89,8 +88,6 @@ void QUndoStack_RedoTextChanged(QUndoStack* self, struct miqt_string* redoText); void QUndoStack_connect_RedoTextChanged(QUndoStack* self, void* slot); struct miqt_string* QUndoStack_Tr2(const char* s, const char* c); struct miqt_string* QUndoStack_Tr3(const char* s, const char* c, int n); -struct miqt_string* QUndoStack_TrUtf82(const char* s, const char* c); -struct miqt_string* QUndoStack_TrUtf83(const char* s, const char* c, int n); QAction* QUndoStack_CreateUndoAction2(const QUndoStack* self, QObject* parent, struct miqt_string* prefix); QAction* QUndoStack_CreateRedoAction2(const QUndoStack* self, QObject* parent, struct miqt_string* prefix); void QUndoStack_SetActive1(QUndoStack* self, bool active); diff --git a/qt/gen_qundoview.cpp b/qt/gen_qundoview.cpp index 5b9e3ac..a6b2ade 100644 --- a/qt/gen_qundoview.cpp +++ b/qt/gen_qundoview.cpp @@ -50,13 +50,6 @@ struct miqt_string* QUndoView_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QUndoView_TrUtf8(const char* s) { - QString _ret = QUndoView::trUtf8(s); - // 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()); -} - QUndoStack* QUndoView_Stack(const QUndoView* self) { return self->stack(); } @@ -107,20 +100,6 @@ struct miqt_string* QUndoView_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QUndoView_TrUtf82(const char* s, const char* c) { - QString _ret = QUndoView::trUtf8(s, c); - // 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* QUndoView_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QUndoView::trUtf8(s, c, static_cast(n)); - // 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 QUndoView_Delete(QUndoView* self) { delete self; } diff --git a/qt/gen_qundoview.go b/qt/gen_qundoview.go index d2f9543..8e0b5db 100644 --- a/qt/gen_qundoview.go +++ b/qt/gen_qundoview.go @@ -91,15 +91,6 @@ func QUndoView_Tr(s string) string { return _ret } -func QUndoView_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QUndoView_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QUndoView) Stack() *QUndoStack { return newQUndoStack_U(unsafe.Pointer(C.QUndoView_Stack(this.h))) } @@ -162,28 +153,6 @@ func QUndoView_Tr3(s string, c string, n int) string { return _ret } -func QUndoView_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QUndoView_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QUndoView_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QUndoView_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QUndoView) Delete() { C.QUndoView_Delete(this.h) diff --git a/qt/gen_qundoview.h b/qt/gen_qundoview.h index de18f64..2bde8d5 100644 --- a/qt/gen_qundoview.h +++ b/qt/gen_qundoview.h @@ -38,7 +38,6 @@ QUndoView* QUndoView_new6(QUndoGroup* group, QWidget* parent); QMetaObject* QUndoView_MetaObject(const QUndoView* self); void* QUndoView_Metacast(QUndoView* self, const char* param1); struct miqt_string* QUndoView_Tr(const char* s); -struct miqt_string* QUndoView_TrUtf8(const char* s); QUndoStack* QUndoView_Stack(const QUndoView* self); QUndoGroup* QUndoView_Group(const QUndoView* self); void QUndoView_SetEmptyLabel(QUndoView* self, struct miqt_string* label); @@ -49,8 +48,6 @@ void QUndoView_SetStack(QUndoView* self, QUndoStack* stack); void QUndoView_SetGroup(QUndoView* self, QUndoGroup* group); struct miqt_string* QUndoView_Tr2(const char* s, const char* c); struct miqt_string* QUndoView_Tr3(const char* s, const char* c, int n); -struct miqt_string* QUndoView_TrUtf82(const char* s, const char* c); -struct miqt_string* QUndoView_TrUtf83(const char* s, const char* c, int n); void QUndoView_Delete(QUndoView* self); #ifdef __cplusplus diff --git a/qt/gen_qurl.cpp b/qt/gen_qurl.cpp index 92299b0..76cbfaf 100644 --- a/qt/gen_qurl.cpp +++ b/qt/gen_qurl.cpp @@ -79,12 +79,6 @@ QUrl* QUrl_FromUserInput(struct miqt_string* userInput) { return new QUrl(QUrl::fromUserInput(userInput_QString)); } -QUrl* QUrl_FromUserInput2(struct miqt_string* userInput, struct miqt_string* workingDirectory) { - QString userInput_QString = QString::fromUtf8(&userInput->data, userInput->len); - QString workingDirectory_QString = QString::fromUtf8(&workingDirectory->data, workingDirectory->len); - return new QUrl(QUrl::fromUserInput(userInput_QString, workingDirectory_QString)); -} - bool QUrl_IsValid(const QUrl* self) { return self->isValid(); } @@ -176,13 +170,6 @@ struct miqt_string* QUrl_Host(const QUrl* self) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QUrl_TopLevelDomain(const QUrl* self) { - QString _ret = self->topLevelDomain(); - // 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 QUrl_SetPort(QUrl* self, int port) { self->setPort(static_cast(port)); } @@ -306,16 +293,16 @@ QByteArray* QUrl_ToPercentEncoding(struct miqt_string* param1) { return new QByteArray(QUrl::toPercentEncoding(param1_QString)); } -struct miqt_string* QUrl_FromAce(QByteArray* param1) { - QString _ret = QUrl::fromAce(*param1); +struct miqt_string* QUrl_FromAce(QByteArray* domain) { + QString _ret = QUrl::fromAce(*domain); // 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()); } -QByteArray* QUrl_ToAce(struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); - return new QByteArray(QUrl::toAce(param1_QString)); +QByteArray* QUrl_ToAce(struct miqt_string* domain) { + QString domain_QString = QString::fromUtf8(&domain->data, domain->len); + return new QByteArray(QUrl::toAce(domain_QString)); } struct miqt_array* QUrl_IdnWhitelist() { @@ -396,6 +383,12 @@ QUrl* QUrl_FromEncoded2(QByteArray* url, int mode) { return new QUrl(QUrl::fromEncoded(*url, static_cast(mode))); } +QUrl* QUrl_FromUserInput2(struct miqt_string* userInput, struct miqt_string* workingDirectory) { + QString userInput_QString = QString::fromUtf8(&userInput->data, userInput->len); + QString workingDirectory_QString = QString::fromUtf8(&workingDirectory->data, workingDirectory->len); + return new QUrl(QUrl::fromUserInput(userInput_QString, workingDirectory_QString)); +} + QUrl* QUrl_FromUserInput3(struct miqt_string* userInput, struct miqt_string* workingDirectory, int options) { QString userInput_QString = QString::fromUtf8(&userInput->data, userInput->len); QString workingDirectory_QString = QString::fromUtf8(&workingDirectory->data, workingDirectory->len); @@ -407,7 +400,7 @@ void QUrl_SetAuthority2(QUrl* self, struct miqt_string* authority, int mode) { self->setAuthority(authority_QString, static_cast(mode)); } -struct miqt_string* QUrl_Authority1(const QUrl* self, int options) { +struct miqt_string* QUrl_Authority1(const QUrl* self, unsigned int options) { QString _ret = self->authority(static_cast(options)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -419,7 +412,7 @@ void QUrl_SetUserInfo2(QUrl* self, struct miqt_string* userInfo, int mode) { self->setUserInfo(userInfo_QString, static_cast(mode)); } -struct miqt_string* QUrl_UserInfo1(const QUrl* self, int options) { +struct miqt_string* QUrl_UserInfo1(const QUrl* self, unsigned int options) { QString _ret = self->userInfo(static_cast(options)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -431,7 +424,7 @@ void QUrl_SetUserName2(QUrl* self, struct miqt_string* userName, int mode) { self->setUserName(userName_QString, static_cast(mode)); } -struct miqt_string* QUrl_UserName1(const QUrl* self, int options) { +struct miqt_string* QUrl_UserName1(const QUrl* self, unsigned int options) { QString _ret = self->userName(static_cast(options)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -443,7 +436,7 @@ void QUrl_SetPassword2(QUrl* self, struct miqt_string* password, int mode) { self->setPassword(password_QString, static_cast(mode)); } -struct miqt_string* QUrl_Password1(const QUrl* self, int param1) { +struct miqt_string* QUrl_Password1(const QUrl* self, unsigned int param1) { QString _ret = self->password(static_cast(param1)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -455,20 +448,13 @@ void QUrl_SetHost2(QUrl* self, struct miqt_string* host, int mode) { self->setHost(host_QString, static_cast(mode)); } -struct miqt_string* QUrl_Host1(const QUrl* self, int param1) { +struct miqt_string* QUrl_Host1(const QUrl* self, unsigned int param1) { QString _ret = self->host(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* QUrl_TopLevelDomain1(const QUrl* self, int options) { - QString _ret = self->topLevelDomain(static_cast(options)); - // 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()); -} - int QUrl_Port1(const QUrl* self, int defaultPort) { return self->port(static_cast(defaultPort)); } @@ -478,14 +464,14 @@ void QUrl_SetPath2(QUrl* self, struct miqt_string* path, int mode) { self->setPath(path_QString, static_cast(mode)); } -struct miqt_string* QUrl_Path1(const QUrl* self, int options) { +struct miqt_string* QUrl_Path1(const QUrl* self, unsigned int options) { QString _ret = self->path(static_cast(options)); // 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* QUrl_FileName1(const QUrl* self, int options) { +struct miqt_string* QUrl_FileName1(const QUrl* self, unsigned int options) { QString _ret = self->fileName(static_cast(options)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -497,14 +483,14 @@ void QUrl_SetQuery2(QUrl* self, struct miqt_string* query, int mode) { self->setQuery(query_QString, static_cast(mode)); } -struct miqt_string* QUrl_Query1(const QUrl* self, int param1) { +struct miqt_string* QUrl_Query1(const QUrl* self, unsigned int param1) { QString _ret = self->query(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* QUrl_Fragment1(const QUrl* self, int options) { +struct miqt_string* QUrl_Fragment1(const QUrl* self, unsigned int options) { QString _ret = self->fragment(static_cast(options)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -526,6 +512,18 @@ QByteArray* QUrl_ToPercentEncoding3(struct miqt_string* param1, QByteArray* excl return new QByteArray(QUrl::toPercentEncoding(param1_QString, *exclude, *include)); } +struct miqt_string* QUrl_FromAce2(QByteArray* domain, unsigned int options) { + QString _ret = QUrl::fromAce(*domain, static_cast(options)); + // 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()); +} + +QByteArray* QUrl_ToAce2(struct miqt_string* domain, unsigned int options) { + QString domain_QString = QString::fromUtf8(&domain->data, domain->len); + return new QByteArray(QUrl::toAce(domain_QString, static_cast(options))); +} + struct miqt_array* QUrl_FromStringList2(struct miqt_array* /* of struct miqt_string* */ uris, int mode) { QList uris_QList; uris_QList.reserve(uris->len); diff --git a/qt/gen_qurl.go b/qt/gen_qurl.go index 7ee26d5..9f826e5 100644 --- a/qt/gen_qurl.go +++ b/qt/gen_qurl.go @@ -21,7 +21,7 @@ const ( QUrl__DecodedMode QUrl__ParsingMode = 2 ) -type QUrl__UrlFormattingOption int +type QUrl__UrlFormattingOption uint const ( QUrl__None QUrl__UrlFormattingOption = 0 @@ -39,7 +39,7 @@ const ( QUrl__NormalizePathSegments QUrl__UrlFormattingOption = 4096 ) -type QUrl__ComponentFormattingOption int +type QUrl__ComponentFormattingOption uint const ( QUrl__PrettyDecoded QUrl__ComponentFormattingOption = 0 @@ -59,6 +59,13 @@ const ( QUrl__AssumeLocalFile QUrl__UserInputResolutionOption = 1 ) +type QUrl__AceProcessingOption uint + +const ( + QUrl__IgnoreIDNWhitelist QUrl__AceProcessingOption = 1 + QUrl__AceTransitionalProcessing QUrl__AceProcessingOption = 2 +) + type QUrl struct { h *C.QUrl } @@ -173,17 +180,6 @@ func QUrl_FromUserInput(userInput string) *QUrl { return _goptr } -func QUrl_FromUserInput2(userInput string, workingDirectory string) *QUrl { - userInput_ms := miqt_strdupg(userInput) - defer C.free(userInput_ms) - workingDirectory_ms := miqt_strdupg(workingDirectory) - defer C.free(workingDirectory_ms) - _ret := C.QUrl_FromUserInput2((*C.struct_miqt_string)(userInput_ms), (*C.struct_miqt_string)(workingDirectory_ms)) - _goptr := newQUrl(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - func (this *QUrl) IsValid() bool { return (bool)(C.QUrl_IsValid(this.h)) } @@ -281,13 +277,6 @@ func (this *QUrl) Host() string { return _ret } -func (this *QUrl) TopLevelDomain() string { - var _ms *C.struct_miqt_string = C.QUrl_TopLevelDomain(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QUrl) SetPort(port int) { C.QUrl_SetPort(this.h, (C.int)(port)) } @@ -425,17 +414,17 @@ func QUrl_ToPercentEncoding(param1 string) *QByteArray { return _goptr } -func QUrl_FromAce(param1 *QByteArray) string { - var _ms *C.struct_miqt_string = C.QUrl_FromAce(param1.cPointer()) +func QUrl_FromAce(domain *QByteArray) string { + var _ms *C.struct_miqt_string = C.QUrl_FromAce(domain.cPointer()) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } -func QUrl_ToAce(param1 string) *QByteArray { - param1_ms := miqt_strdupg(param1) - defer C.free(param1_ms) - _ret := C.QUrl_ToAce((*C.struct_miqt_string)(param1_ms)) +func QUrl_ToAce(domain string) *QByteArray { + domain_ms := miqt_strdupg(domain) + defer C.free(domain_ms) + _ret := C.QUrl_ToAce((*C.struct_miqt_string)(domain_ms)) _goptr := newQByteArray(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -528,6 +517,17 @@ func QUrl_FromEncoded2(url *QByteArray, mode QUrl__ParsingMode) *QUrl { return _goptr } +func QUrl_FromUserInput2(userInput string, workingDirectory string) *QUrl { + userInput_ms := miqt_strdupg(userInput) + defer C.free(userInput_ms) + workingDirectory_ms := miqt_strdupg(workingDirectory) + defer C.free(workingDirectory_ms) + _ret := C.QUrl_FromUserInput2((*C.struct_miqt_string)(userInput_ms), (*C.struct_miqt_string)(workingDirectory_ms)) + _goptr := newQUrl(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + func QUrl_FromUserInput3(userInput string, workingDirectory string, options QUrl__UserInputResolutionOption) *QUrl { userInput_ms := miqt_strdupg(userInput) defer C.free(userInput_ms) @@ -546,7 +546,7 @@ func (this *QUrl) SetAuthority2(authority string, mode QUrl__ParsingMode) { } func (this *QUrl) Authority1(options QUrl__ComponentFormattingOption) 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, (C.uint)(options)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -559,7 +559,7 @@ func (this *QUrl) SetUserInfo2(userInfo string, mode QUrl__ParsingMode) { } func (this *QUrl) UserInfo1(options QUrl__ComponentFormattingOption) 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, (C.uint)(options)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -572,7 +572,7 @@ func (this *QUrl) SetUserName2(userName string, mode QUrl__ParsingMode) { } func (this *QUrl) UserName1(options QUrl__ComponentFormattingOption) 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, (C.uint)(options)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -585,7 +585,7 @@ func (this *QUrl) SetPassword2(password string, mode QUrl__ParsingMode) { } func (this *QUrl) Password1(param1 QUrl__ComponentFormattingOption) 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, (C.uint)(param1)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -598,14 +598,7 @@ func (this *QUrl) SetHost2(host string, mode QUrl__ParsingMode) { } func (this *QUrl) Host1(param1 QUrl__ComponentFormattingOption) string { - var _ms *C.struct_miqt_string = C.QUrl_Host1(this.h, (C.int)(param1)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QUrl) TopLevelDomain1(options QUrl__ComponentFormattingOption) string { - var _ms *C.struct_miqt_string = C.QUrl_TopLevelDomain1(this.h, (C.int)(options)) + var _ms *C.struct_miqt_string = C.QUrl_Host1(this.h, (C.uint)(param1)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -622,14 +615,14 @@ func (this *QUrl) SetPath2(path string, mode QUrl__ParsingMode) { } func (this *QUrl) Path1(options QUrl__ComponentFormattingOption) 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, (C.uint)(options)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } func (this *QUrl) FileName1(options QUrl__ComponentFormattingOption) 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, (C.uint)(options)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -642,14 +635,14 @@ func (this *QUrl) SetQuery2(query string, mode QUrl__ParsingMode) { } func (this *QUrl) Query1(param1 QUrl__ComponentFormattingOption) 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, (C.uint)(param1)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } func (this *QUrl) Fragment1(options QUrl__ComponentFormattingOption) 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, (C.uint)(options)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -679,6 +672,22 @@ func QUrl_ToPercentEncoding3(param1 string, exclude *QByteArray, include *QByteA return _goptr } +func QUrl_FromAce2(domain *QByteArray, options QUrl__AceProcessingOption) string { + var _ms *C.struct_miqt_string = C.QUrl_FromAce2(domain.cPointer(), (C.uint)(options)) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + +func QUrl_ToAce2(domain string, options QUrl__AceProcessingOption) *QByteArray { + domain_ms := miqt_strdupg(domain) + defer C.free(domain_ms) + _ret := C.QUrl_ToAce2((*C.struct_miqt_string)(domain_ms), (C.uint)(options)) + _goptr := newQByteArray(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + func QUrl_FromStringList2(uris []string, mode QUrl__ParsingMode) []QUrl { // For the C ABI, malloc a C array of raw pointers uris_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(uris)))) diff --git a/qt/gen_qurl.h b/qt/gen_qurl.h index d691e2b..8981802 100644 --- a/qt/gen_qurl.h +++ b/qt/gen_qurl.h @@ -37,7 +37,6 @@ struct miqt_string* QUrl_ToDisplayString(const QUrl* self); QByteArray* QUrl_ToEncoded(const QUrl* self); QUrl* QUrl_FromEncoded(QByteArray* url); QUrl* QUrl_FromUserInput(struct miqt_string* userInput); -QUrl* QUrl_FromUserInput2(struct miqt_string* userInput, struct miqt_string* workingDirectory); bool QUrl_IsValid(const QUrl* self); struct miqt_string* QUrl_ErrorString(const QUrl* self); bool QUrl_IsEmpty(const QUrl* self); @@ -54,7 +53,6 @@ void QUrl_SetPassword(QUrl* self, struct miqt_string* password); struct miqt_string* QUrl_Password(const QUrl* self); void QUrl_SetHost(QUrl* self, struct miqt_string* host); struct miqt_string* QUrl_Host(const QUrl* self); -struct miqt_string* QUrl_TopLevelDomain(const QUrl* self); void QUrl_SetPort(QUrl* self, int port); int QUrl_Port(const QUrl* self); void QUrl_SetPath(QUrl* self, struct miqt_string* path); @@ -80,36 +78,38 @@ bool QUrl_OperatorEqual(const QUrl* self, QUrl* url); bool QUrl_OperatorNotEqual(const QUrl* self, QUrl* url); struct miqt_string* QUrl_FromPercentEncoding(QByteArray* param1); QByteArray* QUrl_ToPercentEncoding(struct miqt_string* param1); -struct miqt_string* QUrl_FromAce(QByteArray* param1); -QByteArray* QUrl_ToAce(struct miqt_string* param1); +struct miqt_string* QUrl_FromAce(QByteArray* domain); +QByteArray* QUrl_ToAce(struct miqt_string* domain); 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, int mode); QUrl* QUrl_FromEncoded2(QByteArray* url, int mode); +QUrl* QUrl_FromUserInput2(struct miqt_string* userInput, struct miqt_string* workingDirectory); QUrl* QUrl_FromUserInput3(struct miqt_string* userInput, struct miqt_string* workingDirectory, int options); void QUrl_SetAuthority2(QUrl* self, struct miqt_string* authority, int mode); -struct miqt_string* QUrl_Authority1(const QUrl* self, int options); +struct miqt_string* QUrl_Authority1(const QUrl* self, unsigned int options); void QUrl_SetUserInfo2(QUrl* self, struct miqt_string* userInfo, int mode); -struct miqt_string* QUrl_UserInfo1(const QUrl* self, int options); +struct miqt_string* QUrl_UserInfo1(const QUrl* self, unsigned int options); void QUrl_SetUserName2(QUrl* self, struct miqt_string* userName, int mode); -struct miqt_string* QUrl_UserName1(const QUrl* self, int options); +struct miqt_string* QUrl_UserName1(const QUrl* self, unsigned int options); void QUrl_SetPassword2(QUrl* self, struct miqt_string* password, int mode); -struct miqt_string* QUrl_Password1(const QUrl* self, int param1); +struct miqt_string* QUrl_Password1(const QUrl* self, unsigned int param1); 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); +struct miqt_string* QUrl_Host1(const QUrl* self, unsigned int param1); int QUrl_Port1(const QUrl* self, int defaultPort); 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); +struct miqt_string* QUrl_Path1(const QUrl* self, unsigned int options); +struct miqt_string* QUrl_FileName1(const QUrl* self, unsigned int options); 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); +struct miqt_string* QUrl_Query1(const QUrl* self, unsigned int param1); +struct miqt_string* QUrl_Fragment1(const QUrl* self, unsigned int options); 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_string* QUrl_FromAce2(QByteArray* domain, unsigned int options); +QByteArray* QUrl_ToAce2(struct miqt_string* domain, unsigned int options); struct miqt_array* QUrl_FromStringList2(struct miqt_array* /* of struct miqt_string* */ uris, int mode); void QUrl_Delete(QUrl* self); diff --git a/qt/gen_qurlquery.cpp b/qt/gen_qurlquery.cpp index 312f78e..19b7a90 100644 --- a/qt/gen_qurlquery.cpp +++ b/qt/gen_qurlquery.cpp @@ -131,29 +131,21 @@ void QUrlQuery_RemoveAllQueryItems(QUrlQuery* self, struct miqt_string* key) { self->removeAllQueryItems(key_QString); } -QChar* QUrlQuery_DefaultQueryValueDelimiter() { - return new QChar(QUrlQuery::defaultQueryValueDelimiter()); -} - -QChar* QUrlQuery_DefaultQueryPairDelimiter() { - return new QChar(QUrlQuery::defaultQueryPairDelimiter()); -} - -struct miqt_string* QUrlQuery_Query1(const QUrlQuery* self, int encoding) { +struct miqt_string* QUrlQuery_Query1(const QUrlQuery* self, unsigned int encoding) { QString _ret = self->query(static_cast(encoding)); // 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* QUrlQuery_ToString1(const QUrlQuery* self, int encoding) { +struct miqt_string* QUrlQuery_ToString1(const QUrlQuery* self, unsigned int encoding) { QString _ret = self->toString(static_cast(encoding)); // 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* QUrlQuery_QueryItemValue2(const QUrlQuery* self, struct miqt_string* key, int encoding) { +struct miqt_string* QUrlQuery_QueryItemValue2(const QUrlQuery* self, struct miqt_string* key, unsigned int encoding) { QString key_QString = QString::fromUtf8(&key->data, key->len); QString _ret = self->queryItemValue(key_QString, static_cast(encoding)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -161,7 +153,7 @@ struct miqt_string* QUrlQuery_QueryItemValue2(const QUrlQuery* self, struct miqt return miqt_strdup(_b.data(), _b.length()); } -struct miqt_array* QUrlQuery_AllQueryItemValues2(const QUrlQuery* self, struct miqt_string* key, int encoding) { +struct miqt_array* QUrlQuery_AllQueryItemValues2(const QUrlQuery* self, struct miqt_string* key, unsigned int encoding) { QString key_QString = QString::fromUtf8(&key->data, key->len); QStringList _ret = self->allQueryItemValues(key_QString, static_cast(encoding)); // Convert QList<> from C++ memory to manually-managed C memory diff --git a/qt/gen_qurlquery.go b/qt/gen_qurlquery.go index 508d15f..7c85f69 100644 --- a/qt/gen_qurlquery.go +++ b/qt/gen_qurlquery.go @@ -178,29 +178,15 @@ func (this *QUrlQuery) RemoveAllQueryItems(key string) { C.QUrlQuery_RemoveAllQueryItems(this.h, (*C.struct_miqt_string)(key_ms)) } -func QUrlQuery_DefaultQueryValueDelimiter() *QChar { - _ret := C.QUrlQuery_DefaultQueryValueDelimiter() - _goptr := newQChar(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QUrlQuery_DefaultQueryPairDelimiter() *QChar { - _ret := C.QUrlQuery_DefaultQueryPairDelimiter() - _goptr := newQChar(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - func (this *QUrlQuery) Query1(encoding QUrl__ComponentFormattingOption) 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, (C.uint)(encoding)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret } func (this *QUrlQuery) ToString1(encoding QUrl__ComponentFormattingOption) 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, (C.uint)(encoding)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -209,7 +195,7 @@ func (this *QUrlQuery) ToString1(encoding QUrl__ComponentFormattingOption) strin func (this *QUrlQuery) QueryItemValue2(key string, encoding QUrl__ComponentFormattingOption) 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), (C.uint)(encoding)) _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms)) return _ret @@ -218,7 +204,7 @@ func (this *QUrlQuery) QueryItemValue2(key string, encoding QUrl__ComponentForma func (this *QUrlQuery) AllQueryItemValues2(key string, encoding QUrl__ComponentFormattingOption) []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), (C.uint)(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_qurlquery.h b/qt/gen_qurlquery.h index 03a30bb..031b76d 100644 --- a/qt/gen_qurlquery.h +++ b/qt/gen_qurlquery.h @@ -46,12 +46,10 @@ void QUrlQuery_RemoveQueryItem(QUrlQuery* self, struct miqt_string* key); struct miqt_string* QUrlQuery_QueryItemValue(const QUrlQuery* self, struct miqt_string* key); struct miqt_array* QUrlQuery_AllQueryItemValues(const QUrlQuery* self, struct miqt_string* key); void QUrlQuery_RemoveAllQueryItems(QUrlQuery* self, struct miqt_string* key); -QChar* QUrlQuery_DefaultQueryValueDelimiter(); -QChar* QUrlQuery_DefaultQueryPairDelimiter(); -struct miqt_string* QUrlQuery_Query1(const QUrlQuery* self, int encoding); -struct miqt_string* QUrlQuery_ToString1(const QUrlQuery* self, int encoding); -struct miqt_string* QUrlQuery_QueryItemValue2(const QUrlQuery* self, struct miqt_string* key, int encoding); -struct miqt_array* QUrlQuery_AllQueryItemValues2(const QUrlQuery* self, struct miqt_string* key, int encoding); +struct miqt_string* QUrlQuery_Query1(const QUrlQuery* self, unsigned int encoding); +struct miqt_string* QUrlQuery_ToString1(const QUrlQuery* self, unsigned int encoding); +struct miqt_string* QUrlQuery_QueryItemValue2(const QUrlQuery* self, struct miqt_string* key, unsigned int encoding); +struct miqt_array* QUrlQuery_AllQueryItemValues2(const QUrlQuery* self, struct miqt_string* key, unsigned int encoding); void QUrlQuery_Delete(QUrlQuery* self); #ifdef __cplusplus diff --git a/qt/gen_qutf8stringview.cpp b/qt/gen_qutf8stringview.cpp new file mode 100644 index 0000000..fbeddd3 --- /dev/null +++ b/qt/gen_qutf8stringview.cpp @@ -0,0 +1,14 @@ +#define WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__hide_char8_t +#define WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__wrap_char +#include "qutf8stringview.h" +#include "gen_qutf8stringview.h" +#include "_cgo_export.h" + +void QtPrivate__hide_char8_t_Delete(QtPrivate__hide_char8_t* self) { + delete self; +} + +void QtPrivate__wrap_char_Delete(QtPrivate__wrap_char* self) { + delete self; +} + diff --git a/qt/gen_qutf8stringview.go b/qt/gen_qutf8stringview.go new file mode 100644 index 0000000..5eec152 --- /dev/null +++ b/qt/gen_qutf8stringview.go @@ -0,0 +1,86 @@ +package qt + +/* + +#include "gen_qutf8stringview.h" +#include + +*/ +import "C" + +import ( + "runtime" + "unsafe" +) + +type QtPrivate__hide_char8_t struct { + h *C.QtPrivate__hide_char8_t +} + +func (this *QtPrivate__hide_char8_t) cPointer() *C.QtPrivate__hide_char8_t { + if this == nil { + return nil + } + return this.h +} + +func newQtPrivate__hide_char8_t(h *C.QtPrivate__hide_char8_t) *QtPrivate__hide_char8_t { + if h == nil { + return nil + } + return &QtPrivate__hide_char8_t{h: h} +} + +func newQtPrivate__hide_char8_t_U(h unsafe.Pointer) *QtPrivate__hide_char8_t { + return newQtPrivate__hide_char8_t((*C.QtPrivate__hide_char8_t)(h)) +} + +// Delete this object from C++ memory. +func (this *QtPrivate__hide_char8_t) Delete() { + C.QtPrivate__hide_char8_t_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QtPrivate__hide_char8_t) GoGC() { + runtime.SetFinalizer(this, func(this *QtPrivate__hide_char8_t) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + +type QtPrivate__wrap_char struct { + h *C.QtPrivate__wrap_char +} + +func (this *QtPrivate__wrap_char) cPointer() *C.QtPrivate__wrap_char { + if this == nil { + return nil + } + return this.h +} + +func newQtPrivate__wrap_char(h *C.QtPrivate__wrap_char) *QtPrivate__wrap_char { + if h == nil { + return nil + } + return &QtPrivate__wrap_char{h: h} +} + +func newQtPrivate__wrap_char_U(h unsafe.Pointer) *QtPrivate__wrap_char { + return newQtPrivate__wrap_char((*C.QtPrivate__wrap_char)(h)) +} + +// Delete this object from C++ memory. +func (this *QtPrivate__wrap_char) Delete() { + C.QtPrivate__wrap_char_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QtPrivate__wrap_char) GoGC() { + runtime.SetFinalizer(this, func(this *QtPrivate__wrap_char) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} diff --git a/qt/gen_qutf8stringview.h b/qt/gen_qutf8stringview.h new file mode 100644 index 0000000..e078c03 --- /dev/null +++ b/qt/gen_qutf8stringview.h @@ -0,0 +1,40 @@ +#ifndef GEN_QUTF8STRINGVIEW_H +#define GEN_QUTF8STRINGVIEW_H + +#include +#include +#include + +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + +#include "binding.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__hide_char8_t) +typedef QtPrivate::hide_char8_t QtPrivate__hide_char8_t; +#else +class QtPrivate__hide_char8_t; +#endif +#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__wrap_char) +typedef QtPrivate::wrap_char QtPrivate__wrap_char; +#else +class QtPrivate__wrap_char; +#endif +#else +typedef struct QtPrivate__hide_char8_t QtPrivate__hide_char8_t; +typedef struct QtPrivate__wrap_char QtPrivate__wrap_char; +#endif + +void QtPrivate__hide_char8_t_Delete(QtPrivate__hide_char8_t* self); + +void QtPrivate__wrap_char_Delete(QtPrivate__wrap_char* self); + +#ifdef __cplusplus +} /* extern C */ +#endif + +#endif diff --git a/qt/gen_quuid.cpp b/qt/gen_quuid.cpp index dbd950d..f585061 100644 --- a/qt/gen_quuid.cpp +++ b/qt/gen_quuid.cpp @@ -1,4 +1,6 @@ +#include #include +#include #include #include #include @@ -15,21 +17,16 @@ QUuid* QUuid_new2(unsigned int l, uint16_t w1, uint16_t w2, unsigned char b1, un return new QUuid(static_cast(l), static_cast(w1), static_cast(w2), static_cast(b1), static_cast(b2), static_cast(b3), static_cast(b4), static_cast(b5), static_cast(b6), static_cast(b7), static_cast(b8)); } -QUuid* QUuid_new3(struct miqt_string* param1) { - QString param1_QString = QString::fromUtf8(¶m1->data, param1->len); - return new QUuid(param1_QString); +QUuid* QUuid_new3(QAnyStringView* stringVal) { + return new QUuid(*stringVal); } -QUuid* QUuid_new4(const char* param1) { - return new QUuid(param1); -} - -QUuid* QUuid_new5(QByteArray* param1) { +QUuid* QUuid_new4(QUuid* param1) { return new QUuid(*param1); } -QUuid* QUuid_new6(QUuid* param1) { - return new QUuid(*param1); +QUuid* QUuid_FromString(QAnyStringView* stringVal) { + return new QUuid(QUuid::fromString(*stringVal)); } struct miqt_string* QUuid_ToString(const QUuid* self) { @@ -39,26 +36,15 @@ struct miqt_string* QUuid_ToString(const QUuid* self) { return miqt_strdup(_b.data(), _b.length()); } -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(); - return miqt_strdup(_b.data(), _b.length()); -} - QByteArray* QUuid_ToByteArray(const QUuid* self) { return new QByteArray(self->toByteArray()); } -QByteArray* QUuid_ToByteArrayWithMode(const QUuid* self, int mode) { - return new QByteArray(self->toByteArray(static_cast(mode))); -} - QByteArray* QUuid_ToRfc4122(const QUuid* self) { return new QByteArray(self->toRfc4122()); } -QUuid* QUuid_FromRfc4122(QByteArray* param1) { +QUuid* QUuid_FromRfc4122(QByteArrayView* param1) { return new QUuid(QUuid::fromRfc4122(*param1)); } @@ -114,6 +100,17 @@ int QUuid_Version(const QUuid* self) { return static_cast(_ret); } +struct miqt_string* QUuid_ToString1(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(); + return miqt_strdup(_b.data(), _b.length()); +} + +QByteArray* QUuid_ToByteArray1(const QUuid* self, int mode) { + return new QByteArray(self->toByteArray(static_cast(mode))); +} + void QUuid_Delete(QUuid* self) { delete self; } diff --git a/qt/gen_quuid.go b/qt/gen_quuid.go index 511bf91..932c518 100644 --- a/qt/gen_quuid.go +++ b/qt/gen_quuid.go @@ -78,31 +78,22 @@ func NewQUuid2(l uint, w1 uint16, w2 uint16, b1 byte, b2 byte, b3 byte, b4 byte, } // NewQUuid3 constructs a new QUuid object. -func NewQUuid3(param1 string) *QUuid { - param1_ms := miqt_strdupg(param1) - defer C.free(param1_ms) - ret := C.QUuid_new3((*C.struct_miqt_string)(param1_ms)) +func NewQUuid3(stringVal QAnyStringView) *QUuid { + ret := C.QUuid_new3(stringVal.cPointer()) return newQUuid(ret) } // NewQUuid4 constructs a new QUuid object. -func NewQUuid4(param1 string) *QUuid { - param1_Cstring := C.CString(param1) - defer C.free(unsafe.Pointer(param1_Cstring)) - ret := C.QUuid_new4(param1_Cstring) +func NewQUuid4(param1 *QUuid) *QUuid { + ret := C.QUuid_new4(param1.cPointer()) return newQUuid(ret) } -// NewQUuid5 constructs a new QUuid object. -func NewQUuid5(param1 *QByteArray) *QUuid { - ret := C.QUuid_new5(param1.cPointer()) - return newQUuid(ret) -} - -// NewQUuid6 constructs a new QUuid object. -func NewQUuid6(param1 *QUuid) *QUuid { - ret := C.QUuid_new6(param1.cPointer()) - return newQUuid(ret) +func QUuid_FromString(stringVal QAnyStringView) *QUuid { + _ret := C.QUuid_FromString(stringVal.cPointer()) + _goptr := newQUuid(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr } func (this *QUuid) ToString() string { @@ -112,13 +103,6 @@ func (this *QUuid) ToString() string { return _ret } -func (this *QUuid) ToStringWithMode(mode QUuid__StringFormat) string { - 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 -} - func (this *QUuid) ToByteArray() *QByteArray { _ret := C.QUuid_ToByteArray(this.h) _goptr := newQByteArray(_ret) @@ -126,13 +110,6 @@ func (this *QUuid) ToByteArray() *QByteArray { return _goptr } -func (this *QUuid) ToByteArrayWithMode(mode QUuid__StringFormat) *QByteArray { - _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 -} - func (this *QUuid) ToRfc4122() *QByteArray { _ret := C.QUuid_ToRfc4122(this.h) _goptr := newQByteArray(_ret) @@ -140,7 +117,7 @@ func (this *QUuid) ToRfc4122() *QByteArray { return _goptr } -func QUuid_FromRfc4122(param1 *QByteArray) *QUuid { +func QUuid_FromRfc4122(param1 QByteArrayView) *QUuid { _ret := C.QUuid_FromRfc4122(param1.cPointer()) _goptr := newQUuid(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer @@ -214,6 +191,20 @@ func (this *QUuid) Version() QUuid__Version { return (QUuid__Version)(C.QUuid_Version(this.h)) } +func (this *QUuid) ToString1(mode QUuid__StringFormat) string { + var _ms *C.struct_miqt_string = C.QUuid_ToString1(this.h, (C.int)(mode)) + _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) + C.free(unsafe.Pointer(_ms)) + return _ret +} + +func (this *QUuid) ToByteArray1(mode QUuid__StringFormat) *QByteArray { + _ret := C.QUuid_ToByteArray1(this.h, (C.int)(mode)) + _goptr := newQByteArray(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + // Delete this object from C++ memory. func (this *QUuid) Delete() { C.QUuid_Delete(this.h) diff --git a/qt/gen_quuid.h b/qt/gen_quuid.h index 9a4fac6..ceede00 100644 --- a/qt/gen_quuid.h +++ b/qt/gen_quuid.h @@ -14,25 +14,26 @@ extern "C" { #endif #ifdef __cplusplus +class QAnyStringView; class QByteArray; +class QByteArrayView; class QUuid; #else +typedef struct QAnyStringView QAnyStringView; typedef struct QByteArray QByteArray; +typedef struct QByteArrayView QByteArrayView; typedef struct QUuid QUuid; #endif QUuid* QUuid_new(); QUuid* QUuid_new2(unsigned int l, uint16_t w1, uint16_t w2, unsigned char b1, unsigned char b2, unsigned char b3, unsigned char b4, unsigned char b5, unsigned char b6, unsigned char b7, unsigned char b8); -QUuid* QUuid_new3(struct miqt_string* param1); -QUuid* QUuid_new4(const char* param1); -QUuid* QUuid_new5(QByteArray* param1); -QUuid* QUuid_new6(QUuid* param1); +QUuid* QUuid_new3(QAnyStringView* stringVal); +QUuid* QUuid_new4(QUuid* param1); +QUuid* QUuid_FromString(QAnyStringView* stringVal); struct miqt_string* QUuid_ToString(const QUuid* self); -struct miqt_string* QUuid_ToStringWithMode(const QUuid* self, int mode); QByteArray* QUuid_ToByteArray(const QUuid* self); -QByteArray* QUuid_ToByteArrayWithMode(const QUuid* self, int mode); QByteArray* QUuid_ToRfc4122(const QUuid* self); -QUuid* QUuid_FromRfc4122(QByteArray* param1); +QUuid* QUuid_FromRfc4122(QByteArrayView* param1); bool QUuid_IsNull(const QUuid* self); bool QUuid_OperatorEqual(const QUuid* self, QUuid* orig); bool QUuid_OperatorNotEqual(const QUuid* self, QUuid* orig); @@ -45,6 +46,8 @@ QUuid* QUuid_CreateUuidV32(QUuid* ns, struct miqt_string* baseData); QUuid* QUuid_CreateUuidV52(QUuid* ns, struct miqt_string* baseData); int QUuid_Variant(const QUuid* self); int QUuid_Version(const QUuid* self); +struct miqt_string* QUuid_ToString1(const QUuid* self, int mode); +QByteArray* QUuid_ToByteArray1(const QUuid* self, int mode); void QUuid_Delete(QUuid* self); #ifdef __cplusplus diff --git a/qt/gen_qvalidator.cpp b/qt/gen_qvalidator.cpp index e6660bc..e160250 100644 --- a/qt/gen_qvalidator.cpp +++ b/qt/gen_qvalidator.cpp @@ -3,8 +3,6 @@ #include #include #include -#include -#include #include #include #include @@ -30,13 +28,6 @@ struct miqt_string* QValidator_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QValidator_TrUtf8(const char* s) { - QString _ret = QValidator::trUtf8(s); - // 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 QValidator_SetLocale(QValidator* self, QLocale* locale) { self->setLocale(*locale); } @@ -80,20 +71,6 @@ struct miqt_string* QValidator_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QValidator_TrUtf82(const char* s, const char* c) { - QString _ret = QValidator::trUtf8(s, c); - // 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* QValidator_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QValidator::trUtf8(s, c, static_cast(n)); - // 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 QValidator_Delete(QValidator* self) { delete self; } @@ -129,13 +106,6 @@ struct miqt_string* QIntValidator_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QIntValidator_TrUtf8(const char* s) { - QString _ret = QIntValidator::trUtf8(s); - // 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()); -} - 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)); @@ -203,20 +173,6 @@ struct miqt_string* QIntValidator_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QIntValidator_TrUtf82(const char* s, const char* c) { - QString _ret = QIntValidator::trUtf8(s, c); - // 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* QIntValidator_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QIntValidator::trUtf8(s, c, static_cast(n)); - // 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 QIntValidator_Delete(QIntValidator* self) { delete self; } @@ -252,20 +208,22 @@ struct miqt_string* QDoubleValidator_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QDoubleValidator_TrUtf8(const char* s) { - QString _ret = QDoubleValidator::trUtf8(s); - // 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()); -} - 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); } -void QDoubleValidator_SetRange(QDoubleValidator* self, double bottom, double top) { +void QDoubleValidator_Fixup(const QDoubleValidator* self, struct miqt_string* input) { + QString input_QString = QString::fromUtf8(&input->data, input->len); + self->fixup(input_QString); +} + +void QDoubleValidator_SetRange(QDoubleValidator* self, double bottom, double top, int decimals) { + self->setRange(static_cast(bottom), static_cast(top), static_cast(decimals)); +} + +void QDoubleValidator_SetRange2(QDoubleValidator* self, double bottom, double top) { self->setRange(static_cast(bottom), static_cast(top)); } @@ -361,127 +319,10 @@ struct miqt_string* QDoubleValidator_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QDoubleValidator_TrUtf82(const char* s, const char* c) { - QString _ret = QDoubleValidator::trUtf8(s, c); - // 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* QDoubleValidator_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QDoubleValidator::trUtf8(s, c, static_cast(n)); - // 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 QDoubleValidator_SetRange3(QDoubleValidator* self, double bottom, double top, int decimals) { - self->setRange(static_cast(bottom), static_cast(top), static_cast(decimals)); -} - void QDoubleValidator_Delete(QDoubleValidator* self) { delete self; } -QRegExpValidator* QRegExpValidator_new() { - return new QRegExpValidator(); -} - -QRegExpValidator* QRegExpValidator_new2(QRegExp* rx) { - return new QRegExpValidator(*rx); -} - -QRegExpValidator* QRegExpValidator_new3(QObject* parent) { - return new QRegExpValidator(parent); -} - -QRegExpValidator* QRegExpValidator_new4(QRegExp* rx, QObject* parent) { - return new QRegExpValidator(*rx, parent); -} - -QMetaObject* QRegExpValidator_MetaObject(const QRegExpValidator* self) { - return (QMetaObject*) self->metaObject(); -} - -void* QRegExpValidator_Metacast(QRegExpValidator* self, const char* param1) { - return self->qt_metacast(param1); -} - -struct miqt_string* QRegExpValidator_Tr(const char* s) { - QString _ret = QRegExpValidator::tr(s); - // 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* QRegExpValidator_TrUtf8(const char* s) { - QString _ret = QRegExpValidator::trUtf8(s); - // 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()); -} - -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); -} - -void QRegExpValidator_SetRegExp(QRegExpValidator* self, QRegExp* rx) { - self->setRegExp(*rx); -} - -QRegExp* QRegExpValidator_RegExp(const QRegExpValidator* self) { - const QRegExp& _ret = self->regExp(); - // Cast returned reference into pointer - return const_cast(&_ret); -} - -void QRegExpValidator_RegExpChanged(QRegExpValidator* self, QRegExp* regExp) { - self->regExpChanged(*regExp); -} - -void QRegExpValidator_connect_RegExpChanged(QRegExpValidator* self, void* slot) { - QRegExpValidator::connect(self, static_cast(&QRegExpValidator::regExpChanged), self, [=](const QRegExp& regExp) { - const QRegExp& regExp_ret = regExp; - // Cast returned reference into pointer - QRegExp* sigval1 = const_cast(®Exp_ret); - miqt_exec_callback_QRegExpValidator_RegExpChanged(slot, sigval1); - }); -} - -struct miqt_string* QRegExpValidator_Tr2(const char* s, const char* c) { - QString _ret = QRegExpValidator::tr(s, c); - // 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* QRegExpValidator_Tr3(const char* s, const char* c, int n) { - QString _ret = QRegExpValidator::tr(s, c, static_cast(n)); - // 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* QRegExpValidator_TrUtf82(const char* s, const char* c) { - QString _ret = QRegExpValidator::trUtf8(s, c); - // 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* QRegExpValidator_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QRegExpValidator::trUtf8(s, c, static_cast(n)); - // 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 QRegExpValidator_Delete(QRegExpValidator* self) { - delete self; -} - QRegularExpressionValidator* QRegularExpressionValidator_new() { return new QRegularExpressionValidator(); } @@ -513,13 +354,6 @@ struct miqt_string* QRegularExpressionValidator_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QRegularExpressionValidator_TrUtf8(const char* s) { - QString _ret = QRegularExpressionValidator::trUtf8(s); - // 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()); -} - 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)); @@ -561,20 +395,6 @@ struct miqt_string* QRegularExpressionValidator_Tr3(const char* s, const char* c return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QRegularExpressionValidator_TrUtf82(const char* s, const char* c) { - QString _ret = QRegularExpressionValidator::trUtf8(s, c); - // 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* QRegularExpressionValidator_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QRegularExpressionValidator::trUtf8(s, c, static_cast(n)); - // 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 QRegularExpressionValidator_Delete(QRegularExpressionValidator* self) { delete self; } diff --git a/qt/gen_qvalidator.go b/qt/gen_qvalidator.go index 814d16d..14d5199 100644 --- a/qt/gen_qvalidator.go +++ b/qt/gen_qvalidator.go @@ -71,15 +71,6 @@ func QValidator_Tr(s string) string { return _ret } -func QValidator_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QValidator_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QValidator) SetLocale(locale *QLocale) { C.QValidator_SetLocale(this.h, locale.cPointer()) } @@ -142,28 +133,6 @@ func QValidator_Tr3(s string, c string, n int) string { return _ret } -func QValidator_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QValidator_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QValidator_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QValidator_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QValidator) Delete() { C.QValidator_Delete(this.h) @@ -244,15 +213,6 @@ func QIntValidator_Tr(s string) string { return _ret } -func QIntValidator_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QIntValidator_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QIntValidator) Validate(param1 string, param2 *int) QValidator__State { param1_ms := miqt_strdupg(param1) defer C.free(param1_ms) @@ -347,28 +307,6 @@ func QIntValidator_Tr3(s string, c string, n int) string { return _ret } -func QIntValidator_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QIntValidator_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QIntValidator_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QIntValidator_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QIntValidator) Delete() { C.QIntValidator_Delete(this.h) @@ -449,23 +387,24 @@ func QDoubleValidator_Tr(s string) string { return _ret } -func QDoubleValidator_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QDoubleValidator_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QDoubleValidator) Validate(param1 string, param2 *int) QValidator__State { param1_ms := miqt_strdupg(param1) defer C.free(param1_ms) return (QValidator__State)(C.QDoubleValidator_Validate(this.h, (*C.struct_miqt_string)(param1_ms), (*C.int)(unsafe.Pointer(param2)))) } -func (this *QDoubleValidator) SetRange(bottom float64, top float64) { - C.QDoubleValidator_SetRange(this.h, (C.double)(bottom), (C.double)(top)) +func (this *QDoubleValidator) Fixup(input string) { + input_ms := miqt_strdupg(input) + defer C.free(input_ms) + C.QDoubleValidator_Fixup(this.h, (*C.struct_miqt_string)(input_ms)) +} + +func (this *QDoubleValidator) SetRange(bottom float64, top float64, decimals int) { + C.QDoubleValidator_SetRange(this.h, (C.double)(bottom), (C.double)(top), (C.int)(decimals)) +} + +func (this *QDoubleValidator) SetRange2(bottom float64, top float64) { + C.QDoubleValidator_SetRange2(this.h, (C.double)(bottom), (C.double)(top)) } func (this *QDoubleValidator) SetBottom(bottom float64) { @@ -602,32 +541,6 @@ func QDoubleValidator_Tr3(s string, c string, n int) string { return _ret } -func QDoubleValidator_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDoubleValidator_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QDoubleValidator_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QDoubleValidator_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QDoubleValidator) SetRange3(bottom float64, top float64, decimals int) { - C.QDoubleValidator_SetRange3(this.h, (C.double)(bottom), (C.double)(top), (C.int)(decimals)) -} - // Delete this object from C++ memory. func (this *QDoubleValidator) Delete() { C.QDoubleValidator_Delete(this.h) @@ -642,173 +555,6 @@ func (this *QDoubleValidator) GoGC() { }) } -type QRegExpValidator struct { - h *C.QRegExpValidator - *QValidator -} - -func (this *QRegExpValidator) cPointer() *C.QRegExpValidator { - if this == nil { - return nil - } - return this.h -} - -func newQRegExpValidator(h *C.QRegExpValidator) *QRegExpValidator { - if h == nil { - return nil - } - return &QRegExpValidator{h: h, QValidator: newQValidator_U(unsafe.Pointer(h))} -} - -func newQRegExpValidator_U(h unsafe.Pointer) *QRegExpValidator { - return newQRegExpValidator((*C.QRegExpValidator)(h)) -} - -// NewQRegExpValidator constructs a new QRegExpValidator object. -func NewQRegExpValidator() *QRegExpValidator { - ret := C.QRegExpValidator_new() - return newQRegExpValidator(ret) -} - -// NewQRegExpValidator2 constructs a new QRegExpValidator object. -func NewQRegExpValidator2(rx *QRegExp) *QRegExpValidator { - ret := C.QRegExpValidator_new2(rx.cPointer()) - return newQRegExpValidator(ret) -} - -// NewQRegExpValidator3 constructs a new QRegExpValidator object. -func NewQRegExpValidator3(parent *QObject) *QRegExpValidator { - ret := C.QRegExpValidator_new3(parent.cPointer()) - return newQRegExpValidator(ret) -} - -// NewQRegExpValidator4 constructs a new QRegExpValidator object. -func NewQRegExpValidator4(rx *QRegExp, parent *QObject) *QRegExpValidator { - ret := C.QRegExpValidator_new4(rx.cPointer(), parent.cPointer()) - return newQRegExpValidator(ret) -} - -func (this *QRegExpValidator) MetaObject() *QMetaObject { - return newQMetaObject_U(unsafe.Pointer(C.QRegExpValidator_MetaObject(this.h))) -} - -func (this *QRegExpValidator) Metacast(param1 string) unsafe.Pointer { - param1_Cstring := C.CString(param1) - defer C.free(unsafe.Pointer(param1_Cstring)) - return C.QRegExpValidator_Metacast(this.h, param1_Cstring) -} - -func QRegExpValidator_Tr(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QRegExpValidator_Tr(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QRegExpValidator_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QRegExpValidator_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QRegExpValidator) Validate(input string, pos *int) QValidator__State { - input_ms := miqt_strdupg(input) - defer C.free(input_ms) - return (QValidator__State)(C.QRegExpValidator_Validate(this.h, (*C.struct_miqt_string)(input_ms), (*C.int)(unsafe.Pointer(pos)))) -} - -func (this *QRegExpValidator) SetRegExp(rx *QRegExp) { - C.QRegExpValidator_SetRegExp(this.h, rx.cPointer()) -} - -func (this *QRegExpValidator) RegExp() *QRegExp { - return newQRegExp_U(unsafe.Pointer(C.QRegExpValidator_RegExp(this.h))) -} - -func (this *QRegExpValidator) RegExpChanged(regExp *QRegExp) { - C.QRegExpValidator_RegExpChanged(this.h, regExp.cPointer()) -} -func (this *QRegExpValidator) OnRegExpChanged(slot func(regExp *QRegExp)) { - C.QRegExpValidator_connect_RegExpChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot)))) -} - -//export miqt_exec_callback_QRegExpValidator_RegExpChanged -func miqt_exec_callback_QRegExpValidator_RegExpChanged(cb *C.void, regExp *C.QRegExp) { - gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(regExp *QRegExp)) - if !ok { - panic("miqt: callback of non-callback type (heap corruption?)") - } - - // Convert all CABI parameters to Go parameters - slotval1 := newQRegExp_U(unsafe.Pointer(regExp)) - - gofunc(slotval1) -} - -func QRegExpValidator_Tr2(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QRegExpValidator_Tr2(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QRegExpValidator_Tr3(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QRegExpValidator_Tr3(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QRegExpValidator_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QRegExpValidator_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QRegExpValidator_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QRegExpValidator_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -// Delete this object from C++ memory. -func (this *QRegExpValidator) Delete() { - C.QRegExpValidator_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QRegExpValidator) GoGC() { - runtime.SetFinalizer(this, func(this *QRegExpValidator) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} - type QRegularExpressionValidator struct { h *C.QRegularExpressionValidator *QValidator @@ -875,15 +621,6 @@ func QRegularExpressionValidator_Tr(s string) string { return _ret } -func QRegularExpressionValidator_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QRegularExpressionValidator_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QRegularExpressionValidator) Validate(input string, pos *int) QValidator__State { input_ms := miqt_strdupg(input) defer C.free(input_ms) @@ -943,28 +680,6 @@ func QRegularExpressionValidator_Tr3(s string, c string, n int) string { return _ret } -func QRegularExpressionValidator_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QRegularExpressionValidator_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QRegularExpressionValidator_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QRegularExpressionValidator_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QRegularExpressionValidator) Delete() { C.QRegularExpressionValidator_Delete(this.h) diff --git a/qt/gen_qvalidator.h b/qt/gen_qvalidator.h index 30fa8f9..ee2dcb2 100644 --- a/qt/gen_qvalidator.h +++ b/qt/gen_qvalidator.h @@ -19,8 +19,6 @@ class QIntValidator; class QLocale; class QMetaObject; class QObject; -class QRegExp; -class QRegExpValidator; class QRegularExpression; class QRegularExpressionValidator; class QValidator; @@ -30,8 +28,6 @@ typedef struct QIntValidator QIntValidator; typedef struct QLocale QLocale; typedef struct QMetaObject QMetaObject; typedef struct QObject QObject; -typedef struct QRegExp QRegExp; -typedef struct QRegExpValidator QRegExpValidator; typedef struct QRegularExpression QRegularExpression; typedef struct QRegularExpressionValidator QRegularExpressionValidator; typedef struct QValidator QValidator; @@ -40,7 +36,6 @@ typedef struct QValidator QValidator; QMetaObject* QValidator_MetaObject(const QValidator* self); void* QValidator_Metacast(QValidator* self, const char* param1); 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); int QValidator_Validate(const QValidator* self, struct miqt_string* param1, int* param2); @@ -49,8 +44,6 @@ void QValidator_Changed(QValidator* self); void QValidator_connect_Changed(QValidator* self, void* slot); struct miqt_string* QValidator_Tr2(const char* s, const char* c); struct miqt_string* QValidator_Tr3(const char* s, const char* c, int n); -struct miqt_string* QValidator_TrUtf82(const char* s, const char* c); -struct miqt_string* QValidator_TrUtf83(const char* s, const char* c, int n); void QValidator_Delete(QValidator* self); QIntValidator* QIntValidator_new(); @@ -60,7 +53,6 @@ QIntValidator* QIntValidator_new4(int bottom, int top, QObject* parent); QMetaObject* QIntValidator_MetaObject(const QIntValidator* self); void* QIntValidator_Metacast(QIntValidator* self, const char* param1); struct miqt_string* QIntValidator_Tr(const char* s); -struct miqt_string* QIntValidator_TrUtf8(const char* s); 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); @@ -74,8 +66,6 @@ void QIntValidator_TopChanged(QIntValidator* self, int top); void QIntValidator_connect_TopChanged(QIntValidator* self, void* slot); struct miqt_string* QIntValidator_Tr2(const char* s, const char* c); struct miqt_string* QIntValidator_Tr3(const char* s, const char* c, int n); -struct miqt_string* QIntValidator_TrUtf82(const char* s, const char* c); -struct miqt_string* QIntValidator_TrUtf83(const char* s, const char* c, int n); void QIntValidator_Delete(QIntValidator* self); QDoubleValidator* QDoubleValidator_new(); @@ -85,9 +75,10 @@ QDoubleValidator* QDoubleValidator_new4(double bottom, double top, int decimals, QMetaObject* QDoubleValidator_MetaObject(const QDoubleValidator* self); void* QDoubleValidator_Metacast(QDoubleValidator* self, const char* param1); struct miqt_string* QDoubleValidator_Tr(const char* s); -struct miqt_string* QDoubleValidator_TrUtf8(const char* s); int QDoubleValidator_Validate(const QDoubleValidator* self, struct miqt_string* param1, int* param2); -void QDoubleValidator_SetRange(QDoubleValidator* self, double bottom, double top); +void QDoubleValidator_Fixup(const QDoubleValidator* self, struct miqt_string* input); +void QDoubleValidator_SetRange(QDoubleValidator* self, double bottom, double top, int decimals); +void QDoubleValidator_SetRange2(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); @@ -106,30 +97,8 @@ 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); -struct miqt_string* QDoubleValidator_TrUtf82(const char* s, const char* c); -struct miqt_string* QDoubleValidator_TrUtf83(const char* s, const char* c, int n); -void QDoubleValidator_SetRange3(QDoubleValidator* self, double bottom, double top, int decimals); void QDoubleValidator_Delete(QDoubleValidator* self); -QRegExpValidator* QRegExpValidator_new(); -QRegExpValidator* QRegExpValidator_new2(QRegExp* rx); -QRegExpValidator* QRegExpValidator_new3(QObject* parent); -QRegExpValidator* QRegExpValidator_new4(QRegExp* rx, QObject* parent); -QMetaObject* QRegExpValidator_MetaObject(const QRegExpValidator* self); -void* QRegExpValidator_Metacast(QRegExpValidator* self, const char* param1); -struct miqt_string* QRegExpValidator_Tr(const char* s); -struct miqt_string* QRegExpValidator_TrUtf8(const char* s); -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); -void QRegExpValidator_connect_RegExpChanged(QRegExpValidator* self, void* slot); -struct miqt_string* QRegExpValidator_Tr2(const char* s, const char* c); -struct miqt_string* QRegExpValidator_Tr3(const char* s, const char* c, int n); -struct miqt_string* QRegExpValidator_TrUtf82(const char* s, const char* c); -struct miqt_string* QRegExpValidator_TrUtf83(const char* s, const char* c, int n); -void QRegExpValidator_Delete(QRegExpValidator* self); - QRegularExpressionValidator* QRegularExpressionValidator_new(); QRegularExpressionValidator* QRegularExpressionValidator_new2(QRegularExpression* re); QRegularExpressionValidator* QRegularExpressionValidator_new3(QObject* parent); @@ -137,7 +106,6 @@ QRegularExpressionValidator* QRegularExpressionValidator_new4(QRegularExpression QMetaObject* QRegularExpressionValidator_MetaObject(const QRegularExpressionValidator* self); void* QRegularExpressionValidator_Metacast(QRegularExpressionValidator* self, const char* param1); struct miqt_string* QRegularExpressionValidator_Tr(const char* s); -struct miqt_string* QRegularExpressionValidator_TrUtf8(const char* s); 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); @@ -145,8 +113,6 @@ void QRegularExpressionValidator_RegularExpressionChanged(QRegularExpressionVali void QRegularExpressionValidator_connect_RegularExpressionChanged(QRegularExpressionValidator* self, void* slot); struct miqt_string* QRegularExpressionValidator_Tr2(const char* s, const char* c); struct miqt_string* QRegularExpressionValidator_Tr3(const char* s, const char* c, int n); -struct miqt_string* QRegularExpressionValidator_TrUtf82(const char* s, const char* c); -struct miqt_string* QRegularExpressionValidator_TrUtf83(const char* s, const char* c, int n); void QRegularExpressionValidator_Delete(QRegularExpressionValidator* self); #ifdef __cplusplus diff --git a/qt/gen_qvariant.cpp b/qt/gen_qvariant.cpp index e987d78..dc66a47 100644 --- a/qt/gen_qvariant.cpp +++ b/qt/gen_qvariant.cpp @@ -1,5 +1,3 @@ -#include -#define WORKAROUND_INNER_CLASS_DEFINITION_QAssociativeIterable__const_iterator #include #include #include @@ -15,16 +13,15 @@ #include #include #include +#include #include +#include #include #include #include #include #include -#include #include -#include -#define WORKAROUND_INNER_CLASS_DEFINITION_QSequentialIterable__const_iterator #include #include #include @@ -34,11 +31,9 @@ #include #include #include -#define WORKAROUND_INNER_CLASS_DEFINITION_QVariant__Handler #define WORKAROUND_INNER_CLASS_DEFINITION_QVariant__PrivateShared -#include -#define WORKAROUND_INNER_CLASS_DEFINITION_QtMetaTypePrivate__QAssociativeIterableImpl -#define WORKAROUND_INNER_CLASS_DEFINITION_QtMetaTypePrivate__QSequentialIterableImpl +#include +#define WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__QVariantTypeCoercer #include "qvariant.h" #include "gen_qvariant.h" #include "_cgo_export.h" @@ -47,72 +42,60 @@ QVariant* QVariant_new() { return new QVariant(); } -QVariant* QVariant_new2(int typeVal) { - return new QVariant(static_cast(typeVal)); +QVariant* QVariant_new2(QMetaType* typeVal) { + return new QVariant(*typeVal); } -QVariant* QVariant_new3(int typeId, const void* copyVal) { - return new QVariant(static_cast(typeId), copyVal); -} - -QVariant* QVariant_new4(int typeId, const void* copyVal, unsigned int flags) { - return new QVariant(static_cast(typeId), copyVal, static_cast(flags)); -} - -QVariant* QVariant_new5(QVariant* other) { +QVariant* QVariant_new3(QVariant* other) { return new QVariant(*other); } -QVariant* QVariant_new6(QDataStream* s) { - return new QVariant(*s); -} - -QVariant* QVariant_new7(int i) { +QVariant* QVariant_new4(int i) { return new QVariant(static_cast(i)); } -QVariant* QVariant_new8(unsigned int ui) { +QVariant* QVariant_new5(unsigned int ui) { return new QVariant(static_cast(ui)); } -QVariant* QVariant_new9(long long ll) { +QVariant* QVariant_new6(long long ll) { return new QVariant(static_cast(ll)); } -QVariant* QVariant_new10(unsigned long long ull) { +QVariant* QVariant_new7(unsigned long long ull) { return new QVariant(static_cast(ull)); } -QVariant* QVariant_new11(bool b) { +QVariant* QVariant_new8(bool b) { return new QVariant(b); } -QVariant* QVariant_new12(double d) { +QVariant* QVariant_new9(double d) { return new QVariant(static_cast(d)); } -QVariant* QVariant_new13(float f) { +QVariant* QVariant_new10(float f) { return new QVariant(static_cast(f)); } -QVariant* QVariant_new14(const char* str) { +QVariant* QVariant_new11(const char* str) { return new QVariant(str); } -QVariant* QVariant_new15(QByteArray* bytearray) { +QVariant* QVariant_new12(QByteArray* bytearray) { return new QVariant(*bytearray); } -QVariant* QVariant_new16(QBitArray* bitarray) { +QVariant* QVariant_new13(QBitArray* bitarray) { return new QVariant(*bitarray); } -QVariant* QVariant_new17(struct miqt_string* stringVal) { +QVariant* QVariant_new14(struct miqt_string* stringVal) { QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); return new QVariant(stringVal_QString); } -QVariant* QVariant_new18(struct miqt_array* /* of struct miqt_string* */ stringlist) { +QVariant* QVariant_new15(struct miqt_array* /* of struct miqt_string* */ stringlist) { QList stringlist_QList; stringlist_QList.reserve(stringlist->len); struct miqt_string** stringlist_arr = static_cast(stringlist->data); @@ -123,102 +106,106 @@ QVariant* QVariant_new18(struct miqt_array* /* of struct miqt_string* */ stringl return new QVariant(stringlist_QList); } -QVariant* QVariant_new19(QChar* qchar) { +QVariant* QVariant_new16(QChar* qchar) { return new QVariant(*qchar); } -QVariant* QVariant_new20(QDate* date) { +QVariant* QVariant_new17(QDate* date) { return new QVariant(*date); } -QVariant* QVariant_new21(QTime* time) { +QVariant* QVariant_new18(QTime* time) { return new QVariant(*time); } -QVariant* QVariant_new22(QDateTime* datetime) { +QVariant* QVariant_new19(QDateTime* datetime) { return new QVariant(*datetime); } -QVariant* QVariant_new23(QSize* size) { +QVariant* QVariant_new20(QSize* size) { return new QVariant(*size); } -QVariant* QVariant_new24(QSizeF* size) { +QVariant* QVariant_new21(QSizeF* size) { return new QVariant(*size); } -QVariant* QVariant_new25(QPoint* pt) { +QVariant* QVariant_new22(QPoint* pt) { return new QVariant(*pt); } -QVariant* QVariant_new26(QPointF* pt) { +QVariant* QVariant_new23(QPointF* pt) { return new QVariant(*pt); } -QVariant* QVariant_new27(QLine* line) { +QVariant* QVariant_new24(QLine* line) { return new QVariant(*line); } -QVariant* QVariant_new28(QLineF* line) { +QVariant* QVariant_new25(QLineF* line) { return new QVariant(*line); } -QVariant* QVariant_new29(QRect* rect) { +QVariant* QVariant_new26(QRect* rect) { return new QVariant(*rect); } -QVariant* QVariant_new30(QRectF* rect) { +QVariant* QVariant_new27(QRectF* rect) { return new QVariant(*rect); } -QVariant* QVariant_new31(QLocale* locale) { +QVariant* QVariant_new28(QLocale* locale) { return new QVariant(*locale); } -QVariant* QVariant_new32(QRegExp* regExp) { - return new QVariant(*regExp); -} - -QVariant* QVariant_new33(QRegularExpression* re) { +QVariant* QVariant_new29(QRegularExpression* re) { return new QVariant(*re); } -QVariant* QVariant_new34(QEasingCurve* easing) { +QVariant* QVariant_new30(QEasingCurve* easing) { return new QVariant(*easing); } -QVariant* QVariant_new35(QUuid* uuid) { +QVariant* QVariant_new31(QUuid* uuid) { return new QVariant(*uuid); } -QVariant* QVariant_new36(QUrl* url) { +QVariant* QVariant_new32(QUrl* url) { return new QVariant(*url); } -QVariant* QVariant_new37(QJsonValue* jsonValue) { +QVariant* QVariant_new33(QJsonValue* jsonValue) { return new QVariant(*jsonValue); } -QVariant* QVariant_new38(QJsonObject* jsonObject) { +QVariant* QVariant_new34(QJsonObject* jsonObject) { return new QVariant(*jsonObject); } -QVariant* QVariant_new39(QJsonArray* jsonArray) { +QVariant* QVariant_new35(QJsonArray* jsonArray) { return new QVariant(*jsonArray); } -QVariant* QVariant_new40(QJsonDocument* jsonDocument) { +QVariant* QVariant_new36(QJsonDocument* jsonDocument) { return new QVariant(*jsonDocument); } -QVariant* QVariant_new41(QModelIndex* modelIndex) { +QVariant* QVariant_new37(QModelIndex* modelIndex) { return new QVariant(*modelIndex); } -QVariant* QVariant_new42(QPersistentModelIndex* modelIndex) { +QVariant* QVariant_new38(QPersistentModelIndex* modelIndex) { return new QVariant(*modelIndex); } +QVariant* QVariant_new39(int typeVal) { + return new QVariant(static_cast(typeVal)); +} + +QVariant* QVariant_new40(QMetaType* typeVal, const void* copyVal) { + return new QVariant(*typeVal, copyVal); +} + void QVariant_OperatorAssign(QVariant* self, QVariant* other) { self->operator=(*other); } @@ -227,24 +214,39 @@ void QVariant_Swap(QVariant* self, QVariant* other) { self->swap(*other); } -int QVariant_Type(const QVariant* self) { - QVariant::Type _ret = self->type(); - return static_cast(_ret); -} - int QVariant_UserType(const QVariant* self) { return self->userType(); } +int QVariant_TypeId(const QVariant* self) { + return self->typeId(); +} + const char* QVariant_TypeName(const QVariant* self) { return (const char*) self->typeName(); } -bool QVariant_CanConvert(const QVariant* self, int targetTypeId) { +QMetaType* QVariant_MetaType(const QVariant* self) { + return new QMetaType(self->metaType()); +} + +bool QVariant_CanConvert(const QVariant* self, QMetaType* targetType) { + return self->canConvert(*targetType); +} + +bool QVariant_Convert(QVariant* self, QMetaType* typeVal) { + return self->convert(*typeVal); +} + +bool QVariant_CanView(const QVariant* self, QMetaType* targetType) { + return self->canView(*targetType); +} + +bool QVariant_CanConvertWithTargetTypeId(const QVariant* self, int targetTypeId) { return self->canConvert(static_cast(targetTypeId)); } -bool QVariant_Convert(QVariant* self, int targetTypeId) { +bool QVariant_ConvertWithTargetTypeId(QVariant* self, int targetTypeId) { return self->convert(static_cast(targetTypeId)); } @@ -387,10 +389,6 @@ QLocale* QVariant_ToLocale(const QVariant* self) { return new QLocale(self->toLocale()); } -QRegExp* QVariant_ToRegExp(const QVariant* self) { - return new QRegExp(self->toRegExp()); -} - QRegularExpression* QVariant_ToRegularExpression(const QVariant* self) { return new QRegularExpression(self->toRegularExpression()); } @@ -439,6 +437,11 @@ void QVariant_Save(const QVariant* self, QDataStream* ds) { self->save(*ds); } +int QVariant_Type(const QVariant* self) { + QVariant::Type _ret = self->type(); + return static_cast(_ret); +} + const char* QVariant_TypeToName(int typeId) { return (const char*) QVariant::typeToName(static_cast(typeId)); } @@ -460,28 +463,12 @@ const void* QVariant_Data2(const QVariant* self) { return (const void*) self->data(); } -bool QVariant_OperatorEqual(const QVariant* self, QVariant* v) { - return self->operator==(*v); +void QVariant_SetValue(QVariant* self, QVariant* avalue) { + self->setValue(*avalue); } -bool QVariant_OperatorNotEqual(const QVariant* self, QVariant* v) { - return self->operator!=(*v); -} - -bool QVariant_OperatorLesser(const QVariant* self, QVariant* v) { - return self->operator<(*v); -} - -bool QVariant_OperatorLesserOrEqual(const QVariant* self, QVariant* v) { - return self->operator<=(*v); -} - -bool QVariant_OperatorGreater(const QVariant* self, QVariant* v) { - return self->operator>(*v); -} - -bool QVariant_OperatorGreaterOrEqual(const QVariant* self, QVariant* v) { - return self->operator>=(*v); +QPartialOrdering* QVariant_Compare(QVariant* lhs, QVariant* rhs) { + return new QPartialOrdering(QVariant::compare(*lhs, *rhs)); } int QVariant_ToInt1(const QVariant* self, bool* ok) { @@ -520,227 +507,59 @@ void QVariant_Delete(QVariant* self) { delete self; } -QVariantComparisonHelper* QVariantComparisonHelper_new(QVariant* varVal) { - return new QVariantComparisonHelper(*varVal); +const void* QtPrivate__QVariantTypeCoercer_Convert(QtPrivate__QVariantTypeCoercer* self, QVariant* value, QMetaType* typeVal) { + return (const void*) self->convert(*value, *typeVal); } -QVariantComparisonHelper* QVariantComparisonHelper_new2(QVariantComparisonHelper* param1) { - return new QVariantComparisonHelper(*param1); +const void* QtPrivate__QVariantTypeCoercer_Coerce(QtPrivate__QVariantTypeCoercer* self, QVariant* value, QMetaType* typeVal) { + return (const void*) self->coerce(*value, *typeVal); } -void QVariantComparisonHelper_Delete(QVariantComparisonHelper* self) { +void QtPrivate__QVariantTypeCoercer_Delete(QtPrivate__QVariantTypeCoercer* self) { delete self; } -QSequentialIterable* QSequentialIterable_new(QtMetaTypePrivate__QSequentialIterableImpl* impl) { - return new QSequentialIterable(*impl); +QVariantConstPointer* QVariantConstPointer_new(QVariant* variant) { + return new QVariantConstPointer(*variant); } -QSequentialIterable* QSequentialIterable_new2(QSequentialIterable* param1) { - return new QSequentialIterable(*param1); +QVariantConstPointer* QVariantConstPointer_new2(QVariantConstPointer* param1) { + return new QVariantConstPointer(*param1); } -QSequentialIterable__const_iterator* QSequentialIterable_Begin(const QSequentialIterable* self) { - return new QSequentialIterable::const_iterator(self->begin()); +QVariant* QVariantConstPointer_OperatorMultiply(const QVariantConstPointer* self) { + return new QVariant(self->operator*()); } -QSequentialIterable__const_iterator* QSequentialIterable_End(const QSequentialIterable* self) { - return new QSequentialIterable::const_iterator(self->end()); +QVariant* QVariantConstPointer_OperatorMinusGreater(const QVariantConstPointer* self) { + return (QVariant*) self->operator->(); } -QVariant* QSequentialIterable_At(const QSequentialIterable* self, int idx) { - return new QVariant(self->at(static_cast(idx))); +void QVariantConstPointer_OperatorAssign(QVariantConstPointer* self, QVariantConstPointer* param1) { + self->operator=(*param1); } -int QSequentialIterable_Size(const QSequentialIterable* self) { - return self->size(); -} - -bool QSequentialIterable_CanReverseIterate(const QSequentialIterable* self) { - return self->canReverseIterate(); -} - -void QSequentialIterable_Delete(QSequentialIterable* self) { +void QVariantConstPointer_Delete(QVariantConstPointer* self) { delete self; } -QAssociativeIterable* QAssociativeIterable_new(QtMetaTypePrivate__QAssociativeIterableImpl* impl) { - return new QAssociativeIterable(*impl); +QVariant__PrivateShared* QVariant__PrivateShared_new(QVariant__PrivateShared* param1) { + return new QVariant::PrivateShared(*param1); } -QAssociativeIterable* QAssociativeIterable_new2(QAssociativeIterable* param1) { - return new QAssociativeIterable(*param1); +void QVariant__PrivateShared_Free(QVariant__PrivateShared* p) { + QVariant::PrivateShared::free(p); } -QAssociativeIterable__const_iterator* QAssociativeIterable_Begin(const QAssociativeIterable* self) { - return new QAssociativeIterable::const_iterator(self->begin()); +const void* QVariant__PrivateShared_Data(const QVariant__PrivateShared* self) { + return (const void*) self->data(); } -QAssociativeIterable__const_iterator* QAssociativeIterable_End(const QAssociativeIterable* self) { - return new QAssociativeIterable::const_iterator(self->end()); -} - -QAssociativeIterable__const_iterator* QAssociativeIterable_Find(const QAssociativeIterable* self, QVariant* key) { - return new QAssociativeIterable::const_iterator(self->find(*key)); -} - -QVariant* QAssociativeIterable_Value(const QAssociativeIterable* self, QVariant* key) { - return new QVariant(self->value(*key)); -} - -int QAssociativeIterable_Size(const QAssociativeIterable* self) { - return self->size(); -} - -void QAssociativeIterable_Delete(QAssociativeIterable* self) { - delete self; -} - -QVariant__PrivateShared* QVariant__PrivateShared_new(void* v) { - return new QVariant::PrivateShared(v); +void* QVariant__PrivateShared_Data2(QVariant__PrivateShared* self) { + return self->data(); } void QVariant__PrivateShared_Delete(QVariant__PrivateShared* self) { delete self; } -void QVariant__Handler_Delete(QVariant__Handler* self) { - delete self; -} - -QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_new(QSequentialIterable__const_iterator* other) { - 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*()); -} - -bool QSequentialIterable__const_iterator_OperatorEqual(const QSequentialIterable__const_iterator* self, QSequentialIterable__const_iterator* o) { - return self->operator==(*o); -} - -bool QSequentialIterable__const_iterator_OperatorNotEqual(const QSequentialIterable__const_iterator* self, QSequentialIterable__const_iterator* o) { - return self->operator!=(*o); -} - -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) { - 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))); -} - -QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_OperatorMinus(const QSequentialIterable__const_iterator* self, int j) { - return new QSequentialIterable::const_iterator(self->operator-(static_cast(j))); -} - -void QSequentialIterable__const_iterator_Delete(QSequentialIterable__const_iterator* self) { - delete self; -} - -QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_new(QAssociativeIterable__const_iterator* other) { - 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()); -} - -QVariant* QAssociativeIterable__const_iterator_Value(const QAssociativeIterable__const_iterator* self) { - return new QVariant(self->value()); -} - -QVariant* QAssociativeIterable__const_iterator_OperatorMultiply(const QAssociativeIterable__const_iterator* self) { - return new QVariant(self->operator*()); -} - -bool QAssociativeIterable__const_iterator_OperatorEqual(const QAssociativeIterable__const_iterator* self, QAssociativeIterable__const_iterator* o) { - return self->operator==(*o); -} - -bool QAssociativeIterable__const_iterator_OperatorNotEqual(const QAssociativeIterable__const_iterator* self, QAssociativeIterable__const_iterator* o) { - return self->operator!=(*o); -} - -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) { - 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))); -} - -QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_OperatorMinus(const QAssociativeIterable__const_iterator* self, int j) { - return new QAssociativeIterable::const_iterator(self->operator-(static_cast(j))); -} - -void QAssociativeIterable__const_iterator_Delete(QAssociativeIterable__const_iterator* self) { - delete self; -} - diff --git a/qt/gen_qvariant.go b/qt/gen_qvariant.go index d8cd584..e4be7ed 100644 --- a/qt/gen_qvariant.go +++ b/qt/gen_qvariant.go @@ -43,40 +43,38 @@ const ( QVariant__LineF QVariant__Type = 24 QVariant__Point QVariant__Type = 25 QVariant__PointF QVariant__Type = 26 - QVariant__RegExp QVariant__Type = 27 QVariant__RegularExpression QVariant__Type = 44 QVariant__Hash QVariant__Type = 28 QVariant__EasingCurve QVariant__Type = 29 QVariant__Uuid QVariant__Type = 30 QVariant__ModelIndex QVariant__Type = 42 QVariant__PersistentModelIndex QVariant__Type = 50 - QVariant__LastCoreType QVariant__Type = 55 - QVariant__Font QVariant__Type = 64 - QVariant__Pixmap QVariant__Type = 65 - QVariant__Brush QVariant__Type = 66 - QVariant__Color QVariant__Type = 67 - QVariant__Palette QVariant__Type = 68 - QVariant__Image QVariant__Type = 70 - QVariant__Polygon QVariant__Type = 71 - QVariant__Region QVariant__Type = 72 - QVariant__Bitmap QVariant__Type = 73 - QVariant__Cursor QVariant__Type = 74 - QVariant__KeySequence QVariant__Type = 75 - QVariant__Pen QVariant__Type = 76 - QVariant__TextLength QVariant__Type = 77 - QVariant__TextFormat QVariant__Type = 78 - QVariant__Matrix QVariant__Type = 79 - QVariant__Transform QVariant__Type = 80 - QVariant__Matrix4x4 QVariant__Type = 81 - QVariant__Vector2D QVariant__Type = 82 - QVariant__Vector3D QVariant__Type = 83 - QVariant__Vector4D QVariant__Type = 84 - QVariant__Quaternion QVariant__Type = 85 - QVariant__PolygonF QVariant__Type = 86 - QVariant__Icon QVariant__Type = 69 - QVariant__LastGuiType QVariant__Type = 87 - QVariant__SizePolicy QVariant__Type = 121 - QVariant__UserType QVariant__Type = 1024 + QVariant__LastCoreType QVariant__Type = 58 + QVariant__Font QVariant__Type = 4096 + QVariant__Pixmap QVariant__Type = 4097 + QVariant__Brush QVariant__Type = 4098 + QVariant__Color QVariant__Type = 4099 + QVariant__Palette QVariant__Type = 4100 + QVariant__Image QVariant__Type = 4102 + QVariant__Polygon QVariant__Type = 4103 + QVariant__Region QVariant__Type = 4104 + QVariant__Bitmap QVariant__Type = 4105 + QVariant__Cursor QVariant__Type = 4106 + QVariant__KeySequence QVariant__Type = 4107 + QVariant__Pen QVariant__Type = 4108 + QVariant__TextLength QVariant__Type = 4109 + QVariant__TextFormat QVariant__Type = 4110 + QVariant__Transform QVariant__Type = 4112 + QVariant__Matrix4x4 QVariant__Type = 4113 + QVariant__Vector2D QVariant__Type = 4114 + QVariant__Vector3D QVariant__Type = 4115 + QVariant__Vector4D QVariant__Type = 4116 + QVariant__Quaternion QVariant__Type = 4117 + QVariant__PolygonF QVariant__Type = 4118 + QVariant__Icon QVariant__Type = 4101 + QVariant__LastGuiType QVariant__Type = 4119 + QVariant__SizePolicy QVariant__Type = 8192 + QVariant__UserType QVariant__Type = 65536 QVariant__LastType QVariant__Type = 4294967295 ) @@ -109,107 +107,89 @@ func NewQVariant() *QVariant { } // NewQVariant2 constructs a new QVariant object. -func NewQVariant2(typeVal QVariant__Type) *QVariant { - ret := C.QVariant_new2((C.int)(typeVal)) +func NewQVariant2(typeVal QMetaType) *QVariant { + ret := C.QVariant_new2(typeVal.cPointer()) return newQVariant(ret) } // NewQVariant3 constructs a new QVariant object. -func NewQVariant3(typeId int, copyVal unsafe.Pointer) *QVariant { - ret := C.QVariant_new3((C.int)(typeId), copyVal) +func NewQVariant3(other *QVariant) *QVariant { + ret := C.QVariant_new3(other.cPointer()) return newQVariant(ret) } // NewQVariant4 constructs a new QVariant object. -func NewQVariant4(typeId int, copyVal unsafe.Pointer, flags uint) *QVariant { - ret := C.QVariant_new4((C.int)(typeId), copyVal, (C.uint)(flags)) +func NewQVariant4(i int) *QVariant { + ret := C.QVariant_new4((C.int)(i)) return newQVariant(ret) } // NewQVariant5 constructs a new QVariant object. -func NewQVariant5(other *QVariant) *QVariant { - ret := C.QVariant_new5(other.cPointer()) +func NewQVariant5(ui uint) *QVariant { + ret := C.QVariant_new5((C.uint)(ui)) return newQVariant(ret) } // NewQVariant6 constructs a new QVariant object. -func NewQVariant6(s *QDataStream) *QVariant { - ret := C.QVariant_new6(s.cPointer()) +func NewQVariant6(ll int64) *QVariant { + ret := C.QVariant_new6((C.longlong)(ll)) return newQVariant(ret) } // NewQVariant7 constructs a new QVariant object. -func NewQVariant7(i int) *QVariant { - ret := C.QVariant_new7((C.int)(i)) +func NewQVariant7(ull uint64) *QVariant { + ret := C.QVariant_new7((C.ulonglong)(ull)) return newQVariant(ret) } // NewQVariant8 constructs a new QVariant object. -func NewQVariant8(ui uint) *QVariant { - ret := C.QVariant_new8((C.uint)(ui)) +func NewQVariant8(b bool) *QVariant { + ret := C.QVariant_new8((C.bool)(b)) return newQVariant(ret) } // NewQVariant9 constructs a new QVariant object. -func NewQVariant9(ll int64) *QVariant { - ret := C.QVariant_new9((C.longlong)(ll)) +func NewQVariant9(d float64) *QVariant { + ret := C.QVariant_new9((C.double)(d)) return newQVariant(ret) } // NewQVariant10 constructs a new QVariant object. -func NewQVariant10(ull uint64) *QVariant { - ret := C.QVariant_new10((C.ulonglong)(ull)) +func NewQVariant10(f float32) *QVariant { + ret := C.QVariant_new10((C.float)(f)) return newQVariant(ret) } // NewQVariant11 constructs a new QVariant object. -func NewQVariant11(b bool) *QVariant { - ret := C.QVariant_new11((C.bool)(b)) +func NewQVariant11(str string) *QVariant { + str_Cstring := C.CString(str) + defer C.free(unsafe.Pointer(str_Cstring)) + ret := C.QVariant_new11(str_Cstring) return newQVariant(ret) } // NewQVariant12 constructs a new QVariant object. -func NewQVariant12(d float64) *QVariant { - ret := C.QVariant_new12((C.double)(d)) +func NewQVariant12(bytearray *QByteArray) *QVariant { + ret := C.QVariant_new12(bytearray.cPointer()) return newQVariant(ret) } // NewQVariant13 constructs a new QVariant object. -func NewQVariant13(f float32) *QVariant { - ret := C.QVariant_new13((C.float)(f)) +func NewQVariant13(bitarray *QBitArray) *QVariant { + ret := C.QVariant_new13(bitarray.cPointer()) return newQVariant(ret) } // NewQVariant14 constructs a new QVariant object. -func NewQVariant14(str string) *QVariant { - str_Cstring := C.CString(str) - defer C.free(unsafe.Pointer(str_Cstring)) - ret := C.QVariant_new14(str_Cstring) +func NewQVariant14(stringVal string) *QVariant { + stringVal_ms := miqt_strdupg(stringVal) + defer C.free(stringVal_ms) + ret := C.QVariant_new14((*C.struct_miqt_string)(stringVal_ms)) return newQVariant(ret) } // NewQVariant15 constructs a new QVariant object. -func NewQVariant15(bytearray *QByteArray) *QVariant { - ret := C.QVariant_new15(bytearray.cPointer()) - return newQVariant(ret) -} - -// NewQVariant16 constructs a new QVariant object. -func NewQVariant16(bitarray *QBitArray) *QVariant { - ret := C.QVariant_new16(bitarray.cPointer()) - return newQVariant(ret) -} - -// NewQVariant17 constructs a new QVariant object. -func NewQVariant17(stringVal string) *QVariant { - stringVal_ms := miqt_strdupg(stringVal) - defer C.free(stringVal_ms) - ret := C.QVariant_new17((*C.struct_miqt_string)(stringVal_ms)) - return newQVariant(ret) -} - -// NewQVariant18 constructs a new QVariant object. -func NewQVariant18(stringlist []string) *QVariant { +func NewQVariant15(stringlist []string) *QVariant { // For the C ABI, malloc a C array of raw pointers stringlist_CArray := (*[0xffff]*C.struct_miqt_string)(C.malloc(C.size_t(8 * len(stringlist)))) defer C.free(unsafe.Pointer(stringlist_CArray)) @@ -220,151 +200,157 @@ func NewQVariant18(stringlist []string) *QVariant { } stringlist_ma := &C.struct_miqt_array{len: C.size_t(len(stringlist)), data: unsafe.Pointer(stringlist_CArray)} defer runtime.KeepAlive(unsafe.Pointer(stringlist_ma)) - ret := C.QVariant_new18(stringlist_ma) + ret := C.QVariant_new15(stringlist_ma) + return newQVariant(ret) +} + +// NewQVariant16 constructs a new QVariant object. +func NewQVariant16(qchar QChar) *QVariant { + ret := C.QVariant_new16(qchar.cPointer()) + return newQVariant(ret) +} + +// NewQVariant17 constructs a new QVariant object. +func NewQVariant17(date QDate) *QVariant { + ret := C.QVariant_new17(date.cPointer()) + return newQVariant(ret) +} + +// NewQVariant18 constructs a new QVariant object. +func NewQVariant18(time QTime) *QVariant { + ret := C.QVariant_new18(time.cPointer()) return newQVariant(ret) } // NewQVariant19 constructs a new QVariant object. -func NewQVariant19(qchar QChar) *QVariant { - ret := C.QVariant_new19(qchar.cPointer()) +func NewQVariant19(datetime *QDateTime) *QVariant { + ret := C.QVariant_new19(datetime.cPointer()) return newQVariant(ret) } // NewQVariant20 constructs a new QVariant object. -func NewQVariant20(date *QDate) *QVariant { - ret := C.QVariant_new20(date.cPointer()) +func NewQVariant20(size *QSize) *QVariant { + ret := C.QVariant_new20(size.cPointer()) return newQVariant(ret) } // NewQVariant21 constructs a new QVariant object. -func NewQVariant21(time *QTime) *QVariant { - ret := C.QVariant_new21(time.cPointer()) +func NewQVariant21(size *QSizeF) *QVariant { + ret := C.QVariant_new21(size.cPointer()) return newQVariant(ret) } // NewQVariant22 constructs a new QVariant object. -func NewQVariant22(datetime *QDateTime) *QVariant { - ret := C.QVariant_new22(datetime.cPointer()) +func NewQVariant22(pt *QPoint) *QVariant { + ret := C.QVariant_new22(pt.cPointer()) return newQVariant(ret) } // NewQVariant23 constructs a new QVariant object. -func NewQVariant23(size *QSize) *QVariant { - ret := C.QVariant_new23(size.cPointer()) +func NewQVariant23(pt *QPointF) *QVariant { + ret := C.QVariant_new23(pt.cPointer()) return newQVariant(ret) } // NewQVariant24 constructs a new QVariant object. -func NewQVariant24(size *QSizeF) *QVariant { - ret := C.QVariant_new24(size.cPointer()) +func NewQVariant24(line *QLine) *QVariant { + ret := C.QVariant_new24(line.cPointer()) return newQVariant(ret) } // NewQVariant25 constructs a new QVariant object. -func NewQVariant25(pt *QPoint) *QVariant { - ret := C.QVariant_new25(pt.cPointer()) +func NewQVariant25(line *QLineF) *QVariant { + ret := C.QVariant_new25(line.cPointer()) return newQVariant(ret) } // NewQVariant26 constructs a new QVariant object. -func NewQVariant26(pt *QPointF) *QVariant { - ret := C.QVariant_new26(pt.cPointer()) +func NewQVariant26(rect *QRect) *QVariant { + ret := C.QVariant_new26(rect.cPointer()) return newQVariant(ret) } // NewQVariant27 constructs a new QVariant object. -func NewQVariant27(line *QLine) *QVariant { - ret := C.QVariant_new27(line.cPointer()) +func NewQVariant27(rect *QRectF) *QVariant { + ret := C.QVariant_new27(rect.cPointer()) return newQVariant(ret) } // NewQVariant28 constructs a new QVariant object. -func NewQVariant28(line *QLineF) *QVariant { - ret := C.QVariant_new28(line.cPointer()) +func NewQVariant28(locale *QLocale) *QVariant { + ret := C.QVariant_new28(locale.cPointer()) return newQVariant(ret) } // NewQVariant29 constructs a new QVariant object. -func NewQVariant29(rect *QRect) *QVariant { - ret := C.QVariant_new29(rect.cPointer()) +func NewQVariant29(re *QRegularExpression) *QVariant { + ret := C.QVariant_new29(re.cPointer()) return newQVariant(ret) } // NewQVariant30 constructs a new QVariant object. -func NewQVariant30(rect *QRectF) *QVariant { - ret := C.QVariant_new30(rect.cPointer()) +func NewQVariant30(easing *QEasingCurve) *QVariant { + ret := C.QVariant_new30(easing.cPointer()) return newQVariant(ret) } // NewQVariant31 constructs a new QVariant object. -func NewQVariant31(locale *QLocale) *QVariant { - ret := C.QVariant_new31(locale.cPointer()) +func NewQVariant31(uuid *QUuid) *QVariant { + ret := C.QVariant_new31(uuid.cPointer()) return newQVariant(ret) } // NewQVariant32 constructs a new QVariant object. -func NewQVariant32(regExp *QRegExp) *QVariant { - ret := C.QVariant_new32(regExp.cPointer()) +func NewQVariant32(url *QUrl) *QVariant { + ret := C.QVariant_new32(url.cPointer()) return newQVariant(ret) } // NewQVariant33 constructs a new QVariant object. -func NewQVariant33(re *QRegularExpression) *QVariant { - ret := C.QVariant_new33(re.cPointer()) +func NewQVariant33(jsonValue *QJsonValue) *QVariant { + ret := C.QVariant_new33(jsonValue.cPointer()) return newQVariant(ret) } // NewQVariant34 constructs a new QVariant object. -func NewQVariant34(easing *QEasingCurve) *QVariant { - ret := C.QVariant_new34(easing.cPointer()) +func NewQVariant34(jsonObject *QJsonObject) *QVariant { + ret := C.QVariant_new34(jsonObject.cPointer()) return newQVariant(ret) } // NewQVariant35 constructs a new QVariant object. -func NewQVariant35(uuid *QUuid) *QVariant { - ret := C.QVariant_new35(uuid.cPointer()) +func NewQVariant35(jsonArray *QJsonArray) *QVariant { + ret := C.QVariant_new35(jsonArray.cPointer()) return newQVariant(ret) } // NewQVariant36 constructs a new QVariant object. -func NewQVariant36(url *QUrl) *QVariant { - ret := C.QVariant_new36(url.cPointer()) +func NewQVariant36(jsonDocument *QJsonDocument) *QVariant { + ret := C.QVariant_new36(jsonDocument.cPointer()) return newQVariant(ret) } // NewQVariant37 constructs a new QVariant object. -func NewQVariant37(jsonValue *QJsonValue) *QVariant { - ret := C.QVariant_new37(jsonValue.cPointer()) +func NewQVariant37(modelIndex *QModelIndex) *QVariant { + ret := C.QVariant_new37(modelIndex.cPointer()) return newQVariant(ret) } // NewQVariant38 constructs a new QVariant object. -func NewQVariant38(jsonObject *QJsonObject) *QVariant { - ret := C.QVariant_new38(jsonObject.cPointer()) +func NewQVariant38(modelIndex *QPersistentModelIndex) *QVariant { + ret := C.QVariant_new38(modelIndex.cPointer()) return newQVariant(ret) } // NewQVariant39 constructs a new QVariant object. -func NewQVariant39(jsonArray *QJsonArray) *QVariant { - ret := C.QVariant_new39(jsonArray.cPointer()) +func NewQVariant39(typeVal QVariant__Type) *QVariant { + ret := C.QVariant_new39((C.int)(typeVal)) return newQVariant(ret) } // NewQVariant40 constructs a new QVariant object. -func NewQVariant40(jsonDocument *QJsonDocument) *QVariant { - ret := C.QVariant_new40(jsonDocument.cPointer()) - return newQVariant(ret) -} - -// NewQVariant41 constructs a new QVariant object. -func NewQVariant41(modelIndex *QModelIndex) *QVariant { - ret := C.QVariant_new41(modelIndex.cPointer()) - return newQVariant(ret) -} - -// NewQVariant42 constructs a new QVariant object. -func NewQVariant42(modelIndex *QPersistentModelIndex) *QVariant { - ret := C.QVariant_new42(modelIndex.cPointer()) +func NewQVariant40(typeVal QMetaType, copyVal unsafe.Pointer) *QVariant { + ret := C.QVariant_new40(typeVal.cPointer(), copyVal) return newQVariant(ret) } @@ -376,25 +362,44 @@ func (this *QVariant) Swap(other *QVariant) { C.QVariant_Swap(this.h, other.cPointer()) } -func (this *QVariant) Type() QVariant__Type { - return (QVariant__Type)(C.QVariant_Type(this.h)) -} - func (this *QVariant) UserType() int { return (int)(C.QVariant_UserType(this.h)) } +func (this *QVariant) TypeId() int { + return (int)(C.QVariant_TypeId(this.h)) +} + func (this *QVariant) TypeName() unsafe.Pointer { _ret := C.QVariant_TypeName(this.h) return (unsafe.Pointer)(_ret) } -func (this *QVariant) CanConvert(targetTypeId int) bool { - return (bool)(C.QVariant_CanConvert(this.h, (C.int)(targetTypeId))) +func (this *QVariant) MetaType() *QMetaType { + _ret := C.QVariant_MetaType(this.h) + _goptr := newQMetaType(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr } -func (this *QVariant) Convert(targetTypeId int) bool { - return (bool)(C.QVariant_Convert(this.h, (C.int)(targetTypeId))) +func (this *QVariant) CanConvert(targetType QMetaType) bool { + return (bool)(C.QVariant_CanConvert(this.h, targetType.cPointer())) +} + +func (this *QVariant) Convert(typeVal QMetaType) bool { + return (bool)(C.QVariant_Convert(this.h, typeVal.cPointer())) +} + +func (this *QVariant) CanView(targetType QMetaType) bool { + return (bool)(C.QVariant_CanView(this.h, targetType.cPointer())) +} + +func (this *QVariant) CanConvertWithTargetTypeId(targetTypeId int) bool { + return (bool)(C.QVariant_CanConvertWithTargetTypeId(this.h, (C.int)(targetTypeId))) +} + +func (this *QVariant) ConvertWithTargetTypeId(targetTypeId int) bool { + return (bool)(C.QVariant_ConvertWithTargetTypeId(this.h, (C.int)(targetTypeId))) } func (this *QVariant) IsValid() bool { @@ -575,13 +580,6 @@ func (this *QVariant) ToLocale() *QLocale { return _goptr } -func (this *QVariant) ToRegExp() *QRegExp { - _ret := C.QVariant_ToRegExp(this.h) - _goptr := newQRegExp(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - func (this *QVariant) ToRegularExpression() *QRegularExpression { _ret := C.QVariant_ToRegularExpression(this.h) _goptr := newQRegularExpression(_ret) @@ -660,6 +658,10 @@ func (this *QVariant) Save(ds *QDataStream) { C.QVariant_Save(this.h, ds.cPointer()) } +func (this *QVariant) Type() QVariant__Type { + return (QVariant__Type)(C.QVariant_Type(this.h)) +} + func QVariant_TypeToName(typeId int) unsafe.Pointer { _ret := C.QVariant_TypeToName((C.int)(typeId)) return (unsafe.Pointer)(_ret) @@ -683,28 +685,15 @@ func (this *QVariant) Data2() unsafe.Pointer { return C.QVariant_Data2(this.h) } -func (this *QVariant) OperatorEqual(v *QVariant) bool { - return (bool)(C.QVariant_OperatorEqual(this.h, v.cPointer())) +func (this *QVariant) SetValue(avalue *QVariant) { + C.QVariant_SetValue(this.h, avalue.cPointer()) } -func (this *QVariant) OperatorNotEqual(v *QVariant) bool { - return (bool)(C.QVariant_OperatorNotEqual(this.h, v.cPointer())) -} - -func (this *QVariant) OperatorLesser(v *QVariant) bool { - return (bool)(C.QVariant_OperatorLesser(this.h, v.cPointer())) -} - -func (this *QVariant) OperatorLesserOrEqual(v *QVariant) bool { - return (bool)(C.QVariant_OperatorLesserOrEqual(this.h, v.cPointer())) -} - -func (this *QVariant) OperatorGreater(v *QVariant) bool { - return (bool)(C.QVariant_OperatorGreater(this.h, v.cPointer())) -} - -func (this *QVariant) OperatorGreaterOrEqual(v *QVariant) bool { - return (bool)(C.QVariant_OperatorGreaterOrEqual(this.h, v.cPointer())) +func QVariant_Compare(lhs *QVariant, rhs *QVariant) *QPartialOrdering { + _ret := C.QVariant_Compare(lhs.cPointer(), rhs.cPointer()) + _goptr := newQPartialOrdering(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr } func (this *QVariant) ToInt1(ok *bool) int { @@ -749,206 +738,108 @@ func (this *QVariant) GoGC() { }) } -type QVariantComparisonHelper struct { - h *C.QVariantComparisonHelper +type QtPrivate__QVariantTypeCoercer struct { + h *C.QtPrivate__QVariantTypeCoercer } -func (this *QVariantComparisonHelper) cPointer() *C.QVariantComparisonHelper { +func (this *QtPrivate__QVariantTypeCoercer) cPointer() *C.QtPrivate__QVariantTypeCoercer { if this == nil { return nil } return this.h } -func newQVariantComparisonHelper(h *C.QVariantComparisonHelper) *QVariantComparisonHelper { +func newQtPrivate__QVariantTypeCoercer(h *C.QtPrivate__QVariantTypeCoercer) *QtPrivate__QVariantTypeCoercer { if h == nil { return nil } - return &QVariantComparisonHelper{h: h} + return &QtPrivate__QVariantTypeCoercer{h: h} } -func newQVariantComparisonHelper_U(h unsafe.Pointer) *QVariantComparisonHelper { - return newQVariantComparisonHelper((*C.QVariantComparisonHelper)(h)) +func newQtPrivate__QVariantTypeCoercer_U(h unsafe.Pointer) *QtPrivate__QVariantTypeCoercer { + return newQtPrivate__QVariantTypeCoercer((*C.QtPrivate__QVariantTypeCoercer)(h)) } -// NewQVariantComparisonHelper constructs a new QVariantComparisonHelper object. -func NewQVariantComparisonHelper(varVal *QVariant) *QVariantComparisonHelper { - ret := C.QVariantComparisonHelper_new(varVal.cPointer()) - return newQVariantComparisonHelper(ret) +func (this *QtPrivate__QVariantTypeCoercer) Convert(value *QVariant, typeVal *QMetaType) unsafe.Pointer { + return C.QtPrivate__QVariantTypeCoercer_Convert(this.h, value.cPointer(), typeVal.cPointer()) } -// NewQVariantComparisonHelper2 constructs a new QVariantComparisonHelper object. -func NewQVariantComparisonHelper2(param1 *QVariantComparisonHelper) *QVariantComparisonHelper { - ret := C.QVariantComparisonHelper_new2(param1.cPointer()) - return newQVariantComparisonHelper(ret) +func (this *QtPrivate__QVariantTypeCoercer) Coerce(value *QVariant, typeVal *QMetaType) unsafe.Pointer { + return C.QtPrivate__QVariantTypeCoercer_Coerce(this.h, value.cPointer(), typeVal.cPointer()) } // Delete this object from C++ memory. -func (this *QVariantComparisonHelper) Delete() { - C.QVariantComparisonHelper_Delete(this.h) +func (this *QtPrivate__QVariantTypeCoercer) Delete() { + C.QtPrivate__QVariantTypeCoercer_Delete(this.h) } // GoGC adds a Go Finalizer to this pointer, so that it will be deleted // from C++ memory once it is unreachable from Go memory. -func (this *QVariantComparisonHelper) GoGC() { - runtime.SetFinalizer(this, func(this *QVariantComparisonHelper) { +func (this *QtPrivate__QVariantTypeCoercer) GoGC() { + runtime.SetFinalizer(this, func(this *QtPrivate__QVariantTypeCoercer) { this.Delete() runtime.KeepAlive(this.h) }) } -type QSequentialIterable struct { - h *C.QSequentialIterable +type QVariantConstPointer struct { + h *C.QVariantConstPointer } -func (this *QSequentialIterable) cPointer() *C.QSequentialIterable { +func (this *QVariantConstPointer) cPointer() *C.QVariantConstPointer { if this == nil { return nil } return this.h } -func newQSequentialIterable(h *C.QSequentialIterable) *QSequentialIterable { +func newQVariantConstPointer(h *C.QVariantConstPointer) *QVariantConstPointer { if h == nil { return nil } - return &QSequentialIterable{h: h} + return &QVariantConstPointer{h: h} } -func newQSequentialIterable_U(h unsafe.Pointer) *QSequentialIterable { - return newQSequentialIterable((*C.QSequentialIterable)(h)) +func newQVariantConstPointer_U(h unsafe.Pointer) *QVariantConstPointer { + return newQVariantConstPointer((*C.QVariantConstPointer)(h)) } -// NewQSequentialIterable constructs a new QSequentialIterable object. -func NewQSequentialIterable(impl QtMetaTypePrivate__QSequentialIterableImpl) *QSequentialIterable { - ret := C.QSequentialIterable_new(impl.cPointer()) - return newQSequentialIterable(ret) +// NewQVariantConstPointer constructs a new QVariantConstPointer object. +func NewQVariantConstPointer(variant QVariant) *QVariantConstPointer { + ret := C.QVariantConstPointer_new(variant.cPointer()) + return newQVariantConstPointer(ret) } -// NewQSequentialIterable2 constructs a new QSequentialIterable object. -func NewQSequentialIterable2(param1 *QSequentialIterable) *QSequentialIterable { - ret := C.QSequentialIterable_new2(param1.cPointer()) - return newQSequentialIterable(ret) +// NewQVariantConstPointer2 constructs a new QVariantConstPointer object. +func NewQVariantConstPointer2(param1 *QVariantConstPointer) *QVariantConstPointer { + ret := C.QVariantConstPointer_new2(param1.cPointer()) + return newQVariantConstPointer(ret) } -func (this *QSequentialIterable) Begin() *QSequentialIterable__const_iterator { - _ret := C.QSequentialIterable_Begin(this.h) - _goptr := newQSequentialIterable__const_iterator(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QSequentialIterable) End() *QSequentialIterable__const_iterator { - _ret := C.QSequentialIterable_End(this.h) - _goptr := newQSequentialIterable__const_iterator(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QSequentialIterable) At(idx int) *QVariant { - _ret := C.QSequentialIterable_At(this.h, (C.int)(idx)) +func (this *QVariantConstPointer) OperatorMultiply() *QVariant { + _ret := C.QVariantConstPointer_OperatorMultiply(this.h) _goptr := newQVariant(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QSequentialIterable) Size() int { - return (int)(C.QSequentialIterable_Size(this.h)) +func (this *QVariantConstPointer) OperatorMinusGreater() *QVariant { + return newQVariant_U(unsafe.Pointer(C.QVariantConstPointer_OperatorMinusGreater(this.h))) } -func (this *QSequentialIterable) CanReverseIterate() bool { - return (bool)(C.QSequentialIterable_CanReverseIterate(this.h)) +func (this *QVariantConstPointer) OperatorAssign(param1 *QVariantConstPointer) { + C.QVariantConstPointer_OperatorAssign(this.h, param1.cPointer()) } // Delete this object from C++ memory. -func (this *QSequentialIterable) Delete() { - C.QSequentialIterable_Delete(this.h) +func (this *QVariantConstPointer) Delete() { + C.QVariantConstPointer_Delete(this.h) } // GoGC adds a Go Finalizer to this pointer, so that it will be deleted // from C++ memory once it is unreachable from Go memory. -func (this *QSequentialIterable) GoGC() { - runtime.SetFinalizer(this, func(this *QSequentialIterable) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} - -type QAssociativeIterable struct { - h *C.QAssociativeIterable -} - -func (this *QAssociativeIterable) cPointer() *C.QAssociativeIterable { - if this == nil { - return nil - } - return this.h -} - -func newQAssociativeIterable(h *C.QAssociativeIterable) *QAssociativeIterable { - if h == nil { - return nil - } - return &QAssociativeIterable{h: h} -} - -func newQAssociativeIterable_U(h unsafe.Pointer) *QAssociativeIterable { - return newQAssociativeIterable((*C.QAssociativeIterable)(h)) -} - -// NewQAssociativeIterable constructs a new QAssociativeIterable object. -func NewQAssociativeIterable(impl QtMetaTypePrivate__QAssociativeIterableImpl) *QAssociativeIterable { - ret := C.QAssociativeIterable_new(impl.cPointer()) - return newQAssociativeIterable(ret) -} - -// NewQAssociativeIterable2 constructs a new QAssociativeIterable object. -func NewQAssociativeIterable2(param1 *QAssociativeIterable) *QAssociativeIterable { - ret := C.QAssociativeIterable_new2(param1.cPointer()) - return newQAssociativeIterable(ret) -} - -func (this *QAssociativeIterable) Begin() *QAssociativeIterable__const_iterator { - _ret := C.QAssociativeIterable_Begin(this.h) - _goptr := newQAssociativeIterable__const_iterator(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QAssociativeIterable) End() *QAssociativeIterable__const_iterator { - _ret := C.QAssociativeIterable_End(this.h) - _goptr := newQAssociativeIterable__const_iterator(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QAssociativeIterable) Find(key *QVariant) *QAssociativeIterable__const_iterator { - _ret := C.QAssociativeIterable_Find(this.h, key.cPointer()) - _goptr := newQAssociativeIterable__const_iterator(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QAssociativeIterable) Value(key *QVariant) *QVariant { - _ret := C.QAssociativeIterable_Value(this.h, key.cPointer()) - _goptr := newQVariant(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QAssociativeIterable) Size() int { - return (int)(C.QAssociativeIterable_Size(this.h)) -} - -// Delete this object from C++ memory. -func (this *QAssociativeIterable) Delete() { - C.QAssociativeIterable_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QAssociativeIterable) GoGC() { - runtime.SetFinalizer(this, func(this *QAssociativeIterable) { +func (this *QVariantConstPointer) GoGC() { + runtime.SetFinalizer(this, func(this *QVariantConstPointer) { this.Delete() runtime.KeepAlive(this.h) }) @@ -977,11 +868,23 @@ func newQVariant__PrivateShared_U(h unsafe.Pointer) *QVariant__PrivateShared { } // NewQVariant__PrivateShared constructs a new QVariant::PrivateShared object. -func NewQVariant__PrivateShared(v unsafe.Pointer) *QVariant__PrivateShared { - ret := C.QVariant__PrivateShared_new(v) +func NewQVariant__PrivateShared(param1 *QVariant__PrivateShared) *QVariant__PrivateShared { + ret := C.QVariant__PrivateShared_new(param1.cPointer()) return newQVariant__PrivateShared(ret) } +func QVariant__PrivateShared_Free(p *QVariant__PrivateShared) { + C.QVariant__PrivateShared_Free(p.cPointer()) +} + +func (this *QVariant__PrivateShared) Data() unsafe.Pointer { + return C.QVariant__PrivateShared_Data(this.h) +} + +func (this *QVariant__PrivateShared) Data2() unsafe.Pointer { + return C.QVariant__PrivateShared_Data2(this.h) +} + // Delete this object from C++ memory. func (this *QVariant__PrivateShared) Delete() { C.QVariant__PrivateShared_Delete(this.h) @@ -995,263 +898,3 @@ func (this *QVariant__PrivateShared) GoGC() { runtime.KeepAlive(this.h) }) } - -type QVariant__Handler struct { - h *C.QVariant__Handler -} - -func (this *QVariant__Handler) cPointer() *C.QVariant__Handler { - if this == nil { - return nil - } - return this.h -} - -func newQVariant__Handler(h *C.QVariant__Handler) *QVariant__Handler { - if h == nil { - return nil - } - return &QVariant__Handler{h: h} -} - -func newQVariant__Handler_U(h unsafe.Pointer) *QVariant__Handler { - return newQVariant__Handler((*C.QVariant__Handler)(h)) -} - -// Delete this object from C++ memory. -func (this *QVariant__Handler) Delete() { - C.QVariant__Handler_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QVariant__Handler) GoGC() { - runtime.SetFinalizer(this, func(this *QVariant__Handler) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} - -type QSequentialIterable__const_iterator struct { - h *C.QSequentialIterable__const_iterator -} - -func (this *QSequentialIterable__const_iterator) cPointer() *C.QSequentialIterable__const_iterator { - if this == nil { - return nil - } - return this.h -} - -func newQSequentialIterable__const_iterator(h *C.QSequentialIterable__const_iterator) *QSequentialIterable__const_iterator { - if h == nil { - return nil - } - return &QSequentialIterable__const_iterator{h: h} -} - -func newQSequentialIterable__const_iterator_U(h unsafe.Pointer) *QSequentialIterable__const_iterator { - return newQSequentialIterable__const_iterator((*C.QSequentialIterable__const_iterator)(h)) -} - -// NewQSequentialIterable__const_iterator constructs a new QSequentialIterable::const_iterator object. -func NewQSequentialIterable__const_iterator(other *QSequentialIterable__const_iterator) *QSequentialIterable__const_iterator { - ret := C.QSequentialIterable__const_iterator_new(other.cPointer()) - 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) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QSequentialIterable__const_iterator) OperatorEqual(o *QSequentialIterable__const_iterator) bool { - return (bool)(C.QSequentialIterable__const_iterator_OperatorEqual(this.h, o.cPointer())) -} - -func (this *QSequentialIterable__const_iterator) OperatorNotEqual(o *QSequentialIterable__const_iterator) bool { - return (bool)(C.QSequentialIterable__const_iterator_OperatorNotEqual(this.h, o.cPointer())) -} - -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() *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) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QSequentialIterable__const_iterator) OperatorMinus(j int) *QSequentialIterable__const_iterator { - _ret := C.QSequentialIterable__const_iterator_OperatorMinus(this.h, (C.int)(j)) - _goptr := newQSequentialIterable__const_iterator(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -// Delete this object from C++ memory. -func (this *QSequentialIterable__const_iterator) Delete() { - C.QSequentialIterable__const_iterator_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QSequentialIterable__const_iterator) GoGC() { - runtime.SetFinalizer(this, func(this *QSequentialIterable__const_iterator) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} - -type QAssociativeIterable__const_iterator struct { - h *C.QAssociativeIterable__const_iterator -} - -func (this *QAssociativeIterable__const_iterator) cPointer() *C.QAssociativeIterable__const_iterator { - if this == nil { - return nil - } - return this.h -} - -func newQAssociativeIterable__const_iterator(h *C.QAssociativeIterable__const_iterator) *QAssociativeIterable__const_iterator { - if h == nil { - return nil - } - return &QAssociativeIterable__const_iterator{h: h} -} - -func newQAssociativeIterable__const_iterator_U(h unsafe.Pointer) *QAssociativeIterable__const_iterator { - return newQAssociativeIterable__const_iterator((*C.QAssociativeIterable__const_iterator)(h)) -} - -// NewQAssociativeIterable__const_iterator constructs a new QAssociativeIterable::const_iterator object. -func NewQAssociativeIterable__const_iterator(other *QAssociativeIterable__const_iterator) *QAssociativeIterable__const_iterator { - ret := C.QAssociativeIterable__const_iterator_new(other.cPointer()) - 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) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QAssociativeIterable__const_iterator) Value() *QVariant { - _ret := C.QAssociativeIterable__const_iterator_Value(this.h) - _goptr := newQVariant(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QAssociativeIterable__const_iterator) OperatorMultiply() *QVariant { - _ret := C.QAssociativeIterable__const_iterator_OperatorMultiply(this.h) - _goptr := newQVariant(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QAssociativeIterable__const_iterator) OperatorEqual(o *QAssociativeIterable__const_iterator) bool { - return (bool)(C.QAssociativeIterable__const_iterator_OperatorEqual(this.h, o.cPointer())) -} - -func (this *QAssociativeIterable__const_iterator) OperatorNotEqual(o *QAssociativeIterable__const_iterator) bool { - return (bool)(C.QAssociativeIterable__const_iterator_OperatorNotEqual(this.h, o.cPointer())) -} - -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() *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) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QAssociativeIterable__const_iterator) OperatorMinus(j int) *QAssociativeIterable__const_iterator { - _ret := C.QAssociativeIterable__const_iterator_OperatorMinus(this.h, (C.int)(j)) - _goptr := newQAssociativeIterable__const_iterator(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -// Delete this object from C++ memory. -func (this *QAssociativeIterable__const_iterator) Delete() { - C.QAssociativeIterable__const_iterator_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QAssociativeIterable__const_iterator) GoGC() { - runtime.SetFinalizer(this, func(this *QAssociativeIterable__const_iterator) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} diff --git a/qt/gen_qvariant.h b/qt/gen_qvariant.h index d18787b..cb88f7e 100644 --- a/qt/gen_qvariant.h +++ b/qt/gen_qvariant.h @@ -14,12 +14,6 @@ extern "C" { #endif #ifdef __cplusplus -class QAssociativeIterable; -#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QAssociativeIterable__const_iterator) -typedef QAssociativeIterable::const_iterator QAssociativeIterable__const_iterator; -#else -class QAssociativeIterable__const_iterator; -#endif class QBitArray; class QByteArray; class QChar; @@ -34,50 +28,33 @@ class QJsonValue; class QLine; class QLineF; class QLocale; +class QMetaType; class QModelIndex; +class QPartialOrdering; class QPersistentModelIndex; class QPoint; class QPointF; class QRect; class QRectF; -class QRegExp; class QRegularExpression; -class QSequentialIterable; -#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QSequentialIterable__const_iterator) -typedef QSequentialIterable::const_iterator QSequentialIterable__const_iterator; -#else -class QSequentialIterable__const_iterator; -#endif class QSize; class QSizeF; class QTime; class QUrl; class QUuid; class QVariant; -#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QVariant__Handler) -typedef QVariant::Handler QVariant__Handler; -#else -class QVariant__Handler; -#endif #if defined(WORKAROUND_INNER_CLASS_DEFINITION_QVariant__PrivateShared) typedef QVariant::PrivateShared QVariant__PrivateShared; #else class QVariant__PrivateShared; #endif -class QVariantComparisonHelper; -#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QtMetaTypePrivate__QAssociativeIterableImpl) -typedef QtMetaTypePrivate::QAssociativeIterableImpl QtMetaTypePrivate__QAssociativeIterableImpl; +class QVariantConstPointer; +#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__QVariantTypeCoercer) +typedef QtPrivate::QVariantTypeCoercer QtPrivate__QVariantTypeCoercer; #else -class QtMetaTypePrivate__QAssociativeIterableImpl; -#endif -#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QtMetaTypePrivate__QSequentialIterableImpl) -typedef QtMetaTypePrivate::QSequentialIterableImpl QtMetaTypePrivate__QSequentialIterableImpl; -#else -class QtMetaTypePrivate__QSequentialIterableImpl; +class QtPrivate__QVariantTypeCoercer; #endif #else -typedef struct QAssociativeIterable QAssociativeIterable; -typedef struct QAssociativeIterable__const_iterator QAssociativeIterable__const_iterator; typedef struct QBitArray QBitArray; typedef struct QByteArray QByteArray; typedef struct QChar QChar; @@ -92,78 +69,77 @@ typedef struct QJsonValue QJsonValue; typedef struct QLine QLine; typedef struct QLineF QLineF; typedef struct QLocale QLocale; +typedef struct QMetaType QMetaType; typedef struct QModelIndex QModelIndex; +typedef struct QPartialOrdering QPartialOrdering; typedef struct QPersistentModelIndex QPersistentModelIndex; typedef struct QPoint QPoint; typedef struct QPointF QPointF; typedef struct QRect QRect; typedef struct QRectF QRectF; -typedef struct QRegExp QRegExp; typedef struct QRegularExpression QRegularExpression; -typedef struct QSequentialIterable QSequentialIterable; -typedef struct QSequentialIterable__const_iterator QSequentialIterable__const_iterator; typedef struct QSize QSize; typedef struct QSizeF QSizeF; typedef struct QTime QTime; typedef struct QUrl QUrl; typedef struct QUuid QUuid; typedef struct QVariant QVariant; -typedef struct QVariant__Handler QVariant__Handler; typedef struct QVariant__PrivateShared QVariant__PrivateShared; -typedef struct QVariantComparisonHelper QVariantComparisonHelper; -typedef struct QtMetaTypePrivate__QAssociativeIterableImpl QtMetaTypePrivate__QAssociativeIterableImpl; -typedef struct QtMetaTypePrivate__QSequentialIterableImpl QtMetaTypePrivate__QSequentialIterableImpl; +typedef struct QVariantConstPointer QVariantConstPointer; +typedef struct QtPrivate__QVariantTypeCoercer QtPrivate__QVariantTypeCoercer; #endif QVariant* QVariant_new(); -QVariant* QVariant_new2(int typeVal); -QVariant* QVariant_new3(int typeId, const void* copyVal); -QVariant* QVariant_new4(int typeId, const void* copyVal, unsigned int flags); -QVariant* QVariant_new5(QVariant* other); -QVariant* QVariant_new6(QDataStream* s); -QVariant* QVariant_new7(int i); -QVariant* QVariant_new8(unsigned int ui); -QVariant* QVariant_new9(long long ll); -QVariant* QVariant_new10(unsigned long long ull); -QVariant* QVariant_new11(bool b); -QVariant* QVariant_new12(double d); -QVariant* QVariant_new13(float f); -QVariant* QVariant_new14(const char* str); -QVariant* QVariant_new15(QByteArray* bytearray); -QVariant* QVariant_new16(QBitArray* bitarray); -QVariant* QVariant_new17(struct miqt_string* stringVal); -QVariant* QVariant_new18(struct miqt_array* /* of struct miqt_string* */ stringlist); -QVariant* QVariant_new19(QChar* qchar); -QVariant* QVariant_new20(QDate* date); -QVariant* QVariant_new21(QTime* time); -QVariant* QVariant_new22(QDateTime* datetime); -QVariant* QVariant_new23(QSize* size); -QVariant* QVariant_new24(QSizeF* size); -QVariant* QVariant_new25(QPoint* pt); -QVariant* QVariant_new26(QPointF* pt); -QVariant* QVariant_new27(QLine* line); -QVariant* QVariant_new28(QLineF* line); -QVariant* QVariant_new29(QRect* rect); -QVariant* QVariant_new30(QRectF* rect); -QVariant* QVariant_new31(QLocale* locale); -QVariant* QVariant_new32(QRegExp* regExp); -QVariant* QVariant_new33(QRegularExpression* re); -QVariant* QVariant_new34(QEasingCurve* easing); -QVariant* QVariant_new35(QUuid* uuid); -QVariant* QVariant_new36(QUrl* url); -QVariant* QVariant_new37(QJsonValue* jsonValue); -QVariant* QVariant_new38(QJsonObject* jsonObject); -QVariant* QVariant_new39(QJsonArray* jsonArray); -QVariant* QVariant_new40(QJsonDocument* jsonDocument); -QVariant* QVariant_new41(QModelIndex* modelIndex); -QVariant* QVariant_new42(QPersistentModelIndex* modelIndex); +QVariant* QVariant_new2(QMetaType* typeVal); +QVariant* QVariant_new3(QVariant* other); +QVariant* QVariant_new4(int i); +QVariant* QVariant_new5(unsigned int ui); +QVariant* QVariant_new6(long long ll); +QVariant* QVariant_new7(unsigned long long ull); +QVariant* QVariant_new8(bool b); +QVariant* QVariant_new9(double d); +QVariant* QVariant_new10(float f); +QVariant* QVariant_new11(const char* str); +QVariant* QVariant_new12(QByteArray* bytearray); +QVariant* QVariant_new13(QBitArray* bitarray); +QVariant* QVariant_new14(struct miqt_string* stringVal); +QVariant* QVariant_new15(struct miqt_array* /* of struct miqt_string* */ stringlist); +QVariant* QVariant_new16(QChar* qchar); +QVariant* QVariant_new17(QDate* date); +QVariant* QVariant_new18(QTime* time); +QVariant* QVariant_new19(QDateTime* datetime); +QVariant* QVariant_new20(QSize* size); +QVariant* QVariant_new21(QSizeF* size); +QVariant* QVariant_new22(QPoint* pt); +QVariant* QVariant_new23(QPointF* pt); +QVariant* QVariant_new24(QLine* line); +QVariant* QVariant_new25(QLineF* line); +QVariant* QVariant_new26(QRect* rect); +QVariant* QVariant_new27(QRectF* rect); +QVariant* QVariant_new28(QLocale* locale); +QVariant* QVariant_new29(QRegularExpression* re); +QVariant* QVariant_new30(QEasingCurve* easing); +QVariant* QVariant_new31(QUuid* uuid); +QVariant* QVariant_new32(QUrl* url); +QVariant* QVariant_new33(QJsonValue* jsonValue); +QVariant* QVariant_new34(QJsonObject* jsonObject); +QVariant* QVariant_new35(QJsonArray* jsonArray); +QVariant* QVariant_new36(QJsonDocument* jsonDocument); +QVariant* QVariant_new37(QModelIndex* modelIndex); +QVariant* QVariant_new38(QPersistentModelIndex* modelIndex); +QVariant* QVariant_new39(int typeVal); +QVariant* QVariant_new40(QMetaType* typeVal, const void* copyVal); void QVariant_OperatorAssign(QVariant* self, QVariant* other); void QVariant_Swap(QVariant* self, QVariant* other); -int QVariant_Type(const QVariant* self); int QVariant_UserType(const QVariant* self); +int QVariant_TypeId(const QVariant* self); const char* QVariant_TypeName(const QVariant* self); -bool QVariant_CanConvert(const QVariant* self, int targetTypeId); -bool QVariant_Convert(QVariant* self, int targetTypeId); +QMetaType* QVariant_MetaType(const QVariant* self); +bool QVariant_CanConvert(const QVariant* self, QMetaType* targetType); +bool QVariant_Convert(QVariant* self, QMetaType* typeVal); +bool QVariant_CanView(const QVariant* self, QMetaType* targetType); +bool QVariant_CanConvertWithTargetTypeId(const QVariant* self, int targetTypeId); +bool QVariant_ConvertWithTargetTypeId(QVariant* self, int targetTypeId); bool QVariant_IsValid(const QVariant* self); bool QVariant_IsNull(const QVariant* self); void QVariant_Clear(QVariant* self); @@ -194,7 +170,6 @@ QLine* QVariant_ToLine(const QVariant* self); QLineF* QVariant_ToLineF(const QVariant* self); QRectF* QVariant_ToRectF(const QVariant* self); QLocale* QVariant_ToLocale(const QVariant* self); -QRegExp* QVariant_ToRegExp(const QVariant* self); QRegularExpression* QVariant_ToRegularExpression(const QVariant* self); QEasingCurve* QVariant_ToEasingCurve(const QVariant* self); QUuid* QVariant_ToUuid(const QVariant* self); @@ -207,17 +182,14 @@ QModelIndex* QVariant_ToModelIndex(const QVariant* self); QPersistentModelIndex* QVariant_ToPersistentModelIndex(const QVariant* self); void QVariant_Load(QVariant* self, QDataStream* ds); void QVariant_Save(const QVariant* self, QDataStream* ds); +int QVariant_Type(const QVariant* self); const char* QVariant_TypeToName(int typeId); int QVariant_NameToType(const char* name); void* QVariant_Data(QVariant* self); const void* QVariant_ConstData(const QVariant* self); const void* QVariant_Data2(const QVariant* self); -bool QVariant_OperatorEqual(const QVariant* self, QVariant* v); -bool QVariant_OperatorNotEqual(const QVariant* self, QVariant* v); -bool QVariant_OperatorLesser(const QVariant* self, QVariant* v); -bool QVariant_OperatorLesserOrEqual(const QVariant* self, QVariant* v); -bool QVariant_OperatorGreater(const QVariant* self, QVariant* v); -bool QVariant_OperatorGreaterOrEqual(const QVariant* self, QVariant* v); +void QVariant_SetValue(QVariant* self, QVariant* avalue); +QPartialOrdering* QVariant_Compare(QVariant* lhs, QVariant* rhs); int QVariant_ToInt1(const QVariant* self, bool* ok); unsigned int QVariant_ToUInt1(const QVariant* self, bool* ok); long long QVariant_ToLongLong1(const QVariant* self, bool* ok); @@ -227,65 +199,23 @@ float QVariant_ToFloat1(const QVariant* self, bool* ok); double QVariant_ToReal1(const QVariant* self, bool* ok); void QVariant_Delete(QVariant* self); -QVariantComparisonHelper* QVariantComparisonHelper_new(QVariant* varVal); -QVariantComparisonHelper* QVariantComparisonHelper_new2(QVariantComparisonHelper* param1); -void QVariantComparisonHelper_Delete(QVariantComparisonHelper* self); +const void* QtPrivate__QVariantTypeCoercer_Convert(QtPrivate__QVariantTypeCoercer* self, QVariant* value, QMetaType* typeVal); +const void* QtPrivate__QVariantTypeCoercer_Coerce(QtPrivate__QVariantTypeCoercer* self, QVariant* value, QMetaType* typeVal); +void QtPrivate__QVariantTypeCoercer_Delete(QtPrivate__QVariantTypeCoercer* self); -QSequentialIterable* QSequentialIterable_new(QtMetaTypePrivate__QSequentialIterableImpl* impl); -QSequentialIterable* QSequentialIterable_new2(QSequentialIterable* param1); -QSequentialIterable__const_iterator* QSequentialIterable_Begin(const QSequentialIterable* self); -QSequentialIterable__const_iterator* QSequentialIterable_End(const QSequentialIterable* self); -QVariant* QSequentialIterable_At(const QSequentialIterable* self, int idx); -int QSequentialIterable_Size(const QSequentialIterable* self); -bool QSequentialIterable_CanReverseIterate(const QSequentialIterable* self); -void QSequentialIterable_Delete(QSequentialIterable* self); +QVariantConstPointer* QVariantConstPointer_new(QVariant* variant); +QVariantConstPointer* QVariantConstPointer_new2(QVariantConstPointer* param1); +QVariant* QVariantConstPointer_OperatorMultiply(const QVariantConstPointer* self); +QVariant* QVariantConstPointer_OperatorMinusGreater(const QVariantConstPointer* self); +void QVariantConstPointer_OperatorAssign(QVariantConstPointer* self, QVariantConstPointer* param1); +void QVariantConstPointer_Delete(QVariantConstPointer* self); -QAssociativeIterable* QAssociativeIterable_new(QtMetaTypePrivate__QAssociativeIterableImpl* impl); -QAssociativeIterable* QAssociativeIterable_new2(QAssociativeIterable* param1); -QAssociativeIterable__const_iterator* QAssociativeIterable_Begin(const QAssociativeIterable* self); -QAssociativeIterable__const_iterator* QAssociativeIterable_End(const QAssociativeIterable* self); -QAssociativeIterable__const_iterator* QAssociativeIterable_Find(const QAssociativeIterable* self, QVariant* key); -QVariant* QAssociativeIterable_Value(const QAssociativeIterable* self, QVariant* key); -int QAssociativeIterable_Size(const QAssociativeIterable* self); -void QAssociativeIterable_Delete(QAssociativeIterable* self); - -QVariant__PrivateShared* QVariant__PrivateShared_new(void* v); +QVariant__PrivateShared* QVariant__PrivateShared_new(QVariant__PrivateShared* param1); +void QVariant__PrivateShared_Free(QVariant__PrivateShared* p); +const void* QVariant__PrivateShared_Data(const QVariant__PrivateShared* self); +void* QVariant__PrivateShared_Data2(QVariant__PrivateShared* self); 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); -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); -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); - #ifdef __cplusplus } /* extern C */ #endif diff --git a/qt/gen_qvariantanimation.cpp b/qt/gen_qvariantanimation.cpp index 29b8a5c..d278c5b 100644 --- a/qt/gen_qvariantanimation.cpp +++ b/qt/gen_qvariantanimation.cpp @@ -33,13 +33,6 @@ struct miqt_string* QVariantAnimation_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QVariantAnimation_TrUtf8(const char* s) { - QString _ret = QVariantAnimation::trUtf8(s); - // 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()); -} - QVariant* QVariantAnimation_StartValue(const QVariantAnimation* self) { return new QVariant(self->startValue()); } @@ -111,20 +104,6 @@ struct miqt_string* QVariantAnimation_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QVariantAnimation_TrUtf82(const char* s, const char* c) { - QString _ret = QVariantAnimation::trUtf8(s, c); - // 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* QVariantAnimation_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QVariantAnimation::trUtf8(s, c, static_cast(n)); - // 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 QVariantAnimation_Delete(QVariantAnimation* self) { delete self; } diff --git a/qt/gen_qvariantanimation.go b/qt/gen_qvariantanimation.go index 7e773a8..5ab5148 100644 --- a/qt/gen_qvariantanimation.go +++ b/qt/gen_qvariantanimation.go @@ -68,15 +68,6 @@ func QVariantAnimation_Tr(s string) string { return _ret } -func QVariantAnimation_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QVariantAnimation_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QVariantAnimation) StartValue() *QVariant { _ret := C.QVariantAnimation_StartValue(this.h) _goptr := newQVariant(_ret) @@ -178,28 +169,6 @@ func QVariantAnimation_Tr3(s string, c string, n int) string { return _ret } -func QVariantAnimation_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QVariantAnimation_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QVariantAnimation_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QVariantAnimation_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QVariantAnimation) Delete() { C.QVariantAnimation_Delete(this.h) diff --git a/qt/gen_qvariantanimation.h b/qt/gen_qvariantanimation.h index fd10450..4ade609 100644 --- a/qt/gen_qvariantanimation.h +++ b/qt/gen_qvariantanimation.h @@ -32,7 +32,6 @@ QVariantAnimation* QVariantAnimation_new2(QObject* parent); QMetaObject* QVariantAnimation_MetaObject(const QVariantAnimation* self); void* QVariantAnimation_Metacast(QVariantAnimation* self, const char* param1); struct miqt_string* QVariantAnimation_Tr(const char* s); -struct miqt_string* QVariantAnimation_TrUtf8(const char* s); QVariant* QVariantAnimation_StartValue(const QVariantAnimation* self); void QVariantAnimation_SetStartValue(QVariantAnimation* self, QVariant* value); QVariant* QVariantAnimation_EndValue(const QVariantAnimation* self); @@ -48,8 +47,6 @@ void QVariantAnimation_ValueChanged(QVariantAnimation* self, QVariant* value); void QVariantAnimation_connect_ValueChanged(QVariantAnimation* self, void* slot); struct miqt_string* QVariantAnimation_Tr2(const char* s, const char* c); struct miqt_string* QVariantAnimation_Tr3(const char* s, const char* c, int n); -struct miqt_string* QVariantAnimation_TrUtf82(const char* s, const char* c); -struct miqt_string* QVariantAnimation_TrUtf83(const char* s, const char* c, int n); void QVariantAnimation_Delete(QVariantAnimation* self); #ifdef __cplusplus diff --git a/qt/gen_qvarlengtharray.cpp b/qt/gen_qvarlengtharray.cpp new file mode 100644 index 0000000..e7ebdff --- /dev/null +++ b/qt/gen_qvarlengtharray.cpp @@ -0,0 +1,18 @@ +#include "qvarlengtharray.h" +#include "gen_qvarlengtharray.h" +#include "_cgo_export.h" + +ptrdiff_t QVLABaseBase_Capacity(const QVLABaseBase* self) { + QVLABaseBase::size_type _ret = self->capacity(); + return static_cast(_ret); +} + +ptrdiff_t QVLABaseBase_Size(const QVLABaseBase* self) { + QVLABaseBase::size_type _ret = self->size(); + return static_cast(_ret); +} + +bool QVLABaseBase_Empty(const QVLABaseBase* self) { + return self->empty(); +} + diff --git a/qt/gen_qvarlengtharray.go b/qt/gen_qvarlengtharray.go new file mode 100644 index 0000000..06e0098 --- /dev/null +++ b/qt/gen_qvarlengtharray.go @@ -0,0 +1,47 @@ +package qt + +/* + +#include "gen_qvarlengtharray.h" +#include + +*/ +import "C" + +import ( + "unsafe" +) + +type QVLABaseBase struct { + h *C.QVLABaseBase +} + +func (this *QVLABaseBase) cPointer() *C.QVLABaseBase { + if this == nil { + return nil + } + return this.h +} + +func newQVLABaseBase(h *C.QVLABaseBase) *QVLABaseBase { + if h == nil { + return nil + } + return &QVLABaseBase{h: h} +} + +func newQVLABaseBase_U(h unsafe.Pointer) *QVLABaseBase { + return newQVLABaseBase((*C.QVLABaseBase)(h)) +} + +func (this *QVLABaseBase) Capacity() int64 { + return (int64)(C.QVLABaseBase_Capacity(this.h)) +} + +func (this *QVLABaseBase) Size() int64 { + return (int64)(C.QVLABaseBase_Size(this.h)) +} + +func (this *QVLABaseBase) Empty() bool { + return (bool)(C.QVLABaseBase_Empty(this.h)) +} diff --git a/qt/gen_qvarlengtharray.h b/qt/gen_qvarlengtharray.h new file mode 100644 index 0000000..d4493c5 --- /dev/null +++ b/qt/gen_qvarlengtharray.h @@ -0,0 +1,30 @@ +#ifndef GEN_QVARLENGTHARRAY_H +#define GEN_QVARLENGTHARRAY_H + +#include +#include +#include + +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + +#include "binding.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +class QVLABaseBase; +#else +typedef struct QVLABaseBase QVLABaseBase; +#endif + +ptrdiff_t QVLABaseBase_Capacity(const QVLABaseBase* self); +ptrdiff_t QVLABaseBase_Size(const QVLABaseBase* self); +bool QVLABaseBase_Empty(const QVLABaseBase* self); + +#ifdef __cplusplus +} /* extern C */ +#endif + +#endif diff --git a/qt/gen_qvector2d.cpp b/qt/gen_qvector2d.cpp deleted file mode 100644 index 4b77651..0000000 --- a/qt/gen_qvector2d.cpp +++ /dev/null @@ -1,149 +0,0 @@ -#include -#include -#include -#include -#include -#include "qvector2d.h" -#include "gen_qvector2d.h" -#include "_cgo_export.h" - -QVector2D* QVector2D_new() { - return new QVector2D(); -} - -QVector2D* QVector2D_new2(int param1) { - return new QVector2D(static_cast(param1)); -} - -QVector2D* QVector2D_new3(float xpos, float ypos) { - return new QVector2D(static_cast(xpos), static_cast(ypos)); -} - -QVector2D* QVector2D_new4(QPoint* point) { - return new QVector2D(*point); -} - -QVector2D* QVector2D_new5(QPointF* point) { - return new QVector2D(*point); -} - -QVector2D* QVector2D_new6(QVector3D* vector) { - return new QVector2D(*vector); -} - -QVector2D* QVector2D_new7(QVector4D* vector) { - return new QVector2D(*vector); -} - -QVector2D* QVector2D_new8(QVector2D* param1) { - return new QVector2D(*param1); -} - -bool QVector2D_IsNull(const QVector2D* self) { - return self->isNull(); -} - -float QVector2D_X(const QVector2D* self) { - return self->x(); -} - -float QVector2D_Y(const QVector2D* self) { - return self->y(); -} - -void QVector2D_SetX(QVector2D* self, float x) { - self->setX(static_cast(x)); -} - -void QVector2D_SetY(QVector2D* self, float y) { - self->setY(static_cast(y)); -} - -float QVector2D_OperatorSubscript(const QVector2D* self, int i) { - return self->operator[](static_cast(i)); -} - -float QVector2D_Length(const QVector2D* self) { - return self->length(); -} - -float QVector2D_LengthSquared(const QVector2D* self) { - return self->lengthSquared(); -} - -QVector2D* QVector2D_Normalized(const QVector2D* self) { - return new QVector2D(self->normalized()); -} - -void QVector2D_Normalize(QVector2D* self) { - self->normalize(); -} - -float QVector2D_DistanceToPoint(const QVector2D* self, QVector2D* point) { - return self->distanceToPoint(*point); -} - -float QVector2D_DistanceToLine(const QVector2D* self, QVector2D* point, QVector2D* direction) { - return self->distanceToLine(*point, *direction); -} - -QVector2D* QVector2D_OperatorPlusAssign(QVector2D* self, QVector2D* vector) { - QVector2D& _ret = self->operator+=(*vector); - // Cast returned reference into pointer - return &_ret; -} - -QVector2D* QVector2D_OperatorMinusAssign(QVector2D* self, QVector2D* vector) { - QVector2D& _ret = self->operator-=(*vector); - // Cast returned reference into pointer - return &_ret; -} - -QVector2D* QVector2D_OperatorMultiplyAssign(QVector2D* self, float factor) { - QVector2D& _ret = self->operator*=(static_cast(factor)); - // Cast returned reference into pointer - return &_ret; -} - -QVector2D* QVector2D_OperatorMultiplyAssignWithVector(QVector2D* self, QVector2D* vector) { - QVector2D& _ret = self->operator*=(*vector); - // Cast returned reference into pointer - return &_ret; -} - -QVector2D* QVector2D_OperatorDivideAssign(QVector2D* self, float divisor) { - QVector2D& _ret = self->operator/=(static_cast(divisor)); - // Cast returned reference into pointer - return &_ret; -} - -QVector2D* QVector2D_OperatorDivideAssignWithVector(QVector2D* self, QVector2D* vector) { - QVector2D& _ret = self->operator/=(*vector); - // Cast returned reference into pointer - return &_ret; -} - -float QVector2D_DotProduct(QVector2D* v1, QVector2D* v2) { - return QVector2D::dotProduct(*v1, *v2); -} - -QVector3D* QVector2D_ToVector3D(const QVector2D* self) { - return new QVector3D(self->toVector3D()); -} - -QVector4D* QVector2D_ToVector4D(const QVector2D* self) { - return new QVector4D(self->toVector4D()); -} - -QPoint* QVector2D_ToPoint(const QVector2D* self) { - return new QPoint(self->toPoint()); -} - -QPointF* QVector2D_ToPointF(const QVector2D* self) { - return new QPointF(self->toPointF()); -} - -void QVector2D_Delete(QVector2D* self) { - delete self; -} - diff --git a/qt/gen_qvector2d.go b/qt/gen_qvector2d.go deleted file mode 100644 index c1f7d7e..0000000 --- a/qt/gen_qvector2d.go +++ /dev/null @@ -1,205 +0,0 @@ -package qt - -/* - -#include "gen_qvector2d.h" -#include - -*/ -import "C" - -import ( - "runtime" - "unsafe" -) - -type QVector2D struct { - h *C.QVector2D -} - -func (this *QVector2D) cPointer() *C.QVector2D { - if this == nil { - return nil - } - return this.h -} - -func newQVector2D(h *C.QVector2D) *QVector2D { - if h == nil { - return nil - } - return &QVector2D{h: h} -} - -func newQVector2D_U(h unsafe.Pointer) *QVector2D { - return newQVector2D((*C.QVector2D)(h)) -} - -// NewQVector2D constructs a new QVector2D object. -func NewQVector2D() *QVector2D { - ret := C.QVector2D_new() - return newQVector2D(ret) -} - -// NewQVector2D2 constructs a new QVector2D object. -func NewQVector2D2(param1 Initialization) *QVector2D { - ret := C.QVector2D_new2((C.int)(param1)) - return newQVector2D(ret) -} - -// NewQVector2D3 constructs a new QVector2D object. -func NewQVector2D3(xpos float32, ypos float32) *QVector2D { - ret := C.QVector2D_new3((C.float)(xpos), (C.float)(ypos)) - return newQVector2D(ret) -} - -// NewQVector2D4 constructs a new QVector2D object. -func NewQVector2D4(point *QPoint) *QVector2D { - ret := C.QVector2D_new4(point.cPointer()) - return newQVector2D(ret) -} - -// NewQVector2D5 constructs a new QVector2D object. -func NewQVector2D5(point *QPointF) *QVector2D { - ret := C.QVector2D_new5(point.cPointer()) - return newQVector2D(ret) -} - -// NewQVector2D6 constructs a new QVector2D object. -func NewQVector2D6(vector *QVector3D) *QVector2D { - ret := C.QVector2D_new6(vector.cPointer()) - return newQVector2D(ret) -} - -// NewQVector2D7 constructs a new QVector2D object. -func NewQVector2D7(vector *QVector4D) *QVector2D { - ret := C.QVector2D_new7(vector.cPointer()) - return newQVector2D(ret) -} - -// NewQVector2D8 constructs a new QVector2D object. -func NewQVector2D8(param1 *QVector2D) *QVector2D { - ret := C.QVector2D_new8(param1.cPointer()) - return newQVector2D(ret) -} - -func (this *QVector2D) IsNull() bool { - return (bool)(C.QVector2D_IsNull(this.h)) -} - -func (this *QVector2D) X() float32 { - return (float32)(C.QVector2D_X(this.h)) -} - -func (this *QVector2D) Y() float32 { - return (float32)(C.QVector2D_Y(this.h)) -} - -func (this *QVector2D) SetX(x float32) { - C.QVector2D_SetX(this.h, (C.float)(x)) -} - -func (this *QVector2D) SetY(y float32) { - C.QVector2D_SetY(this.h, (C.float)(y)) -} - -func (this *QVector2D) OperatorSubscript(i int) float32 { - return (float32)(C.QVector2D_OperatorSubscript(this.h, (C.int)(i))) -} - -func (this *QVector2D) Length() float32 { - return (float32)(C.QVector2D_Length(this.h)) -} - -func (this *QVector2D) LengthSquared() float32 { - return (float32)(C.QVector2D_LengthSquared(this.h)) -} - -func (this *QVector2D) Normalized() *QVector2D { - _ret := C.QVector2D_Normalized(this.h) - _goptr := newQVector2D(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QVector2D) Normalize() { - C.QVector2D_Normalize(this.h) -} - -func (this *QVector2D) DistanceToPoint(point *QVector2D) float32 { - return (float32)(C.QVector2D_DistanceToPoint(this.h, point.cPointer())) -} - -func (this *QVector2D) DistanceToLine(point *QVector2D, direction *QVector2D) float32 { - return (float32)(C.QVector2D_DistanceToLine(this.h, point.cPointer(), direction.cPointer())) -} - -func (this *QVector2D) OperatorPlusAssign(vector *QVector2D) *QVector2D { - return newQVector2D_U(unsafe.Pointer(C.QVector2D_OperatorPlusAssign(this.h, vector.cPointer()))) -} - -func (this *QVector2D) OperatorMinusAssign(vector *QVector2D) *QVector2D { - return newQVector2D_U(unsafe.Pointer(C.QVector2D_OperatorMinusAssign(this.h, vector.cPointer()))) -} - -func (this *QVector2D) OperatorMultiplyAssign(factor float32) *QVector2D { - return newQVector2D_U(unsafe.Pointer(C.QVector2D_OperatorMultiplyAssign(this.h, (C.float)(factor)))) -} - -func (this *QVector2D) OperatorMultiplyAssignWithVector(vector *QVector2D) *QVector2D { - return newQVector2D_U(unsafe.Pointer(C.QVector2D_OperatorMultiplyAssignWithVector(this.h, vector.cPointer()))) -} - -func (this *QVector2D) OperatorDivideAssign(divisor float32) *QVector2D { - return newQVector2D_U(unsafe.Pointer(C.QVector2D_OperatorDivideAssign(this.h, (C.float)(divisor)))) -} - -func (this *QVector2D) OperatorDivideAssignWithVector(vector *QVector2D) *QVector2D { - return newQVector2D_U(unsafe.Pointer(C.QVector2D_OperatorDivideAssignWithVector(this.h, vector.cPointer()))) -} - -func QVector2D_DotProduct(v1 *QVector2D, v2 *QVector2D) float32 { - return (float32)(C.QVector2D_DotProduct(v1.cPointer(), v2.cPointer())) -} - -func (this *QVector2D) ToVector3D() *QVector3D { - _ret := C.QVector2D_ToVector3D(this.h) - _goptr := newQVector3D(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QVector2D) ToVector4D() *QVector4D { - _ret := C.QVector2D_ToVector4D(this.h) - _goptr := newQVector4D(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QVector2D) ToPoint() *QPoint { - _ret := C.QVector2D_ToPoint(this.h) - _goptr := newQPoint(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QVector2D) ToPointF() *QPointF { - _ret := C.QVector2D_ToPointF(this.h) - _goptr := newQPointF(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -// Delete this object from C++ memory. -func (this *QVector2D) Delete() { - C.QVector2D_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QVector2D) GoGC() { - runtime.SetFinalizer(this, func(this *QVector2D) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} diff --git a/qt/gen_qvector2d.h b/qt/gen_qvector2d.h deleted file mode 100644 index 3824253..0000000 --- a/qt/gen_qvector2d.h +++ /dev/null @@ -1,67 +0,0 @@ -#ifndef GEN_QVECTOR2D_H -#define GEN_QVECTOR2D_H - -#include -#include -#include - -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - -#include "binding.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __cplusplus -class QPoint; -class QPointF; -class QVector2D; -class QVector3D; -class QVector4D; -#else -typedef struct QPoint QPoint; -typedef struct QPointF QPointF; -typedef struct QVector2D QVector2D; -typedef struct QVector3D QVector3D; -typedef struct QVector4D QVector4D; -#endif - -QVector2D* QVector2D_new(); -QVector2D* QVector2D_new2(int param1); -QVector2D* QVector2D_new3(float xpos, float ypos); -QVector2D* QVector2D_new4(QPoint* point); -QVector2D* QVector2D_new5(QPointF* point); -QVector2D* QVector2D_new6(QVector3D* vector); -QVector2D* QVector2D_new7(QVector4D* vector); -QVector2D* QVector2D_new8(QVector2D* param1); -bool QVector2D_IsNull(const QVector2D* self); -float QVector2D_X(const QVector2D* self); -float QVector2D_Y(const QVector2D* self); -void QVector2D_SetX(QVector2D* self, float x); -void QVector2D_SetY(QVector2D* self, float y); -float QVector2D_OperatorSubscript(const QVector2D* self, int i); -float QVector2D_Length(const QVector2D* self); -float QVector2D_LengthSquared(const QVector2D* self); -QVector2D* QVector2D_Normalized(const QVector2D* self); -void QVector2D_Normalize(QVector2D* self); -float QVector2D_DistanceToPoint(const QVector2D* self, QVector2D* point); -float QVector2D_DistanceToLine(const QVector2D* self, QVector2D* point, QVector2D* direction); -QVector2D* QVector2D_OperatorPlusAssign(QVector2D* self, QVector2D* vector); -QVector2D* QVector2D_OperatorMinusAssign(QVector2D* self, QVector2D* vector); -QVector2D* QVector2D_OperatorMultiplyAssign(QVector2D* self, float factor); -QVector2D* QVector2D_OperatorMultiplyAssignWithVector(QVector2D* self, QVector2D* vector); -QVector2D* QVector2D_OperatorDivideAssign(QVector2D* self, float divisor); -QVector2D* QVector2D_OperatorDivideAssignWithVector(QVector2D* self, QVector2D* vector); -float QVector2D_DotProduct(QVector2D* v1, QVector2D* v2); -QVector3D* QVector2D_ToVector3D(const QVector2D* self); -QVector4D* QVector2D_ToVector4D(const QVector2D* self); -QPoint* QVector2D_ToPoint(const QVector2D* self); -QPointF* QVector2D_ToPointF(const QVector2D* self); -void QVector2D_Delete(QVector2D* self); - -#ifdef __cplusplus -} /* extern C */ -#endif - -#endif diff --git a/qt/gen_qvector3d.cpp b/qt/gen_qvector3d.cpp deleted file mode 100644 index 9081d6f..0000000 --- a/qt/gen_qvector3d.cpp +++ /dev/null @@ -1,191 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include "qvector3d.h" -#include "gen_qvector3d.h" -#include "_cgo_export.h" - -QVector3D* QVector3D_new() { - return new QVector3D(); -} - -QVector3D* QVector3D_new2(int param1) { - return new QVector3D(static_cast(param1)); -} - -QVector3D* QVector3D_new3(float xpos, float ypos, float zpos) { - return new QVector3D(static_cast(xpos), static_cast(ypos), static_cast(zpos)); -} - -QVector3D* QVector3D_new4(QPoint* point) { - return new QVector3D(*point); -} - -QVector3D* QVector3D_new5(QPointF* point) { - return new QVector3D(*point); -} - -QVector3D* QVector3D_new6(QVector2D* vector) { - return new QVector3D(*vector); -} - -QVector3D* QVector3D_new7(QVector2D* vector, float zpos) { - return new QVector3D(*vector, static_cast(zpos)); -} - -QVector3D* QVector3D_new8(QVector4D* vector) { - return new QVector3D(*vector); -} - -QVector3D* QVector3D_new9(QVector3D* param1) { - return new QVector3D(*param1); -} - -bool QVector3D_IsNull(const QVector3D* self) { - return self->isNull(); -} - -float QVector3D_X(const QVector3D* self) { - return self->x(); -} - -float QVector3D_Y(const QVector3D* self) { - return self->y(); -} - -float QVector3D_Z(const QVector3D* self) { - return self->z(); -} - -void QVector3D_SetX(QVector3D* self, float x) { - self->setX(static_cast(x)); -} - -void QVector3D_SetY(QVector3D* self, float y) { - self->setY(static_cast(y)); -} - -void QVector3D_SetZ(QVector3D* self, float z) { - self->setZ(static_cast(z)); -} - -float QVector3D_OperatorSubscript(const QVector3D* self, int i) { - return self->operator[](static_cast(i)); -} - -float QVector3D_Length(const QVector3D* self) { - return self->length(); -} - -float QVector3D_LengthSquared(const QVector3D* self) { - return self->lengthSquared(); -} - -QVector3D* QVector3D_Normalized(const QVector3D* self) { - return new QVector3D(self->normalized()); -} - -void QVector3D_Normalize(QVector3D* self) { - self->normalize(); -} - -QVector3D* QVector3D_OperatorPlusAssign(QVector3D* self, QVector3D* vector) { - QVector3D& _ret = self->operator+=(*vector); - // Cast returned reference into pointer - return &_ret; -} - -QVector3D* QVector3D_OperatorMinusAssign(QVector3D* self, QVector3D* vector) { - QVector3D& _ret = self->operator-=(*vector); - // Cast returned reference into pointer - return &_ret; -} - -QVector3D* QVector3D_OperatorMultiplyAssign(QVector3D* self, float factor) { - QVector3D& _ret = self->operator*=(static_cast(factor)); - // Cast returned reference into pointer - return &_ret; -} - -QVector3D* QVector3D_OperatorMultiplyAssignWithVector(QVector3D* self, QVector3D* vector) { - QVector3D& _ret = self->operator*=(*vector); - // Cast returned reference into pointer - return &_ret; -} - -QVector3D* QVector3D_OperatorDivideAssign(QVector3D* self, float divisor) { - QVector3D& _ret = self->operator/=(static_cast(divisor)); - // Cast returned reference into pointer - return &_ret; -} - -QVector3D* QVector3D_OperatorDivideAssignWithVector(QVector3D* self, QVector3D* vector) { - QVector3D& _ret = self->operator/=(*vector); - // Cast returned reference into pointer - return &_ret; -} - -float QVector3D_DotProduct(QVector3D* v1, QVector3D* v2) { - return QVector3D::dotProduct(*v1, *v2); -} - -QVector3D* QVector3D_CrossProduct(QVector3D* v1, QVector3D* v2) { - return new QVector3D(QVector3D::crossProduct(*v1, *v2)); -} - -QVector3D* QVector3D_Normal(QVector3D* v1, QVector3D* v2) { - return new QVector3D(QVector3D::normal(*v1, *v2)); -} - -QVector3D* QVector3D_Normal2(QVector3D* v1, QVector3D* v2, QVector3D* v3) { - return new QVector3D(QVector3D::normal(*v1, *v2, *v3)); -} - -QVector3D* QVector3D_Project(const QVector3D* self, QMatrix4x4* modelView, QMatrix4x4* projection, QRect* viewport) { - return new QVector3D(self->project(*modelView, *projection, *viewport)); -} - -QVector3D* QVector3D_Unproject(const QVector3D* self, QMatrix4x4* modelView, QMatrix4x4* projection, QRect* viewport) { - return new QVector3D(self->unproject(*modelView, *projection, *viewport)); -} - -float QVector3D_DistanceToPoint(const QVector3D* self, QVector3D* point) { - return self->distanceToPoint(*point); -} - -float QVector3D_DistanceToPlane(const QVector3D* self, QVector3D* plane, QVector3D* normal) { - return self->distanceToPlane(*plane, *normal); -} - -float QVector3D_DistanceToPlane2(const QVector3D* self, QVector3D* plane1, QVector3D* plane2, QVector3D* plane3) { - return self->distanceToPlane(*plane1, *plane2, *plane3); -} - -float QVector3D_DistanceToLine(const QVector3D* self, QVector3D* point, QVector3D* direction) { - return self->distanceToLine(*point, *direction); -} - -QVector2D* QVector3D_ToVector2D(const QVector3D* self) { - return new QVector2D(self->toVector2D()); -} - -QVector4D* QVector3D_ToVector4D(const QVector3D* self) { - return new QVector4D(self->toVector4D()); -} - -QPoint* QVector3D_ToPoint(const QVector3D* self) { - return new QPoint(self->toPoint()); -} - -QPointF* QVector3D_ToPointF(const QVector3D* self) { - return new QPointF(self->toPointF()); -} - -void QVector3D_Delete(QVector3D* self) { - delete self; -} - diff --git a/qt/gen_qvector3d.go b/qt/gen_qvector3d.go deleted file mode 100644 index 0e7c060..0000000 --- a/qt/gen_qvector3d.go +++ /dev/null @@ -1,262 +0,0 @@ -package qt - -/* - -#include "gen_qvector3d.h" -#include - -*/ -import "C" - -import ( - "runtime" - "unsafe" -) - -type QVector3D struct { - h *C.QVector3D -} - -func (this *QVector3D) cPointer() *C.QVector3D { - if this == nil { - return nil - } - return this.h -} - -func newQVector3D(h *C.QVector3D) *QVector3D { - if h == nil { - return nil - } - return &QVector3D{h: h} -} - -func newQVector3D_U(h unsafe.Pointer) *QVector3D { - return newQVector3D((*C.QVector3D)(h)) -} - -// NewQVector3D constructs a new QVector3D object. -func NewQVector3D() *QVector3D { - ret := C.QVector3D_new() - return newQVector3D(ret) -} - -// NewQVector3D2 constructs a new QVector3D object. -func NewQVector3D2(param1 Initialization) *QVector3D { - ret := C.QVector3D_new2((C.int)(param1)) - return newQVector3D(ret) -} - -// NewQVector3D3 constructs a new QVector3D object. -func NewQVector3D3(xpos float32, ypos float32, zpos float32) *QVector3D { - ret := C.QVector3D_new3((C.float)(xpos), (C.float)(ypos), (C.float)(zpos)) - return newQVector3D(ret) -} - -// NewQVector3D4 constructs a new QVector3D object. -func NewQVector3D4(point *QPoint) *QVector3D { - ret := C.QVector3D_new4(point.cPointer()) - return newQVector3D(ret) -} - -// NewQVector3D5 constructs a new QVector3D object. -func NewQVector3D5(point *QPointF) *QVector3D { - ret := C.QVector3D_new5(point.cPointer()) - return newQVector3D(ret) -} - -// NewQVector3D6 constructs a new QVector3D object. -func NewQVector3D6(vector *QVector2D) *QVector3D { - ret := C.QVector3D_new6(vector.cPointer()) - return newQVector3D(ret) -} - -// NewQVector3D7 constructs a new QVector3D object. -func NewQVector3D7(vector *QVector2D, zpos float32) *QVector3D { - ret := C.QVector3D_new7(vector.cPointer(), (C.float)(zpos)) - return newQVector3D(ret) -} - -// NewQVector3D8 constructs a new QVector3D object. -func NewQVector3D8(vector *QVector4D) *QVector3D { - ret := C.QVector3D_new8(vector.cPointer()) - return newQVector3D(ret) -} - -// NewQVector3D9 constructs a new QVector3D object. -func NewQVector3D9(param1 *QVector3D) *QVector3D { - ret := C.QVector3D_new9(param1.cPointer()) - return newQVector3D(ret) -} - -func (this *QVector3D) IsNull() bool { - return (bool)(C.QVector3D_IsNull(this.h)) -} - -func (this *QVector3D) X() float32 { - return (float32)(C.QVector3D_X(this.h)) -} - -func (this *QVector3D) Y() float32 { - return (float32)(C.QVector3D_Y(this.h)) -} - -func (this *QVector3D) Z() float32 { - return (float32)(C.QVector3D_Z(this.h)) -} - -func (this *QVector3D) SetX(x float32) { - C.QVector3D_SetX(this.h, (C.float)(x)) -} - -func (this *QVector3D) SetY(y float32) { - C.QVector3D_SetY(this.h, (C.float)(y)) -} - -func (this *QVector3D) SetZ(z float32) { - C.QVector3D_SetZ(this.h, (C.float)(z)) -} - -func (this *QVector3D) OperatorSubscript(i int) float32 { - return (float32)(C.QVector3D_OperatorSubscript(this.h, (C.int)(i))) -} - -func (this *QVector3D) Length() float32 { - return (float32)(C.QVector3D_Length(this.h)) -} - -func (this *QVector3D) LengthSquared() float32 { - return (float32)(C.QVector3D_LengthSquared(this.h)) -} - -func (this *QVector3D) Normalized() *QVector3D { - _ret := C.QVector3D_Normalized(this.h) - _goptr := newQVector3D(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QVector3D) Normalize() { - C.QVector3D_Normalize(this.h) -} - -func (this *QVector3D) OperatorPlusAssign(vector *QVector3D) *QVector3D { - return newQVector3D_U(unsafe.Pointer(C.QVector3D_OperatorPlusAssign(this.h, vector.cPointer()))) -} - -func (this *QVector3D) OperatorMinusAssign(vector *QVector3D) *QVector3D { - return newQVector3D_U(unsafe.Pointer(C.QVector3D_OperatorMinusAssign(this.h, vector.cPointer()))) -} - -func (this *QVector3D) OperatorMultiplyAssign(factor float32) *QVector3D { - return newQVector3D_U(unsafe.Pointer(C.QVector3D_OperatorMultiplyAssign(this.h, (C.float)(factor)))) -} - -func (this *QVector3D) OperatorMultiplyAssignWithVector(vector *QVector3D) *QVector3D { - return newQVector3D_U(unsafe.Pointer(C.QVector3D_OperatorMultiplyAssignWithVector(this.h, vector.cPointer()))) -} - -func (this *QVector3D) OperatorDivideAssign(divisor float32) *QVector3D { - return newQVector3D_U(unsafe.Pointer(C.QVector3D_OperatorDivideAssign(this.h, (C.float)(divisor)))) -} - -func (this *QVector3D) OperatorDivideAssignWithVector(vector *QVector3D) *QVector3D { - return newQVector3D_U(unsafe.Pointer(C.QVector3D_OperatorDivideAssignWithVector(this.h, vector.cPointer()))) -} - -func QVector3D_DotProduct(v1 *QVector3D, v2 *QVector3D) float32 { - return (float32)(C.QVector3D_DotProduct(v1.cPointer(), v2.cPointer())) -} - -func QVector3D_CrossProduct(v1 *QVector3D, v2 *QVector3D) *QVector3D { - _ret := C.QVector3D_CrossProduct(v1.cPointer(), v2.cPointer()) - _goptr := newQVector3D(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QVector3D_Normal(v1 *QVector3D, v2 *QVector3D) *QVector3D { - _ret := C.QVector3D_Normal(v1.cPointer(), v2.cPointer()) - _goptr := newQVector3D(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func QVector3D_Normal2(v1 *QVector3D, v2 *QVector3D, v3 *QVector3D) *QVector3D { - _ret := C.QVector3D_Normal2(v1.cPointer(), v2.cPointer(), v3.cPointer()) - _goptr := newQVector3D(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QVector3D) Project(modelView *QMatrix4x4, projection *QMatrix4x4, viewport *QRect) *QVector3D { - _ret := C.QVector3D_Project(this.h, modelView.cPointer(), projection.cPointer(), viewport.cPointer()) - _goptr := newQVector3D(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QVector3D) Unproject(modelView *QMatrix4x4, projection *QMatrix4x4, viewport *QRect) *QVector3D { - _ret := C.QVector3D_Unproject(this.h, modelView.cPointer(), projection.cPointer(), viewport.cPointer()) - _goptr := newQVector3D(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QVector3D) DistanceToPoint(point *QVector3D) float32 { - return (float32)(C.QVector3D_DistanceToPoint(this.h, point.cPointer())) -} - -func (this *QVector3D) DistanceToPlane(plane *QVector3D, normal *QVector3D) float32 { - return (float32)(C.QVector3D_DistanceToPlane(this.h, plane.cPointer(), normal.cPointer())) -} - -func (this *QVector3D) DistanceToPlane2(plane1 *QVector3D, plane2 *QVector3D, plane3 *QVector3D) float32 { - return (float32)(C.QVector3D_DistanceToPlane2(this.h, plane1.cPointer(), plane2.cPointer(), plane3.cPointer())) -} - -func (this *QVector3D) DistanceToLine(point *QVector3D, direction *QVector3D) float32 { - return (float32)(C.QVector3D_DistanceToLine(this.h, point.cPointer(), direction.cPointer())) -} - -func (this *QVector3D) ToVector2D() *QVector2D { - _ret := C.QVector3D_ToVector2D(this.h) - _goptr := newQVector2D(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QVector3D) ToVector4D() *QVector4D { - _ret := C.QVector3D_ToVector4D(this.h) - _goptr := newQVector4D(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QVector3D) ToPoint() *QPoint { - _ret := C.QVector3D_ToPoint(this.h) - _goptr := newQPoint(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QVector3D) ToPointF() *QPointF { - _ret := C.QVector3D_ToPointF(this.h) - _goptr := newQPointF(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -// Delete this object from C++ memory. -func (this *QVector3D) Delete() { - C.QVector3D_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QVector3D) GoGC() { - runtime.SetFinalizer(this, func(this *QVector3D) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} diff --git a/qt/gen_qvector3d.h b/qt/gen_qvector3d.h deleted file mode 100644 index 0e0c70f..0000000 --- a/qt/gen_qvector3d.h +++ /dev/null @@ -1,81 +0,0 @@ -#ifndef GEN_QVECTOR3D_H -#define GEN_QVECTOR3D_H - -#include -#include -#include - -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - -#include "binding.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __cplusplus -class QMatrix4x4; -class QPoint; -class QPointF; -class QRect; -class QVector2D; -class QVector3D; -class QVector4D; -#else -typedef struct QMatrix4x4 QMatrix4x4; -typedef struct QPoint QPoint; -typedef struct QPointF QPointF; -typedef struct QRect QRect; -typedef struct QVector2D QVector2D; -typedef struct QVector3D QVector3D; -typedef struct QVector4D QVector4D; -#endif - -QVector3D* QVector3D_new(); -QVector3D* QVector3D_new2(int param1); -QVector3D* QVector3D_new3(float xpos, float ypos, float zpos); -QVector3D* QVector3D_new4(QPoint* point); -QVector3D* QVector3D_new5(QPointF* point); -QVector3D* QVector3D_new6(QVector2D* vector); -QVector3D* QVector3D_new7(QVector2D* vector, float zpos); -QVector3D* QVector3D_new8(QVector4D* vector); -QVector3D* QVector3D_new9(QVector3D* param1); -bool QVector3D_IsNull(const QVector3D* self); -float QVector3D_X(const QVector3D* self); -float QVector3D_Y(const QVector3D* self); -float QVector3D_Z(const QVector3D* self); -void QVector3D_SetX(QVector3D* self, float x); -void QVector3D_SetY(QVector3D* self, float y); -void QVector3D_SetZ(QVector3D* self, float z); -float QVector3D_OperatorSubscript(const QVector3D* self, int i); -float QVector3D_Length(const QVector3D* self); -float QVector3D_LengthSquared(const QVector3D* self); -QVector3D* QVector3D_Normalized(const QVector3D* self); -void QVector3D_Normalize(QVector3D* self); -QVector3D* QVector3D_OperatorPlusAssign(QVector3D* self, QVector3D* vector); -QVector3D* QVector3D_OperatorMinusAssign(QVector3D* self, QVector3D* vector); -QVector3D* QVector3D_OperatorMultiplyAssign(QVector3D* self, float factor); -QVector3D* QVector3D_OperatorMultiplyAssignWithVector(QVector3D* self, QVector3D* vector); -QVector3D* QVector3D_OperatorDivideAssign(QVector3D* self, float divisor); -QVector3D* QVector3D_OperatorDivideAssignWithVector(QVector3D* self, QVector3D* vector); -float QVector3D_DotProduct(QVector3D* v1, QVector3D* v2); -QVector3D* QVector3D_CrossProduct(QVector3D* v1, QVector3D* v2); -QVector3D* QVector3D_Normal(QVector3D* v1, QVector3D* v2); -QVector3D* QVector3D_Normal2(QVector3D* v1, QVector3D* v2, QVector3D* v3); -QVector3D* QVector3D_Project(const QVector3D* self, QMatrix4x4* modelView, QMatrix4x4* projection, QRect* viewport); -QVector3D* QVector3D_Unproject(const QVector3D* self, QMatrix4x4* modelView, QMatrix4x4* projection, QRect* viewport); -float QVector3D_DistanceToPoint(const QVector3D* self, QVector3D* point); -float QVector3D_DistanceToPlane(const QVector3D* self, QVector3D* plane, QVector3D* normal); -float QVector3D_DistanceToPlane2(const QVector3D* self, QVector3D* plane1, QVector3D* plane2, QVector3D* plane3); -float QVector3D_DistanceToLine(const QVector3D* self, QVector3D* point, QVector3D* direction); -QVector2D* QVector3D_ToVector2D(const QVector3D* self); -QVector4D* QVector3D_ToVector4D(const QVector3D* self); -QPoint* QVector3D_ToPoint(const QVector3D* self); -QPointF* QVector3D_ToPointF(const QVector3D* self); -void QVector3D_Delete(QVector3D* self); - -#ifdef __cplusplus -} /* extern C */ -#endif - -#endif diff --git a/qt/gen_qvector4d.cpp b/qt/gen_qvector4d.cpp deleted file mode 100644 index 47e95a9..0000000 --- a/qt/gen_qvector4d.cpp +++ /dev/null @@ -1,173 +0,0 @@ -#include -#include -#include -#include -#include -#include "qvector4d.h" -#include "gen_qvector4d.h" -#include "_cgo_export.h" - -QVector4D* QVector4D_new() { - return new QVector4D(); -} - -QVector4D* QVector4D_new2(int param1) { - return new QVector4D(static_cast(param1)); -} - -QVector4D* QVector4D_new3(float xpos, float ypos, float zpos, float wpos) { - return new QVector4D(static_cast(xpos), static_cast(ypos), static_cast(zpos), static_cast(wpos)); -} - -QVector4D* QVector4D_new4(QPoint* point) { - return new QVector4D(*point); -} - -QVector4D* QVector4D_new5(QPointF* point) { - return new QVector4D(*point); -} - -QVector4D* QVector4D_new6(QVector2D* vector) { - return new QVector4D(*vector); -} - -QVector4D* QVector4D_new7(QVector2D* vector, float zpos, float wpos) { - return new QVector4D(*vector, static_cast(zpos), static_cast(wpos)); -} - -QVector4D* QVector4D_new8(QVector3D* vector) { - return new QVector4D(*vector); -} - -QVector4D* QVector4D_new9(QVector3D* vector, float wpos) { - return new QVector4D(*vector, static_cast(wpos)); -} - -QVector4D* QVector4D_new10(QVector4D* param1) { - return new QVector4D(*param1); -} - -bool QVector4D_IsNull(const QVector4D* self) { - return self->isNull(); -} - -float QVector4D_X(const QVector4D* self) { - return self->x(); -} - -float QVector4D_Y(const QVector4D* self) { - return self->y(); -} - -float QVector4D_Z(const QVector4D* self) { - return self->z(); -} - -float QVector4D_W(const QVector4D* self) { - return self->w(); -} - -void QVector4D_SetX(QVector4D* self, float x) { - self->setX(static_cast(x)); -} - -void QVector4D_SetY(QVector4D* self, float y) { - self->setY(static_cast(y)); -} - -void QVector4D_SetZ(QVector4D* self, float z) { - self->setZ(static_cast(z)); -} - -void QVector4D_SetW(QVector4D* self, float w) { - self->setW(static_cast(w)); -} - -float QVector4D_OperatorSubscript(const QVector4D* self, int i) { - return self->operator[](static_cast(i)); -} - -float QVector4D_Length(const QVector4D* self) { - return self->length(); -} - -float QVector4D_LengthSquared(const QVector4D* self) { - return self->lengthSquared(); -} - -QVector4D* QVector4D_Normalized(const QVector4D* self) { - return new QVector4D(self->normalized()); -} - -void QVector4D_Normalize(QVector4D* self) { - self->normalize(); -} - -QVector4D* QVector4D_OperatorPlusAssign(QVector4D* self, QVector4D* vector) { - QVector4D& _ret = self->operator+=(*vector); - // Cast returned reference into pointer - return &_ret; -} - -QVector4D* QVector4D_OperatorMinusAssign(QVector4D* self, QVector4D* vector) { - QVector4D& _ret = self->operator-=(*vector); - // Cast returned reference into pointer - return &_ret; -} - -QVector4D* QVector4D_OperatorMultiplyAssign(QVector4D* self, float factor) { - QVector4D& _ret = self->operator*=(static_cast(factor)); - // Cast returned reference into pointer - return &_ret; -} - -QVector4D* QVector4D_OperatorMultiplyAssignWithVector(QVector4D* self, QVector4D* vector) { - QVector4D& _ret = self->operator*=(*vector); - // Cast returned reference into pointer - return &_ret; -} - -QVector4D* QVector4D_OperatorDivideAssign(QVector4D* self, float divisor) { - QVector4D& _ret = self->operator/=(static_cast(divisor)); - // Cast returned reference into pointer - return &_ret; -} - -QVector4D* QVector4D_OperatorDivideAssignWithVector(QVector4D* self, QVector4D* vector) { - QVector4D& _ret = self->operator/=(*vector); - // Cast returned reference into pointer - return &_ret; -} - -float QVector4D_DotProduct(QVector4D* v1, QVector4D* v2) { - return QVector4D::dotProduct(*v1, *v2); -} - -QVector2D* QVector4D_ToVector2D(const QVector4D* self) { - return new QVector2D(self->toVector2D()); -} - -QVector2D* QVector4D_ToVector2DAffine(const QVector4D* self) { - return new QVector2D(self->toVector2DAffine()); -} - -QVector3D* QVector4D_ToVector3D(const QVector4D* self) { - return new QVector3D(self->toVector3D()); -} - -QVector3D* QVector4D_ToVector3DAffine(const QVector4D* self) { - return new QVector3D(self->toVector3DAffine()); -} - -QPoint* QVector4D_ToPoint(const QVector4D* self) { - return new QPoint(self->toPoint()); -} - -QPointF* QVector4D_ToPointF(const QVector4D* self) { - return new QPointF(self->toPointF()); -} - -void QVector4D_Delete(QVector4D* self) { - delete self; -} - diff --git a/qt/gen_qvector4d.go b/qt/gen_qvector4d.go deleted file mode 100644 index b503046..0000000 --- a/qt/gen_qvector4d.go +++ /dev/null @@ -1,239 +0,0 @@ -package qt - -/* - -#include "gen_qvector4d.h" -#include - -*/ -import "C" - -import ( - "runtime" - "unsafe" -) - -type QVector4D struct { - h *C.QVector4D -} - -func (this *QVector4D) cPointer() *C.QVector4D { - if this == nil { - return nil - } - return this.h -} - -func newQVector4D(h *C.QVector4D) *QVector4D { - if h == nil { - return nil - } - return &QVector4D{h: h} -} - -func newQVector4D_U(h unsafe.Pointer) *QVector4D { - return newQVector4D((*C.QVector4D)(h)) -} - -// NewQVector4D constructs a new QVector4D object. -func NewQVector4D() *QVector4D { - ret := C.QVector4D_new() - return newQVector4D(ret) -} - -// NewQVector4D2 constructs a new QVector4D object. -func NewQVector4D2(param1 Initialization) *QVector4D { - ret := C.QVector4D_new2((C.int)(param1)) - return newQVector4D(ret) -} - -// NewQVector4D3 constructs a new QVector4D object. -func NewQVector4D3(xpos float32, ypos float32, zpos float32, wpos float32) *QVector4D { - ret := C.QVector4D_new3((C.float)(xpos), (C.float)(ypos), (C.float)(zpos), (C.float)(wpos)) - return newQVector4D(ret) -} - -// NewQVector4D4 constructs a new QVector4D object. -func NewQVector4D4(point *QPoint) *QVector4D { - ret := C.QVector4D_new4(point.cPointer()) - return newQVector4D(ret) -} - -// NewQVector4D5 constructs a new QVector4D object. -func NewQVector4D5(point *QPointF) *QVector4D { - ret := C.QVector4D_new5(point.cPointer()) - return newQVector4D(ret) -} - -// NewQVector4D6 constructs a new QVector4D object. -func NewQVector4D6(vector *QVector2D) *QVector4D { - ret := C.QVector4D_new6(vector.cPointer()) - return newQVector4D(ret) -} - -// NewQVector4D7 constructs a new QVector4D object. -func NewQVector4D7(vector *QVector2D, zpos float32, wpos float32) *QVector4D { - ret := C.QVector4D_new7(vector.cPointer(), (C.float)(zpos), (C.float)(wpos)) - return newQVector4D(ret) -} - -// NewQVector4D8 constructs a new QVector4D object. -func NewQVector4D8(vector *QVector3D) *QVector4D { - ret := C.QVector4D_new8(vector.cPointer()) - return newQVector4D(ret) -} - -// NewQVector4D9 constructs a new QVector4D object. -func NewQVector4D9(vector *QVector3D, wpos float32) *QVector4D { - ret := C.QVector4D_new9(vector.cPointer(), (C.float)(wpos)) - return newQVector4D(ret) -} - -// NewQVector4D10 constructs a new QVector4D object. -func NewQVector4D10(param1 *QVector4D) *QVector4D { - ret := C.QVector4D_new10(param1.cPointer()) - return newQVector4D(ret) -} - -func (this *QVector4D) IsNull() bool { - return (bool)(C.QVector4D_IsNull(this.h)) -} - -func (this *QVector4D) X() float32 { - return (float32)(C.QVector4D_X(this.h)) -} - -func (this *QVector4D) Y() float32 { - return (float32)(C.QVector4D_Y(this.h)) -} - -func (this *QVector4D) Z() float32 { - return (float32)(C.QVector4D_Z(this.h)) -} - -func (this *QVector4D) W() float32 { - return (float32)(C.QVector4D_W(this.h)) -} - -func (this *QVector4D) SetX(x float32) { - C.QVector4D_SetX(this.h, (C.float)(x)) -} - -func (this *QVector4D) SetY(y float32) { - C.QVector4D_SetY(this.h, (C.float)(y)) -} - -func (this *QVector4D) SetZ(z float32) { - C.QVector4D_SetZ(this.h, (C.float)(z)) -} - -func (this *QVector4D) SetW(w float32) { - C.QVector4D_SetW(this.h, (C.float)(w)) -} - -func (this *QVector4D) OperatorSubscript(i int) float32 { - return (float32)(C.QVector4D_OperatorSubscript(this.h, (C.int)(i))) -} - -func (this *QVector4D) Length() float32 { - return (float32)(C.QVector4D_Length(this.h)) -} - -func (this *QVector4D) LengthSquared() float32 { - return (float32)(C.QVector4D_LengthSquared(this.h)) -} - -func (this *QVector4D) Normalized() *QVector4D { - _ret := C.QVector4D_Normalized(this.h) - _goptr := newQVector4D(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QVector4D) Normalize() { - C.QVector4D_Normalize(this.h) -} - -func (this *QVector4D) OperatorPlusAssign(vector *QVector4D) *QVector4D { - return newQVector4D_U(unsafe.Pointer(C.QVector4D_OperatorPlusAssign(this.h, vector.cPointer()))) -} - -func (this *QVector4D) OperatorMinusAssign(vector *QVector4D) *QVector4D { - return newQVector4D_U(unsafe.Pointer(C.QVector4D_OperatorMinusAssign(this.h, vector.cPointer()))) -} - -func (this *QVector4D) OperatorMultiplyAssign(factor float32) *QVector4D { - return newQVector4D_U(unsafe.Pointer(C.QVector4D_OperatorMultiplyAssign(this.h, (C.float)(factor)))) -} - -func (this *QVector4D) OperatorMultiplyAssignWithVector(vector *QVector4D) *QVector4D { - return newQVector4D_U(unsafe.Pointer(C.QVector4D_OperatorMultiplyAssignWithVector(this.h, vector.cPointer()))) -} - -func (this *QVector4D) OperatorDivideAssign(divisor float32) *QVector4D { - return newQVector4D_U(unsafe.Pointer(C.QVector4D_OperatorDivideAssign(this.h, (C.float)(divisor)))) -} - -func (this *QVector4D) OperatorDivideAssignWithVector(vector *QVector4D) *QVector4D { - return newQVector4D_U(unsafe.Pointer(C.QVector4D_OperatorDivideAssignWithVector(this.h, vector.cPointer()))) -} - -func QVector4D_DotProduct(v1 *QVector4D, v2 *QVector4D) float32 { - return (float32)(C.QVector4D_DotProduct(v1.cPointer(), v2.cPointer())) -} - -func (this *QVector4D) ToVector2D() *QVector2D { - _ret := C.QVector4D_ToVector2D(this.h) - _goptr := newQVector2D(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QVector4D) ToVector2DAffine() *QVector2D { - _ret := C.QVector4D_ToVector2DAffine(this.h) - _goptr := newQVector2D(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QVector4D) ToVector3D() *QVector3D { - _ret := C.QVector4D_ToVector3D(this.h) - _goptr := newQVector3D(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QVector4D) ToVector3DAffine() *QVector3D { - _ret := C.QVector4D_ToVector3DAffine(this.h) - _goptr := newQVector3D(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QVector4D) ToPoint() *QPoint { - _ret := C.QVector4D_ToPoint(this.h) - _goptr := newQPoint(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QVector4D) ToPointF() *QPointF { - _ret := C.QVector4D_ToPointF(this.h) - _goptr := newQPointF(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -// Delete this object from C++ memory. -func (this *QVector4D) Delete() { - C.QVector4D_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QVector4D) GoGC() { - runtime.SetFinalizer(this, func(this *QVector4D) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} diff --git a/qt/gen_qvector4d.h b/qt/gen_qvector4d.h deleted file mode 100644 index a0b862b..0000000 --- a/qt/gen_qvector4d.h +++ /dev/null @@ -1,73 +0,0 @@ -#ifndef GEN_QVECTOR4D_H -#define GEN_QVECTOR4D_H - -#include -#include -#include - -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - -#include "binding.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __cplusplus -class QPoint; -class QPointF; -class QVector2D; -class QVector3D; -class QVector4D; -#else -typedef struct QPoint QPoint; -typedef struct QPointF QPointF; -typedef struct QVector2D QVector2D; -typedef struct QVector3D QVector3D; -typedef struct QVector4D QVector4D; -#endif - -QVector4D* QVector4D_new(); -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); -QVector4D* QVector4D_new6(QVector2D* vector); -QVector4D* QVector4D_new7(QVector2D* vector, float zpos, float wpos); -QVector4D* QVector4D_new8(QVector3D* vector); -QVector4D* QVector4D_new9(QVector3D* vector, float wpos); -QVector4D* QVector4D_new10(QVector4D* param1); -bool QVector4D_IsNull(const QVector4D* self); -float QVector4D_X(const QVector4D* self); -float QVector4D_Y(const QVector4D* self); -float QVector4D_Z(const QVector4D* self); -float QVector4D_W(const QVector4D* self); -void QVector4D_SetX(QVector4D* self, float x); -void QVector4D_SetY(QVector4D* self, float y); -void QVector4D_SetZ(QVector4D* self, float z); -void QVector4D_SetW(QVector4D* self, float w); -float QVector4D_OperatorSubscript(const QVector4D* self, int i); -float QVector4D_Length(const QVector4D* self); -float QVector4D_LengthSquared(const QVector4D* self); -QVector4D* QVector4D_Normalized(const QVector4D* self); -void QVector4D_Normalize(QVector4D* self); -QVector4D* QVector4D_OperatorPlusAssign(QVector4D* self, QVector4D* vector); -QVector4D* QVector4D_OperatorMinusAssign(QVector4D* self, QVector4D* vector); -QVector4D* QVector4D_OperatorMultiplyAssign(QVector4D* self, float factor); -QVector4D* QVector4D_OperatorMultiplyAssignWithVector(QVector4D* self, QVector4D* vector); -QVector4D* QVector4D_OperatorDivideAssign(QVector4D* self, float divisor); -QVector4D* QVector4D_OperatorDivideAssignWithVector(QVector4D* self, QVector4D* vector); -float QVector4D_DotProduct(QVector4D* v1, QVector4D* v2); -QVector2D* QVector4D_ToVector2D(const QVector4D* self); -QVector2D* QVector4D_ToVector2DAffine(const QVector4D* self); -QVector3D* QVector4D_ToVector3D(const QVector4D* self); -QVector3D* QVector4D_ToVector3DAffine(const QVector4D* self); -QPoint* QVector4D_ToPoint(const QVector4D* self); -QPointF* QVector4D_ToPointF(const QVector4D* self); -void QVector4D_Delete(QVector4D* self); - -#ifdef __cplusplus -} /* extern C */ -#endif - -#endif diff --git a/qt/gen_qvectornd.cpp b/qt/gen_qvectornd.cpp new file mode 100644 index 0000000..2430f0c --- /dev/null +++ b/qt/gen_qvectornd.cpp @@ -0,0 +1,495 @@ +#include +#include +#include +#include +#include +#include +#include +#include "qvectornd.h" +#include "gen_qvectornd.h" +#include "_cgo_export.h" + +QVector2D* QVector2D_new() { + return new QVector2D(); +} + +QVector2D* QVector2D_new2(int param1) { + return new QVector2D(static_cast(param1)); +} + +QVector2D* QVector2D_new3(float xpos, float ypos) { + return new QVector2D(static_cast(xpos), static_cast(ypos)); +} + +QVector2D* QVector2D_new4(QPoint* point) { + return new QVector2D(*point); +} + +QVector2D* QVector2D_new5(QPointF* point) { + return new QVector2D(*point); +} + +QVector2D* QVector2D_new6(QVector3D* vector) { + return new QVector2D(*vector); +} + +QVector2D* QVector2D_new7(QVector4D* vector) { + return new QVector2D(*vector); +} + +QVector2D* QVector2D_new8(QVector2D* param1) { + return new QVector2D(*param1); +} + +bool QVector2D_IsNull(const QVector2D* self) { + return self->isNull(); +} + +float QVector2D_X(const QVector2D* self) { + return self->x(); +} + +float QVector2D_Y(const QVector2D* self) { + return self->y(); +} + +void QVector2D_SetX(QVector2D* self, float x) { + self->setX(static_cast(x)); +} + +void QVector2D_SetY(QVector2D* self, float y) { + self->setY(static_cast(y)); +} + +float QVector2D_OperatorSubscript(const QVector2D* self, int i) { + return self->operator[](static_cast(i)); +} + +float QVector2D_Length(const QVector2D* self) { + return self->length(); +} + +float QVector2D_LengthSquared(const QVector2D* self) { + return self->lengthSquared(); +} + +QVector2D* QVector2D_Normalized(const QVector2D* self) { + return new QVector2D(self->normalized()); +} + +void QVector2D_Normalize(QVector2D* self) { + self->normalize(); +} + +float QVector2D_DistanceToPoint(const QVector2D* self, QVector2D* point) { + return self->distanceToPoint(*point); +} + +float QVector2D_DistanceToLine(const QVector2D* self, QVector2D* point, QVector2D* direction) { + return self->distanceToLine(*point, *direction); +} + +QVector2D* QVector2D_OperatorPlusAssign(QVector2D* self, QVector2D* vector) { + QVector2D& _ret = self->operator+=(*vector); + // Cast returned reference into pointer + return &_ret; +} + +QVector2D* QVector2D_OperatorMinusAssign(QVector2D* self, QVector2D* vector) { + QVector2D& _ret = self->operator-=(*vector); + // Cast returned reference into pointer + return &_ret; +} + +QVector2D* QVector2D_OperatorMultiplyAssign(QVector2D* self, float factor) { + QVector2D& _ret = self->operator*=(static_cast(factor)); + // Cast returned reference into pointer + return &_ret; +} + +QVector2D* QVector2D_OperatorMultiplyAssignWithVector(QVector2D* self, QVector2D* vector) { + QVector2D& _ret = self->operator*=(*vector); + // Cast returned reference into pointer + return &_ret; +} + +QVector2D* QVector2D_OperatorDivideAssign(QVector2D* self, float divisor) { + QVector2D& _ret = self->operator/=(static_cast(divisor)); + // Cast returned reference into pointer + return &_ret; +} + +QVector2D* QVector2D_OperatorDivideAssignWithVector(QVector2D* self, QVector2D* vector) { + QVector2D& _ret = self->operator/=(*vector); + // Cast returned reference into pointer + return &_ret; +} + +float QVector2D_DotProduct(QVector2D* v1, QVector2D* v2) { + return QVector2D::dotProduct(*v1, *v2); +} + +QVector3D* QVector2D_ToVector3D(const QVector2D* self) { + return new QVector3D(self->toVector3D()); +} + +QVector4D* QVector2D_ToVector4D(const QVector2D* self) { + return new QVector4D(self->toVector4D()); +} + +QPoint* QVector2D_ToPoint(const QVector2D* self) { + return new QPoint(self->toPoint()); +} + +QPointF* QVector2D_ToPointF(const QVector2D* self) { + return new QPointF(self->toPointF()); +} + +void QVector2D_Delete(QVector2D* self) { + delete self; +} + +QVector3D* QVector3D_new() { + return new QVector3D(); +} + +QVector3D* QVector3D_new2(int param1) { + return new QVector3D(static_cast(param1)); +} + +QVector3D* QVector3D_new3(float xpos, float ypos, float zpos) { + return new QVector3D(static_cast(xpos), static_cast(ypos), static_cast(zpos)); +} + +QVector3D* QVector3D_new4(QPoint* point) { + return new QVector3D(*point); +} + +QVector3D* QVector3D_new5(QPointF* point) { + return new QVector3D(*point); +} + +QVector3D* QVector3D_new6(QVector2D* vector) { + return new QVector3D(*vector); +} + +QVector3D* QVector3D_new7(QVector2D* vector, float zpos) { + return new QVector3D(*vector, static_cast(zpos)); +} + +QVector3D* QVector3D_new8(QVector4D* vector) { + return new QVector3D(*vector); +} + +QVector3D* QVector3D_new9(QVector3D* param1) { + return new QVector3D(*param1); +} + +bool QVector3D_IsNull(const QVector3D* self) { + return self->isNull(); +} + +float QVector3D_X(const QVector3D* self) { + return self->x(); +} + +float QVector3D_Y(const QVector3D* self) { + return self->y(); +} + +float QVector3D_Z(const QVector3D* self) { + return self->z(); +} + +void QVector3D_SetX(QVector3D* self, float x) { + self->setX(static_cast(x)); +} + +void QVector3D_SetY(QVector3D* self, float y) { + self->setY(static_cast(y)); +} + +void QVector3D_SetZ(QVector3D* self, float z) { + self->setZ(static_cast(z)); +} + +float QVector3D_OperatorSubscript(const QVector3D* self, int i) { + return self->operator[](static_cast(i)); +} + +float QVector3D_Length(const QVector3D* self) { + return self->length(); +} + +float QVector3D_LengthSquared(const QVector3D* self) { + return self->lengthSquared(); +} + +QVector3D* QVector3D_Normalized(const QVector3D* self) { + return new QVector3D(self->normalized()); +} + +void QVector3D_Normalize(QVector3D* self) { + self->normalize(); +} + +QVector3D* QVector3D_OperatorPlusAssign(QVector3D* self, QVector3D* vector) { + QVector3D& _ret = self->operator+=(*vector); + // Cast returned reference into pointer + return &_ret; +} + +QVector3D* QVector3D_OperatorMinusAssign(QVector3D* self, QVector3D* vector) { + QVector3D& _ret = self->operator-=(*vector); + // Cast returned reference into pointer + return &_ret; +} + +QVector3D* QVector3D_OperatorMultiplyAssign(QVector3D* self, float factor) { + QVector3D& _ret = self->operator*=(static_cast(factor)); + // Cast returned reference into pointer + return &_ret; +} + +QVector3D* QVector3D_OperatorMultiplyAssignWithVector(QVector3D* self, QVector3D* vector) { + QVector3D& _ret = self->operator*=(*vector); + // Cast returned reference into pointer + return &_ret; +} + +QVector3D* QVector3D_OperatorDivideAssign(QVector3D* self, float divisor) { + QVector3D& _ret = self->operator/=(static_cast(divisor)); + // Cast returned reference into pointer + return &_ret; +} + +QVector3D* QVector3D_OperatorDivideAssignWithVector(QVector3D* self, QVector3D* vector) { + QVector3D& _ret = self->operator/=(*vector); + // Cast returned reference into pointer + return &_ret; +} + +float QVector3D_DotProduct(QVector3D* v1, QVector3D* v2) { + return QVector3D::dotProduct(*v1, *v2); +} + +QVector3D* QVector3D_CrossProduct(QVector3D* v1, QVector3D* v2) { + return new QVector3D(QVector3D::crossProduct(*v1, *v2)); +} + +QVector3D* QVector3D_Normal(QVector3D* v1, QVector3D* v2) { + return new QVector3D(QVector3D::normal(*v1, *v2)); +} + +QVector3D* QVector3D_Normal2(QVector3D* v1, QVector3D* v2, QVector3D* v3) { + return new QVector3D(QVector3D::normal(*v1, *v2, *v3)); +} + +QVector3D* QVector3D_Project(const QVector3D* self, QMatrix4x4* modelView, QMatrix4x4* projection, QRect* viewport) { + return new QVector3D(self->project(*modelView, *projection, *viewport)); +} + +QVector3D* QVector3D_Unproject(const QVector3D* self, QMatrix4x4* modelView, QMatrix4x4* projection, QRect* viewport) { + return new QVector3D(self->unproject(*modelView, *projection, *viewport)); +} + +float QVector3D_DistanceToPoint(const QVector3D* self, QVector3D* point) { + return self->distanceToPoint(*point); +} + +float QVector3D_DistanceToPlane(const QVector3D* self, QVector3D* plane, QVector3D* normal) { + return self->distanceToPlane(*plane, *normal); +} + +float QVector3D_DistanceToPlane2(const QVector3D* self, QVector3D* plane1, QVector3D* plane2, QVector3D* plane3) { + return self->distanceToPlane(*plane1, *plane2, *plane3); +} + +float QVector3D_DistanceToLine(const QVector3D* self, QVector3D* point, QVector3D* direction) { + return self->distanceToLine(*point, *direction); +} + +QVector2D* QVector3D_ToVector2D(const QVector3D* self) { + return new QVector2D(self->toVector2D()); +} + +QVector4D* QVector3D_ToVector4D(const QVector3D* self) { + return new QVector4D(self->toVector4D()); +} + +QPoint* QVector3D_ToPoint(const QVector3D* self) { + return new QPoint(self->toPoint()); +} + +QPointF* QVector3D_ToPointF(const QVector3D* self) { + return new QPointF(self->toPointF()); +} + +void QVector3D_Delete(QVector3D* self) { + delete self; +} + +QVector4D* QVector4D_new() { + return new QVector4D(); +} + +QVector4D* QVector4D_new2(int param1) { + return new QVector4D(static_cast(param1)); +} + +QVector4D* QVector4D_new3(float xpos, float ypos, float zpos, float wpos) { + return new QVector4D(static_cast(xpos), static_cast(ypos), static_cast(zpos), static_cast(wpos)); +} + +QVector4D* QVector4D_new4(QPoint* point) { + return new QVector4D(*point); +} + +QVector4D* QVector4D_new5(QPointF* point) { + return new QVector4D(*point); +} + +QVector4D* QVector4D_new6(QVector2D* vector) { + return new QVector4D(*vector); +} + +QVector4D* QVector4D_new7(QVector2D* vector, float zpos, float wpos) { + return new QVector4D(*vector, static_cast(zpos), static_cast(wpos)); +} + +QVector4D* QVector4D_new8(QVector3D* vector) { + return new QVector4D(*vector); +} + +QVector4D* QVector4D_new9(QVector3D* vector, float wpos) { + return new QVector4D(*vector, static_cast(wpos)); +} + +QVector4D* QVector4D_new10(QVector4D* param1) { + return new QVector4D(*param1); +} + +bool QVector4D_IsNull(const QVector4D* self) { + return self->isNull(); +} + +float QVector4D_X(const QVector4D* self) { + return self->x(); +} + +float QVector4D_Y(const QVector4D* self) { + return self->y(); +} + +float QVector4D_Z(const QVector4D* self) { + return self->z(); +} + +float QVector4D_W(const QVector4D* self) { + return self->w(); +} + +void QVector4D_SetX(QVector4D* self, float x) { + self->setX(static_cast(x)); +} + +void QVector4D_SetY(QVector4D* self, float y) { + self->setY(static_cast(y)); +} + +void QVector4D_SetZ(QVector4D* self, float z) { + self->setZ(static_cast(z)); +} + +void QVector4D_SetW(QVector4D* self, float w) { + self->setW(static_cast(w)); +} + +float QVector4D_OperatorSubscript(const QVector4D* self, int i) { + return self->operator[](static_cast(i)); +} + +float QVector4D_Length(const QVector4D* self) { + return self->length(); +} + +float QVector4D_LengthSquared(const QVector4D* self) { + return self->lengthSquared(); +} + +QVector4D* QVector4D_Normalized(const QVector4D* self) { + return new QVector4D(self->normalized()); +} + +void QVector4D_Normalize(QVector4D* self) { + self->normalize(); +} + +QVector4D* QVector4D_OperatorPlusAssign(QVector4D* self, QVector4D* vector) { + QVector4D& _ret = self->operator+=(*vector); + // Cast returned reference into pointer + return &_ret; +} + +QVector4D* QVector4D_OperatorMinusAssign(QVector4D* self, QVector4D* vector) { + QVector4D& _ret = self->operator-=(*vector); + // Cast returned reference into pointer + return &_ret; +} + +QVector4D* QVector4D_OperatorMultiplyAssign(QVector4D* self, float factor) { + QVector4D& _ret = self->operator*=(static_cast(factor)); + // Cast returned reference into pointer + return &_ret; +} + +QVector4D* QVector4D_OperatorMultiplyAssignWithVector(QVector4D* self, QVector4D* vector) { + QVector4D& _ret = self->operator*=(*vector); + // Cast returned reference into pointer + return &_ret; +} + +QVector4D* QVector4D_OperatorDivideAssign(QVector4D* self, float divisor) { + QVector4D& _ret = self->operator/=(static_cast(divisor)); + // Cast returned reference into pointer + return &_ret; +} + +QVector4D* QVector4D_OperatorDivideAssignWithVector(QVector4D* self, QVector4D* vector) { + QVector4D& _ret = self->operator/=(*vector); + // Cast returned reference into pointer + return &_ret; +} + +float QVector4D_DotProduct(QVector4D* v1, QVector4D* v2) { + return QVector4D::dotProduct(*v1, *v2); +} + +QVector2D* QVector4D_ToVector2D(const QVector4D* self) { + return new QVector2D(self->toVector2D()); +} + +QVector2D* QVector4D_ToVector2DAffine(const QVector4D* self) { + return new QVector2D(self->toVector2DAffine()); +} + +QVector3D* QVector4D_ToVector3D(const QVector4D* self) { + return new QVector3D(self->toVector3D()); +} + +QVector3D* QVector4D_ToVector3DAffine(const QVector4D* self) { + return new QVector3D(self->toVector3DAffine()); +} + +QPoint* QVector4D_ToPoint(const QVector4D* self) { + return new QPoint(self->toPoint()); +} + +QPointF* QVector4D_ToPointF(const QVector4D* self) { + return new QPointF(self->toPointF()); +} + +void QVector4D_Delete(QVector4D* self) { + delete self; +} + diff --git a/qt/gen_qvectornd.go b/qt/gen_qvectornd.go new file mode 100644 index 0000000..eb98011 --- /dev/null +++ b/qt/gen_qvectornd.go @@ -0,0 +1,678 @@ +package qt + +/* + +#include "gen_qvectornd.h" +#include + +*/ +import "C" + +import ( + "runtime" + "unsafe" +) + +type QVector2D struct { + h *C.QVector2D +} + +func (this *QVector2D) cPointer() *C.QVector2D { + if this == nil { + return nil + } + return this.h +} + +func newQVector2D(h *C.QVector2D) *QVector2D { + if h == nil { + return nil + } + return &QVector2D{h: h} +} + +func newQVector2D_U(h unsafe.Pointer) *QVector2D { + return newQVector2D((*C.QVector2D)(h)) +} + +// NewQVector2D constructs a new QVector2D object. +func NewQVector2D() *QVector2D { + ret := C.QVector2D_new() + return newQVector2D(ret) +} + +// NewQVector2D2 constructs a new QVector2D object. +func NewQVector2D2(param1 Initialization) *QVector2D { + ret := C.QVector2D_new2((C.int)(param1)) + return newQVector2D(ret) +} + +// NewQVector2D3 constructs a new QVector2D object. +func NewQVector2D3(xpos float32, ypos float32) *QVector2D { + ret := C.QVector2D_new3((C.float)(xpos), (C.float)(ypos)) + return newQVector2D(ret) +} + +// NewQVector2D4 constructs a new QVector2D object. +func NewQVector2D4(point QPoint) *QVector2D { + ret := C.QVector2D_new4(point.cPointer()) + return newQVector2D(ret) +} + +// NewQVector2D5 constructs a new QVector2D object. +func NewQVector2D5(point QPointF) *QVector2D { + ret := C.QVector2D_new5(point.cPointer()) + return newQVector2D(ret) +} + +// NewQVector2D6 constructs a new QVector2D object. +func NewQVector2D6(vector QVector3D) *QVector2D { + ret := C.QVector2D_new6(vector.cPointer()) + return newQVector2D(ret) +} + +// NewQVector2D7 constructs a new QVector2D object. +func NewQVector2D7(vector QVector4D) *QVector2D { + ret := C.QVector2D_new7(vector.cPointer()) + return newQVector2D(ret) +} + +// NewQVector2D8 constructs a new QVector2D object. +func NewQVector2D8(param1 *QVector2D) *QVector2D { + ret := C.QVector2D_new8(param1.cPointer()) + return newQVector2D(ret) +} + +func (this *QVector2D) IsNull() bool { + return (bool)(C.QVector2D_IsNull(this.h)) +} + +func (this *QVector2D) X() float32 { + return (float32)(C.QVector2D_X(this.h)) +} + +func (this *QVector2D) Y() float32 { + return (float32)(C.QVector2D_Y(this.h)) +} + +func (this *QVector2D) SetX(x float32) { + C.QVector2D_SetX(this.h, (C.float)(x)) +} + +func (this *QVector2D) SetY(y float32) { + C.QVector2D_SetY(this.h, (C.float)(y)) +} + +func (this *QVector2D) OperatorSubscript(i int) float32 { + return (float32)(C.QVector2D_OperatorSubscript(this.h, (C.int)(i))) +} + +func (this *QVector2D) Length() float32 { + return (float32)(C.QVector2D_Length(this.h)) +} + +func (this *QVector2D) LengthSquared() float32 { + return (float32)(C.QVector2D_LengthSquared(this.h)) +} + +func (this *QVector2D) Normalized() *QVector2D { + _ret := C.QVector2D_Normalized(this.h) + _goptr := newQVector2D(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QVector2D) Normalize() { + C.QVector2D_Normalize(this.h) +} + +func (this *QVector2D) DistanceToPoint(point QVector2D) float32 { + return (float32)(C.QVector2D_DistanceToPoint(this.h, point.cPointer())) +} + +func (this *QVector2D) DistanceToLine(point QVector2D, direction QVector2D) float32 { + return (float32)(C.QVector2D_DistanceToLine(this.h, point.cPointer(), direction.cPointer())) +} + +func (this *QVector2D) OperatorPlusAssign(vector QVector2D) *QVector2D { + return newQVector2D_U(unsafe.Pointer(C.QVector2D_OperatorPlusAssign(this.h, vector.cPointer()))) +} + +func (this *QVector2D) OperatorMinusAssign(vector QVector2D) *QVector2D { + return newQVector2D_U(unsafe.Pointer(C.QVector2D_OperatorMinusAssign(this.h, vector.cPointer()))) +} + +func (this *QVector2D) OperatorMultiplyAssign(factor float32) *QVector2D { + return newQVector2D_U(unsafe.Pointer(C.QVector2D_OperatorMultiplyAssign(this.h, (C.float)(factor)))) +} + +func (this *QVector2D) OperatorMultiplyAssignWithVector(vector QVector2D) *QVector2D { + return newQVector2D_U(unsafe.Pointer(C.QVector2D_OperatorMultiplyAssignWithVector(this.h, vector.cPointer()))) +} + +func (this *QVector2D) OperatorDivideAssign(divisor float32) *QVector2D { + return newQVector2D_U(unsafe.Pointer(C.QVector2D_OperatorDivideAssign(this.h, (C.float)(divisor)))) +} + +func (this *QVector2D) OperatorDivideAssignWithVector(vector QVector2D) *QVector2D { + return newQVector2D_U(unsafe.Pointer(C.QVector2D_OperatorDivideAssignWithVector(this.h, vector.cPointer()))) +} + +func QVector2D_DotProduct(v1 QVector2D, v2 QVector2D) float32 { + return (float32)(C.QVector2D_DotProduct(v1.cPointer(), v2.cPointer())) +} + +func (this *QVector2D) ToVector3D() *QVector3D { + _ret := C.QVector2D_ToVector3D(this.h) + _goptr := newQVector3D(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QVector2D) ToVector4D() *QVector4D { + _ret := C.QVector2D_ToVector4D(this.h) + _goptr := newQVector4D(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QVector2D) ToPoint() *QPoint { + _ret := C.QVector2D_ToPoint(this.h) + _goptr := newQPoint(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QVector2D) ToPointF() *QPointF { + _ret := C.QVector2D_ToPointF(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +// Delete this object from C++ memory. +func (this *QVector2D) Delete() { + C.QVector2D_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QVector2D) GoGC() { + runtime.SetFinalizer(this, func(this *QVector2D) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + +type QVector3D struct { + h *C.QVector3D +} + +func (this *QVector3D) cPointer() *C.QVector3D { + if this == nil { + return nil + } + return this.h +} + +func newQVector3D(h *C.QVector3D) *QVector3D { + if h == nil { + return nil + } + return &QVector3D{h: h} +} + +func newQVector3D_U(h unsafe.Pointer) *QVector3D { + return newQVector3D((*C.QVector3D)(h)) +} + +// NewQVector3D constructs a new QVector3D object. +func NewQVector3D() *QVector3D { + ret := C.QVector3D_new() + return newQVector3D(ret) +} + +// NewQVector3D2 constructs a new QVector3D object. +func NewQVector3D2(param1 Initialization) *QVector3D { + ret := C.QVector3D_new2((C.int)(param1)) + return newQVector3D(ret) +} + +// NewQVector3D3 constructs a new QVector3D object. +func NewQVector3D3(xpos float32, ypos float32, zpos float32) *QVector3D { + ret := C.QVector3D_new3((C.float)(xpos), (C.float)(ypos), (C.float)(zpos)) + return newQVector3D(ret) +} + +// NewQVector3D4 constructs a new QVector3D object. +func NewQVector3D4(point QPoint) *QVector3D { + ret := C.QVector3D_new4(point.cPointer()) + return newQVector3D(ret) +} + +// NewQVector3D5 constructs a new QVector3D object. +func NewQVector3D5(point QPointF) *QVector3D { + ret := C.QVector3D_new5(point.cPointer()) + return newQVector3D(ret) +} + +// NewQVector3D6 constructs a new QVector3D object. +func NewQVector3D6(vector QVector2D) *QVector3D { + ret := C.QVector3D_new6(vector.cPointer()) + return newQVector3D(ret) +} + +// NewQVector3D7 constructs a new QVector3D object. +func NewQVector3D7(vector QVector2D, zpos float32) *QVector3D { + ret := C.QVector3D_new7(vector.cPointer(), (C.float)(zpos)) + return newQVector3D(ret) +} + +// NewQVector3D8 constructs a new QVector3D object. +func NewQVector3D8(vector QVector4D) *QVector3D { + ret := C.QVector3D_new8(vector.cPointer()) + return newQVector3D(ret) +} + +// NewQVector3D9 constructs a new QVector3D object. +func NewQVector3D9(param1 *QVector3D) *QVector3D { + ret := C.QVector3D_new9(param1.cPointer()) + return newQVector3D(ret) +} + +func (this *QVector3D) IsNull() bool { + return (bool)(C.QVector3D_IsNull(this.h)) +} + +func (this *QVector3D) X() float32 { + return (float32)(C.QVector3D_X(this.h)) +} + +func (this *QVector3D) Y() float32 { + return (float32)(C.QVector3D_Y(this.h)) +} + +func (this *QVector3D) Z() float32 { + return (float32)(C.QVector3D_Z(this.h)) +} + +func (this *QVector3D) SetX(x float32) { + C.QVector3D_SetX(this.h, (C.float)(x)) +} + +func (this *QVector3D) SetY(y float32) { + C.QVector3D_SetY(this.h, (C.float)(y)) +} + +func (this *QVector3D) SetZ(z float32) { + C.QVector3D_SetZ(this.h, (C.float)(z)) +} + +func (this *QVector3D) OperatorSubscript(i int) float32 { + return (float32)(C.QVector3D_OperatorSubscript(this.h, (C.int)(i))) +} + +func (this *QVector3D) Length() float32 { + return (float32)(C.QVector3D_Length(this.h)) +} + +func (this *QVector3D) LengthSquared() float32 { + return (float32)(C.QVector3D_LengthSquared(this.h)) +} + +func (this *QVector3D) Normalized() *QVector3D { + _ret := C.QVector3D_Normalized(this.h) + _goptr := newQVector3D(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QVector3D) Normalize() { + C.QVector3D_Normalize(this.h) +} + +func (this *QVector3D) OperatorPlusAssign(vector QVector3D) *QVector3D { + return newQVector3D_U(unsafe.Pointer(C.QVector3D_OperatorPlusAssign(this.h, vector.cPointer()))) +} + +func (this *QVector3D) OperatorMinusAssign(vector QVector3D) *QVector3D { + return newQVector3D_U(unsafe.Pointer(C.QVector3D_OperatorMinusAssign(this.h, vector.cPointer()))) +} + +func (this *QVector3D) OperatorMultiplyAssign(factor float32) *QVector3D { + return newQVector3D_U(unsafe.Pointer(C.QVector3D_OperatorMultiplyAssign(this.h, (C.float)(factor)))) +} + +func (this *QVector3D) OperatorMultiplyAssignWithVector(vector QVector3D) *QVector3D { + return newQVector3D_U(unsafe.Pointer(C.QVector3D_OperatorMultiplyAssignWithVector(this.h, vector.cPointer()))) +} + +func (this *QVector3D) OperatorDivideAssign(divisor float32) *QVector3D { + return newQVector3D_U(unsafe.Pointer(C.QVector3D_OperatorDivideAssign(this.h, (C.float)(divisor)))) +} + +func (this *QVector3D) OperatorDivideAssignWithVector(vector QVector3D) *QVector3D { + return newQVector3D_U(unsafe.Pointer(C.QVector3D_OperatorDivideAssignWithVector(this.h, vector.cPointer()))) +} + +func QVector3D_DotProduct(v1 QVector3D, v2 QVector3D) float32 { + return (float32)(C.QVector3D_DotProduct(v1.cPointer(), v2.cPointer())) +} + +func QVector3D_CrossProduct(v1 QVector3D, v2 QVector3D) *QVector3D { + _ret := C.QVector3D_CrossProduct(v1.cPointer(), v2.cPointer()) + _goptr := newQVector3D(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func QVector3D_Normal(v1 QVector3D, v2 QVector3D) *QVector3D { + _ret := C.QVector3D_Normal(v1.cPointer(), v2.cPointer()) + _goptr := newQVector3D(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func QVector3D_Normal2(v1 QVector3D, v2 QVector3D, v3 QVector3D) *QVector3D { + _ret := C.QVector3D_Normal2(v1.cPointer(), v2.cPointer(), v3.cPointer()) + _goptr := newQVector3D(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QVector3D) Project(modelView *QMatrix4x4, projection *QMatrix4x4, viewport *QRect) *QVector3D { + _ret := C.QVector3D_Project(this.h, modelView.cPointer(), projection.cPointer(), viewport.cPointer()) + _goptr := newQVector3D(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QVector3D) Unproject(modelView *QMatrix4x4, projection *QMatrix4x4, viewport *QRect) *QVector3D { + _ret := C.QVector3D_Unproject(this.h, modelView.cPointer(), projection.cPointer(), viewport.cPointer()) + _goptr := newQVector3D(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QVector3D) DistanceToPoint(point QVector3D) float32 { + return (float32)(C.QVector3D_DistanceToPoint(this.h, point.cPointer())) +} + +func (this *QVector3D) DistanceToPlane(plane QVector3D, normal QVector3D) float32 { + return (float32)(C.QVector3D_DistanceToPlane(this.h, plane.cPointer(), normal.cPointer())) +} + +func (this *QVector3D) DistanceToPlane2(plane1 QVector3D, plane2 QVector3D, plane3 QVector3D) float32 { + return (float32)(C.QVector3D_DistanceToPlane2(this.h, plane1.cPointer(), plane2.cPointer(), plane3.cPointer())) +} + +func (this *QVector3D) DistanceToLine(point QVector3D, direction QVector3D) float32 { + return (float32)(C.QVector3D_DistanceToLine(this.h, point.cPointer(), direction.cPointer())) +} + +func (this *QVector3D) ToVector2D() *QVector2D { + _ret := C.QVector3D_ToVector2D(this.h) + _goptr := newQVector2D(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QVector3D) ToVector4D() *QVector4D { + _ret := C.QVector3D_ToVector4D(this.h) + _goptr := newQVector4D(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QVector3D) ToPoint() *QPoint { + _ret := C.QVector3D_ToPoint(this.h) + _goptr := newQPoint(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QVector3D) ToPointF() *QPointF { + _ret := C.QVector3D_ToPointF(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +// Delete this object from C++ memory. +func (this *QVector3D) Delete() { + C.QVector3D_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QVector3D) GoGC() { + runtime.SetFinalizer(this, func(this *QVector3D) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} + +type QVector4D struct { + h *C.QVector4D +} + +func (this *QVector4D) cPointer() *C.QVector4D { + if this == nil { + return nil + } + return this.h +} + +func newQVector4D(h *C.QVector4D) *QVector4D { + if h == nil { + return nil + } + return &QVector4D{h: h} +} + +func newQVector4D_U(h unsafe.Pointer) *QVector4D { + return newQVector4D((*C.QVector4D)(h)) +} + +// NewQVector4D constructs a new QVector4D object. +func NewQVector4D() *QVector4D { + ret := C.QVector4D_new() + return newQVector4D(ret) +} + +// NewQVector4D2 constructs a new QVector4D object. +func NewQVector4D2(param1 Initialization) *QVector4D { + ret := C.QVector4D_new2((C.int)(param1)) + return newQVector4D(ret) +} + +// NewQVector4D3 constructs a new QVector4D object. +func NewQVector4D3(xpos float32, ypos float32, zpos float32, wpos float32) *QVector4D { + ret := C.QVector4D_new3((C.float)(xpos), (C.float)(ypos), (C.float)(zpos), (C.float)(wpos)) + return newQVector4D(ret) +} + +// NewQVector4D4 constructs a new QVector4D object. +func NewQVector4D4(point QPoint) *QVector4D { + ret := C.QVector4D_new4(point.cPointer()) + return newQVector4D(ret) +} + +// NewQVector4D5 constructs a new QVector4D object. +func NewQVector4D5(point QPointF) *QVector4D { + ret := C.QVector4D_new5(point.cPointer()) + return newQVector4D(ret) +} + +// NewQVector4D6 constructs a new QVector4D object. +func NewQVector4D6(vector QVector2D) *QVector4D { + ret := C.QVector4D_new6(vector.cPointer()) + return newQVector4D(ret) +} + +// NewQVector4D7 constructs a new QVector4D object. +func NewQVector4D7(vector QVector2D, zpos float32, wpos float32) *QVector4D { + ret := C.QVector4D_new7(vector.cPointer(), (C.float)(zpos), (C.float)(wpos)) + return newQVector4D(ret) +} + +// NewQVector4D8 constructs a new QVector4D object. +func NewQVector4D8(vector QVector3D) *QVector4D { + ret := C.QVector4D_new8(vector.cPointer()) + return newQVector4D(ret) +} + +// NewQVector4D9 constructs a new QVector4D object. +func NewQVector4D9(vector QVector3D, wpos float32) *QVector4D { + ret := C.QVector4D_new9(vector.cPointer(), (C.float)(wpos)) + return newQVector4D(ret) +} + +// NewQVector4D10 constructs a new QVector4D object. +func NewQVector4D10(param1 *QVector4D) *QVector4D { + ret := C.QVector4D_new10(param1.cPointer()) + return newQVector4D(ret) +} + +func (this *QVector4D) IsNull() bool { + return (bool)(C.QVector4D_IsNull(this.h)) +} + +func (this *QVector4D) X() float32 { + return (float32)(C.QVector4D_X(this.h)) +} + +func (this *QVector4D) Y() float32 { + return (float32)(C.QVector4D_Y(this.h)) +} + +func (this *QVector4D) Z() float32 { + return (float32)(C.QVector4D_Z(this.h)) +} + +func (this *QVector4D) W() float32 { + return (float32)(C.QVector4D_W(this.h)) +} + +func (this *QVector4D) SetX(x float32) { + C.QVector4D_SetX(this.h, (C.float)(x)) +} + +func (this *QVector4D) SetY(y float32) { + C.QVector4D_SetY(this.h, (C.float)(y)) +} + +func (this *QVector4D) SetZ(z float32) { + C.QVector4D_SetZ(this.h, (C.float)(z)) +} + +func (this *QVector4D) SetW(w float32) { + C.QVector4D_SetW(this.h, (C.float)(w)) +} + +func (this *QVector4D) OperatorSubscript(i int) float32 { + return (float32)(C.QVector4D_OperatorSubscript(this.h, (C.int)(i))) +} + +func (this *QVector4D) Length() float32 { + return (float32)(C.QVector4D_Length(this.h)) +} + +func (this *QVector4D) LengthSquared() float32 { + return (float32)(C.QVector4D_LengthSquared(this.h)) +} + +func (this *QVector4D) Normalized() *QVector4D { + _ret := C.QVector4D_Normalized(this.h) + _goptr := newQVector4D(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QVector4D) Normalize() { + C.QVector4D_Normalize(this.h) +} + +func (this *QVector4D) OperatorPlusAssign(vector QVector4D) *QVector4D { + return newQVector4D_U(unsafe.Pointer(C.QVector4D_OperatorPlusAssign(this.h, vector.cPointer()))) +} + +func (this *QVector4D) OperatorMinusAssign(vector QVector4D) *QVector4D { + return newQVector4D_U(unsafe.Pointer(C.QVector4D_OperatorMinusAssign(this.h, vector.cPointer()))) +} + +func (this *QVector4D) OperatorMultiplyAssign(factor float32) *QVector4D { + return newQVector4D_U(unsafe.Pointer(C.QVector4D_OperatorMultiplyAssign(this.h, (C.float)(factor)))) +} + +func (this *QVector4D) OperatorMultiplyAssignWithVector(vector QVector4D) *QVector4D { + return newQVector4D_U(unsafe.Pointer(C.QVector4D_OperatorMultiplyAssignWithVector(this.h, vector.cPointer()))) +} + +func (this *QVector4D) OperatorDivideAssign(divisor float32) *QVector4D { + return newQVector4D_U(unsafe.Pointer(C.QVector4D_OperatorDivideAssign(this.h, (C.float)(divisor)))) +} + +func (this *QVector4D) OperatorDivideAssignWithVector(vector QVector4D) *QVector4D { + return newQVector4D_U(unsafe.Pointer(C.QVector4D_OperatorDivideAssignWithVector(this.h, vector.cPointer()))) +} + +func QVector4D_DotProduct(v1 QVector4D, v2 QVector4D) float32 { + return (float32)(C.QVector4D_DotProduct(v1.cPointer(), v2.cPointer())) +} + +func (this *QVector4D) ToVector2D() *QVector2D { + _ret := C.QVector4D_ToVector2D(this.h) + _goptr := newQVector2D(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QVector4D) ToVector2DAffine() *QVector2D { + _ret := C.QVector4D_ToVector2DAffine(this.h) + _goptr := newQVector2D(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QVector4D) ToVector3D() *QVector3D { + _ret := C.QVector4D_ToVector3D(this.h) + _goptr := newQVector3D(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QVector4D) ToVector3DAffine() *QVector3D { + _ret := C.QVector4D_ToVector3DAffine(this.h) + _goptr := newQVector3D(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QVector4D) ToPoint() *QPoint { + _ret := C.QVector4D_ToPoint(this.h) + _goptr := newQPoint(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QVector4D) ToPointF() *QPointF { + _ret := C.QVector4D_ToPointF(this.h) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +// Delete this object from C++ memory. +func (this *QVector4D) Delete() { + C.QVector4D_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QVector4D) GoGC() { + runtime.SetFinalizer(this, func(this *QVector4D) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} diff --git a/qt/gen_qvectornd.h b/qt/gen_qvectornd.h new file mode 100644 index 0000000..b89b4e4 --- /dev/null +++ b/qt/gen_qvectornd.h @@ -0,0 +1,153 @@ +#ifndef GEN_QVECTORND_H +#define GEN_QVECTORND_H + +#include +#include +#include + +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + +#include "binding.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +class QMatrix4x4; +class QPoint; +class QPointF; +class QRect; +class QVector2D; +class QVector3D; +class QVector4D; +#else +typedef struct QMatrix4x4 QMatrix4x4; +typedef struct QPoint QPoint; +typedef struct QPointF QPointF; +typedef struct QRect QRect; +typedef struct QVector2D QVector2D; +typedef struct QVector3D QVector3D; +typedef struct QVector4D QVector4D; +#endif + +QVector2D* QVector2D_new(); +QVector2D* QVector2D_new2(int param1); +QVector2D* QVector2D_new3(float xpos, float ypos); +QVector2D* QVector2D_new4(QPoint* point); +QVector2D* QVector2D_new5(QPointF* point); +QVector2D* QVector2D_new6(QVector3D* vector); +QVector2D* QVector2D_new7(QVector4D* vector); +QVector2D* QVector2D_new8(QVector2D* param1); +bool QVector2D_IsNull(const QVector2D* self); +float QVector2D_X(const QVector2D* self); +float QVector2D_Y(const QVector2D* self); +void QVector2D_SetX(QVector2D* self, float x); +void QVector2D_SetY(QVector2D* self, float y); +float QVector2D_OperatorSubscript(const QVector2D* self, int i); +float QVector2D_Length(const QVector2D* self); +float QVector2D_LengthSquared(const QVector2D* self); +QVector2D* QVector2D_Normalized(const QVector2D* self); +void QVector2D_Normalize(QVector2D* self); +float QVector2D_DistanceToPoint(const QVector2D* self, QVector2D* point); +float QVector2D_DistanceToLine(const QVector2D* self, QVector2D* point, QVector2D* direction); +QVector2D* QVector2D_OperatorPlusAssign(QVector2D* self, QVector2D* vector); +QVector2D* QVector2D_OperatorMinusAssign(QVector2D* self, QVector2D* vector); +QVector2D* QVector2D_OperatorMultiplyAssign(QVector2D* self, float factor); +QVector2D* QVector2D_OperatorMultiplyAssignWithVector(QVector2D* self, QVector2D* vector); +QVector2D* QVector2D_OperatorDivideAssign(QVector2D* self, float divisor); +QVector2D* QVector2D_OperatorDivideAssignWithVector(QVector2D* self, QVector2D* vector); +float QVector2D_DotProduct(QVector2D* v1, QVector2D* v2); +QVector3D* QVector2D_ToVector3D(const QVector2D* self); +QVector4D* QVector2D_ToVector4D(const QVector2D* self); +QPoint* QVector2D_ToPoint(const QVector2D* self); +QPointF* QVector2D_ToPointF(const QVector2D* self); +void QVector2D_Delete(QVector2D* self); + +QVector3D* QVector3D_new(); +QVector3D* QVector3D_new2(int param1); +QVector3D* QVector3D_new3(float xpos, float ypos, float zpos); +QVector3D* QVector3D_new4(QPoint* point); +QVector3D* QVector3D_new5(QPointF* point); +QVector3D* QVector3D_new6(QVector2D* vector); +QVector3D* QVector3D_new7(QVector2D* vector, float zpos); +QVector3D* QVector3D_new8(QVector4D* vector); +QVector3D* QVector3D_new9(QVector3D* param1); +bool QVector3D_IsNull(const QVector3D* self); +float QVector3D_X(const QVector3D* self); +float QVector3D_Y(const QVector3D* self); +float QVector3D_Z(const QVector3D* self); +void QVector3D_SetX(QVector3D* self, float x); +void QVector3D_SetY(QVector3D* self, float y); +void QVector3D_SetZ(QVector3D* self, float z); +float QVector3D_OperatorSubscript(const QVector3D* self, int i); +float QVector3D_Length(const QVector3D* self); +float QVector3D_LengthSquared(const QVector3D* self); +QVector3D* QVector3D_Normalized(const QVector3D* self); +void QVector3D_Normalize(QVector3D* self); +QVector3D* QVector3D_OperatorPlusAssign(QVector3D* self, QVector3D* vector); +QVector3D* QVector3D_OperatorMinusAssign(QVector3D* self, QVector3D* vector); +QVector3D* QVector3D_OperatorMultiplyAssign(QVector3D* self, float factor); +QVector3D* QVector3D_OperatorMultiplyAssignWithVector(QVector3D* self, QVector3D* vector); +QVector3D* QVector3D_OperatorDivideAssign(QVector3D* self, float divisor); +QVector3D* QVector3D_OperatorDivideAssignWithVector(QVector3D* self, QVector3D* vector); +float QVector3D_DotProduct(QVector3D* v1, QVector3D* v2); +QVector3D* QVector3D_CrossProduct(QVector3D* v1, QVector3D* v2); +QVector3D* QVector3D_Normal(QVector3D* v1, QVector3D* v2); +QVector3D* QVector3D_Normal2(QVector3D* v1, QVector3D* v2, QVector3D* v3); +QVector3D* QVector3D_Project(const QVector3D* self, QMatrix4x4* modelView, QMatrix4x4* projection, QRect* viewport); +QVector3D* QVector3D_Unproject(const QVector3D* self, QMatrix4x4* modelView, QMatrix4x4* projection, QRect* viewport); +float QVector3D_DistanceToPoint(const QVector3D* self, QVector3D* point); +float QVector3D_DistanceToPlane(const QVector3D* self, QVector3D* plane, QVector3D* normal); +float QVector3D_DistanceToPlane2(const QVector3D* self, QVector3D* plane1, QVector3D* plane2, QVector3D* plane3); +float QVector3D_DistanceToLine(const QVector3D* self, QVector3D* point, QVector3D* direction); +QVector2D* QVector3D_ToVector2D(const QVector3D* self); +QVector4D* QVector3D_ToVector4D(const QVector3D* self); +QPoint* QVector3D_ToPoint(const QVector3D* self); +QPointF* QVector3D_ToPointF(const QVector3D* self); +void QVector3D_Delete(QVector3D* self); + +QVector4D* QVector4D_new(); +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); +QVector4D* QVector4D_new6(QVector2D* vector); +QVector4D* QVector4D_new7(QVector2D* vector, float zpos, float wpos); +QVector4D* QVector4D_new8(QVector3D* vector); +QVector4D* QVector4D_new9(QVector3D* vector, float wpos); +QVector4D* QVector4D_new10(QVector4D* param1); +bool QVector4D_IsNull(const QVector4D* self); +float QVector4D_X(const QVector4D* self); +float QVector4D_Y(const QVector4D* self); +float QVector4D_Z(const QVector4D* self); +float QVector4D_W(const QVector4D* self); +void QVector4D_SetX(QVector4D* self, float x); +void QVector4D_SetY(QVector4D* self, float y); +void QVector4D_SetZ(QVector4D* self, float z); +void QVector4D_SetW(QVector4D* self, float w); +float QVector4D_OperatorSubscript(const QVector4D* self, int i); +float QVector4D_Length(const QVector4D* self); +float QVector4D_LengthSquared(const QVector4D* self); +QVector4D* QVector4D_Normalized(const QVector4D* self); +void QVector4D_Normalize(QVector4D* self); +QVector4D* QVector4D_OperatorPlusAssign(QVector4D* self, QVector4D* vector); +QVector4D* QVector4D_OperatorMinusAssign(QVector4D* self, QVector4D* vector); +QVector4D* QVector4D_OperatorMultiplyAssign(QVector4D* self, float factor); +QVector4D* QVector4D_OperatorMultiplyAssignWithVector(QVector4D* self, QVector4D* vector); +QVector4D* QVector4D_OperatorDivideAssign(QVector4D* self, float divisor); +QVector4D* QVector4D_OperatorDivideAssignWithVector(QVector4D* self, QVector4D* vector); +float QVector4D_DotProduct(QVector4D* v1, QVector4D* v2); +QVector2D* QVector4D_ToVector2D(const QVector4D* self); +QVector2D* QVector4D_ToVector2DAffine(const QVector4D* self); +QVector3D* QVector4D_ToVector3D(const QVector4D* self); +QVector3D* QVector4D_ToVector3DAffine(const QVector4D* self); +QPoint* QVector4D_ToPoint(const QVector4D* self); +QPointF* QVector4D_ToPointF(const QVector4D* self); +void QVector4D_Delete(QVector4D* self); + +#ifdef __cplusplus +} /* extern C */ +#endif + +#endif diff --git a/qt/gen_qversionnumber.cpp b/qt/gen_qversionnumber.cpp index 2f9218a..b267212 100644 --- a/qt/gen_qversionnumber.cpp +++ b/qt/gen_qversionnumber.cpp @@ -1,7 +1,9 @@ +#include #include #include #include #include +#include #include #include "qversionnumber.h" #include "gen_qversionnumber.h" @@ -12,7 +14,7 @@ QVersionNumber* QVersionNumber_new() { } QVersionNumber* QVersionNumber_new2(struct miqt_array* /* of int */ seg) { - QVector seg_QList; + QList seg_QList; seg_QList.reserve(seg->len); int* seg_arr = static_cast(seg->data); for(size_t i = 0; i < seg->len; ++i) { @@ -33,6 +35,10 @@ QVersionNumber* QVersionNumber_new5(int maj, int min, int mic) { return new QVersionNumber(static_cast(maj), static_cast(min), static_cast(mic)); } +QVersionNumber* QVersionNumber_new6(QVersionNumber* param1) { + return new QVersionNumber(*param1); +} + bool QVersionNumber_IsNull(const QVersionNumber* self) { return self->isNull(); } @@ -58,7 +64,7 @@ QVersionNumber* QVersionNumber_Normalized(const QVersionNumber* self) { } struct miqt_array* QVersionNumber_Segments(const QVersionNumber* self) { - QVector _ret = self->segments(); + QList _ret = self->segments(); // Convert QList<> from C++ memory to manually-managed C memory int* _arr = static_cast(malloc(sizeof(int) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -70,12 +76,13 @@ struct miqt_array* QVersionNumber_Segments(const QVersionNumber* self) { return _out; } -int QVersionNumber_SegmentAt(const QVersionNumber* self, int index) { - return self->segmentAt(static_cast(index)); +int QVersionNumber_SegmentAt(const QVersionNumber* self, ptrdiff_t index) { + return self->segmentAt((qsizetype)(index)); } -int QVersionNumber_SegmentCount(const QVersionNumber* self) { - return self->segmentCount(); +ptrdiff_t QVersionNumber_SegmentCount(const QVersionNumber* self) { + qsizetype _ret = self->segmentCount(); + return static_cast(_ret); } bool QVersionNumber_IsPrefixOf(const QVersionNumber* self, QVersionNumber* other) { @@ -97,17 +104,53 @@ struct miqt_string* QVersionNumber_ToString(const QVersionNumber* self) { return miqt_strdup(_b.data(), _b.length()); } -QVersionNumber* QVersionNumber_FromString(struct miqt_string* stringVal) { - QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); - return new QVersionNumber(QVersionNumber::fromString(stringVal_QString)); +QVersionNumber* QVersionNumber_FromString(QAnyStringView* stringVal) { + return new QVersionNumber(QVersionNumber::fromString(*stringVal)); } -QVersionNumber* QVersionNumber_FromString22(struct miqt_string* stringVal, int* suffixIndex) { - QString stringVal_QString = QString::fromUtf8(&stringVal->data, stringVal->len); - return new QVersionNumber(QVersionNumber::fromString(stringVal_QString, static_cast(suffixIndex))); +QVersionNumber* QVersionNumber_FromString2(QAnyStringView* stringVal, ptrdiff_t* suffixIndex) { + return new QVersionNumber(QVersionNumber::fromString(*stringVal, (qsizetype*)(suffixIndex))); } void QVersionNumber_Delete(QVersionNumber* self) { delete self; } +QTypeRevision* QTypeRevision_new() { + return new QTypeRevision(); +} + +QTypeRevision* QTypeRevision_new2(QTypeRevision* param1) { + return new QTypeRevision(*param1); +} + +QTypeRevision* QTypeRevision_Zero() { + return new QTypeRevision(QTypeRevision::zero()); +} + +bool QTypeRevision_HasMajorVersion(const QTypeRevision* self) { + return self->hasMajorVersion(); +} + +unsigned char QTypeRevision_MajorVersion(const QTypeRevision* self) { + quint8 _ret = self->majorVersion(); + return static_cast(_ret); +} + +bool QTypeRevision_HasMinorVersion(const QTypeRevision* self) { + return self->hasMinorVersion(); +} + +unsigned char QTypeRevision_MinorVersion(const QTypeRevision* self) { + quint8 _ret = self->minorVersion(); + return static_cast(_ret); +} + +bool QTypeRevision_IsValid(const QTypeRevision* self) { + return self->isValid(); +} + +void QTypeRevision_Delete(QTypeRevision* self) { + delete self; +} + diff --git a/qt/gen_qversionnumber.go b/qt/gen_qversionnumber.go index 2c0924d..7b1fdbe 100644 --- a/qt/gen_qversionnumber.go +++ b/qt/gen_qversionnumber.go @@ -73,6 +73,12 @@ func NewQVersionNumber5(maj int, min int, mic int) *QVersionNumber { return newQVersionNumber(ret) } +// NewQVersionNumber6 constructs a new QVersionNumber object. +func NewQVersionNumber6(param1 *QVersionNumber) *QVersionNumber { + ret := C.QVersionNumber_new6(param1.cPointer()) + return newQVersionNumber(ret) +} + func (this *QVersionNumber) IsNull() bool { return (bool)(C.QVersionNumber_IsNull(this.h)) } @@ -111,12 +117,12 @@ func (this *QVersionNumber) Segments() []int { return _ret } -func (this *QVersionNumber) SegmentAt(index int) int { - return (int)(C.QVersionNumber_SegmentAt(this.h, (C.int)(index))) +func (this *QVersionNumber) SegmentAt(index int64) int { + return (int)(C.QVersionNumber_SegmentAt(this.h, (C.ptrdiff_t)(index))) } -func (this *QVersionNumber) SegmentCount() int { - return (int)(C.QVersionNumber_SegmentCount(this.h)) +func (this *QVersionNumber) SegmentCount() int64 { + return (int64)(C.QVersionNumber_SegmentCount(this.h)) } func (this *QVersionNumber) IsPrefixOf(other *QVersionNumber) bool { @@ -141,19 +147,15 @@ func (this *QVersionNumber) ToString() string { return _ret } -func QVersionNumber_FromString(stringVal string) *QVersionNumber { - stringVal_ms := miqt_strdupg(stringVal) - defer C.free(stringVal_ms) - _ret := C.QVersionNumber_FromString((*C.struct_miqt_string)(stringVal_ms)) +func QVersionNumber_FromString(stringVal QAnyStringView) *QVersionNumber { + _ret := C.QVersionNumber_FromString(stringVal.cPointer()) _goptr := newQVersionNumber(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QVersionNumber_FromString22(stringVal string, suffixIndex *int) *QVersionNumber { - stringVal_ms := miqt_strdupg(stringVal) - defer C.free(stringVal_ms) - _ret := C.QVersionNumber_FromString22((*C.struct_miqt_string)(stringVal_ms), (*C.int)(unsafe.Pointer(suffixIndex))) +func QVersionNumber_FromString2(stringVal QAnyStringView, suffixIndex *int64) *QVersionNumber { + _ret := C.QVersionNumber_FromString2(stringVal.cPointer(), (*C.ptrdiff_t)(unsafe.Pointer(suffixIndex))) _goptr := newQVersionNumber(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -172,3 +174,78 @@ func (this *QVersionNumber) GoGC() { runtime.KeepAlive(this.h) }) } + +type QTypeRevision struct { + h *C.QTypeRevision +} + +func (this *QTypeRevision) cPointer() *C.QTypeRevision { + if this == nil { + return nil + } + return this.h +} + +func newQTypeRevision(h *C.QTypeRevision) *QTypeRevision { + if h == nil { + return nil + } + return &QTypeRevision{h: h} +} + +func newQTypeRevision_U(h unsafe.Pointer) *QTypeRevision { + return newQTypeRevision((*C.QTypeRevision)(h)) +} + +// NewQTypeRevision constructs a new QTypeRevision object. +func NewQTypeRevision() *QTypeRevision { + ret := C.QTypeRevision_new() + return newQTypeRevision(ret) +} + +// NewQTypeRevision2 constructs a new QTypeRevision object. +func NewQTypeRevision2(param1 *QTypeRevision) *QTypeRevision { + ret := C.QTypeRevision_new2(param1.cPointer()) + return newQTypeRevision(ret) +} + +func QTypeRevision_Zero() *QTypeRevision { + _ret := C.QTypeRevision_Zero() + _goptr := newQTypeRevision(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QTypeRevision) HasMajorVersion() bool { + return (bool)(C.QTypeRevision_HasMajorVersion(this.h)) +} + +func (this *QTypeRevision) MajorVersion() byte { + return (byte)(C.QTypeRevision_MajorVersion(this.h)) +} + +func (this *QTypeRevision) HasMinorVersion() bool { + return (bool)(C.QTypeRevision_HasMinorVersion(this.h)) +} + +func (this *QTypeRevision) MinorVersion() byte { + return (byte)(C.QTypeRevision_MinorVersion(this.h)) +} + +func (this *QTypeRevision) IsValid() bool { + return (bool)(C.QTypeRevision_IsValid(this.h)) +} + +// Delete this object from C++ memory. +func (this *QTypeRevision) Delete() { + C.QTypeRevision_Delete(this.h) +} + +// GoGC adds a Go Finalizer to this pointer, so that it will be deleted +// from C++ memory once it is unreachable from Go memory. +func (this *QTypeRevision) GoGC() { + runtime.SetFinalizer(this, func(this *QTypeRevision) { + this.Delete() + runtime.KeepAlive(this.h) + }) +} diff --git a/qt/gen_qversionnumber.h b/qt/gen_qversionnumber.h index 4f19b36..a930eea 100644 --- a/qt/gen_qversionnumber.h +++ b/qt/gen_qversionnumber.h @@ -14,8 +14,12 @@ extern "C" { #endif #ifdef __cplusplus +class QAnyStringView; +class QTypeRevision; class QVersionNumber; #else +typedef struct QAnyStringView QAnyStringView; +typedef struct QTypeRevision QTypeRevision; typedef struct QVersionNumber QVersionNumber; #endif @@ -24,6 +28,7 @@ QVersionNumber* QVersionNumber_new2(struct miqt_array* /* of int */ seg); QVersionNumber* QVersionNumber_new3(int maj); QVersionNumber* QVersionNumber_new4(int maj, int min); QVersionNumber* QVersionNumber_new5(int maj, int min, int mic); +QVersionNumber* QVersionNumber_new6(QVersionNumber* param1); bool QVersionNumber_IsNull(const QVersionNumber* self); bool QVersionNumber_IsNormalized(const QVersionNumber* self); int QVersionNumber_MajorVersion(const QVersionNumber* self); @@ -31,16 +36,26 @@ int QVersionNumber_MinorVersion(const QVersionNumber* self); int QVersionNumber_MicroVersion(const QVersionNumber* self); QVersionNumber* QVersionNumber_Normalized(const QVersionNumber* self); struct miqt_array* QVersionNumber_Segments(const QVersionNumber* self); -int QVersionNumber_SegmentAt(const QVersionNumber* self, int index); -int QVersionNumber_SegmentCount(const QVersionNumber* self); +int QVersionNumber_SegmentAt(const QVersionNumber* self, ptrdiff_t index); +ptrdiff_t QVersionNumber_SegmentCount(const QVersionNumber* self); bool QVersionNumber_IsPrefixOf(const QVersionNumber* self, QVersionNumber* other); int QVersionNumber_Compare(QVersionNumber* v1, QVersionNumber* v2); QVersionNumber* QVersionNumber_CommonPrefix(QVersionNumber* v1, QVersionNumber* v2); struct miqt_string* QVersionNumber_ToString(const QVersionNumber* self); -QVersionNumber* QVersionNumber_FromString(struct miqt_string* stringVal); -QVersionNumber* QVersionNumber_FromString22(struct miqt_string* stringVal, int* suffixIndex); +QVersionNumber* QVersionNumber_FromString(QAnyStringView* stringVal); +QVersionNumber* QVersionNumber_FromString2(QAnyStringView* stringVal, ptrdiff_t* suffixIndex); void QVersionNumber_Delete(QVersionNumber* self); +QTypeRevision* QTypeRevision_new(); +QTypeRevision* QTypeRevision_new2(QTypeRevision* param1); +QTypeRevision* QTypeRevision_Zero(); +bool QTypeRevision_HasMajorVersion(const QTypeRevision* self); +unsigned char QTypeRevision_MajorVersion(const QTypeRevision* self); +bool QTypeRevision_HasMinorVersion(const QTypeRevision* self); +unsigned char QTypeRevision_MinorVersion(const QTypeRevision* self); +bool QTypeRevision_IsValid(const QTypeRevision* self); +void QTypeRevision_Delete(QTypeRevision* self); + #ifdef __cplusplus } /* extern C */ #endif diff --git a/qt/gen_qwidget.cpp b/qt/gen_qwidget.cpp index ec349ee..caf2388 100644 --- a/qt/gen_qwidget.cpp +++ b/qt/gen_qwidget.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -77,13 +78,6 @@ struct miqt_string* QWidget_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QWidget_TrUtf8(const char* s) { - QString _ret = QWidget::trUtf8(s); - // 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()); -} - int QWidget_DevType(const QWidget* self) { return self->devType(); } @@ -144,10 +138,6 @@ bool QWidget_IsEnabledTo(const QWidget* self, QWidget* param1) { return self->isEnabledTo(param1); } -bool QWidget_IsEnabledToTLW(const QWidget* self) { - return self->isEnabledToTLW(); -} - void QWidget_SetEnabled(QWidget* self, bool enabled) { self->setEnabled(enabled); } @@ -310,27 +300,51 @@ void QWidget_SetFixedHeight(QWidget* self, int h) { self->setFixedHeight(static_cast(h)); } -QPoint* QWidget_MapToGlobal(const QWidget* self, QPoint* param1) { +QPointF* QWidget_MapToGlobal(const QWidget* self, QPointF* param1) { + return new QPointF(self->mapToGlobal(*param1)); +} + +QPoint* QWidget_MapToGlobalWithQPoint(const QWidget* self, QPoint* param1) { return new QPoint(self->mapToGlobal(*param1)); } -QPoint* QWidget_MapFromGlobal(const QWidget* self, QPoint* param1) { +QPointF* QWidget_MapFromGlobal(const QWidget* self, QPointF* param1) { + return new QPointF(self->mapFromGlobal(*param1)); +} + +QPoint* QWidget_MapFromGlobalWithQPoint(const QWidget* self, QPoint* param1) { return new QPoint(self->mapFromGlobal(*param1)); } -QPoint* QWidget_MapToParent(const QWidget* self, QPoint* param1) { +QPointF* QWidget_MapToParent(const QWidget* self, QPointF* param1) { + return new QPointF(self->mapToParent(*param1)); +} + +QPoint* QWidget_MapToParentWithQPoint(const QWidget* self, QPoint* param1) { return new QPoint(self->mapToParent(*param1)); } -QPoint* QWidget_MapFromParent(const QWidget* self, QPoint* param1) { +QPointF* QWidget_MapFromParent(const QWidget* self, QPointF* param1) { + return new QPointF(self->mapFromParent(*param1)); +} + +QPoint* QWidget_MapFromParentWithQPoint(const QWidget* self, QPoint* param1) { return new QPoint(self->mapFromParent(*param1)); } -QPoint* QWidget_MapTo(const QWidget* self, QWidget* param1, QPoint* param2) { +QPointF* QWidget_MapTo(const QWidget* self, QWidget* param1, QPointF* param2) { + return new QPointF(self->mapTo(param1, *param2)); +} + +QPoint* QWidget_MapTo2(const QWidget* self, QWidget* param1, QPoint* param2) { return new QPoint(self->mapTo(param1, *param2)); } -QPoint* QWidget_MapFrom(const QWidget* self, QWidget* param1, QPoint* param2) { +QPointF* QWidget_MapFrom(const QWidget* self, QWidget* param1, QPointF* param2) { + return new QPointF(self->mapFrom(param1, *param2)); +} + +QPoint* QWidget_MapFrom2(const QWidget* self, QWidget* param1, QPoint* param2) { return new QPoint(self->mapFrom(param1, *param2)); } @@ -953,10 +967,6 @@ void QWidget_SetContentsMarginsWithMargins(QWidget* self, QMargins* margins) { self->setContentsMargins(*margins); } -void QWidget_GetContentsMargins(const QWidget* self, int* left, int* top, int* right, int* bottom) { - self->getContentsMargins(static_cast(left), static_cast(top), static_cast(right), static_cast(bottom)); -} - QMargins* QWidget_ContentsMargins(const QWidget* self) { return new QMargins(self->contentsMargins()); } @@ -1058,6 +1068,26 @@ struct miqt_array* QWidget_Actions(const QWidget* self) { return _out; } +QAction* QWidget_AddActionWithText(QWidget* self, struct miqt_string* text) { + QString text_QString = QString::fromUtf8(&text->data, text->len); + return self->addAction(text_QString); +} + +QAction* QWidget_AddAction2(QWidget* self, QIcon* icon, struct miqt_string* text) { + QString text_QString = QString::fromUtf8(&text->data, text->len); + return self->addAction(*icon, text_QString); +} + +QAction* QWidget_AddAction3(QWidget* self, struct miqt_string* text, QKeySequence* shortcut) { + QString text_QString = QString::fromUtf8(&text->data, text->len); + return self->addAction(text_QString, *shortcut); +} + +QAction* QWidget_AddAction4(QWidget* self, QIcon* icon, struct miqt_string* text, QKeySequence* shortcut) { + QString text_QString = QString::fromUtf8(&text->data, text->len); + return self->addAction(*icon, text_QString, *shortcut); +} + QWidget* QWidget_ParentWidget(const QWidget* self) { return self->parentWidget(); } @@ -1136,6 +1166,10 @@ QScreen* QWidget_Screen(const QWidget* self) { return self->screen(); } +void QWidget_SetScreen(QWidget* self, QScreen* screen) { + self->setScreen(screen); +} + QWidget* QWidget_CreateWindowContainer(QWindow* window) { return QWidget::createWindowContainer(window); } @@ -1223,20 +1257,6 @@ struct miqt_string* QWidget_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QWidget_TrUtf82(const char* s, const char* c) { - QString _ret = QWidget::trUtf8(s, c); - // 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* QWidget_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QWidget::trUtf8(s, c, static_cast(n)); - // 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 QWidget_Render2(QWidget* self, QPaintDevice* target, QPoint* targetOffset) { self->render(target, *targetOffset); } diff --git a/qt/gen_qwidget.go b/qt/gen_qwidget.go index c017099..be43276 100644 --- a/qt/gen_qwidget.go +++ b/qt/gen_qwidget.go @@ -129,15 +129,6 @@ func QWidget_Tr(s string) string { return _ret } -func QWidget_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QWidget_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QWidget) DevType() int { return (int)(C.QWidget_DevType(this.h)) } @@ -194,10 +185,6 @@ func (this *QWidget) IsEnabledTo(param1 *QWidget) bool { return (bool)(C.QWidget_IsEnabledTo(this.h, param1.cPointer())) } -func (this *QWidget) IsEnabledToTLW() bool { - return (bool)(C.QWidget_IsEnabledToTLW(this.h)) -} - func (this *QWidget) SetEnabled(enabled bool) { C.QWidget_SetEnabled(this.h, (C.bool)(enabled)) } @@ -394,43 +381,85 @@ func (this *QWidget) SetFixedHeight(h int) { C.QWidget_SetFixedHeight(this.h, (C.int)(h)) } -func (this *QWidget) MapToGlobal(param1 *QPoint) *QPoint { +func (this *QWidget) MapToGlobal(param1 *QPointF) *QPointF { _ret := C.QWidget_MapToGlobal(this.h, param1.cPointer()) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QWidget) MapToGlobalWithQPoint(param1 *QPoint) *QPoint { + _ret := C.QWidget_MapToGlobalWithQPoint(this.h, param1.cPointer()) _goptr := newQPoint(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QWidget) MapFromGlobal(param1 *QPoint) *QPoint { +func (this *QWidget) MapFromGlobal(param1 *QPointF) *QPointF { _ret := C.QWidget_MapFromGlobal(this.h, param1.cPointer()) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QWidget) MapFromGlobalWithQPoint(param1 *QPoint) *QPoint { + _ret := C.QWidget_MapFromGlobalWithQPoint(this.h, param1.cPointer()) _goptr := newQPoint(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QWidget) MapToParent(param1 *QPoint) *QPoint { +func (this *QWidget) MapToParent(param1 *QPointF) *QPointF { _ret := C.QWidget_MapToParent(this.h, param1.cPointer()) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QWidget) MapToParentWithQPoint(param1 *QPoint) *QPoint { + _ret := C.QWidget_MapToParentWithQPoint(this.h, param1.cPointer()) _goptr := newQPoint(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QWidget) MapFromParent(param1 *QPoint) *QPoint { +func (this *QWidget) MapFromParent(param1 *QPointF) *QPointF { _ret := C.QWidget_MapFromParent(this.h, param1.cPointer()) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QWidget) MapFromParentWithQPoint(param1 *QPoint) *QPoint { + _ret := C.QWidget_MapFromParentWithQPoint(this.h, param1.cPointer()) _goptr := newQPoint(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QWidget) MapTo(param1 *QWidget, param2 *QPoint) *QPoint { +func (this *QWidget) MapTo(param1 *QWidget, param2 *QPointF) *QPointF { _ret := C.QWidget_MapTo(this.h, param1.cPointer(), param2.cPointer()) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QWidget) MapTo2(param1 *QWidget, param2 *QPoint) *QPoint { + _ret := C.QWidget_MapTo2(this.h, param1.cPointer(), param2.cPointer()) _goptr := newQPoint(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QWidget) MapFrom(param1 *QWidget, param2 *QPoint) *QPoint { +func (this *QWidget) MapFrom(param1 *QWidget, param2 *QPointF) *QPointF { _ret := C.QWidget_MapFrom(this.h, param1.cPointer(), param2.cPointer()) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QWidget) MapFrom2(param1 *QWidget, param2 *QPoint) *QPoint { + _ret := C.QWidget_MapFrom2(this.h, param1.cPointer(), param2.cPointer()) _goptr := newQPoint(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -1090,10 +1119,6 @@ func (this *QWidget) SetContentsMarginsWithMargins(margins *QMargins) { C.QWidget_SetContentsMarginsWithMargins(this.h, margins.cPointer()) } -func (this *QWidget) GetContentsMargins(left *int, top *int, right *int, bottom *int) { - C.QWidget_GetContentsMargins(this.h, (*C.int)(unsafe.Pointer(left)), (*C.int)(unsafe.Pointer(top)), (*C.int)(unsafe.Pointer(right)), (*C.int)(unsafe.Pointer(bottom))) -} - func (this *QWidget) ContentsMargins() *QMargins { _ret := C.QWidget_ContentsMargins(this.h) _goptr := newQMargins(_ret) @@ -1203,6 +1228,30 @@ func (this *QWidget) Actions() []*QAction { return _ret } +func (this *QWidget) AddActionWithText(text string) *QAction { + text_ms := miqt_strdupg(text) + defer C.free(text_ms) + return newQAction_U(unsafe.Pointer(C.QWidget_AddActionWithText(this.h, (*C.struct_miqt_string)(text_ms)))) +} + +func (this *QWidget) AddAction2(icon *QIcon, text string) *QAction { + text_ms := miqt_strdupg(text) + defer C.free(text_ms) + return newQAction_U(unsafe.Pointer(C.QWidget_AddAction2(this.h, icon.cPointer(), (*C.struct_miqt_string)(text_ms)))) +} + +func (this *QWidget) AddAction3(text string, shortcut *QKeySequence) *QAction { + text_ms := miqt_strdupg(text) + defer C.free(text_ms) + return newQAction_U(unsafe.Pointer(C.QWidget_AddAction3(this.h, (*C.struct_miqt_string)(text_ms), shortcut.cPointer()))) +} + +func (this *QWidget) AddAction4(icon *QIcon, text string, shortcut *QKeySequence) *QAction { + text_ms := miqt_strdupg(text) + defer C.free(text_ms) + return newQAction_U(unsafe.Pointer(C.QWidget_AddAction4(this.h, icon.cPointer(), (*C.struct_miqt_string)(text_ms), shortcut.cPointer()))) +} + func (this *QWidget) ParentWidget() *QWidget { return newQWidget_U(unsafe.Pointer(C.QWidget_ParentWidget(this.h))) } @@ -1279,6 +1328,10 @@ func (this *QWidget) Screen() *QScreen { return newQScreen_U(unsafe.Pointer(C.QWidget_Screen(this.h))) } +func (this *QWidget) SetScreen(screen *QScreen) { + C.QWidget_SetScreen(this.h, screen.cPointer()) +} + func QWidget_CreateWindowContainer(window *QWindow) *QWidget { return newQWidget_U(unsafe.Pointer(C.QWidget_CreateWindowContainer(window.cPointer()))) } @@ -1410,28 +1463,6 @@ func QWidget_Tr3(s string, c string, n int) string { return _ret } -func QWidget_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QWidget_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QWidget_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QWidget_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QWidget) Render2(target *QPaintDevice, targetOffset *QPoint) { C.QWidget_Render2(this.h, target.cPointer(), targetOffset.cPointer()) } diff --git a/qt/gen_qwidget.h b/qt/gen_qwidget.h index 1edaa58..f041b9f 100644 --- a/qt/gen_qwidget.h +++ b/qt/gen_qwidget.h @@ -36,6 +36,7 @@ class QPainter; class QPalette; class QPixmap; class QPoint; +class QPointF; class QRect; class QRegion; class QScreen; @@ -69,6 +70,7 @@ typedef struct QPainter QPainter; typedef struct QPalette QPalette; typedef struct QPixmap QPixmap; typedef struct QPoint QPoint; +typedef struct QPointF QPointF; typedef struct QRect QRect; typedef struct QRegion QRegion; typedef struct QScreen QScreen; @@ -91,7 +93,6 @@ QWidget* QWidget_new3(QWidget* parent, int f); QMetaObject* QWidget_MetaObject(const QWidget* self); void* QWidget_Metacast(QWidget* self, const char* param1); struct miqt_string* QWidget_Tr(const char* s); -struct miqt_string* QWidget_TrUtf8(const char* s); int QWidget_DevType(const QWidget* self); uintptr_t QWidget_WinId(const QWidget* self); void QWidget_CreateWinId(QWidget* self); @@ -106,7 +107,6 @@ 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); void QWidget_SetEnabled(QWidget* self, bool enabled); void QWidget_SetDisabled(QWidget* self, bool disabled); void QWidget_SetWindowModified(QWidget* self, bool windowModified); @@ -147,12 +147,18 @@ void QWidget_SetFixedSize(QWidget* self, QSize* fixedSize); void QWidget_SetFixedSize2(QWidget* self, int w, int h); void QWidget_SetFixedWidth(QWidget* self, int w); void QWidget_SetFixedHeight(QWidget* self, int h); -QPoint* QWidget_MapToGlobal(const QWidget* self, QPoint* param1); -QPoint* QWidget_MapFromGlobal(const QWidget* self, QPoint* param1); -QPoint* QWidget_MapToParent(const QWidget* self, QPoint* param1); -QPoint* QWidget_MapFromParent(const QWidget* self, QPoint* param1); -QPoint* QWidget_MapTo(const QWidget* self, QWidget* param1, QPoint* param2); -QPoint* QWidget_MapFrom(const QWidget* self, QWidget* param1, QPoint* param2); +QPointF* QWidget_MapToGlobal(const QWidget* self, QPointF* param1); +QPoint* QWidget_MapToGlobalWithQPoint(const QWidget* self, QPoint* param1); +QPointF* QWidget_MapFromGlobal(const QWidget* self, QPointF* param1); +QPoint* QWidget_MapFromGlobalWithQPoint(const QWidget* self, QPoint* param1); +QPointF* QWidget_MapToParent(const QWidget* self, QPointF* param1); +QPoint* QWidget_MapToParentWithQPoint(const QWidget* self, QPoint* param1); +QPointF* QWidget_MapFromParent(const QWidget* self, QPointF* param1); +QPoint* QWidget_MapFromParentWithQPoint(const QWidget* self, QPoint* param1); +QPointF* QWidget_MapTo(const QWidget* self, QWidget* param1, QPointF* param2); +QPoint* QWidget_MapTo2(const QWidget* self, QWidget* param1, QPoint* param2); +QPointF* QWidget_MapFrom(const QWidget* self, QWidget* param1, QPointF* param2); +QPoint* QWidget_MapFrom2(const QWidget* self, QWidget* param1, QPoint* param2); QWidget* QWidget_Window(const QWidget* self); QWidget* QWidget_NativeParentWidget(const QWidget* self); QWidget* QWidget_TopLevelWidget(const QWidget* self); @@ -295,7 +301,6 @@ bool QWidget_HasHeightForWidth(const QWidget* self); QRegion* QWidget_VisibleRegion(const QWidget* self); void QWidget_SetContentsMargins(QWidget* self, int left, int top, int right, int bottom); void QWidget_SetContentsMarginsWithMargins(QWidget* self, QMargins* margins); -void QWidget_GetContentsMargins(const QWidget* self, int* left, int* top, int* right, int* bottom); QMargins* QWidget_ContentsMargins(const QWidget* self); QRect* QWidget_ContentsRect(const QWidget* self); QLayout* QWidget_Layout(const QWidget* self); @@ -316,6 +321,10 @@ void QWidget_InsertActions(QWidget* self, QAction* before, struct miqt_array* /* void QWidget_InsertAction(QWidget* self, QAction* before, QAction* action); void QWidget_RemoveAction(QWidget* self, QAction* action); struct miqt_array* QWidget_Actions(const QWidget* self); +QAction* QWidget_AddActionWithText(QWidget* self, struct miqt_string* text); +QAction* QWidget_AddAction2(QWidget* self, QIcon* icon, struct miqt_string* text); +QAction* QWidget_AddAction3(QWidget* self, struct miqt_string* text, QKeySequence* shortcut); +QAction* QWidget_AddAction4(QWidget* self, QIcon* icon, struct miqt_string* text, QKeySequence* shortcut); QWidget* QWidget_ParentWidget(const QWidget* self); void QWidget_SetWindowFlags(QWidget* self, int typeVal); int QWidget_WindowFlags(const QWidget* self); @@ -335,6 +344,7 @@ void QWidget_SetAutoFillBackground(QWidget* self, bool enabled); QBackingStore* QWidget_BackingStore(const QWidget* self); QWindow* QWidget_WindowHandle(const QWidget* self); QScreen* QWidget_Screen(const QWidget* self); +void QWidget_SetScreen(QWidget* self, QScreen* screen); QWidget* QWidget_CreateWindowContainer(QWindow* window); void QWidget_WindowTitleChanged(QWidget* self, struct miqt_string* title); void QWidget_connect_WindowTitleChanged(QWidget* self, void* slot); @@ -349,8 +359,6 @@ int QWidget_InputMethodHints(const QWidget* self); void QWidget_SetInputMethodHints(QWidget* self, int hints); struct miqt_string* QWidget_Tr2(const char* s, const char* c); struct miqt_string* QWidget_Tr3(const char* s, const char* c, int n); -struct miqt_string* QWidget_TrUtf82(const char* s, const char* c); -struct miqt_string* QWidget_TrUtf83(const char* s, const char* c, int n); void QWidget_Render2(QWidget* self, QPaintDevice* target, QPoint* targetOffset); void QWidget_Render3(QWidget* self, QPaintDevice* target, QPoint* targetOffset, QRegion* sourceRegion); void QWidget_Render4(QWidget* self, QPaintDevice* target, QPoint* targetOffset, QRegion* sourceRegion, int renderFlags); diff --git a/qt/gen_qwidgetaction.cpp b/qt/gen_qwidgetaction.cpp index ca33b5d..b535f4a 100644 --- a/qt/gen_qwidgetaction.cpp +++ b/qt/gen_qwidgetaction.cpp @@ -28,13 +28,6 @@ struct miqt_string* QWidgetAction_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QWidgetAction_TrUtf8(const char* s) { - QString _ret = QWidgetAction::trUtf8(s); - // 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 QWidgetAction_SetDefaultWidget(QWidgetAction* self, QWidget* w) { self->setDefaultWidget(w); } @@ -65,20 +58,6 @@ struct miqt_string* QWidgetAction_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QWidgetAction_TrUtf82(const char* s, const char* c) { - QString _ret = QWidgetAction::trUtf8(s, c); - // 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* QWidgetAction_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QWidgetAction::trUtf8(s, c, static_cast(n)); - // 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 QWidgetAction_Delete(QWidgetAction* self) { delete self; } diff --git a/qt/gen_qwidgetaction.go b/qt/gen_qwidgetaction.go index 645a7dd..22d1326 100644 --- a/qt/gen_qwidgetaction.go +++ b/qt/gen_qwidgetaction.go @@ -61,15 +61,6 @@ func QWidgetAction_Tr(s string) string { return _ret } -func QWidgetAction_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QWidgetAction_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QWidgetAction) SetDefaultWidget(w *QWidget) { C.QWidgetAction_SetDefaultWidget(this.h, w.cPointer()) } @@ -108,28 +99,6 @@ func QWidgetAction_Tr3(s string, c string, n int) string { return _ret } -func QWidgetAction_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QWidgetAction_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QWidgetAction_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QWidgetAction_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QWidgetAction) Delete() { C.QWidgetAction_Delete(this.h) diff --git a/qt/gen_qwidgetaction.h b/qt/gen_qwidgetaction.h index b755b83..42bd69a 100644 --- a/qt/gen_qwidgetaction.h +++ b/qt/gen_qwidgetaction.h @@ -29,15 +29,12 @@ QWidgetAction* QWidgetAction_new(QObject* parent); QMetaObject* QWidgetAction_MetaObject(const QWidgetAction* self); void* QWidgetAction_Metacast(QWidgetAction* self, const char* param1); struct miqt_string* QWidgetAction_Tr(const char* s); -struct miqt_string* QWidgetAction_TrUtf8(const char* s); void QWidgetAction_SetDefaultWidget(QWidgetAction* self, QWidget* w); QWidget* QWidgetAction_DefaultWidget(const QWidgetAction* self); QWidget* QWidgetAction_RequestWidget(QWidgetAction* self, QWidget* parent); void QWidgetAction_ReleaseWidget(QWidgetAction* self, QWidget* widget); struct miqt_string* QWidgetAction_Tr2(const char* s, const char* c); struct miqt_string* QWidgetAction_Tr3(const char* s, const char* c, int n); -struct miqt_string* QWidgetAction_TrUtf82(const char* s, const char* c); -struct miqt_string* QWidgetAction_TrUtf83(const char* s, const char* c, int n); void QWidgetAction_Delete(QWidgetAction* self); #ifdef __cplusplus diff --git a/qt/gen_qwindow.cpp b/qt/gen_qwindow.cpp index 92ec8c5..f8636ae 100644 --- a/qt/gen_qwindow.cpp +++ b/qt/gen_qwindow.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -45,13 +46,6 @@ struct miqt_string* QWindow_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QWindow_TrUtf8(const char* s) { - QString _ret = QWindow::trUtf8(s); - // 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 QWindow_SetSurfaceType(QWindow* self, int surfaceType) { self->setSurfaceType(static_cast(surfaceType)); } @@ -83,11 +77,7 @@ uintptr_t QWindow_WinId(const QWindow* self) { return static_cast(_ret); } -QWindow* QWindow_Parent(const QWindow* self, int mode) { - return self->parent(static_cast(mode)); -} - -QWindow* QWindow_Parent2(const QWindow* self) { +QWindow* QWindow_Parent(const QWindow* self) { return self->parent(); } @@ -374,11 +364,19 @@ QObject* QWindow_FocusObject(const QWindow* self) { return self->focusObject(); } -QPoint* QWindow_MapToGlobal(const QWindow* self, QPoint* pos) { +QPointF* QWindow_MapToGlobal(const QWindow* self, QPointF* pos) { + return new QPointF(self->mapToGlobal(*pos)); +} + +QPointF* QWindow_MapFromGlobal(const QWindow* self, QPointF* pos) { + return new QPointF(self->mapFromGlobal(*pos)); +} + +QPoint* QWindow_MapToGlobalWithPos(const QWindow* self, QPoint* pos) { return new QPoint(self->mapToGlobal(*pos)); } -QPoint* QWindow_MapFromGlobal(const QWindow* self, QPoint* pos) { +QPoint* QWindow_MapFromGlobalWithPos(const QWindow* self, QPoint* pos) { return new QPoint(self->mapFromGlobal(*pos)); } @@ -734,18 +732,8 @@ struct miqt_string* QWindow_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QWindow_TrUtf82(const char* s, const char* c) { - QString _ret = QWindow::trUtf8(s, c); - // 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* QWindow_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QWindow::trUtf8(s, c, static_cast(n)); - // 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()); +QWindow* QWindow_Parent1(const QWindow* self, int mode) { + return self->parent(static_cast(mode)); } void QWindow_SetFlag2(QWindow* self, int param1, bool on) { diff --git a/qt/gen_qwindow.go b/qt/gen_qwindow.go index c0c1318..dffbb23 100644 --- a/qt/gen_qwindow.go +++ b/qt/gen_qwindow.go @@ -93,15 +93,6 @@ func QWindow_Tr(s string) string { return _ret } -func QWindow_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QWindow_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QWindow) SetSurfaceType(surfaceType QSurface__SurfaceType) { C.QWindow_SetSurfaceType(this.h, (C.int)(surfaceType)) } @@ -130,12 +121,8 @@ func (this *QWindow) WinId() uintptr { return (uintptr)(C.QWindow_WinId(this.h)) } -func (this *QWindow) Parent(mode QWindow__AncestorMode) *QWindow { - return newQWindow_U(unsafe.Pointer(C.QWindow_Parent(this.h, (C.int)(mode)))) -} - -func (this *QWindow) Parent2() *QWindow { - return newQWindow_U(unsafe.Pointer(C.QWindow_Parent2(this.h))) +func (this *QWindow) Parent() *QWindow { + return newQWindow_U(unsafe.Pointer(C.QWindow_Parent(this.h))) } func (this *QWindow) SetParent(parent *QWindow) { @@ -456,15 +443,29 @@ func (this *QWindow) FocusObject() *QObject { return newQObject_U(unsafe.Pointer(C.QWindow_FocusObject(this.h))) } -func (this *QWindow) MapToGlobal(pos *QPoint) *QPoint { +func (this *QWindow) MapToGlobal(pos *QPointF) *QPointF { _ret := C.QWindow_MapToGlobal(this.h, pos.cPointer()) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QWindow) MapFromGlobal(pos *QPointF) *QPointF { + _ret := C.QWindow_MapFromGlobal(this.h, pos.cPointer()) + _goptr := newQPointF(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QWindow) MapToGlobalWithPos(pos *QPoint) *QPoint { + _ret := C.QWindow_MapToGlobalWithPos(this.h, pos.cPointer()) _goptr := newQPoint(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QWindow) MapFromGlobal(pos *QPoint) *QPoint { - _ret := C.QWindow_MapFromGlobal(this.h, pos.cPointer()) +func (this *QWindow) MapFromGlobalWithPos(pos *QPoint) *QPoint { + _ret := C.QWindow_MapFromGlobalWithPos(this.h, pos.cPointer()) _goptr := newQPoint(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr @@ -999,26 +1000,8 @@ func QWindow_Tr3(s string, c string, n int) string { return _ret } -func QWindow_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QWindow_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QWindow_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QWindow_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret +func (this *QWindow) Parent1(mode QWindow__AncestorMode) *QWindow { + return newQWindow_U(unsafe.Pointer(C.QWindow_Parent1(this.h, (C.int)(mode)))) } func (this *QWindow) SetFlag2(param1 WindowType, on bool) { diff --git a/qt/gen_qwindow.h b/qt/gen_qwindow.h index 06c3ed5..2f4b772 100644 --- a/qt/gen_qwindow.h +++ b/qt/gen_qwindow.h @@ -21,6 +21,7 @@ class QMargins; class QMetaObject; class QObject; class QPoint; +class QPointF; class QRect; class QRegion; class QScreen; @@ -35,6 +36,7 @@ typedef struct QMargins QMargins; typedef struct QMetaObject QMetaObject; typedef struct QObject QObject; typedef struct QPoint QPoint; +typedef struct QPointF QPointF; typedef struct QRect QRect; typedef struct QRegion QRegion; typedef struct QScreen QScreen; @@ -49,7 +51,6 @@ QWindow* QWindow_new3(QScreen* screen); QMetaObject* QWindow_MetaObject(const QWindow* self); void* QWindow_Metacast(QWindow* self, const char* param1); struct miqt_string* QWindow_Tr(const char* s); -struct miqt_string* QWindow_TrUtf8(const char* s); void QWindow_SetSurfaceType(QWindow* self, int surfaceType); int QWindow_SurfaceType(const QWindow* self); bool QWindow_IsVisible(const QWindow* self); @@ -57,8 +58,7 @@ 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, int mode); -QWindow* QWindow_Parent2(const QWindow* self); +QWindow* QWindow_Parent(const QWindow* self); void QWindow_SetParent(QWindow* self, QWindow* parent); bool QWindow_IsTopLevel(const QWindow* self); bool QWindow_IsModal(const QWindow* self); @@ -126,8 +126,10 @@ QScreen* QWindow_Screen(const QWindow* self); void QWindow_SetScreen(QWindow* self, QScreen* screen); QAccessibleInterface* QWindow_AccessibleRoot(const QWindow* self); QObject* QWindow_FocusObject(const QWindow* self); -QPoint* QWindow_MapToGlobal(const QWindow* self, QPoint* pos); -QPoint* QWindow_MapFromGlobal(const QWindow* self, QPoint* pos); +QPointF* QWindow_MapToGlobal(const QWindow* self, QPointF* pos); +QPointF* QWindow_MapFromGlobal(const QWindow* self, QPointF* pos); +QPoint* QWindow_MapToGlobalWithPos(const QWindow* self, QPoint* pos); +QPoint* QWindow_MapFromGlobalWithPos(const QWindow* self, QPoint* pos); QCursor* QWindow_Cursor(const QWindow* self); void QWindow_SetCursor(QWindow* self, QCursor* cursor); void QWindow_UnsetCursor(QWindow* self); @@ -198,8 +200,7 @@ void QWindow_TransientParentChanged(QWindow* self, QWindow* transientParent); void QWindow_connect_TransientParentChanged(QWindow* self, void* slot); 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); +QWindow* QWindow_Parent1(const QWindow* self, int 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); diff --git a/qt/gen_qwizard.cpp b/qt/gen_qwizard.cpp index aa7ac67..43de4e9 100644 --- a/qt/gen_qwizard.cpp +++ b/qt/gen_qwizard.cpp @@ -41,13 +41,6 @@ struct miqt_string* QWizard_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QWizard_TrUtf8(const char* s) { - QString _ret = QWizard::trUtf8(s); - // 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()); -} - int QWizard_AddPage(QWizard* self, QWizardPage* page) { return self->addPage(page); } @@ -68,19 +61,6 @@ bool QWizard_HasVisitedPage(const QWizard* self, int id) { return self->hasVisitedPage(static_cast(id)); } -struct miqt_array* QWizard_VisitedPages(const QWizard* self) { - QList _ret = self->visitedPages(); - // Convert QList<> from C++ memory to manually-managed C memory - int* _arr = static_cast(malloc(sizeof(int) * _ret.length())); - for (size_t i = 0, e = _ret.length(); i < e; ++i) { - _arr[i] = _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_array* QWizard_VisitedIds(const QWizard* self) { QList _ret = self->visitedIds(); // Convert QList<> from C++ memory to manually-managed C memory @@ -305,6 +285,10 @@ void QWizard_Next(QWizard* self) { self->next(); } +void QWizard_SetCurrentId(QWizard* self, int id) { + self->setCurrentId(static_cast(id)); +} + void QWizard_Restart(QWizard* self) { self->restart(); } @@ -323,20 +307,6 @@ struct miqt_string* QWizard_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QWizard_TrUtf82(const char* s, const char* c) { - QString _ret = QWizard::trUtf8(s, c); - // 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* QWizard_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QWizard::trUtf8(s, c, static_cast(n)); - // 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 QWizard_SetOption2(QWizard* self, int option, bool on) { self->setOption(static_cast(option), on); } @@ -368,13 +338,6 @@ struct miqt_string* QWizardPage_Tr(const char* s) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QWizardPage_TrUtf8(const char* s) { - QString _ret = QWizardPage::trUtf8(s); - // 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 QWizardPage_SetTitle(QWizardPage* self, struct miqt_string* title) { QString title_QString = QString::fromUtf8(&title->data, title->len); self->setTitle(title_QString); @@ -479,20 +442,6 @@ struct miqt_string* QWizardPage_Tr3(const char* s, const char* c, int n) { return miqt_strdup(_b.data(), _b.length()); } -struct miqt_string* QWizardPage_TrUtf82(const char* s, const char* c) { - QString _ret = QWizardPage::trUtf8(s, c); - // 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* QWizardPage_TrUtf83(const char* s, const char* c, int n) { - QString _ret = QWizardPage::trUtf8(s, c, static_cast(n)); - // 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 QWizardPage_Delete(QWizardPage* self) { delete self; } diff --git a/qt/gen_qwizard.go b/qt/gen_qwizard.go index d2fb0fd..ab68778 100644 --- a/qt/gen_qwizard.go +++ b/qt/gen_qwizard.go @@ -134,15 +134,6 @@ func QWizard_Tr(s string) string { return _ret } -func QWizard_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QWizard_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QWizard) AddPage(page *QWizardPage) int { return (int)(C.QWizard_AddPage(this.h, page.cPointer())) } @@ -163,17 +154,6 @@ func (this *QWizard) HasVisitedPage(id int) bool { return (bool)(C.QWizard_HasVisitedPage(this.h, (C.int)(id))) } -func (this *QWizard) VisitedPages() []int { - var _ma *C.struct_miqt_array = C.QWizard_VisitedPages(this.h) - _ret := make([]int, int(_ma.len)) - _outCast := (*[0xffff]C.int)(unsafe.Pointer(_ma.data)) // hey ya - for i := 0; i < int(_ma.len); i++ { - _ret[i] = (int)(_outCast[i]) - } - C.free(unsafe.Pointer(_ma)) - return _ret -} - func (this *QWizard) VisitedIds() []int { var _ma *C.struct_miqt_array = C.QWizard_VisitedIds(this.h) _ret := make([]int, int(_ma.len)) @@ -453,6 +433,10 @@ func (this *QWizard) Next() { C.QWizard_Next(this.h) } +func (this *QWizard) SetCurrentId(id int) { + C.QWizard_SetCurrentId(this.h, (C.int)(id)) +} + func (this *QWizard) Restart() { C.QWizard_Restart(this.h) } @@ -479,28 +463,6 @@ func QWizard_Tr3(s string, c string, n int) string { return _ret } -func QWizard_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QWizard_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QWizard_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QWizard_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QWizard) SetOption2(option QWizard__WizardOption, on bool) { C.QWizard_SetOption2(this.h, (C.int)(option), (C.bool)(on)) } @@ -573,15 +535,6 @@ func QWizardPage_Tr(s string) string { return _ret } -func QWizardPage_TrUtf8(s string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - var _ms *C.struct_miqt_string = C.QWizardPage_TrUtf8(s_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - func (this *QWizardPage) SetTitle(title string) { title_ms := miqt_strdupg(title) defer C.free(title_ms) @@ -707,28 +660,6 @@ func QWizardPage_Tr3(s string, c string, n int) string { return _ret } -func QWizardPage_TrUtf82(s string, c string) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QWizardPage_TrUtf82(s_Cstring, c_Cstring) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func QWizardPage_TrUtf83(s string, c string, n int) string { - s_Cstring := C.CString(s) - defer C.free(unsafe.Pointer(s_Cstring)) - c_Cstring := C.CString(c) - defer C.free(unsafe.Pointer(c_Cstring)) - var _ms *C.struct_miqt_string = C.QWizardPage_TrUtf83(s_Cstring, c_Cstring, (C.int)(n)) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - // Delete this object from C++ memory. func (this *QWizardPage) Delete() { C.QWizardPage_Delete(this.h) diff --git a/qt/gen_qwizard.h b/qt/gen_qwizard.h index 4747856..e2736ef 100644 --- a/qt/gen_qwizard.h +++ b/qt/gen_qwizard.h @@ -39,13 +39,11 @@ QWizard* QWizard_new3(QWidget* parent, int flags); QMetaObject* QWizard_MetaObject(const QWizard* self); void* QWizard_Metacast(QWizard* self, const char* param1); struct miqt_string* QWizard_Tr(const char* s); -struct miqt_string* QWizard_TrUtf8(const char* s); int QWizard_AddPage(QWizard* self, QWizardPage* page); void QWizard_SetPage(QWizard* self, int id, QWizardPage* page); void QWizard_RemovePage(QWizard* self, int id); QWizardPage* QWizard_Page(const QWizard* self, int id); bool QWizard_HasVisitedPage(const QWizard* self, int id); -struct miqt_array* QWizard_VisitedPages(const QWizard* self); struct miqt_array* QWizard_VisitedIds(const QWizard* self); struct miqt_array* QWizard_PageIds(const QWizard* self); void QWizard_SetStartId(QWizard* self, int id); @@ -90,11 +88,10 @@ void QWizard_PageRemoved(QWizard* self, int id); void QWizard_connect_PageRemoved(QWizard* self, void* slot); void QWizard_Back(QWizard* self); void QWizard_Next(QWizard* self); +void QWizard_SetCurrentId(QWizard* self, int id); void QWizard_Restart(QWizard* self); 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, int option, bool on); void QWizard_Delete(QWizard* self); @@ -103,7 +100,6 @@ QWizardPage* QWizardPage_new2(QWidget* parent); QMetaObject* QWizardPage_MetaObject(const QWizardPage* self); void* QWizardPage_Metacast(QWizardPage* self, const char* param1); struct miqt_string* QWizardPage_Tr(const char* s); -struct miqt_string* QWizardPage_TrUtf8(const char* s); 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); @@ -125,8 +121,6 @@ void QWizardPage_CompleteChanged(QWizardPage* self); void QWizardPage_connect_CompleteChanged(QWizardPage* self, void* slot); struct miqt_string* QWizardPage_Tr2(const char* s, const char* c); struct miqt_string* QWizardPage_Tr3(const char* s, const char* c, int n); -struct miqt_string* QWizardPage_TrUtf82(const char* s, const char* c); -struct miqt_string* QWizardPage_TrUtf83(const char* s, const char* c, int n); void QWizardPage_Delete(QWizardPage* self); #ifdef __cplusplus diff --git a/qt/gen_qxmlstream.cpp b/qt/gen_qxmlstream.cpp index 2cf12f9..5fdf642 100644 --- a/qt/gen_qxmlstream.cpp +++ b/qt/gen_qxmlstream.cpp @@ -4,60 +4,38 @@ #include #include #include -#include #include #include #include #include #include #include -#include #include +#define WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__QXmlString #include "qxmlstream.h" #include "gen_qxmlstream.h" #include "_cgo_export.h" -QXmlStreamStringRef* QXmlStreamStringRef_new() { - return new QXmlStreamStringRef(); +QtPrivate__QXmlString* QtPrivate__QXmlString_new(struct miqt_string* s) { + QString s_QString = QString::fromUtf8(&s->data, s->len); + return new QtPrivate::QXmlString(s_QString); } -QXmlStreamStringRef* QXmlStreamStringRef_new2(struct miqt_string* aString) { - QString aString_QString = QString::fromUtf8(&aString->data, aString->len); - return new QXmlStreamStringRef(aString_QString); +QtPrivate__QXmlString* QtPrivate__QXmlString_new2() { + return new QtPrivate::QXmlString(); } -QXmlStreamStringRef* QXmlStreamStringRef_new3(QXmlStreamStringRef* other) { - return new QXmlStreamStringRef(*other); +void QtPrivate__QXmlString_OperatorAssign(QtPrivate__QXmlString* self, struct miqt_string* s) { + QString s_QString = QString::fromUtf8(&s->data, s->len); + self->operator=(s_QString); } -void QXmlStreamStringRef_OperatorAssign(QXmlStreamStringRef* self, QXmlStreamStringRef* other) { - self->operator=(*other); +ptrdiff_t QtPrivate__QXmlString_Size(const QtPrivate__QXmlString* self) { + qsizetype _ret = self->size(); + return static_cast(_ret); } -void QXmlStreamStringRef_Swap(QXmlStreamStringRef* self, QXmlStreamStringRef* other) { - self->swap(*other); -} - -void QXmlStreamStringRef_Clear(QXmlStreamStringRef* self) { - self->clear(); -} - -struct miqt_string* QXmlStreamStringRef_String(const QXmlStreamStringRef* self) { - const QString* _ret = self->string(); - // Convert QString pointer 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()); -} - -int QXmlStreamStringRef_Position(const QXmlStreamStringRef* self) { - return self->position(); -} - -int QXmlStreamStringRef_Size(const QXmlStreamStringRef* self) { - return self->size(); -} - -void QXmlStreamStringRef_Delete(QXmlStreamStringRef* self) { +void QtPrivate__QXmlString_Delete(QtPrivate__QXmlString* self) { delete self; } @@ -82,10 +60,6 @@ QXmlStreamAttribute* QXmlStreamAttribute_new4(QXmlStreamAttribute* param1) { return new QXmlStreamAttribute(*param1); } -void QXmlStreamAttribute_OperatorAssign(QXmlStreamAttribute* self, QXmlStreamAttribute* param1) { - self->operator=(*param1); -} - bool QXmlStreamAttribute_IsDefault(const QXmlStreamAttribute* self) { return self->isDefault(); } @@ -98,6 +72,10 @@ bool QXmlStreamAttribute_OperatorNotEqual(const QXmlStreamAttribute* self, QXmlS return self->operator!=(*other); } +void QXmlStreamAttribute_OperatorAssign(QXmlStreamAttribute* self, QXmlStreamAttribute* param1) { + self->operator=(*param1); +} + void QXmlStreamAttribute_Delete(QXmlStreamAttribute* self) { delete self; } @@ -112,14 +90,6 @@ QXmlStreamNamespaceDeclaration* QXmlStreamNamespaceDeclaration_new2(struct miqt_ return new QXmlStreamNamespaceDeclaration(prefix_QString, namespaceUri_QString); } -QXmlStreamNamespaceDeclaration* QXmlStreamNamespaceDeclaration_new3(QXmlStreamNamespaceDeclaration* param1) { - return new QXmlStreamNamespaceDeclaration(*param1); -} - -void QXmlStreamNamespaceDeclaration_OperatorAssign(QXmlStreamNamespaceDeclaration* self, QXmlStreamNamespaceDeclaration* param1) { - self->operator=(*param1); -} - bool QXmlStreamNamespaceDeclaration_OperatorEqual(const QXmlStreamNamespaceDeclaration* self, QXmlStreamNamespaceDeclaration* other) { return self->operator==(*other); } @@ -136,14 +106,6 @@ QXmlStreamNotationDeclaration* QXmlStreamNotationDeclaration_new() { return new QXmlStreamNotationDeclaration(); } -QXmlStreamNotationDeclaration* QXmlStreamNotationDeclaration_new2(QXmlStreamNotationDeclaration* param1) { - return new QXmlStreamNotationDeclaration(*param1); -} - -void QXmlStreamNotationDeclaration_OperatorAssign(QXmlStreamNotationDeclaration* self, QXmlStreamNotationDeclaration* param1) { - self->operator=(*param1); -} - bool QXmlStreamNotationDeclaration_OperatorEqual(const QXmlStreamNotationDeclaration* self, QXmlStreamNotationDeclaration* other) { return self->operator==(*other); } @@ -160,14 +122,6 @@ QXmlStreamEntityDeclaration* QXmlStreamEntityDeclaration_new() { return new QXmlStreamEntityDeclaration(); } -QXmlStreamEntityDeclaration* QXmlStreamEntityDeclaration_new2(QXmlStreamEntityDeclaration* param1) { - return new QXmlStreamEntityDeclaration(*param1); -} - -void QXmlStreamEntityDeclaration_OperatorAssign(QXmlStreamEntityDeclaration* self, QXmlStreamEntityDeclaration* param1) { - self->operator=(*param1); -} - bool QXmlStreamEntityDeclaration_OperatorEqual(const QXmlStreamEntityDeclaration* self, QXmlStreamEntityDeclaration* other) { return self->operator==(*other); } @@ -376,7 +330,7 @@ void QXmlStreamReader_AddExtraNamespaceDeclaration(QXmlStreamReader* self, QXmlS } void QXmlStreamReader_AddExtraNamespaceDeclarations(QXmlStreamReader* self, struct miqt_array* /* of QXmlStreamNamespaceDeclaration* */ extraNamespaceDeclaractions) { - QVector extraNamespaceDeclaractions_QList; + QList extraNamespaceDeclaractions_QList; extraNamespaceDeclaractions_QList.reserve(extraNamespaceDeclaractions->len); QXmlStreamNamespaceDeclaration** extraNamespaceDeclaractions_arr = static_cast(extraNamespaceDeclaractions->data); for(size_t i = 0; i < extraNamespaceDeclaractions->len; ++i) { @@ -483,18 +437,6 @@ QIODevice* QXmlStreamWriter_Device(const QXmlStreamWriter* self) { return self->device(); } -void QXmlStreamWriter_SetCodec(QXmlStreamWriter* self, QTextCodec* codec) { - self->setCodec(codec); -} - -void QXmlStreamWriter_SetCodecWithCodecName(QXmlStreamWriter* self, const char* codecName) { - self->setCodec(codecName); -} - -QTextCodec* QXmlStreamWriter_Codec(const QXmlStreamWriter* self) { - return self->codec(); -} - void QXmlStreamWriter_SetAutoFormatting(QXmlStreamWriter* self, bool autoFormatting) { self->setAutoFormatting(autoFormatting); } diff --git a/qt/gen_qxmlstream.go b/qt/gen_qxmlstream.go index aa2d64a..dd14437 100644 --- a/qt/gen_qxmlstream.go +++ b/qt/gen_qxmlstream.go @@ -47,84 +47,61 @@ const ( QXmlStreamReader__PrematureEndOfDocumentError QXmlStreamReader__Error = 4 ) -type QXmlStreamStringRef struct { - h *C.QXmlStreamStringRef +type QtPrivate__QXmlString struct { + h *C.QtPrivate__QXmlString } -func (this *QXmlStreamStringRef) cPointer() *C.QXmlStreamStringRef { +func (this *QtPrivate__QXmlString) cPointer() *C.QtPrivate__QXmlString { if this == nil { return nil } return this.h } -func newQXmlStreamStringRef(h *C.QXmlStreamStringRef) *QXmlStreamStringRef { +func newQtPrivate__QXmlString(h *C.QtPrivate__QXmlString) *QtPrivate__QXmlString { if h == nil { return nil } - return &QXmlStreamStringRef{h: h} + return &QtPrivate__QXmlString{h: h} } -func newQXmlStreamStringRef_U(h unsafe.Pointer) *QXmlStreamStringRef { - return newQXmlStreamStringRef((*C.QXmlStreamStringRef)(h)) +func newQtPrivate__QXmlString_U(h unsafe.Pointer) *QtPrivate__QXmlString { + return newQtPrivate__QXmlString((*C.QtPrivate__QXmlString)(h)) } -// NewQXmlStreamStringRef constructs a new QXmlStreamStringRef object. -func NewQXmlStreamStringRef() *QXmlStreamStringRef { - ret := C.QXmlStreamStringRef_new() - return newQXmlStreamStringRef(ret) +// NewQtPrivate__QXmlString constructs a new QtPrivate::QXmlString object. +func NewQtPrivate__QXmlString(s string) *QtPrivate__QXmlString { + s_ms := miqt_strdupg(s) + defer C.free(s_ms) + ret := C.QtPrivate__QXmlString_new((*C.struct_miqt_string)(s_ms)) + return newQtPrivate__QXmlString(ret) } -// NewQXmlStreamStringRef2 constructs a new QXmlStreamStringRef object. -func NewQXmlStreamStringRef2(aString string) *QXmlStreamStringRef { - aString_ms := miqt_strdupg(aString) - defer C.free(aString_ms) - ret := C.QXmlStreamStringRef_new2((*C.struct_miqt_string)(aString_ms)) - return newQXmlStreamStringRef(ret) +// NewQtPrivate__QXmlString2 constructs a new QtPrivate::QXmlString object. +func NewQtPrivate__QXmlString2() *QtPrivate__QXmlString { + ret := C.QtPrivate__QXmlString_new2() + return newQtPrivate__QXmlString(ret) } -// NewQXmlStreamStringRef3 constructs a new QXmlStreamStringRef object. -func NewQXmlStreamStringRef3(other *QXmlStreamStringRef) *QXmlStreamStringRef { - ret := C.QXmlStreamStringRef_new3(other.cPointer()) - return newQXmlStreamStringRef(ret) +func (this *QtPrivate__QXmlString) OperatorAssign(s string) { + s_ms := miqt_strdupg(s) + defer C.free(s_ms) + C.QtPrivate__QXmlString_OperatorAssign(this.h, (*C.struct_miqt_string)(s_ms)) } -func (this *QXmlStreamStringRef) OperatorAssign(other *QXmlStreamStringRef) { - C.QXmlStreamStringRef_OperatorAssign(this.h, other.cPointer()) -} - -func (this *QXmlStreamStringRef) Swap(other *QXmlStreamStringRef) { - C.QXmlStreamStringRef_Swap(this.h, other.cPointer()) -} - -func (this *QXmlStreamStringRef) Clear() { - C.QXmlStreamStringRef_Clear(this.h) -} - -func (this *QXmlStreamStringRef) String() string { - var _ms *C.struct_miqt_string = C.QXmlStreamStringRef_String(this.h) - _ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms)) - return _ret -} - -func (this *QXmlStreamStringRef) Position() int { - return (int)(C.QXmlStreamStringRef_Position(this.h)) -} - -func (this *QXmlStreamStringRef) Size() int { - return (int)(C.QXmlStreamStringRef_Size(this.h)) +func (this *QtPrivate__QXmlString) Size() int64 { + return (int64)(C.QtPrivate__QXmlString_Size(this.h)) } // Delete this object from C++ memory. -func (this *QXmlStreamStringRef) Delete() { - C.QXmlStreamStringRef_Delete(this.h) +func (this *QtPrivate__QXmlString) Delete() { + C.QtPrivate__QXmlString_Delete(this.h) } // GoGC adds a Go Finalizer to this pointer, so that it will be deleted // from C++ memory once it is unreachable from Go memory. -func (this *QXmlStreamStringRef) GoGC() { - runtime.SetFinalizer(this, func(this *QXmlStreamStringRef) { +func (this *QtPrivate__QXmlString) GoGC() { + runtime.SetFinalizer(this, func(this *QtPrivate__QXmlString) { this.Delete() runtime.KeepAlive(this.h) }) @@ -186,10 +163,6 @@ func NewQXmlStreamAttribute4(param1 *QXmlStreamAttribute) *QXmlStreamAttribute { return newQXmlStreamAttribute(ret) } -func (this *QXmlStreamAttribute) OperatorAssign(param1 *QXmlStreamAttribute) { - C.QXmlStreamAttribute_OperatorAssign(this.h, param1.cPointer()) -} - func (this *QXmlStreamAttribute) IsDefault() bool { return (bool)(C.QXmlStreamAttribute_IsDefault(this.h)) } @@ -202,6 +175,10 @@ func (this *QXmlStreamAttribute) OperatorNotEqual(other *QXmlStreamAttribute) bo return (bool)(C.QXmlStreamAttribute_OperatorNotEqual(this.h, other.cPointer())) } +func (this *QXmlStreamAttribute) OperatorAssign(param1 *QXmlStreamAttribute) { + C.QXmlStreamAttribute_OperatorAssign(this.h, param1.cPointer()) +} + // Delete this object from C++ memory. func (this *QXmlStreamAttribute) Delete() { C.QXmlStreamAttribute_Delete(this.h) @@ -254,16 +231,6 @@ func NewQXmlStreamNamespaceDeclaration2(prefix string, namespaceUri string) *QXm return newQXmlStreamNamespaceDeclaration(ret) } -// NewQXmlStreamNamespaceDeclaration3 constructs a new QXmlStreamNamespaceDeclaration object. -func NewQXmlStreamNamespaceDeclaration3(param1 *QXmlStreamNamespaceDeclaration) *QXmlStreamNamespaceDeclaration { - ret := C.QXmlStreamNamespaceDeclaration_new3(param1.cPointer()) - return newQXmlStreamNamespaceDeclaration(ret) -} - -func (this *QXmlStreamNamespaceDeclaration) OperatorAssign(param1 *QXmlStreamNamespaceDeclaration) { - C.QXmlStreamNamespaceDeclaration_OperatorAssign(this.h, param1.cPointer()) -} - func (this *QXmlStreamNamespaceDeclaration) OperatorEqual(other *QXmlStreamNamespaceDeclaration) bool { return (bool)(C.QXmlStreamNamespaceDeclaration_OperatorEqual(this.h, other.cPointer())) } @@ -314,16 +281,6 @@ func NewQXmlStreamNotationDeclaration() *QXmlStreamNotationDeclaration { return newQXmlStreamNotationDeclaration(ret) } -// NewQXmlStreamNotationDeclaration2 constructs a new QXmlStreamNotationDeclaration object. -func NewQXmlStreamNotationDeclaration2(param1 *QXmlStreamNotationDeclaration) *QXmlStreamNotationDeclaration { - ret := C.QXmlStreamNotationDeclaration_new2(param1.cPointer()) - return newQXmlStreamNotationDeclaration(ret) -} - -func (this *QXmlStreamNotationDeclaration) OperatorAssign(param1 *QXmlStreamNotationDeclaration) { - C.QXmlStreamNotationDeclaration_OperatorAssign(this.h, param1.cPointer()) -} - func (this *QXmlStreamNotationDeclaration) OperatorEqual(other *QXmlStreamNotationDeclaration) bool { return (bool)(C.QXmlStreamNotationDeclaration_OperatorEqual(this.h, other.cPointer())) } @@ -374,16 +331,6 @@ func NewQXmlStreamEntityDeclaration() *QXmlStreamEntityDeclaration { return newQXmlStreamEntityDeclaration(ret) } -// NewQXmlStreamEntityDeclaration2 constructs a new QXmlStreamEntityDeclaration object. -func NewQXmlStreamEntityDeclaration2(param1 *QXmlStreamEntityDeclaration) *QXmlStreamEntityDeclaration { - ret := C.QXmlStreamEntityDeclaration_new2(param1.cPointer()) - return newQXmlStreamEntityDeclaration(ret) -} - -func (this *QXmlStreamEntityDeclaration) OperatorAssign(param1 *QXmlStreamEntityDeclaration) { - C.QXmlStreamEntityDeclaration_OperatorAssign(this.h, param1.cPointer()) -} - func (this *QXmlStreamEntityDeclaration) OperatorEqual(other *QXmlStreamEntityDeclaration) bool { return (bool)(C.QXmlStreamEntityDeclaration_OperatorEqual(this.h, other.cPointer())) } @@ -657,10 +604,10 @@ func (this *QXmlStreamReader) NamespaceDeclarations() []QXmlStreamNamespaceDecla _ret := make([]QXmlStreamNamespaceDeclaration, int(_ma.len)) _outCast := (*[0xffff]*C.QXmlStreamNamespaceDeclaration)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _vv_ret := _outCast[i] - _vv_goptr := newQXmlStreamNamespaceDeclaration(_vv_ret) - _vv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_vv_goptr + _lv_ret := _outCast[i] + _lv_goptr := newQXmlStreamNamespaceDeclaration(_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 @@ -687,10 +634,10 @@ func (this *QXmlStreamReader) NotationDeclarations() []QXmlStreamNotationDeclara _ret := make([]QXmlStreamNotationDeclaration, int(_ma.len)) _outCast := (*[0xffff]*C.QXmlStreamNotationDeclaration)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _vv_ret := _outCast[i] - _vv_goptr := newQXmlStreamNotationDeclaration(_vv_ret) - _vv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_vv_goptr + _lv_ret := _outCast[i] + _lv_goptr := newQXmlStreamNotationDeclaration(_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 @@ -701,10 +648,10 @@ func (this *QXmlStreamReader) EntityDeclarations() []QXmlStreamEntityDeclaration _ret := make([]QXmlStreamEntityDeclaration, int(_ma.len)) _outCast := (*[0xffff]*C.QXmlStreamEntityDeclaration)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _vv_ret := _outCast[i] - _vv_goptr := newQXmlStreamEntityDeclaration(_vv_ret) - _vv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_vv_goptr + _lv_ret := _outCast[i] + _lv_goptr := newQXmlStreamEntityDeclaration(_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 @@ -820,20 +767,6 @@ func (this *QXmlStreamWriter) Device() *QIODevice { return newQIODevice_U(unsafe.Pointer(C.QXmlStreamWriter_Device(this.h))) } -func (this *QXmlStreamWriter) SetCodec(codec *QTextCodec) { - C.QXmlStreamWriter_SetCodec(this.h, codec.cPointer()) -} - -func (this *QXmlStreamWriter) SetCodecWithCodecName(codecName string) { - codecName_Cstring := C.CString(codecName) - defer C.free(unsafe.Pointer(codecName_Cstring)) - C.QXmlStreamWriter_SetCodecWithCodecName(this.h, codecName_Cstring) -} - -func (this *QXmlStreamWriter) Codec() *QTextCodec { - return newQTextCodec_U(unsafe.Pointer(C.QXmlStreamWriter_Codec(this.h))) -} - func (this *QXmlStreamWriter) SetAutoFormatting(autoFormatting bool) { C.QXmlStreamWriter_SetAutoFormatting(this.h, (C.bool)(autoFormatting)) } diff --git a/qt/gen_qxmlstream.h b/qt/gen_qxmlstream.h index 34c0285..f620b10 100644 --- a/qt/gen_qxmlstream.h +++ b/qt/gen_qxmlstream.h @@ -16,68 +16,59 @@ extern "C" { #ifdef __cplusplus class QByteArray; class QIODevice; -class QTextCodec; class QXmlStreamAttribute; class QXmlStreamEntityDeclaration; class QXmlStreamEntityResolver; class QXmlStreamNamespaceDeclaration; class QXmlStreamNotationDeclaration; class QXmlStreamReader; -class QXmlStreamStringRef; class QXmlStreamWriter; +#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__QXmlString) +typedef QtPrivate::QXmlString QtPrivate__QXmlString; +#else +class QtPrivate__QXmlString; +#endif #else typedef struct QByteArray QByteArray; typedef struct QIODevice QIODevice; -typedef struct QTextCodec QTextCodec; typedef struct QXmlStreamAttribute QXmlStreamAttribute; typedef struct QXmlStreamEntityDeclaration QXmlStreamEntityDeclaration; typedef struct QXmlStreamEntityResolver QXmlStreamEntityResolver; typedef struct QXmlStreamNamespaceDeclaration QXmlStreamNamespaceDeclaration; typedef struct QXmlStreamNotationDeclaration QXmlStreamNotationDeclaration; typedef struct QXmlStreamReader QXmlStreamReader; -typedef struct QXmlStreamStringRef QXmlStreamStringRef; typedef struct QXmlStreamWriter QXmlStreamWriter; +typedef struct QtPrivate__QXmlString QtPrivate__QXmlString; #endif -QXmlStreamStringRef* QXmlStreamStringRef_new(); -QXmlStreamStringRef* QXmlStreamStringRef_new2(struct miqt_string* aString); -QXmlStreamStringRef* QXmlStreamStringRef_new3(QXmlStreamStringRef* other); -void QXmlStreamStringRef_OperatorAssign(QXmlStreamStringRef* self, QXmlStreamStringRef* other); -void QXmlStreamStringRef_Swap(QXmlStreamStringRef* self, QXmlStreamStringRef* other); -void QXmlStreamStringRef_Clear(QXmlStreamStringRef* self); -struct miqt_string* QXmlStreamStringRef_String(const QXmlStreamStringRef* self); -int QXmlStreamStringRef_Position(const QXmlStreamStringRef* self); -int QXmlStreamStringRef_Size(const QXmlStreamStringRef* self); -void QXmlStreamStringRef_Delete(QXmlStreamStringRef* self); +QtPrivate__QXmlString* QtPrivate__QXmlString_new(struct miqt_string* s); +QtPrivate__QXmlString* QtPrivate__QXmlString_new2(); +void QtPrivate__QXmlString_OperatorAssign(QtPrivate__QXmlString* self, struct miqt_string* s); +ptrdiff_t QtPrivate__QXmlString_Size(const QtPrivate__QXmlString* self); +void QtPrivate__QXmlString_Delete(QtPrivate__QXmlString* self); QXmlStreamAttribute* QXmlStreamAttribute_new(); QXmlStreamAttribute* QXmlStreamAttribute_new2(struct miqt_string* qualifiedName, struct miqt_string* value); QXmlStreamAttribute* QXmlStreamAttribute_new3(struct miqt_string* namespaceUri, struct miqt_string* name, struct miqt_string* value); QXmlStreamAttribute* QXmlStreamAttribute_new4(QXmlStreamAttribute* param1); -void QXmlStreamAttribute_OperatorAssign(QXmlStreamAttribute* self, QXmlStreamAttribute* param1); bool QXmlStreamAttribute_IsDefault(const QXmlStreamAttribute* self); bool QXmlStreamAttribute_OperatorEqual(const QXmlStreamAttribute* self, QXmlStreamAttribute* other); bool QXmlStreamAttribute_OperatorNotEqual(const QXmlStreamAttribute* self, QXmlStreamAttribute* other); +void QXmlStreamAttribute_OperatorAssign(QXmlStreamAttribute* self, QXmlStreamAttribute* param1); void QXmlStreamAttribute_Delete(QXmlStreamAttribute* self); QXmlStreamNamespaceDeclaration* QXmlStreamNamespaceDeclaration_new(); QXmlStreamNamespaceDeclaration* QXmlStreamNamespaceDeclaration_new2(struct miqt_string* prefix, struct miqt_string* namespaceUri); -QXmlStreamNamespaceDeclaration* QXmlStreamNamespaceDeclaration_new3(QXmlStreamNamespaceDeclaration* param1); -void QXmlStreamNamespaceDeclaration_OperatorAssign(QXmlStreamNamespaceDeclaration* self, QXmlStreamNamespaceDeclaration* param1); bool QXmlStreamNamespaceDeclaration_OperatorEqual(const QXmlStreamNamespaceDeclaration* self, QXmlStreamNamespaceDeclaration* other); bool QXmlStreamNamespaceDeclaration_OperatorNotEqual(const QXmlStreamNamespaceDeclaration* self, QXmlStreamNamespaceDeclaration* other); void QXmlStreamNamespaceDeclaration_Delete(QXmlStreamNamespaceDeclaration* self); QXmlStreamNotationDeclaration* QXmlStreamNotationDeclaration_new(); -QXmlStreamNotationDeclaration* QXmlStreamNotationDeclaration_new2(QXmlStreamNotationDeclaration* param1); -void QXmlStreamNotationDeclaration_OperatorAssign(QXmlStreamNotationDeclaration* self, QXmlStreamNotationDeclaration* param1); bool QXmlStreamNotationDeclaration_OperatorEqual(const QXmlStreamNotationDeclaration* self, QXmlStreamNotationDeclaration* other); bool QXmlStreamNotationDeclaration_OperatorNotEqual(const QXmlStreamNotationDeclaration* self, QXmlStreamNotationDeclaration* other); void QXmlStreamNotationDeclaration_Delete(QXmlStreamNotationDeclaration* self); QXmlStreamEntityDeclaration* QXmlStreamEntityDeclaration_new(); -QXmlStreamEntityDeclaration* QXmlStreamEntityDeclaration_new2(QXmlStreamEntityDeclaration* param1); -void QXmlStreamEntityDeclaration_OperatorAssign(QXmlStreamEntityDeclaration* self, QXmlStreamEntityDeclaration* param1); bool QXmlStreamEntityDeclaration_OperatorEqual(const QXmlStreamEntityDeclaration* self, QXmlStreamEntityDeclaration* other); bool QXmlStreamEntityDeclaration_OperatorNotEqual(const QXmlStreamEntityDeclaration* self, QXmlStreamEntityDeclaration* other); void QXmlStreamEntityDeclaration_Delete(QXmlStreamEntityDeclaration* self); @@ -144,9 +135,6 @@ QXmlStreamWriter* QXmlStreamWriter_new2(QIODevice* device); QXmlStreamWriter* QXmlStreamWriter_new3(QByteArray* array); void QXmlStreamWriter_SetDevice(QXmlStreamWriter* self, QIODevice* device); QIODevice* QXmlStreamWriter_Device(const QXmlStreamWriter* self); -void QXmlStreamWriter_SetCodec(QXmlStreamWriter* self, QTextCodec* codec); -void QXmlStreamWriter_SetCodecWithCodecName(QXmlStreamWriter* self, const char* codecName); -QTextCodec* QXmlStreamWriter_Codec(const QXmlStreamWriter* self); void QXmlStreamWriter_SetAutoFormatting(QXmlStreamWriter* self, bool autoFormatting); bool QXmlStreamWriter_AutoFormatting(const QXmlStreamWriter* self); void QXmlStreamWriter_SetAutoFormattingIndent(QXmlStreamWriter* self, int spacesOrTabs);