From e4dd048ca0ca00c3f97f4387c3459a668990b91a Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Tue, 10 Oct 2017 13:35:11 +0200
Subject: [PATCH] fix(Address): remove equal method

---
 src/address/address.cpp              | 6 +-----
 src/address/address.h                | 1 -
 src/conference/conference.cpp        | 2 +-
 src/conference/local-conference.cpp  | 2 +-
 src/conference/remote-conference.cpp | 2 +-
 5 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/address/address.cpp b/src/address/address.cpp
index 3220bbc58..1be60feb0 100644
--- a/src/address/address.cpp
+++ b/src/address/address.cpp
@@ -65,7 +65,7 @@ Address &Address::operator= (const Address &src) {
 }
 
 bool Address::operator== (const Address &address) const {
-	return equal(address);
+	return asString() == address.asString();
 }
 
 bool Address::operator!= (const Address &address) const {
@@ -251,10 +251,6 @@ string Address::asStringUriOnly () const {
 	return out;
 }
 
-bool Address::equal (const Address &address) const {
-	return asString() == address.asString();
-}
-
 bool Address::weakEqual (const Address &address) const {
 	return getUsername() == address.getUsername() &&
 				 getDomain() == address.getDomain() &&
diff --git a/src/address/address.h b/src/address/address.h
index ffd32fc5e..b765067d3 100644
--- a/src/address/address.h
+++ b/src/address/address.h
@@ -82,7 +82,6 @@ public:
 	std::string asString () const;
 	std::string asStringUriOnly () const;
 
-	bool equal (const Address &address) const;
 	bool weakEqual (const Address &address) const;
 
 	const std::string &getHeaderValue (const std::string &headerName) const;
diff --git a/src/conference/conference.cpp b/src/conference/conference.cpp
index 9673f2658..1ed57424e 100644
--- a/src/conference/conference.cpp
+++ b/src/conference/conference.cpp
@@ -193,7 +193,7 @@ bool Conference::isMe (const Address &addr) const {
 	cleanedMe.setPort(0);
 	Address cleanedAddr = addr;
 	cleanedAddr.setPort(0);
-	return cleanedAddr.equal(cleanedMe);
+	return cleanedAddr == cleanedMe;
 }
 
 LINPHONE_END_NAMESPACE
diff --git a/src/conference/local-conference.cpp b/src/conference/local-conference.cpp
index 1a1dcc07b..a26a63832 100644
--- a/src/conference/local-conference.cpp
+++ b/src/conference/local-conference.cpp
@@ -51,7 +51,7 @@ void LocalConference::addParticipant (const Address &addr, const CallSessionPara
 
 void LocalConference::removeParticipant (const shared_ptr<const Participant> &participant) {
 	for (const auto &p : participants) {
-		if (participant->getAddress().equal(p->getAddress())) {
+		if (participant->getAddress() == p->getAddress()) {
 			participants.remove(p);
 			return;
 		}
diff --git a/src/conference/remote-conference.cpp b/src/conference/remote-conference.cpp
index 20c579f50..171908333 100644
--- a/src/conference/remote-conference.cpp
+++ b/src/conference/remote-conference.cpp
@@ -53,7 +53,7 @@ void RemoteConference::addParticipant (const Address &addr, const CallSessionPar
 
 void RemoteConference::removeParticipant (const shared_ptr<const Participant> &participant) {
 	for (const auto &p : participants) {
-		if (participant->getAddress().equal(p->getAddress())) {
+		if (participant->getAddress() == p->getAddress()) {
 			participants.remove(p);
 			return;
 		}