From d218e7923c7e9d4b294d095bfdf352b9c8b8b53b Mon Sep 17 00:00:00 2001
From: Paul-Louis Ageneau <paul-louis@ageneau.org>
Date: Fri, 4 Jun 2021 11:28:19 +0200
Subject: [PATCH] Cleaned up std:: prefix where possible

---
 include/rtc/description.hpp | 20 ++++++++------------
 src/description.cpp         |  8 ++++----
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/include/rtc/description.hpp b/include/rtc/description.hpp
index a6049d1..e8a94fe 100644
--- a/include/rtc/description.hpp
+++ b/include/rtc/description.hpp
@@ -144,11 +144,11 @@ public:
 
 		void removeFormat(const string &fmt);
 
-		void addSSRC(uint32_t ssrc, optional<string> name,
-					 optional<string> msid = nullopt, optional<string> trackID = nullopt);
+		void addSSRC(uint32_t ssrc, optional<string> name, optional<string> msid = nullopt,
+		             optional<string> trackID = nullopt);
 		void removeSSRC(uint32_t oldSSRC);
 		void replaceSSRC(uint32_t oldSSRC, uint32_t ssrc, optional<string> name,
-						 optional<string> msid = nullopt, optional<string> trackID = nullopt);
+		                 optional<string> msid = nullopt, optional<string> trackID = nullopt);
 		bool hasSSRC(uint32_t ssrc);
 		std::vector<uint32_t> getSSRCs();
 		std::optional<std::string> getCNameForSsrc(uint32_t ssrc);
@@ -199,29 +199,25 @@ public:
 
 		std::map<int, RTPMap> mRtpMap;
 		std::vector<uint32_t> mSsrcs;
-        std::map<uint32_t, string> mCNameMap;
+		std::map<uint32_t, string> mCNameMap;
 	};
 
 	class RTC_CPP_EXPORT Audio : public Media {
 	public:
 		Audio(string mid = "audio", Direction dir = Direction::SendOnly);
 
-		void addAudioCodec(int payloadType, string codec,
-		                   optional<string> profile = std::nullopt);
+		void addAudioCodec(int payloadType, string codec, optional<string> profile = std::nullopt);
 
-		void addOpusCodec(int payloadType,
-		                  optional<string> profile = DEFAULT_OPUS_AUDIO_PROFILE);
+		void addOpusCodec(int payloadType, optional<string> profile = DEFAULT_OPUS_AUDIO_PROFILE);
 	};
 
 	class RTC_CPP_EXPORT Video : public Media {
 	public:
 		Video(string mid = "video", Direction dir = Direction::SendOnly);
 
-		void addVideoCodec(int payloadType, string codec,
-		                   optional<string> profile = std::nullopt);
+		void addVideoCodec(int payloadType, string codec, optional<string> profile = std::nullopt);
 
-		void addH264Codec(int payloadType,
-		                  optional<string> profile = DEFAULT_H264_VIDEO_PROFILE);
+		void addH264Codec(int payloadType, optional<string> profile = DEFAULT_H264_VIDEO_PROFILE);
 		void addVP8Codec(int payloadType);
 		void addVP9Codec(int payloadType);
 	};
diff --git a/src/description.cpp b/src/description.cpp
index 9c9d975..4702f39 100644
--- a/src/description.cpp
+++ b/src/description.cpp
@@ -870,7 +870,7 @@ void Description::Media::parseSdpLine(string_view line) {
 				mSsrcs.emplace_back(ssrc);
 			}
 			auto cnamePos = value.find("cname:");
-			if (cnamePos != std::string::npos) {
+			if (cnamePos != string::npos) {
 				auto cname = value.substr(cnamePos + 6);
 				mCNameMap.emplace(ssrc, cname);
 			}
@@ -891,12 +891,12 @@ void Description::Media::addRTPMap(const Description::Media::RTPMap &map) {
 
 std::vector<uint32_t> Description::Media::getSSRCs() { return mSsrcs; }
 
-std::optional<std::string> Description::Media::getCNameForSsrc(uint32_t ssrc) {
+optional<string> Description::Media::getCNameForSsrc(uint32_t ssrc) {
 	auto it = mCNameMap.find(ssrc);
 	if (it != mCNameMap.end()) {
 		return it->second;
 	}
-	return std::nullopt;
+	return nullopt;
 }
 
 std::map<int, Description::Media::RTPMap>::iterator Description::Media::beginMaps() {
@@ -1000,7 +1000,7 @@ string Description::typeToString(Type type) {
 } // namespace rtc
 
 std::ostream &operator<<(std::ostream &out, const rtc::Description &description) {
-	return out << std::string(description);
+	return out << string(description);
 }
 
 std::ostream &operator<<(std::ostream &out, rtc::Description::Type type) {