catchunks: simplify internal options handling
Change-Id: I537a281f6c996c2544c145ab9cc01a54272c8efa
diff --git a/tools/chunks/catchunks/discover-version.hpp b/tools/chunks/catchunks/discover-version.hpp
index 5049cc2..aaf409a 100644
--- a/tools/chunks/catchunks/discover-version.hpp
+++ b/tools/chunks/catchunks/discover-version.hpp
@@ -29,7 +29,6 @@
#ifndef NDN_TOOLS_CHUNKS_CATCHUNKS_DISCOVER_VERSION_HPP
#define NDN_TOOLS_CHUNKS_CATCHUNKS_DISCOVER_VERSION_HPP
-#include "core/common.hpp"
#include "options.hpp"
namespace ndn {
@@ -38,12 +37,12 @@
class DataFetcher;
/**
- * @brief Base class of services for discovering the latest Data version
+ * @brief Service for discovering the latest Data version.
*
* DiscoverVersion's user is notified once after identifying the latest retrievable version or
* on failure to find any Data version.
*/
-class DiscoverVersion : virtual protected Options, noncopyable
+class DiscoverVersion
{
public: // signals
/**
@@ -57,10 +56,7 @@
signal::Signal<DiscoverVersion, std::string> onDiscoveryFailure;
public:
- /**
- * @brief create a DiscoverVersion service
- */
- DiscoverVersion(const Name& prefix, Face& face, const Options& options);
+ DiscoverVersion(Face& face, const Name& prefix, const Options& options);
/**
* @brief identify the latest Data version published.
@@ -73,8 +69,9 @@
handleData(const Interest& interest, const Data& data);
private:
- const Name m_prefix;
Face& m_face;
+ const Name m_prefix;
+ const Options& m_options;
shared_ptr<DataFetcher> m_fetcher;
};