Issue #1234 - Remove 'CString' from PluginFilter.*

src/shared/Utils.h

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 51 matching lines @@
 void ReplaceString(std::wstring& input, const std::wstring& placeholder, const std::wstring& replacement);
 
 /**
  * Returns the beginning of the URL which includes the scheme and hierarchical
  * part according to http://en.wikipedia.org/wiki/URI_scheme.
  */
 std::wstring GetSchemeAndHierarchicalPart(const std::wstring& url);
 
 std::wstring GetQueryString(const std::wstring& url);
 
+/*
+ * The method used below for trimming strings is taken from here:
+ *   http://stackoverflow.com/questions/216823/whats-the-best-way-to-trim-stdstring
+ */
+template<class C>
+bool isNotWhitespace(C x)
+{
+  return !std::isspace(x, std::locale::classic());
+};
+
+template<class T>
+void TrimStringInPlaceLeft(T& text)
+{
+  text.erase(text.begin(), std::find_if(text.begin(), text.end(), isNotWhitespace<T::value_type>));

[sergei, 2016/05/02 14:33:48]

Does it compile? I expect "typename" before "T::value_type".

[Eric, 2016/05/17 19:30:38]

Of course it compiles. Do _you_ post code to review that doesn't compile?

It has passed unit tests since the very first patch set. How would that have
happened if it didn't compile?

+}
+
+template<class T>
+void TrimStringInPlaceRight(T& text)
+{
+  text.erase(std::find_if(text.rbegin(), text.rend(), isNotWhitespace<T::value_type>).base(), text.end());
+}
+
+template<class T>
+void TrimStringInPlace(T& text)
+{
+  TrimStringInPlaceRight(text);
+  TrimStringInPlaceLeft(text);
+}
+
+template<class T>
+T TrimStringLeft(T text)
+{
+  TrimStringInPlaceLeft(text);
+  return text;
+}
+
+template<class T>
+T TrimStringRight(T text)
+{
+  TrimStringInPlaceRight(text);
+  return text;
+}
+
 template<class T>
 T TrimString(T text)
 {
-  // Via http://stackoverflow.com/questions/216823/whats-the-best-way-to-trim-stdstring
-  T trimmed(text);
-  std::function<bool(T::value_type)> isspace = std::bind(&std::isspace<T::value_type>, std::placeholders::_1, std::locale::classic());
-  trimmed.erase(trimmed.begin(), std::find_if(trimmed.begin(), trimmed.end(), std::not1(isspace)));
-  trimmed.erase(std::find_if(trimmed.rbegin(), trimmed.rend(), std::not1(isspace)).base(), trimmed.end());
-  return trimmed;
+  TrimStringInPlaceRight(text);
+  TrimStringInPlaceLeft(text);
+  return text;
 }
 
 #endif // UTILS_H