Skip to content

Commit bd7b305

Browse files
stuqdogstuqdog
authored
RSDK-2518 - Sort headers (#62)
1 parent 2b3948e commit bd7b305

Some content is hidden

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

64 files changed

+314
-219
lines changed

‎.clang-format

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,23 @@ BinPackParameters: false
77
ColumnLimit: 100
88
Cpp11BracedListStyle: true
99
DerivePointerAlignment: false
10+
IncludeBlocks: Preserve
11+
IncludeCategories:
12+
- Regex: '<.*>'
13+
Priority: 1
14+
SortPriority: 0
15+
- Regex: '^(<|"(boost|google|grpc)/)'
16+
Priority: 3
17+
SortPriority: 0
18+
- Regex: '.*'
19+
Priority: 1
20+
SortPriority: 0
21+
IncludeIsMainRegex: '(Test)?$'
22+
IncludeIsMainSourceRegex: ''
1023
IndentWidth: 4
1124
MaxEmptyLinesToKeep: 1
1225
NamespaceIndentation: None
26+
SortIncludes: true
1327
SpaceBeforeAssignmentOperators: true
1428
Standard: Cpp11
15-
SortIncludes: false
1629
UseTab: Never

‎src/common/proto_type.cpp

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
#include <google/protobuf/struct.pb.h>
1+
#include <common/proto_type.hpp>
2+
3+
#include <memory>
4+
#include <unordered_map>
5+
#include <vector>
26

37
#include <boost/blank.hpp>
48
#include <boost/variant/get.hpp>
59
#include <boost/variant/variant.hpp>
6-
#include <common/proto_type.hpp>
10+
#include <google/protobuf/struct.pb.h>
11+
712
#include <config/resource.hpp>
8-
#include <memory>
9-
#include <unordered_map>
10-
#include <vector>
1113

1214
using google::protobuf::Struct;
1315
using google::protobuf::Value;

‎src/common/proto_type.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#pragma once
22

3-
#include <google/protobuf/struct.pb.h>
3+
#include <unordered_map>
44

55
#include <boost/variant/variant.hpp>
6-
#include <unordered_map>
6+
#include <google/protobuf/struct.pb.h>
77

88
class ProtoType {
99
public:

‎src/common/utils.cpp

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
1-
#include <common/v1/common.pb.h>
1+
#include <common/utils.hpp>
2+
3+
#include <tuple>
4+
#include <unordered_map>
5+
#include <vector>
26

37
#include <boost/blank.hpp>
48
#include <boost/optional/optional.hpp>
59
#include <boost/variant/get.hpp>
610
#include <boost/variant/variant.hpp>
7-
#include <common/utils.hpp>
11+
12+
#include <common/v1/common.pb.h>
13+
814
#include <components/component_base.hpp>
915
#include <registry/registry.hpp>
10-
#include <tuple>
11-
#include <unordered_map>
12-
#include <vector>
1316

1417
using viam::common::v1::ResourceName;
1518

‎src/common/utils.hpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
#pragma once
22

3-
#include <common/v1/common.pb.h>
3+
#include <unordered_map>
44

55
#include <boost/optional/optional.hpp>
66
#include <boost/variant/get.hpp>
77
#include <boost/variant/variant.hpp>
8+
9+
#include <common/v1/common.pb.h>
10+
811
#include <common/proto_type.hpp>
912
#include <components/component_base.hpp>
10-
#include <unordered_map>
1113

1214
using viam::common::v1::ResourceName;
1315
const std::string COMPONENT = "component";

‎src/components/camera/camera.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#include <components/camera/camera.hpp>
2+
3+
#include <google/protobuf/descriptor.h>
4+
25
#include <component/camera/v1/camera.grpc.pb.h>
36
#include <component/camera/v1/camera.pb.h>
4-
#include <google/protobuf/descriptor.h>
57

68
#include <common/utils.hpp>
79
#include <components/camera/client.hpp>

‎src/components/camera/camera.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
#pragma once
22

3+
#include <bitset>
4+
#include <string>
5+
#include <vector>
6+
37
#include <component/camera/v1/camera.pb.h>
48

5-
#include <bitset>
9+
#include <common/proto_type.hpp>
610
#include <common/utils.hpp>
711
#include <config/resource.hpp>
812
#include <registry/registry.hpp>
9-
#include <string>
10-
#include <vector>
11-
12-
#include "common/proto_type.hpp"
13-
#include "subtype/subtype.hpp"
13+
#include <subtype/subtype.hpp>
1414

1515
class CameraSubtype : public ResourceSubtype {
1616
public:

‎src/components/camera/client.cpp

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
#include <algorithm>
2-
#include <common/utils.hpp>
3-
#include <components/camera/camera.hpp>
41
#include <components/camera/client.hpp>
5-
#include <config/resource.hpp>
2+
3+
#include <algorithm>
64
#include <string>
75
#include <utility>
86

9-
#include "common/v1/common.pb.h"
10-
#include "component/camera/v1/camera.grpc.pb.h"
7+
#include <common/v1/common.pb.h>
8+
#include <component/camera/v1/camera.grpc.pb.h>
9+
10+
#include <common/utils.hpp>
11+
#include <components/camera/camera.hpp>
12+
#include <config/resource.hpp>
1113

1214
std::string normalize_mime_type(const std::string& str) {
1315
std::string mime_type = str;

‎src/components/camera/client.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#pragma once
22

3-
#include <component/camera/v1/camera.grpc.pb.h>
43
#include <grpcpp/channel.h>
54

5+
#include <component/camera/v1/camera.grpc.pb.h>
6+
67
#include <components/camera/camera.hpp>
78
#include <components/camera/server.hpp>
89
#include <config/resource.hpp>

‎src/components/camera/server.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#include <components/camera/server.hpp>
2-
#include <gen/google/api/http.pb.h>
32

43
#include <common/utils.hpp>
54
#include <components/camera/camera.hpp>

‎src/components/camera/server.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
#include <common/v1/common.pb.h>
44
#include <component/camera/v1/camera.grpc.pb.h>
5-
#include <gen/google/api/http.pb.h>
65

76
#include <resource/resource_server_base.hpp>
87
#include <subtype/subtype.hpp>

‎src/components/component_base.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
#include <common/v1/common.pb.h>
1+
#include <components/component_base.hpp>
2+
3+
#include <string>
4+
25
#include <google/protobuf/struct.pb.h>
36

7+
#include <common/v1/common.pb.h>
8+
49
#include <common/utils.hpp>
5-
#include <components/component_base.hpp>
610
#include <resource/resource_base.hpp>
7-
#include <string>
811

912
using viam::common::v1::ResourceName;
1013

‎src/components/component_base.hpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
#pragma once
22

3-
#include <common/v1/common.pb.h>
3+
#include <string>
4+
45
#include <google/protobuf/struct.pb.h>
56

7+
#include <common/v1/common.pb.h>
8+
69
#include <components/component_type.hpp>
710
#include <resource/resource_base.hpp>
8-
#include <string>
11+
912
class ComponentBase : public ResourceBase {
1013
public:
1114
ComponentType type;

‎src/components/generic/client.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
#include <common/proto_type.hpp>
21
#include <components/generic/client.hpp>
3-
#include <config/resource.hpp>
2+
43
#include <utility>
54

6-
#include "common/v1/common.pb.h"
7-
#include "component/generic/v1/generic.grpc.pb.h"
5+
#include <common/v1/common.pb.h>
6+
#include <component/generic/v1/generic.grpc.pb.h>
7+
8+
#include <common/proto_type.hpp>
9+
#include <config/resource.hpp>
810

911
AttributeMap GenericClient::do_command(AttributeMap command) {
1012
viam::common::v1::DoCommandRequest req;

‎src/components/generic/client.hpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
#include <component/generic/v1/generic.grpc.pb.h>
1+
#pragma once
2+
23
#include <grpcpp/channel.h>
34

5+
#include <component/generic/v1/generic.grpc.pb.h>
6+
47
#include <components/generic/generic.hpp>
58

69
class GenericClient : public Generic {

‎src/components/generic/generic.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
#include <component/generic/v1/generic.grpc.pb.h>
2-
#include <component/generic/v1/generic.pb.h>
1+
#include <components/generic/generic.hpp>
2+
3+
#include <stdexcept>
4+
35
#include <google/protobuf/descriptor.h>
46

7+
#include <component/generic/v1/generic.grpc.pb.h>
8+
59
#include <common/utils.hpp>
610
#include <components/generic/client.hpp>
7-
#include <components/generic/generic.hpp>
811
#include <components/generic/server.hpp>
912
#include <registry/registry.hpp>
1013
#include <resource/resource.hpp>
11-
#include <stdexcept>
1214

1315
std::shared_ptr<ResourceServerBase> GenericSubtype::create_resource_server(
1416
std::shared_ptr<SubtypeService> svc) {

‎src/components/generic/generic.hpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
#pragma once
22

3+
#include <google/protobuf/descriptor.h>
4+
5+
#include <common/proto_type.hpp>
36
#include <common/utils.hpp>
47
#include <config/resource.hpp>
58
#include <registry/registry.hpp>
6-
7-
#include "common/proto_type.hpp"
8-
#include "subtype/subtype.hpp"
9+
#include <subtype/subtype.hpp>
910

1011
// TODO(RSDK-1742): one class per header
1112
class GenericSubtype : public ResourceSubtype {

‎src/components/generic/server.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
#include <components/generic/generic.hpp>
21
#include <components/generic/server.hpp>
2+
3+
#include <components/generic/generic.hpp>
34
#include <rpc/server.hpp>
45

56
::grpc::Status GenericServer::DoCommand(::grpc::ServerContext* context,

‎src/config/resource.cpp

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
1+
#include <config/resource.hpp>
2+
3+
#include <numeric>
4+
#include <string>
5+
#include <unordered_map>
6+
7+
#include <boost/algorithm/string.hpp>
8+
19
#include <app/v1/robot.pb.h>
210
#include <robot/v1/robot.pb.h>
311

4-
#include <boost/algorithm/string.hpp>
512
#include <common/proto_type.hpp>
613
#include <common/utils.hpp>
7-
#include <config/resource.hpp>
8-
#include <numeric>
914
#include <referenceframe/frame.hpp>
1015
#include <resource/resource.hpp>
11-
#include <string>
12-
#include <unordered_map>
1316

1417
Name Resource::resource_name() {
1518
try {

‎src/config/resource.hpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
#pragma once
22

3+
#include <string>
4+
#include <unordered_map>
5+
36
#include <app/v1/robot.pb.h>
47
#include <robot/v1/robot.pb.h>
58

69
#include <common/proto_type.hpp>
710
#include <referenceframe/frame.hpp>
811
#include <resource/resource.hpp>
9-
#include <string>
10-
#include <unordered_map>
1112

1213
typedef std::shared_ptr<std::unordered_map<std::string, std::shared_ptr<ProtoType>>> AttributeMap;
1314

‎src/module/handler_map.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1+
#include <module/handler_map.hpp>
2+
13
#include <memory>
24

3-
#include "google/protobuf/descriptor.h"
4-
#define BOOST_LOG_DYN_LINK 1
5+
#include <boost/log/trivial.hpp>
6+
#include <google/protobuf/descriptor.h>
7+
58
#include <common/v1/common.pb.h>
69
#include <module/v1/module.pb.h>
710
#include <robot/v1/robot.pb.h>
811

9-
#include <boost/log/trivial.hpp>
10-
#include <module/handler_map.hpp>
1112
#include <resource/resource.hpp>
1213

1314
viam::module::v1::HandlerMap HandlerMap_::to_proto() {

‎src/module/module.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
#include <grpcpp/channel.h>
2-
#include <grpcpp/security/credentials.h>
1+
#include <module/module.hpp>
32

4-
#include "subtype/subtype.hpp"
5-
#define BOOST_LOG_DYN_LINK 1
3+
#include <boost/log/trivial.hpp>
4+
#include <grpcpp/channel.h>
65
#include <grpcpp/create_channel.h>
6+
#include <grpcpp/security/credentials.h>
77

8-
#include <boost/log/trivial.hpp>
9-
#include <module/module.hpp>
8+
#include <subtype/subtype.hpp>
109

1110
Module::Module(std::string addr) : addr(addr){};
1211

0 commit comments

Comments
 (0)