Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed unnecessary method p3Notify::AddFeedItem.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7674 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2014-11-11 20:28:45 +00:00
parent fcb7b6c340
commit 67215c7ffe
6 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libretroshare/src/dbase/fistore.h
View File

@ -35,7 +35,6 @@
*/ */
class p3PeerMgr ; class p3PeerMgr ;
class pqiNotify ;
#include "dbase/findex.h" #include "dbase/findex.h"
#include "dbase/cachestrapper.h" #include "dbase/cachestrapper.h"

1
libretroshare/src/ft/ftserver.h
View File

@ -57,7 +57,6 @@ class p3ConnectMgr;
class CacheStrapper; class CacheStrapper;
class CacheTransfer; class CacheTransfer;
class pqiNotify; /* needed by FiStore */
class ftCacheStrapper; class ftCacheStrapper;
class ftFiStore; class ftFiStore;
class ftFiMonitor; class ftFiMonitor;

2
libretroshare/src/pqi/p3linkmgr.cc
View File

@ -472,7 +472,7 @@ void p3LinkMgrIMPL::tickMonitors()
if (notify) if (notify)
{ {
notify->AddPopupMessage(RS_POPUP_CONNECT, peer.id.toStdString(),"", "Online: "); notify->AddPopupMessage(RS_POPUP_CONNECT, peer.id.toStdString(),"", "Online: ");
notify->AddFeedItem(RS_FEED_ITEM_PEER_CONNECT, peer.id.toStdString(), "", ""); notify->AddFeedItem(RS_FEED_ITEM_PEER_CONNECT, peer.id.toStdString());
} }
} }
} }

9
libretroshare/src/pqi/p3notify.cc
View File

@ -196,15 +196,6 @@ bool p3Notify::AddFeedItem(uint32_t type, const std::string& id1, const std::str
return true; return true;
} }
bool p3Notify::AddFeedItem(uint32_t type, const std::string& id1, const std::string& id2, const std::string& id3)
{
RsStackMutex stack(noteMtx); /************* LOCK MUTEX ************/
pendingNewsFeed.push_back(RsFeedItem(type, id1, id2, id3));
return true;
}
bool p3Notify::ClearFeedItems(uint32_t type) bool p3Notify::ClearFeedItems(uint32_t type)
{ {
RsStackMutex stack(noteMtx); /************* LOCK MUTEX ************/ RsStackMutex stack(noteMtx); /************* LOCK MUTEX ************/

13
libretroshare/src/pqi/p3notify.h
View File

@ -86,13 +86,12 @@ class p3Notify: public RsNotify
bool SetSysMessageMode(uint32_t sysid, uint32_t mode); bool SetSysMessageMode(uint32_t sysid, uint32_t mode);
bool SetPopupMessageMode(uint32_t ptype, uint32_t mode); bool SetPopupMessageMode(uint32_t ptype, uint32_t mode);
/* Overloaded from pqiNotify */ /* Notify messages */
virtual bool AddPopupMessage(uint32_t ptype, const std::string& name, const std::string& title, const std::string& msg); bool AddPopupMessage(uint32_t ptype, const std::string& name, const std::string& title, const std::string& msg);
virtual bool AddSysMessage(uint32_t sysid, uint32_t type, const std::string& title, const std::string& msg); bool AddSysMessage(uint32_t sysid, uint32_t type, const std::string& title, const std::string& msg);
virtual bool AddLogMessage(uint32_t sysid, uint32_t type, const std::string& title, const std::string& msg); bool AddLogMessage(uint32_t sysid, uint32_t type, const std::string& title, const std::string& msg);
virtual bool AddFeedItem(uint32_t type, const std::string& id1, const std::string& id2, const std::string& id3); bool AddFeedItem(uint32_t type, const std::string& id1, const std::string& id2 = "", const std::string& id3 = "", const std::string& id4 = "");
virtual bool AddFeedItem(uint32_t type, const std::string& id1, const std::string& id2, const std::string& id3,const std::string& id4); bool ClearFeedItems(uint32_t type);
virtual bool ClearFeedItems(uint32_t type);
// Notifications of clients. Can be called from anywhere inside libretroshare. // Notifications of clients. Can be called from anywhere inside libretroshare.
// //

12
libretroshare/src/retroshare/rsnotify.h
View File

@ -120,13 +120,7 @@ const uint32_t NOTIFY_HASHTYPE_SAVE_FILE_INDEX = 4; /* Hashing file */
class RsFeedItem class RsFeedItem
{ {
public: public:
RsFeedItem(uint32_t type, const std::string& id1, const std::string& id2, const std::string& id3) RsFeedItem(uint32_t type, const std::string& id1, const std::string& id2 = "", const std::string& id3 = "", const std::string& id4 = "")
:mType(type), mId1(id1), mId2(id2), mId3(id3)
{
return;
}
RsFeedItem(uint32_t type, const std::string& id1, const std::string& id2, const std::string& id3,const std::string& id4)
:mType(type), mId1(id1), mId2(id2), mId3(id3), mId4(id4) {} :mType(type), mId1(id1), mId2(id2), mId3(id3), mId4(id4) {}
RsFeedItem() :mType(0) { return; } RsFeedItem() :mType(0) { return; }
@ -203,8 +197,8 @@ class NotifyClient
virtual void notifyForumMsgReadSatusChanged (const std::string& /* channelId */, const std::string& /* msgId */, uint32_t /* status */) {} virtual void notifyForumMsgReadSatusChanged (const std::string& /* channelId */, const std::string& /* msgId */, uint32_t /* status */) {}
virtual void notifyChannelMsgReadSatusChanged (const std::string& /* channelId */, const std::string& /* msgId */, uint32_t /* status */) {} virtual void notifyChannelMsgReadSatusChanged (const std::string& /* channelId */, const std::string& /* msgId */, uint32_t /* status */) {}
virtual bool askForDeferredSelfSignature (const void * /* data */, const uint32_t /* len */, unsigned char * /* sign */, unsigned int * /* signlen */,int& signature_result ) { signature_result = false ;return true; } virtual bool askForDeferredSelfSignature (const void * /* data */, const uint32_t /* len */, unsigned char * /* sign */, unsigned int * /* signlen */,int& signature_result ) { signature_result = false ;return true; }
virtual void notifyDownloadComplete (const std::string& /* fileHash */) {}; virtual void notifyDownloadComplete (const std::string& /* fileHash */) {}
virtual void notifyDownloadCompleteCount (uint32_t /* count */) {}; virtual void notifyDownloadCompleteCount (uint32_t /* count */) {}
virtual void notifyHistoryChanged (uint32_t /* msgId */, int /* type */) {} virtual void notifyHistoryChanged (uint32_t /* msgId */, int /* type */) {}
virtual bool askForPassword (const std::string& /* key_details */, bool /* prev_is_bad */, std::string& /* password */ ) { return false ;} virtual bool askForPassword (const std::string& /* key_details */, bool /* prev_is_bad */, std::string& /* password */ ) { return false ;}