Skip to content

Commit a93d4dc

Browse files
author
Victor Ronchetti
committed
avdecc - apply clang formatting
1 parent 8624321 commit a93d4dc

File tree

254 files changed

+8088
-8160
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

254 files changed

+8088
-8160
lines changed

‎.clang-format

+93
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
---
2+
Language: Cpp
3+
AccessModifierOffset: -4
4+
AlignAfterOpenBracket: Align
5+
AlignConsecutiveAssignments: false
6+
AlignConsecutiveDeclarations: false
7+
AlignEscapedNewlinesLeft: false
8+
AlignOperands: true
9+
AlignTrailingComments: true
10+
AllowAllParametersOfDeclarationOnNextLine: true
11+
AllowShortBlocksOnASingleLine: false
12+
AllowShortCaseLabelsOnASingleLine: false
13+
AllowShortFunctionsOnASingleLine: All
14+
AllowShortIfStatementsOnASingleLine: false
15+
AllowShortLoopsOnASingleLine: false
16+
AlwaysBreakAfterDefinitionReturnType: None
17+
AlwaysBreakAfterReturnType: None
18+
AlwaysBreakBeforeMultilineStrings: false
19+
AlwaysBreakTemplateDeclarations: false
20+
BinPackArguments: true
21+
BinPackParameters: true
22+
BraceWrapping:
23+
AfterClass: true
24+
AfterControlStatement: true
25+
AfterEnum: true
26+
AfterFunction: true
27+
AfterNamespace: true
28+
AfterObjCDeclaration: true
29+
AfterStruct: true
30+
AfterUnion: false
31+
BeforeCatch: true
32+
BeforeElse: true
33+
IndentBraces: false
34+
BreakBeforeBinaryOperators: None
35+
BreakBeforeBraces: Allman
36+
BreakBeforeTernaryOperators: true
37+
BreakConstructorInitializersBeforeComma: false
38+
BreakAfterJavaFieldAnnotations: false
39+
BreakStringLiterals: true
40+
ColumnLimit: 0
41+
CommentPragmas: '^ IWYU pragma:'
42+
ConstructorInitializerAllOnOneLineOrOnePerLine: false
43+
ConstructorInitializerIndentWidth: 4
44+
ContinuationIndentWidth: 4
45+
Cpp11BracedListStyle: true
46+
DerivePointerAlignment: false
47+
DisableFormat: false
48+
ExperimentalAutoDetectBinPacking: false
49+
ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
50+
IncludeCategories:
51+
- Regex: '^"(llvm|llvm-c|clang|clang-c)/'
52+
Priority: 2
53+
- Regex: '^(<|"(gtest|isl|json)/)'
54+
Priority: 3
55+
- Regex: '.*'
56+
Priority: 1
57+
IncludeIsMainRegex: '$'
58+
IndentCaseLabels: false
59+
IndentWidth: 4
60+
IndentWrappedFunctionNames: false
61+
KeepEmptyLinesAtTheStartOfBlocks: true
62+
MacroBlockBegin: ''
63+
MacroBlockEnd: ''
64+
MaxEmptyLinesToKeep: 1
65+
NamespaceIndentation: Inner
66+
ObjCBlockIndentWidth: 2
67+
ObjCSpaceAfterProperty: false
68+
ObjCSpaceBeforeProtocolList: true
69+
PenaltyBreakBeforeFirstCallParameter: 19
70+
PenaltyBreakComment: 300
71+
PenaltyBreakFirstLessLess: 120
72+
PenaltyBreakString: 1000
73+
PenaltyExcessCharacter: 1000000
74+
PenaltyReturnTypeOnItsOwnLine: 60
75+
PointerAlignment: Middle
76+
ReflowComments: true
77+
SortIncludes: false
78+
SpaceAfterCStyleCast: false
79+
SpaceBeforeAssignmentOperators: true
80+
SpaceBeforeParens: ControlStatements
81+
SpaceInEmptyParentheses: false
82+
SpacesBeforeTrailingComments: 1
83+
SpacesInAngles: false
84+
SpacesInContainerLiterals: true
85+
SpacesInCStyleCastParentheses: false
86+
SpacesInParentheses: false
87+
SpacesInSquareBrackets: false
88+
Standard: Cpp11
89+
TabWidth: 8
90+
UseTab: Never
91+
JavaScriptQuotes: Leave
92+
...
93+

‎clang_format_style.sh

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/bin/bash
2+
3+
echo "clang format styling avdecc-lib..."
4+
clang-format -i -style=file controller/lib/include/*.h \
5+
controller/lib/src/*.h controller/lib/src/*.cpp \
6+
controller/lib/src/linux/*.h controller/lib/src/linux/*.cpp \
7+
controller/lib/src/msvc/*.h controller/lib/src/msvc/*.cpp \
8+
controller/lib/src/osx/*.h controller/lib/src/osx/*.cpp \
9+
controller/app/cmdline/src/*.h controller/app/cmdline/src/*.cpp
10+
echo "Done"

‎controller/app/cmdline/src/cli_argument.cpp

+19-23
Original file line numberDiff line numberDiff line change
@@ -37,27 +37,21 @@
3737
#include "cmd_line.h"
3838
#include "cli_argument.h"
3939

40-
cli_argument::cli_argument(cmd_line *cmd_line_ptr, const std::string name,
40+
cli_argument::cli_argument(cmd_line * cmd_line_ptr, const std::string name,
4141
const std::string help, const std::string hint,
4242
size_t match_min, size_t match_max)
43-
: m_cmd_line_ptr(cmd_line_ptr)
44-
, m_is_valid(false)
45-
, m_match_min(match_min)
46-
, m_match_max(match_max)
47-
, m_name(name)
48-
, m_help(help)
49-
, m_hint(hint)
43+
: m_cmd_line_ptr(cmd_line_ptr), m_is_valid(false), m_match_min(match_min), m_match_max(match_max), m_name(name), m_help(help), m_hint(hint)
5044
{
5145
// Format the indentation of the hint strings
5246
std::string::size_type pos = 0;
53-
while ((pos = m_hint.find("\n",pos)) != std::string::npos)
47+
while ((pos = m_hint.find("\n", pos)) != std::string::npos)
5448
{
5549
m_hint.replace(pos, 1, "\n ");
5650
pos += 1;
5751
}
5852
}
5953

60-
const std::string &cli_argument::get_name() const
54+
const std::string & cli_argument::get_name() const
6155
{
6256
return m_name;
6357
}
@@ -134,11 +128,12 @@ size_t cli_argument::get_match_max() const
134128
return m_match_max;
135129
}
136130

137-
cli_argument_int::cli_argument_int(cmd_line *cmd_line_ptr, const std::string name,
131+
cli_argument_int::cli_argument_int(cmd_line * cmd_line_ptr, const std::string name,
138132
const std::string help, const std::string hint,
139133
size_t match_min, size_t match_max)
140134
: cli_argument(cmd_line_ptr, name, help + " (type int)", hint, match_min, match_max)
141-
{}
135+
{
136+
}
142137

143138
void cli_argument_int::clear()
144139
{
@@ -162,7 +157,7 @@ bool cli_argument_int::set_value(std::string value_str)
162157
return false;
163158
}
164159

165-
void cli_argument_int::get_completion_options(std::set<std::string> &options)
160+
void cli_argument_int::get_completion_options(std::set<std::string> & options)
166161
{
167162
// Do nothing
168163
}
@@ -183,11 +178,12 @@ std::vector<int> cli_argument_int::get_all_value_int() const
183178
return m_values;
184179
}
185180

186-
cli_argument_end_station::cli_argument_end_station(cmd_line *cmd_line_ptr, const std::string name,
181+
cli_argument_end_station::cli_argument_end_station(cmd_line * cmd_line_ptr, const std::string name,
187182
const std::string help, const std::string hint,
188183
size_t match_min, size_t match_max)
189184
: cli_argument(cmd_line_ptr, name, help + " (index as int or Entity ID)", hint, match_min, match_max)
190-
{}
185+
{
186+
}
191187

192188
void cli_argument_end_station::clear()
193189
{
@@ -210,15 +206,15 @@ bool cli_argument_end_station::set_value(std::string value_str)
210206
return false;
211207
}
212208

213-
void cli_argument_end_station::get_completion_options(std::set<std::string> &options)
209+
void cli_argument_end_station::get_completion_options(std::set<std::string> & options)
214210
{
215-
avdecc_lib::controller *controller = m_cmd_line_ptr->get_controller();
211+
avdecc_lib::controller * controller = m_cmd_line_ptr->get_controller();
216212

217213
for (size_t i = 0; i < controller->get_end_station_count(); i++)
218214
{
219215
char entity_id_str[20];
220-
avdecc_lib::end_station *end_station = controller->get_end_station_by_index(i);
221-
sprintf(entity_id_str, "0x%" PRIx64, end_station->entity_id());
216+
avdecc_lib::end_station * end_station = controller->get_end_station_by_index(i);
217+
sprintf(entity_id_str, "0x%" PRIx64, end_station->entity_id());
222218
options.insert(std::string(entity_id_str));
223219
}
224220
}
@@ -239,11 +235,12 @@ std::vector<uint32_t> cli_argument_end_station::get_all_value_uint() const
239235
return m_values;
240236
}
241237

242-
cli_argument_string::cli_argument_string(cmd_line *cmd_line_ptr, const std::string name,
238+
cli_argument_string::cli_argument_string(cmd_line * cmd_line_ptr, const std::string name,
243239
const std::string help, const std::string hint,
244240
size_t match_min, size_t match_max)
245241
: cli_argument(cmd_line_ptr, name, help + " (type string)", hint, match_min, match_max)
246-
{}
242+
{
243+
}
247244

248245
void cli_argument_string::clear()
249246
{
@@ -262,7 +259,7 @@ bool cli_argument_string::set_value(std::string value_str)
262259
return false;
263260
}
264261

265-
void cli_argument_string::get_completion_options(std::set<std::string> &options)
262+
void cli_argument_string::get_completion_options(std::set<std::string> & options)
266263
{
267264
// Do nothing
268265
}
@@ -282,4 +279,3 @@ std::vector<std::string> cli_argument_string::get_all_value_str() const
282279
{
283280
return m_values;
284281
}
285-

‎controller/app/cmdline/src/cli_argument.h

+17-18
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ class cmd_line;
4444
class cli_argument
4545
{
4646
public:
47-
cli_argument(cmd_line *cmd_ptr, const std::string name, const std::string help, const std::string hint,
47+
cli_argument(cmd_line * cmd_ptr, const std::string name, const std::string help, const std::string hint,
4848
size_t match_min, size_t match_max);
49-
virtual ~cli_argument() {};
49+
virtual ~cli_argument(){};
5050

51-
const std::string &get_name() const;
51+
const std::string & get_name() const;
5252

5353
virtual void clear() = 0;
5454
virtual bool set_value(std::string value_str) = 0;
55-
virtual void get_completion_options(std::set<std::string> &options) = 0;
55+
virtual void get_completion_options(std::set<std::string> & options) = 0;
5656

5757
///
5858
/// The get_ functions return the first matching value.
@@ -76,7 +76,7 @@ class cli_argument
7676
size_t get_match_max() const;
7777

7878
protected:
79-
cmd_line *m_cmd_line_ptr;
79+
cmd_line * m_cmd_line_ptr;
8080
bool m_is_valid;
8181
size_t m_match_min;
8282
size_t m_match_max;
@@ -88,13 +88,13 @@ class cli_argument
8888
class cli_argument_int : public cli_argument
8989
{
9090
public:
91-
cli_argument_int(cmd_line *cmd_ptr, const std::string name, const std::string help, const std::string hint="",
92-
size_t match_min=1, size_t match_max=1);
93-
virtual ~cli_argument_int() {};
91+
cli_argument_int(cmd_line * cmd_ptr, const std::string name, const std::string help, const std::string hint = "",
92+
size_t match_min = 1, size_t match_max = 1);
93+
virtual ~cli_argument_int(){};
9494

9595
virtual void clear();
9696
virtual bool set_value(std::string value_str);
97-
virtual void get_completion_options(std::set<std::string> &options);
97+
virtual void get_completion_options(std::set<std::string> & options);
9898

9999
virtual int get_value_int() const;
100100

@@ -108,13 +108,13 @@ class cli_argument_int : public cli_argument
108108
class cli_argument_end_station : public cli_argument
109109
{
110110
public:
111-
cli_argument_end_station(cmd_line *cmd_ptr, const std::string name, const std::string help, const std::string hint="",
112-
size_t match_min=1, size_t match_max=1);
113-
virtual ~cli_argument_end_station() {};
111+
cli_argument_end_station(cmd_line * cmd_ptr, const std::string name, const std::string help, const std::string hint = "",
112+
size_t match_min = 1, size_t match_max = 1);
113+
virtual ~cli_argument_end_station(){};
114114

115115
virtual void clear();
116116
virtual bool set_value(std::string value_str);
117-
virtual void get_completion_options(std::set<std::string> &options);
117+
virtual void get_completion_options(std::set<std::string> & options);
118118

119119
virtual uint32_t get_value_uint() const;
120120

@@ -128,13 +128,13 @@ class cli_argument_end_station : public cli_argument
128128
class cli_argument_string : public cli_argument
129129
{
130130
public:
131-
cli_argument_string(cmd_line *cmd_ptr, const std::string name, const std::string help, const std::string hint="",
132-
size_t match_min=1, size_t match_max=1);
133-
virtual ~cli_argument_string() {};
131+
cli_argument_string(cmd_line * cmd_ptr, const std::string name, const std::string help, const std::string hint = "",
132+
size_t match_min = 1, size_t match_max = 1);
133+
virtual ~cli_argument_string(){};
134134

135135
virtual void clear();
136136
virtual bool set_value(std::string value_str);
137-
virtual void get_completion_options(std::set<std::string> &options);
137+
virtual void get_completion_options(std::set<std::string> & options);
138138

139139
virtual std::string get_value_str() const;
140140

@@ -144,4 +144,3 @@ class cli_argument_string : public cli_argument
144144
private:
145145
std::vector<std::string> m_values;
146146
};
147-

0 commit comments

Comments
 (0)