Random cleanups, adding const, removing unnecessary clear calls

Reviewed-by: Jared Adams

2 files changed, 12 insertions, 21 deletions

diff --git a/src/utils/stringfilter.cpp b/src/utils/stringfilter.cpp
index de46491..4a9d19c 100644
--- a/src/utils/stringfilter.cpp
+++ b/src/utils/stringfilter.cpp
@@ -31,14 +31,12 @@ namespace utils
 StringFilter::StringFilter():
     mInitialized(false)
 {
-    mSlangs.clear(); // Does this make any sense here?
     loadSlangFilterList();
 }
 
 StringFilter::~StringFilter()
 {
     writeSlangFilterList();
-    mSlangs.clear(); // Does this make any sense here?
 }
 
 bool StringFilter::loadSlangFilterList()
@@ -71,7 +69,7 @@ void StringFilter::writeSlangFilterList()
     //mConfig->setValue("SlangsList", slangsList);
 }
 
-bool StringFilter::filterContent(const std::string& text)
+bool StringFilter::filterContent(const std::string &text) const
 {
     if (!mInitialized) {
         LOG_DEBUG("Slangs List is not initialized.");
@@ -84,7 +82,7 @@ bool StringFilter::filterContent(const std::string& text)
     std::transform(text.begin(), text.end(), upperCaseText.begin(),
             (int(*)(int))std::toupper);
 
-    for (SlangIterator i = mSlangs.begin(); i != mSlangs.end(); ++i)
+    for (Slangs::const_iterator i = mSlangs.begin(); i != mSlangs.end(); ++i)
     {
         // We look for slangs into the sentence.
         std::string upperCaseSlang = *i;
@@ -100,7 +98,7 @@ bool StringFilter::filterContent(const std::string& text)
     return isContentClean;
 }
 
-bool StringFilter::isEmailValid(const std::string& email)
+bool StringFilter::isEmailValid(const std::string &email) const
 {
     unsigned int min = Configuration::getValue("account_minEmailLength", 7);
     unsigned int max = Configuration::getValue("account_maxEmailLength", 128);
@@ -119,7 +117,7 @@ bool StringFilter::isEmailValid(const std::string& email)
         (email.find_first_of(' ') == std::string::npos);
 }
 
-bool StringFilter::findDoubleQuotes(const std::string &text)
+bool StringFilter::findDoubleQuotes(const std::string &text) const
 {
     return (text.find('"', 0) != std::string::npos);
 }
diff --git a/src/utils/stringfilter.h b/src/utils/stringfilter.h
index 40eed12..3069f41 100644
--- a/src/utils/stringfilter.h
+++ b/src/utils/stringfilter.h
@@ -28,14 +28,12 @@ namespace utils
 {
 
 /**
- * Used to filter content containing bad words. Like username, character's names, chat, ...
+ * Used to filter content containing bad words. Like username, character's
+ * names, chat, ...
  */
 class StringFilter
 {
     public:
-        /**
-         * ctors.
-         */
         StringFilter();
 
         ~StringFilter();
@@ -46,8 +44,7 @@ class StringFilter
          * @return true is the config is loaded succesfully
          *
          */
-        bool
-        loadSlangFilterList();
+        bool loadSlangFilterList();
 
         /**
          * Write slang list to the config file.
@@ -55,29 +52,25 @@ class StringFilter
          * @return true is the config is loaded succesfully
          *
          */
-        void
-        writeSlangFilterList();
+        void writeSlangFilterList();
 
         /**
         * Useful to filter slangs automatically, by instance.
         * @return true if the sentence is slangs clear.
         */
-        bool
-        filterContent(const std::string& text);
+        bool filterContent(const std::string &text) const;
 
         /**
          * Tells if an email is valid
          */
-        bool
-        isEmailValid(const std::string& email);
+        bool isEmailValid(const std::string &email) const;
 
         /**
          * find double quotes (") in strings.
-         * Very useful not to make SQL Queries bqsed on names crash
+         * Very useful not to make SQL Queries based on names crash
          * I placed it here cause where you've got " you can have slangs...
          */
-        bool
-        findDoubleQuotes(const std::string& text);
+        bool findDoubleQuotes(const std::string &text) const;
 
     private:
         typedef std::list<std::string> Slangs;