From 336cbeef3a46930cb734d179f02f8d70a8ea3a6b Mon Sep 17 00:00:00 2001 From: mappu Date: Fri, 11 Apr 2025 23:01:51 +1200 Subject: [PATCH] qt: rebuild (integer type parameters - no change in practice) --- qt/gen_qchar.cpp | 22 +++---- qt/gen_qchar.go | 6 +- qt/gen_qchar.h | 14 ++--- qt/gen_qcolor.cpp | 8 +-- qt/gen_qcolor.go | 8 +-- qt/gen_qcolor.h | 8 +-- qt/gen_qdatastream.cpp | 8 +-- qt/gen_qdatastream.go | 8 +-- qt/gen_qdatastream.h | 8 +-- qt/gen_qdebug.cpp | 4 +- qt/gen_qdebug.go | 4 +- qt/gen_qdebug.h | 4 +- qt/gen_qevent.cpp | 4 +- qt/gen_qevent.go | 4 +- qt/gen_qevent.h | 4 +- qt/gen_qlocale.cpp | 24 ++++---- qt/gen_qlocale.go | 12 ++-- qt/gen_qlocale.h | 20 +++--- qt/gen_qrgba64.cpp | 30 ++++----- qt/gen_qrgba64.go | 10 +-- qt/gen_qrgba64.h | 20 +++--- qt/gen_qstringview.cpp | 18 +++--- qt/gen_qstringview.h | 12 ++-- qt/gen_qtextstream.cpp | 8 +-- qt/gen_qtextstream.go | 8 +-- qt/gen_qtextstream.h | 8 +-- qt/gen_quuid.cpp | 2 +- qt/gen_quuid.go | 2 +- qt/gen_quuid.h | 2 +- qt/network/gen_qabstractsocket.cpp | 44 +++++++------- qt/network/gen_qabstractsocket.go | 24 ++++---- qt/network/gen_qabstractsocket.h | 24 ++++---- qt/network/gen_qdnslookup.cpp | 16 ++--- qt/network/gen_qdnslookup.h | 8 +-- qt/network/gen_qdtls.cpp | 16 ++--- qt/network/gen_qdtls.go | 8 +-- qt/network/gen_qdtls.h | 12 ++-- qt/network/gen_qnetworkaccessmanager.cpp | 8 +-- qt/network/gen_qnetworkaccessmanager.go | 8 +-- qt/network/gen_qnetworkaccessmanager.h | 8 +-- qt/network/gen_qnetworkdatagram.cpp | 6 +- qt/network/gen_qnetworkdatagram.go | 6 +- qt/network/gen_qnetworkdatagram.h | 6 +- qt/network/gen_qnetworkproxy.cpp | 24 ++++---- qt/network/gen_qnetworkproxy.go | 20 +++--- qt/network/gen_qnetworkproxy.h | 22 +++---- qt/network/gen_qsslsocket.cpp | 30 ++++----- qt/network/gen_qsslsocket.go | 22 +++---- qt/network/gen_qsslsocket.h | 20 +++--- qt/network/gen_qtcpserver.cpp | 6 +- qt/network/gen_qtcpserver.go | 2 +- qt/network/gen_qtcpserver.h | 4 +- qt/network/gen_qtcpsocket.cpp | 16 ++--- qt/network/gen_qtcpsocket.go | 8 +-- qt/network/gen_qtcpsocket.h | 6 +- qt/network/gen_qudpsocket.cpp | 22 +++---- qt/network/gen_qudpsocket.go | 14 ++--- qt/network/gen_qudpsocket.h | 12 ++-- qt/script/gen_qscriptvalue.cpp | 4 +- qt/script/gen_qscriptvalue.h | 2 +- qt6/gen_qbytearrayview.cpp | 18 +++--- qt6/gen_qbytearrayview.h | 12 ++-- qt6/gen_qchar.cpp | 4 +- qt6/gen_qchar.go | 4 +- qt6/gen_qchar.h | 4 +- qt6/gen_qcolor.cpp | 8 +-- qt6/gen_qcolor.go | 8 +-- qt6/gen_qcolor.h | 8 +-- qt6/gen_qdatastream.cpp | 8 +-- qt6/gen_qdatastream.go | 8 +-- qt6/gen_qdatastream.h | 8 +-- qt6/gen_qdebug.cpp | 4 +- qt6/gen_qdebug.go | 4 +- qt6/gen_qdebug.h | 4 +- qt6/gen_qevent.cpp | 6 +- qt6/gen_qevent.go | 6 +- qt6/gen_qevent.h | 6 +- qt6/gen_qlocale.cpp | 74 +++++++++++------------ qt6/gen_qlocale.go | 44 +++++++------- qt6/gen_qlocale.h | 58 +++++++++--------- qt6/gen_qrgba64.cpp | 30 ++++----- qt6/gen_qrgba64.go | 10 +-- qt6/gen_qrgba64.h | 20 +++--- qt6/gen_qstringview.cpp | 18 +++--- qt6/gen_qstringview.h | 12 ++-- qt6/gen_qtextstream.cpp | 8 +-- qt6/gen_qtextstream.go | 8 +-- qt6/gen_qtextstream.h | 8 +-- qt6/gen_qtimezone.cpp | 18 +++--- qt6/gen_qtimezone.go | 10 +-- qt6/gen_qtimezone.h | 14 ++--- qt6/gen_quuid.cpp | 2 +- qt6/gen_quuid.go | 2 +- qt6/gen_quuid.h | 2 +- qt6/network/gen_qabstractsocket.cpp | 44 +++++++------- qt6/network/gen_qabstractsocket.go | 24 ++++---- qt6/network/gen_qabstractsocket.h | 24 ++++---- qt6/network/gen_qdnslookup.cpp | 16 ++--- qt6/network/gen_qdnslookup.h | 8 +-- qt6/network/gen_qdtls.cpp | 16 ++--- qt6/network/gen_qdtls.go | 8 +-- qt6/network/gen_qdtls.h | 12 ++-- qt6/network/gen_qnetworkaccessmanager.cpp | 8 +-- qt6/network/gen_qnetworkaccessmanager.go | 8 +-- qt6/network/gen_qnetworkaccessmanager.h | 8 +-- qt6/network/gen_qnetworkdatagram.cpp | 6 +- qt6/network/gen_qnetworkdatagram.go | 6 +- qt6/network/gen_qnetworkdatagram.h | 6 +- qt6/network/gen_qnetworkproxy.cpp | 18 +++--- qt6/network/gen_qnetworkproxy.go | 14 ++--- qt6/network/gen_qnetworkproxy.h | 16 ++--- qt6/network/gen_qsctpsocket.cpp | 24 ++++---- qt6/network/gen_qsctpsocket.go | 12 ++-- qt6/network/gen_qsctpsocket.h | 8 +-- qt6/network/gen_qsslsocket.cpp | 38 ++++++------ qt6/network/gen_qsslsocket.go | 26 ++++---- qt6/network/gen_qsslsocket.h | 22 +++---- qt6/network/gen_qtcpserver.cpp | 6 +- qt6/network/gen_qtcpserver.go | 2 +- qt6/network/gen_qtcpserver.h | 4 +- qt6/network/gen_qtcpsocket.cpp | 28 ++++----- qt6/network/gen_qtcpsocket.go | 16 ++--- qt6/network/gen_qtcpsocket.h | 12 ++-- qt6/network/gen_qudpsocket.cpp | 34 +++++------ qt6/network/gen_qudpsocket.go | 22 +++---- qt6/network/gen_qudpsocket.h | 18 +++--- qt6/qml/gen_qqmlinfo.cpp | 4 +- qt6/qml/gen_qqmlinfo.go | 4 +- qt6/qml/gen_qqmlinfo.h | 4 +- 129 files changed, 851 insertions(+), 851 deletions(-) diff --git a/qt/gen_qchar.cpp b/qt/gen_qchar.cpp index d095c503..a53580ea 100644 --- a/qt/gen_qchar.cpp +++ b/qt/gen_qchar.cpp @@ -26,9 +26,9 @@ char QLatin1Char_toLatin1(const QLatin1Char* self) { return self->toLatin1(); } -uint16_t QLatin1Char_unicode(const QLatin1Char* self) { +unsigned short QLatin1Char_unicode(const QLatin1Char* self) { ushort _ret = self->unicode(); - return static_cast(_ret); + return static_cast(_ret); } void QLatin1Char_delete(QLatin1Char* self) { @@ -39,7 +39,7 @@ QChar* QChar_new() { return new QChar(); } -QChar* QChar_new2(uint16_t rc) { +QChar* QChar_new2(unsigned short rc) { return new QChar(static_cast(rc)); } @@ -47,7 +47,7 @@ QChar* QChar_new3(unsigned char c, unsigned char r) { return new QChar(static_cast(c), static_cast(r)); } -QChar* QChar_new4(int16_t rc) { +QChar* QChar_new4(short rc) { return new QChar(static_cast(rc)); } @@ -161,9 +161,9 @@ char QChar_toLatin1(const QChar* self) { return self->toLatin1(); } -uint16_t QChar_unicode(const QChar* self) { +unsigned short QChar_unicode(const QChar* self) { ushort _ret = self->unicode(); - return static_cast(_ret); + return static_cast(_ret); } QChar* QChar_fromLatin1(char c) { @@ -276,7 +276,7 @@ bool QChar_requiresSurrogates(unsigned int ucs4) { return QChar::requiresSurrogates(static_cast(ucs4)); } -unsigned int QChar_surrogateToUcs4(uint16_t high, uint16_t low) { +unsigned int QChar_surrogateToUcs4(unsigned short high, unsigned short low) { uint _ret = QChar::surrogateToUcs4(static_cast(high), static_cast(low)); return static_cast(_ret); } @@ -286,14 +286,14 @@ unsigned int QChar_surrogateToUcs42(QChar* high, QChar* low) { return static_cast(_ret); } -uint16_t QChar_highSurrogate(unsigned int ucs4) { +unsigned short QChar_highSurrogate(unsigned int ucs4) { ushort _ret = QChar::highSurrogate(static_cast(ucs4)); - return static_cast(_ret); + return static_cast(_ret); } -uint16_t QChar_lowSurrogate(unsigned int ucs4) { +unsigned short QChar_lowSurrogate(unsigned int ucs4) { ushort _ret = QChar::lowSurrogate(static_cast(ucs4)); - return static_cast(_ret); + return static_cast(_ret); } int QChar_categoryWithUcs4(unsigned int ucs4) { diff --git a/qt/gen_qchar.go b/qt/gen_qchar.go index 1798880a..ff420824 100644 --- a/qt/gen_qchar.go +++ b/qt/gen_qchar.go @@ -462,7 +462,7 @@ func NewQChar() *QChar { // NewQChar2 constructs a new QChar object. func NewQChar2(rc uint16) *QChar { - return newQChar(C.QChar_new2((C.uint16_t)(rc))) + return newQChar(C.QChar_new2((C.ushort)(rc))) } // NewQChar3 constructs a new QChar object. @@ -474,7 +474,7 @@ func NewQChar3(c byte, r byte) *QChar { // NewQChar4 constructs a new QChar object. func NewQChar4(rc int16) *QChar { - return newQChar(C.QChar_new4((C.int16_t)(rc))) + return newQChar(C.QChar_new4((C.short)(rc))) } // NewQChar5 constructs a new QChar object. @@ -715,7 +715,7 @@ func QChar_RequiresSurrogates(ucs4 uint) bool { } func QChar_SurrogateToUcs4(high uint16, low uint16) uint { - return (uint)(C.QChar_surrogateToUcs4((C.uint16_t)(high), (C.uint16_t)(low))) + return (uint)(C.QChar_surrogateToUcs4((C.ushort)(high), (C.ushort)(low))) } func QChar_SurrogateToUcs42(high QChar, low QChar) uint { diff --git a/qt/gen_qchar.h b/qt/gen_qchar.h index cc672906..f8e98cb7 100644 --- a/qt/gen_qchar.h +++ b/qt/gen_qchar.h @@ -25,13 +25,13 @@ typedef struct QLatin1Char QLatin1Char; QLatin1Char* QLatin1Char_new(char c); QLatin1Char* QLatin1Char_new2(QLatin1Char* param1); char QLatin1Char_toLatin1(const QLatin1Char* self); -uint16_t QLatin1Char_unicode(const QLatin1Char* self); +unsigned short QLatin1Char_unicode(const QLatin1Char* self); void QLatin1Char_delete(QLatin1Char* self); QChar* QChar_new(); -QChar* QChar_new2(uint16_t rc); +QChar* QChar_new2(unsigned short rc); QChar* QChar_new3(unsigned char c, unsigned char r); -QChar* QChar_new4(int16_t rc); +QChar* QChar_new4(short rc); QChar* QChar_new5(unsigned int rc); QChar* QChar_new6(int rc); QChar* QChar_new7(int s); @@ -56,7 +56,7 @@ QChar* QChar_toCaseFolded(const QChar* self); int QChar_script(const QChar* self); int QChar_unicodeVersion(const QChar* self); char QChar_toLatin1(const QChar* self); -uint16_t QChar_unicode(const QChar* self); +unsigned short QChar_unicode(const QChar* self); QChar* QChar_fromLatin1(char c); bool QChar_isNull(const QChar* self); bool QChar_isPrint(const QChar* self); @@ -84,10 +84,10 @@ bool QChar_isHighSurrogateWithUcs4(unsigned int ucs4); bool QChar_isLowSurrogateWithUcs4(unsigned int ucs4); bool QChar_isSurrogateWithUcs4(unsigned int ucs4); bool QChar_requiresSurrogates(unsigned int ucs4); -unsigned int QChar_surrogateToUcs4(uint16_t high, uint16_t low); +unsigned int QChar_surrogateToUcs4(unsigned short high, unsigned short low); unsigned int QChar_surrogateToUcs42(QChar* high, QChar* low); -uint16_t QChar_highSurrogate(unsigned int ucs4); -uint16_t QChar_lowSurrogate(unsigned int ucs4); +unsigned short QChar_highSurrogate(unsigned int ucs4); +unsigned short QChar_lowSurrogate(unsigned int ucs4); int QChar_categoryWithUcs4(unsigned int ucs4); int QChar_directionWithUcs4(unsigned int ucs4); int QChar_joiningTypeWithUcs4(unsigned int ucs4); diff --git a/qt/gen_qcolor.cpp b/qt/gen_qcolor.cpp index 946a5284..46d0d1e2 100644 --- a/qt/gen_qcolor.cpp +++ b/qt/gen_qcolor.cpp @@ -53,7 +53,7 @@ QColor* QColor_new9(QColor* color) { return new QColor(*color); } -QColor* QColor_new10(int spec, uint16_t a1, uint16_t a2, uint16_t a3, uint16_t a4) { +QColor* QColor_new10(int spec, unsigned short a1, unsigned short a2, unsigned short a3, unsigned short a4) { return new QColor(static_cast(spec), static_cast(a1), static_cast(a2), static_cast(a3), static_cast(a4)); } @@ -61,7 +61,7 @@ QColor* QColor_new11(int r, int g, int b, int a) { return new QColor(static_cast(r), static_cast(g), static_cast(b), static_cast(a)); } -QColor* QColor_new12(int spec, uint16_t a1, uint16_t a2, uint16_t a3, uint16_t a4, uint16_t a5) { +QColor* QColor_new12(int spec, unsigned short a1, unsigned short a2, unsigned short a3, unsigned short a4, unsigned short a5) { return new QColor(static_cast(spec), static_cast(a1), static_cast(a2), static_cast(a3), static_cast(a4), static_cast(a5)); } @@ -443,7 +443,7 @@ QColor* QColor_fromRgbF(double r, double g, double b) { return new QColor(QColor::fromRgbF(static_cast(r), static_cast(g), static_cast(b))); } -QColor* QColor_fromRgba64(uint16_t r, uint16_t g, uint16_t b) { +QColor* QColor_fromRgba64(unsigned short r, unsigned short g, unsigned short b) { return new QColor(QColor::fromRgba64(static_cast(r), static_cast(g), static_cast(b))); } @@ -588,7 +588,7 @@ QColor* QColor_fromRgbF2(double r, double g, double b, double a) { return new QColor(QColor::fromRgbF(static_cast(r), static_cast(g), static_cast(b), static_cast(a))); } -QColor* QColor_fromRgba642(uint16_t r, uint16_t g, uint16_t b, uint16_t a) { +QColor* QColor_fromRgba642(unsigned short r, unsigned short g, unsigned short b, unsigned short a) { return new QColor(QColor::fromRgba64(static_cast(r), static_cast(g), static_cast(b), static_cast(a))); } diff --git a/qt/gen_qcolor.go b/qt/gen_qcolor.go index f7794580..63f0380b 100644 --- a/qt/gen_qcolor.go +++ b/qt/gen_qcolor.go @@ -126,7 +126,7 @@ func NewQColor9(color *QColor) *QColor { // NewQColor10 constructs a new QColor object. func NewQColor10(spec QColor__Spec, a1 uint16, a2 uint16, a3 uint16, a4 uint16) *QColor { - return newQColor(C.QColor_new10((C.int)(spec), (C.uint16_t)(a1), (C.uint16_t)(a2), (C.uint16_t)(a3), (C.uint16_t)(a4))) + return newQColor(C.QColor_new10((C.int)(spec), (C.ushort)(a1), (C.ushort)(a2), (C.ushort)(a3), (C.ushort)(a4))) } // NewQColor11 constructs a new QColor object. @@ -138,7 +138,7 @@ func NewQColor11(r int, g int, b int, a int) *QColor { // NewQColor12 constructs a new QColor object. func NewQColor12(spec QColor__Spec, a1 uint16, a2 uint16, a3 uint16, a4 uint16, a5 uint16) *QColor { - return newQColor(C.QColor_new12((C.int)(spec), (C.uint16_t)(a1), (C.uint16_t)(a2), (C.uint16_t)(a3), (C.uint16_t)(a4), (C.uint16_t)(a5))) + return newQColor(C.QColor_new12((C.int)(spec), (C.ushort)(a1), (C.ushort)(a2), (C.ushort)(a3), (C.ushort)(a4), (C.ushort)(a5))) } func (this *QColor) OperatorAssign(param1 *QColor) { @@ -511,7 +511,7 @@ func QColor_FromRgbF(r float64, g float64, b float64) *QColor { } func QColor_FromRgba64(r uint16, g uint16, b uint16) *QColor { - _goptr := newQColor(C.QColor_fromRgba64((C.uint16_t)(r), (C.uint16_t)(g), (C.uint16_t)(b))) + _goptr := newQColor(C.QColor_fromRgba64((C.ushort)(r), (C.ushort)(g), (C.ushort)(b))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -689,7 +689,7 @@ func QColor_FromRgbF2(r float64, g float64, b float64, a float64) *QColor { } func QColor_FromRgba642(r uint16, g uint16, b uint16, a uint16) *QColor { - _goptr := newQColor(C.QColor_fromRgba642((C.uint16_t)(r), (C.uint16_t)(g), (C.uint16_t)(b), (C.uint16_t)(a))) + _goptr := newQColor(C.QColor_fromRgba642((C.ushort)(r), (C.ushort)(g), (C.ushort)(b), (C.ushort)(a))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt/gen_qcolor.h b/qt/gen_qcolor.h index 70893634..9f498a62 100644 --- a/qt/gen_qcolor.h +++ b/qt/gen_qcolor.h @@ -33,9 +33,9 @@ QColor* QColor_new6(struct miqt_string name); QColor* QColor_new7(const char* aname); QColor* QColor_new8(int spec); QColor* QColor_new9(QColor* color); -QColor* QColor_new10(int spec, uint16_t a1, uint16_t a2, uint16_t a3, uint16_t a4); +QColor* QColor_new10(int spec, unsigned short a1, unsigned short a2, unsigned short a3, unsigned short a4); QColor* QColor_new11(int r, int g, int b, int a); -QColor* QColor_new12(int spec, uint16_t a1, uint16_t a2, uint16_t a3, uint16_t a4, uint16_t a5); +QColor* QColor_new12(int spec, unsigned short a1, unsigned short a2, unsigned short a3, unsigned short a4, unsigned short a5); void QColor_operatorAssign(QColor* self, QColor* param1); void QColor_operatorAssignWithColor(QColor* self, int color); bool QColor_isValid(const QColor* self); @@ -118,7 +118,7 @@ QColor* QColor_fromRgb(unsigned int rgb); QColor* QColor_fromRgba(unsigned int rgba); QColor* QColor_fromRgb2(int r, int g, int b); QColor* QColor_fromRgbF(double r, double g, double b); -QColor* QColor_fromRgba64(uint16_t r, uint16_t g, uint16_t b); +QColor* QColor_fromRgba64(unsigned short r, unsigned short g, unsigned short b); QColor* QColor_fromRgba64WithRgba(QRgba64* rgba); QColor* QColor_fromHsv(int h, int s, int v); QColor* QColor_fromHsvF(double h, double s, double v); @@ -154,7 +154,7 @@ void QColor_getHslF2(const QColor* self, double* h, double* s, double* l, double void QColor_setHslF2(QColor* self, double h, double s, double l, double a); QColor* QColor_fromRgb3(int r, int g, int b, int a); QColor* QColor_fromRgbF2(double r, double g, double b, double a); -QColor* QColor_fromRgba642(uint16_t r, uint16_t g, uint16_t b, uint16_t a); +QColor* QColor_fromRgba642(unsigned short r, unsigned short g, unsigned short b, unsigned short a); QColor* QColor_fromHsv2(int h, int s, int v, int a); QColor* QColor_fromHsvF2(double h, double s, double v, double a); QColor* QColor_fromCmyk2(int c, int m, int y, int k, int a); diff --git a/qt/gen_qdatastream.cpp b/qt/gen_qdatastream.cpp index 35c4451c..f1f0d752 100644 --- a/qt/gen_qdatastream.cpp +++ b/qt/gen_qdatastream.cpp @@ -88,11 +88,11 @@ void QDataStream_operatorShiftRightWithQuint8(QDataStream* self, unsigned char* self->operator>>(static_cast(*i)); } -void QDataStream_operatorShiftRightWithQint16(QDataStream* self, int16_t* i) { +void QDataStream_operatorShiftRightWithQint16(QDataStream* self, short* i) { self->operator>>(static_cast(*i)); } -void QDataStream_operatorShiftRightWithQuint16(QDataStream* self, uint16_t* i) { +void QDataStream_operatorShiftRightWithQuint16(QDataStream* self, unsigned short* i) { self->operator>>(static_cast(*i)); } @@ -136,11 +136,11 @@ void QDataStream_operatorShiftLeftWithQuint8(QDataStream* self, unsigned char i) self->operator<<(static_cast(i)); } -void QDataStream_operatorShiftLeftWithQint16(QDataStream* self, int16_t i) { +void QDataStream_operatorShiftLeftWithQint16(QDataStream* self, short i) { self->operator<<(static_cast(i)); } -void QDataStream_operatorShiftLeftWithQuint16(QDataStream* self, uint16_t i) { +void QDataStream_operatorShiftLeftWithQuint16(QDataStream* self, unsigned short i) { self->operator<<(static_cast(i)); } diff --git a/qt/gen_qdatastream.go b/qt/gen_qdatastream.go index 929013e5..f83596f0 100644 --- a/qt/gen_qdatastream.go +++ b/qt/gen_qdatastream.go @@ -192,11 +192,11 @@ func (this *QDataStream) OperatorShiftRightWithQuint8(i *byte) { } func (this *QDataStream) OperatorShiftRightWithQint16(i *int16) { - C.QDataStream_operatorShiftRightWithQint16(this.h, (*C.int16_t)(unsafe.Pointer(i))) + C.QDataStream_operatorShiftRightWithQint16(this.h, (*C.short)(unsafe.Pointer(i))) } func (this *QDataStream) OperatorShiftRightWithQuint16(i *uint16) { - C.QDataStream_operatorShiftRightWithQuint16(this.h, (*C.uint16_t)(unsafe.Pointer(i))) + C.QDataStream_operatorShiftRightWithQuint16(this.h, (*C.ushort)(unsafe.Pointer(i))) } func (this *QDataStream) OperatorShiftRightWithQint32(i *int) { @@ -242,11 +242,11 @@ func (this *QDataStream) OperatorShiftLeftWithQuint8(i byte) { } func (this *QDataStream) OperatorShiftLeftWithQint16(i int16) { - C.QDataStream_operatorShiftLeftWithQint16(this.h, (C.int16_t)(i)) + C.QDataStream_operatorShiftLeftWithQint16(this.h, (C.short)(i)) } func (this *QDataStream) OperatorShiftLeftWithQuint16(i uint16) { - C.QDataStream_operatorShiftLeftWithQuint16(this.h, (C.uint16_t)(i)) + C.QDataStream_operatorShiftLeftWithQuint16(this.h, (C.ushort)(i)) } func (this *QDataStream) OperatorShiftLeftWithQint32(i int) { diff --git a/qt/gen_qdatastream.h b/qt/gen_qdatastream.h index e4a5bdf5..c785c561 100644 --- a/qt/gen_qdatastream.h +++ b/qt/gen_qdatastream.h @@ -40,8 +40,8 @@ int QDataStream_version(const QDataStream* self); void QDataStream_setVersion(QDataStream* self, int version); void QDataStream_operatorShiftRight(QDataStream* self, signed char* i); void QDataStream_operatorShiftRightWithQuint8(QDataStream* self, unsigned char* i); -void QDataStream_operatorShiftRightWithQint16(QDataStream* self, int16_t* i); -void QDataStream_operatorShiftRightWithQuint16(QDataStream* self, uint16_t* i); +void QDataStream_operatorShiftRightWithQint16(QDataStream* self, short* i); +void QDataStream_operatorShiftRightWithQuint16(QDataStream* self, unsigned short* i); void QDataStream_operatorShiftRightWithQint32(QDataStream* self, int* i); void QDataStream_operatorShiftRightWithQuint32(QDataStream* self, unsigned int* i); void QDataStream_operatorShiftRightWithQint64(QDataStream* self, long long* i); @@ -52,8 +52,8 @@ void QDataStream_operatorShiftRightWithDouble(QDataStream* self, double* f); void QDataStream_operatorShiftRightWithStr(QDataStream* self, char* str); void QDataStream_operatorShiftLeft(QDataStream* self, signed char i); void QDataStream_operatorShiftLeftWithQuint8(QDataStream* self, unsigned char i); -void QDataStream_operatorShiftLeftWithQint16(QDataStream* self, int16_t i); -void QDataStream_operatorShiftLeftWithQuint16(QDataStream* self, uint16_t i); +void QDataStream_operatorShiftLeftWithQint16(QDataStream* self, short i); +void QDataStream_operatorShiftLeftWithQuint16(QDataStream* self, unsigned short i); void QDataStream_operatorShiftLeftWithQint32(QDataStream* self, int i); void QDataStream_operatorShiftLeftWithQuint32(QDataStream* self, unsigned int i); void QDataStream_operatorShiftLeftWithQint64(QDataStream* self, long long i); diff --git a/qt/gen_qdebug.cpp b/qt/gen_qdebug.cpp index 916b2075..f6a9357d 100644 --- a/qt/gen_qdebug.cpp +++ b/qt/gen_qdebug.cpp @@ -116,13 +116,13 @@ QDebug* QDebug_operatorShiftLeftWithChar(QDebug* self, char t) { return &_ret; } -QDebug* QDebug_operatorShiftLeftWithShort(QDebug* self, int16_t t) { +QDebug* QDebug_operatorShiftLeftWithShort(QDebug* self, short t) { QDebug& _ret = self->operator<<(static_cast(t)); // Cast returned reference into pointer return &_ret; } -QDebug* QDebug_operatorShiftLeftWithUnsignedshort(QDebug* self, uint16_t t) { +QDebug* QDebug_operatorShiftLeftWithUnsignedshort(QDebug* self, unsigned short t) { QDebug& _ret = self->operator<<(static_cast(t)); // Cast returned reference into pointer return &_ret; diff --git a/qt/gen_qdebug.go b/qt/gen_qdebug.go index 6038d41a..33341faf 100644 --- a/qt/gen_qdebug.go +++ b/qt/gen_qdebug.go @@ -134,11 +134,11 @@ func (this *QDebug) OperatorShiftLeftWithChar(t int8) *QDebug { } func (this *QDebug) OperatorShiftLeftWithShort(t int16) *QDebug { - return newQDebug(C.QDebug_operatorShiftLeftWithShort(this.h, (C.int16_t)(t))) + return newQDebug(C.QDebug_operatorShiftLeftWithShort(this.h, (C.short)(t))) } func (this *QDebug) OperatorShiftLeftWithUnsignedshort(t uint16) *QDebug { - return newQDebug(C.QDebug_operatorShiftLeftWithUnsignedshort(this.h, (C.uint16_t)(t))) + return newQDebug(C.QDebug_operatorShiftLeftWithUnsignedshort(this.h, (C.ushort)(t))) } func (this *QDebug) OperatorShiftLeftWithInt(t int) *QDebug { diff --git a/qt/gen_qdebug.h b/qt/gen_qdebug.h index df7f9895..00b2242f 100644 --- a/qt/gen_qdebug.h +++ b/qt/gen_qdebug.h @@ -47,8 +47,8 @@ QDebug* QDebug_maybeQuote(QDebug* self); QDebug* QDebug_operatorShiftLeft(QDebug* self, QChar* t); QDebug* QDebug_operatorShiftLeftWithBool(QDebug* self, bool t); QDebug* QDebug_operatorShiftLeftWithChar(QDebug* self, char t); -QDebug* QDebug_operatorShiftLeftWithShort(QDebug* self, int16_t t); -QDebug* QDebug_operatorShiftLeftWithUnsignedshort(QDebug* self, uint16_t t); +QDebug* QDebug_operatorShiftLeftWithShort(QDebug* self, short t); +QDebug* QDebug_operatorShiftLeftWithUnsignedshort(QDebug* self, unsigned short t); QDebug* QDebug_operatorShiftLeftWithInt(QDebug* self, int t); QDebug* QDebug_operatorShiftLeftWithUnsignedint(QDebug* self, unsigned int t); QDebug* QDebug_operatorShiftLeftWithLong(QDebug* self, long t); diff --git a/qt/gen_qevent.cpp b/qt/gen_qevent.cpp index 3678f75a..475604ee 100644 --- a/qt/gen_qevent.cpp +++ b/qt/gen_qevent.cpp @@ -640,7 +640,7 @@ QKeyEvent* QKeyEvent_new5(int type, int key, int modifiers, struct miqt_string t return new QKeyEvent(static_cast(type), static_cast(key), static_cast(modifiers), text_QString, autorep); } -QKeyEvent* QKeyEvent_new6(int type, int key, int modifiers, struct miqt_string text, bool autorep, uint16_t count) { +QKeyEvent* QKeyEvent_new6(int type, int key, int modifiers, struct miqt_string text, bool autorep, unsigned short count) { QString text_QString = QString::fromUtf8(text.data, text.len); return new QKeyEvent(static_cast(type), static_cast(key), static_cast(modifiers), text_QString, autorep, static_cast(count)); } @@ -655,7 +655,7 @@ QKeyEvent* QKeyEvent_new8(int type, int key, int modifiers, unsigned int nativeS return new QKeyEvent(static_cast(type), static_cast(key), static_cast(modifiers), static_cast(nativeScanCode), static_cast(nativeVirtualKey), static_cast(nativeModifiers), text_QString, autorep); } -QKeyEvent* QKeyEvent_new9(int type, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text, bool autorep, uint16_t count) { +QKeyEvent* QKeyEvent_new9(int type, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text, bool autorep, unsigned short count) { QString text_QString = QString::fromUtf8(text.data, text.len); return new QKeyEvent(static_cast(type), static_cast(key), static_cast(modifiers), static_cast(nativeScanCode), static_cast(nativeVirtualKey), static_cast(nativeModifiers), text_QString, autorep, static_cast(count)); } diff --git a/qt/gen_qevent.go b/qt/gen_qevent.go index 8bf18584..66e3199e 100644 --- a/qt/gen_qevent.go +++ b/qt/gen_qevent.go @@ -1039,7 +1039,7 @@ func NewQKeyEvent6(typeVal QEvent__Type, key int, modifiers KeyboardModifier, te text_ms.len = C.size_t(len(text)) defer C.free(unsafe.Pointer(text_ms.data)) - return newQKeyEvent(C.QKeyEvent_new6((C.int)(typeVal), (C.int)(key), (C.int)(modifiers), text_ms, (C.bool)(autorep), (C.uint16_t)(count))) + return newQKeyEvent(C.QKeyEvent_new6((C.int)(typeVal), (C.int)(key), (C.int)(modifiers), text_ms, (C.bool)(autorep), (C.ushort)(count))) } // NewQKeyEvent7 constructs a new QKeyEvent object. @@ -1069,7 +1069,7 @@ func NewQKeyEvent9(typeVal QEvent__Type, key int, modifiers KeyboardModifier, na text_ms.len = C.size_t(len(text)) defer C.free(unsafe.Pointer(text_ms.data)) - return newQKeyEvent(C.QKeyEvent_new9((C.int)(typeVal), (C.int)(key), (C.int)(modifiers), (C.uint)(nativeScanCode), (C.uint)(nativeVirtualKey), (C.uint)(nativeModifiers), text_ms, (C.bool)(autorep), (C.uint16_t)(count))) + return newQKeyEvent(C.QKeyEvent_new9((C.int)(typeVal), (C.int)(key), (C.int)(modifiers), (C.uint)(nativeScanCode), (C.uint)(nativeVirtualKey), (C.uint)(nativeModifiers), text_ms, (C.bool)(autorep), (C.ushort)(count))) } func (this *QKeyEvent) Key() int { diff --git a/qt/gen_qevent.h b/qt/gen_qevent.h index e29b41ab..2ac70dc8 100644 --- a/qt/gen_qevent.h +++ b/qt/gen_qevent.h @@ -281,10 +281,10 @@ QKeyEvent* QKeyEvent_new2(int type, int key, int modifiers, unsigned int nativeS QKeyEvent* QKeyEvent_new3(QKeyEvent* param1); QKeyEvent* QKeyEvent_new4(int type, int key, int modifiers, struct miqt_string text); QKeyEvent* QKeyEvent_new5(int type, int key, int modifiers, struct miqt_string text, bool autorep); -QKeyEvent* QKeyEvent_new6(int type, int key, int modifiers, struct miqt_string text, bool autorep, uint16_t count); +QKeyEvent* QKeyEvent_new6(int type, int key, int modifiers, struct miqt_string text, bool autorep, unsigned short count); QKeyEvent* QKeyEvent_new7(int type, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text); QKeyEvent* QKeyEvent_new8(int type, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text, bool autorep); -QKeyEvent* QKeyEvent_new9(int type, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text, bool autorep, uint16_t count); +QKeyEvent* QKeyEvent_new9(int type, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text, bool autorep, unsigned short count); void QKeyEvent_virtbase(QKeyEvent* src, QInputEvent** outptr_QInputEvent); int QKeyEvent_key(const QKeyEvent* self); bool QKeyEvent_matches(const QKeyEvent* self, int key); diff --git a/qt/gen_qlocale.cpp b/qt/gen_qlocale.cpp index 92951662..0de7a20c 100644 --- a/qt/gen_qlocale.cpp +++ b/qt/gen_qlocale.cpp @@ -111,15 +111,15 @@ struct miqt_string QLocale_nativeCountryName(const QLocale* self) { return _ms; } -int16_t QLocale_toShort(const QLocale* self, struct miqt_string s) { +short QLocale_toShort(const QLocale* self, struct miqt_string s) { QString s_QString = QString::fromUtf8(s.data, s.len); return self->toShort(s_QString); } -uint16_t QLocale_toUShort(const QLocale* self, struct miqt_string s) { +unsigned short QLocale_toUShort(const QLocale* self, struct miqt_string s) { QString s_QString = QString::fromUtf8(s.data, s.len); ushort _ret = self->toUShort(s_QString); - return static_cast(_ret); + return static_cast(_ret); } int QLocale_toInt(const QLocale* self, struct miqt_string s) { @@ -210,7 +210,7 @@ struct miqt_string QLocale_toStringWithUlong(const QLocale* self, unsigned long return _ms; } -struct miqt_string QLocale_toStringWithShort(const QLocale* self, int16_t i) { +struct miqt_string QLocale_toStringWithShort(const QLocale* self, short i) { QString _ret = self->toString(static_cast(i)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -221,7 +221,7 @@ struct miqt_string QLocale_toStringWithShort(const QLocale* self, int16_t i) { return _ms; } -struct miqt_string QLocale_toStringWithUshort(const QLocale* self, uint16_t i) { +struct miqt_string QLocale_toStringWithUshort(const QLocale* self, unsigned short i) { QString _ret = self->toString(static_cast(i)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -650,7 +650,7 @@ struct miqt_string QLocale_toCurrencyStringWithQulonglong(const QLocale* self, u return _ms; } -struct miqt_string QLocale_toCurrencyStringWithShort(const QLocale* self, int16_t param1) { +struct miqt_string QLocale_toCurrencyStringWithShort(const QLocale* self, short param1) { QString _ret = self->toCurrencyString(static_cast(param1)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -661,7 +661,7 @@ struct miqt_string QLocale_toCurrencyStringWithShort(const QLocale* self, int16_ return _ms; } -struct miqt_string QLocale_toCurrencyStringWithUshort(const QLocale* self, uint16_t param1) { +struct miqt_string QLocale_toCurrencyStringWithUshort(const QLocale* self, unsigned short param1) { QString _ret = self->toCurrencyString(static_cast(param1)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -901,15 +901,15 @@ struct miqt_string QLocale_createSeparatedList(const QLocale* self, struct miqt_ return _ms; } -int16_t QLocale_toShort2(const QLocale* self, struct miqt_string s, bool* ok) { +short QLocale_toShort2(const QLocale* self, struct miqt_string s, bool* ok) { QString s_QString = QString::fromUtf8(s.data, s.len); return self->toShort(s_QString, ok); } -uint16_t QLocale_toUShort2(const QLocale* self, struct miqt_string s, bool* ok) { +unsigned short QLocale_toUShort2(const QLocale* self, struct miqt_string s, bool* ok) { QString s_QString = QString::fromUtf8(s.data, s.len); ushort _ret = self->toUShort(s_QString, ok); - return static_cast(_ret); + return static_cast(_ret); } int QLocale_toInt2(const QLocale* self, struct miqt_string s, bool* ok) { @@ -1160,7 +1160,7 @@ struct miqt_string QLocale_toCurrencyString5(const QLocale* self, unsigned long return _ms; } -struct miqt_string QLocale_toCurrencyString6(const QLocale* self, int16_t param1, struct miqt_string symbol) { +struct miqt_string QLocale_toCurrencyString6(const QLocale* self, short param1, struct miqt_string symbol) { QString symbol_QString = QString::fromUtf8(symbol.data, symbol.len); QString _ret = self->toCurrencyString(static_cast(param1), symbol_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -1172,7 +1172,7 @@ struct miqt_string QLocale_toCurrencyString6(const QLocale* self, int16_t param1 return _ms; } -struct miqt_string QLocale_toCurrencyString7(const QLocale* self, uint16_t param1, struct miqt_string symbol) { +struct miqt_string QLocale_toCurrencyString7(const QLocale* self, unsigned short param1, struct miqt_string symbol) { QString symbol_QString = QString::fromUtf8(symbol.data, symbol.len); QString _ret = self->toCurrencyString(static_cast(param1), symbol_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory diff --git a/qt/gen_qlocale.go b/qt/gen_qlocale.go index 5f47c184..a31c24e1 100644 --- a/qt/gen_qlocale.go +++ b/qt/gen_qlocale.go @@ -1120,14 +1120,14 @@ func (this *QLocale) ToStringWithUlong(i uint64) string { } func (this *QLocale) ToStringWithShort(i int16) string { - var _ms C.struct_miqt_string = C.QLocale_toStringWithShort(this.h, (C.int16_t)(i)) + var _ms C.struct_miqt_string = C.QLocale_toStringWithShort(this.h, (C.short)(i)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToStringWithUshort(i uint16) string { - var _ms C.struct_miqt_string = C.QLocale_toStringWithUshort(this.h, (C.uint16_t)(i)) + var _ms C.struct_miqt_string = C.QLocale_toStringWithUshort(this.h, (C.ushort)(i)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -1550,14 +1550,14 @@ func (this *QLocale) ToCurrencyStringWithQulonglong(param1 uint64) string { } func (this *QLocale) ToCurrencyStringWithShort(param1 int16) string { - var _ms C.struct_miqt_string = C.QLocale_toCurrencyStringWithShort(this.h, (C.int16_t)(param1)) + var _ms C.struct_miqt_string = C.QLocale_toCurrencyStringWithShort(this.h, (C.short)(param1)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToCurrencyStringWithUshort(param1 uint16) string { - var _ms C.struct_miqt_string = C.QLocale_toCurrencyStringWithUshort(this.h, (C.uint16_t)(param1)) + var _ms C.struct_miqt_string = C.QLocale_toCurrencyStringWithUshort(this.h, (C.ushort)(param1)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -1985,7 +1985,7 @@ func (this *QLocale) ToCurrencyString6(param1 int16, symbol string) string { symbol_ms.data = C.CString(symbol) symbol_ms.len = C.size_t(len(symbol)) defer C.free(unsafe.Pointer(symbol_ms.data)) - var _ms C.struct_miqt_string = C.QLocale_toCurrencyString6(this.h, (C.int16_t)(param1), symbol_ms) + var _ms C.struct_miqt_string = C.QLocale_toCurrencyString6(this.h, (C.short)(param1), symbol_ms) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -1996,7 +1996,7 @@ func (this *QLocale) ToCurrencyString7(param1 uint16, symbol string) string { symbol_ms.data = C.CString(symbol) symbol_ms.len = C.size_t(len(symbol)) defer C.free(unsafe.Pointer(symbol_ms.data)) - var _ms C.struct_miqt_string = C.QLocale_toCurrencyString7(this.h, (C.uint16_t)(param1), symbol_ms) + var _ms C.struct_miqt_string = C.QLocale_toCurrencyString7(this.h, (C.ushort)(param1), symbol_ms) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret diff --git a/qt/gen_qlocale.h b/qt/gen_qlocale.h index bc290950..a5cd76d6 100644 --- a/qt/gen_qlocale.h +++ b/qt/gen_qlocale.h @@ -45,8 +45,8 @@ struct miqt_string QLocale_name(const QLocale* self); struct miqt_string QLocale_bcp47Name(const QLocale* self); struct miqt_string QLocale_nativeLanguageName(const QLocale* self); struct miqt_string QLocale_nativeCountryName(const QLocale* self); -int16_t QLocale_toShort(const QLocale* self, struct miqt_string s); -uint16_t QLocale_toUShort(const QLocale* self, struct miqt_string s); +short QLocale_toShort(const QLocale* self, struct miqt_string s); +unsigned short QLocale_toUShort(const QLocale* self, struct miqt_string s); int QLocale_toInt(const QLocale* self, struct miqt_string s); unsigned int QLocale_toUInt(const QLocale* self, struct miqt_string s); long QLocale_toLong(const QLocale* self, struct miqt_string s); @@ -59,8 +59,8 @@ struct miqt_string QLocale_toString(const QLocale* self, long long i); struct miqt_string QLocale_toStringWithQulonglong(const QLocale* self, unsigned long long i); struct miqt_string QLocale_toStringWithLong(const QLocale* self, long i); struct miqt_string QLocale_toStringWithUlong(const QLocale* self, unsigned long i); -struct miqt_string QLocale_toStringWithShort(const QLocale* self, int16_t i); -struct miqt_string QLocale_toStringWithUshort(const QLocale* self, uint16_t i); +struct miqt_string QLocale_toStringWithShort(const QLocale* self, short i); +struct miqt_string QLocale_toStringWithUshort(const QLocale* self, unsigned short i); struct miqt_string QLocale_toStringWithInt(const QLocale* self, int i); struct miqt_string QLocale_toStringWithUint(const QLocale* self, unsigned int i); struct miqt_string QLocale_toStringWithDouble(const QLocale* self, double i); @@ -111,8 +111,8 @@ struct miqt_string QLocale_toLower(const QLocale* self, struct miqt_string str); struct miqt_string QLocale_currencySymbol(const QLocale* self); struct miqt_string QLocale_toCurrencyString(const QLocale* self, long long param1); struct miqt_string QLocale_toCurrencyStringWithQulonglong(const QLocale* self, unsigned long long param1); -struct miqt_string QLocale_toCurrencyStringWithShort(const QLocale* self, int16_t param1); -struct miqt_string QLocale_toCurrencyStringWithUshort(const QLocale* self, uint16_t param1); +struct miqt_string QLocale_toCurrencyStringWithShort(const QLocale* self, short param1); +struct miqt_string QLocale_toCurrencyStringWithUshort(const QLocale* self, unsigned short param1); struct miqt_string QLocale_toCurrencyStringWithInt(const QLocale* self, int param1); struct miqt_string QLocale_toCurrencyStringWithUint(const QLocale* self, unsigned int param1); struct miqt_string QLocale_toCurrencyStringWithDouble(const QLocale* self, double param1); @@ -136,8 +136,8 @@ void QLocale_setNumberOptions(QLocale* self, int options); int QLocale_numberOptions(const QLocale* self); struct miqt_string QLocale_quoteString(const QLocale* self, struct miqt_string str); struct miqt_string QLocale_createSeparatedList(const QLocale* self, struct miqt_array /* of struct miqt_string */ strl); -int16_t QLocale_toShort2(const QLocale* self, struct miqt_string s, bool* ok); -uint16_t QLocale_toUShort2(const QLocale* self, struct miqt_string s, bool* ok); +short QLocale_toShort2(const QLocale* self, struct miqt_string s, bool* ok); +unsigned short QLocale_toUShort2(const QLocale* self, struct miqt_string s, bool* ok); int QLocale_toInt2(const QLocale* self, struct miqt_string s, bool* ok); unsigned int QLocale_toUInt2(const QLocale* self, struct miqt_string s, bool* ok); long QLocale_toLong2(const QLocale* self, struct miqt_string s, bool* ok); @@ -166,8 +166,8 @@ struct miqt_string QLocale_standaloneDayName2(const QLocale* self, int param1, i struct miqt_string QLocale_currencySymbolWithQLocaleCurrencySymbolFormat(const QLocale* self, int param1); struct miqt_string QLocale_toCurrencyString4(const QLocale* self, long long param1, struct miqt_string symbol); struct miqt_string QLocale_toCurrencyString5(const QLocale* self, unsigned long long param1, struct miqt_string symbol); -struct miqt_string QLocale_toCurrencyString6(const QLocale* self, int16_t param1, struct miqt_string symbol); -struct miqt_string QLocale_toCurrencyString7(const QLocale* self, uint16_t param1, struct miqt_string symbol); +struct miqt_string QLocale_toCurrencyString6(const QLocale* self, short param1, struct miqt_string symbol); +struct miqt_string QLocale_toCurrencyString7(const QLocale* self, unsigned short param1, struct miqt_string symbol); struct miqt_string QLocale_toCurrencyString8(const QLocale* self, int param1, struct miqt_string symbol); struct miqt_string QLocale_toCurrencyString9(const QLocale* self, unsigned int param1, struct miqt_string symbol); struct miqt_string QLocale_toCurrencyString10(const QLocale* self, double param1, struct miqt_string symbol); diff --git a/qt/gen_qrgba64.cpp b/qt/gen_qrgba64.cpp index bf1f5133..dd393450 100644 --- a/qt/gen_qrgba64.cpp +++ b/qt/gen_qrgba64.cpp @@ -22,7 +22,7 @@ QRgba64* QRgba64_fromRgba64(unsigned long long c) { return new QRgba64(QRgba64::fromRgba64(static_cast(c))); } -QRgba64* QRgba64_fromRgba642(uint16_t red, uint16_t green, uint16_t blue, uint16_t alpha) { +QRgba64* QRgba64_fromRgba642(unsigned short red, unsigned short green, unsigned short blue, unsigned short alpha) { return new QRgba64(QRgba64::fromRgba64(static_cast(red), static_cast(green), static_cast(blue), static_cast(alpha))); } @@ -42,39 +42,39 @@ bool QRgba64_isTransparent(const QRgba64* self) { return self->isTransparent(); } -uint16_t QRgba64_red(const QRgba64* self) { +unsigned short QRgba64_red(const QRgba64* self) { quint16 _ret = self->red(); - return static_cast(_ret); + return static_cast(_ret); } -uint16_t QRgba64_green(const QRgba64* self) { +unsigned short QRgba64_green(const QRgba64* self) { quint16 _ret = self->green(); - return static_cast(_ret); + return static_cast(_ret); } -uint16_t QRgba64_blue(const QRgba64* self) { +unsigned short QRgba64_blue(const QRgba64* self) { quint16 _ret = self->blue(); - return static_cast(_ret); + return static_cast(_ret); } -uint16_t QRgba64_alpha(const QRgba64* self) { +unsigned short QRgba64_alpha(const QRgba64* self) { quint16 _ret = self->alpha(); - return static_cast(_ret); + return static_cast(_ret); } -void QRgba64_setRed(QRgba64* self, uint16_t _red) { +void QRgba64_setRed(QRgba64* self, unsigned short _red) { self->setRed(static_cast(_red)); } -void QRgba64_setGreen(QRgba64* self, uint16_t _green) { +void QRgba64_setGreen(QRgba64* self, unsigned short _green) { self->setGreen(static_cast(_green)); } -void QRgba64_setBlue(QRgba64* self, uint16_t _blue) { +void QRgba64_setBlue(QRgba64* self, unsigned short _blue) { self->setBlue(static_cast(_blue)); } -void QRgba64_setAlpha(QRgba64* self, uint16_t _alpha) { +void QRgba64_setAlpha(QRgba64* self, unsigned short _alpha) { self->setAlpha(static_cast(_alpha)); } @@ -103,9 +103,9 @@ unsigned int QRgba64_toArgb32(const QRgba64* self) { return static_cast(_ret); } -uint16_t QRgba64_toRgb16(const QRgba64* self) { +unsigned short QRgba64_toRgb16(const QRgba64* self) { ushort _ret = self->toRgb16(); - return static_cast(_ret); + return static_cast(_ret); } QRgba64* QRgba64_premultiplied(const QRgba64* self) { diff --git a/qt/gen_qrgba64.go b/qt/gen_qrgba64.go index e72af825..cc4d82a4 100644 --- a/qt/gen_qrgba64.go +++ b/qt/gen_qrgba64.go @@ -64,7 +64,7 @@ func QRgba64_FromRgba64(c uint64) *QRgba64 { } func QRgba64_FromRgba642(red uint16, green uint16, blue uint16, alpha uint16) *QRgba64 { - _goptr := newQRgba64(C.QRgba64_fromRgba642((C.uint16_t)(red), (C.uint16_t)(green), (C.uint16_t)(blue), (C.uint16_t)(alpha))) + _goptr := newQRgba64(C.QRgba64_fromRgba642((C.ushort)(red), (C.ushort)(green), (C.ushort)(blue), (C.ushort)(alpha))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -106,19 +106,19 @@ func (this *QRgba64) Alpha() uint16 { } func (this *QRgba64) SetRed(_red uint16) { - C.QRgba64_setRed(this.h, (C.uint16_t)(_red)) + C.QRgba64_setRed(this.h, (C.ushort)(_red)) } func (this *QRgba64) SetGreen(_green uint16) { - C.QRgba64_setGreen(this.h, (C.uint16_t)(_green)) + C.QRgba64_setGreen(this.h, (C.ushort)(_green)) } func (this *QRgba64) SetBlue(_blue uint16) { - C.QRgba64_setBlue(this.h, (C.uint16_t)(_blue)) + C.QRgba64_setBlue(this.h, (C.ushort)(_blue)) } func (this *QRgba64) SetAlpha(_alpha uint16) { - C.QRgba64_setAlpha(this.h, (C.uint16_t)(_alpha)) + C.QRgba64_setAlpha(this.h, (C.ushort)(_alpha)) } func (this *QRgba64) Red8() byte { diff --git a/qt/gen_qrgba64.h b/qt/gen_qrgba64.h index fadb0c84..17d6a08c 100644 --- a/qt/gen_qrgba64.h +++ b/qt/gen_qrgba64.h @@ -23,25 +23,25 @@ typedef struct QRgba64 QRgba64; QRgba64* QRgba64_new(); QRgba64* QRgba64_new2(QRgba64* param1); QRgba64* QRgba64_fromRgba64(unsigned long long c); -QRgba64* QRgba64_fromRgba642(uint16_t red, uint16_t green, uint16_t blue, uint16_t alpha); +QRgba64* QRgba64_fromRgba642(unsigned short red, unsigned short green, unsigned short blue, unsigned short alpha); QRgba64* QRgba64_fromRgba(unsigned char red, unsigned char green, unsigned char blue, unsigned char alpha); QRgba64* QRgba64_fromArgb32(unsigned int rgb); bool QRgba64_isOpaque(const QRgba64* self); bool QRgba64_isTransparent(const QRgba64* self); -uint16_t QRgba64_red(const QRgba64* self); -uint16_t QRgba64_green(const QRgba64* self); -uint16_t QRgba64_blue(const QRgba64* self); -uint16_t QRgba64_alpha(const QRgba64* self); -void QRgba64_setRed(QRgba64* self, uint16_t _red); -void QRgba64_setGreen(QRgba64* self, uint16_t _green); -void QRgba64_setBlue(QRgba64* self, uint16_t _blue); -void QRgba64_setAlpha(QRgba64* self, uint16_t _alpha); +unsigned short QRgba64_red(const QRgba64* self); +unsigned short QRgba64_green(const QRgba64* self); +unsigned short QRgba64_blue(const QRgba64* self); +unsigned short QRgba64_alpha(const QRgba64* self); +void QRgba64_setRed(QRgba64* self, unsigned short _red); +void QRgba64_setGreen(QRgba64* self, unsigned short _green); +void QRgba64_setBlue(QRgba64* self, unsigned short _blue); +void QRgba64_setAlpha(QRgba64* self, unsigned short _alpha); unsigned char QRgba64_red8(const QRgba64* self); unsigned char QRgba64_green8(const QRgba64* self); unsigned char QRgba64_blue8(const QRgba64* self); unsigned char QRgba64_alpha8(const QRgba64* self); unsigned int QRgba64_toArgb32(const QRgba64* self); -uint16_t QRgba64_toRgb16(const QRgba64* self); +unsigned short QRgba64_toRgb16(const QRgba64* self); QRgba64* QRgba64_premultiplied(const QRgba64* self); QRgba64* QRgba64_unpremultiplied(const QRgba64* self); unsigned long long QRgba64_ToUnsignedLongLong(const QRgba64* self); diff --git a/qt/gen_qstringview.cpp b/qt/gen_qstringview.cpp index c4f181ae..e9495380 100644 --- a/qt/gen_qstringview.cpp +++ b/qt/gen_qstringview.cpp @@ -148,13 +148,13 @@ bool QStringView_isValidUtf16(const QStringView* self) { return self->isValidUtf16(); } -int16_t QStringView_toShort(const QStringView* self) { +short QStringView_toShort(const QStringView* self) { return self->toShort(); } -uint16_t QStringView_toUShort(const QStringView* self) { +unsigned short QStringView_toUShort(const QStringView* self) { ushort _ret = self->toUShort(); - return static_cast(_ret); + return static_cast(_ret); } int QStringView_toInt(const QStringView* self) { @@ -274,22 +274,22 @@ ptrdiff_t QStringView_lastIndexOf3(const QStringView* self, QChar* c, ptrdiff_t return static_cast(_ret); } -int16_t QStringView_toShortWithOk(const QStringView* self, bool* ok) { +short QStringView_toShortWithOk(const QStringView* self, bool* ok) { return self->toShort(ok); } -int16_t QStringView_toShort2(const QStringView* self, bool* ok, int base) { +short QStringView_toShort2(const QStringView* self, bool* ok, int base) { return self->toShort(ok, static_cast(base)); } -uint16_t QStringView_toUShortWithOk(const QStringView* self, bool* ok) { +unsigned short QStringView_toUShortWithOk(const QStringView* self, bool* ok) { ushort _ret = self->toUShort(ok); - return static_cast(_ret); + return static_cast(_ret); } -uint16_t QStringView_toUShort2(const QStringView* self, bool* ok, int base) { +unsigned short QStringView_toUShort2(const QStringView* self, bool* ok, int base) { ushort _ret = self->toUShort(ok, static_cast(base)); - return static_cast(_ret); + return static_cast(_ret); } int QStringView_toIntWithOk(const QStringView* self, bool* ok) { diff --git a/qt/gen_qstringview.h b/qt/gen_qstringview.h index 86567f37..d79d2392 100644 --- a/qt/gen_qstringview.h +++ b/qt/gen_qstringview.h @@ -46,8 +46,8 @@ ptrdiff_t QStringView_count(const QStringView* self, QChar* c); ptrdiff_t QStringView_lastIndexOf(const QStringView* self, QChar* c); bool QStringView_isRightToLeft(const QStringView* self); bool QStringView_isValidUtf16(const QStringView* self); -int16_t QStringView_toShort(const QStringView* self); -uint16_t QStringView_toUShort(const QStringView* self); +short QStringView_toShort(const QStringView* self); +unsigned short QStringView_toUShort(const QStringView* self); int QStringView_toInt(const QStringView* self); unsigned int QStringView_toUInt(const QStringView* self); long QStringView_toLong(const QStringView* self); @@ -74,10 +74,10 @@ bool QStringView_contains2(const QStringView* self, QChar* c, int cs); ptrdiff_t QStringView_count2(const QStringView* self, QChar* c, int cs); ptrdiff_t QStringView_lastIndexOf2(const QStringView* self, QChar* c, ptrdiff_t from); ptrdiff_t QStringView_lastIndexOf3(const QStringView* self, QChar* c, ptrdiff_t from, int cs); -int16_t QStringView_toShortWithOk(const QStringView* self, bool* ok); -int16_t QStringView_toShort2(const QStringView* self, bool* ok, int base); -uint16_t QStringView_toUShortWithOk(const QStringView* self, bool* ok); -uint16_t QStringView_toUShort2(const QStringView* self, bool* ok, int base); +short QStringView_toShortWithOk(const QStringView* self, bool* ok); +short QStringView_toShort2(const QStringView* self, bool* ok, int base); +unsigned short QStringView_toUShortWithOk(const QStringView* self, bool* ok); +unsigned short QStringView_toUShort2(const QStringView* self, bool* ok, int base); int QStringView_toIntWithOk(const QStringView* self, bool* ok); int QStringView_toInt2(const QStringView* self, bool* ok, int base); unsigned int QStringView_toUIntWithOk(const QStringView* self, bool* ok); diff --git a/qt/gen_qtextstream.cpp b/qt/gen_qtextstream.cpp index 317c5df0..926a1963 100644 --- a/qt/gen_qtextstream.cpp +++ b/qt/gen_qtextstream.cpp @@ -233,13 +233,13 @@ QTextStream* QTextStream_operatorShiftRightWithCh(QTextStream* self, char* ch) { return &_ret; } -QTextStream* QTextStream_operatorShiftRightWithShort(QTextStream* self, int16_t* i) { +QTextStream* QTextStream_operatorShiftRightWithShort(QTextStream* self, short* i) { QTextStream& _ret = self->operator>>(static_cast(*i)); // Cast returned reference into pointer return &_ret; } -QTextStream* QTextStream_operatorShiftRightWithUnsignedshort(QTextStream* self, uint16_t* i) { +QTextStream* QTextStream_operatorShiftRightWithUnsignedshort(QTextStream* self, unsigned short* i) { QTextStream& _ret = self->operator>>(static_cast(*i)); // Cast returned reference into pointer return &_ret; @@ -325,13 +325,13 @@ QTextStream* QTextStream_operatorShiftLeftWithCh(QTextStream* self, char ch) { return &_ret; } -QTextStream* QTextStream_operatorShiftLeftWithShort(QTextStream* self, int16_t i) { +QTextStream* QTextStream_operatorShiftLeftWithShort(QTextStream* self, short i) { QTextStream& _ret = self->operator<<(static_cast(i)); // Cast returned reference into pointer return &_ret; } -QTextStream* QTextStream_operatorShiftLeftWithUnsignedshort(QTextStream* self, uint16_t i) { +QTextStream* QTextStream_operatorShiftLeftWithUnsignedshort(QTextStream* self, unsigned short i) { QTextStream& _ret = self->operator<<(static_cast(i)); // Cast returned reference into pointer return &_ret; diff --git a/qt/gen_qtextstream.go b/qt/gen_qtextstream.go index 80977d92..0461a40d 100644 --- a/qt/gen_qtextstream.go +++ b/qt/gen_qtextstream.go @@ -298,11 +298,11 @@ func (this *QTextStream) OperatorShiftRightWithCh(ch *int8) *QTextStream { } func (this *QTextStream) OperatorShiftRightWithShort(i *int16) *QTextStream { - return newQTextStream(C.QTextStream_operatorShiftRightWithShort(this.h, (*C.int16_t)(unsafe.Pointer(i)))) + return newQTextStream(C.QTextStream_operatorShiftRightWithShort(this.h, (*C.short)(unsafe.Pointer(i)))) } func (this *QTextStream) OperatorShiftRightWithUnsignedshort(i *uint16) *QTextStream { - return newQTextStream(C.QTextStream_operatorShiftRightWithUnsignedshort(this.h, (*C.uint16_t)(unsafe.Pointer(i)))) + return newQTextStream(C.QTextStream_operatorShiftRightWithUnsignedshort(this.h, (*C.ushort)(unsafe.Pointer(i)))) } func (this *QTextStream) OperatorShiftRightWithInt(i *int) *QTextStream { @@ -371,11 +371,11 @@ func (this *QTextStream) OperatorShiftLeftWithCh(ch int8) *QTextStream { } func (this *QTextStream) OperatorShiftLeftWithShort(i int16) *QTextStream { - return newQTextStream(C.QTextStream_operatorShiftLeftWithShort(this.h, (C.int16_t)(i))) + return newQTextStream(C.QTextStream_operatorShiftLeftWithShort(this.h, (C.short)(i))) } func (this *QTextStream) OperatorShiftLeftWithUnsignedshort(i uint16) *QTextStream { - return newQTextStream(C.QTextStream_operatorShiftLeftWithUnsignedshort(this.h, (C.uint16_t)(i))) + return newQTextStream(C.QTextStream_operatorShiftLeftWithUnsignedshort(this.h, (C.ushort)(i))) } func (this *QTextStream) OperatorShiftLeftWithInt(i int) *QTextStream { diff --git a/qt/gen_qtextstream.h b/qt/gen_qtextstream.h index c6fbc730..cf10e1e4 100644 --- a/qt/gen_qtextstream.h +++ b/qt/gen_qtextstream.h @@ -72,8 +72,8 @@ void QTextStream_setRealNumberPrecision(QTextStream* self, int precision); int QTextStream_realNumberPrecision(const QTextStream* self); QTextStream* QTextStream_operatorShiftRight(QTextStream* self, QChar* ch); QTextStream* QTextStream_operatorShiftRightWithCh(QTextStream* self, char* ch); -QTextStream* QTextStream_operatorShiftRightWithShort(QTextStream* self, int16_t* i); -QTextStream* QTextStream_operatorShiftRightWithUnsignedshort(QTextStream* self, uint16_t* i); +QTextStream* QTextStream_operatorShiftRightWithShort(QTextStream* self, short* i); +QTextStream* QTextStream_operatorShiftRightWithUnsignedshort(QTextStream* self, unsigned short* i); QTextStream* QTextStream_operatorShiftRightWithInt(QTextStream* self, int* i); QTextStream* QTextStream_operatorShiftRightWithUnsignedint(QTextStream* self, unsigned int* i); QTextStream* QTextStream_operatorShiftRightWithLong(QTextStream* self, long* i); @@ -87,8 +87,8 @@ QTextStream* QTextStream_operatorShiftRightWithArray(QTextStream* self, struct m QTextStream* QTextStream_operatorShiftRightWithChar(QTextStream* self, char* c); QTextStream* QTextStream_operatorShiftLeft(QTextStream* self, QChar* ch); QTextStream* QTextStream_operatorShiftLeftWithCh(QTextStream* self, char ch); -QTextStream* QTextStream_operatorShiftLeftWithShort(QTextStream* self, int16_t i); -QTextStream* QTextStream_operatorShiftLeftWithUnsignedshort(QTextStream* self, uint16_t i); +QTextStream* QTextStream_operatorShiftLeftWithShort(QTextStream* self, short i); +QTextStream* QTextStream_operatorShiftLeftWithUnsignedshort(QTextStream* self, unsigned short i); QTextStream* QTextStream_operatorShiftLeftWithInt(QTextStream* self, int i); QTextStream* QTextStream_operatorShiftLeftWithUnsignedint(QTextStream* self, unsigned int i); QTextStream* QTextStream_operatorShiftLeftWithLong(QTextStream* self, long i); diff --git a/qt/gen_quuid.cpp b/qt/gen_quuid.cpp index d81c5e63..2d108980 100644 --- a/qt/gen_quuid.cpp +++ b/qt/gen_quuid.cpp @@ -18,7 +18,7 @@ QUuid* QUuid_new() { return new QUuid(); } -QUuid* QUuid_new2(unsigned int l, uint16_t w1, uint16_t w2, unsigned char b1, unsigned char b2, unsigned char b3, unsigned char b4, unsigned char b5, unsigned char b6, unsigned char b7, unsigned char b8) { +QUuid* QUuid_new2(unsigned int l, unsigned short w1, unsigned short w2, unsigned char b1, unsigned char b2, unsigned char b3, unsigned char b4, unsigned char b5, unsigned char b6, unsigned char b7, unsigned char b8) { return new QUuid(static_cast(l), static_cast(w1), static_cast(w2), static_cast(b1), static_cast(b2), static_cast(b3), static_cast(b4), static_cast(b5), static_cast(b6), static_cast(b7), static_cast(b8)); } diff --git a/qt/gen_quuid.go b/qt/gen_quuid.go index 2bfbe4f5..3fac4f60 100644 --- a/qt/gen_quuid.go +++ b/qt/gen_quuid.go @@ -84,7 +84,7 @@ func NewQUuid() *QUuid { // NewQUuid2 constructs a new QUuid object. func NewQUuid2(l uint, w1 uint16, w2 uint16, b1 byte, b2 byte, b3 byte, b4 byte, b5 byte, b6 byte, b7 byte, b8 byte) *QUuid { - return newQUuid(C.QUuid_new2((C.uint)(l), (C.uint16_t)(w1), (C.uint16_t)(w2), (C.uchar)(b1), (C.uchar)(b2), (C.uchar)(b3), (C.uchar)(b4), (C.uchar)(b5), (C.uchar)(b6), (C.uchar)(b7), (C.uchar)(b8))) + return newQUuid(C.QUuid_new2((C.uint)(l), (C.ushort)(w1), (C.ushort)(w2), (C.uchar)(b1), (C.uchar)(b2), (C.uchar)(b3), (C.uchar)(b4), (C.uchar)(b5), (C.uchar)(b6), (C.uchar)(b7), (C.uchar)(b8))) } // NewQUuid3 constructs a new QUuid object. diff --git a/qt/gen_quuid.h b/qt/gen_quuid.h index c2c4562d..04ec9413 100644 --- a/qt/gen_quuid.h +++ b/qt/gen_quuid.h @@ -21,7 +21,7 @@ typedef struct QUuid QUuid; #endif QUuid* QUuid_new(); -QUuid* QUuid_new2(unsigned int l, uint16_t w1, uint16_t w2, unsigned char b1, unsigned char b2, unsigned char b3, unsigned char b4, unsigned char b5, unsigned char b6, unsigned char b7, unsigned char b8); +QUuid* QUuid_new2(unsigned int l, unsigned short w1, unsigned short w2, unsigned char b1, unsigned char b2, unsigned char b3, unsigned char b4, unsigned char b5, unsigned char b6, unsigned char b7, unsigned char b8); QUuid* QUuid_new3(struct miqt_string param1); QUuid* QUuid_new4(const char* param1); QUuid* QUuid_new5(struct miqt_string param1); diff --git a/qt/network/gen_qabstractsocket.cpp b/qt/network/gen_qabstractsocket.cpp index 601820af..b5577295 100644 --- a/qt/network/gen_qabstractsocket.cpp +++ b/qt/network/gen_qabstractsocket.cpp @@ -28,8 +28,8 @@ void miqt_exec_callback_QAbstractSocket_errorWithQAbstractSocketSocketError(intp void miqt_exec_callback_QAbstractSocket_errorOccurred(intptr_t, int); void miqt_exec_callback_QAbstractSocket_proxyAuthenticationRequired(intptr_t, QNetworkProxy*, QAuthenticator*); void miqt_exec_callback_QAbstractSocket_resume(QAbstractSocket*, intptr_t); -void miqt_exec_callback_QAbstractSocket_connectToHost(QAbstractSocket*, intptr_t, struct miqt_string, uint16_t, int, int); -void miqt_exec_callback_QAbstractSocket_connectToHost2(QAbstractSocket*, intptr_t, QHostAddress*, uint16_t, int); +void miqt_exec_callback_QAbstractSocket_connectToHost(QAbstractSocket*, intptr_t, struct miqt_string, unsigned short, int, int); +void miqt_exec_callback_QAbstractSocket_connectToHost2(QAbstractSocket*, intptr_t, QHostAddress*, unsigned short, int); void miqt_exec_callback_QAbstractSocket_disconnectFromHost(QAbstractSocket*, intptr_t); long long miqt_exec_callback_QAbstractSocket_bytesAvailable(const QAbstractSocket*, intptr_t); long long miqt_exec_callback_QAbstractSocket_bytesToWrite(const QAbstractSocket*, intptr_t); @@ -109,7 +109,7 @@ public: memcpy(hostName_ms.data, hostName_b.data(), hostName_ms.len); struct miqt_string sigval1 = hostName_ms; quint16 port_ret = port; - uint16_t sigval2 = static_cast(port_ret); + unsigned short sigval2 = static_cast(port_ret); QIODevice::OpenMode mode_ret = mode; int sigval3 = static_cast(mode_ret); QAbstractSocket::NetworkLayerProtocol protocol_ret = protocol; @@ -120,7 +120,7 @@ public: } - friend void QAbstractSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol); + friend void QAbstractSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol); // cgo.Handle value for overwritten implementation intptr_t handle__connectToHost2 = 0; @@ -136,7 +136,7 @@ public: // Cast returned reference into pointer QHostAddress* sigval1 = const_cast(&address_ret); quint16 port_ret = port; - uint16_t sigval2 = static_cast(port_ret); + unsigned short sigval2 = static_cast(port_ret); QIODevice::OpenMode mode_ret = mode; int sigval3 = static_cast(mode_ret); @@ -145,7 +145,7 @@ public: } - friend void QAbstractSocket_virtualbase_connectToHost2(void* self, QHostAddress* address, uint16_t port, int mode); + friend void QAbstractSocket_virtualbase_connectToHost2(void* self, QHostAddress* address, unsigned short port, int mode); // cgo.Handle value for overwritten implementation intptr_t handle__disconnectFromHost = 0; @@ -730,9 +730,9 @@ public: // Wrappers to allow calling protected methods: friend void QAbstractSocket_protectedbase_setSocketState(bool* _dynamic_cast_ok, void* self, int state); friend void QAbstractSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, int socketError); - friend void QAbstractSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port); + friend void QAbstractSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port); friend void QAbstractSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); - friend void QAbstractSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port); + friend void QAbstractSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port); friend void QAbstractSocket_protectedbase_setPeerAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); friend void QAbstractSocket_protectedbase_setPeerName(bool* _dynamic_cast_ok, void* self, struct miqt_string name); friend void QAbstractSocket_protectedbase_setOpenMode(bool* _dynamic_cast_ok, void* self, int openMode); @@ -802,12 +802,12 @@ bool QAbstractSocket_bind2(QAbstractSocket* self) { return self->bind(); } -void QAbstractSocket_connectToHost(QAbstractSocket* self, struct miqt_string hostName, uint16_t port, int mode, int protocol) { +void QAbstractSocket_connectToHost(QAbstractSocket* self, struct miqt_string hostName, unsigned short port, int mode, int protocol) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); self->connectToHost(hostName_QString, static_cast(port), static_cast(mode), static_cast(protocol)); } -void QAbstractSocket_connectToHost2(QAbstractSocket* self, QHostAddress* address, uint16_t port, int mode) { +void QAbstractSocket_connectToHost2(QAbstractSocket* self, QHostAddress* address, unsigned short port, int mode) { self->connectToHost(*address, static_cast(port), static_cast(mode)); } @@ -833,18 +833,18 @@ bool QAbstractSocket_canReadLine(const QAbstractSocket* self) { return self->canReadLine(); } -uint16_t QAbstractSocket_localPort(const QAbstractSocket* self) { +unsigned short QAbstractSocket_localPort(const QAbstractSocket* self) { quint16 _ret = self->localPort(); - return static_cast(_ret); + return static_cast(_ret); } QHostAddress* QAbstractSocket_localAddress(const QAbstractSocket* self) { return new QHostAddress(self->localAddress()); } -uint16_t QAbstractSocket_peerPort(const QAbstractSocket* self) { +unsigned short QAbstractSocket_peerPort(const QAbstractSocket* self) { quint16 _ret = self->peerPort(); - return static_cast(_ret); + return static_cast(_ret); } QHostAddress* QAbstractSocket_peerAddress(const QAbstractSocket* self) { @@ -1087,19 +1087,19 @@ struct miqt_string QAbstractSocket_trUtf83(const char* s, const char* c, int n) return _ms; } -bool QAbstractSocket_bind3(QAbstractSocket* self, QHostAddress* address, uint16_t port) { +bool QAbstractSocket_bind3(QAbstractSocket* self, QHostAddress* address, unsigned short port) { return self->bind(*address, static_cast(port)); } -bool QAbstractSocket_bind4(QAbstractSocket* self, QHostAddress* address, uint16_t port, int mode) { +bool QAbstractSocket_bind4(QAbstractSocket* self, QHostAddress* address, unsigned short port, int mode) { return self->bind(*address, static_cast(port), static_cast(mode)); } -bool QAbstractSocket_bindWithPort(QAbstractSocket* self, uint16_t port) { +bool QAbstractSocket_bindWithPort(QAbstractSocket* self, unsigned short port) { return self->bind(static_cast(port)); } -bool QAbstractSocket_bind5(QAbstractSocket* self, uint16_t port, int mode) { +bool QAbstractSocket_bind5(QAbstractSocket* self, unsigned short port, int mode) { return self->bind(static_cast(port), static_cast(mode)); } @@ -1129,7 +1129,7 @@ bool QAbstractSocket_override_virtual_connectToHost(void* self, intptr_t slot) { return true; } -void QAbstractSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol) { +void QAbstractSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); ( (MiqtVirtualQAbstractSocket*)(self) )->QAbstractSocket::connectToHost(hostName_QString, static_cast(port), static_cast(mode), static_cast(protocol)); @@ -1146,7 +1146,7 @@ bool QAbstractSocket_override_virtual_connectToHost2(void* self, intptr_t slot) return true; } -void QAbstractSocket_virtualbase_connectToHost2(void* self, QHostAddress* address, uint16_t port, int mode) { +void QAbstractSocket_virtualbase_connectToHost2(void* self, QHostAddress* address, unsigned short port, int mode) { ( (MiqtVirtualQAbstractSocket*)(self) )->QAbstractSocket::connectToHost(*address, static_cast(port), static_cast(mode)); @@ -1682,7 +1682,7 @@ void QAbstractSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* } -void QAbstractSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port) { +void QAbstractSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port) { MiqtVirtualQAbstractSocket* self_cast = dynamic_cast( (QAbstractSocket*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; @@ -1708,7 +1708,7 @@ void QAbstractSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* } -void QAbstractSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port) { +void QAbstractSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port) { MiqtVirtualQAbstractSocket* self_cast = dynamic_cast( (QAbstractSocket*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; diff --git a/qt/network/gen_qabstractsocket.go b/qt/network/gen_qabstractsocket.go index 8aa20756..9d4300fa 100644 --- a/qt/network/gen_qabstractsocket.go +++ b/qt/network/gen_qabstractsocket.go @@ -198,11 +198,11 @@ func (this *QAbstractSocket) ConnectToHost(hostName string, port uint16, mode qt hostName_ms.data = C.CString(hostName) hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QAbstractSocket_connectToHost(this.h, hostName_ms, (C.uint16_t)(port), (C.int)(mode), (C.int)(protocol)) + C.QAbstractSocket_connectToHost(this.h, hostName_ms, (C.ushort)(port), (C.int)(mode), (C.int)(protocol)) } func (this *QAbstractSocket) ConnectToHost2(address *QHostAddress, port uint16, mode qt.QIODevice__OpenModeFlag) { - C.QAbstractSocket_connectToHost2(this.h, address.cPointer(), (C.uint16_t)(port), (C.int)(mode)) + C.QAbstractSocket_connectToHost2(this.h, address.cPointer(), (C.ushort)(port), (C.int)(mode)) } func (this *QAbstractSocket) DisconnectFromHost() { @@ -529,19 +529,19 @@ func QAbstractSocket_TrUtf83(s string, c string, n int) string { } func (this *QAbstractSocket) Bind3(address *QHostAddress, port uint16) bool { - return (bool)(C.QAbstractSocket_bind3(this.h, address.cPointer(), (C.uint16_t)(port))) + return (bool)(C.QAbstractSocket_bind3(this.h, address.cPointer(), (C.ushort)(port))) } func (this *QAbstractSocket) Bind4(address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool { - return (bool)(C.QAbstractSocket_bind4(this.h, address.cPointer(), (C.uint16_t)(port), (C.int)(mode))) + return (bool)(C.QAbstractSocket_bind4(this.h, address.cPointer(), (C.ushort)(port), (C.int)(mode))) } func (this *QAbstractSocket) BindWithPort(port uint16) bool { - return (bool)(C.QAbstractSocket_bindWithPort(this.h, (C.uint16_t)(port))) + return (bool)(C.QAbstractSocket_bindWithPort(this.h, (C.ushort)(port))) } func (this *QAbstractSocket) Bind5(port uint16, mode QAbstractSocket__BindFlag) bool { - return (bool)(C.QAbstractSocket_bind5(this.h, (C.uint16_t)(port), (C.int)(mode))) + return (bool)(C.QAbstractSocket_bind5(this.h, (C.ushort)(port), (C.int)(mode))) } // SetSocketState can only be called from a QAbstractSocket that was directly constructed. @@ -572,7 +572,7 @@ func (this *QAbstractSocket) SetSocketError(socketError QAbstractSocket__SocketE func (this *QAbstractSocket) SetLocalPort(port uint16) { var _dynamic_cast_ok C.bool = false - C.QAbstractSocket_protectedbase_setLocalPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uint16_t)(port)) + C.QAbstractSocket_protectedbase_setLocalPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.ushort)(port)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -596,7 +596,7 @@ func (this *QAbstractSocket) SetLocalAddress(address *QHostAddress) { func (this *QAbstractSocket) SetPeerPort(port uint16) { var _dynamic_cast_ok C.bool = false - C.QAbstractSocket_protectedbase_setPeerPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uint16_t)(port)) + C.QAbstractSocket_protectedbase_setPeerPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.ushort)(port)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -747,7 +747,7 @@ func (this *QAbstractSocket) callVirtualBase_ConnectToHost(hostName string, port hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QAbstractSocket_virtualbase_connectToHost(unsafe.Pointer(this.h), hostName_ms, (C.uint16_t)(port), (C.int)(mode), (C.int)(protocol)) + C.QAbstractSocket_virtualbase_connectToHost(unsafe.Pointer(this.h), hostName_ms, (C.ushort)(port), (C.int)(mode), (C.int)(protocol)) } func (this *QAbstractSocket) OnConnectToHost(slot func(super func(hostName string, port uint16, mode qt.QIODevice__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol), hostName string, port uint16, mode qt.QIODevice__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol)) { @@ -758,7 +758,7 @@ func (this *QAbstractSocket) OnConnectToHost(slot func(super func(hostName strin } //export miqt_exec_callback_QAbstractSocket_connectToHost -func miqt_exec_callback_QAbstractSocket_connectToHost(self *C.QAbstractSocket, cb C.intptr_t, hostName C.struct_miqt_string, port C.uint16_t, mode C.int, protocol C.int) { +func miqt_exec_callback_QAbstractSocket_connectToHost(self *C.QAbstractSocket, cb C.intptr_t, hostName C.struct_miqt_string, port C.ushort, mode C.int, protocol C.int) { gofunc, ok := cgo.Handle(cb).Value().(func(super func(hostName string, port uint16, mode qt.QIODevice__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol), hostName string, port uint16, mode qt.QIODevice__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -781,7 +781,7 @@ func miqt_exec_callback_QAbstractSocket_connectToHost(self *C.QAbstractSocket, c func (this *QAbstractSocket) callVirtualBase_ConnectToHost2(address *QHostAddress, port uint16, mode qt.QIODevice__OpenModeFlag) { - C.QAbstractSocket_virtualbase_connectToHost2(unsafe.Pointer(this.h), address.cPointer(), (C.uint16_t)(port), (C.int)(mode)) + C.QAbstractSocket_virtualbase_connectToHost2(unsafe.Pointer(this.h), address.cPointer(), (C.ushort)(port), (C.int)(mode)) } func (this *QAbstractSocket) OnConnectToHost2(slot func(super func(address *QHostAddress, port uint16, mode qt.QIODevice__OpenModeFlag), address *QHostAddress, port uint16, mode qt.QIODevice__OpenModeFlag)) { @@ -792,7 +792,7 @@ func (this *QAbstractSocket) OnConnectToHost2(slot func(super func(address *QHos } //export miqt_exec_callback_QAbstractSocket_connectToHost2 -func miqt_exec_callback_QAbstractSocket_connectToHost2(self *C.QAbstractSocket, cb C.intptr_t, address *C.QHostAddress, port C.uint16_t, mode C.int) { +func miqt_exec_callback_QAbstractSocket_connectToHost2(self *C.QAbstractSocket, cb C.intptr_t, address *C.QHostAddress, port C.ushort, mode C.int) { gofunc, ok := cgo.Handle(cb).Value().(func(super func(address *QHostAddress, port uint16, mode qt.QIODevice__OpenModeFlag), address *QHostAddress, port uint16, mode qt.QIODevice__OpenModeFlag)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt/network/gen_qabstractsocket.h b/qt/network/gen_qabstractsocket.h index e8a22cf8..dae0862e 100644 --- a/qt/network/gen_qabstractsocket.h +++ b/qt/network/gen_qabstractsocket.h @@ -53,16 +53,16 @@ int QAbstractSocket_pauseMode(const QAbstractSocket* self); void QAbstractSocket_setPauseMode(QAbstractSocket* self, int pauseMode); bool QAbstractSocket_bind(QAbstractSocket* self, QHostAddress* address); bool QAbstractSocket_bind2(QAbstractSocket* self); -void QAbstractSocket_connectToHost(QAbstractSocket* self, struct miqt_string hostName, uint16_t port, int mode, int protocol); -void QAbstractSocket_connectToHost2(QAbstractSocket* self, QHostAddress* address, uint16_t port, int mode); +void QAbstractSocket_connectToHost(QAbstractSocket* self, struct miqt_string hostName, unsigned short port, int mode, int protocol); +void QAbstractSocket_connectToHost2(QAbstractSocket* self, QHostAddress* address, unsigned short port, int mode); void QAbstractSocket_disconnectFromHost(QAbstractSocket* self); bool QAbstractSocket_isValid(const QAbstractSocket* self); long long QAbstractSocket_bytesAvailable(const QAbstractSocket* self); long long QAbstractSocket_bytesToWrite(const QAbstractSocket* self); bool QAbstractSocket_canReadLine(const QAbstractSocket* self); -uint16_t QAbstractSocket_localPort(const QAbstractSocket* self); +unsigned short QAbstractSocket_localPort(const QAbstractSocket* self); QHostAddress* QAbstractSocket_localAddress(const QAbstractSocket* self); -uint16_t QAbstractSocket_peerPort(const QAbstractSocket* self); +unsigned short QAbstractSocket_peerPort(const QAbstractSocket* self); QHostAddress* QAbstractSocket_peerAddress(const QAbstractSocket* self); struct miqt_string QAbstractSocket_peerName(const QAbstractSocket* self); long long QAbstractSocket_readBufferSize(const QAbstractSocket* self); @@ -108,16 +108,16 @@ struct miqt_string QAbstractSocket_tr2(const char* s, const char* c); struct miqt_string QAbstractSocket_tr3(const char* s, const char* c, int n); struct miqt_string QAbstractSocket_trUtf82(const char* s, const char* c); struct miqt_string QAbstractSocket_trUtf83(const char* s, const char* c, int n); -bool QAbstractSocket_bind3(QAbstractSocket* self, QHostAddress* address, uint16_t port); -bool QAbstractSocket_bind4(QAbstractSocket* self, QHostAddress* address, uint16_t port, int mode); -bool QAbstractSocket_bindWithPort(QAbstractSocket* self, uint16_t port); -bool QAbstractSocket_bind5(QAbstractSocket* self, uint16_t port, int mode); +bool QAbstractSocket_bind3(QAbstractSocket* self, QHostAddress* address, unsigned short port); +bool QAbstractSocket_bind4(QAbstractSocket* self, QHostAddress* address, unsigned short port, int mode); +bool QAbstractSocket_bindWithPort(QAbstractSocket* self, unsigned short port); +bool QAbstractSocket_bind5(QAbstractSocket* self, unsigned short port, int mode); bool QAbstractSocket_override_virtual_resume(void* self, intptr_t slot); void QAbstractSocket_virtualbase_resume(void* self); bool QAbstractSocket_override_virtual_connectToHost(void* self, intptr_t slot); -void QAbstractSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol); +void QAbstractSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol); bool QAbstractSocket_override_virtual_connectToHost2(void* self, intptr_t slot); -void QAbstractSocket_virtualbase_connectToHost2(void* self, QHostAddress* address, uint16_t port, int mode); +void QAbstractSocket_virtualbase_connectToHost2(void* self, QHostAddress* address, unsigned short port, int mode); bool QAbstractSocket_override_virtual_disconnectFromHost(void* self, intptr_t slot); void QAbstractSocket_virtualbase_disconnectFromHost(void* self); bool QAbstractSocket_override_virtual_bytesAvailable(void* self, intptr_t slot); @@ -182,9 +182,9 @@ bool QAbstractSocket_override_virtual_disconnectNotify(void* self, intptr_t slot void QAbstractSocket_virtualbase_disconnectNotify(void* self, QMetaMethod* signal); void QAbstractSocket_protectedbase_setSocketState(bool* _dynamic_cast_ok, void* self, int state); void QAbstractSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, int socketError); -void QAbstractSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port); +void QAbstractSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port); void QAbstractSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); -void QAbstractSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port); +void QAbstractSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port); void QAbstractSocket_protectedbase_setPeerAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); void QAbstractSocket_protectedbase_setPeerName(bool* _dynamic_cast_ok, void* self, struct miqt_string name); void QAbstractSocket_protectedbase_setOpenMode(bool* _dynamic_cast_ok, void* self, int openMode); diff --git a/qt/network/gen_qdnslookup.cpp b/qt/network/gen_qdnslookup.cpp index e5f3b335..a36f3c9d 100644 --- a/qt/network/gen_qdnslookup.cpp +++ b/qt/network/gen_qdnslookup.cpp @@ -163,9 +163,9 @@ struct miqt_string QDnsMailExchangeRecord_name(const QDnsMailExchangeRecord* sel return _ms; } -uint16_t QDnsMailExchangeRecord_preference(const QDnsMailExchangeRecord* self) { +unsigned short QDnsMailExchangeRecord_preference(const QDnsMailExchangeRecord* self) { quint16 _ret = self->preference(); - return static_cast(_ret); + return static_cast(_ret); } unsigned int QDnsMailExchangeRecord_timeToLive(const QDnsMailExchangeRecord* self) { @@ -204,14 +204,14 @@ struct miqt_string QDnsServiceRecord_name(const QDnsServiceRecord* self) { return _ms; } -uint16_t QDnsServiceRecord_port(const QDnsServiceRecord* self) { +unsigned short QDnsServiceRecord_port(const QDnsServiceRecord* self) { quint16 _ret = self->port(); - return static_cast(_ret); + return static_cast(_ret); } -uint16_t QDnsServiceRecord_priority(const QDnsServiceRecord* self) { +unsigned short QDnsServiceRecord_priority(const QDnsServiceRecord* self) { quint16 _ret = self->priority(); - return static_cast(_ret); + return static_cast(_ret); } struct miqt_string QDnsServiceRecord_target(const QDnsServiceRecord* self) { @@ -230,9 +230,9 @@ unsigned int QDnsServiceRecord_timeToLive(const QDnsServiceRecord* self) { return static_cast(_ret); } -uint16_t QDnsServiceRecord_weight(const QDnsServiceRecord* self) { +unsigned short QDnsServiceRecord_weight(const QDnsServiceRecord* self) { quint16 _ret = self->weight(); - return static_cast(_ret); + return static_cast(_ret); } void QDnsServiceRecord_delete(QDnsServiceRecord* self) { diff --git a/qt/network/gen_qdnslookup.h b/qt/network/gen_qdnslookup.h index a11e078c..dff44a13 100644 --- a/qt/network/gen_qdnslookup.h +++ b/qt/network/gen_qdnslookup.h @@ -68,7 +68,7 @@ void QDnsMailExchangeRecord_operatorAssign(QDnsMailExchangeRecord* self, QDnsMai void QDnsMailExchangeRecord_swap(QDnsMailExchangeRecord* self, QDnsMailExchangeRecord* other); struct miqt_string QDnsMailExchangeRecord_exchange(const QDnsMailExchangeRecord* self); struct miqt_string QDnsMailExchangeRecord_name(const QDnsMailExchangeRecord* self); -uint16_t QDnsMailExchangeRecord_preference(const QDnsMailExchangeRecord* self); +unsigned short QDnsMailExchangeRecord_preference(const QDnsMailExchangeRecord* self); unsigned int QDnsMailExchangeRecord_timeToLive(const QDnsMailExchangeRecord* self); void QDnsMailExchangeRecord_delete(QDnsMailExchangeRecord* self); @@ -77,11 +77,11 @@ QDnsServiceRecord* QDnsServiceRecord_new2(QDnsServiceRecord* other); void QDnsServiceRecord_operatorAssign(QDnsServiceRecord* self, QDnsServiceRecord* other); void QDnsServiceRecord_swap(QDnsServiceRecord* self, QDnsServiceRecord* other); struct miqt_string QDnsServiceRecord_name(const QDnsServiceRecord* self); -uint16_t QDnsServiceRecord_port(const QDnsServiceRecord* self); -uint16_t QDnsServiceRecord_priority(const QDnsServiceRecord* self); +unsigned short QDnsServiceRecord_port(const QDnsServiceRecord* self); +unsigned short QDnsServiceRecord_priority(const QDnsServiceRecord* self); struct miqt_string QDnsServiceRecord_target(const QDnsServiceRecord* self); unsigned int QDnsServiceRecord_timeToLive(const QDnsServiceRecord* self); -uint16_t QDnsServiceRecord_weight(const QDnsServiceRecord* self); +unsigned short QDnsServiceRecord_weight(const QDnsServiceRecord* self); void QDnsServiceRecord_delete(QDnsServiceRecord* self); QDnsTextRecord* QDnsTextRecord_new(); diff --git a/qt/network/gen_qdtls.cpp b/qt/network/gen_qdtls.cpp index 85c2a9dd..4b52888a 100644 --- a/qt/network/gen_qdtls.cpp +++ b/qt/network/gen_qdtls.cpp @@ -246,7 +246,7 @@ QDtlsClientVerifier__GeneratorParameters* QDtlsClientVerifier_cookieGeneratorPar return new QDtlsClientVerifier::GeneratorParameters(self->cookieGeneratorParameters()); } -bool QDtlsClientVerifier_verifyClient(QDtlsClientVerifier* self, QUdpSocket* socket, struct miqt_string dgram, QHostAddress* address, uint16_t port) { +bool QDtlsClientVerifier_verifyClient(QDtlsClientVerifier* self, QUdpSocket* socket, struct miqt_string dgram, QHostAddress* address, unsigned short port) { QByteArray dgram_QByteArray(dgram.data, dgram.len); return self->verifyClient(socket, dgram_QByteArray, *address, static_cast(port)); } @@ -681,7 +681,7 @@ struct miqt_string QDtls_trUtf8(const char* s) { return _ms; } -bool QDtls_setPeer(QDtls* self, QHostAddress* address, uint16_t port) { +bool QDtls_setPeer(QDtls* self, QHostAddress* address, unsigned short port) { return self->setPeer(*address, static_cast(port)); } @@ -694,9 +694,9 @@ QHostAddress* QDtls_peerAddress(const QDtls* self) { return new QHostAddress(self->peerAddress()); } -uint16_t QDtls_peerPort(const QDtls* self) { +unsigned short QDtls_peerPort(const QDtls* self) { quint16 _ret = self->peerPort(); - return static_cast(_ret); + return static_cast(_ret); } struct miqt_string QDtls_peerVerificationName(const QDtls* self) { @@ -715,13 +715,13 @@ int QDtls_sslMode(const QDtls* self) { return static_cast(_ret); } -void QDtls_setMtuHint(QDtls* self, uint16_t mtuHint) { +void QDtls_setMtuHint(QDtls* self, unsigned short mtuHint) { self->setMtuHint(static_cast(mtuHint)); } -uint16_t QDtls_mtuHint(const QDtls* self) { +unsigned short QDtls_mtuHint(const QDtls* self) { quint16 _ret = self->mtuHint(); - return static_cast(_ret); + return static_cast(_ret); } bool QDtls_setCookieGeneratorParameters(QDtls* self, QDtlsClientVerifier__GeneratorParameters* params) { @@ -898,7 +898,7 @@ struct miqt_string QDtls_trUtf83(const char* s, const char* c, int n) { return _ms; } -bool QDtls_setPeer2(QDtls* self, QHostAddress* address, uint16_t port, struct miqt_string verificationName) { +bool QDtls_setPeer2(QDtls* self, QHostAddress* address, unsigned short port, struct miqt_string verificationName) { QString verificationName_QString = QString::fromUtf8(verificationName.data, verificationName.len); return self->setPeer(*address, static_cast(port), verificationName_QString); } diff --git a/qt/network/gen_qdtls.go b/qt/network/gen_qdtls.go index 4de88500..6b93d5f6 100644 --- a/qt/network/gen_qdtls.go +++ b/qt/network/gen_qdtls.go @@ -132,7 +132,7 @@ func (this *QDtlsClientVerifier) VerifyClient(socket *QUdpSocket, dgram []byte, dgram_alias.data = (*C.char)(unsafe.Pointer(nil)) } dgram_alias.len = C.size_t(len(dgram)) - return (bool)(C.QDtlsClientVerifier_verifyClient(this.h, socket.cPointer(), dgram_alias, address.cPointer(), (C.uint16_t)(port))) + return (bool)(C.QDtlsClientVerifier_verifyClient(this.h, socket.cPointer(), dgram_alias, address.cPointer(), (C.ushort)(port))) } func (this *QDtlsClientVerifier) VerifiedHello() []byte { @@ -534,7 +534,7 @@ func QDtls_TrUtf8(s string) string { } func (this *QDtls) SetPeer(address *QHostAddress, port uint16) bool { - return (bool)(C.QDtls_setPeer(this.h, address.cPointer(), (C.uint16_t)(port))) + return (bool)(C.QDtls_setPeer(this.h, address.cPointer(), (C.ushort)(port))) } func (this *QDtls) SetPeerVerificationName(name string) bool { @@ -567,7 +567,7 @@ func (this *QDtls) SslMode() QSslSocket__SslMode { } func (this *QDtls) SetMtuHint(mtuHint uint16) { - C.QDtls_setMtuHint(this.h, (C.uint16_t)(mtuHint)) + C.QDtls_setMtuHint(this.h, (C.ushort)(mtuHint)) } func (this *QDtls) MtuHint() uint16 { @@ -776,7 +776,7 @@ func (this *QDtls) SetPeer2(address *QHostAddress, port uint16, verificationName verificationName_ms.data = C.CString(verificationName) verificationName_ms.len = C.size_t(len(verificationName)) defer C.free(unsafe.Pointer(verificationName_ms.data)) - return (bool)(C.QDtls_setPeer2(this.h, address.cPointer(), (C.uint16_t)(port), verificationName_ms)) + return (bool)(C.QDtls_setPeer2(this.h, address.cPointer(), (C.ushort)(port), verificationName_ms)) } func (this *QDtls) DoHandshake2(socket *QUdpSocket, dgram []byte) bool { diff --git a/qt/network/gen_qdtls.h b/qt/network/gen_qdtls.h index 8e1b26ac..09b43a99 100644 --- a/qt/network/gen_qdtls.h +++ b/qt/network/gen_qdtls.h @@ -61,7 +61,7 @@ struct miqt_string QDtlsClientVerifier_tr(const char* s); struct miqt_string QDtlsClientVerifier_trUtf8(const char* s); bool QDtlsClientVerifier_setCookieGeneratorParameters(QDtlsClientVerifier* self, QDtlsClientVerifier__GeneratorParameters* params); QDtlsClientVerifier__GeneratorParameters* QDtlsClientVerifier_cookieGeneratorParameters(const QDtlsClientVerifier* self); -bool QDtlsClientVerifier_verifyClient(QDtlsClientVerifier* self, QUdpSocket* socket, struct miqt_string dgram, QHostAddress* address, uint16_t port); +bool QDtlsClientVerifier_verifyClient(QDtlsClientVerifier* self, QUdpSocket* socket, struct miqt_string dgram, QHostAddress* address, unsigned short port); struct miqt_string QDtlsClientVerifier_verifiedHello(const QDtlsClientVerifier* self); unsigned char QDtlsClientVerifier_dtlsError(const QDtlsClientVerifier* self); struct miqt_string QDtlsClientVerifier_dtlsErrorString(const QDtlsClientVerifier* self); @@ -96,14 +96,14 @@ QMetaObject* QDtls_metaObject(const QDtls* self); void* QDtls_metacast(QDtls* self, const char* param1); struct miqt_string QDtls_tr(const char* s); struct miqt_string QDtls_trUtf8(const char* s); -bool QDtls_setPeer(QDtls* self, QHostAddress* address, uint16_t port); +bool QDtls_setPeer(QDtls* self, QHostAddress* address, unsigned short port); bool QDtls_setPeerVerificationName(QDtls* self, struct miqt_string name); QHostAddress* QDtls_peerAddress(const QDtls* self); -uint16_t QDtls_peerPort(const QDtls* self); +unsigned short QDtls_peerPort(const QDtls* self); struct miqt_string QDtls_peerVerificationName(const QDtls* self); int QDtls_sslMode(const QDtls* self); -void QDtls_setMtuHint(QDtls* self, uint16_t mtuHint); -uint16_t QDtls_mtuHint(const QDtls* self); +void QDtls_setMtuHint(QDtls* self, unsigned short mtuHint); +unsigned short QDtls_mtuHint(const QDtls* self); bool QDtls_setCookieGeneratorParameters(QDtls* self, QDtlsClientVerifier__GeneratorParameters* params); QDtlsClientVerifier__GeneratorParameters* QDtls_cookieGeneratorParameters(const QDtls* self); bool QDtls_setDtlsConfiguration(QDtls* self, QSslConfiguration* configuration); @@ -131,7 +131,7 @@ struct miqt_string QDtls_tr2(const char* s, const char* c); struct miqt_string QDtls_tr3(const char* s, const char* c, int n); struct miqt_string QDtls_trUtf82(const char* s, const char* c); struct miqt_string QDtls_trUtf83(const char* s, const char* c, int n); -bool QDtls_setPeer2(QDtls* self, QHostAddress* address, uint16_t port, struct miqt_string verificationName); +bool QDtls_setPeer2(QDtls* self, QHostAddress* address, unsigned short port, struct miqt_string verificationName); bool QDtls_doHandshake2(QDtls* self, QUdpSocket* socket, struct miqt_string dgram); bool QDtls_override_virtual_event(void* self, intptr_t slot); bool QDtls_virtualbase_event(void* self, QEvent* event); diff --git a/qt/network/gen_qnetworkaccessmanager.cpp b/qt/network/gen_qnetworkaccessmanager.cpp index 09800a57..515d64c9 100644 --- a/qt/network/gen_qnetworkaccessmanager.cpp +++ b/qt/network/gen_qnetworkaccessmanager.cpp @@ -448,7 +448,7 @@ void QNetworkAccessManager_connectToHostEncrypted(QNetworkAccessManager* self, s self->connectToHostEncrypted(hostName_QString); } -void QNetworkAccessManager_connectToHostEncrypted2(QNetworkAccessManager* self, struct miqt_string hostName, uint16_t port, QSslConfiguration* sslConfiguration, struct miqt_string peerName) { +void QNetworkAccessManager_connectToHostEncrypted2(QNetworkAccessManager* self, struct miqt_string hostName, unsigned short port, QSslConfiguration* sslConfiguration, struct miqt_string peerName) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); QString peerName_QString = QString::fromUtf8(peerName.data, peerName.len); self->connectToHostEncrypted(hostName_QString, static_cast(port), *sslConfiguration, peerName_QString); @@ -647,17 +647,17 @@ QNetworkReply* QNetworkAccessManager_sendCustomRequest4(QNetworkAccessManager* s return self->sendCustomRequest(*request, verb_QByteArray, data); } -void QNetworkAccessManager_connectToHostEncrypted3(QNetworkAccessManager* self, struct miqt_string hostName, uint16_t port) { +void QNetworkAccessManager_connectToHostEncrypted3(QNetworkAccessManager* self, struct miqt_string hostName, unsigned short port) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); self->connectToHostEncrypted(hostName_QString, static_cast(port)); } -void QNetworkAccessManager_connectToHostEncrypted4(QNetworkAccessManager* self, struct miqt_string hostName, uint16_t port, QSslConfiguration* sslConfiguration) { +void QNetworkAccessManager_connectToHostEncrypted4(QNetworkAccessManager* self, struct miqt_string hostName, unsigned short port, QSslConfiguration* sslConfiguration) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); self->connectToHostEncrypted(hostName_QString, static_cast(port), *sslConfiguration); } -void QNetworkAccessManager_connectToHost2(QNetworkAccessManager* self, struct miqt_string hostName, uint16_t port) { +void QNetworkAccessManager_connectToHost2(QNetworkAccessManager* self, struct miqt_string hostName, unsigned short port) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); self->connectToHost(hostName_QString, static_cast(port)); } diff --git a/qt/network/gen_qnetworkaccessmanager.go b/qt/network/gen_qnetworkaccessmanager.go index 4f7093b6..d23473c7 100644 --- a/qt/network/gen_qnetworkaccessmanager.go +++ b/qt/network/gen_qnetworkaccessmanager.go @@ -335,7 +335,7 @@ func (this *QNetworkAccessManager) ConnectToHostEncrypted2(hostName string, port peerName_ms.data = C.CString(peerName) peerName_ms.len = C.size_t(len(peerName)) defer C.free(unsafe.Pointer(peerName_ms.data)) - C.QNetworkAccessManager_connectToHostEncrypted2(this.h, hostName_ms, (C.uint16_t)(port), sslConfiguration.cPointer(), peerName_ms) + C.QNetworkAccessManager_connectToHostEncrypted2(this.h, hostName_ms, (C.ushort)(port), sslConfiguration.cPointer(), peerName_ms) } func (this *QNetworkAccessManager) ConnectToHost(hostName string) { @@ -617,7 +617,7 @@ func (this *QNetworkAccessManager) ConnectToHostEncrypted3(hostName string, port hostName_ms.data = C.CString(hostName) hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QNetworkAccessManager_connectToHostEncrypted3(this.h, hostName_ms, (C.uint16_t)(port)) + C.QNetworkAccessManager_connectToHostEncrypted3(this.h, hostName_ms, (C.ushort)(port)) } func (this *QNetworkAccessManager) ConnectToHostEncrypted4(hostName string, port uint16, sslConfiguration *QSslConfiguration) { @@ -625,7 +625,7 @@ func (this *QNetworkAccessManager) ConnectToHostEncrypted4(hostName string, port hostName_ms.data = C.CString(hostName) hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QNetworkAccessManager_connectToHostEncrypted4(this.h, hostName_ms, (C.uint16_t)(port), sslConfiguration.cPointer()) + C.QNetworkAccessManager_connectToHostEncrypted4(this.h, hostName_ms, (C.ushort)(port), sslConfiguration.cPointer()) } func (this *QNetworkAccessManager) ConnectToHost2(hostName string, port uint16) { @@ -633,7 +633,7 @@ func (this *QNetworkAccessManager) ConnectToHost2(hostName string, port uint16) hostName_ms.data = C.CString(hostName) hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QNetworkAccessManager_connectToHost2(this.h, hostName_ms, (C.uint16_t)(port)) + C.QNetworkAccessManager_connectToHost2(this.h, hostName_ms, (C.ushort)(port)) } func (this *QNetworkAccessManager) SetTransferTimeoutWithTimeout(timeout int) { diff --git a/qt/network/gen_qnetworkaccessmanager.h b/qt/network/gen_qnetworkaccessmanager.h index 5150995b..8537145a 100644 --- a/qt/network/gen_qnetworkaccessmanager.h +++ b/qt/network/gen_qnetworkaccessmanager.h @@ -102,7 +102,7 @@ QNetworkConfiguration* QNetworkAccessManager_activeConfiguration(const QNetworkA void QNetworkAccessManager_setNetworkAccessible(QNetworkAccessManager* self, int accessible); int QNetworkAccessManager_networkAccessible(const QNetworkAccessManager* self); void QNetworkAccessManager_connectToHostEncrypted(QNetworkAccessManager* self, struct miqt_string hostName); -void QNetworkAccessManager_connectToHostEncrypted2(QNetworkAccessManager* self, struct miqt_string hostName, uint16_t port, QSslConfiguration* sslConfiguration, struct miqt_string peerName); +void QNetworkAccessManager_connectToHostEncrypted2(QNetworkAccessManager* self, struct miqt_string hostName, unsigned short port, QSslConfiguration* sslConfiguration, struct miqt_string peerName); void QNetworkAccessManager_connectToHost(QNetworkAccessManager* self, struct miqt_string hostName); void QNetworkAccessManager_setRedirectPolicy(QNetworkAccessManager* self, int policy); int QNetworkAccessManager_redirectPolicy(const QNetworkAccessManager* self); @@ -133,9 +133,9 @@ struct miqt_string QNetworkAccessManager_trUtf82(const char* s, const char* c); struct miqt_string QNetworkAccessManager_trUtf83(const char* s, const char* c, int n); void QNetworkAccessManager_enableStrictTransportSecurityStore2(QNetworkAccessManager* self, bool enabled, struct miqt_string storeDir); QNetworkReply* QNetworkAccessManager_sendCustomRequest4(QNetworkAccessManager* self, QNetworkRequest* request, struct miqt_string verb, QIODevice* data); -void QNetworkAccessManager_connectToHostEncrypted3(QNetworkAccessManager* self, struct miqt_string hostName, uint16_t port); -void QNetworkAccessManager_connectToHostEncrypted4(QNetworkAccessManager* self, struct miqt_string hostName, uint16_t port, QSslConfiguration* sslConfiguration); -void QNetworkAccessManager_connectToHost2(QNetworkAccessManager* self, struct miqt_string hostName, uint16_t port); +void QNetworkAccessManager_connectToHostEncrypted3(QNetworkAccessManager* self, struct miqt_string hostName, unsigned short port); +void QNetworkAccessManager_connectToHostEncrypted4(QNetworkAccessManager* self, struct miqt_string hostName, unsigned short port, QSslConfiguration* sslConfiguration); +void QNetworkAccessManager_connectToHost2(QNetworkAccessManager* self, struct miqt_string hostName, unsigned short port); void QNetworkAccessManager_setTransferTimeoutWithTimeout(QNetworkAccessManager* self, int timeout); bool QNetworkAccessManager_override_virtual_createRequest(void* self, intptr_t slot); QNetworkReply* QNetworkAccessManager_virtualbase_createRequest(void* self, int op, QNetworkRequest* request, QIODevice* outgoingData); diff --git a/qt/network/gen_qnetworkdatagram.cpp b/qt/network/gen_qnetworkdatagram.cpp index 9987452c..594b1349 100644 --- a/qt/network/gen_qnetworkdatagram.cpp +++ b/qt/network/gen_qnetworkdatagram.cpp @@ -30,7 +30,7 @@ QNetworkDatagram* QNetworkDatagram_new4(struct miqt_string data, QHostAddress* d return new QNetworkDatagram(data_QByteArray, *destinationAddress); } -QNetworkDatagram* QNetworkDatagram_new5(struct miqt_string data, QHostAddress* destinationAddress, uint16_t port) { +QNetworkDatagram* QNetworkDatagram_new5(struct miqt_string data, QHostAddress* destinationAddress, unsigned short port) { QByteArray data_QByteArray(data.data, data.len); return new QNetworkDatagram(data_QByteArray, *destinationAddress, static_cast(port)); } @@ -84,7 +84,7 @@ void QNetworkDatagram_setSender(QNetworkDatagram* self, QHostAddress* address) { self->setSender(*address); } -void QNetworkDatagram_setDestination(QNetworkDatagram* self, QHostAddress* address, uint16_t port) { +void QNetworkDatagram_setDestination(QNetworkDatagram* self, QHostAddress* address, unsigned short port) { self->setDestination(*address, static_cast(port)); } @@ -115,7 +115,7 @@ QNetworkDatagram* QNetworkDatagram_makeReply(const QNetworkDatagram* self, struc return new QNetworkDatagram(self->makeReply(payload_QByteArray)); } -void QNetworkDatagram_setSender2(QNetworkDatagram* self, QHostAddress* address, uint16_t port) { +void QNetworkDatagram_setSender2(QNetworkDatagram* self, QHostAddress* address, unsigned short port) { self->setSender(*address, static_cast(port)); } diff --git a/qt/network/gen_qnetworkdatagram.go b/qt/network/gen_qnetworkdatagram.go index 156b85bd..b3fafe93 100644 --- a/qt/network/gen_qnetworkdatagram.go +++ b/qt/network/gen_qnetworkdatagram.go @@ -93,7 +93,7 @@ func NewQNetworkDatagram5(data []byte, destinationAddress *QHostAddress, port ui } data_alias.len = C.size_t(len(data)) - return newQNetworkDatagram(C.QNetworkDatagram_new5(data_alias, destinationAddress.cPointer(), (C.uint16_t)(port))) + return newQNetworkDatagram(C.QNetworkDatagram_new5(data_alias, destinationAddress.cPointer(), (C.ushort)(port))) } func (this *QNetworkDatagram) OperatorAssign(other *QNetworkDatagram) { @@ -149,7 +149,7 @@ func (this *QNetworkDatagram) SetSender(address *QHostAddress) { } func (this *QNetworkDatagram) SetDestination(address *QHostAddress, port uint16) { - C.QNetworkDatagram_setDestination(this.h, address.cPointer(), (C.uint16_t)(port)) + C.QNetworkDatagram_setDestination(this.h, address.cPointer(), (C.ushort)(port)) } func (this *QNetworkDatagram) HopLimit() int { @@ -192,7 +192,7 @@ func (this *QNetworkDatagram) MakeReply(payload []byte) *QNetworkDatagram { } func (this *QNetworkDatagram) SetSender2(address *QHostAddress, port uint16) { - C.QNetworkDatagram_setSender2(this.h, address.cPointer(), (C.uint16_t)(port)) + C.QNetworkDatagram_setSender2(this.h, address.cPointer(), (C.ushort)(port)) } // Delete this object from C++ memory. diff --git a/qt/network/gen_qnetworkdatagram.h b/qt/network/gen_qnetworkdatagram.h index ec1af83f..0b49c30e 100644 --- a/qt/network/gen_qnetworkdatagram.h +++ b/qt/network/gen_qnetworkdatagram.h @@ -26,7 +26,7 @@ QNetworkDatagram* QNetworkDatagram_new(); QNetworkDatagram* QNetworkDatagram_new2(struct miqt_string data); QNetworkDatagram* QNetworkDatagram_new3(QNetworkDatagram* other); QNetworkDatagram* QNetworkDatagram_new4(struct miqt_string data, QHostAddress* destinationAddress); -QNetworkDatagram* QNetworkDatagram_new5(struct miqt_string data, QHostAddress* destinationAddress, uint16_t port); +QNetworkDatagram* QNetworkDatagram_new5(struct miqt_string data, QHostAddress* destinationAddress, unsigned short port); void QNetworkDatagram_operatorAssign(QNetworkDatagram* self, QNetworkDatagram* other); void QNetworkDatagram_swap(QNetworkDatagram* self, QNetworkDatagram* other); void QNetworkDatagram_clear(QNetworkDatagram* self); @@ -39,13 +39,13 @@ QHostAddress* QNetworkDatagram_destinationAddress(const QNetworkDatagram* self); int QNetworkDatagram_senderPort(const QNetworkDatagram* self); int QNetworkDatagram_destinationPort(const QNetworkDatagram* self); void QNetworkDatagram_setSender(QNetworkDatagram* self, QHostAddress* address); -void QNetworkDatagram_setDestination(QNetworkDatagram* self, QHostAddress* address, uint16_t port); +void QNetworkDatagram_setDestination(QNetworkDatagram* self, QHostAddress* address, unsigned short port); int QNetworkDatagram_hopLimit(const QNetworkDatagram* self); void QNetworkDatagram_setHopLimit(QNetworkDatagram* self, int count); struct miqt_string QNetworkDatagram_data(const QNetworkDatagram* self); void QNetworkDatagram_setData(QNetworkDatagram* self, struct miqt_string data); QNetworkDatagram* QNetworkDatagram_makeReply(const QNetworkDatagram* self, struct miqt_string payload); -void QNetworkDatagram_setSender2(QNetworkDatagram* self, QHostAddress* address, uint16_t port); +void QNetworkDatagram_setSender2(QNetworkDatagram* self, QHostAddress* address, unsigned short port); void QNetworkDatagram_delete(QNetworkDatagram* self); #ifdef __cplusplus diff --git a/qt/network/gen_qnetworkproxy.cpp b/qt/network/gen_qnetworkproxy.cpp index 3be69b7a..1c5e9aa0 100644 --- a/qt/network/gen_qnetworkproxy.cpp +++ b/qt/network/gen_qnetworkproxy.cpp @@ -34,7 +34,7 @@ QNetworkProxyQuery* QNetworkProxyQuery_new3(struct miqt_string hostname, int por return new QNetworkProxyQuery(hostname_QString, static_cast(port)); } -QNetworkProxyQuery* QNetworkProxyQuery_new4(uint16_t bindPort) { +QNetworkProxyQuery* QNetworkProxyQuery_new4(unsigned short bindPort) { return new QNetworkProxyQuery(static_cast(bindPort)); } @@ -47,7 +47,7 @@ QNetworkProxyQuery* QNetworkProxyQuery_new6(QNetworkConfiguration* networkConfig return new QNetworkProxyQuery(*networkConfiguration, hostname_QString, static_cast(port)); } -QNetworkProxyQuery* QNetworkProxyQuery_new7(QNetworkConfiguration* networkConfiguration, uint16_t bindPort) { +QNetworkProxyQuery* QNetworkProxyQuery_new7(QNetworkConfiguration* networkConfiguration, unsigned short bindPort) { return new QNetworkProxyQuery(*networkConfiguration, static_cast(bindPort)); } @@ -71,12 +71,12 @@ QNetworkProxyQuery* QNetworkProxyQuery_new11(struct miqt_string hostname, int po return new QNetworkProxyQuery(hostname_QString, static_cast(port), protocolTag_QString, static_cast(queryType)); } -QNetworkProxyQuery* QNetworkProxyQuery_new12(uint16_t bindPort, struct miqt_string protocolTag) { +QNetworkProxyQuery* QNetworkProxyQuery_new12(unsigned short bindPort, struct miqt_string protocolTag) { QString protocolTag_QString = QString::fromUtf8(protocolTag.data, protocolTag.len); return new QNetworkProxyQuery(static_cast(bindPort), protocolTag_QString); } -QNetworkProxyQuery* QNetworkProxyQuery_new13(uint16_t bindPort, struct miqt_string protocolTag, int queryType) { +QNetworkProxyQuery* QNetworkProxyQuery_new13(unsigned short bindPort, struct miqt_string protocolTag, int queryType) { QString protocolTag_QString = QString::fromUtf8(protocolTag.data, protocolTag.len); return new QNetworkProxyQuery(static_cast(bindPort), protocolTag_QString, static_cast(queryType)); } @@ -97,12 +97,12 @@ QNetworkProxyQuery* QNetworkProxyQuery_new16(QNetworkConfiguration* networkConfi return new QNetworkProxyQuery(*networkConfiguration, hostname_QString, static_cast(port), protocolTag_QString, static_cast(queryType)); } -QNetworkProxyQuery* QNetworkProxyQuery_new17(QNetworkConfiguration* networkConfiguration, uint16_t bindPort, struct miqt_string protocolTag) { +QNetworkProxyQuery* QNetworkProxyQuery_new17(QNetworkConfiguration* networkConfiguration, unsigned short bindPort, struct miqt_string protocolTag) { QString protocolTag_QString = QString::fromUtf8(protocolTag.data, protocolTag.len); return new QNetworkProxyQuery(*networkConfiguration, static_cast(bindPort), protocolTag_QString); } -QNetworkProxyQuery* QNetworkProxyQuery_new18(QNetworkConfiguration* networkConfiguration, uint16_t bindPort, struct miqt_string protocolTag, int queryType) { +QNetworkProxyQuery* QNetworkProxyQuery_new18(QNetworkConfiguration* networkConfiguration, unsigned short bindPort, struct miqt_string protocolTag, int queryType) { QString protocolTag_QString = QString::fromUtf8(protocolTag.data, protocolTag.len); return new QNetworkProxyQuery(*networkConfiguration, static_cast(bindPort), protocolTag_QString, static_cast(queryType)); } @@ -217,18 +217,18 @@ QNetworkProxy* QNetworkProxy_new4(int type, struct miqt_string hostName) { return new QNetworkProxy(static_cast(type), hostName_QString); } -QNetworkProxy* QNetworkProxy_new5(int type, struct miqt_string hostName, uint16_t port) { +QNetworkProxy* QNetworkProxy_new5(int type, struct miqt_string hostName, unsigned short port) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); return new QNetworkProxy(static_cast(type), hostName_QString, static_cast(port)); } -QNetworkProxy* QNetworkProxy_new6(int type, struct miqt_string hostName, uint16_t port, struct miqt_string user) { +QNetworkProxy* QNetworkProxy_new6(int type, struct miqt_string hostName, unsigned short port, struct miqt_string user) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); QString user_QString = QString::fromUtf8(user.data, user.len); return new QNetworkProxy(static_cast(type), hostName_QString, static_cast(port), user_QString); } -QNetworkProxy* QNetworkProxy_new7(int type, struct miqt_string hostName, uint16_t port, struct miqt_string user, struct miqt_string password) { +QNetworkProxy* QNetworkProxy_new7(int type, struct miqt_string hostName, unsigned short port, struct miqt_string user, struct miqt_string password) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); QString user_QString = QString::fromUtf8(user.data, user.len); QString password_QString = QString::fromUtf8(password.data, password.len); @@ -325,13 +325,13 @@ struct miqt_string QNetworkProxy_hostName(const QNetworkProxy* self) { return _ms; } -void QNetworkProxy_setPort(QNetworkProxy* self, uint16_t port) { +void QNetworkProxy_setPort(QNetworkProxy* self, unsigned short port) { self->setPort(static_cast(port)); } -uint16_t QNetworkProxy_port(const QNetworkProxy* self) { +unsigned short QNetworkProxy_port(const QNetworkProxy* self) { quint16 _ret = self->port(); - return static_cast(_ret); + return static_cast(_ret); } void QNetworkProxy_setApplicationProxy(QNetworkProxy* proxy) { diff --git a/qt/network/gen_qnetworkproxy.go b/qt/network/gen_qnetworkproxy.go index 7812f96a..c5a587cc 100644 --- a/qt/network/gen_qnetworkproxy.go +++ b/qt/network/gen_qnetworkproxy.go @@ -106,7 +106,7 @@ func NewQNetworkProxyQuery3(hostname string, port int) *QNetworkProxyQuery { // NewQNetworkProxyQuery4 constructs a new QNetworkProxyQuery object. func NewQNetworkProxyQuery4(bindPort uint16) *QNetworkProxyQuery { - return newQNetworkProxyQuery(C.QNetworkProxyQuery_new4((C.uint16_t)(bindPort))) + return newQNetworkProxyQuery(C.QNetworkProxyQuery_new4((C.ushort)(bindPort))) } // NewQNetworkProxyQuery5 constructs a new QNetworkProxyQuery object. @@ -128,7 +128,7 @@ func NewQNetworkProxyQuery6(networkConfiguration *QNetworkConfiguration, hostnam // NewQNetworkProxyQuery7 constructs a new QNetworkProxyQuery object. func NewQNetworkProxyQuery7(networkConfiguration *QNetworkConfiguration, bindPort uint16) *QNetworkProxyQuery { - return newQNetworkProxyQuery(C.QNetworkProxyQuery_new7(networkConfiguration.cPointer(), (C.uint16_t)(bindPort))) + return newQNetworkProxyQuery(C.QNetworkProxyQuery_new7(networkConfiguration.cPointer(), (C.ushort)(bindPort))) } // NewQNetworkProxyQuery8 constructs a new QNetworkProxyQuery object. @@ -178,7 +178,7 @@ func NewQNetworkProxyQuery12(bindPort uint16, protocolTag string) *QNetworkProxy protocolTag_ms.len = C.size_t(len(protocolTag)) defer C.free(unsafe.Pointer(protocolTag_ms.data)) - return newQNetworkProxyQuery(C.QNetworkProxyQuery_new12((C.uint16_t)(bindPort), protocolTag_ms)) + return newQNetworkProxyQuery(C.QNetworkProxyQuery_new12((C.ushort)(bindPort), protocolTag_ms)) } // NewQNetworkProxyQuery13 constructs a new QNetworkProxyQuery object. @@ -188,7 +188,7 @@ func NewQNetworkProxyQuery13(bindPort uint16, protocolTag string, queryType QNet protocolTag_ms.len = C.size_t(len(protocolTag)) defer C.free(unsafe.Pointer(protocolTag_ms.data)) - return newQNetworkProxyQuery(C.QNetworkProxyQuery_new13((C.uint16_t)(bindPort), protocolTag_ms, (C.int)(queryType))) + return newQNetworkProxyQuery(C.QNetworkProxyQuery_new13((C.ushort)(bindPort), protocolTag_ms, (C.int)(queryType))) } // NewQNetworkProxyQuery14 constructs a new QNetworkProxyQuery object. @@ -232,7 +232,7 @@ func NewQNetworkProxyQuery17(networkConfiguration *QNetworkConfiguration, bindPo protocolTag_ms.len = C.size_t(len(protocolTag)) defer C.free(unsafe.Pointer(protocolTag_ms.data)) - return newQNetworkProxyQuery(C.QNetworkProxyQuery_new17(networkConfiguration.cPointer(), (C.uint16_t)(bindPort), protocolTag_ms)) + return newQNetworkProxyQuery(C.QNetworkProxyQuery_new17(networkConfiguration.cPointer(), (C.ushort)(bindPort), protocolTag_ms)) } // NewQNetworkProxyQuery18 constructs a new QNetworkProxyQuery object. @@ -242,7 +242,7 @@ func NewQNetworkProxyQuery18(networkConfiguration *QNetworkConfiguration, bindPo protocolTag_ms.len = C.size_t(len(protocolTag)) defer C.free(unsafe.Pointer(protocolTag_ms.data)) - return newQNetworkProxyQuery(C.QNetworkProxyQuery_new18(networkConfiguration.cPointer(), (C.uint16_t)(bindPort), protocolTag_ms, (C.int)(queryType))) + return newQNetworkProxyQuery(C.QNetworkProxyQuery_new18(networkConfiguration.cPointer(), (C.ushort)(bindPort), protocolTag_ms, (C.int)(queryType))) } func (this *QNetworkProxyQuery) OperatorAssign(other *QNetworkProxyQuery) { @@ -416,7 +416,7 @@ func NewQNetworkProxy5(typeVal QNetworkProxy__ProxyType, hostName string, port u hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - return newQNetworkProxy(C.QNetworkProxy_new5((C.int)(typeVal), hostName_ms, (C.uint16_t)(port))) + return newQNetworkProxy(C.QNetworkProxy_new5((C.int)(typeVal), hostName_ms, (C.ushort)(port))) } // NewQNetworkProxy6 constructs a new QNetworkProxy object. @@ -430,7 +430,7 @@ func NewQNetworkProxy6(typeVal QNetworkProxy__ProxyType, hostName string, port u user_ms.len = C.size_t(len(user)) defer C.free(unsafe.Pointer(user_ms.data)) - return newQNetworkProxy(C.QNetworkProxy_new6((C.int)(typeVal), hostName_ms, (C.uint16_t)(port), user_ms)) + return newQNetworkProxy(C.QNetworkProxy_new6((C.int)(typeVal), hostName_ms, (C.ushort)(port), user_ms)) } // NewQNetworkProxy7 constructs a new QNetworkProxy object. @@ -448,7 +448,7 @@ func NewQNetworkProxy7(typeVal QNetworkProxy__ProxyType, hostName string, port u password_ms.len = C.size_t(len(password)) defer C.free(unsafe.Pointer(password_ms.data)) - return newQNetworkProxy(C.QNetworkProxy_new7((C.int)(typeVal), hostName_ms, (C.uint16_t)(port), user_ms, password_ms)) + return newQNetworkProxy(C.QNetworkProxy_new7((C.int)(typeVal), hostName_ms, (C.ushort)(port), user_ms, password_ms)) } func (this *QNetworkProxy) OperatorAssign(other *QNetworkProxy) { @@ -537,7 +537,7 @@ func (this *QNetworkProxy) HostName() string { } func (this *QNetworkProxy) SetPort(port uint16) { - C.QNetworkProxy_setPort(this.h, (C.uint16_t)(port)) + C.QNetworkProxy_setPort(this.h, (C.ushort)(port)) } func (this *QNetworkProxy) Port() uint16 { diff --git a/qt/network/gen_qnetworkproxy.h b/qt/network/gen_qnetworkproxy.h index 27ee6025..4e54cdf3 100644 --- a/qt/network/gen_qnetworkproxy.h +++ b/qt/network/gen_qnetworkproxy.h @@ -33,21 +33,21 @@ typedef struct QVariant QVariant; QNetworkProxyQuery* QNetworkProxyQuery_new(); QNetworkProxyQuery* QNetworkProxyQuery_new2(QUrl* requestUrl); QNetworkProxyQuery* QNetworkProxyQuery_new3(struct miqt_string hostname, int port); -QNetworkProxyQuery* QNetworkProxyQuery_new4(uint16_t bindPort); +QNetworkProxyQuery* QNetworkProxyQuery_new4(unsigned short bindPort); QNetworkProxyQuery* QNetworkProxyQuery_new5(QNetworkConfiguration* networkConfiguration, QUrl* requestUrl); QNetworkProxyQuery* QNetworkProxyQuery_new6(QNetworkConfiguration* networkConfiguration, struct miqt_string hostname, int port); -QNetworkProxyQuery* QNetworkProxyQuery_new7(QNetworkConfiguration* networkConfiguration, uint16_t bindPort); +QNetworkProxyQuery* QNetworkProxyQuery_new7(QNetworkConfiguration* networkConfiguration, unsigned short bindPort); QNetworkProxyQuery* QNetworkProxyQuery_new8(QNetworkProxyQuery* other); QNetworkProxyQuery* QNetworkProxyQuery_new9(QUrl* requestUrl, int queryType); QNetworkProxyQuery* QNetworkProxyQuery_new10(struct miqt_string hostname, int port, struct miqt_string protocolTag); QNetworkProxyQuery* QNetworkProxyQuery_new11(struct miqt_string hostname, int port, struct miqt_string protocolTag, int queryType); -QNetworkProxyQuery* QNetworkProxyQuery_new12(uint16_t bindPort, struct miqt_string protocolTag); -QNetworkProxyQuery* QNetworkProxyQuery_new13(uint16_t bindPort, struct miqt_string protocolTag, int queryType); +QNetworkProxyQuery* QNetworkProxyQuery_new12(unsigned short bindPort, struct miqt_string protocolTag); +QNetworkProxyQuery* QNetworkProxyQuery_new13(unsigned short bindPort, struct miqt_string protocolTag, int queryType); QNetworkProxyQuery* QNetworkProxyQuery_new14(QNetworkConfiguration* networkConfiguration, QUrl* requestUrl, int queryType); QNetworkProxyQuery* QNetworkProxyQuery_new15(QNetworkConfiguration* networkConfiguration, struct miqt_string hostname, int port, struct miqt_string protocolTag); QNetworkProxyQuery* QNetworkProxyQuery_new16(QNetworkConfiguration* networkConfiguration, struct miqt_string hostname, int port, struct miqt_string protocolTag, int queryType); -QNetworkProxyQuery* QNetworkProxyQuery_new17(QNetworkConfiguration* networkConfiguration, uint16_t bindPort, struct miqt_string protocolTag); -QNetworkProxyQuery* QNetworkProxyQuery_new18(QNetworkConfiguration* networkConfiguration, uint16_t bindPort, struct miqt_string protocolTag, int queryType); +QNetworkProxyQuery* QNetworkProxyQuery_new17(QNetworkConfiguration* networkConfiguration, unsigned short bindPort, struct miqt_string protocolTag); +QNetworkProxyQuery* QNetworkProxyQuery_new18(QNetworkConfiguration* networkConfiguration, unsigned short bindPort, struct miqt_string protocolTag, int queryType); void QNetworkProxyQuery_operatorAssign(QNetworkProxyQuery* self, QNetworkProxyQuery* other); void QNetworkProxyQuery_swap(QNetworkProxyQuery* self, QNetworkProxyQuery* other); bool QNetworkProxyQuery_operatorEqual(const QNetworkProxyQuery* self, QNetworkProxyQuery* other); @@ -72,9 +72,9 @@ QNetworkProxy* QNetworkProxy_new(); QNetworkProxy* QNetworkProxy_new2(int type); QNetworkProxy* QNetworkProxy_new3(QNetworkProxy* other); QNetworkProxy* QNetworkProxy_new4(int type, struct miqt_string hostName); -QNetworkProxy* QNetworkProxy_new5(int type, struct miqt_string hostName, uint16_t port); -QNetworkProxy* QNetworkProxy_new6(int type, struct miqt_string hostName, uint16_t port, struct miqt_string user); -QNetworkProxy* QNetworkProxy_new7(int type, struct miqt_string hostName, uint16_t port, struct miqt_string user, struct miqt_string password); +QNetworkProxy* QNetworkProxy_new5(int type, struct miqt_string hostName, unsigned short port); +QNetworkProxy* QNetworkProxy_new6(int type, struct miqt_string hostName, unsigned short port, struct miqt_string user); +QNetworkProxy* QNetworkProxy_new7(int type, struct miqt_string hostName, unsigned short port, struct miqt_string user, struct miqt_string password); void QNetworkProxy_operatorAssign(QNetworkProxy* self, QNetworkProxy* other); void QNetworkProxy_swap(QNetworkProxy* self, QNetworkProxy* other); bool QNetworkProxy_operatorEqual(const QNetworkProxy* self, QNetworkProxy* other); @@ -91,8 +91,8 @@ void QNetworkProxy_setPassword(QNetworkProxy* self, struct miqt_string password) struct miqt_string QNetworkProxy_password(const QNetworkProxy* self); void QNetworkProxy_setHostName(QNetworkProxy* self, struct miqt_string hostName); struct miqt_string QNetworkProxy_hostName(const QNetworkProxy* self); -void QNetworkProxy_setPort(QNetworkProxy* self, uint16_t port); -uint16_t QNetworkProxy_port(const QNetworkProxy* self); +void QNetworkProxy_setPort(QNetworkProxy* self, unsigned short port); +unsigned short QNetworkProxy_port(const QNetworkProxy* self); void QNetworkProxy_setApplicationProxy(QNetworkProxy* proxy); QNetworkProxy* QNetworkProxy_applicationProxy(); QVariant* QNetworkProxy_header(const QNetworkProxy* self, int header); diff --git a/qt/network/gen_qsslsocket.cpp b/qt/network/gen_qsslsocket.cpp index 34d2d496..650bf0d6 100644 --- a/qt/network/gen_qsslsocket.cpp +++ b/qt/network/gen_qsslsocket.cpp @@ -39,7 +39,7 @@ void miqt_exec_callback_QSslSocket_preSharedKeyAuthenticationRequired(intptr_t, void miqt_exec_callback_QSslSocket_newSessionTicketReceived(intptr_t); void miqt_exec_callback_QSslSocket_resume(QSslSocket*, intptr_t); bool miqt_exec_callback_QSslSocket_setSocketDescriptor(QSslSocket*, intptr_t, intptr_t, int, int); -void miqt_exec_callback_QSslSocket_connectToHost(QSslSocket*, intptr_t, struct miqt_string, uint16_t, int, int); +void miqt_exec_callback_QSslSocket_connectToHost(QSslSocket*, intptr_t, struct miqt_string, unsigned short, int, int); void miqt_exec_callback_QSslSocket_disconnectFromHost(QSslSocket*, intptr_t); void miqt_exec_callback_QSslSocket_setSocketOption(QSslSocket*, intptr_t, int, QVariant*); QVariant* miqt_exec_callback_QSslSocket_socketOption(QSslSocket*, intptr_t, int); @@ -142,7 +142,7 @@ public: memcpy(hostName_ms.data, hostName_b.data(), hostName_ms.len); struct miqt_string sigval1 = hostName_ms; quint16 port_ret = port; - uint16_t sigval2 = static_cast(port_ret); + unsigned short sigval2 = static_cast(port_ret); QIODevice::OpenMode openMode_ret = openMode; int sigval3 = static_cast(openMode_ret); QAbstractSocket::NetworkLayerProtocol protocol_ret = protocol; @@ -153,7 +153,7 @@ public: } - friend void QSslSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int openMode, int protocol); + friend void QSslSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int openMode, int protocol); // cgo.Handle value for overwritten implementation intptr_t handle__disconnectFromHost = 0; @@ -715,9 +715,9 @@ public: // Wrappers to allow calling protected methods: friend void QSslSocket_protectedbase_setSocketState(bool* _dynamic_cast_ok, void* self, int state); friend void QSslSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, int socketError); - friend void QSslSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port); + friend void QSslSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port); friend void QSslSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); - friend void QSslSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port); + friend void QSslSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port); friend void QSslSocket_protectedbase_setPeerAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); friend void QSslSocket_protectedbase_setPeerName(bool* _dynamic_cast_ok, void* self, struct miqt_string name); friend void QSslSocket_protectedbase_setOpenMode(bool* _dynamic_cast_ok, void* self, int openMode); @@ -774,12 +774,12 @@ void QSslSocket_resume(QSslSocket* self) { self->resume(); } -void QSslSocket_connectToHostEncrypted(QSslSocket* self, struct miqt_string hostName, uint16_t port) { +void QSslSocket_connectToHostEncrypted(QSslSocket* self, struct miqt_string hostName, unsigned short port) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); self->connectToHostEncrypted(hostName_QString, static_cast(port)); } -void QSslSocket_connectToHostEncrypted2(QSslSocket* self, struct miqt_string hostName, uint16_t port, struct miqt_string sslPeerName) { +void QSslSocket_connectToHostEncrypted2(QSslSocket* self, struct miqt_string hostName, unsigned short port, struct miqt_string sslPeerName) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); QString sslPeerName_QString = QString::fromUtf8(sslPeerName.data, sslPeerName.len); self->connectToHostEncrypted(hostName_QString, static_cast(port), sslPeerName_QString); @@ -789,7 +789,7 @@ bool QSslSocket_setSocketDescriptor(QSslSocket* self, intptr_t socketDescriptor, return self->setSocketDescriptor((qintptr)(socketDescriptor), static_cast(state), static_cast(openMode)); } -void QSslSocket_connectToHost(QSslSocket* self, struct miqt_string hostName, uint16_t port, int openMode, int protocol) { +void QSslSocket_connectToHost(QSslSocket* self, struct miqt_string hostName, unsigned short port, int openMode, int protocol) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); self->connectToHost(hostName_QString, static_cast(port), static_cast(openMode), static_cast(protocol)); } @@ -1398,23 +1398,23 @@ struct miqt_string QSslSocket_trUtf83(const char* s, const char* c, int n) { return _ms; } -void QSslSocket_connectToHostEncrypted3(QSslSocket* self, struct miqt_string hostName, uint16_t port, int mode) { +void QSslSocket_connectToHostEncrypted3(QSslSocket* self, struct miqt_string hostName, unsigned short port, int mode) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); self->connectToHostEncrypted(hostName_QString, static_cast(port), static_cast(mode)); } -void QSslSocket_connectToHostEncrypted4(QSslSocket* self, struct miqt_string hostName, uint16_t port, int mode, int protocol) { +void QSslSocket_connectToHostEncrypted4(QSslSocket* self, struct miqt_string hostName, unsigned short port, int mode, int protocol) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); self->connectToHostEncrypted(hostName_QString, static_cast(port), static_cast(mode), static_cast(protocol)); } -void QSslSocket_connectToHostEncrypted5(QSslSocket* self, struct miqt_string hostName, uint16_t port, struct miqt_string sslPeerName, int mode) { +void QSslSocket_connectToHostEncrypted5(QSslSocket* self, struct miqt_string hostName, unsigned short port, struct miqt_string sslPeerName, int mode) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); QString sslPeerName_QString = QString::fromUtf8(sslPeerName.data, sslPeerName.len); self->connectToHostEncrypted(hostName_QString, static_cast(port), sslPeerName_QString, static_cast(mode)); } -void QSslSocket_connectToHostEncrypted6(QSslSocket* self, struct miqt_string hostName, uint16_t port, struct miqt_string sslPeerName, int mode, int protocol) { +void QSslSocket_connectToHostEncrypted6(QSslSocket* self, struct miqt_string hostName, unsigned short port, struct miqt_string sslPeerName, int mode, int protocol) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); QString sslPeerName_QString = QString::fromUtf8(sslPeerName.data, sslPeerName.len); self->connectToHostEncrypted(hostName_QString, static_cast(port), sslPeerName_QString, static_cast(mode), static_cast(protocol)); @@ -1507,7 +1507,7 @@ bool QSslSocket_override_virtual_connectToHost(void* self, intptr_t slot) { return true; } -void QSslSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int openMode, int protocol) { +void QSslSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int openMode, int protocol) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); ( (MiqtVirtualQSslSocket*)(self) )->QSslSocket::connectToHost(hostName_QString, static_cast(port), static_cast(openMode), static_cast(protocol)); @@ -2028,7 +2028,7 @@ void QSslSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, } -void QSslSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port) { +void QSslSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port) { MiqtVirtualQSslSocket* self_cast = dynamic_cast( (QSslSocket*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; @@ -2054,7 +2054,7 @@ void QSslSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self } -void QSslSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port) { +void QSslSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port) { MiqtVirtualQSslSocket* self_cast = dynamic_cast( (QSslSocket*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; diff --git a/qt/network/gen_qsslsocket.go b/qt/network/gen_qsslsocket.go index d3850d0c..7dbc4118 100644 --- a/qt/network/gen_qsslsocket.go +++ b/qt/network/gen_qsslsocket.go @@ -117,7 +117,7 @@ func (this *QSslSocket) ConnectToHostEncrypted(hostName string, port uint16) { hostName_ms.data = C.CString(hostName) hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QSslSocket_connectToHostEncrypted(this.h, hostName_ms, (C.uint16_t)(port)) + C.QSslSocket_connectToHostEncrypted(this.h, hostName_ms, (C.ushort)(port)) } func (this *QSslSocket) ConnectToHostEncrypted2(hostName string, port uint16, sslPeerName string) { @@ -129,7 +129,7 @@ func (this *QSslSocket) ConnectToHostEncrypted2(hostName string, port uint16, ss sslPeerName_ms.data = C.CString(sslPeerName) sslPeerName_ms.len = C.size_t(len(sslPeerName)) defer C.free(unsafe.Pointer(sslPeerName_ms.data)) - C.QSslSocket_connectToHostEncrypted2(this.h, hostName_ms, (C.uint16_t)(port), sslPeerName_ms) + C.QSslSocket_connectToHostEncrypted2(this.h, hostName_ms, (C.ushort)(port), sslPeerName_ms) } func (this *QSslSocket) SetSocketDescriptor(socketDescriptor uintptr, state QAbstractSocket__SocketState, openMode qt.QIODevice__OpenModeFlag) bool { @@ -141,7 +141,7 @@ func (this *QSslSocket) ConnectToHost(hostName string, port uint16, openMode qt. hostName_ms.data = C.CString(hostName) hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QSslSocket_connectToHost(this.h, hostName_ms, (C.uint16_t)(port), (C.int)(openMode), (C.int)(protocol)) + C.QSslSocket_connectToHost(this.h, hostName_ms, (C.ushort)(port), (C.int)(openMode), (C.int)(protocol)) } func (this *QSslSocket) DisconnectFromHost() { @@ -806,7 +806,7 @@ func (this *QSslSocket) ConnectToHostEncrypted3(hostName string, port uint16, mo hostName_ms.data = C.CString(hostName) hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QSslSocket_connectToHostEncrypted3(this.h, hostName_ms, (C.uint16_t)(port), (C.int)(mode)) + C.QSslSocket_connectToHostEncrypted3(this.h, hostName_ms, (C.ushort)(port), (C.int)(mode)) } func (this *QSslSocket) ConnectToHostEncrypted4(hostName string, port uint16, mode qt.QIODevice__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol) { @@ -814,7 +814,7 @@ func (this *QSslSocket) ConnectToHostEncrypted4(hostName string, port uint16, mo hostName_ms.data = C.CString(hostName) hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QSslSocket_connectToHostEncrypted4(this.h, hostName_ms, (C.uint16_t)(port), (C.int)(mode), (C.int)(protocol)) + C.QSslSocket_connectToHostEncrypted4(this.h, hostName_ms, (C.ushort)(port), (C.int)(mode), (C.int)(protocol)) } func (this *QSslSocket) ConnectToHostEncrypted5(hostName string, port uint16, sslPeerName string, mode qt.QIODevice__OpenModeFlag) { @@ -826,7 +826,7 @@ func (this *QSslSocket) ConnectToHostEncrypted5(hostName string, port uint16, ss sslPeerName_ms.data = C.CString(sslPeerName) sslPeerName_ms.len = C.size_t(len(sslPeerName)) defer C.free(unsafe.Pointer(sslPeerName_ms.data)) - C.QSslSocket_connectToHostEncrypted5(this.h, hostName_ms, (C.uint16_t)(port), sslPeerName_ms, (C.int)(mode)) + C.QSslSocket_connectToHostEncrypted5(this.h, hostName_ms, (C.ushort)(port), sslPeerName_ms, (C.int)(mode)) } func (this *QSslSocket) ConnectToHostEncrypted6(hostName string, port uint16, sslPeerName string, mode qt.QIODevice__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol) { @@ -838,7 +838,7 @@ func (this *QSslSocket) ConnectToHostEncrypted6(hostName string, port uint16, ss sslPeerName_ms.data = C.CString(sslPeerName) sslPeerName_ms.len = C.size_t(len(sslPeerName)) defer C.free(unsafe.Pointer(sslPeerName_ms.data)) - C.QSslSocket_connectToHostEncrypted6(this.h, hostName_ms, (C.uint16_t)(port), sslPeerName_ms, (C.int)(mode), (C.int)(protocol)) + C.QSslSocket_connectToHostEncrypted6(this.h, hostName_ms, (C.ushort)(port), sslPeerName_ms, (C.int)(mode), (C.int)(protocol)) } func (this *QSslSocket) SetLocalCertificate2(fileName string, format QSsl__EncodingFormat) { @@ -944,7 +944,7 @@ func (this *QSslSocket) SetSocketError(socketError QAbstractSocket__SocketError) func (this *QSslSocket) SetLocalPort(port uint16) { var _dynamic_cast_ok C.bool = false - C.QSslSocket_protectedbase_setLocalPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uint16_t)(port)) + C.QSslSocket_protectedbase_setLocalPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.ushort)(port)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -968,7 +968,7 @@ func (this *QSslSocket) SetLocalAddress(address *QHostAddress) { func (this *QSslSocket) SetPeerPort(port uint16) { var _dynamic_cast_ok C.bool = false - C.QSslSocket_protectedbase_setPeerPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uint16_t)(port)) + C.QSslSocket_protectedbase_setPeerPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.ushort)(port)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -1151,7 +1151,7 @@ func (this *QSslSocket) callVirtualBase_ConnectToHost(hostName string, port uint hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QSslSocket_virtualbase_connectToHost(unsafe.Pointer(this.h), hostName_ms, (C.uint16_t)(port), (C.int)(openMode), (C.int)(protocol)) + C.QSslSocket_virtualbase_connectToHost(unsafe.Pointer(this.h), hostName_ms, (C.ushort)(port), (C.int)(openMode), (C.int)(protocol)) } func (this *QSslSocket) OnConnectToHost(slot func(super func(hostName string, port uint16, openMode qt.QIODevice__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol), hostName string, port uint16, openMode qt.QIODevice__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol)) { @@ -1162,7 +1162,7 @@ func (this *QSslSocket) OnConnectToHost(slot func(super func(hostName string, po } //export miqt_exec_callback_QSslSocket_connectToHost -func miqt_exec_callback_QSslSocket_connectToHost(self *C.QSslSocket, cb C.intptr_t, hostName C.struct_miqt_string, port C.uint16_t, openMode C.int, protocol C.int) { +func miqt_exec_callback_QSslSocket_connectToHost(self *C.QSslSocket, cb C.intptr_t, hostName C.struct_miqt_string, port C.ushort, openMode C.int, protocol C.int) { gofunc, ok := cgo.Handle(cb).Value().(func(super func(hostName string, port uint16, openMode qt.QIODevice__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol), hostName string, port uint16, openMode qt.QIODevice__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt/network/gen_qsslsocket.h b/qt/network/gen_qsslsocket.h index 6eacaa11..b6f671ef 100644 --- a/qt/network/gen_qsslsocket.h +++ b/qt/network/gen_qsslsocket.h @@ -64,10 +64,10 @@ void* QSslSocket_metacast(QSslSocket* self, const char* param1); struct miqt_string QSslSocket_tr(const char* s); struct miqt_string QSslSocket_trUtf8(const char* s); void QSslSocket_resume(QSslSocket* self); -void QSslSocket_connectToHostEncrypted(QSslSocket* self, struct miqt_string hostName, uint16_t port); -void QSslSocket_connectToHostEncrypted2(QSslSocket* self, struct miqt_string hostName, uint16_t port, struct miqt_string sslPeerName); +void QSslSocket_connectToHostEncrypted(QSslSocket* self, struct miqt_string hostName, unsigned short port); +void QSslSocket_connectToHostEncrypted2(QSslSocket* self, struct miqt_string hostName, unsigned short port, struct miqt_string sslPeerName); bool QSslSocket_setSocketDescriptor(QSslSocket* self, intptr_t socketDescriptor, int state, int openMode); -void QSslSocket_connectToHost(QSslSocket* self, struct miqt_string hostName, uint16_t port, int openMode, int protocol); +void QSslSocket_connectToHost(QSslSocket* self, struct miqt_string hostName, unsigned short port, int openMode, int protocol); void QSslSocket_disconnectFromHost(QSslSocket* self); void QSslSocket_setSocketOption(QSslSocket* self, int option, QVariant* value); QVariant* QSslSocket_socketOption(QSslSocket* self, int option); @@ -159,10 +159,10 @@ struct miqt_string QSslSocket_tr2(const char* s, const char* c); struct miqt_string QSslSocket_tr3(const char* s, const char* c, int n); struct miqt_string QSslSocket_trUtf82(const char* s, const char* c); struct miqt_string QSslSocket_trUtf83(const char* s, const char* c, int n); -void QSslSocket_connectToHostEncrypted3(QSslSocket* self, struct miqt_string hostName, uint16_t port, int mode); -void QSslSocket_connectToHostEncrypted4(QSslSocket* self, struct miqt_string hostName, uint16_t port, int mode, int protocol); -void QSslSocket_connectToHostEncrypted5(QSslSocket* self, struct miqt_string hostName, uint16_t port, struct miqt_string sslPeerName, int mode); -void QSslSocket_connectToHostEncrypted6(QSslSocket* self, struct miqt_string hostName, uint16_t port, struct miqt_string sslPeerName, int mode, int protocol); +void QSslSocket_connectToHostEncrypted3(QSslSocket* self, struct miqt_string hostName, unsigned short port, int mode); +void QSslSocket_connectToHostEncrypted4(QSslSocket* self, struct miqt_string hostName, unsigned short port, int mode, int protocol); +void QSslSocket_connectToHostEncrypted5(QSslSocket* self, struct miqt_string hostName, unsigned short port, struct miqt_string sslPeerName, int mode); +void QSslSocket_connectToHostEncrypted6(QSslSocket* self, struct miqt_string hostName, unsigned short port, struct miqt_string sslPeerName, int mode, int protocol); void QSslSocket_setLocalCertificate2(QSslSocket* self, struct miqt_string fileName, int format); void QSslSocket_setPrivateKey2(QSslSocket* self, struct miqt_string fileName, int algorithm); void QSslSocket_setPrivateKey3(QSslSocket* self, struct miqt_string fileName, int algorithm, int format); @@ -177,7 +177,7 @@ void QSslSocket_virtualbase_resume(void* self); bool QSslSocket_override_virtual_setSocketDescriptor(void* self, intptr_t slot); bool QSslSocket_virtualbase_setSocketDescriptor(void* self, intptr_t socketDescriptor, int state, int openMode); bool QSslSocket_override_virtual_connectToHost(void* self, intptr_t slot); -void QSslSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int openMode, int protocol); +void QSslSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int openMode, int protocol); bool QSslSocket_override_virtual_disconnectFromHost(void* self, intptr_t slot); void QSslSocket_virtualbase_disconnectFromHost(void* self); bool QSslSocket_override_virtual_setSocketOption(void* self, intptr_t slot); @@ -240,9 +240,9 @@ bool QSslSocket_override_virtual_disconnectNotify(void* self, intptr_t slot); void QSslSocket_virtualbase_disconnectNotify(void* self, QMetaMethod* signal); void QSslSocket_protectedbase_setSocketState(bool* _dynamic_cast_ok, void* self, int state); void QSslSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, int socketError); -void QSslSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port); +void QSslSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port); void QSslSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); -void QSslSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port); +void QSslSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port); void QSslSocket_protectedbase_setPeerAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); void QSslSocket_protectedbase_setPeerName(bool* _dynamic_cast_ok, void* self, struct miqt_string name); void QSslSocket_protectedbase_setOpenMode(bool* _dynamic_cast_ok, void* self, int openMode); diff --git a/qt/network/gen_qtcpserver.cpp b/qt/network/gen_qtcpserver.cpp index f687c363..c4da7f62 100644 --- a/qt/network/gen_qtcpserver.cpp +++ b/qt/network/gen_qtcpserver.cpp @@ -302,9 +302,9 @@ int QTcpServer_maxPendingConnections(const QTcpServer* self) { return self->maxPendingConnections(); } -uint16_t QTcpServer_serverPort(const QTcpServer* self) { +unsigned short QTcpServer_serverPort(const QTcpServer* self) { quint16 _ret = self->serverPort(); - return static_cast(_ret); + return static_cast(_ret); } QHostAddress* QTcpServer_serverAddress(const QTcpServer* self) { @@ -434,7 +434,7 @@ bool QTcpServer_listenWithAddress(QTcpServer* self, QHostAddress* address) { return self->listen(*address); } -bool QTcpServer_listen2(QTcpServer* self, QHostAddress* address, uint16_t port) { +bool QTcpServer_listen2(QTcpServer* self, QHostAddress* address, unsigned short port) { return self->listen(*address, static_cast(port)); } diff --git a/qt/network/gen_qtcpserver.go b/qt/network/gen_qtcpserver.go index 4911ef54..87373906 100644 --- a/qt/network/gen_qtcpserver.go +++ b/qt/network/gen_qtcpserver.go @@ -256,7 +256,7 @@ func (this *QTcpServer) ListenWithAddress(address *QHostAddress) bool { } func (this *QTcpServer) Listen2(address *QHostAddress, port uint16) bool { - return (bool)(C.QTcpServer_listen2(this.h, address.cPointer(), (C.uint16_t)(port))) + return (bool)(C.QTcpServer_listen2(this.h, address.cPointer(), (C.ushort)(port))) } func (this *QTcpServer) WaitForNewConnectionWithMsec(msec int) bool { diff --git a/qt/network/gen_qtcpserver.h b/qt/network/gen_qtcpserver.h index 252db965..e1239468 100644 --- a/qt/network/gen_qtcpserver.h +++ b/qt/network/gen_qtcpserver.h @@ -50,7 +50,7 @@ void QTcpServer_close(QTcpServer* self); bool QTcpServer_isListening(const QTcpServer* self); void QTcpServer_setMaxPendingConnections(QTcpServer* self, int numConnections); int QTcpServer_maxPendingConnections(const QTcpServer* self); -uint16_t QTcpServer_serverPort(const QTcpServer* self); +unsigned short QTcpServer_serverPort(const QTcpServer* self); QHostAddress* QTcpServer_serverAddress(const QTcpServer* self); intptr_t QTcpServer_socketDescriptor(const QTcpServer* self); bool QTcpServer_setSocketDescriptor(QTcpServer* self, intptr_t socketDescriptor); @@ -73,7 +73,7 @@ struct miqt_string QTcpServer_tr3(const char* s, const char* c, int n); struct miqt_string QTcpServer_trUtf82(const char* s, const char* c); struct miqt_string QTcpServer_trUtf83(const char* s, const char* c, int n); bool QTcpServer_listenWithAddress(QTcpServer* self, QHostAddress* address); -bool QTcpServer_listen2(QTcpServer* self, QHostAddress* address, uint16_t port); +bool QTcpServer_listen2(QTcpServer* self, QHostAddress* address, unsigned short port); bool QTcpServer_waitForNewConnectionWithMsec(QTcpServer* self, int msec); bool QTcpServer_waitForNewConnection2(QTcpServer* self, int msec, bool* timedOut); bool QTcpServer_override_virtual_hasPendingConnections(void* self, intptr_t slot); diff --git a/qt/network/gen_qtcpsocket.cpp b/qt/network/gen_qtcpsocket.cpp index 71d5fa07..94453d61 100644 --- a/qt/network/gen_qtcpsocket.cpp +++ b/qt/network/gen_qtcpsocket.cpp @@ -20,7 +20,7 @@ extern "C" { #endif void miqt_exec_callback_QTcpSocket_resume(QTcpSocket*, intptr_t); -void miqt_exec_callback_QTcpSocket_connectToHost(QTcpSocket*, intptr_t, struct miqt_string, uint16_t, int, int); +void miqt_exec_callback_QTcpSocket_connectToHost(QTcpSocket*, intptr_t, struct miqt_string, unsigned short, int, int); void miqt_exec_callback_QTcpSocket_disconnectFromHost(QTcpSocket*, intptr_t); long long miqt_exec_callback_QTcpSocket_bytesAvailable(const QTcpSocket*, intptr_t); long long miqt_exec_callback_QTcpSocket_bytesToWrite(const QTcpSocket*, intptr_t); @@ -101,7 +101,7 @@ public: memcpy(hostName_ms.data, hostName_b.data(), hostName_ms.len); struct miqt_string sigval1 = hostName_ms; quint16 port_ret = port; - uint16_t sigval2 = static_cast(port_ret); + unsigned short sigval2 = static_cast(port_ret); QIODevice::OpenMode mode_ret = mode; int sigval3 = static_cast(mode_ret); QAbstractSocket::NetworkLayerProtocol protocol_ret = protocol; @@ -112,7 +112,7 @@ public: } - friend void QTcpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol); + friend void QTcpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol); // cgo.Handle value for overwritten implementation intptr_t handle__disconnectFromHost = 0; @@ -697,9 +697,9 @@ public: // Wrappers to allow calling protected methods: friend void QTcpSocket_protectedbase_setSocketState(bool* _dynamic_cast_ok, void* self, int state); friend void QTcpSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, int socketError); - friend void QTcpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port); + friend void QTcpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port); friend void QTcpSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); - friend void QTcpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port); + friend void QTcpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port); friend void QTcpSocket_protectedbase_setPeerAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); friend void QTcpSocket_protectedbase_setPeerName(bool* _dynamic_cast_ok, void* self, struct miqt_string name); friend void QTcpSocket_protectedbase_setOpenMode(bool* _dynamic_cast_ok, void* self, int openMode); @@ -822,7 +822,7 @@ bool QTcpSocket_override_virtual_connectToHost(void* self, intptr_t slot) { return true; } -void QTcpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol) { +void QTcpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); ( (MiqtVirtualQTcpSocket*)(self) )->QTcpSocket::connectToHost(hostName_QString, static_cast(port), static_cast(mode), static_cast(protocol)); @@ -1359,7 +1359,7 @@ void QTcpSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, } -void QTcpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port) { +void QTcpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port) { MiqtVirtualQTcpSocket* self_cast = dynamic_cast( (QTcpSocket*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; @@ -1385,7 +1385,7 @@ void QTcpSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self } -void QTcpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port) { +void QTcpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port) { MiqtVirtualQTcpSocket* self_cast = dynamic_cast( (QTcpSocket*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; diff --git a/qt/network/gen_qtcpsocket.go b/qt/network/gen_qtcpsocket.go index c965f5ff..d2b8b9ae 100644 --- a/qt/network/gen_qtcpsocket.go +++ b/qt/network/gen_qtcpsocket.go @@ -163,7 +163,7 @@ func (this *QTcpSocket) SetSocketError(socketError QAbstractSocket__SocketError) func (this *QTcpSocket) SetLocalPort(port uint16) { var _dynamic_cast_ok C.bool = false - C.QTcpSocket_protectedbase_setLocalPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uint16_t)(port)) + C.QTcpSocket_protectedbase_setLocalPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.ushort)(port)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -187,7 +187,7 @@ func (this *QTcpSocket) SetLocalAddress(address *QHostAddress) { func (this *QTcpSocket) SetPeerPort(port uint16) { var _dynamic_cast_ok C.bool = false - C.QTcpSocket_protectedbase_setPeerPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uint16_t)(port)) + C.QTcpSocket_protectedbase_setPeerPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.ushort)(port)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -338,7 +338,7 @@ func (this *QTcpSocket) callVirtualBase_ConnectToHost(hostName string, port uint hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QTcpSocket_virtualbase_connectToHost(unsafe.Pointer(this.h), hostName_ms, (C.uint16_t)(port), (C.int)(mode), (C.int)(protocol)) + C.QTcpSocket_virtualbase_connectToHost(unsafe.Pointer(this.h), hostName_ms, (C.ushort)(port), (C.int)(mode), (C.int)(protocol)) } func (this *QTcpSocket) OnConnectToHost(slot func(super func(hostName string, port uint16, mode qt.QIODevice__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol), hostName string, port uint16, mode qt.QIODevice__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol)) { @@ -349,7 +349,7 @@ func (this *QTcpSocket) OnConnectToHost(slot func(super func(hostName string, po } //export miqt_exec_callback_QTcpSocket_connectToHost -func miqt_exec_callback_QTcpSocket_connectToHost(self *C.QTcpSocket, cb C.intptr_t, hostName C.struct_miqt_string, port C.uint16_t, mode C.int, protocol C.int) { +func miqt_exec_callback_QTcpSocket_connectToHost(self *C.QTcpSocket, cb C.intptr_t, hostName C.struct_miqt_string, port C.ushort, mode C.int, protocol C.int) { gofunc, ok := cgo.Handle(cb).Value().(func(super func(hostName string, port uint16, mode qt.QIODevice__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol), hostName string, port uint16, mode qt.QIODevice__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt/network/gen_qtcpsocket.h b/qt/network/gen_qtcpsocket.h index 561eaf26..75a64410 100644 --- a/qt/network/gen_qtcpsocket.h +++ b/qt/network/gen_qtcpsocket.h @@ -54,7 +54,7 @@ struct miqt_string QTcpSocket_trUtf83(const char* s, const char* c, int n); bool QTcpSocket_override_virtual_resume(void* self, intptr_t slot); void QTcpSocket_virtualbase_resume(void* self); bool QTcpSocket_override_virtual_connectToHost(void* self, intptr_t slot); -void QTcpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol); +void QTcpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol); bool QTcpSocket_override_virtual_disconnectFromHost(void* self, intptr_t slot); void QTcpSocket_virtualbase_disconnectFromHost(void* self); bool QTcpSocket_override_virtual_bytesAvailable(void* self, intptr_t slot); @@ -119,9 +119,9 @@ bool QTcpSocket_override_virtual_disconnectNotify(void* self, intptr_t slot); void QTcpSocket_virtualbase_disconnectNotify(void* self, QMetaMethod* signal); void QTcpSocket_protectedbase_setSocketState(bool* _dynamic_cast_ok, void* self, int state); void QTcpSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, int socketError); -void QTcpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port); +void QTcpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port); void QTcpSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); -void QTcpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port); +void QTcpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port); void QTcpSocket_protectedbase_setPeerAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); void QTcpSocket_protectedbase_setPeerName(bool* _dynamic_cast_ok, void* self, struct miqt_string name); void QTcpSocket_protectedbase_setOpenMode(bool* _dynamic_cast_ok, void* self, int openMode); diff --git a/qt/network/gen_qudpsocket.cpp b/qt/network/gen_qudpsocket.cpp index 5bd53a3f..021bb5f9 100644 --- a/qt/network/gen_qudpsocket.cpp +++ b/qt/network/gen_qudpsocket.cpp @@ -23,7 +23,7 @@ extern "C" { #endif void miqt_exec_callback_QUdpSocket_resume(QUdpSocket*, intptr_t); -void miqt_exec_callback_QUdpSocket_connectToHost(QUdpSocket*, intptr_t, struct miqt_string, uint16_t, int, int); +void miqt_exec_callback_QUdpSocket_connectToHost(QUdpSocket*, intptr_t, struct miqt_string, unsigned short, int, int); void miqt_exec_callback_QUdpSocket_disconnectFromHost(QUdpSocket*, intptr_t); long long miqt_exec_callback_QUdpSocket_bytesAvailable(const QUdpSocket*, intptr_t); long long miqt_exec_callback_QUdpSocket_bytesToWrite(const QUdpSocket*, intptr_t); @@ -104,7 +104,7 @@ public: memcpy(hostName_ms.data, hostName_b.data(), hostName_ms.len); struct miqt_string sigval1 = hostName_ms; quint16 port_ret = port; - uint16_t sigval2 = static_cast(port_ret); + unsigned short sigval2 = static_cast(port_ret); QIODevice::OpenMode mode_ret = mode; int sigval3 = static_cast(mode_ret); QAbstractSocket::NetworkLayerProtocol protocol_ret = protocol; @@ -115,7 +115,7 @@ public: } - friend void QUdpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol); + friend void QUdpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol); // cgo.Handle value for overwritten implementation intptr_t handle__disconnectFromHost = 0; @@ -700,9 +700,9 @@ public: // Wrappers to allow calling protected methods: friend void QUdpSocket_protectedbase_setSocketState(bool* _dynamic_cast_ok, void* self, int state); friend void QUdpSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, int socketError); - friend void QUdpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port); + friend void QUdpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port); friend void QUdpSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); - friend void QUdpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port); + friend void QUdpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port); friend void QUdpSocket_protectedbase_setPeerAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); friend void QUdpSocket_protectedbase_setPeerName(bool* _dynamic_cast_ok, void* self, struct miqt_string name); friend void QUdpSocket_protectedbase_setOpenMode(bool* _dynamic_cast_ok, void* self, int openMode); @@ -802,12 +802,12 @@ long long QUdpSocket_writeDatagram(QUdpSocket* self, QNetworkDatagram* datagram) return static_cast(_ret); } -long long QUdpSocket_writeDatagram2(QUdpSocket* self, const char* data, long long len, QHostAddress* host, uint16_t port) { +long long QUdpSocket_writeDatagram2(QUdpSocket* self, const char* data, long long len, QHostAddress* host, unsigned short port) { qint64 _ret = self->writeDatagram(data, static_cast(len), *host, static_cast(port)); return static_cast(_ret); } -long long QUdpSocket_writeDatagram3(QUdpSocket* self, struct miqt_string datagram, QHostAddress* host, uint16_t port) { +long long QUdpSocket_writeDatagram3(QUdpSocket* self, struct miqt_string datagram, QHostAddress* host, unsigned short port) { QByteArray datagram_QByteArray(datagram.data, datagram.len); qint64 _ret = self->writeDatagram(datagram_QByteArray, *host, static_cast(port)); return static_cast(_ret); @@ -866,7 +866,7 @@ long long QUdpSocket_readDatagram2(QUdpSocket* self, char* data, long long maxle return static_cast(_ret); } -long long QUdpSocket_readDatagram3(QUdpSocket* self, char* data, long long maxlen, QHostAddress* host, uint16_t* port) { +long long QUdpSocket_readDatagram3(QUdpSocket* self, char* data, long long maxlen, QHostAddress* host, unsigned short* port) { qint64 _ret = self->readDatagram(data, static_cast(maxlen), host, static_cast(port)); return static_cast(_ret); } @@ -897,7 +897,7 @@ bool QUdpSocket_override_virtual_connectToHost(void* self, intptr_t slot) { return true; } -void QUdpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol) { +void QUdpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); ( (MiqtVirtualQUdpSocket*)(self) )->QUdpSocket::connectToHost(hostName_QString, static_cast(port), static_cast(mode), static_cast(protocol)); @@ -1434,7 +1434,7 @@ void QUdpSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, } -void QUdpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port) { +void QUdpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port) { MiqtVirtualQUdpSocket* self_cast = dynamic_cast( (QUdpSocket*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; @@ -1460,7 +1460,7 @@ void QUdpSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self } -void QUdpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port) { +void QUdpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port) { MiqtVirtualQUdpSocket* self_cast = dynamic_cast( (QUdpSocket*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; diff --git a/qt/network/gen_qudpsocket.go b/qt/network/gen_qudpsocket.go index 71d926fb..454b80da 100644 --- a/qt/network/gen_qudpsocket.go +++ b/qt/network/gen_qudpsocket.go @@ -144,7 +144,7 @@ func (this *QUdpSocket) WriteDatagram(datagram *QNetworkDatagram) int64 { func (this *QUdpSocket) WriteDatagram2(data string, lenVal int64, host *QHostAddress, port uint16) int64 { data_Cstring := C.CString(data) defer C.free(unsafe.Pointer(data_Cstring)) - return (int64)(C.QUdpSocket_writeDatagram2(this.h, data_Cstring, (C.longlong)(lenVal), host.cPointer(), (C.uint16_t)(port))) + return (int64)(C.QUdpSocket_writeDatagram2(this.h, data_Cstring, (C.longlong)(lenVal), host.cPointer(), (C.ushort)(port))) } func (this *QUdpSocket) WriteDatagram3(datagram []byte, host *QHostAddress, port uint16) int64 { @@ -155,7 +155,7 @@ func (this *QUdpSocket) WriteDatagram3(datagram []byte, host *QHostAddress, port datagram_alias.data = (*C.char)(unsafe.Pointer(nil)) } datagram_alias.len = C.size_t(len(datagram)) - return (int64)(C.QUdpSocket_writeDatagram3(this.h, datagram_alias, host.cPointer(), (C.uint16_t)(port))) + return (int64)(C.QUdpSocket_writeDatagram3(this.h, datagram_alias, host.cPointer(), (C.ushort)(port))) } func QUdpSocket_Tr2(s string, c string) string { @@ -217,7 +217,7 @@ func (this *QUdpSocket) ReadDatagram2(data string, maxlen int64, host *QHostAddr func (this *QUdpSocket) ReadDatagram3(data string, maxlen int64, host *QHostAddress, port *uint16) int64 { data_Cstring := C.CString(data) defer C.free(unsafe.Pointer(data_Cstring)) - return (int64)(C.QUdpSocket_readDatagram3(this.h, data_Cstring, (C.longlong)(maxlen), host.cPointer(), (*C.uint16_t)(unsafe.Pointer(port)))) + return (int64)(C.QUdpSocket_readDatagram3(this.h, data_Cstring, (C.longlong)(maxlen), host.cPointer(), (*C.ushort)(unsafe.Pointer(port)))) } // SetSocketState can only be called from a QUdpSocket that was directly constructed. @@ -248,7 +248,7 @@ func (this *QUdpSocket) SetSocketError(socketError QAbstractSocket__SocketError) func (this *QUdpSocket) SetLocalPort(port uint16) { var _dynamic_cast_ok C.bool = false - C.QUdpSocket_protectedbase_setLocalPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uint16_t)(port)) + C.QUdpSocket_protectedbase_setLocalPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.ushort)(port)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -272,7 +272,7 @@ func (this *QUdpSocket) SetLocalAddress(address *QHostAddress) { func (this *QUdpSocket) SetPeerPort(port uint16) { var _dynamic_cast_ok C.bool = false - C.QUdpSocket_protectedbase_setPeerPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uint16_t)(port)) + C.QUdpSocket_protectedbase_setPeerPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.ushort)(port)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -423,7 +423,7 @@ func (this *QUdpSocket) callVirtualBase_ConnectToHost(hostName string, port uint hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QUdpSocket_virtualbase_connectToHost(unsafe.Pointer(this.h), hostName_ms, (C.uint16_t)(port), (C.int)(mode), (C.int)(protocol)) + C.QUdpSocket_virtualbase_connectToHost(unsafe.Pointer(this.h), hostName_ms, (C.ushort)(port), (C.int)(mode), (C.int)(protocol)) } func (this *QUdpSocket) OnConnectToHost(slot func(super func(hostName string, port uint16, mode qt.QIODevice__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol), hostName string, port uint16, mode qt.QIODevice__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol)) { @@ -434,7 +434,7 @@ func (this *QUdpSocket) OnConnectToHost(slot func(super func(hostName string, po } //export miqt_exec_callback_QUdpSocket_connectToHost -func miqt_exec_callback_QUdpSocket_connectToHost(self *C.QUdpSocket, cb C.intptr_t, hostName C.struct_miqt_string, port C.uint16_t, mode C.int, protocol C.int) { +func miqt_exec_callback_QUdpSocket_connectToHost(self *C.QUdpSocket, cb C.intptr_t, hostName C.struct_miqt_string, port C.ushort, mode C.int, protocol C.int) { gofunc, ok := cgo.Handle(cb).Value().(func(super func(hostName string, port uint16, mode qt.QIODevice__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol), hostName string, port uint16, mode qt.QIODevice__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt/network/gen_qudpsocket.h b/qt/network/gen_qudpsocket.h index 660a8ccf..2590ce8e 100644 --- a/qt/network/gen_qudpsocket.h +++ b/qt/network/gen_qudpsocket.h @@ -62,19 +62,19 @@ long long QUdpSocket_pendingDatagramSize(const QUdpSocket* self); QNetworkDatagram* QUdpSocket_receiveDatagram(QUdpSocket* self); long long QUdpSocket_readDatagram(QUdpSocket* self, char* data, long long maxlen); long long QUdpSocket_writeDatagram(QUdpSocket* self, QNetworkDatagram* datagram); -long long QUdpSocket_writeDatagram2(QUdpSocket* self, const char* data, long long len, QHostAddress* host, uint16_t port); -long long QUdpSocket_writeDatagram3(QUdpSocket* self, struct miqt_string datagram, QHostAddress* host, uint16_t port); +long long QUdpSocket_writeDatagram2(QUdpSocket* self, const char* data, long long len, QHostAddress* host, unsigned short port); +long long QUdpSocket_writeDatagram3(QUdpSocket* self, struct miqt_string datagram, QHostAddress* host, unsigned short port); struct miqt_string QUdpSocket_tr2(const char* s, const char* c); struct miqt_string QUdpSocket_tr3(const char* s, const char* c, int n); struct miqt_string QUdpSocket_trUtf82(const char* s, const char* c); struct miqt_string QUdpSocket_trUtf83(const char* s, const char* c, int n); QNetworkDatagram* QUdpSocket_receiveDatagramWithMaxSize(QUdpSocket* self, long long maxSize); long long QUdpSocket_readDatagram2(QUdpSocket* self, char* data, long long maxlen, QHostAddress* host); -long long QUdpSocket_readDatagram3(QUdpSocket* self, char* data, long long maxlen, QHostAddress* host, uint16_t* port); +long long QUdpSocket_readDatagram3(QUdpSocket* self, char* data, long long maxlen, QHostAddress* host, unsigned short* port); bool QUdpSocket_override_virtual_resume(void* self, intptr_t slot); void QUdpSocket_virtualbase_resume(void* self); bool QUdpSocket_override_virtual_connectToHost(void* self, intptr_t slot); -void QUdpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol); +void QUdpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol); bool QUdpSocket_override_virtual_disconnectFromHost(void* self, intptr_t slot); void QUdpSocket_virtualbase_disconnectFromHost(void* self); bool QUdpSocket_override_virtual_bytesAvailable(void* self, intptr_t slot); @@ -139,9 +139,9 @@ bool QUdpSocket_override_virtual_disconnectNotify(void* self, intptr_t slot); void QUdpSocket_virtualbase_disconnectNotify(void* self, QMetaMethod* signal); void QUdpSocket_protectedbase_setSocketState(bool* _dynamic_cast_ok, void* self, int state); void QUdpSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, int socketError); -void QUdpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port); +void QUdpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port); void QUdpSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); -void QUdpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port); +void QUdpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port); void QUdpSocket_protectedbase_setPeerAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); void QUdpSocket_protectedbase_setPeerName(bool* _dynamic_cast_ok, void* self, struct miqt_string name); void QUdpSocket_protectedbase_setOpenMode(bool* _dynamic_cast_ok, void* self, int openMode); diff --git a/qt/script/gen_qscriptvalue.cpp b/qt/script/gen_qscriptvalue.cpp index cfd5125b..2873975e 100644 --- a/qt/script/gen_qscriptvalue.cpp +++ b/qt/script/gen_qscriptvalue.cpp @@ -199,9 +199,9 @@ unsigned int QScriptValue_toUInt32(const QScriptValue* self) { return static_cast(_ret); } -uint16_t QScriptValue_toUInt16(const QScriptValue* self) { +unsigned short QScriptValue_toUInt16(const QScriptValue* self) { quint16 _ret = self->toUInt16(); - return static_cast(_ret); + return static_cast(_ret); } QVariant* QScriptValue_toVariant(const QScriptValue* self) { diff --git a/qt/script/gen_qscriptvalue.h b/qt/script/gen_qscriptvalue.h index de1826f8..9cd99bf1 100644 --- a/qt/script/gen_qscriptvalue.h +++ b/qt/script/gen_qscriptvalue.h @@ -77,7 +77,7 @@ bool QScriptValue_toBoolean(const QScriptValue* self); double QScriptValue_toInteger(const QScriptValue* self); int QScriptValue_toInt32(const QScriptValue* self); unsigned int QScriptValue_toUInt32(const QScriptValue* self); -uint16_t QScriptValue_toUInt16(const QScriptValue* self); +unsigned short QScriptValue_toUInt16(const QScriptValue* self); QVariant* QScriptValue_toVariant(const QScriptValue* self); QObject* QScriptValue_toQObject(const QScriptValue* self); QMetaObject* QScriptValue_toQMetaObject(const QScriptValue* self); diff --git a/qt6/gen_qbytearrayview.cpp b/qt6/gen_qbytearrayview.cpp index 0c132372..92654a9e 100644 --- a/qt6/gen_qbytearrayview.cpp +++ b/qt6/gen_qbytearrayview.cpp @@ -83,13 +83,13 @@ QByteArrayView* QByteArrayView_trimmed(const QByteArrayView* self) { return new QByteArrayView(self->trimmed()); } -int16_t QByteArrayView_toShort(const QByteArrayView* self) { +short QByteArrayView_toShort(const QByteArrayView* self) { return self->toShort(); } -uint16_t QByteArrayView_toUShort(const QByteArrayView* self) { +unsigned short QByteArrayView_toUShort(const QByteArrayView* self) { ushort _ret = self->toUShort(); - return static_cast(_ret); + return static_cast(_ret); } int QByteArrayView_toInt(const QByteArrayView* self) { @@ -248,22 +248,22 @@ char QByteArrayView_last2(const QByteArrayView* self) { return self->last(); } -int16_t QByteArrayView_toShortWithOk(const QByteArrayView* self, bool* ok) { +short QByteArrayView_toShortWithOk(const QByteArrayView* self, bool* ok) { return self->toShort(ok); } -int16_t QByteArrayView_toShort2(const QByteArrayView* self, bool* ok, int base) { +short QByteArrayView_toShort2(const QByteArrayView* self, bool* ok, int base) { return self->toShort(ok, static_cast(base)); } -uint16_t QByteArrayView_toUShortWithOk(const QByteArrayView* self, bool* ok) { +unsigned short QByteArrayView_toUShortWithOk(const QByteArrayView* self, bool* ok) { ushort _ret = self->toUShort(ok); - return static_cast(_ret); + return static_cast(_ret); } -uint16_t QByteArrayView_toUShort2(const QByteArrayView* self, bool* ok, int base) { +unsigned short QByteArrayView_toUShort2(const QByteArrayView* self, bool* ok, int base) { ushort _ret = self->toUShort(ok, static_cast(base)); - return static_cast(_ret); + return static_cast(_ret); } int QByteArrayView_toIntWithOk(const QByteArrayView* self, bool* ok) { diff --git a/qt6/gen_qbytearrayview.h b/qt6/gen_qbytearrayview.h index 93786b17..1f2e5903 100644 --- a/qt6/gen_qbytearrayview.h +++ b/qt6/gen_qbytearrayview.h @@ -36,8 +36,8 @@ QByteArrayView* QByteArrayView_chopped(const QByteArrayView* self, ptrdiff_t len void QByteArrayView_truncate(QByteArrayView* self, ptrdiff_t n); void QByteArrayView_chop(QByteArrayView* self, ptrdiff_t n); QByteArrayView* QByteArrayView_trimmed(const QByteArrayView* self); -int16_t QByteArrayView_toShort(const QByteArrayView* self); -uint16_t QByteArrayView_toUShort(const QByteArrayView* self); +short QByteArrayView_toShort(const QByteArrayView* self); +unsigned short QByteArrayView_toUShort(const QByteArrayView* self); int QByteArrayView_toInt(const QByteArrayView* self); unsigned int QByteArrayView_toUInt(const QByteArrayView* self); long QByteArrayView_toLong(const QByteArrayView* self); @@ -73,10 +73,10 @@ bool QByteArrayView_isEmpty(const QByteArrayView* self); ptrdiff_t QByteArrayView_length(const QByteArrayView* self); char QByteArrayView_first2(const QByteArrayView* self); char QByteArrayView_last2(const QByteArrayView* self); -int16_t QByteArrayView_toShortWithOk(const QByteArrayView* self, bool* ok); -int16_t QByteArrayView_toShort2(const QByteArrayView* self, bool* ok, int base); -uint16_t QByteArrayView_toUShortWithOk(const QByteArrayView* self, bool* ok); -uint16_t QByteArrayView_toUShort2(const QByteArrayView* self, bool* ok, int base); +short QByteArrayView_toShortWithOk(const QByteArrayView* self, bool* ok); +short QByteArrayView_toShort2(const QByteArrayView* self, bool* ok, int base); +unsigned short QByteArrayView_toUShortWithOk(const QByteArrayView* self, bool* ok); +unsigned short QByteArrayView_toUShort2(const QByteArrayView* self, bool* ok, int base); int QByteArrayView_toIntWithOk(const QByteArrayView* self, bool* ok); int QByteArrayView_toInt2(const QByteArrayView* self, bool* ok, int base); unsigned int QByteArrayView_toUIntWithOk(const QByteArrayView* self, bool* ok); diff --git a/qt6/gen_qchar.cpp b/qt6/gen_qchar.cpp index d10ac88c..2f531fd7 100644 --- a/qt6/gen_qchar.cpp +++ b/qt6/gen_qchar.cpp @@ -34,7 +34,7 @@ QChar* QChar_new() { return new QChar(); } -QChar* QChar_new2(uint16_t rc) { +QChar* QChar_new2(unsigned short rc) { return new QChar(static_cast(rc)); } @@ -42,7 +42,7 @@ QChar* QChar_new3(unsigned char c, unsigned char r) { return new QChar(static_cast(c), static_cast(r)); } -QChar* QChar_new4(int16_t rc) { +QChar* QChar_new4(short rc) { return new QChar(static_cast(rc)); } diff --git a/qt6/gen_qchar.go b/qt6/gen_qchar.go index 9b72dff3..b946ac7e 100644 --- a/qt6/gen_qchar.go +++ b/qt6/gen_qchar.go @@ -456,7 +456,7 @@ func NewQChar() *QChar { // NewQChar2 constructs a new QChar object. func NewQChar2(rc uint16) *QChar { - return newQChar(C.QChar_new2((C.uint16_t)(rc))) + return newQChar(C.QChar_new2((C.ushort)(rc))) } // NewQChar3 constructs a new QChar object. @@ -468,7 +468,7 @@ func NewQChar3(c byte, r byte) *QChar { // NewQChar4 constructs a new QChar object. func NewQChar4(rc int16) *QChar { - return newQChar(C.QChar_new4((C.int16_t)(rc))) + return newQChar(C.QChar_new4((C.short)(rc))) } // NewQChar5 constructs a new QChar object. diff --git a/qt6/gen_qchar.h b/qt6/gen_qchar.h index 38022f66..ed1ffc23 100644 --- a/qt6/gen_qchar.h +++ b/qt6/gen_qchar.h @@ -28,9 +28,9 @@ char QLatin1Char_toLatin1(const QLatin1Char* self); void QLatin1Char_delete(QLatin1Char* self); QChar* QChar_new(); -QChar* QChar_new2(uint16_t rc); +QChar* QChar_new2(unsigned short rc); QChar* QChar_new3(unsigned char c, unsigned char r); -QChar* QChar_new4(int16_t rc); +QChar* QChar_new4(short rc); QChar* QChar_new5(unsigned int rc); QChar* QChar_new6(int rc); QChar* QChar_new7(int s); diff --git a/qt6/gen_qcolor.cpp b/qt6/gen_qcolor.cpp index 1d62e357..c2f9ce3f 100644 --- a/qt6/gen_qcolor.cpp +++ b/qt6/gen_qcolor.cpp @@ -50,7 +50,7 @@ QColor* QColor_new8(int spec) { return new QColor(static_cast(spec)); } -QColor* QColor_new9(int spec, uint16_t a1, uint16_t a2, uint16_t a3, uint16_t a4) { +QColor* QColor_new9(int spec, unsigned short a1, unsigned short a2, unsigned short a3, unsigned short a4) { return new QColor(static_cast(spec), static_cast(a1), static_cast(a2), static_cast(a3), static_cast(a4)); } @@ -62,7 +62,7 @@ QColor* QColor_new11(int r, int g, int b, int a) { return new QColor(static_cast(r), static_cast(g), static_cast(b), static_cast(a)); } -QColor* QColor_new12(int spec, uint16_t a1, uint16_t a2, uint16_t a3, uint16_t a4, uint16_t a5) { +QColor* QColor_new12(int spec, unsigned short a1, unsigned short a2, unsigned short a3, unsigned short a4, unsigned short a5) { return new QColor(static_cast(spec), static_cast(a1), static_cast(a2), static_cast(a3), static_cast(a4), static_cast(a5)); } @@ -409,7 +409,7 @@ QColor* QColor_fromRgbF(float r, float g, float b) { return new QColor(QColor::fromRgbF(static_cast(r), static_cast(g), static_cast(b))); } -QColor* QColor_fromRgba64(uint16_t r, uint16_t g, uint16_t b) { +QColor* QColor_fromRgba64(unsigned short r, unsigned short g, unsigned short b) { return new QColor(QColor::fromRgba64(static_cast(r), static_cast(g), static_cast(b))); } @@ -553,7 +553,7 @@ QColor* QColor_fromRgbF2(float r, float g, float b, float a) { return new QColor(QColor::fromRgbF(static_cast(r), static_cast(g), static_cast(b), static_cast(a))); } -QColor* QColor_fromRgba642(uint16_t r, uint16_t g, uint16_t b, uint16_t a) { +QColor* QColor_fromRgba642(unsigned short r, unsigned short g, unsigned short b, unsigned short a) { return new QColor(QColor::fromRgba64(static_cast(r), static_cast(g), static_cast(b), static_cast(a))); } diff --git a/qt6/gen_qcolor.go b/qt6/gen_qcolor.go index cf5d7929..70d1c388 100644 --- a/qt6/gen_qcolor.go +++ b/qt6/gen_qcolor.go @@ -120,7 +120,7 @@ func NewQColor8(spec QColor__Spec) *QColor { // NewQColor9 constructs a new QColor object. func NewQColor9(spec QColor__Spec, a1 uint16, a2 uint16, a3 uint16, a4 uint16) *QColor { - return newQColor(C.QColor_new9((C.int)(spec), (C.uint16_t)(a1), (C.uint16_t)(a2), (C.uint16_t)(a3), (C.uint16_t)(a4))) + return newQColor(C.QColor_new9((C.int)(spec), (C.ushort)(a1), (C.ushort)(a2), (C.ushort)(a3), (C.ushort)(a4))) } // NewQColor10 constructs a new QColor object. @@ -138,7 +138,7 @@ func NewQColor11(r int, g int, b int, a int) *QColor { // NewQColor12 constructs a new QColor object. func NewQColor12(spec QColor__Spec, a1 uint16, a2 uint16, a3 uint16, a4 uint16, a5 uint16) *QColor { - return newQColor(C.QColor_new12((C.int)(spec), (C.uint16_t)(a1), (C.uint16_t)(a2), (C.uint16_t)(a3), (C.uint16_t)(a4), (C.uint16_t)(a5))) + return newQColor(C.QColor_new12((C.int)(spec), (C.ushort)(a1), (C.ushort)(a2), (C.ushort)(a3), (C.ushort)(a4), (C.ushort)(a5))) } func QColor_FromString(name QAnyStringView) *QColor { @@ -498,7 +498,7 @@ func QColor_FromRgbF(r float32, g float32, b float32) *QColor { } func QColor_FromRgba64(r uint16, g uint16, b uint16) *QColor { - _goptr := newQColor(C.QColor_fromRgba64((C.uint16_t)(r), (C.uint16_t)(g), (C.uint16_t)(b))) + _goptr := newQColor(C.QColor_fromRgba64((C.ushort)(r), (C.ushort)(g), (C.ushort)(b))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -667,7 +667,7 @@ func QColor_FromRgbF2(r float32, g float32, b float32, a float32) *QColor { } func QColor_FromRgba642(r uint16, g uint16, b uint16, a uint16) *QColor { - _goptr := newQColor(C.QColor_fromRgba642((C.uint16_t)(r), (C.uint16_t)(g), (C.uint16_t)(b), (C.uint16_t)(a))) + _goptr := newQColor(C.QColor_fromRgba642((C.ushort)(r), (C.ushort)(g), (C.ushort)(b), (C.ushort)(a))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } diff --git a/qt6/gen_qcolor.h b/qt6/gen_qcolor.h index 9f919666..dd866bdc 100644 --- a/qt6/gen_qcolor.h +++ b/qt6/gen_qcolor.h @@ -34,10 +34,10 @@ QColor* QColor_new5(QRgba64* rgba64); QColor* QColor_new6(struct miqt_string name); QColor* QColor_new7(const char* aname); QColor* QColor_new8(int spec); -QColor* QColor_new9(int spec, uint16_t a1, uint16_t a2, uint16_t a3, uint16_t a4); +QColor* QColor_new9(int spec, unsigned short a1, unsigned short a2, unsigned short a3, unsigned short a4); QColor* QColor_new10(QColor* param1); QColor* QColor_new11(int r, int g, int b, int a); -QColor* QColor_new12(int spec, uint16_t a1, uint16_t a2, uint16_t a3, uint16_t a4, uint16_t a5); +QColor* QColor_new12(int spec, unsigned short a1, unsigned short a2, unsigned short a3, unsigned short a4, unsigned short a5); QColor* QColor_fromString(QAnyStringView* name); void QColor_operatorAssign(QColor* self, int color); bool QColor_isValid(const QColor* self); @@ -117,7 +117,7 @@ QColor* QColor_fromRgb(unsigned int rgb); QColor* QColor_fromRgba(unsigned int rgba); QColor* QColor_fromRgb2(int r, int g, int b); QColor* QColor_fromRgbF(float r, float g, float b); -QColor* QColor_fromRgba64(uint16_t r, uint16_t g, uint16_t b); +QColor* QColor_fromRgba64(unsigned short r, unsigned short g, unsigned short b); QColor* QColor_fromRgba64WithRgba(QRgba64* rgba); QColor* QColor_fromHsv(int h, int s, int v); QColor* QColor_fromHsvF(float h, float s, float v); @@ -151,7 +151,7 @@ void QColor_getHslF2(const QColor* self, float* h, float* s, float* l, float* a) void QColor_setHslF2(QColor* self, float h, float s, float l, float a); QColor* QColor_fromRgb3(int r, int g, int b, int a); QColor* QColor_fromRgbF2(float r, float g, float b, float a); -QColor* QColor_fromRgba642(uint16_t r, uint16_t g, uint16_t b, uint16_t a); +QColor* QColor_fromRgba642(unsigned short r, unsigned short g, unsigned short b, unsigned short a); QColor* QColor_fromHsv2(int h, int s, int v, int a); QColor* QColor_fromHsvF2(float h, float s, float v, float a); QColor* QColor_fromCmyk2(int c, int m, int y, int k, int a); diff --git a/qt6/gen_qdatastream.cpp b/qt6/gen_qdatastream.cpp index 5c433e7f..599754e9 100644 --- a/qt6/gen_qdatastream.cpp +++ b/qt6/gen_qdatastream.cpp @@ -93,11 +93,11 @@ void QDataStream_operatorShiftRightWithQuint8(QDataStream* self, unsigned char* self->operator>>(static_cast(*i)); } -void QDataStream_operatorShiftRightWithQint16(QDataStream* self, int16_t* i) { +void QDataStream_operatorShiftRightWithQint16(QDataStream* self, short* i) { self->operator>>(static_cast(*i)); } -void QDataStream_operatorShiftRightWithQuint16(QDataStream* self, uint16_t* i) { +void QDataStream_operatorShiftRightWithQuint16(QDataStream* self, unsigned short* i) { self->operator>>(static_cast(*i)); } @@ -145,11 +145,11 @@ void QDataStream_operatorShiftLeftWithQuint8(QDataStream* self, unsigned char i) self->operator<<(static_cast(i)); } -void QDataStream_operatorShiftLeftWithQint16(QDataStream* self, int16_t i) { +void QDataStream_operatorShiftLeftWithQint16(QDataStream* self, short i) { self->operator<<(static_cast(i)); } -void QDataStream_operatorShiftLeftWithQuint16(QDataStream* self, uint16_t i) { +void QDataStream_operatorShiftLeftWithQuint16(QDataStream* self, unsigned short i) { self->operator<<(static_cast(i)); } diff --git a/qt6/gen_qdatastream.go b/qt6/gen_qdatastream.go index d0a0c9b2..ba57e65a 100644 --- a/qt6/gen_qdatastream.go +++ b/qt6/gen_qdatastream.go @@ -201,11 +201,11 @@ func (this *QDataStream) OperatorShiftRightWithQuint8(i *byte) { } func (this *QDataStream) OperatorShiftRightWithQint16(i *int16) { - C.QDataStream_operatorShiftRightWithQint16(this.h, (*C.int16_t)(unsafe.Pointer(i))) + C.QDataStream_operatorShiftRightWithQint16(this.h, (*C.short)(unsafe.Pointer(i))) } func (this *QDataStream) OperatorShiftRightWithQuint16(i *uint16) { - C.QDataStream_operatorShiftRightWithQuint16(this.h, (*C.uint16_t)(unsafe.Pointer(i))) + C.QDataStream_operatorShiftRightWithQuint16(this.h, (*C.ushort)(unsafe.Pointer(i))) } func (this *QDataStream) OperatorShiftRightWithQint32(i *int) { @@ -255,11 +255,11 @@ func (this *QDataStream) OperatorShiftLeftWithQuint8(i byte) { } func (this *QDataStream) OperatorShiftLeftWithQint16(i int16) { - C.QDataStream_operatorShiftLeftWithQint16(this.h, (C.int16_t)(i)) + C.QDataStream_operatorShiftLeftWithQint16(this.h, (C.short)(i)) } func (this *QDataStream) OperatorShiftLeftWithQuint16(i uint16) { - C.QDataStream_operatorShiftLeftWithQuint16(this.h, (C.uint16_t)(i)) + C.QDataStream_operatorShiftLeftWithQuint16(this.h, (C.ushort)(i)) } func (this *QDataStream) OperatorShiftLeftWithQint32(i int) { diff --git a/qt6/gen_qdatastream.h b/qt6/gen_qdatastream.h index 3e5d455c..8e64e2e3 100644 --- a/qt6/gen_qdatastream.h +++ b/qt6/gen_qdatastream.h @@ -43,8 +43,8 @@ void QDataStream_setVersion(QDataStream* self, int version); void QDataStream_operatorShiftRight(QDataStream* self, char* i); void QDataStream_operatorShiftRightWithQint8(QDataStream* self, signed char* i); void QDataStream_operatorShiftRightWithQuint8(QDataStream* self, unsigned char* i); -void QDataStream_operatorShiftRightWithQint16(QDataStream* self, int16_t* i); -void QDataStream_operatorShiftRightWithQuint16(QDataStream* self, uint16_t* i); +void QDataStream_operatorShiftRightWithQint16(QDataStream* self, short* i); +void QDataStream_operatorShiftRightWithQuint16(QDataStream* self, unsigned short* i); void QDataStream_operatorShiftRightWithQint32(QDataStream* self, int* i); void QDataStream_operatorShiftRightWithQuint32(QDataStream* self, unsigned int* i); void QDataStream_operatorShiftRightWithQint64(QDataStream* self, long long* i); @@ -56,8 +56,8 @@ void QDataStream_operatorShiftRightWithStr(QDataStream* self, char* str); void QDataStream_operatorShiftLeft(QDataStream* self, char i); void QDataStream_operatorShiftLeftWithQint8(QDataStream* self, signed char i); void QDataStream_operatorShiftLeftWithQuint8(QDataStream* self, unsigned char i); -void QDataStream_operatorShiftLeftWithQint16(QDataStream* self, int16_t i); -void QDataStream_operatorShiftLeftWithQuint16(QDataStream* self, uint16_t i); +void QDataStream_operatorShiftLeftWithQint16(QDataStream* self, short i); +void QDataStream_operatorShiftLeftWithQuint16(QDataStream* self, unsigned short i); void QDataStream_operatorShiftLeftWithQint32(QDataStream* self, int i); void QDataStream_operatorShiftLeftWithQuint32(QDataStream* self, unsigned int i); void QDataStream_operatorShiftLeftWithQint64(QDataStream* self, long long i); diff --git a/qt6/gen_qdebug.cpp b/qt6/gen_qdebug.cpp index b8740189..4ea58fd9 100644 --- a/qt6/gen_qdebug.cpp +++ b/qt6/gen_qdebug.cpp @@ -122,13 +122,13 @@ QDebug* QDebug_operatorShiftLeftWithChar(QDebug* self, char t) { return &_ret; } -QDebug* QDebug_operatorShiftLeftWithShort(QDebug* self, int16_t t) { +QDebug* QDebug_operatorShiftLeftWithShort(QDebug* self, short t) { QDebug& _ret = self->operator<<(static_cast(t)); // Cast returned reference into pointer return &_ret; } -QDebug* QDebug_operatorShiftLeftWithUnsignedshort(QDebug* self, uint16_t t) { +QDebug* QDebug_operatorShiftLeftWithUnsignedshort(QDebug* self, unsigned short t) { QDebug& _ret = self->operator<<(static_cast(t)); // Cast returned reference into pointer return &_ret; diff --git a/qt6/gen_qdebug.go b/qt6/gen_qdebug.go index 456751a2..d43d34f0 100644 --- a/qt6/gen_qdebug.go +++ b/qt6/gen_qdebug.go @@ -138,11 +138,11 @@ func (this *QDebug) OperatorShiftLeftWithChar(t int8) *QDebug { } func (this *QDebug) OperatorShiftLeftWithShort(t int16) *QDebug { - return newQDebug(C.QDebug_operatorShiftLeftWithShort(this.h, (C.int16_t)(t))) + return newQDebug(C.QDebug_operatorShiftLeftWithShort(this.h, (C.short)(t))) } func (this *QDebug) OperatorShiftLeftWithUnsignedshort(t uint16) *QDebug { - return newQDebug(C.QDebug_operatorShiftLeftWithUnsignedshort(this.h, (C.uint16_t)(t))) + return newQDebug(C.QDebug_operatorShiftLeftWithUnsignedshort(this.h, (C.ushort)(t))) } func (this *QDebug) OperatorShiftLeftWithInt(t int) *QDebug { diff --git a/qt6/gen_qdebug.h b/qt6/gen_qdebug.h index 43ecd0cf..3e1c500a 100644 --- a/qt6/gen_qdebug.h +++ b/qt6/gen_qdebug.h @@ -52,8 +52,8 @@ QDebug* QDebug_maybeQuote(QDebug* self); QDebug* QDebug_operatorShiftLeft(QDebug* self, QChar* t); QDebug* QDebug_operatorShiftLeftWithBool(QDebug* self, bool t); QDebug* QDebug_operatorShiftLeftWithChar(QDebug* self, char t); -QDebug* QDebug_operatorShiftLeftWithShort(QDebug* self, int16_t t); -QDebug* QDebug_operatorShiftLeftWithUnsignedshort(QDebug* self, uint16_t t); +QDebug* QDebug_operatorShiftLeftWithShort(QDebug* self, short t); +QDebug* QDebug_operatorShiftLeftWithUnsignedshort(QDebug* self, unsigned short t); QDebug* QDebug_operatorShiftLeftWithInt(QDebug* self, int t); QDebug* QDebug_operatorShiftLeftWithUnsignedint(QDebug* self, unsigned int t); QDebug* QDebug_operatorShiftLeftWithLong(QDebug* self, long t); diff --git a/qt6/gen_qevent.cpp b/qt6/gen_qevent.cpp index 24b332d5..b131d40d 100644 --- a/qt6/gen_qevent.cpp +++ b/qt6/gen_qevent.cpp @@ -2533,7 +2533,7 @@ QKeyEvent* QKeyEvent_new4(int type, int key, int modifiers, struct miqt_string t return new MiqtVirtualQKeyEvent(static_cast(type), static_cast(key), static_cast(modifiers), text_QString, autorep); } -QKeyEvent* QKeyEvent_new5(int type, int key, int modifiers, struct miqt_string text, bool autorep, uint16_t count) { +QKeyEvent* QKeyEvent_new5(int type, int key, int modifiers, struct miqt_string text, bool autorep, unsigned short count) { QString text_QString = QString::fromUtf8(text.data, text.len); return new MiqtVirtualQKeyEvent(static_cast(type), static_cast(key), static_cast(modifiers), text_QString, autorep, static_cast(count)); } @@ -2548,12 +2548,12 @@ QKeyEvent* QKeyEvent_new7(int type, int key, int modifiers, unsigned int nativeS return new MiqtVirtualQKeyEvent(static_cast(type), static_cast(key), static_cast(modifiers), static_cast(nativeScanCode), static_cast(nativeVirtualKey), static_cast(nativeModifiers), text_QString, autorep); } -QKeyEvent* QKeyEvent_new8(int type, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text, bool autorep, uint16_t count) { +QKeyEvent* QKeyEvent_new8(int type, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text, bool autorep, unsigned short count) { QString text_QString = QString::fromUtf8(text.data, text.len); return new MiqtVirtualQKeyEvent(static_cast(type), static_cast(key), static_cast(modifiers), static_cast(nativeScanCode), static_cast(nativeVirtualKey), static_cast(nativeModifiers), text_QString, autorep, static_cast(count)); } -QKeyEvent* QKeyEvent_new9(int type, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text, bool autorep, uint16_t count, QInputDevice* device) { +QKeyEvent* QKeyEvent_new9(int type, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text, bool autorep, unsigned short count, QInputDevice* device) { QString text_QString = QString::fromUtf8(text.data, text.len); return new MiqtVirtualQKeyEvent(static_cast(type), static_cast(key), static_cast(modifiers), static_cast(nativeScanCode), static_cast(nativeVirtualKey), static_cast(nativeModifiers), text_QString, autorep, static_cast(count), device); } diff --git a/qt6/gen_qevent.go b/qt6/gen_qevent.go index 49fa9161..985252af 100644 --- a/qt6/gen_qevent.go +++ b/qt6/gen_qevent.go @@ -2375,7 +2375,7 @@ func NewQKeyEvent5(typeVal QEvent__Type, key int, modifiers KeyboardModifier, te text_ms.len = C.size_t(len(text)) defer C.free(unsafe.Pointer(text_ms.data)) - return newQKeyEvent(C.QKeyEvent_new5((C.int)(typeVal), (C.int)(key), (C.int)(modifiers), text_ms, (C.bool)(autorep), (C.uint16_t)(count))) + return newQKeyEvent(C.QKeyEvent_new5((C.int)(typeVal), (C.int)(key), (C.int)(modifiers), text_ms, (C.bool)(autorep), (C.ushort)(count))) } // NewQKeyEvent6 constructs a new QKeyEvent object. @@ -2405,7 +2405,7 @@ func NewQKeyEvent8(typeVal QEvent__Type, key int, modifiers KeyboardModifier, na text_ms.len = C.size_t(len(text)) defer C.free(unsafe.Pointer(text_ms.data)) - return newQKeyEvent(C.QKeyEvent_new8((C.int)(typeVal), (C.int)(key), (C.int)(modifiers), (C.uint)(nativeScanCode), (C.uint)(nativeVirtualKey), (C.uint)(nativeModifiers), text_ms, (C.bool)(autorep), (C.uint16_t)(count))) + return newQKeyEvent(C.QKeyEvent_new8((C.int)(typeVal), (C.int)(key), (C.int)(modifiers), (C.uint)(nativeScanCode), (C.uint)(nativeVirtualKey), (C.uint)(nativeModifiers), text_ms, (C.bool)(autorep), (C.ushort)(count))) } // NewQKeyEvent9 constructs a new QKeyEvent object. @@ -2415,7 +2415,7 @@ func NewQKeyEvent9(typeVal QEvent__Type, key int, modifiers KeyboardModifier, na text_ms.len = C.size_t(len(text)) defer C.free(unsafe.Pointer(text_ms.data)) - return newQKeyEvent(C.QKeyEvent_new9((C.int)(typeVal), (C.int)(key), (C.int)(modifiers), (C.uint)(nativeScanCode), (C.uint)(nativeVirtualKey), (C.uint)(nativeModifiers), text_ms, (C.bool)(autorep), (C.uint16_t)(count), device.cPointer())) + return newQKeyEvent(C.QKeyEvent_new9((C.int)(typeVal), (C.int)(key), (C.int)(modifiers), (C.uint)(nativeScanCode), (C.uint)(nativeVirtualKey), (C.uint)(nativeModifiers), text_ms, (C.bool)(autorep), (C.ushort)(count), device.cPointer())) } func (this *QKeyEvent) Clone() *QKeyEvent { diff --git a/qt6/gen_qevent.h b/qt6/gen_qevent.h index 55c18fc6..d84d5bde 100644 --- a/qt6/gen_qevent.h +++ b/qt6/gen_qevent.h @@ -397,11 +397,11 @@ QKeyEvent* QKeyEvent_new(int type, int key, int modifiers); QKeyEvent* QKeyEvent_new2(int type, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers); QKeyEvent* QKeyEvent_new3(int type, int key, int modifiers, struct miqt_string text); QKeyEvent* QKeyEvent_new4(int type, int key, int modifiers, struct miqt_string text, bool autorep); -QKeyEvent* QKeyEvent_new5(int type, int key, int modifiers, struct miqt_string text, bool autorep, uint16_t count); +QKeyEvent* QKeyEvent_new5(int type, int key, int modifiers, struct miqt_string text, bool autorep, unsigned short count); QKeyEvent* QKeyEvent_new6(int type, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text); QKeyEvent* QKeyEvent_new7(int type, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text, bool autorep); -QKeyEvent* QKeyEvent_new8(int type, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text, bool autorep, uint16_t count); -QKeyEvent* QKeyEvent_new9(int type, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text, bool autorep, uint16_t count, QInputDevice* device); +QKeyEvent* QKeyEvent_new8(int type, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text, bool autorep, unsigned short count); +QKeyEvent* QKeyEvent_new9(int type, int key, int modifiers, unsigned int nativeScanCode, unsigned int nativeVirtualKey, unsigned int nativeModifiers, struct miqt_string text, bool autorep, unsigned short count, QInputDevice* device); void QKeyEvent_virtbase(QKeyEvent* src, QInputEvent** outptr_QInputEvent); QKeyEvent* QKeyEvent_clone(const QKeyEvent* self); int QKeyEvent_key(const QKeyEvent* self); diff --git a/qt6/gen_qlocale.cpp b/qt6/gen_qlocale.cpp index 34c307fc..68e6e6ef 100644 --- a/qt6/gen_qlocale.cpp +++ b/qt6/gen_qlocale.cpp @@ -27,11 +27,11 @@ QLocale* QLocale_new2(struct miqt_string name) { return new QLocale(name_QString); } -QLocale* QLocale_new3(uint16_t language, uint16_t territory) { +QLocale* QLocale_new3(unsigned short language, unsigned short territory) { return new QLocale(static_cast(language), static_cast(territory)); } -QLocale* QLocale_new4(uint16_t language) { +QLocale* QLocale_new4(unsigned short language) { return new QLocale(static_cast(language)); } @@ -39,11 +39,11 @@ QLocale* QLocale_new5(QLocale* other) { return new QLocale(*other); } -QLocale* QLocale_new6(uint16_t language, uint16_t script) { +QLocale* QLocale_new6(unsigned short language, unsigned short script) { return new QLocale(static_cast(language), static_cast(script)); } -QLocale* QLocale_new7(uint16_t language, uint16_t script, uint16_t territory) { +QLocale* QLocale_new7(unsigned short language, unsigned short script, unsigned short territory) { return new QLocale(static_cast(language), static_cast(script), static_cast(territory)); } @@ -55,24 +55,24 @@ void QLocale_swap(QLocale* self, QLocale* other) { self->swap(*other); } -uint16_t QLocale_language(const QLocale* self) { +unsigned short QLocale_language(const QLocale* self) { QLocale::Language _ret = self->language(); - return static_cast(_ret); + return static_cast(_ret); } -uint16_t QLocale_script(const QLocale* self) { +unsigned short QLocale_script(const QLocale* self) { QLocale::Script _ret = self->script(); - return static_cast(_ret); + return static_cast(_ret); } -uint16_t QLocale_territory(const QLocale* self) { +unsigned short QLocale_territory(const QLocale* self) { QLocale::Territory _ret = self->territory(); - return static_cast(_ret); + return static_cast(_ret); } -uint16_t QLocale_country(const QLocale* self) { +unsigned short QLocale_country(const QLocale* self) { QLocale::Country _ret = self->country(); - return static_cast(_ret); + return static_cast(_ret); } struct miqt_string QLocale_name(const QLocale* self) { @@ -130,15 +130,15 @@ struct miqt_string QLocale_nativeCountryName(const QLocale* self) { return _ms; } -int16_t QLocale_toShort(const QLocale* self, struct miqt_string s) { +short QLocale_toShort(const QLocale* self, struct miqt_string s) { QString s_QString = QString::fromUtf8(s.data, s.len); return self->toShort(s_QString); } -uint16_t QLocale_toUShort(const QLocale* self, struct miqt_string s) { +unsigned short QLocale_toUShort(const QLocale* self, struct miqt_string s) { QString s_QString = QString::fromUtf8(s.data, s.len); ushort _ret = self->toUShort(s_QString); - return static_cast(_ret); + return static_cast(_ret); } int QLocale_toInt(const QLocale* self, struct miqt_string s) { @@ -229,7 +229,7 @@ struct miqt_string QLocale_toStringWithUlong(const QLocale* self, unsigned long return _ms; } -struct miqt_string QLocale_toStringWithShort(const QLocale* self, int16_t i) { +struct miqt_string QLocale_toStringWithShort(const QLocale* self, short i) { QString _ret = self->toString(static_cast(i)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -240,7 +240,7 @@ struct miqt_string QLocale_toStringWithShort(const QLocale* self, int16_t i) { return _ms; } -struct miqt_string QLocale_toStringWithUshort(const QLocale* self, uint16_t i) { +struct miqt_string QLocale_toStringWithUshort(const QLocale* self, unsigned short i) { QString _ret = self->toString(static_cast(i)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -707,7 +707,7 @@ struct miqt_string QLocale_toCurrencyStringWithQulonglong(const QLocale* self, u return _ms; } -struct miqt_string QLocale_toCurrencyStringWithShort(const QLocale* self, int16_t i) { +struct miqt_string QLocale_toCurrencyStringWithShort(const QLocale* self, short i) { QString _ret = self->toCurrencyString(static_cast(i)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -718,7 +718,7 @@ struct miqt_string QLocale_toCurrencyStringWithShort(const QLocale* self, int16_ return _ms; } -struct miqt_string QLocale_toCurrencyStringWithUshort(const QLocale* self, uint16_t i) { +struct miqt_string QLocale_toCurrencyStringWithUshort(const QLocale* self, unsigned short i) { QString _ret = self->toCurrencyString(static_cast(i)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -804,7 +804,7 @@ struct miqt_array /* of struct miqt_string */ QLocale_uiLanguages(const QLocale return _out; } -struct miqt_string QLocale_languageToCode(uint16_t language) { +struct miqt_string QLocale_languageToCode(unsigned short language) { QString _ret = QLocale::languageToCode(static_cast(language)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -815,7 +815,7 @@ struct miqt_string QLocale_languageToCode(uint16_t language) { return _ms; } -struct miqt_string QLocale_territoryToCode(uint16_t territory) { +struct miqt_string QLocale_territoryToCode(unsigned short territory) { QString _ret = QLocale::territoryToCode(static_cast(territory)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -826,7 +826,7 @@ struct miqt_string QLocale_territoryToCode(uint16_t territory) { return _ms; } -struct miqt_string QLocale_countryToCode(uint16_t country) { +struct miqt_string QLocale_countryToCode(unsigned short country) { QString _ret = QLocale::countryToCode(static_cast(country)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -837,7 +837,7 @@ struct miqt_string QLocale_countryToCode(uint16_t country) { return _ms; } -struct miqt_string QLocale_scriptToCode(uint16_t script) { +struct miqt_string QLocale_scriptToCode(unsigned short script) { QString _ret = QLocale::scriptToCode(static_cast(script)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -848,7 +848,7 @@ struct miqt_string QLocale_scriptToCode(uint16_t script) { return _ms; } -struct miqt_string QLocale_languageToString(uint16_t language) { +struct miqt_string QLocale_languageToString(unsigned short language) { QString _ret = QLocale::languageToString(static_cast(language)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -859,7 +859,7 @@ struct miqt_string QLocale_languageToString(uint16_t language) { return _ms; } -struct miqt_string QLocale_territoryToString(uint16_t territory) { +struct miqt_string QLocale_territoryToString(unsigned short territory) { QString _ret = QLocale::territoryToString(static_cast(territory)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -870,7 +870,7 @@ struct miqt_string QLocale_territoryToString(uint16_t territory) { return _ms; } -struct miqt_string QLocale_countryToString(uint16_t country) { +struct miqt_string QLocale_countryToString(unsigned short country) { QString _ret = QLocale::countryToString(static_cast(country)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -881,7 +881,7 @@ struct miqt_string QLocale_countryToString(uint16_t country) { return _ms; } -struct miqt_string QLocale_scriptToString(uint16_t script) { +struct miqt_string QLocale_scriptToString(unsigned short script) { QString _ret = QLocale::scriptToString(static_cast(script)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); @@ -904,7 +904,7 @@ QLocale* QLocale_system() { return new QLocale(QLocale::system()); } -struct miqt_array /* of QLocale* */ QLocale_matchingLocales(uint16_t language, uint16_t script, uint16_t territory) { +struct miqt_array /* of QLocale* */ QLocale_matchingLocales(unsigned short language, unsigned short script, unsigned short territory) { QList _ret = QLocale::matchingLocales(static_cast(language), static_cast(script), static_cast(territory)); // Convert QList<> from C++ memory to manually-managed C memory QLocale** _arr = static_cast(malloc(sizeof(QLocale*) * _ret.length())); @@ -917,13 +917,13 @@ struct miqt_array /* of QLocale* */ QLocale_matchingLocales(uint16_t language, return _out; } -struct miqt_array /* of uint16_t */ QLocale_countriesForLanguage(uint16_t lang) { +struct miqt_array /* of unsigned short */ QLocale_countriesForLanguage(unsigned short lang) { QList _ret = QLocale::countriesForLanguage(static_cast(lang)); // Convert QList<> from C++ memory to manually-managed C memory - uint16_t* _arr = static_cast(malloc(sizeof(uint16_t) * _ret.length())); + unsigned short* _arr = static_cast(malloc(sizeof(unsigned short) * _ret.length())); for (size_t i = 0, e = _ret.length(); i < e; ++i) { QLocale::Country _lv_ret = _ret[i]; - _arr[i] = static_cast(_lv_ret); + _arr[i] = static_cast(_lv_ret); } struct miqt_array _out; _out.len = _ret.length(); @@ -970,15 +970,15 @@ struct miqt_string QLocale_createSeparatedList(const QLocale* self, struct miqt_ return _ms; } -int16_t QLocale_toShort2(const QLocale* self, struct miqt_string s, bool* ok) { +short QLocale_toShort2(const QLocale* self, struct miqt_string s, bool* ok) { QString s_QString = QString::fromUtf8(s.data, s.len); return self->toShort(s_QString, ok); } -uint16_t QLocale_toUShort2(const QLocale* self, struct miqt_string s, bool* ok) { +unsigned short QLocale_toUShort2(const QLocale* self, struct miqt_string s, bool* ok) { QString s_QString = QString::fromUtf8(s.data, s.len); ushort _ret = self->toUShort(s_QString, ok); - return static_cast(_ret); + return static_cast(_ret); } int QLocale_toInt2(const QLocale* self, struct miqt_string s, bool* ok) { @@ -1229,7 +1229,7 @@ struct miqt_string QLocale_toCurrencyString3(const QLocale* self, unsigned long return _ms; } -struct miqt_string QLocale_toCurrencyString4(const QLocale* self, int16_t i, struct miqt_string symbol) { +struct miqt_string QLocale_toCurrencyString4(const QLocale* self, short i, struct miqt_string symbol) { QString symbol_QString = QString::fromUtf8(symbol.data, symbol.len); QString _ret = self->toCurrencyString(static_cast(i), symbol_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -1241,7 +1241,7 @@ struct miqt_string QLocale_toCurrencyString4(const QLocale* self, int16_t i, str return _ms; } -struct miqt_string QLocale_toCurrencyString5(const QLocale* self, uint16_t i, struct miqt_string symbol) { +struct miqt_string QLocale_toCurrencyString5(const QLocale* self, unsigned short i, struct miqt_string symbol) { QString symbol_QString = QString::fromUtf8(symbol.data, symbol.len); QString _ret = self->toCurrencyString(static_cast(i), symbol_QString); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory @@ -1347,7 +1347,7 @@ struct miqt_string QLocale_formattedDataSize3(const QLocale* self, long long byt return _ms; } -struct miqt_string QLocale_languageToCode2(uint16_t language, int codeTypes) { +struct miqt_string QLocale_languageToCode2(unsigned short language, int codeTypes) { QString _ret = QLocale::languageToCode(static_cast(language), static_cast(codeTypes)); // Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory QByteArray _b = _ret.toUtf8(); diff --git a/qt6/gen_qlocale.go b/qt6/gen_qlocale.go index 5ca738c7..f0240bbc 100644 --- a/qt6/gen_qlocale.go +++ b/qt6/gen_qlocale.go @@ -940,13 +940,13 @@ func NewQLocale2(name string) *QLocale { // NewQLocale3 constructs a new QLocale object. func NewQLocale3(language QLocale__Language, territory QLocale__Country) *QLocale { - return newQLocale(C.QLocale_new3((C.uint16_t)(language), (C.uint16_t)(territory))) + return newQLocale(C.QLocale_new3((C.ushort)(language), (C.ushort)(territory))) } // NewQLocale4 constructs a new QLocale object. func NewQLocale4(language QLocale__Language) *QLocale { - return newQLocale(C.QLocale_new4((C.uint16_t)(language))) + return newQLocale(C.QLocale_new4((C.ushort)(language))) } // NewQLocale5 constructs a new QLocale object. @@ -958,13 +958,13 @@ func NewQLocale5(other *QLocale) *QLocale { // NewQLocale6 constructs a new QLocale object. func NewQLocale6(language QLocale__Language, script QLocale__Script) *QLocale { - return newQLocale(C.QLocale_new6((C.uint16_t)(language), (C.uint16_t)(script))) + return newQLocale(C.QLocale_new6((C.ushort)(language), (C.ushort)(script))) } // NewQLocale7 constructs a new QLocale object. func NewQLocale7(language QLocale__Language, script QLocale__Script, territory QLocale__Country) *QLocale { - return newQLocale(C.QLocale_new7((C.uint16_t)(language), (C.uint16_t)(script), (C.uint16_t)(territory))) + return newQLocale(C.QLocale_new7((C.ushort)(language), (C.ushort)(script), (C.ushort)(territory))) } func (this *QLocale) OperatorAssign(other *QLocale) { @@ -1135,14 +1135,14 @@ func (this *QLocale) ToStringWithUlong(i uint64) string { } func (this *QLocale) ToStringWithShort(i int16) string { - var _ms C.struct_miqt_string = C.QLocale_toStringWithShort(this.h, (C.int16_t)(i)) + var _ms C.struct_miqt_string = C.QLocale_toStringWithShort(this.h, (C.short)(i)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToStringWithUshort(i uint16) string { - var _ms C.struct_miqt_string = C.QLocale_toStringWithUshort(this.h, (C.uint16_t)(i)) + var _ms C.struct_miqt_string = C.QLocale_toStringWithUshort(this.h, (C.ushort)(i)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -1548,14 +1548,14 @@ func (this *QLocale) ToCurrencyStringWithQulonglong(param1 uint64) string { } func (this *QLocale) ToCurrencyStringWithShort(i int16) string { - var _ms C.struct_miqt_string = C.QLocale_toCurrencyStringWithShort(this.h, (C.int16_t)(i)) + var _ms C.struct_miqt_string = C.QLocale_toCurrencyStringWithShort(this.h, (C.short)(i)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret } func (this *QLocale) ToCurrencyStringWithUshort(i uint16) string { - var _ms C.struct_miqt_string = C.QLocale_toCurrencyStringWithUshort(this.h, (C.uint16_t)(i)) + var _ms C.struct_miqt_string = C.QLocale_toCurrencyStringWithUshort(this.h, (C.ushort)(i)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -1610,56 +1610,56 @@ func (this *QLocale) UiLanguages() []string { } func QLocale_LanguageToCode(language QLocale__Language) string { - var _ms C.struct_miqt_string = C.QLocale_languageToCode((C.uint16_t)(language)) + var _ms C.struct_miqt_string = C.QLocale_languageToCode((C.ushort)(language)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret } func QLocale_TerritoryToCode(territory QLocale__Country) string { - var _ms C.struct_miqt_string = C.QLocale_territoryToCode((C.uint16_t)(territory)) + var _ms C.struct_miqt_string = C.QLocale_territoryToCode((C.ushort)(territory)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret } func QLocale_CountryToCode(country QLocale__Country) string { - var _ms C.struct_miqt_string = C.QLocale_countryToCode((C.uint16_t)(country)) + var _ms C.struct_miqt_string = C.QLocale_countryToCode((C.ushort)(country)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret } func QLocale_ScriptToCode(script QLocale__Script) string { - var _ms C.struct_miqt_string = C.QLocale_scriptToCode((C.uint16_t)(script)) + var _ms C.struct_miqt_string = C.QLocale_scriptToCode((C.ushort)(script)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret } func QLocale_LanguageToString(language QLocale__Language) string { - var _ms C.struct_miqt_string = C.QLocale_languageToString((C.uint16_t)(language)) + var _ms C.struct_miqt_string = C.QLocale_languageToString((C.ushort)(language)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret } func QLocale_TerritoryToString(territory QLocale__Country) string { - var _ms C.struct_miqt_string = C.QLocale_territoryToString((C.uint16_t)(territory)) + var _ms C.struct_miqt_string = C.QLocale_territoryToString((C.ushort)(territory)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret } func QLocale_CountryToString(country QLocale__Country) string { - var _ms C.struct_miqt_string = C.QLocale_countryToString((C.uint16_t)(country)) + var _ms C.struct_miqt_string = C.QLocale_countryToString((C.ushort)(country)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret } func QLocale_ScriptToString(script QLocale__Script) string { - var _ms C.struct_miqt_string = C.QLocale_scriptToString((C.uint16_t)(script)) + var _ms C.struct_miqt_string = C.QLocale_scriptToString((C.ushort)(script)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -1682,7 +1682,7 @@ func QLocale_System() *QLocale { } func QLocale_MatchingLocales(language QLocale__Language, script QLocale__Script, territory QLocale__Country) []QLocale { - var _ma C.struct_miqt_array = C.QLocale_matchingLocales((C.uint16_t)(language), (C.uint16_t)(script), (C.uint16_t)(territory)) + var _ma C.struct_miqt_array = C.QLocale_matchingLocales((C.ushort)(language), (C.ushort)(script), (C.ushort)(territory)) _ret := make([]QLocale, int(_ma.len)) _outCast := (*[0xffff]*C.QLocale)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -1694,9 +1694,9 @@ func QLocale_MatchingLocales(language QLocale__Language, script QLocale__Script, } func QLocale_CountriesForLanguage(lang QLocale__Language) []QLocale__Country { - var _ma C.struct_miqt_array = C.QLocale_countriesForLanguage((C.uint16_t)(lang)) + var _ma C.struct_miqt_array = C.QLocale_countriesForLanguage((C.ushort)(lang)) _ret := make([]QLocale__Country, int(_ma.len)) - _outCast := (*[0xffff]C.uint16_t)(unsafe.Pointer(_ma.data)) // hey ya + _outCast := (*[0xffff]C.ushort)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { _ret[i] = (QLocale__Country)(_outCast[i]) } @@ -1981,7 +1981,7 @@ func (this *QLocale) ToCurrencyString4(i int16, symbol string) string { symbol_ms.data = C.CString(symbol) symbol_ms.len = C.size_t(len(symbol)) defer C.free(unsafe.Pointer(symbol_ms.data)) - var _ms C.struct_miqt_string = C.QLocale_toCurrencyString4(this.h, (C.int16_t)(i), symbol_ms) + var _ms C.struct_miqt_string = C.QLocale_toCurrencyString4(this.h, (C.short)(i), symbol_ms) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -1992,7 +1992,7 @@ func (this *QLocale) ToCurrencyString5(i uint16, symbol string) string { symbol_ms.data = C.CString(symbol) symbol_ms.len = C.size_t(len(symbol)) defer C.free(unsafe.Pointer(symbol_ms.data)) - var _ms C.struct_miqt_string = C.QLocale_toCurrencyString5(this.h, (C.uint16_t)(i), symbol_ms) + var _ms C.struct_miqt_string = C.QLocale_toCurrencyString5(this.h, (C.ushort)(i), symbol_ms) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret @@ -2079,7 +2079,7 @@ func (this *QLocale) FormattedDataSize3(bytes int64, precision int, format QLoca } func QLocale_LanguageToCode2(language QLocale__Language, codeTypes QLocale__LanguageCodeType) string { - var _ms C.struct_miqt_string = C.QLocale_languageToCode2((C.uint16_t)(language), (C.int)(codeTypes)) + var _ms C.struct_miqt_string = C.QLocale_languageToCode2((C.ushort)(language), (C.int)(codeTypes)) _ret := C.GoStringN(_ms.data, C.int(int64(_ms.len))) C.free(unsafe.Pointer(_ms.data)) return _ret diff --git a/qt6/gen_qlocale.h b/qt6/gen_qlocale.h index 9ebb9047..428607b3 100644 --- a/qt6/gen_qlocale.h +++ b/qt6/gen_qlocale.h @@ -30,24 +30,24 @@ typedef struct QTime QTime; QLocale* QLocale_new(); QLocale* QLocale_new2(struct miqt_string name); -QLocale* QLocale_new3(uint16_t language, uint16_t territory); -QLocale* QLocale_new4(uint16_t language); +QLocale* QLocale_new3(unsigned short language, unsigned short territory); +QLocale* QLocale_new4(unsigned short language); QLocale* QLocale_new5(QLocale* other); -QLocale* QLocale_new6(uint16_t language, uint16_t script); -QLocale* QLocale_new7(uint16_t language, uint16_t script, uint16_t territory); +QLocale* QLocale_new6(unsigned short language, unsigned short script); +QLocale* QLocale_new7(unsigned short language, unsigned short script, unsigned short territory); void QLocale_operatorAssign(QLocale* self, QLocale* other); void QLocale_swap(QLocale* self, QLocale* other); -uint16_t QLocale_language(const QLocale* self); -uint16_t QLocale_script(const QLocale* self); -uint16_t QLocale_territory(const QLocale* self); -uint16_t QLocale_country(const QLocale* self); +unsigned short QLocale_language(const QLocale* self); +unsigned short QLocale_script(const QLocale* self); +unsigned short QLocale_territory(const QLocale* self); +unsigned short QLocale_country(const QLocale* self); struct miqt_string QLocale_name(const QLocale* self); struct miqt_string QLocale_bcp47Name(const QLocale* self); struct miqt_string QLocale_nativeLanguageName(const QLocale* self); struct miqt_string QLocale_nativeTerritoryName(const QLocale* self); struct miqt_string QLocale_nativeCountryName(const QLocale* self); -int16_t QLocale_toShort(const QLocale* self, struct miqt_string s); -uint16_t QLocale_toUShort(const QLocale* self, struct miqt_string s); +short QLocale_toShort(const QLocale* self, struct miqt_string s); +unsigned short QLocale_toUShort(const QLocale* self, struct miqt_string s); int QLocale_toInt(const QLocale* self, struct miqt_string s); unsigned int QLocale_toUInt(const QLocale* self, struct miqt_string s); long QLocale_toLong(const QLocale* self, struct miqt_string s); @@ -60,8 +60,8 @@ struct miqt_string QLocale_toString(const QLocale* self, long long i); struct miqt_string QLocale_toStringWithQulonglong(const QLocale* self, unsigned long long i); struct miqt_string QLocale_toStringWithLong(const QLocale* self, long i); struct miqt_string QLocale_toStringWithUlong(const QLocale* self, unsigned long i); -struct miqt_string QLocale_toStringWithShort(const QLocale* self, int16_t i); -struct miqt_string QLocale_toStringWithUshort(const QLocale* self, uint16_t i); +struct miqt_string QLocale_toStringWithShort(const QLocale* self, short i); +struct miqt_string QLocale_toStringWithUshort(const QLocale* self, unsigned short i); struct miqt_string QLocale_toStringWithInt(const QLocale* self, int i); struct miqt_string QLocale_toStringWithUint(const QLocale* self, unsigned int i); struct miqt_string QLocale_toStringWithDouble(const QLocale* self, double f); @@ -110,33 +110,33 @@ struct miqt_string QLocale_toLower(const QLocale* self, struct miqt_string str); struct miqt_string QLocale_currencySymbol(const QLocale* self); struct miqt_string QLocale_toCurrencyString(const QLocale* self, long long param1); struct miqt_string QLocale_toCurrencyStringWithQulonglong(const QLocale* self, unsigned long long param1); -struct miqt_string QLocale_toCurrencyStringWithShort(const QLocale* self, int16_t i); -struct miqt_string QLocale_toCurrencyStringWithUshort(const QLocale* self, uint16_t i); +struct miqt_string QLocale_toCurrencyStringWithShort(const QLocale* self, short i); +struct miqt_string QLocale_toCurrencyStringWithUshort(const QLocale* self, unsigned short i); struct miqt_string QLocale_toCurrencyStringWithInt(const QLocale* self, int i); struct miqt_string QLocale_toCurrencyStringWithUint(const QLocale* self, unsigned int i); struct miqt_string QLocale_toCurrencyStringWithDouble(const QLocale* self, double param1); struct miqt_string QLocale_toCurrencyStringWithFloat(const QLocale* self, float i); struct miqt_string QLocale_formattedDataSize(const QLocale* self, long long bytes); struct miqt_array /* of struct miqt_string */ QLocale_uiLanguages(const QLocale* self); -struct miqt_string QLocale_languageToCode(uint16_t language); -struct miqt_string QLocale_territoryToCode(uint16_t territory); -struct miqt_string QLocale_countryToCode(uint16_t country); -struct miqt_string QLocale_scriptToCode(uint16_t script); -struct miqt_string QLocale_languageToString(uint16_t language); -struct miqt_string QLocale_territoryToString(uint16_t territory); -struct miqt_string QLocale_countryToString(uint16_t country); -struct miqt_string QLocale_scriptToString(uint16_t script); +struct miqt_string QLocale_languageToCode(unsigned short language); +struct miqt_string QLocale_territoryToCode(unsigned short territory); +struct miqt_string QLocale_countryToCode(unsigned short country); +struct miqt_string QLocale_scriptToCode(unsigned short script); +struct miqt_string QLocale_languageToString(unsigned short language); +struct miqt_string QLocale_territoryToString(unsigned short territory); +struct miqt_string QLocale_countryToString(unsigned short country); +struct miqt_string QLocale_scriptToString(unsigned short script); void QLocale_setDefault(QLocale* locale); QLocale* QLocale_c(); QLocale* QLocale_system(); -struct miqt_array /* of QLocale* */ QLocale_matchingLocales(uint16_t language, uint16_t script, uint16_t territory); -struct miqt_array /* of uint16_t */ QLocale_countriesForLanguage(uint16_t lang); +struct miqt_array /* of QLocale* */ QLocale_matchingLocales(unsigned short language, unsigned short script, unsigned short territory); +struct miqt_array /* of unsigned short */ QLocale_countriesForLanguage(unsigned short lang); void QLocale_setNumberOptions(QLocale* self, int options); int QLocale_numberOptions(const QLocale* self); struct miqt_string QLocale_quoteString(const QLocale* self, struct miqt_string str); struct miqt_string QLocale_createSeparatedList(const QLocale* self, struct miqt_array /* of struct miqt_string */ strl); -int16_t QLocale_toShort2(const QLocale* self, struct miqt_string s, bool* ok); -uint16_t QLocale_toUShort2(const QLocale* self, struct miqt_string s, bool* ok); +short QLocale_toShort2(const QLocale* self, struct miqt_string s, bool* ok); +unsigned short QLocale_toUShort2(const QLocale* self, struct miqt_string s, bool* ok); int QLocale_toInt2(const QLocale* self, struct miqt_string s, bool* ok); unsigned int QLocale_toUInt2(const QLocale* self, struct miqt_string s, bool* ok); long QLocale_toLong2(const QLocale* self, struct miqt_string s, bool* ok); @@ -165,8 +165,8 @@ struct miqt_string QLocale_standaloneDayName2(const QLocale* self, int param1, i struct miqt_string QLocale_currencySymbolWithQLocaleCurrencySymbolFormat(const QLocale* self, int param1); struct miqt_string QLocale_toCurrencyString2(const QLocale* self, long long param1, struct miqt_string symbol); struct miqt_string QLocale_toCurrencyString3(const QLocale* self, unsigned long long param1, struct miqt_string symbol); -struct miqt_string QLocale_toCurrencyString4(const QLocale* self, int16_t i, struct miqt_string symbol); -struct miqt_string QLocale_toCurrencyString5(const QLocale* self, uint16_t i, struct miqt_string symbol); +struct miqt_string QLocale_toCurrencyString4(const QLocale* self, short i, struct miqt_string symbol); +struct miqt_string QLocale_toCurrencyString5(const QLocale* self, unsigned short i, struct miqt_string symbol); struct miqt_string QLocale_toCurrencyString6(const QLocale* self, int i, struct miqt_string symbol); struct miqt_string QLocale_toCurrencyString7(const QLocale* self, unsigned int i, struct miqt_string symbol); struct miqt_string QLocale_toCurrencyString8(const QLocale* self, double param1, struct miqt_string symbol); @@ -175,7 +175,7 @@ struct miqt_string QLocale_toCurrencyString10(const QLocale* self, float i, stru struct miqt_string QLocale_toCurrencyString11(const QLocale* self, float i, struct miqt_string symbol, int precision); struct miqt_string QLocale_formattedDataSize2(const QLocale* self, long long bytes, int precision); struct miqt_string QLocale_formattedDataSize3(const QLocale* self, long long bytes, int precision, int format); -struct miqt_string QLocale_languageToCode2(uint16_t language, int codeTypes); +struct miqt_string QLocale_languageToCode2(unsigned short language, int codeTypes); struct miqt_string QLocale_quoteString2(const QLocale* self, struct miqt_string str, int style); void QLocale_delete(QLocale* self); diff --git a/qt6/gen_qrgba64.cpp b/qt6/gen_qrgba64.cpp index bf1f5133..dd393450 100644 --- a/qt6/gen_qrgba64.cpp +++ b/qt6/gen_qrgba64.cpp @@ -22,7 +22,7 @@ QRgba64* QRgba64_fromRgba64(unsigned long long c) { return new QRgba64(QRgba64::fromRgba64(static_cast(c))); } -QRgba64* QRgba64_fromRgba642(uint16_t red, uint16_t green, uint16_t blue, uint16_t alpha) { +QRgba64* QRgba64_fromRgba642(unsigned short red, unsigned short green, unsigned short blue, unsigned short alpha) { return new QRgba64(QRgba64::fromRgba64(static_cast(red), static_cast(green), static_cast(blue), static_cast(alpha))); } @@ -42,39 +42,39 @@ bool QRgba64_isTransparent(const QRgba64* self) { return self->isTransparent(); } -uint16_t QRgba64_red(const QRgba64* self) { +unsigned short QRgba64_red(const QRgba64* self) { quint16 _ret = self->red(); - return static_cast(_ret); + return static_cast(_ret); } -uint16_t QRgba64_green(const QRgba64* self) { +unsigned short QRgba64_green(const QRgba64* self) { quint16 _ret = self->green(); - return static_cast(_ret); + return static_cast(_ret); } -uint16_t QRgba64_blue(const QRgba64* self) { +unsigned short QRgba64_blue(const QRgba64* self) { quint16 _ret = self->blue(); - return static_cast(_ret); + return static_cast(_ret); } -uint16_t QRgba64_alpha(const QRgba64* self) { +unsigned short QRgba64_alpha(const QRgba64* self) { quint16 _ret = self->alpha(); - return static_cast(_ret); + return static_cast(_ret); } -void QRgba64_setRed(QRgba64* self, uint16_t _red) { +void QRgba64_setRed(QRgba64* self, unsigned short _red) { self->setRed(static_cast(_red)); } -void QRgba64_setGreen(QRgba64* self, uint16_t _green) { +void QRgba64_setGreen(QRgba64* self, unsigned short _green) { self->setGreen(static_cast(_green)); } -void QRgba64_setBlue(QRgba64* self, uint16_t _blue) { +void QRgba64_setBlue(QRgba64* self, unsigned short _blue) { self->setBlue(static_cast(_blue)); } -void QRgba64_setAlpha(QRgba64* self, uint16_t _alpha) { +void QRgba64_setAlpha(QRgba64* self, unsigned short _alpha) { self->setAlpha(static_cast(_alpha)); } @@ -103,9 +103,9 @@ unsigned int QRgba64_toArgb32(const QRgba64* self) { return static_cast(_ret); } -uint16_t QRgba64_toRgb16(const QRgba64* self) { +unsigned short QRgba64_toRgb16(const QRgba64* self) { ushort _ret = self->toRgb16(); - return static_cast(_ret); + return static_cast(_ret); } QRgba64* QRgba64_premultiplied(const QRgba64* self) { diff --git a/qt6/gen_qrgba64.go b/qt6/gen_qrgba64.go index e0eaaa73..21d0d35c 100644 --- a/qt6/gen_qrgba64.go +++ b/qt6/gen_qrgba64.go @@ -64,7 +64,7 @@ func QRgba64_FromRgba64(c uint64) *QRgba64 { } func QRgba64_FromRgba642(red uint16, green uint16, blue uint16, alpha uint16) *QRgba64 { - _goptr := newQRgba64(C.QRgba64_fromRgba642((C.uint16_t)(red), (C.uint16_t)(green), (C.uint16_t)(blue), (C.uint16_t)(alpha))) + _goptr := newQRgba64(C.QRgba64_fromRgba642((C.ushort)(red), (C.ushort)(green), (C.ushort)(blue), (C.ushort)(alpha))) _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer return _goptr } @@ -106,19 +106,19 @@ func (this *QRgba64) Alpha() uint16 { } func (this *QRgba64) SetRed(_red uint16) { - C.QRgba64_setRed(this.h, (C.uint16_t)(_red)) + C.QRgba64_setRed(this.h, (C.ushort)(_red)) } func (this *QRgba64) SetGreen(_green uint16) { - C.QRgba64_setGreen(this.h, (C.uint16_t)(_green)) + C.QRgba64_setGreen(this.h, (C.ushort)(_green)) } func (this *QRgba64) SetBlue(_blue uint16) { - C.QRgba64_setBlue(this.h, (C.uint16_t)(_blue)) + C.QRgba64_setBlue(this.h, (C.ushort)(_blue)) } func (this *QRgba64) SetAlpha(_alpha uint16) { - C.QRgba64_setAlpha(this.h, (C.uint16_t)(_alpha)) + C.QRgba64_setAlpha(this.h, (C.ushort)(_alpha)) } func (this *QRgba64) Red8() byte { diff --git a/qt6/gen_qrgba64.h b/qt6/gen_qrgba64.h index 04e124c7..3ca1387d 100644 --- a/qt6/gen_qrgba64.h +++ b/qt6/gen_qrgba64.h @@ -23,25 +23,25 @@ typedef struct QRgba64 QRgba64; QRgba64* QRgba64_new(); QRgba64* QRgba64_new2(QRgba64* param1); QRgba64* QRgba64_fromRgba64(unsigned long long c); -QRgba64* QRgba64_fromRgba642(uint16_t red, uint16_t green, uint16_t blue, uint16_t alpha); +QRgba64* QRgba64_fromRgba642(unsigned short red, unsigned short green, unsigned short blue, unsigned short alpha); QRgba64* QRgba64_fromRgba(unsigned char red, unsigned char green, unsigned char blue, unsigned char alpha); QRgba64* QRgba64_fromArgb32(unsigned int rgb); bool QRgba64_isOpaque(const QRgba64* self); bool QRgba64_isTransparent(const QRgba64* self); -uint16_t QRgba64_red(const QRgba64* self); -uint16_t QRgba64_green(const QRgba64* self); -uint16_t QRgba64_blue(const QRgba64* self); -uint16_t QRgba64_alpha(const QRgba64* self); -void QRgba64_setRed(QRgba64* self, uint16_t _red); -void QRgba64_setGreen(QRgba64* self, uint16_t _green); -void QRgba64_setBlue(QRgba64* self, uint16_t _blue); -void QRgba64_setAlpha(QRgba64* self, uint16_t _alpha); +unsigned short QRgba64_red(const QRgba64* self); +unsigned short QRgba64_green(const QRgba64* self); +unsigned short QRgba64_blue(const QRgba64* self); +unsigned short QRgba64_alpha(const QRgba64* self); +void QRgba64_setRed(QRgba64* self, unsigned short _red); +void QRgba64_setGreen(QRgba64* self, unsigned short _green); +void QRgba64_setBlue(QRgba64* self, unsigned short _blue); +void QRgba64_setAlpha(QRgba64* self, unsigned short _alpha); unsigned char QRgba64_red8(const QRgba64* self); unsigned char QRgba64_green8(const QRgba64* self); unsigned char QRgba64_blue8(const QRgba64* self); unsigned char QRgba64_alpha8(const QRgba64* self); unsigned int QRgba64_toArgb32(const QRgba64* self); -uint16_t QRgba64_toRgb16(const QRgba64* self); +unsigned short QRgba64_toRgb16(const QRgba64* self); QRgba64* QRgba64_premultiplied(const QRgba64* self); QRgba64* QRgba64_unpremultiplied(const QRgba64* self); unsigned long long QRgba64_ToUnsignedLongLong(const QRgba64* self); diff --git a/qt6/gen_qstringview.cpp b/qt6/gen_qstringview.cpp index f709f168..68ba623f 100644 --- a/qt6/gen_qstringview.cpp +++ b/qt6/gen_qstringview.cpp @@ -179,13 +179,13 @@ bool QStringView_isValidUtf16(const QStringView* self) { return self->isValidUtf16(); } -int16_t QStringView_toShort(const QStringView* self) { +short QStringView_toShort(const QStringView* self) { return self->toShort(); } -uint16_t QStringView_toUShort(const QStringView* self) { +unsigned short QStringView_toUShort(const QStringView* self) { ushort _ret = self->toUShort(); - return static_cast(_ret); + return static_cast(_ret); } int QStringView_toInt(const QStringView* self) { @@ -335,22 +335,22 @@ bool QStringView_contains5(const QStringView* self, QRegularExpression* re, QReg return self->contains(*re, rmatch); } -int16_t QStringView_toShortWithOk(const QStringView* self, bool* ok) { +short QStringView_toShortWithOk(const QStringView* self, bool* ok) { return self->toShort(ok); } -int16_t QStringView_toShort2(const QStringView* self, bool* ok, int base) { +short QStringView_toShort2(const QStringView* self, bool* ok, int base) { return self->toShort(ok, static_cast(base)); } -uint16_t QStringView_toUShortWithOk(const QStringView* self, bool* ok) { +unsigned short QStringView_toUShortWithOk(const QStringView* self, bool* ok) { ushort _ret = self->toUShort(ok); - return static_cast(_ret); + return static_cast(_ret); } -uint16_t QStringView_toUShort2(const QStringView* self, bool* ok, int base) { +unsigned short QStringView_toUShort2(const QStringView* self, bool* ok, int base) { ushort _ret = self->toUShort(ok, static_cast(base)); - return static_cast(_ret); + return static_cast(_ret); } int QStringView_toIntWithOk(const QStringView* self, bool* ok) { diff --git a/qt6/gen_qstringview.h b/qt6/gen_qstringview.h index b994d7c5..8bc9bd82 100644 --- a/qt6/gen_qstringview.h +++ b/qt6/gen_qstringview.h @@ -56,8 +56,8 @@ bool QStringView_containsWithRe(const QStringView* self, QRegularExpression* re) ptrdiff_t QStringView_countWithRe(const QStringView* self, QRegularExpression* re); bool QStringView_isRightToLeft(const QStringView* self); bool QStringView_isValidUtf16(const QStringView* self); -int16_t QStringView_toShort(const QStringView* self); -uint16_t QStringView_toUShort(const QStringView* self); +short QStringView_toShort(const QStringView* self); +unsigned short QStringView_toUShort(const QStringView* self); int QStringView_toInt(const QStringView* self); unsigned int QStringView_toUInt(const QStringView* self); long QStringView_toLong(const QStringView* self); @@ -90,10 +90,10 @@ ptrdiff_t QStringView_indexOf8(const QStringView* self, QRegularExpression* re, ptrdiff_t QStringView_indexOf9(const QStringView* self, QRegularExpression* re, ptrdiff_t from, QRegularExpressionMatch* rmatch); ptrdiff_t QStringView_lastIndexOf12(const QStringView* self, QRegularExpression* re, ptrdiff_t from, QRegularExpressionMatch* rmatch); bool QStringView_contains5(const QStringView* self, QRegularExpression* re, QRegularExpressionMatch* rmatch); -int16_t QStringView_toShortWithOk(const QStringView* self, bool* ok); -int16_t QStringView_toShort2(const QStringView* self, bool* ok, int base); -uint16_t QStringView_toUShortWithOk(const QStringView* self, bool* ok); -uint16_t QStringView_toUShort2(const QStringView* self, bool* ok, int base); +short QStringView_toShortWithOk(const QStringView* self, bool* ok); +short QStringView_toShort2(const QStringView* self, bool* ok, int base); +unsigned short QStringView_toUShortWithOk(const QStringView* self, bool* ok); +unsigned short QStringView_toUShort2(const QStringView* self, bool* ok, int base); int QStringView_toIntWithOk(const QStringView* self, bool* ok); int QStringView_toInt2(const QStringView* self, bool* ok, int base); unsigned int QStringView_toUIntWithOk(const QStringView* self, bool* ok); diff --git a/qt6/gen_qtextstream.cpp b/qt6/gen_qtextstream.cpp index c738e4b5..82f9b892 100644 --- a/qt6/gen_qtextstream.cpp +++ b/qt6/gen_qtextstream.cpp @@ -234,13 +234,13 @@ QTextStream* QTextStream_operatorShiftRightWithCh(QTextStream* self, char* ch) { return &_ret; } -QTextStream* QTextStream_operatorShiftRightWithShort(QTextStream* self, int16_t* i) { +QTextStream* QTextStream_operatorShiftRightWithShort(QTextStream* self, short* i) { QTextStream& _ret = self->operator>>(static_cast(*i)); // Cast returned reference into pointer return &_ret; } -QTextStream* QTextStream_operatorShiftRightWithUnsignedshort(QTextStream* self, uint16_t* i) { +QTextStream* QTextStream_operatorShiftRightWithUnsignedshort(QTextStream* self, unsigned short* i) { QTextStream& _ret = self->operator>>(static_cast(*i)); // Cast returned reference into pointer return &_ret; @@ -326,13 +326,13 @@ QTextStream* QTextStream_operatorShiftLeftWithCh(QTextStream* self, char ch) { return &_ret; } -QTextStream* QTextStream_operatorShiftLeftWithShort(QTextStream* self, int16_t i) { +QTextStream* QTextStream_operatorShiftLeftWithShort(QTextStream* self, short i) { QTextStream& _ret = self->operator<<(static_cast(i)); // Cast returned reference into pointer return &_ret; } -QTextStream* QTextStream_operatorShiftLeftWithUnsignedshort(QTextStream* self, uint16_t i) { +QTextStream* QTextStream_operatorShiftLeftWithUnsignedshort(QTextStream* self, unsigned short i) { QTextStream& _ret = self->operator<<(static_cast(i)); // Cast returned reference into pointer return &_ret; diff --git a/qt6/gen_qtextstream.go b/qt6/gen_qtextstream.go index 89dc3254..57368699 100644 --- a/qt6/gen_qtextstream.go +++ b/qt6/gen_qtextstream.go @@ -296,11 +296,11 @@ func (this *QTextStream) OperatorShiftRightWithCh(ch *int8) *QTextStream { } func (this *QTextStream) OperatorShiftRightWithShort(i *int16) *QTextStream { - return newQTextStream(C.QTextStream_operatorShiftRightWithShort(this.h, (*C.int16_t)(unsafe.Pointer(i)))) + return newQTextStream(C.QTextStream_operatorShiftRightWithShort(this.h, (*C.short)(unsafe.Pointer(i)))) } func (this *QTextStream) OperatorShiftRightWithUnsignedshort(i *uint16) *QTextStream { - return newQTextStream(C.QTextStream_operatorShiftRightWithUnsignedshort(this.h, (*C.uint16_t)(unsafe.Pointer(i)))) + return newQTextStream(C.QTextStream_operatorShiftRightWithUnsignedshort(this.h, (*C.ushort)(unsafe.Pointer(i)))) } func (this *QTextStream) OperatorShiftRightWithInt(i *int) *QTextStream { @@ -369,11 +369,11 @@ func (this *QTextStream) OperatorShiftLeftWithCh(ch int8) *QTextStream { } func (this *QTextStream) OperatorShiftLeftWithShort(i int16) *QTextStream { - return newQTextStream(C.QTextStream_operatorShiftLeftWithShort(this.h, (C.int16_t)(i))) + return newQTextStream(C.QTextStream_operatorShiftLeftWithShort(this.h, (C.short)(i))) } func (this *QTextStream) OperatorShiftLeftWithUnsignedshort(i uint16) *QTextStream { - return newQTextStream(C.QTextStream_operatorShiftLeftWithUnsignedshort(this.h, (C.uint16_t)(i))) + return newQTextStream(C.QTextStream_operatorShiftLeftWithUnsignedshort(this.h, (C.ushort)(i))) } func (this *QTextStream) OperatorShiftLeftWithInt(i int) *QTextStream { diff --git a/qt6/gen_qtextstream.h b/qt6/gen_qtextstream.h index 524fe959..310fb694 100644 --- a/qt6/gen_qtextstream.h +++ b/qt6/gen_qtextstream.h @@ -72,8 +72,8 @@ void QTextStream_setRealNumberPrecision(QTextStream* self, int precision); int QTextStream_realNumberPrecision(const QTextStream* self); QTextStream* QTextStream_operatorShiftRight(QTextStream* self, QChar* ch); QTextStream* QTextStream_operatorShiftRightWithCh(QTextStream* self, char* ch); -QTextStream* QTextStream_operatorShiftRightWithShort(QTextStream* self, int16_t* i); -QTextStream* QTextStream_operatorShiftRightWithUnsignedshort(QTextStream* self, uint16_t* i); +QTextStream* QTextStream_operatorShiftRightWithShort(QTextStream* self, short* i); +QTextStream* QTextStream_operatorShiftRightWithUnsignedshort(QTextStream* self, unsigned short* i); QTextStream* QTextStream_operatorShiftRightWithInt(QTextStream* self, int* i); QTextStream* QTextStream_operatorShiftRightWithUnsignedint(QTextStream* self, unsigned int* i); QTextStream* QTextStream_operatorShiftRightWithLong(QTextStream* self, long* i); @@ -87,8 +87,8 @@ QTextStream* QTextStream_operatorShiftRightWithArray(QTextStream* self, struct m QTextStream* QTextStream_operatorShiftRightWithChar(QTextStream* self, char* c); QTextStream* QTextStream_operatorShiftLeft(QTextStream* self, QChar* ch); QTextStream* QTextStream_operatorShiftLeftWithCh(QTextStream* self, char ch); -QTextStream* QTextStream_operatorShiftLeftWithShort(QTextStream* self, int16_t i); -QTextStream* QTextStream_operatorShiftLeftWithUnsignedshort(QTextStream* self, uint16_t i); +QTextStream* QTextStream_operatorShiftLeftWithShort(QTextStream* self, short i); +QTextStream* QTextStream_operatorShiftLeftWithUnsignedshort(QTextStream* self, unsigned short i); QTextStream* QTextStream_operatorShiftLeftWithInt(QTextStream* self, int i); QTextStream* QTextStream_operatorShiftLeftWithUnsignedint(QTextStream* self, unsigned int i); QTextStream* QTextStream_operatorShiftLeftWithLong(QTextStream* self, long i); diff --git a/qt6/gen_qtimezone.cpp b/qt6/gen_qtimezone.cpp index f548ac42..69e60b83 100644 --- a/qt6/gen_qtimezone.cpp +++ b/qt6/gen_qtimezone.cpp @@ -42,14 +42,14 @@ QTimeZone* QTimeZone_new5(QTimeZone* other) { return new QTimeZone(*other); } -QTimeZone* QTimeZone_new6(struct miqt_string zoneId, int offsetSeconds, struct miqt_string name, struct miqt_string abbreviation, uint16_t territory) { +QTimeZone* QTimeZone_new6(struct miqt_string zoneId, int offsetSeconds, struct miqt_string name, struct miqt_string abbreviation, unsigned short territory) { QByteArray zoneId_QByteArray(zoneId.data, zoneId.len); QString name_QString = QString::fromUtf8(name.data, name.len); QString abbreviation_QString = QString::fromUtf8(abbreviation.data, abbreviation.len); return new QTimeZone(zoneId_QByteArray, static_cast(offsetSeconds), name_QString, abbreviation_QString, static_cast(territory)); } -QTimeZone* QTimeZone_new7(struct miqt_string zoneId, int offsetSeconds, struct miqt_string name, struct miqt_string abbreviation, uint16_t territory, struct miqt_string comment) { +QTimeZone* QTimeZone_new7(struct miqt_string zoneId, int offsetSeconds, struct miqt_string name, struct miqt_string abbreviation, unsigned short territory, struct miqt_string comment) { QByteArray zoneId_QByteArray(zoneId.data, zoneId.len); QString name_QString = QString::fromUtf8(name.data, name.len); QString abbreviation_QString = QString::fromUtf8(abbreviation.data, abbreviation.len); @@ -78,14 +78,14 @@ struct miqt_string QTimeZone_id(const QTimeZone* self) { return _ms; } -uint16_t QTimeZone_territory(const QTimeZone* self) { +unsigned short QTimeZone_territory(const QTimeZone* self) { QLocale::Territory _ret = self->territory(); - return static_cast(_ret); + return static_cast(_ret); } -uint16_t QTimeZone_country(const QTimeZone* self) { +unsigned short QTimeZone_country(const QTimeZone* self) { QLocale::Country _ret = self->country(); - return static_cast(_ret); + return static_cast(_ret); } struct miqt_string QTimeZone_comment(const QTimeZone* self) { @@ -221,7 +221,7 @@ struct miqt_array /* of struct miqt_string */ QTimeZone_availableTimeZoneIds() return _out; } -struct miqt_array /* of struct miqt_string */ QTimeZone_availableTimeZoneIdsWithTerritory(uint16_t territory) { +struct miqt_array /* of struct miqt_string */ QTimeZone_availableTimeZoneIdsWithTerritory(unsigned short territory) { QList _ret = QTimeZone::availableTimeZoneIds(static_cast(territory)); // Convert QList<> from C++ memory to manually-managed C memory struct miqt_string* _arr = static_cast(malloc(sizeof(struct miqt_string) * _ret.length())); @@ -277,7 +277,7 @@ struct miqt_string QTimeZone_windowsIdToDefaultIanaId(struct miqt_string windows return _ms; } -struct miqt_string QTimeZone_windowsIdToDefaultIanaId2(struct miqt_string windowsId, uint16_t territory) { +struct miqt_string QTimeZone_windowsIdToDefaultIanaId2(struct miqt_string windowsId, unsigned short territory) { QByteArray windowsId_QByteArray(windowsId.data, windowsId.len); QByteArray _qb = QTimeZone::windowsIdToDefaultIanaId(windowsId_QByteArray, static_cast(territory)); struct miqt_string _ms; @@ -306,7 +306,7 @@ struct miqt_array /* of struct miqt_string */ QTimeZone_windowsIdToIanaIds(stru return _out; } -struct miqt_array /* of struct miqt_string */ QTimeZone_windowsIdToIanaIds2(struct miqt_string windowsId, uint16_t territory) { +struct miqt_array /* of struct miqt_string */ QTimeZone_windowsIdToIanaIds2(struct miqt_string windowsId, unsigned short territory) { QByteArray windowsId_QByteArray(windowsId.data, windowsId.len); QList _ret = QTimeZone::windowsIdToIanaIds(windowsId_QByteArray, static_cast(territory)); // Convert QList<> from C++ memory to manually-managed C memory diff --git a/qt6/gen_qtimezone.go b/qt6/gen_qtimezone.go index a8c1d8f7..c10a94a2 100644 --- a/qt6/gen_qtimezone.go +++ b/qt6/gen_qtimezone.go @@ -139,7 +139,7 @@ func NewQTimeZone6(zoneId []byte, offsetSeconds int, name string, abbreviation s abbreviation_ms.len = C.size_t(len(abbreviation)) defer C.free(unsafe.Pointer(abbreviation_ms.data)) - return newQTimeZone(C.QTimeZone_new6(zoneId_alias, (C.int)(offsetSeconds), name_ms, abbreviation_ms, (C.uint16_t)(territory))) + return newQTimeZone(C.QTimeZone_new6(zoneId_alias, (C.int)(offsetSeconds), name_ms, abbreviation_ms, (C.ushort)(territory))) } // NewQTimeZone7 constructs a new QTimeZone object. @@ -164,7 +164,7 @@ func NewQTimeZone7(zoneId []byte, offsetSeconds int, name string, abbreviation s comment_ms.len = C.size_t(len(comment)) defer C.free(unsafe.Pointer(comment_ms.data)) - return newQTimeZone(C.QTimeZone_new7(zoneId_alias, (C.int)(offsetSeconds), name_ms, abbreviation_ms, (C.uint16_t)(territory), comment_ms)) + return newQTimeZone(C.QTimeZone_new7(zoneId_alias, (C.int)(offsetSeconds), name_ms, abbreviation_ms, (C.ushort)(territory), comment_ms)) } func (this *QTimeZone) OperatorAssign(other *QTimeZone) { @@ -320,7 +320,7 @@ func QTimeZone_AvailableTimeZoneIds() [][]byte { } func QTimeZone_AvailableTimeZoneIdsWithTerritory(territory QLocale__Country) [][]byte { - var _ma C.struct_miqt_array = C.QTimeZone_availableTimeZoneIdsWithTerritory((C.uint16_t)(territory)) + var _ma C.struct_miqt_array = C.QTimeZone_availableTimeZoneIdsWithTerritory((C.ushort)(territory)) _ret := make([][]byte, int(_ma.len)) _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { @@ -381,7 +381,7 @@ func QTimeZone_WindowsIdToDefaultIanaId2(windowsId []byte, territory QLocale__Co windowsId_alias.data = (*C.char)(unsafe.Pointer(nil)) } windowsId_alias.len = C.size_t(len(windowsId)) - var _bytearray C.struct_miqt_string = C.QTimeZone_windowsIdToDefaultIanaId2(windowsId_alias, (C.uint16_t)(territory)) + var _bytearray C.struct_miqt_string = C.QTimeZone_windowsIdToDefaultIanaId2(windowsId_alias, (C.ushort)(territory)) _ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len))) C.free(unsafe.Pointer(_bytearray.data)) return _ret @@ -415,7 +415,7 @@ func QTimeZone_WindowsIdToIanaIds2(windowsId []byte, territory QLocale__Country) windowsId_alias.data = (*C.char)(unsafe.Pointer(nil)) } windowsId_alias.len = C.size_t(len(windowsId)) - var _ma C.struct_miqt_array = C.QTimeZone_windowsIdToIanaIds2(windowsId_alias, (C.uint16_t)(territory)) + var _ma C.struct_miqt_array = C.QTimeZone_windowsIdToIanaIds2(windowsId_alias, (C.ushort)(territory)) _ret := make([][]byte, int(_ma.len)) _outCast := (*[0xffff]C.struct_miqt_string)(unsafe.Pointer(_ma.data)) // hey ya for i := 0; i < int(_ma.len); i++ { diff --git a/qt6/gen_qtimezone.h b/qt6/gen_qtimezone.h index 90e1b366..f6953353 100644 --- a/qt6/gen_qtimezone.h +++ b/qt6/gen_qtimezone.h @@ -35,14 +35,14 @@ QTimeZone* QTimeZone_new2(struct miqt_string ianaId); QTimeZone* QTimeZone_new3(int offsetSeconds); QTimeZone* QTimeZone_new4(struct miqt_string zoneId, int offsetSeconds, struct miqt_string name, struct miqt_string abbreviation); QTimeZone* QTimeZone_new5(QTimeZone* other); -QTimeZone* QTimeZone_new6(struct miqt_string zoneId, int offsetSeconds, struct miqt_string name, struct miqt_string abbreviation, uint16_t territory); -QTimeZone* QTimeZone_new7(struct miqt_string zoneId, int offsetSeconds, struct miqt_string name, struct miqt_string abbreviation, uint16_t territory, struct miqt_string comment); +QTimeZone* QTimeZone_new6(struct miqt_string zoneId, int offsetSeconds, struct miqt_string name, struct miqt_string abbreviation, unsigned short territory); +QTimeZone* QTimeZone_new7(struct miqt_string zoneId, int offsetSeconds, struct miqt_string name, struct miqt_string abbreviation, unsigned short territory, struct miqt_string comment); void QTimeZone_operatorAssign(QTimeZone* self, QTimeZone* other); void QTimeZone_swap(QTimeZone* self, QTimeZone* other); bool QTimeZone_isValid(const QTimeZone* self); struct miqt_string QTimeZone_id(const QTimeZone* self); -uint16_t QTimeZone_territory(const QTimeZone* self); -uint16_t QTimeZone_country(const QTimeZone* self); +unsigned short QTimeZone_territory(const QTimeZone* self); +unsigned short QTimeZone_country(const QTimeZone* self); struct miqt_string QTimeZone_comment(const QTimeZone* self); struct miqt_string QTimeZone_displayName(const QTimeZone* self, QDateTime* atDateTime); struct miqt_string QTimeZone_displayNameWithTimeType(const QTimeZone* self, int timeType); @@ -62,13 +62,13 @@ QTimeZone* QTimeZone_systemTimeZone(); QTimeZone* QTimeZone_utc(); bool QTimeZone_isTimeZoneIdAvailable(struct miqt_string ianaId); struct miqt_array /* of struct miqt_string */ QTimeZone_availableTimeZoneIds(); -struct miqt_array /* of struct miqt_string */ QTimeZone_availableTimeZoneIdsWithTerritory(uint16_t territory); +struct miqt_array /* of struct miqt_string */ QTimeZone_availableTimeZoneIdsWithTerritory(unsigned short territory); struct miqt_array /* of struct miqt_string */ QTimeZone_availableTimeZoneIdsWithOffsetSeconds(int offsetSeconds); struct miqt_string QTimeZone_ianaIdToWindowsId(struct miqt_string ianaId); struct miqt_string QTimeZone_windowsIdToDefaultIanaId(struct miqt_string windowsId); -struct miqt_string QTimeZone_windowsIdToDefaultIanaId2(struct miqt_string windowsId, uint16_t territory); +struct miqt_string QTimeZone_windowsIdToDefaultIanaId2(struct miqt_string windowsId, unsigned short territory); struct miqt_array /* of struct miqt_string */ QTimeZone_windowsIdToIanaIds(struct miqt_string windowsId); -struct miqt_array /* of struct miqt_string */ QTimeZone_windowsIdToIanaIds2(struct miqt_string windowsId, uint16_t territory); +struct miqt_array /* of struct miqt_string */ QTimeZone_windowsIdToIanaIds2(struct miqt_string windowsId, unsigned short territory); struct miqt_string QTimeZone_displayName2(const QTimeZone* self, QDateTime* atDateTime, int nameType); struct miqt_string QTimeZone_displayName3(const QTimeZone* self, QDateTime* atDateTime, int nameType, QLocale* locale); struct miqt_string QTimeZone_displayName4(const QTimeZone* self, int timeType, int nameType); diff --git a/qt6/gen_quuid.cpp b/qt6/gen_quuid.cpp index b0b65403..203f73d2 100644 --- a/qt6/gen_quuid.cpp +++ b/qt6/gen_quuid.cpp @@ -20,7 +20,7 @@ QUuid* QUuid_new() { return new QUuid(); } -QUuid* QUuid_new2(unsigned int l, uint16_t w1, uint16_t w2, unsigned char b1, unsigned char b2, unsigned char b3, unsigned char b4, unsigned char b5, unsigned char b6, unsigned char b7, unsigned char b8) { +QUuid* QUuid_new2(unsigned int l, unsigned short w1, unsigned short w2, unsigned char b1, unsigned char b2, unsigned char b3, unsigned char b4, unsigned char b5, unsigned char b6, unsigned char b7, unsigned char b8) { return new QUuid(static_cast(l), static_cast(w1), static_cast(w2), static_cast(b1), static_cast(b2), static_cast(b3), static_cast(b4), static_cast(b5), static_cast(b6), static_cast(b7), static_cast(b8)); } diff --git a/qt6/gen_quuid.go b/qt6/gen_quuid.go index 21a8db3e..cf5b215f 100644 --- a/qt6/gen_quuid.go +++ b/qt6/gen_quuid.go @@ -84,7 +84,7 @@ func NewQUuid() *QUuid { // NewQUuid2 constructs a new QUuid object. func NewQUuid2(l uint, w1 uint16, w2 uint16, b1 byte, b2 byte, b3 byte, b4 byte, b5 byte, b6 byte, b7 byte, b8 byte) *QUuid { - return newQUuid(C.QUuid_new2((C.uint)(l), (C.uint16_t)(w1), (C.uint16_t)(w2), (C.uchar)(b1), (C.uchar)(b2), (C.uchar)(b3), (C.uchar)(b4), (C.uchar)(b5), (C.uchar)(b6), (C.uchar)(b7), (C.uchar)(b8))) + return newQUuid(C.QUuid_new2((C.uint)(l), (C.ushort)(w1), (C.ushort)(w2), (C.uchar)(b1), (C.uchar)(b2), (C.uchar)(b3), (C.uchar)(b4), (C.uchar)(b5), (C.uchar)(b6), (C.uchar)(b7), (C.uchar)(b8))) } // NewQUuid3 constructs a new QUuid object. diff --git a/qt6/gen_quuid.h b/qt6/gen_quuid.h index cbe84eb9..1d530df5 100644 --- a/qt6/gen_quuid.h +++ b/qt6/gen_quuid.h @@ -25,7 +25,7 @@ typedef struct QUuid QUuid; #endif QUuid* QUuid_new(); -QUuid* QUuid_new2(unsigned int l, uint16_t w1, uint16_t w2, unsigned char b1, unsigned char b2, unsigned char b3, unsigned char b4, unsigned char b5, unsigned char b6, unsigned char b7, unsigned char b8); +QUuid* QUuid_new2(unsigned int l, unsigned short w1, unsigned short w2, unsigned char b1, unsigned char b2, unsigned char b3, unsigned char b4, unsigned char b5, unsigned char b6, unsigned char b7, unsigned char b8); QUuid* QUuid_new3(QAnyStringView* string); QUuid* QUuid_new4(QUuid* param1); QUuid* QUuid_fromString(QAnyStringView* string); diff --git a/qt6/network/gen_qabstractsocket.cpp b/qt6/network/gen_qabstractsocket.cpp index 5833b1a7..264f1136 100644 --- a/qt6/network/gen_qabstractsocket.cpp +++ b/qt6/network/gen_qabstractsocket.cpp @@ -28,8 +28,8 @@ void miqt_exec_callback_QAbstractSocket_stateChanged(intptr_t, int); void miqt_exec_callback_QAbstractSocket_errorOccurred(intptr_t, int); void miqt_exec_callback_QAbstractSocket_proxyAuthenticationRequired(intptr_t, QNetworkProxy*, QAuthenticator*); void miqt_exec_callback_QAbstractSocket_resume(QAbstractSocket*, intptr_t); -bool miqt_exec_callback_QAbstractSocket_bind(QAbstractSocket*, intptr_t, QHostAddress*, uint16_t, int); -void miqt_exec_callback_QAbstractSocket_connectToHost(QAbstractSocket*, intptr_t, struct miqt_string, uint16_t, int, int); +bool miqt_exec_callback_QAbstractSocket_bind(QAbstractSocket*, intptr_t, QHostAddress*, unsigned short, int); +void miqt_exec_callback_QAbstractSocket_connectToHost(QAbstractSocket*, intptr_t, struct miqt_string, unsigned short, int, int); void miqt_exec_callback_QAbstractSocket_disconnectFromHost(QAbstractSocket*, intptr_t); long long miqt_exec_callback_QAbstractSocket_bytesAvailable(const QAbstractSocket*, intptr_t); long long miqt_exec_callback_QAbstractSocket_bytesToWrite(const QAbstractSocket*, intptr_t); @@ -104,7 +104,7 @@ public: // Cast returned reference into pointer QHostAddress* sigval1 = const_cast(&address_ret); quint16 port_ret = port; - uint16_t sigval2 = static_cast(port_ret); + unsigned short sigval2 = static_cast(port_ret); QAbstractSocket::BindMode mode_ret = mode; int sigval3 = static_cast(mode_ret); @@ -113,7 +113,7 @@ public: return callback_return_value; } - friend bool QAbstractSocket_virtualbase_bind(void* self, QHostAddress* address, uint16_t port, int mode); + friend bool QAbstractSocket_virtualbase_bind(void* self, QHostAddress* address, unsigned short port, int mode); // cgo.Handle value for overwritten implementation intptr_t handle__connectToHost = 0; @@ -134,7 +134,7 @@ public: memcpy(hostName_ms.data, hostName_b.data(), hostName_ms.len); struct miqt_string sigval1 = hostName_ms; quint16 port_ret = port; - uint16_t sigval2 = static_cast(port_ret); + unsigned short sigval2 = static_cast(port_ret); QIODeviceBase::OpenMode mode_ret = mode; int sigval3 = static_cast(mode_ret); QAbstractSocket::NetworkLayerProtocol protocol_ret = protocol; @@ -145,7 +145,7 @@ public: } - friend void QAbstractSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol); + friend void QAbstractSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol); // cgo.Handle value for overwritten implementation intptr_t handle__disconnectFromHost = 0; @@ -749,9 +749,9 @@ public: // Wrappers to allow calling protected methods: friend void QAbstractSocket_protectedbase_setSocketState(bool* _dynamic_cast_ok, void* self, int state); friend void QAbstractSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, int socketError); - friend void QAbstractSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port); + friend void QAbstractSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port); friend void QAbstractSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); - friend void QAbstractSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port); + friend void QAbstractSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port); friend void QAbstractSocket_protectedbase_setPeerAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); friend void QAbstractSocket_protectedbase_setPeerName(bool* _dynamic_cast_ok, void* self, struct miqt_string name); friend void QAbstractSocket_protectedbase_setOpenMode(bool* _dynamic_cast_ok, void* self, int openMode); @@ -802,7 +802,7 @@ void QAbstractSocket_setPauseMode(QAbstractSocket* self, int pauseMode) { self->setPauseMode(static_cast(pauseMode)); } -bool QAbstractSocket_bind(QAbstractSocket* self, QHostAddress* address, uint16_t port, int mode) { +bool QAbstractSocket_bind(QAbstractSocket* self, QHostAddress* address, unsigned short port, int mode) { return self->bind(*address, static_cast(port), static_cast(mode)); } @@ -810,12 +810,12 @@ bool QAbstractSocket_bind2(QAbstractSocket* self) { return self->bind(); } -void QAbstractSocket_connectToHost(QAbstractSocket* self, struct miqt_string hostName, uint16_t port, int mode, int protocol) { +void QAbstractSocket_connectToHost(QAbstractSocket* self, struct miqt_string hostName, unsigned short port, int mode, int protocol) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); self->connectToHost(hostName_QString, static_cast(port), static_cast(mode), static_cast(protocol)); } -void QAbstractSocket_connectToHost2(QAbstractSocket* self, QHostAddress* address, uint16_t port) { +void QAbstractSocket_connectToHost2(QAbstractSocket* self, QHostAddress* address, unsigned short port) { self->connectToHost(*address, static_cast(port)); } @@ -837,18 +837,18 @@ long long QAbstractSocket_bytesToWrite(const QAbstractSocket* self) { return static_cast(_ret); } -uint16_t QAbstractSocket_localPort(const QAbstractSocket* self) { +unsigned short QAbstractSocket_localPort(const QAbstractSocket* self) { quint16 _ret = self->localPort(); - return static_cast(_ret); + return static_cast(_ret); } QHostAddress* QAbstractSocket_localAddress(const QAbstractSocket* self) { return new QHostAddress(self->localAddress()); } -uint16_t QAbstractSocket_peerPort(const QAbstractSocket* self) { +unsigned short QAbstractSocket_peerPort(const QAbstractSocket* self) { quint16 _ret = self->peerPort(); - return static_cast(_ret); + return static_cast(_ret); } QHostAddress* QAbstractSocket_peerAddress(const QAbstractSocket* self) { @@ -1053,15 +1053,15 @@ struct miqt_string QAbstractSocket_tr3(const char* s, const char* c, int n) { return _ms; } -bool QAbstractSocket_bindWithPort(QAbstractSocket* self, uint16_t port) { +bool QAbstractSocket_bindWithPort(QAbstractSocket* self, unsigned short port) { return self->bind(static_cast(port)); } -bool QAbstractSocket_bind3(QAbstractSocket* self, uint16_t port, int mode) { +bool QAbstractSocket_bind3(QAbstractSocket* self, unsigned short port, int mode) { return self->bind(static_cast(port), static_cast(mode)); } -void QAbstractSocket_connectToHost3(QAbstractSocket* self, QHostAddress* address, uint16_t port, int mode) { +void QAbstractSocket_connectToHost3(QAbstractSocket* self, QHostAddress* address, unsigned short port, int mode) { self->connectToHost(*address, static_cast(port), static_cast(mode)); } @@ -1091,7 +1091,7 @@ bool QAbstractSocket_override_virtual_bind(void* self, intptr_t slot) { return true; } -bool QAbstractSocket_virtualbase_bind(void* self, QHostAddress* address, uint16_t port, int mode) { +bool QAbstractSocket_virtualbase_bind(void* self, QHostAddress* address, unsigned short port, int mode) { return ( (MiqtVirtualQAbstractSocket*)(self) )->QAbstractSocket::bind(*address, static_cast(port), static_cast(mode)); @@ -1107,7 +1107,7 @@ bool QAbstractSocket_override_virtual_connectToHost(void* self, intptr_t slot) { return true; } -void QAbstractSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol) { +void QAbstractSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); ( (MiqtVirtualQAbstractSocket*)(self) )->QAbstractSocket::connectToHost(hostName_QString, static_cast(port), static_cast(mode), static_cast(protocol)); @@ -1661,7 +1661,7 @@ void QAbstractSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* } -void QAbstractSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port) { +void QAbstractSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port) { MiqtVirtualQAbstractSocket* self_cast = dynamic_cast( (QAbstractSocket*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; @@ -1687,7 +1687,7 @@ void QAbstractSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* } -void QAbstractSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port) { +void QAbstractSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port) { MiqtVirtualQAbstractSocket* self_cast = dynamic_cast( (QAbstractSocket*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; diff --git a/qt6/network/gen_qabstractsocket.go b/qt6/network/gen_qabstractsocket.go index f8cdc255..696d11bd 100644 --- a/qt6/network/gen_qabstractsocket.go +++ b/qt6/network/gen_qabstractsocket.go @@ -177,7 +177,7 @@ func (this *QAbstractSocket) SetPauseMode(pauseMode QAbstractSocket__PauseMode) } func (this *QAbstractSocket) Bind(address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool { - return (bool)(C.QAbstractSocket_bind(this.h, address.cPointer(), (C.uint16_t)(port), (C.int)(mode))) + return (bool)(C.QAbstractSocket_bind(this.h, address.cPointer(), (C.ushort)(port), (C.int)(mode))) } func (this *QAbstractSocket) Bind2() bool { @@ -189,11 +189,11 @@ func (this *QAbstractSocket) ConnectToHost(hostName string, port uint16, mode qt hostName_ms.data = C.CString(hostName) hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QAbstractSocket_connectToHost(this.h, hostName_ms, (C.uint16_t)(port), (C.int)(mode), (C.int)(protocol)) + C.QAbstractSocket_connectToHost(this.h, hostName_ms, (C.ushort)(port), (C.int)(mode), (C.int)(protocol)) } func (this *QAbstractSocket) ConnectToHost2(address *QHostAddress, port uint16) { - C.QAbstractSocket_connectToHost2(this.h, address.cPointer(), (C.uint16_t)(port)) + C.QAbstractSocket_connectToHost2(this.h, address.cPointer(), (C.ushort)(port)) } func (this *QAbstractSocket) DisconnectFromHost() { @@ -470,15 +470,15 @@ func QAbstractSocket_Tr3(s string, c string, n int) string { } func (this *QAbstractSocket) BindWithPort(port uint16) bool { - return (bool)(C.QAbstractSocket_bindWithPort(this.h, (C.uint16_t)(port))) + return (bool)(C.QAbstractSocket_bindWithPort(this.h, (C.ushort)(port))) } func (this *QAbstractSocket) Bind3(port uint16, mode QAbstractSocket__BindFlag) bool { - return (bool)(C.QAbstractSocket_bind3(this.h, (C.uint16_t)(port), (C.int)(mode))) + return (bool)(C.QAbstractSocket_bind3(this.h, (C.ushort)(port), (C.int)(mode))) } func (this *QAbstractSocket) ConnectToHost3(address *QHostAddress, port uint16, mode qt6.QIODeviceBase__OpenModeFlag) { - C.QAbstractSocket_connectToHost3(this.h, address.cPointer(), (C.uint16_t)(port), (C.int)(mode)) + C.QAbstractSocket_connectToHost3(this.h, address.cPointer(), (C.ushort)(port), (C.int)(mode)) } // SetSocketState can only be called from a QAbstractSocket that was directly constructed. @@ -509,7 +509,7 @@ func (this *QAbstractSocket) SetSocketError(socketError QAbstractSocket__SocketE func (this *QAbstractSocket) SetLocalPort(port uint16) { var _dynamic_cast_ok C.bool = false - C.QAbstractSocket_protectedbase_setLocalPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uint16_t)(port)) + C.QAbstractSocket_protectedbase_setLocalPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.ushort)(port)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -533,7 +533,7 @@ func (this *QAbstractSocket) SetLocalAddress(address *QHostAddress) { func (this *QAbstractSocket) SetPeerPort(port uint16) { var _dynamic_cast_ok C.bool = false - C.QAbstractSocket_protectedbase_setPeerPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uint16_t)(port)) + C.QAbstractSocket_protectedbase_setPeerPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.ushort)(port)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -680,7 +680,7 @@ func miqt_exec_callback_QAbstractSocket_resume(self *C.QAbstractSocket, cb C.int func (this *QAbstractSocket) callVirtualBase_Bind(address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool { - return (bool)(C.QAbstractSocket_virtualbase_bind(unsafe.Pointer(this.h), address.cPointer(), (C.uint16_t)(port), (C.int)(mode))) + return (bool)(C.QAbstractSocket_virtualbase_bind(unsafe.Pointer(this.h), address.cPointer(), (C.ushort)(port), (C.int)(mode))) } func (this *QAbstractSocket) OnBind(slot func(super func(address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool, address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool) { @@ -691,7 +691,7 @@ func (this *QAbstractSocket) OnBind(slot func(super func(address *QHostAddress, } //export miqt_exec_callback_QAbstractSocket_bind -func miqt_exec_callback_QAbstractSocket_bind(self *C.QAbstractSocket, cb C.intptr_t, address *C.QHostAddress, port C.uint16_t, mode C.int) C.bool { +func miqt_exec_callback_QAbstractSocket_bind(self *C.QAbstractSocket, cb C.intptr_t, address *C.QHostAddress, port C.ushort, mode C.int) C.bool { gofunc, ok := cgo.Handle(cb).Value().(func(super func(address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool, address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -716,7 +716,7 @@ func (this *QAbstractSocket) callVirtualBase_ConnectToHost(hostName string, port hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QAbstractSocket_virtualbase_connectToHost(unsafe.Pointer(this.h), hostName_ms, (C.uint16_t)(port), (C.int)(mode), (C.int)(protocol)) + C.QAbstractSocket_virtualbase_connectToHost(unsafe.Pointer(this.h), hostName_ms, (C.ushort)(port), (C.int)(mode), (C.int)(protocol)) } func (this *QAbstractSocket) OnConnectToHost(slot func(super func(hostName string, port uint16, mode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol), hostName string, port uint16, mode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol)) { @@ -727,7 +727,7 @@ func (this *QAbstractSocket) OnConnectToHost(slot func(super func(hostName strin } //export miqt_exec_callback_QAbstractSocket_connectToHost -func miqt_exec_callback_QAbstractSocket_connectToHost(self *C.QAbstractSocket, cb C.intptr_t, hostName C.struct_miqt_string, port C.uint16_t, mode C.int, protocol C.int) { +func miqt_exec_callback_QAbstractSocket_connectToHost(self *C.QAbstractSocket, cb C.intptr_t, hostName C.struct_miqt_string, port C.ushort, mode C.int, protocol C.int) { gofunc, ok := cgo.Handle(cb).Value().(func(super func(hostName string, port uint16, mode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol), hostName string, port uint16, mode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt6/network/gen_qabstractsocket.h b/qt6/network/gen_qabstractsocket.h index bf32d78c..4d24b7b6 100644 --- a/qt6/network/gen_qabstractsocket.h +++ b/qt6/network/gen_qabstractsocket.h @@ -52,17 +52,17 @@ struct miqt_string QAbstractSocket_tr(const char* s); void QAbstractSocket_resume(QAbstractSocket* self); int QAbstractSocket_pauseMode(const QAbstractSocket* self); void QAbstractSocket_setPauseMode(QAbstractSocket* self, int pauseMode); -bool QAbstractSocket_bind(QAbstractSocket* self, QHostAddress* address, uint16_t port, int mode); +bool QAbstractSocket_bind(QAbstractSocket* self, QHostAddress* address, unsigned short port, int mode); bool QAbstractSocket_bind2(QAbstractSocket* self); -void QAbstractSocket_connectToHost(QAbstractSocket* self, struct miqt_string hostName, uint16_t port, int mode, int protocol); -void QAbstractSocket_connectToHost2(QAbstractSocket* self, QHostAddress* address, uint16_t port); +void QAbstractSocket_connectToHost(QAbstractSocket* self, struct miqt_string hostName, unsigned short port, int mode, int protocol); +void QAbstractSocket_connectToHost2(QAbstractSocket* self, QHostAddress* address, unsigned short port); void QAbstractSocket_disconnectFromHost(QAbstractSocket* self); bool QAbstractSocket_isValid(const QAbstractSocket* self); long long QAbstractSocket_bytesAvailable(const QAbstractSocket* self); long long QAbstractSocket_bytesToWrite(const QAbstractSocket* self); -uint16_t QAbstractSocket_localPort(const QAbstractSocket* self); +unsigned short QAbstractSocket_localPort(const QAbstractSocket* self); QHostAddress* QAbstractSocket_localAddress(const QAbstractSocket* self); -uint16_t QAbstractSocket_peerPort(const QAbstractSocket* self); +unsigned short QAbstractSocket_peerPort(const QAbstractSocket* self); QHostAddress* QAbstractSocket_peerAddress(const QAbstractSocket* self); struct miqt_string QAbstractSocket_peerName(const QAbstractSocket* self); long long QAbstractSocket_readBufferSize(const QAbstractSocket* self); @@ -104,15 +104,15 @@ long long QAbstractSocket_skipData(QAbstractSocket* self, long long maxSize); long long QAbstractSocket_writeData(QAbstractSocket* self, const char* data, long long len); struct miqt_string QAbstractSocket_tr2(const char* s, const char* c); struct miqt_string QAbstractSocket_tr3(const char* s, const char* c, int n); -bool QAbstractSocket_bindWithPort(QAbstractSocket* self, uint16_t port); -bool QAbstractSocket_bind3(QAbstractSocket* self, uint16_t port, int mode); -void QAbstractSocket_connectToHost3(QAbstractSocket* self, QHostAddress* address, uint16_t port, int mode); +bool QAbstractSocket_bindWithPort(QAbstractSocket* self, unsigned short port); +bool QAbstractSocket_bind3(QAbstractSocket* self, unsigned short port, int mode); +void QAbstractSocket_connectToHost3(QAbstractSocket* self, QHostAddress* address, unsigned short port, int mode); bool QAbstractSocket_override_virtual_resume(void* self, intptr_t slot); void QAbstractSocket_virtualbase_resume(void* self); bool QAbstractSocket_override_virtual_bind(void* self, intptr_t slot); -bool QAbstractSocket_virtualbase_bind(void* self, QHostAddress* address, uint16_t port, int mode); +bool QAbstractSocket_virtualbase_bind(void* self, QHostAddress* address, unsigned short port, int mode); bool QAbstractSocket_override_virtual_connectToHost(void* self, intptr_t slot); -void QAbstractSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol); +void QAbstractSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol); bool QAbstractSocket_override_virtual_disconnectFromHost(void* self, intptr_t slot); void QAbstractSocket_virtualbase_disconnectFromHost(void* self); bool QAbstractSocket_override_virtual_bytesAvailable(void* self, intptr_t slot); @@ -179,9 +179,9 @@ bool QAbstractSocket_override_virtual_disconnectNotify(void* self, intptr_t slot void QAbstractSocket_virtualbase_disconnectNotify(void* self, QMetaMethod* signal); void QAbstractSocket_protectedbase_setSocketState(bool* _dynamic_cast_ok, void* self, int state); void QAbstractSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, int socketError); -void QAbstractSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port); +void QAbstractSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port); void QAbstractSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); -void QAbstractSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port); +void QAbstractSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port); void QAbstractSocket_protectedbase_setPeerAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); void QAbstractSocket_protectedbase_setPeerName(bool* _dynamic_cast_ok, void* self, struct miqt_string name); void QAbstractSocket_protectedbase_setOpenMode(bool* _dynamic_cast_ok, void* self, int openMode); diff --git a/qt6/network/gen_qdnslookup.cpp b/qt6/network/gen_qdnslookup.cpp index 0691d3f9..0a343b2e 100644 --- a/qt6/network/gen_qdnslookup.cpp +++ b/qt6/network/gen_qdnslookup.cpp @@ -163,9 +163,9 @@ struct miqt_string QDnsMailExchangeRecord_name(const QDnsMailExchangeRecord* sel return _ms; } -uint16_t QDnsMailExchangeRecord_preference(const QDnsMailExchangeRecord* self) { +unsigned short QDnsMailExchangeRecord_preference(const QDnsMailExchangeRecord* self) { quint16 _ret = self->preference(); - return static_cast(_ret); + return static_cast(_ret); } unsigned int QDnsMailExchangeRecord_timeToLive(const QDnsMailExchangeRecord* self) { @@ -204,14 +204,14 @@ struct miqt_string QDnsServiceRecord_name(const QDnsServiceRecord* self) { return _ms; } -uint16_t QDnsServiceRecord_port(const QDnsServiceRecord* self) { +unsigned short QDnsServiceRecord_port(const QDnsServiceRecord* self) { quint16 _ret = self->port(); - return static_cast(_ret); + return static_cast(_ret); } -uint16_t QDnsServiceRecord_priority(const QDnsServiceRecord* self) { +unsigned short QDnsServiceRecord_priority(const QDnsServiceRecord* self) { quint16 _ret = self->priority(); - return static_cast(_ret); + return static_cast(_ret); } struct miqt_string QDnsServiceRecord_target(const QDnsServiceRecord* self) { @@ -230,9 +230,9 @@ unsigned int QDnsServiceRecord_timeToLive(const QDnsServiceRecord* self) { return static_cast(_ret); } -uint16_t QDnsServiceRecord_weight(const QDnsServiceRecord* self) { +unsigned short QDnsServiceRecord_weight(const QDnsServiceRecord* self) { quint16 _ret = self->weight(); - return static_cast(_ret); + return static_cast(_ret); } void QDnsServiceRecord_delete(QDnsServiceRecord* self) { diff --git a/qt6/network/gen_qdnslookup.h b/qt6/network/gen_qdnslookup.h index 1c7e73b0..3501bb7c 100644 --- a/qt6/network/gen_qdnslookup.h +++ b/qt6/network/gen_qdnslookup.h @@ -68,7 +68,7 @@ void QDnsMailExchangeRecord_operatorAssign(QDnsMailExchangeRecord* self, QDnsMai void QDnsMailExchangeRecord_swap(QDnsMailExchangeRecord* self, QDnsMailExchangeRecord* other); struct miqt_string QDnsMailExchangeRecord_exchange(const QDnsMailExchangeRecord* self); struct miqt_string QDnsMailExchangeRecord_name(const QDnsMailExchangeRecord* self); -uint16_t QDnsMailExchangeRecord_preference(const QDnsMailExchangeRecord* self); +unsigned short QDnsMailExchangeRecord_preference(const QDnsMailExchangeRecord* self); unsigned int QDnsMailExchangeRecord_timeToLive(const QDnsMailExchangeRecord* self); void QDnsMailExchangeRecord_delete(QDnsMailExchangeRecord* self); @@ -77,11 +77,11 @@ QDnsServiceRecord* QDnsServiceRecord_new2(QDnsServiceRecord* other); void QDnsServiceRecord_operatorAssign(QDnsServiceRecord* self, QDnsServiceRecord* other); void QDnsServiceRecord_swap(QDnsServiceRecord* self, QDnsServiceRecord* other); struct miqt_string QDnsServiceRecord_name(const QDnsServiceRecord* self); -uint16_t QDnsServiceRecord_port(const QDnsServiceRecord* self); -uint16_t QDnsServiceRecord_priority(const QDnsServiceRecord* self); +unsigned short QDnsServiceRecord_port(const QDnsServiceRecord* self); +unsigned short QDnsServiceRecord_priority(const QDnsServiceRecord* self); struct miqt_string QDnsServiceRecord_target(const QDnsServiceRecord* self); unsigned int QDnsServiceRecord_timeToLive(const QDnsServiceRecord* self); -uint16_t QDnsServiceRecord_weight(const QDnsServiceRecord* self); +unsigned short QDnsServiceRecord_weight(const QDnsServiceRecord* self); void QDnsServiceRecord_delete(QDnsServiceRecord* self); QDnsTextRecord* QDnsTextRecord_new(); diff --git a/qt6/network/gen_qdtls.cpp b/qt6/network/gen_qdtls.cpp index c41e6448..138f0844 100644 --- a/qt6/network/gen_qdtls.cpp +++ b/qt6/network/gen_qdtls.cpp @@ -235,7 +235,7 @@ QDtlsClientVerifier__GeneratorParameters* QDtlsClientVerifier_cookieGeneratorPar return new QDtlsClientVerifier::GeneratorParameters(self->cookieGeneratorParameters()); } -bool QDtlsClientVerifier_verifyClient(QDtlsClientVerifier* self, QUdpSocket* socket, struct miqt_string dgram, QHostAddress* address, uint16_t port) { +bool QDtlsClientVerifier_verifyClient(QDtlsClientVerifier* self, QUdpSocket* socket, struct miqt_string dgram, QHostAddress* address, unsigned short port) { QByteArray dgram_QByteArray(dgram.data, dgram.len); return self->verifyClient(socket, dgram_QByteArray, *address, static_cast(port)); } @@ -637,7 +637,7 @@ struct miqt_string QDtls_tr(const char* s) { return _ms; } -bool QDtls_setPeer(QDtls* self, QHostAddress* address, uint16_t port) { +bool QDtls_setPeer(QDtls* self, QHostAddress* address, unsigned short port) { return self->setPeer(*address, static_cast(port)); } @@ -650,9 +650,9 @@ QHostAddress* QDtls_peerAddress(const QDtls* self) { return new QHostAddress(self->peerAddress()); } -uint16_t QDtls_peerPort(const QDtls* self) { +unsigned short QDtls_peerPort(const QDtls* self) { quint16 _ret = self->peerPort(); - return static_cast(_ret); + return static_cast(_ret); } struct miqt_string QDtls_peerVerificationName(const QDtls* self) { @@ -671,13 +671,13 @@ int QDtls_sslMode(const QDtls* self) { return static_cast(_ret); } -void QDtls_setMtuHint(QDtls* self, uint16_t mtuHint) { +void QDtls_setMtuHint(QDtls* self, unsigned short mtuHint) { self->setMtuHint(static_cast(mtuHint)); } -uint16_t QDtls_mtuHint(const QDtls* self) { +unsigned short QDtls_mtuHint(const QDtls* self) { quint16 _ret = self->mtuHint(); - return static_cast(_ret); + return static_cast(_ret); } bool QDtls_setCookieGeneratorParameters(QDtls* self, QDtlsClientVerifier__GeneratorParameters* params) { @@ -832,7 +832,7 @@ struct miqt_string QDtls_tr3(const char* s, const char* c, int n) { return _ms; } -bool QDtls_setPeer2(QDtls* self, QHostAddress* address, uint16_t port, struct miqt_string verificationName) { +bool QDtls_setPeer2(QDtls* self, QHostAddress* address, unsigned short port, struct miqt_string verificationName) { QString verificationName_QString = QString::fromUtf8(verificationName.data, verificationName.len); return self->setPeer(*address, static_cast(port), verificationName_QString); } diff --git a/qt6/network/gen_qdtls.go b/qt6/network/gen_qdtls.go index df5d73cc..e5371d77 100644 --- a/qt6/network/gen_qdtls.go +++ b/qt6/network/gen_qdtls.go @@ -123,7 +123,7 @@ func (this *QDtlsClientVerifier) VerifyClient(socket *QUdpSocket, dgram []byte, dgram_alias.data = (*C.char)(unsafe.Pointer(nil)) } dgram_alias.len = C.size_t(len(dgram)) - return (bool)(C.QDtlsClientVerifier_verifyClient(this.h, socket.cPointer(), dgram_alias, address.cPointer(), (C.uint16_t)(port))) + return (bool)(C.QDtlsClientVerifier_verifyClient(this.h, socket.cPointer(), dgram_alias, address.cPointer(), (C.ushort)(port))) } func (this *QDtlsClientVerifier) VerifiedHello() []byte { @@ -494,7 +494,7 @@ func QDtls_Tr(s string) string { } func (this *QDtls) SetPeer(address *QHostAddress, port uint16) bool { - return (bool)(C.QDtls_setPeer(this.h, address.cPointer(), (C.uint16_t)(port))) + return (bool)(C.QDtls_setPeer(this.h, address.cPointer(), (C.ushort)(port))) } func (this *QDtls) SetPeerVerificationName(name string) bool { @@ -527,7 +527,7 @@ func (this *QDtls) SslMode() QSslSocket__SslMode { } func (this *QDtls) SetMtuHint(mtuHint uint16) { - C.QDtls_setMtuHint(this.h, (C.uint16_t)(mtuHint)) + C.QDtls_setMtuHint(this.h, (C.ushort)(mtuHint)) } func (this *QDtls) MtuHint() uint16 { @@ -714,7 +714,7 @@ func (this *QDtls) SetPeer2(address *QHostAddress, port uint16, verificationName verificationName_ms.data = C.CString(verificationName) verificationName_ms.len = C.size_t(len(verificationName)) defer C.free(unsafe.Pointer(verificationName_ms.data)) - return (bool)(C.QDtls_setPeer2(this.h, address.cPointer(), (C.uint16_t)(port), verificationName_ms)) + return (bool)(C.QDtls_setPeer2(this.h, address.cPointer(), (C.ushort)(port), verificationName_ms)) } func (this *QDtls) DoHandshake2(socket *QUdpSocket, dgram []byte) bool { diff --git a/qt6/network/gen_qdtls.h b/qt6/network/gen_qdtls.h index f5647ac2..ec2aedb5 100644 --- a/qt6/network/gen_qdtls.h +++ b/qt6/network/gen_qdtls.h @@ -60,7 +60,7 @@ void* QDtlsClientVerifier_metacast(QDtlsClientVerifier* self, const char* param1 struct miqt_string QDtlsClientVerifier_tr(const char* s); bool QDtlsClientVerifier_setCookieGeneratorParameters(QDtlsClientVerifier* self, QDtlsClientVerifier__GeneratorParameters* params); QDtlsClientVerifier__GeneratorParameters* QDtlsClientVerifier_cookieGeneratorParameters(const QDtlsClientVerifier* self); -bool QDtlsClientVerifier_verifyClient(QDtlsClientVerifier* self, QUdpSocket* socket, struct miqt_string dgram, QHostAddress* address, uint16_t port); +bool QDtlsClientVerifier_verifyClient(QDtlsClientVerifier* self, QUdpSocket* socket, struct miqt_string dgram, QHostAddress* address, unsigned short port); struct miqt_string QDtlsClientVerifier_verifiedHello(const QDtlsClientVerifier* self); unsigned char QDtlsClientVerifier_dtlsError(const QDtlsClientVerifier* self); struct miqt_string QDtlsClientVerifier_dtlsErrorString(const QDtlsClientVerifier* self); @@ -92,14 +92,14 @@ void QDtls_virtbase(QDtls* src, QObject** outptr_QObject); QMetaObject* QDtls_metaObject(const QDtls* self); void* QDtls_metacast(QDtls* self, const char* param1); struct miqt_string QDtls_tr(const char* s); -bool QDtls_setPeer(QDtls* self, QHostAddress* address, uint16_t port); +bool QDtls_setPeer(QDtls* self, QHostAddress* address, unsigned short port); bool QDtls_setPeerVerificationName(QDtls* self, struct miqt_string name); QHostAddress* QDtls_peerAddress(const QDtls* self); -uint16_t QDtls_peerPort(const QDtls* self); +unsigned short QDtls_peerPort(const QDtls* self); struct miqt_string QDtls_peerVerificationName(const QDtls* self); int QDtls_sslMode(const QDtls* self); -void QDtls_setMtuHint(QDtls* self, uint16_t mtuHint); -uint16_t QDtls_mtuHint(const QDtls* self); +void QDtls_setMtuHint(QDtls* self, unsigned short mtuHint); +unsigned short QDtls_mtuHint(const QDtls* self); bool QDtls_setCookieGeneratorParameters(QDtls* self, QDtlsClientVerifier__GeneratorParameters* params); QDtlsClientVerifier__GeneratorParameters* QDtls_cookieGeneratorParameters(const QDtls* self); bool QDtls_setDtlsConfiguration(QDtls* self, QSslConfiguration* configuration); @@ -125,7 +125,7 @@ void QDtls_handshakeTimeout(QDtls* self); void QDtls_connect_handshakeTimeout(QDtls* self, intptr_t slot); struct miqt_string QDtls_tr2(const char* s, const char* c); struct miqt_string QDtls_tr3(const char* s, const char* c, int n); -bool QDtls_setPeer2(QDtls* self, QHostAddress* address, uint16_t port, struct miqt_string verificationName); +bool QDtls_setPeer2(QDtls* self, QHostAddress* address, unsigned short port, struct miqt_string verificationName); bool QDtls_doHandshake2(QDtls* self, QUdpSocket* socket, struct miqt_string dgram); bool QDtls_override_virtual_event(void* self, intptr_t slot); bool QDtls_virtualbase_event(void* self, QEvent* event); diff --git a/qt6/network/gen_qnetworkaccessmanager.cpp b/qt6/network/gen_qnetworkaccessmanager.cpp index 0b5edcf5..cdc36db2 100644 --- a/qt6/network/gen_qnetworkaccessmanager.cpp +++ b/qt6/network/gen_qnetworkaccessmanager.cpp @@ -437,7 +437,7 @@ void QNetworkAccessManager_connectToHostEncrypted(QNetworkAccessManager* self, s self->connectToHostEncrypted(hostName_QString); } -void QNetworkAccessManager_connectToHostEncrypted2(QNetworkAccessManager* self, struct miqt_string hostName, uint16_t port, QSslConfiguration* sslConfiguration, struct miqt_string peerName) { +void QNetworkAccessManager_connectToHostEncrypted2(QNetworkAccessManager* self, struct miqt_string hostName, unsigned short port, QSslConfiguration* sslConfiguration, struct miqt_string peerName) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); QString peerName_QString = QString::fromUtf8(peerName.data, peerName.len); self->connectToHostEncrypted(hostName_QString, static_cast(port), *sslConfiguration, peerName_QString); @@ -592,17 +592,17 @@ QNetworkReply* QNetworkAccessManager_sendCustomRequest4(QNetworkAccessManager* s return self->sendCustomRequest(*request, verb_QByteArray, data); } -void QNetworkAccessManager_connectToHostEncrypted3(QNetworkAccessManager* self, struct miqt_string hostName, uint16_t port) { +void QNetworkAccessManager_connectToHostEncrypted3(QNetworkAccessManager* self, struct miqt_string hostName, unsigned short port) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); self->connectToHostEncrypted(hostName_QString, static_cast(port)); } -void QNetworkAccessManager_connectToHostEncrypted4(QNetworkAccessManager* self, struct miqt_string hostName, uint16_t port, QSslConfiguration* sslConfiguration) { +void QNetworkAccessManager_connectToHostEncrypted4(QNetworkAccessManager* self, struct miqt_string hostName, unsigned short port, QSslConfiguration* sslConfiguration) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); self->connectToHostEncrypted(hostName_QString, static_cast(port), *sslConfiguration); } -void QNetworkAccessManager_connectToHost2(QNetworkAccessManager* self, struct miqt_string hostName, uint16_t port) { +void QNetworkAccessManager_connectToHost2(QNetworkAccessManager* self, struct miqt_string hostName, unsigned short port) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); self->connectToHost(hostName_QString, static_cast(port)); } diff --git a/qt6/network/gen_qnetworkaccessmanager.go b/qt6/network/gen_qnetworkaccessmanager.go index b13e0522..3b399931 100644 --- a/qt6/network/gen_qnetworkaccessmanager.go +++ b/qt6/network/gen_qnetworkaccessmanager.go @@ -294,7 +294,7 @@ func (this *QNetworkAccessManager) ConnectToHostEncrypted2(hostName string, port peerName_ms.data = C.CString(peerName) peerName_ms.len = C.size_t(len(peerName)) defer C.free(unsafe.Pointer(peerName_ms.data)) - C.QNetworkAccessManager_connectToHostEncrypted2(this.h, hostName_ms, (C.uint16_t)(port), sslConfiguration.cPointer(), peerName_ms) + C.QNetworkAccessManager_connectToHostEncrypted2(this.h, hostName_ms, (C.ushort)(port), sslConfiguration.cPointer(), peerName_ms) } func (this *QNetworkAccessManager) ConnectToHost(hostName string) { @@ -517,7 +517,7 @@ func (this *QNetworkAccessManager) ConnectToHostEncrypted3(hostName string, port hostName_ms.data = C.CString(hostName) hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QNetworkAccessManager_connectToHostEncrypted3(this.h, hostName_ms, (C.uint16_t)(port)) + C.QNetworkAccessManager_connectToHostEncrypted3(this.h, hostName_ms, (C.ushort)(port)) } func (this *QNetworkAccessManager) ConnectToHostEncrypted4(hostName string, port uint16, sslConfiguration *QSslConfiguration) { @@ -525,7 +525,7 @@ func (this *QNetworkAccessManager) ConnectToHostEncrypted4(hostName string, port hostName_ms.data = C.CString(hostName) hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QNetworkAccessManager_connectToHostEncrypted4(this.h, hostName_ms, (C.uint16_t)(port), sslConfiguration.cPointer()) + C.QNetworkAccessManager_connectToHostEncrypted4(this.h, hostName_ms, (C.ushort)(port), sslConfiguration.cPointer()) } func (this *QNetworkAccessManager) ConnectToHost2(hostName string, port uint16) { @@ -533,7 +533,7 @@ func (this *QNetworkAccessManager) ConnectToHost2(hostName string, port uint16) hostName_ms.data = C.CString(hostName) hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QNetworkAccessManager_connectToHost2(this.h, hostName_ms, (C.uint16_t)(port)) + C.QNetworkAccessManager_connectToHost2(this.h, hostName_ms, (C.ushort)(port)) } func (this *QNetworkAccessManager) SetTransferTimeoutWithTimeout(timeout int) { diff --git a/qt6/network/gen_qnetworkaccessmanager.h b/qt6/network/gen_qnetworkaccessmanager.h index 8645eca4..34cdbe35 100644 --- a/qt6/network/gen_qnetworkaccessmanager.h +++ b/qt6/network/gen_qnetworkaccessmanager.h @@ -94,7 +94,7 @@ QNetworkReply* QNetworkAccessManager_post3(QNetworkAccessManager* self, QNetwork QNetworkReply* QNetworkAccessManager_put3(QNetworkAccessManager* self, QNetworkRequest* request, QHttpMultiPart* multiPart); QNetworkReply* QNetworkAccessManager_sendCustomRequest3(QNetworkAccessManager* self, QNetworkRequest* request, struct miqt_string verb, QHttpMultiPart* multiPart); void QNetworkAccessManager_connectToHostEncrypted(QNetworkAccessManager* self, struct miqt_string hostName); -void QNetworkAccessManager_connectToHostEncrypted2(QNetworkAccessManager* self, struct miqt_string hostName, uint16_t port, QSslConfiguration* sslConfiguration, struct miqt_string peerName); +void QNetworkAccessManager_connectToHostEncrypted2(QNetworkAccessManager* self, struct miqt_string hostName, unsigned short port, QSslConfiguration* sslConfiguration, struct miqt_string peerName); void QNetworkAccessManager_connectToHost(QNetworkAccessManager* self, struct miqt_string hostName); void QNetworkAccessManager_setRedirectPolicy(QNetworkAccessManager* self, int policy); int QNetworkAccessManager_redirectPolicy(const QNetworkAccessManager* self); @@ -119,9 +119,9 @@ struct miqt_string QNetworkAccessManager_tr2(const char* s, const char* c); struct miqt_string QNetworkAccessManager_tr3(const char* s, const char* c, int n); void QNetworkAccessManager_enableStrictTransportSecurityStore2(QNetworkAccessManager* self, bool enabled, struct miqt_string storeDir); QNetworkReply* QNetworkAccessManager_sendCustomRequest4(QNetworkAccessManager* self, QNetworkRequest* request, struct miqt_string verb, QIODevice* data); -void QNetworkAccessManager_connectToHostEncrypted3(QNetworkAccessManager* self, struct miqt_string hostName, uint16_t port); -void QNetworkAccessManager_connectToHostEncrypted4(QNetworkAccessManager* self, struct miqt_string hostName, uint16_t port, QSslConfiguration* sslConfiguration); -void QNetworkAccessManager_connectToHost2(QNetworkAccessManager* self, struct miqt_string hostName, uint16_t port); +void QNetworkAccessManager_connectToHostEncrypted3(QNetworkAccessManager* self, struct miqt_string hostName, unsigned short port); +void QNetworkAccessManager_connectToHostEncrypted4(QNetworkAccessManager* self, struct miqt_string hostName, unsigned short port, QSslConfiguration* sslConfiguration); +void QNetworkAccessManager_connectToHost2(QNetworkAccessManager* self, struct miqt_string hostName, unsigned short port); void QNetworkAccessManager_setTransferTimeoutWithTimeout(QNetworkAccessManager* self, int timeout); bool QNetworkAccessManager_override_virtual_supportedSchemes(void* self, intptr_t slot); struct miqt_array /* of struct miqt_string */ QNetworkAccessManager_virtualbase_supportedSchemes(const void* self); diff --git a/qt6/network/gen_qnetworkdatagram.cpp b/qt6/network/gen_qnetworkdatagram.cpp index 9987452c..594b1349 100644 --- a/qt6/network/gen_qnetworkdatagram.cpp +++ b/qt6/network/gen_qnetworkdatagram.cpp @@ -30,7 +30,7 @@ QNetworkDatagram* QNetworkDatagram_new4(struct miqt_string data, QHostAddress* d return new QNetworkDatagram(data_QByteArray, *destinationAddress); } -QNetworkDatagram* QNetworkDatagram_new5(struct miqt_string data, QHostAddress* destinationAddress, uint16_t port) { +QNetworkDatagram* QNetworkDatagram_new5(struct miqt_string data, QHostAddress* destinationAddress, unsigned short port) { QByteArray data_QByteArray(data.data, data.len); return new QNetworkDatagram(data_QByteArray, *destinationAddress, static_cast(port)); } @@ -84,7 +84,7 @@ void QNetworkDatagram_setSender(QNetworkDatagram* self, QHostAddress* address) { self->setSender(*address); } -void QNetworkDatagram_setDestination(QNetworkDatagram* self, QHostAddress* address, uint16_t port) { +void QNetworkDatagram_setDestination(QNetworkDatagram* self, QHostAddress* address, unsigned short port) { self->setDestination(*address, static_cast(port)); } @@ -115,7 +115,7 @@ QNetworkDatagram* QNetworkDatagram_makeReply(const QNetworkDatagram* self, struc return new QNetworkDatagram(self->makeReply(payload_QByteArray)); } -void QNetworkDatagram_setSender2(QNetworkDatagram* self, QHostAddress* address, uint16_t port) { +void QNetworkDatagram_setSender2(QNetworkDatagram* self, QHostAddress* address, unsigned short port) { self->setSender(*address, static_cast(port)); } diff --git a/qt6/network/gen_qnetworkdatagram.go b/qt6/network/gen_qnetworkdatagram.go index 156b85bd..b3fafe93 100644 --- a/qt6/network/gen_qnetworkdatagram.go +++ b/qt6/network/gen_qnetworkdatagram.go @@ -93,7 +93,7 @@ func NewQNetworkDatagram5(data []byte, destinationAddress *QHostAddress, port ui } data_alias.len = C.size_t(len(data)) - return newQNetworkDatagram(C.QNetworkDatagram_new5(data_alias, destinationAddress.cPointer(), (C.uint16_t)(port))) + return newQNetworkDatagram(C.QNetworkDatagram_new5(data_alias, destinationAddress.cPointer(), (C.ushort)(port))) } func (this *QNetworkDatagram) OperatorAssign(other *QNetworkDatagram) { @@ -149,7 +149,7 @@ func (this *QNetworkDatagram) SetSender(address *QHostAddress) { } func (this *QNetworkDatagram) SetDestination(address *QHostAddress, port uint16) { - C.QNetworkDatagram_setDestination(this.h, address.cPointer(), (C.uint16_t)(port)) + C.QNetworkDatagram_setDestination(this.h, address.cPointer(), (C.ushort)(port)) } func (this *QNetworkDatagram) HopLimit() int { @@ -192,7 +192,7 @@ func (this *QNetworkDatagram) MakeReply(payload []byte) *QNetworkDatagram { } func (this *QNetworkDatagram) SetSender2(address *QHostAddress, port uint16) { - C.QNetworkDatagram_setSender2(this.h, address.cPointer(), (C.uint16_t)(port)) + C.QNetworkDatagram_setSender2(this.h, address.cPointer(), (C.ushort)(port)) } // Delete this object from C++ memory. diff --git a/qt6/network/gen_qnetworkdatagram.h b/qt6/network/gen_qnetworkdatagram.h index 377dd3d4..0d860b08 100644 --- a/qt6/network/gen_qnetworkdatagram.h +++ b/qt6/network/gen_qnetworkdatagram.h @@ -26,7 +26,7 @@ QNetworkDatagram* QNetworkDatagram_new(); QNetworkDatagram* QNetworkDatagram_new2(struct miqt_string data); QNetworkDatagram* QNetworkDatagram_new3(QNetworkDatagram* other); QNetworkDatagram* QNetworkDatagram_new4(struct miqt_string data, QHostAddress* destinationAddress); -QNetworkDatagram* QNetworkDatagram_new5(struct miqt_string data, QHostAddress* destinationAddress, uint16_t port); +QNetworkDatagram* QNetworkDatagram_new5(struct miqt_string data, QHostAddress* destinationAddress, unsigned short port); void QNetworkDatagram_operatorAssign(QNetworkDatagram* self, QNetworkDatagram* other); void QNetworkDatagram_swap(QNetworkDatagram* self, QNetworkDatagram* other); void QNetworkDatagram_clear(QNetworkDatagram* self); @@ -39,13 +39,13 @@ QHostAddress* QNetworkDatagram_destinationAddress(const QNetworkDatagram* self); int QNetworkDatagram_senderPort(const QNetworkDatagram* self); int QNetworkDatagram_destinationPort(const QNetworkDatagram* self); void QNetworkDatagram_setSender(QNetworkDatagram* self, QHostAddress* address); -void QNetworkDatagram_setDestination(QNetworkDatagram* self, QHostAddress* address, uint16_t port); +void QNetworkDatagram_setDestination(QNetworkDatagram* self, QHostAddress* address, unsigned short port); int QNetworkDatagram_hopLimit(const QNetworkDatagram* self); void QNetworkDatagram_setHopLimit(QNetworkDatagram* self, int count); struct miqt_string QNetworkDatagram_data(const QNetworkDatagram* self); void QNetworkDatagram_setData(QNetworkDatagram* self, struct miqt_string data); QNetworkDatagram* QNetworkDatagram_makeReply(const QNetworkDatagram* self, struct miqt_string payload); -void QNetworkDatagram_setSender2(QNetworkDatagram* self, QHostAddress* address, uint16_t port); +void QNetworkDatagram_setSender2(QNetworkDatagram* self, QHostAddress* address, unsigned short port); void QNetworkDatagram_delete(QNetworkDatagram* self); #ifdef __cplusplus diff --git a/qt6/network/gen_qnetworkproxy.cpp b/qt6/network/gen_qnetworkproxy.cpp index 6ba9e62c..7b180205 100644 --- a/qt6/network/gen_qnetworkproxy.cpp +++ b/qt6/network/gen_qnetworkproxy.cpp @@ -33,7 +33,7 @@ QNetworkProxyQuery* QNetworkProxyQuery_new3(struct miqt_string hostname, int por return new QNetworkProxyQuery(hostname_QString, static_cast(port)); } -QNetworkProxyQuery* QNetworkProxyQuery_new4(uint16_t bindPort) { +QNetworkProxyQuery* QNetworkProxyQuery_new4(unsigned short bindPort) { return new QNetworkProxyQuery(static_cast(bindPort)); } @@ -57,12 +57,12 @@ QNetworkProxyQuery* QNetworkProxyQuery_new8(struct miqt_string hostname, int por return new QNetworkProxyQuery(hostname_QString, static_cast(port), protocolTag_QString, static_cast(queryType)); } -QNetworkProxyQuery* QNetworkProxyQuery_new9(uint16_t bindPort, struct miqt_string protocolTag) { +QNetworkProxyQuery* QNetworkProxyQuery_new9(unsigned short bindPort, struct miqt_string protocolTag) { QString protocolTag_QString = QString::fromUtf8(protocolTag.data, protocolTag.len); return new QNetworkProxyQuery(static_cast(bindPort), protocolTag_QString); } -QNetworkProxyQuery* QNetworkProxyQuery_new10(uint16_t bindPort, struct miqt_string protocolTag, int queryType) { +QNetworkProxyQuery* QNetworkProxyQuery_new10(unsigned short bindPort, struct miqt_string protocolTag, int queryType) { QString protocolTag_QString = QString::fromUtf8(protocolTag.data, protocolTag.len); return new QNetworkProxyQuery(static_cast(bindPort), protocolTag_QString, static_cast(queryType)); } @@ -169,18 +169,18 @@ QNetworkProxy* QNetworkProxy_new4(int type, struct miqt_string hostName) { return new QNetworkProxy(static_cast(type), hostName_QString); } -QNetworkProxy* QNetworkProxy_new5(int type, struct miqt_string hostName, uint16_t port) { +QNetworkProxy* QNetworkProxy_new5(int type, struct miqt_string hostName, unsigned short port) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); return new QNetworkProxy(static_cast(type), hostName_QString, static_cast(port)); } -QNetworkProxy* QNetworkProxy_new6(int type, struct miqt_string hostName, uint16_t port, struct miqt_string user) { +QNetworkProxy* QNetworkProxy_new6(int type, struct miqt_string hostName, unsigned short port, struct miqt_string user) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); QString user_QString = QString::fromUtf8(user.data, user.len); return new QNetworkProxy(static_cast(type), hostName_QString, static_cast(port), user_QString); } -QNetworkProxy* QNetworkProxy_new7(int type, struct miqt_string hostName, uint16_t port, struct miqt_string user, struct miqt_string password) { +QNetworkProxy* QNetworkProxy_new7(int type, struct miqt_string hostName, unsigned short port, struct miqt_string user, struct miqt_string password) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); QString user_QString = QString::fromUtf8(user.data, user.len); QString password_QString = QString::fromUtf8(password.data, password.len); @@ -277,13 +277,13 @@ struct miqt_string QNetworkProxy_hostName(const QNetworkProxy* self) { return _ms; } -void QNetworkProxy_setPort(QNetworkProxy* self, uint16_t port) { +void QNetworkProxy_setPort(QNetworkProxy* self, unsigned short port) { self->setPort(static_cast(port)); } -uint16_t QNetworkProxy_port(const QNetworkProxy* self) { +unsigned short QNetworkProxy_port(const QNetworkProxy* self) { quint16 _ret = self->port(); - return static_cast(_ret); + return static_cast(_ret); } void QNetworkProxy_setApplicationProxy(QNetworkProxy* proxy) { diff --git a/qt6/network/gen_qnetworkproxy.go b/qt6/network/gen_qnetworkproxy.go index e5c301e3..003b036a 100644 --- a/qt6/network/gen_qnetworkproxy.go +++ b/qt6/network/gen_qnetworkproxy.go @@ -106,7 +106,7 @@ func NewQNetworkProxyQuery3(hostname string, port int) *QNetworkProxyQuery { // NewQNetworkProxyQuery4 constructs a new QNetworkProxyQuery object. func NewQNetworkProxyQuery4(bindPort uint16) *QNetworkProxyQuery { - return newQNetworkProxyQuery(C.QNetworkProxyQuery_new4((C.uint16_t)(bindPort))) + return newQNetworkProxyQuery(C.QNetworkProxyQuery_new4((C.ushort)(bindPort))) } // NewQNetworkProxyQuery5 constructs a new QNetworkProxyQuery object. @@ -156,7 +156,7 @@ func NewQNetworkProxyQuery9(bindPort uint16, protocolTag string) *QNetworkProxyQ protocolTag_ms.len = C.size_t(len(protocolTag)) defer C.free(unsafe.Pointer(protocolTag_ms.data)) - return newQNetworkProxyQuery(C.QNetworkProxyQuery_new9((C.uint16_t)(bindPort), protocolTag_ms)) + return newQNetworkProxyQuery(C.QNetworkProxyQuery_new9((C.ushort)(bindPort), protocolTag_ms)) } // NewQNetworkProxyQuery10 constructs a new QNetworkProxyQuery object. @@ -166,7 +166,7 @@ func NewQNetworkProxyQuery10(bindPort uint16, protocolTag string, queryType QNet protocolTag_ms.len = C.size_t(len(protocolTag)) defer C.free(unsafe.Pointer(protocolTag_ms.data)) - return newQNetworkProxyQuery(C.QNetworkProxyQuery_new10((C.uint16_t)(bindPort), protocolTag_ms, (C.int)(queryType))) + return newQNetworkProxyQuery(C.QNetworkProxyQuery_new10((C.ushort)(bindPort), protocolTag_ms, (C.int)(queryType))) } func (this *QNetworkProxyQuery) OperatorAssign(other *QNetworkProxyQuery) { @@ -330,7 +330,7 @@ func NewQNetworkProxy5(typeVal QNetworkProxy__ProxyType, hostName string, port u hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - return newQNetworkProxy(C.QNetworkProxy_new5((C.int)(typeVal), hostName_ms, (C.uint16_t)(port))) + return newQNetworkProxy(C.QNetworkProxy_new5((C.int)(typeVal), hostName_ms, (C.ushort)(port))) } // NewQNetworkProxy6 constructs a new QNetworkProxy object. @@ -344,7 +344,7 @@ func NewQNetworkProxy6(typeVal QNetworkProxy__ProxyType, hostName string, port u user_ms.len = C.size_t(len(user)) defer C.free(unsafe.Pointer(user_ms.data)) - return newQNetworkProxy(C.QNetworkProxy_new6((C.int)(typeVal), hostName_ms, (C.uint16_t)(port), user_ms)) + return newQNetworkProxy(C.QNetworkProxy_new6((C.int)(typeVal), hostName_ms, (C.ushort)(port), user_ms)) } // NewQNetworkProxy7 constructs a new QNetworkProxy object. @@ -362,7 +362,7 @@ func NewQNetworkProxy7(typeVal QNetworkProxy__ProxyType, hostName string, port u password_ms.len = C.size_t(len(password)) defer C.free(unsafe.Pointer(password_ms.data)) - return newQNetworkProxy(C.QNetworkProxy_new7((C.int)(typeVal), hostName_ms, (C.uint16_t)(port), user_ms, password_ms)) + return newQNetworkProxy(C.QNetworkProxy_new7((C.int)(typeVal), hostName_ms, (C.ushort)(port), user_ms, password_ms)) } func (this *QNetworkProxy) OperatorAssign(other *QNetworkProxy) { @@ -451,7 +451,7 @@ func (this *QNetworkProxy) HostName() string { } func (this *QNetworkProxy) SetPort(port uint16) { - C.QNetworkProxy_setPort(this.h, (C.uint16_t)(port)) + C.QNetworkProxy_setPort(this.h, (C.ushort)(port)) } func (this *QNetworkProxy) Port() uint16 { diff --git a/qt6/network/gen_qnetworkproxy.h b/qt6/network/gen_qnetworkproxy.h index fef73525..d4250d76 100644 --- a/qt6/network/gen_qnetworkproxy.h +++ b/qt6/network/gen_qnetworkproxy.h @@ -31,13 +31,13 @@ typedef struct QVariant QVariant; QNetworkProxyQuery* QNetworkProxyQuery_new(); QNetworkProxyQuery* QNetworkProxyQuery_new2(QUrl* requestUrl); QNetworkProxyQuery* QNetworkProxyQuery_new3(struct miqt_string hostname, int port); -QNetworkProxyQuery* QNetworkProxyQuery_new4(uint16_t bindPort); +QNetworkProxyQuery* QNetworkProxyQuery_new4(unsigned short bindPort); QNetworkProxyQuery* QNetworkProxyQuery_new5(QNetworkProxyQuery* other); QNetworkProxyQuery* QNetworkProxyQuery_new6(QUrl* requestUrl, int queryType); QNetworkProxyQuery* QNetworkProxyQuery_new7(struct miqt_string hostname, int port, struct miqt_string protocolTag); QNetworkProxyQuery* QNetworkProxyQuery_new8(struct miqt_string hostname, int port, struct miqt_string protocolTag, int queryType); -QNetworkProxyQuery* QNetworkProxyQuery_new9(uint16_t bindPort, struct miqt_string protocolTag); -QNetworkProxyQuery* QNetworkProxyQuery_new10(uint16_t bindPort, struct miqt_string protocolTag, int queryType); +QNetworkProxyQuery* QNetworkProxyQuery_new9(unsigned short bindPort, struct miqt_string protocolTag); +QNetworkProxyQuery* QNetworkProxyQuery_new10(unsigned short bindPort, struct miqt_string protocolTag, int queryType); void QNetworkProxyQuery_operatorAssign(QNetworkProxyQuery* self, QNetworkProxyQuery* other); void QNetworkProxyQuery_swap(QNetworkProxyQuery* self, QNetworkProxyQuery* other); bool QNetworkProxyQuery_operatorEqual(const QNetworkProxyQuery* self, QNetworkProxyQuery* other); @@ -60,9 +60,9 @@ QNetworkProxy* QNetworkProxy_new(); QNetworkProxy* QNetworkProxy_new2(int type); QNetworkProxy* QNetworkProxy_new3(QNetworkProxy* other); QNetworkProxy* QNetworkProxy_new4(int type, struct miqt_string hostName); -QNetworkProxy* QNetworkProxy_new5(int type, struct miqt_string hostName, uint16_t port); -QNetworkProxy* QNetworkProxy_new6(int type, struct miqt_string hostName, uint16_t port, struct miqt_string user); -QNetworkProxy* QNetworkProxy_new7(int type, struct miqt_string hostName, uint16_t port, struct miqt_string user, struct miqt_string password); +QNetworkProxy* QNetworkProxy_new5(int type, struct miqt_string hostName, unsigned short port); +QNetworkProxy* QNetworkProxy_new6(int type, struct miqt_string hostName, unsigned short port, struct miqt_string user); +QNetworkProxy* QNetworkProxy_new7(int type, struct miqt_string hostName, unsigned short port, struct miqt_string user, struct miqt_string password); void QNetworkProxy_operatorAssign(QNetworkProxy* self, QNetworkProxy* other); void QNetworkProxy_swap(QNetworkProxy* self, QNetworkProxy* other); bool QNetworkProxy_operatorEqual(const QNetworkProxy* self, QNetworkProxy* other); @@ -79,8 +79,8 @@ void QNetworkProxy_setPassword(QNetworkProxy* self, struct miqt_string password) struct miqt_string QNetworkProxy_password(const QNetworkProxy* self); void QNetworkProxy_setHostName(QNetworkProxy* self, struct miqt_string hostName); struct miqt_string QNetworkProxy_hostName(const QNetworkProxy* self); -void QNetworkProxy_setPort(QNetworkProxy* self, uint16_t port); -uint16_t QNetworkProxy_port(const QNetworkProxy* self); +void QNetworkProxy_setPort(QNetworkProxy* self, unsigned short port); +unsigned short QNetworkProxy_port(const QNetworkProxy* self); void QNetworkProxy_setApplicationProxy(QNetworkProxy* proxy); QNetworkProxy* QNetworkProxy_applicationProxy(); QVariant* QNetworkProxy_header(const QNetworkProxy* self, int header); diff --git a/qt6/network/gen_qsctpsocket.cpp b/qt6/network/gen_qsctpsocket.cpp index dadf8c95..313d6c9c 100644 --- a/qt6/network/gen_qsctpsocket.cpp +++ b/qt6/network/gen_qsctpsocket.cpp @@ -27,8 +27,8 @@ void miqt_exec_callback_QSctpSocket_disconnectFromHost(QSctpSocket*, intptr_t); long long miqt_exec_callback_QSctpSocket_readData(QSctpSocket*, intptr_t, char*, long long); long long miqt_exec_callback_QSctpSocket_readLineData(QSctpSocket*, intptr_t, char*, long long); void miqt_exec_callback_QSctpSocket_resume(QSctpSocket*, intptr_t); -bool miqt_exec_callback_QSctpSocket_bind(QSctpSocket*, intptr_t, QHostAddress*, uint16_t, int); -void miqt_exec_callback_QSctpSocket_connectToHost(QSctpSocket*, intptr_t, struct miqt_string, uint16_t, int, int); +bool miqt_exec_callback_QSctpSocket_bind(QSctpSocket*, intptr_t, QHostAddress*, unsigned short, int); +void miqt_exec_callback_QSctpSocket_connectToHost(QSctpSocket*, intptr_t, struct miqt_string, unsigned short, int, int); long long miqt_exec_callback_QSctpSocket_bytesAvailable(const QSctpSocket*, intptr_t); long long miqt_exec_callback_QSctpSocket_bytesToWrite(const QSctpSocket*, intptr_t); void miqt_exec_callback_QSctpSocket_setReadBufferSize(QSctpSocket*, intptr_t, long long); @@ -176,7 +176,7 @@ public: // Cast returned reference into pointer QHostAddress* sigval1 = const_cast(&address_ret); quint16 port_ret = port; - uint16_t sigval2 = static_cast(port_ret); + unsigned short sigval2 = static_cast(port_ret); QAbstractSocket::BindMode mode_ret = mode; int sigval3 = static_cast(mode_ret); @@ -185,7 +185,7 @@ public: return callback_return_value; } - friend bool QSctpSocket_virtualbase_bind(void* self, QHostAddress* address, uint16_t port, int mode); + friend bool QSctpSocket_virtualbase_bind(void* self, QHostAddress* address, unsigned short port, int mode); // cgo.Handle value for overwritten implementation intptr_t handle__connectToHost = 0; @@ -206,7 +206,7 @@ public: memcpy(hostName_ms.data, hostName_b.data(), hostName_ms.len); struct miqt_string sigval1 = hostName_ms; quint16 port_ret = port; - uint16_t sigval2 = static_cast(port_ret); + unsigned short sigval2 = static_cast(port_ret); QIODeviceBase::OpenMode mode_ret = mode; int sigval3 = static_cast(mode_ret); QAbstractSocket::NetworkLayerProtocol protocol_ret = protocol; @@ -217,7 +217,7 @@ public: } - friend void QSctpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol); + friend void QSctpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol); // cgo.Handle value for overwritten implementation intptr_t handle__bytesAvailable = 0; @@ -745,9 +745,9 @@ public: // Wrappers to allow calling protected methods: friend void QSctpSocket_protectedbase_setSocketState(bool* _dynamic_cast_ok, void* self, int state); friend void QSctpSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, int socketError); - friend void QSctpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port); + friend void QSctpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port); friend void QSctpSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); - friend void QSctpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port); + friend void QSctpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port); friend void QSctpSocket_protectedbase_setPeerAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); friend void QSctpSocket_protectedbase_setPeerName(bool* _dynamic_cast_ok, void* self, struct miqt_string name); friend void QSctpSocket_protectedbase_setOpenMode(bool* _dynamic_cast_ok, void* self, int openMode); @@ -931,7 +931,7 @@ bool QSctpSocket_override_virtual_bind(void* self, intptr_t slot) { return true; } -bool QSctpSocket_virtualbase_bind(void* self, QHostAddress* address, uint16_t port, int mode) { +bool QSctpSocket_virtualbase_bind(void* self, QHostAddress* address, unsigned short port, int mode) { return ( (MiqtVirtualQSctpSocket*)(self) )->QSctpSocket::bind(*address, static_cast(port), static_cast(mode)); @@ -947,7 +947,7 @@ bool QSctpSocket_override_virtual_connectToHost(void* self, intptr_t slot) { return true; } -void QSctpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol) { +void QSctpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); ( (MiqtVirtualQSctpSocket*)(self) )->QSctpSocket::connectToHost(hostName_QString, static_cast(port), static_cast(mode), static_cast(protocol)); @@ -1435,7 +1435,7 @@ void QSctpSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self } -void QSctpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port) { +void QSctpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port) { MiqtVirtualQSctpSocket* self_cast = dynamic_cast( (QSctpSocket*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; @@ -1461,7 +1461,7 @@ void QSctpSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* sel } -void QSctpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port) { +void QSctpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port) { MiqtVirtualQSctpSocket* self_cast = dynamic_cast( (QSctpSocket*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; diff --git a/qt6/network/gen_qsctpsocket.go b/qt6/network/gen_qsctpsocket.go index 989d2f86..8a3dcdb6 100644 --- a/qt6/network/gen_qsctpsocket.go +++ b/qt6/network/gen_qsctpsocket.go @@ -162,7 +162,7 @@ func (this *QSctpSocket) SetSocketError(socketError QAbstractSocket__SocketError func (this *QSctpSocket) SetLocalPort(port uint16) { var _dynamic_cast_ok C.bool = false - C.QSctpSocket_protectedbase_setLocalPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uint16_t)(port)) + C.QSctpSocket_protectedbase_setLocalPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.ushort)(port)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -186,7 +186,7 @@ func (this *QSctpSocket) SetLocalAddress(address *QHostAddress) { func (this *QSctpSocket) SetPeerPort(port uint16) { var _dynamic_cast_ok C.bool = false - C.QSctpSocket_protectedbase_setPeerPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uint16_t)(port)) + C.QSctpSocket_protectedbase_setPeerPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.ushort)(port)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -445,7 +445,7 @@ func miqt_exec_callback_QSctpSocket_resume(self *C.QSctpSocket, cb C.intptr_t) { func (this *QSctpSocket) callVirtualBase_Bind(address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool { - return (bool)(C.QSctpSocket_virtualbase_bind(unsafe.Pointer(this.h), address.cPointer(), (C.uint16_t)(port), (C.int)(mode))) + return (bool)(C.QSctpSocket_virtualbase_bind(unsafe.Pointer(this.h), address.cPointer(), (C.ushort)(port), (C.int)(mode))) } func (this *QSctpSocket) OnBind(slot func(super func(address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool, address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool) { @@ -456,7 +456,7 @@ func (this *QSctpSocket) OnBind(slot func(super func(address *QHostAddress, port } //export miqt_exec_callback_QSctpSocket_bind -func miqt_exec_callback_QSctpSocket_bind(self *C.QSctpSocket, cb C.intptr_t, address *C.QHostAddress, port C.uint16_t, mode C.int) C.bool { +func miqt_exec_callback_QSctpSocket_bind(self *C.QSctpSocket, cb C.intptr_t, address *C.QHostAddress, port C.ushort, mode C.int) C.bool { gofunc, ok := cgo.Handle(cb).Value().(func(super func(address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool, address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -481,7 +481,7 @@ func (this *QSctpSocket) callVirtualBase_ConnectToHost(hostName string, port uin hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QSctpSocket_virtualbase_connectToHost(unsafe.Pointer(this.h), hostName_ms, (C.uint16_t)(port), (C.int)(mode), (C.int)(protocol)) + C.QSctpSocket_virtualbase_connectToHost(unsafe.Pointer(this.h), hostName_ms, (C.ushort)(port), (C.int)(mode), (C.int)(protocol)) } func (this *QSctpSocket) OnConnectToHost(slot func(super func(hostName string, port uint16, mode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol), hostName string, port uint16, mode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol)) { @@ -492,7 +492,7 @@ func (this *QSctpSocket) OnConnectToHost(slot func(super func(hostName string, p } //export miqt_exec_callback_QSctpSocket_connectToHost -func miqt_exec_callback_QSctpSocket_connectToHost(self *C.QSctpSocket, cb C.intptr_t, hostName C.struct_miqt_string, port C.uint16_t, mode C.int, protocol C.int) { +func miqt_exec_callback_QSctpSocket_connectToHost(self *C.QSctpSocket, cb C.intptr_t, hostName C.struct_miqt_string, port C.ushort, mode C.int, protocol C.int) { gofunc, ok := cgo.Handle(cb).Value().(func(super func(hostName string, port uint16, mode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol), hostName string, port uint16, mode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt6/network/gen_qsctpsocket.h b/qt6/network/gen_qsctpsocket.h index 11054edf..27f55109 100644 --- a/qt6/network/gen_qsctpsocket.h +++ b/qt6/network/gen_qsctpsocket.h @@ -74,9 +74,9 @@ long long QSctpSocket_virtualbase_readLineData(void* self, char* data, long long bool QSctpSocket_override_virtual_resume(void* self, intptr_t slot); void QSctpSocket_virtualbase_resume(void* self); bool QSctpSocket_override_virtual_bind(void* self, intptr_t slot); -bool QSctpSocket_virtualbase_bind(void* self, QHostAddress* address, uint16_t port, int mode); +bool QSctpSocket_virtualbase_bind(void* self, QHostAddress* address, unsigned short port, int mode); bool QSctpSocket_override_virtual_connectToHost(void* self, intptr_t slot); -void QSctpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol); +void QSctpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol); bool QSctpSocket_override_virtual_bytesAvailable(void* self, intptr_t slot); long long QSctpSocket_virtualbase_bytesAvailable(const void* self); bool QSctpSocket_override_virtual_bytesToWrite(void* self, intptr_t slot); @@ -135,9 +135,9 @@ bool QSctpSocket_override_virtual_disconnectNotify(void* self, intptr_t slot); void QSctpSocket_virtualbase_disconnectNotify(void* self, QMetaMethod* signal); void QSctpSocket_protectedbase_setSocketState(bool* _dynamic_cast_ok, void* self, int state); void QSctpSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, int socketError); -void QSctpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port); +void QSctpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port); void QSctpSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); -void QSctpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port); +void QSctpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port); void QSctpSocket_protectedbase_setPeerAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); void QSctpSocket_protectedbase_setPeerName(bool* _dynamic_cast_ok, void* self, struct miqt_string name); void QSctpSocket_protectedbase_setOpenMode(bool* _dynamic_cast_ok, void* self, int openMode); diff --git a/qt6/network/gen_qsslsocket.cpp b/qt6/network/gen_qsslsocket.cpp index 3abccd05..4a84c5ae 100644 --- a/qt6/network/gen_qsslsocket.cpp +++ b/qt6/network/gen_qsslsocket.cpp @@ -42,7 +42,7 @@ void miqt_exec_callback_QSslSocket_alertReceived(intptr_t, int, int, struct miqt void miqt_exec_callback_QSslSocket_handshakeInterruptedOnError(intptr_t, QSslError*); void miqt_exec_callback_QSslSocket_resume(QSslSocket*, intptr_t); bool miqt_exec_callback_QSslSocket_setSocketDescriptor(QSslSocket*, intptr_t, intptr_t, int, int); -void miqt_exec_callback_QSslSocket_connectToHost(QSslSocket*, intptr_t, struct miqt_string, uint16_t, int, int); +void miqt_exec_callback_QSslSocket_connectToHost(QSslSocket*, intptr_t, struct miqt_string, unsigned short, int, int); void miqt_exec_callback_QSslSocket_disconnectFromHost(QSslSocket*, intptr_t); void miqt_exec_callback_QSslSocket_setSocketOption(QSslSocket*, intptr_t, int, QVariant*); QVariant* miqt_exec_callback_QSslSocket_socketOption(QSslSocket*, intptr_t, int); @@ -59,7 +59,7 @@ bool miqt_exec_callback_QSslSocket_waitForDisconnected(QSslSocket*, intptr_t, in long long miqt_exec_callback_QSslSocket_readData(QSslSocket*, intptr_t, char*, long long); long long miqt_exec_callback_QSslSocket_skipData(QSslSocket*, intptr_t, long long); long long miqt_exec_callback_QSslSocket_writeData(QSslSocket*, intptr_t, const char*, long long); -bool miqt_exec_callback_QSslSocket_bind(QSslSocket*, intptr_t, QHostAddress*, uint16_t, int); +bool miqt_exec_callback_QSslSocket_bind(QSslSocket*, intptr_t, QHostAddress*, unsigned short, int); intptr_t miqt_exec_callback_QSslSocket_socketDescriptor(const QSslSocket*, intptr_t); bool miqt_exec_callback_QSslSocket_isSequential(const QSslSocket*, intptr_t); long long miqt_exec_callback_QSslSocket_readLineData(QSslSocket*, intptr_t, char*, long long); @@ -147,7 +147,7 @@ public: memcpy(hostName_ms.data, hostName_b.data(), hostName_ms.len); struct miqt_string sigval1 = hostName_ms; quint16 port_ret = port; - uint16_t sigval2 = static_cast(port_ret); + unsigned short sigval2 = static_cast(port_ret); QIODeviceBase::OpenMode openMode_ret = openMode; int sigval3 = static_cast(openMode_ret); QAbstractSocket::NetworkLayerProtocol protocol_ret = protocol; @@ -158,7 +158,7 @@ public: } - friend void QSslSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int openMode, int protocol); + friend void QSslSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int openMode, int protocol); // cgo.Handle value for overwritten implementation intptr_t handle__disconnectFromHost = 0; @@ -470,7 +470,7 @@ public: // Cast returned reference into pointer QHostAddress* sigval1 = const_cast(&address_ret); quint16 port_ret = port; - uint16_t sigval2 = static_cast(port_ret); + unsigned short sigval2 = static_cast(port_ret); QAbstractSocket::BindMode mode_ret = mode; int sigval3 = static_cast(mode_ret); @@ -479,7 +479,7 @@ public: return callback_return_value; } - friend bool QSslSocket_virtualbase_bind(void* self, QHostAddress* address, uint16_t port, int mode); + friend bool QSslSocket_virtualbase_bind(void* self, QHostAddress* address, unsigned short port, int mode); // cgo.Handle value for overwritten implementation intptr_t handle__socketDescriptor = 0; @@ -763,9 +763,9 @@ public: // Wrappers to allow calling protected methods: friend void QSslSocket_protectedbase_setSocketState(bool* _dynamic_cast_ok, void* self, int state); friend void QSslSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, int socketError); - friend void QSslSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port); + friend void QSslSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port); friend void QSslSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); - friend void QSslSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port); + friend void QSslSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port); friend void QSslSocket_protectedbase_setPeerAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); friend void QSslSocket_protectedbase_setPeerName(bool* _dynamic_cast_ok, void* self, struct miqt_string name); friend void QSslSocket_protectedbase_setOpenMode(bool* _dynamic_cast_ok, void* self, int openMode); @@ -811,12 +811,12 @@ void QSslSocket_resume(QSslSocket* self) { self->resume(); } -void QSslSocket_connectToHostEncrypted(QSslSocket* self, struct miqt_string hostName, uint16_t port) { +void QSslSocket_connectToHostEncrypted(QSslSocket* self, struct miqt_string hostName, unsigned short port) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); self->connectToHostEncrypted(hostName_QString, static_cast(port)); } -void QSslSocket_connectToHostEncrypted2(QSslSocket* self, struct miqt_string hostName, uint16_t port, struct miqt_string sslPeerName) { +void QSslSocket_connectToHostEncrypted2(QSslSocket* self, struct miqt_string hostName, unsigned short port, struct miqt_string sslPeerName) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); QString sslPeerName_QString = QString::fromUtf8(sslPeerName.data, sslPeerName.len); self->connectToHostEncrypted(hostName_QString, static_cast(port), sslPeerName_QString); @@ -826,7 +826,7 @@ bool QSslSocket_setSocketDescriptor(QSslSocket* self, intptr_t socketDescriptor, return self->setSocketDescriptor((qintptr)(socketDescriptor), static_cast(state), static_cast(openMode)); } -void QSslSocket_connectToHost(QSslSocket* self, struct miqt_string hostName, uint16_t port, int openMode, int protocol) { +void QSslSocket_connectToHost(QSslSocket* self, struct miqt_string hostName, unsigned short port, int openMode, int protocol) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); self->connectToHost(hostName_QString, static_cast(port), static_cast(openMode), static_cast(protocol)); } @@ -1384,23 +1384,23 @@ struct miqt_string QSslSocket_tr3(const char* s, const char* c, int n) { return _ms; } -void QSslSocket_connectToHostEncrypted3(QSslSocket* self, struct miqt_string hostName, uint16_t port, int mode) { +void QSslSocket_connectToHostEncrypted3(QSslSocket* self, struct miqt_string hostName, unsigned short port, int mode) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); self->connectToHostEncrypted(hostName_QString, static_cast(port), static_cast(mode)); } -void QSslSocket_connectToHostEncrypted4(QSslSocket* self, struct miqt_string hostName, uint16_t port, int mode, int protocol) { +void QSslSocket_connectToHostEncrypted4(QSslSocket* self, struct miqt_string hostName, unsigned short port, int mode, int protocol) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); self->connectToHostEncrypted(hostName_QString, static_cast(port), static_cast(mode), static_cast(protocol)); } -void QSslSocket_connectToHostEncrypted5(QSslSocket* self, struct miqt_string hostName, uint16_t port, struct miqt_string sslPeerName, int mode) { +void QSslSocket_connectToHostEncrypted5(QSslSocket* self, struct miqt_string hostName, unsigned short port, struct miqt_string sslPeerName, int mode) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); QString sslPeerName_QString = QString::fromUtf8(sslPeerName.data, sslPeerName.len); self->connectToHostEncrypted(hostName_QString, static_cast(port), sslPeerName_QString, static_cast(mode)); } -void QSslSocket_connectToHostEncrypted6(QSslSocket* self, struct miqt_string hostName, uint16_t port, struct miqt_string sslPeerName, int mode, int protocol) { +void QSslSocket_connectToHostEncrypted6(QSslSocket* self, struct miqt_string hostName, unsigned short port, struct miqt_string sslPeerName, int mode, int protocol) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); QString sslPeerName_QString = QString::fromUtf8(sslPeerName.data, sslPeerName.len); self->connectToHostEncrypted(hostName_QString, static_cast(port), sslPeerName_QString, static_cast(mode), static_cast(protocol)); @@ -1533,7 +1533,7 @@ bool QSslSocket_override_virtual_connectToHost(void* self, intptr_t slot) { return true; } -void QSslSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int openMode, int protocol) { +void QSslSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int openMode, int protocol) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); ( (MiqtVirtualQSslSocket*)(self) )->QSslSocket::connectToHost(hostName_QString, static_cast(port), static_cast(openMode), static_cast(protocol)); @@ -1811,7 +1811,7 @@ bool QSslSocket_override_virtual_bind(void* self, intptr_t slot) { return true; } -bool QSslSocket_virtualbase_bind(void* self, QHostAddress* address, uint16_t port, int mode) { +bool QSslSocket_virtualbase_bind(void* self, QHostAddress* address, unsigned short port, int mode) { return ( (MiqtVirtualQSslSocket*)(self) )->QSslSocket::bind(*address, static_cast(port), static_cast(mode)); @@ -2087,7 +2087,7 @@ void QSslSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, } -void QSslSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port) { +void QSslSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port) { MiqtVirtualQSslSocket* self_cast = dynamic_cast( (QSslSocket*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; @@ -2113,7 +2113,7 @@ void QSslSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self } -void QSslSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port) { +void QSslSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port) { MiqtVirtualQSslSocket* self_cast = dynamic_cast( (QSslSocket*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; diff --git a/qt6/network/gen_qsslsocket.go b/qt6/network/gen_qsslsocket.go index f21175f2..56a5ef23 100644 --- a/qt6/network/gen_qsslsocket.go +++ b/qt6/network/gen_qsslsocket.go @@ -108,7 +108,7 @@ func (this *QSslSocket) ConnectToHostEncrypted(hostName string, port uint16) { hostName_ms.data = C.CString(hostName) hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QSslSocket_connectToHostEncrypted(this.h, hostName_ms, (C.uint16_t)(port)) + C.QSslSocket_connectToHostEncrypted(this.h, hostName_ms, (C.ushort)(port)) } func (this *QSslSocket) ConnectToHostEncrypted2(hostName string, port uint16, sslPeerName string) { @@ -120,7 +120,7 @@ func (this *QSslSocket) ConnectToHostEncrypted2(hostName string, port uint16, ss sslPeerName_ms.data = C.CString(sslPeerName) sslPeerName_ms.len = C.size_t(len(sslPeerName)) defer C.free(unsafe.Pointer(sslPeerName_ms.data)) - C.QSslSocket_connectToHostEncrypted2(this.h, hostName_ms, (C.uint16_t)(port), sslPeerName_ms) + C.QSslSocket_connectToHostEncrypted2(this.h, hostName_ms, (C.ushort)(port), sslPeerName_ms) } func (this *QSslSocket) SetSocketDescriptor(socketDescriptor uintptr, state QAbstractSocket__SocketState, openMode qt6.QIODeviceBase__OpenModeFlag) bool { @@ -132,7 +132,7 @@ func (this *QSslSocket) ConnectToHost(hostName string, port uint16, openMode qt6 hostName_ms.data = C.CString(hostName) hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QSslSocket_connectToHost(this.h, hostName_ms, (C.uint16_t)(port), (C.int)(openMode), (C.int)(protocol)) + C.QSslSocket_connectToHost(this.h, hostName_ms, (C.ushort)(port), (C.int)(openMode), (C.int)(protocol)) } func (this *QSslSocket) DisconnectFromHost() { @@ -747,7 +747,7 @@ func (this *QSslSocket) ConnectToHostEncrypted3(hostName string, port uint16, mo hostName_ms.data = C.CString(hostName) hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QSslSocket_connectToHostEncrypted3(this.h, hostName_ms, (C.uint16_t)(port), (C.int)(mode)) + C.QSslSocket_connectToHostEncrypted3(this.h, hostName_ms, (C.ushort)(port), (C.int)(mode)) } func (this *QSslSocket) ConnectToHostEncrypted4(hostName string, port uint16, mode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol) { @@ -755,7 +755,7 @@ func (this *QSslSocket) ConnectToHostEncrypted4(hostName string, port uint16, mo hostName_ms.data = C.CString(hostName) hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QSslSocket_connectToHostEncrypted4(this.h, hostName_ms, (C.uint16_t)(port), (C.int)(mode), (C.int)(protocol)) + C.QSslSocket_connectToHostEncrypted4(this.h, hostName_ms, (C.ushort)(port), (C.int)(mode), (C.int)(protocol)) } func (this *QSslSocket) ConnectToHostEncrypted5(hostName string, port uint16, sslPeerName string, mode qt6.QIODeviceBase__OpenModeFlag) { @@ -767,7 +767,7 @@ func (this *QSslSocket) ConnectToHostEncrypted5(hostName string, port uint16, ss sslPeerName_ms.data = C.CString(sslPeerName) sslPeerName_ms.len = C.size_t(len(sslPeerName)) defer C.free(unsafe.Pointer(sslPeerName_ms.data)) - C.QSslSocket_connectToHostEncrypted5(this.h, hostName_ms, (C.uint16_t)(port), sslPeerName_ms, (C.int)(mode)) + C.QSslSocket_connectToHostEncrypted5(this.h, hostName_ms, (C.ushort)(port), sslPeerName_ms, (C.int)(mode)) } func (this *QSslSocket) ConnectToHostEncrypted6(hostName string, port uint16, sslPeerName string, mode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol) { @@ -779,7 +779,7 @@ func (this *QSslSocket) ConnectToHostEncrypted6(hostName string, port uint16, ss sslPeerName_ms.data = C.CString(sslPeerName) sslPeerName_ms.len = C.size_t(len(sslPeerName)) defer C.free(unsafe.Pointer(sslPeerName_ms.data)) - C.QSslSocket_connectToHostEncrypted6(this.h, hostName_ms, (C.uint16_t)(port), sslPeerName_ms, (C.int)(mode), (C.int)(protocol)) + C.QSslSocket_connectToHostEncrypted6(this.h, hostName_ms, (C.ushort)(port), sslPeerName_ms, (C.int)(mode), (C.int)(protocol)) } func (this *QSslSocket) SetLocalCertificate2(fileName string, format QSsl__EncodingFormat) { @@ -919,7 +919,7 @@ func (this *QSslSocket) SetSocketError(socketError QAbstractSocket__SocketError) func (this *QSslSocket) SetLocalPort(port uint16) { var _dynamic_cast_ok C.bool = false - C.QSslSocket_protectedbase_setLocalPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uint16_t)(port)) + C.QSslSocket_protectedbase_setLocalPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.ushort)(port)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -943,7 +943,7 @@ func (this *QSslSocket) SetLocalAddress(address *QHostAddress) { func (this *QSslSocket) SetPeerPort(port uint16) { var _dynamic_cast_ok C.bool = false - C.QSslSocket_protectedbase_setPeerPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uint16_t)(port)) + C.QSslSocket_protectedbase_setPeerPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.ushort)(port)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -1126,7 +1126,7 @@ func (this *QSslSocket) callVirtualBase_ConnectToHost(hostName string, port uint hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QSslSocket_virtualbase_connectToHost(unsafe.Pointer(this.h), hostName_ms, (C.uint16_t)(port), (C.int)(openMode), (C.int)(protocol)) + C.QSslSocket_virtualbase_connectToHost(unsafe.Pointer(this.h), hostName_ms, (C.ushort)(port), (C.int)(openMode), (C.int)(protocol)) } func (this *QSslSocket) OnConnectToHost(slot func(super func(hostName string, port uint16, openMode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol), hostName string, port uint16, openMode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol)) { @@ -1137,7 +1137,7 @@ func (this *QSslSocket) OnConnectToHost(slot func(super func(hostName string, po } //export miqt_exec_callback_QSslSocket_connectToHost -func miqt_exec_callback_QSslSocket_connectToHost(self *C.QSslSocket, cb C.intptr_t, hostName C.struct_miqt_string, port C.uint16_t, openMode C.int, protocol C.int) { +func miqt_exec_callback_QSslSocket_connectToHost(self *C.QSslSocket, cb C.intptr_t, hostName C.struct_miqt_string, port C.ushort, openMode C.int, protocol C.int) { gofunc, ok := cgo.Handle(cb).Value().(func(super func(hostName string, port uint16, openMode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol), hostName string, port uint16, openMode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -1596,7 +1596,7 @@ func miqt_exec_callback_QSslSocket_writeData(self *C.QSslSocket, cb C.intptr_t, func (this *QSslSocket) callVirtualBase_Bind(address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool { - return (bool)(C.QSslSocket_virtualbase_bind(unsafe.Pointer(this.h), address.cPointer(), (C.uint16_t)(port), (C.int)(mode))) + return (bool)(C.QSslSocket_virtualbase_bind(unsafe.Pointer(this.h), address.cPointer(), (C.ushort)(port), (C.int)(mode))) } func (this *QSslSocket) OnBind(slot func(super func(address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool, address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool) { @@ -1607,7 +1607,7 @@ func (this *QSslSocket) OnBind(slot func(super func(address *QHostAddress, port } //export miqt_exec_callback_QSslSocket_bind -func miqt_exec_callback_QSslSocket_bind(self *C.QSslSocket, cb C.intptr_t, address *C.QHostAddress, port C.uint16_t, mode C.int) C.bool { +func miqt_exec_callback_QSslSocket_bind(self *C.QSslSocket, cb C.intptr_t, address *C.QHostAddress, port C.ushort, mode C.int) C.bool { gofunc, ok := cgo.Handle(cb).Value().(func(super func(address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool, address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt6/network/gen_qsslsocket.h b/qt6/network/gen_qsslsocket.h index 54d540e9..d2deee2c 100644 --- a/qt6/network/gen_qsslsocket.h +++ b/qt6/network/gen_qsslsocket.h @@ -65,10 +65,10 @@ QMetaObject* QSslSocket_metaObject(const QSslSocket* self); void* QSslSocket_metacast(QSslSocket* self, const char* param1); struct miqt_string QSslSocket_tr(const char* s); void QSslSocket_resume(QSslSocket* self); -void QSslSocket_connectToHostEncrypted(QSslSocket* self, struct miqt_string hostName, uint16_t port); -void QSslSocket_connectToHostEncrypted2(QSslSocket* self, struct miqt_string hostName, uint16_t port, struct miqt_string sslPeerName); +void QSslSocket_connectToHostEncrypted(QSslSocket* self, struct miqt_string hostName, unsigned short port); +void QSslSocket_connectToHostEncrypted2(QSslSocket* self, struct miqt_string hostName, unsigned short port, struct miqt_string sslPeerName); bool QSslSocket_setSocketDescriptor(QSslSocket* self, intptr_t socketDescriptor, int state, int openMode); -void QSslSocket_connectToHost(QSslSocket* self, struct miqt_string hostName, uint16_t port, int openMode, int protocol); +void QSslSocket_connectToHost(QSslSocket* self, struct miqt_string hostName, unsigned short port, int openMode, int protocol); void QSslSocket_disconnectFromHost(QSslSocket* self); void QSslSocket_setSocketOption(QSslSocket* self, int option, QVariant* value); QVariant* QSslSocket_socketOption(QSslSocket* self, int option); @@ -155,10 +155,10 @@ long long QSslSocket_skipData(QSslSocket* self, long long maxSize); long long QSslSocket_writeData(QSslSocket* self, const char* data, long long len); struct miqt_string QSslSocket_tr2(const char* s, const char* c); struct miqt_string QSslSocket_tr3(const char* s, const char* c, int n); -void QSslSocket_connectToHostEncrypted3(QSslSocket* self, struct miqt_string hostName, uint16_t port, int mode); -void QSslSocket_connectToHostEncrypted4(QSslSocket* self, struct miqt_string hostName, uint16_t port, int mode, int protocol); -void QSslSocket_connectToHostEncrypted5(QSslSocket* self, struct miqt_string hostName, uint16_t port, struct miqt_string sslPeerName, int mode); -void QSslSocket_connectToHostEncrypted6(QSslSocket* self, struct miqt_string hostName, uint16_t port, struct miqt_string sslPeerName, int mode, int protocol); +void QSslSocket_connectToHostEncrypted3(QSslSocket* self, struct miqt_string hostName, unsigned short port, int mode); +void QSslSocket_connectToHostEncrypted4(QSslSocket* self, struct miqt_string hostName, unsigned short port, int mode, int protocol); +void QSslSocket_connectToHostEncrypted5(QSslSocket* self, struct miqt_string hostName, unsigned short port, struct miqt_string sslPeerName, int mode); +void QSslSocket_connectToHostEncrypted6(QSslSocket* self, struct miqt_string hostName, unsigned short port, struct miqt_string sslPeerName, int mode, int protocol); void QSslSocket_setLocalCertificate2(QSslSocket* self, struct miqt_string fileName, int format); void QSslSocket_setPrivateKey2(QSslSocket* self, struct miqt_string fileName, int algorithm); void QSslSocket_setPrivateKey3(QSslSocket* self, struct miqt_string fileName, int algorithm, int format); @@ -175,7 +175,7 @@ void QSslSocket_virtualbase_resume(void* self); bool QSslSocket_override_virtual_setSocketDescriptor(void* self, intptr_t slot); bool QSslSocket_virtualbase_setSocketDescriptor(void* self, intptr_t socketDescriptor, int state, int openMode); bool QSslSocket_override_virtual_connectToHost(void* self, intptr_t slot); -void QSslSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int openMode, int protocol); +void QSslSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int openMode, int protocol); bool QSslSocket_override_virtual_disconnectFromHost(void* self, intptr_t slot); void QSslSocket_virtualbase_disconnectFromHost(void* self); bool QSslSocket_override_virtual_setSocketOption(void* self, intptr_t slot); @@ -209,7 +209,7 @@ long long QSslSocket_virtualbase_skipData(void* self, long long maxSize); bool QSslSocket_override_virtual_writeData(void* self, intptr_t slot); long long QSslSocket_virtualbase_writeData(void* self, const char* data, long long len); bool QSslSocket_override_virtual_bind(void* self, intptr_t slot); -bool QSslSocket_virtualbase_bind(void* self, QHostAddress* address, uint16_t port, int mode); +bool QSslSocket_virtualbase_bind(void* self, QHostAddress* address, unsigned short port, int mode); bool QSslSocket_override_virtual_socketDescriptor(void* self, intptr_t slot); intptr_t QSslSocket_virtualbase_socketDescriptor(const void* self); bool QSslSocket_override_virtual_isSequential(void* self, intptr_t slot); @@ -242,9 +242,9 @@ bool QSslSocket_override_virtual_disconnectNotify(void* self, intptr_t slot); void QSslSocket_virtualbase_disconnectNotify(void* self, QMetaMethod* signal); void QSslSocket_protectedbase_setSocketState(bool* _dynamic_cast_ok, void* self, int state); void QSslSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, int socketError); -void QSslSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port); +void QSslSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port); void QSslSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); -void QSslSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port); +void QSslSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port); void QSslSocket_protectedbase_setPeerAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); void QSslSocket_protectedbase_setPeerName(bool* _dynamic_cast_ok, void* self, struct miqt_string name); void QSslSocket_protectedbase_setOpenMode(bool* _dynamic_cast_ok, void* self, int openMode); diff --git a/qt6/network/gen_qtcpserver.cpp b/qt6/network/gen_qtcpserver.cpp index 9df0329e..5dc4a33e 100644 --- a/qt6/network/gen_qtcpserver.cpp +++ b/qt6/network/gen_qtcpserver.cpp @@ -299,9 +299,9 @@ int QTcpServer_listenBacklogSize(const QTcpServer* self) { return self->listenBacklogSize(); } -uint16_t QTcpServer_serverPort(const QTcpServer* self) { +unsigned short QTcpServer_serverPort(const QTcpServer* self) { quint16 _ret = self->serverPort(); - return static_cast(_ret); + return static_cast(_ret); } QHostAddress* QTcpServer_serverAddress(const QTcpServer* self) { @@ -409,7 +409,7 @@ bool QTcpServer_listenWithAddress(QTcpServer* self, QHostAddress* address) { return self->listen(*address); } -bool QTcpServer_listen2(QTcpServer* self, QHostAddress* address, uint16_t port) { +bool QTcpServer_listen2(QTcpServer* self, QHostAddress* address, unsigned short port) { return self->listen(*address, static_cast(port)); } diff --git a/qt6/network/gen_qtcpserver.go b/qt6/network/gen_qtcpserver.go index cb3e1c3c..7178f6a8 100644 --- a/qt6/network/gen_qtcpserver.go +++ b/qt6/network/gen_qtcpserver.go @@ -233,7 +233,7 @@ func (this *QTcpServer) ListenWithAddress(address *QHostAddress) bool { } func (this *QTcpServer) Listen2(address *QHostAddress, port uint16) bool { - return (bool)(C.QTcpServer_listen2(this.h, address.cPointer(), (C.uint16_t)(port))) + return (bool)(C.QTcpServer_listen2(this.h, address.cPointer(), (C.ushort)(port))) } func (this *QTcpServer) WaitForNewConnectionWithMsec(msec int) bool { diff --git a/qt6/network/gen_qtcpserver.h b/qt6/network/gen_qtcpserver.h index 1740f8de..b0dd14a0 100644 --- a/qt6/network/gen_qtcpserver.h +++ b/qt6/network/gen_qtcpserver.h @@ -51,7 +51,7 @@ void QTcpServer_setMaxPendingConnections(QTcpServer* self, int numConnections); int QTcpServer_maxPendingConnections(const QTcpServer* self); void QTcpServer_setListenBacklogSize(QTcpServer* self, int size); int QTcpServer_listenBacklogSize(const QTcpServer* self); -uint16_t QTcpServer_serverPort(const QTcpServer* self); +unsigned short QTcpServer_serverPort(const QTcpServer* self); QHostAddress* QTcpServer_serverAddress(const QTcpServer* self); intptr_t QTcpServer_socketDescriptor(const QTcpServer* self); bool QTcpServer_setSocketDescriptor(QTcpServer* self, intptr_t socketDescriptor); @@ -72,7 +72,7 @@ void QTcpServer_connect_acceptError(QTcpServer* self, intptr_t slot); struct miqt_string QTcpServer_tr2(const char* s, const char* c); struct miqt_string QTcpServer_tr3(const char* s, const char* c, int n); bool QTcpServer_listenWithAddress(QTcpServer* self, QHostAddress* address); -bool QTcpServer_listen2(QTcpServer* self, QHostAddress* address, uint16_t port); +bool QTcpServer_listen2(QTcpServer* self, QHostAddress* address, unsigned short port); bool QTcpServer_waitForNewConnectionWithMsec(QTcpServer* self, int msec); bool QTcpServer_waitForNewConnection2(QTcpServer* self, int msec, bool* timedOut); bool QTcpServer_override_virtual_hasPendingConnections(void* self, intptr_t slot); diff --git a/qt6/network/gen_qtcpsocket.cpp b/qt6/network/gen_qtcpsocket.cpp index b0b9e67b..c9d8c90a 100644 --- a/qt6/network/gen_qtcpsocket.cpp +++ b/qt6/network/gen_qtcpsocket.cpp @@ -21,8 +21,8 @@ extern "C" { #endif void miqt_exec_callback_QTcpSocket_resume(QTcpSocket*, intptr_t); -bool miqt_exec_callback_QTcpSocket_bind(QTcpSocket*, intptr_t, QHostAddress*, uint16_t, int); -void miqt_exec_callback_QTcpSocket_connectToHost(QTcpSocket*, intptr_t, struct miqt_string, uint16_t, int, int); +bool miqt_exec_callback_QTcpSocket_bind(QTcpSocket*, intptr_t, QHostAddress*, unsigned short, int); +void miqt_exec_callback_QTcpSocket_connectToHost(QTcpSocket*, intptr_t, struct miqt_string, unsigned short, int, int); void miqt_exec_callback_QTcpSocket_disconnectFromHost(QTcpSocket*, intptr_t); long long miqt_exec_callback_QTcpSocket_bytesAvailable(const QTcpSocket*, intptr_t); long long miqt_exec_callback_QTcpSocket_bytesToWrite(const QTcpSocket*, intptr_t); @@ -98,7 +98,7 @@ public: // Cast returned reference into pointer QHostAddress* sigval1 = const_cast(&address_ret); quint16 port_ret = port; - uint16_t sigval2 = static_cast(port_ret); + unsigned short sigval2 = static_cast(port_ret); QAbstractSocket::BindMode mode_ret = mode; int sigval3 = static_cast(mode_ret); @@ -107,7 +107,7 @@ public: return callback_return_value; } - friend bool QTcpSocket_virtualbase_bind(void* self, QHostAddress* address, uint16_t port, int mode); + friend bool QTcpSocket_virtualbase_bind(void* self, QHostAddress* address, unsigned short port, int mode); // cgo.Handle value for overwritten implementation intptr_t handle__connectToHost = 0; @@ -128,7 +128,7 @@ public: memcpy(hostName_ms.data, hostName_b.data(), hostName_ms.len); struct miqt_string sigval1 = hostName_ms; quint16 port_ret = port; - uint16_t sigval2 = static_cast(port_ret); + unsigned short sigval2 = static_cast(port_ret); QIODeviceBase::OpenMode mode_ret = mode; int sigval3 = static_cast(mode_ret); QAbstractSocket::NetworkLayerProtocol protocol_ret = protocol; @@ -139,7 +139,7 @@ public: } - friend void QTcpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol); + friend void QTcpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol); // cgo.Handle value for overwritten implementation intptr_t handle__disconnectFromHost = 0; @@ -743,9 +743,9 @@ public: // Wrappers to allow calling protected methods: friend void QTcpSocket_protectedbase_setSocketState(bool* _dynamic_cast_ok, void* self, int state); friend void QTcpSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, int socketError); - friend void QTcpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port); + friend void QTcpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port); friend void QTcpSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); - friend void QTcpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port); + friend void QTcpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port); friend void QTcpSocket_protectedbase_setPeerAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); friend void QTcpSocket_protectedbase_setPeerName(bool* _dynamic_cast_ok, void* self, struct miqt_string name); friend void QTcpSocket_protectedbase_setOpenMode(bool* _dynamic_cast_ok, void* self, int openMode); @@ -813,11 +813,11 @@ struct miqt_string QTcpSocket_tr3(const char* s, const char* c, int n) { return _ms; } -bool QTcpSocket_bind2(QTcpSocket* self, int addr, uint16_t port) { +bool QTcpSocket_bind2(QTcpSocket* self, int addr, unsigned short port) { return self->bind(static_cast(addr), static_cast(port)); } -bool QTcpSocket_bind3(QTcpSocket* self, int addr, uint16_t port, int mode) { +bool QTcpSocket_bind3(QTcpSocket* self, int addr, unsigned short port, int mode) { return self->bind(static_cast(addr), static_cast(port), static_cast(mode)); } @@ -847,7 +847,7 @@ bool QTcpSocket_override_virtual_bind(void* self, intptr_t slot) { return true; } -bool QTcpSocket_virtualbase_bind(void* self, QHostAddress* address, uint16_t port, int mode) { +bool QTcpSocket_virtualbase_bind(void* self, QHostAddress* address, unsigned short port, int mode) { return ( (MiqtVirtualQTcpSocket*)(self) )->QTcpSocket::bind(*address, static_cast(port), static_cast(mode)); @@ -863,7 +863,7 @@ bool QTcpSocket_override_virtual_connectToHost(void* self, intptr_t slot) { return true; } -void QTcpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol) { +void QTcpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); ( (MiqtVirtualQTcpSocket*)(self) )->QTcpSocket::connectToHost(hostName_QString, static_cast(port), static_cast(mode), static_cast(protocol)); @@ -1417,7 +1417,7 @@ void QTcpSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, } -void QTcpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port) { +void QTcpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port) { MiqtVirtualQTcpSocket* self_cast = dynamic_cast( (QTcpSocket*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; @@ -1443,7 +1443,7 @@ void QTcpSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self } -void QTcpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port) { +void QTcpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port) { MiqtVirtualQTcpSocket* self_cast = dynamic_cast( (QTcpSocket*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; diff --git a/qt6/network/gen_qtcpsocket.go b/qt6/network/gen_qtcpsocket.go index 2d7edb24..ada37ad3 100644 --- a/qt6/network/gen_qtcpsocket.go +++ b/qt6/network/gen_qtcpsocket.go @@ -109,11 +109,11 @@ func QTcpSocket_Tr3(s string, c string, n int) string { } func (this *QTcpSocket) Bind2(addr QHostAddress__SpecialAddress, port uint16) bool { - return (bool)(C.QTcpSocket_bind2(this.h, (C.int)(addr), (C.uint16_t)(port))) + return (bool)(C.QTcpSocket_bind2(this.h, (C.int)(addr), (C.ushort)(port))) } func (this *QTcpSocket) Bind3(addr QHostAddress__SpecialAddress, port uint16, mode QAbstractSocket__BindFlag) bool { - return (bool)(C.QTcpSocket_bind3(this.h, (C.int)(addr), (C.uint16_t)(port), (C.int)(mode))) + return (bool)(C.QTcpSocket_bind3(this.h, (C.int)(addr), (C.ushort)(port), (C.int)(mode))) } // SetSocketState can only be called from a QTcpSocket that was directly constructed. @@ -144,7 +144,7 @@ func (this *QTcpSocket) SetSocketError(socketError QAbstractSocket__SocketError) func (this *QTcpSocket) SetLocalPort(port uint16) { var _dynamic_cast_ok C.bool = false - C.QTcpSocket_protectedbase_setLocalPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uint16_t)(port)) + C.QTcpSocket_protectedbase_setLocalPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.ushort)(port)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -168,7 +168,7 @@ func (this *QTcpSocket) SetLocalAddress(address *QHostAddress) { func (this *QTcpSocket) SetPeerPort(port uint16) { var _dynamic_cast_ok C.bool = false - C.QTcpSocket_protectedbase_setPeerPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uint16_t)(port)) + C.QTcpSocket_protectedbase_setPeerPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.ushort)(port)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -315,7 +315,7 @@ func miqt_exec_callback_QTcpSocket_resume(self *C.QTcpSocket, cb C.intptr_t) { func (this *QTcpSocket) callVirtualBase_Bind(address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool { - return (bool)(C.QTcpSocket_virtualbase_bind(unsafe.Pointer(this.h), address.cPointer(), (C.uint16_t)(port), (C.int)(mode))) + return (bool)(C.QTcpSocket_virtualbase_bind(unsafe.Pointer(this.h), address.cPointer(), (C.ushort)(port), (C.int)(mode))) } func (this *QTcpSocket) OnBind(slot func(super func(address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool, address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool) { @@ -326,7 +326,7 @@ func (this *QTcpSocket) OnBind(slot func(super func(address *QHostAddress, port } //export miqt_exec_callback_QTcpSocket_bind -func miqt_exec_callback_QTcpSocket_bind(self *C.QTcpSocket, cb C.intptr_t, address *C.QHostAddress, port C.uint16_t, mode C.int) C.bool { +func miqt_exec_callback_QTcpSocket_bind(self *C.QTcpSocket, cb C.intptr_t, address *C.QHostAddress, port C.ushort, mode C.int) C.bool { gofunc, ok := cgo.Handle(cb).Value().(func(super func(address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool, address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -351,7 +351,7 @@ func (this *QTcpSocket) callVirtualBase_ConnectToHost(hostName string, port uint hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QTcpSocket_virtualbase_connectToHost(unsafe.Pointer(this.h), hostName_ms, (C.uint16_t)(port), (C.int)(mode), (C.int)(protocol)) + C.QTcpSocket_virtualbase_connectToHost(unsafe.Pointer(this.h), hostName_ms, (C.ushort)(port), (C.int)(mode), (C.int)(protocol)) } func (this *QTcpSocket) OnConnectToHost(slot func(super func(hostName string, port uint16, mode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol), hostName string, port uint16, mode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol)) { @@ -362,7 +362,7 @@ func (this *QTcpSocket) OnConnectToHost(slot func(super func(hostName string, po } //export miqt_exec_callback_QTcpSocket_connectToHost -func miqt_exec_callback_QTcpSocket_connectToHost(self *C.QTcpSocket, cb C.intptr_t, hostName C.struct_miqt_string, port C.uint16_t, mode C.int, protocol C.int) { +func miqt_exec_callback_QTcpSocket_connectToHost(self *C.QTcpSocket, cb C.intptr_t, hostName C.struct_miqt_string, port C.ushort, mode C.int, protocol C.int) { gofunc, ok := cgo.Handle(cb).Value().(func(super func(hostName string, port uint16, mode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol), hostName string, port uint16, mode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt6/network/gen_qtcpsocket.h b/qt6/network/gen_qtcpsocket.h index 12d612a9..7b02b6ac 100644 --- a/qt6/network/gen_qtcpsocket.h +++ b/qt6/network/gen_qtcpsocket.h @@ -51,14 +51,14 @@ struct miqt_string QTcpSocket_tr(const char* s); bool QTcpSocket_bind(QTcpSocket* self, int addr); struct miqt_string QTcpSocket_tr2(const char* s, const char* c); struct miqt_string QTcpSocket_tr3(const char* s, const char* c, int n); -bool QTcpSocket_bind2(QTcpSocket* self, int addr, uint16_t port); -bool QTcpSocket_bind3(QTcpSocket* self, int addr, uint16_t port, int mode); +bool QTcpSocket_bind2(QTcpSocket* self, int addr, unsigned short port); +bool QTcpSocket_bind3(QTcpSocket* self, int addr, unsigned short port, int mode); bool QTcpSocket_override_virtual_resume(void* self, intptr_t slot); void QTcpSocket_virtualbase_resume(void* self); bool QTcpSocket_override_virtual_bind(void* self, intptr_t slot); -bool QTcpSocket_virtualbase_bind(void* self, QHostAddress* address, uint16_t port, int mode); +bool QTcpSocket_virtualbase_bind(void* self, QHostAddress* address, unsigned short port, int mode); bool QTcpSocket_override_virtual_connectToHost(void* self, intptr_t slot); -void QTcpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol); +void QTcpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol); bool QTcpSocket_override_virtual_disconnectFromHost(void* self, intptr_t slot); void QTcpSocket_virtualbase_disconnectFromHost(void* self); bool QTcpSocket_override_virtual_bytesAvailable(void* self, intptr_t slot); @@ -125,9 +125,9 @@ bool QTcpSocket_override_virtual_disconnectNotify(void* self, intptr_t slot); void QTcpSocket_virtualbase_disconnectNotify(void* self, QMetaMethod* signal); void QTcpSocket_protectedbase_setSocketState(bool* _dynamic_cast_ok, void* self, int state); void QTcpSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, int socketError); -void QTcpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port); +void QTcpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port); void QTcpSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); -void QTcpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port); +void QTcpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port); void QTcpSocket_protectedbase_setPeerAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); void QTcpSocket_protectedbase_setPeerName(bool* _dynamic_cast_ok, void* self, struct miqt_string name); void QTcpSocket_protectedbase_setOpenMode(bool* _dynamic_cast_ok, void* self, int openMode); diff --git a/qt6/network/gen_qudpsocket.cpp b/qt6/network/gen_qudpsocket.cpp index c0059214..50261089 100644 --- a/qt6/network/gen_qudpsocket.cpp +++ b/qt6/network/gen_qudpsocket.cpp @@ -24,8 +24,8 @@ extern "C" { #endif void miqt_exec_callback_QUdpSocket_resume(QUdpSocket*, intptr_t); -bool miqt_exec_callback_QUdpSocket_bind(QUdpSocket*, intptr_t, QHostAddress*, uint16_t, int); -void miqt_exec_callback_QUdpSocket_connectToHost(QUdpSocket*, intptr_t, struct miqt_string, uint16_t, int, int); +bool miqt_exec_callback_QUdpSocket_bind(QUdpSocket*, intptr_t, QHostAddress*, unsigned short, int); +void miqt_exec_callback_QUdpSocket_connectToHost(QUdpSocket*, intptr_t, struct miqt_string, unsigned short, int, int); void miqt_exec_callback_QUdpSocket_disconnectFromHost(QUdpSocket*, intptr_t); long long miqt_exec_callback_QUdpSocket_bytesAvailable(const QUdpSocket*, intptr_t); long long miqt_exec_callback_QUdpSocket_bytesToWrite(const QUdpSocket*, intptr_t); @@ -101,7 +101,7 @@ public: // Cast returned reference into pointer QHostAddress* sigval1 = const_cast(&address_ret); quint16 port_ret = port; - uint16_t sigval2 = static_cast(port_ret); + unsigned short sigval2 = static_cast(port_ret); QAbstractSocket::BindMode mode_ret = mode; int sigval3 = static_cast(mode_ret); @@ -110,7 +110,7 @@ public: return callback_return_value; } - friend bool QUdpSocket_virtualbase_bind(void* self, QHostAddress* address, uint16_t port, int mode); + friend bool QUdpSocket_virtualbase_bind(void* self, QHostAddress* address, unsigned short port, int mode); // cgo.Handle value for overwritten implementation intptr_t handle__connectToHost = 0; @@ -131,7 +131,7 @@ public: memcpy(hostName_ms.data, hostName_b.data(), hostName_ms.len); struct miqt_string sigval1 = hostName_ms; quint16 port_ret = port; - uint16_t sigval2 = static_cast(port_ret); + unsigned short sigval2 = static_cast(port_ret); QIODeviceBase::OpenMode mode_ret = mode; int sigval3 = static_cast(mode_ret); QAbstractSocket::NetworkLayerProtocol protocol_ret = protocol; @@ -142,7 +142,7 @@ public: } - friend void QUdpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol); + friend void QUdpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol); // cgo.Handle value for overwritten implementation intptr_t handle__disconnectFromHost = 0; @@ -746,9 +746,9 @@ public: // Wrappers to allow calling protected methods: friend void QUdpSocket_protectedbase_setSocketState(bool* _dynamic_cast_ok, void* self, int state); friend void QUdpSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, int socketError); - friend void QUdpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port); + friend void QUdpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port); friend void QUdpSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); - friend void QUdpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port); + friend void QUdpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port); friend void QUdpSocket_protectedbase_setPeerAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); friend void QUdpSocket_protectedbase_setPeerName(bool* _dynamic_cast_ok, void* self, struct miqt_string name); friend void QUdpSocket_protectedbase_setOpenMode(bool* _dynamic_cast_ok, void* self, int openMode); @@ -841,12 +841,12 @@ long long QUdpSocket_writeDatagram(QUdpSocket* self, QNetworkDatagram* datagram) return static_cast(_ret); } -long long QUdpSocket_writeDatagram2(QUdpSocket* self, const char* data, long long len, QHostAddress* host, uint16_t port) { +long long QUdpSocket_writeDatagram2(QUdpSocket* self, const char* data, long long len, QHostAddress* host, unsigned short port) { qint64 _ret = self->writeDatagram(data, static_cast(len), *host, static_cast(port)); return static_cast(_ret); } -long long QUdpSocket_writeDatagram3(QUdpSocket* self, struct miqt_string datagram, QHostAddress* host, uint16_t port) { +long long QUdpSocket_writeDatagram3(QUdpSocket* self, struct miqt_string datagram, QHostAddress* host, unsigned short port) { QByteArray datagram_QByteArray(datagram.data, datagram.len); qint64 _ret = self->writeDatagram(datagram_QByteArray, *host, static_cast(port)); return static_cast(_ret); @@ -874,11 +874,11 @@ struct miqt_string QUdpSocket_tr3(const char* s, const char* c, int n) { return _ms; } -bool QUdpSocket_bind2(QUdpSocket* self, int addr, uint16_t port) { +bool QUdpSocket_bind2(QUdpSocket* self, int addr, unsigned short port) { return self->bind(static_cast(addr), static_cast(port)); } -bool QUdpSocket_bind3(QUdpSocket* self, int addr, uint16_t port, int mode) { +bool QUdpSocket_bind3(QUdpSocket* self, int addr, unsigned short port, int mode) { return self->bind(static_cast(addr), static_cast(port), static_cast(mode)); } @@ -891,7 +891,7 @@ long long QUdpSocket_readDatagram2(QUdpSocket* self, char* data, long long maxle return static_cast(_ret); } -long long QUdpSocket_readDatagram3(QUdpSocket* self, char* data, long long maxlen, QHostAddress* host, uint16_t* port) { +long long QUdpSocket_readDatagram3(QUdpSocket* self, char* data, long long maxlen, QHostAddress* host, unsigned short* port) { qint64 _ret = self->readDatagram(data, static_cast(maxlen), host, static_cast(port)); return static_cast(_ret); } @@ -922,7 +922,7 @@ bool QUdpSocket_override_virtual_bind(void* self, intptr_t slot) { return true; } -bool QUdpSocket_virtualbase_bind(void* self, QHostAddress* address, uint16_t port, int mode) { +bool QUdpSocket_virtualbase_bind(void* self, QHostAddress* address, unsigned short port, int mode) { return ( (MiqtVirtualQUdpSocket*)(self) )->QUdpSocket::bind(*address, static_cast(port), static_cast(mode)); @@ -938,7 +938,7 @@ bool QUdpSocket_override_virtual_connectToHost(void* self, intptr_t slot) { return true; } -void QUdpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol) { +void QUdpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol) { QString hostName_QString = QString::fromUtf8(hostName.data, hostName.len); ( (MiqtVirtualQUdpSocket*)(self) )->QUdpSocket::connectToHost(hostName_QString, static_cast(port), static_cast(mode), static_cast(protocol)); @@ -1492,7 +1492,7 @@ void QUdpSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, } -void QUdpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port) { +void QUdpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port) { MiqtVirtualQUdpSocket* self_cast = dynamic_cast( (QUdpSocket*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; @@ -1518,7 +1518,7 @@ void QUdpSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self } -void QUdpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port) { +void QUdpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port) { MiqtVirtualQUdpSocket* self_cast = dynamic_cast( (QUdpSocket*)(self) ); if (self_cast == nullptr) { *_dynamic_cast_ok = false; diff --git a/qt6/network/gen_qudpsocket.go b/qt6/network/gen_qudpsocket.go index 9e9a9ddc..cbac7371 100644 --- a/qt6/network/gen_qudpsocket.go +++ b/qt6/network/gen_qudpsocket.go @@ -139,7 +139,7 @@ func (this *QUdpSocket) WriteDatagram(datagram *QNetworkDatagram) int64 { func (this *QUdpSocket) WriteDatagram2(data string, lenVal int64, host *QHostAddress, port uint16) int64 { data_Cstring := C.CString(data) defer C.free(unsafe.Pointer(data_Cstring)) - return (int64)(C.QUdpSocket_writeDatagram2(this.h, data_Cstring, (C.longlong)(lenVal), host.cPointer(), (C.uint16_t)(port))) + return (int64)(C.QUdpSocket_writeDatagram2(this.h, data_Cstring, (C.longlong)(lenVal), host.cPointer(), (C.ushort)(port))) } func (this *QUdpSocket) WriteDatagram3(datagram []byte, host *QHostAddress, port uint16) int64 { @@ -150,7 +150,7 @@ func (this *QUdpSocket) WriteDatagram3(datagram []byte, host *QHostAddress, port datagram_alias.data = (*C.char)(unsafe.Pointer(nil)) } datagram_alias.len = C.size_t(len(datagram)) - return (int64)(C.QUdpSocket_writeDatagram3(this.h, datagram_alias, host.cPointer(), (C.uint16_t)(port))) + return (int64)(C.QUdpSocket_writeDatagram3(this.h, datagram_alias, host.cPointer(), (C.ushort)(port))) } func QUdpSocket_Tr2(s string, c string) string { @@ -176,11 +176,11 @@ func QUdpSocket_Tr3(s string, c string, n int) string { } func (this *QUdpSocket) Bind2(addr QHostAddress__SpecialAddress, port uint16) bool { - return (bool)(C.QUdpSocket_bind2(this.h, (C.int)(addr), (C.uint16_t)(port))) + return (bool)(C.QUdpSocket_bind2(this.h, (C.int)(addr), (C.ushort)(port))) } func (this *QUdpSocket) Bind3(addr QHostAddress__SpecialAddress, port uint16, mode QAbstractSocket__BindFlag) bool { - return (bool)(C.QUdpSocket_bind3(this.h, (C.int)(addr), (C.uint16_t)(port), (C.int)(mode))) + return (bool)(C.QUdpSocket_bind3(this.h, (C.int)(addr), (C.ushort)(port), (C.int)(mode))) } func (this *QUdpSocket) ReceiveDatagramWithMaxSize(maxSize int64) *QNetworkDatagram { @@ -198,7 +198,7 @@ func (this *QUdpSocket) ReadDatagram2(data string, maxlen int64, host *QHostAddr func (this *QUdpSocket) ReadDatagram3(data string, maxlen int64, host *QHostAddress, port *uint16) int64 { data_Cstring := C.CString(data) defer C.free(unsafe.Pointer(data_Cstring)) - return (int64)(C.QUdpSocket_readDatagram3(this.h, data_Cstring, (C.longlong)(maxlen), host.cPointer(), (*C.uint16_t)(unsafe.Pointer(port)))) + return (int64)(C.QUdpSocket_readDatagram3(this.h, data_Cstring, (C.longlong)(maxlen), host.cPointer(), (*C.ushort)(unsafe.Pointer(port)))) } // SetSocketState can only be called from a QUdpSocket that was directly constructed. @@ -229,7 +229,7 @@ func (this *QUdpSocket) SetSocketError(socketError QAbstractSocket__SocketError) func (this *QUdpSocket) SetLocalPort(port uint16) { var _dynamic_cast_ok C.bool = false - C.QUdpSocket_protectedbase_setLocalPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uint16_t)(port)) + C.QUdpSocket_protectedbase_setLocalPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.ushort)(port)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -253,7 +253,7 @@ func (this *QUdpSocket) SetLocalAddress(address *QHostAddress) { func (this *QUdpSocket) SetPeerPort(port uint16) { var _dynamic_cast_ok C.bool = false - C.QUdpSocket_protectedbase_setPeerPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.uint16_t)(port)) + C.QUdpSocket_protectedbase_setPeerPort(&_dynamic_cast_ok, unsafe.Pointer(this.h), (C.ushort)(port)) if !_dynamic_cast_ok { panic("miqt: can only call protected methods for directly constructed types") @@ -400,7 +400,7 @@ func miqt_exec_callback_QUdpSocket_resume(self *C.QUdpSocket, cb C.intptr_t) { func (this *QUdpSocket) callVirtualBase_Bind(address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool { - return (bool)(C.QUdpSocket_virtualbase_bind(unsafe.Pointer(this.h), address.cPointer(), (C.uint16_t)(port), (C.int)(mode))) + return (bool)(C.QUdpSocket_virtualbase_bind(unsafe.Pointer(this.h), address.cPointer(), (C.ushort)(port), (C.int)(mode))) } func (this *QUdpSocket) OnBind(slot func(super func(address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool, address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool) { @@ -411,7 +411,7 @@ func (this *QUdpSocket) OnBind(slot func(super func(address *QHostAddress, port } //export miqt_exec_callback_QUdpSocket_bind -func miqt_exec_callback_QUdpSocket_bind(self *C.QUdpSocket, cb C.intptr_t, address *C.QHostAddress, port C.uint16_t, mode C.int) C.bool { +func miqt_exec_callback_QUdpSocket_bind(self *C.QUdpSocket, cb C.intptr_t, address *C.QHostAddress, port C.ushort, mode C.int) C.bool { gofunc, ok := cgo.Handle(cb).Value().(func(super func(address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool, address *QHostAddress, port uint16, mode QAbstractSocket__BindFlag) bool) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") @@ -436,7 +436,7 @@ func (this *QUdpSocket) callVirtualBase_ConnectToHost(hostName string, port uint hostName_ms.len = C.size_t(len(hostName)) defer C.free(unsafe.Pointer(hostName_ms.data)) - C.QUdpSocket_virtualbase_connectToHost(unsafe.Pointer(this.h), hostName_ms, (C.uint16_t)(port), (C.int)(mode), (C.int)(protocol)) + C.QUdpSocket_virtualbase_connectToHost(unsafe.Pointer(this.h), hostName_ms, (C.ushort)(port), (C.int)(mode), (C.int)(protocol)) } func (this *QUdpSocket) OnConnectToHost(slot func(super func(hostName string, port uint16, mode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol), hostName string, port uint16, mode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol)) { @@ -447,7 +447,7 @@ func (this *QUdpSocket) OnConnectToHost(slot func(super func(hostName string, po } //export miqt_exec_callback_QUdpSocket_connectToHost -func miqt_exec_callback_QUdpSocket_connectToHost(self *C.QUdpSocket, cb C.intptr_t, hostName C.struct_miqt_string, port C.uint16_t, mode C.int, protocol C.int) { +func miqt_exec_callback_QUdpSocket_connectToHost(self *C.QUdpSocket, cb C.intptr_t, hostName C.struct_miqt_string, port C.ushort, mode C.int, protocol C.int) { gofunc, ok := cgo.Handle(cb).Value().(func(super func(hostName string, port uint16, mode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol), hostName string, port uint16, mode qt6.QIODeviceBase__OpenModeFlag, protocol QAbstractSocket__NetworkLayerProtocol)) if !ok { panic("miqt: callback of non-callback type (heap corruption?)") diff --git a/qt6/network/gen_qudpsocket.h b/qt6/network/gen_qudpsocket.h index ca06f33f..f5022feb 100644 --- a/qt6/network/gen_qudpsocket.h +++ b/qt6/network/gen_qudpsocket.h @@ -64,21 +64,21 @@ long long QUdpSocket_pendingDatagramSize(const QUdpSocket* self); QNetworkDatagram* QUdpSocket_receiveDatagram(QUdpSocket* self); long long QUdpSocket_readDatagram(QUdpSocket* self, char* data, long long maxlen); long long QUdpSocket_writeDatagram(QUdpSocket* self, QNetworkDatagram* datagram); -long long QUdpSocket_writeDatagram2(QUdpSocket* self, const char* data, long long len, QHostAddress* host, uint16_t port); -long long QUdpSocket_writeDatagram3(QUdpSocket* self, struct miqt_string datagram, QHostAddress* host, uint16_t port); +long long QUdpSocket_writeDatagram2(QUdpSocket* self, const char* data, long long len, QHostAddress* host, unsigned short port); +long long QUdpSocket_writeDatagram3(QUdpSocket* self, struct miqt_string datagram, QHostAddress* host, unsigned short port); struct miqt_string QUdpSocket_tr2(const char* s, const char* c); struct miqt_string QUdpSocket_tr3(const char* s, const char* c, int n); -bool QUdpSocket_bind2(QUdpSocket* self, int addr, uint16_t port); -bool QUdpSocket_bind3(QUdpSocket* self, int addr, uint16_t port, int mode); +bool QUdpSocket_bind2(QUdpSocket* self, int addr, unsigned short port); +bool QUdpSocket_bind3(QUdpSocket* self, int addr, unsigned short port, int mode); QNetworkDatagram* QUdpSocket_receiveDatagramWithMaxSize(QUdpSocket* self, long long maxSize); long long QUdpSocket_readDatagram2(QUdpSocket* self, char* data, long long maxlen, QHostAddress* host); -long long QUdpSocket_readDatagram3(QUdpSocket* self, char* data, long long maxlen, QHostAddress* host, uint16_t* port); +long long QUdpSocket_readDatagram3(QUdpSocket* self, char* data, long long maxlen, QHostAddress* host, unsigned short* port); bool QUdpSocket_override_virtual_resume(void* self, intptr_t slot); void QUdpSocket_virtualbase_resume(void* self); bool QUdpSocket_override_virtual_bind(void* self, intptr_t slot); -bool QUdpSocket_virtualbase_bind(void* self, QHostAddress* address, uint16_t port, int mode); +bool QUdpSocket_virtualbase_bind(void* self, QHostAddress* address, unsigned short port, int mode); bool QUdpSocket_override_virtual_connectToHost(void* self, intptr_t slot); -void QUdpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, uint16_t port, int mode, int protocol); +void QUdpSocket_virtualbase_connectToHost(void* self, struct miqt_string hostName, unsigned short port, int mode, int protocol); bool QUdpSocket_override_virtual_disconnectFromHost(void* self, intptr_t slot); void QUdpSocket_virtualbase_disconnectFromHost(void* self); bool QUdpSocket_override_virtual_bytesAvailable(void* self, intptr_t slot); @@ -145,9 +145,9 @@ bool QUdpSocket_override_virtual_disconnectNotify(void* self, intptr_t slot); void QUdpSocket_virtualbase_disconnectNotify(void* self, QMetaMethod* signal); void QUdpSocket_protectedbase_setSocketState(bool* _dynamic_cast_ok, void* self, int state); void QUdpSocket_protectedbase_setSocketError(bool* _dynamic_cast_ok, void* self, int socketError); -void QUdpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, uint16_t port); +void QUdpSocket_protectedbase_setLocalPort(bool* _dynamic_cast_ok, void* self, unsigned short port); void QUdpSocket_protectedbase_setLocalAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); -void QUdpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, uint16_t port); +void QUdpSocket_protectedbase_setPeerPort(bool* _dynamic_cast_ok, void* self, unsigned short port); void QUdpSocket_protectedbase_setPeerAddress(bool* _dynamic_cast_ok, void* self, QHostAddress* address); void QUdpSocket_protectedbase_setPeerName(bool* _dynamic_cast_ok, void* self, struct miqt_string name); void QUdpSocket_protectedbase_setOpenMode(bool* _dynamic_cast_ok, void* self, int openMode); diff --git a/qt6/qml/gen_qqmlinfo.cpp b/qt6/qml/gen_qqmlinfo.cpp index a85d37e8..7f1fbf92 100644 --- a/qt6/qml/gen_qqmlinfo.cpp +++ b/qt6/qml/gen_qqmlinfo.cpp @@ -44,13 +44,13 @@ QQmlInfo* QQmlInfo_operatorShiftLeftWithChar(QQmlInfo* self, char t) { return &_ret; } -QQmlInfo* QQmlInfo_operatorShiftLeftWithShort(QQmlInfo* self, int16_t t) { +QQmlInfo* QQmlInfo_operatorShiftLeftWithShort(QQmlInfo* self, short t) { QQmlInfo& _ret = self->operator<<(static_cast(t)); // Cast returned reference into pointer return &_ret; } -QQmlInfo* QQmlInfo_operatorShiftLeftWithUnsignedshort(QQmlInfo* self, uint16_t t) { +QQmlInfo* QQmlInfo_operatorShiftLeftWithUnsignedshort(QQmlInfo* self, unsigned short t) { QQmlInfo& _ret = self->operator<<(static_cast(t)); // Cast returned reference into pointer return &_ret; diff --git a/qt6/qml/gen_qqmlinfo.go b/qt6/qml/gen_qqmlinfo.go index 31e1f0a8..252b53a0 100644 --- a/qt6/qml/gen_qqmlinfo.go +++ b/qt6/qml/gen_qqmlinfo.go @@ -69,11 +69,11 @@ func (this *QQmlInfo) OperatorShiftLeftWithChar(t int8) *QQmlInfo { } func (this *QQmlInfo) OperatorShiftLeftWithShort(t int16) *QQmlInfo { - return newQQmlInfo(C.QQmlInfo_operatorShiftLeftWithShort(this.h, (C.int16_t)(t))) + return newQQmlInfo(C.QQmlInfo_operatorShiftLeftWithShort(this.h, (C.short)(t))) } func (this *QQmlInfo) OperatorShiftLeftWithUnsignedshort(t uint16) *QQmlInfo { - return newQQmlInfo(C.QQmlInfo_operatorShiftLeftWithUnsignedshort(this.h, (C.uint16_t)(t))) + return newQQmlInfo(C.QQmlInfo_operatorShiftLeftWithUnsignedshort(this.h, (C.ushort)(t))) } func (this *QQmlInfo) OperatorShiftLeftWithInt(t int) *QQmlInfo { diff --git a/qt6/qml/gen_qqmlinfo.h b/qt6/qml/gen_qqmlinfo.h index ae9772b2..2fd66d88 100644 --- a/qt6/qml/gen_qqmlinfo.h +++ b/qt6/qml/gen_qqmlinfo.h @@ -33,8 +33,8 @@ void QQmlInfo_virtbase(QQmlInfo* src, QDebug** outptr_QDebug); QQmlInfo* QQmlInfo_operatorShiftLeft(QQmlInfo* self, QChar* t); QQmlInfo* QQmlInfo_operatorShiftLeftWithBool(QQmlInfo* self, bool t); QQmlInfo* QQmlInfo_operatorShiftLeftWithChar(QQmlInfo* self, char t); -QQmlInfo* QQmlInfo_operatorShiftLeftWithShort(QQmlInfo* self, int16_t t); -QQmlInfo* QQmlInfo_operatorShiftLeftWithUnsignedshort(QQmlInfo* self, uint16_t t); +QQmlInfo* QQmlInfo_operatorShiftLeftWithShort(QQmlInfo* self, short t); +QQmlInfo* QQmlInfo_operatorShiftLeftWithUnsignedshort(QQmlInfo* self, unsigned short t); QQmlInfo* QQmlInfo_operatorShiftLeftWithInt(QQmlInfo* self, int t); QQmlInfo* QQmlInfo_operatorShiftLeftWithUnsignedint(QQmlInfo* self, unsigned int t); QQmlInfo* QQmlInfo_operatorShiftLeftWithLong(QQmlInfo* self, long t);