cxx-qt-lib: Add support for QUuid (#1149)

--------- Co-authored-by: Leon Matthes <[email protected]>
KDAB · Jan 14, 2025 · e84662a · e84662a
1 parent 1f72cdd
commit e84662a
Show file tree

Hide file tree

Showing 27 changed files with 910 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - `QDateTime::from_string` to parse `QDateTime` from a `QString`.
+- Support for further types: `QUuid`
 
 ### Fixed
 

diff --git a/crates/cxx-qt-lib/Cargo.toml b/crates/cxx-qt-lib/Cargo.toml
@@ -29,14 +29,15 @@ http = { version = "1.0", optional = true }
 rgb = { version = "0.8", optional = true }
 time = { version = "0.3.20", optional = true }
 url = { version = "2.3", optional = true }
+uuid = { version = "1.1.0", optional = true }
 serde = { version = "1", features=["derive"], optional = true }
 
 [build-dependencies]
 cxx-qt-build.workspace = true
 qt-build-utils.workspace = true
 
 [features]
-full = ["qt_full", "serde", "url", "time", "rgb", "http", "chrono", "bytes"]
+full = ["qt_full", "serde", "url", "uuid", "time", "rgb", "http", "chrono", "bytes"]
 default = []
 
 qt_full = ["qt_gui", "qt_qml", "qt_quickcontrols"]
@@ -51,6 +52,7 @@ rgb = ["dep:rgb"]
 time = ["dep:time"]
 url = ["dep:url"]
 serde = ["dep:serde"]
+uuid = ["dep:uuid"]
 link_qt_object_files = ["cxx-qt-build/link_qt_object_files"]
 
 [lints]

diff --git a/crates/cxx-qt-lib/build.rs b/crates/cxx-qt-lib/build.rs
@@ -110,6 +110,7 @@ fn main() {
         "core/qlist/qlist_qstring",
         "core/qlist/qlist_qtime",
         "core/qlist/qlist_qurl",
+        "core/qlist/qlist_quuid",
         "core/qlist/qlist_qvariant",
         "core/qlist/qlist_u8",
         "core/qlist/qlist_u16",
@@ -137,6 +138,7 @@ fn main() {
         "core/qset/qset_qstring",
         "core/qset/qset_qtime",
         "core/qset/qset_qurl",
+        "core/qset/qset_quuid",
         "core/qset/qset_u8",
         "core/qset/qset_u16",
         "core/qset/qset_u32",
@@ -148,6 +150,7 @@ fn main() {
         "core/qt",
         "core/qtime",
         "core/qurl",
+        "core/quuid",
         "core/qvariant/mod",
         "core/qvariant/qvariant_bool",
         "core/qvariant/qvariant_f32",
@@ -170,6 +173,7 @@ fn main() {
         "core/qvariant/qvariant_qstringlist",
         "core/qvariant/qvariant_qtime",
         "core/qvariant/qvariant_qurl",
+        "core/qvariant/qvariant_quuid",
         "core/qvariant/qvariant_u8",
         "core/qvariant/qvariant_u16",
         "core/qvariant/qvariant_u32",
@@ -197,6 +201,7 @@ fn main() {
         "core/qvector/qvector_qstring",
         "core/qvector/qvector_qtime",
         "core/qvector/qvector_qurl",
+        "core/qvector/qvector_quuid",
         "core/qvector/qvector_qvariant",
         "core/qvector/qvector_u8",
         "core/qvector/qvector_u16",
@@ -272,6 +277,7 @@ fn main() {
         "core/qstringlist",
         "core/qtime",
         "core/qurl",
+        "core/quuid",
         "core/qvariant/qvariant",
         "core/qvector/qvector",
     ];

diff --git a/crates/cxx-qt-lib/include/core/qlist.h b/crates/cxx-qt-lib/include/core/qlist.h
@@ -27,6 +27,7 @@
 #include <QtCore/QString>
 #include <QtCore/QTime>
 #include <QtCore/QUrl>
+#include <QtCore/QUuid>
 #include <QtCore/QVariant>
 
 #ifdef CXX_QT_GUI_FEATURE
@@ -170,6 +171,7 @@ using QList_QSizeF = QList<::QSizeF>;
 using QList_QString = QList<::QString>;
 using QList_QTime = QList<::QTime>;
 using QList_QUrl = QList<::QUrl>;
+using QList_QUuid = QList<::QUuid>;
 using QList_QVariant = QList<::QVariant>;
 using QList_u8 = QList<::std::uint8_t>;
 using QList_u16 = QList<::std::uint16_t>;

diff --git a/crates/cxx-qt-lib/include/core/qset.h b/crates/cxx-qt-lib/include/core/qset.h
@@ -17,6 +17,7 @@
 #include <QtCore/QString>
 #include <QtCore/QTime>
 #include <QtCore/QUrl>
+#include <QtCore/QUuid>
 
 #include "rust/cxx.h"
 
@@ -84,6 +85,7 @@ using QSet_QPersistentModelIndex = QSet<::QPersistentModelIndex>;
 using QSet_QString = QSet<::QString>;
 using QSet_QTime = QSet<::QTime>;
 using QSet_QUrl = QSet<::QUrl>;
+using QSet_QUuid = QSet<::QUuid>;
 using QSet_u8 = QSet<::std::uint8_t>;
 using QSet_u16 = QSet<::std::uint16_t>;
 using QSet_u32 = QSet<::std::uint32_t>;

diff --git a/crates/cxx-qt-lib/include/core/quuid.h b/crates/cxx-qt-lib/include/core/quuid.h
@@ -0,0 +1,40 @@
+// clang-format off
+// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
+// clang-format on
+// SPDX-FileContributor: Joshua Booth <[email protected]>
+//
+// SPDX-License-Identifier: MIT OR Apache-2.0
+#pragma once
+
+#include <QtCore/QUuid>
+
+#include "rust/cxx.h"
+
+using QUuidVariant = QUuid::Variant;
+using QUuidVersion = QUuid::Version;
+
+namespace rust {
+namespace cxxqtlib1 {
+QUuid
+quuidCreateUuidV3(const QUuid& ns, ::rust::Slice<const ::std::uint8_t> slice);
+
+QUuid
+quuidCreateUuid();
+
+QUuid
+quuidCreateUuidV5(const QUuid& ns, ::rust::Slice<const ::std::uint8_t> slice);
+
+QString
+quuidToString(const QUuid& uuid);
+
+QUuid
+quuidFromString(const QString& string);
+
+QUuid
+quuidFromStr(rust::Str string);
+
+QUuid
+quuidFromRfc4122(const QByteArray& bytes);
+
+}
+}
diff --git a/crates/cxx-qt-lib/include/core/qvariant.h b/crates/cxx-qt-lib/include/core/qvariant.h
@@ -26,6 +26,7 @@
 #include <QtCore/QStringList>
 #include <QtCore/QTime>
 #include <QtCore/QUrl>
+#include <QtCore/QUuid>
 
 #ifdef CXX_QT_GUI_FEATURE
 #include <QtGui/QColor>
@@ -91,6 +92,7 @@ CXX_QT_QVARIANT_CAN_CONVERT(QString)
 CXX_QT_QVARIANT_CAN_CONVERT(QStringList)
 CXX_QT_QVARIANT_CAN_CONVERT(QTime)
 CXX_QT_QVARIANT_CAN_CONVERT(QUrl)
+CXX_QT_QVARIANT_CAN_CONVERT(QUuid)
 CXX_QT_QVARIANT_CAN_CONVERT(U8)
 CXX_QT_QVARIANT_CAN_CONVERT(U16)
 CXX_QT_QVARIANT_CAN_CONVERT(U32)

diff --git a/crates/cxx-qt-lib/include/core/qvector.h b/crates/cxx-qt-lib/include/core/qvector.h
@@ -25,6 +25,7 @@
 #include <QtCore/QString>
 #include <QtCore/QTime>
 #include <QtCore/QUrl>
+#include <QtCore/QUuid>
 #include <QtCore/QVariant>
 
 #ifdef CXX_QT_GUI_FEATURE
@@ -167,6 +168,7 @@ using QVector_QSizeF = QVector<::QSizeF>;
 using QVector_QString = QVector<::QString>;
 using QVector_QTime = QVector<::QTime>;
 using QVector_QUrl = QVector<::QUrl>;
+using QVector_QUuid = QVector<::QUuid>;
 using QVector_QVariant = QVector<::QVariant>;
 using QVector_u8 = QVector<::std::uint8_t>;
 using QVector_u16 = QVector<::std::uint16_t>;

diff --git a/crates/cxx-qt-lib/src/core/mod.rs b/crates/cxx-qt-lib/src/core/mod.rs
@@ -97,6 +97,9 @@ pub use qpointf::QPointF;
 mod qurl;
 pub use qurl::QUrl;
 
+mod quuid;
+pub use quuid::{QUuid, QUuidVariant, QUuidVersion};
+
 mod qvariant;
 pub use qvariant::{QVariant, QVariantValue};
 

diff --git a/crates/cxx-qt-lib/src/core/qlist/generate.sh b/crates/cxx-qt-lib/src/core/qlist/generate.sh
@@ -227,6 +227,7 @@ generate_bridge_qt "QSizeF" "qsizef"
 generate_bridge_qt "QString" "qstring"
 generate_bridge_qt "QTime" "qtime"
 generate_bridge_qt "QUrl" "qurl"
+generate_bridge_qt "QUuid" "quuid"
 generate_bridge_qt "QVariant" "qvariant"
 generate_bridge_qt "QLine" "qline"
 generate_bridge_qt "QLineF" "qlinef"

diff --git a/crates/cxx-qt-lib/src/core/qlist/mod.rs b/crates/cxx-qt-lib/src/core/qlist/mod.rs
@@ -9,7 +9,7 @@ use crate::QColor;
 use crate::QDateTime;
 use crate::{
     QByteArray, QDate, QLine, QLineF, QMargins, QMarginsF, QPersistentModelIndex, QPoint, QPointF,
-    QRect, QRectF, QSize, QSizeF, QString, QTime, QUrl, QVariant,
+    QRect, QRectF, QSize, QSizeF, QString, QTime, QUrl, QUuid, QVariant,
 };
 use core::{marker::PhantomData, mem::MaybeUninit};
 use cxx::{type_id, ExternType};
@@ -373,6 +373,7 @@ impl_qlist_element!(QSizeF, qlist_qsizef, "QList_QSizeF");
 impl_qlist_element!(QString, qlist_qstring, "QList_QString");
 impl_qlist_element!(QTime, qlist_qtime, "QList_QTime");
 impl_qlist_element!(QUrl, qlist_qurl, "QList_QUrl");
+impl_qlist_element!(QUuid, qlist_quuid, "QList_QUuid");
 impl_qlist_element!(QVariant, qlist_qvariant, "QList_QVariant");
 impl_qlist_element!(u8, qlist_u8, "QList_u8");
 impl_qlist_element!(u16, qlist_u16, "QList_u16");

diff --git a/crates/cxx-qt-lib/src/core/qlist/qlist.cpp b/crates/cxx-qt-lib/src/core/qlist/qlist.cpp
@@ -57,6 +57,7 @@ CXX_QT_QLIST_ASSERTS(::QSizeF, QSizeF);
 CXX_QT_QLIST_ASSERTS(::QString, QString);
 CXX_QT_QLIST_ASSERTS(::QTime, QTime);
 CXX_QT_QLIST_ASSERTS(::QUrl, QUrl);
+CXX_QT_QLIST_ASSERTS(::QUuid, QUuid);
 CXX_QT_QLIST_ASSERTS(::QVariant, QVariant);
 CXX_QT_QLIST_ASSERTS(::std::uint8_t, u8);
 CXX_QT_QLIST_ASSERTS(::std::uint16_t, u16);

diff --git a/crates/cxx-qt-lib/src/core/qlist/qlist_quuid.rs b/crates/cxx-qt-lib/src/core/qlist/qlist_quuid.rs
diff --git a/crates/cxx-qt-lib/src/core/qset/generate.sh b/crates/cxx-qt-lib/src/core/qset/generate.sh
@@ -174,6 +174,7 @@ generate_bridge_qt "QPersistentModelIndex" "qpersistentmodelindex"
 generate_bridge_qt "QString" "qstring"
 generate_bridge_qt "QTime" "qtime"
 generate_bridge_qt "QUrl" "qurl"
+generate_bridge_qt "QUuid" "quuid"
 generate_bridge_primitive "u8"
 generate_bridge_primitive "u16"
 generate_bridge_primitive "u32"

diff --git a/crates/cxx-qt-lib/src/core/qset/mod.rs b/crates/cxx-qt-lib/src/core/qset/mod.rs
@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
 #[cfg(not(target_os = "emscripten"))]
 use crate::QDateTime;
-use crate::{QByteArray, QDate, QPersistentModelIndex, QString, QTime, QUrl};
+use crate::{QByteArray, QDate, QPersistentModelIndex, QString, QTime, QUrl, QUuid};
 use core::{marker::PhantomData, mem::MaybeUninit};
 use cxx::{type_id, ExternType};
 
@@ -262,6 +262,7 @@ impl_qset_element!(
 impl_qset_element!(QString, qset_qstring, "QSet_QString");
 impl_qset_element!(QTime, qset_qtime, "QSet_QTime");
 impl_qset_element!(QUrl, qset_qurl, "QSet_QUrl");
+impl_qset_element!(QUuid, qset_quuid, "QSet_QUuid");
 impl_qset_element!(u8, qset_u8, "QSet_u8");
 impl_qset_element!(u16, qset_u16, "QSet_u16");
 impl_qset_element!(u32, qset_u32, "QSet_u32");

diff --git a/crates/cxx-qt-lib/src/core/qset/qset.cpp b/crates/cxx-qt-lib/src/core/qset/qset.cpp
@@ -34,6 +34,7 @@ CXX_QT_QSET_ASSERTS(::QPersistentModelIndex, QPersistentModelIndex);
 CXX_QT_QSET_ASSERTS(::QString, QString);
 CXX_QT_QSET_ASSERTS(::QTime, QTime);
 CXX_QT_QSET_ASSERTS(::QUrl, QUrl);
+CXX_QT_QSET_ASSERTS(::QUuid, QUuid);
 CXX_QT_QSET_ASSERTS(::std::uint8_t, u8);
 CXX_QT_QSET_ASSERTS(::std::uint16_t, u16);
 CXX_QT_QSET_ASSERTS(::std::uint32_t, u32);