Bläddra i källkod

Camel case fix

Murat Dogan 5 år sedan
förälder
incheckning
6173d18da4
3 ändrade filer med 28 tillägg och 28 borttagningar
  1. 2 2
      include/rtc/candidate.hpp
  2. 18 18
      src/candidate.cpp
  3. 8 8
      src/icetransport.cpp

+ 2 - 2
include/rtc/candidate.hpp

@@ -26,8 +26,8 @@
 namespace rtc {
 
 #if not USE_JUICE
-enum class CandidateType { HOST = 0, SERVER_REFLEXIVE, PEER_REFLEXIVE, RELAYED };
-enum class CandidateTransportType { UDP = 0, TCP_ACTIVE, TCP_PASSIVE, TCP_SO };
+enum class CandidateType { Host = 0, ServerReflexive, PeerReflexive, Relayed };
+enum class CandidateTransportType { Udp = 0, TcpActive, TcpPassive, TcpSo };
 struct CandidateInfo {
 	string address;
 	int port;

+ 18 - 18
src/candidate.cpp

@@ -135,31 +135,31 @@ std::ostream &operator<<(std::ostream &out, const rtc::Candidate &candidate) {
 #if not USE_JUICE
 std::ostream &operator<<(std::ostream &out, const rtc::CandidateType &type) {
 	switch (type) {
-	case rtc::CandidateType::HOST:
-		return out << "HOST";
-	case rtc::CandidateType::PEER_REFLEXIVE:
-		return out << "PEER_REFLEXIVE";
-	case rtc::CandidateType::RELAYED:
-		return out << "RELAYED";
-	case rtc::CandidateType::SERVER_REFLEXIVE:
-		return out << "SERVER_REFLEXIVE";
+	case rtc::CandidateType::Host:
+		return out << "Host";
+	case rtc::CandidateType::PeerReflexive:
+		return out << "PeerReflexive";
+	case rtc::CandidateType::Relayed:
+		return out << "Relayed";
+	case rtc::CandidateType::ServerReflexive:
+		return out << "ServerReflexive";
 	default:
-		return out << "UNKOWN";
+		return out << "Unknown";
 	}
 }
 
 std::ostream &operator<<(std::ostream &out, const rtc::CandidateTransportType &transportType) {
 	switch (transportType) {
-	case rtc::CandidateTransportType::TCP_ACTIVE:
-		return out << "TCP_ACTIVE";
-	case rtc::CandidateTransportType::TCP_PASSIVE:
-		return out << "TCP_PASSIVE";
-	case rtc::CandidateTransportType::TCP_SO:
-		return out << "TCP_SO";
-	case rtc::CandidateTransportType::UDP:
-		return out << "UDP";
+	case rtc::CandidateTransportType::TcpActive:
+		return out << "TcpActive";
+	case rtc::CandidateTransportType::TcpPassive:
+		return out << "TcpPassive";
+	case rtc::CandidateTransportType::TcpSo:
+		return out << "TcpSo";
+	case rtc::CandidateTransportType::Udp:
+		return out << "Udp";
 	default:
-		return out << "UNKOWN";
+		return out << "Unknown";
 	}
 }
 #endif

+ 8 - 8
src/icetransport.cpp

@@ -684,26 +684,26 @@ bool IceTransport::getSelectedCandidatePair(CandidateInfo *localInfo, CandidateI
 const CandidateType IceTransport::NiceTypeToCandidateType(NiceCandidateType type) {
 	switch (type) {
 	case NiceCandidateType::NICE_CANDIDATE_TYPE_HOST:
-		return CandidateType::HOST;
+		return CandidateType::Host;
 	case NiceCandidateType::NICE_CANDIDATE_TYPE_PEER_REFLEXIVE:
-		return CandidateType::PEER_REFLEXIVE;
+		return CandidateType::PeerReflexive;
 	case NiceCandidateType::NICE_CANDIDATE_TYPE_RELAYED:
-		return CandidateType::RELAYED;
+		return CandidateType::Relayed;
 	case NiceCandidateType::NICE_CANDIDATE_TYPE_SERVER_REFLEXIVE:
-		return CandidateType::SERVER_REFLEXIVE;
+		return CandidateType::ServerReflexive;
 	}
 }
 
 const CandidateTransportType IceTransport::NiceTransportTypeToCandidateTransportType(NiceCandidateTransport type) {
 	switch (type) {
 	case NiceCandidateTransport::NICE_CANDIDATE_TRANSPORT_TCP_ACTIVE:
-		return CandidateTransportType::TCP_ACTIVE;
+		return CandidateTransportType::TcpActive;
 	case NiceCandidateTransport::NICE_CANDIDATE_TRANSPORT_TCP_PASSIVE:
-		return CandidateTransportType::TCP_PASSIVE;
+		return CandidateTransportType::TcpPassive;
 	case NiceCandidateTransport::NICE_CANDIDATE_TRANSPORT_TCP_SO:
-		return CandidateTransportType::TCP_SO;
+		return CandidateTransportType::TcpSo;
 	case NiceCandidateTransport::NICE_CANDIDATE_TRANSPORT_UDP:
-		return CandidateTransportType::UDP;
+		return CandidateTransportType::Udp;
 	}
 }