From 52b3507a2b63a45b96b802106b8ee89b2740de41 Mon Sep 17 00:00:00 2001
From: Alexander Stillich <dr.west@zoho.com>
Date: Tue, 7 Nov 2017 23:10:58 +0100
Subject: [PATCH] Removed escape_hash_filter::mPrevious, removed usage of
 boost::replace_all

---
 components/files/escape.cpp | 15 ++++++++++-----
 components/files/escape.hpp | 11 -----------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/components/files/escape.cpp b/components/files/escape.cpp
index 3c3d04d51..93ae9b885 100644
--- a/components/files/escape.cpp
+++ b/components/files/escape.cpp
@@ -1,6 +1,6 @@
 #include "escape.hpp"
 
-#include <boost/algorithm/string/replace.hpp>
+#include <components/misc/stringops.hpp>
 
 namespace Files
 {
@@ -8,7 +8,7 @@ namespace Files
     const int escape_hash_filter::sEscapeIdentifier = 'a';
     const int escape_hash_filter::sHashIdentifier = 'h';
 
-    escape_hash_filter::escape_hash_filter() : mNext(), mPrevious(), mSeenNonWhitespace(false), mFinishLine(false)
+    escape_hash_filter::escape_hash_filter() : mSeenNonWhitespace(false), mFinishLine(false)
     {
     }
 
@@ -26,9 +26,14 @@ namespace Files
 
     std::string EscapeHashString::processString(const std::string & str)
     {
-        std::string temp = boost::replace_all_copy<std::string>(str, std::string() + (char)escape_hash_filter::sEscape + (char)escape_hash_filter::sHashIdentifier, "#");
-        auto format = std::string(1, (char)escape_hash_filter::sEscape);
-        boost::replace_all(temp, std::string() + (char)escape_hash_filter::sEscape + (char)escape_hash_filter::sEscapeIdentifier, format);
+        std::string temp = str;
+
+        static const char hash[] = { escape_hash_filter::sEscape,  escape_hash_filter::sHashIdentifier };
+        Misc::StringUtils::replaceAll(temp, hash, "#", 2, 1);
+
+        static const char escape[] = { escape_hash_filter::sEscape,  escape_hash_filter::sEscapeIdentifier };
+        Misc::StringUtils::replaceAll(temp, escape, "@", 2, 1);
+
         return temp;
     }
 
diff --git a/components/files/escape.hpp b/components/files/escape.hpp
index 64410f3ab..d01bd8d98 100644
--- a/components/files/escape.hpp
+++ b/components/files/escape.hpp
@@ -30,7 +30,6 @@ namespace Files
 
     private:
         std::queue<int> mNext;
-        int mPrevious;
 
         bool mSeenNonWhitespace;
         bool mFinishLine;
@@ -42,11 +41,9 @@ namespace Files
         if (mNext.empty())
         {
             int character = boost::iostreams::get(src);
-            bool record = true;
             if (character == boost::iostreams::WOULD_BLOCK)
             {
                 mNext.push(character);
-                record = false;
             }
             else if (character == EOF)
             {
@@ -79,12 +76,6 @@ namespace Files
                 }
             }
             else if (character == sEscape)
-            {
-                mNext.push(sEscape);
-                mNext.push(sEscapeIdentifier);
-                record = false;
-            }
-            else if (mPrevious == sEscape)
             {
                 mNext.push(sEscape);
                 mNext.push(sEscapeIdentifier);
@@ -95,8 +86,6 @@ namespace Files
             }
             if (!mSeenNonWhitespace && !isspace(character))
                 mSeenNonWhitespace = true;
-            if (record)
-                mPrevious = character;
         }
         int retval = mNext.front();
         mNext.pop();