Skip to content

Commit c641bcf

Browse files
ahayzen-kdabahayzen-kdab
committed
cxx-qt: rename cxx-qt-common folder to cxx-qt
1 parent 6383b68 commit c641bcf

27 files changed

+53
-53
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ impl CxxQtBuilder {
445445
qtbuild.cargo_link_libraries(&mut self.cc_builder);
446446

447447
// Write cxx-qt-gen, cxx-qt-lib and cxx headers
448-
cxx_qt::write_headers(format!("{header_root}/cxx-qt-common"));
448+
cxx_qt::write_headers(format!("{header_root}/cxx-qt"));
449449
cxx_qt_lib_headers::write_headers(format!("{header_root}/cxx-qt-lib"));
450450
std::fs::create_dir_all(format!("{header_root}/rust"))
451451
.expect("Could not create cxx header directory");

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pub fn generate(qobject_idents: &QObjectName) -> Result<GeneratedCppQObjectBlock
1313

1414
result
1515
.includes
16-
.insert("#include <cxx-qt-common/cxxqt_type.h>".to_owned());
16+
.insert("#include <cxx-qt/cxxqt_type.h>".to_owned());
1717

1818
result
1919
.base_classes
@@ -38,7 +38,7 @@ mod tests {
3838
assert_eq!(generated.includes.len(), 1);
3939
assert!(generated
4040
.includes
41-
.contains("#include <cxx-qt-common/cxxqt_type.h>"));
41+
.contains("#include <cxx-qt/cxxqt_type.h>"));
4242

4343
// base class
4444
assert_eq!(generated.base_classes.len(), 1);

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ pub fn generate(
3434
// Ensure that we include MaybeLockGuard<T> that is used in multiple places
3535
block
3636
.includes
37-
.insert("#include <cxx-qt-common/cxxqt_maybelockguard.h>".to_owned());
37+
.insert("#include <cxx-qt/cxxqt_maybelockguard.h>".to_owned());
3838
block.forward_declares = data.forward_declares;
3939
block.fragments = data.fragments;
4040
debug_assert!(data.methods.is_empty());

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pub fn generate() -> Result<(String, GeneratedCppQObjectBlocks)> {
1111

1212
result
1313
.includes
14-
.insert("#include <cxx-qt-common/cxxqt_locking.h>".to_owned());
14+
.insert("#include <cxx-qt/cxxqt_locking.h>".to_owned());
1515

1616
result
1717
.base_classes
@@ -37,7 +37,7 @@ mod tests {
3737
assert_eq!(generated.includes.len(), 1);
3838
assert!(generated
3939
.includes
40-
.contains("#include <cxx-qt-common/cxxqt_locking.h>"));
40+
.contains("#include <cxx-qt/cxxqt_locking.h>"));
4141

4242
// base class
4343
assert_eq!(generated.base_classes.len(), 1);

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ impl GeneratedCppQObject {
112112
generated
113113
.blocks
114114
.includes
115-
.insert("#include <cxx-qt-common/cxxqt_maybelockguard.h>".to_owned());
115+
.insert("#include <cxx-qt/cxxqt_maybelockguard.h>".to_owned());
116116

117117
// Build the base class
118118
let base_class = qobject

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ pub fn generate_cpp_signal(
8989
// Add the include we need
9090
generated
9191
.includes
92-
.insert("#include <cxx-qt-common/cxxqt_signalhandler.h>".to_owned());
92+
.insert("#include <cxx-qt/cxxqt_signalhandler.h>".to_owned());
9393

9494
// Build a namespace that includes any namespace for the T
9595
let qobject_ident_str = qobject_ident.to_string();

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ pub fn generate(qobject_idents: &QObjectName) -> Result<(String, GeneratedCppQOb
3030

3131
result
3232
.includes
33-
.insert("#include <cxx-qt-common/cxxqt_threading.h>".to_owned());
33+
.insert("#include <cxx-qt/cxxqt_threading.h>".to_owned());
3434

3535
result
3636
.base_classes
@@ -89,7 +89,7 @@ mod tests {
8989
assert_eq!(generated.includes.len(), 1);
9090
assert!(generated
9191
.includes
92-
.contains("#include <cxx-qt-common/cxxqt_threading.h>"));
92+
.contains("#include <cxx-qt/cxxqt_threading.h>"));
9393

9494
// base class
9595
assert_eq!(generated.base_classes.len(), 1);

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ pub fn generate(
4949
// <https://github.com/dtolnay/cxx/issues/683>
5050
#[doc(hidden)]
5151
type #cxx_qt_thread_ident = cxx_qt::CxxQtThread<#cpp_struct_ident>;
52-
include!("cxx-qt-common/cxxqt_thread.h");
52+
include!("cxx-qt/cxxqt_thread.h");
5353

5454
#[doc(hidden)]
5555
#[cxx_name = "qtThread"]
@@ -187,7 +187,7 @@ mod tests {
187187
unsafe extern "C++" {
188188
#[doc(hidden)]
189189
type MyObjectCxxQtThread = cxx_qt::CxxQtThread<MyObject>;
190-
include!("cxx-qt-common/cxxqt_thread.h");
190+
include!("cxx-qt/cxxqt_thread.h");
191191

192192
#[doc(hidden)]
193193
#[cxx_name = "qtThread"]

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pub fn write_rust(generated: &GeneratedRustBlocks) -> TokenStream {
2222
unsafe extern "C++" {
2323
include ! (< QtCore / QObject >);
2424

25-
include!("cxx-qt-common/cxxqt_connection.h");
25+
include!("cxx-qt/cxxqt_connection.h");
2626
#[doc(hidden)]
2727
#[namespace = "Qt"]
2828
// Rename to CxxQtConnectionType so the developer can define it
@@ -192,7 +192,7 @@ mod tests {
192192
unsafe extern "C++" {
193193
include ! (< QtCore / QObject >);
194194

195-
include!("cxx-qt-common/cxxqt_connection.h");
195+
include!("cxx-qt/cxxqt_connection.h");
196196
#[doc(hidden)]
197197
#[namespace = "Qt"]
198198
#[rust_name = "CxxQtConnectionType"]
@@ -238,7 +238,7 @@ mod tests {
238238
unsafe extern "C++" {
239239
include ! (< QtCore / QObject >);
240240

241-
include!("cxx-qt-common/cxxqt_connection.h");
241+
include!("cxx-qt/cxxqt_connection.h");
242242
#[doc(hidden)]
243243
#[namespace = "Qt"]
244244
#[rust_name = "CxxQtConnectionType"]

‎crates/cxx-qt-gen/test_outputs/inheritance.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#pragma once
22

3-
#include <cxx-qt-common/cxxqt_locking.h>
4-
#include <cxx-qt-common/cxxqt_maybelockguard.h>
5-
#include <cxx-qt-common/cxxqt_type.h>
3+
#include <cxx-qt/cxxqt_locking.h>
4+
#include <cxx-qt/cxxqt_maybelockguard.h>
5+
#include <cxx-qt/cxxqt_type.h>
66

77
class MyObject;
88

‎crates/cxx-qt-gen/test_outputs/inheritance.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ mod inheritance {
88
}
99
unsafe extern "C++" {
1010
include ! (< QtCore / QObject >);
11-
include!("cxx-qt-common/cxxqt_connection.h");
11+
include!("cxx-qt/cxxqt_connection.h");
1212
#[doc(hidden)]
1313
#[namespace = "Qt"]
1414
#[rust_name = "CxxQtConnectionType"]

‎crates/cxx-qt-gen/test_outputs/invokables.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#pragma once
22

3-
#include <cxx-qt-common/cxxqt_maybelockguard.h>
4-
#include <cxx-qt-common/cxxqt_threading.h>
5-
#include <cxx-qt-common/cxxqt_type.h>
3+
#include <cxx-qt/cxxqt_maybelockguard.h>
4+
#include <cxx-qt/cxxqt_threading.h>
5+
#include <cxx-qt/cxxqt_type.h>
66

77
namespace cxx_qt::my_object {
88
class MyObject;

‎crates/cxx-qt-gen/test_outputs/invokables.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ mod ffi {
1111
}
1212
unsafe extern "C++" {
1313
include ! (< QtCore / QObject >);
14-
include!("cxx-qt-common/cxxqt_connection.h");
14+
include!("cxx-qt/cxxqt_connection.h");
1515
#[doc(hidden)]
1616
#[namespace = "Qt"]
1717
#[rust_name = "CxxQtConnectionType"]
@@ -95,7 +95,7 @@ mod ffi {
9595
unsafe extern "C++" {
9696
#[doc(hidden)]
9797
type MyObjectCxxQtThread = cxx_qt::CxxQtThread<MyObject>;
98-
include!("cxx-qt-common/cxxqt_thread.h");
98+
include!("cxx-qt/cxxqt_thread.h");
9999
#[doc(hidden)]
100100
#[cxx_name = "qtThread"]
101101
fn cxx_qt_ffi_qt_thread(self: &MyObject) -> MyObjectCxxQtThread;

‎crates/cxx-qt-gen/test_outputs/passthrough_and_naming.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#pragma once
22

3-
#include <cxx-qt-common/cxxqt_locking.h>
4-
#include <cxx-qt-common/cxxqt_maybelockguard.h>
5-
#include <cxx-qt-common/cxxqt_signalhandler.h>
6-
#include <cxx-qt-common/cxxqt_type.h>
3+
#include <cxx-qt/cxxqt_locking.h>
4+
#include <cxx-qt/cxxqt_maybelockguard.h>
5+
#include <cxx-qt/cxxqt_signalhandler.h>
6+
#include <cxx-qt/cxxqt_type.h>
77

88
namespace cxx_qt::multi_object {
99
class MyObject;

‎crates/cxx-qt-gen/test_outputs/passthrough_and_naming.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ pub mod ffi {
4747
}
4848
unsafe extern "C++" {
4949
include ! (< QtCore / QObject >);
50-
include!("cxx-qt-common/cxxqt_connection.h");
50+
include!("cxx-qt/cxxqt_connection.h");
5151
#[doc(hidden)]
5252
#[namespace = "Qt"]
5353
#[rust_name = "CxxQtConnectionType"]

‎crates/cxx-qt-gen/test_outputs/properties.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#pragma once
22

3-
#include <cxx-qt-common/cxxqt_locking.h>
4-
#include <cxx-qt-common/cxxqt_maybelockguard.h>
5-
#include <cxx-qt-common/cxxqt_signalhandler.h>
6-
#include <cxx-qt-common/cxxqt_type.h>
3+
#include <cxx-qt/cxxqt_locking.h>
4+
#include <cxx-qt/cxxqt_maybelockguard.h>
5+
#include <cxx-qt/cxxqt_signalhandler.h>
6+
#include <cxx-qt/cxxqt_type.h>
77

88
namespace cxx_qt::my_object {
99
class MyObject;

‎crates/cxx-qt-gen/test_outputs/properties.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ mod ffi {
77
}
88
unsafe extern "C++" {
99
include ! (< QtCore / QObject >);
10-
include!("cxx-qt-common/cxxqt_connection.h");
10+
include!("cxx-qt/cxxqt_connection.h");
1111
#[doc(hidden)]
1212
#[namespace = "Qt"]
1313
#[rust_name = "CxxQtConnectionType"]

‎crates/cxx-qt-gen/test_outputs/qenum.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
#include <QtCore/QObject>
44
#include <QtQml/QQmlEngine>
55
#include <cstdint>
6-
#include <cxx-qt-common/cxxqt_locking.h>
7-
#include <cxx-qt-common/cxxqt_maybelockguard.h>
8-
#include <cxx-qt-common/cxxqt_type.h>
6+
#include <cxx-qt/cxxqt_locking.h>
7+
#include <cxx-qt/cxxqt_maybelockguard.h>
8+
#include <cxx-qt/cxxqt_type.h>
99

1010
namespace cxx_qt::my_object {
1111
class MyObject;

‎crates/cxx-qt-gen/test_outputs/qenum.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
mod ffi {
33
unsafe extern "C++" {
44
include ! (< QtCore / QObject >);
5-
include!("cxx-qt-common/cxxqt_connection.h");
5+
include!("cxx-qt/cxxqt_connection.h");
66
#[doc(hidden)]
77
#[namespace = "Qt"]
88
#[rust_name = "CxxQtConnectionType"]

‎crates/cxx-qt-gen/test_outputs/signals.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#pragma once
22

3-
#include <cxx-qt-common/cxxqt_locking.h>
4-
#include <cxx-qt-common/cxxqt_maybelockguard.h>
5-
#include <cxx-qt-common/cxxqt_signalhandler.h>
6-
#include <cxx-qt-common/cxxqt_type.h>
3+
#include <cxx-qt/cxxqt_locking.h>
4+
#include <cxx-qt/cxxqt_maybelockguard.h>
5+
#include <cxx-qt/cxxqt_signalhandler.h>
6+
#include <cxx-qt/cxxqt_type.h>
77

88
namespace cxx_qt::my_object {
99
class MyObject;

‎crates/cxx-qt-gen/test_outputs/signals.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ mod ffi {
77
}
88
unsafe extern "C++" {
99
include ! (< QtCore / QObject >);
10-
include!("cxx-qt-common/cxxqt_connection.h");
10+
include!("cxx-qt/cxxqt_connection.h");
1111
#[doc(hidden)]
1212
#[namespace = "Qt"]
1313
#[rust_name = "CxxQtConnectionType"]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
#pragma once
88

99
// Re-export QMetaObjectConnection from cxx-qt
10-
#include "cxx-qt-common/cxxqt_connection.h"
10+
#include "cxx-qt/cxxqt_connection.h"

‎crates/cxx-qt/build.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ fn main() {
3030

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

‎crates/cxx-qt/include/cxxqt_maybelockguard.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#pragma once
99

10-
#include <cxx-qt-common/cxxqt_locking.h>
10+
#include <cxx-qt/cxxqt_locking.h>
1111
#include <memory>
1212
#include <mutex>
1313
#include <type_traits>

‎crates/cxx-qt/include/cxxqt_threading.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
#include <memory>
1111
#include <mutex>
1212

13-
#include <cxx-qt-common/cxxqt_locking.h>
14-
#include <cxx-qt-common/cxxqt_thread.h>
13+
#include <cxx-qt/cxxqt_locking.h>
14+
#include <cxx-qt/cxxqt_thread.h>
1515

1616
namespace rust::cxxqt1 {
1717

‎crates/cxx-qt/src/connection.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use std::mem::MaybeUninit;
99
mod ffi {
1010
#[namespace = "rust::cxxqt1"]
1111
unsafe extern "C++" {
12-
include!("cxx-qt-common/cxxqt_connection.h");
12+
include!("cxx-qt/cxxqt_connection.h");
1313

1414
#[doc(hidden)]
1515
type QMetaObjectConnection = crate::QMetaObjectConnection;

‎crates/cxx-qt/src/cxxqt_connection.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// SPDX-FileContributor: Andrew Hayzen <[email protected]>
55
//
66
// SPDX-License-Identifier: MIT OR Apache-2.0
7-
#include "cxx-qt-common/cxxqt_connection.h"
7+
#include "cxx-qt/cxxqt_connection.h"
88

99
#include <type_traits>
1010

0 commit comments

Comments
 (0)