Remove use of convert_case

Author: BenFordTytherington

Cargo.toml

@@ -50,7 +50,6 @@ cc = { version = "1.0.89", features = ["parallel"] }
 cxx = "1.0.95"
 cxx-build = { version = "1.0.95", features = [ "parallel" ] }
 cxx-gen = "0.7.121"
-convert_case = "0.6"
 proc-macro2 = "1.0"
 syn = { version = "2.0", features = ["extra-traits", "full"] }
 quote = "1.0"

crates/cxx-qt-gen/Cargo.toml

@@ -22,7 +22,6 @@ exclude = ["update_expected.sh"]
 proc-macro2.workspace = true
 syn.workspace = true
 quote.workspace = true
-convert_case.workspace = true
 clang-format = "0.3"
 indoc = "2.0"
 

crates/cxx-qt-gen/src/naming/mod.rs

@@ -16,5 +16,5 @@ mod name;
 pub(crate) mod rust;
 mod type_names;
 
-pub use name::{AutoCamel, Name};
+pub use name::Name;
 pub use type_names::TypeNames;

crates/cxx-qt-gen/src/naming/name.rs

@@ -4,24 +4,9 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
 use crate::syntax::{attribute::attribute_get_path, expr::expr_to_string};
-use convert_case::{Case, Casing};
 use quote::format_ident;
 use syn::{spanned::Spanned, Attribute, Error, Ident, Path, Result};
 
-pub enum AutoCamel {
-    Enabled,
-    Disabled,
-}
-
-impl AutoCamel {
-    pub fn as_bool(&self) -> bool {
-        match self {
-            AutoCamel::Enabled => true,
-            AutoCamel::Disabled => false,
-        }
-    }
-}
-
 /// This struct contains all names a certain syntax element may have
 ///
 /// This includes the rust_name, cxx_name, as well as qualifications like
@@ -144,35 +129,18 @@ impl Name {
             namespace,
             module: module.cloned().map(Path::from),
         }
-        .with_options(cxx_name, rust_name, AutoCamel::Disabled))
+        .with_options(cxx_name, rust_name))
     }
 
     /// Applies naming options to an existing name, applying logic about what should cause renaming
-    pub fn with_options(
-        self,
-        cxx: Option<String>,
-        rust: Option<Ident>,
-        auto_camel: AutoCamel,
-    ) -> Self {
-        let mut cxx_ident = cxx.clone();
-        let rust_ident = if let Some(rust_ident) = rust {
-            // If we have a rust_name, but no cxx_name, the original ident is the cxx_name.
-            if cxx.is_none() {
-                cxx_ident = Some(self.rust.to_string());
-            };
-
-            rust_ident
+    pub fn with_options(self, cxx: Option<String>, rust: Option<Ident>) -> Self {
+        let cxx_ident = if cxx.is_none() && rust.is_some() {
+            Some(self.rust.to_string())
         } else {
-            // If we have no rust_name and no cxx_name, the original ident is the cxx_name ONLY if auto converting.
-            // Otherwise it stays as the original cxx Option
-            if cxx.is_none() && auto_camel.as_bool() {
-                cxx_ident = Some(self.rust.to_string().to_case(Case::Camel));
-            }
-            self.rust.clone()
+            cxx.clone()
         };
-
         Self {
-            rust: rust_ident,
+            rust: rust.unwrap_or_else(|| self.rust.clone()),
             cxx: cxx_ident,
             ..self
         }

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

@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
-use crate::naming::{AutoCamel, Name};
+use crate::naming::Name;
 use crate::syntax::expr::expr_to_string;
 use syn::{
     parse::{Error, ParseStream},
@@ -189,7 +189,7 @@ impl ParsedQProperty {
                     ))
                 }
 
-                let name = Name::new(ident).with_options(cxx_name.map(|ident| ident.to_string()), rust_name, AutoCamel::Enabled);
+                let name = Name::new(ident).with_options(cxx_name.map(|ident| ident.to_string()), rust_name);
 
                 // This check is needed otherwise this fn would error unless READ, WRITE, etc... was passed with cxx_name
                 if read_required {

crates/cxx-qt-gen/test_inputs/properties.rs

@@ -10,20 +10,20 @@ mod ffi {
         #[qobject]
         #[qproperty(i32, primitive)]
         #[qproperty(QPoint, trivial)]
-        #[qproperty(i32, custom_function_prop, READ = my_getter, WRITE = my_setter, NOTIFY)]
-        #[qproperty(i32, readonly_prop, READ)]
+        #[qproperty(i32, custom_function_prop, cxx_name = "customFunctionProp", READ = my_getter, WRITE = my_setter, NOTIFY)]
+        #[qproperty(i32, readonly_prop, cxx_name = "readonlyProp", READ)]
         #[qproperty(
             i32,
             named_prop,
             cxx_name = "renamedProperty",
             rust_name = "renamed_property"
         )]
         #[qproperty(i32, named_prop_2, rust_name = "renamed_property_2")]
-        #[qproperty(i32, custom_on_changed_prop, READ, WRITE, NOTIFY = my_on_changed)]
-        #[qproperty(i32, const_prop, READ, CONSTANT)]
-        #[qproperty(i32, resettable_prop, READ, WRITE, RESET = myResetFn)]
-        #[qproperty(i32, required_prop, READ, WRITE, REQUIRED)]
-        #[qproperty(i32, final_prop, READ, WRITE, FINAL)]
+        #[qproperty(i32, custom_on_changed_prop, cxx_name = "customOnChangedProp", READ, WRITE, NOTIFY = my_on_changed)]
+        #[qproperty(i32, const_prop, cxx_name = "constProp", READ, CONSTANT)]
+        #[qproperty(i32, resettable_prop, cxx_name = "resettableProp", READ, WRITE, RESET = myResetFn)]
+        #[qproperty(i32, required_prop, cxx_name = "requiredProp", READ, WRITE, REQUIRED)]
+        #[qproperty(i32, final_prop, cxx_name = "finalProp", READ, WRITE, FINAL)]
         type MyObject = super::MyObjectRust;
     }
 

examples/qml_features/rust/src/properties.rs

@@ -22,9 +22,9 @@ pub mod qobject {
         #[qobject]
         #[qml_element]
         #[qproperty(bool, connected, READ, NOTIFY = connected_state_changed)]
-        #[qproperty(QUrl, connected_url, READ, WRITE = set_url, NOTIFY = connected_state_changed, RESET = reset_url)]
-        #[qproperty(QUrl, previous_connected_url, READ, NOTIFY = connected_state_changed)]
-        #[qproperty(QString, status_message, READ, NOTIFY = connected_state_changed)]
+        #[qproperty(QUrl, connected_url, cxx_name = "connectedUrl", READ, WRITE = set_url, NOTIFY = connected_state_changed, RESET = reset_url)]
+        #[qproperty(QUrl, previous_connected_url, cxx_name = "previousConnectedUrl", READ, NOTIFY = connected_state_changed)]
+        #[qproperty(QString, status_message, cxx_name = "statusMessage", READ, NOTIFY = connected_state_changed)]
         type RustProperties = super::RustPropertiesRust;
         // ANCHOR_END: book_properties_signature