From 910babe1d2fe714c1229ca2fca0da802e1cdac36 Mon Sep 17 00:00:00 2001 From: mappu Date: Mon, 4 Nov 2024 22:24:09 +1300 Subject: [PATCH] qt/cbor: rebuild for new subpackage path [BREAKING] --- qt/cbor/cflags.go | 8 + qt/{ => cbor}/gen_qcborarray.cpp | 0 qt/{ => cbor}/gen_qcborarray.go | 11 +- qt/{ => cbor}/gen_qcborarray.h | 2 +- qt/{ => cbor}/gen_qcborcommon.cpp | 0 qt/{ => cbor}/gen_qcborcommon.go | 2 +- {qt6 => qt/cbor}/gen_qcborcommon.h | 2 +- qt/{ => cbor}/gen_qcbormap.cpp | 0 qt/{ => cbor}/gen_qcbormap.go | 31 +- qt/{ => cbor}/gen_qcbormap.h | 2 +- qt/{ => cbor}/gen_qcborstreamreader.cpp | 0 {qt6 => qt/cbor}/gen_qcborstreamreader.go | 15 +- qt/{ => cbor}/gen_qcborstreamreader.h | 2 +- qt/{ => cbor}/gen_qcborstreamwriter.cpp | 0 {qt6 => qt/cbor}/gen_qcborstreamwriter.go | 15 +- {qt6 => qt/cbor}/gen_qcborstreamwriter.h | 2 +- qt/{ => cbor}/gen_qcborvalue.cpp | 0 qt/{ => cbor}/gen_qcborvalue.go | 123 ++--- qt/{ => cbor}/gen_qcborvalue.h | 2 +- qt/gen_qmetatype.go | 2 + qt6/cbor/cflags.go | 7 + qt6/{ => cbor}/gen_qcborarray.cpp | 21 +- qt6/{ => cbor}/gen_qcborarray.go | 27 +- qt6/{ => cbor}/gen_qcborarray.h | 15 +- qt6/{ => cbor}/gen_qcborcommon.cpp | 0 qt6/{ => cbor}/gen_qcborcommon.go | 2 +- {qt => qt6/cbor}/gen_qcborcommon.h | 2 +- qt6/{ => cbor}/gen_qcbormap.cpp | 17 +- qt6/{ => cbor}/gen_qcbormap.go | 51 +- qt6/{ => cbor}/gen_qcbormap.h | 11 +- qt6/{ => cbor}/gen_qcborstreamreader.cpp | 0 {qt => qt6/cbor}/gen_qcborstreamreader.go | 15 +- qt6/{ => cbor}/gen_qcborstreamreader.h | 2 +- qt6/{ => cbor}/gen_qcborstreamwriter.cpp | 0 {qt => qt6/cbor}/gen_qcborstreamwriter.go | 15 +- {qt => qt6/cbor}/gen_qcborstreamwriter.h | 2 +- qt6/{ => cbor}/gen_qcborvalue.cpp | 359 +------------- qt6/{ => cbor}/gen_qcborvalue.go | 568 ++++------------------ qt6/{ => cbor}/gen_qcborvalue.h | 88 +--- qt6/gen_qmetatype.go | 2 + 40 files changed, 315 insertions(+), 1108 deletions(-) create mode 100644 qt/cbor/cflags.go rename qt/{ => cbor}/gen_qcborarray.cpp (100%) rename qt/{ => cbor}/gen_qcborarray.go (98%) rename qt/{ => cbor}/gen_qcborarray.h (99%) rename qt/{ => cbor}/gen_qcborcommon.cpp (100%) rename qt/{ => cbor}/gen_qcborcommon.go (99%) rename {qt6 => qt/cbor}/gen_qcborcommon.h (92%) rename qt/{ => cbor}/gen_qcbormap.cpp (100%) rename qt/{ => cbor}/gen_qcbormap.go (97%) rename qt/{ => cbor}/gen_qcbormap.h (99%) rename qt/{ => cbor}/gen_qcborstreamreader.cpp (100%) rename {qt6 => qt/cbor}/gen_qcborstreamreader.go (95%) rename qt/{ => cbor}/gen_qcborstreamreader.h (99%) rename qt/{ => cbor}/gen_qcborstreamwriter.cpp (100%) rename {qt6 => qt/cbor}/gen_qcborstreamwriter.go (90%) rename {qt6 => qt/cbor}/gen_qcborstreamwriter.h (98%) rename qt/{ => cbor}/gen_qcborvalue.cpp (100%) rename qt/{ => cbor}/gen_qcborvalue.go (89%) rename qt/{ => cbor}/gen_qcborvalue.h (99%) create mode 100644 qt6/cbor/cflags.go rename qt6/{ => cbor}/gen_qcborarray.cpp (94%) rename qt6/{ => cbor}/gen_qcborarray.go (97%) rename qt6/{ => cbor}/gen_qcborarray.h (93%) rename qt6/{ => cbor}/gen_qcborcommon.cpp (100%) rename qt6/{ => cbor}/gen_qcborcommon.go (99%) rename {qt => qt6/cbor}/gen_qcborcommon.h (92%) rename qt6/{ => cbor}/gen_qcbormap.cpp (97%) rename qt6/{ => cbor}/gen_qcbormap.go (95%) rename qt6/{ => cbor}/gen_qcbormap.h (95%) rename qt6/{ => cbor}/gen_qcborstreamreader.cpp (100%) rename {qt => qt6/cbor}/gen_qcborstreamreader.go (95%) rename qt6/{ => cbor}/gen_qcborstreamreader.h (99%) rename qt6/{ => cbor}/gen_qcborstreamwriter.cpp (100%) rename {qt => qt6/cbor}/gen_qcborstreamwriter.go (90%) rename {qt => qt6/cbor}/gen_qcborstreamwriter.h (98%) rename qt6/{ => cbor}/gen_qcborvalue.cpp (67%) rename qt6/{ => cbor}/gen_qcborvalue.go (65%) rename qt6/{ => cbor}/gen_qcborvalue.h (65%) diff --git a/qt/cbor/cflags.go b/qt/cbor/cflags.go new file mode 100644 index 00000000..0c326444 --- /dev/null +++ b/qt/cbor/cflags.go @@ -0,0 +1,8 @@ +package cbor + +/* +#cgo CXXFLAGS: -std=c++11 +#cgo CFLAGS: -std=gnu11 -fPIC +#cgo pkg-config: Qt5Core +*/ +import "C" diff --git a/qt/gen_qcborarray.cpp b/qt/cbor/gen_qcborarray.cpp similarity index 100% rename from qt/gen_qcborarray.cpp rename to qt/cbor/gen_qcborarray.cpp diff --git a/qt/gen_qcborarray.go b/qt/cbor/gen_qcborarray.go similarity index 98% rename from qt/gen_qcborarray.go rename to qt/cbor/gen_qcborarray.go index 9caa531b..7a523bd6 100644 --- a/qt/gen_qcborarray.go +++ b/qt/cbor/gen_qcborarray.go @@ -1,4 +1,4 @@ -package qt +package cbor /* @@ -9,6 +9,7 @@ package qt import "C" import ( + "github.com/mappu/miqt/qt" "runtime" "unsafe" ) @@ -345,16 +346,16 @@ func QCborArray_FromStringList(list []string) *QCborArray { return _goptr } -func QCborArray_FromJsonArray(array *QJsonArray) *QCborArray { - _ret := C.QCborArray_FromJsonArray(array.cPointer()) +func QCborArray_FromJsonArray(array *qt.QJsonArray) *QCborArray { + _ret := C.QCborArray_FromJsonArray((*C.QJsonArray)(array.UnsafePointer())) _goptr := newQCborArray(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborArray) ToJsonArray() *QJsonArray { +func (this *QCborArray) ToJsonArray() *qt.QJsonArray { _ret := C.QCborArray_ToJsonArray(this.h) - _goptr := newQJsonArray(_ret) + _goptr := qt.UnsafeNewQJsonArray(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt/gen_qcborarray.h b/qt/cbor/gen_qcborarray.h similarity index 99% rename from qt/gen_qcborarray.h rename to qt/cbor/gen_qcborarray.h index f0b017ec..0ca6b1e1 100644 --- a/qt/gen_qcborarray.h +++ b/qt/cbor/gen_qcborarray.h @@ -7,7 +7,7 @@ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#include "../libmiqt/libmiqt.h" +#include "../../libmiqt/libmiqt.h" #ifdef __cplusplus extern "C" { diff --git a/qt/gen_qcborcommon.cpp b/qt/cbor/gen_qcborcommon.cpp similarity index 100% rename from qt/gen_qcborcommon.cpp rename to qt/cbor/gen_qcborcommon.cpp diff --git a/qt/gen_qcborcommon.go b/qt/cbor/gen_qcborcommon.go similarity index 99% rename from qt/gen_qcborcommon.go rename to qt/cbor/gen_qcborcommon.go index af24a823..e1e52613 100644 --- a/qt/gen_qcborcommon.go +++ b/qt/cbor/gen_qcborcommon.go @@ -1,4 +1,4 @@ -package qt +package cbor /* diff --git a/qt6/gen_qcborcommon.h b/qt/cbor/gen_qcborcommon.h similarity index 92% rename from qt6/gen_qcborcommon.h rename to qt/cbor/gen_qcborcommon.h index e35b942f..3c893790 100644 --- a/qt6/gen_qcborcommon.h +++ b/qt/cbor/gen_qcborcommon.h @@ -7,7 +7,7 @@ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#include "../libmiqt/libmiqt.h" +#include "../../libmiqt/libmiqt.h" #ifdef __cplusplus extern "C" { diff --git a/qt/gen_qcbormap.cpp b/qt/cbor/gen_qcbormap.cpp similarity index 100% rename from qt/gen_qcbormap.cpp rename to qt/cbor/gen_qcbormap.cpp diff --git a/qt/gen_qcbormap.go b/qt/cbor/gen_qcbormap.go similarity index 97% rename from qt/gen_qcbormap.go rename to qt/cbor/gen_qcbormap.go index 7348b390..c768016f 100644 --- a/qt/gen_qcbormap.go +++ b/qt/cbor/gen_qcbormap.go @@ -1,4 +1,4 @@ -package qt +package cbor /* @@ -9,6 +9,7 @@ package qt import "C" import ( + "github.com/mappu/miqt/qt" "runtime" "unsafe" ) @@ -430,7 +431,7 @@ func (this *QCborMap) Insert4(key *QCborValue, value_ *QCborValue) *QCborMap__It return _goptr } -func QCborMap_FromVariantMap(mapVal map[string]QVariant) *QCborMap { +func QCborMap_FromVariantMap(mapVal map[string]qt.QVariant) *QCborMap { mapVal_Keys_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(int(unsafe.Sizeof(C.struct_miqt_string{})) * len(mapVal)))) defer C.free(unsafe.Pointer(mapVal_Keys_CArray)) mapVal_Values_CArray := (*[0xffff]*C.QVariant)(C.malloc(C.size_t(8 * len(mapVal)))) @@ -442,7 +443,7 @@ func QCborMap_FromVariantMap(mapVal map[string]QVariant) *QCborMap { mapVal_k_ms.len = C.size_t(len(mapVal_k)) defer C.free(unsafe.Pointer(mapVal_k_ms.data)) mapVal_Keys_CArray[mapVal_ctr] = mapVal_k_ms - mapVal_Values_CArray[mapVal_ctr] = mapVal_v.cPointer() + mapVal_Values_CArray[mapVal_ctr] = (*C.QVariant)(mapVal_v.UnsafePointer()) mapVal_ctr++ } mapVal_mm := C.struct_miqt_map{ @@ -456,7 +457,7 @@ func QCborMap_FromVariantMap(mapVal map[string]QVariant) *QCborMap { return _goptr } -func QCborMap_FromVariantHash(hash map[string]QVariant) *QCborMap { +func QCborMap_FromVariantHash(hash map[string]qt.QVariant) *QCborMap { hash_Keys_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(int(unsafe.Sizeof(C.struct_miqt_string{})) * len(hash)))) defer C.free(unsafe.Pointer(hash_Keys_CArray)) hash_Values_CArray := (*[0xffff]*C.QVariant)(C.malloc(C.size_t(8 * len(hash)))) @@ -468,7 +469,7 @@ func QCborMap_FromVariantHash(hash map[string]QVariant) *QCborMap { hash_k_ms.len = C.size_t(len(hash_k)) defer C.free(unsafe.Pointer(hash_k_ms.data)) hash_Keys_CArray[hash_ctr] = hash_k_ms - hash_Values_CArray[hash_ctr] = hash_v.cPointer() + hash_Values_CArray[hash_ctr] = (*C.QVariant)(hash_v.UnsafePointer()) hash_ctr++ } hash_mm := C.struct_miqt_map{ @@ -482,16 +483,16 @@ func QCborMap_FromVariantHash(hash map[string]QVariant) *QCborMap { return _goptr } -func QCborMap_FromJsonObject(o *QJsonObject) *QCborMap { - _ret := C.QCborMap_FromJsonObject(o.cPointer()) +func QCborMap_FromJsonObject(o *qt.QJsonObject) *QCborMap { + _ret := C.QCborMap_FromJsonObject((*C.QJsonObject)(o.UnsafePointer())) _goptr := newQCborMap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborMap) ToVariantMap() map[string]QVariant { +func (this *QCborMap) ToVariantMap() map[string]qt.QVariant { var _mm C.struct_miqt_map = C.QCborMap_ToVariantMap(this.h) - _ret := make(map[string]QVariant, int(_mm.len)) + _ret := make(map[string]qt.QVariant, int(_mm.len)) _Keys := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_mm.keys)) _Values := (*[0xffff]*C.QVariant)(unsafe.Pointer(_mm.values)) for i := 0; i < int(_mm.len); i++ { @@ -500,7 +501,7 @@ func (this *QCborMap) ToVariantMap() map[string]QVariant { C.free(unsafe.Pointer(_mapkey_ms.data)) _entry_Key := _mapkey_ret _mapval_ret := _Values[i] - _mapval_goptr := newQVariant(_mapval_ret) + _mapval_goptr := qt.UnsafeNewQVariant(unsafe.Pointer(_mapval_ret)) _mapval_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer _entry_Value := *_mapval_goptr @@ -509,9 +510,9 @@ func (this *QCborMap) ToVariantMap() map[string]QVariant { return _ret } -func (this *QCborMap) ToVariantHash() map[string]QVariant { +func (this *QCborMap) ToVariantHash() map[string]qt.QVariant { var _mm C.struct_miqt_map = C.QCborMap_ToVariantHash(this.h) - _ret := make(map[string]QVariant, int(_mm.len)) + _ret := make(map[string]qt.QVariant, int(_mm.len)) _Keys := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_mm.keys)) _Values := (*[0xffff]*C.QVariant)(unsafe.Pointer(_mm.values)) for i := 0; i < int(_mm.len); i++ { @@ -520,7 +521,7 @@ func (this *QCborMap) ToVariantHash() map[string]QVariant { C.free(unsafe.Pointer(_hashkey_ms.data)) _entry_Key := _hashkey_ret _hashval_ret := _Values[i] - _hashval_goptr := newQVariant(_hashval_ret) + _hashval_goptr := qt.UnsafeNewQVariant(unsafe.Pointer(_hashval_ret)) _hashval_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer _entry_Value := *_hashval_goptr @@ -529,9 +530,9 @@ func (this *QCborMap) ToVariantHash() map[string]QVariant { return _ret } -func (this *QCborMap) ToJsonObject() *QJsonObject { +func (this *QCborMap) ToJsonObject() *qt.QJsonObject { _ret := C.QCborMap_ToJsonObject(this.h) - _goptr := newQJsonObject(_ret) + _goptr := qt.UnsafeNewQJsonObject(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt/gen_qcbormap.h b/qt/cbor/gen_qcbormap.h similarity index 99% rename from qt/gen_qcbormap.h rename to qt/cbor/gen_qcbormap.h index ceb3db7a..527178ba 100644 --- a/qt/gen_qcbormap.h +++ b/qt/cbor/gen_qcbormap.h @@ -7,7 +7,7 @@ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#include "../libmiqt/libmiqt.h" +#include "../../libmiqt/libmiqt.h" #ifdef __cplusplus extern "C" { diff --git a/qt/gen_qcborstreamreader.cpp b/qt/cbor/gen_qcborstreamreader.cpp similarity index 100% rename from qt/gen_qcborstreamreader.cpp rename to qt/cbor/gen_qcborstreamreader.cpp diff --git a/qt6/gen_qcborstreamreader.go b/qt/cbor/gen_qcborstreamreader.go similarity index 95% rename from qt6/gen_qcborstreamreader.go rename to qt/cbor/gen_qcborstreamreader.go index 283f018b..57a5e1df 100644 --- a/qt6/gen_qcborstreamreader.go +++ b/qt/cbor/gen_qcborstreamreader.go @@ -1,4 +1,4 @@ -package qt6 +package cbor /* @@ -9,6 +9,7 @@ package qt6 import "C" import ( + "github.com/mappu/miqt/qt" "runtime" "unsafe" ) @@ -100,17 +101,17 @@ func NewQCborStreamReader4(data []byte) *QCborStreamReader { } // NewQCborStreamReader5 constructs a new QCborStreamReader object. -func NewQCborStreamReader5(device *QIODevice) *QCborStreamReader { - ret := C.QCborStreamReader_new5(device.cPointer()) +func NewQCborStreamReader5(device *qt.QIODevice) *QCborStreamReader { + ret := C.QCborStreamReader_new5((*C.QIODevice)(device.UnsafePointer())) return newQCborStreamReader(ret) } -func (this *QCborStreamReader) SetDevice(device *QIODevice) { - C.QCborStreamReader_SetDevice(this.h, device.cPointer()) +func (this *QCborStreamReader) SetDevice(device *qt.QIODevice) { + C.QCborStreamReader_SetDevice(this.h, (*C.QIODevice)(device.UnsafePointer())) } -func (this *QCborStreamReader) Device() *QIODevice { - return UnsafeNewQIODevice(unsafe.Pointer(C.QCborStreamReader_Device(this.h))) +func (this *QCborStreamReader) Device() *qt.QIODevice { + return qt.UnsafeNewQIODevice(unsafe.Pointer(C.QCborStreamReader_Device(this.h))) } func (this *QCborStreamReader) AddData(data []byte) { diff --git a/qt/gen_qcborstreamreader.h b/qt/cbor/gen_qcborstreamreader.h similarity index 99% rename from qt/gen_qcborstreamreader.h rename to qt/cbor/gen_qcborstreamreader.h index 4de66206..bcca845b 100644 --- a/qt/gen_qcborstreamreader.h +++ b/qt/cbor/gen_qcborstreamreader.h @@ -7,7 +7,7 @@ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#include "../libmiqt/libmiqt.h" +#include "../../libmiqt/libmiqt.h" #ifdef __cplusplus extern "C" { diff --git a/qt/gen_qcborstreamwriter.cpp b/qt/cbor/gen_qcborstreamwriter.cpp similarity index 100% rename from qt/gen_qcborstreamwriter.cpp rename to qt/cbor/gen_qcborstreamwriter.cpp diff --git a/qt6/gen_qcborstreamwriter.go b/qt/cbor/gen_qcborstreamwriter.go similarity index 90% rename from qt6/gen_qcborstreamwriter.go rename to qt/cbor/gen_qcborstreamwriter.go index 6580189c..2a869139 100644 --- a/qt6/gen_qcborstreamwriter.go +++ b/qt/cbor/gen_qcborstreamwriter.go @@ -1,4 +1,4 @@ -package qt6 +package cbor /* @@ -9,6 +9,7 @@ package qt6 import "C" import ( + "github.com/mappu/miqt/qt" "runtime" "unsafe" ) @@ -43,17 +44,17 @@ func UnsafeNewQCborStreamWriter(h unsafe.Pointer) *QCborStreamWriter { } // NewQCborStreamWriter constructs a new QCborStreamWriter object. -func NewQCborStreamWriter(device *QIODevice) *QCborStreamWriter { - ret := C.QCborStreamWriter_new(device.cPointer()) +func NewQCborStreamWriter(device *qt.QIODevice) *QCborStreamWriter { + ret := C.QCborStreamWriter_new((*C.QIODevice)(device.UnsafePointer())) return newQCborStreamWriter(ret) } -func (this *QCborStreamWriter) SetDevice(device *QIODevice) { - C.QCborStreamWriter_SetDevice(this.h, device.cPointer()) +func (this *QCborStreamWriter) SetDevice(device *qt.QIODevice) { + C.QCborStreamWriter_SetDevice(this.h, (*C.QIODevice)(device.UnsafePointer())) } -func (this *QCborStreamWriter) Device() *QIODevice { - return UnsafeNewQIODevice(unsafe.Pointer(C.QCborStreamWriter_Device(this.h))) +func (this *QCborStreamWriter) Device() *qt.QIODevice { + return qt.UnsafeNewQIODevice(unsafe.Pointer(C.QCborStreamWriter_Device(this.h))) } func (this *QCborStreamWriter) Append(u uint64) { diff --git a/qt6/gen_qcborstreamwriter.h b/qt/cbor/gen_qcborstreamwriter.h similarity index 98% rename from qt6/gen_qcborstreamwriter.h rename to qt/cbor/gen_qcborstreamwriter.h index 3d3d1234..ecc958d7 100644 --- a/qt6/gen_qcborstreamwriter.h +++ b/qt/cbor/gen_qcborstreamwriter.h @@ -7,7 +7,7 @@ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#include "../libmiqt/libmiqt.h" +#include "../../libmiqt/libmiqt.h" #ifdef __cplusplus extern "C" { diff --git a/qt/gen_qcborvalue.cpp b/qt/cbor/gen_qcborvalue.cpp similarity index 100% rename from qt/gen_qcborvalue.cpp rename to qt/cbor/gen_qcborvalue.cpp diff --git a/qt/gen_qcborvalue.go b/qt/cbor/gen_qcborvalue.go similarity index 89% rename from qt/gen_qcborvalue.go rename to qt/cbor/gen_qcborvalue.go index 59307408..bf585163 100644 --- a/qt/gen_qcborvalue.go +++ b/qt/cbor/gen_qcborvalue.go @@ -1,4 +1,4 @@ -package qt +package cbor /* @@ -9,6 +9,7 @@ package qt import "C" import ( + "github.com/mappu/miqt/qt" "runtime" "unsafe" ) @@ -232,26 +233,26 @@ func NewQCborValue15(t_ QCborKnownTags) *QCborValue { } // NewQCborValue16 constructs a new QCborValue object. -func NewQCborValue16(dt *QDateTime) *QCborValue { - ret := C.QCborValue_new16(dt.cPointer()) +func NewQCborValue16(dt *qt.QDateTime) *QCborValue { + ret := C.QCborValue_new16((*C.QDateTime)(dt.UnsafePointer())) return newQCborValue(ret) } // NewQCborValue17 constructs a new QCborValue object. -func NewQCborValue17(url *QUrl) *QCborValue { - ret := C.QCborValue_new17(url.cPointer()) +func NewQCborValue17(url *qt.QUrl) *QCborValue { + ret := C.QCborValue_new17((*C.QUrl)(url.UnsafePointer())) return newQCborValue(ret) } // NewQCborValue18 constructs a new QCborValue object. -func NewQCborValue18(rx *QRegularExpression) *QCborValue { - ret := C.QCborValue_new18(rx.cPointer()) +func NewQCborValue18(rx *qt.QRegularExpression) *QCborValue { + ret := C.QCborValue_new18((*C.QRegularExpression)(rx.UnsafePointer())) return newQCborValue(ret) } // NewQCborValue19 constructs a new QCborValue object. -func NewQCborValue19(uuid *QUuid) *QCborValue { - ret := C.QCborValue_new19(uuid.cPointer()) +func NewQCborValue19(uuid *qt.QUuid) *QCborValue { + ret := C.QCborValue_new19((*C.QUuid)(uuid.UnsafePointer())) return newQCborValue(ret) } @@ -406,30 +407,30 @@ func (this *QCborValue) ToString() string { return _ret } -func (this *QCborValue) ToDateTime() *QDateTime { +func (this *QCborValue) ToDateTime() *qt.QDateTime { _ret := C.QCborValue_ToDateTime(this.h) - _goptr := newQDateTime(_ret) + _goptr := qt.UnsafeNewQDateTime(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValue) ToUrl() *QUrl { +func (this *QCborValue) ToUrl() *qt.QUrl { _ret := C.QCborValue_ToUrl(this.h) - _goptr := newQUrl(_ret) + _goptr := qt.UnsafeNewQUrl(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValue) ToRegularExpression() *QRegularExpression { +func (this *QCborValue) ToRegularExpression() *qt.QRegularExpression { _ret := C.QCborValue_ToRegularExpression(this.h) - _goptr := newQRegularExpression(_ret) + _goptr := qt.UnsafeNewQRegularExpression(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValue) ToUuid() *QUuid { +func (this *QCborValue) ToUuid() *qt.QUuid { _ret := C.QCborValue_ToUuid(this.h) - _goptr := newQUuid(_ret) + _goptr := qt.UnsafeNewQUuid(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -514,30 +515,30 @@ func (this *QCborValue) OperatorLesser(other *QCborValue) bool { return (bool)(C.QCborValue_OperatorLesser(this.h, other.cPointer())) } -func QCborValue_FromVariant(variant *QVariant) *QCborValue { - _ret := C.QCborValue_FromVariant(variant.cPointer()) +func QCborValue_FromVariant(variant *qt.QVariant) *QCborValue { + _ret := C.QCborValue_FromVariant((*C.QVariant)(variant.UnsafePointer())) _goptr := newQCborValue(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValue) ToVariant() *QVariant { +func (this *QCborValue) ToVariant() *qt.QVariant { _ret := C.QCborValue_ToVariant(this.h) - _goptr := newQVariant(_ret) + _goptr := qt.UnsafeNewQVariant(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QCborValue_FromJsonValue(v *QJsonValue) *QCborValue { - _ret := C.QCborValue_FromJsonValue(v.cPointer()) +func QCborValue_FromJsonValue(v *qt.QJsonValue) *QCborValue { + _ret := C.QCborValue_FromJsonValue((*C.QJsonValue)(v.UnsafePointer())) _goptr := newQCborValue(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValue) ToJsonValue() *QJsonValue { +func (this *QCborValue) ToJsonValue() *qt.QJsonValue { _ret := C.QCborValue_ToJsonValue(this.h) - _goptr := newQJsonValue(_ret) + _goptr := qt.UnsafeNewQJsonValue(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -641,30 +642,30 @@ func (this *QCborValue) ToString1(defaultValue string) string { return _ret } -func (this *QCborValue) ToDateTime1(defaultValue *QDateTime) *QDateTime { - _ret := C.QCborValue_ToDateTime1(this.h, defaultValue.cPointer()) - _goptr := newQDateTime(_ret) +func (this *QCborValue) ToDateTime1(defaultValue *qt.QDateTime) *qt.QDateTime { + _ret := C.QCborValue_ToDateTime1(this.h, (*C.QDateTime)(defaultValue.UnsafePointer())) + _goptr := qt.UnsafeNewQDateTime(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValue) ToUrl1(defaultValue *QUrl) *QUrl { - _ret := C.QCborValue_ToUrl1(this.h, defaultValue.cPointer()) - _goptr := newQUrl(_ret) +func (this *QCborValue) ToUrl1(defaultValue *qt.QUrl) *qt.QUrl { + _ret := C.QCborValue_ToUrl1(this.h, (*C.QUrl)(defaultValue.UnsafePointer())) + _goptr := qt.UnsafeNewQUrl(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValue) ToRegularExpression1(defaultValue *QRegularExpression) *QRegularExpression { - _ret := C.QCborValue_ToRegularExpression1(this.h, defaultValue.cPointer()) - _goptr := newQRegularExpression(_ret) +func (this *QCborValue) ToRegularExpression1(defaultValue *qt.QRegularExpression) *qt.QRegularExpression { + _ret := C.QCborValue_ToRegularExpression1(this.h, (*C.QRegularExpression)(defaultValue.UnsafePointer())) + _goptr := qt.UnsafeNewQRegularExpression(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValue) ToUuid1(defaultValue *QUuid) *QUuid { - _ret := C.QCborValue_ToUuid1(this.h, defaultValue.cPointer()) - _goptr := newQUuid(_ret) +func (this *QCborValue) ToUuid1(defaultValue *qt.QUuid) *qt.QUuid { + _ret := C.QCborValue_ToUuid1(this.h, (*C.QUuid)(defaultValue.UnsafePointer())) + _goptr := qt.UnsafeNewQUuid(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -891,30 +892,30 @@ func (this *QCborValueRef) ToString() string { return _ret } -func (this *QCborValueRef) ToDateTime() *QDateTime { +func (this *QCborValueRef) ToDateTime() *qt.QDateTime { _ret := C.QCborValueRef_ToDateTime(this.h) - _goptr := newQDateTime(_ret) + _goptr := qt.UnsafeNewQDateTime(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValueRef) ToUrl() *QUrl { +func (this *QCborValueRef) ToUrl() *qt.QUrl { _ret := C.QCborValueRef_ToUrl(this.h) - _goptr := newQUrl(_ret) + _goptr := qt.UnsafeNewQUrl(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValueRef) ToRegularExpression() *QRegularExpression { +func (this *QCborValueRef) ToRegularExpression() *qt.QRegularExpression { _ret := C.QCborValueRef_ToRegularExpression(this.h) - _goptr := newQRegularExpression(_ret) + _goptr := qt.UnsafeNewQRegularExpression(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValueRef) ToUuid() *QUuid { +func (this *QCborValueRef) ToUuid() *qt.QUuid { _ret := C.QCborValueRef_ToUuid(this.h) - _goptr := newQUuid(_ret) + _goptr := qt.UnsafeNewQUuid(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -999,16 +1000,16 @@ func (this *QCborValueRef) OperatorLesser(other *QCborValue) bool { return (bool)(C.QCborValueRef_OperatorLesser(this.h, other.cPointer())) } -func (this *QCborValueRef) ToVariant() *QVariant { +func (this *QCborValueRef) ToVariant() *qt.QVariant { _ret := C.QCborValueRef_ToVariant(this.h) - _goptr := newQVariant(_ret) + _goptr := qt.UnsafeNewQVariant(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValueRef) ToJsonValue() *QJsonValue { +func (this *QCborValueRef) ToJsonValue() *qt.QJsonValue { _ret := C.QCborValueRef_ToJsonValue(this.h) - _goptr := newQJsonValue(_ret) + _goptr := qt.UnsafeNewQJsonValue(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -1075,30 +1076,30 @@ func (this *QCborValueRef) ToString1(defaultValue string) string { return _ret } -func (this *QCborValueRef) ToDateTime1(defaultValue *QDateTime) *QDateTime { - _ret := C.QCborValueRef_ToDateTime1(this.h, defaultValue.cPointer()) - _goptr := newQDateTime(_ret) +func (this *QCborValueRef) ToDateTime1(defaultValue *qt.QDateTime) *qt.QDateTime { + _ret := C.QCborValueRef_ToDateTime1(this.h, (*C.QDateTime)(defaultValue.UnsafePointer())) + _goptr := qt.UnsafeNewQDateTime(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValueRef) ToUrl1(defaultValue *QUrl) *QUrl { - _ret := C.QCborValueRef_ToUrl1(this.h, defaultValue.cPointer()) - _goptr := newQUrl(_ret) +func (this *QCborValueRef) ToUrl1(defaultValue *qt.QUrl) *qt.QUrl { + _ret := C.QCborValueRef_ToUrl1(this.h, (*C.QUrl)(defaultValue.UnsafePointer())) + _goptr := qt.UnsafeNewQUrl(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValueRef) ToRegularExpression1(defaultValue *QRegularExpression) *QRegularExpression { - _ret := C.QCborValueRef_ToRegularExpression1(this.h, defaultValue.cPointer()) - _goptr := newQRegularExpression(_ret) +func (this *QCborValueRef) ToRegularExpression1(defaultValue *qt.QRegularExpression) *qt.QRegularExpression { + _ret := C.QCborValueRef_ToRegularExpression1(this.h, (*C.QRegularExpression)(defaultValue.UnsafePointer())) + _goptr := qt.UnsafeNewQRegularExpression(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValueRef) ToUuid1(defaultValue *QUuid) *QUuid { - _ret := C.QCborValueRef_ToUuid1(this.h, defaultValue.cPointer()) - _goptr := newQUuid(_ret) +func (this *QCborValueRef) ToUuid1(defaultValue *qt.QUuid) *qt.QUuid { + _ret := C.QCborValueRef_ToUuid1(this.h, (*C.QUuid)(defaultValue.UnsafePointer())) + _goptr := qt.UnsafeNewQUuid(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt/gen_qcborvalue.h b/qt/cbor/gen_qcborvalue.h similarity index 99% rename from qt/gen_qcborvalue.h rename to qt/cbor/gen_qcborvalue.h index 83467424..fc5d8c0d 100644 --- a/qt/gen_qcborvalue.h +++ b/qt/cbor/gen_qcborvalue.h @@ -7,7 +7,7 @@ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#include "../libmiqt/libmiqt.h" +#include "../../libmiqt/libmiqt.h" #ifdef __cplusplus extern "C" { diff --git a/qt/gen_qmetatype.go b/qt/gen_qmetatype.go index f9116cfb..1e328a94 100644 --- a/qt/gen_qmetatype.go +++ b/qt/gen_qmetatype.go @@ -13,6 +13,8 @@ import ( "unsafe" ) +type QCborSimpleType byte + type QtMetaTypePrivate__IteratorCapability int const ( diff --git a/qt6/cbor/cflags.go b/qt6/cbor/cflags.go new file mode 100644 index 00000000..e1e55d76 --- /dev/null +++ b/qt6/cbor/cflags.go @@ -0,0 +1,7 @@ +package cbor + +/* +#cgo CFLAGS: -fPIC +#cgo pkg-config: Qt6Core +*/ +import "C" diff --git a/qt6/gen_qcborarray.cpp b/qt6/cbor/gen_qcborarray.cpp similarity index 94% rename from qt6/gen_qcborarray.cpp rename to qt6/cbor/gen_qcborarray.cpp index 571cefae..36e37a97 100644 --- a/qt6/gen_qcborarray.cpp +++ b/qt6/cbor/gen_qcborarray.cpp @@ -2,7 +2,6 @@ #define WORKAROUND_INNER_CLASS_DEFINITION_QCborArray__ConstIterator #define WORKAROUND_INNER_CLASS_DEFINITION_QCborArray__Iterator #include -#include #include #include #include @@ -261,15 +260,11 @@ QCborValueRef* QCborArray__Iterator_OperatorMultiply(const QCborArray__Iterator* return new QCborValueRef(self->operator*()); } -QCborValueRef* QCborArray__Iterator_OperatorMinusGreater(QCborArray__Iterator* self) { +QCborValueRef* QCborArray__Iterator_OperatorMinusGreater(const QCborArray__Iterator* self) { return self->operator->(); } -QCborValueConstRef* QCborArray__Iterator_OperatorMinusGreater2(const QCborArray__Iterator* self) { - return (QCborValueConstRef*) self->operator->(); -} - -QCborValueRef* QCborArray__Iterator_OperatorSubscript(const QCborArray__Iterator* self, ptrdiff_t j) { +QCborValueRef* QCborArray__Iterator_OperatorSubscript(QCborArray__Iterator* self, ptrdiff_t j) { return new QCborValueRef(self->operator[]((qsizetype)(j))); } @@ -382,16 +377,16 @@ void QCborArray__ConstIterator_OperatorAssign(QCborArray__ConstIterator* self, Q self->operator=(*other); } -QCborValueConstRef* QCborArray__ConstIterator_OperatorMultiply(const QCborArray__ConstIterator* self) { - return new QCborValueConstRef(self->operator*()); +QCborValueRef* QCborArray__ConstIterator_OperatorMultiply(const QCborArray__ConstIterator* self) { + return new QCborValueRef(self->operator*()); } -QCborValueConstRef* QCborArray__ConstIterator_OperatorMinusGreater(const QCborArray__ConstIterator* self) { - return (QCborValueConstRef*) self->operator->(); +QCborValueRef* QCborArray__ConstIterator_OperatorMinusGreater(const QCborArray__ConstIterator* self) { + return (QCborValueRef*) self->operator->(); } -QCborValueConstRef* QCborArray__ConstIterator_OperatorSubscript(const QCborArray__ConstIterator* self, ptrdiff_t j) { - return new QCborValueConstRef(self->operator[]((qsizetype)(j))); +QCborValueRef* QCborArray__ConstIterator_OperatorSubscript(QCborArray__ConstIterator* self, ptrdiff_t j) { + return new QCborValueRef(self->operator[]((qsizetype)(j))); } bool QCborArray__ConstIterator_OperatorEqual(const QCborArray__ConstIterator* self, QCborArray__Iterator* o) { diff --git a/qt6/gen_qcborarray.go b/qt6/cbor/gen_qcborarray.go similarity index 97% rename from qt6/gen_qcborarray.go rename to qt6/cbor/gen_qcborarray.go index 4b75b987..de2b74f9 100644 --- a/qt6/gen_qcborarray.go +++ b/qt6/cbor/gen_qcborarray.go @@ -1,4 +1,4 @@ -package qt6 +package cbor /* @@ -9,6 +9,7 @@ package qt6 import "C" import ( + "github.com/mappu/miqt/qt6" "runtime" "unsafe" ) @@ -345,16 +346,16 @@ func QCborArray_FromStringList(list []string) *QCborArray { return _goptr } -func QCborArray_FromJsonArray(array *QJsonArray) *QCborArray { - _ret := C.QCborArray_FromJsonArray(array.cPointer()) +func QCborArray_FromJsonArray(array *qt6.QJsonArray) *QCborArray { + _ret := C.QCborArray_FromJsonArray((*C.QJsonArray)(array.UnsafePointer())) _goptr := newQCborArray(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborArray) ToJsonArray() *QJsonArray { +func (this *QCborArray) ToJsonArray() *qt6.QJsonArray { _ret := C.QCborArray_ToJsonArray(this.h) - _goptr := newQJsonArray(_ret) + _goptr := qt6.UnsafeNewQJsonArray(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -429,10 +430,6 @@ func (this *QCborArray__Iterator) OperatorMinusGreater() *QCborValueRef { return UnsafeNewQCborValueRef(unsafe.Pointer(C.QCborArray__Iterator_OperatorMinusGreater(this.h))) } -func (this *QCborArray__Iterator) OperatorMinusGreater2() *QCborValueConstRef { - return UnsafeNewQCborValueConstRef(unsafe.Pointer(C.QCborArray__Iterator_OperatorMinusGreater2(this.h))) -} - func (this *QCborArray__Iterator) OperatorSubscript(j int64) *QCborValueRef { _ret := C.QCborArray__Iterator_OperatorSubscript(this.h, (C.ptrdiff_t)(j)) _goptr := newQCborValueRef(_ret) @@ -595,20 +592,20 @@ func (this *QCborArray__ConstIterator) OperatorAssign(other *QCborArray__ConstIt C.QCborArray__ConstIterator_OperatorAssign(this.h, other.cPointer()) } -func (this *QCborArray__ConstIterator) OperatorMultiply() *QCborValueConstRef { +func (this *QCborArray__ConstIterator) OperatorMultiply() *QCborValueRef { _ret := C.QCborArray__ConstIterator_OperatorMultiply(this.h) - _goptr := newQCborValueConstRef(_ret) + _goptr := newQCborValueRef(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborArray__ConstIterator) OperatorMinusGreater() *QCborValueConstRef { - return UnsafeNewQCborValueConstRef(unsafe.Pointer(C.QCborArray__ConstIterator_OperatorMinusGreater(this.h))) +func (this *QCborArray__ConstIterator) OperatorMinusGreater() *QCborValueRef { + return UnsafeNewQCborValueRef(unsafe.Pointer(C.QCborArray__ConstIterator_OperatorMinusGreater(this.h))) } -func (this *QCborArray__ConstIterator) OperatorSubscript(j int64) *QCborValueConstRef { +func (this *QCborArray__ConstIterator) OperatorSubscript(j int64) *QCborValueRef { _ret := C.QCborArray__ConstIterator_OperatorSubscript(this.h, (C.ptrdiff_t)(j)) - _goptr := newQCborValueConstRef(_ret) + _goptr := newQCborValueRef(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt6/gen_qcborarray.h b/qt6/cbor/gen_qcborarray.h similarity index 93% rename from qt6/gen_qcborarray.h rename to qt6/cbor/gen_qcborarray.h index ed1b00f6..0ca6b1e1 100644 --- a/qt6/gen_qcborarray.h +++ b/qt6/cbor/gen_qcborarray.h @@ -7,7 +7,7 @@ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#include "../libmiqt/libmiqt.h" +#include "../../libmiqt/libmiqt.h" #ifdef __cplusplus extern "C" { @@ -26,7 +26,6 @@ typedef QCborArray::Iterator QCborArray__Iterator; class QCborArray__Iterator; #endif class QCborValue; -class QCborValueConstRef; class QCborValueRef; class QJsonArray; #else @@ -34,7 +33,6 @@ typedef struct QCborArray QCborArray; typedef struct QCborArray__ConstIterator QCborArray__ConstIterator; typedef struct QCborArray__Iterator QCborArray__Iterator; typedef struct QCborValue QCborValue; -typedef struct QCborValueConstRef QCborValueConstRef; typedef struct QCborValueRef QCborValueRef; typedef struct QJsonArray QJsonArray; #endif @@ -99,9 +97,8 @@ QCborArray__Iterator* QCborArray__Iterator_new(); QCborArray__Iterator* QCborArray__Iterator_new2(QCborArray__Iterator* param1); void QCborArray__Iterator_OperatorAssign(QCborArray__Iterator* self, QCborArray__Iterator* other); QCborValueRef* QCborArray__Iterator_OperatorMultiply(const QCborArray__Iterator* self); -QCborValueRef* QCborArray__Iterator_OperatorMinusGreater(QCborArray__Iterator* self); -QCborValueConstRef* QCborArray__Iterator_OperatorMinusGreater2(const QCborArray__Iterator* self); -QCborValueRef* QCborArray__Iterator_OperatorSubscript(const QCborArray__Iterator* self, ptrdiff_t j); +QCborValueRef* QCborArray__Iterator_OperatorMinusGreater(const QCborArray__Iterator* self); +QCborValueRef* QCborArray__Iterator_OperatorSubscript(QCborArray__Iterator* self, ptrdiff_t j); bool QCborArray__Iterator_OperatorEqual(const QCborArray__Iterator* self, QCborArray__Iterator* o); bool QCborArray__Iterator_OperatorNotEqual(const QCborArray__Iterator* self, QCborArray__Iterator* o); bool QCborArray__Iterator_OperatorLesser(const QCborArray__Iterator* self, QCborArray__Iterator* other); @@ -128,9 +125,9 @@ void QCborArray__Iterator_Delete(QCborArray__Iterator* self); QCborArray__ConstIterator* QCborArray__ConstIterator_new(); QCborArray__ConstIterator* QCborArray__ConstIterator_new2(QCborArray__ConstIterator* param1); void QCborArray__ConstIterator_OperatorAssign(QCborArray__ConstIterator* self, QCborArray__ConstIterator* other); -QCborValueConstRef* QCborArray__ConstIterator_OperatorMultiply(const QCborArray__ConstIterator* self); -QCborValueConstRef* QCborArray__ConstIterator_OperatorMinusGreater(const QCborArray__ConstIterator* self); -QCborValueConstRef* QCborArray__ConstIterator_OperatorSubscript(const QCborArray__ConstIterator* self, ptrdiff_t j); +QCborValueRef* QCborArray__ConstIterator_OperatorMultiply(const QCborArray__ConstIterator* self); +QCborValueRef* QCborArray__ConstIterator_OperatorMinusGreater(const QCborArray__ConstIterator* self); +QCborValueRef* QCborArray__ConstIterator_OperatorSubscript(QCborArray__ConstIterator* self, ptrdiff_t j); bool QCborArray__ConstIterator_OperatorEqual(const QCborArray__ConstIterator* self, QCborArray__Iterator* o); bool QCborArray__ConstIterator_OperatorNotEqual(const QCborArray__ConstIterator* self, QCborArray__Iterator* o); bool QCborArray__ConstIterator_OperatorLesser(const QCborArray__ConstIterator* self, QCborArray__Iterator* other); diff --git a/qt6/gen_qcborcommon.cpp b/qt6/cbor/gen_qcborcommon.cpp similarity index 100% rename from qt6/gen_qcborcommon.cpp rename to qt6/cbor/gen_qcborcommon.cpp diff --git a/qt6/gen_qcborcommon.go b/qt6/cbor/gen_qcborcommon.go similarity index 99% rename from qt6/gen_qcborcommon.go rename to qt6/cbor/gen_qcborcommon.go index 6a1c0fa3..e1e52613 100644 --- a/qt6/gen_qcborcommon.go +++ b/qt6/cbor/gen_qcborcommon.go @@ -1,4 +1,4 @@ -package qt6 +package cbor /* diff --git a/qt/gen_qcborcommon.h b/qt6/cbor/gen_qcborcommon.h similarity index 92% rename from qt/gen_qcborcommon.h rename to qt6/cbor/gen_qcborcommon.h index e35b942f..3c893790 100644 --- a/qt/gen_qcborcommon.h +++ b/qt6/cbor/gen_qcborcommon.h @@ -7,7 +7,7 @@ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#include "../libmiqt/libmiqt.h" +#include "../../libmiqt/libmiqt.h" #ifdef __cplusplus extern "C" { diff --git a/qt6/gen_qcbormap.cpp b/qt6/cbor/gen_qcbormap.cpp similarity index 97% rename from qt6/gen_qcbormap.cpp rename to qt6/cbor/gen_qcbormap.cpp index 77cae178..01c071c7 100644 --- a/qt6/gen_qcbormap.cpp +++ b/qt6/cbor/gen_qcbormap.cpp @@ -2,7 +2,6 @@ #define WORKAROUND_INNER_CLASS_DEFINITION_QCborMap__ConstIterator #define WORKAROUND_INNER_CLASS_DEFINITION_QCborMap__Iterator #include -#include #include #include #include @@ -49,7 +48,7 @@ void QCborMap_Clear(QCborMap* self) { } struct miqt_array QCborMap_Keys(const QCborMap* self) { - QList _ret = self->keys(); + QVector _ret = self->keys(); // Convert QList<> from C++ memory to manually-managed C memory QCborValue** _arr = static_cast(malloc(sizeof(QCborValue*) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { @@ -356,14 +355,10 @@ void QCborMap__Iterator_OperatorAssign(QCborMap__Iterator* self, QCborMap__Itera self->operator=(*other); } -QCborValueRef* QCborMap__Iterator_OperatorMinusGreater(QCborMap__Iterator* self) { +QCborValueRef* QCborMap__Iterator_OperatorMinusGreater(const QCborMap__Iterator* self) { return self->operator->(); } -QCborValueConstRef* QCborMap__Iterator_OperatorMinusGreater2(const QCborMap__Iterator* self) { - return (QCborValueConstRef*) self->operator->(); -} - QCborValue* QCborMap__Iterator_Key(const QCborMap__Iterator* self) { return new QCborValue(self->key()); } @@ -481,16 +476,16 @@ void QCborMap__ConstIterator_OperatorAssign(QCborMap__ConstIterator* self, QCbor self->operator=(*other); } -QCborValueConstRef* QCborMap__ConstIterator_OperatorMinusGreater(const QCborMap__ConstIterator* self) { - return (QCborValueConstRef*) self->operator->(); +QCborValueRef* QCborMap__ConstIterator_OperatorMinusGreater(const QCborMap__ConstIterator* self) { + return (QCborValueRef*) self->operator->(); } QCborValue* QCborMap__ConstIterator_Key(const QCborMap__ConstIterator* self) { return new QCborValue(self->key()); } -QCborValueConstRef* QCborMap__ConstIterator_Value(const QCborMap__ConstIterator* self) { - return new QCborValueConstRef(self->value()); +QCborValueRef* QCborMap__ConstIterator_Value(const QCborMap__ConstIterator* self) { + return new QCborValueRef(self->value()); } bool QCborMap__ConstIterator_OperatorEqual(const QCborMap__ConstIterator* self, QCborMap__Iterator* o) { diff --git a/qt6/gen_qcbormap.go b/qt6/cbor/gen_qcbormap.go similarity index 95% rename from qt6/gen_qcbormap.go rename to qt6/cbor/gen_qcbormap.go index 1a6fe998..f1e996a8 100644 --- a/qt6/gen_qcbormap.go +++ b/qt6/cbor/gen_qcbormap.go @@ -1,4 +1,4 @@ -package qt6 +package cbor /* @@ -9,6 +9,7 @@ package qt6 import "C" import ( + "github.com/mappu/miqt/qt6" "runtime" "unsafe" ) @@ -86,10 +87,10 @@ func (this *QCborMap) Keys() []QCborValue { _ret := make([]QCborValue, int(_ma.len)) _outCast := (*[0xffff]*C.QCborValue)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { - _lv_ret := _outCast[i] - _lv_goptr := newQCborValue(_lv_ret) - _lv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - _ret[i] = *_lv_goptr + _vv_ret := _outCast[i] + _vv_goptr := newQCborValue(_vv_ret) + _vv_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + _ret[i] = *_vv_goptr } return _ret } @@ -430,7 +431,7 @@ func (this *QCborMap) Insert4(key *QCborValue, value_ *QCborValue) *QCborMap__It return _goptr } -func QCborMap_FromVariantMap(mapVal map[string]QVariant) *QCborMap { +func QCborMap_FromVariantMap(mapVal map[string]qt6.QVariant) *QCborMap { mapVal_Keys_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(int(unsafe.Sizeof(C.struct_miqt_string{})) * len(mapVal)))) defer C.free(unsafe.Pointer(mapVal_Keys_CArray)) mapVal_Values_CArray := (*[0xffff]*C.QVariant)(C.malloc(C.size_t(8 * len(mapVal)))) @@ -442,7 +443,7 @@ func QCborMap_FromVariantMap(mapVal map[string]QVariant) *QCborMap { mapVal_k_ms.len = C.size_t(len(mapVal_k)) defer C.free(unsafe.Pointer(mapVal_k_ms.data)) mapVal_Keys_CArray[mapVal_ctr] = mapVal_k_ms - mapVal_Values_CArray[mapVal_ctr] = mapVal_v.cPointer() + mapVal_Values_CArray[mapVal_ctr] = (*C.QVariant)(mapVal_v.UnsafePointer()) mapVal_ctr++ } mapVal_mm := C.struct_miqt_map{ @@ -456,7 +457,7 @@ func QCborMap_FromVariantMap(mapVal map[string]QVariant) *QCborMap { return _goptr } -func QCborMap_FromVariantHash(hash map[string]QVariant) *QCborMap { +func QCborMap_FromVariantHash(hash map[string]qt6.QVariant) *QCborMap { hash_Keys_CArray := (*[0xffff]C.struct_miqt_string)(C.malloc(C.size_t(int(unsafe.Sizeof(C.struct_miqt_string{})) * len(hash)))) defer C.free(unsafe.Pointer(hash_Keys_CArray)) hash_Values_CArray := (*[0xffff]*C.QVariant)(C.malloc(C.size_t(8 * len(hash)))) @@ -468,7 +469,7 @@ func QCborMap_FromVariantHash(hash map[string]QVariant) *QCborMap { hash_k_ms.len = C.size_t(len(hash_k)) defer C.free(unsafe.Pointer(hash_k_ms.data)) hash_Keys_CArray[hash_ctr] = hash_k_ms - hash_Values_CArray[hash_ctr] = hash_v.cPointer() + hash_Values_CArray[hash_ctr] = (*C.QVariant)(hash_v.UnsafePointer()) hash_ctr++ } hash_mm := C.struct_miqt_map{ @@ -482,16 +483,16 @@ func QCborMap_FromVariantHash(hash map[string]QVariant) *QCborMap { return _goptr } -func QCborMap_FromJsonObject(o *QJsonObject) *QCborMap { - _ret := C.QCborMap_FromJsonObject(o.cPointer()) +func QCborMap_FromJsonObject(o *qt6.QJsonObject) *QCborMap { + _ret := C.QCborMap_FromJsonObject((*C.QJsonObject)(o.UnsafePointer())) _goptr := newQCborMap(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborMap) ToVariantMap() map[string]QVariant { +func (this *QCborMap) ToVariantMap() map[string]qt6.QVariant { var _mm C.struct_miqt_map = C.QCborMap_ToVariantMap(this.h) - _ret := make(map[string]QVariant, int(_mm.len)) + _ret := make(map[string]qt6.QVariant, int(_mm.len)) _Keys := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_mm.keys)) _Values := (*[0xffff]*C.QVariant)(unsafe.Pointer(_mm.values)) for i := 0; i < int(_mm.len); i++ { @@ -500,7 +501,7 @@ func (this *QCborMap) ToVariantMap() map[string]QVariant { C.free(unsafe.Pointer(_mapkey_ms.data)) _entry_Key := _mapkey_ret _mapval_ret := _Values[i] - _mapval_goptr := newQVariant(_mapval_ret) + _mapval_goptr := qt6.UnsafeNewQVariant(unsafe.Pointer(_mapval_ret)) _mapval_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer _entry_Value := *_mapval_goptr @@ -509,9 +510,9 @@ func (this *QCborMap) ToVariantMap() map[string]QVariant { return _ret } -func (this *QCborMap) ToVariantHash() map[string]QVariant { +func (this *QCborMap) ToVariantHash() map[string]qt6.QVariant { var _mm C.struct_miqt_map = C.QCborMap_ToVariantHash(this.h) - _ret := make(map[string]QVariant, int(_mm.len)) + _ret := make(map[string]qt6.QVariant, int(_mm.len)) _Keys := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_mm.keys)) _Values := (*[0xffff]*C.QVariant)(unsafe.Pointer(_mm.values)) for i := 0; i < int(_mm.len); i++ { @@ -520,7 +521,7 @@ func (this *QCborMap) ToVariantHash() map[string]QVariant { C.free(unsafe.Pointer(_hashkey_ms.data)) _entry_Key := _hashkey_ret _hashval_ret := _Values[i] - _hashval_goptr := newQVariant(_hashval_ret) + _hashval_goptr := qt6.UnsafeNewQVariant(unsafe.Pointer(_hashval_ret)) _hashval_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer _entry_Value := *_hashval_goptr @@ -529,9 +530,9 @@ func (this *QCborMap) ToVariantHash() map[string]QVariant { return _ret } -func (this *QCborMap) ToJsonObject() *QJsonObject { +func (this *QCborMap) ToJsonObject() *qt6.QJsonObject { _ret := C.QCborMap_ToJsonObject(this.h) - _goptr := newQJsonObject(_ret) + _goptr := qt6.UnsafeNewQJsonObject(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -599,10 +600,6 @@ func (this *QCborMap__Iterator) OperatorMinusGreater() *QCborValueRef { return UnsafeNewQCborValueRef(unsafe.Pointer(C.QCborMap__Iterator_OperatorMinusGreater(this.h))) } -func (this *QCborMap__Iterator) OperatorMinusGreater2() *QCborValueConstRef { - return UnsafeNewQCborValueConstRef(unsafe.Pointer(C.QCborMap__Iterator_OperatorMinusGreater2(this.h))) -} - func (this *QCborMap__Iterator) Key() *QCborValue { _ret := C.QCborMap__Iterator_Key(this.h) _goptr := newQCborValue(_ret) @@ -772,8 +769,8 @@ func (this *QCborMap__ConstIterator) OperatorAssign(other *QCborMap__ConstIterat C.QCborMap__ConstIterator_OperatorAssign(this.h, other.cPointer()) } -func (this *QCborMap__ConstIterator) OperatorMinusGreater() *QCborValueConstRef { - return UnsafeNewQCborValueConstRef(unsafe.Pointer(C.QCborMap__ConstIterator_OperatorMinusGreater(this.h))) +func (this *QCborMap__ConstIterator) OperatorMinusGreater() *QCborValueRef { + return UnsafeNewQCborValueRef(unsafe.Pointer(C.QCborMap__ConstIterator_OperatorMinusGreater(this.h))) } func (this *QCborMap__ConstIterator) Key() *QCborValue { @@ -783,9 +780,9 @@ func (this *QCborMap__ConstIterator) Key() *QCborValue { return _goptr } -func (this *QCborMap__ConstIterator) Value() *QCborValueConstRef { +func (this *QCborMap__ConstIterator) Value() *QCborValueRef { _ret := C.QCborMap__ConstIterator_Value(this.h) - _goptr := newQCborValueConstRef(_ret) + _goptr := newQCborValueRef(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt6/gen_qcbormap.h b/qt6/cbor/gen_qcbormap.h similarity index 95% rename from qt6/gen_qcbormap.h rename to qt6/cbor/gen_qcbormap.h index 85aa486a..527178ba 100644 --- a/qt6/gen_qcbormap.h +++ b/qt6/cbor/gen_qcbormap.h @@ -7,7 +7,7 @@ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#include "../libmiqt/libmiqt.h" +#include "../../libmiqt/libmiqt.h" #ifdef __cplusplus extern "C" { @@ -26,7 +26,6 @@ typedef QCborMap::Iterator QCborMap__Iterator; class QCborMap__Iterator; #endif class QCborValue; -class QCborValueConstRef; class QCborValueRef; class QJsonObject; class QVariant; @@ -35,7 +34,6 @@ typedef struct QCborMap QCborMap; typedef struct QCborMap__ConstIterator QCborMap__ConstIterator; typedef struct QCborMap__Iterator QCborMap__Iterator; typedef struct QCborValue QCborValue; -typedef struct QCborValueConstRef QCborValueConstRef; typedef struct QCborValueRef QCborValueRef; typedef struct QJsonObject QJsonObject; typedef struct QVariant QVariant; @@ -108,8 +106,7 @@ void QCborMap_Delete(QCborMap* self); QCborMap__Iterator* QCborMap__Iterator_new(); QCborMap__Iterator* QCborMap__Iterator_new2(QCborMap__Iterator* param1); void QCborMap__Iterator_OperatorAssign(QCborMap__Iterator* self, QCborMap__Iterator* other); -QCborValueRef* QCborMap__Iterator_OperatorMinusGreater(QCborMap__Iterator* self); -QCborValueConstRef* QCborMap__Iterator_OperatorMinusGreater2(const QCborMap__Iterator* self); +QCborValueRef* QCborMap__Iterator_OperatorMinusGreater(const QCborMap__Iterator* self); QCborValue* QCborMap__Iterator_Key(const QCborMap__Iterator* self); QCborValueRef* QCborMap__Iterator_Value(const QCborMap__Iterator* self); bool QCborMap__Iterator_OperatorEqual(const QCborMap__Iterator* self, QCborMap__Iterator* o); @@ -138,9 +135,9 @@ void QCborMap__Iterator_Delete(QCborMap__Iterator* self); QCborMap__ConstIterator* QCborMap__ConstIterator_new(); QCborMap__ConstIterator* QCborMap__ConstIterator_new2(QCborMap__ConstIterator* param1); void QCborMap__ConstIterator_OperatorAssign(QCborMap__ConstIterator* self, QCborMap__ConstIterator* other); -QCborValueConstRef* QCborMap__ConstIterator_OperatorMinusGreater(const QCborMap__ConstIterator* self); +QCborValueRef* QCborMap__ConstIterator_OperatorMinusGreater(const QCborMap__ConstIterator* self); QCborValue* QCborMap__ConstIterator_Key(const QCborMap__ConstIterator* self); -QCborValueConstRef* QCborMap__ConstIterator_Value(const QCborMap__ConstIterator* self); +QCborValueRef* QCborMap__ConstIterator_Value(const QCborMap__ConstIterator* self); bool QCborMap__ConstIterator_OperatorEqual(const QCborMap__ConstIterator* self, QCborMap__Iterator* o); bool QCborMap__ConstIterator_OperatorNotEqual(const QCborMap__ConstIterator* self, QCborMap__Iterator* o); bool QCborMap__ConstIterator_OperatorLesser(const QCborMap__ConstIterator* self, QCborMap__Iterator* other); diff --git a/qt6/gen_qcborstreamreader.cpp b/qt6/cbor/gen_qcborstreamreader.cpp similarity index 100% rename from qt6/gen_qcborstreamreader.cpp rename to qt6/cbor/gen_qcborstreamreader.cpp diff --git a/qt/gen_qcborstreamreader.go b/qt6/cbor/gen_qcborstreamreader.go similarity index 95% rename from qt/gen_qcborstreamreader.go rename to qt6/cbor/gen_qcborstreamreader.go index e3dd61da..136f135a 100644 --- a/qt/gen_qcborstreamreader.go +++ b/qt6/cbor/gen_qcborstreamreader.go @@ -1,4 +1,4 @@ -package qt +package cbor /* @@ -9,6 +9,7 @@ package qt import "C" import ( + "github.com/mappu/miqt/qt6" "runtime" "unsafe" ) @@ -100,17 +101,17 @@ func NewQCborStreamReader4(data []byte) *QCborStreamReader { } // NewQCborStreamReader5 constructs a new QCborStreamReader object. -func NewQCborStreamReader5(device *QIODevice) *QCborStreamReader { - ret := C.QCborStreamReader_new5(device.cPointer()) +func NewQCborStreamReader5(device *qt6.QIODevice) *QCborStreamReader { + ret := C.QCborStreamReader_new5((*C.QIODevice)(device.UnsafePointer())) return newQCborStreamReader(ret) } -func (this *QCborStreamReader) SetDevice(device *QIODevice) { - C.QCborStreamReader_SetDevice(this.h, device.cPointer()) +func (this *QCborStreamReader) SetDevice(device *qt6.QIODevice) { + C.QCborStreamReader_SetDevice(this.h, (*C.QIODevice)(device.UnsafePointer())) } -func (this *QCborStreamReader) Device() *QIODevice { - return UnsafeNewQIODevice(unsafe.Pointer(C.QCborStreamReader_Device(this.h))) +func (this *QCborStreamReader) Device() *qt6.QIODevice { + return qt6.UnsafeNewQIODevice(unsafe.Pointer(C.QCborStreamReader_Device(this.h))) } func (this *QCborStreamReader) AddData(data []byte) { diff --git a/qt6/gen_qcborstreamreader.h b/qt6/cbor/gen_qcborstreamreader.h similarity index 99% rename from qt6/gen_qcborstreamreader.h rename to qt6/cbor/gen_qcborstreamreader.h index 4de66206..bcca845b 100644 --- a/qt6/gen_qcborstreamreader.h +++ b/qt6/cbor/gen_qcborstreamreader.h @@ -7,7 +7,7 @@ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#include "../libmiqt/libmiqt.h" +#include "../../libmiqt/libmiqt.h" #ifdef __cplusplus extern "C" { diff --git a/qt6/gen_qcborstreamwriter.cpp b/qt6/cbor/gen_qcborstreamwriter.cpp similarity index 100% rename from qt6/gen_qcborstreamwriter.cpp rename to qt6/cbor/gen_qcborstreamwriter.cpp diff --git a/qt/gen_qcborstreamwriter.go b/qt6/cbor/gen_qcborstreamwriter.go similarity index 90% rename from qt/gen_qcborstreamwriter.go rename to qt6/cbor/gen_qcborstreamwriter.go index 13eeb2b3..e0137a4c 100644 --- a/qt/gen_qcborstreamwriter.go +++ b/qt6/cbor/gen_qcborstreamwriter.go @@ -1,4 +1,4 @@ -package qt +package cbor /* @@ -9,6 +9,7 @@ package qt import "C" import ( + "github.com/mappu/miqt/qt6" "runtime" "unsafe" ) @@ -43,17 +44,17 @@ func UnsafeNewQCborStreamWriter(h unsafe.Pointer) *QCborStreamWriter { } // NewQCborStreamWriter constructs a new QCborStreamWriter object. -func NewQCborStreamWriter(device *QIODevice) *QCborStreamWriter { - ret := C.QCborStreamWriter_new(device.cPointer()) +func NewQCborStreamWriter(device *qt6.QIODevice) *QCborStreamWriter { + ret := C.QCborStreamWriter_new((*C.QIODevice)(device.UnsafePointer())) return newQCborStreamWriter(ret) } -func (this *QCborStreamWriter) SetDevice(device *QIODevice) { - C.QCborStreamWriter_SetDevice(this.h, device.cPointer()) +func (this *QCborStreamWriter) SetDevice(device *qt6.QIODevice) { + C.QCborStreamWriter_SetDevice(this.h, (*C.QIODevice)(device.UnsafePointer())) } -func (this *QCborStreamWriter) Device() *QIODevice { - return UnsafeNewQIODevice(unsafe.Pointer(C.QCborStreamWriter_Device(this.h))) +func (this *QCborStreamWriter) Device() *qt6.QIODevice { + return qt6.UnsafeNewQIODevice(unsafe.Pointer(C.QCborStreamWriter_Device(this.h))) } func (this *QCborStreamWriter) Append(u uint64) { diff --git a/qt/gen_qcborstreamwriter.h b/qt6/cbor/gen_qcborstreamwriter.h similarity index 98% rename from qt/gen_qcborstreamwriter.h rename to qt6/cbor/gen_qcborstreamwriter.h index 3d3d1234..ecc958d7 100644 --- a/qt/gen_qcborstreamwriter.h +++ b/qt6/cbor/gen_qcborstreamwriter.h @@ -7,7 +7,7 @@ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#include "../libmiqt/libmiqt.h" +#include "../../libmiqt/libmiqt.h" #ifdef __cplusplus extern "C" { diff --git a/qt6/gen_qcborvalue.cpp b/qt6/cbor/gen_qcborvalue.cpp similarity index 67% rename from qt6/gen_qcborvalue.cpp rename to qt6/cbor/gen_qcborvalue.cpp index 78ee74d7..bf20637b 100644 --- a/qt6/gen_qcborvalue.cpp +++ b/qt6/cbor/gen_qcborvalue.cpp @@ -5,7 +5,6 @@ #include #include #include -#include #include #include #include @@ -364,7 +363,7 @@ QCborValue* QCborValue_FromCbor3(const unsigned char* data, ptrdiff_t lenVal) { return new QCborValue(QCborValue::fromCbor(static_cast(data), (qsizetype)(lenVal))); } -struct miqt_string QCborValue_ToCbor(const QCborValue* self) { +struct miqt_string QCborValue_ToCbor(QCborValue* self) { QByteArray _qb = self->toCbor(); struct miqt_string _ms; _ms.len = _qb.length(); @@ -373,7 +372,7 @@ struct miqt_string QCborValue_ToCbor(const QCborValue* self) { return _ms; } -void QCborValue_ToCborWithWriter(const QCborValue* self, QCborStreamWriter* writer) { +void QCborValue_ToCborWithWriter(QCborValue* self, QCborStreamWriter* writer) { self->toCbor(*writer); } @@ -466,7 +465,7 @@ QCborValue* QCborValue_FromCbor33(const unsigned char* data, ptrdiff_t lenVal, Q return new QCborValue(QCborValue::fromCbor(static_cast(data), (qsizetype)(lenVal), error)); } -struct miqt_string QCborValue_ToCbor1(const QCborValue* self, int opt) { +struct miqt_string QCborValue_ToCbor1(QCborValue* self, int opt) { QByteArray _qb = self->toCbor(static_cast(opt)); struct miqt_string _ms; _ms.len = _qb.length(); @@ -475,7 +474,7 @@ struct miqt_string QCborValue_ToCbor1(const QCborValue* self, int opt) { return _ms; } -void QCborValue_ToCbor2(const QCborValue* self, QCborStreamWriter* writer, int opt) { +void QCborValue_ToCbor2(QCborValue* self, QCborStreamWriter* writer, int opt) { self->toCbor(*writer, static_cast(opt)); } @@ -494,324 +493,6 @@ void QCborValue_Delete(QCborValue* self) { delete self; } -QCborValueConstRef* QCborValueConstRef_new(QCborValueConstRef* param1) { - return new QCborValueConstRef(*param1); -} - -int QCborValueConstRef_Type(const QCborValueConstRef* self) { - QCborValue::Type _ret = self->type(); - return static_cast(_ret); -} - -bool QCborValueConstRef_IsInteger(const QCborValueConstRef* self) { - return self->isInteger(); -} - -bool QCborValueConstRef_IsByteArray(const QCborValueConstRef* self) { - return self->isByteArray(); -} - -bool QCborValueConstRef_IsString(const QCborValueConstRef* self) { - return self->isString(); -} - -bool QCborValueConstRef_IsArray(const QCborValueConstRef* self) { - return self->isArray(); -} - -bool QCborValueConstRef_IsMap(const QCborValueConstRef* self) { - return self->isMap(); -} - -bool QCborValueConstRef_IsTag(const QCborValueConstRef* self) { - return self->isTag(); -} - -bool QCborValueConstRef_IsFalse(const QCborValueConstRef* self) { - return self->isFalse(); -} - -bool QCborValueConstRef_IsTrue(const QCborValueConstRef* self) { - return self->isTrue(); -} - -bool QCborValueConstRef_IsBool(const QCborValueConstRef* self) { - return self->isBool(); -} - -bool QCborValueConstRef_IsNull(const QCborValueConstRef* self) { - return self->isNull(); -} - -bool QCborValueConstRef_IsUndefined(const QCborValueConstRef* self) { - return self->isUndefined(); -} - -bool QCborValueConstRef_IsDouble(const QCborValueConstRef* self) { - return self->isDouble(); -} - -bool QCborValueConstRef_IsDateTime(const QCborValueConstRef* self) { - return self->isDateTime(); -} - -bool QCborValueConstRef_IsUrl(const QCborValueConstRef* self) { - return self->isUrl(); -} - -bool QCborValueConstRef_IsRegularExpression(const QCborValueConstRef* self) { - return self->isRegularExpression(); -} - -bool QCborValueConstRef_IsUuid(const QCborValueConstRef* self) { - return self->isUuid(); -} - -bool QCborValueConstRef_IsInvalid(const QCborValueConstRef* self) { - return self->isInvalid(); -} - -bool QCborValueConstRef_IsContainer(const QCborValueConstRef* self) { - return self->isContainer(); -} - -bool QCborValueConstRef_IsSimpleType(const QCborValueConstRef* self) { - return self->isSimpleType(); -} - -bool QCborValueConstRef_IsSimpleTypeWithSt(const QCborValueConstRef* self, uint8_t st) { - return self->isSimpleType(static_cast(st)); -} - -uint8_t QCborValueConstRef_ToSimpleType(const QCborValueConstRef* self) { - QCborSimpleType _ret = self->toSimpleType(); - return static_cast(_ret); -} - -uint64_t QCborValueConstRef_Tag(const QCborValueConstRef* self) { - QCborTag _ret = self->tag(); - return static_cast(_ret); -} - -QCborValue* QCborValueConstRef_TaggedValue(const QCborValueConstRef* self) { - return new QCborValue(self->taggedValue()); -} - -long long QCborValueConstRef_ToInteger(const QCborValueConstRef* self) { - qint64 _ret = self->toInteger(); - return static_cast(_ret); -} - -bool QCborValueConstRef_ToBool(const QCborValueConstRef* self) { - return self->toBool(); -} - -double QCborValueConstRef_ToDouble(const QCborValueConstRef* self) { - return self->toDouble(); -} - -struct miqt_string QCborValueConstRef_ToByteArray(const QCborValueConstRef* self) { - QByteArray _qb = self->toByteArray(); - struct miqt_string _ms; - _ms.len = _qb.length(); - _ms.data = static_cast(malloc(_ms.len)); - memcpy(_ms.data, _qb.data(), _ms.len); - return _ms; -} - -struct miqt_string QCborValueConstRef_ToString(const QCborValueConstRef* self) { - QString _ret = self->toString(); - // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory - QByteArray _b = _ret.toUtf8(); - struct miqt_string _ms; - _ms.len = _b.length(); - _ms.data = static_cast(malloc(_ms.len)); - memcpy(_ms.data, _b.data(), _ms.len); - return _ms; -} - -QDateTime* QCborValueConstRef_ToDateTime(const QCborValueConstRef* self) { - return new QDateTime(self->toDateTime()); -} - -QUrl* QCborValueConstRef_ToUrl(const QCborValueConstRef* self) { - return new QUrl(self->toUrl()); -} - -QRegularExpression* QCborValueConstRef_ToRegularExpression(const QCborValueConstRef* self) { - return new QRegularExpression(self->toRegularExpression()); -} - -QUuid* QCborValueConstRef_ToUuid(const QCborValueConstRef* self) { - return new QUuid(self->toUuid()); -} - -QCborArray* QCborValueConstRef_ToArray(const QCborValueConstRef* self) { - return new QCborArray(self->toArray()); -} - -QCborArray* QCborValueConstRef_ToArrayWithQCborArray(const QCborValueConstRef* self, QCborArray* a) { - return new QCborArray(self->toArray(*a)); -} - -QCborMap* QCborValueConstRef_ToMap(const QCborValueConstRef* self) { - return new QCborMap(self->toMap()); -} - -QCborMap* QCborValueConstRef_ToMapWithQCborMap(const QCborValueConstRef* self, QCborMap* m) { - return new QCborMap(self->toMap(*m)); -} - -QCborValue* QCborValueConstRef_OperatorSubscript(const QCborValueConstRef* self, struct miqt_string key) { - QString key_QString = QString::fromUtf8(key.data, key.len); - return new QCborValue(self->operator[](key_QString)); -} - -QCborValue* QCborValueConstRef_OperatorSubscript2(const QCborValueConstRef* self, long long key) { - return new QCborValue(self->operator[](static_cast(key))); -} - -int QCborValueConstRef_Compare(const QCborValueConstRef* self, QCborValue* other) { - return self->compare(*other); -} - -bool QCborValueConstRef_OperatorEqual(const QCborValueConstRef* self, QCborValue* other) { - return self->operator==(*other); -} - -bool QCborValueConstRef_OperatorNotEqual(const QCborValueConstRef* self, QCborValue* other) { - return self->operator!=(*other); -} - -bool QCborValueConstRef_OperatorLesser(const QCborValueConstRef* self, QCborValue* other) { - return self->operator<(*other); -} - -QVariant* QCborValueConstRef_ToVariant(const QCborValueConstRef* self) { - return new QVariant(self->toVariant()); -} - -QJsonValue* QCborValueConstRef_ToJsonValue(const QCborValueConstRef* self) { - return new QJsonValue(self->toJsonValue()); -} - -struct miqt_string QCborValueConstRef_ToCbor(const QCborValueConstRef* self) { - QByteArray _qb = self->toCbor(); - struct miqt_string _ms; - _ms.len = _qb.length(); - _ms.data = static_cast(malloc(_ms.len)); - memcpy(_ms.data, _qb.data(), _ms.len); - return _ms; -} - -void QCborValueConstRef_ToCborWithWriter(const QCborValueConstRef* self, QCborStreamWriter* writer) { - self->toCbor(*writer); -} - -struct miqt_string QCborValueConstRef_ToDiagnosticNotation(const QCborValueConstRef* self) { - QString _ret = self->toDiagnosticNotation(); - // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory - QByteArray _b = _ret.toUtf8(); - struct miqt_string _ms; - _ms.len = _b.length(); - _ms.data = static_cast(malloc(_ms.len)); - memcpy(_ms.data, _b.data(), _ms.len); - return _ms; -} - -uint8_t QCborValueConstRef_ToSimpleType1(const QCborValueConstRef* self, uint8_t defaultValue) { - QCborSimpleType _ret = self->toSimpleType(static_cast(defaultValue)); - return static_cast(_ret); -} - -uint64_t QCborValueConstRef_Tag1(const QCborValueConstRef* self, uint64_t defaultValue) { - QCborTag _ret = self->tag(static_cast(defaultValue)); - return static_cast(_ret); -} - -QCborValue* QCborValueConstRef_TaggedValue1(const QCborValueConstRef* self, QCborValue* defaultValue) { - return new QCborValue(self->taggedValue(*defaultValue)); -} - -long long QCborValueConstRef_ToInteger1(const QCborValueConstRef* self, long long defaultValue) { - qint64 _ret = self->toInteger(static_cast(defaultValue)); - return static_cast(_ret); -} - -bool QCborValueConstRef_ToBool1(const QCborValueConstRef* self, bool defaultValue) { - return self->toBool(defaultValue); -} - -double QCborValueConstRef_ToDouble1(const QCborValueConstRef* self, double defaultValue) { - return self->toDouble(static_cast(defaultValue)); -} - -struct miqt_string QCborValueConstRef_ToByteArray1(const QCborValueConstRef* self, struct miqt_string defaultValue) { - QByteArray defaultValue_QByteArray(defaultValue.data, defaultValue.len); - QByteArray _qb = self->toByteArray(defaultValue_QByteArray); - struct miqt_string _ms; - _ms.len = _qb.length(); - _ms.data = static_cast(malloc(_ms.len)); - memcpy(_ms.data, _qb.data(), _ms.len); - return _ms; -} - -struct miqt_string QCborValueConstRef_ToString1(const QCborValueConstRef* self, struct miqt_string defaultValue) { - QString defaultValue_QString = QString::fromUtf8(defaultValue.data, defaultValue.len); - QString _ret = self->toString(defaultValue_QString); - // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory - QByteArray _b = _ret.toUtf8(); - struct miqt_string _ms; - _ms.len = _b.length(); - _ms.data = static_cast(malloc(_ms.len)); - memcpy(_ms.data, _b.data(), _ms.len); - return _ms; -} - -QDateTime* QCborValueConstRef_ToDateTime1(const QCborValueConstRef* self, QDateTime* defaultValue) { - return new QDateTime(self->toDateTime(*defaultValue)); -} - -QUrl* QCborValueConstRef_ToUrl1(const QCborValueConstRef* self, QUrl* defaultValue) { - return new QUrl(self->toUrl(*defaultValue)); -} - -QRegularExpression* QCborValueConstRef_ToRegularExpression1(const QCborValueConstRef* self, QRegularExpression* defaultValue) { - return new QRegularExpression(self->toRegularExpression(*defaultValue)); -} - -QUuid* QCborValueConstRef_ToUuid1(const QCborValueConstRef* self, QUuid* defaultValue) { - return new QUuid(self->toUuid(*defaultValue)); -} - -struct miqt_string QCborValueConstRef_ToCbor1(const QCborValueConstRef* self, int opt) { - QByteArray _qb = self->toCbor(static_cast(opt)); - struct miqt_string _ms; - _ms.len = _qb.length(); - _ms.data = static_cast(malloc(_ms.len)); - memcpy(_ms.data, _qb.data(), _ms.len); - return _ms; -} - -void QCborValueConstRef_ToCbor2(const QCborValueConstRef* self, QCborStreamWriter* writer, int opt) { - self->toCbor(*writer, static_cast(opt)); -} - -struct miqt_string QCborValueConstRef_ToDiagnosticNotation1(const QCborValueConstRef* self, int opt) { - QString _ret = self->toDiagnosticNotation(static_cast(opt)); - // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory - QByteArray _b = _ret.toUtf8(); - struct miqt_string _ms; - _ms.len = _b.length(); - _ms.data = static_cast(malloc(_ms.len)); - memcpy(_ms.data, _b.data(), _ms.len); - return _ms; -} - -void QCborValueConstRef_Delete(QCborValueConstRef* self) { - delete self; -} - QCborValueRef* QCborValueRef_new(QCborValueRef* param1) { return new QCborValueRef(*param1); } @@ -824,15 +505,6 @@ void QCborValueRef_OperatorAssignWithOther(QCborValueRef* self, QCborValueRef* o self->operator=(*other); } -QCborValueRef* QCborValueRef_OperatorSubscript(QCborValueRef* self, long long key) { - return new QCborValueRef(self->operator[](static_cast(key))); -} - -QCborValueRef* QCborValueRef_OperatorSubscript2(QCborValueRef* self, struct miqt_string key) { - QString key_QString = QString::fromUtf8(key.data, key.len); - return new QCborValueRef(self->operator[](key_QString)); -} - int QCborValueRef_Type(const QCborValueRef* self) { QCborValue::Type _ret = self->type(); return static_cast(_ret); @@ -918,11 +590,6 @@ bool QCborValueRef_IsSimpleTypeWithSt(const QCborValueRef* self, uint8_t st) { return self->isSimpleType(static_cast(st)); } -uint8_t QCborValueRef_ToSimpleType(const QCborValueRef* self) { - QCborSimpleType _ret = self->toSimpleType(); - return static_cast(_ret); -} - uint64_t QCborValueRef_Tag(const QCborValueRef* self) { QCborTag _ret = self->tag(); return static_cast(_ret); @@ -997,15 +664,24 @@ QCborMap* QCborValueRef_ToMapWithQCborMap(const QCborValueRef* self, QCborMap* m return new QCborMap(self->toMap(*m)); } -QCborValue* QCborValueRef_OperatorSubscript3(const QCborValueRef* self, struct miqt_string key) { +QCborValue* QCborValueRef_OperatorSubscript(const QCborValueRef* self, struct miqt_string key) { QString key_QString = QString::fromUtf8(key.data, key.len); return new QCborValue(self->operator[](key_QString)); } -QCborValue* QCborValueRef_OperatorSubscript5(const QCborValueRef* self, long long key) { +QCborValue* QCborValueRef_OperatorSubscript2(const QCborValueRef* self, long long key) { return new QCborValue(self->operator[](static_cast(key))); } +QCborValueRef* QCborValueRef_OperatorSubscript3(QCborValueRef* self, long long key) { + return new QCborValueRef(self->operator[](static_cast(key))); +} + +QCborValueRef* QCborValueRef_OperatorSubscript5(QCborValueRef* self, struct miqt_string key) { + QString key_QString = QString::fromUtf8(key.data, key.len); + return new QCborValueRef(self->operator[](key_QString)); +} + int QCborValueRef_Compare(const QCborValueRef* self, QCborValue* other) { return self->compare(*other); } @@ -1054,11 +730,6 @@ struct miqt_string QCborValueRef_ToDiagnosticNotation(QCborValueRef* self) { return _ms; } -uint8_t QCborValueRef_ToSimpleType1(const QCborValueRef* self, uint8_t defaultValue) { - QCborSimpleType _ret = self->toSimpleType(static_cast(defaultValue)); - return static_cast(_ret); -} - uint64_t QCborValueRef_Tag1(const QCborValueRef* self, uint64_t defaultValue) { QCborTag _ret = self->tag(static_cast(defaultValue)); return static_cast(_ret); diff --git a/qt6/gen_qcborvalue.go b/qt6/cbor/gen_qcborvalue.go similarity index 65% rename from qt6/gen_qcborvalue.go rename to qt6/cbor/gen_qcborvalue.go index e39c625f..29e57f60 100644 --- a/qt6/gen_qcborvalue.go +++ b/qt6/cbor/gen_qcborvalue.go @@ -1,4 +1,4 @@ -package qt6 +package cbor /* @@ -9,6 +9,7 @@ package qt6 import "C" import ( + "github.com/mappu/miqt/qt6" "runtime" "unsafe" ) @@ -232,26 +233,26 @@ func NewQCborValue15(t_ QCborKnownTags) *QCborValue { } // NewQCborValue16 constructs a new QCborValue object. -func NewQCborValue16(dt *QDateTime) *QCborValue { - ret := C.QCborValue_new16(dt.cPointer()) +func NewQCborValue16(dt *qt6.QDateTime) *QCborValue { + ret := C.QCborValue_new16((*C.QDateTime)(dt.UnsafePointer())) return newQCborValue(ret) } // NewQCborValue17 constructs a new QCborValue object. -func NewQCborValue17(url *QUrl) *QCborValue { - ret := C.QCborValue_new17(url.cPointer()) +func NewQCborValue17(url *qt6.QUrl) *QCborValue { + ret := C.QCborValue_new17((*C.QUrl)(url.UnsafePointer())) return newQCborValue(ret) } // NewQCborValue18 constructs a new QCborValue object. -func NewQCborValue18(rx *QRegularExpression) *QCborValue { - ret := C.QCborValue_new18(rx.cPointer()) +func NewQCborValue18(rx *qt6.QRegularExpression) *QCborValue { + ret := C.QCborValue_new18((*C.QRegularExpression)(rx.UnsafePointer())) return newQCborValue(ret) } // NewQCborValue19 constructs a new QCborValue object. -func NewQCborValue19(uuid *QUuid) *QCborValue { - ret := C.QCborValue_new19(uuid.cPointer()) +func NewQCborValue19(uuid *qt6.QUuid) *QCborValue { + ret := C.QCborValue_new19((*C.QUuid)(uuid.UnsafePointer())) return newQCborValue(ret) } @@ -406,30 +407,30 @@ func (this *QCborValue) ToString() string { return _ret } -func (this *QCborValue) ToDateTime() *QDateTime { +func (this *QCborValue) ToDateTime() *qt6.QDateTime { _ret := C.QCborValue_ToDateTime(this.h) - _goptr := newQDateTime(_ret) + _goptr := qt6.UnsafeNewQDateTime(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValue) ToUrl() *QUrl { +func (this *QCborValue) ToUrl() *qt6.QUrl { _ret := C.QCborValue_ToUrl(this.h) - _goptr := newQUrl(_ret) + _goptr := qt6.UnsafeNewQUrl(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValue) ToRegularExpression() *QRegularExpression { +func (this *QCborValue) ToRegularExpression() *qt6.QRegularExpression { _ret := C.QCborValue_ToRegularExpression(this.h) - _goptr := newQRegularExpression(_ret) + _goptr := qt6.UnsafeNewQRegularExpression(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValue) ToUuid() *QUuid { +func (this *QCborValue) ToUuid() *qt6.QUuid { _ret := C.QCborValue_ToUuid(this.h) - _goptr := newQUuid(_ret) + _goptr := qt6.UnsafeNewQUuid(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -514,30 +515,30 @@ func (this *QCborValue) OperatorLesser(other *QCborValue) bool { return (bool)(C.QCborValue_OperatorLesser(this.h, other.cPointer())) } -func QCborValue_FromVariant(variant *QVariant) *QCborValue { - _ret := C.QCborValue_FromVariant(variant.cPointer()) +func QCborValue_FromVariant(variant *qt6.QVariant) *QCborValue { + _ret := C.QCborValue_FromVariant((*C.QVariant)(variant.UnsafePointer())) _goptr := newQCborValue(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValue) ToVariant() *QVariant { +func (this *QCborValue) ToVariant() *qt6.QVariant { _ret := C.QCborValue_ToVariant(this.h) - _goptr := newQVariant(_ret) + _goptr := qt6.UnsafeNewQVariant(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func QCborValue_FromJsonValue(v *QJsonValue) *QCborValue { - _ret := C.QCborValue_FromJsonValue(v.cPointer()) +func QCborValue_FromJsonValue(v *qt6.QJsonValue) *QCborValue { + _ret := C.QCborValue_FromJsonValue((*C.QJsonValue)(v.UnsafePointer())) _goptr := newQCborValue(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValue) ToJsonValue() *QJsonValue { +func (this *QCborValue) ToJsonValue() *qt6.QJsonValue { _ret := C.QCborValue_ToJsonValue(this.h) - _goptr := newQJsonValue(_ret) + _goptr := qt6.UnsafeNewQJsonValue(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -641,30 +642,30 @@ func (this *QCborValue) ToString1(defaultValue string) string { return _ret } -func (this *QCborValue) ToDateTime1(defaultValue *QDateTime) *QDateTime { - _ret := C.QCborValue_ToDateTime1(this.h, defaultValue.cPointer()) - _goptr := newQDateTime(_ret) +func (this *QCborValue) ToDateTime1(defaultValue *qt6.QDateTime) *qt6.QDateTime { + _ret := C.QCborValue_ToDateTime1(this.h, (*C.QDateTime)(defaultValue.UnsafePointer())) + _goptr := qt6.UnsafeNewQDateTime(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValue) ToUrl1(defaultValue *QUrl) *QUrl { - _ret := C.QCborValue_ToUrl1(this.h, defaultValue.cPointer()) - _goptr := newQUrl(_ret) +func (this *QCborValue) ToUrl1(defaultValue *qt6.QUrl) *qt6.QUrl { + _ret := C.QCborValue_ToUrl1(this.h, (*C.QUrl)(defaultValue.UnsafePointer())) + _goptr := qt6.UnsafeNewQUrl(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValue) ToRegularExpression1(defaultValue *QRegularExpression) *QRegularExpression { - _ret := C.QCborValue_ToRegularExpression1(this.h, defaultValue.cPointer()) - _goptr := newQRegularExpression(_ret) +func (this *QCborValue) ToRegularExpression1(defaultValue *qt6.QRegularExpression) *qt6.QRegularExpression { + _ret := C.QCborValue_ToRegularExpression1(this.h, (*C.QRegularExpression)(defaultValue.UnsafePointer())) + _goptr := qt6.UnsafeNewQRegularExpression(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValue) ToUuid1(defaultValue *QUuid) *QUuid { - _ret := C.QCborValue_ToUuid1(this.h, defaultValue.cPointer()) - _goptr := newQUuid(_ret) +func (this *QCborValue) ToUuid1(defaultValue *qt6.QUuid) *qt6.QUuid { + _ret := C.QCborValue_ToUuid1(this.h, (*C.QUuid)(defaultValue.UnsafePointer())) + _goptr := qt6.UnsafeNewQUuid(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -727,399 +728,8 @@ func (this *QCborValue) GoGC() { }) } -type QCborValueConstRef struct { - h *C.QCborValueConstRef -} - -func (this *QCborValueConstRef) cPointer() *C.QCborValueConstRef { - if this == nil { - return nil - } - return this.h -} - -func (this *QCborValueConstRef) UnsafePointer() unsafe.Pointer { - if this == nil { - return nil - } - return unsafe.Pointer(this.h) -} - -func newQCborValueConstRef(h *C.QCborValueConstRef) *QCborValueConstRef { - if h == nil { - return nil - } - return &QCborValueConstRef{h: h} -} - -func UnsafeNewQCborValueConstRef(h unsafe.Pointer) *QCborValueConstRef { - return newQCborValueConstRef((*C.QCborValueConstRef)(h)) -} - -// NewQCborValueConstRef constructs a new QCborValueConstRef object. -func NewQCborValueConstRef(param1 *QCborValueConstRef) *QCborValueConstRef { - ret := C.QCborValueConstRef_new(param1.cPointer()) - return newQCborValueConstRef(ret) -} - -func (this *QCborValueConstRef) Type() QCborValue__Type { - return (QCborValue__Type)(C.QCborValueConstRef_Type(this.h)) -} - -func (this *QCborValueConstRef) IsInteger() bool { - return (bool)(C.QCborValueConstRef_IsInteger(this.h)) -} - -func (this *QCborValueConstRef) IsByteArray() bool { - return (bool)(C.QCborValueConstRef_IsByteArray(this.h)) -} - -func (this *QCborValueConstRef) IsString() bool { - return (bool)(C.QCborValueConstRef_IsString(this.h)) -} - -func (this *QCborValueConstRef) IsArray() bool { - return (bool)(C.QCborValueConstRef_IsArray(this.h)) -} - -func (this *QCborValueConstRef) IsMap() bool { - return (bool)(C.QCborValueConstRef_IsMap(this.h)) -} - -func (this *QCborValueConstRef) IsTag() bool { - return (bool)(C.QCborValueConstRef_IsTag(this.h)) -} - -func (this *QCborValueConstRef) IsFalse() bool { - return (bool)(C.QCborValueConstRef_IsFalse(this.h)) -} - -func (this *QCborValueConstRef) IsTrue() bool { - return (bool)(C.QCborValueConstRef_IsTrue(this.h)) -} - -func (this *QCborValueConstRef) IsBool() bool { - return (bool)(C.QCborValueConstRef_IsBool(this.h)) -} - -func (this *QCborValueConstRef) IsNull() bool { - return (bool)(C.QCborValueConstRef_IsNull(this.h)) -} - -func (this *QCborValueConstRef) IsUndefined() bool { - return (bool)(C.QCborValueConstRef_IsUndefined(this.h)) -} - -func (this *QCborValueConstRef) IsDouble() bool { - return (bool)(C.QCborValueConstRef_IsDouble(this.h)) -} - -func (this *QCborValueConstRef) IsDateTime() bool { - return (bool)(C.QCborValueConstRef_IsDateTime(this.h)) -} - -func (this *QCborValueConstRef) IsUrl() bool { - return (bool)(C.QCborValueConstRef_IsUrl(this.h)) -} - -func (this *QCborValueConstRef) IsRegularExpression() bool { - return (bool)(C.QCborValueConstRef_IsRegularExpression(this.h)) -} - -func (this *QCborValueConstRef) IsUuid() bool { - return (bool)(C.QCborValueConstRef_IsUuid(this.h)) -} - -func (this *QCborValueConstRef) IsInvalid() bool { - return (bool)(C.QCborValueConstRef_IsInvalid(this.h)) -} - -func (this *QCborValueConstRef) IsContainer() bool { - return (bool)(C.QCborValueConstRef_IsContainer(this.h)) -} - -func (this *QCborValueConstRef) IsSimpleType() bool { - return (bool)(C.QCborValueConstRef_IsSimpleType(this.h)) -} - -func (this *QCborValueConstRef) IsSimpleTypeWithSt(st QCborSimpleType) bool { - return (bool)(C.QCborValueConstRef_IsSimpleTypeWithSt(this.h, (C.uint8_t)(st))) -} - -func (this *QCborValueConstRef) ToSimpleType() QCborSimpleType { - return (QCborSimpleType)(C.QCborValueConstRef_ToSimpleType(this.h)) -} - -func (this *QCborValueConstRef) Tag() QCborTag { - return (QCborTag)(C.QCborValueConstRef_Tag(this.h)) -} - -func (this *QCborValueConstRef) TaggedValue() *QCborValue { - _ret := C.QCborValueConstRef_TaggedValue(this.h) - _goptr := newQCborValue(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QCborValueConstRef) ToInteger() int64 { - return (int64)(C.QCborValueConstRef_ToInteger(this.h)) -} - -func (this *QCborValueConstRef) ToBool() bool { - return (bool)(C.QCborValueConstRef_ToBool(this.h)) -} - -func (this *QCborValueConstRef) ToDouble() float64 { - return (float64)(C.QCborValueConstRef_ToDouble(this.h)) -} - -func (this *QCborValueConstRef) ToByteArray() []byte { - var _bytearray C.struct_miqt_string = C.QCborValueConstRef_ToByteArray(this.h) - _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) - C.free(unsafe.Pointer(_bytearray.data)) - return _ret -} - -func (this *QCborValueConstRef) ToString() string { - var _ms C.struct_miqt_string = C.QCborValueConstRef_ToString(this.h) - _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms.data)) - return _ret -} - -func (this *QCborValueConstRef) ToDateTime() *QDateTime { - _ret := C.QCborValueConstRef_ToDateTime(this.h) - _goptr := newQDateTime(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QCborValueConstRef) ToUrl() *QUrl { - _ret := C.QCborValueConstRef_ToUrl(this.h) - _goptr := newQUrl(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QCborValueConstRef) ToRegularExpression() *QRegularExpression { - _ret := C.QCborValueConstRef_ToRegularExpression(this.h) - _goptr := newQRegularExpression(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QCborValueConstRef) ToUuid() *QUuid { - _ret := C.QCborValueConstRef_ToUuid(this.h) - _goptr := newQUuid(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QCborValueConstRef) ToArray() *QCborArray { - _ret := C.QCborValueConstRef_ToArray(this.h) - _goptr := newQCborArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QCborValueConstRef) ToArrayWithQCborArray(a *QCborArray) *QCborArray { - _ret := C.QCborValueConstRef_ToArrayWithQCborArray(this.h, a.cPointer()) - _goptr := newQCborArray(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QCborValueConstRef) ToMap() *QCborMap { - _ret := C.QCborValueConstRef_ToMap(this.h) - _goptr := newQCborMap(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QCborValueConstRef) ToMapWithQCborMap(m *QCborMap) *QCborMap { - _ret := C.QCborValueConstRef_ToMapWithQCborMap(this.h, m.cPointer()) - _goptr := newQCborMap(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QCborValueConstRef) OperatorSubscript(key string) *QCborValue { - key_ms := C.struct_miqt_string{} - key_ms.data = C.CString(key) - key_ms.len = C.size_t(len(key)) - defer C.free(unsafe.Pointer(key_ms.data)) - _ret := C.QCborValueConstRef_OperatorSubscript(this.h, key_ms) - _goptr := newQCborValue(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QCborValueConstRef) OperatorSubscript2(key int64) *QCborValue { - _ret := C.QCborValueConstRef_OperatorSubscript2(this.h, (C.longlong)(key)) - _goptr := newQCborValue(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QCborValueConstRef) Compare(other *QCborValue) int { - return (int)(C.QCborValueConstRef_Compare(this.h, other.cPointer())) -} - -func (this *QCborValueConstRef) OperatorEqual(other *QCborValue) bool { - return (bool)(C.QCborValueConstRef_OperatorEqual(this.h, other.cPointer())) -} - -func (this *QCborValueConstRef) OperatorNotEqual(other *QCborValue) bool { - return (bool)(C.QCborValueConstRef_OperatorNotEqual(this.h, other.cPointer())) -} - -func (this *QCborValueConstRef) OperatorLesser(other *QCborValue) bool { - return (bool)(C.QCborValueConstRef_OperatorLesser(this.h, other.cPointer())) -} - -func (this *QCborValueConstRef) ToVariant() *QVariant { - _ret := C.QCborValueConstRef_ToVariant(this.h) - _goptr := newQVariant(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QCborValueConstRef) ToJsonValue() *QJsonValue { - _ret := C.QCborValueConstRef_ToJsonValue(this.h) - _goptr := newQJsonValue(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QCborValueConstRef) ToCbor() []byte { - var _bytearray C.struct_miqt_string = C.QCborValueConstRef_ToCbor(this.h) - _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) - C.free(unsafe.Pointer(_bytearray.data)) - return _ret -} - -func (this *QCborValueConstRef) ToCborWithWriter(writer *QCborStreamWriter) { - C.QCborValueConstRef_ToCborWithWriter(this.h, writer.cPointer()) -} - -func (this *QCborValueConstRef) ToDiagnosticNotation() string { - var _ms C.struct_miqt_string = C.QCborValueConstRef_ToDiagnosticNotation(this.h) - _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms.data)) - return _ret -} - -func (this *QCborValueConstRef) ToSimpleType1(defaultValue QCborSimpleType) QCborSimpleType { - return (QCborSimpleType)(C.QCborValueConstRef_ToSimpleType1(this.h, (C.uint8_t)(defaultValue))) -} - -func (this *QCborValueConstRef) Tag1(defaultValue QCborTag) QCborTag { - return (QCborTag)(C.QCborValueConstRef_Tag1(this.h, (C.uint64_t)(defaultValue))) -} - -func (this *QCborValueConstRef) TaggedValue1(defaultValue *QCborValue) *QCborValue { - _ret := C.QCborValueConstRef_TaggedValue1(this.h, defaultValue.cPointer()) - _goptr := newQCborValue(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QCborValueConstRef) ToInteger1(defaultValue int64) int64 { - return (int64)(C.QCborValueConstRef_ToInteger1(this.h, (C.longlong)(defaultValue))) -} - -func (this *QCborValueConstRef) ToBool1(defaultValue bool) bool { - return (bool)(C.QCborValueConstRef_ToBool1(this.h, (C.bool)(defaultValue))) -} - -func (this *QCborValueConstRef) ToDouble1(defaultValue float64) float64 { - return (float64)(C.QCborValueConstRef_ToDouble1(this.h, (C.double)(defaultValue))) -} - -func (this *QCborValueConstRef) ToByteArray1(defaultValue []byte) []byte { - defaultValue_alias := C.struct_miqt_string{} - defaultValue_alias.data = (*C.char)(unsafe.Pointer(&defaultValue[0])) - defaultValue_alias.len = C.size_t(len(defaultValue)) - var _bytearray C.struct_miqt_string = C.QCborValueConstRef_ToByteArray1(this.h, defaultValue_alias) - _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) - C.free(unsafe.Pointer(_bytearray.data)) - return _ret -} - -func (this *QCborValueConstRef) ToString1(defaultValue string) string { - defaultValue_ms := C.struct_miqt_string{} - defaultValue_ms.data = C.CString(defaultValue) - defaultValue_ms.len = C.size_t(len(defaultValue)) - defer C.free(unsafe.Pointer(defaultValue_ms.data)) - var _ms C.struct_miqt_string = C.QCborValueConstRef_ToString1(this.h, defaultValue_ms) - _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms.data)) - return _ret -} - -func (this *QCborValueConstRef) ToDateTime1(defaultValue *QDateTime) *QDateTime { - _ret := C.QCborValueConstRef_ToDateTime1(this.h, defaultValue.cPointer()) - _goptr := newQDateTime(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QCborValueConstRef) ToUrl1(defaultValue *QUrl) *QUrl { - _ret := C.QCborValueConstRef_ToUrl1(this.h, defaultValue.cPointer()) - _goptr := newQUrl(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QCborValueConstRef) ToRegularExpression1(defaultValue *QRegularExpression) *QRegularExpression { - _ret := C.QCborValueConstRef_ToRegularExpression1(this.h, defaultValue.cPointer()) - _goptr := newQRegularExpression(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QCborValueConstRef) ToUuid1(defaultValue *QUuid) *QUuid { - _ret := C.QCborValueConstRef_ToUuid1(this.h, defaultValue.cPointer()) - _goptr := newQUuid(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QCborValueConstRef) ToCbor1(opt QCborValue__EncodingOption) []byte { - var _bytearray C.struct_miqt_string = C.QCborValueConstRef_ToCbor1(this.h, (C.int)(opt)) - _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) - C.free(unsafe.Pointer(_bytearray.data)) - return _ret -} - -func (this *QCborValueConstRef) ToCbor2(writer *QCborStreamWriter, opt QCborValue__EncodingOption) { - C.QCborValueConstRef_ToCbor2(this.h, writer.cPointer(), (C.int)(opt)) -} - -func (this *QCborValueConstRef) ToDiagnosticNotation1(opt QCborValue__DiagnosticNotationOption) string { - var _ms C.struct_miqt_string = C.QCborValueConstRef_ToDiagnosticNotation1(this.h, (C.int)(opt)) - _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) - C.free(unsafe.Pointer(_ms.data)) - return _ret -} - -// Delete this object from C++ memory. -func (this *QCborValueConstRef) Delete() { - C.QCborValueConstRef_Delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QCborValueConstRef) GoGC() { - runtime.SetFinalizer(this, func(this *QCborValueConstRef) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} - type QCborValueRef struct { h *C.QCborValueRef - *QCborValueConstRef } func (this *QCborValueRef) cPointer() *C.QCborValueRef { @@ -1140,7 +750,7 @@ func newQCborValueRef(h *C.QCborValueRef) *QCborValueRef { if h == nil { return nil } - return &QCborValueRef{h: h, QCborValueConstRef: UnsafeNewQCborValueConstRef(unsafe.Pointer(h))} + return &QCborValueRef{h: h} } func UnsafeNewQCborValueRef(h unsafe.Pointer) *QCborValueRef { @@ -1161,24 +771,6 @@ func (this *QCborValueRef) OperatorAssignWithOther(other *QCborValueRef) { C.QCborValueRef_OperatorAssignWithOther(this.h, other.cPointer()) } -func (this *QCborValueRef) OperatorSubscript(key int64) *QCborValueRef { - _ret := C.QCborValueRef_OperatorSubscript(this.h, (C.longlong)(key)) - _goptr := newQCborValueRef(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QCborValueRef) OperatorSubscript2(key string) *QCborValueRef { - key_ms := C.struct_miqt_string{} - key_ms.data = C.CString(key) - key_ms.len = C.size_t(len(key)) - defer C.free(unsafe.Pointer(key_ms.data)) - _ret := C.QCborValueRef_OperatorSubscript2(this.h, key_ms) - _goptr := newQCborValueRef(_ret) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - func (this *QCborValueRef) Type() QCborValue__Type { return (QCborValue__Type)(C.QCborValueRef_Type(this.h)) } @@ -1263,10 +855,6 @@ func (this *QCborValueRef) IsSimpleTypeWithSt(st QCborSimpleType) bool { return (bool)(C.QCborValueRef_IsSimpleTypeWithSt(this.h, (C.uint8_t)(st))) } -func (this *QCborValueRef) ToSimpleType() QCborSimpleType { - return (QCborSimpleType)(C.QCborValueRef_ToSimpleType(this.h)) -} - func (this *QCborValueRef) Tag() QCborTag { return (QCborTag)(C.QCborValueRef_Tag(this.h)) } @@ -1304,30 +892,30 @@ func (this *QCborValueRef) ToString() string { return _ret } -func (this *QCborValueRef) ToDateTime() *QDateTime { +func (this *QCborValueRef) ToDateTime() *qt6.QDateTime { _ret := C.QCborValueRef_ToDateTime(this.h) - _goptr := newQDateTime(_ret) + _goptr := qt6.UnsafeNewQDateTime(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValueRef) ToUrl() *QUrl { +func (this *QCborValueRef) ToUrl() *qt6.QUrl { _ret := C.QCborValueRef_ToUrl(this.h) - _goptr := newQUrl(_ret) + _goptr := qt6.UnsafeNewQUrl(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValueRef) ToRegularExpression() *QRegularExpression { +func (this *QCborValueRef) ToRegularExpression() *qt6.QRegularExpression { _ret := C.QCborValueRef_ToRegularExpression(this.h) - _goptr := newQRegularExpression(_ret) + _goptr := qt6.UnsafeNewQRegularExpression(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValueRef) ToUuid() *QUuid { +func (this *QCborValueRef) ToUuid() *qt6.QUuid { _ret := C.QCborValueRef_ToUuid(this.h) - _goptr := newQUuid(_ret) + _goptr := qt6.UnsafeNewQUuid(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -1360,24 +948,42 @@ func (this *QCborValueRef) ToMapWithQCborMap(m *QCborMap) *QCborMap { return _goptr } -func (this *QCborValueRef) OperatorSubscript3(key string) *QCborValue { +func (this *QCborValueRef) OperatorSubscript(key string) *QCborValue { key_ms := C.struct_miqt_string{} key_ms.data = C.CString(key) key_ms.len = C.size_t(len(key)) defer C.free(unsafe.Pointer(key_ms.data)) - _ret := C.QCborValueRef_OperatorSubscript3(this.h, key_ms) + _ret := C.QCborValueRef_OperatorSubscript(this.h, key_ms) _goptr := newQCborValue(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValueRef) OperatorSubscript5(key int64) *QCborValue { - _ret := C.QCborValueRef_OperatorSubscript5(this.h, (C.longlong)(key)) +func (this *QCborValueRef) OperatorSubscript2(key int64) *QCborValue { + _ret := C.QCborValueRef_OperatorSubscript2(this.h, (C.longlong)(key)) _goptr := newQCborValue(_ret) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } +func (this *QCborValueRef) OperatorSubscript3(key int64) *QCborValueRef { + _ret := C.QCborValueRef_OperatorSubscript3(this.h, (C.longlong)(key)) + _goptr := newQCborValueRef(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + +func (this *QCborValueRef) OperatorSubscript5(key string) *QCborValueRef { + key_ms := C.struct_miqt_string{} + key_ms.data = C.CString(key) + key_ms.len = C.size_t(len(key)) + defer C.free(unsafe.Pointer(key_ms.data)) + _ret := C.QCborValueRef_OperatorSubscript5(this.h, key_ms) + _goptr := newQCborValueRef(_ret) + _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer + return _goptr +} + func (this *QCborValueRef) Compare(other *QCborValue) int { return (int)(C.QCborValueRef_Compare(this.h, other.cPointer())) } @@ -1394,16 +1000,16 @@ func (this *QCborValueRef) OperatorLesser(other *QCborValue) bool { return (bool)(C.QCborValueRef_OperatorLesser(this.h, other.cPointer())) } -func (this *QCborValueRef) ToVariant() *QVariant { +func (this *QCborValueRef) ToVariant() *qt6.QVariant { _ret := C.QCborValueRef_ToVariant(this.h) - _goptr := newQVariant(_ret) + _goptr := qt6.UnsafeNewQVariant(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValueRef) ToJsonValue() *QJsonValue { +func (this *QCborValueRef) ToJsonValue() *qt6.QJsonValue { _ret := C.QCborValueRef_ToJsonValue(this.h) - _goptr := newQJsonValue(_ret) + _goptr := qt6.UnsafeNewQJsonValue(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -1426,10 +1032,6 @@ func (this *QCborValueRef) ToDiagnosticNotation() string { return _ret } -func (this *QCborValueRef) ToSimpleType1(defaultValue QCborSimpleType) QCborSimpleType { - return (QCborSimpleType)(C.QCborValueRef_ToSimpleType1(this.h, (C.uint8_t)(defaultValue))) -} - func (this *QCborValueRef) Tag1(defaultValue QCborTag) QCborTag { return (QCborTag)(C.QCborValueRef_Tag1(this.h, (C.uint64_t)(defaultValue))) } @@ -1474,30 +1076,30 @@ func (this *QCborValueRef) ToString1(defaultValue string) string { return _ret } -func (this *QCborValueRef) ToDateTime1(defaultValue *QDateTime) *QDateTime { - _ret := C.QCborValueRef_ToDateTime1(this.h, defaultValue.cPointer()) - _goptr := newQDateTime(_ret) +func (this *QCborValueRef) ToDateTime1(defaultValue *qt6.QDateTime) *qt6.QDateTime { + _ret := C.QCborValueRef_ToDateTime1(this.h, (*C.QDateTime)(defaultValue.UnsafePointer())) + _goptr := qt6.UnsafeNewQDateTime(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValueRef) ToUrl1(defaultValue *QUrl) *QUrl { - _ret := C.QCborValueRef_ToUrl1(this.h, defaultValue.cPointer()) - _goptr := newQUrl(_ret) +func (this *QCborValueRef) ToUrl1(defaultValue *qt6.QUrl) *qt6.QUrl { + _ret := C.QCborValueRef_ToUrl1(this.h, (*C.QUrl)(defaultValue.UnsafePointer())) + _goptr := qt6.UnsafeNewQUrl(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValueRef) ToRegularExpression1(defaultValue *QRegularExpression) *QRegularExpression { - _ret := C.QCborValueRef_ToRegularExpression1(this.h, defaultValue.cPointer()) - _goptr := newQRegularExpression(_ret) +func (this *QCborValueRef) ToRegularExpression1(defaultValue *qt6.QRegularExpression) *qt6.QRegularExpression { + _ret := C.QCborValueRef_ToRegularExpression1(this.h, (*C.QRegularExpression)(defaultValue.UnsafePointer())) + _goptr := qt6.UnsafeNewQRegularExpression(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } -func (this *QCborValueRef) ToUuid1(defaultValue *QUuid) *QUuid { - _ret := C.QCborValueRef_ToUuid1(this.h, defaultValue.cPointer()) - _goptr := newQUuid(_ret) +func (this *QCborValueRef) ToUuid1(defaultValue *qt6.QUuid) *qt6.QUuid { + _ret := C.QCborValueRef_ToUuid1(this.h, (*C.QUuid)(defaultValue.UnsafePointer())) + _goptr := qt6.UnsafeNewQUuid(unsafe.Pointer(_ret)) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt6/gen_qcborvalue.h b/qt6/cbor/gen_qcborvalue.h similarity index 65% rename from qt6/gen_qcborvalue.h rename to qt6/cbor/gen_qcborvalue.h index b77bbbbf..fc5d8c0d 100644 --- a/qt6/gen_qcborvalue.h +++ b/qt6/cbor/gen_qcborvalue.h @@ -7,7 +7,7 @@ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#include "../libmiqt/libmiqt.h" +#include "../../libmiqt/libmiqt.h" #ifdef __cplusplus extern "C" { @@ -21,7 +21,6 @@ class QCborParserError; class QCborStreamReader; class QCborStreamWriter; class QCborValue; -class QCborValueConstRef; class QCborValueRef; class QDateTime; class QJsonValue; @@ -37,7 +36,6 @@ typedef struct QCborParserError QCborParserError; typedef struct QCborStreamReader QCborStreamReader; typedef struct QCborStreamWriter QCborStreamWriter; typedef struct QCborValue QCborValue; -typedef struct QCborValueConstRef QCborValueConstRef; typedef struct QCborValueRef QCborValueRef; typedef struct QDateTime QDateTime; typedef struct QJsonValue QJsonValue; @@ -127,8 +125,8 @@ QCborValue* QCborValue_FromCbor(QCborStreamReader* reader); QCborValue* QCborValue_FromCborWithBa(struct miqt_string ba); QCborValue* QCborValue_FromCbor2(const char* data, ptrdiff_t lenVal); QCborValue* QCborValue_FromCbor3(const unsigned char* data, ptrdiff_t lenVal); -struct miqt_string QCborValue_ToCbor(const QCborValue* self); -void QCborValue_ToCborWithWriter(const QCborValue* self, QCborStreamWriter* writer); +struct miqt_string QCborValue_ToCbor(QCborValue* self); +void QCborValue_ToCborWithWriter(QCborValue* self, QCborStreamWriter* writer); struct miqt_string QCborValue_ToDiagnosticNotation(const QCborValue* self); uint8_t QCborValue_ToSimpleType1(const QCborValue* self, uint8_t defaultValue); long long QCborValue_ToInteger1(const QCborValue* self, long long defaultValue); @@ -145,82 +143,14 @@ QUuid* QCborValue_ToUuid1(const QCborValue* self, QUuid* defaultValue); QCborValue* QCborValue_FromCbor22(struct miqt_string ba, QCborParserError* error); QCborValue* QCborValue_FromCbor32(const char* data, ptrdiff_t lenVal, QCborParserError* error); QCborValue* QCborValue_FromCbor33(const unsigned char* data, ptrdiff_t lenVal, QCborParserError* error); -struct miqt_string QCborValue_ToCbor1(const QCborValue* self, int opt); -void QCborValue_ToCbor2(const QCborValue* self, QCborStreamWriter* writer, int opt); +struct miqt_string QCborValue_ToCbor1(QCborValue* self, int opt); +void QCborValue_ToCbor2(QCborValue* self, QCborStreamWriter* writer, int opt); struct miqt_string QCborValue_ToDiagnosticNotation1(const QCborValue* self, int opts); void QCborValue_Delete(QCborValue* self); -QCborValueConstRef* QCborValueConstRef_new(QCborValueConstRef* param1); -int QCborValueConstRef_Type(const QCborValueConstRef* self); -bool QCborValueConstRef_IsInteger(const QCborValueConstRef* self); -bool QCborValueConstRef_IsByteArray(const QCborValueConstRef* self); -bool QCborValueConstRef_IsString(const QCborValueConstRef* self); -bool QCborValueConstRef_IsArray(const QCborValueConstRef* self); -bool QCborValueConstRef_IsMap(const QCborValueConstRef* self); -bool QCborValueConstRef_IsTag(const QCborValueConstRef* self); -bool QCborValueConstRef_IsFalse(const QCborValueConstRef* self); -bool QCborValueConstRef_IsTrue(const QCborValueConstRef* self); -bool QCborValueConstRef_IsBool(const QCborValueConstRef* self); -bool QCborValueConstRef_IsNull(const QCborValueConstRef* self); -bool QCborValueConstRef_IsUndefined(const QCborValueConstRef* self); -bool QCborValueConstRef_IsDouble(const QCborValueConstRef* self); -bool QCborValueConstRef_IsDateTime(const QCborValueConstRef* self); -bool QCborValueConstRef_IsUrl(const QCborValueConstRef* self); -bool QCborValueConstRef_IsRegularExpression(const QCborValueConstRef* self); -bool QCborValueConstRef_IsUuid(const QCborValueConstRef* self); -bool QCborValueConstRef_IsInvalid(const QCborValueConstRef* self); -bool QCborValueConstRef_IsContainer(const QCborValueConstRef* self); -bool QCborValueConstRef_IsSimpleType(const QCborValueConstRef* self); -bool QCborValueConstRef_IsSimpleTypeWithSt(const QCborValueConstRef* self, uint8_t st); -uint8_t QCborValueConstRef_ToSimpleType(const QCborValueConstRef* self); -uint64_t QCborValueConstRef_Tag(const QCborValueConstRef* self); -QCborValue* QCborValueConstRef_TaggedValue(const QCborValueConstRef* self); -long long QCborValueConstRef_ToInteger(const QCborValueConstRef* self); -bool QCborValueConstRef_ToBool(const QCborValueConstRef* self); -double QCborValueConstRef_ToDouble(const QCborValueConstRef* self); -struct miqt_string QCborValueConstRef_ToByteArray(const QCborValueConstRef* self); -struct miqt_string QCborValueConstRef_ToString(const QCborValueConstRef* self); -QDateTime* QCborValueConstRef_ToDateTime(const QCborValueConstRef* self); -QUrl* QCborValueConstRef_ToUrl(const QCborValueConstRef* self); -QRegularExpression* QCborValueConstRef_ToRegularExpression(const QCborValueConstRef* self); -QUuid* QCborValueConstRef_ToUuid(const QCborValueConstRef* self); -QCborArray* QCborValueConstRef_ToArray(const QCborValueConstRef* self); -QCborArray* QCborValueConstRef_ToArrayWithQCborArray(const QCborValueConstRef* self, QCborArray* a); -QCborMap* QCborValueConstRef_ToMap(const QCborValueConstRef* self); -QCborMap* QCborValueConstRef_ToMapWithQCborMap(const QCborValueConstRef* self, QCborMap* m); -QCborValue* QCborValueConstRef_OperatorSubscript(const QCborValueConstRef* self, struct miqt_string key); -QCborValue* QCborValueConstRef_OperatorSubscript2(const QCborValueConstRef* self, long long key); -int QCborValueConstRef_Compare(const QCborValueConstRef* self, QCborValue* other); -bool QCborValueConstRef_OperatorEqual(const QCborValueConstRef* self, QCborValue* other); -bool QCborValueConstRef_OperatorNotEqual(const QCborValueConstRef* self, QCborValue* other); -bool QCborValueConstRef_OperatorLesser(const QCborValueConstRef* self, QCborValue* other); -QVariant* QCborValueConstRef_ToVariant(const QCborValueConstRef* self); -QJsonValue* QCborValueConstRef_ToJsonValue(const QCborValueConstRef* self); -struct miqt_string QCborValueConstRef_ToCbor(const QCborValueConstRef* self); -void QCborValueConstRef_ToCborWithWriter(const QCborValueConstRef* self, QCborStreamWriter* writer); -struct miqt_string QCborValueConstRef_ToDiagnosticNotation(const QCborValueConstRef* self); -uint8_t QCborValueConstRef_ToSimpleType1(const QCborValueConstRef* self, uint8_t defaultValue); -uint64_t QCborValueConstRef_Tag1(const QCborValueConstRef* self, uint64_t defaultValue); -QCborValue* QCborValueConstRef_TaggedValue1(const QCborValueConstRef* self, QCborValue* defaultValue); -long long QCborValueConstRef_ToInteger1(const QCborValueConstRef* self, long long defaultValue); -bool QCborValueConstRef_ToBool1(const QCborValueConstRef* self, bool defaultValue); -double QCborValueConstRef_ToDouble1(const QCborValueConstRef* self, double defaultValue); -struct miqt_string QCborValueConstRef_ToByteArray1(const QCborValueConstRef* self, struct miqt_string defaultValue); -struct miqt_string QCborValueConstRef_ToString1(const QCborValueConstRef* self, struct miqt_string defaultValue); -QDateTime* QCborValueConstRef_ToDateTime1(const QCborValueConstRef* self, QDateTime* defaultValue); -QUrl* QCborValueConstRef_ToUrl1(const QCborValueConstRef* self, QUrl* defaultValue); -QRegularExpression* QCborValueConstRef_ToRegularExpression1(const QCborValueConstRef* self, QRegularExpression* defaultValue); -QUuid* QCborValueConstRef_ToUuid1(const QCborValueConstRef* self, QUuid* defaultValue); -struct miqt_string QCborValueConstRef_ToCbor1(const QCborValueConstRef* self, int opt); -void QCborValueConstRef_ToCbor2(const QCborValueConstRef* self, QCborStreamWriter* writer, int opt); -struct miqt_string QCborValueConstRef_ToDiagnosticNotation1(const QCborValueConstRef* self, int opt); -void QCborValueConstRef_Delete(QCborValueConstRef* self); - QCborValueRef* QCborValueRef_new(QCborValueRef* param1); void QCborValueRef_OperatorAssign(QCborValueRef* self, QCborValue* other); void QCborValueRef_OperatorAssignWithOther(QCborValueRef* self, QCborValueRef* other); -QCborValueRef* QCborValueRef_OperatorSubscript(QCborValueRef* self, long long key); -QCborValueRef* QCborValueRef_OperatorSubscript2(QCborValueRef* self, struct miqt_string key); int QCborValueRef_Type(const QCborValueRef* self); bool QCborValueRef_IsInteger(const QCborValueRef* self); bool QCborValueRef_IsByteArray(const QCborValueRef* self); @@ -242,7 +172,6 @@ bool QCborValueRef_IsInvalid(const QCborValueRef* self); bool QCborValueRef_IsContainer(const QCborValueRef* self); bool QCborValueRef_IsSimpleType(const QCborValueRef* self); bool QCborValueRef_IsSimpleTypeWithSt(const QCborValueRef* self, uint8_t st); -uint8_t QCborValueRef_ToSimpleType(const QCborValueRef* self); uint64_t QCborValueRef_Tag(const QCborValueRef* self); QCborValue* QCborValueRef_TaggedValue(const QCborValueRef* self); long long QCborValueRef_ToInteger(const QCborValueRef* self); @@ -258,8 +187,10 @@ QCborArray* QCborValueRef_ToArray(const QCborValueRef* self); QCborArray* QCborValueRef_ToArrayWithQCborArray(const QCborValueRef* self, QCborArray* a); QCborMap* QCborValueRef_ToMap(const QCborValueRef* self); QCborMap* QCborValueRef_ToMapWithQCborMap(const QCborValueRef* self, QCborMap* m); -QCborValue* QCborValueRef_OperatorSubscript3(const QCborValueRef* self, struct miqt_string key); -QCborValue* QCborValueRef_OperatorSubscript5(const QCborValueRef* self, long long key); +QCborValue* QCborValueRef_OperatorSubscript(const QCborValueRef* self, struct miqt_string key); +QCborValue* QCborValueRef_OperatorSubscript2(const QCborValueRef* self, long long key); +QCborValueRef* QCborValueRef_OperatorSubscript3(QCborValueRef* self, long long key); +QCborValueRef* QCborValueRef_OperatorSubscript5(QCborValueRef* self, struct miqt_string key); int QCborValueRef_Compare(const QCborValueRef* self, QCborValue* other); bool QCborValueRef_OperatorEqual(const QCborValueRef* self, QCborValue* other); bool QCborValueRef_OperatorNotEqual(const QCborValueRef* self, QCborValue* other); @@ -269,7 +200,6 @@ QJsonValue* QCborValueRef_ToJsonValue(const QCborValueRef* self); struct miqt_string QCborValueRef_ToCbor(QCborValueRef* self); void QCborValueRef_ToCborWithWriter(QCborValueRef* self, QCborStreamWriter* writer); struct miqt_string QCborValueRef_ToDiagnosticNotation(QCborValueRef* self); -uint8_t QCborValueRef_ToSimpleType1(const QCborValueRef* self, uint8_t defaultValue); uint64_t QCborValueRef_Tag1(const QCborValueRef* self, uint64_t defaultValue); QCborValue* QCborValueRef_TaggedValue1(const QCborValueRef* self, QCborValue* defaultValue); long long QCborValueRef_ToInteger1(const QCborValueRef* self, long long defaultValue); diff --git a/qt6/gen_qmetatype.go b/qt6/gen_qmetatype.go index 9597556d..922cb793 100644 --- a/qt6/gen_qmetatype.go +++ b/qt6/gen_qmetatype.go @@ -13,6 +13,8 @@ import ( "unsafe" ) +type QCborSimpleType byte + type QMetaType__Type int const (