0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid using double-quote as a C++ raw string delimiter-char

Browse source 
This avoids warnings from xgettext, which considers `R"""..."""` to be
sufficiently unusual that it doesn't have support for it. This version
uses an empty d-char-sequence, as the only string which needed a longer
delimiter was removed in 10997c39a3.
This commit is contained in:
Steve Cotton 2023-06-06 20:37:14 +02:00 • committed by Steve Cotton
parent ff8d4d063f
commit 8d2d58d6ec
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ai/composite/component.cpp
View file

@ -134,7 +134,7 @@ static component *find_component(component *root, const std::string &path, path_
}
//match path elements in [modify_ai] tag
boost::regex re(R"""(([^\.^\[]+)(\[(\d*)\]|\[([^\]]+)\]|()))""");
boost::regex re(R"(([^\.^\[]+)(\[(\d*)\]|\[([^\]]+)\]|()))");
const int sub_matches[] {1,3,4};
boost::sregex_token_iterator i(path.begin(), path.end(), re, sub_matches);
boost::sregex_token_iterator j;

2
src/editor/map/map_context.cpp
View file

@ -835,7 +835,7 @@ bool map_context::save_map()
} else {
std::string map_string = filesystem::read_file(get_filename());
boost::regex rexpression_map_data(R"""((.*map_data\s*=\s*")(.+?)(".*))""");
boost::regex rexpression_map_data(R"((.*map_data\s*=\s*")(.+?)(".*))");
boost::smatch matched_map_data;
if(boost::regex_search(map_string, matched_map_data, rexpression_map_data,

4
src/server/campaignd/server.cpp
View file

@ -101,7 +101,7 @@ const std::string default_web_url = "https://add-ons.wesnoth.org/";
* The text is intended for display on the client with Pango markup enabled and
* sent by the server as-is, so it ought to be formatted accordingly.
*/
const std::string default_license_notice = R"""(<span size='x-large'>General Rules</span>
const std::string default_license_notice = R"(<span size='x-large'>General Rules</span>
The current version of the server rules can be found at: https://r.wesnoth.org/t51347
@ -117,7 +117,7 @@ All content within add-ons uploaded to this server must be licensed under the te
<b>By uploading content to this server, you certify that you have the right to:</b>
a) release all included art and audio explicitly denoted with a Creative Commons license in the prescribed manner under that license; <b>and</b>
b) release all other included content under the terms of the chosen versions of the GNU GPL.)""";
b) release all other included content under the terms of the chosen versions of the GNU GPL.)";
bool timing_reports_enabled = false;

4
src/tests/gui/test_gui2.cpp
View file

@ -753,9 +753,9 @@ struct dialog_tester<addon_connect>
template<>
struct dialog_tester<addon_license_prompt>
{
std::string license_terms = R"""(Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis ante nibh, dignissim ullamcorper tristique eget, condimentum sit amet enim. Aenean dictum pulvinar lacinia. Etiam eleifend, leo sed efficitur consectetur, augue nulla ornare lectus, vitae molestie lacus risus vitae libero. Quisque odio nunc, porttitor eget fermentum sit amet, faucibus eu risus. Praesent sit amet lacus tortor. Suspendisse volutpat quam vitae ipsum fermentum, in vulputate metus egestas. Nulla id consequat ex. Nulla ac dignissim nisl, nec euismod lectus. Duis vitae dolor ornare, convallis justo in, porta dui.
std::string license_terms = R"(Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis ante nibh, dignissim ullamcorper tristique eget, condimentum sit amet enim. Aenean dictum pulvinar lacinia. Etiam eleifend, leo sed efficitur consectetur, augue nulla ornare lectus, vitae molestie lacus risus vitae libero. Quisque odio nunc, porttitor eget fermentum sit amet, faucibus eu risus. Praesent sit amet lacus tortor. Suspendisse volutpat quam vitae ipsum fermentum, in vulputate metus egestas. Nulla id consequat ex. Nulla ac dignissim nisl, nec euismod lectus. Duis vitae dolor ornare, convallis justo in, porta dui.
Sed faucibus nibh sit amet ligula porta, non malesuada nibh tristique. Maecenas aliquam diam non eros convallis mattis. Proin rhoncus condimentum leo, sed condimentum magna. Phasellus cursus condimentum lacus, sed sodales lacus. Sed pharetra dictum metus, eget dictum nibh lobortis imperdiet. Nunc tempus sollicitudin bibendum. In porttitor interdum orci. Curabitur vitae nibh vestibulum, condimentum lectus quis, condimentum dui. In quis cursus nisl. Maecenas semper neque eu ipsum aliquam, id porta ligula lacinia. Integer sed blandit ex, eu accumsan magna.)""";
Sed faucibus nibh sit amet ligula porta, non malesuada nibh tristique. Maecenas aliquam diam non eros convallis mattis. Proin rhoncus condimentum leo, sed condimentum magna. Phasellus cursus condimentum lacus, sed sodales lacus. Sed pharetra dictum metus, eget dictum nibh lobortis imperdiet. Nunc tempus sollicitudin bibendum. In porttitor interdum orci. Curabitur vitae nibh vestibulum, condimentum lectus quis, condimentum dui. In quis cursus nisl. Maecenas semper neque eu ipsum aliquam, id porta ligula lacinia. Integer sed blandit ex, eu accumsan magna.)";
addon_license_prompt* create()
{
return new addon_license_prompt(license_terms);