Fix various small issues.

- Add CXX11_OVERRIDE to *Regex::Matches and *RegexFactory::Create.
- Fix documentation comment on regex_string.
- Fix various code duplication/layout issues.

1 files changed, 5 insertions, 8 deletions

diff --git a/include/modules/regex.h b/include/modules/regex.h
index e278df502..0bced4e2b 100644
--- a/include/modules/regex.h
+++ b/include/modules/regex.h
@@ -25,18 +25,15 @@
 class Regex : public classbase
 {
 protected:
-	std::string regex_string; // The raw uncompiled regex string.
+	/** The uncompiled regex string. */
+	std::string regex_string;
 
 	// Constructor may as well be protected, as this class is abstract.
-	Regex(const std::string& rx) : regex_string(rx)
-	{
-	}
+	Regex(const std::string& rx) : regex_string(rx) { }
 
 public:
 
-	virtual ~Regex()
-	{
-	}
+	virtual ~Regex() { }
 
 	virtual bool Matches(const std::string& text) = 0;
 
@@ -49,7 +46,7 @@ public:
 class RegexFactory : public DataProvider
 {
  public:
-	RegexFactory(Module* Creator, const std::string& Name) : DataProvider(Creator, Name) {}
+	RegexFactory(Module* creator, const std::string& name) : DataProvider(creator, name) { }
 
 	virtual Regex* Create(const std::string& expr) = 0;
 };