Browse Source

2009-07-01 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Removed ctor of AbstractCommand which doesn't take FileEntry.
	* src/AbstractCommand.cc
	* src/AbstractCommand.h
	* src/CreateRequestCommand.cc
Tatsuhiro Tsujikawa 16 years ago
parent
commit
1812142da5
4 changed files with 9 additions and 24 deletions
  1. 7 0
      ChangeLog
  2. 0 19
      src/AbstractCommand.cc
  3. 0 4
      src/AbstractCommand.h
  4. 2 1
      src/CreateRequestCommand.cc

+ 7 - 0
ChangeLog

@@ -1,3 +1,10 @@
+2009-07-01  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Removed ctor of AbstractCommand which doesn't take FileEntry.
+	* src/AbstractCommand.cc
+	* src/AbstractCommand.h
+	* src/CreateRequestCommand.cc
+
 2009-07-01  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Get proxy download working

+ 0 - 19
src/AbstractCommand.cc

@@ -67,25 +67,6 @@
 
 namespace aria2 {
 
-// TODO1.5 Remove this
-AbstractCommand::AbstractCommand(int32_t cuid,
-				 const SharedHandle<Request>& req,
-				 RequestGroup* requestGroup,
-				 DownloadEngine* e,
-				 const SocketHandle& s):
-  Command(cuid), _requestGroup(requestGroup),
-  req(req), e(e), socket(s),
-  checkSocketIsReadable(false), checkSocketIsWritable(false),
-  nameResolverCheck(false)
-{
-  if(!socket.isNull() && socket->isOpen()) {
-    setReadCheckSocket(socket);
-  }
-  timeout = _requestGroup->getTimeout();
-  _requestGroup->increaseStreamConnection();
-  _requestGroup->increaseNumCommand();
-}
-
 AbstractCommand::AbstractCommand(int32_t cuid,
 				 const SharedHandle<Request>& req,
 				 const SharedHandle<FileEntry>& fileEntry,

+ 0 - 4
src/AbstractCommand.h

@@ -143,10 +143,6 @@ private:
 
 #endif // ENABLE_ASYNC_DNS
 public:
-  AbstractCommand(int32_t cuid, const SharedHandle<Request>& req,
-		  RequestGroup* requestGroup, DownloadEngine* e,
-		  const SharedHandle<SocketCore>& s = SharedHandle<SocketCore>());
-
   AbstractCommand(int32_t cuid, const SharedHandle<Request>& req,
 		  const SharedHandle<FileEntry>& fileEntry,
 		  RequestGroup* requestGroup, DownloadEngine* e,

+ 2 - 1
src/CreateRequestCommand.cc

@@ -48,7 +48,8 @@ namespace aria2 {
 CreateRequestCommand::CreateRequestCommand(int32_t cuid,
 					   RequestGroup* requestGroup,
 					   DownloadEngine* e):
-  AbstractCommand(cuid, SharedHandle<Request>(), requestGroup, e)
+  AbstractCommand
+  (cuid, SharedHandle<Request>(), SharedHandle<FileEntry>(), requestGroup, e)
 {
   setStatus(Command::STATUS_ONESHOT_REALTIME);
   disableReadCheckSocket();