ruby-qt6-rice 2.1.0 → 6.0.0

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

@@ -0,0 +1,63 @@
+// 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 RICE_QT6_PRELUDES_QLASS_HPP
+#define RICE_QT6_PRELUDES_QLASS_HPP
+
+#include <rice/cxx/asserts.hpp>
+
+RICE4RUBYQT6_USE_NAMESPACE
+
+template<typename T, typename Base_T = void>
+inline Data_Type<T> define_qlass_under(Object parent, Identifier id)
+{
+    Class superKlass = get_superklass<Base_T>();
+    Data_Type<T> klass = define_class_under<T, Base_T>(parent, id, superKlass);
+
+    auto instance = RubyQt6_RTypedData_Registries::instance();
+    auto klassid = klass.object_id();
+    auto rtypeddata = klass.ruby_data_type();
+    auto pair = instance->klass2rtypeddata_.insert({ klassid, rtypeddata });
+    if (!pair.second && pair.first->second != rtypeddata) {
+        std::string msg = "define_qlass_under: already registered qlass: " + klass.to_s().str();
+        assertm(false, msg.c_str());
+    }
+
+    return klass;
+}
+
+template<typename T, typename Base_T = void>
+inline Data_Type<T> declare_qlass_under(Object parent, Identifier id)
+{
+    Class klass = parent.const_get(id).value();
+
+    auto instance = RubyQt6_RTypedData_Registries::instance();
+    auto klassid = klass.object_id();
+    auto iter = instance->klass2rtypeddata_.find(klassid);
+    if (iter == instance->klass2rtypeddata_.end()) {
+        std::string msg = "declare_qlass_under: unregistered qlass: " + klass.to_s().str();
+        assertm(false, msg.c_str());
+    }
+
+    return declare_class_under<T, Base_T>(parent, id.c_str(), iter->second);
+}
+
+#endif

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

@@ -0,0 +1,52 @@
+// 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 RICE_QT6_PRELUDES_REGISTRIES_HPP
+#define RICE_QT6_PRELUDES_REGISTRIES_HPP
+
+#ifdef _WIN32
+#  ifdef RUBYQT6_BUILD_RICE_LIB
+#    define RUBYQT6_RICE_EXPORT __declspec(dllexport)
+#  else
+#    define RUBYQT6_RICE_EXPORT __declspec(dllimport)
+#  endif
+#else
+#  define RUBYQT6_RICE_EXPORT
+#endif
+
+struct RUBYQT6_RICE_EXPORT RubyQt6_RTypedData_Registries
+{
+    RUBYQT6_RICE_EXPORT static RubyQt6_RTypedData_Registries *instance();
+    static RubyQt6_RTypedData_Registries* instance_;
+
+    std::map<VALUE, rb_data_type_t*> klass2rtypeddata_;
+};
+
+#ifdef RUBYQT6_BUILD_RICE_LIB
+inline 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;
+#endif
+
+#endif

data/include/rice/qt6/preludes.hpp

@@ -0,0 +1,28 @@
+// 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 RICE_QT6_PRELUDES_HPP
+#define RICE_QT6_PRELUDES_HPP
+
+#include <rice/qt6/preludes/registries.hpp>
+#include <rice/qt6/preludes/qlass.hpp>
+
+#endif

data/include/rice/qt6/qdbusreply.hpp

@@ -32,11 +32,11 @@ void define_qdbusreply_under(Module module)
     using QDBusReply_T = QDBusReply<Value_T>;
     using QDBusPendingReply_T = QDBusPendingReply<Value_T>;
 
-    detail::TypeMapper<QDBusReply_T> typeMapper;
-    std::string klassName = typeMapper.rubyName();
+    detail::TypeDetail<QDBusReply_T> typeDetail;
+    std::string klassName = typeDetail.rubyName();
     Identifier id(klassName);
 
-    define_class_under<QDBusReply_T>(module, id)
+    define_qlass_under<QDBusReply_T>(module, id)
         .define_constructor(Constructor<QDBusReply_T, const QDBusError &>(), Arg("dbus_error") = static_cast<const QDBusError &>(QDBusError()))
         .define_constructor(Constructor<QDBusReply_T, const QDBusMessage &>(), Arg("reply"))
         .define_constructor(Constructor<QDBusReply_T, const QDBusPendingCall &>(), Arg("pcall"))

data/include/rice/qt6/qenum.hpp

@@ -50,7 +50,7 @@ VALUE qenum_qvariant_register_metatype(VALUE self)
 template<typename Enum_T>
 Data_Type<Enum_T> define_qenum_under(Module module, char const* name)
 {
-    Data_Type<Enum_T> qenum = define_class_under<Enum_T>(module, name);
+    Data_Type<Enum_T> qenum = define_qlass_under<Enum_T>(module, name);
     detail::protect(rb_define_method, qenum, "to_i", (RUBY_METHOD_FUNC)qenum_to_i<Enum_T>, 0);
     detail::protect(rb_define_singleton_method, qenum, "from_int", (RUBY_METHOD_FUNC)qenum_from_int<Enum_T>, 1);
     detail::protect(rb_define_singleton_method, qenum, "_qvariant_register_metatype", (RUBY_METHOD_FUNC)qenum_qvariant_register_metatype<Enum_T>, 0);

data/include/rice/qt6/qflags.hpp

@@ -45,7 +45,7 @@ Data_Type<QFlags<Enum_T>> define_qflags_under(Module module, char const* name)
 {
     using QFlags_T = QFlags<Enum_T>;
 
-    Data_Type<QFlags_T> qflags = define_class_under<QFlags_T>(module, name);
+    Data_Type<QFlags_T> qflags = define_qlass_under<QFlags_T>(module, name);
     detail::protect(rb_define_method, qflags, "to_i", (RUBY_METHOD_FUNC)qflags_to_i<QFlags_T>, 0);
     detail::protect(rb_define_singleton_method, qflags, "from_int", (RUBY_METHOD_FUNC)qflags_from_int<QFlags_T>, 1);
     return qflags;

data/include/rice/qt6/qlist.hpp

@@ -23,6 +23,7 @@
 #define RICE_QLIST_HPP
 
 #include <QList>
+#include <rice/cxx/concepts.hpp>
 
 RICE4RUBYQT6_USE_NAMESPACE
 
@@ -38,7 +39,7 @@ public:
         this->define_constructors();
         this->define_capacity_methods();
         this->define_access_methods();
-        this->define_comparable_methods();
+        if constexpr (has_equal_operator<Parameter_T>::value) { this->define_comparable_methods(); }
         this->define_insert_methods();
         this->define_remove_methods();
         this->define_enumerable();
@@ -159,15 +160,17 @@ private:
             return self;
         });
 
-        klass_.define_method("delete", [](QList_T *self, Parameter_T element) -> std::optional<Value_T> {
-            qsizetype index = self->lastIndexOf(element);
-            if (index != -1) {
-                Value_T result = self->takeAt(index);
-                self->removeAll(element);
-                return result;
-            }
-            return std::nullopt;
-        });
+        if constexpr (has_equal_operator<Parameter_T>::value) {
+            klass_.define_method("delete", [](QList_T *self, Parameter_T element) -> std::optional<Value_T> {
+                qsizetype index = self->lastIndexOf(element);
+                if (index != -1) {
+                    Value_T result = self->takeAt(index);
+                    self->removeAll(element);
+                    return result;
+                }
+                return std::nullopt;
+            });
+        }
 
         klass_.define_method("delete_at", [](QList_T *self, qsizetype index) -> std::optional<Value_T> {
             if (index < 0) {
@@ -182,13 +185,7 @@ private:
 
     void define_enumerable()
     {
-        klass_.include_module(rb_mEnumerable);
-        klass_.define_method("each", [](QList_T *self) -> QList_T* {
-            for (qsizetype i = 0; i < self->size(); i++) {
-                detail::protect(rb_yield, detail::to_ruby(self->at(i)));
-            }
-            return self;
-        });
+        klass_.template define_iterator<typename QList_T::iterator(QList_T::*)()>(&QList_T::begin, &QList_T::end);
     }
 
     void define_to_array()
@@ -205,11 +202,11 @@ void define_qlist_under(Module module)
 {
     using QList_T = QList<Value_T>;
 
-    detail::TypeMapper<QList_T> typeMapper;
-    std::string klassName = typeMapper.rubyName();
+    detail::TypeDetail<QList_T> typeDetail;
+    std::string klassName = typeDetail.rubyName();
     Identifier id(klassName);
 
-    Data_Type<QList_T> qlist = define_class_under<QList_T>(module, id);
+    Data_Type<QList_T> qlist = define_qlass_under<QList_T>(module, id);
     DefineQListMethods<QList_T> qlist_(qlist);
 }
 

data/include/rice/qt6/qmap.hpp

@@ -31,6 +31,7 @@ class DefineQMapMethods
 {
       using Key_T = typename QMap_T::key_type;
       using Mapped_T = typename QMap_T::mapped_type;
+      using To_Ruby_T = typename detail::remove_cv_recursive_t<Mapped_T>;
 
 public:
     DefineQMapMethods(Data_Type<QMap_T> klass) : klass_(klass)
@@ -124,18 +125,20 @@ private:
 
     void define_enumerable()
     {
-        klass_.include_module(rb_mEnumerable);
-        klass_.define_method("each", [](QMap_T *self) -> QMap_T* {
-            for (auto i = self->cbegin(), end = self->cend(); i != end; ++i) {
-                detail::protect(rb_yield_values, 2, detail::to_ruby(i.key()), detail::to_ruby(i.value()));
-            }
-            return self;
-        });
+        klass_.template define_iterator<typename QMap_T::iterator (QMap_T::*)()>(&QMap_T::begin, &QMap_T::end);
     }
 
     void define_to_hash()
     {
-        rb_define_alias(klass_, "to_hash", "to_h");
+        klass_.define_method("to_h", [](QMap_T *self) {
+            VALUE result = rb_hash_new();
+            for (auto iter = self->cbegin(), end = self->cend(); iter != end; ++iter) {
+                VALUE key = detail::To_Ruby<Key_T&>().convert(iter.key());
+                VALUE value = detail::To_Ruby<To_Ruby_T&>().convert(iter.value());
+                rb_hash_aset(result, key, value);
+            }
+            return result;
+        }, Return().setValue());
     }
 
 private:
@@ -147,11 +150,11 @@ void define_qmap_under(Module module)
 {
     using QMap_T = QMap<Key_T, Mapped_T>;
 
-    detail::TypeMapper<QMap_T> typeMapper;
-    std::string klassName = typeMapper.rubyName();
+    detail::TypeDetail<QMap_T> typeDetail;
+    std::string klassName = typeDetail.rubyName();
     Identifier id(klassName);
 
-    Data_Type<QMap_T> qmap = define_class_under<QMap_T>(module, id);
+    Data_Type<QMap_T> qmap = define_qlass_under<QMap_T>(module, id);
     DefineQMapMethods<QMap_T> qmap_(qmap);
 }
 

data/include/rice/qt6.hpp

@@ -36,4 +36,7 @@
 // macros
 #define RICE4RUBYQT6_USE_NAMESPACE using namespace ::Rice4RubyQt6;
 
+// include rice/qt6 stuffs
+#include <rice/qt6/preludes.hpp>
+
 #endif

data/lib/mkmf-rubyqt6.rb

@@ -41,18 +41,35 @@ def rubyqt6_extconf(mod, depends:)
   r = "RUBYQT6_BUILD_#{mod.upcase}_LIB"
   append_cppflags("-D#{r}")
 
-  # Add qt6 included directories
+  # Add included directories
   append_cppflags("-I#{qt_install_headers}")
   (Array(depends) + Array(mod)).each do |name|
-    includedir = File.join(qt_install_headers, name)
-    append_cppflags("-I#{includedir}")
+    if name.start_with?("Qt")
+      includedir = File.join(qt_install_headers, name)
+      append_cppflags("-I#{includedir}")
+    elsif name.start_with?("K")
+      includedir = File.join("/usr/include/KF6", name)
+      append_cppflags("-I#{includedir}")
+    end
   end
 
-  # Add qt6 libraries
+  # Add libraries
   (Array(depends) + Array(mod)).each do |name|
-    library = name.sub("Qt", "Qt6")
-    message = "Could not find lib#{library}, please install qt6 package"
-    raise message unless find_library(library, nil, qt_install_libs)
+    if name.start_with?("Qt")
+      library = name.sub("Qt", "Qt6")
+      message = "Could not find lib#{library}, please install qt6 package"
+      raise message unless find_library(library, nil, qt_install_libs)
+    elsif name.start_with?("K")
+      library = name.sub("K", "KF6")
+      message = "Could not find lib#{library}, please install kf6 package"
+      raise message unless find_library(library, nil, "/usr/lib")
+    end
+  end
+
+  # 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"))
   end
 
   # Create Makefile

data/lib/qt6/rice/version.rb

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

data/lib/qt6/rice.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-qt6-rice
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 6.0.0
 platform: ruby
 authors:
 - John Doe
@@ -13,7 +13,8 @@ description: Extend the Rice library with support for the Qt framework.
 email:
 - johndoe@example.com
 executables: []
-extensions: []
+extensions:
+- ext/qt6/rice/extconf.rb
 extra_rdoc_files: []
 files:
 - ".rspec"
@@ -21,6 +22,9 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- ext/qt6/rice/extconf.rb
+- ext/qt6/rice/rice-rb.cpp
+- ext/qt6/rice/rice-rb.hpp
 - include/bando/common.hpp
 - include/bando/qobject.hpp
 - include/bando/qobject/qdbusabstractadaptor.hpp
@@ -33,7 +37,19 @@ files:
 - include/rice/core/api.hpp
 - include/rice/core/rice.hpp
 - include/rice/core/stl.hpp
+- include/rice/cxx/asserts.hpp
+- include/rice/cxx/concepts.hpp
 - include/rice/qt6.hpp
+- include/rice/qt6/preludes.hpp
+- include/rice/qt6/preludes/libqt6core.hpp
+- include/rice/qt6/preludes/libqt6gui.hpp
+- include/rice/qt6/preludes/libqt6multimedia.hpp
+- include/rice/qt6/preludes/libqt6qml.hpp
+- include/rice/qt6/preludes/libqt6quick.hpp
+- include/rice/qt6/preludes/libqt6webenginecore.hpp
+- include/rice/qt6/preludes/libqt6widgets.hpp
+- include/rice/qt6/preludes/qlass.hpp
+- include/rice/qt6/preludes/registries.hpp
 - include/rice/qt6/qdbusreply.hpp
 - include/rice/qt6/qenum.hpp
 - include/rice/qt6/qflags.hpp