X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fgetopt.h;h=ade620bf94d5c46bc2b6c36197a807a4b4edb986;hb=41363aed34382386f915f17c1a961750b4fdcb14;hp=a1208f4c1fa9e423314225bb87e8fc91903149e8;hpb=122846f0881673770d88eff7d925ecf25c01b62e;p=libs%2Fcore.git

diff --git a/source/core/getopt.h b/source/core/getopt.h
index a1208f4..ade620b 100644
--- a/source/core/getopt.h
+++ b/source/core/getopt.h
@@ -13,13 +13,13 @@ namespace Msp {
 class usage_error: public std::runtime_error
 {
 private:
-	std::string help_;
+	std::string m_help;
 
 public:
-	usage_error(const std::string &w, const std::string &h = std::string()): std::runtime_error(w), help_(h) { }
-	~usage_error() throw() { }
+	usage_error(const std::string &w, const std::string &h = std::string()): std::runtime_error(w), m_help(h) { }
+	virtual ~usage_error() throw() = default;
 
-	const char *help() const throw() { return help_.c_str(); }
+	const char *help() const throw() { return m_help.c_str(); }
 };
 
 
@@ -72,9 +72,9 @@ public:
 	class Option
 	{
 	protected:
-		Option() { }
+		Option() = default;
 	public:
-		virtual ~Option() { }
+		virtual ~Option() = default;
 
 		/// Sets help text for the option.
 		virtual Option &set_help(const std::string &) = 0;
@@ -92,9 +92,9 @@ public:
 	class Argument
 	{
 	protected:
-		Argument() { }
+		Argument() = default;
 	public:
-		virtual ~Argument() { }
+		virtual ~Argument() = default;
 
 		virtual Argument &set_help(const std::string &) = 0;
 	};
@@ -103,9 +103,9 @@ private:
 	class Store
 	{
 	protected:
-		Store() { }
+		Store() = default;
 	public:
-		virtual ~Store() { }
+		virtual ~Store() = default;
 
 		virtual Store *clone() const = 0;
 
@@ -121,10 +121,10 @@ 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);
@@ -149,7 +149,7 @@ 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);