From eaf658de3d1ef984c9a0b4273a9cfbd3029f8b5b Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Tue, 27 Aug 2013 07:54:16 +0100 Subject: 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. --- include/modules/regex.h | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'include') 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; }; -- cgit v1.2.3