From ae70105920285674012de9130c17293a0b0e83ca Mon Sep 17 00:00:00 2001 From: mappu Date: Sun, 17 Nov 2024 19:33:38 +1300 Subject: [PATCH] QDeadlineTimer: remove non-public method --- cmd/genbindings/config-allowlist.go | 6 ++++++ qt/gen_qdeadlinetimer.cpp | 14 -------------- qt/gen_qdeadlinetimer.go | 17 ----------------- qt/gen_qdeadlinetimer.h | 1 - qt6/gen_qdeadlinetimer.cpp | 14 -------------- qt6/gen_qdeadlinetimer.go | 17 ----------------- qt6/gen_qdeadlinetimer.h | 1 - 7 files changed, 6 insertions(+), 64 deletions(-) diff --git a/cmd/genbindings/config-allowlist.go b/cmd/genbindings/config-allowlist.go index 06123fc1..3ae2dda8 100644 --- a/cmd/genbindings/config-allowlist.go +++ b/cmd/genbindings/config-allowlist.go @@ -218,6 +218,12 @@ func AllowMethod(className string, mm CppMethod) error { return ErrTooComplex // Qt 6: Present in header, but no-op method was not included in compiled library } + if className == "QDeadlineTimer" && mm.MethodName == "_q_data" { + // Qt 6.4: Present in header with "not a public method" comment, not present in Qt 6.6 + // @ref https://github.com/qt/qtbase/blob/v6.4.0/src/corelib/kernel/qdeadlinetimer.h#L156C29-L156C36 + return ErrTooComplex + } + return nil // OK, allow } diff --git a/qt/gen_qdeadlinetimer.cpp b/qt/gen_qdeadlinetimer.cpp index d8172988..2a93ec7b 100644 --- a/qt/gen_qdeadlinetimer.cpp +++ b/qt/gen_qdeadlinetimer.cpp @@ -108,20 +108,6 @@ QDeadlineTimer* QDeadlineTimer_OperatorMinusAssign(QDeadlineTimer* self, long lo return &_ret; } -struct miqt_map /* tuple of long long and unsigned int */ QDeadlineTimer_QData(const QDeadlineTimer* self) { - QPair _ret = self->_q_data(); - // Convert QPair<> from C++ memory to manually-managed C memory - long long* _first_arr = static_cast(malloc(sizeof(long long))); - unsigned int* _second_arr = static_cast(malloc(sizeof(unsigned int))); - _first_arr[0] = _ret.first; - _second_arr[0] = _ret.second; - struct miqt_map _out; - _out.len = 1; - _out.keys = static_cast(_first_arr); - _out.values = static_cast(_second_arr); - return _out; -} - void QDeadlineTimer_OperatorAssign(QDeadlineTimer* self, QDeadlineTimer* param1) { self->operator=(*param1); } diff --git a/qt/gen_qdeadlinetimer.go b/qt/gen_qdeadlinetimer.go index 23fa192a..04b53016 100644 --- a/qt/gen_qdeadlinetimer.go +++ b/qt/gen_qdeadlinetimer.go @@ -164,23 +164,6 @@ func (this *QDeadlineTimer) OperatorMinusAssign(msecs int64) *QDeadlineTimer { return UnsafeNewQDeadlineTimer(unsafe.Pointer(C.QDeadlineTimer_OperatorMinusAssign(this.h, (C.longlong)(msecs)))) } -func (this *QDeadlineTimer) QData() struct { - First int64 - Second uint -} { - var _mm C.struct_miqt_map = C.QDeadlineTimer_QData(this.h) - _First_CArray := (*[0xffff]C.longlong)(unsafe.Pointer(_mm.keys)) - _Second_CArray := (*[0xffff]C.uint)(unsafe.Pointer(_mm.values)) - _entry_First := (int64)(_First_CArray[0]) - - _entry_Second := (uint)(_Second_CArray[0]) - - return struct { - First int64 - Second uint - }{First: _entry_First, Second: _entry_Second} -} - func (this *QDeadlineTimer) OperatorAssign(param1 *QDeadlineTimer) { C.QDeadlineTimer_OperatorAssign(this.h, param1.cPointer()) } diff --git a/qt/gen_qdeadlinetimer.h b/qt/gen_qdeadlinetimer.h index 195e5d5b..306258fd 100644 --- a/qt/gen_qdeadlinetimer.h +++ b/qt/gen_qdeadlinetimer.h @@ -44,7 +44,6 @@ QDeadlineTimer* QDeadlineTimer_AddNSecs(QDeadlineTimer* dt, long long nsecs); QDeadlineTimer* QDeadlineTimer_Current(); QDeadlineTimer* QDeadlineTimer_OperatorPlusAssign(QDeadlineTimer* self, long long msecs); QDeadlineTimer* QDeadlineTimer_OperatorMinusAssign(QDeadlineTimer* self, long long msecs); -struct miqt_map /* tuple of long long and unsigned int */ QDeadlineTimer_QData(const QDeadlineTimer* self); void QDeadlineTimer_OperatorAssign(QDeadlineTimer* self, QDeadlineTimer* param1); void QDeadlineTimer_SetRemainingTime2(QDeadlineTimer* self, long long msecs, int typeVal); void QDeadlineTimer_SetPreciseRemainingTime2(QDeadlineTimer* self, long long secs, long long nsecs); diff --git a/qt6/gen_qdeadlinetimer.cpp b/qt6/gen_qdeadlinetimer.cpp index d8172988..2a93ec7b 100644 --- a/qt6/gen_qdeadlinetimer.cpp +++ b/qt6/gen_qdeadlinetimer.cpp @@ -108,20 +108,6 @@ QDeadlineTimer* QDeadlineTimer_OperatorMinusAssign(QDeadlineTimer* self, long lo return &_ret; } -struct miqt_map /* tuple of long long and unsigned int */ QDeadlineTimer_QData(const QDeadlineTimer* self) { - QPair _ret = self->_q_data(); - // Convert QPair<> from C++ memory to manually-managed C memory - long long* _first_arr = static_cast(malloc(sizeof(long long))); - unsigned int* _second_arr = static_cast(malloc(sizeof(unsigned int))); - _first_arr[0] = _ret.first; - _second_arr[0] = _ret.second; - struct miqt_map _out; - _out.len = 1; - _out.keys = static_cast(_first_arr); - _out.values = static_cast(_second_arr); - return _out; -} - void QDeadlineTimer_OperatorAssign(QDeadlineTimer* self, QDeadlineTimer* param1) { self->operator=(*param1); } diff --git a/qt6/gen_qdeadlinetimer.go b/qt6/gen_qdeadlinetimer.go index 44cd3e8c..39f6bced 100644 --- a/qt6/gen_qdeadlinetimer.go +++ b/qt6/gen_qdeadlinetimer.go @@ -164,23 +164,6 @@ func (this *QDeadlineTimer) OperatorMinusAssign(msecs int64) *QDeadlineTimer { return UnsafeNewQDeadlineTimer(unsafe.Pointer(C.QDeadlineTimer_OperatorMinusAssign(this.h, (C.longlong)(msecs)))) } -func (this *QDeadlineTimer) QData() struct { - First int64 - Second uint -} { - var _mm C.struct_miqt_map = C.QDeadlineTimer_QData(this.h) - _First_CArray := (*[0xffff]C.longlong)(unsafe.Pointer(_mm.keys)) - _Second_CArray := (*[0xffff]C.uint)(unsafe.Pointer(_mm.values)) - _entry_First := (int64)(_First_CArray[0]) - - _entry_Second := (uint)(_Second_CArray[0]) - - return struct { - First int64 - Second uint - }{First: _entry_First, Second: _entry_Second} -} - func (this *QDeadlineTimer) OperatorAssign(param1 *QDeadlineTimer) { C.QDeadlineTimer_OperatorAssign(this.h, param1.cPointer()) } diff --git a/qt6/gen_qdeadlinetimer.h b/qt6/gen_qdeadlinetimer.h index fae68487..ae4f8759 100644 --- a/qt6/gen_qdeadlinetimer.h +++ b/qt6/gen_qdeadlinetimer.h @@ -44,7 +44,6 @@ QDeadlineTimer* QDeadlineTimer_AddNSecs(QDeadlineTimer* dt, long long nsecs); QDeadlineTimer* QDeadlineTimer_Current(); QDeadlineTimer* QDeadlineTimer_OperatorPlusAssign(QDeadlineTimer* self, long long msecs); QDeadlineTimer* QDeadlineTimer_OperatorMinusAssign(QDeadlineTimer* self, long long msecs); -struct miqt_map /* tuple of long long and unsigned int */ QDeadlineTimer_QData(const QDeadlineTimer* self); void QDeadlineTimer_OperatorAssign(QDeadlineTimer* self, QDeadlineTimer* param1); void QDeadlineTimer_SetRemainingTime2(QDeadlineTimer* self, long long msecs, int typeVal); void QDeadlineTimer_SetPreciseRemainingTime2(QDeadlineTimer* self, long long secs, long long nsecs);