Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-12-01 12:54:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Remove a bunch of deadcode

Browse source 
RsSerializable already provide std::ostream &operator<<
Add deprecation notice for RsNotify
This commit is contained in:
Gioacchino Mazzurco 2019-04-23 15:46:39 +02:00
parent b1285a5de7
commit de0dd63e3f
No known key found for this signature in database
GPG key ID: A1FBCA3872E87051
17 changed files with 27 additions and 378 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libretroshare/src/retroshare/rsgxsiface.h
View file

@ -75,7 +75,7 @@ struct RsGxsGroupSummary : RsSerializable
*/
struct RsGxsChanges
{
RsGxsChanges(): mService(0){}
RsGxsChanges(): mService(nullptr){}
RsTokenService *mService;
std::map<RsGxsGroupId, std::set<RsGxsMessageId> > mMsgs;
std::map<RsGxsGroupId, std::set<RsGxsMessageId> > mMsgsMeta;

6
libretroshare/src/retroshare/rsidentity.h
View file

@ -151,11 +151,9 @@ struct RsGxsIdGroup : RsSerializable
RsGenericSerializer::SerializeContext& ctx ) override;
};
std::ostream &operator<<(std::ostream &out, const RsGxsIdGroup &group);
// DATA TYPE FOR EXTERNAL INTERFACE.
struct RsRecognTag
struct RS_DEPRECATED RsRecognTag
{
RsRecognTag(uint16_t tc, uint16_t tt, bool v) :
tag_class(tc), tag_type(tt), valid(v) {}
@ -166,7 +164,7 @@ struct RsRecognTag
};
struct RsRecognTagDetails
struct RS_DEPRECATED RsRecognTagDetails
{
RsRecognTagDetails() :
valid_from(0), valid_to(0), tag_class(0), tag_type(0), is_valid(false),

3
libretroshare/src/retroshare/rsmsgs.h
View file

@ -485,14 +485,13 @@ public:
}
};
std::ostream &operator<<(std::ostream &out, const Rs::Msgs::MessageInfo &info);
class RsMsgs;
/**
* @brief Pointer to retroshare's message service
* @jsonapi{development}
*/
extern RsMsgs *rsMsgs;
extern RsMsgs* rsMsgs;
class RsMsgs
{

15
libretroshare/src/retroshare/rsnotify.h
View file

@ -19,8 +19,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. *
* *
*******************************************************************************/
#ifndef RS_NOTIFY_GUI_INTERFACE_H
#define RS_NOTIFY_GUI_INTERFACE_H
#pragma once
#include <map>
#include <list>
@ -30,6 +29,7 @@
#include "rsturtle.h"
#include "rsgxsifacetypes.h"
#include "util/rsdeprecate.h"
class ChatId;
class ChatMessage;
@ -148,7 +148,7 @@ const uint32_t NOTIFY_HASHTYPE_FINISH = 2; /* Finish */
const uint32_t NOTIFY_HASHTYPE_HASH_FILE = 3; /* Hashing file */
const uint32_t NOTIFY_HASHTYPE_SAVE_FILE_INDEX = 4; /* Hashing file */
class RsFeedItem
class RS_DEPRECATED RsFeedItem
{
public:
RsFeedItem(uint32_t type, const std::string& id1, const std::string& id2, const std::string& id3, const std::string& id4, uint32_t result1)
@ -181,9 +181,9 @@ class RsFeedItem
// This mechanism can be used in plugins, new services, etc.
//
class NotifyClient;
class RS_DEPRECATED NotifyClient;
class RsNotify
class RS_DEPRECATED_FOR(RsEvents) RsNotify
{
public:
/* registration of notifies clients */
@ -206,7 +206,7 @@ class RsNotify
virtual bool setDisableAskPassword (const bool /*bValue*/) { return false ; }
};
class NotifyClient
class RS_DEPRECATED NotifyClient
{
public:
NotifyClient() {}
@ -223,8 +223,6 @@ public:
virtual void notifyCustomState (const std::string& /* peer_id */, const std::string& /* status_string */) {}
virtual void notifyHashingInfo (uint32_t /* type */, const std::string& /* fileinfo */) {}
virtual void notifyTurtleSearchResult (const RsPeerId& /* pid */, uint32_t /* search_id */, const std::list<TurtleFileInfo>& /* files */) {}
#warning MISSING CODE HERE
// virtual void notifyTurtleSearchResult (uint32_t /* search_id */, const std::list<TurtleGxsInfo >& /* groups */) {}
virtual void notifyPeerHasNewAvatar (std::string /* peer_id */) {}
virtual void notifyOwnAvatarChanged () {}
virtual void notifyOwnStatusMessageChanged () {}
@ -245,4 +243,3 @@ public:
virtual bool askForPassword (const std::string& /* title */, const std::string& /* key_details */, bool /* prev_is_bad */, std::string& /* password */,bool& /* cancelled */ ) { return false ;}
virtual bool askForPluginConfirmation (const std::string& /* plugin_filename */, const std::string& /* plugin_file_hash */,bool /* first_time */) { return false ;}
};
#endif

2
libretroshare/src/retroshare/rspeers.h
View file

@ -358,8 +358,6 @@ struct RsGroupInfo : RsSerializable
}
};
std::ostream &operator<<(std::ostream &out, const RsPeerDetails &detail);
/** The Main Interface Class - for information about your Peers
* A peer is another RS instance, means associated with an SSL certificate
* A same GPG person can have multiple peer running with different SSL certs

4
libretroshare/src/retroshare/rsservicecontrol.h
View file

@ -88,10 +88,6 @@ struct RsPeerServiceInfo : RsSerializable
}
};
std::ostream &operator<<(std::ostream &out, const RsPeerServiceInfo &info);
std::ostream &operator<<(std::ostream &out, const RsServiceInfo &info);
struct RsServicePermissions : RsSerializable
{
RsServicePermissions();

3
libretroshare/src/retroshare/rstokenservice.h
View file

@ -107,9 +107,6 @@ struct RsTokReqOptions
rstime_t mAfter;
};
std::ostream &operator<<(std::ostream &out, const RsGroupMetaData &meta);
std::ostream &operator<<(std::ostream &out, const RsMsgMetaData &meta);
/*!
* A proxy class for requesting generic service data for GXS
* This seperates the request mechanism from the actual retrieval of data

4
libretroshare/src/retroshare/rstypes.h
View file

@ -248,8 +248,6 @@ struct FileInfo : RsSerializable
}
};
std::ostream &operator<<(std::ostream &out, const FileInfo& info);
/**
* Pointers in this class have no real meaning as pointers, they are used as
* indexes, internally by retroshare.
@ -370,8 +368,6 @@ struct DirDetails : RsSerializable
}
};
std::ostream &operator<<(std::ostream &out, const DirDetails& details);
class FileDetail
{
public: