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

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

Issue 6523237609504768: Issue #276 - eliminate CString from CPluginMutex (Closed)
Patch Set: Created July 30, 2014, 5:56 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
« src/plugin/PluginMutex.h ('K') | « src/plugin/PluginMutex.cpp ('k') | no next file » | 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 #ifdef SUPPORT_FILTER 8 #ifdef SUPPORT_FILTER
9 #include "PluginFilter.h" 9 #include "PluginFilter.h"
10 #endif 10 #endif
(...skipping 15 matching lines...) Expand all
26 } 26 }
27 } 27 }
28 28
29 class TSettings 29 class TSettings
30 { 30 {
31 DWORD processorId; 31 DWORD processorId;
32 32
33 char sPluginId[44]; 33 char sPluginId[44];
34 }; 34 };
35 35
36
37 class CPluginSettingsLock : public CPluginMutex
38 {
39 public:
40 CPluginSettingsLock() : CPluginMutex("SettingsFile", PLUGIN_ERROR_MUTEX_SETTIN GS_FILE) {}
41 ~CPluginSettingsLock() {}
42
43 };
44
45
46 class CPluginSettingsTabLock : public CPluginMutex
47 {
48 public:
49 CPluginSettingsTabLock() : CPluginMutex("SettingsFileTab", PLUGIN_ERROR_MUTEX_ SETTINGS_FILE_TAB) {}
50 ~CPluginSettingsTabLock() {}
51 };
52
53 #ifdef SUPPORT_WHITELIST 36 #ifdef SUPPORT_WHITELIST
54 37
55 class CPluginSettingsWhitelistLock : public CPluginMutex 38 class CPluginSettingsWhitelistLock : public CPluginMutex
56 { 39 {
57 public: 40 public:
58 CPluginSettingsWhitelistLock() : CPluginMutex("SettingsFileWhitelist", PLUGIN_ ERROR_MUTEX_SETTINGS_FILE_WHITELIST) {} 41 CPluginSettingsWhitelistLock() : CPluginMutex(L"SettingsFileWhitelist", PLUGIN _ERROR_MUTEX_SETTINGS_FILE_WHITELIST) {}
59 ~CPluginSettingsWhitelistLock() {} 42 ~CPluginSettingsWhitelistLock() {}
60 }; 43 };
61 44
62 #endif 45 #endif
63 46
64 CPluginSettings* CPluginSettings::s_instance = NULL; 47 CPluginSettings* CPluginSettings::s_instance = NULL;
65 48
66 CComAutoCriticalSection CPluginSettings::s_criticalSectionLocal; 49 CComAutoCriticalSection CPluginSettings::s_criticalSectionLocal;
67 50
68 51
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 } 320 }
338 321
339 CString CPluginSettings::GetDocumentationLink() 322 CString CPluginSettings::GetDocumentationLink()
340 { 323 {
341 return CString(CPluginClient::GetInstance()->GetDocumentationLink().c_str()); 324 return CString(CPluginClient::GetInstance()->GetDocumentationLink().c_str());
342 } 325 }
343 326
344 327
345 328
346 #endif // SUPPORT_WHITELIST 329 #endif // SUPPORT_WHITELIST
OLDNEW
« src/plugin/PluginMutex.h ('K') | « src/plugin/PluginMutex.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld