ruby-qt6-rice 2.1.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d294b84e15844267b51ba8829e1dcea647389c8ff1b8a9e500bdf3311d2ae80
-  data.tar.gz: 8f4a884cdc06272b3204632eebb815aa4f91e2f3198a4c20891fdafffbfd9df2
+  metadata.gz: 7239b9643a298d4843ba1a52307a5ce451c00ccfb385ca9ba5714f7b297554c0
+  data.tar.gz: 6d14e054c66b2d466d3f87a4f5c8a760d4a0234b9c4afc4b01af93fb3f5a96a9
 SHA512:
-  metadata.gz: 48ffd6cc4df50322f7e39eafadb9dcfebe2fb4a3c339e570a2eaf4f71131f268be7045b9ccf1f2f031068918d4cd15be9c0c368602d298e8d0aacdd8f550fc54
-  data.tar.gz: 4c7ac6689ce87ba910afa4251f1e1a1ee3ceaab6edff4e7677e27c17364062e1bad0d272f29a2673cfb153262364d7deb0b2f4d8517248a8d5485a5d0fac07c4
+  metadata.gz: 27cfba991dc3b4aab4415587ac389e5aa875416b2c6690662bfc434155c20b276316e4497e73577c9ac33c00d8ef0c4280b4b31279f6eec6005d1b65b1c94a34
+  data.tar.gz: 28124f5d10382c34998f421a44892e6b7d6549706d5e23a24881ccfcd0f9fdfbaee47f4a39b732d2e62919821a3a2407ab752a6802acf7b828f25ddda47acc9c

data/.rubocop.yml

@@ -8,4 +8,4 @@ AllCops:
   Exclude:
     - "bin/**/*"
     - "tmp/**/*"
-    - "lib/mkmf-*.rb"
+    - "lib/qt6/mkmf-*.rb"

data/Rakefile

@@ -3,10 +3,21 @@
 require "bundler/gem_tasks"
 GEMSPEC = Gem::Specification.load("rice.gemspec")
 
+require "rake/extensiontask"
+Rake::ExtensionTask.new("rice", GEMSPEC) do |ext|
+  ext.ext_dir = "ext/qt6/rice"
+  ext.lib_dir = "lib/qt6/rice"
+end
+Rake::Task["rake:compile"].enhance do
+  mkdir_p Pathname.new(GEMSPEC.gem_build_complete_path).parent
+  touch GEMSPEC.gem_build_complete_path
+end
+
 require "rubocop/rake_task"
 RuboCop::RakeTask.new
 
 require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 
-task default: %i[spec]
+task build: :compile
+task default: %i[compile spec]

data/ext/qt6/rice/extconf.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+require_relative "../../../lib/mkmf-rubyqt6"
+
+rubyqt6_extconf("Rice", depends: [])

data/ext/qt6/rice/rice-rb.cpp

@@ -0,0 +1,10 @@
+#include "rice-rb.hpp"
+
+RICE4RUBYQT6_USE_NAMESPACE
+
+extern "C" void Init_rice()
+{
+    return detail::cpp_protect([] {
+        RubyQt6_RTypedData_Registries::instance();
+    });
+}

data/ext/qt6/rice/rice-rb.hpp

@@ -0,0 +1,3 @@
+#include <rice/qt6.hpp>
+
+extern "C" void Init_rice();

data/include/bando/common.hpp

@@ -132,7 +132,8 @@ template <typename BandoClass_T> void bando_initializeValue(BandoClass_T *self,
     self->value_ = value;
     self->mo_ = mo;
 
-    self->value_address_ = const_cast<VALUE*>(&self->value_.value());
+    auto v = self->value_.value();
+    self->value_address_ = const_cast<VALUE*>(&v);
     detail::protect(rb_gc_register_address, self->value_address_);
 }
 

data/include/bando/qobject/qdbusabstractadaptor.hpp

@@ -92,7 +92,7 @@ Data_Type<BC_T> define_bando_qdbusabstractadaptor_under(Module module, char cons
             .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);
+            .define_method("_sender", &BC_T::sender);
 
     bando_qlass
         .define_method("auto_relay_signals", &BC_T::autoRelaySignals)

data/include/bando/qobject/qdbusabstractinterface.hpp

@@ -84,7 +84,7 @@ Data_Type<BC_T> define_bando_qdbusabstractinterface_under(Module module, char co
             .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);
+            .define_method("_sender", &BC_T::sender);
     return bando_qlass;
 }
 

data/include/bando/qobject/qitemdelegate.hpp

@@ -124,7 +124,7 @@ Data_Type<BC_T> define_bando_qitemdelegate_under(Module module, char const *name
             .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);
+            .define_method("_sender", &BC_T::sender);
 
     bando_qlass
         .define_method("create_editor", [](BC_T *self, QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) -> QWidget * { return self->C_T::createEditor(parent, option, index); }, Arg("parent"), Arg("option"), Arg("index"))

data/include/bando/qobject/qlayout.hpp

@@ -161,7 +161,7 @@ Data_Type<BC_T> define_bando_qlayout_under(Module module, char const *name)
             .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);
+            .define_method("_sender", &BC_T::sender);
 
     bando_qlass
         .define_method("expanding_directions", [](BC_T *self) -> Qt::Orientations { return self->C_T::expandingDirections(); })

data/include/bando/qobject/qwebenginepage.hpp

@@ -159,7 +159,7 @@ Data_Type<BC_T> define_bando_qwebenginepage_under(Module module, char const *nam
             .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);
+            .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));

data/include/bando/qobject.hpp

@@ -131,7 +131,7 @@ Data_Type<BC_T> define_bando_qobject_under(Module module, char const *name)
     detail::protect(rb_define_method, bando_qlass, "_ruby_value_handle_event", (RUBY_METHOD_FUNC)bando_qobject_ruby_value_handle_event<BC_T>, 2);
     detail::protect(rb_define_method, bando_qlass, "_event", (RUBY_METHOD_FUNC)bando_qobject_event<BC_T>, 1);
     detail::protect(rb_define_method, bando_qlass, "_event_filter", (RUBY_METHOD_FUNC)bando_qobject_event_filter<BC_T>, 2);
-    detail::protect(rb_define_method, bando_qlass, "sender", (RUBY_METHOD_FUNC)bando_qobject_sender<BC_T>, 0);
+    detail::protect(rb_define_method, bando_qlass, "_sender", (RUBY_METHOD_FUNC)bando_qobject_sender<BC_T>, 0);
     return bando_qlass;
 }
 

data/include/bando/qwidget/qspinbox.hpp

@@ -197,7 +197,7 @@ Data_Type<BC_T> define_bando_qspinbox_under(Module module, char const *name)
             .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);
+            .define_method("_sender", &BC_T::sender);
 
     bando_qlass
         .define_method("minimum_size_hint", [](BC_T *self) -> QSize { return self->C_T::minimumSizeHint(); })

data/include/bando/qwidget.hpp

@@ -240,7 +240,7 @@ Data_Type<BC_T> define_bando_qwidget_under(Module module, char const *name)
     detail::protect(rb_define_method, bando_qlass, "_ruby_value_handle_event", (RUBY_METHOD_FUNC)bando_qwidget_ruby_value_handle_event<BC_T>, 2);
     detail::protect(rb_define_method, bando_qlass, "_event", (RUBY_METHOD_FUNC)bando_qwidget_event<BC_T>, 1);
     detail::protect(rb_define_method, bando_qlass, "_event_filter", (RUBY_METHOD_FUNC)bando_qwidget_event_filter<BC_T>, 2);
-    detail::protect(rb_define_method, bando_qlass, "sender", (RUBY_METHOD_FUNC)bando_qwidget_sender<BC_T>, 0);
+    detail::protect(rb_define_method, bando_qlass, "_sender", (RUBY_METHOD_FUNC)bando_qwidget_sender<BC_T>, 0);
     detail::protect(rb_define_method, bando_qlass, "minimum_size_hint", (RUBY_METHOD_FUNC)bando_qwidget_minimum_size_hint<BC_T, C_T>, 0);
     detail::protect(rb_define_method, bando_qlass, "size_hint", (RUBY_METHOD_FUNC)bando_qwidget_size_hint<BC_T, C_T>, 0);
     return bando_qlass;