From cbec8f229bb4d995c9fb05babf176e82a6f6db7c Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Thu, 19 Jul 2012 10:09:24 +0200 Subject: some interface fixes --- src/ChainURLFilter.cpp | 2 +- src/ChainURLFilter.hpp | 2 +- src/Deduper.hpp | 2 +- src/DomainURLFilter.cpp | 2 +- src/DomainURLFilter.hpp | 2 +- src/Fetcher.cpp | 5 ----- src/Fetcher.hpp | 4 ++-- src/Frontier.cpp | 5 ----- src/Frontier.hpp | 2 +- src/GNUmakefile | 2 -- src/LibFetchFetcher.cpp | 2 +- src/LibFetchFetcher.hpp | 2 +- src/MD5Deduper.hpp | 2 +- src/ProtocolURLFilter.cpp | 2 +- src/ProtocolURLFilter.hpp | 2 +- src/URLFilter.hpp | 2 +- 16 files changed, 14 insertions(+), 26 deletions(-) delete mode 100644 src/Fetcher.cpp delete mode 100644 src/Frontier.cpp (limited to 'src') diff --git a/src/ChainURLFilter.cpp b/src/ChainURLFilter.cpp index e367c14..a356299 100644 --- a/src/ChainURLFilter.cpp +++ b/src/ChainURLFilter.cpp @@ -26,7 +26,7 @@ ChainURLFilter::ChainURLFilter( URLFilter *f1, URLFilter *f2, URLFilter *f3 ) m_filters.push_back( f3 ); } -bool ChainURLFilter::filter( const URL &url ) +bool ChainURLFilter::filter( const URL url ) { list::const_iterator it; diff --git a/src/ChainURLFilter.hpp b/src/ChainURLFilter.hpp index d6b2580..216af6b 100644 --- a/src/ChainURLFilter.hpp +++ b/src/ChainURLFilter.hpp @@ -13,7 +13,7 @@ class ChainURLFilter : public URLFilter ChainURLFilter( URLFilter *f1, URLFilter *f2 ); ChainURLFilter( URLFilter *f1, URLFilter *f2, URLFilter *f3 ); - virtual bool filter( const URL &url ); + virtual bool filter( const URL url ); protected: std::list m_filters; diff --git a/src/Deduper.hpp b/src/Deduper.hpp index f55db19..36421fa 100644 --- a/src/Deduper.hpp +++ b/src/Deduper.hpp @@ -9,7 +9,7 @@ class Deduper public: virtual ~Deduper( ) = 0; - virtual bool contentSeen( const URL &url, RewindInputStream *s ) = 0; + virtual bool contentSeen( const URL url, RewindInputStream *s ) = 0; }; #endif diff --git a/src/DomainURLFilter.cpp b/src/DomainURLFilter.cpp index 7234f34..7eb6560 100644 --- a/src/DomainURLFilter.cpp +++ b/src/DomainURLFilter.cpp @@ -6,7 +6,7 @@ DomainURLFilter::DomainURLFilter( const std::set domains ) { } -bool DomainURLFilter::filter( const URL &url ) +bool DomainURLFilter::filter( const URL url ) { string domain = url.domain( ); bool res = ( m_domains.find( domain ) != m_domains.end( ) ); diff --git a/src/DomainURLFilter.hpp b/src/DomainURLFilter.hpp index 76dbc73..637ea67 100644 --- a/src/DomainURLFilter.hpp +++ b/src/DomainURLFilter.hpp @@ -10,7 +10,7 @@ class DomainURLFilter : public URLFilter public: DomainURLFilter( const std::set domains ); - virtual bool filter( const URL &url ); + virtual bool filter( const URL url ); protected: std::set m_domains; diff --git a/src/Fetcher.cpp b/src/Fetcher.cpp deleted file mode 100644 index 0e2d8a2..0000000 --- a/src/Fetcher.cpp +++ /dev/null @@ -1,5 +0,0 @@ -#include "Fetcher.hpp" - -Fetcher::~Fetcher( ) -{ -} diff --git a/src/Fetcher.hpp b/src/Fetcher.hpp index 7bf9819..40f1c7a 100644 --- a/src/Fetcher.hpp +++ b/src/Fetcher.hpp @@ -7,9 +7,9 @@ class Fetcher { public: - virtual ~Fetcher( ) = 0; + virtual ~Fetcher( ) { }; - virtual RewindInputStream *fetch( const URL& url ) = 0; + virtual RewindInputStream *fetch( const URL url ) = 0; }; #endif diff --git a/src/Frontier.cpp b/src/Frontier.cpp deleted file mode 100644 index 2c45a63..0000000 --- a/src/Frontier.cpp +++ /dev/null @@ -1,5 +0,0 @@ -#include "Frontier.hpp" - -Frontier::~Frontier( ) -{ -} diff --git a/src/Frontier.hpp b/src/Frontier.hpp index 4cbb244..54c0dd6 100644 --- a/src/Frontier.hpp +++ b/src/Frontier.hpp @@ -6,7 +6,7 @@ class Frontier { public: - virtual ~Frontier( ) = 0; + virtual ~Frontier( ) { }; virtual URL getNextUrl( ) = 0; diff --git a/src/GNUmakefile b/src/GNUmakefile index 823c7be..816d6be 100644 --- a/src/GNUmakefile +++ b/src/GNUmakefile @@ -28,10 +28,8 @@ endif CPP_OBJS = \ URL.o \ - Fetcher.o \ LibFetchFetcher.o \ LibFetchRewindInputStream.o \ - Frontier.o \ Deduper.o \ HTMLLinkExtractProcessor.o \ ProtocolURLFilter.o \ diff --git a/src/LibFetchFetcher.cpp b/src/LibFetchFetcher.cpp index 6c0ff39..976543f 100644 --- a/src/LibFetchFetcher.cpp +++ b/src/LibFetchFetcher.cpp @@ -3,7 +3,7 @@ #include "fetch.h" -RewindInputStream *LibFetchFetcher::fetch( const URL &url ) +RewindInputStream *LibFetchFetcher::fetch( const URL url ) { LibFetchRewindInputStream *s = new LibFetchRewindInputStream( url ); return s; diff --git a/src/LibFetchFetcher.hpp b/src/LibFetchFetcher.hpp index 55cc107..5cb4677 100644 --- a/src/LibFetchFetcher.hpp +++ b/src/LibFetchFetcher.hpp @@ -12,7 +12,7 @@ class LibFetchFetcher : public Fetcher virtual ~LibFetchFetcher( ) { } - virtual RewindInputStream *fetch( const URL& url ); + virtual RewindInputStream *fetch( const URL url ); }; #endif diff --git a/src/MD5Deduper.hpp b/src/MD5Deduper.hpp index 39de2a6..8372865 100644 --- a/src/MD5Deduper.hpp +++ b/src/MD5Deduper.hpp @@ -11,7 +11,7 @@ class MD5Deduper : public Deduper { virtual ~MD5Deduper( ) { } - virtual bool contentSeen( const URL &url, RewindInputStream *s ) { + virtual bool contentSeen( const URL url, RewindInputStream *s ) { (void)url; (void)s; return false; diff --git a/src/ProtocolURLFilter.cpp b/src/ProtocolURLFilter.cpp index 2566a8c..2d0a169 100644 --- a/src/ProtocolURLFilter.cpp +++ b/src/ProtocolURLFilter.cpp @@ -6,7 +6,7 @@ ProtocolURLFilter::ProtocolURLFilter( const std::set protocols ) { } -bool ProtocolURLFilter::filter( const URL &url ) +bool ProtocolURLFilter::filter( const URL url ) { string protocol = url.protocol( ); bool res = ( m_protocols.find( protocol ) != m_protocols.end( ) ); diff --git a/src/ProtocolURLFilter.hpp b/src/ProtocolURLFilter.hpp index cd05ff9..3fe18f8 100644 --- a/src/ProtocolURLFilter.hpp +++ b/src/ProtocolURLFilter.hpp @@ -10,7 +10,7 @@ class ProtocolURLFilter : public URLFilter public: ProtocolURLFilter( const std::set protocols ); - bool filter( const URL &url ); + bool filter( const URL url ); protected: std::set m_protocols; diff --git a/src/URLFilter.hpp b/src/URLFilter.hpp index c48307e..2136009 100644 --- a/src/URLFilter.hpp +++ b/src/URLFilter.hpp @@ -8,7 +8,7 @@ class URLFilter public: virtual ~URLFilter( ) { }; - virtual bool filter( const URL &url ) = 0; + virtual bool filter( const URL url ) = 0; }; #endif -- cgit v1.2.3-54-g00ecf