cxx-qt-gen: load namespace from qobject macro in same place as specifiers

Author: ahayzen-kdab

crates/cxx-qt-gen/src/parser/cxxqtdata.rs

@@ -4,9 +4,7 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
 use crate::parser::{qobject::ParsedQObject, signals::ParsedSignalsEnum};
-use crate::syntax::attribute::{
-    attribute_tokens_to_map, attribute_tokens_to_value, AttributeDefault,
-};
+use crate::syntax::attribute::attribute_tokens_to_value;
 use crate::syntax::foreignmod::{foreign_mod_to_foreign_item_types, verbatim_to_foreign_mod};
 use crate::syntax::{
     attribute::{attribute_find_path, attribute_tokens_to_ident},
@@ -74,17 +72,10 @@ impl ParsedCxxQtData {
                     // Load the QObject
                     let mut qobject = ParsedQObject::from_struct(qobject_struct, index)?;
 
-                    // Parse any namespaces
-                    let attr_map = attribute_tokens_to_map::<Ident, LitStr>(
-                        &qobject_struct.attrs[index],
-                        AttributeDefault::None,
-                    )?;
-                    qobject.namespace =
-                        if let Some(lit_str) = attr_map.get(&quote::format_ident!("namespace")) {
-                            lit_str.value()
-                        } else {
-                            self.namespace.clone()
-                        };
+                    // Inject the bridge namespace if the qobject one is empty
+                    if qobject.namespace.is_empty() && !self.namespace.is_empty() {
+                        qobject.namespace = self.namespace.clone();
+                    }
 
                     // Note that we assume a compiler error will occur later
                     // if you had two structs with the same name

crates/cxx-qt-gen/src/parser/qobject.rs

@@ -78,6 +78,11 @@ impl ParsedQObject {
             .get(&quote::format_ident!("base"))
             .map(|base| base.value());
 
+        // Load the namespace, if it is empty then the ParsedCxxQtData will inject any global namespace
+        let namespace = attrs_map
+            .get(&quote::format_ident!("namespace"))
+            .map_or_else(|| "".to_owned(), |base| base.value());
+
         // Remove the macro from the struct
         let mut qobject_struct = qobject_struct.clone();
         qobject_struct.attrs.remove(attr_index);
@@ -89,8 +94,7 @@ impl ParsedQObject {
         Ok(Self {
             base_class,
             qobject_struct,
-            // TODO: read from the qobject macro later
-            namespace: "".to_owned(),
+            namespace,
             signals: None,
             invokables: vec![],
             methods: vec![],