X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fgetopt.h;h=575184f3400b2699cf3ba078a90633550ffd9e6d;hb=4ad05c650c55e3edccea887d15b26f41cdf60fb6;hp=ed6cf86195d2419cf7e3b579e470b64e242bc0bd;hpb=5763dd6e8089c97699cbcbd221afb7fe1841bcdd;p=libs%2Fcore.git

diff --git a/source/core/getopt.h b/source/core/getopt.h
index ed6cf86..575184f 100644
--- a/source/core/getopt.h
+++ b/source/core/getopt.h
@@ -17,7 +17,7 @@ private:
 
 public:
 	usage_error(const std::string &w, const std::string &h = std::string()): std::runtime_error(w), m_help(h) { }
-	virtual ~usage_error() throw() = default;
+	~usage_error() throw() override = default;
 
 	const char *help() const throw() { return m_help.c_str(); }
 };
@@ -121,24 +121,24 @@ private:
 		std::string lng;
 		ArgType arg_type = NO_ARG;
 		unsigned seen_count = 0;
-		unsigned *ext_seen_count = 0;
+		unsigned *ext_seen_count = nullptr;
 		std::string help;
 		std::string metavar = "ARG";
-		Store *store = 0;
+		Store *store = nullptr;
 
 	public:
 		OptionImpl(char, const std::string &, const Store &, ArgType);
-		virtual ~OptionImpl();
+		~OptionImpl() override;
 
-		virtual OptionImpl &set_help(const std::string &);
-		virtual OptionImpl &set_help(const std::string &, const std::string &);
-		virtual OptionImpl &bind_seen_count(unsigned &);
+		OptionImpl &set_help(const std::string &) override;
+		OptionImpl &set_help(const std::string &, const std::string &) override;
+		OptionImpl &bind_seen_count(unsigned &) override;
 		char get_short() const { return shrt; }
 		const std::string &get_long() const { return lng; }
 		ArgType get_arg_type() const { return arg_type; }
 		const std::string &get_help() const { return help; }
 		const std::string &get_metavar() const { return metavar; }
-		virtual unsigned get_seen_count() const { return seen_count; }
+		unsigned get_seen_count() const override { return seen_count; }
 		void process();
 		void process(const std::string &);
 	};
@@ -149,13 +149,13 @@ private:
 		std::string name;
 		ArgType type = REQUIRED_ARG;
 		std::string help;
-		Store *store = 0;
+		Store *store = nullptr;
 
 	public:
 		ArgumentImpl(const std::string &, const Store &, ArgType);
-		virtual ~ArgumentImpl();
+		~ArgumentImpl() override;
 
-		virtual ArgumentImpl &set_help(const std::string &);
+		ArgumentImpl &set_help(const std::string &) override;
 		const std::string &get_name() const { return name; }
 		ArgType get_type() const { return type; }
 		const std::string &get_help() const { return help; }
@@ -172,14 +172,14 @@ private:
 	public:
 		SimpleStore(T &d): data(d) { }
 
-		virtual SimpleStore *clone() const
+		SimpleStore *clone() const override
 		{ return new SimpleStore(data); }
 
-		virtual bool is_list() const { return false; }
+		bool is_list() const override { return false; }
 
-		virtual void store() { }
+		void store() override { }
 
-		virtual void store(const std::string &a)
+		void store(const std::string &a) override
 		{ data = lexical_cast<T>(a); }
 	};
 
@@ -192,14 +192,14 @@ private:
 	public:
 		ListStore(T &d): data(d) { }
 
-		virtual ListStore *clone() const
+		ListStore *clone() const override
 		{ return new ListStore(data); }
 
-		virtual bool is_list() const { return true; }
+		bool is_list() const override { return true; }
 
-		virtual void store() { }
+		void store() override { }
 
-		virtual void store(const std::string &a)
+		void store(const std::string &a) override
 		{ data.push_back(lexical_cast<typename T::value_type>(a)); }
 	};