compiled/subscription/UserDefinedSubscription.cpp - Issue 29721753: Issue 6180 - use ABP_TEXT everywhere in order to let String be a UTF-8 string

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified 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.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: compiled/subscription/UserDefinedSubscription.cpp

diff --git a/compiled/subscription/UserDefinedSubscription.cpp b/compiled/subscription/UserDefinedSubscription.cpp

index 5e3972e09d80281d08e5f9c192b7ae129a2c6ce2..dd1bf2de4c2abe484562c41ba7875f5a0415c4de 100644

--- a/compiled/subscription/UserDefinedSubscription.cpp

+++ b/compiled/subscription/UserDefinedSubscription.cpp

@@ -93,14 +93,14 @@ OwnedString UserDefinedSubscription::Serialize() const

OwnedString result(Subscription::Serialize());

if (!IsGeneric())

{

- result.append(u"defaults="_str);

+ result.append(ABP_TEXT("defaults="_str));

if (mDefaults & FilterCategory::BLOCKING)

- result.append(u" blocking"_str);

+ result.append(ABP_TEXT(" blocking"_str));

if (mDefaults & FilterCategory::WHITELIST)

- result.append(u" whitelist"_str);

+ result.append(ABP_TEXT(" whitelist"_str));

if (mDefaults & FilterCategory::ELEMHIDE)

- result.append(u" elemhide"_str);

- result.append(u'\n');

+ result.append(ABP_TEXT(" elemhide"_str));

+ result.append(ABP_TEXT('\n'));

}

return result;

}

« no previous file with comments | « compiled/subscription/Subscription.cpp ('k') | test/compiled/Filter.cpp » ('j') | no next file with comments »