Skip to content

Commit 7c821a1

Browse files
ahayzen-kdabahayzen-kdab
committed
cxx-qt: rename namespace of headers to cxxqt1 in cxx-qt
1 parent 33490f8 commit 7c821a1

40 files changed

+216
-224
lines changed

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ fn default_constructor(
2828
r#"
2929
{class_name}::{class_name}(QObject* parent)
3030
: {base_class}(parent)
31-
, ::rust::cxxqtlib1::CxxQtType<{rust_obj}>(::{namespace_internals}::createRs()){initializers}
31+
, ::rust::cxxqt1::CxxQtType<{rust_obj}>(::{namespace_internals}::createRs()){initializers}
3232
{{ }}
3333
"#,
3434
class_name = qobject.ident,
@@ -119,7 +119,7 @@ pub fn generate(
119119
r#"
120120
{class_name}::{class_name}(::{namespace_internals}::CxxQtConstructorArguments{index}&& args)
121121
: {base_class}({base_args})
122-
, ::rust::cxxqtlib1::CxxQtType<{rust_obj}>(::{namespace_internals}::newRs{index}(::std::move(args.new_))){initializers}
122+
, ::rust::cxxqt1::CxxQtType<{rust_obj}>(::{namespace_internals}::newRs{index}(::std::move(args.new_))){initializers}
123123
{{
124124
::{namespace_internals}::initialize{index}(*this, ::std::move(args.initialize));
125125
}}
@@ -185,7 +185,7 @@ mod tests {
185185
"
186186
MyObject::MyObject(QObject* parent)
187187
: BaseClass(parent)
188-
, ::rust::cxxqtlib1::CxxQtType<MyObjectRust>(::rust::createRs())
188+
, ::rust::cxxqt1::CxxQtType<MyObjectRust>(::rust::createRs())
189189
, member1(1)
190190
, member2{{ 2 }}
191191
{{ }}
@@ -215,7 +215,7 @@ mod tests {
215215
"
216216
MyObject::MyObject(QObject* parent)
217217
: BaseClass(parent)
218-
, ::rust::cxxqtlib1::CxxQtType<MyObjectRust>(::rust::createRs())
218+
, ::rust::cxxqt1::CxxQtType<MyObjectRust>(::rust::createRs())
219219
{{ }}
220220
"
221221
),
@@ -246,7 +246,7 @@ mod tests {
246246
"
247247
MyObject::MyObject(::rust::CxxQtConstructorArguments0&& args)
248248
: BaseClass()
249-
, ::rust::cxxqtlib1::CxxQtType<MyObjectRust>(::rust::newRs0(::std::move(args.new_)))
249+
, ::rust::cxxqt1::CxxQtType<MyObjectRust>(::rust::newRs0(::std::move(args.new_)))
250250
{{
251251
::rust::initialize0(*this, ::std::move(args.initialize));
252252
}}
@@ -309,7 +309,7 @@ mod tests {
309309
"
310310
MyObject::MyObject(::rust::CxxQtConstructorArguments0&& args)
311311
: BaseClass(::std::move(args.base.arg0), ::std::move(args.base.arg1))
312-
, ::rust::cxxqtlib1::CxxQtType<MyObjectRust>(::rust::newRs0(::std::move(args.new_)))
312+
, ::rust::cxxqt1::CxxQtType<MyObjectRust>(::rust::newRs0(::std::move(args.new_)))
313313
, initializer
314314
{{
315315
::rust::initialize0(*this, ::std::move(args.initialize));
@@ -379,7 +379,7 @@ mod tests {
379379
"
380380
MyObject::MyObject(::rust::CxxQtConstructorArguments0&& args)
381381
: BaseClass()
382-
, ::rust::cxxqtlib1::CxxQtType<MyObjectRust>(::rust::newRs0(::std::move(args.new_)))
382+
, ::rust::cxxqt1::CxxQtType<MyObjectRust>(::rust::newRs0(::std::move(args.new_)))
383383
, initializer
384384
{{
385385
::rust::initialize0(*this, ::std::move(args.initialize));
@@ -394,7 +394,7 @@ mod tests {
394394
"
395395
MyObject::MyObject(::rust::CxxQtConstructorArguments1&& args)
396396
: BaseClass(::std::move(args.base.arg0))
397-
, ::rust::cxxqtlib1::CxxQtType<MyObjectRust>(::rust::newRs1(::std::move(args.new_)))
397+
, ::rust::cxxqt1::CxxQtType<MyObjectRust>(::rust::newRs1(::std::move(args.new_)))
398398
, initializer
399399
{{
400400
::rust::initialize1(*this, ::std::move(args.initialize));

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

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

1818
result
1919
.base_classes
20-
.push(format!("::rust::cxxqtlib1::CxxQtType<{rust_ident}>"));
20+
.push(format!("::rust::cxxqt1::CxxQtType<{rust_ident}>"));
2121

2222
Ok(result)
2323
}
@@ -44,7 +44,7 @@ mod tests {
4444
assert_eq!(generated.base_classes.len(), 1);
4545
assert_eq!(
4646
generated.base_classes[0],
47-
"::rust::cxxqtlib1::CxxQtType<MyObjectRust>"
47+
"::rust::cxxqt1::CxxQtType<MyObjectRust>"
4848
);
4949
}
5050
}

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ pub fn generate() -> Result<(String, GeneratedCppQObjectBlocks)> {
1515

1616
result
1717
.base_classes
18-
.push("::rust::cxxqtlib1::CxxQtLocking".to_owned());
18+
.push("::rust::cxxqt1::CxxQtLocking".to_owned());
1919

20-
let class_initializer = "::rust::cxxqtlib1::CxxQtLocking()".to_owned();
20+
let class_initializer = "::rust::cxxqt1::CxxQtLocking()".to_owned();
2121

2222
Ok((class_initializer, result))
2323
}
@@ -31,7 +31,7 @@ mod tests {
3131
let (initializer, generated) = generate().unwrap();
3232

3333
// initializer
34-
assert_eq!(initializer, "::rust::cxxqtlib1::CxxQtLocking()");
34+
assert_eq!(initializer, "::rust::cxxqt1::CxxQtLocking()");
3535

3636
// includes
3737
assert_eq!(generated.includes.len(), 1);
@@ -41,6 +41,6 @@ mod tests {
4141

4242
// base class
4343
assert_eq!(generated.base_classes.len(), 1);
44-
assert_eq!(generated.base_classes[0], "::rust::cxxqtlib1::CxxQtLocking");
44+
assert_eq!(generated.base_classes[0], "::rust::cxxqt1::CxxQtLocking");
4545
}
4646
}

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ pub fn generate_cpp_methods(
115115
{return_cxx_ty}
116116
{qobject_ident}::{ident}({parameter_types}){is_const}
117117
{{
118-
const ::rust::cxxqtlib1::MaybeLockGuard<{qobject_ident}> guard(*this);
118+
const ::rust::cxxqt1::MaybeLockGuard<{qobject_ident}> guard(*this);
119119
{body};
120120
}}
121121
"#,
@@ -248,7 +248,7 @@ mod tests {
248248
void
249249
MyObject::voidInvokable() const
250250
{
251-
const ::rust::cxxqtlib1::MaybeLockGuard<MyObject> guard(*this);
251+
const ::rust::cxxqt1::MaybeLockGuard<MyObject> guard(*this);
252252
voidInvokableWrapper();
253253
}
254254
"#}
@@ -269,7 +269,7 @@ mod tests {
269269
::std::int32_t
270270
MyObject::trivialInvokable(::std::int32_t param) const
271271
{
272-
const ::rust::cxxqtlib1::MaybeLockGuard<MyObject> guard(*this);
272+
const ::rust::cxxqt1::MaybeLockGuard<MyObject> guard(*this);
273273
return trivialInvokableWrapper(param);
274274
}
275275
"#}
@@ -290,7 +290,7 @@ mod tests {
290290
::std::unique_ptr<QColor>
291291
MyObject::opaqueInvokable(QColor const& param)
292292
{
293-
const ::rust::cxxqtlib1::MaybeLockGuard<MyObject> guard(*this);
293+
const ::rust::cxxqt1::MaybeLockGuard<MyObject> guard(*this);
294294
return opaqueInvokableWrapper(param);
295295
}
296296
"#}
@@ -311,7 +311,7 @@ mod tests {
311311
::std::int32_t
312312
MyObject::specifiersInvokable(::std::int32_t param) const
313313
{
314-
const ::rust::cxxqtlib1::MaybeLockGuard<MyObject> guard(*this);
314+
const ::rust::cxxqt1::MaybeLockGuard<MyObject> guard(*this);
315315
return specifiersInvokableWrapper(param);
316316
}
317317
"#}
@@ -329,7 +329,7 @@ mod tests {
329329
void
330330
MyObject::cppMethod() const
331331
{
332-
const ::rust::cxxqtlib1::MaybeLockGuard<MyObject> guard(*this);
332+
const ::rust::cxxqt1::MaybeLockGuard<MyObject> guard(*this);
333333
cppMethodWrapper();
334334
}
335335
"#}
@@ -420,7 +420,7 @@ mod tests {
420420
B2
421421
MyObject::trivialInvokable(A1 param) const
422422
{
423-
const ::rust::cxxqtlib1::MaybeLockGuard<MyObject> guard(*this);
423+
const ::rust::cxxqt1::MaybeLockGuard<MyObject> guard(*this);
424424
return trivialInvokableWrapper(param);
425425
}
426426
"#}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub fn generate(idents: &QPropertyName, qobject_ident: &str, return_cxx_ty: &str
1717
{return_cxx_ty} const&
1818
{qobject_ident}::{ident_getter}() const
1919
{{
20-
const ::rust::cxxqtlib1::MaybeLockGuard<{qobject_ident}> guard(*this);
20+
const ::rust::cxxqt1::MaybeLockGuard<{qobject_ident}> guard(*this);
2121
return {ident_getter_wrapper}();
2222
}}
2323
"#,

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

+15-15
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ mod tests {
102102
::std::int32_t const&
103103
MyObject::getTrivialProperty() const
104104
{
105-
const ::rust::cxxqtlib1::MaybeLockGuard<MyObject> guard(*this);
105+
const ::rust::cxxqt1::MaybeLockGuard<MyObject> guard(*this);
106106
return getTrivialPropertyWrapper();
107107
}
108108
"#}
@@ -123,7 +123,7 @@ mod tests {
123123
void
124124
MyObject::setTrivialProperty(::std::int32_t const& value)
125125
{
126-
const ::rust::cxxqtlib1::MaybeLockGuard<MyObject> guard(*this);
126+
const ::rust::cxxqt1::MaybeLockGuard<MyObject> guard(*this);
127127
setTrivialPropertyWrapper(value);
128128
}
129129
"#}
@@ -144,7 +144,7 @@ mod tests {
144144
::std::unique_ptr<QColor> const&
145145
MyObject::getOpaqueProperty() const
146146
{
147-
const ::rust::cxxqtlib1::MaybeLockGuard<MyObject> guard(*this);
147+
const ::rust::cxxqt1::MaybeLockGuard<MyObject> guard(*this);
148148
return getOpaquePropertyWrapper();
149149
}
150150
"#}
@@ -165,7 +165,7 @@ mod tests {
165165
void
166166
MyObject::setOpaqueProperty(::std::unique_ptr<QColor> const& value)
167167
{
168-
const ::rust::cxxqtlib1::MaybeLockGuard<MyObject> guard(*this);
168+
const ::rust::cxxqt1::MaybeLockGuard<MyObject> guard(*this);
169169
setOpaquePropertyWrapper(value);
170170
}
171171
"#}
@@ -206,7 +206,7 @@ mod tests {
206206
indoc! {r#"
207207
// Define namespace otherwise we hit a GCC bug
208208
// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56480
209-
namespace rust::cxxqtlib1 {
209+
namespace rust::cxxqt1 {
210210
template <>
211211
SignalHandler<::rust::cxxqtgen1::MyObjectCxxQtSignalParamstrivialPropertyChanged *>::~SignalHandler() noexcept
212212
{
@@ -227,7 +227,7 @@ mod tests {
227227
228228
static_assert(alignof(SignalHandler<::rust::cxxqtgen1::MyObjectCxxQtSignalParamstrivialPropertyChanged *>) <= alignof(::std::size_t), "unexpected aligment");
229229
static_assert(sizeof(SignalHandler<::rust::cxxqtgen1::MyObjectCxxQtSignalParamstrivialPropertyChanged *>) == sizeof(::std::size_t[2]), "unexpected size");
230-
} // namespace rust::cxxqtlib1
230+
} // namespace rust::cxxqt1
231231
232232
namespace rust::cxxqtgen1 {
233233
::QMetaObject::Connection
@@ -238,7 +238,7 @@ mod tests {
238238
&MyObject::trivialPropertyChanged,
239239
&self,
240240
[&, closure = ::std::move(closure)]() mutable {
241-
const ::rust::cxxqtlib1::MaybeLockGuard<MyObject> guard(self);
241+
const ::rust::cxxqt1::MaybeLockGuard<MyObject> guard(self);
242242
closure.template operator()<MyObject&>(self);
243243
},
244244
type);
@@ -267,7 +267,7 @@ mod tests {
267267
indoc! {r#"
268268
// Define namespace otherwise we hit a GCC bug
269269
// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56480
270-
namespace rust::cxxqtlib1 {
270+
namespace rust::cxxqt1 {
271271
template <>
272272
SignalHandler<::rust::cxxqtgen1::MyObjectCxxQtSignalParamsopaquePropertyChanged *>::~SignalHandler() noexcept
273273
{
@@ -288,7 +288,7 @@ mod tests {
288288
289289
static_assert(alignof(SignalHandler<::rust::cxxqtgen1::MyObjectCxxQtSignalParamsopaquePropertyChanged *>) <= alignof(::std::size_t), "unexpected aligment");
290290
static_assert(sizeof(SignalHandler<::rust::cxxqtgen1::MyObjectCxxQtSignalParamsopaquePropertyChanged *>) == sizeof(::std::size_t[2]), "unexpected size");
291-
} // namespace rust::cxxqtlib1
291+
} // namespace rust::cxxqt1
292292
293293
namespace rust::cxxqtgen1 {
294294
::QMetaObject::Connection
@@ -299,7 +299,7 @@ mod tests {
299299
&MyObject::opaquePropertyChanged,
300300
&self,
301301
[&, closure = ::std::move(closure)]() mutable {
302-
const ::rust::cxxqtlib1::MaybeLockGuard<MyObject> guard(self);
302+
const ::rust::cxxqt1::MaybeLockGuard<MyObject> guard(self);
303303
closure.template operator()<MyObject&>(self);
304304
},
305305
type);
@@ -382,7 +382,7 @@ mod tests {
382382
A1 const&
383383
MyObject::getMappedProperty() const
384384
{
385-
const ::rust::cxxqtlib1::MaybeLockGuard<MyObject> guard(*this);
385+
const ::rust::cxxqt1::MaybeLockGuard<MyObject> guard(*this);
386386
return getMappedPropertyWrapper();
387387
}
388388
"#}
@@ -400,7 +400,7 @@ mod tests {
400400
void
401401
MyObject::setMappedProperty(A1 const& value)
402402
{
403-
const ::rust::cxxqtlib1::MaybeLockGuard<MyObject> guard(*this);
403+
const ::rust::cxxqt1::MaybeLockGuard<MyObject> guard(*this);
404404
setMappedPropertyWrapper(value);
405405
}
406406
"#}
@@ -433,7 +433,7 @@ mod tests {
433433
indoc! {r#"
434434
// Define namespace otherwise we hit a GCC bug
435435
// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56480
436-
namespace rust::cxxqtlib1 {
436+
namespace rust::cxxqt1 {
437437
template <>
438438
SignalHandler<::rust::cxxqtgen1::MyObjectCxxQtSignalParamsmappedPropertyChanged *>::~SignalHandler() noexcept
439439
{
@@ -454,7 +454,7 @@ mod tests {
454454
455455
static_assert(alignof(SignalHandler<::rust::cxxqtgen1::MyObjectCxxQtSignalParamsmappedPropertyChanged *>) <= alignof(::std::size_t), "unexpected aligment");
456456
static_assert(sizeof(SignalHandler<::rust::cxxqtgen1::MyObjectCxxQtSignalParamsmappedPropertyChanged *>) == sizeof(::std::size_t[2]), "unexpected size");
457-
} // namespace rust::cxxqtlib1
457+
} // namespace rust::cxxqt1
458458
459459
namespace rust::cxxqtgen1 {
460460
::QMetaObject::Connection
@@ -465,7 +465,7 @@ mod tests {
465465
&MyObject::mappedPropertyChanged,
466466
&self,
467467
[&, closure = ::std::move(closure)]() mutable {
468-
const ::rust::cxxqtlib1::MaybeLockGuard<MyObject> guard(self);
468+
const ::rust::cxxqt1::MaybeLockGuard<MyObject> guard(self);
469469
closure.template operator()<MyObject&>(self);
470470
},
471471
type);

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub fn generate(idents: &QPropertyName, qobject_ident: &str, cxx_ty: &str) -> Cp
1717
void
1818
{qobject_ident}::{ident_setter}({cxx_ty} const& value)
1919
{{
20-
const ::rust::cxxqtlib1::MaybeLockGuard<{qobject_ident}> guard(*this);
20+
const ::rust::cxxqt1::MaybeLockGuard<{qobject_ident}> guard(*this);
2121
{ident_setter_wrapper}(value);
2222
}}
2323
"#,

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

+4-10
Original file line numberDiff line numberDiff line change
@@ -215,12 +215,9 @@ mod tests {
215215
assert_eq!(cpp.blocks.base_classes[0], "QObject");
216216
assert_eq!(
217217
cpp.blocks.base_classes[1],
218-
"::rust::cxxqtlib1::CxxQtType<MyObjectRust>"
219-
);
220-
assert_eq!(
221-
cpp.blocks.base_classes[2],
222-
"::rust::cxxqtlib1::CxxQtLocking"
218+
"::rust::cxxqt1::CxxQtType<MyObjectRust>"
223219
);
220+
assert_eq!(cpp.blocks.base_classes[2], "::rust::cxxqt1::CxxQtLocking");
224221
assert_eq!(cpp.blocks.metaobjects.len(), 0);
225222
}
226223

@@ -248,12 +245,9 @@ mod tests {
248245
assert_eq!(cpp.blocks.base_classes[0], "QStringListModel");
249246
assert_eq!(
250247
cpp.blocks.base_classes[1],
251-
"::rust::cxxqtlib1::CxxQtType<MyObjectRust>"
252-
);
253-
assert_eq!(
254-
cpp.blocks.base_classes[2],
255-
"::rust::cxxqtlib1::CxxQtLocking"
248+
"::rust::cxxqt1::CxxQtType<MyObjectRust>"
256249
);
250+
assert_eq!(cpp.blocks.base_classes[2], "::rust::cxxqt1::CxxQtLocking");
257251
assert_eq!(cpp.blocks.metaobjects.len(), 0);
258252
}
259253

0 commit comments

Comments
 (0)