suppressed #ifdef TURTLE_HOPPING from libretroshare, as it s not anymore needed.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1094 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2009-03-22 14:08:02 +00:00
parent 99baceae7e
commit 4ef56e1b79
7 changed files with 40 additions and 40 deletions

View file

@ -35,9 +35,7 @@ class NotifyBase;
class RsIface;
class RsControl;
class RsInit;
#ifdef TURTLE_HOPPING
struct TurtleFileInfo ;
#endif
/* declare single RsIface for everyone to use! */
@ -203,9 +201,7 @@ class NotifyBase
virtual void notifyErrorMsg(int list, int sev, std::string msg) { (void) list; (void) sev; (void) msg; return; }
virtual void notifyChat() { return; }
virtual void notifyHashingInfo(std::string fileinfo) { (void)fileinfo; return ; }
#ifdef TURTLE_HOPPING
virtual void notifyTurtleSearchResult(uint32_t search_id,const std::list<TurtleFileInfo>& files) { (void)files; }
#endif
};
const int NOTIFY_LIST_NEIGHBOURS = 1;

View file

@ -56,9 +56,11 @@ struct TurtleFileInfo
class RsTurtle
{
public:
RsTurtle() {}
RsTurtle() { _sharing_strategy = SHARE_ENTIRE_NETWORK ;}
virtual ~RsTurtle() {}
enum FileSharingStrategy { SHARE_ENTIRE_NETWORK, SHARE_FRIENDS_ONLY } ;
// Lauches a search request through the pipes, and immediately returns
// the request id, which will be further used by the gui to store results
// as they come back.
@ -70,6 +72,14 @@ class RsTurtle
// initialization process.
//
virtual void turtleDownload(const std::string& file_hash) = 0 ;
// Sets the file sharing strategy. It concerns all local files. It would
// be better to handle this for each file, of course.
void setFileSharingStrategy(FileSharingStrategy f) { _sharing_strategy = f ; }
protected:
FileSharingStrategy _sharing_strategy ;
};
#endif