language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-10-02 14:51:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Optional C++ namespaces (#4759)

Browse source 
Co-authored-by: Michael Winkelmann <michael@winkelmann.site>
This commit is contained in:
Wilston Oreo 2024-03-06 19:43:11 +01:00 • committed by GitHub
parent 43266f7f76
commit bef532b5fc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 148 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

16
internal/compiler/lib.rs
View file

@ -94,6 +94,9 @@ pub struct CompilerConfiguration {
/// The domain used as one of the parameter to the translate function
pub translation_domain: Option<String>,
/// C++ namespace
pub cpp_namespace: Option<String>,
}
impl CompilerConfiguration {
@ -142,6 +145,18 @@ impl CompilerConfiguration {
let enable_component_containers = enable_experimental_features;
let cpp_namespace = match output_format {
#[cfg(feature = "cpp")]
crate::generator::OutputFormat::Cpp(config) => match config.namespace {
Some(namespace) => Some(namespace),
None => match std::env::var("SLINT_CPP_NAMESPACE") {
Ok(namespace) => Some(namespace),
Err(_) => None,
},
},
_ => None,
};
Self {
embed_resources,
include_paths: Default::default(),
@ -154,6 +169,7 @@ impl CompilerConfiguration {
accessibility: true,
enable_component_containers,
translation_domain: None,
cpp_namespace,
}
}
}