diff --git a/qt/gen_qarraydata.cpp b/qt/gen_qarraydata.cpp index def51041..258a10c9 100644 --- a/qt/gen_qarraydata.cpp +++ b/qt/gen_qarraydata.cpp @@ -58,11 +58,6 @@ void QArrayData_Delete(QArrayData* self) { delete self; } -int QtPrivate__QContainerImplHelper_Mid(int originalLength, int* position, int* length) { - QtPrivate::QContainerImplHelper::CutResult _ret = QtPrivate::QContainerImplHelper::mid(static_cast(originalLength), static_cast(position), static_cast(length)); - return static_cast(_ret); -} - void QtPrivate__QContainerImplHelper_Delete(QtPrivate__QContainerImplHelper* self) { delete self; } diff --git a/qt/gen_qarraydata.go b/qt/gen_qarraydata.go index bd96dc7e..df6520a1 100644 --- a/qt/gen_qarraydata.go +++ b/qt/gen_qarraydata.go @@ -152,10 +152,6 @@ func UnsafeNewQtPrivate__QContainerImplHelper(h unsafe.Pointer) *QtPrivate__QCon return newQtPrivate__QContainerImplHelper((*C.QtPrivate__QContainerImplHelper)(h)) } -func QtPrivate__QContainerImplHelper_Mid(originalLength int, position *int, length *int) QtPrivate__QContainerImplHelper__CutResult { - return (QtPrivate__QContainerImplHelper__CutResult)(C.QtPrivate__QContainerImplHelper_Mid((C.int)(originalLength), (*C.int)(unsafe.Pointer(position)), (*C.int)(unsafe.Pointer(length)))) -} - // Delete this object from C++ memory. func (this *QtPrivate__QContainerImplHelper) Delete() { C.QtPrivate__QContainerImplHelper_Delete(this.h) diff --git a/qt/gen_qarraydata.h b/qt/gen_qarraydata.h index 74feaf29..eff2c2f6 100644 --- a/qt/gen_qarraydata.h +++ b/qt/gen_qarraydata.h @@ -39,7 +39,6 @@ QArrayData* QArrayData_Allocate4(size_t objectSize, size_t alignment, size_t cap QArrayData* QArrayData_ReallocateUnaligned4(QArrayData* data, size_t objectSize, size_t newCapacity, int newOptions); void QArrayData_Delete(QArrayData* self); -int QtPrivate__QContainerImplHelper_Mid(int originalLength, int* position, int* length); void QtPrivate__QContainerImplHelper_Delete(QtPrivate__QContainerImplHelper* self); #ifdef __cplusplus diff --git a/qt/gen_qdatastream.cpp b/qt/gen_qdatastream.cpp index fcbeb905..d6b198c7 100644 --- a/qt/gen_qdatastream.cpp +++ b/qt/gen_qdatastream.cpp @@ -216,10 +216,6 @@ QtPrivate__StreamStateSaver* QtPrivate__StreamStateSaver_new(QDataStream* s) { return new QtPrivate::StreamStateSaver(s); } -QtPrivate__StreamStateSaver* QtPrivate__StreamStateSaver_new2(QtPrivate__StreamStateSaver* param1) { - return new QtPrivate::StreamStateSaver(*param1); -} - void QtPrivate__StreamStateSaver_Delete(QtPrivate__StreamStateSaver* self) { delete self; } diff --git a/qt/gen_qdatastream.go b/qt/gen_qdatastream.go index 11b86d88..f0305278 100644 --- a/qt/gen_qdatastream.go +++ b/qt/gen_qdatastream.go @@ -369,12 +369,6 @@ func NewQtPrivate__StreamStateSaver(s *QDataStream) *QtPrivate__StreamStateSaver return newQtPrivate__StreamStateSaver(ret) } -// NewQtPrivate__StreamStateSaver2 constructs a new QtPrivate::StreamStateSaver object. -func NewQtPrivate__StreamStateSaver2(param1 *QtPrivate__StreamStateSaver) *QtPrivate__StreamStateSaver { - ret := C.QtPrivate__StreamStateSaver_new2(param1.cPointer()) - return newQtPrivate__StreamStateSaver(ret) -} - // Delete this object from C++ memory. func (this *QtPrivate__StreamStateSaver) Delete() { C.QtPrivate__StreamStateSaver_Delete(this.h) diff --git a/qt/gen_qdatastream.h b/qt/gen_qdatastream.h index fe932fae..01a74fe9 100644 --- a/qt/gen_qdatastream.h +++ b/qt/gen_qdatastream.h @@ -81,7 +81,6 @@ void QDataStream_AbortTransaction(QDataStream* self); void QDataStream_Delete(QDataStream* self); QtPrivate__StreamStateSaver* QtPrivate__StreamStateSaver_new(QDataStream* s); -QtPrivate__StreamStateSaver* QtPrivate__StreamStateSaver_new2(QtPrivate__StreamStateSaver* param1); void QtPrivate__StreamStateSaver_Delete(QtPrivate__StreamStateSaver* self); #ifdef __cplusplus diff --git a/qt/gen_qexception.cpp b/qt/gen_qexception.cpp index ed2abc26..4b94ccd5 100644 --- a/qt/gen_qexception.cpp +++ b/qt/gen_qexception.cpp @@ -8,30 +8,14 @@ QtPrivate__ExceptionHolder* QtPrivate__ExceptionHolder_new() { return new QtPrivate::ExceptionHolder(); } -QtPrivate__ExceptionHolder* QtPrivate__ExceptionHolder_new2(QtPrivate__ExceptionHolder* other) { - return new QtPrivate::ExceptionHolder(*other); -} - -void QtPrivate__ExceptionHolder_OperatorAssign(QtPrivate__ExceptionHolder* self, QtPrivate__ExceptionHolder* other) { - self->operator=(*other); -} - void QtPrivate__ExceptionHolder_Delete(QtPrivate__ExceptionHolder* self) { delete self; } -QtPrivate__ExceptionStore* QtPrivate__ExceptionStore_new(QtPrivate__ExceptionStore* param1) { - return new QtPrivate::ExceptionStore(*param1); -} - bool QtPrivate__ExceptionStore_HasException(const QtPrivate__ExceptionStore* self) { return self->hasException(); } -QtPrivate__ExceptionHolder* QtPrivate__ExceptionStore_Exception(QtPrivate__ExceptionStore* self) { - return new QtPrivate::ExceptionHolder(self->exception()); -} - void QtPrivate__ExceptionStore_ThrowPossibleException(QtPrivate__ExceptionStore* self) { self->throwPossibleException(); } @@ -40,10 +24,6 @@ bool QtPrivate__ExceptionStore_HasThrown(const QtPrivate__ExceptionStore* self) return self->hasThrown(); } -void QtPrivate__ExceptionStore_OperatorAssign(QtPrivate__ExceptionStore* self, QtPrivate__ExceptionStore* param1) { - self->operator=(*param1); -} - void QtPrivate__ExceptionStore_Delete(QtPrivate__ExceptionStore* self) { delete self; } diff --git a/qt/gen_qexception.go b/qt/gen_qexception.go index d72e0f21..934eb7b2 100644 --- a/qt/gen_qexception.go +++ b/qt/gen_qexception.go @@ -48,16 +48,6 @@ func NewQtPrivate__ExceptionHolder() *QtPrivate__ExceptionHolder { return newQtPrivate__ExceptionHolder(ret) } -// NewQtPrivate__ExceptionHolder2 constructs a new QtPrivate::ExceptionHolder object. -func NewQtPrivate__ExceptionHolder2(other *QtPrivate__ExceptionHolder) *QtPrivate__ExceptionHolder { - ret := C.QtPrivate__ExceptionHolder_new2(other.cPointer()) - return newQtPrivate__ExceptionHolder(ret) -} - -func (this *QtPrivate__ExceptionHolder) OperatorAssign(other *QtPrivate__ExceptionHolder) { - C.QtPrivate__ExceptionHolder_OperatorAssign(this.h, other.cPointer()) -} - // Delete this object from C++ memory. func (this *QtPrivate__ExceptionHolder) Delete() { C.QtPrivate__ExceptionHolder_Delete(this.h) @@ -101,23 +91,10 @@ func UnsafeNewQtPrivate__ExceptionStore(h unsafe.Pointer) *QtPrivate__ExceptionS return newQtPrivate__ExceptionStore((*C.QtPrivate__ExceptionStore)(h)) } -// NewQtPrivate__ExceptionStore constructs a new QtPrivate::ExceptionStore object. -func NewQtPrivate__ExceptionStore(param1 *QtPrivate__ExceptionStore) *QtPrivate__ExceptionStore { - ret := C.QtPrivate__ExceptionStore_new(param1.cPointer()) - return newQtPrivate__ExceptionStore(ret) -} - func (this *QtPrivate__ExceptionStore) HasException() bool { return (bool)(C.QtPrivate__ExceptionStore_HasException(this.h)) } -func (this *QtPrivate__ExceptionStore) Exception() *QtPrivate__ExceptionHolder { - _ret := C.QtPrivate__ExceptionStore_Exception(this.h) - _goptr := newQtPrivate__ExceptionHolder(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - func (this *QtPrivate__ExceptionStore) ThrowPossibleException() { C.QtPrivate__ExceptionStore_ThrowPossibleException(this.h) } @@ -126,10 +103,6 @@ func (this *QtPrivate__ExceptionStore) HasThrown() bool { return (bool)(C.QtPrivate__ExceptionStore_HasThrown(this.h)) } -func (this *QtPrivate__ExceptionStore) OperatorAssign(param1 *QtPrivate__ExceptionStore) { - C.QtPrivate__ExceptionStore_OperatorAssign(this.h, param1.cPointer()) -} - // Delete this object from C++ memory. func (this *QtPrivate__ExceptionStore) Delete() { C.QtPrivate__ExceptionStore_Delete(this.h) diff --git a/qt/gen_qexception.h b/qt/gen_qexception.h index 77f24278..19f4b51f 100644 --- a/qt/gen_qexception.h +++ b/qt/gen_qexception.h @@ -30,16 +30,11 @@ typedef struct QtPrivate__ExceptionStore QtPrivate__ExceptionStore; #endif QtPrivate__ExceptionHolder* QtPrivate__ExceptionHolder_new(); -QtPrivate__ExceptionHolder* QtPrivate__ExceptionHolder_new2(QtPrivate__ExceptionHolder* other); -void QtPrivate__ExceptionHolder_OperatorAssign(QtPrivate__ExceptionHolder* self, QtPrivate__ExceptionHolder* other); void QtPrivate__ExceptionHolder_Delete(QtPrivate__ExceptionHolder* self); -QtPrivate__ExceptionStore* QtPrivate__ExceptionStore_new(QtPrivate__ExceptionStore* param1); bool QtPrivate__ExceptionStore_HasException(const QtPrivate__ExceptionStore* self); -QtPrivate__ExceptionHolder* QtPrivate__ExceptionStore_Exception(QtPrivate__ExceptionStore* self); void QtPrivate__ExceptionStore_ThrowPossibleException(QtPrivate__ExceptionStore* self); bool QtPrivate__ExceptionStore_HasThrown(const QtPrivate__ExceptionStore* self); -void QtPrivate__ExceptionStore_OperatorAssign(QtPrivate__ExceptionStore* self, QtPrivate__ExceptionStore* param1); void QtPrivate__ExceptionStore_Delete(QtPrivate__ExceptionStore* self); #ifdef __cplusplus diff --git a/qt/gen_qfutureinterface.cpp b/qt/gen_qfutureinterface.cpp index 060c3b02..7bafd7ef 100644 --- a/qt/gen_qfutureinterface.cpp +++ b/qt/gen_qfutureinterface.cpp @@ -5,8 +5,6 @@ #include #include #include -#define WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__ExceptionStore -#define WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__ResultStoreBase #include #include "gen_qfutureinterface.h" #include "_cgo_export.h" @@ -177,24 +175,6 @@ QMutex* QFutureInterfaceBase_MutexWithInt(const QFutureInterfaceBase* self, int return &_ret; } -QtPrivate__ExceptionStore* QFutureInterfaceBase_ExceptionStore(QFutureInterfaceBase* self) { - QtPrivate::ExceptionStore& _ret = self->exceptionStore(); - // Cast returned reference into pointer - return &_ret; -} - -QtPrivate__ResultStoreBase* QFutureInterfaceBase_ResultStoreBase(QFutureInterfaceBase* self) { - QtPrivate::ResultStoreBase& _ret = self->resultStoreBase(); - // Cast returned reference into pointer - return &_ret; -} - -QtPrivate__ResultStoreBase* QFutureInterfaceBase_ResultStoreBase2(const QFutureInterfaceBase* self) { - const QtPrivate::ResultStoreBase& _ret = self->resultStoreBase(); - // Cast returned reference into pointer - return const_cast(&_ret); -} - bool QFutureInterfaceBase_OperatorEqual(const QFutureInterfaceBase* self, QFutureInterfaceBase* other) { return self->operator==(*other); } diff --git a/qt/gen_qfutureinterface.go b/qt/gen_qfutureinterface.go index 7eac8c50..80bdd30c 100644 --- a/qt/gen_qfutureinterface.go +++ b/qt/gen_qfutureinterface.go @@ -223,18 +223,6 @@ func (this *QFutureInterfaceBase) MutexWithInt(param1 int) *QMutex { return UnsafeNewQMutex(unsafe.Pointer(C.QFutureInterfaceBase_MutexWithInt(this.h, (C.int)(param1)))) } -func (this *QFutureInterfaceBase) ExceptionStore() *QtPrivate__ExceptionStore { - return UnsafeNewQtPrivate__ExceptionStore(unsafe.Pointer(C.QFutureInterfaceBase_ExceptionStore(this.h))) -} - -func (this *QFutureInterfaceBase) ResultStoreBase() *QtPrivate__ResultStoreBase { - return UnsafeNewQtPrivate__ResultStoreBase(unsafe.Pointer(C.QFutureInterfaceBase_ResultStoreBase(this.h))) -} - -func (this *QFutureInterfaceBase) ResultStoreBase2() *QtPrivate__ResultStoreBase { - return UnsafeNewQtPrivate__ResultStoreBase(unsafe.Pointer(C.QFutureInterfaceBase_ResultStoreBase2(this.h))) -} - func (this *QFutureInterfaceBase) OperatorEqual(other *QFutureInterfaceBase) bool { return (bool)(C.QFutureInterfaceBase_OperatorEqual(this.h, other.cPointer())) } diff --git a/qt/gen_qfutureinterface.h b/qt/gen_qfutureinterface.h index a76f9a7f..54d56422 100644 --- a/qt/gen_qfutureinterface.h +++ b/qt/gen_qfutureinterface.h @@ -18,23 +18,11 @@ class QFutureInterfaceBase; class QMutex; class QRunnable; class QThreadPool; -#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__ExceptionStore) -typedef QtPrivate::ExceptionStore QtPrivate__ExceptionStore; -#else -class QtPrivate__ExceptionStore; -#endif -#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QtPrivate__ResultStoreBase) -typedef QtPrivate::ResultStoreBase QtPrivate__ResultStoreBase; -#else -class QtPrivate__ResultStoreBase; -#endif #else typedef struct QFutureInterfaceBase QFutureInterfaceBase; typedef struct QMutex QMutex; typedef struct QRunnable QRunnable; typedef struct QThreadPool QThreadPool; -typedef struct QtPrivate__ExceptionStore QtPrivate__ExceptionStore; -typedef struct QtPrivate__ResultStoreBase QtPrivate__ResultStoreBase; #endif QFutureInterfaceBase* QFutureInterfaceBase_new(); @@ -76,9 +64,6 @@ void QFutureInterfaceBase_WaitForResult(QFutureInterfaceBase* self, int resultIn void QFutureInterfaceBase_WaitForResume(QFutureInterfaceBase* self); QMutex* QFutureInterfaceBase_Mutex(const QFutureInterfaceBase* self); QMutex* QFutureInterfaceBase_MutexWithInt(const QFutureInterfaceBase* self, int param1); -QtPrivate__ExceptionStore* QFutureInterfaceBase_ExceptionStore(QFutureInterfaceBase* self); -QtPrivate__ResultStoreBase* QFutureInterfaceBase_ResultStoreBase(QFutureInterfaceBase* self); -QtPrivate__ResultStoreBase* QFutureInterfaceBase_ResultStoreBase2(const QFutureInterfaceBase* self); bool QFutureInterfaceBase_OperatorEqual(const QFutureInterfaceBase* self, QFutureInterfaceBase* other); bool QFutureInterfaceBase_OperatorNotEqual(const QFutureInterfaceBase* self, QFutureInterfaceBase* other); void QFutureInterfaceBase_OperatorAssign(QFutureInterfaceBase* self, QFutureInterfaceBase* other); diff --git a/qt/gen_qhashfunctions.cpp b/qt/gen_qhashfunctions.cpp index 059c876f..9b3241f1 100644 --- a/qt/gen_qhashfunctions.cpp +++ b/qt/gen_qhashfunctions.cpp @@ -8,10 +8,6 @@ QtPrivate__QHashCombine* QtPrivate__QHashCombine_new() { return new QtPrivate::QHashCombine(); } -QtPrivate__QHashCombine* QtPrivate__QHashCombine_new2(QtPrivate__QHashCombine* param1) { - return new QtPrivate::QHashCombine(*param1); -} - void QtPrivate__QHashCombine_Delete(QtPrivate__QHashCombine* self) { delete self; } @@ -20,10 +16,6 @@ QtPrivate__QHashCombineCommutative* QtPrivate__QHashCombineCommutative_new() { return new QtPrivate::QHashCombineCommutative(); } -QtPrivate__QHashCombineCommutative* QtPrivate__QHashCombineCommutative_new2(QtPrivate__QHashCombineCommutative* param1) { - return new QtPrivate::QHashCombineCommutative(*param1); -} - void QtPrivate__QHashCombineCommutative_Delete(QtPrivate__QHashCombineCommutative* self) { delete self; } diff --git a/qt/gen_qhashfunctions.go b/qt/gen_qhashfunctions.go index e1f895e9..02265cc0 100644 --- a/qt/gen_qhashfunctions.go +++ b/qt/gen_qhashfunctions.go @@ -48,12 +48,6 @@ func NewQtPrivate__QHashCombine() *QtPrivate__QHashCombine { return newQtPrivate__QHashCombine(ret) } -// NewQtPrivate__QHashCombine2 constructs a new QtPrivate::QHashCombine object. -func NewQtPrivate__QHashCombine2(param1 *QtPrivate__QHashCombine) *QtPrivate__QHashCombine { - ret := C.QtPrivate__QHashCombine_new2(param1.cPointer()) - return newQtPrivate__QHashCombine(ret) -} - // Delete this object from C++ memory. func (this *QtPrivate__QHashCombine) Delete() { C.QtPrivate__QHashCombine_Delete(this.h) @@ -103,12 +97,6 @@ func NewQtPrivate__QHashCombineCommutative() *QtPrivate__QHashCombineCommutative return newQtPrivate__QHashCombineCommutative(ret) } -// NewQtPrivate__QHashCombineCommutative2 constructs a new QtPrivate::QHashCombineCommutative object. -func NewQtPrivate__QHashCombineCommutative2(param1 *QtPrivate__QHashCombineCommutative) *QtPrivate__QHashCombineCommutative { - ret := C.QtPrivate__QHashCombineCommutative_new2(param1.cPointer()) - return newQtPrivate__QHashCombineCommutative(ret) -} - // Delete this object from C++ memory. func (this *QtPrivate__QHashCombineCommutative) Delete() { C.QtPrivate__QHashCombineCommutative_Delete(this.h) diff --git a/qt/gen_qhashfunctions.h b/qt/gen_qhashfunctions.h index 7014441e..7af9c7d0 100644 --- a/qt/gen_qhashfunctions.h +++ b/qt/gen_qhashfunctions.h @@ -30,11 +30,9 @@ typedef struct QtPrivate__QHashCombineCommutative QtPrivate__QHashCombineCommuta #endif QtPrivate__QHashCombine* QtPrivate__QHashCombine_new(); -QtPrivate__QHashCombine* QtPrivate__QHashCombine_new2(QtPrivate__QHashCombine* param1); void QtPrivate__QHashCombine_Delete(QtPrivate__QHashCombine* self); QtPrivate__QHashCombineCommutative* QtPrivate__QHashCombineCommutative_new(); -QtPrivate__QHashCombineCommutative* QtPrivate__QHashCombineCommutative_new2(QtPrivate__QHashCombineCommutative* param1); void QtPrivate__QHashCombineCommutative_Delete(QtPrivate__QHashCombineCommutative* self); #ifdef __cplusplus diff --git a/qt/gen_qresultstore.cpp b/qt/gen_qresultstore.cpp index 8fa02268..763f743e 100644 --- a/qt/gen_qresultstore.cpp +++ b/qt/gen_qresultstore.cpp @@ -45,10 +45,6 @@ int QtPrivate__ResultIteratorBase_ResultIndex(const QtPrivate__ResultIteratorBas return self->resultIndex(); } -QtPrivate__ResultIteratorBase* QtPrivate__ResultIteratorBase_OperatorPlusPlus(QtPrivate__ResultIteratorBase* self) { - return new QtPrivate::ResultIteratorBase(self->operator++()); -} - int QtPrivate__ResultIteratorBase_BatchSize(const QtPrivate__ResultIteratorBase* self) { return self->batchSize(); } @@ -57,14 +53,6 @@ void QtPrivate__ResultIteratorBase_BatchedAdvance(QtPrivate__ResultIteratorBase* self->batchedAdvance(); } -bool QtPrivate__ResultIteratorBase_OperatorEqual(const QtPrivate__ResultIteratorBase* self, QtPrivate__ResultIteratorBase* other) { - return self->operator==(*other); -} - -bool QtPrivate__ResultIteratorBase_OperatorNotEqual(const QtPrivate__ResultIteratorBase* self, QtPrivate__ResultIteratorBase* other) { - return self->operator!=(*other); -} - bool QtPrivate__ResultIteratorBase_IsVector(const QtPrivate__ResultIteratorBase* self) { return self->isVector(); } @@ -81,10 +69,6 @@ QtPrivate__ResultStoreBase* QtPrivate__ResultStoreBase_new() { return new QtPrivate::ResultStoreBase(); } -QtPrivate__ResultStoreBase* QtPrivate__ResultStoreBase_new2(QtPrivate__ResultStoreBase* param1) { - return new QtPrivate::ResultStoreBase(*param1); -} - void QtPrivate__ResultStoreBase_SetFilterMode(QtPrivate__ResultStoreBase* self, bool enable) { self->setFilterMode(enable); } @@ -101,22 +85,10 @@ int QtPrivate__ResultStoreBase_AddResults(QtPrivate__ResultStoreBase* self, int return self->addResults(static_cast(index), results, static_cast(vectorSize), static_cast(logicalCount)); } -QtPrivate__ResultIteratorBase* QtPrivate__ResultStoreBase_Begin(const QtPrivate__ResultStoreBase* self) { - return new QtPrivate::ResultIteratorBase(self->begin()); -} - -QtPrivate__ResultIteratorBase* QtPrivate__ResultStoreBase_End(const QtPrivate__ResultStoreBase* self) { - return new QtPrivate::ResultIteratorBase(self->end()); -} - bool QtPrivate__ResultStoreBase_HasNextResult(const QtPrivate__ResultStoreBase* self) { return self->hasNextResult(); } -QtPrivate__ResultIteratorBase* QtPrivate__ResultStoreBase_ResultAt(const QtPrivate__ResultStoreBase* self, int index) { - return new QtPrivate::ResultIteratorBase(self->resultAt(static_cast(index))); -} - bool QtPrivate__ResultStoreBase_Contains(const QtPrivate__ResultStoreBase* self, int index) { return self->contains(static_cast(index)); } @@ -129,10 +101,6 @@ int QtPrivate__ResultStoreBase_AddCanceledResult(QtPrivate__ResultStoreBase* sel return self->addCanceledResult(static_cast(index)); } -void QtPrivate__ResultStoreBase_OperatorAssign(QtPrivate__ResultStoreBase* self, QtPrivate__ResultStoreBase* param1) { - self->operator=(*param1); -} - void QtPrivate__ResultStoreBase_Delete(QtPrivate__ResultStoreBase* self) { delete self; } diff --git a/qt/gen_qresultstore.go b/qt/gen_qresultstore.go index c0d25944..6c222a3f 100644 --- a/qt/gen_qresultstore.go +++ b/qt/gen_qresultstore.go @@ -129,13 +129,6 @@ func (this *QtPrivate__ResultIteratorBase) ResultIndex() int { return (int)(C.QtPrivate__ResultIteratorBase_ResultIndex(this.h)) } -func (this *QtPrivate__ResultIteratorBase) OperatorPlusPlus() *QtPrivate__ResultIteratorBase { - _ret := C.QtPrivate__ResultIteratorBase_OperatorPlusPlus(this.h) - _goptr := newQtPrivate__ResultIteratorBase(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - func (this *QtPrivate__ResultIteratorBase) BatchSize() int { return (int)(C.QtPrivate__ResultIteratorBase_BatchSize(this.h)) } @@ -144,14 +137,6 @@ func (this *QtPrivate__ResultIteratorBase) BatchedAdvance() { C.QtPrivate__ResultIteratorBase_BatchedAdvance(this.h) } -func (this *QtPrivate__ResultIteratorBase) OperatorEqual(other *QtPrivate__ResultIteratorBase) bool { - return (bool)(C.QtPrivate__ResultIteratorBase_OperatorEqual(this.h, other.cPointer())) -} - -func (this *QtPrivate__ResultIteratorBase) OperatorNotEqual(other *QtPrivate__ResultIteratorBase) bool { - return (bool)(C.QtPrivate__ResultIteratorBase_OperatorNotEqual(this.h, other.cPointer())) -} - func (this *QtPrivate__ResultIteratorBase) IsVector() bool { return (bool)(C.QtPrivate__ResultIteratorBase_IsVector(this.h)) } @@ -209,12 +194,6 @@ func NewQtPrivate__ResultStoreBase() *QtPrivate__ResultStoreBase { return newQtPrivate__ResultStoreBase(ret) } -// NewQtPrivate__ResultStoreBase2 constructs a new QtPrivate::ResultStoreBase object. -func NewQtPrivate__ResultStoreBase2(param1 *QtPrivate__ResultStoreBase) *QtPrivate__ResultStoreBase { - ret := C.QtPrivate__ResultStoreBase_new2(param1.cPointer()) - return newQtPrivate__ResultStoreBase(ret) -} - func (this *QtPrivate__ResultStoreBase) SetFilterMode(enable bool) { C.QtPrivate__ResultStoreBase_SetFilterMode(this.h, (C.bool)(enable)) } @@ -231,31 +210,10 @@ func (this *QtPrivate__ResultStoreBase) AddResults(index int, results unsafe.Poi return (int)(C.QtPrivate__ResultStoreBase_AddResults(this.h, (C.int)(index), results, (C.int)(vectorSize), (C.int)(logicalCount))) } -func (this *QtPrivate__ResultStoreBase) Begin() *QtPrivate__ResultIteratorBase { - _ret := C.QtPrivate__ResultStoreBase_Begin(this.h) - _goptr := newQtPrivate__ResultIteratorBase(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QtPrivate__ResultStoreBase) End() *QtPrivate__ResultIteratorBase { - _ret := C.QtPrivate__ResultStoreBase_End(this.h) - _goptr := newQtPrivate__ResultIteratorBase(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - func (this *QtPrivate__ResultStoreBase) HasNextResult() bool { return (bool)(C.QtPrivate__ResultStoreBase_HasNextResult(this.h)) } -func (this *QtPrivate__ResultStoreBase) ResultAt(index int) *QtPrivate__ResultIteratorBase { - _ret := C.QtPrivate__ResultStoreBase_ResultAt(this.h, (C.int)(index)) - _goptr := newQtPrivate__ResultIteratorBase(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - func (this *QtPrivate__ResultStoreBase) Contains(index int) bool { return (bool)(C.QtPrivate__ResultStoreBase_Contains(this.h, (C.int)(index))) } @@ -268,10 +226,6 @@ func (this *QtPrivate__ResultStoreBase) AddCanceledResult(index int) int { return (int)(C.QtPrivate__ResultStoreBase_AddCanceledResult(this.h, (C.int)(index))) } -func (this *QtPrivate__ResultStoreBase) OperatorAssign(param1 *QtPrivate__ResultStoreBase) { - C.QtPrivate__ResultStoreBase_OperatorAssign(this.h, param1.cPointer()) -} - // Delete this object from C++ memory. func (this *QtPrivate__ResultStoreBase) Delete() { C.QtPrivate__ResultStoreBase_Delete(this.h) diff --git a/qt/gen_qresultstore.h b/qt/gen_qresultstore.h index 3892c955..65e2b6e9 100644 --- a/qt/gen_qresultstore.h +++ b/qt/gen_qresultstore.h @@ -46,29 +46,21 @@ void QtPrivate__ResultItem_Delete(QtPrivate__ResultItem* self); QtPrivate__ResultIteratorBase* QtPrivate__ResultIteratorBase_new(); int QtPrivate__ResultIteratorBase_VectorIndex(const QtPrivate__ResultIteratorBase* self); int QtPrivate__ResultIteratorBase_ResultIndex(const QtPrivate__ResultIteratorBase* self); -QtPrivate__ResultIteratorBase* QtPrivate__ResultIteratorBase_OperatorPlusPlus(QtPrivate__ResultIteratorBase* self); int QtPrivate__ResultIteratorBase_BatchSize(const QtPrivate__ResultIteratorBase* self); void QtPrivate__ResultIteratorBase_BatchedAdvance(QtPrivate__ResultIteratorBase* self); -bool QtPrivate__ResultIteratorBase_OperatorEqual(const QtPrivate__ResultIteratorBase* self, QtPrivate__ResultIteratorBase* other); -bool QtPrivate__ResultIteratorBase_OperatorNotEqual(const QtPrivate__ResultIteratorBase* self, QtPrivate__ResultIteratorBase* other); bool QtPrivate__ResultIteratorBase_IsVector(const QtPrivate__ResultIteratorBase* self); bool QtPrivate__ResultIteratorBase_CanIncrementVectorIndex(const QtPrivate__ResultIteratorBase* self); void QtPrivate__ResultIteratorBase_Delete(QtPrivate__ResultIteratorBase* self); QtPrivate__ResultStoreBase* QtPrivate__ResultStoreBase_new(); -QtPrivate__ResultStoreBase* QtPrivate__ResultStoreBase_new2(QtPrivate__ResultStoreBase* param1); void QtPrivate__ResultStoreBase_SetFilterMode(QtPrivate__ResultStoreBase* self, bool enable); bool QtPrivate__ResultStoreBase_FilterMode(const QtPrivate__ResultStoreBase* self); int QtPrivate__ResultStoreBase_AddResult(QtPrivate__ResultStoreBase* self, int index, const void* result); int QtPrivate__ResultStoreBase_AddResults(QtPrivate__ResultStoreBase* self, int index, const void* results, int vectorSize, int logicalCount); -QtPrivate__ResultIteratorBase* QtPrivate__ResultStoreBase_Begin(const QtPrivate__ResultStoreBase* self); -QtPrivate__ResultIteratorBase* QtPrivate__ResultStoreBase_End(const QtPrivate__ResultStoreBase* self); bool QtPrivate__ResultStoreBase_HasNextResult(const QtPrivate__ResultStoreBase* self); -QtPrivate__ResultIteratorBase* QtPrivate__ResultStoreBase_ResultAt(const QtPrivate__ResultStoreBase* self, int index); bool QtPrivate__ResultStoreBase_Contains(const QtPrivate__ResultStoreBase* self, int index); int QtPrivate__ResultStoreBase_Count(const QtPrivate__ResultStoreBase* self); int QtPrivate__ResultStoreBase_AddCanceledResult(QtPrivate__ResultStoreBase* self, int index); -void QtPrivate__ResultStoreBase_OperatorAssign(QtPrivate__ResultStoreBase* self, QtPrivate__ResultStoreBase* param1); void QtPrivate__ResultStoreBase_Delete(QtPrivate__ResultStoreBase* self); #ifdef __cplusplus diff --git a/qt/gen_qtwidgets-config.cpp b/qt/gen_qtwidgets-config.cpp new file mode 100644 index 00000000..f913b41b --- /dev/null +++ b/qt/gen_qtwidgets-config.cpp @@ -0,0 +1,4 @@ +#include +#include "gen_qtwidgets-config.h" +#include "_cgo_export.h" + diff --git a/qt/gen_qtwidgets-config.go b/qt/gen_qtwidgets-config.go new file mode 100644 index 00000000..c1b6b72a --- /dev/null +++ b/qt/gen_qtwidgets-config.go @@ -0,0 +1,9 @@ +package qt + +/* + +#include "gen_qtwidgets-config.h" +#include + +*/ +import "C" diff --git a/qt/gen_qtwidgets-config.h b/qt/gen_qtwidgets-config.h new file mode 100644 index 00000000..9fca297a --- /dev/null +++ b/qt/gen_qtwidgets-config.h @@ -0,0 +1,24 @@ +#ifndef GEN_QTWIDGETS_CONFIG_H +#define GEN_QTWIDGETS_CONFIG_H + +#include +#include +#include + +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + +#include "../libmiqt/libmiqt.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +#else +#endif + +#ifdef __cplusplus +} /* extern C */ +#endif + +#endif diff --git a/qt/gen_qvariant.cpp b/qt/gen_qvariant.cpp index 78663f26..2ee56907 100644 --- a/qt/gen_qvariant.cpp +++ b/qt/gen_qvariant.cpp @@ -1,5 +1,3 @@ -#include -#define WORKAROUND_INNER_CLASS_DEFINITION_QAssociativeIterable__const_iterator #include #include #include @@ -23,8 +21,6 @@ #include #include #include -#include -#define WORKAROUND_INNER_CLASS_DEFINITION_QSequentialIterable__const_iterator #include #include #include @@ -37,8 +33,6 @@ #define WORKAROUND_INNER_CLASS_DEFINITION_QVariant__Handler #define WORKAROUND_INNER_CLASS_DEFINITION_QVariant__PrivateShared #include -#define WORKAROUND_INNER_CLASS_DEFINITION_QtMetaTypePrivate__QAssociativeIterableImpl -#define WORKAROUND_INNER_CLASS_DEFINITION_QtMetaTypePrivate__QSequentialIterableImpl #include #include "gen_qvariant.h" #include "_cgo_export.h" @@ -546,70 +540,6 @@ void QVariantComparisonHelper_Delete(QVariantComparisonHelper* self) { delete self; } -QSequentialIterable* QSequentialIterable_new(QtMetaTypePrivate__QSequentialIterableImpl* impl) { - return new QSequentialIterable(*impl); -} - -QSequentialIterable* QSequentialIterable_new2(QSequentialIterable* param1) { - return new QSequentialIterable(*param1); -} - -QSequentialIterable__const_iterator* QSequentialIterable_Begin(const QSequentialIterable* self) { - return new QSequentialIterable::const_iterator(self->begin()); -} - -QSequentialIterable__const_iterator* QSequentialIterable_End(const QSequentialIterable* self) { - return new QSequentialIterable::const_iterator(self->end()); -} - -QVariant* QSequentialIterable_At(const QSequentialIterable* self, int idx) { - return new QVariant(self->at(static_cast(idx))); -} - -int QSequentialIterable_Size(const QSequentialIterable* self) { - return self->size(); -} - -bool QSequentialIterable_CanReverseIterate(const QSequentialIterable* self) { - return self->canReverseIterate(); -} - -void QSequentialIterable_Delete(QSequentialIterable* self) { - delete self; -} - -QAssociativeIterable* QAssociativeIterable_new(QtMetaTypePrivate__QAssociativeIterableImpl* impl) { - return new QAssociativeIterable(*impl); -} - -QAssociativeIterable* QAssociativeIterable_new2(QAssociativeIterable* param1) { - return new QAssociativeIterable(*param1); -} - -QAssociativeIterable__const_iterator* QAssociativeIterable_Begin(const QAssociativeIterable* self) { - return new QAssociativeIterable::const_iterator(self->begin()); -} - -QAssociativeIterable__const_iterator* QAssociativeIterable_End(const QAssociativeIterable* self) { - return new QAssociativeIterable::const_iterator(self->end()); -} - -QAssociativeIterable__const_iterator* QAssociativeIterable_Find(const QAssociativeIterable* self, QVariant* key) { - return new QAssociativeIterable::const_iterator(self->find(*key)); -} - -QVariant* QAssociativeIterable_Value(const QAssociativeIterable* self, QVariant* key) { - return new QVariant(self->value(*key)); -} - -int QAssociativeIterable_Size(const QAssociativeIterable* self) { - return self->size(); -} - -void QAssociativeIterable_Delete(QAssociativeIterable* self) { - delete self; -} - QVariant__PrivateShared* QVariant__PrivateShared_new(void* v) { return new QVariant::PrivateShared(v); } @@ -622,139 +552,3 @@ void QVariant__Handler_Delete(QVariant__Handler* self) { delete self; } -QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_new(QSequentialIterable__const_iterator* other) { - return new QSequentialIterable::const_iterator(*other); -} - -void QSequentialIterable__const_iterator_OperatorAssign(QSequentialIterable__const_iterator* self, QSequentialIterable__const_iterator* other) { - self->operator=(*other); -} - -QVariant* QSequentialIterable__const_iterator_OperatorMultiply(const QSequentialIterable__const_iterator* self) { - return new QVariant(self->operator*()); -} - -bool QSequentialIterable__const_iterator_OperatorEqual(const QSequentialIterable__const_iterator* self, QSequentialIterable__const_iterator* o) { - return self->operator==(*o); -} - -bool QSequentialIterable__const_iterator_OperatorNotEqual(const QSequentialIterable__const_iterator* self, QSequentialIterable__const_iterator* o) { - return self->operator!=(*o); -} - -QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_OperatorPlusPlus(QSequentialIterable__const_iterator* self) { - QSequentialIterable::const_iterator& _ret = self->operator++(); - // Cast returned reference into pointer - return &_ret; -} - -QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_OperatorPlusPlusWithInt(QSequentialIterable__const_iterator* self, int param1) { - return new QSequentialIterable::const_iterator(self->operator++(static_cast(param1))); -} - -QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_OperatorMinusMinus(QSequentialIterable__const_iterator* self) { - QSequentialIterable::const_iterator& _ret = self->operator--(); - // Cast returned reference into pointer - return &_ret; -} - -QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_OperatorMinusMinusWithInt(QSequentialIterable__const_iterator* self, int param1) { - return new QSequentialIterable::const_iterator(self->operator--(static_cast(param1))); -} - -QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_OperatorPlusAssign(QSequentialIterable__const_iterator* self, int j) { - QSequentialIterable::const_iterator& _ret = self->operator+=(static_cast(j)); - // Cast returned reference into pointer - return &_ret; -} - -QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_OperatorMinusAssign(QSequentialIterable__const_iterator* self, int j) { - QSequentialIterable::const_iterator& _ret = self->operator-=(static_cast(j)); - // Cast returned reference into pointer - return &_ret; -} - -QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_OperatorPlus(const QSequentialIterable__const_iterator* self, int j) { - return new QSequentialIterable::const_iterator(self->operator+(static_cast(j))); -} - -QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_OperatorMinus(const QSequentialIterable__const_iterator* self, int j) { - return new QSequentialIterable::const_iterator(self->operator-(static_cast(j))); -} - -void QSequentialIterable__const_iterator_Delete(QSequentialIterable__const_iterator* self) { - delete self; -} - -QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_new(QAssociativeIterable__const_iterator* other) { - return new QAssociativeIterable::const_iterator(*other); -} - -void QAssociativeIterable__const_iterator_OperatorAssign(QAssociativeIterable__const_iterator* self, QAssociativeIterable__const_iterator* other) { - self->operator=(*other); -} - -QVariant* QAssociativeIterable__const_iterator_Key(const QAssociativeIterable__const_iterator* self) { - return new QVariant(self->key()); -} - -QVariant* QAssociativeIterable__const_iterator_Value(const QAssociativeIterable__const_iterator* self) { - return new QVariant(self->value()); -} - -QVariant* QAssociativeIterable__const_iterator_OperatorMultiply(const QAssociativeIterable__const_iterator* self) { - return new QVariant(self->operator*()); -} - -bool QAssociativeIterable__const_iterator_OperatorEqual(const QAssociativeIterable__const_iterator* self, QAssociativeIterable__const_iterator* o) { - return self->operator==(*o); -} - -bool QAssociativeIterable__const_iterator_OperatorNotEqual(const QAssociativeIterable__const_iterator* self, QAssociativeIterable__const_iterator* o) { - return self->operator!=(*o); -} - -QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_OperatorPlusPlus(QAssociativeIterable__const_iterator* self) { - QAssociativeIterable::const_iterator& _ret = self->operator++(); - // Cast returned reference into pointer - return &_ret; -} - -QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_OperatorPlusPlusWithInt(QAssociativeIterable__const_iterator* self, int param1) { - return new QAssociativeIterable::const_iterator(self->operator++(static_cast(param1))); -} - -QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_OperatorMinusMinus(QAssociativeIterable__const_iterator* self) { - QAssociativeIterable::const_iterator& _ret = self->operator--(); - // Cast returned reference into pointer - return &_ret; -} - -QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_OperatorMinusMinusWithInt(QAssociativeIterable__const_iterator* self, int param1) { - return new QAssociativeIterable::const_iterator(self->operator--(static_cast(param1))); -} - -QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_OperatorPlusAssign(QAssociativeIterable__const_iterator* self, int j) { - QAssociativeIterable::const_iterator& _ret = self->operator+=(static_cast(j)); - // Cast returned reference into pointer - return &_ret; -} - -QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_OperatorMinusAssign(QAssociativeIterable__const_iterator* self, int j) { - QAssociativeIterable::const_iterator& _ret = self->operator-=(static_cast(j)); - // Cast returned reference into pointer - return &_ret; -} - -QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_OperatorPlus(const QAssociativeIterable__const_iterator* self, int j) { - return new QAssociativeIterable::const_iterator(self->operator+(static_cast(j))); -} - -QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_OperatorMinus(const QAssociativeIterable__const_iterator* self, int j) { - return new QAssociativeIterable::const_iterator(self->operator-(static_cast(j))); -} - -void QAssociativeIterable__const_iterator_Delete(QAssociativeIterable__const_iterator* self) { - delete self; -} - diff --git a/qt/gen_qvariant.go b/qt/gen_qvariant.go index f60efdd2..b3a0da7c 100644 --- a/qt/gen_qvariant.go +++ b/qt/gen_qvariant.go @@ -818,177 +818,6 @@ func (this *QVariantComparisonHelper) GoGC() { }) } -type QSequentialIterable struct { - h *C.QSequentialIterable -} - -func (this *QSequentialIterable) cPointer() *C.QSequentialIterable { - if this == nil { - return nil - } - return this.h -} - -func (this *QSequentialIterable) UnsafePointer() unsafe.Pointer { - if this == nil { - return nil - } - return unsafe.Pointer(this.h) -} - -func newQSequentialIterable(h *C.QSequentialIterable) *QSequentialIterable { - if h == nil { - return nil - } - return &QSequentialIterable{h: h} -} - -func UnsafeNewQSequentialIterable(h unsafe.Pointer) *QSequentialIterable { - return newQSequentialIterable((*C.QSequentialIterable)(h)) -} - -// NewQSequentialIterable constructs a new QSequentialIterable object. -func NewQSequentialIterable(impl QtMetaTypePrivate__QSequentialIterableImpl) *QSequentialIterable { - ret := C.QSequentialIterable_new(impl.cPointer()) - return newQSequentialIterable(ret) -} - -// NewQSequentialIterable2 constructs a new QSequentialIterable object. -func NewQSequentialIterable2(param1 *QSequentialIterable) *QSequentialIterable { - ret := C.QSequentialIterable_new2(param1.cPointer()) - return newQSequentialIterable(ret) -} - -func (this *QSequentialIterable) Begin() *QSequentialIterable__const_iterator { - _ret := C.QSequentialIterable_Begin(this.h) - _goptr := newQSequentialIterable__const_iterator(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QSequentialIterable) End() *QSequentialIterable__const_iterator { - _ret := C.QSequentialIterable_End(this.h) - _goptr := newQSequentialIterable__const_iterator(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QSequentialIterable) At(idx int) *QVariant { - _ret := C.QSequentialIterable_At(this.h, (C.int)(idx)) - _goptr := newQVariant(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QSequentialIterable) Size() int { - return (int)(C.QSequentialIterable_Size(this.h)) -} - -func (this *QSequentialIterable) CanReverseIterate() bool { - return (bool)(C.QSequentialIterable_CanReverseIterate(this.h)) -} - -// Delete this object from C++ memory. -func (this *QSequentialIterable) Delete() { - C.QSequentialIterable_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QSequentialIterable) GoGC() { - runtime.SetFinalizer(this, func(this *QSequentialIterable) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} - -type QAssociativeIterable struct { - h *C.QAssociativeIterable -} - -func (this *QAssociativeIterable) cPointer() *C.QAssociativeIterable { - if this == nil { - return nil - } - return this.h -} - -func (this *QAssociativeIterable) UnsafePointer() unsafe.Pointer { - if this == nil { - return nil - } - return unsafe.Pointer(this.h) -} - -func newQAssociativeIterable(h *C.QAssociativeIterable) *QAssociativeIterable { - if h == nil { - return nil - } - return &QAssociativeIterable{h: h} -} - -func UnsafeNewQAssociativeIterable(h unsafe.Pointer) *QAssociativeIterable { - return newQAssociativeIterable((*C.QAssociativeIterable)(h)) -} - -// NewQAssociativeIterable constructs a new QAssociativeIterable object. -func NewQAssociativeIterable(impl QtMetaTypePrivate__QAssociativeIterableImpl) *QAssociativeIterable { - ret := C.QAssociativeIterable_new(impl.cPointer()) - return newQAssociativeIterable(ret) -} - -// NewQAssociativeIterable2 constructs a new QAssociativeIterable object. -func NewQAssociativeIterable2(param1 *QAssociativeIterable) *QAssociativeIterable { - ret := C.QAssociativeIterable_new2(param1.cPointer()) - return newQAssociativeIterable(ret) -} - -func (this *QAssociativeIterable) Begin() *QAssociativeIterable__const_iterator { - _ret := C.QAssociativeIterable_Begin(this.h) - _goptr := newQAssociativeIterable__const_iterator(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QAssociativeIterable) End() *QAssociativeIterable__const_iterator { - _ret := C.QAssociativeIterable_End(this.h) - _goptr := newQAssociativeIterable__const_iterator(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QAssociativeIterable) Find(key *QVariant) *QAssociativeIterable__const_iterator { - _ret := C.QAssociativeIterable_Find(this.h, key.cPointer()) - _goptr := newQAssociativeIterable__const_iterator(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QAssociativeIterable) Value(key *QVariant) *QVariant { - _ret := C.QAssociativeIterable_Value(this.h, key.cPointer()) - _goptr := newQVariant(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QAssociativeIterable) Size() int { - return (int)(C.QAssociativeIterable_Size(this.h)) -} - -// Delete this object from C++ memory. -func (this *QAssociativeIterable) Delete() { - C.QAssociativeIterable_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QAssociativeIterable) GoGC() { - runtime.SetFinalizer(this, func(this *QAssociativeIterable) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} - type QVariant__PrivateShared struct { h *C.QVariant__PrivateShared } @@ -1080,241 +909,3 @@ func (this *QVariant__Handler) GoGC() { runtime.KeepAlive(this.h) }) } - -type QSequentialIterable__const_iterator struct { - h *C.QSequentialIterable__const_iterator -} - -func (this *QSequentialIterable__const_iterator) cPointer() *C.QSequentialIterable__const_iterator { - if this == nil { - return nil - } - return this.h -} - -func (this *QSequentialIterable__const_iterator) UnsafePointer() unsafe.Pointer { - if this == nil { - return nil - } - return unsafe.Pointer(this.h) -} - -func newQSequentialIterable__const_iterator(h *C.QSequentialIterable__const_iterator) *QSequentialIterable__const_iterator { - if h == nil { - return nil - } - return &QSequentialIterable__const_iterator{h: h} -} - -func UnsafeNewQSequentialIterable__const_iterator(h unsafe.Pointer) *QSequentialIterable__const_iterator { - return newQSequentialIterable__const_iterator((*C.QSequentialIterable__const_iterator)(h)) -} - -// NewQSequentialIterable__const_iterator constructs a new QSequentialIterable::const_iterator object. -func NewQSequentialIterable__const_iterator(other *QSequentialIterable__const_iterator) *QSequentialIterable__const_iterator { - ret := C.QSequentialIterable__const_iterator_new(other.cPointer()) - return newQSequentialIterable__const_iterator(ret) -} - -func (this *QSequentialIterable__const_iterator) OperatorAssign(other *QSequentialIterable__const_iterator) { - C.QSequentialIterable__const_iterator_OperatorAssign(this.h, other.cPointer()) -} - -func (this *QSequentialIterable__const_iterator) OperatorMultiply() *QVariant { - _ret := C.QSequentialIterable__const_iterator_OperatorMultiply(this.h) - _goptr := newQVariant(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QSequentialIterable__const_iterator) OperatorEqual(o *QSequentialIterable__const_iterator) bool { - return (bool)(C.QSequentialIterable__const_iterator_OperatorEqual(this.h, o.cPointer())) -} - -func (this *QSequentialIterable__const_iterator) OperatorNotEqual(o *QSequentialIterable__const_iterator) bool { - return (bool)(C.QSequentialIterable__const_iterator_OperatorNotEqual(this.h, o.cPointer())) -} - -func (this *QSequentialIterable__const_iterator) OperatorPlusPlus() *QSequentialIterable__const_iterator { - return UnsafeNewQSequentialIterable__const_iterator(unsafe.Pointer(C.QSequentialIterable__const_iterator_OperatorPlusPlus(this.h))) -} - -func (this *QSequentialIterable__const_iterator) OperatorPlusPlusWithInt(param1 int) *QSequentialIterable__const_iterator { - _ret := C.QSequentialIterable__const_iterator_OperatorPlusPlusWithInt(this.h, (C.int)(param1)) - _goptr := newQSequentialIterable__const_iterator(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QSequentialIterable__const_iterator) OperatorMinusMinus() *QSequentialIterable__const_iterator { - return UnsafeNewQSequentialIterable__const_iterator(unsafe.Pointer(C.QSequentialIterable__const_iterator_OperatorMinusMinus(this.h))) -} - -func (this *QSequentialIterable__const_iterator) OperatorMinusMinusWithInt(param1 int) *QSequentialIterable__const_iterator { - _ret := C.QSequentialIterable__const_iterator_OperatorMinusMinusWithInt(this.h, (C.int)(param1)) - _goptr := newQSequentialIterable__const_iterator(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QSequentialIterable__const_iterator) OperatorPlusAssign(j int) *QSequentialIterable__const_iterator { - return UnsafeNewQSequentialIterable__const_iterator(unsafe.Pointer(C.QSequentialIterable__const_iterator_OperatorPlusAssign(this.h, (C.int)(j)))) -} - -func (this *QSequentialIterable__const_iterator) OperatorMinusAssign(j int) *QSequentialIterable__const_iterator { - return UnsafeNewQSequentialIterable__const_iterator(unsafe.Pointer(C.QSequentialIterable__const_iterator_OperatorMinusAssign(this.h, (C.int)(j)))) -} - -func (this *QSequentialIterable__const_iterator) OperatorPlus(j int) *QSequentialIterable__const_iterator { - _ret := C.QSequentialIterable__const_iterator_OperatorPlus(this.h, (C.int)(j)) - _goptr := newQSequentialIterable__const_iterator(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QSequentialIterable__const_iterator) OperatorMinus(j int) *QSequentialIterable__const_iterator { - _ret := C.QSequentialIterable__const_iterator_OperatorMinus(this.h, (C.int)(j)) - _goptr := newQSequentialIterable__const_iterator(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -// Delete this object from C++ memory. -func (this *QSequentialIterable__const_iterator) Delete() { - C.QSequentialIterable__const_iterator_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QSequentialIterable__const_iterator) GoGC() { - runtime.SetFinalizer(this, func(this *QSequentialIterable__const_iterator) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} - -type QAssociativeIterable__const_iterator struct { - h *C.QAssociativeIterable__const_iterator -} - -func (this *QAssociativeIterable__const_iterator) cPointer() *C.QAssociativeIterable__const_iterator { - if this == nil { - return nil - } - return this.h -} - -func (this *QAssociativeIterable__const_iterator) UnsafePointer() unsafe.Pointer { - if this == nil { - return nil - } - return unsafe.Pointer(this.h) -} - -func newQAssociativeIterable__const_iterator(h *C.QAssociativeIterable__const_iterator) *QAssociativeIterable__const_iterator { - if h == nil { - return nil - } - return &QAssociativeIterable__const_iterator{h: h} -} - -func UnsafeNewQAssociativeIterable__const_iterator(h unsafe.Pointer) *QAssociativeIterable__const_iterator { - return newQAssociativeIterable__const_iterator((*C.QAssociativeIterable__const_iterator)(h)) -} - -// NewQAssociativeIterable__const_iterator constructs a new QAssociativeIterable::const_iterator object. -func NewQAssociativeIterable__const_iterator(other *QAssociativeIterable__const_iterator) *QAssociativeIterable__const_iterator { - ret := C.QAssociativeIterable__const_iterator_new(other.cPointer()) - return newQAssociativeIterable__const_iterator(ret) -} - -func (this *QAssociativeIterable__const_iterator) OperatorAssign(other *QAssociativeIterable__const_iterator) { - C.QAssociativeIterable__const_iterator_OperatorAssign(this.h, other.cPointer()) -} - -func (this *QAssociativeIterable__const_iterator) Key() *QVariant { - _ret := C.QAssociativeIterable__const_iterator_Key(this.h) - _goptr := newQVariant(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QAssociativeIterable__const_iterator) Value() *QVariant { - _ret := C.QAssociativeIterable__const_iterator_Value(this.h) - _goptr := newQVariant(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QAssociativeIterable__const_iterator) OperatorMultiply() *QVariant { - _ret := C.QAssociativeIterable__const_iterator_OperatorMultiply(this.h) - _goptr := newQVariant(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QAssociativeIterable__const_iterator) OperatorEqual(o *QAssociativeIterable__const_iterator) bool { - return (bool)(C.QAssociativeIterable__const_iterator_OperatorEqual(this.h, o.cPointer())) -} - -func (this *QAssociativeIterable__const_iterator) OperatorNotEqual(o *QAssociativeIterable__const_iterator) bool { - return (bool)(C.QAssociativeIterable__const_iterator_OperatorNotEqual(this.h, o.cPointer())) -} - -func (this *QAssociativeIterable__const_iterator) OperatorPlusPlus() *QAssociativeIterable__const_iterator { - return UnsafeNewQAssociativeIterable__const_iterator(unsafe.Pointer(C.QAssociativeIterable__const_iterator_OperatorPlusPlus(this.h))) -} - -func (this *QAssociativeIterable__const_iterator) OperatorPlusPlusWithInt(param1 int) *QAssociativeIterable__const_iterator { - _ret := C.QAssociativeIterable__const_iterator_OperatorPlusPlusWithInt(this.h, (C.int)(param1)) - _goptr := newQAssociativeIterable__const_iterator(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QAssociativeIterable__const_iterator) OperatorMinusMinus() *QAssociativeIterable__const_iterator { - return UnsafeNewQAssociativeIterable__const_iterator(unsafe.Pointer(C.QAssociativeIterable__const_iterator_OperatorMinusMinus(this.h))) -} - -func (this *QAssociativeIterable__const_iterator) OperatorMinusMinusWithInt(param1 int) *QAssociativeIterable__const_iterator { - _ret := C.QAssociativeIterable__const_iterator_OperatorMinusMinusWithInt(this.h, (C.int)(param1)) - _goptr := newQAssociativeIterable__const_iterator(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QAssociativeIterable__const_iterator) OperatorPlusAssign(j int) *QAssociativeIterable__const_iterator { - return UnsafeNewQAssociativeIterable__const_iterator(unsafe.Pointer(C.QAssociativeIterable__const_iterator_OperatorPlusAssign(this.h, (C.int)(j)))) -} - -func (this *QAssociativeIterable__const_iterator) OperatorMinusAssign(j int) *QAssociativeIterable__const_iterator { - return UnsafeNewQAssociativeIterable__const_iterator(unsafe.Pointer(C.QAssociativeIterable__const_iterator_OperatorMinusAssign(this.h, (C.int)(j)))) -} - -func (this *QAssociativeIterable__const_iterator) OperatorPlus(j int) *QAssociativeIterable__const_iterator { - _ret := C.QAssociativeIterable__const_iterator_OperatorPlus(this.h, (C.int)(j)) - _goptr := newQAssociativeIterable__const_iterator(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QAssociativeIterable__const_iterator) OperatorMinus(j int) *QAssociativeIterable__const_iterator { - _ret := C.QAssociativeIterable__const_iterator_OperatorMinus(this.h, (C.int)(j)) - _goptr := newQAssociativeIterable__const_iterator(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -// Delete this object from C++ memory. -func (this *QAssociativeIterable__const_iterator) Delete() { - C.QAssociativeIterable__const_iterator_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QAssociativeIterable__const_iterator) GoGC() { - runtime.SetFinalizer(this, func(this *QAssociativeIterable__const_iterator) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} diff --git a/qt/gen_qvariant.h b/qt/gen_qvariant.h index b2ccf37b..3efa445d 100644 --- a/qt/gen_qvariant.h +++ b/qt/gen_qvariant.h @@ -14,12 +14,6 @@ extern "C" { #endif #ifdef __cplusplus -class QAssociativeIterable; -#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QAssociativeIterable__const_iterator) -typedef QAssociativeIterable::const_iterator QAssociativeIterable__const_iterator; -#else -class QAssociativeIterable__const_iterator; -#endif class QBitArray; class QByteArray; class QChar; @@ -42,12 +36,6 @@ class QRect; class QRectF; class QRegExp; class QRegularExpression; -class QSequentialIterable; -#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QSequentialIterable__const_iterator) -typedef QSequentialIterable::const_iterator QSequentialIterable__const_iterator; -#else -class QSequentialIterable__const_iterator; -#endif class QSize; class QSizeF; class QTime; @@ -65,19 +53,7 @@ typedef QVariant::PrivateShared QVariant__PrivateShared; class QVariant__PrivateShared; #endif class QVariantComparisonHelper; -#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QtMetaTypePrivate__QAssociativeIterableImpl) -typedef QtMetaTypePrivate::QAssociativeIterableImpl QtMetaTypePrivate__QAssociativeIterableImpl; #else -class QtMetaTypePrivate__QAssociativeIterableImpl; -#endif -#if defined(WORKAROUND_INNER_CLASS_DEFINITION_QtMetaTypePrivate__QSequentialIterableImpl) -typedef QtMetaTypePrivate::QSequentialIterableImpl QtMetaTypePrivate__QSequentialIterableImpl; -#else -class QtMetaTypePrivate__QSequentialIterableImpl; -#endif -#else -typedef struct QAssociativeIterable QAssociativeIterable; -typedef struct QAssociativeIterable__const_iterator QAssociativeIterable__const_iterator; typedef struct QBitArray QBitArray; typedef struct QByteArray QByteArray; typedef struct QChar QChar; @@ -100,8 +76,6 @@ typedef struct QRect QRect; typedef struct QRectF QRectF; typedef struct QRegExp QRegExp; typedef struct QRegularExpression QRegularExpression; -typedef struct QSequentialIterable QSequentialIterable; -typedef struct QSequentialIterable__const_iterator QSequentialIterable__const_iterator; typedef struct QSize QSize; typedef struct QSizeF QSizeF; typedef struct QTime QTime; @@ -111,8 +85,6 @@ typedef struct QVariant QVariant; typedef struct QVariant__Handler QVariant__Handler; typedef struct QVariant__PrivateShared QVariant__PrivateShared; typedef struct QVariantComparisonHelper QVariantComparisonHelper; -typedef struct QtMetaTypePrivate__QAssociativeIterableImpl QtMetaTypePrivate__QAssociativeIterableImpl; -typedef struct QtMetaTypePrivate__QSequentialIterableImpl QtMetaTypePrivate__QSequentialIterableImpl; #endif QVariant* QVariant_new(); @@ -231,61 +203,11 @@ QVariantComparisonHelper* QVariantComparisonHelper_new(QVariant* varVal); QVariantComparisonHelper* QVariantComparisonHelper_new2(QVariantComparisonHelper* param1); void QVariantComparisonHelper_Delete(QVariantComparisonHelper* self); -QSequentialIterable* QSequentialIterable_new(QtMetaTypePrivate__QSequentialIterableImpl* impl); -QSequentialIterable* QSequentialIterable_new2(QSequentialIterable* param1); -QSequentialIterable__const_iterator* QSequentialIterable_Begin(const QSequentialIterable* self); -QSequentialIterable__const_iterator* QSequentialIterable_End(const QSequentialIterable* self); -QVariant* QSequentialIterable_At(const QSequentialIterable* self, int idx); -int QSequentialIterable_Size(const QSequentialIterable* self); -bool QSequentialIterable_CanReverseIterate(const QSequentialIterable* self); -void QSequentialIterable_Delete(QSequentialIterable* self); - -QAssociativeIterable* QAssociativeIterable_new(QtMetaTypePrivate__QAssociativeIterableImpl* impl); -QAssociativeIterable* QAssociativeIterable_new2(QAssociativeIterable* param1); -QAssociativeIterable__const_iterator* QAssociativeIterable_Begin(const QAssociativeIterable* self); -QAssociativeIterable__const_iterator* QAssociativeIterable_End(const QAssociativeIterable* self); -QAssociativeIterable__const_iterator* QAssociativeIterable_Find(const QAssociativeIterable* self, QVariant* key); -QVariant* QAssociativeIterable_Value(const QAssociativeIterable* self, QVariant* key); -int QAssociativeIterable_Size(const QAssociativeIterable* self); -void QAssociativeIterable_Delete(QAssociativeIterable* self); - QVariant__PrivateShared* QVariant__PrivateShared_new(void* v); void QVariant__PrivateShared_Delete(QVariant__PrivateShared* self); void QVariant__Handler_Delete(QVariant__Handler* self); -QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_new(QSequentialIterable__const_iterator* other); -void QSequentialIterable__const_iterator_OperatorAssign(QSequentialIterable__const_iterator* self, QSequentialIterable__const_iterator* other); -QVariant* QSequentialIterable__const_iterator_OperatorMultiply(const QSequentialIterable__const_iterator* self); -bool QSequentialIterable__const_iterator_OperatorEqual(const QSequentialIterable__const_iterator* self, QSequentialIterable__const_iterator* o); -bool QSequentialIterable__const_iterator_OperatorNotEqual(const QSequentialIterable__const_iterator* self, QSequentialIterable__const_iterator* o); -QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_OperatorPlusPlus(QSequentialIterable__const_iterator* self); -QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_OperatorPlusPlusWithInt(QSequentialIterable__const_iterator* self, int param1); -QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_OperatorMinusMinus(QSequentialIterable__const_iterator* self); -QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_OperatorMinusMinusWithInt(QSequentialIterable__const_iterator* self, int param1); -QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_OperatorPlusAssign(QSequentialIterable__const_iterator* self, int j); -QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_OperatorMinusAssign(QSequentialIterable__const_iterator* self, int j); -QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_OperatorPlus(const QSequentialIterable__const_iterator* self, int j); -QSequentialIterable__const_iterator* QSequentialIterable__const_iterator_OperatorMinus(const QSequentialIterable__const_iterator* self, int j); -void QSequentialIterable__const_iterator_Delete(QSequentialIterable__const_iterator* self); - -QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_new(QAssociativeIterable__const_iterator* other); -void QAssociativeIterable__const_iterator_OperatorAssign(QAssociativeIterable__const_iterator* self, QAssociativeIterable__const_iterator* other); -QVariant* QAssociativeIterable__const_iterator_Key(const QAssociativeIterable__const_iterator* self); -QVariant* QAssociativeIterable__const_iterator_Value(const QAssociativeIterable__const_iterator* self); -QVariant* QAssociativeIterable__const_iterator_OperatorMultiply(const QAssociativeIterable__const_iterator* self); -bool QAssociativeIterable__const_iterator_OperatorEqual(const QAssociativeIterable__const_iterator* self, QAssociativeIterable__const_iterator* o); -bool QAssociativeIterable__const_iterator_OperatorNotEqual(const QAssociativeIterable__const_iterator* self, QAssociativeIterable__const_iterator* o); -QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_OperatorPlusPlus(QAssociativeIterable__const_iterator* self); -QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_OperatorPlusPlusWithInt(QAssociativeIterable__const_iterator* self, int param1); -QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_OperatorMinusMinus(QAssociativeIterable__const_iterator* self); -QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_OperatorMinusMinusWithInt(QAssociativeIterable__const_iterator* self, int param1); -QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_OperatorPlusAssign(QAssociativeIterable__const_iterator* self, int j); -QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_OperatorMinusAssign(QAssociativeIterable__const_iterator* self, int j); -QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_OperatorPlus(const QAssociativeIterable__const_iterator* self, int j); -QAssociativeIterable__const_iterator* QAssociativeIterable__const_iterator_OperatorMinus(const QAssociativeIterable__const_iterator* self, int j); -void QAssociativeIterable__const_iterator_Delete(QAssociativeIterable__const_iterator* self); - #ifdef __cplusplus } /* extern C */ #endif