ruby-qt6-rice 6.0.0 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7239b9643a298d4843ba1a52307a5ce451c00ccfb385ca9ba5714f7b297554c0
-  data.tar.gz: 6d14e054c66b2d466d3f87a4f5c8a760d4a0234b9c4afc4b01af93fb3f5a96a9
+  metadata.gz: 6a6aeeea52c229e9ec9107f0a878f810f4da0f57f1125e4d234a7cbee9f34f26
+  data.tar.gz: b4a14875c07b82212e67509d0ca6554390a841e1c27a477a249f21329d67f223
 SHA512:
-  metadata.gz: 27cfba991dc3b4aab4415587ac389e5aa875416b2c6690662bfc434155c20b276316e4497e73577c9ac33c00d8ef0c4280b4b31279f6eec6005d1b65b1c94a34
-  data.tar.gz: 28124f5d10382c34998f421a44892e6b7d6549706d5e23a24881ccfcd0f9fdfbaee47f4a39b732d2e62919821a3a2407ab752a6802acf7b828f25ddda47acc9c
+  metadata.gz: 1a0e49a306ecd7bb4cee1081b75e46255cb2d8a94a1da790d6b7863b1eecb657111a324faea87076eedd950471f049f8f9f21b718a8d476e7cf12d7b1b484bd3
+  data.tar.gz: e8e55d43cabc562f8570fbb84c14405d336b37a2b31501c8f10f818c8911ff2bf53dc43db5fea72f1f6a1783edb78bcfd0540ce6b877d33850591b7cc948ae90

data/include/bando/qobject/qdbusabstractadaptor.hpp

@@ -23,8 +23,8 @@
 #define BANDO_QDBUSABSTRACTADAPTOR_HPP
 
 #include <bando/common.hpp>
-#include <QChildEvent>
 #include <QEvent>
+#include <QChildEvent>
 #include <QTimerEvent>
 
 RICE4RUBYQT6_USE_NAMESPACE
@@ -52,14 +52,6 @@ template <typename Class_T, typename... Arg_Ts> class BandoQDBusAbstractAdaptor
     void timerEvent(QTimerEvent *event) override { bando_handleEvent<BandoQDBusAbstractAdaptor>(this, event, bando_FunctionName::timerEvent); };
     QObject *sender() const { return this->Class_T::sender(); }
 
-    bool autoRelaySignals() const {
-        return this->Class_T::autoRelaySignals();
-    };
-
-    void setAutoRelaySignals(bool enable) {
-        this->Class_T::setAutoRelaySignals(enable);
-    };
-
   public:
     bool Class_T_handleQObjectEvent(QEvent *event) { return this->Class_T::event(event); };
     bool Class_T_handleQObjectEventFilter(QObject *watched, QEvent *event) { return this->Class_T::eventFilter(watched, event); };
@@ -80,6 +72,15 @@ template <typename Class_T, typename... Arg_Ts> class BandoQDBusAbstractAdaptor
     VALUE *value_address_;
 
     QMetaObject *mo_;
+
+  public:
+    bool Class_T_autoRelaySignals() const {
+        return this->Class_T::autoRelaySignals();
+    };
+
+    void Class_T_setAutoRelaySignals(bool enable) {
+        this->Class_T::setAutoRelaySignals(enable);
+    };
 };
 
 template <typename BC_T, typename C_T>
@@ -95,8 +96,8 @@ Data_Type<BC_T> define_bando_qdbusabstractadaptor_under(Module module, char cons
             .define_method("_sender", &BC_T::sender);
 
     bando_qlass
-        .define_method("auto_relay_signals", &BC_T::autoRelaySignals)
-        .define_method("set_auto_relay_signals", &BC_T::setAutoRelaySignals, Arg("enable"));
+        .define_method("auto_relay_signals", &BC_T::Class_T_autoRelaySignals)
+        .define_method("set_auto_relay_signals", &BC_T::Class_T_setAutoRelaySignals, Arg("enable"));
 
     return bando_qlass;
 }

data/include/bando/qobject/qdbusabstractinterface.hpp

@@ -23,8 +23,8 @@
 #define BANDO_QDBUSABSTRACTINTERFACE_HPP
 
 #include <bando/common.hpp>
-#include <QChildEvent>
 #include <QEvent>
+#include <QChildEvent>
 #include <QTimerEvent>
 
 RICE4RUBYQT6_USE_NAMESPACE

data/include/bando/qobject/qitemdelegate.hpp

@@ -23,11 +23,11 @@
 #define BANDO_QITEMDELEGATE_HPP
 
 #include <bando/common.hpp>
-#include <QChildEvent>
 #include <QEvent>
+#include <QChildEvent>
+#include <QTimerEvent>
 #include <QPainter>
 #include <QStyleOptionViewItem>
-#include <QTimerEvent>
 
 RICE4RUBYQT6_USE_NAMESPACE
 
@@ -54,6 +54,28 @@ template <typename Class_T, typename... Arg_Ts> class BandoQItemDelegate : publi
     void timerEvent(QTimerEvent *event) override { bando_handleEvent<BandoQItemDelegate>(this, event, bando_FunctionName::timerEvent); };
     QObject *sender() const { return this->Class_T::sender(); }
 
+  public:
+    bool Class_T_handleQObjectEvent(QEvent *event) { return this->Class_T::event(event); };
+    bool Class_T_handleQObjectEventFilter(QObject *watched, QEvent *event) { return this->Class_T::eventFilter(watched, event); };
+
+    void Class_T_handleEvent(bando_FunctionName name, QEvent *event) {
+        switch (name)
+        {
+        case bando_FunctionName::childEvent: return this->Class_T::childEvent(static_cast<QChildEvent *>(event));
+        case bando_FunctionName::timerEvent: return this->Class_T::timerEvent(static_cast<QTimerEvent *>(event));
+        default: Q_UNREACHABLE(); break;
+        }
+    };
+
+  public:
+    template <typename BC_T, typename C_T> friend const QMetaObject *bando_metaObject(const BC_T *self);
+
+    Object value_;
+    VALUE *value_address_;
+
+    QMetaObject *mo_;
+
+  public:
     QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override {
         Q_ASSERT(this->value_.rb_type() != RUBY_T_NONE);
         auto rb_name = Identifier("create_editor");
@@ -91,27 +113,6 @@ template <typename Class_T, typename... Arg_Ts> class BandoQItemDelegate : publi
         auto rb_name = Identifier("update_editor_geometry");
         this->value_.call(rb_name, Object(detail::to_ruby(editor)), Object(detail::to_ruby(option)), Object(detail::to_ruby(index)));
     };
-
-  public:
-    bool Class_T_handleQObjectEvent(QEvent *event) { return this->Class_T::event(event); };
-    bool Class_T_handleQObjectEventFilter(QObject *watched, QEvent *event) { return this->Class_T::eventFilter(watched, event); };
-
-    void Class_T_handleEvent(bando_FunctionName name, QEvent *event) {
-        switch (name)
-        {
-        case bando_FunctionName::childEvent: return this->Class_T::childEvent(static_cast<QChildEvent *>(event));
-        case bando_FunctionName::timerEvent: return this->Class_T::timerEvent(static_cast<QTimerEvent *>(event));
-        default: Q_UNREACHABLE(); break;
-        }
-    };
-
-  public:
-    template <typename BC_T, typename C_T> friend const QMetaObject *bando_metaObject(const BC_T *self);
-
-    Object value_;
-    VALUE *value_address_;
-
-    QMetaObject *mo_;
 };
 
 template <typename BC_T, typename C_T>

data/include/bando/qobject/qlayout.hpp

@@ -23,10 +23,10 @@
 #define BANDO_QLAYOUT_HPP
 
 #include <bando/common.hpp>
-#include <QChildEvent>
 #include <QEvent>
-#include <QLayoutItem>
+#include <QChildEvent>
 #include <QTimerEvent>
+#include <QLayoutItem>
 #include <QWidget>
 
 RICE4RUBYQT6_USE_NAMESPACE
@@ -54,6 +54,28 @@ template <typename Class_T, typename... Arg_Ts> class BandoQLayout : public Clas
     void timerEvent(QTimerEvent *event) override { bando_handleEvent<BandoQLayout>(this, event, bando_FunctionName::timerEvent); };
     QObject *sender() const { return this->Class_T::sender(); }
 
+  public:
+    bool Class_T_handleQObjectEvent(QEvent *event) { return this->Class_T::event(event); };
+    bool Class_T_handleQObjectEventFilter(QObject *watched, QEvent *event) { return this->Class_T::eventFilter(watched, event); };
+
+    void Class_T_handleEvent(bando_FunctionName name, QEvent *event) {
+        switch (name)
+        {
+        case bando_FunctionName::childEvent: return this->Class_T::childEvent(static_cast<QChildEvent *>(event));
+        case bando_FunctionName::timerEvent: return this->Class_T::timerEvent(static_cast<QTimerEvent *>(event));
+        default: Q_UNREACHABLE(); break;
+        }
+    };
+
+  public:
+    template <typename BC_T, typename C_T> friend const QMetaObject *bando_metaObject(const BC_T *self);
+
+    Object value_;
+    VALUE *value_address_;
+
+    QMetaObject *mo_;
+
+  public:
     void addItem(QLayoutItem *item) override {
         Q_ASSERT(this->value_.rb_type() != RUBY_T_NONE);
         auto rb_name = Identifier("add_item");
@@ -74,13 +96,6 @@ template <typename Class_T, typename... Arg_Ts> class BandoQLayout : public Clas
         return detail::From_Ruby<QLayoutItem *>().convert(rb_return);
     };
 
-    QLayoutItem *takeAt(int index) override {
-        Q_ASSERT(this->value_.rb_type() != RUBY_T_NONE);
-        auto rb_name = Identifier("take_at");
-        auto rb_return = this->value_.call(rb_name, Object(detail::to_ruby(index)));
-        return detail::From_Ruby<QLayoutItem *>().convert(rb_return);
-    };
-
     QSize sizeHint() const override {
         Q_ASSERT(this->value_.rb_type() != RUBY_T_NONE);
         auto rb_name = Identifier("size_hint");
@@ -88,6 +103,13 @@ template <typename Class_T, typename... Arg_Ts> class BandoQLayout : public Clas
         return detail::From_Ruby<QSize>().convert(rb_return);
     };
 
+    QLayoutItem *takeAt(int index) override {
+        Q_ASSERT(this->value_.rb_type() != RUBY_T_NONE);
+        auto rb_name = Identifier("take_at");
+        auto rb_return = this->value_.call(rb_name, Object(detail::to_ruby(index)));
+        return detail::From_Ruby<QLayoutItem *>().convert(rb_return);
+    };
+
     Qt::Orientations expandingDirections() const override {
         Q_ASSERT(this->value_.rb_type() != RUBY_T_NONE);
         auto rb_name = Identifier("expanding_directions");
@@ -128,27 +150,6 @@ template <typename Class_T, typename... Arg_Ts> class BandoQLayout : public Clas
         auto rb_name = Identifier("set_geometry");
         this->value_.call(rb_name, Object(detail::to_ruby(r)));
     };
-
-  public:
-    bool Class_T_handleQObjectEvent(QEvent *event) { return this->Class_T::event(event); };
-    bool Class_T_handleQObjectEventFilter(QObject *watched, QEvent *event) { return this->Class_T::eventFilter(watched, event); };
-
-    void Class_T_handleEvent(bando_FunctionName name, QEvent *event) {
-        switch (name)
-        {
-        case bando_FunctionName::childEvent: return this->Class_T::childEvent(static_cast<QChildEvent *>(event));
-        case bando_FunctionName::timerEvent: return this->Class_T::timerEvent(static_cast<QTimerEvent *>(event));
-        default: Q_UNREACHABLE(); break;
-        }
-    };
-
-  public:
-    template <typename BC_T, typename C_T> friend const QMetaObject *bando_metaObject(const BC_T *self);
-
-    Object value_;
-    VALUE *value_address_;
-
-    QMetaObject *mo_;
 };
 
 template <typename BC_T, typename C_T>

data/include/bando/qobject/qsortfilterproxymodel.hpp

@@ -0,0 +1,132 @@
+// This file is part of [RubyQt6](https://github.com/souk4711/ruby-qt6).
+//
+// It is licensed under the LGPLv3, included below.
+//
+// As a special exception to the GNU Lesser General Public License version 3
+// ("LGPL3"), the copyright holders of this Library give you permission to
+// convey to a third party a Combined Work that links statically or dynamically
+// to this Library without providing any Minimal Corresponding Source or
+// Minimal Application Code as set out in 4d or providing the installation
+// information set out in section 4e, provided that you comply with the other
+// provisions of LGPL3 and provided that you meet, for the Application the
+// terms and conditions of the license(s) which apply to the Application.
+//
+// Except as stated in this special exception, the provisions of LGPL3 will
+// continue to comply in full to this Library. If you modify this Library, you
+// may apply this exception to your version of this Library, but you are not
+// obliged to do so. If you do not wish to do so, delete this exception
+// statement from your version. This exception does not (and cannot) modify any
+// license terms which apply to the Application, with which you must still
+// comply.
+
+#ifndef BANDO_QSORTFILTERPROXYMODEL_HPP
+#define BANDO_QSORTFILTERPROXYMODEL_HPP
+
+#include <bando/common.hpp>
+#include <QChildEvent>
+#include <QEvent>
+#include <QTimerEvent>
+#include <QSortFilterProxyModel>
+
+RICE4RUBYQT6_USE_NAMESPACE
+
+template <typename Class_T, typename... Arg_Ts> class BandoQSortFilterProxyModel : public Class_T
+{
+  public:
+    BandoQSortFilterProxyModel(Arg_Ts... args) : Class_T(args...), value_(Qnil), value_address_(nullptr), mo_(nullptr) {};
+    BandoQSortFilterProxyModel(const BandoQSortFilterProxyModel &) = delete;
+    BandoQSortFilterProxyModel &operator=(const BandoQSortFilterProxyModel &) = delete;
+    BandoQSortFilterProxyModel(BandoQSortFilterProxyModel &&) = delete;
+    BandoQSortFilterProxyModel &operator=(BandoQSortFilterProxyModel &&) = delete;
+    ~BandoQSortFilterProxyModel() override { bando_finalizer<BandoQSortFilterProxyModel>(this); };
+
+    void initializeValue(Object value, QMetaObject *mo) { bando_initializeValue<BandoQSortFilterProxyModel>(this, value, mo); };
+    Object value() { return this->value_; };
+
+    const QMetaObject *metaObject() const override { return bando_metaObject<BandoQSortFilterProxyModel, Class_T>(this); };
+    int qt_metacall(QMetaObject::Call call, int id, void **args) override { return bando_qt_metacall<BandoQSortFilterProxyModel>(this, call, id, args); };
+
+    bool event(QEvent *event) override { return bando_handleQObjectEvent<BandoQSortFilterProxyModel>(this, event); };
+    bool eventFilter(QObject *watched, QEvent *event) override { return bando_handleQObjectEventFilter<BandoQSortFilterProxyModel>(this, watched, event); };
+
+    void childEvent(QChildEvent *event) override { bando_handleEvent<BandoQSortFilterProxyModel>(this, event, bando_FunctionName::childEvent); };
+    void timerEvent(QTimerEvent *event) override { bando_handleEvent<BandoQSortFilterProxyModel>(this, event, bando_FunctionName::timerEvent); };
+    QObject *sender() const { return this->Class_T::sender(); }
+
+  public:
+    bool Class_T_handleQObjectEvent(QEvent *event) { return this->Class_T::event(event); };
+    bool Class_T_handleQObjectEventFilter(QObject *watched, QEvent *event) { return this->Class_T::eventFilter(watched, event); };
+
+    void Class_T_handleEvent(bando_FunctionName name, QEvent *event) {
+        switch (name)
+        {
+        case bando_FunctionName::childEvent: return this->Class_T::childEvent(static_cast<QChildEvent *>(event));
+        case bando_FunctionName::timerEvent: return this->Class_T::timerEvent(static_cast<QTimerEvent *>(event));
+        default: Q_UNREACHABLE(); break;
+        }
+    };
+
+  public:
+    template <typename BC_T, typename C_T> friend const QMetaObject *bando_metaObject(const BC_T *self);
+
+    Object value_;
+    VALUE *value_address_;
+
+    QMetaObject *mo_;
+
+  public:
+    bool filterAcceptsColumn(int source_column, const QModelIndex &source_parent) const override {
+        Q_ASSERT(this->value_.rb_type() != RUBY_T_NONE);
+        auto rb_name = Identifier("filter_accepts_column");
+        auto rb_return = this->value_.call(rb_name, Object(detail::to_ruby(source_column)), Object(detail::to_ruby(source_parent)));
+        return detail::From_Ruby<bool>().convert(rb_return);
+    };
+
+    bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override {
+        Q_ASSERT(this->value_.rb_type() != RUBY_T_NONE);
+        auto rb_name = Identifier("filter_accepts_row");
+        auto rb_return = this->value_.call(rb_name, Object(detail::to_ruby(source_row)), Object(detail::to_ruby(source_parent)));
+        return detail::From_Ruby<bool>().convert(rb_return);
+    };
+
+    bool lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const override {
+        Q_ASSERT(this->value_.rb_type() != RUBY_T_NONE);
+        auto rb_name = Identifier("less_than");
+        auto rb_return = this->value_.call(rb_name, Object(detail::to_ruby(source_left)), Object(detail::to_ruby(source_right)));
+        return detail::From_Ruby<bool>().convert(rb_return);
+    };
+
+    bool Class_T_filterAcceptsColumn(int source_column, const QModelIndex &source_parent) const {
+        return this->Class_T::filterAcceptsColumn(source_column, source_parent);
+    };
+
+    bool Class_T_filterAcceptsRow(int source_row, const QModelIndex &source_parent) const {
+        return this->Class_T::filterAcceptsRow(source_row, source_parent);
+    };
+
+    bool Class_T_lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const {
+        return this->Class_T::lessThan(source_left, source_right);
+    };
+};
+
+template <typename BC_T, typename C_T>
+Data_Type<BC_T> define_bando_qsortfilterproxymodel_under(Module module, char const *name)
+{
+    Data_Type<BC_T> bando_qlass =
+        define_class_under<BC_T, C_T>(module, name)
+            .define_method("_initialize_ruby_value", &BC_T::initializeValue, Arg("value"), Arg("mo"))
+            .define_method("_ruby_value", &BC_T::value)
+            .define_method("_ruby_value_handle_event", &BC_T::Class_T_handleEvent, Arg("name"), Arg("event"))
+            .define_method("_event", &BC_T::Class_T_handleQObjectEvent, Arg("event"))
+            .define_method("_event_filter", &BC_T::Class_T_handleQObjectEventFilter, Arg("watched"), Arg("event"))
+            .define_method("_sender", &BC_T::sender);
+
+    bando_qlass
+        .define_method("filter_accepts_column", &BC_T::Class_T_filterAcceptsColumn, Arg("source_column"), Arg("source_parent"))
+        .define_method("filter_accepts_row", &BC_T::Class_T_filterAcceptsRow, Arg("source_row"), Arg("source_parent"))
+        .define_method("less_than", &BC_T::Class_T_lessThan, Arg("source_left"), Arg("source_right"));
+
+    return bando_qlass;
+}
+
+#endif

data/include/bando/qobject/qwebenginepage.hpp

@@ -23,8 +23,8 @@
 #define BANDO_QWEBENGINEPAGE_HPP
 
 #include <bando/common.hpp>
-#include <QChildEvent>
 #include <QEvent>
+#include <QChildEvent>
 #include <QTimerEvent>
 #include <QWebEnginePage>
 
@@ -53,6 +53,28 @@ template <typename Class_T, typename... Arg_Ts> class BandoQWebEnginePage : publ
     void timerEvent(QTimerEvent *event) override { bando_handleEvent<BandoQWebEnginePage>(this, event, bando_FunctionName::timerEvent); };
     QObject *sender() const { return this->Class_T::sender(); }
 
+  public:
+    bool Class_T_handleQObjectEvent(QEvent *event) { return this->Class_T::event(event); };
+    bool Class_T_handleQObjectEventFilter(QObject *watched, QEvent *event) { return this->Class_T::eventFilter(watched, event); };
+
+    void Class_T_handleEvent(bando_FunctionName name, QEvent *event) {
+        switch (name)
+        {
+        case bando_FunctionName::childEvent: return this->Class_T::childEvent(static_cast<QChildEvent *>(event));
+        case bando_FunctionName::timerEvent: return this->Class_T::timerEvent(static_cast<QTimerEvent *>(event));
+        default: Q_UNREACHABLE(); break;
+        }
+    };
+
+  public:
+    template <typename BC_T, typename C_T> friend const QMetaObject *bando_metaObject(const BC_T *self);
+
+    Object value_;
+    VALUE *value_address_;
+
+    QMetaObject *mo_;
+
+  public:
     void triggerAction(QWebEnginePage::WebAction action, bool checked = false) override {
         Q_ASSERT(this->value_.rb_type() != RUBY_T_NONE);
         auto rb_name = Identifier("trigger_action");
@@ -60,93 +82,79 @@ template <typename Class_T, typename... Arg_Ts> class BandoQWebEnginePage : publ
     };
 
     bool acceptNavigationRequest(const QUrl &url, QWebEnginePage::NavigationType type, bool isMainFrame) override {
-        auto rb_name = Identifier("accept_navigation_request");
-        if (!this->value_.respond_to(rb_name))
-            return this->Class_T::acceptNavigationRequest(url, type, isMainFrame);
-
         Q_ASSERT(this->value_.rb_type() != RUBY_T_NONE);
+        auto rb_name = Identifier("accept_navigation_request");
         auto rb_return = this->value_.call(rb_name, Object(detail::to_ruby(url)), Object(detail::to_ruby(type)), Object(detail::to_ruby(isMainFrame)));
         return detail::From_Ruby<bool>().convert(rb_return);
     };
 
     QStringList chooseFiles(QWebEnginePage::FileSelectionMode mode, const QStringList &oldFiles, const QStringList &acceptedMimeTypes) override {
-        auto rb_name = Identifier("choose_files");
-        if (!this->value_.respond_to(rb_name))
-            return this->Class_T::chooseFiles(mode, oldFiles, acceptedMimeTypes);
-
         Q_ASSERT(this->value_.rb_type() != RUBY_T_NONE);
+        auto rb_name = Identifier("choose_files");
         auto rb_return = this->value_.call(rb_name, Object(detail::to_ruby(mode)), Object(detail::to_ruby(oldFiles)), Object(detail::to_ruby(acceptedMimeTypes)));
         return detail::From_Ruby<QStringList>().convert(rb_return);
     };
 
     QWebEnginePage *createWindow(QWebEnginePage::WebWindowType type) override {
-        auto rb_name = Identifier("create_window");
-        if (!this->value_.respond_to(rb_name))
-            return this->Class_T::createWindow(type);
-
         Q_ASSERT(this->value_.rb_type() != RUBY_T_NONE);
+        auto rb_name = Identifier("create_window");
         auto rb_return = this->value_.call(rb_name, Object(detail::to_ruby(type)));
         return detail::From_Ruby<QWebEnginePage *>().convert(rb_return);
     };
 
     void javaScriptAlert(const QUrl &securityOrigin, const QString &msg) override {
-        auto rb_name = Identifier("java_script_alert");
-        if (!this->value_.respond_to(rb_name))
-            return this->Class_T::javaScriptAlert(securityOrigin, msg);
-
         Q_ASSERT(this->value_.rb_type() != RUBY_T_NONE);
+        auto rb_name = Identifier("java_script_alert");
         this->value_.call(rb_name, Object(detail::to_ruby(securityOrigin)), Object(detail::to_ruby(msg)));
     };
 
     bool javaScriptConfirm(const QUrl &securityOrigin, const QString &msg) override {
-        auto rb_name = Identifier("java_script_confirm");
-        if (!this->value_.respond_to(rb_name))
-            return this->Class_T::javaScriptConfirm(securityOrigin, msg);
-
         Q_ASSERT(this->value_.rb_type() != RUBY_T_NONE);
+        auto rb_name = Identifier("java_script_confirm");
         auto rb_return = this->value_.call(rb_name, Object(detail::to_ruby(securityOrigin)), Object(detail::to_ruby(msg)));
         return detail::From_Ruby<bool>().convert(rb_return);
     };
 
     void javaScriptConsoleMessage(QWebEnginePage::JavaScriptConsoleMessageLevel level, const QString &message, int lineNumber, const QString &sourceID) override {
-        auto rb_name = Identifier("java_script_console_message");
-        if (!this->value_.respond_to(rb_name))
-            return this->Class_T::javaScriptConsoleMessage(level, message, lineNumber, sourceID);
-
         Q_ASSERT(this->value_.rb_type() != RUBY_T_NONE);
+        auto rb_name = Identifier("java_script_console_message");
         this->value_.call(rb_name, Object(detail::to_ruby(level)), Object(detail::to_ruby(message)), Object(detail::to_ruby(lineNumber)), Object(detail::to_ruby(sourceID)));
     };
 
     bool javaScriptPrompt(const QUrl &securityOrigin, const QString &msg, const QString &defaultValue, QString *result) override {
-        auto rb_name = Identifier("java_script_prompt");
-        if (!this->value_.respond_to(rb_name))
-            return this->Class_T::javaScriptPrompt(securityOrigin, msg, defaultValue, result);
-
         Q_ASSERT(this->value_.rb_type() != RUBY_T_NONE);
+        auto rb_name = Identifier("java_script_prompt");
         auto rb_return = this->value_.call(rb_name, Object(detail::to_ruby(securityOrigin)), Object(detail::to_ruby(msg)), Object(detail::to_ruby(defaultValue)), Object(detail::to_ruby(result)));
         return detail::From_Ruby<bool>().convert(rb_return);
     };
 
-  public:
-    bool Class_T_handleQObjectEvent(QEvent *event) { return this->Class_T::event(event); };
-    bool Class_T_handleQObjectEventFilter(QObject *watched, QEvent *event) { return this->Class_T::eventFilter(watched, event); };
+    bool Class_T_acceptNavigationRequest(const QUrl &url, QWebEnginePage::NavigationType type, bool isMainFrame) {
+        return this->Class_T::acceptNavigationRequest(url, type, isMainFrame);
+    };
 
-    void Class_T_handleEvent(bando_FunctionName name, QEvent *event) {
-        switch (name)
-        {
-        case bando_FunctionName::childEvent: return this->Class_T::childEvent(static_cast<QChildEvent *>(event));
-        case bando_FunctionName::timerEvent: return this->Class_T::timerEvent(static_cast<QTimerEvent *>(event));
-        default: Q_UNREACHABLE(); break;
-        }
+    QStringList Class_T_chooseFiles(QWebEnginePage::FileSelectionMode mode, const QStringList &oldFiles, const QStringList &acceptedMimeTypes) {
+        return this->Class_T::chooseFiles(mode, oldFiles, acceptedMimeTypes);
     };
 
-  public:
-    template <typename BC_T, typename C_T> friend const QMetaObject *bando_metaObject(const BC_T *self);
+    QWebEnginePage *Class_T_createWindow(QWebEnginePage::WebWindowType type) {
+        return this->Class_T::createWindow(type);
+    };
 
-    Object value_;
-    VALUE *value_address_;
+    void Class_T_javaScriptAlert(const QUrl &securityOrigin, const QString &msg) {
+        return this->Class_T::javaScriptAlert(securityOrigin, msg);
+    };
 
-    QMetaObject *mo_;
+    bool Class_T_javaScriptConfirm(const QUrl &securityOrigin, const QString &msg) {
+        return this->Class_T::javaScriptConfirm(securityOrigin, msg);
+    };
+
+    void Class_T_javaScriptConsoleMessage(QWebEnginePage::JavaScriptConsoleMessageLevel level, const QString &message, int lineNumber, const QString &sourceID) {
+        return this->Class_T::javaScriptConsoleMessage(level, message, lineNumber, sourceID);
+    };
+
+    bool Class_T_javaScriptPrompt(const QUrl &securityOrigin, const QString &msg, const QString &defaultValue, QString *result) {
+        return this->Class_T::javaScriptPrompt(securityOrigin, msg, defaultValue, result);
+    };
 };
 
 template <typename BC_T, typename C_T>
@@ -162,7 +170,14 @@ Data_Type<BC_T> define_bando_qwebenginepage_under(Module module, char const *nam
             .define_method("_sender", &BC_T::sender);
 
     bando_qlass
-        .define_method("trigger_action", [](BC_T *self, QWebEnginePage::WebAction action, bool checked) -> void { return self->C_T::triggerAction(action, checked); }, Arg("action"), Arg("checked") = static_cast<bool>(false));
+        .define_method("trigger_action", [](BC_T *self, QWebEnginePage::WebAction action, bool checked) -> void { return self->C_T::triggerAction(action, checked); }, Arg("action"), Arg("checked") = static_cast<bool>(false))
+        .define_method("accept_navigation_request", &BC_T::Class_T_acceptNavigationRequest, Arg("url"), Arg("type"), Arg("is_main_frame"))
+        .define_method("choose_files", &BC_T::Class_T_chooseFiles, Arg("mode"), Arg("old_files"), Arg("accepted_mime_types"))
+        .define_method("create_window", &BC_T::Class_T_createWindow, Arg("type"))
+        .define_method("java_script_alert", &BC_T::Class_T_javaScriptAlert, Arg("security_origin"), Arg("msg"))
+        .define_method("java_script_confirm", &BC_T::Class_T_javaScriptConfirm, Arg("security_origin"), Arg("msg"))
+        .define_method("java_script_console_message", &BC_T::Class_T_javaScriptConsoleMessage, Arg("level"), Arg("message"), Arg("line_number"), Arg("source_id"))
+        .define_method("java_script_prompt", &BC_T::Class_T_javaScriptPrompt, Arg("security_origin"), Arg("msg"), Arg("default_value"), Arg("result"));
 
     return bando_qlass;
 }

data/include/bando/qwidget/qspinbox.hpp

@@ -118,26 +118,6 @@ template <typename Class_T, typename... Arg_Ts> class BandoQSpinBox : public Cla
         return detail::From_Ruby<QSize>().convert(rb_return);
     };
 
-    QString textFromValue(int value) const override {
-        auto rb_name = Identifier("text_from_value");
-        if (!this->value_.respond_to(rb_name))
-            return this->Class_T::textFromValue(value);
-
-        Q_ASSERT(this->value_.rb_type() != RUBY_T_NONE);
-        auto rb_return = this->value_.call(rb_name, Object(detail::to_ruby(value)));
-        return detail::From_Ruby<QString>().convert(rb_return);
-    }
-
-    int valueFromText(const QString &text) const override {
-        auto rb_name = Identifier("value_from_text");
-        if (!this->value_.respond_to(rb_name))
-            return this->Class_T::valueFromText(text);
-
-        Q_ASSERT(this->value_.rb_type() != RUBY_T_NONE);
-        auto rb_return = this->value_.call(rb_name, Object(detail::to_ruby(text)));
-        return detail::From_Ruby<int>().convert(rb_return);
-    }
-
   public:
     bool Class_T_handleQObjectEvent(QEvent *event) { return this->Class_T::event(event); };
     bool Class_T_handleQObjectEventFilter(QObject *watched, QEvent *event) { return this->Class_T::eventFilter(watched, event); };
@@ -185,6 +165,29 @@ template <typename Class_T, typename... Arg_Ts> class BandoQSpinBox : public Cla
     VALUE *value_address_;
 
     QMetaObject *mo_;
+
+  public:
+    QString textFromValue(int value) const override {
+        Q_ASSERT(this->value_.rb_type() != RUBY_T_NONE);
+        auto rb_name = Identifier("text_from_value");
+        auto rb_return = this->value_.call(rb_name, Object(detail::to_ruby(value)));
+        return detail::From_Ruby<QString>().convert(rb_return);
+    };
+
+    int valueFromText(const QString &text) const override {
+        Q_ASSERT(this->value_.rb_type() != RUBY_T_NONE);
+        auto rb_name = Identifier("value_from_text");
+        auto rb_return = this->value_.call(rb_name, Object(detail::to_ruby(text)));
+        return detail::From_Ruby<int>().convert(rb_return);
+    };
+
+    QString Class_T_textFromValue(int value) {
+        return this->Class_T::textFromValue(value);
+    };
+
+    int Class_T_valueFromText(const QString &text) {
+        return this->Class_T::valueFromText(text);
+    };
 };
 
 template <typename BC_T, typename C_T>
@@ -201,7 +204,9 @@ Data_Type<BC_T> define_bando_qspinbox_under(Module module, char const *name)
 
     bando_qlass
         .define_method("minimum_size_hint", [](BC_T *self) -> QSize { return self->C_T::minimumSizeHint(); })
-        .define_method("size_hint", [](BC_T *self) -> QSize { return self->C_T::sizeHint(); });
+        .define_method("size_hint", [](BC_T *self) -> QSize { return self->C_T::sizeHint(); })
+        .define_method("text_from_value", &BC_T::Class_T_textFromValue, Arg("value"))
+        .define_method("value_from_text", &BC_T::Class_T_valueFromText, Arg("text"));
 
     return bando_qlass;
 }

data/include/rice/qt6/preludes/registries.hpp

@@ -41,12 +41,12 @@ struct RUBYQT6_RICE_EXPORT RubyQt6_RTypedData_Registries
 };
 
 #ifdef RUBYQT6_BUILD_RICE_LIB
-inline RubyQt6_RTypedData_Registries *RubyQt6_RTypedData_Registries::instance()
+RubyQt6_RTypedData_Registries *RubyQt6_RTypedData_Registries::instance()
 {
     if (instance_ == nullptr) { instance_ = new RubyQt6_RTypedData_Registries; }
     return instance_;
 }
-inline RubyQt6_RTypedData_Registries *RubyQt6_RTypedData_Registries::instance_ = nullptr;
+RubyQt6_RTypedData_Registries *RubyQt6_RTypedData_Registries::instance_ = nullptr;
 #endif
 
 #endif

data/lib/mkmf-rubyqt6.rb

@@ -68,8 +68,10 @@ def rubyqt6_extconf(mod, depends:)
 
   # Add rice library
   if mod != "Rice"
-    rubyqt6_rice_gem_path = Gem::Specification.find_by_name("ruby-qt6-rice").full_gem_path
-    append_ldflags(File.join(rubyqt6_rice_gem_path, "lib/qt6/rice/rice.so"))
+    spec = Gem::Specification.find_by_name("ruby-qt6-rice")
+    rice_so = File.join(spec.full_gem_path, "lib/qt6/rice/rice.so")
+    rice_so = File.join(spec.extension_dir, "qt6/rice/rice.so") unless File.exist?(rice_so)
+    append_ldflags(rice_so)
   end
 
   # Create Makefile

data/lib/qt6/rice/version.rb

@@ -2,6 +2,6 @@
 
 module RubyQt6
   module Rice
-    RICE_RUBYGEM_VERSION = "6.0.0"
+    RICE_RUBYGEM_VERSION = "6.2.0"
   end
 end

data/lib/qt6/rice.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
-require_relative "rice/version"
-require_relative "rice/rice"
+require "qt6/rice/version"
+require "qt6/rice/rice"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-qt6-rice
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.2.0
 platform: ruby
 authors:
 - John Doe
@@ -9,7 +9,6 @@ bindir: exe
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
-description: Extend the Rice library with support for the Qt framework.
 email:
 - johndoe@example.com
 executables: []
@@ -31,6 +30,7 @@ files:
 - include/bando/qobject/qdbusabstractinterface.hpp
 - include/bando/qobject/qitemdelegate.hpp
 - include/bando/qobject/qlayout.hpp
+- include/bando/qobject/qsortfilterproxymodel.hpp
 - include/bando/qobject/qwebenginepage.hpp
 - include/bando/qwidget.hpp
 - include/bando/qwidget/qspinbox.hpp
@@ -60,11 +60,9 @@ files:
 - lib/qt6/rice.rb
 - lib/qt6/rice/version.rb
 homepage: https://github.com/souk4711/ruby-qt6
-licenses: []
-metadata:
-  homepage_uri: https://github.com/souk4711/ruby-qt6
-  source_code_uri: https://github.com/souk4711/ruby-qt6
-  changelog_uri: https://github.com/souk4711/ruby-qt6
+licenses:
+- LGPL-3.0-only WITH LGPL-3.0-linking-exception
+metadata: {}
 rdoc_options: []
 require_paths:
 - lib