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

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

Issue 29347788: Issue #1234 - Remove transitional conversion functions for CString (Closed)
Patch Set: Created July 15, 2016, 6:13 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/ATL_Deprecate.cpp ('k') | src/plugin/PluginDebug.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2016 Eyeo GmbH 3 * Copyright (C) 2006-2016 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 if (SUCCEEDED(pEl->get_style(&pStyle)) && pStyle) 139 if (SUCCEEDED(pEl->get_style(&pStyle)) && pStyle)
140 { 140 {
141 CComBSTR bstrDisplay; 141 CComBSTR bstrDisplay;
142 if (SUCCEEDED(pStyle->get_display(&bstrDisplay)) && ToWstring(bstrDisplay) = = L"none") 142 if (SUCCEEDED(pStyle->get_display(&bstrDisplay)) && ToWstring(bstrDisplay) = = L"none")
143 { 143 {
144 return; 144 return;
145 } 145 }
146 static const CComBSTR sbstrNone(L"none"); 146 static const CComBSTR sbstrNone(L"none");
147 if (SUCCEEDED(pStyle->put_display(sbstrNone))) 147 if (SUCCEEDED(pStyle->put_display(sbstrNone)))
148 { 148 {
149 DEBUG_HIDE_EL(ToWstring(indent) + L"HideEl::Hiding " + ToWstring(type) + L " url:" + url) 149 DEBUG_HIDE_EL(ToWstring(indent) + L"HideEl::Hiding " + type + L" url:" + u rl)
RastaJedi 2016/07/16 19:41:18 You said you removed last reference to `ToWstring(
RastaJedi 2016/07/16 19:46:06 Ignore me!
Eric 2016/07/17 14:24:22 No, this is right. The macro DEBUG_HIDE_EL is tur
150 #ifdef ENABLE_DEBUG_RESULT 150 #ifdef ENABLE_DEBUG_RESULT
151 if (isDebug) 151 if (isDebug)
152 { 152 {
153 CPluginDebug::DebugResultHiding(type, url, L"-"); 153 CPluginDebug::DebugResultHiding(type, url, L"-");
154 } 154 }
155 #endif // ENABLE_DEBUG_RESULT 155 #endif // ENABLE_DEBUG_RESULT
156 } 156 }
157 } 157 }
158 } 158 }
OLDNEW
« no previous file with comments | « src/plugin/ATL_Deprecate.cpp ('k') | src/plugin/PluginDebug.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld