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

diff --git a/source/core/getopt.h b/source/core/getopt.h
index 5c21ccb..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(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(); }
 };
 
 
@@ -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);