ruby-qt6-qtdbus 1.0.1 → 2.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (39) hide show
  1. checksums.yaml +4 -4
  2. data/Rakefile +4 -0
  3. data/ext/qt6/qtdbus/bando-qdbusabstractadaptor-rb.cpp +3 -3
  4. data/ext/qt6/qtdbus/bando-qdbusabstractadaptor-rb.hpp +4 -3
  5. data/ext/qt6/qtdbus/bando-qdbusabstractinterface-rb.cpp +3 -3
  6. data/ext/qt6/qtdbus/bando-qdbusabstractinterface-rb.hpp +4 -3
  7. data/ext/qt6/qtdbus/extconf.rb +3 -13
  8. data/ext/qt6/qtdbus/{qdbus-enum-rb.cpp → qdbus-rb.cpp} +3 -3
  9. data/ext/qt6/qtdbus/qdbus-rb.hpp +5 -0
  10. data/ext/qt6/qtdbus/qdbusabstractadaptor-rb.cpp +3 -3
  11. data/ext/qt6/qtdbus/qdbusabstractadaptor-rb.hpp +4 -3
  12. data/ext/qt6/qtdbus/qdbusabstractinterface-rb.cpp +3 -3
  13. data/ext/qt6/qtdbus/qdbusabstractinterface-rb.hpp +4 -3
  14. data/ext/qt6/qtdbus/qdbusconnection-rb.cpp +3 -3
  15. data/ext/qt6/qtdbus/qdbusconnection-rb.hpp +4 -3
  16. data/ext/qt6/qtdbus/qdbusconnectioninterface-rb.cpp +7 -7
  17. data/ext/qt6/qtdbus/qdbusconnectioninterface-rb.hpp +4 -3
  18. data/ext/qt6/qtdbus/qdbuserror-rb.cpp +3 -3
  19. data/ext/qt6/qtdbus/qdbuserror-rb.hpp +4 -3
  20. data/ext/qt6/qtdbus/qdbusinterface-rb.cpp +3 -3
  21. data/ext/qt6/qtdbus/qdbusinterface-rb.hpp +4 -3
  22. data/ext/qt6/qtdbus/qdbusmessage-rb.cpp +3 -3
  23. data/ext/qt6/qtdbus/qdbusmessage-rb.hpp +4 -3
  24. data/ext/qt6/qtdbus/qdbusservicewatcher-rb.cpp +7 -7
  25. data/ext/qt6/qtdbus/qdbusservicewatcher-rb.hpp +4 -3
  26. data/ext/qt6/qtdbus/qdbusvariant-rb.cpp +3 -3
  27. data/ext/qt6/qtdbus/qdbusvariant-rb.hpp +4 -3
  28. data/ext/qt6/qtdbus/qtdbus-rb.cpp +9 -7
  29. data/ext/qt6/qtdbus/qtdbus-rb.hpp +1 -1
  30. data/ext/qt6/qtdbus/qtdbusversion-rb.cpp +2 -2
  31. data/ext/qt6/qtdbus/qtdbusversion-rb.hpp +4 -3
  32. data/ext/qt6/qtdbus/t-qtdbus-rb.cpp +2 -2
  33. data/ext/qt6/qtdbus/t-qtdbus-rb.hpp +4 -3
  34. data/lib/qt6/qtdbus/qdbusabstractinterface.rb +1 -1
  35. data/lib/qt6/qtdbus/qdbusconnection.rb +1 -1
  36. data/lib/qt6/qtdbus/qdbusinterface.rb +2 -1
  37. data/lib/qt6/qtdbus/version.rb +1 -1
  38. metadata +8 -8
  39. data/ext/qt6/qtdbus/qdbus-enum-rb.hpp +0 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 610f3fd18445a84b9429b085a4d7a3a56729b0bdf4e98bc7376573832645c5d5
4
- data.tar.gz: 4b6beeada66966687e094643f737422380348089c96587888b8f1e999b55a76a
3
+ metadata.gz: 7e9dc5407c193ea060c1980323498c0e9561fd132dc230706ddb6df6e81a94da
4
+ data.tar.gz: df2917ac0993e1bc17cdca2546d71019910d046661e9f2d81da4e4cb5193f1b7
5
5
  SHA512:
6
- metadata.gz: 9650035a4ee26c24fa59cc42f1c11cee32b08d1405c0e483d369c45b74c86acbddb66e768972569df489fa150161672d98c7df5cebd43305260b7e48612bc527
7
- data.tar.gz: fdf3bd20f55c0d0e58c23f5cb010b8f972c196238875e56c9aee7adc553068f76293a51f6019d7d6d5b4b10c5fce46e7ce54a4a2e291fdf62d919c3743dd9619
6
+ metadata.gz: c876941d1e18cb93a578f89f411d92052ed58605cd49b885b2778e12e742ca3f7d78fdcd398cb089a51e8cff3904d58cd6599a6733d05d8e91bac29baf416f93
7
+ data.tar.gz: f4d412676ab754057a7e15bd86748a4eeb29593b057fcff6041e0b52dde3d6a58d347d48af18dc2c067d62a1e71ca8d1f5431e9ad51d204b4f9418950f50f6e7
data/Rakefile CHANGED
@@ -8,6 +8,10 @@ Rake::ExtensionTask.new("qtdbus", GEMSPEC) do |ext|
8
8
  ext.ext_dir = "ext/qt6/qtdbus"
9
9
  ext.lib_dir = "lib/qt6/qtdbus"
10
10
  end
11
+ Rake::Task["rake:compile"].enhance do
12
+ mkdir_p Pathname.new(GEMSPEC.gem_build_complete_path).parent
13
+ touch GEMSPEC.gem_build_complete_path
14
+ end
11
15
 
12
16
  require "rubocop/rake_task"
13
17
  RuboCop::RakeTask.new
@@ -3,13 +3,13 @@
3
3
 
4
4
  #include <QDBusAbstractAdaptor>
5
5
 
6
- using namespace Rice;
6
+ RICE4RUBYQT6_USE_NAMESPACE
7
7
 
8
8
  using Bando_QDBusAbstractAdaptor = BandoQDBusAbstractAdaptor<QDBusAbstractAdaptor, QObject *>;
9
9
 
10
- Rice::Class rb_mBando_cQDBusAbstractAdaptor;
10
+ Class rb_mBando_cQDBusAbstractAdaptor;
11
11
 
12
- void Init_bando_qdbusabstractadaptor(Rice::Module rb_mQt6Bando)
12
+ void Init_bando_qdbusabstractadaptor(Module rb_mQt6Bando)
13
13
  {
14
14
  rb_mBando_cQDBusAbstractAdaptor =
15
15
  define_bando_qdbusabstractadaptor_under<Bando_QDBusAbstractAdaptor, QDBusAbstractAdaptor>(rb_mQt6Bando, "QDBusAbstractAdaptor")
@@ -1,4 +1,5 @@
1
- #include <rice/rice.hpp>
2
- #include <rice/stl.hpp>
1
+ #include <rice/qt6.hpp>
3
2
 
4
- void Init_bando_qdbusabstractadaptor(Rice::Module rb_mQt6Bando);
3
+ RICE4RUBYQT6_USE_NAMESPACE
4
+
5
+ void Init_bando_qdbusabstractadaptor(Module rb_mQt6Bando);
@@ -3,13 +3,13 @@
3
3
 
4
4
  #include <QDBusAbstractInterface>
5
5
 
6
- using namespace Rice;
6
+ RICE4RUBYQT6_USE_NAMESPACE
7
7
 
8
8
  using Bando_QDBusAbstractInterface = BandoQDBusAbstractInterface<QDBusAbstractInterface, const QString &, const QString &, const char *, const QDBusConnection &, QObject *>;
9
9
 
10
- Rice::Class rb_mBando_cQDBusAbstractInterface;
10
+ Class rb_mBando_cQDBusAbstractInterface;
11
11
 
12
- void Init_bando_qdbusabstractinterface(Rice::Module rb_mQt6Bando)
12
+ void Init_bando_qdbusabstractinterface(Module rb_mQt6Bando)
13
13
  {
14
14
  rb_mBando_cQDBusAbstractInterface =
15
15
  define_bando_qdbusabstractinterface_under<Bando_QDBusAbstractInterface, QDBusAbstractInterface>(rb_mQt6Bando, "QDBusAbstractInterface")
@@ -1,4 +1,5 @@
1
- #include <rice/rice.hpp>
2
- #include <rice/stl.hpp>
1
+ #include <rice/qt6.hpp>
3
2
 
4
- void Init_bando_qdbusabstractinterface(Rice::Module rb_mQt6Bando);
3
+ RICE4RUBYQT6_USE_NAMESPACE
4
+
5
+ void Init_bando_qdbusabstractinterface(Module rb_mQt6Bando);
@@ -1,16 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- RUBYQT6_RICE_LIB_PATH = File.join(__dir__, "../../../../rice/lib")
4
- if File.exist?(RUBYQT6_RICE_LIB_PATH)
5
- require File.join(RUBYQT6_RICE_LIB_PATH, "mkmf-rubyqt6.rb")
6
- else
7
- require "mkmf-rubyqt6"
8
- end
3
+ RUBYQT6_RICE_GEM_PATH = Gem::Specification.find_by_name("ruby-qt6-rice").full_gem_path
4
+ require File.join(RUBYQT6_RICE_GEM_PATH, "lib/mkmf-rubyqt6.rb")
9
5
 
10
- includedir = qt_install_headers
11
- append_cppflags("-I#{includedir}")
12
- append_cppflags("-I#{includedir}/QtCore")
13
- append_cppflags("-I#{includedir}/QtDBus")
14
- abort "libQt6DBus is missing, please install qt6-base" unless have_library("Qt6DBus")
15
-
16
- create_makefile("qt6/qtdbus/qtdbus")
6
+ rubyqt6_extconf("QtDBus", depends: ["QtCore"])
@@ -1,10 +1,10 @@
1
- #include "qdbus-enum-rb.hpp"
1
+ #include "qdbus-rb.hpp"
2
2
  #include <qdbusconnection.h>
3
3
  #include <rice/qt6/qenum.hpp>
4
4
 
5
- using namespace Rice;
5
+ RICE4RUBYQT6_USE_NAMESPACE
6
6
 
7
- void Init_qdbus_enum(Rice::Module rb_mQt6QtDBus)
7
+ void Init_qdbus(Module rb_mQt6QtDBus)
8
8
  {
9
9
  Module rb_mQDBus =
10
10
  // RubyQt6::QtDBus::QDBus
@@ -0,0 +1,5 @@
1
+ #include <rice/qt6.hpp>
2
+
3
+ RICE4RUBYQT6_USE_NAMESPACE
4
+
5
+ void Init_qdbus(Module rb_mQt6QtDBus);
@@ -1,11 +1,11 @@
1
1
  #include "qdbusabstractadaptor-rb.hpp"
2
2
  #include <qdbusabstractadaptor.h>
3
3
 
4
- using namespace Rice;
4
+ RICE4RUBYQT6_USE_NAMESPACE
5
5
 
6
- Rice::Class rb_cQDBusAbstractAdaptor;
6
+ Class rb_cQDBusAbstractAdaptor;
7
7
 
8
- void Init_qdbusabstractadaptor(Rice::Module rb_mQt6QtDBus)
8
+ void Init_qdbusabstractadaptor(Module rb_mQt6QtDBus)
9
9
  {
10
10
  rb_cQDBusAbstractAdaptor =
11
11
  // RubyQt6::QtDBus::QDBusAbstractAdaptor
@@ -1,4 +1,5 @@
1
- #include <rice/rice.hpp>
2
- #include <rice/stl.hpp>
1
+ #include <rice/qt6.hpp>
3
2
 
4
- void Init_qdbusabstractadaptor(Rice::Module rb_mQt6QtDBus);
3
+ RICE4RUBYQT6_USE_NAMESPACE
4
+
5
+ void Init_qdbusabstractadaptor(Module rb_mQt6QtDBus);
@@ -1,11 +1,11 @@
1
1
  #include "qdbusabstractinterface-rb.hpp"
2
2
  #include <qdbusabstractinterface.h>
3
3
 
4
- using namespace Rice;
4
+ RICE4RUBYQT6_USE_NAMESPACE
5
5
 
6
- Rice::Class rb_cQDBusAbstractInterface;
6
+ Class rb_cQDBusAbstractInterface;
7
7
 
8
- void Init_qdbusabstractinterface(Rice::Module rb_mQt6QtDBus)
8
+ void Init_qdbusabstractinterface(Module rb_mQt6QtDBus)
9
9
  {
10
10
  rb_cQDBusAbstractInterface =
11
11
  // RubyQt6::QtDBus::QDBusAbstractInterface
@@ -1,4 +1,5 @@
1
- #include <rice/rice.hpp>
2
- #include <rice/stl.hpp>
1
+ #include <rice/qt6.hpp>
3
2
 
4
- void Init_qdbusabstractinterface(Rice::Module rb_mQt6QtDBus);
3
+ RICE4RUBYQT6_USE_NAMESPACE
4
+
5
+ void Init_qdbusabstractinterface(Module rb_mQt6QtDBus);
@@ -8,11 +8,11 @@
8
8
  #include <QDBusMessage>
9
9
  #include <QDBusVirtualObject>
10
10
 
11
- using namespace Rice;
11
+ RICE4RUBYQT6_USE_NAMESPACE
12
12
 
13
- Rice::Class rb_cQDBusConnection;
13
+ Class rb_cQDBusConnection;
14
14
 
15
- void Init_qdbusconnection(Rice::Module rb_mQt6QtDBus)
15
+ void Init_qdbusconnection(Module rb_mQt6QtDBus)
16
16
  {
17
17
  rb_cQDBusConnection =
18
18
  // RubyQt6::QtDBus::QDBusConnection
@@ -1,4 +1,5 @@
1
- #include <rice/rice.hpp>
2
- #include <rice/stl.hpp>
1
+ #include <rice/qt6.hpp>
3
2
 
4
- void Init_qdbusconnection(Rice::Module rb_mQt6QtDBus);
3
+ RICE4RUBYQT6_USE_NAMESPACE
4
+
5
+ void Init_qdbusconnection(Module rb_mQt6QtDBus);
@@ -2,11 +2,11 @@
2
2
  #include <qdbusconnectioninterface.h>
3
3
  #include <rice/qt6/qenum.hpp>
4
4
 
5
- using namespace Rice;
5
+ RICE4RUBYQT6_USE_NAMESPACE
6
6
 
7
- Rice::Class rb_cQDBusConnectionInterface;
7
+ Class rb_cQDBusConnectionInterface;
8
8
 
9
- void Init_qdbusconnectioninterface(Rice::Module rb_mQt6QtDBus)
9
+ void Init_qdbusconnectioninterface(Module rb_mQt6QtDBus)
10
10
  {
11
11
  rb_cQDBusConnectionInterface =
12
12
  // RubyQt6::QtDBus::QDBusConnectionInterface
@@ -22,11 +22,11 @@ void Init_qdbusconnectioninterface(Rice::Module rb_mQt6QtDBus)
22
22
  .define_method("service_pid", &QDBusConnectionInterface::servicePid, Arg("service_name"))
23
23
  .define_method("service_uid", &QDBusConnectionInterface::serviceUid, Arg("service_name"))
24
24
  .define_method("start_service", &QDBusConnectionInterface::startService, Arg("name"))
25
- .define_method("unregister_service", &QDBusConnectionInterface::unregisterService, Arg("service_name"))
25
+ .define_method("unregister_service", &QDBusConnectionInterface::unregisterService, Arg("service_name"));
26
26
  // Signals
27
- .define_method("call_with_callback_failed", &QDBusConnectionInterface::callWithCallbackFailed, Arg("error"), Arg("call"))
28
- .define_method("service_registered", &QDBusConnectionInterface::serviceRegistered, Arg("service"))
29
- .define_method("service_unregistered", &QDBusConnectionInterface::serviceUnregistered, Arg("service"));
27
+ // .define_method("call_with_callback_failed", &QDBusConnectionInterface::callWithCallbackFailed, Arg("error"), Arg("call"))
28
+ // .define_method("service_registered", &QDBusConnectionInterface::serviceRegistered, Arg("service"))
29
+ // .define_method("service_unregistered", &QDBusConnectionInterface::serviceUnregistered, Arg("service"));
30
30
 
31
31
  Data_Type<QDBusConnectionInterface::ServiceQueueOptions> rb_cQDBusConnectionInterfaceServiceQueueOptions =
32
32
  // RubyQt6::QtDBus::QDBusConnectionInterface::ServiceQueueOptions
@@ -1,4 +1,5 @@
1
- #include <rice/rice.hpp>
2
- #include <rice/stl.hpp>
1
+ #include <rice/qt6.hpp>
3
2
 
4
- void Init_qdbusconnectioninterface(Rice::Module rb_mQt6QtDBus);
3
+ RICE4RUBYQT6_USE_NAMESPACE
4
+
5
+ void Init_qdbusconnectioninterface(Module rb_mQt6QtDBus);
@@ -4,11 +4,11 @@
4
4
 
5
5
  #include <QDBusMessage>
6
6
 
7
- using namespace Rice;
7
+ RICE4RUBYQT6_USE_NAMESPACE
8
8
 
9
- Rice::Class rb_cQDBusError;
9
+ Class rb_cQDBusError;
10
10
 
11
- void Init_qdbuserror(Rice::Module rb_mQt6QtDBus)
11
+ void Init_qdbuserror(Module rb_mQt6QtDBus)
12
12
  {
13
13
  rb_cQDBusError =
14
14
  // RubyQt6::QtDBus::QDBusError
@@ -1,4 +1,5 @@
1
- #include <rice/rice.hpp>
2
- #include <rice/stl.hpp>
1
+ #include <rice/qt6.hpp>
3
2
 
4
- void Init_qdbuserror(Rice::Module rb_mQt6QtDBus);
3
+ RICE4RUBYQT6_USE_NAMESPACE
4
+
5
+ void Init_qdbuserror(Module rb_mQt6QtDBus);
@@ -1,11 +1,11 @@
1
1
  #include "qdbusinterface-rb.hpp"
2
2
  #include <qdbusinterface.h>
3
3
 
4
- using namespace Rice;
4
+ RICE4RUBYQT6_USE_NAMESPACE
5
5
 
6
- Rice::Class rb_cQDBusInterface;
6
+ Class rb_cQDBusInterface;
7
7
 
8
- void Init_qdbusinterface(Rice::Module rb_mQt6QtDBus)
8
+ void Init_qdbusinterface(Module rb_mQt6QtDBus)
9
9
  {
10
10
  rb_cQDBusInterface =
11
11
  // RubyQt6::QtDBus::QDBusInterface
@@ -1,4 +1,5 @@
1
- #include <rice/rice.hpp>
2
- #include <rice/stl.hpp>
1
+ #include <rice/qt6.hpp>
3
2
 
4
- void Init_qdbusinterface(Rice::Module rb_mQt6QtDBus);
3
+ RICE4RUBYQT6_USE_NAMESPACE
4
+
5
+ void Init_qdbusinterface(Module rb_mQt6QtDBus);
@@ -2,11 +2,11 @@
2
2
  #include <qdbusmessage.h>
3
3
  #include <rice/qt6/qenum.hpp>
4
4
 
5
- using namespace Rice;
5
+ RICE4RUBYQT6_USE_NAMESPACE
6
6
 
7
- Rice::Class rb_cQDBusMessage;
7
+ Class rb_cQDBusMessage;
8
8
 
9
- void Init_qdbusmessage(Rice::Module rb_mQt6QtDBus)
9
+ void Init_qdbusmessage(Module rb_mQt6QtDBus)
10
10
  {
11
11
  rb_cQDBusMessage =
12
12
  // RubyQt6::QtDBus::QDBusMessage
@@ -1,4 +1,5 @@
1
- #include <rice/rice.hpp>
2
- #include <rice/stl.hpp>
1
+ #include <rice/qt6.hpp>
3
2
 
4
- void Init_qdbusmessage(Rice::Module rb_mQt6QtDBus);
3
+ RICE4RUBYQT6_USE_NAMESPACE
4
+
5
+ void Init_qdbusmessage(Module rb_mQt6QtDBus);
@@ -6,11 +6,11 @@
6
6
  #include <QBindable>
7
7
  #include <QDBusConnection>
8
8
 
9
- using namespace Rice;
9
+ RICE4RUBYQT6_USE_NAMESPACE
10
10
 
11
- Rice::Class rb_cQDBusServiceWatcher;
11
+ Class rb_cQDBusServiceWatcher;
12
12
 
13
- void Init_qdbusservicewatcher(Rice::Module rb_mQt6QtDBus)
13
+ void Init_qdbusservicewatcher(Module rb_mQt6QtDBus)
14
14
  {
15
15
  rb_cQDBusServiceWatcher =
16
16
  // RubyQt6::QtDBus::QDBusServiceWatcher
@@ -29,11 +29,11 @@ void Init_qdbusservicewatcher(Rice::Module rb_mQt6QtDBus)
29
29
  .define_method("set_watch_mode", &QDBusServiceWatcher::setWatchMode, Arg("mode"))
30
30
  .define_method("set_watched_services", &QDBusServiceWatcher::setWatchedServices, Arg("services"))
31
31
  .define_method("watch_mode", &QDBusServiceWatcher::watchMode)
32
- .define_method("watched_services", &QDBusServiceWatcher::watchedServices)
32
+ .define_method("watched_services", &QDBusServiceWatcher::watchedServices);
33
33
  // Signals
34
- .define_method("service_owner_changed", &QDBusServiceWatcher::serviceOwnerChanged, Arg("service"), Arg("old_owner"), Arg("new_owner"))
35
- .define_method("service_registered", &QDBusServiceWatcher::serviceRegistered, Arg("service"))
36
- .define_method("service_unregistered", &QDBusServiceWatcher::serviceUnregistered, Arg("service"));
34
+ // .define_method("service_owner_changed", &QDBusServiceWatcher::serviceOwnerChanged, Arg("service"), Arg("old_owner"), Arg("new_owner"))
35
+ // .define_method("service_registered", &QDBusServiceWatcher::serviceRegistered, Arg("service"))
36
+ // .define_method("service_unregistered", &QDBusServiceWatcher::serviceUnregistered, Arg("service"));
37
37
 
38
38
  Data_Type<QDBusServiceWatcher::WatchModeFlag> rb_cQDBusServiceWatcherWatchModeFlag =
39
39
  // RubyQt6::QtDBus::QDBusServiceWatcher::WatchModeFlag
@@ -1,4 +1,5 @@
1
- #include <rice/rice.hpp>
2
- #include <rice/stl.hpp>
1
+ #include <rice/qt6.hpp>
3
2
 
4
- void Init_qdbusservicewatcher(Rice::Module rb_mQt6QtDBus);
3
+ RICE4RUBYQT6_USE_NAMESPACE
4
+
5
+ void Init_qdbusservicewatcher(Module rb_mQt6QtDBus);
@@ -1,11 +1,11 @@
1
1
  #include "qdbusvariant-rb.hpp"
2
2
  #include <qdbusextratypes.h>
3
3
 
4
- using namespace Rice;
4
+ RICE4RUBYQT6_USE_NAMESPACE
5
5
 
6
- Rice::Class rb_cQDBusVariant;
6
+ Class rb_cQDBusVariant;
7
7
 
8
- void Init_qdbusvariant(Rice::Module rb_mQt6QtDBus)
8
+ void Init_qdbusvariant(Module rb_mQt6QtDBus)
9
9
  {
10
10
 
11
11
  rb_cQDBusVariant =
@@ -1,4 +1,5 @@
1
- #include <rice/rice.hpp>
2
- #include <rice/stl.hpp>
1
+ #include <rice/qt6.hpp>
3
2
 
4
- void Init_qdbusvariant(Rice::Module rb_mQt6QtDBus);
3
+ RICE4RUBYQT6_USE_NAMESPACE
4
+
5
+ void Init_qdbusvariant(Module rb_mQt6QtDBus);
@@ -1,6 +1,6 @@
1
1
  #include "qtdbus-rb.hpp"
2
2
  #include "qtdbusversion-rb.hpp"
3
- #include "qdbus-enum-rb.hpp"
3
+ #include "qdbus-rb.hpp"
4
4
 
5
5
  #include "qdbusconnection-rb.hpp"
6
6
  #include "qdbuserror-rb.hpp"
@@ -18,14 +18,16 @@
18
18
  #include "bando-qdbusabstractadaptor-rb.hpp"
19
19
  #include "bando-qdbusabstractinterface-rb.hpp"
20
20
 
21
+ RICE4RUBYQT6_USE_NAMESPACE
22
+
21
23
  extern "C" void Init_qtdbus()
22
24
  {
23
- return Rice::detail::cpp_protect([] {
24
- Rice::Module rb_mQt6 = Rice::define_module("RubyQt6");
25
- Rice::Module rb_mQt6QtDBus = define_module_under(rb_mQt6, "QtDBus");
25
+ return detail::cpp_protect([] {
26
+ Module rb_mQt6 = define_module("RubyQt6");
27
+ Module rb_mQt6QtDBus = define_module_under(rb_mQt6, "QtDBus");
26
28
 
27
29
  Init_qtdbusversion(rb_mQt6QtDBus);
28
- Init_qdbus_enum(rb_mQt6QtDBus);
30
+ Init_qdbus(rb_mQt6QtDBus);
29
31
 
30
32
  Init_qdbusconnection(rb_mQt6QtDBus);
31
33
  Init_qdbuserror(rb_mQt6QtDBus);
@@ -38,10 +40,10 @@ extern "C" void Init_qtdbus()
38
40
  Init_qdbusinterface(rb_mQt6QtDBus);
39
41
  Init_qdbusservicewatcher(rb_mQt6QtDBus);
40
42
 
41
- Rice::Module rb_mQt6T = define_module_under(rb_mQt6, "T");
43
+ Module rb_mQt6T = define_module_under(rb_mQt6, "T");
42
44
  Init_t_qtdbus(rb_mQt6T);
43
45
 
44
- Rice::Module rb_mQt6Bando = define_module_under(rb_mQt6, "Bando");
46
+ Module rb_mQt6Bando = define_module_under(rb_mQt6, "Bando");
45
47
  Init_bando_qdbusabstractadaptor(rb_mQt6Bando);
46
48
  Init_bando_qdbusabstractinterface(rb_mQt6Bando);
47
49
  });
@@ -1,3 +1,3 @@
1
- #include <rice/rice.hpp>
1
+ #include <rice/qt6.hpp>
2
2
 
3
3
  extern "C" void Init_qtdbus();
@@ -1,9 +1,9 @@
1
1
  #include "qtdbusversion-rb.hpp"
2
2
  #include <qtdbusversion.h>
3
3
 
4
- using namespace Rice;
4
+ RICE4RUBYQT6_USE_NAMESPACE
5
5
 
6
- void Init_qtdbusversion(Rice::Module rb_mQt6QtDBus)
6
+ void Init_qtdbusversion(Module rb_mQt6QtDBus)
7
7
  {
8
8
  rb_mQt6QtDBus.define_constant("QTDBUS_VERSION", QTDBUS_VERSION_STR);
9
9
  }
@@ -1,4 +1,5 @@
1
- #include <rice/rice.hpp>
2
- #include <rice/stl.hpp>
1
+ #include <rice/qt6.hpp>
3
2
 
4
- void Init_qtdbusversion(Rice::Module rb_mQt6QtDBus);
3
+ RICE4RUBYQT6_USE_NAMESPACE
4
+
5
+ void Init_qtdbusversion(Module rb_mQt6QtDBus);
@@ -3,9 +3,9 @@
3
3
 
4
4
  #include <QList>
5
5
 
6
- using namespace Rice;
6
+ RICE4RUBYQT6_USE_NAMESPACE
7
7
 
8
- void Init_t_qtdbus(Rice::Module rb_mQt6T)
8
+ void Init_t_qtdbus(Module rb_mQt6T)
9
9
  {
10
10
  // QDBusReply<QList<QString>>
11
11
  define_qdbusreply_under<QList<QString>>(rb_mQt6T);
@@ -1,4 +1,5 @@
1
- #include <rice/rice.hpp>
2
- #include <rice/stl.hpp>
1
+ #include <rice/qt6.hpp>
3
2
 
4
- void Init_t_qtdbus(Rice::Module rb_mQt6T);
3
+ RICE4RUBYQT6_USE_NAMESPACE
4
+
5
+ void Init_t_qtdbus(Module rb_mQt6T);
@@ -26,7 +26,7 @@ module RubyQt6
26
26
 
27
27
  # @!visibility private
28
28
  def call(*args)
29
- mode = args_nth_delete_callmode(args, 0) || QtDBus::QDBus::CallMode::AutoDetect
29
+ mode = args_nth_delete_callmode(args, 0) || QtDBus::QDBus::AutoDetect
30
30
  method = args.delete_at(0)
31
31
  call_with_argument_list(mode, T.to_qstr(method), T.to_qvariantlist(args))
32
32
  end
@@ -28,7 +28,7 @@ module RubyQt6
28
28
 
29
29
  # @!visibility private
30
30
  def register_object(*args)
31
- options = args_nth_delete_registeroptions(args, -1) || QtDBus::QDBusConnection::RegisterOption::ExportAdaptors
31
+ options = args_nth_delete_registeroptions(args, -1) || QtDBus::QDBusConnection::ExportAdaptors
32
32
  case args.size
33
33
  when 2 then _register_object(T.to_qstr(args[-2]), args[-1], T.to_qflags(options))
34
34
  when 3 then _register_object(T.to_qstr(args[-3]), T.to_qstr(args[-2]), args[-1], T.to_qflags(options))
@@ -18,7 +18,8 @@ module RubyQt6
18
18
  # @param parent [QObject]
19
19
  # @return [QDBusInterface]
20
20
  def initialize(service, path, interface = "", connection = nil, parent = nil)
21
- _initialize(T.to_qstr(service), T.to_qstr(path), T.to_qstr(interface), connection || QtDBus::QDBusConnection.session_bus, parent)
21
+ connection ||= QtDBus::QDBusConnection.session_bus
22
+ _initialize(T.to_qstr(service), T.to_qstr(path), T.to_qstr(interface), connection, parent)
22
23
  _take_ownership_from_ruby(self)
23
24
  end
24
25
  end
@@ -2,6 +2,6 @@
2
2
 
3
3
  module RubyQt6
4
4
  module QtDBus
5
- QTDBUS_RUBYGEM_VERSION = "1.0.1"
5
+ QTDBUS_RUBYGEM_VERSION = "2.0.0"
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ruby-qt6-qtdbus
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.1
4
+ version: 2.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - John Doe
@@ -15,28 +15,28 @@ dependencies:
15
15
  requirements:
16
16
  - - '='
17
17
  - !ruby/object:Gem::Version
18
- version: 1.0.1
18
+ version: 2.0.0
19
19
  type: :runtime
20
20
  prerelease: false
21
21
  version_requirements: !ruby/object:Gem::Requirement
22
22
  requirements:
23
23
  - - '='
24
24
  - !ruby/object:Gem::Version
25
- version: 1.0.1
25
+ version: 2.0.0
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: ruby-qt6-qtcore
28
28
  requirement: !ruby/object:Gem::Requirement
29
29
  requirements:
30
30
  - - "~>"
31
31
  - !ruby/object:Gem::Version
32
- version: 1.0.0
32
+ version: 2.0.0
33
33
  type: :runtime
34
34
  prerelease: false
35
35
  version_requirements: !ruby/object:Gem::Requirement
36
36
  requirements:
37
37
  - - "~>"
38
38
  - !ruby/object:Gem::Version
39
- version: 1.0.0
39
+ version: 2.0.0
40
40
  description: Ruby Bindings for Qt D-Bus.
41
41
  email:
42
42
  - johndoe@example.com
@@ -55,8 +55,8 @@ files:
55
55
  - ext/qt6/qtdbus/bando-qdbusabstractinterface-rb.cpp
56
56
  - ext/qt6/qtdbus/bando-qdbusabstractinterface-rb.hpp
57
57
  - ext/qt6/qtdbus/extconf.rb
58
- - ext/qt6/qtdbus/qdbus-enum-rb.cpp
59
- - ext/qt6/qtdbus/qdbus-enum-rb.hpp
58
+ - ext/qt6/qtdbus/qdbus-rb.cpp
59
+ - ext/qt6/qtdbus/qdbus-rb.hpp
60
60
  - ext/qt6/qtdbus/qdbusabstractadaptor-rb.cpp
61
61
  - ext/qt6/qtdbus/qdbusabstractadaptor-rb.hpp
62
62
  - ext/qt6/qtdbus/qdbusabstractinterface-rb.cpp
@@ -110,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
110
110
  requirements:
111
111
  - - ">="
112
112
  - !ruby/object:Gem::Version
113
- version: 3.1.0
113
+ version: 3.3.0
114
114
  required_rubygems_version: !ruby/object:Gem::Requirement
115
115
  requirements:
116
116
  - - ">="
@@ -1,4 +0,0 @@
1
- #include <rice/rice.hpp>
2
- #include <rice/stl.hpp>
3
-
4
- void Init_qdbus_enum(Rice::Module rb_mQt6QtDBus);