diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2009-04-28 09:22:43 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2009-04-28 09:22:43 +0000 |
| commit | 16f5ebcfcd8fd54702993525ee756c1c8b7f6f09 (patch) | |
| tree | fe18692747877d5f8f7ad550331f7cae4e567565 /src/MetalinkHelper.cc | |
| parent | f80abe91d2c6cbba9781f6928f46c099684855e2 (diff) | |
2009-04-28 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Removed MetalinkProcessorFactory. Since we don't use both
libxml2 and expat simultaneously, MetalinkProcessor is now not
base class and it is directly implemented in
XML2SAXMetalinkProcessor and ExpatMetalinkProcessor.
* src/ExpatMetalinkProcessor.cc
* src/ExpatMetalinkProcessor.h
* src/Makefile.am
* src/MetalinkHelper.cc
* src/MetalinkProcessor.h
* src/MetalinkProcessorFactory.cc: Removed.
* src/MetalinkProcessorFactory.h: Removed
* src/XML2SAXMetalinkProcessor.cc
* src/XML2SAXMetalinkProcessor.h
* test/MetalinkProcessorTest.cc
Diffstat (limited to 'src/MetalinkHelper.cc')
| -rw-r--r-- | src/MetalinkHelper.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/MetalinkHelper.cc b/src/MetalinkHelper.cc index 9123480b..958c9caa 100644 --- a/src/MetalinkHelper.cc +++ b/src/MetalinkHelper.cc @@ -35,11 +35,9 @@ #include "MetalinkHelper.h" #include "Option.h" #include "MetalinkEntry.h" -#include "MetalinkProcessorFactory.h" #include "MetalinkParserStateMachine.h" #include "Metalinker.h" #include "MetalinkProcessor.h" -#include "MetalinkProcessorFactory.h" #include "prefs.h" #include "DlAbortEx.h" #include "BinaryStream.h" @@ -54,9 +52,8 @@ void MetalinkHelper::parseAndQuery (std::deque<SharedHandle<MetalinkEntry> >& result, const std::string& filename, const Option* option) { - SharedHandle<MetalinkProcessor> proc = MetalinkProcessorFactory::newInstance(); - - SharedHandle<Metalinker> metalinker = proc->parseFile(filename); + MetalinkProcessor proc; + SharedHandle<Metalinker> metalinker = proc.parseFile(filename); query(result, metalinker, option); } @@ -64,9 +61,8 @@ void MetalinkHelper::parseAndQuery (std::deque<SharedHandle<MetalinkEntry> >& result, const SharedHandle<BinaryStream>& binaryStream, const Option* option) { - SharedHandle<MetalinkProcessor> proc = MetalinkProcessorFactory::newInstance(); - - SharedHandle<Metalinker> metalinker = proc->parseFromBinaryStream(binaryStream); + MetalinkProcessor proc; + SharedHandle<Metalinker> metalinker =proc.parseFromBinaryStream(binaryStream); query(result, metalinker, option); } |