From 218db127fa2ca98fad2800def955b1acbc7d79a3 Mon Sep 17 00:00:00 2001 From: mappu Date: Sat, 7 Sep 2024 15:31:00 +1200 Subject: [PATCH] qt: rebuild (more const correctness, new connect handlers) --- qt/gen_qabstractbutton.cpp | 6 ++ qt/gen_qabstractbutton.go | 8 ++ qt/gen_qabstractbutton.h | 1 + qt/gen_qabstractitemdelegate.cpp | 6 ++ qt/gen_qabstractitemdelegate.go | 8 ++ qt/gen_qabstractitemdelegate.h | 1 + qt/gen_qabstractitemmodel.cpp | 60 ++++++++++---- qt/gen_qabstractitemmodel.go | 40 +++++++++ qt/gen_qabstractitemmodel.h | 5 ++ qt/gen_qabstractproxymodel.cpp | 6 +- qt/gen_qabstracttextdocumentlayout.cpp | 6 ++ qt/gen_qabstracttextdocumentlayout.go | 8 ++ qt/gen_qabstracttextdocumentlayout.h | 1 + qt/gen_qaction.cpp | 6 ++ qt/gen_qaction.go | 8 ++ qt/gen_qaction.h | 1 + qt/gen_qbytearray.cpp | 104 ++++++++++++------------ qt/gen_qbytearray.go | 16 ++-- qt/gen_qbytearray.h | 16 ++-- qt/gen_qbytearraymatcher.cpp | 4 +- qt/gen_qcalendar.cpp | 14 ++-- qt/gen_qcborvalue.cpp | 42 +++++----- qt/gen_qclipboard.cpp | 10 +-- qt/gen_qcolor.cpp | 24 +++--- qt/gen_qcolorspace.cpp | 2 +- qt/gen_qcombobox.cpp | 10 +-- qt/gen_qcommonstyle.cpp | 36 ++++---- qt/gen_qconcatenatetablesproxymodel.cpp | 10 +-- qt/gen_qdatetime.cpp | 16 ++-- qt/gen_qdesktopwidget.cpp | 6 +- qt/gen_qdir.cpp | 18 ++-- qt/gen_qdirmodel.cpp | 14 ++-- qt/gen_qfilesystemmodel.cpp | 16 ++-- qt/gen_qfontdatabase.cpp | 10 +-- qt/gen_qfontmetrics.cpp | 30 +++---- qt/gen_qgraphicsgridlayout.cpp | 2 +- qt/gen_qgraphicsitem.cpp | 10 +-- qt/gen_qgraphicslayoutitem.cpp | 2 +- qt/gen_qgraphicslinearlayout.cpp | 4 +- qt/gen_qgraphicsscene.cpp | 24 +++--- qt/gen_qgraphicsview.cpp | 6 +- qt/gen_qgroupbox.cpp | 6 ++ qt/gen_qgroupbox.go | 8 ++ qt/gen_qgroupbox.h | 1 + qt/gen_qicon.cpp | 40 ++++----- qt/gen_qiconengine.cpp | 4 +- qt/gen_qidentityproxymodel.cpp | 12 +-- qt/gen_qimage.cpp | 42 +++++----- qt/gen_qimageiohandler.cpp | 2 +- qt/gen_qitemselectionmodel.cpp | 12 +-- qt/gen_qjsonvalue.cpp | 6 +- qt/gen_qkeysequence.cpp | 2 +- qt/gen_qlocale.cpp | 90 ++++++++++---------- qt/gen_qlocale.go | 8 +- qt/gen_qlocale.h | 8 +- qt/gen_qmainwindow.cpp | 2 +- qt/gen_qmatrix.cpp | 2 +- qt/gen_qmatrix4x4.cpp | 2 +- qt/gen_qmdiarea.cpp | 2 +- qt/gen_qmenubar.cpp | 2 +- qt/gen_qmetaobject.cpp | 94 ++++++++++----------- qt/gen_qmimedatabase.cpp | 4 +- qt/gen_qobject.cpp | 8 +- qt/gen_qobject.go | 8 ++ qt/gen_qobject.h | 1 + qt/gen_qobjectdefs.cpp | 22 ++--- qt/gen_qpixmap.cpp | 40 ++++----- qt/gen_qprocess.cpp | 2 +- qt/gen_qproxystyle.cpp | 30 +++---- qt/gen_qrawfont.cpp | 4 +- qt/gen_qrect.cpp | 4 +- qt/gen_qregexp.cpp | 12 +-- qt/gen_qregularexpression.cpp | 20 ++--- qt/gen_qscreen.cpp | 10 +-- qt/gen_qsettings.cpp | 2 +- qt/gen_qsocketnotifier.cpp | 8 +- qt/gen_qsocketnotifier.go | 8 +- qt/gen_qsocketnotifier.h | 4 +- qt/gen_qsortfilterproxymodel.cpp | 16 ++-- qt/gen_qstandarditemmodel.cpp | 22 ++--- qt/gen_qstringlistmodel.cpp | 4 +- qt/gen_qstringmatcher.cpp | 4 +- qt/gen_qstringview.cpp | 48 +++++------ qt/gen_qstyle.cpp | 42 +++++----- qt/gen_qtabwidget.cpp | 2 +- qt/gen_qtextcodec.cpp | 8 +- qt/gen_qtextdocument.cpp | 24 +++--- qt/gen_qtextdocumentfragment.cpp | 2 +- qt/gen_qtextedit.cpp | 2 +- qt/gen_qtextlayout.cpp | 24 +++--- qt/gen_qtextobject.cpp | 4 +- qt/gen_qtimezone.cpp | 8 +- qt/gen_qtransform.cpp | 2 +- qt/gen_qtranslator.cpp | 4 +- qt/gen_qtransposeproxymodel.cpp | 8 +- qt/gen_qtreewidget.cpp | 4 +- qt/gen_qundogroup.cpp | 4 +- qt/gen_qundostack.cpp | 4 +- qt/gen_qurl.cpp | 22 ++--- qt/gen_qurlquery.cpp | 8 +- qt/gen_qvariant.cpp | 14 ++-- qt/gen_qwindow.cpp | 2 +- 102 files changed, 798 insertions(+), 633 deletions(-) diff --git a/qt/gen_qabstractbutton.cpp b/qt/gen_qabstractbutton.cpp index 523756fb..fb4e0e44 100644 --- a/qt/gen_qabstractbutton.cpp +++ b/qt/gen_qabstractbutton.cpp @@ -177,6 +177,12 @@ void QAbstractButton_Clicked(QAbstractButton* self) { self->clicked(); } +void QAbstractButton_connect_Clicked(QAbstractButton* self, void* slot) { + QAbstractButton::connect(self, static_cast(&QAbstractButton::clicked), self, [=]() { + miqt_exec_callback(slot, 0, nullptr); + }); +} + void QAbstractButton_Toggled(QAbstractButton* self, bool checked) { self->toggled(checked); } diff --git a/qt/gen_qabstractbutton.go b/qt/gen_qabstractbutton.go index d46707f3..80650510 100644 --- a/qt/gen_qabstractbutton.go +++ b/qt/gen_qabstractbutton.go @@ -232,6 +232,14 @@ func (this *QAbstractButton) Clicked() { C.QAbstractButton_Clicked(this.h) } +func (this *QAbstractButton) OnClicked(slot func()) { + var slotWrapper miqtCallbackFunc = func(argc C.int, args *C.void) { + slot() + } + + C.QAbstractButton_connect_Clicked(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slotWrapper)))) +} + func (this *QAbstractButton) Toggled(checked bool) { C.QAbstractButton_Toggled(this.h, (C.bool)(checked)) } diff --git a/qt/gen_qabstractbutton.h b/qt/gen_qabstractbutton.h index 9ff85f05..142005d3 100644 --- a/qt/gen_qabstractbutton.h +++ b/qt/gen_qabstractbutton.h @@ -61,6 +61,7 @@ void QAbstractButton_connect_Pressed(QAbstractButton* self, void* slot); void QAbstractButton_Released(QAbstractButton* self); void QAbstractButton_connect_Released(QAbstractButton* self, void* slot); void QAbstractButton_Clicked(QAbstractButton* self); +void QAbstractButton_connect_Clicked(QAbstractButton* self, void* slot); void QAbstractButton_Toggled(QAbstractButton* self, bool checked); void QAbstractButton_connect_Toggled(QAbstractButton* self, void* slot); void QAbstractButton_Tr2(const char* s, const char* c, char** _out, int* _out_Strlen); diff --git a/qt/gen_qabstractitemdelegate.cpp b/qt/gen_qabstractitemdelegate.cpp index d265d65d..d5b39bfd 100644 --- a/qt/gen_qabstractitemdelegate.cpp +++ b/qt/gen_qabstractitemdelegate.cpp @@ -117,6 +117,12 @@ void QAbstractItemDelegate_CloseEditor(QAbstractItemDelegate* self, QWidget* edi self->closeEditor(editor); } +void QAbstractItemDelegate_connect_CloseEditor(QAbstractItemDelegate* self, void* slot) { + QAbstractItemDelegate::connect(self, static_cast(&QAbstractItemDelegate::closeEditor), self, [=](QWidget* editor) { + miqt_exec_callback(slot, 0, nullptr); + }); +} + void QAbstractItemDelegate_SizeHintChanged(QAbstractItemDelegate* self, QModelIndex* param1) { self->sizeHintChanged(*param1); } diff --git a/qt/gen_qabstractitemdelegate.go b/qt/gen_qabstractitemdelegate.go index 7535cf8b..ab73be46 100644 --- a/qt/gen_qabstractitemdelegate.go +++ b/qt/gen_qabstractitemdelegate.go @@ -160,6 +160,14 @@ func (this *QAbstractItemDelegate) CloseEditor(editor *QWidget) { C.QAbstractItemDelegate_CloseEditor(this.h, editor.cPointer()) } +func (this *QAbstractItemDelegate) OnCloseEditor(slot func()) { + var slotWrapper miqtCallbackFunc = func(argc C.int, args *C.void) { + slot() + } + + C.QAbstractItemDelegate_connect_CloseEditor(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slotWrapper)))) +} + func (this *QAbstractItemDelegate) SizeHintChanged(param1 *QModelIndex) { C.QAbstractItemDelegate_SizeHintChanged(this.h, param1.cPointer()) } diff --git a/qt/gen_qabstractitemdelegate.h b/qt/gen_qabstractitemdelegate.h index a525697c..7e174a93 100644 --- a/qt/gen_qabstractitemdelegate.h +++ b/qt/gen_qabstractitemdelegate.h @@ -56,6 +56,7 @@ void QAbstractItemDelegate_PaintingRoles(QAbstractItemDelegate* self, int** _out void QAbstractItemDelegate_CommitData(QAbstractItemDelegate* self, QWidget* editor); void QAbstractItemDelegate_connect_CommitData(QAbstractItemDelegate* self, void* slot); void QAbstractItemDelegate_CloseEditor(QAbstractItemDelegate* self, QWidget* editor); +void QAbstractItemDelegate_connect_CloseEditor(QAbstractItemDelegate* self, void* slot); void QAbstractItemDelegate_SizeHintChanged(QAbstractItemDelegate* self, QModelIndex* param1); void QAbstractItemDelegate_connect_SizeHintChanged(QAbstractItemDelegate* self, void* slot); void QAbstractItemDelegate_Tr2(const char* s, const char* c, char** _out, int* _out_Strlen); diff --git a/qt/gen_qabstractitemmodel.cpp b/qt/gen_qabstractitemmodel.cpp index 88f6dda4..266cb2d6 100644 --- a/qt/gen_qabstractitemmodel.cpp +++ b/qt/gen_qabstractitemmodel.cpp @@ -102,7 +102,7 @@ bool QModelIndex_OperatorLesser(QModelIndex* self, QModelIndex* other) { } QVariant* QModelIndex_Data1(QModelIndex* self, int role) { - QVariant ret = self->data(static_cast(role)); + QVariant ret = const_cast(self)->data(static_cast(role)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QVariant(ret)); } @@ -206,7 +206,7 @@ bool QPersistentModelIndex_IsValid(QPersistentModelIndex* self) { } QVariant* QPersistentModelIndex_Data1(QPersistentModelIndex* self, int role) { - QVariant ret = self->data(static_cast(role)); + QVariant ret = const_cast(self)->data(static_cast(role)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QVariant(ret)); } @@ -431,6 +431,12 @@ void QAbstractItemModel_DataChanged(QAbstractItemModel* self, QModelIndex* topLe 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) { + miqt_exec_callback(slot, 0, nullptr); + }); +} + void QAbstractItemModel_HeaderDataChanged(QAbstractItemModel* self, uintptr_t orientation, int first, int last) { self->headerDataChanged(static_cast(orientation), static_cast(first), static_cast(last)); } @@ -445,10 +451,22 @@ void QAbstractItemModel_LayoutChanged(QAbstractItemModel* self) { self->layoutChanged(); } +void QAbstractItemModel_connect_LayoutChanged(QAbstractItemModel* self, void* slot) { + QAbstractItemModel::connect(self, static_cast&, QAbstractItemModel::LayoutChangeHint)>(&QAbstractItemModel::layoutChanged), self, [=]() { + miqt_exec_callback(slot, 0, nullptr); + }); +} + void QAbstractItemModel_LayoutAboutToBeChanged(QAbstractItemModel* self) { self->layoutAboutToBeChanged(); } +void QAbstractItemModel_connect_LayoutAboutToBeChanged(QAbstractItemModel* self, void* slot) { + QAbstractItemModel::connect(self, static_cast&, QAbstractItemModel::LayoutChangeHint)>(&QAbstractItemModel::layoutAboutToBeChanged), self, [=]() { + miqt_exec_callback(slot, 0, nullptr); + }); +} + bool QAbstractItemModel_Submit(QAbstractItemModel* self) { return self->submit(); } @@ -494,29 +512,29 @@ void QAbstractItemModel_TrUtf83(const char* s, const char* c, int n, char** _out } bool QAbstractItemModel_HasIndex3(QAbstractItemModel* self, int row, int column, QModelIndex* parent) { - return self->hasIndex(static_cast(row), static_cast(column), *parent); + return const_cast(self)->hasIndex(static_cast(row), static_cast(column), *parent); } QModelIndex* QAbstractItemModel_Index3(QAbstractItemModel* self, int row, int column, QModelIndex* parent) { - QModelIndex ret = self->index(static_cast(row), static_cast(column), *parent); + QModelIndex ret = const_cast(self)->index(static_cast(row), static_cast(column), *parent); // Copy-construct value returned type into heap-allocated copy return static_cast(new QModelIndex(ret)); } int QAbstractItemModel_RowCount1(QAbstractItemModel* self, QModelIndex* parent) { - return self->rowCount(*parent); + return const_cast(self)->rowCount(*parent); } int QAbstractItemModel_ColumnCount1(QAbstractItemModel* self, QModelIndex* parent) { - return self->columnCount(*parent); + return const_cast(self)->columnCount(*parent); } bool QAbstractItemModel_HasChildren1(QAbstractItemModel* self, QModelIndex* parent) { - return self->hasChildren(*parent); + return const_cast(self)->hasChildren(*parent); } QVariant* QAbstractItemModel_Data2(QAbstractItemModel* self, QModelIndex* index, int role) { - QVariant ret = self->data(*index, static_cast(role)); + QVariant ret = const_cast(self)->data(*index, static_cast(role)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QVariant(ret)); } @@ -526,7 +544,7 @@ bool QAbstractItemModel_SetData3(QAbstractItemModel* self, QModelIndex* index, Q } QVariant* QAbstractItemModel_HeaderData3(QAbstractItemModel* self, int section, uintptr_t orientation, int role) { - QVariant ret = self->headerData(static_cast(section), static_cast(orientation), static_cast(role)); + QVariant ret = const_cast(self)->headerData(static_cast(section), static_cast(orientation), static_cast(role)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QVariant(ret)); } @@ -572,7 +590,7 @@ void QAbstractItemModel_Sort2(QAbstractItemModel* self, int column, uintptr_t or } void QAbstractItemModel_Match4(QAbstractItemModel* self, QModelIndex* start, int role, QVariant* value, int hits, QModelIndex*** _out, size_t* _out_len) { - QModelIndexList ret = self->match(*start, static_cast(role), *value, static_cast(hits)); + QModelIndexList ret = const_cast(self)->match(*start, static_cast(role), *value, static_cast(hits)); // Convert QList<> from C++ memory to manually-managed C memory of copy-constructed pointers QModelIndex** __out = static_cast(malloc(sizeof(QModelIndex**) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { @@ -583,7 +601,7 @@ void QAbstractItemModel_Match4(QAbstractItemModel* self, QModelIndex* start, int } void QAbstractItemModel_Match5(QAbstractItemModel* self, QModelIndex* start, int role, QVariant* value, int hits, int flags, QModelIndex*** _out, size_t* _out_len) { - QModelIndexList ret = self->match(*start, static_cast(role), *value, static_cast(hits), static_cast(flags)); + QModelIndexList ret = const_cast(self)->match(*start, static_cast(role), *value, static_cast(hits), static_cast(flags)); // Convert QList<> from C++ memory to manually-managed C memory of copy-constructed pointers QModelIndex** __out = static_cast(malloc(sizeof(QModelIndex**) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { @@ -594,7 +612,7 @@ void QAbstractItemModel_Match5(QAbstractItemModel* self, QModelIndex* start, int } bool QAbstractItemModel_CheckIndex2(QAbstractItemModel* self, QModelIndex* index, int options) { - return self->checkIndex(*index, static_cast(options)); + return const_cast(self)->checkIndex(*index, static_cast(options)); } void QAbstractItemModel_DataChanged3(QAbstractItemModel* self, QModelIndex* topLeft, QModelIndex* bottomRight, int* roles, size_t roles_len) { @@ -621,6 +639,12 @@ void QAbstractItemModel_LayoutChanged1(QAbstractItemModel* self, QPersistentMode self->layoutChanged(parents_QList); } +void QAbstractItemModel_connect_LayoutChanged1(QAbstractItemModel* self, void* slot) { + QAbstractItemModel::connect(self, static_cast&, QAbstractItemModel::LayoutChangeHint)>(&QAbstractItemModel::layoutChanged), self, [=](const QList& parents) { + miqt_exec_callback(slot, 0, nullptr); + }); +} + void QAbstractItemModel_LayoutChanged2(QAbstractItemModel* self, QPersistentModelIndex** parents, size_t parents_len, uintptr_t hint) { QList parents_QList; parents_QList.reserve(parents_len); @@ -645,6 +669,12 @@ void QAbstractItemModel_LayoutAboutToBeChanged1(QAbstractItemModel* self, QPersi self->layoutAboutToBeChanged(parents_QList); } +void QAbstractItemModel_connect_LayoutAboutToBeChanged1(QAbstractItemModel* self, void* slot) { + QAbstractItemModel::connect(self, static_cast&, QAbstractItemModel::LayoutChangeHint)>(&QAbstractItemModel::layoutAboutToBeChanged), self, [=](const QList& parents) { + miqt_exec_callback(slot, 0, nullptr); + }); +} + void QAbstractItemModel_LayoutAboutToBeChanged2(QAbstractItemModel* self, QPersistentModelIndex** parents, size_t parents_len, uintptr_t hint) { QList parents_QList; parents_QList.reserve(parents_len); @@ -744,7 +774,7 @@ void QAbstractTableModel_TrUtf83(const char* s, const char* c, int n, char** _ou } QModelIndex* QAbstractTableModel_Index3(QAbstractTableModel* self, int row, int column, QModelIndex* parent) { - QModelIndex ret = self->index(static_cast(row), static_cast(column), *parent); + QModelIndex ret = const_cast(self)->index(static_cast(row), static_cast(column), *parent); // Copy-construct value returned type into heap-allocated copy return static_cast(new QModelIndex(ret)); } @@ -833,13 +863,13 @@ void QAbstractListModel_TrUtf83(const char* s, const char* c, int n, char** _out } QModelIndex* QAbstractListModel_Index2(QAbstractListModel* self, int row, int column) { - QModelIndex ret = self->index(static_cast(row), static_cast(column)); + QModelIndex ret = const_cast(self)->index(static_cast(row), static_cast(column)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QModelIndex(ret)); } QModelIndex* QAbstractListModel_Index3(QAbstractListModel* self, int row, int column, QModelIndex* parent) { - QModelIndex ret = self->index(static_cast(row), static_cast(column), *parent); + QModelIndex ret = const_cast(self)->index(static_cast(row), static_cast(column), *parent); // Copy-construct value returned type into heap-allocated copy return static_cast(new QModelIndex(ret)); } diff --git a/qt/gen_qabstractitemmodel.go b/qt/gen_qabstractitemmodel.go index 0ff3a213..3c5153f1 100644 --- a/qt/gen_qabstractitemmodel.go +++ b/qt/gen_qabstractitemmodel.go @@ -660,6 +660,14 @@ func (this *QAbstractItemModel) DataChanged(topLeft *QModelIndex, bottomRight *Q C.QAbstractItemModel_DataChanged(this.h, topLeft.cPointer(), bottomRight.cPointer()) } +func (this *QAbstractItemModel) OnDataChanged(slot func()) { + var slotWrapper miqtCallbackFunc = func(argc C.int, args *C.void) { + slot() + } + + C.QAbstractItemModel_connect_DataChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slotWrapper)))) +} + func (this *QAbstractItemModel) HeaderDataChanged(orientation Orientation, first int, last int) { C.QAbstractItemModel_HeaderDataChanged(this.h, (C.uintptr_t)(orientation), (C.int)(first), (C.int)(last)) } @@ -676,10 +684,26 @@ func (this *QAbstractItemModel) LayoutChanged() { C.QAbstractItemModel_LayoutChanged(this.h) } +func (this *QAbstractItemModel) OnLayoutChanged(slot func()) { + var slotWrapper miqtCallbackFunc = func(argc C.int, args *C.void) { + slot() + } + + C.QAbstractItemModel_connect_LayoutChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slotWrapper)))) +} + func (this *QAbstractItemModel) LayoutAboutToBeChanged() { C.QAbstractItemModel_LayoutAboutToBeChanged(this.h) } +func (this *QAbstractItemModel) OnLayoutAboutToBeChanged(slot func()) { + var slotWrapper miqtCallbackFunc = func(argc C.int, args *C.void) { + slot() + } + + C.QAbstractItemModel_connect_LayoutAboutToBeChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slotWrapper)))) +} + func (this *QAbstractItemModel) Submit() bool { ret := C.QAbstractItemModel_Submit(this.h) return (bool)(ret) @@ -907,6 +931,14 @@ func (this *QAbstractItemModel) LayoutChanged1(parents []QPersistentModelIndex) C.QAbstractItemModel_LayoutChanged1(this.h, &parents_CArray[0], C.size_t(len(parents))) } +func (this *QAbstractItemModel) OnLayoutChanged1(slot func()) { + var slotWrapper miqtCallbackFunc = func(argc C.int, args *C.void) { + slot() + } + + C.QAbstractItemModel_connect_LayoutChanged1(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slotWrapper)))) +} + func (this *QAbstractItemModel) LayoutChanged2(parents []QPersistentModelIndex, hint QAbstractItemModel__LayoutChangeHint) { // For the C ABI, malloc a C array of raw pointers parents_CArray := (*[0xffff]*C.QPersistentModelIndex)(C.malloc(C.size_t(8 * len(parents)))) @@ -935,6 +967,14 @@ func (this *QAbstractItemModel) LayoutAboutToBeChanged1(parents []QPersistentMod C.QAbstractItemModel_LayoutAboutToBeChanged1(this.h, &parents_CArray[0], C.size_t(len(parents))) } +func (this *QAbstractItemModel) OnLayoutAboutToBeChanged1(slot func()) { + var slotWrapper miqtCallbackFunc = func(argc C.int, args *C.void) { + slot() + } + + C.QAbstractItemModel_connect_LayoutAboutToBeChanged1(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slotWrapper)))) +} + func (this *QAbstractItemModel) LayoutAboutToBeChanged2(parents []QPersistentModelIndex, hint QAbstractItemModel__LayoutChangeHint) { // For the C ABI, malloc a C array of raw pointers parents_CArray := (*[0xffff]*C.QPersistentModelIndex)(C.malloc(C.size_t(8 * len(parents)))) diff --git a/qt/gen_qabstractitemmodel.h b/qt/gen_qabstractitemmodel.h index 4cb6b038..799e0135 100644 --- a/qt/gen_qabstractitemmodel.h +++ b/qt/gen_qabstractitemmodel.h @@ -118,10 +118,13 @@ void QAbstractItemModel_Match(QAbstractItemModel* self, QModelIndex* start, int QSize* QAbstractItemModel_Span(QAbstractItemModel* self, QModelIndex* index); bool QAbstractItemModel_CheckIndex(QAbstractItemModel* self, QModelIndex* index); void QAbstractItemModel_DataChanged(QAbstractItemModel* self, QModelIndex* topLeft, QModelIndex* bottomRight); +void QAbstractItemModel_connect_DataChanged(QAbstractItemModel* self, void* slot); void QAbstractItemModel_HeaderDataChanged(QAbstractItemModel* self, uintptr_t orientation, int first, int last); void QAbstractItemModel_connect_HeaderDataChanged(QAbstractItemModel* self, void* slot); void QAbstractItemModel_LayoutChanged(QAbstractItemModel* self); +void QAbstractItemModel_connect_LayoutChanged(QAbstractItemModel* self, void* slot); void QAbstractItemModel_LayoutAboutToBeChanged(QAbstractItemModel* self); +void QAbstractItemModel_connect_LayoutAboutToBeChanged(QAbstractItemModel* self, void* slot); bool QAbstractItemModel_Submit(QAbstractItemModel* self); void QAbstractItemModel_Revert(QAbstractItemModel* self); void QAbstractItemModel_Tr2(const char* s, const char* c, char** _out, int* _out_Strlen); @@ -152,9 +155,11 @@ bool QAbstractItemModel_CheckIndex2(QAbstractItemModel* self, QModelIndex* index void QAbstractItemModel_DataChanged3(QAbstractItemModel* self, QModelIndex* topLeft, QModelIndex* bottomRight, int* roles, size_t roles_len); void QAbstractItemModel_connect_DataChanged3(QAbstractItemModel* self, void* slot); void QAbstractItemModel_LayoutChanged1(QAbstractItemModel* self, QPersistentModelIndex** parents, size_t parents_len); +void QAbstractItemModel_connect_LayoutChanged1(QAbstractItemModel* self, void* slot); void QAbstractItemModel_LayoutChanged2(QAbstractItemModel* self, QPersistentModelIndex** parents, size_t parents_len, uintptr_t hint); void QAbstractItemModel_connect_LayoutChanged2(QAbstractItemModel* self, void* slot); void QAbstractItemModel_LayoutAboutToBeChanged1(QAbstractItemModel* self, QPersistentModelIndex** parents, size_t parents_len); +void QAbstractItemModel_connect_LayoutAboutToBeChanged1(QAbstractItemModel* self, void* slot); void QAbstractItemModel_LayoutAboutToBeChanged2(QAbstractItemModel* self, QPersistentModelIndex** parents, size_t parents_len, uintptr_t hint); void QAbstractItemModel_connect_LayoutAboutToBeChanged2(QAbstractItemModel* self, void* slot); void QAbstractItemModel_Delete(QAbstractItemModel* self); diff --git a/qt/gen_qabstractproxymodel.cpp b/qt/gen_qabstractproxymodel.cpp index b7152d23..f63dadc8 100644 --- a/qt/gen_qabstractproxymodel.cpp +++ b/qt/gen_qabstractproxymodel.cpp @@ -207,13 +207,13 @@ void QAbstractProxyModel_TrUtf83(const char* s, const char* c, int n, char** _ou } QVariant* QAbstractProxyModel_Data2(QAbstractProxyModel* self, QModelIndex* proxyIndex, int role) { - QVariant ret = self->data(*proxyIndex, static_cast(role)); + QVariant ret = const_cast(self)->data(*proxyIndex, static_cast(role)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QVariant(ret)); } QVariant* QAbstractProxyModel_HeaderData3(QAbstractProxyModel* self, int section, uintptr_t orientation, int role) { - QVariant ret = self->headerData(static_cast(section), static_cast(orientation), static_cast(role)); + QVariant ret = const_cast(self)->headerData(static_cast(section), static_cast(orientation), static_cast(role)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QVariant(ret)); } @@ -231,7 +231,7 @@ void QAbstractProxyModel_Sort2(QAbstractProxyModel* self, int column, uintptr_t } bool QAbstractProxyModel_HasChildren1(QAbstractProxyModel* self, QModelIndex* parent) { - return self->hasChildren(*parent); + return const_cast(self)->hasChildren(*parent); } void QAbstractProxyModel_Delete(QAbstractProxyModel* self) { diff --git a/qt/gen_qabstracttextdocumentlayout.cpp b/qt/gen_qabstracttextdocumentlayout.cpp index defaa7af..0ec04f57 100644 --- a/qt/gen_qabstracttextdocumentlayout.cpp +++ b/qt/gen_qabstracttextdocumentlayout.cpp @@ -130,6 +130,12 @@ void QAbstractTextDocumentLayout_Update(QAbstractTextDocumentLayout* self) { self->update(); } +void QAbstractTextDocumentLayout_connect_Update(QAbstractTextDocumentLayout* self, void* slot) { + QAbstractTextDocumentLayout::connect(self, static_cast(&QAbstractTextDocumentLayout::update), self, [=]() { + miqt_exec_callback(slot, 0, nullptr); + }); +} + void QAbstractTextDocumentLayout_UpdateBlock(QAbstractTextDocumentLayout* self, QTextBlock* block) { self->updateBlock(*block); } diff --git a/qt/gen_qabstracttextdocumentlayout.go b/qt/gen_qabstracttextdocumentlayout.go index 005c491a..3600c537 100644 --- a/qt/gen_qabstracttextdocumentlayout.go +++ b/qt/gen_qabstracttextdocumentlayout.go @@ -177,6 +177,14 @@ func (this *QAbstractTextDocumentLayout) Update() { C.QAbstractTextDocumentLayout_Update(this.h) } +func (this *QAbstractTextDocumentLayout) OnUpdate(slot func()) { + var slotWrapper miqtCallbackFunc = func(argc C.int, args *C.void) { + slot() + } + + C.QAbstractTextDocumentLayout_connect_Update(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slotWrapper)))) +} + func (this *QAbstractTextDocumentLayout) UpdateBlock(block *QTextBlock) { C.QAbstractTextDocumentLayout_UpdateBlock(this.h, block.cPointer()) } diff --git a/qt/gen_qabstracttextdocumentlayout.h b/qt/gen_qabstracttextdocumentlayout.h index fe91076d..830f4798 100644 --- a/qt/gen_qabstracttextdocumentlayout.h +++ b/qt/gen_qabstracttextdocumentlayout.h @@ -72,6 +72,7 @@ QTextDocument* QAbstractTextDocumentLayout_Document(QAbstractTextDocumentLayout* void QAbstractTextDocumentLayout_RegisterHandler(QAbstractTextDocumentLayout* self, int objectType, QObject* component); void QAbstractTextDocumentLayout_UnregisterHandler(QAbstractTextDocumentLayout* self, int objectType); void QAbstractTextDocumentLayout_Update(QAbstractTextDocumentLayout* self); +void QAbstractTextDocumentLayout_connect_Update(QAbstractTextDocumentLayout* self, void* slot); void QAbstractTextDocumentLayout_UpdateBlock(QAbstractTextDocumentLayout* self, QTextBlock* block); void QAbstractTextDocumentLayout_connect_UpdateBlock(QAbstractTextDocumentLayout* self, void* slot); void QAbstractTextDocumentLayout_DocumentSizeChanged(QAbstractTextDocumentLayout* self, QSizeF* newSize); diff --git a/qt/gen_qaction.cpp b/qt/gen_qaction.cpp index ddd5f443..97a5abff 100644 --- a/qt/gen_qaction.cpp +++ b/qt/gen_qaction.cpp @@ -376,6 +376,12 @@ void QAction_Triggered(QAction* self) { self->triggered(); } +void QAction_connect_Triggered(QAction* self, void* slot) { + QAction::connect(self, static_cast(&QAction::triggered), self, [=]() { + miqt_exec_callback(slot, 0, nullptr); + }); +} + void QAction_Hovered(QAction* self) { self->hovered(); } diff --git a/qt/gen_qaction.go b/qt/gen_qaction.go index d212378d..e7de8475 100644 --- a/qt/gen_qaction.go +++ b/qt/gen_qaction.go @@ -486,6 +486,14 @@ func (this *QAction) Triggered() { C.QAction_Triggered(this.h) } +func (this *QAction) OnTriggered(slot func()) { + var slotWrapper miqtCallbackFunc = func(argc C.int, args *C.void) { + slot() + } + + C.QAction_connect_Triggered(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slotWrapper)))) +} + func (this *QAction) Hovered() { C.QAction_Hovered(this.h) } diff --git a/qt/gen_qaction.h b/qt/gen_qaction.h index b5b156e1..7adb4cfb 100644 --- a/qt/gen_qaction.h +++ b/qt/gen_qaction.h @@ -105,6 +105,7 @@ void QAction_SetVisible(QAction* self, bool visible); void QAction_Changed(QAction* self); void QAction_connect_Changed(QAction* self, void* slot); void QAction_Triggered(QAction* self); +void QAction_connect_Triggered(QAction* self, void* slot); void QAction_Hovered(QAction* self); void QAction_connect_Hovered(QAction* self, void* slot); void QAction_Toggled(QAction* self, bool param1); diff --git a/qt/gen_qbytearray.cpp b/qt/gen_qbytearray.cpp index 79a72459..ec143e14 100644 --- a/qt/gen_qbytearray.cpp +++ b/qt/gen_qbytearray.cpp @@ -697,14 +697,14 @@ QByteArray* QByteArray_SetNumWithUint(QByteArray* self, unsigned int param1) { return &ret; } -QByteArray* QByteArray_SetNumWithQlonglong(QByteArray* self, int64_t param1) { - QByteArray& ret = self->setNum((qlonglong)(param1)); +QByteArray* QByteArray_SetNumWithQlonglong(QByteArray* self, long long param1) { + QByteArray& ret = self->setNum(static_cast(param1)); // Cast returned reference into pointer return &ret; } -QByteArray* QByteArray_SetNumWithQulonglong(QByteArray* self, uint64_t param1) { - QByteArray& ret = self->setNum((qulonglong)(param1)); +QByteArray* QByteArray_SetNumWithQulonglong(QByteArray* self, unsigned long long param1) { + QByteArray& ret = self->setNum(static_cast(param1)); // Cast returned reference into pointer return &ret; } @@ -739,14 +739,14 @@ QByteArray* QByteArray_NumberWithUint(unsigned int param1) { return static_cast(new QByteArray(ret)); } -QByteArray* QByteArray_NumberWithQlonglong(int64_t param1) { - QByteArray ret = QByteArray::number((qlonglong)(param1)); +QByteArray* QByteArray_NumberWithQlonglong(long long param1) { + QByteArray ret = QByteArray::number(static_cast(param1)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QByteArray(ret)); } -QByteArray* QByteArray_NumberWithQulonglong(uint64_t param1) { - QByteArray ret = QByteArray::number((qulonglong)(param1)); +QByteArray* QByteArray_NumberWithQulonglong(unsigned long long param1) { + QByteArray ret = QByteArray::number(static_cast(param1)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QByteArray(ret)); } @@ -872,163 +872,163 @@ QByteArray* QByteArray_Fill2(QByteArray* self, char c, int size) { } int QByteArray_IndexOf2(QByteArray* self, char c, int from) { - return self->indexOf(static_cast(c), static_cast(from)); + return const_cast(self)->indexOf(static_cast(c), static_cast(from)); } int QByteArray_IndexOf22(QByteArray* self, const char* c, int from) { - return self->indexOf(c, static_cast(from)); + return const_cast(self)->indexOf(c, static_cast(from)); } int QByteArray_IndexOf23(QByteArray* self, QByteArray* a, int from) { - return self->indexOf(*a, static_cast(from)); + return const_cast(self)->indexOf(*a, static_cast(from)); } int QByteArray_LastIndexOf2(QByteArray* self, char c, int from) { - return self->lastIndexOf(static_cast(c), static_cast(from)); + return const_cast(self)->lastIndexOf(static_cast(c), static_cast(from)); } int QByteArray_LastIndexOf22(QByteArray* self, const char* c, int from) { - return self->lastIndexOf(c, static_cast(from)); + return const_cast(self)->lastIndexOf(c, static_cast(from)); } int QByteArray_LastIndexOf23(QByteArray* self, QByteArray* a, int from) { - return self->lastIndexOf(*a, static_cast(from)); + return const_cast(self)->lastIndexOf(*a, static_cast(from)); } int QByteArray_Compare2(QByteArray* self, const char* c, uintptr_t cs) { - return self->compare(c, static_cast(cs)); + return const_cast(self)->compare(c, static_cast(cs)); } int QByteArray_Compare22(QByteArray* self, QByteArray* a, uintptr_t cs) { - return self->compare(*a, static_cast(cs)); + return const_cast(self)->compare(*a, static_cast(cs)); } QByteArray* QByteArray_Mid2(QByteArray* self, int index, int lenVal) { - QByteArray ret = self->mid(static_cast(index), static_cast(lenVal)); + QByteArray ret = const_cast(self)->mid(static_cast(index), static_cast(lenVal)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QByteArray(ret)); } QByteArray* QByteArray_LeftJustified2(QByteArray* self, int width, char fill) { - QByteArray ret = self->leftJustified(static_cast(width), static_cast(fill)); + QByteArray ret = const_cast(self)->leftJustified(static_cast(width), static_cast(fill)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QByteArray(ret)); } QByteArray* QByteArray_LeftJustified3(QByteArray* self, int width, char fill, bool truncate) { - QByteArray ret = self->leftJustified(static_cast(width), static_cast(fill), truncate); + QByteArray ret = const_cast(self)->leftJustified(static_cast(width), static_cast(fill), truncate); // Copy-construct value returned type into heap-allocated copy return static_cast(new QByteArray(ret)); } QByteArray* QByteArray_RightJustified2(QByteArray* self, int width, char fill) { - QByteArray ret = self->rightJustified(static_cast(width), static_cast(fill)); + QByteArray ret = const_cast(self)->rightJustified(static_cast(width), static_cast(fill)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QByteArray(ret)); } QByteArray* QByteArray_RightJustified3(QByteArray* self, int width, char fill, bool truncate) { - QByteArray ret = self->rightJustified(static_cast(width), static_cast(fill), truncate); + QByteArray ret = const_cast(self)->rightJustified(static_cast(width), static_cast(fill), truncate); // Copy-construct value returned type into heap-allocated copy return static_cast(new QByteArray(ret)); } int QByteArray_IndexOf24(QByteArray* self, const char* s, size_t s_Strlen, int from) { QString s_QString = QString::fromUtf8(s, s_Strlen); - return self->indexOf(s_QString, static_cast(from)); + return const_cast(self)->indexOf(s_QString, static_cast(from)); } int QByteArray_LastIndexOf24(QByteArray* self, const char* s, size_t s_Strlen, int from) { QString s_QString = QString::fromUtf8(s, s_Strlen); - return self->lastIndexOf(s_QString, static_cast(from)); + return const_cast(self)->lastIndexOf(s_QString, static_cast(from)); } int16_t QByteArray_ToShort1(QByteArray* self, bool* ok) { - return self->toShort(ok); + return const_cast(self)->toShort(ok); } int16_t QByteArray_ToShort2(QByteArray* self, bool* ok, int base) { - return self->toShort(ok, static_cast(base)); + return const_cast(self)->toShort(ok, static_cast(base)); } uint16_t QByteArray_ToUShort1(QByteArray* self, bool* ok) { - return self->toUShort(ok); + return const_cast(self)->toUShort(ok); } uint16_t QByteArray_ToUShort2(QByteArray* self, bool* ok, int base) { - return self->toUShort(ok, static_cast(base)); + return const_cast(self)->toUShort(ok, static_cast(base)); } int QByteArray_ToInt1(QByteArray* self, bool* ok) { - return self->toInt(ok); + return const_cast(self)->toInt(ok); } int QByteArray_ToInt2(QByteArray* self, bool* ok, int base) { - return self->toInt(ok, static_cast(base)); + return const_cast(self)->toInt(ok, static_cast(base)); } unsigned int QByteArray_ToUInt1(QByteArray* self, bool* ok) { - return self->toUInt(ok); + return const_cast(self)->toUInt(ok); } unsigned int QByteArray_ToUInt2(QByteArray* self, bool* ok, int base) { - return self->toUInt(ok, static_cast(base)); + return const_cast(self)->toUInt(ok, static_cast(base)); } long QByteArray_ToLong1(QByteArray* self, bool* ok) { - return self->toLong(ok); + return const_cast(self)->toLong(ok); } long QByteArray_ToLong2(QByteArray* self, bool* ok, int base) { - return self->toLong(ok, static_cast(base)); + return const_cast(self)->toLong(ok, static_cast(base)); } unsigned long QByteArray_ToULong1(QByteArray* self, bool* ok) { - return self->toULong(ok); + return const_cast(self)->toULong(ok); } unsigned long QByteArray_ToULong2(QByteArray* self, bool* ok, int base) { - return self->toULong(ok, static_cast(base)); + return const_cast(self)->toULong(ok, static_cast(base)); } int64_t QByteArray_ToLongLong1(QByteArray* self, bool* ok) { - return self->toLongLong(ok); + return const_cast(self)->toLongLong(ok); } int64_t QByteArray_ToLongLong2(QByteArray* self, bool* ok, int base) { - return self->toLongLong(ok, static_cast(base)); + return const_cast(self)->toLongLong(ok, static_cast(base)); } uint64_t QByteArray_ToULongLong1(QByteArray* self, bool* ok) { - return self->toULongLong(ok); + return const_cast(self)->toULongLong(ok); } uint64_t QByteArray_ToULongLong2(QByteArray* self, bool* ok, int base) { - return self->toULongLong(ok, static_cast(base)); + return const_cast(self)->toULongLong(ok, static_cast(base)); } float QByteArray_ToFloat1(QByteArray* self, bool* ok) { - return self->toFloat(ok); + return const_cast(self)->toFloat(ok); } double QByteArray_ToDouble1(QByteArray* self, bool* ok) { - return self->toDouble(ok); + return const_cast(self)->toDouble(ok); } QByteArray* QByteArray_ToPercentEncoding1(QByteArray* self, QByteArray* exclude) { - QByteArray ret = self->toPercentEncoding(*exclude); + QByteArray ret = const_cast(self)->toPercentEncoding(*exclude); // Copy-construct value returned type into heap-allocated copy return static_cast(new QByteArray(ret)); } QByteArray* QByteArray_ToPercentEncoding2(QByteArray* self, QByteArray* exclude, QByteArray* include) { - QByteArray ret = self->toPercentEncoding(*exclude, *include); + QByteArray ret = const_cast(self)->toPercentEncoding(*exclude, *include); // Copy-construct value returned type into heap-allocated copy return static_cast(new QByteArray(ret)); } QByteArray* QByteArray_ToPercentEncoding3(QByteArray* self, QByteArray* exclude, QByteArray* include, char percent) { - QByteArray ret = self->toPercentEncoding(*exclude, *include, static_cast(percent)); + QByteArray ret = const_cast(self)->toPercentEncoding(*exclude, *include, static_cast(percent)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QByteArray(ret)); } @@ -1057,14 +1057,14 @@ QByteArray* QByteArray_SetNum24(QByteArray* self, unsigned int param1, int base) return &ret; } -QByteArray* QByteArray_SetNum25(QByteArray* self, int64_t param1, int base) { - QByteArray& ret = self->setNum((qlonglong)(param1), static_cast(base)); +QByteArray* QByteArray_SetNum25(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, uint64_t param1, int base) { - QByteArray& ret = self->setNum((qulonglong)(param1), static_cast(base)); +QByteArray* QByteArray_SetNum26(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; } @@ -1105,14 +1105,14 @@ QByteArray* QByteArray_Number22(unsigned int param1, int base) { return static_cast(new QByteArray(ret)); } -QByteArray* QByteArray_Number23(int64_t param1, int base) { - QByteArray ret = QByteArray::number((qlonglong)(param1), static_cast(base)); +QByteArray* QByteArray_Number23(long long param1, int base) { + QByteArray ret = QByteArray::number(static_cast(param1), static_cast(base)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QByteArray(ret)); } -QByteArray* QByteArray_Number24(uint64_t param1, int base) { - QByteArray ret = QByteArray::number((qulonglong)(param1), static_cast(base)); +QByteArray* QByteArray_Number24(unsigned long long param1, int base) { + QByteArray ret = QByteArray::number(static_cast(param1), static_cast(base)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QByteArray(ret)); } diff --git a/qt/gen_qbytearray.go b/qt/gen_qbytearray.go index 85f24734..a6fd68d2 100644 --- a/qt/gen_qbytearray.go +++ b/qt/gen_qbytearray.go @@ -975,12 +975,12 @@ func (this *QByteArray) SetNumWithUint(param1 uint) *QByteArray { } func (this *QByteArray) SetNumWithQlonglong(param1 int64) *QByteArray { - ret := C.QByteArray_SetNumWithQlonglong(this.h, (C.int64_t)(param1)) + ret := C.QByteArray_SetNumWithQlonglong(this.h, (C.longlong)(param1)) return newQByteArray_U(unsafe.Pointer(ret)) } func (this *QByteArray) SetNumWithQulonglong(param1 uint64) *QByteArray { - ret := C.QByteArray_SetNumWithQulonglong(this.h, (C.uint64_t)(param1)) + ret := C.QByteArray_SetNumWithQulonglong(this.h, (C.ulonglong)(param1)) return newQByteArray_U(unsafe.Pointer(ret)) } @@ -1024,7 +1024,7 @@ func QByteArray_NumberWithUint(param1 uint) *QByteArray { } func QByteArray_NumberWithQlonglong(param1 int64) *QByteArray { - ret := C.QByteArray_NumberWithQlonglong((C.int64_t)(param1)) + ret := C.QByteArray_NumberWithQlonglong((C.longlong)(param1)) // Qt uses pass-by-value semantics for this type. Mimic with finalizer ret1 := newQByteArray(ret) runtime.SetFinalizer(ret1, func(ret2 *QByteArray) { @@ -1035,7 +1035,7 @@ func QByteArray_NumberWithQlonglong(param1 int64) *QByteArray { } func QByteArray_NumberWithQulonglong(param1 uint64) *QByteArray { - ret := C.QByteArray_NumberWithQulonglong((C.uint64_t)(param1)) + ret := C.QByteArray_NumberWithQulonglong((C.ulonglong)(param1)) // Qt uses pass-by-value semantics for this type. Mimic with finalizer ret1 := newQByteArray(ret) runtime.SetFinalizer(ret1, func(ret2 *QByteArray) { @@ -1475,12 +1475,12 @@ func (this *QByteArray) SetNum24(param1 uint, base int) *QByteArray { } func (this *QByteArray) SetNum25(param1 int64, base int) *QByteArray { - ret := C.QByteArray_SetNum25(this.h, (C.int64_t)(param1), (C.int)(base)) + ret := C.QByteArray_SetNum25(this.h, (C.longlong)(param1), (C.int)(base)) return newQByteArray_U(unsafe.Pointer(ret)) } func (this *QByteArray) SetNum26(param1 uint64, base int) *QByteArray { - ret := C.QByteArray_SetNum26(this.h, (C.uint64_t)(param1), (C.int)(base)) + ret := C.QByteArray_SetNum26(this.h, (C.ulonglong)(param1), (C.int)(base)) return newQByteArray_U(unsafe.Pointer(ret)) } @@ -1527,7 +1527,7 @@ func QByteArray_Number22(param1 uint, base int) *QByteArray { } func QByteArray_Number23(param1 int64, base int) *QByteArray { - ret := C.QByteArray_Number23((C.int64_t)(param1), (C.int)(base)) + ret := C.QByteArray_Number23((C.longlong)(param1), (C.int)(base)) // Qt uses pass-by-value semantics for this type. Mimic with finalizer ret1 := newQByteArray(ret) runtime.SetFinalizer(ret1, func(ret2 *QByteArray) { @@ -1538,7 +1538,7 @@ func QByteArray_Number23(param1 int64, base int) *QByteArray { } func QByteArray_Number24(param1 uint64, base int) *QByteArray { - ret := C.QByteArray_Number24((C.uint64_t)(param1), (C.int)(base)) + ret := C.QByteArray_Number24((C.ulonglong)(param1), (C.int)(base)) // Qt uses pass-by-value semantics for this type. Mimic with finalizer ret1 := newQByteArray(ret) runtime.SetFinalizer(ret1, func(ret2 *QByteArray) { diff --git a/qt/gen_qbytearray.h b/qt/gen_qbytearray.h index edbe76a9..78c7b042 100644 --- a/qt/gen_qbytearray.h +++ b/qt/gen_qbytearray.h @@ -163,15 +163,15 @@ 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_SetNumWithQlonglong(QByteArray* self, int64_t param1); -QByteArray* QByteArray_SetNumWithQulonglong(QByteArray* self, uint64_t 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_Number(int param1); QByteArray* QByteArray_NumberWithUint(unsigned int param1); -QByteArray* QByteArray_NumberWithQlonglong(int64_t param1); -QByteArray* QByteArray_NumberWithQulonglong(uint64_t 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__FromBase64Result* QByteArray_FromBase64Encoding(QByteArray* base64); @@ -238,16 +238,16 @@ 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, int64_t param1, int base); -QByteArray* QByteArray_SetNum26(QByteArray* self, uint64_t 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_Number2(int param1, int base); QByteArray* QByteArray_Number22(unsigned int param1, int base); -QByteArray* QByteArray_Number23(int64_t param1, int base); -QByteArray* QByteArray_Number24(uint64_t 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__FromBase64Result* QByteArray_FromBase64Encoding2(QByteArray* base64, int options); diff --git a/qt/gen_qbytearraymatcher.cpp b/qt/gen_qbytearraymatcher.cpp index 6664bdeb..9c90d045 100644 --- a/qt/gen_qbytearraymatcher.cpp +++ b/qt/gen_qbytearraymatcher.cpp @@ -48,11 +48,11 @@ QByteArray* QByteArrayMatcher_Pattern(QByteArrayMatcher* self) { } int QByteArrayMatcher_IndexIn22(QByteArrayMatcher* self, QByteArray* ba, int from) { - return self->indexIn(*ba, static_cast(from)); + return const_cast(self)->indexIn(*ba, static_cast(from)); } int QByteArrayMatcher_IndexIn3(QByteArrayMatcher* self, const char* str, int lenVal, int from) { - return self->indexIn(str, static_cast(lenVal), static_cast(from)); + return const_cast(self)->indexIn(str, static_cast(lenVal), static_cast(from)); } void QByteArrayMatcher_Delete(QByteArrayMatcher* self) { diff --git a/qt/gen_qcalendar.cpp b/qt/gen_qcalendar.cpp index f51389e4..916a5b7f 100644 --- a/qt/gen_qcalendar.cpp +++ b/qt/gen_qcalendar.cpp @@ -167,11 +167,11 @@ void QCalendar_AvailableCalendars(char*** _out, int** _out_Lengths, size_t* _out } int QCalendar_DaysInMonth2(QCalendar* self, int month, int year) { - return self->daysInMonth(static_cast(month), static_cast(year)); + return const_cast(self)->daysInMonth(static_cast(month), static_cast(year)); } void QCalendar_MonthName3(QCalendar* self, QLocale* locale, int month, int year, char** _out, int* _out_Strlen) { - QString ret = self->monthName(*locale, static_cast(month), static_cast(year)); + QString ret = const_cast(self)->monthName(*locale, static_cast(month), static_cast(year)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -180,7 +180,7 @@ void QCalendar_MonthName3(QCalendar* self, QLocale* locale, int month, int year, } void QCalendar_MonthName4(QCalendar* self, QLocale* locale, int month, int year, uintptr_t format, char** _out, int* _out_Strlen) { - QString ret = self->monthName(*locale, static_cast(month), static_cast(year), static_cast(format)); + QString ret = const_cast(self)->monthName(*locale, static_cast(month), static_cast(year), static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -189,7 +189,7 @@ void QCalendar_MonthName4(QCalendar* self, QLocale* locale, int month, int year, } void QCalendar_StandaloneMonthName3(QCalendar* self, QLocale* locale, int month, int year, char** _out, int* _out_Strlen) { - QString ret = self->standaloneMonthName(*locale, static_cast(month), static_cast(year)); + QString ret = const_cast(self)->standaloneMonthName(*locale, static_cast(month), static_cast(year)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -198,7 +198,7 @@ void QCalendar_StandaloneMonthName3(QCalendar* self, QLocale* locale, int month, } void QCalendar_StandaloneMonthName4(QCalendar* self, QLocale* locale, int month, int year, uintptr_t format, char** _out, int* _out_Strlen) { - QString ret = self->standaloneMonthName(*locale, static_cast(month), static_cast(year), static_cast(format)); + QString ret = const_cast(self)->standaloneMonthName(*locale, static_cast(month), static_cast(year), static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -207,7 +207,7 @@ void QCalendar_StandaloneMonthName4(QCalendar* self, QLocale* locale, int month, } void QCalendar_WeekDayName3(QCalendar* self, QLocale* locale, int day, uintptr_t format, char** _out, int* _out_Strlen) { - QString ret = self->weekDayName(*locale, static_cast(day), static_cast(format)); + QString ret = const_cast(self)->weekDayName(*locale, static_cast(day), static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -216,7 +216,7 @@ void QCalendar_WeekDayName3(QCalendar* self, QLocale* locale, int day, uintptr_t } void QCalendar_StandaloneWeekDayName3(QCalendar* self, QLocale* locale, int day, uintptr_t format, char** _out, int* _out_Strlen) { - QString ret = self->standaloneWeekDayName(*locale, static_cast(day), static_cast(format)); + QString ret = const_cast(self)->standaloneWeekDayName(*locale, static_cast(day), static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); diff --git a/qt/gen_qcborvalue.cpp b/qt/gen_qcborvalue.cpp index 344eca90..6496e46a 100644 --- a/qt/gen_qcborvalue.cpp +++ b/qt/gen_qcborvalue.cpp @@ -385,32 +385,32 @@ void QCborValue_ToDiagnosticNotation(QCborValue* self, char** _out, int* _out_St } long long QCborValue_ToInteger1(QCborValue* self, long long defaultValue) { - return self->toInteger(static_cast(defaultValue)); + return const_cast(self)->toInteger(static_cast(defaultValue)); } bool QCborValue_ToBool1(QCborValue* self, bool defaultValue) { - return self->toBool(defaultValue); + return const_cast(self)->toBool(defaultValue); } double QCborValue_ToDouble1(QCborValue* self, double defaultValue) { - return self->toDouble(static_cast(defaultValue)); + return const_cast(self)->toDouble(static_cast(defaultValue)); } QCborValue* QCborValue_TaggedValue1(QCborValue* self, QCborValue* defaultValue) { - QCborValue ret = self->taggedValue(*defaultValue); + QCborValue ret = const_cast(self)->taggedValue(*defaultValue); // Copy-construct value returned type into heap-allocated copy return static_cast(new QCborValue(ret)); } QByteArray* QCborValue_ToByteArray1(QCborValue* self, QByteArray* defaultValue) { - QByteArray ret = self->toByteArray(*defaultValue); + QByteArray ret = const_cast(self)->toByteArray(*defaultValue); // Copy-construct value returned type into heap-allocated copy return static_cast(new QByteArray(ret)); } void QCborValue_ToString1(QCborValue* self, const char* defaultValue, size_t defaultValue_Strlen, char** _out, int* _out_Strlen) { QString defaultValue_QString = QString::fromUtf8(defaultValue, defaultValue_Strlen); - QString ret = self->toString(defaultValue_QString); + QString ret = const_cast(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(); *_out = static_cast(malloc(b.length())); @@ -419,25 +419,25 @@ void QCborValue_ToString1(QCborValue* self, const char* defaultValue, size_t def } QDateTime* QCborValue_ToDateTime1(QCborValue* self, QDateTime* defaultValue) { - QDateTime ret = self->toDateTime(*defaultValue); + QDateTime ret = const_cast(self)->toDateTime(*defaultValue); // Copy-construct value returned type into heap-allocated copy return static_cast(new QDateTime(ret)); } QUrl* QCborValue_ToUrl1(QCborValue* self, QUrl* defaultValue) { - QUrl ret = self->toUrl(*defaultValue); + QUrl ret = const_cast(self)->toUrl(*defaultValue); // Copy-construct value returned type into heap-allocated copy return static_cast(new QUrl(ret)); } QRegularExpression* QCborValue_ToRegularExpression1(QCborValue* self, QRegularExpression* defaultValue) { - QRegularExpression ret = self->toRegularExpression(*defaultValue); + QRegularExpression ret = const_cast(self)->toRegularExpression(*defaultValue); // Copy-construct value returned type into heap-allocated copy return static_cast(new QRegularExpression(ret)); } QUuid* QCborValue_ToUuid1(QCborValue* self, QUuid* defaultValue) { - QUuid ret = self->toUuid(*defaultValue); + QUuid ret = const_cast(self)->toUuid(*defaultValue); // Copy-construct value returned type into heap-allocated copy return static_cast(new QUuid(ret)); } @@ -471,7 +471,7 @@ void QCborValue_ToCbor2(QCborValue* self, QCborStreamWriter* writer, int opt) { } void QCborValue_ToDiagnosticNotation1(QCborValue* self, int opts, char** _out, int* _out_Strlen) { - QString ret = self->toDiagnosticNotation(static_cast(opts)); + QString ret = const_cast(self)->toDiagnosticNotation(static_cast(opts)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -731,32 +731,32 @@ void QCborValueRef_ToDiagnosticNotation(QCborValueRef* self, char** _out, int* _ } QCborValue* QCborValueRef_TaggedValue1(QCborValueRef* self, QCborValue* defaultValue) { - QCborValue ret = self->taggedValue(*defaultValue); + QCborValue ret = const_cast(self)->taggedValue(*defaultValue); // Copy-construct value returned type into heap-allocated copy return static_cast(new QCborValue(ret)); } long long QCborValueRef_ToInteger1(QCborValueRef* self, long long defaultValue) { - return self->toInteger(static_cast(defaultValue)); + return const_cast(self)->toInteger(static_cast(defaultValue)); } bool QCborValueRef_ToBool1(QCborValueRef* self, bool defaultValue) { - return self->toBool(defaultValue); + return const_cast(self)->toBool(defaultValue); } double QCborValueRef_ToDouble1(QCborValueRef* self, double defaultValue) { - return self->toDouble(static_cast(defaultValue)); + return const_cast(self)->toDouble(static_cast(defaultValue)); } QByteArray* QCborValueRef_ToByteArray1(QCborValueRef* self, QByteArray* defaultValue) { - QByteArray ret = self->toByteArray(*defaultValue); + QByteArray ret = const_cast(self)->toByteArray(*defaultValue); // Copy-construct value returned type into heap-allocated copy return static_cast(new QByteArray(ret)); } void QCborValueRef_ToString1(QCborValueRef* self, const char* defaultValue, size_t defaultValue_Strlen, char** _out, int* _out_Strlen) { QString defaultValue_QString = QString::fromUtf8(defaultValue, defaultValue_Strlen); - QString ret = self->toString(defaultValue_QString); + QString ret = const_cast(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(); *_out = static_cast(malloc(b.length())); @@ -765,25 +765,25 @@ void QCborValueRef_ToString1(QCborValueRef* self, const char* defaultValue, size } QDateTime* QCborValueRef_ToDateTime1(QCborValueRef* self, QDateTime* defaultValue) { - QDateTime ret = self->toDateTime(*defaultValue); + QDateTime ret = const_cast(self)->toDateTime(*defaultValue); // Copy-construct value returned type into heap-allocated copy return static_cast(new QDateTime(ret)); } QUrl* QCborValueRef_ToUrl1(QCborValueRef* self, QUrl* defaultValue) { - QUrl ret = self->toUrl(*defaultValue); + QUrl ret = const_cast(self)->toUrl(*defaultValue); // Copy-construct value returned type into heap-allocated copy return static_cast(new QUrl(ret)); } QRegularExpression* QCborValueRef_ToRegularExpression1(QCborValueRef* self, QRegularExpression* defaultValue) { - QRegularExpression ret = self->toRegularExpression(*defaultValue); + QRegularExpression ret = const_cast(self)->toRegularExpression(*defaultValue); // Copy-construct value returned type into heap-allocated copy return static_cast(new QRegularExpression(ret)); } QUuid* QCborValueRef_ToUuid1(QCborValueRef* self, QUuid* defaultValue) { - QUuid ret = self->toUuid(*defaultValue); + QUuid ret = const_cast(self)->toUuid(*defaultValue); // Copy-construct value returned type into heap-allocated copy return static_cast(new QUuid(ret)); } diff --git a/qt/gen_qclipboard.cpp b/qt/gen_qclipboard.cpp index 2d0f51a3..422f0d1e 100644 --- a/qt/gen_qclipboard.cpp +++ b/qt/gen_qclipboard.cpp @@ -193,7 +193,7 @@ void QClipboard_Clear1(QClipboard* self, uintptr_t mode) { } void QClipboard_Text1(QClipboard* self, uintptr_t mode, char** _out, int* _out_Strlen) { - QString ret = self->text(static_cast(mode)); + QString ret = const_cast(self)->text(static_cast(mode)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -203,7 +203,7 @@ void QClipboard_Text1(QClipboard* self, uintptr_t mode, char** _out, int* _out_S void QClipboard_Text2(QClipboard* self, const char* subtype, size_t subtype_Strlen, uintptr_t mode, char** _out, int* _out_Strlen) { QString subtype_QString = QString::fromUtf8(subtype, subtype_Strlen); - QString ret = self->text(subtype_QString, static_cast(mode)); + QString ret = const_cast(self)->text(subtype_QString, static_cast(mode)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -217,7 +217,7 @@ void QClipboard_SetText2(QClipboard* self, const char* param1, size_t param1_Str } QMimeData* QClipboard_MimeData1(QClipboard* self, uintptr_t mode) { - return (QMimeData*) self->mimeData(static_cast(mode)); + return (QMimeData*) const_cast(self)->mimeData(static_cast(mode)); } void QClipboard_SetMimeData2(QClipboard* self, QMimeData* data, uintptr_t mode) { @@ -225,13 +225,13 @@ void QClipboard_SetMimeData2(QClipboard* self, QMimeData* data, uintptr_t mode) } QImage* QClipboard_Image1(QClipboard* self, uintptr_t mode) { - QImage ret = self->image(static_cast(mode)); + QImage ret = const_cast(self)->image(static_cast(mode)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QImage(ret)); } QPixmap* QClipboard_Pixmap1(QClipboard* self, uintptr_t mode) { - QPixmap ret = self->pixmap(static_cast(mode)); + QPixmap ret = const_cast(self)->pixmap(static_cast(mode)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QPixmap(ret)); } diff --git a/qt/gen_qcolor.cpp b/qt/gen_qcolor.cpp index 59d7f424..57ffc747 100644 --- a/qt/gen_qcolor.cpp +++ b/qt/gen_qcolor.cpp @@ -522,7 +522,7 @@ bool QColor_IsValidColor(const char* name, size_t name_Strlen) { } void QColor_GetRgb4(QColor* self, int* r, int* g, int* b, int* a) { - self->getRgb(static_cast(r), static_cast(g), static_cast(b), static_cast(a)); + const_cast(self)->getRgb(static_cast(r), static_cast(g), static_cast(b), static_cast(a)); } void QColor_SetRgb4(QColor* self, int r, int g, int b, int a) { @@ -530,7 +530,7 @@ void QColor_SetRgb4(QColor* self, int r, int g, int b, int a) { } void QColor_GetRgbF4(QColor* self, double* r, double* g, double* b, double* a) { - self->getRgbF(static_cast(r), static_cast(g), static_cast(b), static_cast(a)); + const_cast(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) { @@ -538,7 +538,7 @@ void QColor_SetRgbF4(QColor* self, double r, double g, double b, double a) { } void QColor_GetHsv4(QColor* self, int* h, int* s, int* v, int* a) { - self->getHsv(static_cast(h), static_cast(s), static_cast(v), static_cast(a)); + const_cast(self)->getHsv(static_cast(h), static_cast(s), static_cast(v), static_cast(a)); } void QColor_SetHsv4(QColor* self, int h, int s, int v, int a) { @@ -546,7 +546,7 @@ void QColor_SetHsv4(QColor* self, int h, int s, int v, int a) { } void QColor_GetHsvF4(QColor* self, double* h, double* s, double* v, double* a) { - self->getHsvF(static_cast(h), static_cast(s), static_cast(v), static_cast(a)); + const_cast(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) { @@ -558,7 +558,7 @@ void QColor_GetCmyk5(QColor* self, int* c, int* m, int* y, int* k, int* a) { } void QColor_GetCmyk52(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)); + const_cast(self)->getCmyk(static_cast(c), static_cast(m), static_cast(y), static_cast(k), static_cast(a)); } void QColor_SetCmyk5(QColor* self, int c, int m, int y, int k, int a) { @@ -570,7 +570,7 @@ void QColor_GetCmykF5(QColor* self, double* c, double* m, double* y, double* k, } void QColor_GetCmykF52(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)); + const_cast(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) { @@ -578,7 +578,7 @@ void QColor_SetCmykF5(QColor* self, double c, double m, double y, double k, doub } void QColor_GetHsl4(QColor* self, int* h, int* s, int* l, int* a) { - self->getHsl(static_cast(h), static_cast(s), static_cast(l), static_cast(a)); + const_cast(self)->getHsl(static_cast(h), static_cast(s), static_cast(l), static_cast(a)); } void QColor_SetHsl4(QColor* self, int h, int s, int l, int a) { @@ -586,7 +586,7 @@ void QColor_SetHsl4(QColor* self, int h, int s, int l, int a) { } void QColor_GetHslF4(QColor* self, double* h, double* s, double* l, double* a) { - self->getHslF(static_cast(h), static_cast(s), static_cast(l), static_cast(a)); + const_cast(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) { @@ -648,25 +648,25 @@ QColor* QColor_FromHslF4(double h, double s, double l, double a) { } QColor* QColor_Light1(QColor* self, int f) { - QColor ret = self->light(static_cast(f)); + QColor ret = const_cast(self)->light(static_cast(f)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QColor(ret)); } QColor* QColor_Dark1(QColor* self, int f) { - QColor ret = self->dark(static_cast(f)); + QColor ret = const_cast(self)->dark(static_cast(f)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QColor(ret)); } QColor* QColor_Lighter1(QColor* self, int f) { - QColor ret = self->lighter(static_cast(f)); + QColor ret = const_cast(self)->lighter(static_cast(f)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QColor(ret)); } QColor* QColor_Darker1(QColor* self, int f) { - QColor ret = self->darker(static_cast(f)); + QColor ret = const_cast(self)->darker(static_cast(f)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QColor(ret)); } diff --git a/qt/gen_qcolorspace.cpp b/qt/gen_qcolorspace.cpp index e9bc8589..0ed736c6 100644 --- a/qt/gen_qcolorspace.cpp +++ b/qt/gen_qcolorspace.cpp @@ -109,7 +109,7 @@ void QColorSpace_SetTransferFunction2(QColorSpace* self, uintptr_t transferFunct } QColorSpace* QColorSpace_WithTransferFunction2(QColorSpace* self, uintptr_t transferFunction, float gamma) { - QColorSpace ret = self->withTransferFunction(static_cast(transferFunction), static_cast(gamma)); + QColorSpace ret = const_cast(self)->withTransferFunction(static_cast(transferFunction), static_cast(gamma)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QColorSpace(ret)); } diff --git a/qt/gen_qcombobox.cpp b/qt/gen_qcombobox.cpp index 07aea833..740bbbc2 100644 --- a/qt/gen_qcombobox.cpp +++ b/qt/gen_qcombobox.cpp @@ -542,25 +542,25 @@ void QComboBox_TrUtf83(const char* s, const char* c, int n, char** _out, int* _o int QComboBox_FindText2(QComboBox* self, const char* text, size_t text_Strlen, int flags) { QString text_QString = QString::fromUtf8(text, text_Strlen); - return self->findText(text_QString, static_cast(flags)); + return const_cast(self)->findText(text_QString, static_cast(flags)); } int QComboBox_FindData2(QComboBox* self, QVariant* data, int role) { - return self->findData(*data, static_cast(role)); + return const_cast(self)->findData(*data, static_cast(role)); } int QComboBox_FindData3(QComboBox* self, QVariant* data, int role, int flags) { - return self->findData(*data, static_cast(role), static_cast(flags)); + return const_cast(self)->findData(*data, static_cast(role), static_cast(flags)); } QVariant* QComboBox_CurrentData1(QComboBox* self, int role) { - QVariant ret = self->currentData(static_cast(role)); + QVariant ret = const_cast(self)->currentData(static_cast(role)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QVariant(ret)); } QVariant* QComboBox_ItemData2(QComboBox* self, int index, int role) { - QVariant ret = self->itemData(static_cast(index), static_cast(role)); + QVariant ret = const_cast(self)->itemData(static_cast(index), static_cast(role)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QVariant(ret)); } diff --git a/qt/gen_qcommonstyle.cpp b/qt/gen_qcommonstyle.cpp index 5e23e64c..f8376ecf 100644 --- a/qt/gen_qcommonstyle.cpp +++ b/qt/gen_qcommonstyle.cpp @@ -171,90 +171,90 @@ void QCommonStyle_TrUtf83(const char* s, const char* c, int n, char** _out, int* } void QCommonStyle_DrawPrimitive4(QCommonStyle* self, uintptr_t pe, QStyleOption* opt, QPainter* p, QWidget* w) { - self->drawPrimitive(static_cast(pe), opt, p, w); + const_cast(self)->drawPrimitive(static_cast(pe), opt, p, w); } void QCommonStyle_DrawControl4(QCommonStyle* self, uintptr_t element, QStyleOption* opt, QPainter* p, QWidget* w) { - self->drawControl(static_cast(element), opt, p, w); + const_cast(self)->drawControl(static_cast(element), opt, p, w); } QRect* QCommonStyle_SubElementRect3(QCommonStyle* self, uintptr_t r, QStyleOption* opt, QWidget* widget) { - QRect ret = self->subElementRect(static_cast(r), opt, widget); + QRect ret = const_cast(self)->subElementRect(static_cast(r), opt, widget); // Copy-construct value returned type into heap-allocated copy return static_cast(new QRect(ret)); } void QCommonStyle_DrawComplexControl4(QCommonStyle* self, uintptr_t cc, QStyleOptionComplex* opt, QPainter* p, QWidget* w) { - self->drawComplexControl(static_cast(cc), opt, p, w); + const_cast(self)->drawComplexControl(static_cast(cc), opt, p, w); } uintptr_t QCommonStyle_HitTestComplexControl4(QCommonStyle* self, uintptr_t cc, QStyleOptionComplex* opt, QPoint* pt, QWidget* w) { - QStyle::SubControl ret = self->hitTestComplexControl(static_cast(cc), opt, *pt, w); + QStyle::SubControl ret = const_cast(self)->hitTestComplexControl(static_cast(cc), opt, *pt, w); return static_cast(ret); } QRect* QCommonStyle_SubControlRect4(QCommonStyle* self, uintptr_t cc, QStyleOptionComplex* opt, uintptr_t sc, QWidget* w) { - QRect ret = self->subControlRect(static_cast(cc), opt, static_cast(sc), w); + QRect ret = const_cast(self)->subControlRect(static_cast(cc), opt, static_cast(sc), w); // Copy-construct value returned type into heap-allocated copy return static_cast(new QRect(ret)); } QSize* QCommonStyle_SizeFromContents4(QCommonStyle* self, uintptr_t ct, QStyleOption* opt, QSize* contentsSize, QWidget* widget) { - QSize ret = self->sizeFromContents(static_cast(ct), opt, *contentsSize, widget); + QSize ret = const_cast(self)->sizeFromContents(static_cast(ct), opt, *contentsSize, widget); // Copy-construct value returned type into heap-allocated copy return static_cast(new QSize(ret)); } int QCommonStyle_PixelMetric2(QCommonStyle* self, uintptr_t m, QStyleOption* opt) { - return self->pixelMetric(static_cast(m), opt); + return const_cast(self)->pixelMetric(static_cast(m), opt); } int QCommonStyle_PixelMetric3(QCommonStyle* self, uintptr_t m, QStyleOption* opt, QWidget* widget) { - return self->pixelMetric(static_cast(m), opt, widget); + return const_cast(self)->pixelMetric(static_cast(m), opt, widget); } int QCommonStyle_StyleHint2(QCommonStyle* self, uintptr_t sh, QStyleOption* opt) { - return self->styleHint(static_cast(sh), opt); + return const_cast(self)->styleHint(static_cast(sh), opt); } int QCommonStyle_StyleHint3(QCommonStyle* self, uintptr_t sh, QStyleOption* opt, QWidget* w) { - return self->styleHint(static_cast(sh), opt, w); + return const_cast(self)->styleHint(static_cast(sh), opt, w); } int QCommonStyle_StyleHint4(QCommonStyle* self, uintptr_t sh, QStyleOption* opt, QWidget* w, QStyleHintReturn* shret) { - return self->styleHint(static_cast(sh), opt, w, shret); + return const_cast(self)->styleHint(static_cast(sh), opt, w, shret); } QIcon* QCommonStyle_StandardIcon2(QCommonStyle* self, uintptr_t standardIcon, QStyleOption* opt) { - QIcon ret = self->standardIcon(static_cast(standardIcon), opt); + QIcon ret = const_cast(self)->standardIcon(static_cast(standardIcon), opt); // Copy-construct value returned type into heap-allocated copy return static_cast(new QIcon(ret)); } QIcon* QCommonStyle_StandardIcon3(QCommonStyle* self, uintptr_t standardIcon, QStyleOption* opt, QWidget* widget) { - QIcon ret = self->standardIcon(static_cast(standardIcon), opt, widget); + QIcon ret = const_cast(self)->standardIcon(static_cast(standardIcon), opt, widget); // Copy-construct value returned type into heap-allocated copy return static_cast(new QIcon(ret)); } QPixmap* QCommonStyle_StandardPixmap2(QCommonStyle* self, uintptr_t sp, QStyleOption* opt) { - QPixmap ret = self->standardPixmap(static_cast(sp), opt); + QPixmap ret = const_cast(self)->standardPixmap(static_cast(sp), opt); // Copy-construct value returned type into heap-allocated copy return static_cast(new QPixmap(ret)); } QPixmap* QCommonStyle_StandardPixmap3(QCommonStyle* self, uintptr_t sp, QStyleOption* opt, QWidget* widget) { - QPixmap ret = self->standardPixmap(static_cast(sp), opt, widget); + QPixmap ret = const_cast(self)->standardPixmap(static_cast(sp), opt, widget); // Copy-construct value returned type into heap-allocated copy return static_cast(new QPixmap(ret)); } int QCommonStyle_LayoutSpacing4(QCommonStyle* self, uintptr_t control1, uintptr_t control2, uintptr_t orientation, QStyleOption* option) { - return self->layoutSpacing(static_cast(control1), static_cast(control2), static_cast(orientation), option); + return const_cast(self)->layoutSpacing(static_cast(control1), static_cast(control2), static_cast(orientation), option); } int QCommonStyle_LayoutSpacing5(QCommonStyle* self, uintptr_t control1, uintptr_t control2, uintptr_t orientation, QStyleOption* option, QWidget* widget) { - return self->layoutSpacing(static_cast(control1), static_cast(control2), static_cast(orientation), option, widget); + return const_cast(self)->layoutSpacing(static_cast(control1), static_cast(control2), static_cast(orientation), option, widget); } void QCommonStyle_Delete(QCommonStyle* self) { diff --git a/qt/gen_qconcatenatetablesproxymodel.cpp b/qt/gen_qconcatenatetablesproxymodel.cpp index be4b59a4..3762f731 100644 --- a/qt/gen_qconcatenatetablesproxymodel.cpp +++ b/qt/gen_qconcatenatetablesproxymodel.cpp @@ -197,7 +197,7 @@ void QConcatenateTablesProxyModel_TrUtf83(const char* s, const char* c, int n, c } QVariant* QConcatenateTablesProxyModel_Data2(QConcatenateTablesProxyModel* self, QModelIndex* index, int role) { - QVariant ret = self->data(*index, static_cast(role)); + QVariant ret = const_cast(self)->data(*index, static_cast(role)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QVariant(ret)); } @@ -207,23 +207,23 @@ bool QConcatenateTablesProxyModel_SetData3(QConcatenateTablesProxyModel* self, Q } QModelIndex* QConcatenateTablesProxyModel_Index3(QConcatenateTablesProxyModel* self, int row, int column, QModelIndex* parent) { - QModelIndex ret = self->index(static_cast(row), static_cast(column), *parent); + QModelIndex ret = const_cast(self)->index(static_cast(row), static_cast(column), *parent); // Copy-construct value returned type into heap-allocated copy return static_cast(new QModelIndex(ret)); } int QConcatenateTablesProxyModel_RowCount1(QConcatenateTablesProxyModel* self, QModelIndex* parent) { - return self->rowCount(*parent); + return const_cast(self)->rowCount(*parent); } QVariant* QConcatenateTablesProxyModel_HeaderData3(QConcatenateTablesProxyModel* self, int section, uintptr_t orientation, int role) { - QVariant ret = self->headerData(static_cast(section), static_cast(orientation), static_cast(role)); + QVariant ret = const_cast(self)->headerData(static_cast(section), static_cast(orientation), static_cast(role)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QVariant(ret)); } int QConcatenateTablesProxyModel_ColumnCount1(QConcatenateTablesProxyModel* self, QModelIndex* parent) { - return self->columnCount(*parent); + return const_cast(self)->columnCount(*parent); } void QConcatenateTablesProxyModel_Delete(QConcatenateTablesProxyModel* self) { diff --git a/qt/gen_qdatetime.cpp b/qt/gen_qdatetime.cpp index 2a78a251..66dcba42 100644 --- a/qt/gen_qdatetime.cpp +++ b/qt/gen_qdatetime.cpp @@ -318,29 +318,29 @@ long long QDate_ToJulianDay(QDate* self) { } int QDate_WeekNumber1(QDate* self, int* yearNum) { - return self->weekNumber(static_cast(yearNum)); + return const_cast(self)->weekNumber(static_cast(yearNum)); } QDateTime* QDate_StartOfDay1(QDate* self, uintptr_t spec) { - QDateTime ret = self->startOfDay(static_cast(spec)); + QDateTime ret = const_cast(self)->startOfDay(static_cast(spec)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QDateTime(ret)); } QDateTime* QDate_StartOfDay2(QDate* self, uintptr_t spec, int offsetSeconds) { - QDateTime ret = self->startOfDay(static_cast(spec), static_cast(offsetSeconds)); + QDateTime ret = const_cast(self)->startOfDay(static_cast(spec), static_cast(offsetSeconds)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QDateTime(ret)); } QDateTime* QDate_EndOfDay1(QDate* self, uintptr_t spec) { - QDateTime ret = self->endOfDay(static_cast(spec)); + QDateTime ret = const_cast(self)->endOfDay(static_cast(spec)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QDateTime(ret)); } QDateTime* QDate_EndOfDay2(QDate* self, uintptr_t spec, int offsetSeconds) { - QDateTime ret = self->endOfDay(static_cast(spec), static_cast(offsetSeconds)); + QDateTime ret = const_cast(self)->endOfDay(static_cast(spec), static_cast(offsetSeconds)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QDateTime(ret)); } @@ -382,7 +382,7 @@ void QDate_LongDayName2(int weekday, uintptr_t typeVal, char** _out, int* _out_S } void QDate_ToString1(QDate* self, uintptr_t format, char** _out, int* _out_Strlen) { - QString ret = self->toString(static_cast(format)); + QString ret = const_cast(self)->toString(static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -560,7 +560,7 @@ int QTime_Elapsed(QTime* self) { } void QTime_ToString1(QTime* self, uintptr_t f, char** _out, int* _out_Strlen) { - QString ret = self->toString(static_cast(f)); + QString ret = const_cast(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(); *_out = static_cast(malloc(b.length())); @@ -936,7 +936,7 @@ long long QDateTime_CurrentSecsSinceEpoch() { } void QDateTime_ToString1(QDateTime* self, uintptr_t format, char** _out, int* _out_Strlen) { - QString ret = self->toString(static_cast(format)); + QString ret = const_cast(self)->toString(static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); diff --git a/qt/gen_qdesktopwidget.cpp b/qt/gen_qdesktopwidget.cpp index 5a212403..7bc24f7d 100644 --- a/qt/gen_qdesktopwidget.cpp +++ b/qt/gen_qdesktopwidget.cpp @@ -181,7 +181,7 @@ void QDesktopWidget_TrUtf83(const char* s, const char* c, int n, char** _out, in } int QDesktopWidget_ScreenNumber1(QDesktopWidget* self, QWidget* widget) { - return self->screenNumber(widget); + return const_cast(self)->screenNumber(widget); } QWidget* QDesktopWidget_Screen1(QDesktopWidget* self, int screen) { @@ -189,13 +189,13 @@ QWidget* QDesktopWidget_Screen1(QDesktopWidget* self, int screen) { } QRect* QDesktopWidget_ScreenGeometry1(QDesktopWidget* self, int screen) { - QRect ret = self->screenGeometry(static_cast(screen)); + QRect ret = const_cast(self)->screenGeometry(static_cast(screen)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QRect(ret)); } QRect* QDesktopWidget_AvailableGeometry1(QDesktopWidget* self, int screen) { - QRect ret = self->availableGeometry(static_cast(screen)); + QRect ret = const_cast(self)->availableGeometry(static_cast(screen)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QRect(ret)); } diff --git a/qt/gen_qdir.cpp b/qt/gen_qdir.cpp index 7667d342..e5436c78 100644 --- a/qt/gen_qdir.cpp +++ b/qt/gen_qdir.cpp @@ -542,11 +542,11 @@ void QDir_Refresh(QDir* self) { } bool QDir_IsEmpty1(QDir* self, int filters) { - return self->isEmpty(static_cast(filters)); + return const_cast(self)->isEmpty(static_cast(filters)); } void QDir_EntryList1(QDir* self, int filters, char*** _out, int** _out_Lengths, size_t* _out_len) { - QStringList ret = self->entryList(static_cast(filters)); + QStringList ret = const_cast(self)->entryList(static_cast(filters)); // Convert QStringList from C++ memory to manually-managed C memory char** __out = static_cast(malloc(sizeof(char*) * ret.length())); int* __out_Lengths = static_cast(malloc(sizeof(int) * ret.length())); @@ -563,7 +563,7 @@ void QDir_EntryList1(QDir* self, int filters, char*** _out, int** _out_Lengths, } void QDir_EntryList2(QDir* self, int filters, int sort, char*** _out, int** _out_Lengths, size_t* _out_len) { - QStringList ret = self->entryList(static_cast(filters), static_cast(sort)); + QStringList ret = const_cast(self)->entryList(static_cast(filters), static_cast(sort)); // Convert QStringList from C++ memory to manually-managed C memory char** __out = static_cast(malloc(sizeof(char*) * ret.length())); int* __out_Lengths = static_cast(malloc(sizeof(int) * ret.length())); @@ -585,7 +585,7 @@ void QDir_EntryList22(QDir* self, char** nameFilters, uint64_t* nameFilters_Leng for(size_t i = 0; i < nameFilters_len; ++i) { nameFilters_QList.push_back(QString::fromUtf8(nameFilters[i], nameFilters_Lengths[i])); } - QStringList ret = self->entryList(nameFilters_QList, static_cast(filters)); + QStringList ret = const_cast(self)->entryList(nameFilters_QList, static_cast(filters)); // Convert QStringList from C++ memory to manually-managed C memory char** __out = static_cast(malloc(sizeof(char*) * ret.length())); int* __out_Lengths = static_cast(malloc(sizeof(int) * ret.length())); @@ -607,7 +607,7 @@ void QDir_EntryList3(QDir* self, char** nameFilters, uint64_t* nameFilters_Lengt for(size_t i = 0; i < nameFilters_len; ++i) { nameFilters_QList.push_back(QString::fromUtf8(nameFilters[i], nameFilters_Lengths[i])); } - QStringList ret = self->entryList(nameFilters_QList, static_cast(filters), static_cast(sort)); + QStringList ret = const_cast(self)->entryList(nameFilters_QList, static_cast(filters), static_cast(sort)); // Convert QStringList from C++ memory to manually-managed C memory char** __out = static_cast(malloc(sizeof(char*) * ret.length())); int* __out_Lengths = static_cast(malloc(sizeof(int) * ret.length())); @@ -624,7 +624,7 @@ void QDir_EntryList3(QDir* self, char** nameFilters, uint64_t* nameFilters_Lengt } void QDir_EntryInfoList1(QDir* self, int filters, QFileInfo*** _out, size_t* _out_len) { - QFileInfoList ret = self->entryInfoList(static_cast(filters)); + QFileInfoList ret = const_cast(self)->entryInfoList(static_cast(filters)); // Convert QList<> from C++ memory to manually-managed C memory of copy-constructed pointers QFileInfo** __out = static_cast(malloc(sizeof(QFileInfo**) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { @@ -635,7 +635,7 @@ void QDir_EntryInfoList1(QDir* self, int filters, QFileInfo*** _out, size_t* _ou } void QDir_EntryInfoList2(QDir* self, int filters, int sort, QFileInfo*** _out, size_t* _out_len) { - QFileInfoList ret = self->entryInfoList(static_cast(filters), static_cast(sort)); + QFileInfoList ret = const_cast(self)->entryInfoList(static_cast(filters), static_cast(sort)); // Convert QList<> from C++ memory to manually-managed C memory of copy-constructed pointers QFileInfo** __out = static_cast(malloc(sizeof(QFileInfo**) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { @@ -651,7 +651,7 @@ void QDir_EntryInfoList22(QDir* self, char** nameFilters, uint64_t* nameFilters_ for(size_t i = 0; i < nameFilters_len; ++i) { nameFilters_QList.push_back(QString::fromUtf8(nameFilters[i], nameFilters_Lengths[i])); } - QFileInfoList ret = self->entryInfoList(nameFilters_QList, static_cast(filters)); + QFileInfoList ret = const_cast(self)->entryInfoList(nameFilters_QList, static_cast(filters)); // Convert QList<> from C++ memory to manually-managed C memory of copy-constructed pointers QFileInfo** __out = static_cast(malloc(sizeof(QFileInfo**) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { @@ -667,7 +667,7 @@ void QDir_EntryInfoList3(QDir* self, char** nameFilters, uint64_t* nameFilters_L for(size_t i = 0; i < nameFilters_len; ++i) { nameFilters_QList.push_back(QString::fromUtf8(nameFilters[i], nameFilters_Lengths[i])); } - QFileInfoList ret = self->entryInfoList(nameFilters_QList, static_cast(filters), static_cast(sort)); + QFileInfoList ret = const_cast(self)->entryInfoList(nameFilters_QList, static_cast(filters), static_cast(sort)); // Convert QList<> from C++ memory to manually-managed C memory of copy-constructed pointers QFileInfo** __out = static_cast(malloc(sizeof(QFileInfo**) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { diff --git a/qt/gen_qdirmodel.cpp b/qt/gen_qdirmodel.cpp index e7d33a68..276b2535 100644 --- a/qt/gen_qdirmodel.cpp +++ b/qt/gen_qdirmodel.cpp @@ -324,21 +324,21 @@ void QDirModel_TrUtf83(const char* s, const char* c, int n, char** _out, int* _o } QModelIndex* QDirModel_Index3(QDirModel* self, int row, int column, QModelIndex* parent) { - QModelIndex ret = self->index(static_cast(row), static_cast(column), *parent); + QModelIndex ret = const_cast(self)->index(static_cast(row), static_cast(column), *parent); // Copy-construct value returned type into heap-allocated copy return static_cast(new QModelIndex(ret)); } int QDirModel_RowCount1(QDirModel* self, QModelIndex* parent) { - return self->rowCount(*parent); + return const_cast(self)->rowCount(*parent); } int QDirModel_ColumnCount1(QDirModel* self, QModelIndex* parent) { - return self->columnCount(*parent); + return const_cast(self)->columnCount(*parent); } QVariant* QDirModel_Data2(QDirModel* self, QModelIndex* index, int role) { - QVariant ret = self->data(*index, static_cast(role)); + QVariant ret = const_cast(self)->data(*index, static_cast(role)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QVariant(ret)); } @@ -348,13 +348,13 @@ bool QDirModel_SetData3(QDirModel* self, QModelIndex* index, QVariant* value, in } QVariant* QDirModel_HeaderData3(QDirModel* self, int section, uintptr_t orientation, int role) { - QVariant ret = self->headerData(static_cast(section), static_cast(orientation), static_cast(role)); + QVariant ret = const_cast(self)->headerData(static_cast(section), static_cast(orientation), static_cast(role)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QVariant(ret)); } bool QDirModel_HasChildren1(QDirModel* self, QModelIndex* index) { - return self->hasChildren(*index); + return const_cast(self)->hasChildren(*index); } void QDirModel_Sort2(QDirModel* self, int column, uintptr_t order) { @@ -363,7 +363,7 @@ void QDirModel_Sort2(QDirModel* self, int column, uintptr_t order) { QModelIndex* QDirModel_Index2(QDirModel* self, const char* path, size_t path_Strlen, int column) { QString path_QString = QString::fromUtf8(path, path_Strlen); - QModelIndex ret = self->index(path_QString, static_cast(column)); + QModelIndex ret = const_cast(self)->index(path_QString, static_cast(column)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QModelIndex(ret)); } diff --git a/qt/gen_qfilesystemmodel.cpp b/qt/gen_qfilesystemmodel.cpp index c05aaca0..47e76ecb 100644 --- a/qt/gen_qfilesystemmodel.cpp +++ b/qt/gen_qfilesystemmodel.cpp @@ -413,38 +413,38 @@ void QFileSystemModel_TrUtf83(const char* s, const char* c, int n, char** _out, } QModelIndex* QFileSystemModel_Index3(QFileSystemModel* self, int row, int column, QModelIndex* parent) { - QModelIndex ret = self->index(static_cast(row), static_cast(column), *parent); + QModelIndex ret = const_cast(self)->index(static_cast(row), static_cast(column), *parent); // Copy-construct value returned type into heap-allocated copy return static_cast(new QModelIndex(ret)); } QModelIndex* QFileSystemModel_Index2(QFileSystemModel* self, const char* path, size_t path_Strlen, int column) { QString path_QString = QString::fromUtf8(path, path_Strlen); - QModelIndex ret = self->index(path_QString, static_cast(column)); + QModelIndex ret = const_cast(self)->index(path_QString, static_cast(column)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QModelIndex(ret)); } bool QFileSystemModel_HasChildren1(QFileSystemModel* self, QModelIndex* parent) { - return self->hasChildren(*parent); + return const_cast(self)->hasChildren(*parent); } int QFileSystemModel_RowCount1(QFileSystemModel* self, QModelIndex* parent) { - return self->rowCount(*parent); + return const_cast(self)->rowCount(*parent); } int QFileSystemModel_ColumnCount1(QFileSystemModel* self, QModelIndex* parent) { - return self->columnCount(*parent); + return const_cast(self)->columnCount(*parent); } QVariant* QFileSystemModel_MyComputer1(QFileSystemModel* self, int role) { - QVariant ret = self->myComputer(static_cast(role)); + QVariant ret = const_cast(self)->myComputer(static_cast(role)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QVariant(ret)); } QVariant* QFileSystemModel_Data2(QFileSystemModel* self, QModelIndex* index, int role) { - QVariant ret = self->data(*index, static_cast(role)); + QVariant ret = const_cast(self)->data(*index, static_cast(role)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QVariant(ret)); } @@ -454,7 +454,7 @@ bool QFileSystemModel_SetData3(QFileSystemModel* self, QModelIndex* index, QVari } QVariant* QFileSystemModel_HeaderData3(QFileSystemModel* self, int section, uintptr_t orientation, int role) { - QVariant ret = self->headerData(static_cast(section), static_cast(orientation), static_cast(role)); + QVariant ret = const_cast(self)->headerData(static_cast(section), static_cast(orientation), static_cast(role)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QVariant(ret)); } diff --git a/qt/gen_qfontdatabase.cpp b/qt/gen_qfontdatabase.cpp index d716f799..382fd5a7 100644 --- a/qt/gen_qfontdatabase.cpp +++ b/qt/gen_qfontdatabase.cpp @@ -249,7 +249,7 @@ QFont* QFontDatabase_SystemFont(uintptr_t typeVal) { } void QFontDatabase_Families1(QFontDatabase* self, uintptr_t writingSystem, char*** _out, int** _out_Lengths, size_t* _out_len) { - QStringList ret = self->families(static_cast(writingSystem)); + QStringList ret = const_cast(self)->families(static_cast(writingSystem)); // Convert QStringList from C++ memory to manually-managed C memory char** __out = static_cast(malloc(sizeof(char*) * ret.length())); int* __out_Lengths = static_cast(malloc(sizeof(int) * ret.length())); @@ -281,25 +281,25 @@ void QFontDatabase_PointSizes2(QFontDatabase* self, const char* family, size_t f bool QFontDatabase_IsBitmapScalable2(QFontDatabase* self, const char* family, size_t family_Strlen, const char* style, size_t style_Strlen) { QString family_QString = QString::fromUtf8(family, family_Strlen); QString style_QString = QString::fromUtf8(style, style_Strlen); - return self->isBitmapScalable(family_QString, style_QString); + return const_cast(self)->isBitmapScalable(family_QString, style_QString); } bool QFontDatabase_IsSmoothlyScalable2(QFontDatabase* self, const char* family, size_t family_Strlen, const char* style, size_t style_Strlen) { QString family_QString = QString::fromUtf8(family, family_Strlen); QString style_QString = QString::fromUtf8(style, style_Strlen); - return self->isSmoothlyScalable(family_QString, style_QString); + return const_cast(self)->isSmoothlyScalable(family_QString, style_QString); } bool QFontDatabase_IsScalable2(QFontDatabase* self, const char* family, size_t family_Strlen, const char* style, size_t style_Strlen) { QString family_QString = QString::fromUtf8(family, family_Strlen); QString style_QString = QString::fromUtf8(style, style_Strlen); - return self->isScalable(family_QString, style_QString); + return const_cast(self)->isScalable(family_QString, style_QString); } bool QFontDatabase_IsFixedPitch2(QFontDatabase* self, const char* family, size_t family_Strlen, const char* style, size_t style_Strlen) { QString family_QString = QString::fromUtf8(family, family_Strlen); QString style_QString = QString::fromUtf8(style, style_Strlen); - return self->isFixedPitch(family_QString, style_QString); + return const_cast(self)->isFixedPitch(family_QString, style_QString); } void QFontDatabase_Delete(QFontDatabase* self) { diff --git a/qt/gen_qfontmetrics.cpp b/qt/gen_qfontmetrics.cpp index f2b612d0..13b72bee 100644 --- a/qt/gen_qfontmetrics.cpp +++ b/qt/gen_qfontmetrics.cpp @@ -207,59 +207,59 @@ bool QFontMetrics_OperatorNotEqual(QFontMetrics* self, QFontMetrics* other) { int QFontMetrics_Width22(QFontMetrics* self, const char* param1, size_t param1_Strlen, int lenVal) { QString param1_QString = QString::fromUtf8(param1, param1_Strlen); - return self->width(param1_QString, static_cast(lenVal)); + return const_cast(self)->width(param1_QString, static_cast(lenVal)); } int QFontMetrics_HorizontalAdvance2(QFontMetrics* self, const char* param1, size_t param1_Strlen, int lenVal) { QString param1_QString = QString::fromUtf8(param1, param1_Strlen); - return self->horizontalAdvance(param1_QString, static_cast(lenVal)); + return const_cast(self)->horizontalAdvance(param1_QString, static_cast(lenVal)); } QRect* QFontMetrics_BoundingRect4(QFontMetrics* self, QRect* r, int flags, const char* text, size_t text_Strlen, int tabstops) { QString text_QString = QString::fromUtf8(text, text_Strlen); - QRect ret = self->boundingRect(*r, static_cast(flags), text_QString, static_cast(tabstops)); + QRect ret = const_cast(self)->boundingRect(*r, static_cast(flags), text_QString, static_cast(tabstops)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QRect(ret)); } QRect* QFontMetrics_BoundingRect5(QFontMetrics* self, QRect* r, int flags, const char* text, size_t text_Strlen, int tabstops, int* tabarray) { QString text_QString = QString::fromUtf8(text, text_Strlen); - QRect ret = self->boundingRect(*r, static_cast(flags), text_QString, static_cast(tabstops), static_cast(tabarray)); + QRect ret = const_cast(self)->boundingRect(*r, static_cast(flags), text_QString, static_cast(tabstops), static_cast(tabarray)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QRect(ret)); } QRect* QFontMetrics_BoundingRect7(QFontMetrics* self, int x, int y, int w, int h, int flags, const char* text, size_t text_Strlen, int tabstops) { QString text_QString = QString::fromUtf8(text, text_Strlen); - QRect ret = self->boundingRect(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(flags), text_QString, static_cast(tabstops)); + QRect ret = const_cast(self)->boundingRect(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(flags), text_QString, static_cast(tabstops)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QRect(ret)); } QRect* QFontMetrics_BoundingRect8(QFontMetrics* self, int x, int y, int w, int h, int flags, const char* text, size_t text_Strlen, int tabstops, int* tabarray) { QString text_QString = QString::fromUtf8(text, text_Strlen); - QRect ret = self->boundingRect(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(flags), text_QString, static_cast(tabstops), static_cast(tabarray)); + QRect ret = const_cast(self)->boundingRect(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(flags), text_QString, static_cast(tabstops), static_cast(tabarray)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QRect(ret)); } QSize* QFontMetrics_Size3(QFontMetrics* self, int flags, const char* str, size_t str_Strlen, int tabstops) { QString str_QString = QString::fromUtf8(str, str_Strlen); - QSize ret = self->size(static_cast(flags), str_QString, static_cast(tabstops)); + QSize ret = const_cast(self)->size(static_cast(flags), str_QString, static_cast(tabstops)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QSize(ret)); } QSize* QFontMetrics_Size4(QFontMetrics* self, int flags, const char* str, size_t str_Strlen, int tabstops, int* tabarray) { QString str_QString = QString::fromUtf8(str, str_Strlen); - QSize ret = self->size(static_cast(flags), str_QString, static_cast(tabstops), static_cast(tabarray)); + QSize ret = const_cast(self)->size(static_cast(flags), str_QString, static_cast(tabstops), static_cast(tabarray)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QSize(ret)); } void QFontMetrics_ElidedText4(QFontMetrics* self, const char* text, size_t text_Strlen, uintptr_t mode, int width, int flags, char** _out, int* _out_Strlen) { QString text_QString = QString::fromUtf8(text, text_Strlen); - QString ret = self->elidedText(text_QString, static_cast(mode), static_cast(width), static_cast(flags)); + QString ret = const_cast(self)->elidedText(text_QString, static_cast(mode), static_cast(width), static_cast(flags)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -451,40 +451,40 @@ bool QFontMetricsF_OperatorNotEqual(QFontMetricsF* self, QFontMetricsF* other) { double QFontMetricsF_HorizontalAdvance2(QFontMetricsF* self, const char* stringVal, size_t stringVal_Strlen, int length) { QString stringVal_QString = QString::fromUtf8(stringVal, stringVal_Strlen); - return self->horizontalAdvance(stringVal_QString, static_cast(length)); + return const_cast(self)->horizontalAdvance(stringVal_QString, static_cast(length)); } QRectF* QFontMetricsF_BoundingRect4(QFontMetricsF* self, QRectF* r, int flags, const char* stringVal, size_t stringVal_Strlen, int tabstops) { QString stringVal_QString = QString::fromUtf8(stringVal, stringVal_Strlen); - QRectF ret = self->boundingRect(*r, static_cast(flags), stringVal_QString, static_cast(tabstops)); + QRectF ret = const_cast(self)->boundingRect(*r, static_cast(flags), stringVal_QString, static_cast(tabstops)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QRectF(ret)); } QRectF* QFontMetricsF_BoundingRect5(QFontMetricsF* self, QRectF* r, int flags, const char* stringVal, size_t stringVal_Strlen, int tabstops, int* tabarray) { QString stringVal_QString = QString::fromUtf8(stringVal, stringVal_Strlen); - QRectF ret = self->boundingRect(*r, static_cast(flags), stringVal_QString, static_cast(tabstops), static_cast(tabarray)); + QRectF ret = const_cast(self)->boundingRect(*r, static_cast(flags), stringVal_QString, static_cast(tabstops), static_cast(tabarray)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QRectF(ret)); } QSizeF* QFontMetricsF_Size3(QFontMetricsF* self, int flags, const char* str, size_t str_Strlen, int tabstops) { QString str_QString = QString::fromUtf8(str, str_Strlen); - QSizeF ret = self->size(static_cast(flags), str_QString, static_cast(tabstops)); + QSizeF ret = const_cast(self)->size(static_cast(flags), str_QString, static_cast(tabstops)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QSizeF(ret)); } QSizeF* QFontMetricsF_Size4(QFontMetricsF* self, int flags, const char* str, size_t str_Strlen, int tabstops, int* tabarray) { QString str_QString = QString::fromUtf8(str, str_Strlen); - QSizeF ret = self->size(static_cast(flags), str_QString, static_cast(tabstops), static_cast(tabarray)); + QSizeF ret = const_cast(self)->size(static_cast(flags), str_QString, static_cast(tabstops), static_cast(tabarray)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QSizeF(ret)); } void QFontMetricsF_ElidedText4(QFontMetricsF* self, const char* text, size_t text_Strlen, uintptr_t mode, double width, int flags, char** _out, int* _out_Strlen) { QString text_QString = QString::fromUtf8(text, text_Strlen); - QString ret = self->elidedText(text_QString, static_cast(mode), static_cast(width), static_cast(flags)); + QString ret = const_cast(self)->elidedText(text_QString, static_cast(mode), static_cast(width), static_cast(flags)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); diff --git a/qt/gen_qgraphicsgridlayout.cpp b/qt/gen_qgraphicsgridlayout.cpp index 3c1a597a..8ba137ec 100644 --- a/qt/gen_qgraphicsgridlayout.cpp +++ b/qt/gen_qgraphicsgridlayout.cpp @@ -212,7 +212,7 @@ void QGraphicsGridLayout_AddItem4(QGraphicsGridLayout* self, QGraphicsLayoutItem } QSizeF* QGraphicsGridLayout_SizeHint2(QGraphicsGridLayout* self, uintptr_t which, QSizeF* constraint) { - QSizeF ret = self->sizeHint(static_cast(which), *constraint); + QSizeF ret = const_cast(self)->sizeHint(static_cast(which), *constraint); // Copy-construct value returned type into heap-allocated copy return static_cast(new QSizeF(ret)); } diff --git a/qt/gen_qgraphicsitem.cpp b/qt/gen_qgraphicsitem.cpp index 9ba1bee7..e8a5fb0d 100644 --- a/qt/gen_qgraphicsitem.cpp +++ b/qt/gen_qgraphicsitem.cpp @@ -877,7 +877,7 @@ void QGraphicsItem_SetMatrix2(QGraphicsItem* self, QMatrix* matrix, bool combine } QTransform* QGraphicsItem_ItemTransform2(QGraphicsItem* self, QGraphicsItem* other, bool* ok) { - QTransform ret = self->itemTransform(other, ok); + QTransform ret = const_cast(self)->itemTransform(other, ok); // Copy-construct value returned type into heap-allocated copy return static_cast(new QTransform(ret)); } @@ -887,15 +887,15 @@ void QGraphicsItem_SetTransform2(QGraphicsItem* self, QTransform* matrix, bool c } bool QGraphicsItem_CollidesWithItem2(QGraphicsItem* self, QGraphicsItem* other, uintptr_t mode) { - return self->collidesWithItem(other, static_cast(mode)); + return const_cast(self)->collidesWithItem(other, static_cast(mode)); } bool QGraphicsItem_CollidesWithPath2(QGraphicsItem* self, QPainterPath* path, uintptr_t mode) { - return self->collidesWithPath(*path, static_cast(mode)); + return const_cast(self)->collidesWithPath(*path, static_cast(mode)); } void QGraphicsItem_CollidingItems1(QGraphicsItem* self, uintptr_t mode, QGraphicsItem*** _out, size_t* _out_len) { - QList ret = self->collidingItems(static_cast(mode)); + QList ret = const_cast(self)->collidingItems(static_cast(mode)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** __out = static_cast(malloc(sizeof(QGraphicsItem*) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { @@ -906,7 +906,7 @@ void QGraphicsItem_CollidingItems1(QGraphicsItem* self, uintptr_t mode, QGraphic } bool QGraphicsItem_IsObscured1(QGraphicsItem* self, QRectF* rect) { - return self->isObscured(*rect); + return const_cast(self)->isObscured(*rect); } void QGraphicsItem_Paint3(QGraphicsItem* self, QPainter* painter, QStyleOptionGraphicsItem* option, QWidget* widget) { diff --git a/qt/gen_qgraphicslayoutitem.cpp b/qt/gen_qgraphicslayoutitem.cpp index a4faf463..b9db95c2 100644 --- a/qt/gen_qgraphicslayoutitem.cpp +++ b/qt/gen_qgraphicslayoutitem.cpp @@ -170,7 +170,7 @@ void QGraphicsLayoutItem_SetSizePolicy3(QGraphicsLayoutItem* self, uintptr_t hPo } QSizeF* QGraphicsLayoutItem_EffectiveSizeHint2(QGraphicsLayoutItem* self, uintptr_t which, QSizeF* constraint) { - QSizeF ret = self->effectiveSizeHint(static_cast(which), *constraint); + QSizeF ret = const_cast(self)->effectiveSizeHint(static_cast(which), *constraint); // Copy-construct value returned type into heap-allocated copy return static_cast(new QSizeF(ret)); } diff --git a/qt/gen_qgraphicslinearlayout.cpp b/qt/gen_qgraphicslinearlayout.cpp index 253ad6c7..aced781d 100644 --- a/qt/gen_qgraphicslinearlayout.cpp +++ b/qt/gen_qgraphicslinearlayout.cpp @@ -127,13 +127,13 @@ void QGraphicsLinearLayout_InsertStretch2(QGraphicsLinearLayout* self, int index } QSizeF* QGraphicsLinearLayout_SizeHint2(QGraphicsLinearLayout* self, uintptr_t which, QSizeF* constraint) { - QSizeF ret = self->sizeHint(static_cast(which), *constraint); + QSizeF ret = const_cast(self)->sizeHint(static_cast(which), *constraint); // Copy-construct value returned type into heap-allocated copy return static_cast(new QSizeF(ret)); } void QGraphicsLinearLayout_Dump1(QGraphicsLinearLayout* self, int indent) { - self->dump(static_cast(indent)); + const_cast(self)->dump(static_cast(indent)); } void QGraphicsLinearLayout_Delete(QGraphicsLinearLayout* self) { diff --git a/qt/gen_qgraphicsscene.cpp b/qt/gen_qgraphicsscene.cpp index cc908a40..b890030c 100644 --- a/qt/gen_qgraphicsscene.cpp +++ b/qt/gen_qgraphicsscene.cpp @@ -572,7 +572,7 @@ void QGraphicsScene_Render4(QGraphicsScene* self, QPainter* painter, QRectF* tar } void QGraphicsScene_Items1(QGraphicsScene* self, uintptr_t order, QGraphicsItem*** _out, size_t* _out_len) { - QList ret = self->items(static_cast(order)); + QList ret = const_cast(self)->items(static_cast(order)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** __out = static_cast(malloc(sizeof(QGraphicsItem*) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { @@ -583,7 +583,7 @@ void QGraphicsScene_Items1(QGraphicsScene* self, uintptr_t order, QGraphicsItem* } void QGraphicsScene_Items22(QGraphicsScene* self, QPointF* pos, uintptr_t mode, QGraphicsItem*** _out, size_t* _out_len) { - QList ret = self->items(*pos, static_cast(mode)); + QList ret = const_cast(self)->items(*pos, static_cast(mode)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** __out = static_cast(malloc(sizeof(QGraphicsItem*) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { @@ -594,7 +594,7 @@ void QGraphicsScene_Items22(QGraphicsScene* self, QPointF* pos, uintptr_t mode, } void QGraphicsScene_Items3(QGraphicsScene* self, QPointF* pos, uintptr_t mode, uintptr_t order, QGraphicsItem*** _out, size_t* _out_len) { - QList ret = self->items(*pos, static_cast(mode), static_cast(order)); + QList ret = const_cast(self)->items(*pos, static_cast(mode), static_cast(order)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** __out = static_cast(malloc(sizeof(QGraphicsItem*) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { @@ -605,7 +605,7 @@ void QGraphicsScene_Items3(QGraphicsScene* self, QPointF* pos, uintptr_t mode, u } void QGraphicsScene_Items4(QGraphicsScene* self, QPointF* pos, uintptr_t mode, uintptr_t order, QTransform* deviceTransform, QGraphicsItem*** _out, size_t* _out_len) { - QList ret = self->items(*pos, static_cast(mode), static_cast(order), *deviceTransform); + QList ret = const_cast(self)->items(*pos, static_cast(mode), static_cast(order), *deviceTransform); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** __out = static_cast(malloc(sizeof(QGraphicsItem*) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { @@ -616,7 +616,7 @@ void QGraphicsScene_Items4(QGraphicsScene* self, QPointF* pos, uintptr_t mode, u } void QGraphicsScene_Items23(QGraphicsScene* self, QRectF* rect, uintptr_t mode, QGraphicsItem*** _out, size_t* _out_len) { - QList ret = self->items(*rect, static_cast(mode)); + QList ret = const_cast(self)->items(*rect, static_cast(mode)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** __out = static_cast(malloc(sizeof(QGraphicsItem*) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { @@ -627,7 +627,7 @@ void QGraphicsScene_Items23(QGraphicsScene* self, QRectF* rect, uintptr_t mode, } void QGraphicsScene_Items32(QGraphicsScene* self, QRectF* rect, uintptr_t mode, uintptr_t order, QGraphicsItem*** _out, size_t* _out_len) { - QList ret = self->items(*rect, static_cast(mode), static_cast(order)); + QList ret = const_cast(self)->items(*rect, static_cast(mode), static_cast(order)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** __out = static_cast(malloc(sizeof(QGraphicsItem*) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { @@ -638,7 +638,7 @@ void QGraphicsScene_Items32(QGraphicsScene* self, QRectF* rect, uintptr_t mode, } void QGraphicsScene_Items42(QGraphicsScene* self, QRectF* rect, uintptr_t mode, uintptr_t order, QTransform* deviceTransform, QGraphicsItem*** _out, size_t* _out_len) { - QList ret = self->items(*rect, static_cast(mode), static_cast(order), *deviceTransform); + QList ret = const_cast(self)->items(*rect, static_cast(mode), static_cast(order), *deviceTransform); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** __out = static_cast(malloc(sizeof(QGraphicsItem*) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { @@ -649,7 +649,7 @@ void QGraphicsScene_Items42(QGraphicsScene* self, QRectF* rect, uintptr_t mode, } void QGraphicsScene_Items25(QGraphicsScene* self, QPainterPath* path, uintptr_t mode, QGraphicsItem*** _out, size_t* _out_len) { - QList ret = self->items(*path, static_cast(mode)); + QList ret = const_cast(self)->items(*path, static_cast(mode)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** __out = static_cast(malloc(sizeof(QGraphicsItem*) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { @@ -660,7 +660,7 @@ void QGraphicsScene_Items25(QGraphicsScene* self, QPainterPath* path, uintptr_t } void QGraphicsScene_Items34(QGraphicsScene* self, QPainterPath* path, uintptr_t mode, uintptr_t order, QGraphicsItem*** _out, size_t* _out_len) { - QList ret = self->items(*path, static_cast(mode), static_cast(order)); + QList ret = const_cast(self)->items(*path, static_cast(mode), static_cast(order)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** __out = static_cast(malloc(sizeof(QGraphicsItem*) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { @@ -671,7 +671,7 @@ void QGraphicsScene_Items34(QGraphicsScene* self, QPainterPath* path, uintptr_t } void QGraphicsScene_Items44(QGraphicsScene* self, QPainterPath* path, uintptr_t mode, uintptr_t order, QTransform* deviceTransform, QGraphicsItem*** _out, size_t* _out_len) { - QList ret = self->items(*path, static_cast(mode), static_cast(order), *deviceTransform); + QList ret = const_cast(self)->items(*path, static_cast(mode), static_cast(order), *deviceTransform); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** __out = static_cast(malloc(sizeof(QGraphicsItem*) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { @@ -682,7 +682,7 @@ void QGraphicsScene_Items44(QGraphicsScene* self, QPainterPath* path, uintptr_t } void QGraphicsScene_CollidingItems2(QGraphicsScene* self, QGraphicsItem* item, uintptr_t mode, QGraphicsItem*** _out, size_t* _out_len) { - QList ret = self->collidingItems(item, static_cast(mode)); + QList ret = const_cast(self)->collidingItems(item, static_cast(mode)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** __out = static_cast(malloc(sizeof(QGraphicsItem*) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { @@ -693,7 +693,7 @@ void QGraphicsScene_CollidingItems2(QGraphicsScene* self, QGraphicsItem* item, u } void QGraphicsScene_Items7(QGraphicsScene* self, double x, double y, double w, double h, uintptr_t mode, uintptr_t order, QTransform* deviceTransform, QGraphicsItem*** _out, size_t* _out_len) { - QList ret = self->items(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(mode), static_cast(order), *deviceTransform); + QList ret = const_cast(self)->items(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(mode), static_cast(order), *deviceTransform); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** __out = static_cast(malloc(sizeof(QGraphicsItem*) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { diff --git a/qt/gen_qgraphicsview.cpp b/qt/gen_qgraphicsview.cpp index c613d5ef..186520d5 100644 --- a/qt/gen_qgraphicsview.cpp +++ b/qt/gen_qgraphicsview.cpp @@ -557,7 +557,7 @@ void QGraphicsView_Render4(QGraphicsView* self, QPainter* painter, QRectF* targe } void QGraphicsView_Items22(QGraphicsView* self, QRect* rect, uintptr_t mode, QGraphicsItem*** _out, size_t* _out_len) { - QList ret = self->items(*rect, static_cast(mode)); + QList ret = const_cast(self)->items(*rect, static_cast(mode)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** __out = static_cast(malloc(sizeof(QGraphicsItem*) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { @@ -568,7 +568,7 @@ void QGraphicsView_Items22(QGraphicsView* self, QRect* rect, uintptr_t mode, QGr } void QGraphicsView_Items5(QGraphicsView* self, int x, int y, int w, int h, uintptr_t mode, QGraphicsItem*** _out, size_t* _out_len) { - QList ret = self->items(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(mode)); + QList ret = const_cast(self)->items(static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(mode)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** __out = static_cast(malloc(sizeof(QGraphicsItem*) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { @@ -579,7 +579,7 @@ void QGraphicsView_Items5(QGraphicsView* self, int x, int y, int w, int h, uintp } void QGraphicsView_Items24(QGraphicsView* self, QPainterPath* path, uintptr_t mode, QGraphicsItem*** _out, size_t* _out_len) { - QList ret = self->items(*path, static_cast(mode)); + QList ret = const_cast(self)->items(*path, static_cast(mode)); // Convert QList<> from C++ memory to manually-managed C memory QGraphicsItem** __out = static_cast(malloc(sizeof(QGraphicsItem*) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { diff --git a/qt/gen_qgroupbox.cpp b/qt/gen_qgroupbox.cpp index f7f24019..5a763ade 100644 --- a/qt/gen_qgroupbox.cpp +++ b/qt/gen_qgroupbox.cpp @@ -110,6 +110,12 @@ void QGroupBox_Clicked(QGroupBox* self) { self->clicked(); } +void QGroupBox_connect_Clicked(QGroupBox* self, void* slot) { + QGroupBox::connect(self, static_cast(&QGroupBox::clicked), self, [=]() { + miqt_exec_callback(slot, 0, nullptr); + }); +} + void QGroupBox_Toggled(QGroupBox* self, bool param1) { self->toggled(param1); } diff --git a/qt/gen_qgroupbox.go b/qt/gen_qgroupbox.go index b487001f..318989d6 100644 --- a/qt/gen_qgroupbox.go +++ b/qt/gen_qgroupbox.go @@ -158,6 +158,14 @@ func (this *QGroupBox) Clicked() { C.QGroupBox_Clicked(this.h) } +func (this *QGroupBox) OnClicked(slot func()) { + var slotWrapper miqtCallbackFunc = func(argc C.int, args *C.void) { + slot() + } + + C.QGroupBox_connect_Clicked(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slotWrapper)))) +} + func (this *QGroupBox) Toggled(param1 bool) { C.QGroupBox_Toggled(this.h, (C.bool)(param1)) } diff --git a/qt/gen_qgroupbox.h b/qt/gen_qgroupbox.h index 9e60855d..e14b781d 100644 --- a/qt/gen_qgroupbox.h +++ b/qt/gen_qgroupbox.h @@ -42,6 +42,7 @@ void QGroupBox_SetCheckable(QGroupBox* self, bool checkable); bool QGroupBox_IsChecked(QGroupBox* self); void QGroupBox_SetChecked(QGroupBox* self, bool checked); void QGroupBox_Clicked(QGroupBox* self); +void QGroupBox_connect_Clicked(QGroupBox* self, void* slot); void QGroupBox_Toggled(QGroupBox* self, bool param1); void QGroupBox_connect_Toggled(QGroupBox* self, void* slot); void QGroupBox_Tr2(const char* s, const char* c, char** _out, int* _out_Strlen); diff --git a/qt/gen_qicon.cpp b/qt/gen_qicon.cpp index b6d2e288..6859d8d1 100644 --- a/qt/gen_qicon.cpp +++ b/qt/gen_qicon.cpp @@ -243,99 +243,99 @@ void QIcon_SetFallbackThemeName(const char* name, size_t name_Strlen) { } QPixmap* QIcon_Pixmap22(QIcon* self, QSize* size, uintptr_t mode) { - QPixmap ret = self->pixmap(*size, static_cast(mode)); + QPixmap ret = const_cast(self)->pixmap(*size, static_cast(mode)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QPixmap(ret)); } QPixmap* QIcon_Pixmap32(QIcon* self, QSize* size, uintptr_t mode, uintptr_t state) { - QPixmap ret = self->pixmap(*size, static_cast(mode), static_cast(state)); + QPixmap ret = const_cast(self)->pixmap(*size, static_cast(mode), static_cast(state)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QPixmap(ret)); } QPixmap* QIcon_Pixmap33(QIcon* self, int w, int h, uintptr_t mode) { - QPixmap ret = self->pixmap(static_cast(w), static_cast(h), static_cast(mode)); + QPixmap ret = const_cast(self)->pixmap(static_cast(w), static_cast(h), static_cast(mode)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QPixmap(ret)); } QPixmap* QIcon_Pixmap4(QIcon* self, int w, int h, uintptr_t mode, uintptr_t state) { - QPixmap ret = self->pixmap(static_cast(w), static_cast(h), static_cast(mode), static_cast(state)); + QPixmap ret = const_cast(self)->pixmap(static_cast(w), static_cast(h), static_cast(mode), static_cast(state)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QPixmap(ret)); } QPixmap* QIcon_Pixmap23(QIcon* self, int extent, uintptr_t mode) { - QPixmap ret = self->pixmap(static_cast(extent), static_cast(mode)); + QPixmap ret = const_cast(self)->pixmap(static_cast(extent), static_cast(mode)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QPixmap(ret)); } QPixmap* QIcon_Pixmap34(QIcon* self, int extent, uintptr_t mode, uintptr_t state) { - QPixmap ret = self->pixmap(static_cast(extent), static_cast(mode), static_cast(state)); + QPixmap ret = const_cast(self)->pixmap(static_cast(extent), static_cast(mode), static_cast(state)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QPixmap(ret)); } QPixmap* QIcon_Pixmap35(QIcon* self, QWindow* window, QSize* size, uintptr_t mode) { - QPixmap ret = self->pixmap(window, *size, static_cast(mode)); + QPixmap ret = const_cast(self)->pixmap(window, *size, static_cast(mode)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QPixmap(ret)); } QPixmap* QIcon_Pixmap42(QIcon* self, QWindow* window, QSize* size, uintptr_t mode, uintptr_t state) { - QPixmap ret = self->pixmap(window, *size, static_cast(mode), static_cast(state)); + QPixmap ret = const_cast(self)->pixmap(window, *size, static_cast(mode), static_cast(state)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QPixmap(ret)); } QSize* QIcon_ActualSize22(QIcon* self, QSize* size, uintptr_t mode) { - QSize ret = self->actualSize(*size, static_cast(mode)); + QSize ret = const_cast(self)->actualSize(*size, static_cast(mode)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QSize(ret)); } QSize* QIcon_ActualSize3(QIcon* self, QSize* size, uintptr_t mode, uintptr_t state) { - QSize ret = self->actualSize(*size, static_cast(mode), static_cast(state)); + QSize ret = const_cast(self)->actualSize(*size, static_cast(mode), static_cast(state)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QSize(ret)); } QSize* QIcon_ActualSize32(QIcon* self, QWindow* window, QSize* size, uintptr_t mode) { - QSize ret = self->actualSize(window, *size, static_cast(mode)); + QSize ret = const_cast(self)->actualSize(window, *size, static_cast(mode)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QSize(ret)); } QSize* QIcon_ActualSize4(QIcon* self, QWindow* window, QSize* size, uintptr_t mode, uintptr_t state) { - QSize ret = self->actualSize(window, *size, static_cast(mode), static_cast(state)); + QSize ret = const_cast(self)->actualSize(window, *size, static_cast(mode), static_cast(state)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QSize(ret)); } void QIcon_Paint3(QIcon* self, QPainter* painter, QRect* rect, int alignment) { - self->paint(painter, *rect, static_cast(alignment)); + const_cast(self)->paint(painter, *rect, static_cast(alignment)); } void QIcon_Paint4(QIcon* self, QPainter* painter, QRect* rect, int alignment, uintptr_t mode) { - self->paint(painter, *rect, static_cast(alignment), static_cast(mode)); + const_cast(self)->paint(painter, *rect, static_cast(alignment), static_cast(mode)); } void QIcon_Paint5(QIcon* self, QPainter* painter, QRect* rect, int alignment, uintptr_t mode, uintptr_t state) { - self->paint(painter, *rect, static_cast(alignment), static_cast(mode), static_cast(state)); + const_cast(self)->paint(painter, *rect, static_cast(alignment), static_cast(mode), static_cast(state)); } void QIcon_Paint6(QIcon* self, QPainter* painter, int x, int y, int w, int h, int alignment) { - self->paint(painter, static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(alignment)); + const_cast(self)->paint(painter, static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(alignment)); } void QIcon_Paint7(QIcon* self, QPainter* painter, int x, int y, int w, int h, int alignment, uintptr_t mode) { - self->paint(painter, static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(alignment), static_cast(mode)); + const_cast(self)->paint(painter, static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(alignment), static_cast(mode)); } void QIcon_Paint8(QIcon* self, QPainter* painter, int x, int y, int w, int h, int alignment, uintptr_t mode, uintptr_t state) { - self->paint(painter, static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(alignment), static_cast(mode), static_cast(state)); + const_cast(self)->paint(painter, static_cast(x), static_cast(y), static_cast(w), static_cast(h), static_cast(alignment), static_cast(mode), static_cast(state)); } void QIcon_AddPixmap2(QIcon* self, QPixmap* pixmap, uintptr_t mode) { @@ -362,7 +362,7 @@ void QIcon_AddFile4(QIcon* self, const char* fileName, size_t fileName_Strlen, Q } void QIcon_AvailableSizes1(QIcon* self, uintptr_t mode, QSize*** _out, size_t* _out_len) { - QList ret = self->availableSizes(static_cast(mode)); + QList ret = const_cast(self)->availableSizes(static_cast(mode)); // Convert QList<> from C++ memory to manually-managed C memory of copy-constructed pointers QSize** __out = static_cast(malloc(sizeof(QSize**) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { @@ -373,7 +373,7 @@ void QIcon_AvailableSizes1(QIcon* self, uintptr_t mode, QSize*** _out, size_t* _ } void QIcon_AvailableSizes2(QIcon* self, uintptr_t mode, uintptr_t state, QSize*** _out, size_t* _out_len) { - QList ret = self->availableSizes(static_cast(mode), static_cast(state)); + QList ret = const_cast(self)->availableSizes(static_cast(mode), static_cast(state)); // Convert QList<> from C++ memory to manually-managed C memory of copy-constructed pointers QSize** __out = static_cast(malloc(sizeof(QSize**) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { diff --git a/qt/gen_qiconengine.cpp b/qt/gen_qiconengine.cpp index eceb4b84..919842dd 100644 --- a/qt/gen_qiconengine.cpp +++ b/qt/gen_qiconengine.cpp @@ -95,7 +95,7 @@ QPixmap* QIconEngine_ScaledPixmap(QIconEngine* self, QSize* size, uintptr_t mode } void QIconEngine_AvailableSizes1(QIconEngine* self, uintptr_t mode, QSize*** _out, size_t* _out_len) { - QList ret = self->availableSizes(static_cast(mode)); + QList ret = const_cast(self)->availableSizes(static_cast(mode)); // Convert QList<> from C++ memory to manually-managed C memory of copy-constructed pointers QSize** __out = static_cast(malloc(sizeof(QSize**) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { @@ -106,7 +106,7 @@ void QIconEngine_AvailableSizes1(QIconEngine* self, uintptr_t mode, QSize*** _ou } void QIconEngine_AvailableSizes2(QIconEngine* self, uintptr_t mode, uintptr_t state, QSize*** _out, size_t* _out_len) { - QList ret = self->availableSizes(static_cast(mode), static_cast(state)); + QList ret = const_cast(self)->availableSizes(static_cast(mode), static_cast(state)); // Convert QList<> from C++ memory to manually-managed C memory of copy-constructed pointers QSize** __out = static_cast(malloc(sizeof(QSize**) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { diff --git a/qt/gen_qidentityproxymodel.cpp b/qt/gen_qidentityproxymodel.cpp index 6efe5dce..932c2ca7 100644 --- a/qt/gen_qidentityproxymodel.cpp +++ b/qt/gen_qidentityproxymodel.cpp @@ -171,27 +171,27 @@ void QIdentityProxyModel_TrUtf83(const char* s, const char* c, int n, char** _ou } int QIdentityProxyModel_ColumnCount1(QIdentityProxyModel* self, QModelIndex* parent) { - return self->columnCount(*parent); + return const_cast(self)->columnCount(*parent); } QModelIndex* QIdentityProxyModel_Index3(QIdentityProxyModel* self, int row, int column, QModelIndex* parent) { - QModelIndex ret = self->index(static_cast(row), static_cast(column), *parent); + QModelIndex ret = const_cast(self)->index(static_cast(row), static_cast(column), *parent); // Copy-construct value returned type into heap-allocated copy return static_cast(new QModelIndex(ret)); } int QIdentityProxyModel_RowCount1(QIdentityProxyModel* self, QModelIndex* parent) { - return self->rowCount(*parent); + return const_cast(self)->rowCount(*parent); } QVariant* QIdentityProxyModel_HeaderData3(QIdentityProxyModel* self, int section, uintptr_t orientation, int role) { - QVariant ret = self->headerData(static_cast(section), static_cast(orientation), static_cast(role)); + QVariant ret = const_cast(self)->headerData(static_cast(section), static_cast(orientation), static_cast(role)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QVariant(ret)); } void QIdentityProxyModel_Match4(QIdentityProxyModel* self, QModelIndex* start, int role, QVariant* value, int hits, QModelIndex*** _out, size_t* _out_len) { - QModelIndexList ret = self->match(*start, static_cast(role), *value, static_cast(hits)); + QModelIndexList ret = const_cast(self)->match(*start, static_cast(role), *value, static_cast(hits)); // Convert QList<> from C++ memory to manually-managed C memory of copy-constructed pointers QModelIndex** __out = static_cast(malloc(sizeof(QModelIndex**) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { @@ -202,7 +202,7 @@ void QIdentityProxyModel_Match4(QIdentityProxyModel* self, QModelIndex* start, i } void QIdentityProxyModel_Match5(QIdentityProxyModel* self, QModelIndex* start, int role, QVariant* value, int hits, int flags, QModelIndex*** _out, size_t* _out_len) { - QModelIndexList ret = self->match(*start, static_cast(role), *value, static_cast(hits), static_cast(flags)); + QModelIndexList ret = const_cast(self)->match(*start, static_cast(role), *value, static_cast(hits), static_cast(flags)); // Convert QList<> from C++ memory to manually-managed C memory of copy-constructed pointers QModelIndex** __out = static_cast(malloc(sizeof(QModelIndex**) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { diff --git a/qt/gen_qimage.cpp b/qt/gen_qimage.cpp index 47a5b212..77f61307 100644 --- a/qt/gen_qimage.cpp +++ b/qt/gen_qimage.cpp @@ -561,13 +561,13 @@ uintptr_t QImage_ToImageFormat(QPixelFormat* format) { } QImage* QImage_Copy1(QImage* self, QRect* rect) { - QImage ret = self->copy(*rect); + QImage ret = const_cast(self)->copy(*rect); // Copy-construct value returned type into heap-allocated copy return static_cast(new QImage(ret)); } QImage* QImage_ConvertToFormat22(QImage* self, uintptr_t f, int flags) { - QImage ret = self->convertToFormat(static_cast(f), static_cast(flags)); + QImage ret = const_cast(self)->convertToFormat(static_cast(f), static_cast(flags)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QImage(ret)); } @@ -578,7 +578,7 @@ QImage* QImage_ConvertToFormat3(QImage* self, uintptr_t f, unsigned int* colorTa for(size_t i = 0; i < colorTable_len; ++i) { colorTable_QList.push_back(colorTable[i]); } - QImage ret = self->convertToFormat(static_cast(f), colorTable_QList, static_cast(flags)); + QImage ret = const_cast(self)->convertToFormat(static_cast(f), colorTable_QList, static_cast(flags)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QImage(ret)); } @@ -588,79 +588,79 @@ void QImage_ConvertTo2(QImage* self, uintptr_t f, int flags) { } QImage* QImage_CreateAlphaMask1(QImage* self, int flags) { - QImage ret = self->createAlphaMask(static_cast(flags)); + QImage ret = const_cast(self)->createAlphaMask(static_cast(flags)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QImage(ret)); } QImage* QImage_CreateHeuristicMask1(QImage* self, bool clipTight) { - QImage ret = self->createHeuristicMask(clipTight); + QImage ret = const_cast(self)->createHeuristicMask(clipTight); // Copy-construct value returned type into heap-allocated copy return static_cast(new QImage(ret)); } QImage* QImage_CreateMaskFromColor2(QImage* self, unsigned int color, uintptr_t mode) { - QImage ret = self->createMaskFromColor(static_cast(color), static_cast(mode)); + QImage ret = const_cast(self)->createMaskFromColor(static_cast(color), static_cast(mode)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QImage(ret)); } QImage* QImage_Scaled3(QImage* self, int w, int h, uintptr_t aspectMode) { - QImage ret = self->scaled(static_cast(w), static_cast(h), static_cast(aspectMode)); + QImage ret = const_cast(self)->scaled(static_cast(w), static_cast(h), static_cast(aspectMode)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QImage(ret)); } QImage* QImage_Scaled4(QImage* self, int w, int h, uintptr_t aspectMode, uintptr_t mode) { - QImage ret = self->scaled(static_cast(w), static_cast(h), static_cast(aspectMode), static_cast(mode)); + QImage ret = const_cast(self)->scaled(static_cast(w), static_cast(h), static_cast(aspectMode), static_cast(mode)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QImage(ret)); } QImage* QImage_Scaled2(QImage* self, QSize* s, uintptr_t aspectMode) { - QImage ret = self->scaled(*s, static_cast(aspectMode)); + QImage ret = const_cast(self)->scaled(*s, static_cast(aspectMode)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QImage(ret)); } QImage* QImage_Scaled32(QImage* self, QSize* s, uintptr_t aspectMode, uintptr_t mode) { - QImage ret = self->scaled(*s, static_cast(aspectMode), static_cast(mode)); + QImage ret = const_cast(self)->scaled(*s, static_cast(aspectMode), static_cast(mode)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QImage(ret)); } QImage* QImage_ScaledToWidth2(QImage* self, int w, uintptr_t mode) { - QImage ret = self->scaledToWidth(static_cast(w), static_cast(mode)); + QImage ret = const_cast(self)->scaledToWidth(static_cast(w), static_cast(mode)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QImage(ret)); } QImage* QImage_ScaledToHeight2(QImage* self, int h, uintptr_t mode) { - QImage ret = self->scaledToHeight(static_cast(h), static_cast(mode)); + QImage ret = const_cast(self)->scaledToHeight(static_cast(h), static_cast(mode)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QImage(ret)); } QImage* QImage_Transformed2(QImage* self, QMatrix* matrix, uintptr_t mode) { - QImage ret = self->transformed(*matrix, static_cast(mode)); + QImage ret = const_cast(self)->transformed(*matrix, static_cast(mode)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QImage(ret)); } QImage* QImage_Transformed22(QImage* self, QTransform* matrix, uintptr_t mode) { - QImage ret = self->transformed(*matrix, static_cast(mode)); + QImage ret = const_cast(self)->transformed(*matrix, static_cast(mode)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QImage(ret)); } QImage* QImage_Mirrored1(QImage* self, bool horizontally) { - QImage ret = self->mirrored(horizontally); + QImage ret = const_cast(self)->mirrored(horizontally); // Copy-construct value returned type into heap-allocated copy return static_cast(new QImage(ret)); } QImage* QImage_Mirrored2(QImage* self, bool horizontally, bool vertically) { - QImage ret = self->mirrored(horizontally, vertically); + QImage ret = const_cast(self)->mirrored(horizontally, vertically); // Copy-construct value returned type into heap-allocated copy return static_cast(new QImage(ret)); } @@ -684,20 +684,20 @@ bool QImage_LoadFromData2(QImage* self, QByteArray* data, const char* aformat) { bool QImage_Save2(QImage* self, const char* fileName, size_t fileName_Strlen, const char* format) { QString fileName_QString = QString::fromUtf8(fileName, fileName_Strlen); - return self->save(fileName_QString, format); + return const_cast(self)->save(fileName_QString, format); } bool QImage_Save3(QImage* self, const char* fileName, size_t fileName_Strlen, const char* format, int quality) { QString fileName_QString = QString::fromUtf8(fileName, fileName_Strlen); - return self->save(fileName_QString, format, static_cast(quality)); + return const_cast(self)->save(fileName_QString, format, static_cast(quality)); } bool QImage_Save22(QImage* self, QIODevice* device, const char* format) { - return self->save(device, format); + return const_cast(self)->save(device, format); } bool QImage_Save32(QImage* self, QIODevice* device, const char* format, int quality) { - return self->save(device, format, static_cast(quality)); + return const_cast(self)->save(device, format, static_cast(quality)); } QImage* QImage_FromData3(const unsigned char* data, int size, const char* format) { @@ -714,7 +714,7 @@ QImage* QImage_FromData2(QByteArray* data, const char* format) { void QImage_Text1(QImage* self, const char* key, size_t key_Strlen, char** _out, int* _out_Strlen) { QString key_QString = QString::fromUtf8(key, key_Strlen); - QString ret = self->text(key_QString); + QString ret = const_cast(self)->text(key_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); diff --git a/qt/gen_qimageiohandler.cpp b/qt/gen_qimageiohandler.cpp index 2fe416d8..16916672 100644 --- a/qt/gen_qimageiohandler.cpp +++ b/qt/gen_qimageiohandler.cpp @@ -173,7 +173,7 @@ void QImageIOPlugin_TrUtf83(const char* s, const char* c, int n, char** _out, in } QImageIOHandler* QImageIOPlugin_Create2(QImageIOPlugin* self, QIODevice* device, QByteArray* format) { - return self->create(device, *format); + return const_cast(self)->create(device, *format); } void QImageIOPlugin_Delete(QImageIOPlugin* self) { diff --git a/qt/gen_qitemselectionmodel.cpp b/qt/gen_qitemselectionmodel.cpp index 10cd4d29..37052686 100644 --- a/qt/gen_qitemselectionmodel.cpp +++ b/qt/gen_qitemselectionmodel.cpp @@ -350,23 +350,23 @@ void QItemSelectionModel_TrUtf83(const char* s, const char* c, int n, char** _ou } bool QItemSelectionModel_IsRowSelected2(QItemSelectionModel* self, int row, QModelIndex* parent) { - return self->isRowSelected(static_cast(row), *parent); + return const_cast(self)->isRowSelected(static_cast(row), *parent); } bool QItemSelectionModel_IsColumnSelected2(QItemSelectionModel* self, int column, QModelIndex* parent) { - return self->isColumnSelected(static_cast(column), *parent); + return const_cast(self)->isColumnSelected(static_cast(column), *parent); } bool QItemSelectionModel_RowIntersectsSelection2(QItemSelectionModel* self, int row, QModelIndex* parent) { - return self->rowIntersectsSelection(static_cast(row), *parent); + return const_cast(self)->rowIntersectsSelection(static_cast(row), *parent); } bool QItemSelectionModel_ColumnIntersectsSelection2(QItemSelectionModel* self, int column, QModelIndex* parent) { - return self->columnIntersectsSelection(static_cast(column), *parent); + return const_cast(self)->columnIntersectsSelection(static_cast(column), *parent); } void QItemSelectionModel_SelectedRows1(QItemSelectionModel* self, int column, QModelIndex*** _out, size_t* _out_len) { - QModelIndexList ret = self->selectedRows(static_cast(column)); + QModelIndexList ret = const_cast(self)->selectedRows(static_cast(column)); // Convert QList<> from C++ memory to manually-managed C memory of copy-constructed pointers QModelIndex** __out = static_cast(malloc(sizeof(QModelIndex**) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { @@ -377,7 +377,7 @@ void QItemSelectionModel_SelectedRows1(QItemSelectionModel* self, int column, QM } void QItemSelectionModel_SelectedColumns1(QItemSelectionModel* self, int row, QModelIndex*** _out, size_t* _out_len) { - QModelIndexList ret = self->selectedColumns(static_cast(row)); + QModelIndexList ret = const_cast(self)->selectedColumns(static_cast(row)); // Convert QList<> from C++ memory to manually-managed C memory of copy-constructed pointers QModelIndex** __out = static_cast(malloc(sizeof(QModelIndex**) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { diff --git a/qt/gen_qjsonvalue.cpp b/qt/gen_qjsonvalue.cpp index 7b981387..2f6054e4 100644 --- a/qt/gen_qjsonvalue.cpp +++ b/qt/gen_qjsonvalue.cpp @@ -191,15 +191,15 @@ bool QJsonValue_OperatorNotEqual(QJsonValue* self, QJsonValue* other) { } bool QJsonValue_ToBool1(QJsonValue* self, bool defaultValue) { - return self->toBool(defaultValue); + return const_cast(self)->toBool(defaultValue); } int QJsonValue_ToInt1(QJsonValue* self, int defaultValue) { - return self->toInt(static_cast(defaultValue)); + return const_cast(self)->toInt(static_cast(defaultValue)); } double QJsonValue_ToDouble1(QJsonValue* self, double defaultValue) { - return self->toDouble(static_cast(defaultValue)); + return const_cast(self)->toDouble(static_cast(defaultValue)); } void QJsonValue_Delete(QJsonValue* self) { diff --git a/qt/gen_qkeysequence.cpp b/qt/gen_qkeysequence.cpp index 0800153d..7552c016 100644 --- a/qt/gen_qkeysequence.cpp +++ b/qt/gen_qkeysequence.cpp @@ -163,7 +163,7 @@ bool QKeySequence_IsDetached(QKeySequence* self) { } void QKeySequence_ToString1(QKeySequence* self, uintptr_t format, char** _out, int* _out_Strlen) { - QString ret = self->toString(static_cast(format)); + QString ret = const_cast(self)->toString(static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); diff --git a/qt/gen_qlocale.cpp b/qt/gen_qlocale.cpp index 73efffe8..49647e30 100644 --- a/qt/gen_qlocale.cpp +++ b/qt/gen_qlocale.cpp @@ -589,8 +589,8 @@ void QLocale_CurrencySymbol(QLocale* self, char** _out, int* _out_Strlen) { *_out_Strlen = b.length(); } -void QLocale_ToCurrencyString(QLocale* self, int64_t param1, char** _out, int* _out_Strlen) { - QString ret = const_cast(self)->toCurrencyString((qlonglong)(param1)); +void QLocale_ToCurrencyString(QLocale* self, long long param1, char** _out, int* _out_Strlen) { + QString ret = const_cast(self)->toCurrencyString(static_cast(param1)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -598,8 +598,8 @@ void QLocale_ToCurrencyString(QLocale* self, int64_t param1, char** _out, int* _ *_out_Strlen = b.length(); } -void QLocale_ToCurrencyStringWithQulonglong(QLocale* self, uint64_t param1, char** _out, int* _out_Strlen) { - QString ret = const_cast(self)->toCurrencyString((qulonglong)(param1)); +void QLocale_ToCurrencyStringWithQulonglong(QLocale* self, unsigned long long param1, char** _out, int* _out_Strlen) { + QString ret = const_cast(self)->toCurrencyString(static_cast(param1)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -824,56 +824,56 @@ void QLocale_CreateSeparatedList(QLocale* self, char** strl, uint64_t* strl_Leng int16_t QLocale_ToShort2(QLocale* self, const char* s, size_t s_Strlen, bool* ok) { QString s_QString = QString::fromUtf8(s, s_Strlen); - return self->toShort(s_QString, ok); + return const_cast(self)->toShort(s_QString, ok); } uint16_t QLocale_ToUShort2(QLocale* self, const char* s, size_t s_Strlen, bool* ok) { QString s_QString = QString::fromUtf8(s, s_Strlen); - return self->toUShort(s_QString, ok); + return const_cast(self)->toUShort(s_QString, ok); } int QLocale_ToInt2(QLocale* self, const char* s, size_t s_Strlen, bool* ok) { QString s_QString = QString::fromUtf8(s, s_Strlen); - return self->toInt(s_QString, ok); + return const_cast(self)->toInt(s_QString, ok); } unsigned int QLocale_ToUInt2(QLocale* self, const char* s, size_t s_Strlen, bool* ok) { QString s_QString = QString::fromUtf8(s, s_Strlen); - return self->toUInt(s_QString, ok); + return const_cast(self)->toUInt(s_QString, ok); } long QLocale_ToLong2(QLocale* self, const char* s, size_t s_Strlen, bool* ok) { QString s_QString = QString::fromUtf8(s, s_Strlen); - return self->toLong(s_QString, ok); + return const_cast(self)->toLong(s_QString, ok); } unsigned long QLocale_ToULong2(QLocale* self, const char* s, size_t s_Strlen, bool* ok) { QString s_QString = QString::fromUtf8(s, s_Strlen); - return self->toULong(s_QString, ok); + return const_cast(self)->toULong(s_QString, ok); } int64_t QLocale_ToLongLong2(QLocale* self, const char* s, size_t s_Strlen, bool* ok) { QString s_QString = QString::fromUtf8(s, s_Strlen); - return self->toLongLong(s_QString, ok); + return const_cast(self)->toLongLong(s_QString, ok); } uint64_t QLocale_ToULongLong2(QLocale* self, const char* s, size_t s_Strlen, bool* ok) { QString s_QString = QString::fromUtf8(s, s_Strlen); - return self->toULongLong(s_QString, ok); + return const_cast(self)->toULongLong(s_QString, ok); } float QLocale_ToFloat2(QLocale* self, const char* s, size_t s_Strlen, bool* ok) { QString s_QString = QString::fromUtf8(s, s_Strlen); - return self->toFloat(s_QString, ok); + return const_cast(self)->toFloat(s_QString, ok); } double QLocale_ToDouble2(QLocale* self, const char* s, size_t s_Strlen, bool* ok) { QString s_QString = QString::fromUtf8(s, s_Strlen); - return self->toDouble(s_QString, ok); + return const_cast(self)->toDouble(s_QString, ok); } void QLocale_ToString22(QLocale* self, double i, char f, char** _out, int* _out_Strlen) { - QString ret = self->toString(static_cast(i), static_cast(f)); + QString ret = const_cast(self)->toString(static_cast(i), static_cast(f)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -882,7 +882,7 @@ void QLocale_ToString22(QLocale* self, double i, char f, char** _out, int* _out_ } void QLocale_ToString32(QLocale* self, double i, char f, int prec, char** _out, int* _out_Strlen) { - QString ret = self->toString(static_cast(i), static_cast(f), static_cast(prec)); + QString ret = const_cast(self)->toString(static_cast(i), static_cast(f), static_cast(prec)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -891,7 +891,7 @@ void QLocale_ToString32(QLocale* self, double i, char f, int prec, char** _out, } void QLocale_ToString23(QLocale* self, float i, char f, char** _out, int* _out_Strlen) { - QString ret = self->toString(static_cast(i), static_cast(f)); + QString ret = const_cast(self)->toString(static_cast(i), static_cast(f)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -900,7 +900,7 @@ void QLocale_ToString23(QLocale* self, float i, char f, char** _out, int* _out_S } void QLocale_ToString33(QLocale* self, float i, char f, int prec, char** _out, int* _out_Strlen) { - QString ret = self->toString(static_cast(i), static_cast(f), static_cast(prec)); + QString ret = const_cast(self)->toString(static_cast(i), static_cast(f), static_cast(prec)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -909,7 +909,7 @@ void QLocale_ToString33(QLocale* self, float i, char f, int prec, char** _out, i } void QLocale_ToString24(QLocale* self, QDate* date, uintptr_t format, char** _out, int* _out_Strlen) { - QString ret = self->toString(*date, static_cast(format)); + QString ret = const_cast(self)->toString(*date, static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -918,7 +918,7 @@ void QLocale_ToString24(QLocale* self, QDate* date, uintptr_t format, char** _ou } void QLocale_ToString25(QLocale* self, QTime* time, uintptr_t format, char** _out, int* _out_Strlen) { - QString ret = self->toString(*time, static_cast(format)); + QString ret = const_cast(self)->toString(*time, static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -927,7 +927,7 @@ void QLocale_ToString25(QLocale* self, QTime* time, uintptr_t format, char** _ou } void QLocale_ToString26(QLocale* self, QDateTime* dateTime, uintptr_t format, char** _out, int* _out_Strlen) { - QString ret = self->toString(*dateTime, static_cast(format)); + QString ret = const_cast(self)->toString(*dateTime, static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -936,7 +936,7 @@ void QLocale_ToString26(QLocale* self, QDateTime* dateTime, uintptr_t format, ch } void QLocale_DateFormat1(QLocale* self, uintptr_t format, char** _out, int* _out_Strlen) { - QString ret = self->dateFormat(static_cast(format)); + QString ret = const_cast(self)->dateFormat(static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -945,7 +945,7 @@ void QLocale_DateFormat1(QLocale* self, uintptr_t format, char** _out, int* _out } void QLocale_TimeFormat1(QLocale* self, uintptr_t format, char** _out, int* _out_Strlen) { - QString ret = self->timeFormat(static_cast(format)); + QString ret = const_cast(self)->timeFormat(static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -954,7 +954,7 @@ void QLocale_TimeFormat1(QLocale* self, uintptr_t format, char** _out, int* _out } void QLocale_DateTimeFormat1(QLocale* self, uintptr_t format, char** _out, int* _out_Strlen) { - QString ret = self->dateTimeFormat(static_cast(format)); + QString ret = const_cast(self)->dateTimeFormat(static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -964,27 +964,27 @@ void QLocale_DateTimeFormat1(QLocale* self, uintptr_t format, char** _out, int* QDate* QLocale_ToDate22(QLocale* self, const char* stringVal, size_t stringVal_Strlen, uintptr_t param2) { QString stringVal_QString = QString::fromUtf8(stringVal, stringVal_Strlen); - QDate ret = self->toDate(stringVal_QString, static_cast(param2)); + QDate ret = const_cast(self)->toDate(stringVal_QString, static_cast(param2)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QDate(ret)); } QTime* QLocale_ToTime22(QLocale* self, const char* stringVal, size_t stringVal_Strlen, uintptr_t param2) { QString stringVal_QString = QString::fromUtf8(stringVal, stringVal_Strlen); - QTime ret = self->toTime(stringVal_QString, static_cast(param2)); + QTime ret = const_cast(self)->toTime(stringVal_QString, static_cast(param2)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QTime(ret)); } QDateTime* QLocale_ToDateTime22(QLocale* self, const char* stringVal, size_t stringVal_Strlen, uintptr_t format) { QString stringVal_QString = QString::fromUtf8(stringVal, stringVal_Strlen); - QDateTime ret = self->toDateTime(stringVal_QString, static_cast(format)); + QDateTime ret = const_cast(self)->toDateTime(stringVal_QString, static_cast(format)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QDateTime(ret)); } void QLocale_MonthName2(QLocale* self, int param1, uintptr_t format, char** _out, int* _out_Strlen) { - QString ret = self->monthName(static_cast(param1), static_cast(format)); + QString ret = const_cast(self)->monthName(static_cast(param1), static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -993,7 +993,7 @@ void QLocale_MonthName2(QLocale* self, int param1, uintptr_t format, char** _out } void QLocale_StandaloneMonthName2(QLocale* self, int param1, uintptr_t format, char** _out, int* _out_Strlen) { - QString ret = self->standaloneMonthName(static_cast(param1), static_cast(format)); + QString ret = const_cast(self)->standaloneMonthName(static_cast(param1), static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -1002,7 +1002,7 @@ void QLocale_StandaloneMonthName2(QLocale* self, int param1, uintptr_t format, c } void QLocale_DayName2(QLocale* self, int param1, uintptr_t format, char** _out, int* _out_Strlen) { - QString ret = self->dayName(static_cast(param1), static_cast(format)); + QString ret = const_cast(self)->dayName(static_cast(param1), static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -1011,7 +1011,7 @@ void QLocale_DayName2(QLocale* self, int param1, uintptr_t format, char** _out, } void QLocale_StandaloneDayName2(QLocale* self, int param1, uintptr_t format, char** _out, int* _out_Strlen) { - QString ret = self->standaloneDayName(static_cast(param1), static_cast(format)); + QString ret = const_cast(self)->standaloneDayName(static_cast(param1), static_cast(format)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -1020,7 +1020,7 @@ void QLocale_StandaloneDayName2(QLocale* self, int param1, uintptr_t format, cha } void QLocale_CurrencySymbol1(QLocale* self, uintptr_t param1, char** _out, int* _out_Strlen) { - QString ret = self->currencySymbol(static_cast(param1)); + QString ret = const_cast(self)->currencySymbol(static_cast(param1)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -1028,9 +1028,9 @@ void QLocale_CurrencySymbol1(QLocale* self, uintptr_t param1, char** _out, int* *_out_Strlen = b.length(); } -void QLocale_ToCurrencyString22(QLocale* self, int64_t param1, const char* symbol, size_t symbol_Strlen, char** _out, int* _out_Strlen) { +void QLocale_ToCurrencyString22(QLocale* self, long long param1, const char* symbol, size_t symbol_Strlen, char** _out, int* _out_Strlen) { QString symbol_QString = QString::fromUtf8(symbol, symbol_Strlen); - QString ret = self->toCurrencyString((qlonglong)(param1), symbol_QString); + QString ret = const_cast(self)->toCurrencyString(static_cast(param1), symbol_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -1038,9 +1038,9 @@ void QLocale_ToCurrencyString22(QLocale* self, int64_t param1, const char* symbo *_out_Strlen = b.length(); } -void QLocale_ToCurrencyString23(QLocale* self, uint64_t param1, const char* symbol, size_t symbol_Strlen, char** _out, int* _out_Strlen) { +void QLocale_ToCurrencyString23(QLocale* self, unsigned long long param1, const char* symbol, size_t symbol_Strlen, char** _out, int* _out_Strlen) { QString symbol_QString = QString::fromUtf8(symbol, symbol_Strlen); - QString ret = self->toCurrencyString((qulonglong)(param1), symbol_QString); + QString ret = const_cast(self)->toCurrencyString(static_cast(param1), symbol_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -1050,7 +1050,7 @@ void QLocale_ToCurrencyString23(QLocale* self, uint64_t param1, const char* symb void QLocale_ToCurrencyString24(QLocale* self, int16_t param1, const char* symbol, size_t symbol_Strlen, char** _out, int* _out_Strlen) { QString symbol_QString = QString::fromUtf8(symbol, symbol_Strlen); - QString ret = self->toCurrencyString(static_cast(param1), symbol_QString); + QString ret = const_cast(self)->toCurrencyString(static_cast(param1), symbol_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -1060,7 +1060,7 @@ void QLocale_ToCurrencyString24(QLocale* self, int16_t param1, const char* symbo void QLocale_ToCurrencyString25(QLocale* self, uint16_t param1, const char* symbol, size_t symbol_Strlen, char** _out, int* _out_Strlen) { QString symbol_QString = QString::fromUtf8(symbol, symbol_Strlen); - QString ret = self->toCurrencyString(static_cast(param1), symbol_QString); + QString ret = const_cast(self)->toCurrencyString(static_cast(param1), symbol_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -1070,7 +1070,7 @@ void QLocale_ToCurrencyString25(QLocale* self, uint16_t param1, const char* symb void QLocale_ToCurrencyString26(QLocale* self, int param1, const char* symbol, size_t symbol_Strlen, char** _out, int* _out_Strlen) { QString symbol_QString = QString::fromUtf8(symbol, symbol_Strlen); - QString ret = self->toCurrencyString(static_cast(param1), symbol_QString); + QString ret = const_cast(self)->toCurrencyString(static_cast(param1), symbol_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -1080,7 +1080,7 @@ void QLocale_ToCurrencyString26(QLocale* self, int param1, const char* symbol, s void QLocale_ToCurrencyString27(QLocale* self, unsigned int param1, const char* symbol, size_t symbol_Strlen, char** _out, int* _out_Strlen) { QString symbol_QString = QString::fromUtf8(symbol, symbol_Strlen); - QString ret = self->toCurrencyString(static_cast(param1), symbol_QString); + QString ret = const_cast(self)->toCurrencyString(static_cast(param1), symbol_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -1090,7 +1090,7 @@ void QLocale_ToCurrencyString27(QLocale* self, unsigned int param1, const char* void QLocale_ToCurrencyString28(QLocale* self, double param1, const char* symbol, size_t symbol_Strlen, char** _out, int* _out_Strlen) { QString symbol_QString = QString::fromUtf8(symbol, symbol_Strlen); - QString ret = self->toCurrencyString(static_cast(param1), symbol_QString); + QString ret = const_cast(self)->toCurrencyString(static_cast(param1), symbol_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -1100,7 +1100,7 @@ void QLocale_ToCurrencyString28(QLocale* self, double param1, const char* symbol void QLocale_ToCurrencyString29(QLocale* self, float i, const char* symbol, size_t symbol_Strlen, char** _out, int* _out_Strlen) { QString symbol_QString = QString::fromUtf8(symbol, symbol_Strlen); - QString ret = self->toCurrencyString(static_cast(i), symbol_QString); + QString ret = const_cast(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(); *_out = static_cast(malloc(b.length())); @@ -1127,7 +1127,7 @@ void QLocale_FormattedDataSize3(QLocale* self, long long bytes, int precision, i } void QLocale_FormattedDataSize22(QLocale* self, long long bytes, int precision, char** _out, int* _out_Strlen) { - QString ret = self->formattedDataSize(static_cast(bytes), static_cast(precision)); + QString ret = const_cast(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(); *_out = static_cast(malloc(b.length())); @@ -1136,7 +1136,7 @@ void QLocale_FormattedDataSize22(QLocale* self, long long bytes, int precision, } void QLocale_FormattedDataSize32(QLocale* self, long long bytes, int precision, int format, char** _out, int* _out_Strlen) { - QString ret = self->formattedDataSize(static_cast(bytes), static_cast(precision), static_cast(format)); + QString ret = const_cast(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(); *_out = static_cast(malloc(b.length())); @@ -1146,7 +1146,7 @@ void QLocale_FormattedDataSize32(QLocale* self, long long bytes, int precision, void QLocale_QuoteString2(QLocale* self, const char* str, size_t str_Strlen, uintptr_t style, char** _out, int* _out_Strlen) { QString str_QString = QString::fromUtf8(str, str_Strlen); - QString ret = self->quoteString(str_QString, static_cast(style)); + QString ret = const_cast(self)->quoteString(str_QString, static_cast(style)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); diff --git a/qt/gen_qlocale.go b/qt/gen_qlocale.go index 45ee4233..afb31704 100644 --- a/qt/gen_qlocale.go +++ b/qt/gen_qlocale.go @@ -1647,7 +1647,7 @@ func (this *QLocale) CurrencySymbol() string { func (this *QLocale) ToCurrencyString(param1 int64) string { var _out *C.char = nil var _out_Strlen C.int = 0 - C.QLocale_ToCurrencyString(this.h, (C.int64_t)(param1), &_out, &_out_Strlen) + C.QLocale_ToCurrencyString(this.h, (C.longlong)(param1), &_out, &_out_Strlen) ret := C.GoStringN(_out, _out_Strlen) C.free(unsafe.Pointer(_out)) return ret @@ -1656,7 +1656,7 @@ func (this *QLocale) ToCurrencyString(param1 int64) string { func (this *QLocale) ToCurrencyStringWithQulonglong(param1 uint64) string { var _out *C.char = nil var _out_Strlen C.int = 0 - C.QLocale_ToCurrencyStringWithQulonglong(this.h, (C.uint64_t)(param1), &_out, &_out_Strlen) + C.QLocale_ToCurrencyStringWithQulonglong(this.h, (C.ulonglong)(param1), &_out, &_out_Strlen) ret := C.GoStringN(_out, _out_Strlen) C.free(unsafe.Pointer(_out)) return ret @@ -2149,7 +2149,7 @@ func (this *QLocale) ToCurrencyString22(param1 int64, symbol string) string { defer C.free(unsafe.Pointer(symbol_Cstring)) var _out *C.char = nil var _out_Strlen C.int = 0 - C.QLocale_ToCurrencyString22(this.h, (C.int64_t)(param1), symbol_Cstring, C.size_t(len(symbol)), &_out, &_out_Strlen) + C.QLocale_ToCurrencyString22(this.h, (C.longlong)(param1), symbol_Cstring, C.size_t(len(symbol)), &_out, &_out_Strlen) ret := C.GoStringN(_out, _out_Strlen) C.free(unsafe.Pointer(_out)) return ret @@ -2160,7 +2160,7 @@ func (this *QLocale) ToCurrencyString23(param1 uint64, symbol string) string { defer C.free(unsafe.Pointer(symbol_Cstring)) var _out *C.char = nil var _out_Strlen C.int = 0 - C.QLocale_ToCurrencyString23(this.h, (C.uint64_t)(param1), symbol_Cstring, C.size_t(len(symbol)), &_out, &_out_Strlen) + C.QLocale_ToCurrencyString23(this.h, (C.ulonglong)(param1), symbol_Cstring, C.size_t(len(symbol)), &_out, &_out_Strlen) ret := C.GoStringN(_out, _out_Strlen) C.free(unsafe.Pointer(_out)) return ret diff --git a/qt/gen_qlocale.h b/qt/gen_qlocale.h index 49640661..99f0260c 100644 --- a/qt/gen_qlocale.h +++ b/qt/gen_qlocale.h @@ -106,8 +106,8 @@ uintptr_t QLocale_TextDirection(QLocale* self); void QLocale_ToUpper(QLocale* self, const char* str, size_t str_Strlen, char** _out, int* _out_Strlen); void QLocale_ToLower(QLocale* self, const char* str, size_t str_Strlen, char** _out, int* _out_Strlen); void QLocale_CurrencySymbol(QLocale* self, char** _out, int* _out_Strlen); -void QLocale_ToCurrencyString(QLocale* self, int64_t param1, char** _out, int* _out_Strlen); -void QLocale_ToCurrencyStringWithQulonglong(QLocale* self, uint64_t param1, char** _out, int* _out_Strlen); +void QLocale_ToCurrencyString(QLocale* self, long long param1, char** _out, int* _out_Strlen); +void QLocale_ToCurrencyStringWithQulonglong(QLocale* self, unsigned long long param1, char** _out, int* _out_Strlen); void QLocale_ToCurrencyStringWithShort(QLocale* self, int16_t param1, char** _out, int* _out_Strlen); void QLocale_ToCurrencyStringWithUshort(QLocale* self, uint16_t param1, char** _out, int* _out_Strlen); void QLocale_ToCurrencyStringWithInt(QLocale* self, int param1, char** _out, int* _out_Strlen); @@ -161,8 +161,8 @@ void QLocale_StandaloneMonthName2(QLocale* self, int param1, uintptr_t format, c void QLocale_DayName2(QLocale* self, int param1, uintptr_t format, char** _out, int* _out_Strlen); void QLocale_StandaloneDayName2(QLocale* self, int param1, uintptr_t format, char** _out, int* _out_Strlen); void QLocale_CurrencySymbol1(QLocale* self, uintptr_t param1, char** _out, int* _out_Strlen); -void QLocale_ToCurrencyString22(QLocale* self, int64_t param1, const char* symbol, size_t symbol_Strlen, char** _out, int* _out_Strlen); -void QLocale_ToCurrencyString23(QLocale* self, uint64_t param1, const char* symbol, size_t symbol_Strlen, char** _out, int* _out_Strlen); +void QLocale_ToCurrencyString22(QLocale* self, long long param1, const char* symbol, size_t symbol_Strlen, char** _out, int* _out_Strlen); +void QLocale_ToCurrencyString23(QLocale* self, unsigned long long param1, const char* symbol, size_t symbol_Strlen, char** _out, int* _out_Strlen); void QLocale_ToCurrencyString24(QLocale* self, int16_t param1, const char* symbol, size_t symbol_Strlen, char** _out, int* _out_Strlen); void QLocale_ToCurrencyString25(QLocale* self, uint16_t param1, const char* symbol, size_t symbol_Strlen, char** _out, int* _out_Strlen); void QLocale_ToCurrencyString26(QLocale* self, int param1, const char* symbol, size_t symbol_Strlen, char** _out, int* _out_Strlen); diff --git a/qt/gen_qmainwindow.cpp b/qt/gen_qmainwindow.cpp index 6fe403f6..8eb4ae69 100644 --- a/qt/gen_qmainwindow.cpp +++ b/qt/gen_qmainwindow.cpp @@ -363,7 +363,7 @@ void QMainWindow_AddToolBarBreak1(QMainWindow* self, uintptr_t area) { } QByteArray* QMainWindow_SaveState1(QMainWindow* self, int version) { - QByteArray ret = self->saveState(static_cast(version)); + QByteArray ret = const_cast(self)->saveState(static_cast(version)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QByteArray(ret)); } diff --git a/qt/gen_qmatrix.cpp b/qt/gen_qmatrix.cpp index f015266e..e05d6c89 100644 --- a/qt/gen_qmatrix.cpp +++ b/qt/gen_qmatrix.cpp @@ -186,7 +186,7 @@ QMatrix* QMatrix_OperatorMultiply(QMatrix* self, QMatrix* o) { } QMatrix* QMatrix_Inverted1(QMatrix* self, bool* invertible) { - QMatrix ret = self->inverted(invertible); + QMatrix ret = const_cast(self)->inverted(invertible); // Copy-construct value returned type into heap-allocated copy return static_cast(new QMatrix(ret)); } diff --git a/qt/gen_qmatrix4x4.cpp b/qt/gen_qmatrix4x4.cpp index cc3ed1b2..92ade112 100644 --- a/qt/gen_qmatrix4x4.cpp +++ b/qt/gen_qmatrix4x4.cpp @@ -295,7 +295,7 @@ void QMatrix4x4_Optimize(QMatrix4x4* self) { } QMatrix4x4* QMatrix4x4_Inverted1(QMatrix4x4* self, bool* invertible) { - QMatrix4x4 ret = self->inverted(invertible); + QMatrix4x4 ret = const_cast(self)->inverted(invertible); // Copy-construct value returned type into heap-allocated copy return static_cast(new QMatrix4x4(ret)); } diff --git a/qt/gen_qmdiarea.cpp b/qt/gen_qmdiarea.cpp index c84c744a..7573abf5 100644 --- a/qt/gen_qmdiarea.cpp +++ b/qt/gen_qmdiarea.cpp @@ -238,7 +238,7 @@ void QMdiArea_TrUtf83(const char* s, const char* c, int n, char** _out, int* _ou } void QMdiArea_SubWindowList1(QMdiArea* self, uintptr_t order, QMdiSubWindow*** _out, size_t* _out_len) { - QList ret = self->subWindowList(static_cast(order)); + QList ret = const_cast(self)->subWindowList(static_cast(order)); // Convert QList<> from C++ memory to manually-managed C memory QMdiSubWindow** __out = static_cast(malloc(sizeof(QMdiSubWindow*) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { diff --git a/qt/gen_qmenubar.cpp b/qt/gen_qmenubar.cpp index a9e98418..28969161 100644 --- a/qt/gen_qmenubar.cpp +++ b/qt/gen_qmenubar.cpp @@ -206,7 +206,7 @@ void QMenuBar_SetCornerWidget2(QMenuBar* self, QWidget* w, uintptr_t corner) { } QWidget* QMenuBar_CornerWidget1(QMenuBar* self, uintptr_t corner) { - return self->cornerWidget(static_cast(corner)); + return const_cast(self)->cornerWidget(static_cast(corner)); } void QMenuBar_Delete(QMenuBar* self) { diff --git a/qt/gen_qmetaobject.cpp b/qt/gen_qmetaobject.cpp index 453aa255..68760e96 100644 --- a/qt/gen_qmetaobject.cpp +++ b/qt/gen_qmetaobject.cpp @@ -130,163 +130,163 @@ bool QMetaMethod_IsValid(QMetaMethod* self) { } bool QMetaMethod_Invoke4(QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0) { - return self->invoke(object, static_cast(connectionType), *returnValue, *val0); + return const_cast(self)->invoke(object, static_cast(connectionType), *returnValue, *val0); } bool QMetaMethod_Invoke5(QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1) { - return self->invoke(object, static_cast(connectionType), *returnValue, *val0, *val1); + return const_cast(self)->invoke(object, static_cast(connectionType), *returnValue, *val0, *val1); } bool QMetaMethod_Invoke6(QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { - return self->invoke(object, static_cast(connectionType), *returnValue, *val0, *val1, *val2); + return const_cast(self)->invoke(object, static_cast(connectionType), *returnValue, *val0, *val1, *val2); } bool QMetaMethod_Invoke7(QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { - return self->invoke(object, static_cast(connectionType), *returnValue, *val0, *val1, *val2, *val3); + return const_cast(self)->invoke(object, static_cast(connectionType), *returnValue, *val0, *val1, *val2, *val3); } bool QMetaMethod_Invoke8(QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { - return self->invoke(object, static_cast(connectionType), *returnValue, *val0, *val1, *val2, *val3, *val4); + return const_cast(self)->invoke(object, static_cast(connectionType), *returnValue, *val0, *val1, *val2, *val3, *val4); } bool QMetaMethod_Invoke9(QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { - return self->invoke(object, static_cast(connectionType), *returnValue, *val0, *val1, *val2, *val3, *val4, *val5); + return const_cast(self)->invoke(object, static_cast(connectionType), *returnValue, *val0, *val1, *val2, *val3, *val4, *val5); } bool QMetaMethod_Invoke10(QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { - return self->invoke(object, static_cast(connectionType), *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6); + return const_cast(self)->invoke(object, static_cast(connectionType), *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6); } bool QMetaMethod_Invoke11(QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { - return self->invoke(object, static_cast(connectionType), *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7); + return const_cast(self)->invoke(object, static_cast(connectionType), *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7); } bool QMetaMethod_Invoke12(QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { - return self->invoke(object, static_cast(connectionType), *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8); + return const_cast(self)->invoke(object, static_cast(connectionType), *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8); } bool QMetaMethod_Invoke13(QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { - return self->invoke(object, static_cast(connectionType), *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8, *val9); + return const_cast(self)->invoke(object, static_cast(connectionType), *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8, *val9); } bool QMetaMethod_Invoke32(QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0) { - return self->invoke(object, *returnValue, *val0); + return const_cast(self)->invoke(object, *returnValue, *val0); } bool QMetaMethod_Invoke42(QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1) { - return self->invoke(object, *returnValue, *val0, *val1); + return const_cast(self)->invoke(object, *returnValue, *val0, *val1); } bool QMetaMethod_Invoke52(QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { - return self->invoke(object, *returnValue, *val0, *val1, *val2); + return const_cast(self)->invoke(object, *returnValue, *val0, *val1, *val2); } bool QMetaMethod_Invoke62(QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { - return self->invoke(object, *returnValue, *val0, *val1, *val2, *val3); + return const_cast(self)->invoke(object, *returnValue, *val0, *val1, *val2, *val3); } bool QMetaMethod_Invoke72(QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { - return self->invoke(object, *returnValue, *val0, *val1, *val2, *val3, *val4); + return const_cast(self)->invoke(object, *returnValue, *val0, *val1, *val2, *val3, *val4); } bool QMetaMethod_Invoke82(QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { - return self->invoke(object, *returnValue, *val0, *val1, *val2, *val3, *val4, *val5); + return const_cast(self)->invoke(object, *returnValue, *val0, *val1, *val2, *val3, *val4, *val5); } bool QMetaMethod_Invoke92(QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { - return self->invoke(object, *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6); + return const_cast(self)->invoke(object, *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6); } bool QMetaMethod_Invoke102(QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { - return self->invoke(object, *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7); + return const_cast(self)->invoke(object, *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7); } bool QMetaMethod_Invoke112(QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { - return self->invoke(object, *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8); + return const_cast(self)->invoke(object, *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8); } bool QMetaMethod_Invoke122(QMetaMethod* self, QObject* object, QGenericReturnArgument* returnValue, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { - return self->invoke(object, *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8, *val9); + return const_cast(self)->invoke(object, *returnValue, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8, *val9); } bool QMetaMethod_Invoke33(QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericArgument* val0) { - return self->invoke(object, static_cast(connectionType), *val0); + return const_cast(self)->invoke(object, static_cast(connectionType), *val0); } bool QMetaMethod_Invoke43(QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericArgument* val0, QGenericArgument* val1) { - return self->invoke(object, static_cast(connectionType), *val0, *val1); + return const_cast(self)->invoke(object, static_cast(connectionType), *val0, *val1); } bool QMetaMethod_Invoke53(QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { - return self->invoke(object, static_cast(connectionType), *val0, *val1, *val2); + return const_cast(self)->invoke(object, static_cast(connectionType), *val0, *val1, *val2); } bool QMetaMethod_Invoke63(QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { - return self->invoke(object, static_cast(connectionType), *val0, *val1, *val2, *val3); + return const_cast(self)->invoke(object, static_cast(connectionType), *val0, *val1, *val2, *val3); } bool QMetaMethod_Invoke73(QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { - return self->invoke(object, static_cast(connectionType), *val0, *val1, *val2, *val3, *val4); + return const_cast(self)->invoke(object, static_cast(connectionType), *val0, *val1, *val2, *val3, *val4); } bool QMetaMethod_Invoke83(QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { - return self->invoke(object, static_cast(connectionType), *val0, *val1, *val2, *val3, *val4, *val5); + return const_cast(self)->invoke(object, static_cast(connectionType), *val0, *val1, *val2, *val3, *val4, *val5); } bool QMetaMethod_Invoke93(QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { - return self->invoke(object, static_cast(connectionType), *val0, *val1, *val2, *val3, *val4, *val5, *val6); + return const_cast(self)->invoke(object, static_cast(connectionType), *val0, *val1, *val2, *val3, *val4, *val5, *val6); } bool QMetaMethod_Invoke103(QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { - return self->invoke(object, static_cast(connectionType), *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7); + return const_cast(self)->invoke(object, static_cast(connectionType), *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7); } bool QMetaMethod_Invoke113(QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { - return self->invoke(object, static_cast(connectionType), *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8); + return const_cast(self)->invoke(object, static_cast(connectionType), *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8); } bool QMetaMethod_Invoke123(QMetaMethod* self, QObject* object, uintptr_t connectionType, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { - return self->invoke(object, static_cast(connectionType), *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8, *val9); + return const_cast(self)->invoke(object, static_cast(connectionType), *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8, *val9); } bool QMetaMethod_Invoke22(QMetaMethod* self, QObject* object, QGenericArgument* val0) { - return self->invoke(object, *val0); + return const_cast(self)->invoke(object, *val0); } bool QMetaMethod_Invoke34(QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1) { - return self->invoke(object, *val0, *val1); + return const_cast(self)->invoke(object, *val0, *val1); } bool QMetaMethod_Invoke44(QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { - return self->invoke(object, *val0, *val1, *val2); + return const_cast(self)->invoke(object, *val0, *val1, *val2); } bool QMetaMethod_Invoke54(QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { - return self->invoke(object, *val0, *val1, *val2, *val3); + return const_cast(self)->invoke(object, *val0, *val1, *val2, *val3); } bool QMetaMethod_Invoke64(QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { - return self->invoke(object, *val0, *val1, *val2, *val3, *val4); + return const_cast(self)->invoke(object, *val0, *val1, *val2, *val3, *val4); } bool QMetaMethod_Invoke74(QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { - return self->invoke(object, *val0, *val1, *val2, *val3, *val4, *val5); + return const_cast(self)->invoke(object, *val0, *val1, *val2, *val3, *val4, *val5); } bool QMetaMethod_Invoke84(QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { - return self->invoke(object, *val0, *val1, *val2, *val3, *val4, *val5, *val6); + return const_cast(self)->invoke(object, *val0, *val1, *val2, *val3, *val4, *val5, *val6); } bool QMetaMethod_Invoke94(QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { - return self->invoke(object, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7); + return const_cast(self)->invoke(object, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7); } bool QMetaMethod_Invoke104(QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { - return self->invoke(object, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8); + return const_cast(self)->invoke(object, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8); } bool QMetaMethod_Invoke114(QMetaMethod* self, QObject* object, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { - return self->invoke(object, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8, *val9); + return const_cast(self)->invoke(object, *val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8, *val9); } void QMetaMethod_Delete(QMetaMethod* self) { @@ -360,11 +360,11 @@ bool QMetaEnum_IsValid(QMetaEnum* self) { } int QMetaEnum_KeyToValue2(QMetaEnum* self, const char* key, bool* ok) { - return self->keyToValue(key, ok); + return const_cast(self)->keyToValue(key, ok); } int QMetaEnum_KeysToValue2(QMetaEnum* self, const char* keys, bool* ok) { - return self->keysToValue(keys, ok); + return const_cast(self)->keysToValue(keys, ok); } void QMetaEnum_Delete(QMetaEnum* self) { @@ -503,23 +503,23 @@ QMetaObject* QMetaProperty_EnclosingMetaObject(QMetaProperty* self) { } bool QMetaProperty_IsDesignable1(QMetaProperty* self, QObject* obj) { - return self->isDesignable(obj); + return const_cast(self)->isDesignable(obj); } bool QMetaProperty_IsScriptable1(QMetaProperty* self, QObject* obj) { - return self->isScriptable(obj); + return const_cast(self)->isScriptable(obj); } bool QMetaProperty_IsStored1(QMetaProperty* self, QObject* obj) { - return self->isStored(obj); + return const_cast(self)->isStored(obj); } bool QMetaProperty_IsEditable1(QMetaProperty* self, QObject* obj) { - return self->isEditable(obj); + return const_cast(self)->isEditable(obj); } bool QMetaProperty_IsUser1(QMetaProperty* self, QObject* obj) { - return self->isUser(obj); + return const_cast(self)->isUser(obj); } void QMetaProperty_Delete(QMetaProperty* self) { diff --git a/qt/gen_qmimedatabase.cpp b/qt/gen_qmimedatabase.cpp index b7a43b5a..faded94d 100644 --- a/qt/gen_qmimedatabase.cpp +++ b/qt/gen_qmimedatabase.cpp @@ -107,13 +107,13 @@ void QMimeDatabase_AllMimeTypes(QMimeDatabase* self, QMimeType*** _out, size_t* QMimeType* QMimeDatabase_MimeTypeForFile2(QMimeDatabase* self, const char* fileName, size_t fileName_Strlen, uintptr_t mode) { QString fileName_QString = QString::fromUtf8(fileName, fileName_Strlen); - QMimeType ret = self->mimeTypeForFile(fileName_QString, static_cast(mode)); + QMimeType ret = const_cast(self)->mimeTypeForFile(fileName_QString, static_cast(mode)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QMimeType(ret)); } QMimeType* QMimeDatabase_MimeTypeForFile22(QMimeDatabase* self, QFileInfo* fileInfo, uintptr_t mode) { - QMimeType ret = self->mimeTypeForFile(*fileInfo, static_cast(mode)); + QMimeType ret = const_cast(self)->mimeTypeForFile(*fileInfo, static_cast(mode)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QMimeType(ret)); } diff --git a/qt/gen_qobject.cpp b/qt/gen_qobject.cpp index 4b6cdcc0..e7224d20 100644 --- a/qt/gen_qobject.cpp +++ b/qt/gen_qobject.cpp @@ -209,6 +209,12 @@ void QObject_Destroyed(QObject* self) { self->destroyed(); } +void QObject_connect_Destroyed(QObject* self, void* slot) { + QObject::connect(self, static_cast(&QObject::destroyed), self, [=]() { + miqt_exec_callback(slot, 0, nullptr); + }); +} + QObject* QObject_Parent(QObject* self) { return const_cast(self)->parent(); } @@ -268,7 +274,7 @@ QMetaObject__Connection* QObject_Connect5(QObject* sender, QMetaMethod* signal, } QMetaObject__Connection* QObject_Connect4(QObject* self, QObject* sender, const char* signal, const char* member, uintptr_t typeVal) { - QMetaObject::Connection ret = self->connect(sender, signal, member, static_cast(typeVal)); + QMetaObject::Connection ret = const_cast(self)->connect(sender, signal, member, static_cast(typeVal)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QMetaObject::Connection(ret)); } diff --git a/qt/gen_qobject.go b/qt/gen_qobject.go index fd321db6..defd5125 100644 --- a/qt/gen_qobject.go +++ b/qt/gen_qobject.go @@ -303,6 +303,14 @@ func (this *QObject) Destroyed() { C.QObject_Destroyed(this.h) } +func (this *QObject) OnDestroyed(slot func()) { + var slotWrapper miqtCallbackFunc = func(argc C.int, args *C.void) { + slot() + } + + C.QObject_connect_Destroyed(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slotWrapper)))) +} + func (this *QObject) Parent() *QObject { ret := C.QObject_Parent(this.h) return newQObject_U(unsafe.Pointer(ret)) diff --git a/qt/gen_qobject.h b/qt/gen_qobject.h index 9bbf43b3..76419545 100644 --- a/qt/gen_qobject.h +++ b/qt/gen_qobject.h @@ -80,6 +80,7 @@ unsigned int QObject_RegisterUserData(); void QObject_SetUserData(QObject* self, unsigned int id, QObjectUserData* data); QObjectUserData* QObject_UserData(QObject* self, unsigned int id); void QObject_Destroyed(QObject* self); +void QObject_connect_Destroyed(QObject* self, void* slot); QObject* QObject_Parent(QObject* self); bool QObject_Inherits(QObject* self, const char* classname); void QObject_DeleteLater(QObject* self); diff --git a/qt/gen_qobjectdefs.cpp b/qt/gen_qobjectdefs.cpp index 9e524bb3..62526350 100644 --- a/qt/gen_qobjectdefs.cpp +++ b/qt/gen_qobjectdefs.cpp @@ -252,7 +252,7 @@ QObject* QMetaObject_NewInstance(QMetaObject* self) { } void QMetaObject_Tr3(QMetaObject* self, const char* s, const char* c, int n, char** _out, int* _out_Strlen) { - QString ret = self->tr(s, c, static_cast(n)); + QString ret = const_cast(self)->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(); *_out = static_cast(malloc(b.length())); @@ -433,43 +433,43 @@ bool QMetaObject_InvokeMethod124(QObject* obj, const char* member, QGenericArgum } QObject* QMetaObject_NewInstance1(QMetaObject* self, QGenericArgument* val0) { - return self->newInstance(*val0); + return const_cast(self)->newInstance(*val0); } QObject* QMetaObject_NewInstance2(QMetaObject* self, QGenericArgument* val0, QGenericArgument* val1) { - return self->newInstance(*val0, *val1); + return const_cast(self)->newInstance(*val0, *val1); } QObject* QMetaObject_NewInstance3(QMetaObject* self, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2) { - return self->newInstance(*val0, *val1, *val2); + return const_cast(self)->newInstance(*val0, *val1, *val2); } QObject* QMetaObject_NewInstance4(QMetaObject* self, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3) { - return self->newInstance(*val0, *val1, *val2, *val3); + return const_cast(self)->newInstance(*val0, *val1, *val2, *val3); } QObject* QMetaObject_NewInstance5(QMetaObject* self, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4) { - return self->newInstance(*val0, *val1, *val2, *val3, *val4); + return const_cast(self)->newInstance(*val0, *val1, *val2, *val3, *val4); } QObject* QMetaObject_NewInstance6(QMetaObject* self, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5) { - return self->newInstance(*val0, *val1, *val2, *val3, *val4, *val5); + return const_cast(self)->newInstance(*val0, *val1, *val2, *val3, *val4, *val5); } QObject* QMetaObject_NewInstance7(QMetaObject* self, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6) { - return self->newInstance(*val0, *val1, *val2, *val3, *val4, *val5, *val6); + return const_cast(self)->newInstance(*val0, *val1, *val2, *val3, *val4, *val5, *val6); } QObject* QMetaObject_NewInstance8(QMetaObject* self, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7) { - return self->newInstance(*val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7); + return const_cast(self)->newInstance(*val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7); } QObject* QMetaObject_NewInstance9(QMetaObject* self, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8) { - return self->newInstance(*val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8); + return const_cast(self)->newInstance(*val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8); } QObject* QMetaObject_NewInstance10(QMetaObject* self, QGenericArgument* val0, QGenericArgument* val1, QGenericArgument* val2, QGenericArgument* val3, QGenericArgument* val4, QGenericArgument* val5, QGenericArgument* val6, QGenericArgument* val7, QGenericArgument* val8, QGenericArgument* val9) { - return self->newInstance(*val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8, *val9); + return const_cast(self)->newInstance(*val0, *val1, *val2, *val3, *val4, *val5, *val6, *val7, *val8, *val9); } void QMetaObject_Delete(QMetaObject* self) { diff --git a/qt/gen_qpixmap.cpp b/qt/gen_qpixmap.cpp index 18d5b6ec..58c5dc65 100644 --- a/qt/gen_qpixmap.cpp +++ b/qt/gen_qpixmap.cpp @@ -151,7 +151,7 @@ QBitmap* QPixmap_CreateMaskFromColor(QPixmap* self, QColor* maskColor) { } QPixmap* QPixmap_GrabWindow(uintptr_t param1) { - QPixmap ret = QPixmap::grabWindow(static_cast(param1)); + QPixmap ret = QPixmap::grabWindow(static_cast(param1)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QPixmap(ret)); } @@ -309,37 +309,37 @@ void QPixmap_Fill1(QPixmap* self, QColor* fillColor) { } QBitmap* QPixmap_CreateHeuristicMask1(QPixmap* self, bool clipTight) { - QBitmap ret = self->createHeuristicMask(clipTight); + QBitmap ret = const_cast(self)->createHeuristicMask(clipTight); // Copy-construct value returned type into heap-allocated copy return static_cast(new QBitmap(ret)); } QBitmap* QPixmap_CreateMaskFromColor2(QPixmap* self, QColor* maskColor, uintptr_t mode) { - QBitmap ret = self->createMaskFromColor(*maskColor, static_cast(mode)); + QBitmap ret = const_cast(self)->createMaskFromColor(*maskColor, static_cast(mode)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QBitmap(ret)); } QPixmap* QPixmap_GrabWindow2(uintptr_t param1, int x) { - QPixmap ret = QPixmap::grabWindow(static_cast(param1), static_cast(x)); + QPixmap ret = QPixmap::grabWindow(static_cast(param1), static_cast(x)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QPixmap(ret)); } QPixmap* QPixmap_GrabWindow3(uintptr_t param1, int x, int y) { - QPixmap ret = QPixmap::grabWindow(static_cast(param1), static_cast(x), static_cast(y)); + QPixmap ret = QPixmap::grabWindow(static_cast(param1), static_cast(x), static_cast(y)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QPixmap(ret)); } QPixmap* QPixmap_GrabWindow4(uintptr_t param1, int x, int y, int w) { - QPixmap ret = QPixmap::grabWindow(static_cast(param1), static_cast(x), static_cast(y), static_cast(w)); + QPixmap ret = QPixmap::grabWindow(static_cast(param1), static_cast(x), static_cast(y), static_cast(w)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QPixmap(ret)); } QPixmap* QPixmap_GrabWindow5(uintptr_t param1, int x, int y, int w, int h) { - QPixmap ret = QPixmap::grabWindow(static_cast(param1), static_cast(x), static_cast(y), static_cast(w), static_cast(h)); + QPixmap ret = QPixmap::grabWindow(static_cast(param1), static_cast(x), static_cast(y), static_cast(w), static_cast(h)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QPixmap(ret)); } @@ -369,49 +369,49 @@ QPixmap* QPixmap_GrabWidget5(QObject* widget, int x, int y, int w, int h) { } QPixmap* QPixmap_Scaled3(QPixmap* self, int w, int h, uintptr_t aspectMode) { - QPixmap ret = self->scaled(static_cast(w), static_cast(h), static_cast(aspectMode)); + QPixmap ret = const_cast(self)->scaled(static_cast(w), static_cast(h), static_cast(aspectMode)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QPixmap(ret)); } QPixmap* QPixmap_Scaled4(QPixmap* self, int w, int h, uintptr_t aspectMode, uintptr_t mode) { - QPixmap ret = self->scaled(static_cast(w), static_cast(h), static_cast(aspectMode), static_cast(mode)); + QPixmap ret = const_cast(self)->scaled(static_cast(w), static_cast(h), static_cast(aspectMode), static_cast(mode)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QPixmap(ret)); } QPixmap* QPixmap_Scaled2(QPixmap* self, QSize* s, uintptr_t aspectMode) { - QPixmap ret = self->scaled(*s, static_cast(aspectMode)); + QPixmap ret = const_cast(self)->scaled(*s, static_cast(aspectMode)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QPixmap(ret)); } QPixmap* QPixmap_Scaled32(QPixmap* self, QSize* s, uintptr_t aspectMode, uintptr_t mode) { - QPixmap ret = self->scaled(*s, static_cast(aspectMode), static_cast(mode)); + QPixmap ret = const_cast(self)->scaled(*s, static_cast(aspectMode), static_cast(mode)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QPixmap(ret)); } QPixmap* QPixmap_ScaledToWidth2(QPixmap* self, int w, uintptr_t mode) { - QPixmap ret = self->scaledToWidth(static_cast(w), static_cast(mode)); + QPixmap ret = const_cast(self)->scaledToWidth(static_cast(w), static_cast(mode)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QPixmap(ret)); } QPixmap* QPixmap_ScaledToHeight2(QPixmap* self, int h, uintptr_t mode) { - QPixmap ret = self->scaledToHeight(static_cast(h), static_cast(mode)); + QPixmap ret = const_cast(self)->scaledToHeight(static_cast(h), static_cast(mode)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QPixmap(ret)); } QPixmap* QPixmap_Transformed2(QPixmap* self, QMatrix* param1, uintptr_t mode) { - QPixmap ret = self->transformed(*param1, static_cast(mode)); + QPixmap ret = const_cast(self)->transformed(*param1, static_cast(mode)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QPixmap(ret)); } QPixmap* QPixmap_Transformed22(QPixmap* self, QTransform* param1, uintptr_t mode) { - QPixmap ret = self->transformed(*param1, static_cast(mode)); + QPixmap ret = const_cast(self)->transformed(*param1, static_cast(mode)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QPixmap(ret)); } @@ -456,20 +456,20 @@ bool QPixmap_LoadFromData32(QPixmap* self, QByteArray* data, const char* format, bool QPixmap_Save2(QPixmap* self, const char* fileName, size_t fileName_Strlen, const char* format) { QString fileName_QString = QString::fromUtf8(fileName, fileName_Strlen); - return self->save(fileName_QString, format); + return const_cast(self)->save(fileName_QString, format); } bool QPixmap_Save3(QPixmap* self, const char* fileName, size_t fileName_Strlen, const char* format, int quality) { QString fileName_QString = QString::fromUtf8(fileName, fileName_Strlen); - return self->save(fileName_QString, format, static_cast(quality)); + return const_cast(self)->save(fileName_QString, format, static_cast(quality)); } bool QPixmap_Save22(QPixmap* self, QIODevice* device, const char* format) { - return self->save(device, format); + return const_cast(self)->save(device, format); } bool QPixmap_Save32(QPixmap* self, QIODevice* device, const char* format, int quality) { - return self->save(device, format, static_cast(quality)); + return const_cast(self)->save(device, format, static_cast(quality)); } bool QPixmap_ConvertFromImage2(QPixmap* self, QImage* img, int flags) { @@ -477,7 +477,7 @@ bool QPixmap_ConvertFromImage2(QPixmap* self, QImage* img, int flags) { } QPixmap* QPixmap_Copy1(QPixmap* self, QRect* rect) { - QPixmap ret = self->copy(*rect); + QPixmap ret = const_cast(self)->copy(*rect); // Copy-construct value returned type into heap-allocated copy return static_cast(new QPixmap(ret)); } diff --git a/qt/gen_qprocess.cpp b/qt/gen_qprocess.cpp index af473faf..bb791360 100644 --- a/qt/gen_qprocess.cpp +++ b/qt/gen_qprocess.cpp @@ -120,7 +120,7 @@ QProcessEnvironment* QProcessEnvironment_SystemEnvironment() { void QProcessEnvironment_Value2(QProcessEnvironment* self, const char* name, size_t name_Strlen, const char* defaultValue, size_t defaultValue_Strlen, char** _out, int* _out_Strlen) { QString name_QString = QString::fromUtf8(name, name_Strlen); QString defaultValue_QString = QString::fromUtf8(defaultValue, defaultValue_Strlen); - QString ret = self->value(name_QString, defaultValue_QString); + QString ret = const_cast(self)->value(name_QString, defaultValue_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); diff --git a/qt/gen_qproxystyle.cpp b/qt/gen_qproxystyle.cpp index ab9ee256..fb93e932 100644 --- a/qt/gen_qproxystyle.cpp +++ b/qt/gen_qproxystyle.cpp @@ -218,69 +218,69 @@ void QProxyStyle_TrUtf83(const char* s, const char* c, int n, char** _out, int* } void QProxyStyle_DrawPrimitive4(QProxyStyle* self, uintptr_t element, QStyleOption* option, QPainter* painter, QWidget* widget) { - self->drawPrimitive(static_cast(element), option, painter, widget); + const_cast(self)->drawPrimitive(static_cast(element), option, painter, widget); } void QProxyStyle_DrawControl4(QProxyStyle* self, uintptr_t element, QStyleOption* option, QPainter* painter, QWidget* widget) { - self->drawControl(static_cast(element), option, painter, widget); + const_cast(self)->drawControl(static_cast(element), option, painter, widget); } void QProxyStyle_DrawComplexControl4(QProxyStyle* self, uintptr_t control, QStyleOptionComplex* option, QPainter* painter, QWidget* widget) { - self->drawComplexControl(static_cast(control), option, painter, widget); + const_cast(self)->drawComplexControl(static_cast(control), option, painter, widget); } void QProxyStyle_DrawItemText7(QProxyStyle* self, QPainter* painter, QRect* rect, int flags, QPalette* pal, bool enabled, const char* text, size_t text_Strlen, uintptr_t textRole) { QString text_QString = QString::fromUtf8(text, text_Strlen); - self->drawItemText(painter, *rect, static_cast(flags), *pal, enabled, text_QString, static_cast(textRole)); + const_cast(self)->drawItemText(painter, *rect, static_cast(flags), *pal, enabled, text_QString, static_cast(textRole)); } uintptr_t QProxyStyle_HitTestComplexControl4(QProxyStyle* self, uintptr_t control, QStyleOptionComplex* option, QPoint* pos, QWidget* widget) { - QStyle::SubControl ret = self->hitTestComplexControl(static_cast(control), option, *pos, widget); + QStyle::SubControl ret = const_cast(self)->hitTestComplexControl(static_cast(control), option, *pos, widget); return static_cast(ret); } int QProxyStyle_StyleHint2(QProxyStyle* self, uintptr_t hint, QStyleOption* option) { - return self->styleHint(static_cast(hint), option); + return const_cast(self)->styleHint(static_cast(hint), option); } int QProxyStyle_StyleHint3(QProxyStyle* self, uintptr_t hint, QStyleOption* option, QWidget* widget) { - return self->styleHint(static_cast(hint), option, widget); + return const_cast(self)->styleHint(static_cast(hint), option, widget); } int QProxyStyle_StyleHint4(QProxyStyle* self, uintptr_t hint, QStyleOption* option, QWidget* widget, QStyleHintReturn* returnData) { - return self->styleHint(static_cast(hint), option, widget, returnData); + return const_cast(self)->styleHint(static_cast(hint), option, widget, returnData); } int QProxyStyle_PixelMetric2(QProxyStyle* self, uintptr_t metric, QStyleOption* option) { - return self->pixelMetric(static_cast(metric), option); + return const_cast(self)->pixelMetric(static_cast(metric), option); } int QProxyStyle_PixelMetric3(QProxyStyle* self, uintptr_t metric, QStyleOption* option, QWidget* widget) { - return self->pixelMetric(static_cast(metric), option, widget); + return const_cast(self)->pixelMetric(static_cast(metric), option, widget); } int QProxyStyle_LayoutSpacing4(QProxyStyle* self, uintptr_t control1, uintptr_t control2, uintptr_t orientation, QStyleOption* option) { - return self->layoutSpacing(static_cast(control1), static_cast(control2), static_cast(orientation), option); + return const_cast(self)->layoutSpacing(static_cast(control1), static_cast(control2), static_cast(orientation), option); } int QProxyStyle_LayoutSpacing5(QProxyStyle* self, uintptr_t control1, uintptr_t control2, uintptr_t orientation, QStyleOption* option, QWidget* widget) { - return self->layoutSpacing(static_cast(control1), static_cast(control2), static_cast(orientation), option, widget); + return const_cast(self)->layoutSpacing(static_cast(control1), static_cast(control2), static_cast(orientation), option, widget); } QIcon* QProxyStyle_StandardIcon2(QProxyStyle* self, uintptr_t standardIcon, QStyleOption* option) { - QIcon ret = self->standardIcon(static_cast(standardIcon), option); + QIcon ret = const_cast(self)->standardIcon(static_cast(standardIcon), option); // Copy-construct value returned type into heap-allocated copy return static_cast(new QIcon(ret)); } QIcon* QProxyStyle_StandardIcon3(QProxyStyle* self, uintptr_t standardIcon, QStyleOption* option, QWidget* widget) { - QIcon ret = self->standardIcon(static_cast(standardIcon), option, widget); + QIcon ret = const_cast(self)->standardIcon(static_cast(standardIcon), option, widget); // Copy-construct value returned type into heap-allocated copy return static_cast(new QIcon(ret)); } QPixmap* QProxyStyle_StandardPixmap3(QProxyStyle* self, uintptr_t standardPixmap, QStyleOption* opt, QWidget* widget) { - QPixmap ret = self->standardPixmap(static_cast(standardPixmap), opt, widget); + QPixmap ret = const_cast(self)->standardPixmap(static_cast(standardPixmap), opt, widget); // Copy-construct value returned type into heap-allocated copy return static_cast(new QPixmap(ret)); } diff --git a/qt/gen_qrawfont.cpp b/qt/gen_qrawfont.cpp index c4988aa4..3d3719eb 100644 --- a/qt/gen_qrawfont.cpp +++ b/qt/gen_qrawfont.cpp @@ -260,13 +260,13 @@ QRawFont* QRawFont_FromFont(QFont* font) { } QImage* QRawFont_AlphaMapForGlyph2(QRawFont* self, unsigned int glyphIndex, uintptr_t antialiasingType) { - QImage ret = self->alphaMapForGlyph(static_cast(glyphIndex), static_cast(antialiasingType)); + QImage ret = const_cast(self)->alphaMapForGlyph(static_cast(glyphIndex), static_cast(antialiasingType)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QImage(ret)); } QImage* QRawFont_AlphaMapForGlyph3(QRawFont* self, unsigned int glyphIndex, uintptr_t antialiasingType, QTransform* transform) { - QImage ret = self->alphaMapForGlyph(static_cast(glyphIndex), static_cast(antialiasingType), *transform); + QImage ret = const_cast(self)->alphaMapForGlyph(static_cast(glyphIndex), static_cast(antialiasingType), *transform); // Copy-construct value returned type into heap-allocated copy return static_cast(new QImage(ret)); } diff --git a/qt/gen_qrect.cpp b/qt/gen_qrect.cpp index 6e19fe2d..eee6996c 100644 --- a/qt/gen_qrect.cpp +++ b/qt/gen_qrect.cpp @@ -345,11 +345,11 @@ QRect* QRect_OperatorMinusAssign(QRect* self, QMargins* margins) { } bool QRect_Contains22(QRect* self, QRect* r, bool proper) { - return self->contains(*r, proper); + return const_cast(self)->contains(*r, proper); } bool QRect_Contains23(QRect* self, QPoint* p, bool proper) { - return self->contains(*p, proper); + return const_cast(self)->contains(*p, proper); } void QRect_Delete(QRect* self) { diff --git a/qt/gen_qregexp.cpp b/qt/gen_qregexp.cpp index 9638533c..6eb81073 100644 --- a/qt/gen_qregexp.cpp +++ b/qt/gen_qregexp.cpp @@ -211,26 +211,26 @@ void QRegExp_Escape(const char* str, size_t str_Strlen, char** _out, int* _out_S int QRegExp_IndexIn2(QRegExp* self, const char* str, size_t str_Strlen, int offset) { QString str_QString = QString::fromUtf8(str, str_Strlen); - return self->indexIn(str_QString, static_cast(offset)); + return const_cast(self)->indexIn(str_QString, static_cast(offset)); } int QRegExp_IndexIn3(QRegExp* self, const char* str, size_t str_Strlen, int offset, uintptr_t caretMode) { QString str_QString = QString::fromUtf8(str, str_Strlen); - return self->indexIn(str_QString, static_cast(offset), static_cast(caretMode)); + return const_cast(self)->indexIn(str_QString, static_cast(offset), static_cast(caretMode)); } int QRegExp_LastIndexIn2(QRegExp* self, const char* str, size_t str_Strlen, int offset) { QString str_QString = QString::fromUtf8(str, str_Strlen); - return self->lastIndexIn(str_QString, static_cast(offset)); + return const_cast(self)->lastIndexIn(str_QString, static_cast(offset)); } int QRegExp_LastIndexIn3(QRegExp* self, const char* str, size_t str_Strlen, int offset, uintptr_t caretMode) { QString str_QString = QString::fromUtf8(str, str_Strlen); - return self->lastIndexIn(str_QString, static_cast(offset), static_cast(caretMode)); + return const_cast(self)->lastIndexIn(str_QString, static_cast(offset), static_cast(caretMode)); } void QRegExp_Cap1(QRegExp* self, int nth, char** _out, int* _out_Strlen) { - QString ret = self->cap(static_cast(nth)); + QString ret = const_cast(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(); *_out = static_cast(malloc(b.length())); @@ -248,7 +248,7 @@ void QRegExp_Cap1WithNth(QRegExp* self, int nth, char** _out, int* _out_Strlen) } int QRegExp_Pos1(QRegExp* self, int nth) { - return self->pos(static_cast(nth)); + return const_cast(self)->pos(static_cast(nth)); } int QRegExp_Pos1WithNth(QRegExp* self, int nth) { diff --git a/qt/gen_qregularexpression.cpp b/qt/gen_qregularexpression.cpp index 3a6a9cfd..aefc8b8f 100644 --- a/qt/gen_qregularexpression.cpp +++ b/qt/gen_qregularexpression.cpp @@ -158,42 +158,42 @@ bool QRegularExpression_OperatorNotEqual(QRegularExpression* self, QRegularExpre QRegularExpressionMatch* QRegularExpression_Match2(QRegularExpression* self, const char* subject, size_t subject_Strlen, int offset) { QString subject_QString = QString::fromUtf8(subject, subject_Strlen); - QRegularExpressionMatch ret = self->match(subject_QString, static_cast(offset)); + QRegularExpressionMatch ret = const_cast(self)->match(subject_QString, static_cast(offset)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QRegularExpressionMatch(ret)); } QRegularExpressionMatch* QRegularExpression_Match3(QRegularExpression* self, const char* subject, size_t subject_Strlen, int offset, uintptr_t matchType) { QString subject_QString = QString::fromUtf8(subject, subject_Strlen); - QRegularExpressionMatch ret = self->match(subject_QString, static_cast(offset), static_cast(matchType)); + QRegularExpressionMatch ret = const_cast(self)->match(subject_QString, static_cast(offset), static_cast(matchType)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QRegularExpressionMatch(ret)); } QRegularExpressionMatch* QRegularExpression_Match4(QRegularExpression* self, const char* subject, size_t subject_Strlen, int offset, uintptr_t matchType, int matchOptions) { QString subject_QString = QString::fromUtf8(subject, subject_Strlen); - QRegularExpressionMatch ret = self->match(subject_QString, static_cast(offset), static_cast(matchType), static_cast(matchOptions)); + QRegularExpressionMatch ret = const_cast(self)->match(subject_QString, static_cast(offset), static_cast(matchType), static_cast(matchOptions)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QRegularExpressionMatch(ret)); } QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch2(QRegularExpression* self, const char* subject, size_t subject_Strlen, int offset) { QString subject_QString = QString::fromUtf8(subject, subject_Strlen); - QRegularExpressionMatchIterator ret = self->globalMatch(subject_QString, static_cast(offset)); + QRegularExpressionMatchIterator ret = const_cast(self)->globalMatch(subject_QString, static_cast(offset)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QRegularExpressionMatchIterator(ret)); } QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch3(QRegularExpression* self, const char* subject, size_t subject_Strlen, int offset, uintptr_t matchType) { QString subject_QString = QString::fromUtf8(subject, subject_Strlen); - QRegularExpressionMatchIterator ret = self->globalMatch(subject_QString, static_cast(offset), static_cast(matchType)); + QRegularExpressionMatchIterator ret = const_cast(self)->globalMatch(subject_QString, static_cast(offset), static_cast(matchType)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QRegularExpressionMatchIterator(ret)); } QRegularExpressionMatchIterator* QRegularExpression_GlobalMatch4(QRegularExpression* self, const char* subject, size_t subject_Strlen, int offset, uintptr_t matchType, int matchOptions) { QString subject_QString = QString::fromUtf8(subject, subject_Strlen); - QRegularExpressionMatchIterator ret = self->globalMatch(subject_QString, static_cast(offset), static_cast(matchType), static_cast(matchOptions)); + QRegularExpressionMatchIterator ret = const_cast(self)->globalMatch(subject_QString, static_cast(offset), static_cast(matchType), static_cast(matchOptions)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QRegularExpressionMatchIterator(ret)); } @@ -314,7 +314,7 @@ int QRegularExpressionMatch_CapturedEndWithName(QRegularExpressionMatch* self, c } void QRegularExpressionMatch_Captured1(QRegularExpressionMatch* self, int nth, char** _out, int* _out_Strlen) { - QString ret = self->captured(static_cast(nth)); + QString ret = const_cast(self)->captured(static_cast(nth)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -323,15 +323,15 @@ void QRegularExpressionMatch_Captured1(QRegularExpressionMatch* self, int nth, c } int QRegularExpressionMatch_CapturedStart1(QRegularExpressionMatch* self, int nth) { - return self->capturedStart(static_cast(nth)); + return const_cast(self)->capturedStart(static_cast(nth)); } int QRegularExpressionMatch_CapturedLength1(QRegularExpressionMatch* self, int nth) { - return self->capturedLength(static_cast(nth)); + return const_cast(self)->capturedLength(static_cast(nth)); } int QRegularExpressionMatch_CapturedEnd1(QRegularExpressionMatch* self, int nth) { - return self->capturedEnd(static_cast(nth)); + return const_cast(self)->capturedEnd(static_cast(nth)); } void QRegularExpressionMatch_Delete(QRegularExpressionMatch* self) { diff --git a/qt/gen_qscreen.cpp b/qt/gen_qscreen.cpp index f69c154d..be65cbb4 100644 --- a/qt/gen_qscreen.cpp +++ b/qt/gen_qscreen.cpp @@ -226,7 +226,7 @@ bool QScreen_IsLandscape(QScreen* self, uintptr_t orientation) { } QPixmap* QScreen_GrabWindow(QScreen* self, uintptr_t window) { - QPixmap ret = self->grabWindow(static_cast(window)); + QPixmap ret = self->grabWindow(static_cast(window)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QPixmap(ret)); } @@ -362,25 +362,25 @@ void QScreen_TrUtf83(const char* s, const char* c, int n, char** _out, int* _out } QPixmap* QScreen_GrabWindow2(QScreen* self, uintptr_t window, int x) { - QPixmap ret = self->grabWindow(static_cast(window), static_cast(x)); + QPixmap ret = self->grabWindow(static_cast(window), static_cast(x)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QPixmap(ret)); } QPixmap* QScreen_GrabWindow3(QScreen* self, uintptr_t window, int x, int y) { - QPixmap ret = self->grabWindow(static_cast(window), static_cast(x), static_cast(y)); + QPixmap ret = self->grabWindow(static_cast(window), static_cast(x), static_cast(y)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QPixmap(ret)); } QPixmap* QScreen_GrabWindow4(QScreen* self, uintptr_t window, int x, int y, int w) { - QPixmap ret = self->grabWindow(static_cast(window), static_cast(x), static_cast(y), static_cast(w)); + QPixmap ret = self->grabWindow(static_cast(window), static_cast(x), static_cast(y), static_cast(w)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QPixmap(ret)); } QPixmap* QScreen_GrabWindow5(QScreen* self, uintptr_t window, int x, int y, int w, int h) { - QPixmap ret = self->grabWindow(static_cast(window), static_cast(x), static_cast(y), static_cast(w), static_cast(h)); + QPixmap ret = self->grabWindow(static_cast(window), static_cast(x), static_cast(y), static_cast(w), static_cast(h)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QPixmap(ret)); } diff --git a/qt/gen_qsettings.cpp b/qt/gen_qsettings.cpp index d0f288d5..88e3da36 100644 --- a/qt/gen_qsettings.cpp +++ b/qt/gen_qsettings.cpp @@ -372,7 +372,7 @@ void QSettings_BeginWriteArray2(QSettings* self, const char* prefix, size_t pref QVariant* QSettings_Value2(QSettings* self, const char* key, size_t key_Strlen, QVariant* defaultValue) { QString key_QString = QString::fromUtf8(key, key_Strlen); - QVariant ret = self->value(key_QString, *defaultValue); + QVariant ret = const_cast(self)->value(key_QString, *defaultValue); // Copy-construct value returned type into heap-allocated copy return static_cast(new QVariant(ret)); } diff --git a/qt/gen_qsocketnotifier.cpp b/qt/gen_qsocketnotifier.cpp index 4deb5651..cc34dbde 100644 --- a/qt/gen_qsocketnotifier.cpp +++ b/qt/gen_qsocketnotifier.cpp @@ -13,12 +13,12 @@ extern "C" { extern void miqt_exec_callback(void* cb, int argc, void* argv); } -QSocketNotifier* QSocketNotifier_new(ptrdiff_t socket, uintptr_t param2) { - return new QSocketNotifier(static_cast(socket), static_cast(param2)); +QSocketNotifier* QSocketNotifier_new(uintptr_t socket, uintptr_t param2) { + return new QSocketNotifier(static_cast(socket), static_cast(param2)); } -QSocketNotifier* QSocketNotifier_new2(ptrdiff_t socket, uintptr_t param2, QObject* parent) { - return new QSocketNotifier(static_cast(socket), static_cast(param2), parent); +QSocketNotifier* QSocketNotifier_new2(uintptr_t socket, uintptr_t param2, QObject* parent) { + return new QSocketNotifier(static_cast(socket), static_cast(param2), parent); } QMetaObject* QSocketNotifier_MetaObject(QSocketNotifier* self) { diff --git a/qt/gen_qsocketnotifier.go b/qt/gen_qsocketnotifier.go index 89544a25..f2275751 100644 --- a/qt/gen_qsocketnotifier.go +++ b/qt/gen_qsocketnotifier.go @@ -45,14 +45,14 @@ func newQSocketNotifier_U(h unsafe.Pointer) *QSocketNotifier { } // NewQSocketNotifier constructs a new QSocketNotifier object. -func NewQSocketNotifier(socket uint64, param2 QSocketNotifier__Type) *QSocketNotifier { - ret := C.QSocketNotifier_new((C.ptrdiff_t)(socket), (C.uintptr_t)(param2)) +func NewQSocketNotifier(socket uintptr, param2 QSocketNotifier__Type) *QSocketNotifier { + ret := C.QSocketNotifier_new((C.uintptr_t)(socket), (C.uintptr_t)(param2)) return newQSocketNotifier(ret) } // NewQSocketNotifier2 constructs a new QSocketNotifier object. -func NewQSocketNotifier2(socket uint64, param2 QSocketNotifier__Type, parent *QObject) *QSocketNotifier { - ret := C.QSocketNotifier_new2((C.ptrdiff_t)(socket), (C.uintptr_t)(param2), parent.cPointer()) +func NewQSocketNotifier2(socket uintptr, param2 QSocketNotifier__Type, parent *QObject) *QSocketNotifier { + ret := C.QSocketNotifier_new2((C.uintptr_t)(socket), (C.uintptr_t)(param2), parent.cPointer()) return newQSocketNotifier(ret) } diff --git a/qt/gen_qsocketnotifier.h b/qt/gen_qsocketnotifier.h index f272aef2..7121289d 100644 --- a/qt/gen_qsocketnotifier.h +++ b/qt/gen_qsocketnotifier.h @@ -23,8 +23,8 @@ typedef struct QSocketDescriptor QSocketDescriptor; typedef struct QSocketNotifier QSocketNotifier; #endif -QSocketNotifier* QSocketNotifier_new(ptrdiff_t socket, uintptr_t param2); -QSocketNotifier* QSocketNotifier_new2(ptrdiff_t socket, uintptr_t param2, QObject* parent); +QSocketNotifier* QSocketNotifier_new(uintptr_t socket, uintptr_t param2); +QSocketNotifier* QSocketNotifier_new2(uintptr_t socket, uintptr_t param2, QObject* parent); QMetaObject* QSocketNotifier_MetaObject(QSocketNotifier* self); void QSocketNotifier_Tr(const char* s, char** _out, int* _out_Strlen); void QSocketNotifier_TrUtf8(const char* s, char** _out, int* _out_Strlen); diff --git a/qt/gen_qsortfilterproxymodel.cpp b/qt/gen_qsortfilterproxymodel.cpp index 9f945837..1f36fe78 100644 --- a/qt/gen_qsortfilterproxymodel.cpp +++ b/qt/gen_qsortfilterproxymodel.cpp @@ -437,25 +437,25 @@ void QSortFilterProxyModel_TrUtf83(const char* s, const char* c, int n, char** _ } QModelIndex* QSortFilterProxyModel_Index3(QSortFilterProxyModel* self, int row, int column, QModelIndex* parent) { - QModelIndex ret = self->index(static_cast(row), static_cast(column), *parent); + QModelIndex ret = const_cast(self)->index(static_cast(row), static_cast(column), *parent); // Copy-construct value returned type into heap-allocated copy return static_cast(new QModelIndex(ret)); } int QSortFilterProxyModel_RowCount1(QSortFilterProxyModel* self, QModelIndex* parent) { - return self->rowCount(*parent); + return const_cast(self)->rowCount(*parent); } int QSortFilterProxyModel_ColumnCount1(QSortFilterProxyModel* self, QModelIndex* parent) { - return self->columnCount(*parent); + return const_cast(self)->columnCount(*parent); } bool QSortFilterProxyModel_HasChildren1(QSortFilterProxyModel* self, QModelIndex* parent) { - return self->hasChildren(*parent); + return const_cast(self)->hasChildren(*parent); } QVariant* QSortFilterProxyModel_Data2(QSortFilterProxyModel* self, QModelIndex* index, int role) { - QVariant ret = self->data(*index, static_cast(role)); + QVariant ret = const_cast(self)->data(*index, static_cast(role)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QVariant(ret)); } @@ -465,7 +465,7 @@ bool QSortFilterProxyModel_SetData3(QSortFilterProxyModel* self, QModelIndex* in } QVariant* QSortFilterProxyModel_HeaderData3(QSortFilterProxyModel* self, int section, uintptr_t orientation, int role) { - QVariant ret = self->headerData(static_cast(section), static_cast(orientation), static_cast(role)); + QVariant ret = const_cast(self)->headerData(static_cast(section), static_cast(orientation), static_cast(role)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QVariant(ret)); } @@ -491,7 +491,7 @@ bool QSortFilterProxyModel_RemoveColumns3(QSortFilterProxyModel* self, int colum } void QSortFilterProxyModel_Match4(QSortFilterProxyModel* self, QModelIndex* start, int role, QVariant* value, int hits, QModelIndex*** _out, size_t* _out_len) { - QModelIndexList ret = self->match(*start, static_cast(role), *value, static_cast(hits)); + QModelIndexList ret = const_cast(self)->match(*start, static_cast(role), *value, static_cast(hits)); // Convert QList<> from C++ memory to manually-managed C memory of copy-constructed pointers QModelIndex** __out = static_cast(malloc(sizeof(QModelIndex**) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { @@ -502,7 +502,7 @@ void QSortFilterProxyModel_Match4(QSortFilterProxyModel* self, QModelIndex* star } void QSortFilterProxyModel_Match5(QSortFilterProxyModel* self, QModelIndex* start, int role, QVariant* value, int hits, int flags, QModelIndex*** _out, size_t* _out_len) { - QModelIndexList ret = self->match(*start, static_cast(role), *value, static_cast(hits), static_cast(flags)); + QModelIndexList ret = const_cast(self)->match(*start, static_cast(role), *value, static_cast(hits), static_cast(flags)); // Convert QList<> from C++ memory to manually-managed C memory of copy-constructed pointers QModelIndex** __out = static_cast(malloc(sizeof(QModelIndex**) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { diff --git a/qt/gen_qstandarditemmodel.cpp b/qt/gen_qstandarditemmodel.cpp index 7926bae8..6f258c45 100644 --- a/qt/gen_qstandarditemmodel.cpp +++ b/qt/gen_qstandarditemmodel.cpp @@ -482,7 +482,7 @@ bool QStandardItem_OperatorLesser(QStandardItem* self, QStandardItem* other) { } QVariant* QStandardItem_Data1(QStandardItem* self, int role) { - QVariant ret = self->data(static_cast(role)); + QVariant ret = const_cast(self)->data(static_cast(role)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QVariant(ret)); } @@ -492,7 +492,7 @@ void QStandardItem_SetData2(QStandardItem* self, QVariant* value, int role) { } QStandardItem* QStandardItem_Child2(QStandardItem* self, int row, int column) { - return self->child(static_cast(row), static_cast(column)); + return const_cast(self)->child(static_cast(row), static_cast(column)); } QStandardItem* QStandardItem_TakeChild2(QStandardItem* self, int row, int column) { @@ -892,25 +892,25 @@ void QStandardItemModel_TrUtf83(const char* s, const char* c, int n, char** _out } QModelIndex* QStandardItemModel_Index3(QStandardItemModel* self, int row, int column, QModelIndex* parent) { - QModelIndex ret = self->index(static_cast(row), static_cast(column), *parent); + QModelIndex ret = const_cast(self)->index(static_cast(row), static_cast(column), *parent); // Copy-construct value returned type into heap-allocated copy return static_cast(new QModelIndex(ret)); } int QStandardItemModel_RowCount1(QStandardItemModel* self, QModelIndex* parent) { - return self->rowCount(*parent); + return const_cast(self)->rowCount(*parent); } int QStandardItemModel_ColumnCount1(QStandardItemModel* self, QModelIndex* parent) { - return self->columnCount(*parent); + return const_cast(self)->columnCount(*parent); } bool QStandardItemModel_HasChildren1(QStandardItemModel* self, QModelIndex* parent) { - return self->hasChildren(*parent); + return const_cast(self)->hasChildren(*parent); } QVariant* QStandardItemModel_Data2(QStandardItemModel* self, QModelIndex* index, int role) { - QVariant ret = self->data(*index, static_cast(role)); + QVariant ret = const_cast(self)->data(*index, static_cast(role)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QVariant(ret)); } @@ -920,7 +920,7 @@ bool QStandardItemModel_SetData3(QStandardItemModel* self, QModelIndex* index, Q } QVariant* QStandardItemModel_HeaderData3(QStandardItemModel* self, int section, uintptr_t orientation, int role) { - QVariant ret = self->headerData(static_cast(section), static_cast(orientation), static_cast(role)); + QVariant ret = const_cast(self)->headerData(static_cast(section), static_cast(orientation), static_cast(role)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QVariant(ret)); } @@ -950,7 +950,7 @@ void QStandardItemModel_Sort2(QStandardItemModel* self, int column, uintptr_t or } QStandardItem* QStandardItemModel_Item2(QStandardItemModel* self, int row, int column) { - return self->item(static_cast(row), static_cast(column)); + return const_cast(self)->item(static_cast(row), static_cast(column)); } bool QStandardItemModel_InsertRow22(QStandardItemModel* self, int row, QModelIndex* parent) { @@ -967,7 +967,7 @@ QStandardItem* QStandardItemModel_TakeItem2(QStandardItemModel* self, int row, i void QStandardItemModel_FindItems2(QStandardItemModel* self, const char* text, size_t text_Strlen, int flags, QStandardItem*** _out, size_t* _out_len) { QString text_QString = QString::fromUtf8(text, text_Strlen); - QList ret = self->findItems(text_QString, static_cast(flags)); + QList ret = const_cast(self)->findItems(text_QString, static_cast(flags)); // Convert QList<> from C++ memory to manually-managed C memory QStandardItem** __out = static_cast(malloc(sizeof(QStandardItem*) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { @@ -979,7 +979,7 @@ void QStandardItemModel_FindItems2(QStandardItemModel* self, const char* text, s void QStandardItemModel_FindItems3(QStandardItemModel* self, const char* text, size_t text_Strlen, int flags, int column, QStandardItem*** _out, size_t* _out_len) { QString text_QString = QString::fromUtf8(text, text_Strlen); - QList ret = self->findItems(text_QString, static_cast(flags), static_cast(column)); + QList ret = const_cast(self)->findItems(text_QString, static_cast(flags), static_cast(column)); // Convert QList<> from C++ memory to manually-managed C memory QStandardItem** __out = static_cast(malloc(sizeof(QStandardItem*) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { diff --git a/qt/gen_qstringlistmodel.cpp b/qt/gen_qstringlistmodel.cpp index ef08a8a7..461985ac 100644 --- a/qt/gen_qstringlistmodel.cpp +++ b/qt/gen_qstringlistmodel.cpp @@ -172,11 +172,11 @@ void QStringListModel_TrUtf83(const char* s, const char* c, int n, char** _out, } int QStringListModel_RowCount1(QStringListModel* self, QModelIndex* parent) { - return self->rowCount(*parent); + return const_cast(self)->rowCount(*parent); } QVariant* QStringListModel_Data2(QStringListModel* self, QModelIndex* index, int role) { - QVariant ret = self->data(*index, static_cast(role)); + QVariant ret = const_cast(self)->data(*index, static_cast(role)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QVariant(ret)); } diff --git a/qt/gen_qstringmatcher.cpp b/qt/gen_qstringmatcher.cpp index e19be380..93819d7f 100644 --- a/qt/gen_qstringmatcher.cpp +++ b/qt/gen_qstringmatcher.cpp @@ -75,11 +75,11 @@ uintptr_t QStringMatcher_CaseSensitivity(QStringMatcher* self) { int QStringMatcher_IndexIn22(QStringMatcher* self, const char* str, size_t str_Strlen, int from) { QString str_QString = QString::fromUtf8(str, str_Strlen); - return self->indexIn(str_QString, static_cast(from)); + return const_cast(self)->indexIn(str_QString, static_cast(from)); } int QStringMatcher_IndexIn3(QStringMatcher* self, QChar* str, int length, int from) { - return self->indexIn(str, static_cast(length), static_cast(from)); + return const_cast(self)->indexIn(str, static_cast(length), static_cast(from)); } void QStringMatcher_Delete(QStringMatcher* self) { diff --git a/qt/gen_qstringview.cpp b/qt/gen_qstringview.cpp index 1dc06488..e9214762 100644 --- a/qt/gen_qstringview.cpp +++ b/qt/gen_qstringview.cpp @@ -208,99 +208,99 @@ QChar* QStringView_Last(QStringView* self) { } size_t QStringView_IndexOf2(QStringView* self, QChar* c, size_t from) { - return self->indexOf(*c, static_cast(from)); + return const_cast(self)->indexOf(*c, static_cast(from)); } size_t QStringView_IndexOf3(QStringView* self, QChar* c, size_t from, uintptr_t cs) { - return self->indexOf(*c, static_cast(from), static_cast(cs)); + return const_cast(self)->indexOf(*c, static_cast(from), static_cast(cs)); } bool QStringView_Contains2(QStringView* self, QChar* c, uintptr_t cs) { - return self->contains(*c, static_cast(cs)); + return const_cast(self)->contains(*c, static_cast(cs)); } size_t QStringView_Count2(QStringView* self, QChar* c, uintptr_t cs) { - return self->count(*c, static_cast(cs)); + return const_cast(self)->count(*c, static_cast(cs)); } size_t QStringView_LastIndexOf2(QStringView* self, QChar* c, size_t from) { - return self->lastIndexOf(*c, static_cast(from)); + return const_cast(self)->lastIndexOf(*c, static_cast(from)); } size_t QStringView_LastIndexOf3(QStringView* self, QChar* c, size_t from, uintptr_t cs) { - return self->lastIndexOf(*c, static_cast(from), static_cast(cs)); + return const_cast(self)->lastIndexOf(*c, static_cast(from), static_cast(cs)); } int16_t QStringView_ToShort1(QStringView* self, bool* ok) { - return self->toShort(ok); + return const_cast(self)->toShort(ok); } int16_t QStringView_ToShort2(QStringView* self, bool* ok, int base) { - return self->toShort(ok, static_cast(base)); + return const_cast(self)->toShort(ok, static_cast(base)); } uint16_t QStringView_ToUShort1(QStringView* self, bool* ok) { - return self->toUShort(ok); + return const_cast(self)->toUShort(ok); } uint16_t QStringView_ToUShort2(QStringView* self, bool* ok, int base) { - return self->toUShort(ok, static_cast(base)); + return const_cast(self)->toUShort(ok, static_cast(base)); } int QStringView_ToInt1(QStringView* self, bool* ok) { - return self->toInt(ok); + return const_cast(self)->toInt(ok); } int QStringView_ToInt2(QStringView* self, bool* ok, int base) { - return self->toInt(ok, static_cast(base)); + return const_cast(self)->toInt(ok, static_cast(base)); } unsigned int QStringView_ToUInt1(QStringView* self, bool* ok) { - return self->toUInt(ok); + return const_cast(self)->toUInt(ok); } unsigned int QStringView_ToUInt2(QStringView* self, bool* ok, int base) { - return self->toUInt(ok, static_cast(base)); + return const_cast(self)->toUInt(ok, static_cast(base)); } long QStringView_ToLong1(QStringView* self, bool* ok) { - return self->toLong(ok); + return const_cast(self)->toLong(ok); } long QStringView_ToLong2(QStringView* self, bool* ok, int base) { - return self->toLong(ok, static_cast(base)); + return const_cast(self)->toLong(ok, static_cast(base)); } unsigned long QStringView_ToULong1(QStringView* self, bool* ok) { - return self->toULong(ok); + return const_cast(self)->toULong(ok); } unsigned long QStringView_ToULong2(QStringView* self, bool* ok, int base) { - return self->toULong(ok, static_cast(base)); + return const_cast(self)->toULong(ok, static_cast(base)); } int64_t QStringView_ToLongLong1(QStringView* self, bool* ok) { - return self->toLongLong(ok); + return const_cast(self)->toLongLong(ok); } int64_t QStringView_ToLongLong2(QStringView* self, bool* ok, int base) { - return self->toLongLong(ok, static_cast(base)); + return const_cast(self)->toLongLong(ok, static_cast(base)); } uint64_t QStringView_ToULongLong1(QStringView* self, bool* ok) { - return self->toULongLong(ok); + return const_cast(self)->toULongLong(ok); } uint64_t QStringView_ToULongLong2(QStringView* self, bool* ok, int base) { - return self->toULongLong(ok, static_cast(base)); + return const_cast(self)->toULongLong(ok, static_cast(base)); } float QStringView_ToFloat1(QStringView* self, bool* ok) { - return self->toFloat(ok); + return const_cast(self)->toFloat(ok); } double QStringView_ToDouble1(QStringView* self, bool* ok) { - return self->toDouble(ok); + return const_cast(self)->toDouble(ok); } void QStringView_Delete(QStringView* self) { diff --git a/qt/gen_qstyle.cpp b/qt/gen_qstyle.cpp index dc5cfcff..265e4d99 100644 --- a/qt/gen_qstyle.cpp +++ b/qt/gen_qstyle.cpp @@ -236,84 +236,84 @@ void QStyle_TrUtf83(const char* s, const char* c, int n, char** _out, int* _out_ void QStyle_DrawItemText7(QStyle* self, QPainter* painter, QRect* rect, int flags, QPalette* pal, bool enabled, const char* text, size_t text_Strlen, uintptr_t textRole) { QString text_QString = QString::fromUtf8(text, text_Strlen); - self->drawItemText(painter, *rect, static_cast(flags), *pal, enabled, text_QString, static_cast(textRole)); + const_cast(self)->drawItemText(painter, *rect, static_cast(flags), *pal, enabled, text_QString, static_cast(textRole)); } void QStyle_DrawPrimitive4(QStyle* self, uintptr_t pe, QStyleOption* opt, QPainter* p, QWidget* w) { - self->drawPrimitive(static_cast(pe), opt, p, w); + const_cast(self)->drawPrimitive(static_cast(pe), opt, p, w); } void QStyle_DrawControl4(QStyle* self, uintptr_t element, QStyleOption* opt, QPainter* p, QWidget* w) { - self->drawControl(static_cast(element), opt, p, w); + const_cast(self)->drawControl(static_cast(element), opt, p, w); } QRect* QStyle_SubElementRect3(QStyle* self, uintptr_t subElement, QStyleOption* option, QWidget* widget) { - QRect ret = self->subElementRect(static_cast(subElement), option, widget); + QRect ret = const_cast(self)->subElementRect(static_cast(subElement), option, widget); // Copy-construct value returned type into heap-allocated copy return static_cast(new QRect(ret)); } void QStyle_DrawComplexControl4(QStyle* self, uintptr_t cc, QStyleOptionComplex* opt, QPainter* p, QWidget* widget) { - self->drawComplexControl(static_cast(cc), opt, p, widget); + const_cast(self)->drawComplexControl(static_cast(cc), opt, p, widget); } uintptr_t QStyle_HitTestComplexControl4(QStyle* self, uintptr_t cc, QStyleOptionComplex* opt, QPoint* pt, QWidget* widget) { - QStyle::SubControl ret = self->hitTestComplexControl(static_cast(cc), opt, *pt, widget); + QStyle::SubControl ret = const_cast(self)->hitTestComplexControl(static_cast(cc), opt, *pt, widget); return static_cast(ret); } QRect* QStyle_SubControlRect4(QStyle* self, uintptr_t cc, QStyleOptionComplex* opt, uintptr_t sc, QWidget* widget) { - QRect ret = self->subControlRect(static_cast(cc), opt, static_cast(sc), widget); + QRect ret = const_cast(self)->subControlRect(static_cast(cc), opt, static_cast(sc), widget); // Copy-construct value returned type into heap-allocated copy return static_cast(new QRect(ret)); } int QStyle_PixelMetric2(QStyle* self, uintptr_t metric, QStyleOption* option) { - return self->pixelMetric(static_cast(metric), option); + return const_cast(self)->pixelMetric(static_cast(metric), option); } int QStyle_PixelMetric3(QStyle* self, uintptr_t metric, QStyleOption* option, QWidget* widget) { - return self->pixelMetric(static_cast(metric), option, widget); + return const_cast(self)->pixelMetric(static_cast(metric), option, widget); } QSize* QStyle_SizeFromContents4(QStyle* self, uintptr_t ct, QStyleOption* opt, QSize* contentsSize, QWidget* w) { - QSize ret = self->sizeFromContents(static_cast(ct), opt, *contentsSize, w); + QSize ret = const_cast(self)->sizeFromContents(static_cast(ct), opt, *contentsSize, w); // Copy-construct value returned type into heap-allocated copy return static_cast(new QSize(ret)); } int QStyle_StyleHint2(QStyle* self, uintptr_t stylehint, QStyleOption* opt) { - return self->styleHint(static_cast(stylehint), opt); + return const_cast(self)->styleHint(static_cast(stylehint), opt); } int QStyle_StyleHint3(QStyle* self, uintptr_t stylehint, QStyleOption* opt, QWidget* widget) { - return self->styleHint(static_cast(stylehint), opt, widget); + return const_cast(self)->styleHint(static_cast(stylehint), opt, widget); } int QStyle_StyleHint4(QStyle* self, uintptr_t stylehint, QStyleOption* opt, QWidget* widget, QStyleHintReturn* returnData) { - return self->styleHint(static_cast(stylehint), opt, widget, returnData); + return const_cast(self)->styleHint(static_cast(stylehint), opt, widget, returnData); } QPixmap* QStyle_StandardPixmap2(QStyle* self, uintptr_t standardPixmap, QStyleOption* opt) { - QPixmap ret = self->standardPixmap(static_cast(standardPixmap), opt); + QPixmap ret = const_cast(self)->standardPixmap(static_cast(standardPixmap), opt); // Copy-construct value returned type into heap-allocated copy return static_cast(new QPixmap(ret)); } QPixmap* QStyle_StandardPixmap3(QStyle* self, uintptr_t standardPixmap, QStyleOption* opt, QWidget* widget) { - QPixmap ret = self->standardPixmap(static_cast(standardPixmap), opt, widget); + QPixmap ret = const_cast(self)->standardPixmap(static_cast(standardPixmap), opt, widget); // Copy-construct value returned type into heap-allocated copy return static_cast(new QPixmap(ret)); } QIcon* QStyle_StandardIcon2(QStyle* self, uintptr_t standardIcon, QStyleOption* option) { - QIcon ret = self->standardIcon(static_cast(standardIcon), option); + QIcon ret = const_cast(self)->standardIcon(static_cast(standardIcon), option); // Copy-construct value returned type into heap-allocated copy return static_cast(new QIcon(ret)); } QIcon* QStyle_StandardIcon3(QStyle* self, uintptr_t standardIcon, QStyleOption* option, QWidget* widget) { - QIcon ret = self->standardIcon(static_cast(standardIcon), option, widget); + QIcon ret = const_cast(self)->standardIcon(static_cast(standardIcon), option, widget); // Copy-construct value returned type into heap-allocated copy return static_cast(new QIcon(ret)); } @@ -327,19 +327,19 @@ int QStyle_SliderValueFromPosition5(int min, int max, int pos, int space, bool u } int QStyle_LayoutSpacing4(QStyle* self, uintptr_t control1, uintptr_t control2, uintptr_t orientation, QStyleOption* option) { - return self->layoutSpacing(static_cast(control1), static_cast(control2), static_cast(orientation), option); + return const_cast(self)->layoutSpacing(static_cast(control1), static_cast(control2), static_cast(orientation), option); } int QStyle_LayoutSpacing5(QStyle* self, uintptr_t control1, uintptr_t control2, uintptr_t orientation, QStyleOption* option, QWidget* widget) { - return self->layoutSpacing(static_cast(control1), static_cast(control2), static_cast(orientation), option, widget); + return const_cast(self)->layoutSpacing(static_cast(control1), static_cast(control2), static_cast(orientation), option, widget); } int QStyle_CombinedLayoutSpacing4(QStyle* self, int controls1, int controls2, uintptr_t orientation, QStyleOption* option) { - return self->combinedLayoutSpacing(static_cast(controls1), static_cast(controls2), static_cast(orientation), option); + return const_cast(self)->combinedLayoutSpacing(static_cast(controls1), static_cast(controls2), static_cast(orientation), option); } int QStyle_CombinedLayoutSpacing5(QStyle* self, int controls1, int controls2, uintptr_t orientation, QStyleOption* option, QWidget* widget) { - return self->combinedLayoutSpacing(static_cast(controls1), static_cast(controls2), static_cast(orientation), option, widget); + return const_cast(self)->combinedLayoutSpacing(static_cast(controls1), static_cast(controls2), static_cast(orientation), option, widget); } void QStyle_Delete(QStyle* self) { diff --git a/qt/gen_qtabwidget.cpp b/qt/gen_qtabwidget.cpp index ef675fa6..afa4ad89 100644 --- a/qt/gen_qtabwidget.cpp +++ b/qt/gen_qtabwidget.cpp @@ -359,7 +359,7 @@ void QTabWidget_SetCornerWidget2(QTabWidget* self, QWidget* w, uintptr_t corner) } QWidget* QTabWidget_CornerWidget1(QTabWidget* self, uintptr_t corner) { - return self->cornerWidget(static_cast(corner)); + return const_cast(self)->cornerWidget(static_cast(corner)); } void QTabWidget_Delete(QTabWidget* self) { diff --git a/qt/gen_qtextcodec.cpp b/qt/gen_qtextcodec.cpp index 74472906..2dc8c0f2 100644 --- a/qt/gen_qtextcodec.cpp +++ b/qt/gen_qtextcodec.cpp @@ -153,7 +153,7 @@ int QTextCodec_MibEnum(QTextCodec* self) { } void QTextCodec_ToUnicode3(QTextCodec* self, const char* in, int length, QTextCodec__ConverterState* state, char** _out, int* _out_Strlen) { - QString ret = self->toUnicode(in, static_cast(length), state); + QString ret = const_cast(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(); *_out = static_cast(malloc(b.length())); @@ -162,17 +162,17 @@ void QTextCodec_ToUnicode3(QTextCodec* self, const char* in, int length, QTextCo } QByteArray* QTextCodec_FromUnicode3(QTextCodec* self, QChar* in, int length, QTextCodec__ConverterState* state) { - QByteArray ret = self->fromUnicode(in, static_cast(length), state); + QByteArray ret = const_cast(self)->fromUnicode(in, static_cast(length), state); // Copy-construct value returned type into heap-allocated copy return static_cast(new QByteArray(ret)); } QTextDecoder* QTextCodec_MakeDecoder1(QTextCodec* self, int flags) { - return self->makeDecoder(static_cast(flags)); + return const_cast(self)->makeDecoder(static_cast(flags)); } QTextEncoder* QTextCodec_MakeEncoder1(QTextCodec* self, int flags) { - return self->makeEncoder(static_cast(flags)); + return const_cast(self)->makeEncoder(static_cast(flags)); } QTextEncoder* QTextEncoder_new(QTextCodec* codec) { diff --git a/qt/gen_qtextdocument.cpp b/qt/gen_qtextdocument.cpp index d93abb76..4d8b7feb 100644 --- a/qt/gen_qtextdocument.cpp +++ b/qt/gen_qtextdocument.cpp @@ -630,11 +630,11 @@ void QTextDocument_TrUtf83(const char* s, const char* c, int n, char** _out, int } QTextDocument* QTextDocument_Clone1(QTextDocument* self, QObject* parent) { - return self->clone(parent); + return const_cast(self)->clone(parent); } void QTextDocument_ToHtml1(QTextDocument* self, QByteArray* encoding, char** _out, int* _out_Strlen) { - QString ret = self->toHtml(*encoding); + QString ret = const_cast(self)->toHtml(*encoding); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -643,7 +643,7 @@ void QTextDocument_ToHtml1(QTextDocument* self, QByteArray* encoding, char** _ou } void QTextDocument_ToMarkdown1(QTextDocument* self, int features, char** _out, int* _out_Strlen) { - QString ret = self->toMarkdown(static_cast(features)); + QString ret = const_cast(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(); *_out = static_cast(malloc(b.length())); @@ -658,57 +658,57 @@ void QTextDocument_SetMarkdown2(QTextDocument* self, const char* markdown, size_ QTextCursor* QTextDocument_Find22(QTextDocument* self, const char* subString, size_t subString_Strlen, int from) { QString subString_QString = QString::fromUtf8(subString, subString_Strlen); - QTextCursor ret = self->find(subString_QString, static_cast(from)); + QTextCursor ret = const_cast(self)->find(subString_QString, static_cast(from)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QTextCursor(ret)); } QTextCursor* QTextDocument_Find32(QTextDocument* self, const char* subString, size_t subString_Strlen, int from, int options) { QString subString_QString = QString::fromUtf8(subString, subString_Strlen); - QTextCursor ret = self->find(subString_QString, static_cast(from), static_cast(options)); + QTextCursor ret = const_cast(self)->find(subString_QString, static_cast(from), static_cast(options)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QTextCursor(ret)); } QTextCursor* QTextDocument_Find33(QTextDocument* self, const char* subString, size_t subString_Strlen, QTextCursor* cursor, int options) { QString subString_QString = QString::fromUtf8(subString, subString_Strlen); - QTextCursor ret = self->find(subString_QString, *cursor, static_cast(options)); + QTextCursor ret = const_cast(self)->find(subString_QString, *cursor, static_cast(options)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QTextCursor(ret)); } QTextCursor* QTextDocument_Find23(QTextDocument* self, QRegExp* expr, int from) { - QTextCursor ret = self->find(*expr, static_cast(from)); + QTextCursor ret = const_cast(self)->find(*expr, static_cast(from)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QTextCursor(ret)); } QTextCursor* QTextDocument_Find34(QTextDocument* self, QRegExp* expr, int from, int options) { - QTextCursor ret = self->find(*expr, static_cast(from), static_cast(options)); + QTextCursor ret = const_cast(self)->find(*expr, static_cast(from), static_cast(options)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QTextCursor(ret)); } QTextCursor* QTextDocument_Find35(QTextDocument* self, QRegExp* expr, QTextCursor* cursor, int options) { - QTextCursor ret = self->find(*expr, *cursor, static_cast(options)); + QTextCursor ret = const_cast(self)->find(*expr, *cursor, static_cast(options)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QTextCursor(ret)); } QTextCursor* QTextDocument_Find24(QTextDocument* self, QRegularExpression* expr, int from) { - QTextCursor ret = self->find(*expr, static_cast(from)); + QTextCursor ret = const_cast(self)->find(*expr, static_cast(from)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QTextCursor(ret)); } QTextCursor* QTextDocument_Find36(QTextDocument* self, QRegularExpression* expr, int from, int options) { - QTextCursor ret = self->find(*expr, static_cast(from), static_cast(options)); + QTextCursor ret = const_cast(self)->find(*expr, static_cast(from), static_cast(options)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QTextCursor(ret)); } QTextCursor* QTextDocument_Find37(QTextDocument* self, QRegularExpression* expr, QTextCursor* cursor, int options) { - QTextCursor ret = self->find(*expr, *cursor, static_cast(options)); + QTextCursor ret = const_cast(self)->find(*expr, *cursor, static_cast(options)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QTextCursor(ret)); } diff --git a/qt/gen_qtextdocumentfragment.cpp b/qt/gen_qtextdocumentfragment.cpp index 6d8eb18c..19d3577d 100644 --- a/qt/gen_qtextdocumentfragment.cpp +++ b/qt/gen_qtextdocumentfragment.cpp @@ -77,7 +77,7 @@ QTextDocumentFragment* QTextDocumentFragment_FromHtml2(const char* html, size_t } void QTextDocumentFragment_ToHtml1(QTextDocumentFragment* self, QByteArray* encoding, char** _out, int* _out_Strlen) { - QString ret = self->toHtml(*encoding); + QString ret = const_cast(self)->toHtml(*encoding); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); diff --git a/qt/gen_qtextedit.cpp b/qt/gen_qtextedit.cpp index b4d011f3..449c0d46 100644 --- a/qt/gen_qtextedit.cpp +++ b/qt/gen_qtextedit.cpp @@ -645,7 +645,7 @@ bool QTextEdit_Find24(QTextEdit* self, QRegularExpression* exp, int options) { } void QTextEdit_ToMarkdown1(QTextEdit* self, int features, char** _out, int* _out_Strlen) { - QString ret = self->toMarkdown(static_cast(features)); + QString ret = const_cast(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(); *_out = static_cast(malloc(b.length())); diff --git a/qt/gen_qtextlayout.cpp b/qt/gen_qtextlayout.cpp index ce1f7417..3554d95b 100644 --- a/qt/gen_qtextlayout.cpp +++ b/qt/gen_qtextlayout.cpp @@ -339,11 +339,11 @@ void QTextLayout_SetFlags(QTextLayout* self, int flags) { } int QTextLayout_NextCursorPosition2(QTextLayout* self, int oldPos, uintptr_t mode) { - return self->nextCursorPosition(static_cast(oldPos), static_cast(mode)); + return const_cast(self)->nextCursorPosition(static_cast(oldPos), static_cast(mode)); } int QTextLayout_PreviousCursorPosition2(QTextLayout* self, int oldPos, uintptr_t mode) { - return self->previousCursorPosition(static_cast(oldPos), static_cast(mode)); + return const_cast(self)->previousCursorPosition(static_cast(oldPos), static_cast(mode)); } void QTextLayout_Draw3(QTextLayout* self, QPainter* p, QPointF* pos, QTextLayout__FormatRange** selections, size_t selections_len) { @@ -352,7 +352,7 @@ void QTextLayout_Draw3(QTextLayout* self, QPainter* p, QPointF* pos, QTextLayout for(size_t i = 0; i < selections_len; ++i) { selections_QList.push_back(*(selections[i])); } - self->draw(p, *pos, selections_QList); + const_cast(self)->draw(p, *pos, selections_QList); } void QTextLayout_Draw4(QTextLayout* self, QPainter* p, QPointF* pos, QTextLayout__FormatRange** selections, size_t selections_len, QRectF* clip) { @@ -361,11 +361,11 @@ void QTextLayout_Draw4(QTextLayout* self, QPainter* p, QPointF* pos, QTextLayout for(size_t i = 0; i < selections_len; ++i) { selections_QList.push_back(*(selections[i])); } - self->draw(p, *pos, selections_QList, *clip); + const_cast(self)->draw(p, *pos, selections_QList, *clip); } void QTextLayout_GlyphRuns1(QTextLayout* self, int from, QGlyphRun*** _out, size_t* _out_len) { - QList ret = self->glyphRuns(static_cast(from)); + QList ret = const_cast(self)->glyphRuns(static_cast(from)); // Convert QList<> from C++ memory to manually-managed C memory of copy-constructed pointers QGlyphRun** __out = static_cast(malloc(sizeof(QGlyphRun**) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { @@ -376,7 +376,7 @@ void QTextLayout_GlyphRuns1(QTextLayout* self, int from, QGlyphRun*** _out, size } void QTextLayout_GlyphRuns2(QTextLayout* self, int from, int length, QGlyphRun*** _out, size_t* _out_len) { - QList ret = self->glyphRuns(static_cast(from), static_cast(length)); + QList ret = const_cast(self)->glyphRuns(static_cast(from), static_cast(length)); // Convert QList<> from C++ memory to manually-managed C memory of copy-constructed pointers QGlyphRun** __out = static_cast(malloc(sizeof(QGlyphRun**) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { @@ -516,23 +516,23 @@ void QTextLine_GlyphRuns(QTextLine* self, QGlyphRun*** _out, size_t* _out_len) { } double QTextLine_CursorToX2(QTextLine* self, int* cursorPos, uintptr_t edge) { - return self->cursorToX(static_cast(cursorPos), static_cast(edge)); + return const_cast(self)->cursorToX(static_cast(cursorPos), static_cast(edge)); } double QTextLine_CursorToX22(QTextLine* self, int cursorPos, uintptr_t edge) { - return self->cursorToX(static_cast(cursorPos), static_cast(edge)); + return const_cast(self)->cursorToX(static_cast(cursorPos), static_cast(edge)); } int QTextLine_XToCursor2(QTextLine* self, double x, uintptr_t param2) { - return self->xToCursor(static_cast(x), static_cast(param2)); + return const_cast(self)->xToCursor(static_cast(x), static_cast(param2)); } void QTextLine_Draw3(QTextLine* self, QPainter* p, QPointF* point, QTextLayout__FormatRange* selection) { - self->draw(p, *point, selection); + const_cast(self)->draw(p, *point, selection); } void QTextLine_GlyphRuns1(QTextLine* self, int from, QGlyphRun*** _out, size_t* _out_len) { - QList ret = self->glyphRuns(static_cast(from)); + QList ret = const_cast(self)->glyphRuns(static_cast(from)); // Convert QList<> from C++ memory to manually-managed C memory of copy-constructed pointers QGlyphRun** __out = static_cast(malloc(sizeof(QGlyphRun**) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { @@ -543,7 +543,7 @@ void QTextLine_GlyphRuns1(QTextLine* self, int from, QGlyphRun*** _out, size_t* } void QTextLine_GlyphRuns2(QTextLine* self, int from, int length, QGlyphRun*** _out, size_t* _out_len) { - QList ret = self->glyphRuns(static_cast(from), static_cast(length)); + QList ret = const_cast(self)->glyphRuns(static_cast(from), static_cast(length)); // Convert QList<> from C++ memory to manually-managed C memory of copy-constructed pointers QGlyphRun** __out = static_cast(malloc(sizeof(QGlyphRun**) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { diff --git a/qt/gen_qtextobject.cpp b/qt/gen_qtextobject.cpp index d43cdd56..da161d3f 100644 --- a/qt/gen_qtextobject.cpp +++ b/qt/gen_qtextobject.cpp @@ -563,7 +563,7 @@ void QTextFragment_GlyphRuns(QTextFragment* self, QGlyphRun*** _out, size_t* _ou } void QTextFragment_GlyphRuns1(QTextFragment* self, int from, QGlyphRun*** _out, size_t* _out_len) { - QList ret = self->glyphRuns(static_cast(from)); + QList ret = const_cast(self)->glyphRuns(static_cast(from)); // Convert QList<> from C++ memory to manually-managed C memory of copy-constructed pointers QGlyphRun** __out = static_cast(malloc(sizeof(QGlyphRun**) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { @@ -574,7 +574,7 @@ void QTextFragment_GlyphRuns1(QTextFragment* self, int from, QGlyphRun*** _out, } void QTextFragment_GlyphRuns2(QTextFragment* self, int from, int length, QGlyphRun*** _out, size_t* _out_len) { - QList ret = self->glyphRuns(static_cast(from), static_cast(length)); + QList ret = const_cast(self)->glyphRuns(static_cast(from), static_cast(length)); // Convert QList<> from C++ memory to manually-managed C memory of copy-constructed pointers QGlyphRun** __out = static_cast(malloc(sizeof(QGlyphRun**) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { diff --git a/qt/gen_qtimezone.cpp b/qt/gen_qtimezone.cpp index 5a817f94..e0b126b5 100644 --- a/qt/gen_qtimezone.cpp +++ b/qt/gen_qtimezone.cpp @@ -266,7 +266,7 @@ void QTimeZone_WindowsIdToIanaIds2(QByteArray* windowsId, uintptr_t country, QBy } void QTimeZone_DisplayName2(QTimeZone* self, QDateTime* atDateTime, uintptr_t nameType, char** _out, int* _out_Strlen) { - QString ret = self->displayName(*atDateTime, static_cast(nameType)); + QString ret = const_cast(self)->displayName(*atDateTime, static_cast(nameType)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -275,7 +275,7 @@ void QTimeZone_DisplayName2(QTimeZone* self, QDateTime* atDateTime, uintptr_t na } void QTimeZone_DisplayName3(QTimeZone* self, QDateTime* atDateTime, uintptr_t nameType, QLocale* locale, char** _out, int* _out_Strlen) { - QString ret = self->displayName(*atDateTime, static_cast(nameType), *locale); + QString ret = const_cast(self)->displayName(*atDateTime, static_cast(nameType), *locale); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -284,7 +284,7 @@ void QTimeZone_DisplayName3(QTimeZone* self, QDateTime* atDateTime, uintptr_t na } void QTimeZone_DisplayName22(QTimeZone* self, uintptr_t timeType, uintptr_t nameType, char** _out, int* _out_Strlen) { - QString ret = self->displayName(static_cast(timeType), static_cast(nameType)); + QString ret = const_cast(self)->displayName(static_cast(timeType), static_cast(nameType)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -293,7 +293,7 @@ void QTimeZone_DisplayName22(QTimeZone* self, uintptr_t timeType, uintptr_t name } void QTimeZone_DisplayName32(QTimeZone* self, uintptr_t timeType, uintptr_t nameType, QLocale* locale, char** _out, int* _out_Strlen) { - QString ret = self->displayName(static_cast(timeType), static_cast(nameType), *locale); + QString ret = const_cast(self)->displayName(static_cast(timeType), static_cast(nameType), *locale); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); diff --git a/qt/gen_qtransform.cpp b/qt/gen_qtransform.cpp index 58c49f62..0a4ee0e8 100644 --- a/qt/gen_qtransform.cpp +++ b/qt/gen_qtransform.cpp @@ -304,7 +304,7 @@ QTransform* QTransform_FromScale(double dx, double dy) { } QTransform* QTransform_Inverted1(QTransform* self, bool* invertible) { - QTransform ret = self->inverted(invertible); + QTransform ret = const_cast(self)->inverted(invertible); // Copy-construct value returned type into heap-allocated copy return static_cast(new QTransform(ret)); } diff --git a/qt/gen_qtranslator.cpp b/qt/gen_qtranslator.cpp index ad1bec5f..eb6994ce 100644 --- a/qt/gen_qtranslator.cpp +++ b/qt/gen_qtranslator.cpp @@ -125,7 +125,7 @@ void QTranslator_TrUtf83(const char* s, const char* c, int n, char** _out, int* } void QTranslator_Translate3(QTranslator* self, const char* context, const char* sourceText, const char* disambiguation, char** _out, int* _out_Strlen) { - QString ret = self->translate(context, sourceText, disambiguation); + QString ret = const_cast(self)->translate(context, sourceText, disambiguation); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -134,7 +134,7 @@ void QTranslator_Translate3(QTranslator* self, const char* context, const char* } void QTranslator_Translate4(QTranslator* self, const char* context, const char* sourceText, const char* disambiguation, int n, char** _out, int* _out_Strlen) { - QString ret = self->translate(context, sourceText, disambiguation, static_cast(n)); + QString ret = const_cast(self)->translate(context, 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(); *_out = static_cast(malloc(b.length())); diff --git a/qt/gen_qtransposeproxymodel.cpp b/qt/gen_qtransposeproxymodel.cpp index a19e2d22..ce039278 100644 --- a/qt/gen_qtransposeproxymodel.cpp +++ b/qt/gen_qtransposeproxymodel.cpp @@ -163,15 +163,15 @@ void QTransposeProxyModel_TrUtf83(const char* s, const char* c, int n, char** _o } int QTransposeProxyModel_RowCount1(QTransposeProxyModel* self, QModelIndex* parent) { - return self->rowCount(*parent); + return const_cast(self)->rowCount(*parent); } int QTransposeProxyModel_ColumnCount1(QTransposeProxyModel* self, QModelIndex* parent) { - return self->columnCount(*parent); + return const_cast(self)->columnCount(*parent); } QVariant* QTransposeProxyModel_HeaderData3(QTransposeProxyModel* self, int section, uintptr_t orientation, int role) { - QVariant ret = self->headerData(static_cast(section), static_cast(orientation), static_cast(role)); + QVariant ret = const_cast(self)->headerData(static_cast(section), static_cast(orientation), static_cast(role)); // Copy-construct value returned type into heap-allocated copy return static_cast(new QVariant(ret)); } @@ -181,7 +181,7 @@ bool QTransposeProxyModel_SetHeaderData4(QTransposeProxyModel* self, int section } QModelIndex* QTransposeProxyModel_Index3(QTransposeProxyModel* self, int row, int column, QModelIndex* parent) { - QModelIndex ret = self->index(static_cast(row), static_cast(column), *parent); + QModelIndex ret = const_cast(self)->index(static_cast(row), static_cast(column), *parent); // Copy-construct value returned type into heap-allocated copy return static_cast(new QModelIndex(ret)); } diff --git a/qt/gen_qtreewidget.cpp b/qt/gen_qtreewidget.cpp index d18ecafa..83067df3 100644 --- a/qt/gen_qtreewidget.cpp +++ b/qt/gen_qtreewidget.cpp @@ -842,12 +842,12 @@ void QTreeWidget_ClosePersistentEditor2(QTreeWidget* self, QTreeWidgetItem* item } bool QTreeWidget_IsPersistentEditorOpen2(QTreeWidget* self, QTreeWidgetItem* item, int column) { - return self->isPersistentEditorOpen(item, static_cast(column)); + return const_cast(self)->isPersistentEditorOpen(item, static_cast(column)); } void QTreeWidget_FindItems3(QTreeWidget* self, const char* text, size_t text_Strlen, int flags, int column, QTreeWidgetItem*** _out, size_t* _out_len) { QString text_QString = QString::fromUtf8(text, text_Strlen); - QList ret = self->findItems(text_QString, static_cast(flags), static_cast(column)); + QList ret = const_cast(self)->findItems(text_QString, static_cast(flags), static_cast(column)); // Convert QList<> from C++ memory to manually-managed C memory QTreeWidgetItem** __out = static_cast(malloc(sizeof(QTreeWidgetItem*) * ret.length())); for (size_t i = 0, e = ret.length(); i < e; ++i) { diff --git a/qt/gen_qundogroup.cpp b/qt/gen_qundogroup.cpp index db4e5933..43414f37 100644 --- a/qt/gen_qundogroup.cpp +++ b/qt/gen_qundogroup.cpp @@ -228,12 +228,12 @@ void QUndoGroup_TrUtf83(const char* s, const char* c, int n, char** _out, int* _ QAction* QUndoGroup_CreateUndoAction2(QUndoGroup* self, QObject* parent, const char* prefix, size_t prefix_Strlen) { QString prefix_QString = QString::fromUtf8(prefix, prefix_Strlen); - return self->createUndoAction(parent, prefix_QString); + return const_cast(self)->createUndoAction(parent, prefix_QString); } QAction* QUndoGroup_CreateRedoAction2(QUndoGroup* self, QObject* parent, const char* prefix, size_t prefix_Strlen) { QString prefix_QString = QString::fromUtf8(prefix, prefix_Strlen); - return self->createRedoAction(parent, prefix_QString); + return const_cast(self)->createRedoAction(parent, prefix_QString); } void QUndoGroup_Delete(QUndoGroup* self) { diff --git a/qt/gen_qundostack.cpp b/qt/gen_qundostack.cpp index ba12144e..2a8e8f99 100644 --- a/qt/gen_qundostack.cpp +++ b/qt/gen_qundostack.cpp @@ -337,12 +337,12 @@ void QUndoStack_TrUtf83(const char* s, const char* c, int n, char** _out, int* _ QAction* QUndoStack_CreateUndoAction2(QUndoStack* self, QObject* parent, const char* prefix, size_t prefix_Strlen) { QString prefix_QString = QString::fromUtf8(prefix, prefix_Strlen); - return self->createUndoAction(parent, prefix_QString); + return const_cast(self)->createUndoAction(parent, prefix_QString); } QAction* QUndoStack_CreateRedoAction2(QUndoStack* self, QObject* parent, const char* prefix, size_t prefix_Strlen) { QString prefix_QString = QString::fromUtf8(prefix, prefix_Strlen); - return self->createRedoAction(parent, prefix_QString); + return const_cast(self)->createRedoAction(parent, prefix_QString); } void QUndoStack_SetActive1(QUndoStack* self, bool active) { diff --git a/qt/gen_qurl.cpp b/qt/gen_qurl.cpp index 2fa5c2aa..c115ad23 100644 --- a/qt/gen_qurl.cpp +++ b/qt/gen_qurl.cpp @@ -463,7 +463,7 @@ void QUrl_SetAuthority2(QUrl* self, const char* authority, size_t authority_Strl } void QUrl_Authority1(QUrl* self, int options, char** _out, int* _out_Strlen) { - QString ret = self->authority(static_cast(options)); + QString ret = const_cast(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(); *_out = static_cast(malloc(b.length())); @@ -477,7 +477,7 @@ void QUrl_SetUserInfo2(QUrl* self, const char* userInfo, size_t userInfo_Strlen, } void QUrl_UserInfo1(QUrl* self, int options, char** _out, int* _out_Strlen) { - QString ret = self->userInfo(static_cast(options)); + QString ret = const_cast(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(); *_out = static_cast(malloc(b.length())); @@ -491,7 +491,7 @@ void QUrl_SetUserName2(QUrl* self, const char* userName, size_t userName_Strlen, } void QUrl_UserName1(QUrl* self, int options, char** _out, int* _out_Strlen) { - QString ret = self->userName(static_cast(options)); + QString ret = const_cast(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(); *_out = static_cast(malloc(b.length())); @@ -505,7 +505,7 @@ void QUrl_SetPassword2(QUrl* self, const char* password, size_t password_Strlen, } void QUrl_Password1(QUrl* self, int param1, char** _out, int* _out_Strlen) { - QString ret = self->password(static_cast(param1)); + QString ret = const_cast(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(); *_out = static_cast(malloc(b.length())); @@ -519,7 +519,7 @@ void QUrl_SetHost2(QUrl* self, const char* host, size_t host_Strlen, uintptr_t m } void QUrl_Host1(QUrl* self, int param1, char** _out, int* _out_Strlen) { - QString ret = self->host(static_cast(param1)); + QString ret = const_cast(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(); *_out = static_cast(malloc(b.length())); @@ -528,7 +528,7 @@ void QUrl_Host1(QUrl* self, int param1, char** _out, int* _out_Strlen) { } void QUrl_TopLevelDomain1(QUrl* self, int options, char** _out, int* _out_Strlen) { - QString ret = self->topLevelDomain(static_cast(options)); + QString ret = const_cast(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(); *_out = static_cast(malloc(b.length())); @@ -537,7 +537,7 @@ void QUrl_TopLevelDomain1(QUrl* self, int options, char** _out, int* _out_Strlen } int QUrl_Port1(QUrl* self, int defaultPort) { - return self->port(static_cast(defaultPort)); + return const_cast(self)->port(static_cast(defaultPort)); } void QUrl_SetPath2(QUrl* self, const char* path, size_t path_Strlen, uintptr_t mode) { @@ -546,7 +546,7 @@ void QUrl_SetPath2(QUrl* self, const char* path, size_t path_Strlen, uintptr_t m } void QUrl_Path1(QUrl* self, int options, char** _out, int* _out_Strlen) { - QString ret = self->path(static_cast(options)); + QString ret = const_cast(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(); *_out = static_cast(malloc(b.length())); @@ -555,7 +555,7 @@ void QUrl_Path1(QUrl* self, int options, char** _out, int* _out_Strlen) { } void QUrl_FileName1(QUrl* self, int options, char** _out, int* _out_Strlen) { - QString ret = self->fileName(static_cast(options)); + QString ret = const_cast(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(); *_out = static_cast(malloc(b.length())); @@ -569,7 +569,7 @@ void QUrl_SetQuery2(QUrl* self, const char* query, size_t query_Strlen, uintptr_ } void QUrl_Query1(QUrl* self, int param1, char** _out, int* _out_Strlen) { - QString ret = self->query(static_cast(param1)); + QString ret = const_cast(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(); *_out = static_cast(malloc(b.length())); @@ -578,7 +578,7 @@ void QUrl_Query1(QUrl* self, int param1, char** _out, int* _out_Strlen) { } void QUrl_Fragment1(QUrl* self, int options, char** _out, int* _out_Strlen) { - QString ret = self->fragment(static_cast(options)); + QString ret = const_cast(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(); *_out = static_cast(malloc(b.length())); diff --git a/qt/gen_qurlquery.cpp b/qt/gen_qurlquery.cpp index e56439cb..64fb0d38 100644 --- a/qt/gen_qurlquery.cpp +++ b/qt/gen_qurlquery.cpp @@ -159,7 +159,7 @@ QChar* QUrlQuery_DefaultQueryPairDelimiter() { } void QUrlQuery_Query1(QUrlQuery* self, int encoding, char** _out, int* _out_Strlen) { - QString ret = self->query(static_cast(encoding)); + QString ret = const_cast(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(); *_out = static_cast(malloc(b.length())); @@ -168,7 +168,7 @@ void QUrlQuery_Query1(QUrlQuery* self, int encoding, char** _out, int* _out_Strl } void QUrlQuery_ToString1(QUrlQuery* self, int encoding, char** _out, int* _out_Strlen) { - QString ret = self->toString(static_cast(encoding)); + QString ret = const_cast(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(); *_out = static_cast(malloc(b.length())); @@ -178,7 +178,7 @@ void QUrlQuery_ToString1(QUrlQuery* self, int encoding, char** _out, int* _out_S void QUrlQuery_QueryItemValue2(QUrlQuery* self, const char* key, size_t key_Strlen, int encoding, char** _out, int* _out_Strlen) { QString key_QString = QString::fromUtf8(key, key_Strlen); - QString ret = self->queryItemValue(key_QString, static_cast(encoding)); + QString ret = const_cast(self)->queryItemValue(key_QString, static_cast(encoding)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray b = ret.toUtf8(); *_out = static_cast(malloc(b.length())); @@ -188,7 +188,7 @@ void QUrlQuery_QueryItemValue2(QUrlQuery* self, const char* key, size_t key_Strl void QUrlQuery_AllQueryItemValues2(QUrlQuery* self, const char* key, size_t key_Strlen, int encoding, char*** _out, int** _out_Lengths, size_t* _out_len) { QString key_QString = QString::fromUtf8(key, key_Strlen); - QStringList ret = self->allQueryItemValues(key_QString, static_cast(encoding)); + QStringList ret = const_cast(self)->allQueryItemValues(key_QString, static_cast(encoding)); // Convert QStringList from C++ memory to manually-managed C memory char** __out = static_cast(malloc(sizeof(char*) * ret.length())); int* __out_Lengths = static_cast(malloc(sizeof(int) * ret.length())); diff --git a/qt/gen_qvariant.cpp b/qt/gen_qvariant.cpp index 4c582af8..80fea035 100644 --- a/qt/gen_qvariant.cpp +++ b/qt/gen_qvariant.cpp @@ -518,31 +518,31 @@ bool QVariant_OperatorGreaterOrEqual(QVariant* self, QVariant* v) { } int QVariant_ToInt1(QVariant* self, bool* ok) { - return self->toInt(ok); + return const_cast(self)->toInt(ok); } unsigned int QVariant_ToUInt1(QVariant* self, bool* ok) { - return self->toUInt(ok); + return const_cast(self)->toUInt(ok); } int64_t QVariant_ToLongLong1(QVariant* self, bool* ok) { - return self->toLongLong(ok); + return const_cast(self)->toLongLong(ok); } uint64_t QVariant_ToULongLong1(QVariant* self, bool* ok) { - return self->toULongLong(ok); + return const_cast(self)->toULongLong(ok); } double QVariant_ToDouble1(QVariant* self, bool* ok) { - return self->toDouble(ok); + return const_cast(self)->toDouble(ok); } float QVariant_ToFloat1(QVariant* self, bool* ok) { - return self->toFloat(ok); + return const_cast(self)->toFloat(ok); } double QVariant_ToReal1(QVariant* self, bool* ok) { - return self->toReal(ok); + return const_cast(self)->toReal(ok); } void QVariant_Delete(QVariant* self) { diff --git a/qt/gen_qwindow.cpp b/qt/gen_qwindow.cpp index a3bf0dba..88da47d0 100644 --- a/qt/gen_qwindow.cpp +++ b/qt/gen_qwindow.cpp @@ -774,7 +774,7 @@ void QWindow_SetFlag2(QWindow* self, uintptr_t param1, bool on) { } bool QWindow_IsAncestorOf2(QWindow* self, QWindow* child, uintptr_t mode) { - return self->isAncestorOf(child, static_cast(mode)); + return const_cast(self)->isAncestorOf(child, static_cast(mode)); } void QWindow_Delete(QWindow* self) {