diff --git a/qt/webengine/gen_qwebenginepage.cpp b/qt/webengine/gen_qwebenginepage.cpp index ae93858e..e0689174 100644 --- a/qt/webengine/gen_qwebenginepage.cpp +++ b/qt/webengine/gen_qwebenginepage.cpp @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include @@ -52,7 +51,6 @@ void miqt_exec_callback_QWebEnginePage_windowCloseRequested(intptr_t); void miqt_exec_callback_QWebEnginePage_featurePermissionRequested(intptr_t, QUrl*, int); void miqt_exec_callback_QWebEnginePage_featurePermissionRequestCanceled(intptr_t, QUrl*, int); void miqt_exec_callback_QWebEnginePage_fullScreenRequested(intptr_t, QWebEngineFullScreenRequest*); -void miqt_exec_callback_QWebEnginePage_quotaRequested(intptr_t, QWebEngineQuotaRequest*); void miqt_exec_callback_QWebEnginePage_registerProtocolHandlerRequested(intptr_t, QWebEngineRegisterProtocolHandlerRequest*); void miqt_exec_callback_QWebEnginePage_selectClientCertificate(intptr_t, QWebEngineClientCertificateSelection*); void miqt_exec_callback_QWebEnginePage_authenticationRequired(intptr_t, QUrl*, QAuthenticator*); @@ -903,17 +901,6 @@ void QWebEnginePage_connect_fullScreenRequested(QWebEnginePage* self, intptr_t s }); } -void QWebEnginePage_quotaRequested(QWebEnginePage* self, QWebEngineQuotaRequest* quotaRequest) { - self->quotaRequested(*quotaRequest); -} - -void QWebEnginePage_connect_quotaRequested(QWebEnginePage* self, intptr_t slot) { - MiqtVirtualQWebEnginePage::connect(self, static_cast(&QWebEnginePage::quotaRequested), self, [=](QWebEngineQuotaRequest quotaRequest) { - QWebEngineQuotaRequest* sigval1 = new QWebEngineQuotaRequest(quotaRequest); - miqt_exec_callback_QWebEnginePage_quotaRequested(slot, sigval1); - }); -} - void QWebEnginePage_registerProtocolHandlerRequested(QWebEnginePage* self, QWebEngineRegisterProtocolHandlerRequest* request) { self->registerProtocolHandlerRequested(*request); } diff --git a/qt/webengine/gen_qwebenginepage.go b/qt/webengine/gen_qwebenginepage.go index 7fba1f52..f1cddfd5 100644 --- a/qt/webengine/gen_qwebenginepage.go +++ b/qt/webengine/gen_qwebenginepage.go @@ -713,28 +713,6 @@ func miqt_exec_callback_QWebEnginePage_fullScreenRequested(cb C.intptr_t, fullSc gofunc(slotval1) } -func (this *QWebEnginePage) QuotaRequested(quotaRequest QWebEngineQuotaRequest) { - C.QWebEnginePage_quotaRequested(this.h, quotaRequest.cPointer()) -} -func (this *QWebEnginePage) OnQuotaRequested(slot func(quotaRequest QWebEngineQuotaRequest)) { - C.QWebEnginePage_connect_quotaRequested(this.h, C.intptr_t(cgo.NewHandle(slot))) -} - -//export miqt_exec_callback_QWebEnginePage_quotaRequested -func miqt_exec_callback_QWebEnginePage_quotaRequested(cb C.intptr_t, quotaRequest *C.QWebEngineQuotaRequest) { - gofunc, ok := cgo.Handle(cb).Value().(func(quotaRequest QWebEngineQuotaRequest)) - if !ok { - panic("miqt: callback of non-callback type (heap corruption?)") - } - - // Convert all CABI parameters to Go parameters - quotaRequest_goptr := newQWebEngineQuotaRequest(quotaRequest) - quotaRequest_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - slotval1 := *quotaRequest_goptr - - gofunc(slotval1) -} - func (this *QWebEnginePage) RegisterProtocolHandlerRequested(request QWebEngineRegisterProtocolHandlerRequest) { C.QWebEnginePage_registerProtocolHandlerRequested(this.h, request.cPointer()) } diff --git a/qt/webengine/gen_qwebenginepage.h b/qt/webengine/gen_qwebenginepage.h index 99d5f1b5..bddc8263 100644 --- a/qt/webengine/gen_qwebenginepage.h +++ b/qt/webengine/gen_qwebenginepage.h @@ -41,7 +41,6 @@ class QWebEngineHistory; class QWebEngineHttpRequest; class QWebEnginePage; class QWebEngineProfile; -class QWebEngineQuotaRequest; class QWebEngineRegisterProtocolHandlerRequest; class QWebEngineScriptCollection; class QWebEngineSettings; @@ -74,7 +73,6 @@ typedef struct QWebEngineHistory QWebEngineHistory; typedef struct QWebEngineHttpRequest QWebEngineHttpRequest; typedef struct QWebEnginePage QWebEnginePage; typedef struct QWebEngineProfile QWebEngineProfile; -typedef struct QWebEngineQuotaRequest QWebEngineQuotaRequest; typedef struct QWebEngineRegisterProtocolHandlerRequest QWebEngineRegisterProtocolHandlerRequest; typedef struct QWebEngineScriptCollection QWebEngineScriptCollection; typedef struct QWebEngineSettings QWebEngineSettings; @@ -165,8 +163,6 @@ void QWebEnginePage_featurePermissionRequestCanceled(QWebEnginePage* self, QUrl* void QWebEnginePage_connect_featurePermissionRequestCanceled(QWebEnginePage* self, intptr_t slot); void QWebEnginePage_fullScreenRequested(QWebEnginePage* self, QWebEngineFullScreenRequest* fullScreenRequest); void QWebEnginePage_connect_fullScreenRequested(QWebEnginePage* self, intptr_t slot); -void QWebEnginePage_quotaRequested(QWebEnginePage* self, QWebEngineQuotaRequest* quotaRequest); -void QWebEnginePage_connect_quotaRequested(QWebEnginePage* self, intptr_t slot); void QWebEnginePage_registerProtocolHandlerRequested(QWebEnginePage* self, QWebEngineRegisterProtocolHandlerRequest* request); void QWebEnginePage_connect_registerProtocolHandlerRequested(QWebEnginePage* self, intptr_t slot); void QWebEnginePage_selectClientCertificate(QWebEnginePage* self, QWebEngineClientCertificateSelection* clientCertSelection); diff --git a/qt/webengine/gen_qwebenginequotarequest.cpp b/qt/webengine/gen_qwebenginequotarequest.cpp deleted file mode 100644 index f7efddb1..00000000 --- a/qt/webengine/gen_qwebenginequotarequest.cpp +++ /dev/null @@ -1,50 +0,0 @@ -#include -#include -#include -#include "gen_qwebenginequotarequest.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __cplusplus -} /* extern C */ -#endif - -QWebEngineQuotaRequest* QWebEngineQuotaRequest_new() { - return new QWebEngineQuotaRequest(); -} - -QWebEngineQuotaRequest* QWebEngineQuotaRequest_new2(QWebEngineQuotaRequest* param1) { - return new QWebEngineQuotaRequest(*param1); -} - -void QWebEngineQuotaRequest_accept(QWebEngineQuotaRequest* self) { - self->accept(); -} - -void QWebEngineQuotaRequest_reject(QWebEngineQuotaRequest* self) { - self->reject(); -} - -QUrl* QWebEngineQuotaRequest_origin(const QWebEngineQuotaRequest* self) { - return new QUrl(self->origin()); -} - -long long QWebEngineQuotaRequest_requestedSize(const QWebEngineQuotaRequest* self) { - qint64 _ret = self->requestedSize(); - return static_cast(_ret); -} - -bool QWebEngineQuotaRequest_operatorEqual(const QWebEngineQuotaRequest* self, QWebEngineQuotaRequest* that) { - return (*self == *that); -} - -bool QWebEngineQuotaRequest_operatorNotEqual(const QWebEngineQuotaRequest* self, QWebEngineQuotaRequest* that) { - return (*self != *that); -} - -void QWebEngineQuotaRequest_delete(QWebEngineQuotaRequest* self) { - delete self; -} - diff --git a/qt/webengine/gen_qwebenginequotarequest.go b/qt/webengine/gen_qwebenginequotarequest.go deleted file mode 100644 index 86c235a9..00000000 --- a/qt/webengine/gen_qwebenginequotarequest.go +++ /dev/null @@ -1,99 +0,0 @@ -package webengine - -/* - -#include "gen_qwebenginequotarequest.h" -#include - -*/ -import "C" - -import ( - "github.com/mappu/miqt/qt" - "runtime" - "unsafe" -) - -type QWebEngineQuotaRequest struct { - h *C.QWebEngineQuotaRequest -} - -func (this *QWebEngineQuotaRequest) cPointer() *C.QWebEngineQuotaRequest { - if this == nil { - return nil - } - return this.h -} - -func (this *QWebEngineQuotaRequest) UnsafePointer() unsafe.Pointer { - if this == nil { - return nil - } - return unsafe.Pointer(this.h) -} - -// newQWebEngineQuotaRequest constructs the type using only CGO pointers. -func newQWebEngineQuotaRequest(h *C.QWebEngineQuotaRequest) *QWebEngineQuotaRequest { - if h == nil { - return nil - } - - return &QWebEngineQuotaRequest{h: h} -} - -// UnsafeNewQWebEngineQuotaRequest constructs the type using only unsafe pointers. -func UnsafeNewQWebEngineQuotaRequest(h unsafe.Pointer) *QWebEngineQuotaRequest { - return newQWebEngineQuotaRequest((*C.QWebEngineQuotaRequest)(h)) -} - -// NewQWebEngineQuotaRequest constructs a new QWebEngineQuotaRequest object. -func NewQWebEngineQuotaRequest() *QWebEngineQuotaRequest { - - return newQWebEngineQuotaRequest(C.QWebEngineQuotaRequest_new()) -} - -// NewQWebEngineQuotaRequest2 constructs a new QWebEngineQuotaRequest object. -func NewQWebEngineQuotaRequest2(param1 *QWebEngineQuotaRequest) *QWebEngineQuotaRequest { - - return newQWebEngineQuotaRequest(C.QWebEngineQuotaRequest_new2(param1.cPointer())) -} - -func (this *QWebEngineQuotaRequest) Accept() { - C.QWebEngineQuotaRequest_accept(this.h) -} - -func (this *QWebEngineQuotaRequest) Reject() { - C.QWebEngineQuotaRequest_reject(this.h) -} - -func (this *QWebEngineQuotaRequest) Origin() *qt.QUrl { - _goptr := qt.UnsafeNewQUrl(unsafe.Pointer(C.QWebEngineQuotaRequest_origin(this.h))) - _goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer - return _goptr -} - -func (this *QWebEngineQuotaRequest) RequestedSize() int64 { - return (int64)(C.QWebEngineQuotaRequest_requestedSize(this.h)) -} - -func (this *QWebEngineQuotaRequest) OperatorEqual(that *QWebEngineQuotaRequest) bool { - return (bool)(C.QWebEngineQuotaRequest_operatorEqual(this.h, that.cPointer())) -} - -func (this *QWebEngineQuotaRequest) OperatorNotEqual(that *QWebEngineQuotaRequest) bool { - return (bool)(C.QWebEngineQuotaRequest_operatorNotEqual(this.h, that.cPointer())) -} - -// Delete this object from C++ memory. -func (this *QWebEngineQuotaRequest) Delete() { - C.QWebEngineQuotaRequest_delete(this.h) -} - -// GoGC adds a Go Finalizer to this pointer, so that it will be deleted -// from C++ memory once it is unreachable from Go memory. -func (this *QWebEngineQuotaRequest) GoGC() { - runtime.SetFinalizer(this, func(this *QWebEngineQuotaRequest) { - this.Delete() - runtime.KeepAlive(this.h) - }) -} diff --git a/qt/webengine/gen_qwebenginequotarequest.h b/qt/webengine/gen_qwebenginequotarequest.h deleted file mode 100644 index 98a2b828..00000000 --- a/qt/webengine/gen_qwebenginequotarequest.h +++ /dev/null @@ -1,39 +0,0 @@ -#pragma once -#ifndef MIQT_QT_WEBENGINE_GEN_QWEBENGINEQUOTAREQUEST_H -#define MIQT_QT_WEBENGINE_GEN_QWEBENGINEQUOTAREQUEST_H - -#include -#include -#include - -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - -#include "../../libmiqt/libmiqt.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __cplusplus -class QUrl; -class QWebEngineQuotaRequest; -#else -typedef struct QUrl QUrl; -typedef struct QWebEngineQuotaRequest QWebEngineQuotaRequest; -#endif - -QWebEngineQuotaRequest* QWebEngineQuotaRequest_new(); -QWebEngineQuotaRequest* QWebEngineQuotaRequest_new2(QWebEngineQuotaRequest* param1); -void QWebEngineQuotaRequest_accept(QWebEngineQuotaRequest* self); -void QWebEngineQuotaRequest_reject(QWebEngineQuotaRequest* self); -QUrl* QWebEngineQuotaRequest_origin(const QWebEngineQuotaRequest* self); -long long QWebEngineQuotaRequest_requestedSize(const QWebEngineQuotaRequest* self); -bool QWebEngineQuotaRequest_operatorEqual(const QWebEngineQuotaRequest* self, QWebEngineQuotaRequest* that); -bool QWebEngineQuotaRequest_operatorNotEqual(const QWebEngineQuotaRequest* self, QWebEngineQuotaRequest* that); -void QWebEngineQuotaRequest_delete(QWebEngineQuotaRequest* self); - -#ifdef __cplusplus -} /* extern C */ -#endif - -#endif