version 0.3.28

[fms.git] / include / freenet / iindexrequester.h

diff --git a/include/freenet/iindexrequester.h b/include/freenet/iindexrequester.h
index 6173868..37dcdda 100644 (file)
--- a/include/freenet/iindexrequester.h
+++ b/include/freenet/iindexrequester.h
@@ -25,12 +25,12 @@ class IIndexRequester:public IFreenetRegistrable,public IFCPConnected,public IFC
 {\r
 public:\r
        IIndexRequester();\r
-       IIndexRequester(FCPv2 *fcp);\r
+       IIndexRequester(FCPv2::Connection *fcp);\r
        virtual ~IIndexRequester()              {}\r
 \r
        virtual void FCPConnected();\r
        virtual void FCPDisconnected();\r
-       virtual const bool HandleMessage(FCPMessage &message);\r
+       virtual const bool HandleMessage(FCPv2::Message &message);\r
 \r
        virtual void Process();\r
 \r
@@ -41,8 +41,8 @@ protected:
        virtual void Initialize()=0;            // initialize m_maxrequests and m_fcpuniquename\r
        virtual void PopulateIDList()=0;\r
        virtual void StartRequest(const IDTYPE &id)=0;\r
-       virtual const bool HandleAllData(FCPMessage &message)=0;\r
-       virtual const bool HandleGetFailed(FCPMessage &message)=0;\r
+       virtual const bool HandleAllData(FCPv2::Message &message)=0;\r
+       virtual const bool HandleGetFailed(FCPv2::Message &message)=0;\r
        virtual void RemoveFromRequestList(const IDTYPE id);\r
 \r
        Poco::DateTime m_tempdate;\r
@@ -65,7 +65,7 @@ IIndexRequester<IDTYPE>::IIndexRequester()
 }\r
 \r
 template <class IDTYPE>\r
-IIndexRequester<IDTYPE>::IIndexRequester(FCPv2 *fcp):IFCPConnected(fcp)\r
+IIndexRequester<IDTYPE>::IIndexRequester(FCPv2::Connection *fcp):IFCPConnected(fcp)\r
 {\r
        InitializeIIndexRequester();\r
 }\r
@@ -100,7 +100,7 @@ void IIndexRequester<IDTYPE>::FCPDisconnected()
 }\r
 \r
 template <class IDTYPE>\r
-const bool IIndexRequester<IDTYPE>::HandleMessage(FCPMessage &message)\r
+const bool IIndexRequester<IDTYPE>::HandleMessage(FCPv2::Message &message)\r
 {\r
 \r
        if(message["Identifier"].find(m_fcpuniquename)==0)\r
@@ -210,14 +210,6 @@ void IIndexRequester<IDTYPE>::RegisterWithThread(FreenetMasterThread *thread)
 template <class IDTYPE>\r
 void IIndexRequester<IDTYPE>::RemoveFromRequestList(const IDTYPE id)\r
 {\r
-/*\r
-       typename std::vector<IDTYPE>::iterator i=m_requesting.begin();\r
-       while(i!=m_requesting.end() && (*i)!=id)\r
-       {\r
-               i++;\r
-       }\r
-*/\r
-       // better\r
        typename std::vector<IDTYPE>::iterator i=std::find(m_requesting.begin(),m_requesting.end(),id);\r
 \r
        if(i!=m_requesting.end())\r