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

Side by Side Diff: compiled/subscription/UserDefinedSubscription.cpp

Issue 29721753: Issue 6180 - use ABP_TEXT everywhere in order to let String be a UTF-8 string (Closed) Base URL: https://github.com/adblockplus/adblockpluscore.git@adb2678354813ce5b6de095072954c5a784a7bc4
Patch Set: rebase Created March 15, 2018, 1:53 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 | « compiled/subscription/Subscription.cpp ('k') | test/compiled/Filter.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 /* 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-present eyeo GmbH 3 * Copyright (C) 2006-present 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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 *filter.get(), this, pos); 86 *filter.get(), this, pos);
87 } 87 }
88 return true; 88 return true;
89 } 89 }
90 90
91 OwnedString UserDefinedSubscription::Serialize() const 91 OwnedString UserDefinedSubscription::Serialize() const
92 { 92 {
93 OwnedString result(Subscription::Serialize()); 93 OwnedString result(Subscription::Serialize());
94 if (!IsGeneric()) 94 if (!IsGeneric())
95 { 95 {
96 result.append(u"defaults="_str); 96 result.append(ABP_TEXT("defaults="_str));
97 if (mDefaults & FilterCategory::BLOCKING) 97 if (mDefaults & FilterCategory::BLOCKING)
98 result.append(u" blocking"_str); 98 result.append(ABP_TEXT(" blocking"_str));
99 if (mDefaults & FilterCategory::WHITELIST) 99 if (mDefaults & FilterCategory::WHITELIST)
100 result.append(u" whitelist"_str); 100 result.append(ABP_TEXT(" whitelist"_str));
101 if (mDefaults & FilterCategory::ELEMHIDE) 101 if (mDefaults & FilterCategory::ELEMHIDE)
102 result.append(u" elemhide"_str); 102 result.append(ABP_TEXT(" elemhide"_str));
103 result.append(u'\n'); 103 result.append(ABP_TEXT('\n'));
104 } 104 }
105 return result; 105 return result;
106 } 106 }
OLDNEW
« no previous file with comments | « compiled/subscription/Subscription.cpp ('k') | test/compiled/Filter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld