Skip to content

Commit 4e5ed77

Browse files
rsjbaileyrsjbailey
committed
Fix formatting
1 parent 57421ba commit 4e5ed77

File tree

9 files changed

+50
-56
lines changed

9 files changed

+50
-56
lines changed

‎include/adm/document.hpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ namespace adm {
140140
template <typename Element>
141141
std::shared_ptr<Element> getElement();
142142

143-
144143
/** @name Lookup ADM elements by its Id
145144
*
146145
* Lookup the first ADM element with the given Id.

‎include/adm/elements/tag_list.hpp‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ namespace adm {
1717
struct TTagTag {};
1818

1919
namespace detail {
20-
extern template class ADM_EXPORT_TEMPLATE_METHODS RequiredParameter<TTagValue>;
21-
extern template class ADM_EXPORT_TEMPLATE_METHODS OptionalParameter<TTagClass>;
20+
extern template class ADM_EXPORT_TEMPLATE_METHODS
21+
RequiredParameter<TTagValue>;
22+
extern template class ADM_EXPORT_TEMPLATE_METHODS
23+
OptionalParameter<TTagClass>;
2224

2325
using TTagBase = HasParameters<RequiredParameter<TTagValue>,
2426
OptionalParameter<TTagClass>>;
@@ -36,9 +38,9 @@ namespace adm {
3638

3739
ADM_EXPORT explicit TTag(std::string str)
3840
: TTag(TTagValue(std::move(str))) {}
39-
ADM_EXPORT explicit TTag(const char* s);
41+
ADM_EXPORT explicit TTag(const char *s);
4042

41-
ADM_EXPORT void print(std::ostream& os) const;
43+
ADM_EXPORT void print(std::ostream &os) const;
4244

4345
using detail::TTagBase::set;
4446
using detail::TTagBase::unset;
@@ -63,9 +65,7 @@ namespace adm {
6365
return detail::optionalsEqual<TTagValue, TTagClass>(a, b);
6466
}
6567

66-
inline bool operator!=(const TTag &a, const TTag &b) {
67-
return !(a==b);
68-
}
68+
inline bool operator!=(const TTag &a, const TTag &b) { return !(a == b); }
6969

7070
struct TagGroupTag {};
7171

@@ -76,7 +76,7 @@ namespace adm {
7676
} // namespace detail
7777

7878
class TagGroup : private detail::TagGroupBase,
79-
private detail::AddWrapperMethods<TagGroup> {
79+
private detail::AddWrapperMethods<TagGroup> {
8080
public:
8181
using tag = TagGroupTag;
8282

@@ -147,7 +147,8 @@ namespace adm {
147147
ADM_EXPORT ElementRange<AudioObject> getReferences(
148148
detail::ParameterTraits<AudioObject>::tag);
149149

150-
ADM_EXPORT void clearReferences(detail::ParameterTraits<AudioProgramme>::tag);
150+
ADM_EXPORT void clearReferences(
151+
detail::ParameterTraits<AudioProgramme>::tag);
151152
ADM_EXPORT void clearReferences(detail::ParameterTraits<AudioContent>::tag);
152153
ADM_EXPORT void clearReferences(detail::ParameterTraits<AudioObject>::tag);
153154

@@ -220,7 +221,8 @@ namespace adm {
220221
ADD_TRAIT(TagGroups, TagGroupsTag);
221222

222223
namespace detail {
223-
extern template class ADM_EXPORT_TEMPLATE_METHODS VectorParameter<TagGroups>;
224+
extern template class ADM_EXPORT_TEMPLATE_METHODS
225+
VectorParameter<TagGroups>;
224226

225227
using TagListBase = HasParameters<VectorParameter<TagGroups>>;
226228
} // namespace detail

‎include/adm/parse.hpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,8 @@ namespace adm {
100100
* @param commonDefinitions Common Defintions document
101101
*/
102102
ADM_EXPORT std::shared_ptr<Document> parseFrame(
103-
std::istream& stream,
104-
const FrameHeader& header,
105-
xml::ParserOptions options,
106-
std::shared_ptr<Document> commonDefinitions);
103+
std::istream& stream, const FrameHeader& header,
104+
xml::ParserOptions options, std::shared_ptr<Document> commonDefinitions);
107105

108106
/**
109107
* @brief Parse an XML representation of a serial ADM frame and return

‎include/adm/private/rapidxml_wrapper.hpp‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,9 @@ namespace adm {
102102
void addBaseElements(const Source &src, const std::string &name,
103103
Callable formatter);
104104

105-
template <typename ElementType, typename Source,
106-
typename Callable>
105+
template <typename ElementType, typename Source, typename Callable>
107106
void addBaseElement(const Source &src, const std::string &name,
108-
Callable formatter);
107+
Callable formatter);
109108

110109
template <typename ElementType, typename AdmIdType, typename Source>
111110
void addReference(const Source &src, const std::string &name);
@@ -267,18 +266,16 @@ namespace adm {
267266
}
268267
}
269268

270-
template <typename ElementType, typename Source,
271-
typename Callable>
269+
template <typename ElementType, typename Source, typename Callable>
272270
void XmlNode::addBaseElement(const Source &src, const std::string &name,
273-
Callable formatter) {
271+
Callable formatter) {
274272
auto admElement = src->template getElement<ElementType>();
275273
if (admElement) {
276274
auto node = addNode(name);
277275
formatter(node, *admElement);
278276
}
279277
}
280278

281-
282279
template <typename ElementType, typename AdmIdType, typename Source>
283280
void XmlNode::addReference(const Source &src, const std::string &name) {
284281
addElement<AdmIdType>(src->template getReference<ElementType>(), name);

‎src/elements/tag_list.cpp‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ namespace adm {
1212

1313
// ---- References ---- //
1414
bool TagGroup::addReference(std::shared_ptr<AudioProgramme> programme) {
15-
auto it = std::find(audioProgrammes_.begin(), audioProgrammes_.end(), programme);
15+
auto it =
16+
std::find(audioProgrammes_.begin(), audioProgrammes_.end(), programme);
1617
if (it == audioProgrammes_.end()) {
1718
audioProgrammes_.push_back(std::move(programme));
1819
return true;
@@ -42,7 +43,8 @@ namespace adm {
4243
}
4344

4445
void TagGroup::removeReference(std::shared_ptr<AudioProgramme> programme) {
45-
auto it = std::find(audioProgrammes_.begin(), audioProgrammes_.end(), programme);
46+
auto it =
47+
std::find(audioProgrammes_.begin(), audioProgrammes_.end(), programme);
4648
if (it != audioProgrammes_.end()) {
4749
audioProgrammes_.erase(it);
4850
}
@@ -68,18 +70,15 @@ namespace adm {
6870
clearReferences<AudioObject>();
6971
}
7072

71-
void TagGroup::clearReferences(
72-
detail::ParameterTraits<AudioProgramme>::tag) {
73+
void TagGroup::clearReferences(detail::ParameterTraits<AudioProgramme>::tag) {
7374
audioProgrammes_.clear();
7475
}
7576

76-
void TagGroup::clearReferences(
77-
detail::ParameterTraits<AudioContent>::tag) {
77+
void TagGroup::clearReferences(detail::ParameterTraits<AudioContent>::tag) {
7878
audioContents_.clear();
7979
}
8080

81-
void TagGroup::clearReferences(
82-
detail::ParameterTraits<AudioObject>::tag) {
81+
void TagGroup::clearReferences(detail::ParameterTraits<AudioObject>::tag) {
8382
audioObjects_.clear();
8483
}
8584

‎src/parse.cpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,9 @@ namespace adm {
3737
return parser.parse();
3838
}
3939

40-
std::shared_ptr<Document> parseFrame(std::istream& stream,
41-
const FrameHeader& header,
42-
xml::ParserOptions options,
43-
std::shared_ptr<Document> commonDefinitions) {
40+
std::shared_ptr<Document> parseFrame(
41+
std::istream& stream, const FrameHeader& header,
42+
xml::ParserOptions options, std::shared_ptr<Document> commonDefinitions) {
4443
xml::DocumentParser parser(stream, options, commonDefinitions);
4544
parser.setHeader(header);
4645
return parser.parse();

‎src/private/document_parser.cpp‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,8 @@ namespace adm {
118118
std::string nodeName(node->name(), node->name_size());
119119
if (nodeName == "profileList") {
120120
// Can't use the local add function as that contains an ID setting
121-
document_->add(std::make_shared<ProfileList>(parseProfileList(node)));
121+
document_->add(
122+
std::make_shared<ProfileList>(parseProfileList(node)));
122123
} else if (nodeName == "tagList") {
123124
// Can't use the local add function as that contains an ID setting
124125
document_->add(std::make_shared<TagList>(parseTagList(node)));
@@ -564,9 +565,15 @@ namespace adm {
564565
auto tagGroup = std::make_shared<TagGroup>();
565566
tagGroup->setTempId(rand() % 1000);
566567
addOptionalElements<TTag>(node, "tag", tagGroup, &parseTTag);
567-
addOptionalReferences<AudioProgrammeId>(node, "audioProgrammeIDRef", tagGroup, tagGroupProgrammeRefs_, &parseAudioProgrammeId);
568-
addOptionalReferences<AudioContentId>(node, "audioContentIDRef", tagGroup, tagGroupContentRefs_, &parseAudioContentId);
569-
addOptionalReferences<AudioObjectId>(node, "audioObjectIDRef", tagGroup, tagGroupObjectRefs_, &parseAudioObjectId);
568+
addOptionalReferences<AudioProgrammeId>(node, "audioProgrammeIDRef",
569+
tagGroup, tagGroupProgrammeRefs_,
570+
&parseAudioProgrammeId);
571+
addOptionalReferences<AudioContentId>(node, "audioContentIDRef", tagGroup,
572+
tagGroupContentRefs_,
573+
&parseAudioContentId);
574+
addOptionalReferences<AudioObjectId>(node, "audioObjectIDRef", tagGroup,
575+
tagGroupObjectRefs_,
576+
&parseAudioObjectId);
570577

571578
resolveReferences(tagGroupProgrammeRefs_);
572579
resolveReferences(tagGroupContentRefs_);

‎src/private/rapidxml_formatter.cpp‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -796,9 +796,12 @@ namespace adm {
796796

797797
void formatTagGroup(XmlNode &node, const TagGroup &tagGroup) {
798798
node.addVectorElements<TTags>(&tagGroup, "tag", &formatTag);
799-
node.addReferences<AudioProgramme, AudioProgrammeId>(&tagGroup, "audioProgrammeIDRef");
800-
node.addReferences<AudioContent, AudioContentId>(&tagGroup, "audioContentIDRef");
801-
node.addReferences<AudioObject, AudioObjectId>(&tagGroup, "audioObjectIDRef");
799+
node.addReferences<AudioProgramme, AudioProgrammeId>(
800+
&tagGroup, "audioProgrammeIDRef");
801+
node.addReferences<AudioContent, AudioContentId>(&tagGroup,
802+
"audioContentIDRef");
803+
node.addReferences<AudioObject, AudioObjectId>(&tagGroup,
804+
"audioObjectIDRef");
802805
}
803806

804807
void formatTag(XmlNode &node, const TTag &tag) {

‎tests/tag_list_tests.cpp‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,22 @@ using namespace adm;
1212
using namespace adm_test;
1313

1414
TEST_CASE("Tag parameters") {
15-
TTag tag{
16-
TTagValue("value")
17-
};
15+
TTag tag{TTagValue("value")};
1816

19-
check_optional_param<TTagClass>(tag,
20-
canBeSetTo(TTagClass{"class2"}));
21-
check_required_param<TTagValue>(tag,
22-
hasDefaultOf(TTagValue{"value"}),
17+
check_optional_param<TTagClass>(tag, canBeSetTo(TTagClass{"class2"}));
18+
check_required_param<TTagValue>(tag, hasDefaultOf(TTagValue{"value"}),
2319
canBeSetTo(TTagValue{"value2"}));
2420
}
2521

2622
TEST_CASE("TagGroup parameters") {
2723
TagGroup tagGroup;
28-
TTag tag{
29-
TTagClass("class"),
30-
TTagValue("value")
31-
};
24+
TTag tag{TTagClass("class"), TTagValue("value")};
3225

3326
check_vector_param<TTags>(tagGroup, canBeSetTo(TTags{tag}));
3427
}
3528

3629
TEST_CASE("TagList parameters") {
37-
TTag tag{
38-
TTagClass("class"),
39-
TTagValue("value")
40-
};
30+
TTag tag{TTagClass("class"), TTagValue("value")};
4131

4232
TagGroup tagGroup;
4333
tagGroup.add(tag);

0 commit comments

Comments
 (0)