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

Delta Between Two Patch Sets: src/plugin/PluginSettings.cpp

Issue 10836037: Share code for data path retrieval in engine and plugin (Closed)
Left Patch Set: Fixed issues in previous patch Created June 4, 2013, 10:14 a.m.
Right Patch Set: Fixed nit Created June 4, 2013, 10:38 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « src/plugin/PluginSettings.h ('k') | src/plugin/abp.h » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
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 "PluginIniFileW.h" 5 #include "PluginIniFileW.h"
6 #include "PluginIniFile.h" 6 #include "PluginIniFile.h"
7 #include "PluginSettings.h" 7 #include "PluginSettings.h"
8 #include "PluginDictionary.h" 8 #include "PluginDictionary.h"
9 #include "PluginClient.h" 9 #include "PluginClient.h"
10 #include "PluginChecksum.h" 10 #include "PluginChecksum.h"
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 m_isDirty = true; 304 m_isDirty = true;
305 DEBUG_SETTINGS("Settings::Configuration plugin update version:" + it->seco nd); 305 DEBUG_SETTINGS("Settings::Configuration plugin update version:" + it->seco nd);
306 } 306 }
307 } 307 }
308 308
309 return true; 309 return true;
310 } 310 }
311 311
312 CString CPluginSettings::GetDataPath(const CString& filename) 312 CString CPluginSettings::GetDataPath(const CString& filename)
313 { 313 {
314 std::wstring path = ::GetAppDataPath() + L"\\" + (LPCWSTR)filename; 314 std::wstring path = ::GetAppDataPath() + L"\\" + static_cast<LPCWSTR>(filename );
Felix Dahlke 2013/06/04 10:18:09 Shouldn't this be filename.c_str()? I'd prefer a C
Wladimir Palant 2013/06/04 10:39:03 It's CString so - no. Changed it into static_cast.
315 return CString(path.c_str()); 315 return CString(path.c_str());
316 } 316 }
317 317
318 CString CPluginSettings::GetSystemLanguage() 318 CString CPluginSettings::GetSystemLanguage()
319 { 319 {
320 CString language; 320 CString language;
321 CString country; 321 CString country;
322 322
323 DWORD bufSize = 256; 323 DWORD bufSize = 256;
324 int ccBuf = GetLocaleInfo(LOCALE_SYSTEM_DEFAULT, LOCALE_SISO639LANGNAME, langu age.GetBufferSetLength(bufSize), bufSize); 324 int ccBuf = GetLocaleInfo(LOCALE_SYSTEM_DEFAULT, LOCALE_SISO639LANGNAME, langu age.GetBufferSetLength(bufSize), bufSize);
(...skipping 1149 matching lines...) Expand 10 before | Expand all | Expand 10 after
1474 return CString(L""); 1474 return CString(L"");
1475 } 1475 }
1476 1476
1477 1477
1478 void CPluginSettings::RefreshFilterlist() 1478 void CPluginSettings::RefreshFilterlist()
1479 { 1479 {
1480 CPluginClient::GetInstance()->UpdateAllSubscriptions(); 1480 CPluginClient::GetInstance()->UpdateAllSubscriptions();
1481 } 1481 }
1482 1482
1483 #endif // SUPPORT_WHITELIST 1483 #endif // SUPPORT_WHITELIST
LEFTRIGHT

Powered by Google App Engine
This is Rietveld