diff --git a/libretroshare/src/retroshare/rsdisc.h b/libretroshare/src/retroshare/rsdisc.h index 2e1420908..04af7165c 100644 --- a/libretroshare/src/retroshare/rsdisc.h +++ b/libretroshare/src/retroshare/rsdisc.h @@ -79,15 +79,6 @@ class RsDisc * @return true on success false otherwise */ virtual bool getWaitingDiscCount(size_t &sendCount, size_t &recvCount) = 0; - - /** - * @brief getWaitingDiscCount get the number of queued discovery packets. - * @param[out] sendCount number of queued outgoing packets - * @param[out] recvCount number of queued incoming packets - * @return true on success false otherwise - */ - RS_DEPRECATED - virtual bool getWaitingDiscCount(unsigned int *sendCount, unsigned int *recvCount) = 0; }; #endif diff --git a/libretroshare/src/services/p3discovery2.cc b/libretroshare/src/services/p3discovery2.cc index 05fa7a982..ea659bd0d 100644 --- a/libretroshare/src/services/p3discovery2.cc +++ b/libretroshare/src/services/p3discovery2.cc @@ -1247,28 +1247,6 @@ bool p3discovery2::setPeerVersion(const SSLID &peerId, const std::string &versio } -bool p3discovery2::getWaitingDiscCount(unsigned int *sendCount, unsigned int *recvCount) -{ - if (sendCount == NULL && recvCount == NULL) { - /* Nothing to do */ - return false; - } - - size_t send, recv; - getWaitingDiscCount(send, recv); - - if (sendCount) { - *sendCount = send; - } - - if (recvCount) { - *recvCount = recv; - } - return true; -} - - - /*************************************************************************************/ /* AuthGPGService */ /*************************************************************************************/ diff --git a/libretroshare/src/services/p3discovery2.h b/libretroshare/src/services/p3discovery2.h index a31137f5a..8b9d1e7ff 100644 --- a/libretroshare/src/services/p3discovery2.h +++ b/libretroshare/src/services/p3discovery2.h @@ -91,8 +91,6 @@ virtual RsServiceInfo getServiceInfo(); bool getDiscPgpFriends(const RsPgpId &pgpid, std::list &gpg_friends); bool getPeerVersion(const RsPeerId &id, std::string &version); bool getWaitingDiscCount(size_t &sendCount, size_t &recvCount); - bool getWaitingDiscCount(unsigned int *sendCount, unsigned int *recvCount); - /************* from AuthGPService ****************/ virtual AuthGPGOperation *getGPGOperation(); virtual void setGPGOperation(AuthGPGOperation *operation);