ruby-qt6-qtcore 1.0.1 → 2.0.1

data/ext/qt6/qtcore/qt-enum-sz-rb.cpp

@@ -2,9 +2,9 @@
 #include <qnamespace.h>
 #include <rice/qt6/qenum.hpp>
 
-using namespace Rice;
+RICE4RUBYQT6_USE_NAMESPACE
 
-void Init_qt_enum_sz(Rice::Module rb_mQt6QtCore)
+void Init_qt_enum_sz(Module rb_mQt6QtCore)
 {
     Module rb_mQt =
         // RubyQt6::QtCore::Qt

data/ext/qt6/qtcore/qt-enum-sz-rb.hpp

@@ -1,4 +1,5 @@
-#include <rice/rice.hpp>
-#include <rice/stl.hpp>
+#include <rice/qt6.hpp>
 
-void Init_qt_enum_sz(Rice::Module rb_mQt6QtCore);
+RICE4RUBYQT6_USE_NAMESPACE
+
+void Init_qt_enum_sz(Module rb_mQt6QtCore);

data/ext/qt6/qtcore/qt-flags-al-rb.cpp

@@ -3,9 +3,9 @@
 
 #include <rice/qt6/qflags.hpp>
 
-using namespace Rice;
+RICE4RUBYQT6_USE_NAMESPACE
 
-void Init_qt_flags_al(Rice::Module rb_mQt6QtCore)
+void Init_qt_flags_al(Module rb_mQt6QtCore)
 {
     Module rb_mQt =
         // RubyQt6::QtCore::Qt

data/ext/qt6/qtcore/qt-flags-al-rb.hpp

@@ -1,4 +1,5 @@
-#include <rice/rice.hpp>
-#include <rice/stl.hpp>
+#include <rice/qt6.hpp>
 
-void Init_qt_flags_al(Rice::Module rb_mQt6QtCore);
+RICE4RUBYQT6_USE_NAMESPACE
+
+void Init_qt_flags_al(Module rb_mQt6QtCore);

data/ext/qt6/qtcore/qt-flags-mz-rb.cpp

@@ -3,9 +3,9 @@
 
 #include <rice/qt6/qflags.hpp>
 
-using namespace Rice;
+RICE4RUBYQT6_USE_NAMESPACE
 
-void Init_qt_flags_mz(Rice::Module rb_mQt6QtCore)
+void Init_qt_flags_mz(Module rb_mQt6QtCore)
 {
     Module rb_mQt =
         // RubyQt6::QtCore::Qt

data/ext/qt6/qtcore/qt-flags-mz-rb.hpp

@@ -1,4 +1,5 @@
-#include <rice/rice.hpp>
-#include <rice/stl.hpp>
+#include <rice/qt6.hpp>
 
-void Init_qt_flags_mz(Rice::Module rb_mQt6QtCore);
+RICE4RUBYQT6_USE_NAMESPACE
+
+void Init_qt_flags_mz(Module rb_mQt6QtCore);

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

@@ -28,23 +28,29 @@
 #include "qline-rb.hpp"
 #include "qlocale-rb.hpp"
 #include "qmargins-rb.hpp"
+#include "qmimetype-rb.hpp"
 #include "qmodelindex-rb.hpp"
 #include "qpoint-rb.hpp"
+#include "qprocessenvironment-rb.hpp"
 #include "qrect-rb.hpp"
 #include "qregularexpression-rb.hpp"
 #include "qresource-rb.hpp"
 #include "qsize-rb.hpp"
+#include "qstandardpaths-rb.hpp"
 #include "qtextstream-rb.hpp"
 #include "qurl-rb.hpp"
+#include "qurlquery-rb.hpp"
 #include "quuid-rb.hpp"
 #include "qvariant-rb.hpp"
 
 #include "qobject-rb.hpp"
 #include "qabstractitemmodel-rb.hpp"
 #include "qcoreapplication-rb.hpp"
+#include "qeventloop-rb.hpp"
 #include "qiodevice-rb.hpp"
 #include "qfiledevice-rb.hpp"
 #include "qfile-rb.hpp"
+#include "qprocess-rb.hpp"
 #include "qitemselectionmodel-rb.hpp"
 #include "qsettings-rb.hpp"
 #include "qsignalmapper-rb.hpp"
@@ -54,17 +60,21 @@
 #include "t-qtcore-rb.hpp"
 #include "qitemselection-rb.hpp"
 #include "qstringlist-rb.hpp"
+#include "qvariantlist-rb.hpp"
+#include "qvariantmap-rb.hpp"
 
-#include "bando-rb.hpp"
+#include "bando-core-rb.hpp"
 #include "bando-qobject-rb.hpp"
 
+RICE4RUBYQT6_USE_NAMESPACE
+
 extern "C" void Init_qtcore()
 {
-    return Rice::detail::cpp_protect([] {
-        Rice::define_buffer<char *>();
+    return detail::cpp_protect([] {
+        define_buffer<char *>();
 
-        Rice::Module rb_mQt6 = Rice::define_module("RubyQt6");
-        Rice::Module rb_mQt6QtCore = define_module_under(rb_mQt6, "QtCore");
+        Module rb_mQt6 = define_module("RubyQt6");
+        Module rb_mQt6QtCore = define_module_under(rb_mQt6, "QtCore");
 
         Init_qtcoreversion(rb_mQt6QtCore);
         Init_qt_enum_af(rb_mQt6QtCore);
@@ -95,36 +105,44 @@ extern "C" void Init_qtcore()
         Init_qline(rb_mQt6QtCore);
         Init_qlocale(rb_mQt6QtCore);
         Init_qmargins(rb_mQt6QtCore);
+        Init_qmimetype(rb_mQt6QtCore);
         Init_qmodelindex(rb_mQt6QtCore);
         Init_qpoint(rb_mQt6QtCore);
+        Init_qprocessenvironment(rb_mQt6QtCore);
         Init_qrect(rb_mQt6QtCore);
         Init_qregularexpression(rb_mQt6QtCore);
         Init_qresource(rb_mQt6QtCore);
         Init_qsize(rb_mQt6QtCore);
+        Init_qstandardpaths(rb_mQt6QtCore);
         Init_qtextstream(rb_mQt6QtCore);
         Init_qurl(rb_mQt6QtCore);
+        Init_qurlquery(rb_mQt6QtCore);
         Init_quuid(rb_mQt6QtCore);
         Init_qvariant(rb_mQt6QtCore);
 
         Init_qobject(rb_mQt6QtCore);
         Init_qabstractitemmodel(rb_mQt6QtCore);
         Init_qcoreapplication(rb_mQt6QtCore);
+        Init_qeventloop(rb_mQt6QtCore);
         Init_qiodevice(rb_mQt6QtCore);
         Init_qfiledevice(rb_mQt6QtCore);
         Init_qfile(rb_mQt6QtCore);
+        Init_qprocess(rb_mQt6QtCore);
         Init_qitemselectionmodel(rb_mQt6QtCore);
         Init_qsettings(rb_mQt6QtCore);
         Init_qsignalmapper(rb_mQt6QtCore);
         Init_qtimer(rb_mQt6QtCore);
         Init_qtranslator(rb_mQt6QtCore);
 
-        Rice::Module rb_mQt6T = define_module_under(rb_mQt6, "T");
+        Module rb_mQt6T = define_module_under(rb_mQt6, "T");
         Init_t_qtcore(rb_mQt6T);
         Init_qitemselection(rb_mQt6QtCore);
         Init_qstringlist(rb_mQt6QtCore);
+        Init_qvariantlist(rb_mQt6QtCore);
+        Init_qvariantmap(rb_mQt6QtCore);
 
-        Rice::Module rb_mQt6Bando = define_module_under(rb_mQt6, "Bando");
-        Init_bando(rb_mQt6Bando);
+        Module rb_mQt6Bando = define_module_under(rb_mQt6, "Bando");
+        Init_bando_core(rb_mQt6Bando);
         Init_bando_qobject(rb_mQt6Bando);
     });
 }

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

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

data/ext/qt6/qtcore/qtcoreversion-rb.cpp

@@ -1,9 +1,9 @@
 #include "qtcoreversion-rb.hpp"
 #include <qtcoreversion.h>
 
-using namespace Rice;
+RICE4RUBYQT6_USE_NAMESPACE
 
-void Init_qtcoreversion(Rice::Module rb_mQt6QtCore)
+void Init_qtcoreversion(Module rb_mQt6QtCore)
 {
     rb_mQt6QtCore.define_constant("QTCORE_VERSION", QTCORE_VERSION_STR);
 }

data/ext/qt6/qtcore/qtcoreversion-rb.hpp

@@ -1,4 +1,5 @@
-#include <rice/rice.hpp>
-#include <rice/stl.hpp>
+#include <rice/qt6.hpp>
 
-void Init_qtcoreversion(Rice::Module rb_mQt6QtCore);
+RICE4RUBYQT6_USE_NAMESPACE
+
+void Init_qtcoreversion(Module rb_mQt6QtCore);

data/ext/qt6/qtcore/qtextstream-rb.cpp

@@ -6,11 +6,11 @@
 #include <QIODevice>
 #include <QLocale>
 
-using namespace Rice;
+RICE4RUBYQT6_USE_NAMESPACE
 
-Rice::Class rb_cQTextStream;
+Class rb_cQTextStream;
 
-void Init_qtextstream(Rice::Module rb_mQt6QtCore)
+void Init_qtextstream(Module rb_mQt6QtCore)
 {
     rb_cQTextStream =
         // RubyQt6::QtCore::QTextStream

data/ext/qt6/qtcore/qtextstream-rb.hpp

@@ -1,4 +1,5 @@
-#include <rice/rice.hpp>
-#include <rice/stl.hpp>
+#include <rice/qt6.hpp>
 
-void Init_qtextstream(Rice::Module rb_mQt6QtCore);
+RICE4RUBYQT6_USE_NAMESPACE
+
+void Init_qtextstream(Module rb_mQt6QtCore);

data/ext/qt6/qtcore/qtimer-rb.cpp

@@ -3,11 +3,11 @@
 
 #include <QBindable>
 
-using namespace Rice;
+RICE4RUBYQT6_USE_NAMESPACE
 
-Rice::Class rb_cQTimer;
+Class rb_cQTimer;
 
-void Init_qtimer(Rice::Module rb_mQt6QtCore)
+void Init_qtimer(Module rb_mQt6QtCore)
 {
     rb_cQTimer =
         // RubyQt6::QtCore::QTimer
@@ -29,10 +29,8 @@ void Init_qtimer(Rice::Module rb_mQt6QtCore)
             .define_method("remaining_time", &QTimer::remainingTime)
             .define_method("remaining_time_as_duration", &QTimer::remainingTimeAsDuration)
             .define_method<void (QTimer::*)(int)>("set_interval", &QTimer::setInterval, Arg("msec"))
-            .define_method<void (QTimer::*)(std::chrono::milliseconds)>("set_interval", &QTimer::setInterval, Arg("value"))
             .define_method("set_single_shot", &QTimer::setSingleShot, Arg("single_shot"))
             .define_method("set_timer_type", &QTimer::setTimerType, Arg("atype"))
-            .define_method<void (QTimer::*)(std::chrono::milliseconds)>("start", &QTimer::start, Arg("value"))
             .define_method("timer_id", &QTimer::timerId)
             .define_method("timer_type", &QTimer::timerType)
             // Public Slots
@@ -40,7 +38,7 @@ void Init_qtimer(Rice::Module rb_mQt6QtCore)
             .define_method<void (QTimer::*)()>("start", &QTimer::start)
             .define_method("stop", &QTimer::stop)
             // Signals
-            .define_method("timeout", &QTimer::timeout)
+            // .define_method("timeout", &QTimer::timeout)
             // Static Public Members
             .define_singleton_function<void (*)(int, Qt::TimerType, const QObject *, const char *)>("_single_shot", &QTimer::singleShot, Arg("msec"), Arg("timer_type"), Arg("receiver"), Arg("member"))
             .define_singleton_function<void (*)(int, const QObject *, const char *)>("_single_shot", &QTimer::singleShot, Arg("msec"), Arg("receiver"), Arg("member"));

data/ext/qt6/qtcore/qtimer-rb.hpp

@@ -1,4 +1,5 @@
-#include <rice/rice.hpp>
-#include <rice/stl.hpp>
+#include <rice/qt6.hpp>
 
-void Init_qtimer(Rice::Module rb_mQt6QtCore);
+RICE4RUBYQT6_USE_NAMESPACE
+
+void Init_qtimer(Module rb_mQt6QtCore);

data/ext/qt6/qtcore/qtranslator-rb.cpp

@@ -3,11 +3,11 @@
 
 #include <QLocale>
 
-using namespace Rice;
+RICE4RUBYQT6_USE_NAMESPACE
 
-Rice::Class rb_cQTranslator;
+Class rb_cQTranslator;
 
-void Init_qtranslator(Rice::Module rb_mQt6QtCore)
+void Init_qtranslator(Module rb_mQt6QtCore)
 {
     rb_cQTranslator =
         // RubyQt6::QtCore::QTranslator

data/ext/qt6/qtcore/qtranslator-rb.hpp

@@ -1,4 +1,5 @@
-#include <rice/rice.hpp>
-#include <rice/stl.hpp>
+#include <rice/qt6.hpp>
 
-void Init_qtranslator(Rice::Module rb_mQt6QtCore);
+RICE4RUBYQT6_USE_NAMESPACE
+
+void Init_qtranslator(Module rb_mQt6QtCore);

data/ext/qt6/qtcore/qurl-rb.cpp

@@ -5,15 +5,20 @@
 
 #include <QUrlQuery>
 
-using namespace Rice;
+RICE4RUBYQT6_USE_NAMESPACE
 
-Rice::Class rb_cQUrl;
+Class rb_cQUrl;
 
-void Init_qurl(Rice::Module rb_mQt6QtCore)
+void Init_qurl(Module rb_mQt6QtCore)
 {
     rb_cQUrl =
         // RubyQt6::QtCore::QUrl
         define_class_under<QUrl>(rb_mQt6QtCore, "QUrl")
+            // RubyQt6-Defined Functions
+            .define_method("_to_string", [](QUrl *self, int options) -> QString { return self->toString(QFlag(options)); }, Arg("options"))
+            .define_singleton_function("_qvariant_register_metatype", []() -> int { return qRegisterMetaType<QUrl>(); })
+            .define_singleton_function("_qvariant_from_value", [](const QUrl &value) -> QVariant { return QVariant::fromValue(value); })
+            .define_singleton_function("_qvariant_to_value", [](const QVariant &qvariant) -> QUrl { return qvariant.value<QUrl>(); })
             // Constructor
             .define_constructor(Constructor<QUrl>())
             .define_constructor(Constructor<QUrl, const QString &>(), Arg("url"))
@@ -57,17 +62,16 @@ void Init_qurl(Rice::Module rb_mQt6QtCore)
             .define_method("to_display_string", &QUrl::toDisplayString, Arg("options") = static_cast<QUrl::FormattingOptions>(QUrl::ComponentFormattingOption::PrettyDecoded))
             .define_method("to_encoded", &QUrl::toEncoded, Arg("options") = static_cast<QUrl::FormattingOptions>(QUrl::ComponentFormattingOption::PrettyDecoded))
             .define_method("to_local_file", &QUrl::toLocalFile)
-            .define_method("to_string", &QUrl::toString, Arg("options") = static_cast<QUrl::FormattingOptions>(QUrl::ComponentFormattingOption::PrettyDecoded))
             .define_method("url", &QUrl::url, Arg("options") = static_cast<QUrl::FormattingOptions>(QUrl::ComponentFormattingOption::PrettyDecoded))
             .define_method("user_info", &QUrl::userInfo, Arg("options") = static_cast<QUrl::ComponentFormattingOptions>(QUrl::ComponentFormattingOption::PrettyDecoded))
             .define_method("user_name", &QUrl::userName, Arg("options") = static_cast<QUrl::ComponentFormattingOptions>(QUrl::ComponentFormattingOption::FullyDecoded))
             // Static Public Members
             .define_singleton_function("from_ace", &QUrl::fromAce, Arg("domain"), Arg("options") = static_cast<QUrl::AceProcessingOptions>(QUrl::AceProcessingOptions {}))
             .define_singleton_function("from_encoded", &QUrl::fromEncoded, Arg("input"), Arg("mode") = static_cast<QUrl::ParsingMode>(QUrl::ParsingMode::TolerantMode))
-            .define_singleton_function("from_local_file", &QUrl::fromLocalFile, Arg("localfile"))
+            .define_singleton_function("_from_local_file", &QUrl::fromLocalFile, Arg("localfile"))
             .define_singleton_function("from_percent_encoding", &QUrl::fromPercentEncoding, Arg("input"))
             .define_singleton_function("from_string_list", &QUrl::fromStringList, Arg("uris"), Arg("mode") = static_cast<QUrl::ParsingMode>(QUrl::ParsingMode::TolerantMode))
-            .define_singleton_function("from_user_input", &QUrl::fromUserInput, Arg("user_input"), Arg("working_directory") = static_cast<const QString &>(QString()), Arg("options") = static_cast<QUrl::UserInputResolutionOptions>(QUrl::UserInputResolutionOption::DefaultResolution))
+            .define_singleton_function("_from_user_input", &QUrl::fromUserInput, Arg("user_input"), Arg("working_directory") = static_cast<const QString &>(QString()), Arg("options") = static_cast<QUrl::UserInputResolutionOptions>(QUrl::UserInputResolutionOption::DefaultResolution))
             .define_singleton_function("idn_whitelist", &QUrl::idnWhitelist)
             .define_singleton_function("set_idn_whitelist", &QUrl::setIdnWhitelist, Arg("list"))
             .define_singleton_function("to_ace", &QUrl::toAce, Arg("domain"), Arg("options") = static_cast<QUrl::AceProcessingOptions>(QUrl::AceProcessingOptions {}))

data/ext/qt6/qtcore/qurl-rb.hpp

@@ -1,4 +1,5 @@
-#include <rice/rice.hpp>
-#include <rice/stl.hpp>
+#include <rice/qt6.hpp>
 
-void Init_qurl(Rice::Module rb_mQt6QtCore);
+RICE4RUBYQT6_USE_NAMESPACE
+
+void Init_qurl(Module rb_mQt6QtCore);

data/ext/qt6/qtcore/qurlquery-rb.cpp

@@ -0,0 +1,33 @@
+#include "qurlquery-rb.hpp"
+#include <qurlquery.h>
+
+RICE4RUBYQT6_USE_NAMESPACE
+
+Class rb_cQUrlQuery;
+
+void Init_qurlquery(Module rb_mQt6QtCore)
+{
+    rb_cQUrlQuery =
+        // RubyQt6::QtCore::QUrlQuery
+        define_class_under<QUrlQuery>(rb_mQt6QtCore, "QUrlQuery")
+            // Constructor
+            .define_constructor(Constructor<QUrlQuery>())
+            // Public Functions
+            .define_method("_add_query_item", &QUrlQuery::addQueryItem, Arg("key"), Arg("value"))
+            .define_method("all_query_item_values", &QUrlQuery::allQueryItemValues, Arg("key"), Arg("encoding") = static_cast<QUrl::ComponentFormattingOptions>(QUrl::PrettyDecoded))
+            .define_method("clear", &QUrlQuery::clear)
+            .define_method("_has_query_item", &QUrlQuery::hasQueryItem, Arg("key"))
+            .define_method("detached?", &QUrlQuery::isDetached)
+            .define_method("empty?", &QUrlQuery::isEmpty)
+            .define_method("query", &QUrlQuery::query, Arg("encoding") = static_cast<QUrl::ComponentFormattingOptions>(QUrl::PrettyDecoded))
+            .define_method("query_item_value", &QUrlQuery::queryItemValue, Arg("key"), Arg("encoding") = static_cast<QUrl::ComponentFormattingOptions>(QUrl::PrettyDecoded))
+            .define_method("query_items", &QUrlQuery::queryItems, Arg("encoding") = static_cast<QUrl::ComponentFormattingOptions>(QUrl::PrettyDecoded))
+            .define_method("query_pair_delimiter", &QUrlQuery::queryPairDelimiter)
+            .define_method("query_value_delimiter", &QUrlQuery::queryValueDelimiter)
+            .define_method("_remove_all_query_items", &QUrlQuery::removeAllQueryItems, Arg("key"))
+            .define_method("_remove_query_item", &QUrlQuery::removeQueryItem, Arg("key"))
+            .define_method("_set_query", &QUrlQuery::setQuery, Arg("query"))
+            .define_method("set_query_delimiters", &QUrlQuery::setQueryDelimiters, Arg("value_delimiter"), Arg("pair_delimiter"))
+            .define_method("set_query_items", &QUrlQuery::setQueryItems, Arg("query"))
+            .define_method("to_string", &QUrlQuery::toString, Arg("encoding") = static_cast<QUrl::ComponentFormattingOptions>(QUrl::PrettyDecoded));
+}

data/ext/qt6/qtcore/qurlquery-rb.hpp

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

data/ext/qt6/qtcore/quuid-rb.cpp

@@ -2,9 +2,9 @@
 #include <quuid.h>
 #include <rice/qt6/qenum.hpp>
 
-using namespace Rice;
+RICE4RUBYQT6_USE_NAMESPACE
 
-Rice::Class rb_cQUuid;
+Class rb_cQUuid;
 
 int QUuid_operator_compare(QUuid *lhs, QUuid *rhs)
 {
@@ -13,7 +13,7 @@ int QUuid_operator_compare(QUuid *lhs, QUuid *rhs)
     return 0;
 }
 
-void Init_quuid(Rice::Module rb_mQt6QtCore)
+void Init_quuid(Module rb_mQt6QtCore)
 {
     rb_cQUuid =
         // RubyQt6::QtCore::QUuid

data/ext/qt6/qtcore/quuid-rb.hpp

@@ -1,4 +1,5 @@
-#include <rice/rice.hpp>
-#include <rice/stl.hpp>
+#include <rice/qt6.hpp>
 
-void Init_quuid(Rice::Module rb_mQt6QtCore);
+RICE4RUBYQT6_USE_NAMESPACE
+
+void Init_quuid(Module rb_mQt6QtCore);

data/ext/qt6/qtcore/qvariant-rb.cpp

@@ -14,11 +14,11 @@
 #include <QSizeF>
 #include <QSizeF>
 
-using namespace Rice;
+RICE4RUBYQT6_USE_NAMESPACE
 
-Rice::Class rb_cQVariant;
+Class rb_cQVariant;
 
-void Init_qvariant(Rice::Module rb_mQt6QtCore)
+void Init_qvariant(Module rb_mQt6QtCore)
 {
     rb_cQVariant =
         // RubyQt6::QtCore::QVariant
@@ -29,6 +29,7 @@ void Init_qvariant(Rice::Module rb_mQt6QtCore)
             .define_singleton_function("from_double", [](double value) -> QVariant { return QVariant(value); })
             .define_singleton_function("from_qstring", [](const char *value) -> QVariant { return QVariant(QString(value)); })
             .define_singleton_function("from_qstring", [](const QString &value) -> QVariant { return QVariant(value); })
+            .define_singleton_function("from_qbytearray", [](const QByteArray &value) -> QVariant { return QVariant(value); })
             .define_singleton_function("from_qdatetime", [](const QDateTime &value) -> QVariant { return QVariant(value); })
             .define_singleton_function("from_qdate", [](const QDate &value) -> QVariant { return QVariant(value); })
             .define_singleton_function("from_qtime", [](const QTime &value) -> QVariant { return QVariant(value); })
@@ -50,6 +51,7 @@ void Init_qvariant(Rice::Module rb_mQt6QtCore)
             .define_singleton_function("to_int", [](const QVariant &qvariant) -> int { return qvariant.toInt(); })
             .define_singleton_function("to_double", [](const QVariant &qvariant) -> double { return qvariant.toDouble(); })
             .define_singleton_function("to_qstring", [](const QVariant &qvariant) -> QString { return qvariant.toString(); })
+            .define_singleton_function("to_qbytearray", [](const QVariant &qvariant) -> QByteArray { return qvariant.toByteArray(); })
             .define_singleton_function("to_qdatetime", [](const QVariant &qvariant) -> QDateTime { return qvariant.toDateTime(); })
             .define_singleton_function("to_qdate", [](const QVariant &qvariant) -> QDate { return qvariant.toDate(); })
             .define_singleton_function("to_qtime", [](const QVariant &qvariant) -> QTime { return qvariant.toTime(); })
@@ -64,6 +66,7 @@ void Init_qvariant(Rice::Module rb_mQt6QtCore)
             .define_singleton_function("to_qstringlist", [](const QVariant &qvariant) -> QStringList { return qvariant.toStringList(); })
             .define_singleton_function("_to_qobject", [](const QVariant &qvariant) -> QObject * { return qvariant.value<QObject *>(); })
             // Public Functions
+            .define_method<bool (QVariant::*)(QMetaType)>("convert", &QVariant::convert, Arg("target_type"))
             .define_method("valid?", &QVariant::isValid)
             .define_method("type_id", &QVariant::typeId)
             .define_method("type_name", &QVariant::typeName);

data/ext/qt6/qtcore/qvariant-rb.hpp

@@ -1,4 +1,5 @@
-#include <rice/rice.hpp>
-#include <rice/stl.hpp>
+#include <rice/qt6.hpp>
 
-void Init_qvariant(Rice::Module rb_mQt6QtCore);
+RICE4RUBYQT6_USE_NAMESPACE
+
+void Init_qvariant(Module rb_mQt6QtCore);

data/ext/qt6/qtcore/qvariantlist-rb.cpp

@@ -0,0 +1,16 @@
+#include "qvariantlist-rb.hpp"
+#include <qvariantlist.h>
+
+#include <QList>
+#include <QVariant>
+
+RICE4RUBYQT6_USE_NAMESPACE
+
+Class rb_cQVariantList;
+
+void Init_qvariantlist(Module rb_mQt6QtCore)
+{
+    rb_cQVariantList =
+        // RubyQt6::QtCore::QVariantList
+        define_class_under<QVariantList, QList<QVariant>>(rb_mQt6QtCore, "QVariantList");
+}

data/ext/qt6/qtcore/qvariantlist-rb.hpp

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

data/ext/qt6/qtcore/qvariantmap-rb.cpp

@@ -0,0 +1,16 @@
+#include "qvariantmap-rb.hpp"
+#include <qvariantmap.h>
+
+#include <QMap>
+#include <QVariant>
+
+RICE4RUBYQT6_USE_NAMESPACE
+
+Class rb_cQVariantMap;
+
+void Init_qvariantmap(Module rb_mQt6QtCore)
+{
+    rb_cQVariantMap =
+        // RubyQt6::QtCore::QVariantMap
+        define_class_under<QVariantMap, QMap<QString, QVariant>>(rb_mQt6QtCore, "QVariantMap");
+}

data/ext/qt6/qtcore/qvariantmap-rb.hpp

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

data/ext/qt6/qtcore/t-qtcore-rb.cpp

@@ -1,15 +1,17 @@
 #include "t-qtcore-rb.hpp"
 #include <rice/qt6/qlist.hpp>
+#include <rice/qt6/qmap.hpp>
 
 #include <QItemSelectionRange>
 #include <QModelIndex>
-#include <QObject>
 #include <QString>
+#include <QUrl>
 #include <QVariant>
+#include <QObject>
 
-using namespace Rice;
+RICE4RUBYQT6_USE_NAMESPACE
 
-void Init_t_qtcore(Rice::Module rb_mQt6T)
+void Init_t_qtcore(Module rb_mQt6T)
 {
     // QList<QByteArray>
     define_qlist_under<QByteArray>(rb_mQt6T);
@@ -20,12 +22,18 @@ void Init_t_qtcore(Rice::Module rb_mQt6T)
     // QList<QModelIndex> -> QModelIndexList
     define_qlist_under<QModelIndex>(rb_mQt6T);
 
-    // QList<QObject *>
-    define_qlist_under<QObject *>(rb_mQt6T);
-
     // QList<QString> -> QStringList
     define_qlist_under<QString>(rb_mQt6T);
 
+    // QList<QUrl>
+    define_qlist_under<QUrl>(rb_mQt6T);
+
     // QList<QVariant>
     define_qlist_under<QVariant>(rb_mQt6T);
+
+    // QList<QObject *>
+    define_qlist_under<QObject *>(rb_mQt6T);
+
+    // QMap<QString, QVariant>
+    define_qmap_under<QString, QVariant>(rb_mQt6T);
 }

data/ext/qt6/qtcore/t-qtcore-rb.hpp

@@ -1,4 +1,5 @@
-#include <rice/rice.hpp>
-#include <rice/stl.hpp>
+#include <rice/qt6.hpp>
 
-void Init_t_qtcore(Rice::Module rb_mQt6T);
+RICE4RUBYQT6_USE_NAMESPACE
+
+void Init_t_qtcore(Module rb_mQt6T);

data/lib/qt6/ducktyping.rb

@@ -43,10 +43,17 @@ module RubyQt6
       QtCore::QString.new(str)
     end
 
+    def self.to_qkeysequence(key)
+      return key unless key.is_a?(String) || key.is_a?(QtCore::QString) || key.is_a?(Integer) || key.is_a?(QtGui::QKeySequence::StandardKey)
+      QtGui::QKeySequence.new(key)
+    end
+
     def self.to_qvariantlist(array)
-      array.each_with_object(T::QList≺QVariant≻.new) do |o, memo|
-        memo << (o.is_a?(QtCore::QVariant) ? o : QtCore::QVariant.new(o))
-      end
+      array.each_with_object(QtCore::QVariantList.new) { |e, memo| memo << QtCore::QVariant.new(e) }
+    end
+
+    def self.to_qvariantmap(hash)
+      hash.each_with_object(QtCore::QVariantMap.new) { |(k, v), memo| memo[k.to_qstr] = QtCore::QVariant.new(v) }
     end
 
     def self.to_qflags(enum_or_flags)

data/lib/qt6/qtcore/private/metamethod.rb

@@ -57,7 +57,7 @@ module RubyQt6
         def qsignature_name
           case @underlying
           when :libQt6 then QtCore::Private.inflector.camelize(@name)
-          when :ruby then "_rubyqt6_#{QtCore::Private.inflector.underscore(@name)}"
+          when :ruby then @name
           else raise "Unknown underlying type: #{@underlying}"
           end
         end

data/lib/qt6/qtcore/private/metaobject.rb

@@ -6,25 +6,26 @@ module RubyQt6
       class MetaObject
         attr_reader :metamethods
 
-        def self.find_receiver_metamethod!(receiver, method, signal = nil)
+        def self.find_receiver_metamethod!(receiver, receiver_metamethod_name, signal)
           if signal.nil?
             signature = "anonymous()"
             signal = QtCore::Private::MetaMethod.new(signature, :signal, :ruby)
           end
 
-          name = QtCore::Private::MetaMethod.normalized_name(method.to_s)
+          name = QtCore::Private::MetaMethod.normalized_name(receiver_metamethod_name.to_s)
           compatible_methods = signal.parameters.count.downto(0).map do |n|
             QtCore::Private::MetaMethod.normalized_signature(name, signal.parameters[0...n])
           end
 
-          mo = receiver.class._rubyqt6_metaobject
+          receiver_class = receiver.is_a?(Class) ? receiver : receiver.class
+          mo = receiver_class._rubyqt6_metaobject
           until mo.nil?
             mo.metamethods.each { |meth| return meth if compatible_methods.include?(meth.signature) }
             mo.metamethods.each { |meth| return meth if name == meth.name } if mo.ruby?
             mo = mo.super_class
           end
 
-          qlass = receiver.class.name.split("::").last
+          qlass = receiver_class.name.split("::").last
           raise "No compatible metamethod: #{qlass}##{name}"
         end