cxx-qt: rename cxx-qt-common folder to cxx-qt

Author: ahayzen-kdab

crates/cxx-qt-build/src/lib.rs

@@ -445,7 +445,7 @@ impl CxxQtBuilder {
         qtbuild.cargo_link_libraries(&mut self.cc_builder);
 
         // Write cxx-qt-gen, cxx-qt-lib and cxx headers
-        cxx_qt::write_headers(format!("{header_root}/cxx-qt-common"));
+        cxx_qt::write_headers(format!("{header_root}/cxx-qt"));
         cxx_qt_lib_headers::write_headers(format!("{header_root}/cxx-qt-lib"));
         std::fs::create_dir_all(format!("{header_root}/rust"))
             .expect("Could not create cxx header directory");

crates/cxx-qt-gen/src/generator/cpp/cxxqttype.rs

@@ -13,7 +13,7 @@ pub fn generate(qobject_idents: &QObjectName) -> Result<GeneratedCppQObjectBlock
 
     result
         .includes
-        .insert("#include <cxx-qt-common/cxxqt_type.h>".to_owned());
+        .insert("#include <cxx-qt/cxxqt_type.h>".to_owned());
 
     result
         .base_classes
@@ -38,7 +38,7 @@ mod tests {
         assert_eq!(generated.includes.len(), 1);
         assert!(generated
             .includes
-            .contains("#include <cxx-qt-common/cxxqt_type.h>"));
+            .contains("#include <cxx-qt/cxxqt_type.h>"));
 
         // base class
         assert_eq!(generated.base_classes.len(), 1);

crates/cxx-qt-gen/src/generator/cpp/externcxxqt.rs

@@ -35,7 +35,7 @@ pub fn generate(
             // Ensure that we include MaybeLockGuard<T> that is used in multiple places
             block
                 .includes
-                .insert("#include <cxx-qt-common/cxxqt_maybelockguard.h>".to_owned());
+                .insert("#include <cxx-qt/cxxqt_maybelockguard.h>".to_owned());
             block.forward_declares = data.forward_declares;
             block.fragments = data.fragments;
             debug_assert!(data.methods.is_empty());

crates/cxx-qt-gen/src/generator/cpp/locking.rs

@@ -11,7 +11,7 @@ pub fn generate() -> Result<(String, GeneratedCppQObjectBlocks)> {
 
     result
         .includes
-        .insert("#include <cxx-qt-common/cxxqt_locking.h>".to_owned());
+        .insert("#include <cxx-qt/cxxqt_locking.h>".to_owned());
 
     result
         .base_classes
@@ -37,7 +37,7 @@ mod tests {
         assert_eq!(generated.includes.len(), 1);
         assert!(generated
             .includes
-            .contains("#include <cxx-qt-common/cxxqt_locking.h>"));
+            .contains("#include <cxx-qt/cxxqt_locking.h>"));
 
         // base class
         assert_eq!(generated.base_classes.len(), 1);

crates/cxx-qt-gen/src/generator/cpp/qobject.rs

@@ -112,7 +112,7 @@ impl GeneratedCppQObject {
         generated
             .blocks
             .includes
-            .insert("#include <cxx-qt-common/cxxqt_maybelockguard.h>".to_owned());
+            .insert("#include <cxx-qt/cxxqt_maybelockguard.h>".to_owned());
 
         // Build the base class
         let base_class = qobject

crates/cxx-qt-gen/src/generator/cpp/signal.rs

@@ -88,7 +88,7 @@ pub fn generate_cpp_signal(
     // Add the include we need
     generated
         .includes
-        .insert("#include <cxx-qt-common/cxxqt_signalhandler.h>".to_owned());
+        .insert("#include <cxx-qt/cxxqt_signalhandler.h>".to_owned());
 
     // Build a namespace that includes any namespace for the T
     let qobject_ident_str = qobject_ident.to_string();

crates/cxx-qt-gen/src/generator/cpp/threading.rs

@@ -30,7 +30,7 @@ pub fn generate(qobject_idents: &QObjectName) -> Result<(String, GeneratedCppQOb
 
     result
         .includes
-        .insert("#include <cxx-qt-common/cxxqt_threading.h>".to_owned());
+        .insert("#include <cxx-qt/cxxqt_threading.h>".to_owned());
 
     result
         .base_classes
@@ -89,7 +89,7 @@ mod tests {
         assert_eq!(generated.includes.len(), 1);
         assert!(generated
             .includes
-            .contains("#include <cxx-qt-common/cxxqt_threading.h>"));
+            .contains("#include <cxx-qt/cxxqt_threading.h>"));
 
         // base class
         assert_eq!(generated.base_classes.len(), 1);

crates/cxx-qt-gen/src/generator/rust/threading.rs

@@ -50,7 +50,7 @@ pub fn generate(
                     // <https://github.com/dtolnay/cxx/issues/683>
                     #[doc(hidden)]
                     type #cxx_qt_thread_ident = cxx_qt::CxxQtThread<#cpp_struct_ident>;
-                    include!("cxx-qt-common/cxxqt_thread.h");
+                    include!("cxx-qt/cxxqt_thread.h");
 
                     #[doc(hidden)]
                     #[cxx_name = "qtThread"]
@@ -187,7 +187,7 @@ mod tests {
                 unsafe extern "C++" {
                     #[doc(hidden)]
                     type MyObjectCxxQtThread = cxx_qt::CxxQtThread<MyObject>;
-                    include!("cxx-qt-common/cxxqt_thread.h");
+                    include!("cxx-qt/cxxqt_thread.h");
 
                     #[doc(hidden)]
                     #[cxx_name = "qtThread"]

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

@@ -22,7 +22,7 @@ pub fn write_rust(generated: &GeneratedRustBlocks) -> TokenStream {
             unsafe extern "C++" {
                 include ! (< QtCore / QObject >);
 
-                include!("cxx-qt-common/cxxqt_connection.h");
+                include!("cxx-qt/cxxqt_connection.h");
                 #[doc(hidden)]
                 #[namespace = "Qt"]
                 // Rename to CxxQtConnectionType so the developer can define it
@@ -192,7 +192,7 @@ mod tests {
                 unsafe extern "C++" {
                     include ! (< QtCore / QObject >);
 
-                    include!("cxx-qt-common/cxxqt_connection.h");
+                    include!("cxx-qt/cxxqt_connection.h");
                     #[doc(hidden)]
                     #[namespace = "Qt"]
                     #[rust_name = "CxxQtConnectionType"]
@@ -238,7 +238,7 @@ mod tests {
                 unsafe extern "C++" {
                     include ! (< QtCore / QObject >);
 
-                    include!("cxx-qt-common/cxxqt_connection.h");
+                    include!("cxx-qt/cxxqt_connection.h");
                     #[doc(hidden)]
                     #[namespace = "Qt"]
                     #[rust_name = "CxxQtConnectionType"]

crates/cxx-qt-lib-headers/include/core/qmetaobjectconnection.h

@@ -7,4 +7,4 @@
 #pragma once
 
 // Re-export QMetaObjectConnection from cxx-qt
-#include "cxx-qt-common/cxxqt_connection.h"
+#include "cxx-qt/cxxqt_connection.h"

crates/cxx-qt/build.rs

@@ -30,8 +30,8 @@ fn main() {
 
     // Write this library's manually written C++ headers to files and add them to include paths
     let out_dir = std::env::var("OUT_DIR").unwrap();
-    let directory = format!("{out_dir}/cxx-qt-common");
-    std::fs::create_dir_all(&directory).expect("Could not create cxx-qt-common header directory");
+    let directory = format!("{out_dir}/cxx-qt");
+    std::fs::create_dir_all(&directory).expect("Could not create cxx-qt header directory");
     // Note we only need cxxqt_connection.h for now, but lets move all headers to be consistent
     // ensure src/lib write_headers is consistent
     for (file_contents, file_name) in [
@@ -56,8 +56,8 @@ fn main() {
         (include_str!("include/cxxqt_type.h"), "cxxqt_type.h"),
     ] {
         let h_path = format!("{directory}/{file_name}");
-        let mut header = File::create(h_path).expect("Could not create cxx-qt-common header");
-        write!(header, "{file_contents}").expect("Could not write cxx-qt-common header");
+        let mut header = File::create(h_path).expect("Could not create cxx-qt header");
+        write!(header, "{file_contents}").expect("Could not write cxx-qt header");
     }
     builder.include(out_dir);
     builder.includes(qtbuild.include_paths());

crates/cxx-qt/include/cxxqt_maybelockguard.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <cxx-qt-common/cxxqt_locking.h>
+#include <cxx-qt/cxxqt_locking.h>
 #include <memory>
 #include <mutex>
 #include <type_traits>

crates/cxx-qt/include/cxxqt_threading.h

@@ -10,8 +10,8 @@
 #include <memory>
 #include <mutex>
 
-#include <cxx-qt-common/cxxqt_locking.h>
-#include <cxx-qt-common/cxxqt_thread.h>
+#include <cxx-qt/cxxqt_locking.h>
+#include <cxx-qt/cxxqt_thread.h>
 
 namespace rust::cxxqt1 {
 

crates/cxx-qt/src/connection.rs

@@ -9,7 +9,7 @@ use std::mem::MaybeUninit;
 mod ffi {
     #[namespace = "rust::cxxqt1"]
     unsafe extern "C++" {
-        include!("cxx-qt-common/cxxqt_connection.h");
+        include!("cxx-qt/cxxqt_connection.h");
 
         #[doc(hidden)]
         type QMetaObjectConnection = crate::QMetaObjectConnection;

crates/cxx-qt/src/cxxqt_connection.cpp

@@ -4,7 +4,7 @@
 // SPDX-FileContributor: Andrew Hayzen <[email protected]>
 //
 // SPDX-License-Identifier: MIT OR Apache-2.0
-#include "cxx-qt-common/cxxqt_connection.h"
+#include "cxx-qt/cxxqt_connection.h"
 
 #include <type_traits>
 

tests/qt_types_standalone/rust/src/qmetaobjectconnection.rs

@@ -9,7 +9,7 @@ use cxx_qt::{QMetaObjectConnection, QMetaObjectConnectionGuard};
 mod qmetaobjectconnection_cxx {
     #[namespace = "rust::cxxqt1"]
     unsafe extern "C++" {
-        include!("cxx-qt-common/cxxqt_connection.h");
+        include!("cxx-qt/cxxqt_connection.h");
         type QMetaObjectConnection = cxx_qt::QMetaObjectConnection;
     }