cxx-qt-gen: in writer make namespace_pair more generic

This allows it to be used for externcxxqt blocks too.

Related to #577

Author: ahayzen-kdab

crates/cxx-qt-gen/src/writer/cpp/header.rs

@@ -6,7 +6,7 @@
 use std::collections::BTreeSet;
 
 use crate::generator::cpp::{fragment::CppFragment, GeneratedCppBlocks};
-use crate::writer::cpp::namespace_pair;
+use crate::writer::cpp::namespace_start_and_end;
 use indoc::formatdoc;
 
 /// Extract the header from a given CppFragment
@@ -43,7 +43,7 @@ fn create_block(block: &str, items: &[String]) -> String {
 //
 // Note that this is needed incase ObjectA refers to ObjectB in it's class
 fn forward_declare(generated: &GeneratedCppBlocks) -> Vec<String> {
-    let (namespace_start, namespace_end) = namespace_pair(generated);
+    let (namespace_start, namespace_end) = namespace_start_and_end(&generated.namespace);
 
     generated
         .qobjects
@@ -66,7 +66,7 @@ fn forward_declare(generated: &GeneratedCppBlocks) -> Vec<String> {
 
 /// For a given GeneratedCppBlocks write the classes
 fn qobjects_header(generated: &GeneratedCppBlocks) -> Vec<String> {
-    let (namespace_start, namespace_end) = namespace_pair(generated);
+    let (namespace_start, namespace_end) = namespace_start_and_end(&generated.namespace);
 
     generated.qobjects.iter().map(|qobject| {
         formatdoc! { r#"

crates/cxx-qt-gen/src/writer/cpp/mod.rs

@@ -12,21 +12,15 @@ use header::write_cpp_header;
 use source::write_cpp_source;
 
 /// For a given GeneratedCppBlocks write the namespace pair
-pub fn namespace_pair(generated: &GeneratedCppBlocks) -> (String, String) {
-    let namespace_start = if generated.namespace.is_empty() {
-        "".to_owned()
+pub fn namespace_start_and_end(namespace: &str) -> (String, String) {
+    if namespace.is_empty() {
+        ("".to_owned(), "".to_owned())
     } else {
-        format!("namespace {namespace} {{", namespace = generated.namespace)
-    };
-    let namespace_end = if generated.namespace.is_empty() {
-        "".to_owned()
-    } else {
-        format!(
-            "}} // namespace {namespace}",
-            namespace = generated.namespace
+        (
+            format!("namespace {namespace} {{"),
+            format!("}} // namespace {namespace}"),
         )
-    };
-    (namespace_start, namespace_end)
+    }
 }
 
 /// For a given GeneratedCppBlocks write this into a C++ header and source pair

crates/cxx-qt-gen/src/writer/cpp/source.rs

@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
 use crate::generator::cpp::{fragment::CppFragment, GeneratedCppBlocks};
-use crate::writer::cpp::namespace_pair;
+use crate::writer::cpp::namespace_start_and_end;
 use indoc::formatdoc;
 
 /// Extract the source from a given CppFragment
@@ -18,7 +18,7 @@ fn pair_as_source(pair: &CppFragment) -> Option<String> {
 
 /// For a given GeneratedCppBlocks write the implementations
 fn qobjects_source(generated: &GeneratedCppBlocks) -> Vec<String> {
-    let (namespace_start, namespace_end) = namespace_pair(generated);
+    let (namespace_start, namespace_end) = namespace_start_and_end(&generated.namespace);
 
     generated.qobjects.iter().map(|qobject| {
         formatdoc! { r#"