Unified Diff: src/plugin/PluginUserSettings.cpp
Issue 11062004:
Don't use std::string in the plugin, convert when communicating with the engine (Closed)
Patch Set:
Created June 27, 2013, 10:37 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« src/plugin/PluginFilter.cpp ('K')
|
« src/plugin/PluginTabBase.cpp ('k')
|
src/plugin/PluginWbPassThrough.cpp » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: src/plugin/PluginUserSettings.cpp |
| =================================================================== |
| --- a/src/plugin/PluginUserSettings.cpp |
| +++ b/src/plugin/PluginUserSettings.cpp |
| @@ -275,7 +275,7 @@ |
| if (pVarResult) |
| { |
| - std::vector<std::string> whiteList = settings->GetWhiteListedDomainList(); |
| + std::vector<std::wstring> whiteList = settings->GetWhiteListedDomainList(); |
| CString sWhiteList; |
| for (size_t i = 0; i < whiteList.size(); i++) |
| { |
| @@ -283,7 +283,7 @@ |
| { |
| sWhiteList += ','; |
| } |
| - sWhiteList += CString(CA2W(whiteList[i].c_str(), CP_UTF8)); |
| + sWhiteList += CString(whiteList[i].c_str()); |
| } |
| pVarResult->vt = VT_BSTR; |
« src/plugin/PluginFilter.cpp ('K')
|
« src/plugin/PluginTabBase.cpp ('k')
|
src/plugin/PluginWbPassThrough.cpp » ('j')
|
no next file with comments »
