ruby-qt6-qtdbus 2.0.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e9dc5407c193ea060c1980323498c0e9561fd132dc230706ddb6df6e81a94da
-  data.tar.gz: df2917ac0993e1bc17cdca2546d71019910d046661e9f2d81da4e4cb5193f1b7
+  metadata.gz: 921610a9bbaf288cc955aa97e66cfddb1d9d8894be99a2d0e882f42e7df6360d
+  data.tar.gz: 95f78476b4619d26077d0655c20acb99ef7eb456ed35fbd10ce0fd600569311e
 SHA512:
-  metadata.gz: c876941d1e18cb93a578f89f411d92052ed58605cd49b885b2778e12e742ca3f7d78fdcd398cb089a51e8cff3904d58cd6599a6733d05d8e91bac29baf416f93
-  data.tar.gz: f4d412676ab754057a7e15bd86748a4eeb29593b057fcff6041e0b52dde3d6a58d347d48af18dc2c067d62a1e71ca8d1f5431e9ad51d204b4f9418950f50f6e7
+  metadata.gz: 24e7819bce613e65c31682306877f6f5a898769235920d877968dc914aa835dccaa20cc31185af45604c8e07d02b15fde17998361975da6347bffcd3c575b899
+  data.tar.gz: 40de43f58499818ab0bd956934465a2d15d087d3bf4236ad8d9b52eb8943f6bf12a8cc9e318e260d1e78fd9f61a744828d96c58fc7298331508c2e96fa660243

data/ext/qt6/qtdbus/qdbusabstractadaptor-rb.cpp

@@ -9,7 +9,8 @@ void Init_qdbusabstractadaptor(Module rb_mQt6QtDBus)
 {
     rb_cQDBusAbstractAdaptor =
         // RubyQt6::QtDBus::QDBusAbstractAdaptor
-        define_class_under<QDBusAbstractAdaptor, QObject>(rb_mQt6QtDBus, "QDBusAbstractAdaptor")
+        define_qlass_under<QDBusAbstractAdaptor, QObject>(rb_mQt6QtDBus, "QDBusAbstractAdaptor")
             // RubyQt6-Defined Functions
+            .define_singleton_function("_qobject_cast", [](QObject *object) -> const QDBusAbstractAdaptor * { return qobject_cast<QDBusAbstractAdaptor *>(object); })
             .define_singleton_function("_static_meta_object", []() -> const QMetaObject * { return &QDBusAbstractAdaptor::staticMetaObject; });
 }

data/ext/qt6/qtdbus/qdbusabstractinterface-rb.cpp

@@ -9,8 +9,9 @@ void Init_qdbusabstractinterface(Module rb_mQt6QtDBus)
 {
     rb_cQDBusAbstractInterface =
         // RubyQt6::QtDBus::QDBusAbstractInterface
-        define_class_under<QDBusAbstractInterface, QObject>(rb_mQt6QtDBus, "QDBusAbstractInterface")
+        define_qlass_under<QDBusAbstractInterface, QObject>(rb_mQt6QtDBus, "QDBusAbstractInterface")
             // RubyQt6-Defined Functions
+            .define_singleton_function("_qobject_cast", [](QObject *object) -> const QDBusAbstractInterface * { return qobject_cast<QDBusAbstractInterface *>(object); })
             .define_singleton_function("_static_meta_object", []() -> const QMetaObject * { return &QDBusAbstractInterface::staticMetaObject; })
             // Public Functions
             .define_method("async_call_with_argument_list", &QDBusAbstractInterface::asyncCallWithArgumentList, Arg("method"), Arg("args"))

data/ext/qt6/qtdbus/qdbusconnection-rb.cpp

@@ -16,7 +16,7 @@ void Init_qdbusconnection(Module rb_mQt6QtDBus)
 {
     rb_cQDBusConnection =
         // RubyQt6::QtDBus::QDBusConnection
-        define_class_under<QDBusConnection>(rb_mQt6QtDBus, "QDBusConnection")
+        define_qlass_under<QDBusConnection>(rb_mQt6QtDBus, "QDBusConnection")
             // Constructor
             .define_constructor(Constructor<QDBusConnection, const QString &>(), Arg("name"))
             // Public Functions

data/ext/qt6/qtdbus/qdbusconnectioninterface-rb.cpp

@@ -10,8 +10,9 @@ void Init_qdbusconnectioninterface(Module rb_mQt6QtDBus)
 {
     rb_cQDBusConnectionInterface =
         // RubyQt6::QtDBus::QDBusConnectionInterface
-        define_class_under<QDBusConnectionInterface, QDBusAbstractInterface>(rb_mQt6QtDBus, "QDBusConnectionInterface")
+        define_qlass_under<QDBusConnectionInterface, QDBusAbstractInterface>(rb_mQt6QtDBus, "QDBusConnectionInterface")
             // RubyQt6-Defined Functions
+            .define_singleton_function("_qobject_cast", [](QObject *object) -> const QDBusConnectionInterface * { return qobject_cast<QDBusConnectionInterface *>(object); })
             .define_singleton_function("_static_meta_object", []() -> const QMetaObject * { return &QDBusConnectionInterface::staticMetaObject; })
             // Public Functions
             .define_method("activatable_service_names", &QDBusConnectionInterface::activatableServiceNames)

data/ext/qt6/qtdbus/qdbuserror-rb.cpp

@@ -12,7 +12,7 @@ void Init_qdbuserror(Module rb_mQt6QtDBus)
 {
     rb_cQDBusError =
         // RubyQt6::QtDBus::QDBusError
-        define_class_under<QDBusError>(rb_mQt6QtDBus, "QDBusError")
+        define_qlass_under<QDBusError>(rb_mQt6QtDBus, "QDBusError")
             // Constructor
             .define_constructor(Constructor<QDBusError, const QDBusMessage&>(), Arg("message"))
             .define_constructor(Constructor<QDBusError, QDBusError::ErrorType, const QString &>(), Arg("type"), Arg("message"))

data/ext/qt6/qtdbus/qdbusinterface-rb.cpp

@@ -9,8 +9,9 @@ void Init_qdbusinterface(Module rb_mQt6QtDBus)
 {
     rb_cQDBusInterface =
         // RubyQt6::QtDBus::QDBusInterface
-        define_class_under<QDBusInterface, QDBusAbstractInterface>(rb_mQt6QtDBus, "QDBusInterface")
+        define_qlass_under<QDBusInterface, QDBusAbstractInterface>(rb_mQt6QtDBus, "QDBusInterface")
             // RubyQt6-Defined Functions
+            .define_singleton_function("_qobject_cast", [](QObject *object) -> const QDBusInterface * { return qobject_cast<QDBusInterface *>(object); })
             .define_singleton_function("_static_meta_object", []() -> const QMetaObject * { return &QDBusInterface::staticMetaObject; })
             // Constructor
             .define_constructor(Constructor<QDBusInterface, const QString &, const QString &, const QString &, const QDBusConnection &, QObject *>(), Arg("service"), Arg("path"), Arg("interface"), Arg("connection"), Arg("parent"));

data/ext/qt6/qtdbus/qdbusmessage-rb.cpp

@@ -10,7 +10,7 @@ void Init_qdbusmessage(Module rb_mQt6QtDBus)
 {
     rb_cQDBusMessage =
         // RubyQt6::QtDBus::QDBusMessage
-        define_class_under<QDBusMessage>(rb_mQt6QtDBus, "QDBusMessage")
+        define_qlass_under<QDBusMessage>(rb_mQt6QtDBus, "QDBusMessage")
             // Constructor
             .define_constructor(Constructor<QDBusMessage>())
             // Public Functions

data/ext/qt6/qtdbus/qdbusservicewatcher-rb.cpp

@@ -14,8 +14,9 @@ void Init_qdbusservicewatcher(Module rb_mQt6QtDBus)
 {
     rb_cQDBusServiceWatcher =
         // RubyQt6::QtDBus::QDBusServiceWatcher
-        define_class_under<QDBusServiceWatcher, QObject>(rb_mQt6QtDBus, "QDBusServiceWatcher")
+        define_qlass_under<QDBusServiceWatcher, QObject>(rb_mQt6QtDBus, "QDBusServiceWatcher")
             // RubyQt6-Defined Functions
+            .define_singleton_function("_qobject_cast", [](QObject *object) -> const QDBusServiceWatcher * { return qobject_cast<QDBusServiceWatcher *>(object); })
             .define_singleton_function("_static_meta_object", []() -> const QMetaObject * { return &QDBusServiceWatcher::staticMetaObject; })
             // Constructor
             .define_constructor(Constructor<QDBusServiceWatcher, QObject *>(), Arg("parent"))

data/ext/qt6/qtdbus/qdbusvariant-rb.cpp

@@ -10,7 +10,7 @@ void Init_qdbusvariant(Module rb_mQt6QtDBus)
 
     rb_cQDBusVariant =
         // RubyQt6::QtDBus::QDBusVariant
-        define_class_under<QDBusVariant>(rb_mQt6QtDBus, "QDBusVariant")
+        define_qlass_under<QDBusVariant>(rb_mQt6QtDBus, "QDBusVariant")
             // RubyQt6-Defined Functions
             .define_singleton_function("_qvariant_register_metatype", []() -> int { return qRegisterMetaType<QDBusVariant>(); })
             .define_singleton_function("_qvariant_from_value", [](const QDBusVariant &value) -> QVariant { return QVariant::fromValue(value); })

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

@@ -1,4 +1,5 @@
 #include "qtdbus-rb.hpp"
+#include "qtdbuspreludes-rb.hpp"
 #include "qtdbusversion-rb.hpp"
 #include "qdbus-rb.hpp"
 
@@ -26,6 +27,7 @@ extern "C" void Init_qtdbus()
         Module rb_mQt6 = define_module("RubyQt6");
         Module rb_mQt6QtDBus = define_module_under(rb_mQt6, "QtDBus");
 
+        Init_qtdbuspreludes(rb_mQt6);
         Init_qtdbusversion(rb_mQt6QtDBus);
         Init_qdbus(rb_mQt6QtDBus);
 

data/ext/qt6/qtdbus/qtdbuspreludes-rb.cpp

@@ -0,0 +1,9 @@
+#include "qtdbuspreludes-rb.hpp"
+#include <rice/qt6/preludes/libqt6core.hpp>
+
+RICE4RUBYQT6_USE_NAMESPACE
+
+void Init_qtdbuspreludes(Module rb_mQt6)
+{
+    declare_qlass_under_libqt6core(rb_mQt6);
+}

data/ext/qt6/qtdbus/qtdbuspreludes-rb.hpp

@@ -0,0 +1,5 @@
+#include <rice/qt6.hpp>
+
+RICE4RUBYQT6_USE_NAMESPACE
+
+void Init_qtdbuspreludes(Module rb_mQt6);

data/lib/qt6/qtdbus/qdbusabstractinterface.rb

@@ -26,7 +26,7 @@ module RubyQt6
 
       # @!visibility private
       def call(*args)
-        mode = args_nth_delete_callmode(args, 0) || QtDBus::QDBus::AutoDetect
+        mode = args_nth_delete_callmode(args, 0) || QDBus::AutoDetect
         method = args.delete_at(0)
         call_with_argument_list(mode, T.to_qstr(method), T.to_qvariantlist(args))
       end
@@ -34,7 +34,7 @@ module RubyQt6
       private
 
       def args_nth_delete_callmode(args, index)
-        return unless args[index].is_a?(QtDBus::QDBus::CallMode)
+        return unless args[index].is_a?(QDBus::CallMode)
         args.delete_at(index)
       end
     end

data/lib/qt6/qtdbus/qdbusconnection.rb

@@ -28,7 +28,7 @@ module RubyQt6
 
       # @!visibility private
       def register_object(*args)
-        options = args_nth_delete_registeroptions(args, -1) || QtDBus::QDBusConnection::ExportAdaptors
+        options = args_nth_delete_registeroptions(args, -1) || QDBusConnection::ExportAdaptors
         case args.size
         when 2 then _register_object(T.to_qstr(args[-2]), args[-1], T.to_qflags(options))
         when 3 then _register_object(T.to_qstr(args[-3]), T.to_qstr(args[-2]), args[-1], T.to_qflags(options))
@@ -44,7 +44,7 @@ module RubyQt6
       private
 
       def args_nth_delete_registeroptions(args, index)
-        return unless args[index].is_a?(QtDBus::QDBusConnection::RegisterOption) || args[index].is_a?(QtDBus::QDBusConnection::RegisterOptions)
+        return unless args[index].is_a?(QDBusConnection::RegisterOption) || args[index].is_a?(QDBusConnection::RegisterOptions)
         args.delete_at(index)
       end
     end

data/lib/qt6/qtdbus/qdbusinterface.rb

@@ -18,7 +18,7 @@ module RubyQt6
       # @param parent [QObject]
       # @return [QDBusInterface]
       def initialize(service, path, interface = "", connection = nil, parent = nil)
-        connection ||= QtDBus::QDBusConnection.session_bus
+        connection ||= QDBusConnection.session_bus
         _initialize(T.to_qstr(service), T.to_qstr(path), T.to_qstr(interface), connection, parent)
         _take_ownership_from_ruby(self)
       end

data/lib/qt6/qtdbus/qdbusreply.rb

@@ -13,15 +13,15 @@ module RubyQt6
       # @param message [QDBusMessage]
       # @return [QDBusReply]
       def initialize(message)
-        @error = QtDBus::QDBusError.new(message)
+        @error = QDBusError.new(message)
         if @error.valid?
-          @data = QtCore::QVariant.new("")
+          @data = QVariant.new("")
           return
         end
 
         if message.arguments.size < 1
-          @error = QtDBus::QDBusError.new(QtDBus::QDBusError::ErrorType::InvalidSignature, "Unexpected reply signature")
-          @data = QtCore::QVariant.new("")
+          @error = QDBusError.new(QDBusError::ErrorType::InvalidSignature, "Unexpected reply signature")
+          @data = QVariant.new("")
           return
         end
 

data/lib/qt6/qtdbus/qdbusvariant.rb

@@ -5,7 +5,12 @@ module RubyQt6
     # @see https://doc.qt.io/qt-6/qdbusvariant.html
     class QDBusVariant
       # @!parse
-      QtCore::QVariant.register(_qvariant_register_metatype, method(:_qvariant_from_value), method(:_qvariant_to_value), from: self)
+      QVariant.register(
+        _qvariant_register_metatype,
+        method(:_qvariant_from_value),
+        method(:_qvariant_to_value),
+        from: self
+      )
 
       # @!visibility private
       alias_method :_initialize, :initialize
@@ -13,7 +18,7 @@ module RubyQt6
       # @param variant [QVariant]
       # @return [QDBusVariant]
       def initialize(variant)
-        variant = variant.is_a?(QtCore::QVariant) ? variant : QtCore::QVariant.new(variant)
+        variant = variant.is_a?(QVariant) ? variant : QVariant.new(variant)
         _initialize(variant)
       end
     end

data/lib/qt6/qtdbus/version.rb

@@ -2,6 +2,6 @@
 
 module RubyQt6
   module QtDBus
-    QTDBUS_RUBYGEM_VERSION = "2.0.0"
+    QTDBUS_RUBYGEM_VERSION = "6.0.0"
   end
 end

data/lib/qt6/qtdbus.rb

@@ -21,3 +21,5 @@ require_relative "qtdbus/qdbusservicewatcher"
 
 require_relative "bando/qdbusabstractadaptor"
 require_relative "bando/qdbusabstractinterface"
+
+RubyQt6.initialize!(RubyQt6::QtDBus)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-qt6-qtdbus
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 6.0.0
 platform: ruby
 authors:
 - John Doe
@@ -15,28 +15,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: ruby-qt6-qtcore
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 6.0.0
 description: Ruby Bindings for Qt D-Bus.
 email:
 - johndoe@example.com
@@ -77,6 +77,8 @@ files:
 - ext/qt6/qtdbus/qdbusvariant-rb.hpp
 - ext/qt6/qtdbus/qtdbus-rb.cpp
 - ext/qt6/qtdbus/qtdbus-rb.hpp
+- ext/qt6/qtdbus/qtdbuspreludes-rb.cpp
+- ext/qt6/qtdbus/qtdbuspreludes-rb.hpp
 - ext/qt6/qtdbus/qtdbusversion-rb.cpp
 - ext/qt6/qtdbus/qtdbusversion-rb.hpp
 - ext/qt6/qtdbus/t-qtdbus-rb.cpp