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

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

Issue 5109791353470976: Issue #1234 - standardize some string conversions (Closed)
Patch Set: Created Aug. 6, 2014, 8:19 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/PluginClass.cpp ('k') | src/plugin/PluginSettings.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 "PluginFilter.h" 3 #include "PluginFilter.h"
4 #include "PluginSettings.h" 4 #include "PluginSettings.h"
5 #include "PluginClient.h" 5 #include "PluginClient.h"
6 #include "PluginClientFactory.h" 6 #include "PluginClientFactory.h"
7 #include "PluginMutex.h" 7 #include "PluginMutex.h"
8 #include "PluginSettings.h" 8 #include "PluginSettings.h"
9 #include "PluginSystem.h" 9 #include "PluginSystem.h"
10 #include "PluginClass.h" 10 #include "PluginClass.h"
(...skipping 675 matching lines...) Expand 10 before | Expand all | Expand 10 after
686 type = "OTHER"; 686 type = "OTHER";
687 687
688 std::map<int,CString>::const_iterator it = m_contentMapText.find(contentType ); 688 std::map<int,CString>::const_iterator it = m_contentMapText.find(contentType );
689 if (it != m_contentMapText.end()) 689 if (it != m_contentMapText.end())
690 { 690 {
691 type = it->second; 691 type = it->second;
692 } 692 }
693 } 693 }
694 694
695 CPluginClient* client = CPluginClient::GetInstance(); 695 CPluginClient* client = CPluginClient::GetInstance();
696 if (client->Matches(std::wstring(src), std::wstring(type), std::wstring(domain ))) 696 if (client->Matches(to_wstring(src), to_wstring(type), to_wstring(domain)))
697 { 697 {
698 if (addDebug) 698 if (addDebug)
699 { 699 {
700 DEBUG_FILTER("Filter::ShouldBlock " + type + " YES") 700 DEBUG_FILTER("Filter::ShouldBlock " + type + " YES")
701 701
702 #ifdef ENABLE_DEBUG_RESULT 702 #ifdef ENABLE_DEBUG_RESULT
703 CPluginDebug::DebugResultBlocking(type, src, domain); 703 CPluginDebug::DebugResultBlocking(type, src, domain);
704 #endif 704 #endif
705 } 705 }
706 return true; 706 return true;
707 } 707 }
708 return false; 708 return false;
709 } 709 }
OLDNEW
« no previous file with comments | « src/plugin/PluginClass.cpp ('k') | src/plugin/PluginSettings.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld