WIP: examples: use Result in qml_features and test_inputs

Related to #404
KDAB · Jul 19, 2023 · 3618ed4 · 3618ed4
1 parent 5212017
commit 3618ed4
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 3 deletions.
diff --git a/crates/cxx-qt-gen/test_inputs/invokables.rs b/crates/cxx-qt-gen/test_inputs/invokables.rs
@@ -35,6 +35,12 @@ mod ffi {
 
         #[qinvokable(cxx_virtual)]
         fn invokable_virtual(self: &MyObject);
+
+        #[qinvokable]
+        fn invokable_result_tuple(self: &MyObject) -> Result<()>;
+
+        #[qinvokable]
+        fn invokable_result_type(self: &MyObject) -> Result<String>;
     }
 
     impl cxx_qt::Threading for MyObject {}

diff --git a/crates/cxx-qt-gen/test_outputs/invokables.cpp b/crates/cxx-qt-gen/test_outputs/invokables.cpp
@@ -78,6 +78,20 @@ MyObject::invokableVirtual() const
   m_rustObj->invokableVirtualWrapper(*this);
 }
 
+void
+MyObject::invokableResultTuple() const
+{
+  const ::std::lock_guard<::std::recursive_mutex> guard(*m_rustObjMutex);
+  m_rustObj->invokableResultTupleWrapper(*this);
+}
+
+::rust::String
+MyObject::invokableResultType() const
+{
+  const ::std::lock_guard<::std::recursive_mutex> guard(*m_rustObjMutex);
+  return m_rustObj->invokableResultTypeWrapper(*this);
+}
+
 static_assert(alignof(MyObjectCxxQtThread) <= alignof(::std::size_t),
               "unexpected aligment");
 static_assert(sizeof(MyObjectCxxQtThread) == sizeof(::std::size_t[4]),

diff --git a/crates/cxx-qt-gen/test_outputs/invokables.h b/crates/cxx-qt-gen/test_outputs/invokables.h
@@ -36,6 +36,8 @@ class MyObject : public QObject
   Q_INVOKABLE void invokableFinal() const final;
   Q_INVOKABLE void invokableOverride() const override;
   Q_INVOKABLE virtual void invokableVirtual() const;
+  Q_INVOKABLE void invokableResultTuple() const;
+  Q_INVOKABLE ::rust::String invokableResultType() const;
   MyObjectCxxQtThread qtThread() const;
   explicit MyObject(::std::int32_t arg0, QObject* arg1);
 

diff --git a/crates/cxx-qt-gen/test_outputs/invokables.rs b/crates/cxx-qt-gen/test_outputs/invokables.rs
@@ -79,6 +79,14 @@ mod ffi {
         #[cxx_name = "invokableVirtualWrapper"]
         fn invokable_virtual_wrapper(self: &MyObjectRust, cpp: &MyObject);
     }
+    extern "Rust" {
+        #[cxx_name = "invokableResultTupleWrapper"]
+        fn invokable_result_tuple_wrapper(self: &MyObjectRust, cpp: &MyObject) -> Result<()>;
+    }
+    extern "Rust" {
+        #[cxx_name = "invokableResultTypeWrapper"]
+        fn invokable_result_type_wrapper(self: &MyObjectRust, cpp: &MyObject) -> Result<String>;
+    }
     unsafe extern "C++" {
         #[doc(hidden)]
         type MyObjectCxxQtThread = cxx_qt::CxxQtThread<MyObject>;
@@ -234,6 +242,21 @@ pub mod cxx_qt_ffi {
             cpp.invokable_virtual();
         }
     }
+    impl MyObjectRust {
+        #[doc(hidden)]
+        pub fn invokable_result_tuple_wrapper(self: &MyObjectRust, cpp: &MyObject) -> Result<()> {
+            return cpp.invokable_result_tuple();
+        }
+    }
+    impl MyObjectRust {
+        #[doc(hidden)]
+        pub fn invokable_result_type_wrapper(
+            self: &MyObjectRust,
+            cpp: &MyObject,
+        ) -> Result<String> {
+            return cpp.invokable_result_type();
+        }
+    }
     impl cxx_qt::Threading for MyObject {
         type BoxedQueuedFn = MyObjectCxxQtThreadQueuedFn;
         type ThreadingTypeId = cxx::type_id!("cxx_qt::my_object::MyObjectCxxQtThread");

diff --git a/examples/qml_features/rust/src/invokables.rs b/examples/qml_features/rust/src/invokables.rs
@@ -24,7 +24,7 @@ pub mod qobject {
     unsafe extern "RustQt" {
         /// Immutable invokable method that returns the QColor
         #[qinvokable]
-        fn load_color(self: &RustInvokables) -> QColor;
+        fn load_color(self: &RustInvokables) -> Result<QColor>;
 
         /// Mutable invokable method that stores a color
         #[qinvokable]
@@ -61,8 +61,8 @@ impl Default for RustInvokablesRust {
 // ANCHOR: book_invokable_impl
 impl qobject::RustInvokables {
     /// Immutable invokable method that returns the QColor
-    fn load_color(&self) -> QColor {
-        self.as_qcolor()
+    fn load_color(&self) -> Result<QColor, i32> {
+        Ok(self.as_qcolor())
     }
 
     /// Mutable invokable method that stores a color