cxx-qt: move connection guard inside cxx-qt from lib

Author: ahayzen-kdab

crates/cxx-qt-lib/src/core/mod.rs

@@ -38,11 +38,8 @@ pub use qmargins::QMargins;
 mod qmarginsf;
 pub use qmarginsf::QMarginsF;
 
-// Reexport QMetaObject connection from cxx-qt
-pub use cxx_qt::QMetaObjectConnection;
-
-mod qmetaobjectconnectionguard;
-pub use qmetaobjectconnectionguard::QMetaObjectConnectionGuard;
+// Reexport QMetaObject connection and guard from cxx-qt
+pub use cxx_qt::{QMetaObjectConnection, QMetaObjectConnectionGuard};
 
 mod qmodelindex;
 pub use qmodelindex::QModelIndex;

crates/cxx-qt/build.rs

@@ -13,7 +13,7 @@ fn main() {
     qt_build_utils::setup_linker();
 
     let cpp_files = ["src/cxxqt_connection.cpp"];
-    let rust_bridges = ["src/connection.rs"];
+    let rust_bridges = ["src/connection.rs", "src/connectionguard.rs"];
 
     for bridge in &rust_bridges {
         println!("cargo:rerun-if-changed={bridge}");

crates/cxx-qt-lib/src/core/qmetaobjectconnectionguard.rs renamed to crates/cxx-qt/src/connectionguard.rs

@@ -3,6 +3,8 @@
 //
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
+use crate::QMetaObjectConnection;
+
 #[cxx::bridge]
 mod ffi {
     extern "Rust" {
@@ -13,17 +15,17 @@ mod ffi {
 
 /// Represents a guard to a signal-slot (or signal-functor) connection.
 ///
-/// This struct can be created from a [cxx_qt::QMetaObjectConnection].
+/// This struct can be created from a [QMetaObjectConnection].
 ///
 /// Note that when this struct is dropped the connection is disconnected.
 /// So to keep a connection active either hold onto the struct for the duration
 /// that the connection should be active or call `release`.
 pub struct QMetaObjectConnectionGuard {
-    connection: cxx_qt::QMetaObjectConnection,
+    connection: QMetaObjectConnection,
 }
 
-impl From<cxx_qt::QMetaObjectConnection> for QMetaObjectConnectionGuard {
-    fn from(connection: cxx_qt::QMetaObjectConnection) -> Self {
+impl From<QMetaObjectConnection> for QMetaObjectConnectionGuard {
+    fn from(connection: QMetaObjectConnection) -> Self {
         Self { connection }
     }
 }
@@ -37,7 +39,7 @@ impl Drop for QMetaObjectConnectionGuard {
 
 impl QMetaObjectConnectionGuard {
     /// Release the connection without disconnecting
-    pub fn release(mut self) -> cxx_qt::QMetaObjectConnection {
+    pub fn release(mut self) -> QMetaObjectConnection {
         // Take the connection as our Drop implementation disconnects automatically
         // whereas we just want to release
         core::mem::take(&mut self.connection)

crates/cxx-qt/src/lib.rs

@@ -12,6 +12,7 @@
 use std::{fs::File, io::Write, path::Path};
 
 mod connection;
+mod connectionguard;
 #[doc(hidden)]
 pub mod signalhandler;
 mod threading;
@@ -20,6 +21,7 @@ pub use cxx_qt_macro::bridge;
 pub use cxx_qt_macro::qobject;
 
 pub use connection::{ConnectionType, QMetaObjectConnection};
+pub use connectionguard::QMetaObjectConnectionGuard;
 pub use threading::CxxQtThread;
 
 // Export static assertions that can then be used in cxx-qt-gen generation