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
814namespace 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
3439nlohmann::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
4953void SignalingCandidate::setSdpMid (const std::string& mid) { sdpMid = mid; }
5054void 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
9297SignalingDescription WebrtcSignalingMessage::getDescription () const {
93- return *( description_. get ()) ;
98+ return *description_;
9499}
95100SignalingCandidate WebrtcSignalingMessage::getCandidate () const {
96- return *( candidate_. get ()) ;
101+ return *candidate_;
97102}
98103
99104WebrtcSignalingMessage 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