Skip to content

Commit b6a4c1a

Browse files
author
Thomas
committed
fix linting
1 parent d5c6c2b commit b6a4c1a

File tree

3 files changed

+24
-18
lines changed

3 files changed

+24
-18
lines changed

sdk/.clang-tidy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,4 @@ HeaderFilterRegex: '.*'
2525

2626
CheckOptions:
2727
readability-function-cognitive-complexity.IgnoreMacros: true
28+
misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic: true

sdk/src/signaling_util/message_transport/include/nabto/webrtc/util/message_transport.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class SignalingDescription {
7070
* @param descType type of the description, typically "offer" or "answer"
7171
* @param descSdp SDP representation of the description.
7272
*/
73-
SignalingDescription(const std::string& descType, const std::string& descSdp);
73+
SignalingDescription(std::string descType, std::string descSdp);
7474

7575
/**
7676
* Convert the description to JSON format following the network protocol.
@@ -101,7 +101,7 @@ class SignalingCandidate {
101101
*
102102
* @param cand The string representation of the candidate.
103103
*/
104-
SignalingCandidate(const std::string& cand);
104+
explicit SignalingCandidate(std::string cand);
105105

106106
/**
107107
* Set the optional SDP MID value of a candidate.
@@ -146,7 +146,7 @@ class SignalingCandidate {
146146
* Optional SDP M Line Index of the candidate. If this is `<0` it means the
147147
* value does not exist.
148148
*/
149-
int sdpMLineIndex;
149+
int sdpMLineIndex{-1};
150150

151151
/**
152152
* Optional Username Fragment of the candidate. If this is empty, it means the
@@ -179,14 +179,14 @@ class WebrtcSignalingMessage {
179179
*
180180
* @param description The description to construct with.
181181
*/
182-
WebrtcSignalingMessage(SignalingDescription description);
182+
explicit WebrtcSignalingMessage(const SignalingDescription& description);
183183

184184
/**
185185
* Construct a WebRTC Signaling message from a SignalingCandidate.
186186
*
187187
* @param candidate The candidate to construct with.
188188
*/
189-
WebrtcSignalingMessage(SignalingCandidate candidate);
189+
explicit WebrtcSignalingMessage(const SignalingCandidate& candidate);
190190

191191
/**
192192
* Check if the message is a SignalingDescription.

sdk/src/signaling_util/message_transport/src/message_transport.cpp

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
#include <nabto/webrtc/device.hpp>
44
#include <nabto/webrtc/util/message_transport.hpp>
55

6+
#include <nlohmann/json.hpp>
7+
#include <nlohmann/json_fwd.hpp>
8+
9+
#include <memory>
10+
#include <stdexcept>
11+
#include <string>
612
#include <utility>
713

814
namespace nabto {
@@ -25,11 +31,10 @@ MessageTransportPtr MessageTransportFactory::createNoneTransport(
2531
}
2632

2733
// SIGNALING DESCRIPTION START
28-
SignalingDescription::SignalingDescription(const std::string& descType,
29-
const std::string& descSdp) {
30-
type = descType;
31-
sdp = descSdp;
32-
}
34+
// NOLINTNEXTLINE(bugprone-easily-swappable-parameters)
35+
SignalingDescription::SignalingDescription(std::string descType,
36+
std::string descSdp)
37+
: type(std::move(descType)), sdp(std::move(descSdp)) {}
3338

3439
nlohmann::json SignalingDescription::toJson() {
3540
nlohmann::json desc = {{"type", type}, {"sdp", sdp}};
@@ -42,9 +47,8 @@ nlohmann::json SignalingDescription::toJson() {
4247
}
4348

4449
// SIGNALING CANDIDATE START
45-
SignalingCandidate::SignalingCandidate(const std::string& cand) {
46-
candidate = cand;
47-
}
50+
SignalingCandidate::SignalingCandidate(std::string cand)
51+
: candidate(std::move(cand)) {}
4852

4953
void SignalingCandidate::setSdpMid(const std::string& mid) { sdpMid = mid; }
5054
void SignalingCandidate::setSdpMLineIndex(int index) { sdpMLineIndex = index; }
@@ -74,10 +78,11 @@ nlohmann::json SignalingCandidate::toJson() {
7478

7579
// SIGNALING MESSAGE START
7680

77-
WebrtcSignalingMessage::WebrtcSignalingMessage(SignalingDescription desc) {
81+
WebrtcSignalingMessage::WebrtcSignalingMessage(
82+
const SignalingDescription& desc) {
7883
description_ = std::make_unique<SignalingDescription>(desc);
7984
}
80-
WebrtcSignalingMessage::WebrtcSignalingMessage(SignalingCandidate cand) {
85+
WebrtcSignalingMessage::WebrtcSignalingMessage(const SignalingCandidate& cand) {
8186
candidate_ = std::make_unique<SignalingCandidate>(cand);
8287
}
8388

@@ -90,10 +95,10 @@ bool WebrtcSignalingMessage::isCandidate() const {
9095
}
9196

9297
SignalingDescription WebrtcSignalingMessage::getDescription() const {
93-
return *(description_.get());
98+
return *description_;
9499
}
95100
SignalingCandidate WebrtcSignalingMessage::getCandidate() const {
96-
return *(candidate_.get());
101+
return *candidate_;
97102
}
98103

99104
WebrtcSignalingMessage WebrtcSignalingMessage::fromJson(
@@ -102,7 +107,7 @@ WebrtcSignalingMessage WebrtcSignalingMessage::fromJson(
102107
if (type == "DESCRIPTION") {
103108
auto descType = jsonMessage.at("description").at("type").get<std::string>();
104109
auto sdp = jsonMessage.at("description").at("sdp").get<std::string>();
105-
SignalingDescription desc(descType, sdp);
110+
const SignalingDescription desc(descType, sdp);
106111
return WebrtcSignalingMessage(desc);
107112
}
108113
if (type == "CANDIDATE") {

0 commit comments

Comments
 (0)