Add casting for QQmlEngine and reexport qobject

BenFordTytherington · BenFordTytherington · commit 691c7a000672 · 2025-02-21T16:19:14.000Z
diff --git a/crates/cxx-qt-gen/src/generator/rust/mod.rs b/crates/cxx-qt-gen/src/generator/rust/mod.rs
@@ -107,7 +107,7 @@ fn add_qobject_import(qobjects: &[ParsedQObject]) -> GeneratedRustFragment {
                 extern "C++" {
                     #[doc(hidden)]
                     #[namespace=""]
-                    type QObject = cxx_qt::qobject::QObject;
+                    type QObject = cxx_qt::QObject;
                 }
             }],
             cxx_qt_mod_contents: vec![],
diff --git a/crates/cxx-qt-gen/src/generator/rust/qobject.rs b/crates/cxx-qt-gen/src/generator/rust/qobject.rs
@@ -71,9 +71,7 @@ impl GeneratedRustFragment {
             .map(|name| type_names.lookup(name))
             .transpose()?
             .cloned()
-            .unwrap_or(
-                Name::new(format_ident!("QObject")).with_module(parse_quote! {::cxx_qt::qobject}),
-            );
+            .unwrap_or(Name::new(format_ident!("QObject")).with_module(parse_quote! {::cxx_qt}));
 
         let base_unqualified = base.rust_unqualified();
         let base_qualified = base.rust_qualified();
diff --git a/crates/cxx-qt-gen/test_outputs/cfgs.rs b/crates/cxx-qt-gen/test_outputs/cfgs.rs
@@ -481,7 +481,7 @@ mod ffi {
     extern "C++" {
         #[doc(hidden)]
         #[namespace = ""]
-        type QObject = cxx_qt::qobject::QObject;
+        type QObject = cxx_qt::QObject;
     }
 }
 #[cfg(not(enabled))]
@@ -632,11 +632,11 @@ cxx_qt::static_assertions::assert_eq_size!(
     cxx_qt::signalhandler::CxxQtSignalHandler<QObjectEnabledCxxQtSignalClosuresignal_enabled>,
     [usize; 2]
 );
-impl ::cxx_qt::Upcast<::cxx_qt::qobject::QObject> for ffi::QObjectEnabled {
-    unsafe fn upcast_ptr(this: *const Self) -> *const ::cxx_qt::qobject::QObject {
+impl ::cxx_qt::Upcast<::cxx_qt::QObject> for ffi::QObjectEnabled {
+    unsafe fn upcast_ptr(this: *const Self) -> *const ::cxx_qt::QObject {
         ffi::cxx_qt_ffi_QObjectEnabled_upcastPtr(this)
     }
-    unsafe fn from_base_ptr(base: *const ::cxx_qt::qobject::QObject) -> *const Self {
+    unsafe fn from_base_ptr(base: *const ::cxx_qt::QObject) -> *const Self {
         ffi::cxx_qt_ffi_QObjectEnabled_downcastPtr(base)
     }
 }
@@ -811,11 +811,11 @@ cxx_qt::static_assertions::assert_eq_size!(
     cxx_qt::signalhandler::CxxQtSignalHandler<QObjectDisabledCxxQtSignalClosuresignal_enabled>,
     [usize; 2]
 );
-impl ::cxx_qt::Upcast<::cxx_qt::qobject::QObject> for ffi::QObjectDisabled {
-    unsafe fn upcast_ptr(this: *const Self) -> *const ::cxx_qt::qobject::QObject {
+impl ::cxx_qt::Upcast<::cxx_qt::QObject> for ffi::QObjectDisabled {
+    unsafe fn upcast_ptr(this: *const Self) -> *const ::cxx_qt::QObject {
         ffi::cxx_qt_ffi_QObjectDisabled_upcastPtr(this)
     }
-    unsafe fn from_base_ptr(base: *const ::cxx_qt::qobject::QObject) -> *const Self {
+    unsafe fn from_base_ptr(base: *const ::cxx_qt::QObject) -> *const Self {
         ffi::cxx_qt_ffi_QObjectDisabled_downcastPtr(base)
     }
 }
diff --git a/crates/cxx-qt-gen/test_outputs/invokables.rs b/crates/cxx-qt-gen/test_outputs/invokables.rs
@@ -266,7 +266,7 @@ mod ffi {
     extern "C++" {
         #[doc(hidden)]
         #[namespace = ""]
-        type QObject = cxx_qt::qobject::QObject;
+        type QObject = cxx_qt::QObject;
     }
 }
 impl cxx_qt::Threading for ffi::MyObject {
@@ -321,11 +321,11 @@ impl cxx_qt::Threading for ffi::MyObject {
 pub struct MyObjectCxxQtThreadQueuedFn {
     inner: std::boxed::Box<dyn FnOnce(core::pin::Pin<&mut ffi::MyObject>) + Send>,
 }
-impl ::cxx_qt::Upcast<::cxx_qt::qobject::QObject> for ffi::MyObject {
-    unsafe fn upcast_ptr(this: *const Self) -> *const ::cxx_qt::qobject::QObject {
+impl ::cxx_qt::Upcast<::cxx_qt::QObject> for ffi::MyObject {
+    unsafe fn upcast_ptr(this: *const Self) -> *const ::cxx_qt::QObject {
         ffi::cxx_qt_ffi_MyObject_upcastPtr(this)
     }
-    unsafe fn from_base_ptr(base: *const ::cxx_qt::qobject::QObject) -> *const Self {
+    unsafe fn from_base_ptr(base: *const ::cxx_qt::QObject) -> *const Self {
         ffi::cxx_qt_ffi_MyObject_downcastPtr(base)
     }
 }
diff --git a/crates/cxx-qt-gen/test_outputs/passthrough_and_naming.rs b/crates/cxx-qt-gen/test_outputs/passthrough_and_naming.rs
@@ -473,7 +473,7 @@ pub mod ffi {
     extern "C++" {
         #[doc(hidden)]
         #[namespace = ""]
-        type QObject = cxx_qt::qobject::QObject;
+        type QObject = cxx_qt::QObject;
     }
 }
 impl ffi::MyObject {
@@ -796,11 +796,11 @@ cxx_qt::static_assertions::assert_eq_size!(
     cxx_qt::signalhandler::CxxQtSignalHandler<SecondObjectCxxQtSignalClosureready>,
     [usize; 2]
 );
-impl ::cxx_qt::Upcast<::cxx_qt::qobject::QObject> for ffi::SecondObject {
-    unsafe fn upcast_ptr(this: *const Self) -> *const ::cxx_qt::qobject::QObject {
+impl ::cxx_qt::Upcast<::cxx_qt::QObject> for ffi::SecondObject {
+    unsafe fn upcast_ptr(this: *const Self) -> *const ::cxx_qt::QObject {
         ffi::cxx_qt_ffi_SecondObject_upcastPtr(this)
     }
-    unsafe fn from_base_ptr(base: *const ::cxx_qt::qobject::QObject) -> *const Self {
+    unsafe fn from_base_ptr(base: *const ::cxx_qt::QObject) -> *const Self {
         ffi::cxx_qt_ffi_SecondObject_downcastPtr(base)
     }
 }
@@ -824,11 +824,11 @@ impl ::cxx_qt::CxxQtType for ffi::SecondObject {
         ffi::cxx_qt_ffi_SecondObject_unsafeRustMut(self)
     }
 }
-impl ::cxx_qt::Upcast<::cxx_qt::qobject::QObject> for ffi::MyRustName {
-    unsafe fn upcast_ptr(this: *const Self) -> *const ::cxx_qt::qobject::QObject {
+impl ::cxx_qt::Upcast<::cxx_qt::QObject> for ffi::MyRustName {
+    unsafe fn upcast_ptr(this: *const Self) -> *const ::cxx_qt::QObject {
         ffi::cxx_qt_ffi_MyCxxName_upcastPtr(this)
     }
-    unsafe fn from_base_ptr(base: *const ::cxx_qt::qobject::QObject) -> *const Self {
+    unsafe fn from_base_ptr(base: *const ::cxx_qt::QObject) -> *const Self {
         ffi::cxx_qt_ffi_MyCxxName_downcastPtr(base)
     }
 }
diff --git a/crates/cxx-qt-gen/test_outputs/properties.rs b/crates/cxx-qt-gen/test_outputs/properties.rs
@@ -419,7 +419,7 @@ mod ffi {
     extern "C++" {
         #[doc(hidden)]
         #[namespace = ""]
-        type QObject = cxx_qt::qobject::QObject;
+        type QObject = cxx_qt::QObject;
     }
 }
 impl ffi::MyObject {
@@ -1052,11 +1052,11 @@ cxx_qt::static_assertions::assert_eq_size!(
     cxx_qt::signalhandler::CxxQtSignalHandler<MyObjectCxxQtSignalClosuremy_on_changed>,
     [usize; 2]
 );
-impl ::cxx_qt::Upcast<::cxx_qt::qobject::QObject> for ffi::MyObject {
-    unsafe fn upcast_ptr(this: *const Self) -> *const ::cxx_qt::qobject::QObject {
+impl ::cxx_qt::Upcast<::cxx_qt::QObject> for ffi::MyObject {
+    unsafe fn upcast_ptr(this: *const Self) -> *const ::cxx_qt::QObject {
         ffi::cxx_qt_ffi_MyObject_upcastPtr(this)
     }
-    unsafe fn from_base_ptr(base: *const ::cxx_qt::qobject::QObject) -> *const Self {
+    unsafe fn from_base_ptr(base: *const ::cxx_qt::QObject) -> *const Self {
         ffi::cxx_qt_ffi_MyObject_downcastPtr(base)
     }
 }
diff --git a/crates/cxx-qt-gen/test_outputs/qenum.rs b/crates/cxx-qt-gen/test_outputs/qenum.rs
@@ -166,14 +166,14 @@ mod ffi {
     extern "C++" {
         #[doc(hidden)]
         #[namespace = ""]
-        type QObject = cxx_qt::qobject::QObject;
+        type QObject = cxx_qt::QObject;
     }
 }
-impl ::cxx_qt::Upcast<::cxx_qt::qobject::QObject> for ffi::MyObject {
-    unsafe fn upcast_ptr(this: *const Self) -> *const ::cxx_qt::qobject::QObject {
+impl ::cxx_qt::Upcast<::cxx_qt::QObject> for ffi::MyObject {
+    unsafe fn upcast_ptr(this: *const Self) -> *const ::cxx_qt::QObject {
         ffi::cxx_qt_ffi_MyObject_upcastPtr(this)
     }
-    unsafe fn from_base_ptr(base: *const ::cxx_qt::qobject::QObject) -> *const Self {
+    unsafe fn from_base_ptr(base: *const ::cxx_qt::QObject) -> *const Self {
         ffi::cxx_qt_ffi_MyObject_downcastPtr(base)
     }
 }
@@ -197,11 +197,11 @@ impl ::cxx_qt::CxxQtType for ffi::MyObject {
         ffi::cxx_qt_ffi_MyObject_unsafeRustMut(self)
     }
 }
-impl ::cxx_qt::Upcast<::cxx_qt::qobject::QObject> for ffi::MyRenamedObject {
-    unsafe fn upcast_ptr(this: *const Self) -> *const ::cxx_qt::qobject::QObject {
+impl ::cxx_qt::Upcast<::cxx_qt::QObject> for ffi::MyRenamedObject {
+    unsafe fn upcast_ptr(this: *const Self) -> *const ::cxx_qt::QObject {
         ffi::cxx_qt_ffi_CxxName_upcastPtr(this)
     }
-    unsafe fn from_base_ptr(base: *const ::cxx_qt::qobject::QObject) -> *const Self {
+    unsafe fn from_base_ptr(base: *const ::cxx_qt::QObject) -> *const Self {
         ffi::cxx_qt_ffi_CxxName_downcastPtr(base)
     }
 }
diff --git a/crates/cxx-qt-gen/test_outputs/signals.rs b/crates/cxx-qt-gen/test_outputs/signals.rs
@@ -214,7 +214,7 @@ mod ffi {
     extern "C++" {
         #[doc(hidden)]
         #[namespace = ""]
-        type QObject = cxx_qt::qobject::QObject;
+        type QObject = cxx_qt::QObject;
     }
 }
 impl ffi::MyObject {
@@ -443,11 +443,11 @@ cxx_qt::static_assertions::assert_eq_size!(
     cxx_qt::signalhandler::CxxQtSignalHandler<MyObjectCxxQtSignalClosurenewData>,
     [usize; 2]
 );
-impl ::cxx_qt::Upcast<::cxx_qt::qobject::QObject> for ffi::MyObject {
-    unsafe fn upcast_ptr(this: *const Self) -> *const ::cxx_qt::qobject::QObject {
+impl ::cxx_qt::Upcast<::cxx_qt::QObject> for ffi::MyObject {
+    unsafe fn upcast_ptr(this: *const Self) -> *const ::cxx_qt::QObject {
         ffi::cxx_qt_ffi_MyObject_upcastPtr(this)
     }
-    unsafe fn from_base_ptr(base: *const ::cxx_qt::qobject::QObject) -> *const Self {
+    unsafe fn from_base_ptr(base: *const ::cxx_qt::QObject) -> *const Self {
         ffi::cxx_qt_ffi_MyObject_downcastPtr(base)
     }
 }
diff --git a/crates/cxx-qt-lib/include/qml/qqmlapplicationengine.h b/crates/cxx-qt-lib/include/qml/qqmlapplicationengine.h
@@ -22,9 +22,6 @@ namespace cxxqtlib1 {
 ::std::unique_ptr<QQmlApplicationEngine>
 qqmlapplicationengineNew();
 
-QQmlEngine&
-qqmlapplicationengineAsQQmlEngine(QQmlApplicationEngine&);
-
 }
 }
 
diff --git a/crates/cxx-qt-lib/src/qml/qqmlapplicationengine.cpp b/crates/cxx-qt-lib/src/qml/qqmlapplicationengine.cpp
@@ -16,11 +16,5 @@ qqmlapplicationengineNew()
   return ::std::make_unique<QQmlApplicationEngine>();
 }
 
-QQmlEngine&
-qqmlapplicationengineAsQQmlEngine(QQmlApplicationEngine& engine)
-{
-  return static_cast<QQmlEngine&>(engine);
-}
-
 }
 }
diff --git a/crates/cxx-qt-lib/src/qml/qqmlapplicationengine.rs b/crates/cxx-qt-lib/src/qml/qqmlapplicationengine.rs
@@ -16,6 +16,20 @@ mod ffi {
         include!("cxx-qt-lib/qqmlapplicationengine.h");
         type QQmlApplicationEngine;
 
+        include!("cxx-qt/casting.h");
+
+        #[doc(hidden)]
+        #[rust_name = "upcast_qqmlapplication_engine"]
+        #[cxx_name = "upcastPtr"]
+        #[namespace = "rust::cxxqt1"]
+        unsafe fn upcast(thiz: *const QQmlApplicationEngine) -> *const QQmlEngine;
+
+        #[doc(hidden)]
+        #[rust_name = "downcast_qqml_engine"]
+        #[cxx_name = "downcastPtr"]
+        #[namespace = "rust::cxxqt1"]
+        unsafe fn downcast(base: *const QQmlEngine) -> *const QQmlApplicationEngine;
+
         /// Adds path as a directory where the engine searches for installed modules in a URL-based directory structure.
         #[rust_name = "add_import_path"]
         fn addImportPath(self: Pin<&mut QQmlApplicationEngine>, path: &QString);
@@ -71,12 +85,6 @@ mod ffi {
         #[doc(hidden)]
         #[rust_name = "qqmlapplicationengine_new"]
         fn qqmlapplicationengineNew() -> UniquePtr<QQmlApplicationEngine>;
-
-        #[doc(hidden)]
-        #[rust_name = "qqmlapplicationengine_as_qqmlengine"]
-        fn qqmlapplicationengineAsQQmlEngine(
-            ptr: Pin<&mut QQmlApplicationEngine>,
-        ) -> Pin<&mut QQmlEngine>;
     }
 
     // QQmlApplicationEngine is not a trivial to CXX and is not relocatable in Qt
@@ -87,16 +95,21 @@ mod ffi {
 }
 
 use crate::QQmlEngine;
-use core::pin::Pin;
+use cxx_qt::Upcast;
 
 pub use ffi::QQmlApplicationEngine;
 
-impl QQmlApplicationEngine {
-    /// Convert the existing [QQmlApplicationEngine] to a [QQmlEngine]
-    pub fn as_qqmlengine<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut QQmlEngine> {
-        ffi::qqmlapplicationengine_as_qqmlengine(self)
+impl Upcast<QQmlEngine> for QQmlApplicationEngine {
+    unsafe fn upcast_ptr(this: *const Self) -> *const QQmlEngine {
+        ffi::upcast_qqmlapplication_engine(this)
+    }
+
+    unsafe fn from_base_ptr(base: *const QQmlEngine) -> *const Self {
+        ffi::downcast_qqml_engine(base)
     }
+}
 
+impl QQmlApplicationEngine {
     /// Create a new QQmlApplicationEngine
     pub fn new() -> cxx::UniquePtr<Self> {
         ffi::qqmlapplicationengine_new()
diff --git a/crates/cxx-qt/include/casting.h b/crates/cxx-qt/include/casting.h
@@ -1,5 +1,7 @@
-// SPDX-FileCopyrightText: 2025 Klarälvdalens Datakonsult AB, a KDAB Group
-// company <info@kdab.com> SPDX-FileContributor: Ben Ford <ben.ford@kdab.com>
+// clang-format off
+// SPDX-FileCopyrightText: 2025 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+// clang-format on
+// SPDX-FileContributor: Ben Ford <ben.ford@kdab.com>
 //
 // SPDX-License-Identifier: MIT OR Apache-2.0
 #pragma once
diff --git a/crates/cxx-qt/src/lib.rs b/crates/cxx-qt/src/lib.rs
@@ -15,7 +15,7 @@ use std::{fs::File, io::Write, path::Path};
 
 mod connection;
 mod connectionguard;
-pub mod qobject;
+mod qobject;
 #[doc(hidden)]
 pub mod signalhandler;
 mod threading;
@@ -24,6 +24,7 @@ pub use cxx_qt_macro::bridge;
 pub use cxx_qt_macro::init_crate;
 pub use cxx_qt_macro::init_qml_module;
 pub use cxx_qt_macro::qobject;
+pub use qobject::QObject;
 
 pub use connection::{ConnectionType, QMetaObjectConnection};
 pub use connectionguard::QMetaObjectConnectionGuard;
diff --git a/examples/cargo_without_cmake/src/main.rs b/examples/cargo_without_cmake/src/main.rs
@@ -14,6 +14,7 @@
 // ANCHOR: book_cargo_imports
 pub mod cxxqt_object;
 
+use cxx_qt::Upcast;
 use cxx_qt_lib::{QGuiApplication, QQmlApplicationEngine, QUrl};
 // ANCHOR_END: book_cargo_imports
 
@@ -31,7 +32,7 @@ fn main() {
     if let Some(engine) = engine.as_mut() {
         // Listen to a signal from the QML Engine
         engine
-            .as_qqmlengine()
+            .upcast_pin()
             .on_quit(|_| {
                 println!("QML Quit!");
             })
diff --git a/examples/qml_multi_crates/rust/main/src/main.rs b/examples/qml_multi_crates/rust/main/src/main.rs
@@ -5,6 +5,7 @@
 
 extern crate qml_multi_crates;
 
+use cxx_qt::Upcast;
 use cxx_qt_lib::{QGuiApplication, QQmlApplicationEngine, QUrl};
 
 fn main() {
@@ -22,7 +23,7 @@ fn main() {
     if let Some(engine) = engine.as_mut() {
         // Listen to a signal from the QML Engine
         engine
-            .as_qqmlengine()
+            .upcast_pin()
             .on_quit(|_| {
                 println!("QML Quit!");
             })

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ fn add_qobject_import(qobjects: &[ParsedQObject]) -> GeneratedRustFragment {`
`107`	`107`	`extern "C++" {`
`108`	`108`	`#[doc(hidden)]`
`109`	`109`	`#[namespace=""]`
`110`		`- type QObject = cxx_qt::qobject::QObject;`
	`110`	`+ type QObject = cxx_qt::QObject;`
`111`	`111`	`}`
`112`	`112`	`}],`
`113`	`113`	`cxx_qt_mod_contents: vec![],`
Original file line number	Diff line number	Diff line change
`@@ -481,7 +481,7 @@ mod ffi {`
`481`	`481`	`extern "C++" {`
`482`	`482`	`#[doc(hidden)]`
`483`	`483`	`#[namespace = ""]`
`484`		`- type QObject = cxx_qt::qobject::QObject;`
	`484`	`+ type QObject = cxx_qt::QObject;`
`485`	`485`	`}`
`486`	`486`	`}`
`487`	`487`	`#[cfg(not(enabled))]`
`@@ -632,11 +632,11 @@ cxx_qt::static_assertions::assert_eq_size!(`
`632`	`632`	`cxx_qt::signalhandler::CxxQtSignalHandler<QObjectEnabledCxxQtSignalClosuresignal_enabled>,`
`633`	`633`	`[usize; 2]`
`634`	`634`	`);`
`635`		`-impl ::cxx_qt::Upcast<::cxx_qt::qobject::QObject> for ffi::QObjectEnabled {`
`636`		`- unsafe fn upcast_ptr(this: const Self) -> const ::cxx_qt::qobject::QObject {`
	`635`	`+impl ::cxx_qt::Upcast<::cxx_qt::QObject> for ffi::QObjectEnabled {`
	`636`	`+ unsafe fn upcast_ptr(this: const Self) -> const ::cxx_qt::QObject {`
`637`	`637`	`ffi::cxx_qt_ffi_QObjectEnabled_upcastPtr(this)`
`638`	`638`	`}`
`639`		`- unsafe fn from_base_ptr(base: const ::cxx_qt::qobject::QObject) -> const Self {`
	`639`	`+ unsafe fn from_base_ptr(base: const ::cxx_qt::QObject) -> const Self {`
`640`	`640`	`ffi::cxx_qt_ffi_QObjectEnabled_downcastPtr(base)`
`641`	`641`	`}`
`642`	`642`	`}`
`@@ -811,11 +811,11 @@ cxx_qt::static_assertions::assert_eq_size!(`
`811`	`811`	`cxx_qt::signalhandler::CxxQtSignalHandler<QObjectDisabledCxxQtSignalClosuresignal_enabled>,`
`812`	`812`	`[usize; 2]`
`813`	`813`	`);`
`814`		`-impl ::cxx_qt::Upcast<::cxx_qt::qobject::QObject> for ffi::QObjectDisabled {`
`815`		`- unsafe fn upcast_ptr(this: const Self) -> const ::cxx_qt::qobject::QObject {`
	`814`	`+impl ::cxx_qt::Upcast<::cxx_qt::QObject> for ffi::QObjectDisabled {`
	`815`	`+ unsafe fn upcast_ptr(this: const Self) -> const ::cxx_qt::QObject {`
`816`	`816`	`ffi::cxx_qt_ffi_QObjectDisabled_upcastPtr(this)`
`817`	`817`	`}`
`818`		`- unsafe fn from_base_ptr(base: const ::cxx_qt::qobject::QObject) -> const Self {`
	`818`	`+ unsafe fn from_base_ptr(base: const ::cxx_qt::QObject) -> const Self {`
`819`	`819`	`ffi::cxx_qt_ffi_QObjectDisabled_downcastPtr(base)`
`820`	`820`	`}`
`821`	`821`	`}`
Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ mod ffi {`
`266`	`266`	`extern "C++" {`
`267`	`267`	`#[doc(hidden)]`
`268`	`268`	`#[namespace = ""]`
`269`		`- type QObject = cxx_qt::qobject::QObject;`
	`269`	`+ type QObject = cxx_qt::QObject;`
`270`	`270`	`}`
`271`	`271`	`}`
`272`	`272`	`impl cxx_qt::Threading for ffi::MyObject {`
`@@ -321,11 +321,11 @@ impl cxx_qt::Threading for ffi::MyObject {`
`321`	`321`	`pub struct MyObjectCxxQtThreadQueuedFn {`
`322`	`322`	`inner: std::boxed::Box<dyn FnOnce(core::pin::Pin<&mut ffi::MyObject>) + Send>,`
`323`	`323`	`}`
`324`		`-impl ::cxx_qt::Upcast<::cxx_qt::qobject::QObject> for ffi::MyObject {`
`325`		`- unsafe fn upcast_ptr(this: const Self) -> const ::cxx_qt::qobject::QObject {`
	`324`	`+impl ::cxx_qt::Upcast<::cxx_qt::QObject> for ffi::MyObject {`
	`325`	`+ unsafe fn upcast_ptr(this: const Self) -> const ::cxx_qt::QObject {`
`326`	`326`	`ffi::cxx_qt_ffi_MyObject_upcastPtr(this)`
`327`	`327`	`}`
`328`		`- unsafe fn from_base_ptr(base: const ::cxx_qt::qobject::QObject) -> const Self {`
	`328`	`+ unsafe fn from_base_ptr(base: const ::cxx_qt::QObject) -> const Self {`
`329`	`329`	`ffi::cxx_qt_ffi_MyObject_downcastPtr(base)`
`330`	`330`	`}`
`331`	`331`	`}`
Original file line number	Diff line number	Diff line change
`@@ -473,7 +473,7 @@ pub mod ffi {`
`473`	`473`	`extern "C++" {`
`474`	`474`	`#[doc(hidden)]`
`475`	`475`	`#[namespace = ""]`
`476`		`- type QObject = cxx_qt::qobject::QObject;`
	`476`	`+ type QObject = cxx_qt::QObject;`
`477`	`477`	`}`
`478`	`478`	`}`
`479`	`479`	`impl ffi::MyObject {`
`@@ -796,11 +796,11 @@ cxx_qt::static_assertions::assert_eq_size!(`
`796`	`796`	`cxx_qt::signalhandler::CxxQtSignalHandler<SecondObjectCxxQtSignalClosureready>,`
`797`	`797`	`[usize; 2]`
`798`	`798`	`);`
`799`		`-impl ::cxx_qt::Upcast<::cxx_qt::qobject::QObject> for ffi::SecondObject {`
`800`		`- unsafe fn upcast_ptr(this: const Self) -> const ::cxx_qt::qobject::QObject {`
	`799`	`+impl ::cxx_qt::Upcast<::cxx_qt::QObject> for ffi::SecondObject {`
	`800`	`+ unsafe fn upcast_ptr(this: const Self) -> const ::cxx_qt::QObject {`
`801`	`801`	`ffi::cxx_qt_ffi_SecondObject_upcastPtr(this)`
`802`	`802`	`}`
`803`		`- unsafe fn from_base_ptr(base: const ::cxx_qt::qobject::QObject) -> const Self {`
	`803`	`+ unsafe fn from_base_ptr(base: const ::cxx_qt::QObject) -> const Self {`
`804`	`804`	`ffi::cxx_qt_ffi_SecondObject_downcastPtr(base)`
`805`	`805`	`}`
`806`	`806`	`}`
`@@ -824,11 +824,11 @@ impl ::cxx_qt::CxxQtType for ffi::SecondObject {`
`824`	`824`	`ffi::cxx_qt_ffi_SecondObject_unsafeRustMut(self)`
`825`	`825`	`}`
`826`	`826`	`}`
`827`		`-impl ::cxx_qt::Upcast<::cxx_qt::qobject::QObject> for ffi::MyRustName {`
`828`		`- unsafe fn upcast_ptr(this: const Self) -> const ::cxx_qt::qobject::QObject {`
	`827`	`+impl ::cxx_qt::Upcast<::cxx_qt::QObject> for ffi::MyRustName {`
	`828`	`+ unsafe fn upcast_ptr(this: const Self) -> const ::cxx_qt::QObject {`
`829`	`829`	`ffi::cxx_qt_ffi_MyCxxName_upcastPtr(this)`
`830`	`830`	`}`
`831`		`- unsafe fn from_base_ptr(base: const ::cxx_qt::qobject::QObject) -> const Self {`
	`831`	`+ unsafe fn from_base_ptr(base: const ::cxx_qt::QObject) -> const Self {`
`832`	`832`	`ffi::cxx_qt_ffi_MyCxxName_downcastPtr(base)`
`833`	`833`	`}`
`834`	`834`	`}`
Original file line number	Diff line number	Diff line change
`@@ -419,7 +419,7 @@ mod ffi {`
`419`	`419`	`extern "C++" {`
`420`	`420`	`#[doc(hidden)]`
`421`	`421`	`#[namespace = ""]`
`422`		`- type QObject = cxx_qt::qobject::QObject;`
	`422`	`+ type QObject = cxx_qt::QObject;`
`423`	`423`	`}`
`424`	`424`	`}`
`425`	`425`	`impl ffi::MyObject {`
`@@ -1052,11 +1052,11 @@ cxx_qt::static_assertions::assert_eq_size!(`
`1052`	`1052`	`cxx_qt::signalhandler::CxxQtSignalHandler<MyObjectCxxQtSignalClosuremy_on_changed>,`
`1053`	`1053`	`[usize; 2]`
`1054`	`1054`	`);`
`1055`		`-impl ::cxx_qt::Upcast<::cxx_qt::qobject::QObject> for ffi::MyObject {`
`1056`		`- unsafe fn upcast_ptr(this: const Self) -> const ::cxx_qt::qobject::QObject {`
	`1055`	`+impl ::cxx_qt::Upcast<::cxx_qt::QObject> for ffi::MyObject {`
	`1056`	`+ unsafe fn upcast_ptr(this: const Self) -> const ::cxx_qt::QObject {`
`1057`	`1057`	`ffi::cxx_qt_ffi_MyObject_upcastPtr(this)`
`1058`	`1058`	`}`
`1059`		`- unsafe fn from_base_ptr(base: const ::cxx_qt::qobject::QObject) -> const Self {`
	`1059`	`+ unsafe fn from_base_ptr(base: const ::cxx_qt::QObject) -> const Self {`
`1060`	`1060`	`ffi::cxx_qt_ffi_MyObject_downcastPtr(base)`
`1061`	`1061`	`}`
`1062`	`1062`	`}`
Original file line number	Diff line number	Diff line change
`@@ -166,14 +166,14 @@ mod ffi {`
`166`	`166`	`extern "C++" {`
`167`	`167`	`#[doc(hidden)]`
`168`	`168`	`#[namespace = ""]`
`169`		`- type QObject = cxx_qt::qobject::QObject;`
	`169`	`+ type QObject = cxx_qt::QObject;`
`170`	`170`	`}`
`171`	`171`	`}`
`172`		`-impl ::cxx_qt::Upcast<::cxx_qt::qobject::QObject> for ffi::MyObject {`
`173`		`- unsafe fn upcast_ptr(this: const Self) -> const ::cxx_qt::qobject::QObject {`
	`172`	`+impl ::cxx_qt::Upcast<::cxx_qt::QObject> for ffi::MyObject {`
	`173`	`+ unsafe fn upcast_ptr(this: const Self) -> const ::cxx_qt::QObject {`
`174`	`174`	`ffi::cxx_qt_ffi_MyObject_upcastPtr(this)`
`175`	`175`	`}`
`176`		`- unsafe fn from_base_ptr(base: const ::cxx_qt::qobject::QObject) -> const Self {`
	`176`	`+ unsafe fn from_base_ptr(base: const ::cxx_qt::QObject) -> const Self {`
`177`	`177`	`ffi::cxx_qt_ffi_MyObject_downcastPtr(base)`
`178`	`178`	`}`
`179`	`179`	`}`
`@@ -197,11 +197,11 @@ impl ::cxx_qt::CxxQtType for ffi::MyObject {`
`197`	`197`	`ffi::cxx_qt_ffi_MyObject_unsafeRustMut(self)`
`198`	`198`	`}`
`199`	`199`	`}`
`200`		`-impl ::cxx_qt::Upcast<::cxx_qt::qobject::QObject> for ffi::MyRenamedObject {`
`201`		`- unsafe fn upcast_ptr(this: const Self) -> const ::cxx_qt::qobject::QObject {`
	`200`	`+impl ::cxx_qt::Upcast<::cxx_qt::QObject> for ffi::MyRenamedObject {`
	`201`	`+ unsafe fn upcast_ptr(this: const Self) -> const ::cxx_qt::QObject {`
`202`	`202`	`ffi::cxx_qt_ffi_CxxName_upcastPtr(this)`
`203`	`203`	`}`
`204`		`- unsafe fn from_base_ptr(base: const ::cxx_qt::qobject::QObject) -> const Self {`
	`204`	`+ unsafe fn from_base_ptr(base: const ::cxx_qt::QObject) -> const Self {`
`205`	`205`	`ffi::cxx_qt_ffi_CxxName_downcastPtr(base)`
`206`	`206`	`}`
`207`	`207`	`}`
Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ mod ffi {`
`214`	`214`	`extern "C++" {`
`215`	`215`	`#[doc(hidden)]`
`216`	`216`	`#[namespace = ""]`
`217`		`- type QObject = cxx_qt::qobject::QObject;`
	`217`	`+ type QObject = cxx_qt::QObject;`
`218`	`218`	`}`
`219`	`219`	`}`
`220`	`220`	`impl ffi::MyObject {`
`@@ -443,11 +443,11 @@ cxx_qt::static_assertions::assert_eq_size!(`
`443`	`443`	`cxx_qt::signalhandler::CxxQtSignalHandler<MyObjectCxxQtSignalClosurenewData>,`
`444`	`444`	`[usize; 2]`
`445`	`445`	`);`
`446`		`-impl ::cxx_qt::Upcast<::cxx_qt::qobject::QObject> for ffi::MyObject {`
`447`		`- unsafe fn upcast_ptr(this: const Self) -> const ::cxx_qt::qobject::QObject {`
	`446`	`+impl ::cxx_qt::Upcast<::cxx_qt::QObject> for ffi::MyObject {`
	`447`	`+ unsafe fn upcast_ptr(this: const Self) -> const ::cxx_qt::QObject {`
`448`	`448`	`ffi::cxx_qt_ffi_MyObject_upcastPtr(this)`
`449`	`449`	`}`
`450`		`- unsafe fn from_base_ptr(base: const ::cxx_qt::qobject::QObject) -> const Self {`
	`450`	`+ unsafe fn from_base_ptr(base: const ::cxx_qt::QObject) -> const Self {`
`451`	`451`	`ffi::cxx_qt_ffi_MyObject_downcastPtr(base)`
`452`	`452`	`}`
`453`	`453`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,6 @@ namespace cxxqtlib1 {`
`22`	`22`	`::std::unique_ptr<QQmlApplicationEngine>`
`23`	`23`	`qqmlapplicationengineNew();`
`24`	`24`
`25`		`-QQmlEngine&`
`26`		`-qqmlapplicationengineAsQQmlEngine(QQmlApplicationEngine&);`
`27`		`-`
`28`	`25`	`}`
`29`	`26`	`}`
`30`	`27`
Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,5 @@ qqmlapplicationengineNew()`
`16`	`16`	`return ::std::make_unique<QQmlApplicationEngine>();`
`17`	`17`	`}`
`18`	`18`
`19`		`-QQmlEngine&`
`20`		`-qqmlapplicationengineAsQQmlEngine(QQmlApplicationEngine& engine)`
`21`		`-{`
`22`		`- return static_cast<QQmlEngine&>(engine);`
`23`		`-}`
`24`		`-`
`25`	`19`	`}`
`26`	`20`	`}`