Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: src/plugin/PluginSettings.cpp

Issue 5491870822039552: Issue #1234 - Remove old versions of ToWstring and ToCString (Closed)
Patch Set: Created Jan. 13, 2015, 3:35 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/plugin/PluginFilter.cpp ('k') | src/plugin/PluginWbPassThrough.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #include "PluginStdAfx.h" 1 #include "PluginStdAfx.h"
2 2
3 #include <Wbemidl.h> 3 #include <Wbemidl.h>
4 #include <time.h> 4 #include <time.h>
5 #include "PluginSettings.h" 5 #include "PluginSettings.h"
6 #include "PluginClient.h" 6 #include "PluginClient.h"
7 #include "PluginSystem.h" 7 #include "PluginSystem.h"
8 #include "PluginFilter.h" 8 #include "PluginFilter.h"
9 #include "PluginMutex.h" 9 #include "PluginMutex.h"
10 #include "../shared/Utils.h" 10 #include "../shared/Utils.h"
11 #include <memory> 11 #include <memory>
12 12
13 13
14 // IE functions 14 // IE functions
15 #pragma comment(lib, "iepmapi.lib") 15 #pragma comment(lib, "iepmapi.lib")
16 16
17 #include <knownfolders.h> 17 #include <knownfolders.h>
18 18
19 namespace 19 namespace
20 { 20 {
21 std::wstring CreateDomainWhitelistingFilter(const CString& domain) 21 std::wstring CreateDomainWhitelistingFilter(const CString& domain)
22 { 22 {
23 return L"@@||" + to_wstring(domain) + L"^$document"; 23 return L"@@||" + ToWstring(domain) + L"^$document";
24 } 24 }
25 } 25 }
26 26
27 class TSettings 27 class TSettings
28 { 28 {
29 DWORD processorId; 29 DWORD processorId;
30 30
31 char sPluginId[44]; 31 char sPluginId[44];
32 }; 32 };
33 33
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 if (subscription->url != aaUrl) 258 if (subscription->url != aaUrl)
259 { 259 {
260 return CString(subscription->url.c_str()); 260 return CString(subscription->url.c_str());
261 } 261 }
262 } 262 }
263 return CString(L""); 263 return CString(L"");
264 } 264 }
265 265
266 CString CPluginSettings::GetAppLocale() 266 CString CPluginSettings::GetAppLocale()
267 { 267 {
268 return to_CString(GetBrowserLanguage()); 268 return ToCString(GetBrowserLanguage());
269 } 269 }
270 270
271 CString CPluginSettings::GetDocumentationLink() 271 CString CPluginSettings::GetDocumentationLink()
272 { 272 {
273 return CString(CPluginClient::GetInstance()->GetDocumentationLink().c_str()); 273 return CString(CPluginClient::GetInstance()->GetDocumentationLink().c_str());
274 } 274 }
OLDNEW
« no previous file with comments | « src/plugin/PluginFilter.cpp ('k') | src/plugin/PluginWbPassThrough.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld