Skip to content

Commit a31e70c

Browse files
ahayzen-kdabahayzen-kdab
committed
cxx-qt: rename namespace of headers to cxxqt1 in cxx-qt
1 parent 18931b0 commit a31e70c

39 files changed

+215
-223
lines changed

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ fn default_constructor(
2727
r#"
2828
{class_name}::{class_name}(QObject* parent)
2929
: {base_class}(parent)
30-
, ::rust::cxxqtlib1::CxxQtType<{rust_obj}>(::{namespace_internals}::createRs()){initializers}
30+
, ::rust::cxxqt1::CxxQtType<{rust_obj}>(::{namespace_internals}::createRs()){initializers}
3131
{{ }}
3232
"#,
3333
class_name = qobject.ident,
@@ -118,7 +118,7 @@ pub fn generate(
118118
r#"
119119
{class_name}::{class_name}(::{namespace_internals}::CxxQtConstructorArguments{index}&& args)
120120
: {base_class}({base_args})
121-
, ::rust::cxxqtlib1::CxxQtType<{rust_obj}>(::{namespace_internals}::newRs{index}(::std::move(args.new_))){initializers}
121+
, ::rust::cxxqt1::CxxQtType<{rust_obj}>(::{namespace_internals}::newRs{index}(::std::move(args.new_))){initializers}
122122
{{
123123
::{namespace_internals}::initialize{index}(*this, ::std::move(args.initialize));
124124
}}
@@ -184,7 +184,7 @@ mod tests {
184184
"
185185
MyObject::MyObject(QObject* parent)
186186
: BaseClass(parent)
187-
, ::rust::cxxqtlib1::CxxQtType<MyObjectRust>(::rust::createRs())
187+
, ::rust::cxxqt1::CxxQtType<MyObjectRust>(::rust::createRs())
188188
, member1(1)
189189
, member2{{ 2 }}
190190
{{ }}
@@ -214,7 +214,7 @@ mod tests {
214214
"
215215
MyObject::MyObject(QObject* parent)
216216
: BaseClass(parent)
217-
, ::rust::cxxqtlib1::CxxQtType<MyObjectRust>(::rust::createRs())
217+
, ::rust::cxxqt1::CxxQtType<MyObjectRust>(::rust::createRs())
218218
{{ }}
219219
"
220220
),
@@ -245,7 +245,7 @@ mod tests {
245245
"
246246
MyObject::MyObject(::rust::CxxQtConstructorArguments0&& args)
247247
: BaseClass()
248-
, ::rust::cxxqtlib1::CxxQtType<MyObjectRust>(::rust::newRs0(::std::move(args.new_)))
248+
, ::rust::cxxqt1::CxxQtType<MyObjectRust>(::rust::newRs0(::std::move(args.new_)))
249249
{{
250250
::rust::initialize0(*this, ::std::move(args.initialize));
251251
}}
@@ -308,7 +308,7 @@ mod tests {
308308
"
309309
MyObject::MyObject(::rust::CxxQtConstructorArguments0&& args)
310310
: BaseClass(::std::move(args.base.arg0), ::std::move(args.base.arg1))
311-
, ::rust::cxxqtlib1::CxxQtType<MyObjectRust>(::rust::newRs0(::std::move(args.new_)))
311+
, ::rust::cxxqt1::CxxQtType<MyObjectRust>(::rust::newRs0(::std::move(args.new_)))
312312
, initializer
313313
{{
314314
::rust::initialize0(*this, ::std::move(args.initialize));
@@ -378,7 +378,7 @@ mod tests {
378378
"
379379
MyObject::MyObject(::rust::CxxQtConstructorArguments0&& args)
380380
: BaseClass()
381-
, ::rust::cxxqtlib1::CxxQtType<MyObjectRust>(::rust::newRs0(::std::move(args.new_)))
381+
, ::rust::cxxqt1::CxxQtType<MyObjectRust>(::rust::newRs0(::std::move(args.new_)))
382382
, initializer
383383
{{
384384
::rust::initialize0(*this, ::std::move(args.initialize));
@@ -393,7 +393,7 @@ mod tests {
393393
"
394394
MyObject::MyObject(::rust::CxxQtConstructorArguments1&& args)
395395
: BaseClass(::std::move(args.base.arg0))
396-
, ::rust::cxxqtlib1::CxxQtType<MyObjectRust>(::rust::newRs1(::std::move(args.new_)))
396+
, ::rust::cxxqt1::CxxQtType<MyObjectRust>(::rust::newRs1(::std::move(args.new_)))
397397
, initializer
398398
{{
399399
::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
@@ -113,7 +113,7 @@ pub fn generate_cpp_methods(
113113
{return_cxx_ty}
114114
{qobject_ident}::{ident}({parameter_types}){is_const}
115115
{{
116-
const ::rust::cxxqtlib1::MaybeLockGuard<{qobject_ident}> guard(*this);
116+
const ::rust::cxxqt1::MaybeLockGuard<{qobject_ident}> guard(*this);
117117
{body};
118118
}}
119119
"#,
@@ -246,7 +246,7 @@ mod tests {
246246
void
247247
MyObject::voidInvokable() const
248248
{
249-
const ::rust::cxxqtlib1::MaybeLockGuard<MyObject> guard(*this);
249+
const ::rust::cxxqt1::MaybeLockGuard<MyObject> guard(*this);
250250
voidInvokableWrapper();
251251
}
252252
"#}
@@ -267,7 +267,7 @@ mod tests {
267267
::std::int32_t
268268
MyObject::trivialInvokable(::std::int32_t param) const
269269
{
270-
const ::rust::cxxqtlib1::MaybeLockGuard<MyObject> guard(*this);
270+
const ::rust::cxxqt1::MaybeLockGuard<MyObject> guard(*this);
271271
return trivialInvokableWrapper(param);
272272
}
273273
"#}
@@ -288,7 +288,7 @@ mod tests {
288288
::std::unique_ptr<QColor>
289289
MyObject::opaqueInvokable(QColor const& param)
290290
{
291-
const ::rust::cxxqtlib1::MaybeLockGuard<MyObject> guard(*this);
291+
const ::rust::cxxqt1::MaybeLockGuard<MyObject> guard(*this);
292292
return opaqueInvokableWrapper(param);
293293
}
294294
"#}
@@ -309,7 +309,7 @@ mod tests {
309309
::std::int32_t
310310
MyObject::specifiersInvokable(::std::int32_t param) const
311311
{
312-
const ::rust::cxxqtlib1::MaybeLockGuard<MyObject> guard(*this);
312+
const ::rust::cxxqt1::MaybeLockGuard<MyObject> guard(*this);
313313
return specifiersInvokableWrapper(param);
314314
}
315315
"#}
@@ -327,7 +327,7 @@ mod tests {
327327
void
328328
MyObject::cppMethod() const
329329
{
330-
const ::rust::cxxqtlib1::MaybeLockGuard<MyObject> guard(*this);
330+
const ::rust::cxxqt1::MaybeLockGuard<MyObject> guard(*this);
331331
cppMethodWrapper();
332332
}
333333
"#}
@@ -418,7 +418,7 @@ mod tests {
418418
B2
419419
MyObject::trivialInvokable(A1 param) const
420420
{
421-
const ::rust::cxxqtlib1::MaybeLockGuard<MyObject> guard(*this);
421+
const ::rust::cxxqt1::MaybeLockGuard<MyObject> guard(*this);
422422
return trivialInvokableWrapper(param);
423423
}
424424
"#}

‎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
@@ -103,7 +103,7 @@ mod tests {
103103
::std::int32_t const&
104104
MyObject::getTrivialProperty() const
105105
{
106-
const ::rust::cxxqtlib1::MaybeLockGuard<MyObject> guard(*this);
106+
const ::rust::cxxqt1::MaybeLockGuard<MyObject> guard(*this);
107107
return getTrivialPropertyWrapper();
108108
}
109109
"#}
@@ -124,7 +124,7 @@ mod tests {
124124
void
125125
MyObject::setTrivialProperty(::std::int32_t const& value)
126126
{
127-
const ::rust::cxxqtlib1::MaybeLockGuard<MyObject> guard(*this);
127+
const ::rust::cxxqt1::MaybeLockGuard<MyObject> guard(*this);
128128
setTrivialPropertyWrapper(value);
129129
}
130130
"#}
@@ -145,7 +145,7 @@ mod tests {
145145
::std::unique_ptr<QColor> const&
146146
MyObject::getOpaqueProperty() const
147147
{
148-
const ::rust::cxxqtlib1::MaybeLockGuard<MyObject> guard(*this);
148+
const ::rust::cxxqt1::MaybeLockGuard<MyObject> guard(*this);
149149
return getOpaquePropertyWrapper();
150150
}
151151
"#}
@@ -166,7 +166,7 @@ mod tests {
166166
void
167167
MyObject::setOpaqueProperty(::std::unique_ptr<QColor> const& value)
168168
{
169-
const ::rust::cxxqtlib1::MaybeLockGuard<MyObject> guard(*this);
169+
const ::rust::cxxqt1::MaybeLockGuard<MyObject> guard(*this);
170170
setOpaquePropertyWrapper(value);
171171
}
172172
"#}
@@ -207,7 +207,7 @@ mod tests {
207207
indoc! {r#"
208208
// Define namespace otherwise we hit a GCC bug
209209
// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56480
210-
namespace rust::cxxqtlib1 {
210+
namespace rust::cxxqt1 {
211211
template <>
212212
SignalHandler<::rust::cxxqtgen1::MyObjectCxxQtSignalParamstrivialPropertyChanged *>::~SignalHandler() noexcept
213213
{
@@ -228,7 +228,7 @@ mod tests {
228228
229229
static_assert(alignof(SignalHandler<::rust::cxxqtgen1::MyObjectCxxQtSignalParamstrivialPropertyChanged *>) <= alignof(::std::size_t), "unexpected aligment");
230230
static_assert(sizeof(SignalHandler<::rust::cxxqtgen1::MyObjectCxxQtSignalParamstrivialPropertyChanged *>) == sizeof(::std::size_t[2]), "unexpected size");
231-
} // namespace rust::cxxqtlib1
231+
} // namespace rust::cxxqt1
232232
233233
namespace rust::cxxqtgen1 {
234234
::QMetaObject::Connection
@@ -239,7 +239,7 @@ mod tests {
239239
&MyObject::trivialPropertyChanged,
240240
&self,
241241
[&, closure = ::std::move(closure)]() mutable {
242-
const ::rust::cxxqtlib1::MaybeLockGuard<MyObject> guard(self);
242+
const ::rust::cxxqt1::MaybeLockGuard<MyObject> guard(self);
243243
closure.template operator()<MyObject&>(self);
244244
},
245245
type);
@@ -268,7 +268,7 @@ mod tests {
268268
indoc! {r#"
269269
// Define namespace otherwise we hit a GCC bug
270270
// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56480
271-
namespace rust::cxxqtlib1 {
271+
namespace rust::cxxqt1 {
272272
template <>
273273
SignalHandler<::rust::cxxqtgen1::MyObjectCxxQtSignalParamsopaquePropertyChanged *>::~SignalHandler() noexcept
274274
{
@@ -289,7 +289,7 @@ mod tests {
289289
290290
static_assert(alignof(SignalHandler<::rust::cxxqtgen1::MyObjectCxxQtSignalParamsopaquePropertyChanged *>) <= alignof(::std::size_t), "unexpected aligment");
291291
static_assert(sizeof(SignalHandler<::rust::cxxqtgen1::MyObjectCxxQtSignalParamsopaquePropertyChanged *>) == sizeof(::std::size_t[2]), "unexpected size");
292-
} // namespace rust::cxxqtlib1
292+
} // namespace rust::cxxqt1
293293
294294
namespace rust::cxxqtgen1 {
295295
::QMetaObject::Connection
@@ -300,7 +300,7 @@ mod tests {
300300
&MyObject::opaquePropertyChanged,
301301
&self,
302302
[&, closure = ::std::move(closure)]() mutable {
303-
const ::rust::cxxqtlib1::MaybeLockGuard<MyObject> guard(self);
303+
const ::rust::cxxqt1::MaybeLockGuard<MyObject> guard(self);
304304
closure.template operator()<MyObject&>(self);
305305
},
306306
type);
@@ -383,7 +383,7 @@ mod tests {
383383
A1 const&
384384
MyObject::getMappedProperty() const
385385
{
386-
const ::rust::cxxqtlib1::MaybeLockGuard<MyObject> guard(*this);
386+
const ::rust::cxxqt1::MaybeLockGuard<MyObject> guard(*this);
387387
return getMappedPropertyWrapper();
388388
}
389389
"#}
@@ -401,7 +401,7 @@ mod tests {
401401
void
402402
MyObject::setMappedProperty(A1 const& value)
403403
{
404-
const ::rust::cxxqtlib1::MaybeLockGuard<MyObject> guard(*this);
404+
const ::rust::cxxqt1::MaybeLockGuard<MyObject> guard(*this);
405405
setMappedPropertyWrapper(value);
406406
}
407407
"#}
@@ -434,7 +434,7 @@ mod tests {
434434
indoc! {r#"
435435
// Define namespace otherwise we hit a GCC bug
436436
// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56480
437-
namespace rust::cxxqtlib1 {
437+
namespace rust::cxxqt1 {
438438
template <>
439439
SignalHandler<::rust::cxxqtgen1::MyObjectCxxQtSignalParamsmappedPropertyChanged *>::~SignalHandler() noexcept
440440
{
@@ -455,7 +455,7 @@ mod tests {
455455
456456
static_assert(alignof(SignalHandler<::rust::cxxqtgen1::MyObjectCxxQtSignalParamsmappedPropertyChanged *>) <= alignof(::std::size_t), "unexpected aligment");
457457
static_assert(sizeof(SignalHandler<::rust::cxxqtgen1::MyObjectCxxQtSignalParamsmappedPropertyChanged *>) == sizeof(::std::size_t[2]), "unexpected size");
458-
} // namespace rust::cxxqtlib1
458+
} // namespace rust::cxxqt1
459459
460460
namespace rust::cxxqtgen1 {
461461
::QMetaObject::Connection
@@ -466,7 +466,7 @@ mod tests {
466466
&MyObject::mappedPropertyChanged,
467467
&self,
468468
[&, closure = ::std::move(closure)]() mutable {
469-
const ::rust::cxxqtlib1::MaybeLockGuard<MyObject> guard(self);
469+
const ::rust::cxxqt1::MaybeLockGuard<MyObject> guard(self);
470470
closure.template operator()<MyObject&>(self);
471471
},
472472
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)