Issue 1795 - Add helper std::wstring GetLocationUrl(IWebBrowser2& browser)

src/plugin/PluginUtil.cpp

 #include "PluginStdAfx.h"
 #include <algorithm>
 #include <stdexcept>
 #include <vector>
 
 #include "../shared/Utils.h"
 #include "PluginUtil.h"
 #include "PluginSettings.h"
 
 std::wstring HtmlFolderPath()
@@ skipping 10 matching lines @@
 {
   return FileUrl(HtmlFolderPath() + L"firstRun.html");
 }
 
 std::wstring FileUrl(const std::wstring& path)
 {
   std::wstring url = path;
   std::replace(url.begin(), url.end(), L'\\', L'/');
   return L"file:///" + url;
 }
+
+std::wstring GetLocationUrl(IWebBrowser2& browser)
+{
+  std::wstring retValue;

[Eric, 2015/01/13 17:04:20]

Use of this variable requires extraneous assignments.

[sergei, 2015/01/29 12:42:11]

I've changed the body of this function and removed `retValue`.

+  ATL::CComBSTR locationUrl;
+  if (SUCCEEDED(browser.get_LocationURL(&locationUrl)) && !!locationUrl)

[Eric, 2015/01/13 17:04:20]

No need for double negation. Testing a converted pointer as boolean is
completely reliable, and it's the pattern used for CComBSTR extensively in the
code.

+  {
+    retValue.assign(locationUrl, locationUrl.Length());

[Eric, 2015/01/13 17:04:20]

return std::wstring(locationUrl, locationUrl.Length());

+  }
+  return retValue;

[Eric, 2015/01/13 17:04:20]

return L"";
 -- or --
return std:;wstring();

+}