Skip to content

C
core
Kaydet (Commit) f1e5db3e authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Use emplace_back 

Change-Id: I006e3c8f411b480917d9cfb9c4f3d082b79c833d
üst e0b93ef5
Expand all Show whitespace changes
Inline Side-by-side
Showing with 51 additions and 85 deletions
unodevtools/source/skeletonmaker/skeletoncommon.cxx
Dosyayı görüntüle @ f1e5db3e
......@@ -132,10 +132,8 @@ void checkAttributes(rtl::Reference< TypeManager > const & manager,
i != ent2->getDirectAttributes().end(); ++i)
{
if (!containsAttribute(attributes, i->name)) {
attributes.push_back(
unoidl::AccumulationBasedServiceEntity::Property(
i->name,
i->type,
attributes.emplace_back(
i->name, i->type,
(unoidl::AccumulationBasedServiceEntity::Property::
Attributes(
((i->bound
......@@ -146,7 +144,7 @@ void checkAttributes(rtl::Reference< TypeManager > const & manager,
? (unoidl::AccumulationBasedServiceEntity::
Property::ATTRIBUTE_READ_ONLY)
: 0)))),
std::vector< OUString >()));
std::vector< OUString >());
}
}
break;
......
unoidl/source/legacyprovider.cxx
Dosyayı görüntüle @ f1e5db3e
......@@ -234,19 +234,16 @@ rtl::Reference< Entity > readEntity(
std::vector< AnnotatedReference > mandBases;
sal_uInt16 n = reader.getSuperTypeCount();
for (sal_uInt16 j = 0; j != n; ++j) {
mandBases.push_back(
AnnotatedReference(
mandBases.emplace_back(
reader.getSuperTypeName(j).replace('/', '.'),
std::vector< OUString >()));
std::vector< OUString >());
}
std::vector< AnnotatedReference > optBases;
n = reader.getReferenceCount();
for (sal_uInt16 j = 0; j != n; ++j) {
optBases.push_back(
AnnotatedReference(
optBases.emplace_back(
reader.getReferenceTypeName(j).replace('/', '.'),
translateAnnotations(
reader.getReferenceDocumentation(j))));
translateAnnotations(reader.getReferenceDocumentation(j)));
}
sal_uInt16 methodCount = reader.getMethodCount();
std::vector< InterfaceTypeEntity::Attribute > attrs;
......@@ -297,12 +294,11 @@ rtl::Reference< Entity > readEntity(
}
}
RTFieldAccess flags = reader.getFieldFlags(j);
attrs.push_back(
InterfaceTypeEntity::Attribute(
attrs.emplace_back(
attrName, reader.getFieldTypeName(j).replace('/', '.'),
bool(flags & RTFieldAccess::BOUND),
bool(flags & RTFieldAccess::READONLY), getExcs, setExcs,
translateAnnotations(reader.getFieldDocumentation(j))));
translateAnnotations(reader.getFieldDocumentation(j)));
}
std::vector< InterfaceTypeEntity::Method > meths;
for (sal_uInt16 j = 0; j != methodCount; ++j) {
......@@ -338,12 +334,11 @@ rtl::Reference< Entity > readEntity(
+ " in interface type with key "
+ sub.getName()));
}
params.push_back(
InterfaceTypeEntity::Method::Parameter(
params.emplace_back(
reader.getMethodParameterName(j, k),
(reader.getMethodParameterTypeName(j, k).
replace('/', '.')),
dir));
dir);
}
std::vector< OUString > excs;
m = reader.getMethodExceptionCount(j);
......@@ -354,13 +349,12 @@ rtl::Reference< Entity > readEntity(
reader.getMethodExceptionTypeName(j, k).replace(
'/', '.'));
}
meths.push_back(
InterfaceTypeEntity::Method(
meths.emplace_back(
reader.getMethodName(j),
reader.getMethodReturnTypeName(j).replace('/', '.'),
params, excs,
translateAnnotations(
reader.getMethodDocumentation(j))));
reader.getMethodDocumentation(j)));
}
}
return new InterfaceTypeEntity(
......@@ -391,12 +385,10 @@ rtl::Reference< Entity > readEntity(
std::vector< PlainStructTypeEntity::Member > mems;
n = reader.getFieldCount();
for (sal_uInt16 j = 0; j < n; ++j) {
mems.push_back(
PlainStructTypeEntity::Member(
mems.emplace_back(
reader.getFieldName(j),
reader.getFieldTypeName(j).replace('/', '.'),
translateAnnotations(
reader.getFieldDocumentation(j))));
translateAnnotations(reader.getFieldDocumentation(j)));
}
return new PlainStructTypeEntity(
reader.isPublished(), base, mems,
......@@ -418,14 +410,13 @@ rtl::Reference< Entity > readEntity(
std::vector< PolymorphicStructTypeTemplateEntity::Member > mems;
n = reader.getFieldCount();
for (sal_uInt16 j = 0; j < n; ++j) {
mems.push_back(
PolymorphicStructTypeTemplateEntity::Member(
mems.emplace_back(
reader.getFieldName(j),
reader.getFieldTypeName(j).replace('/', '.'),
bool(reader.getFieldFlags(j)
bool(
reader.getFieldFlags(j)
& RTFieldAccess::PARAMETERIZED_TYPE),
translateAnnotations(
reader.getFieldDocumentation(j))));
translateAnnotations(reader.getFieldDocumentation(j)));
}
return new PolymorphicStructTypeTemplateEntity(
reader.isPublished(), params, mems,
......@@ -446,10 +437,9 @@ rtl::Reference< Entity > readEntity(
+ reader.getFieldName(j) + " of enum type with key "
+ sub.getName()));
}
mems.push_back(
EnumTypeEntity::Member(
mems.emplace_back(
reader.getFieldName(j), v.m_value.aLong,
translateAnnotations(reader.getFieldDocumentation(j))));
translateAnnotations(reader.getFieldDocumentation(j)));
}
return new EnumTypeEntity(
......@@ -476,11 +466,10 @@ rtl::Reference< Entity > readEntity(
std::vector< ExceptionTypeEntity::Member > mems;
sal_uInt16 n = reader.getFieldCount();
for (sal_uInt16 j = 0; j != n; ++j) {
mems.push_back(
ExceptionTypeEntity::Member(
mems.emplace_back(
reader.getFieldName(j),
reader.getFieldTypeName(j).replace('/', '.'),
translateAnnotations(reader.getFieldDocumentation(j))));
translateAnnotations(reader.getFieldDocumentation(j)));
}
return new ExceptionTypeEntity(
reader.isPublished(), base, mems,
......@@ -507,10 +496,10 @@ rtl::Reference< Entity > readEntity(
std::vector< AnnotatedReference > optIfcs;
sal_uInt16 n = reader.getReferenceCount();
for (sal_uInt16 j = 0; j != n; ++j) {
AnnotatedReference base(
AnnotatedReference base{
reader.getReferenceTypeName(j).replace('/', '.'),
translateAnnotations(
reader.getReferenceDocumentation(j)));
reader.getReferenceDocumentation(j))};
switch (reader.getReferenceSort(j)) {
case RTReferenceType::EXPORTS:
if (!(reader.getReferenceFlags(j) & RTFieldAccess::OPTIONAL))
......@@ -578,15 +567,13 @@ rtl::Reference< Entity > readEntity(
attrs |= AccumulationBasedServiceEntity::Property::
ATTRIBUTE_REMOVABLE;
}
props.push_back(
AccumulationBasedServiceEntity::Property(
props.emplace_back(
reader.getFieldName(j),
reader.getFieldTypeName(j).replace('/', '.'),
static_cast<
AccumulationBasedServiceEntity::Property::
Attributes >(attrs),
translateAnnotations(
reader.getFieldDocumentation(j))));
translateAnnotations(reader.getFieldDocumentation(j)));
}
return new AccumulationBasedServiceEntity(
reader.isPublished(), mandServs, optServs, mandIfcs,
......@@ -652,13 +639,11 @@ rtl::Reference< Entity > readEntity(
+ " in service with key "
+ sub.getName()));
}
params.push_back(
SingleInterfaceBasedServiceEntity::Constructor::
Parameter(
params.emplace_back(
reader.getMethodParameterName(j, k),
(reader.getMethodParameterTypeName(j, k).
replace('/', '.')),
(mode & RT_PARAM_REST) != 0));
(mode & RT_PARAM_REST) != 0);
}
std::vector< OUString > excs;
m = reader.getMethodExceptionCount(j);
......@@ -768,11 +753,10 @@ rtl::Reference< Entity > readEntity(
std::vector< ConstantGroupEntity::Member > mems;
sal_uInt16 n = reader.getFieldCount();
for (sal_uInt16 j = 0; j != n; ++j) {
mems.push_back(
ConstantGroupEntity::Member(
mems.emplace_back(
reader.getFieldName(j),
translateConstantValue(sub, reader.getFieldValue(j)),
translateAnnotations(reader.getFieldDocumentation(j))));
translateAnnotations(reader.getFieldDocumentation(j)));
}
return new ConstantGroupEntity(
reader.isPublished(), mems,
......
unoidl/source/sourceprovider-parser.y
Dosyayı görüntüle @ f1e5db3e
......@@ -1039,8 +1039,7 @@ enumMember:
}
++v;
}
pad->members.push_back(
unoidl::EnumTypeEntity::Member(id, v, annotations($1)));
pad->members.emplace_back(id, v, annotations($1));
}
| deprecated_opt identifier '=' expr
{
......@@ -1078,8 +1077,7 @@ enumMember:
YYERROR;
break;
}
pad->members.push_back(
unoidl::EnumTypeEntity::Member(id, v, annotations($1)));
pad->members.emplace_back(id, v, annotations($1));
}
;
......@@ -1399,9 +1397,7 @@ structMember:
p->entity.get());
}
}
p1->members.push_back(
unoidl::PlainStructTypeEntity::Member(
id, t.getName(), annotations($1)));
p1->members.emplace_back(id, t.getName(), annotations($1));
} else {
unoidl::detail::SourceProviderPolymorphicStructTypeTemplateEntityPad *
p2 = dynamic_cast<unoidl::detail::SourceProviderPolymorphicStructTypeTemplateEntityPad *>(
......@@ -1420,12 +1416,10 @@ structMember:
YYERROR;
}
}
p2->members.push_back(
unoidl::PolymorphicStructTypeTemplateEntity::Member(
p2->members.emplace_back(
id, t.getName(),
(t.type
== unoidl::detail::SourceProviderType::TYPE_PARAMETER),
annotations($1)));
t.type == unoidl::detail::SourceProviderType::TYPE_PARAMETER,
annotations($1));
} else {
unoidl::detail::SourceProviderExceptionTypeEntityPad * p3
= dynamic_cast<unoidl::detail::SourceProviderExceptionTypeEntityPad *>(
......@@ -1499,9 +1493,7 @@ structMember:
p->entity.get());
}
}
p3->members.push_back(
unoidl::ExceptionTypeEntity::Member(
id, t.getName(), annotations($1)));
p3->members.emplace_back(id, t.getName(), annotations($1));
}
}
}
......@@ -1625,14 +1617,14 @@ interfaceDefn:
i(pad->directMandatoryBases.begin());
i != pad->directMandatoryBases.end(); ++i)
{
mbases.push_back(unoidl::AnnotatedReference(i->name, i->annotations));
mbases.emplace_back(i->name, i->annotations);
}
std::vector<unoidl::AnnotatedReference> obases;
for (std::vector<unoidl::detail::SourceProviderInterfaceTypeEntityPad::DirectBase>::const_iterator
i(pad->directOptionalBases.begin());
i != pad->directOptionalBases.end(); ++i)
{
obases.push_back(unoidl::AnnotatedReference(i->name, i->annotations));
obases.emplace_back(i->name, i->annotations);
}
ent->entity = new unoidl::InterfaceTypeEntity(
pad->isPublished(), mbases, obases, pad->directAttributes,
......@@ -1760,12 +1752,10 @@ interfaceAttribute:
if (!pad->addDirectMember(@4, yyscanner, data, id)) {
YYERROR;
}
pad->directAttributes.push_back(
unoidl::InterfaceTypeEntity::Attribute(
pad->directAttributes.emplace_back(
id, t.getName(), ($2 & unoidl::detail::FLAG_BOUND) != 0,
($2 & unoidl::detail::FLAG_READONLY) != 0,
std::vector<OUString>(), std::vector<OUString>(),
annotations($1)));
std::vector<OUString>(), std::vector<OUString>(), annotations($1));
}
attributeAccessDecls_opt ';'
;
......@@ -1842,11 +1832,10 @@ interfaceMethod:
if (!pad->addDirectMember(@3, yyscanner, data, id)) {
YYERROR;
}
pad->directMethods.push_back(
unoidl::InterfaceTypeEntity::Method(
pad->directMethods.emplace_back(
id, t.getName(),
std::vector<unoidl::InterfaceTypeEntity::Method::Parameter>(),
std::vector<OUString>(), annotations($1)));
std::vector<OUString>(), annotations($1));
}
'(' methodParams_opt ')' exceptionSpec_opt ';'
{
......@@ -1910,8 +1899,7 @@ methodParam:
YYERROR;
}
}
pad->directMethods.back().parameters.push_back(
unoidl::InterfaceTypeEntity::Method::Parameter(id, t.getName(), $2));
pad->directMethods.back().parameters.emplace_back(id, t.getName(), $2);
}
;
......@@ -2309,8 +2297,7 @@ constant:
YYERROR;
break;
}
pad->members.push_back(
unoidl::ConstantGroupEntity::Member(id, v, annotations($1)));
pad->members.emplace_back(id, v, annotations($1));
}
;
......@@ -2396,9 +2383,7 @@ singleInterfaceBasedServiceDefn:
j(i->parameters.begin());
j != i->parameters.end(); ++j)
{
parms.push_back(
unoidl::SingleInterfaceBasedServiceEntity::Constructor::Parameter(
j->name, j->type.getName(), j->rest));
parms.emplace_back(j->name, j->type.getName(), j->rest);
}
ctors.push_back(
unoidl::SingleInterfaceBasedServiceEntity::Constructor(
......@@ -2691,7 +2676,7 @@ serviceBase:
YYERROR;
}
}
v.push_back(unoidl::AnnotatedReference(name, annotations($1)));
v.emplace_back(name, annotations($1));
}
;
......@@ -2770,7 +2755,7 @@ serviceInterfaceBase:
YYERROR;
}
}
v.push_back(unoidl::AnnotatedReference(name, annotations($1)));
v.emplace_back(name, annotations($1));
}
;
......@@ -2860,11 +2845,10 @@ serviceProperty:
YYERROR;
}
}
pad->directProperties.push_back(
unoidl::AccumulationBasedServiceEntity::Property(
pad->directProperties.emplace_back(
id, t.getName(),
unoidl::AccumulationBasedServiceEntity::Property::Attributes(att),
annotations($1)));
annotations($1));
}
;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment