diff --git a/checks/settings.cpp b/checks/settings.cpp index 571bfac90..b7b960fad 100644 --- a/checks/settings.cpp +++ b/checks/settings.cpp @@ -37,10 +37,9 @@ #include #include #include -using namespace std; -string checks_settings_url () +std::string checks_settings_url () { return "checks/settings"; } @@ -56,9 +55,9 @@ bool checks_settings_acl ([[maybe_unused]] Webserver_Request& webserver_request) } -string checks_settings (Webserver_Request& webserver_request) +std::string checks_settings (Webserver_Request& webserver_request) { - string page {}; + std::string page {}; Assets_Header header = Assets_Header (translate("Manage Checks"), webserver_request); header.add_bread_crumb (menu_logic_settings_menu (), menu_logic_settings_text ()); page = header.run (); @@ -66,9 +65,9 @@ string checks_settings (Webserver_Request& webserver_request) if (webserver_request.query.count ("bible")) { - string bible = webserver_request.query["bible"]; + const std::string bible = webserver_request.query["bible"]; if (bible.empty()) { - Dialog_List dialog_list = Dialog_List ("settings", translate("Select which Bible to manage"), string(), string()); + Dialog_List dialog_list = Dialog_List ("settings", translate("Select which Bible to manage"), std::string(), std::string()); std::vector bibles = access_bible::bibles (webserver_request); for (const auto & selectable_bible : bibles) { dialog_list.add_row (selectable_bible, "bible", selectable_bible); @@ -79,7 +78,7 @@ string checks_settings (Webserver_Request& webserver_request) webserver_request.database_config_user()->setBible (bible); } } - string bible = access_bible::clamp (webserver_request, webserver_request.database_config_user()->getBible ()); + const std::string bible = access_bible::clamp (webserver_request, webserver_request.database_config_user()->getBible ()); if (webserver_request.query.count ("run")) { @@ -89,8 +88,8 @@ string checks_settings (Webserver_Request& webserver_request) } - string checkbox = webserver_request.post ["checkbox"]; - bool checked = filter::strings::convert_to_bool (webserver_request.post ["checked"]); + const std::string checkbox = webserver_request.post ["checkbox"]; + const bool checked = filter::strings::convert_to_bool (webserver_request.post ["checked"]); if (checkbox == "doublespacesusfm") { diff --git a/checks/verses.cpp b/checks/verses.cpp index f02e54497..a18e60451 100644 --- a/checks/verses.cpp +++ b/checks/verses.cpp @@ -44,7 +44,7 @@ void checks_verses::missing_punctuation_at_end (const std::string& bible, int bo if (verse == 0) continue; if (text.empty ()) continue; for (const auto & ignore_text : ignores) { - text = filter::strings::replace (ignore_text, string(), text); + text = filter::strings::replace (ignore_text, std::string(), text); } const size_t text_length = filter::strings::unicode_string_length (text); const string lastCharacter = filter::strings::unicode_string_substr (text, text_length - 1, 1); diff --git a/checksum/logic.cpp b/checksum/logic.cpp index adbb4f540..e14e85982 100644 --- a/checksum/logic.cpp +++ b/checksum/logic.cpp @@ -78,7 +78,7 @@ string checksum_logic::get_book (Webserver_Request& webserver_request, const std for (auto chapter : chapters) { checksums.push_back (get_chapter (webserver_request, bible, book, chapter)); } - string checksum = filter::strings::implode (checksums, string()); + string checksum = filter::strings::implode (checksums, std::string()); checksum = md5 (checksum); return checksum; } @@ -92,7 +92,7 @@ string checksum_logic::get_bible (Webserver_Request& webserver_request, const st for (auto book : books) { checksums.push_back (get_book (webserver_request, bible, book)); } - string checksum = filter::strings::implode (checksums, string()); + string checksum = filter::strings::implode (checksums, std::string()); checksum = md5 (checksum); return checksum; } @@ -105,7 +105,7 @@ string checksum_logic::get_bibles (Webserver_Request& webserver_request, const s for (const auto & bible : bibles) { checksums.push_back (get_bible (webserver_request, bible)); } - string checksum = filter::strings::implode (checksums, string()); + string checksum = filter::strings::implode (checksums, std::string()); checksum = md5 (checksum); return checksum; } diff --git a/edit/save.cpp b/edit/save.cpp index f906482b3..aa1961d20 100644 --- a/edit/save.cpp +++ b/edit/save.cpp @@ -90,7 +90,7 @@ string edit_save (Webserver_Request& webserver_request) return translate("Save failure"); } - if (!access_bible::book_write (webserver_request, string(), bible, book)) { + if (!access_bible::book_write (webserver_request, std::string(), bible, book)) { return translate("No write access"); } diff --git a/edit/update.cpp b/edit/update.cpp index 4bdfc3e87..677368634 100644 --- a/edit/update.cpp +++ b/edit/update.cpp @@ -141,7 +141,7 @@ string edit_update (Webserver_Request& webserver_request) bool bible_write_access = false; if (good2go) { - bible_write_access = access_bible::book_write (webserver_request, string(), bible, book); + bible_write_access = access_bible::book_write (webserver_request, std::string(), bible, book); } diff --git a/editone2/save.cpp b/editone2/save.cpp index 954be74dc..7a2e0a34b 100644 --- a/editone2/save.cpp +++ b/editone2/save.cpp @@ -99,7 +99,7 @@ string editone2_save (Webserver_Request& webserver_request) } - if (!access_bible::book_write (webserver_request, string(), bible, book)) { + if (!access_bible::book_write (webserver_request, std::string(), bible, book)) { return translate ("No write access"); } diff --git a/editone2/update.cpp b/editone2/update.cpp index 7f6fbb891..3de4b3218 100644 --- a/editone2/update.cpp +++ b/editone2/update.cpp @@ -142,7 +142,7 @@ string editone2_update (Webserver_Request& webserver_request) bool bible_write_access = false; if (good2go) { - bible_write_access = access_bible::book_write (webserver_request, string(), bible, book); + bible_write_access = access_bible::book_write (webserver_request, std::string(), bible, book); } diff --git a/editor/html2usfm.cpp b/editor/html2usfm.cpp index 3ad0bac86..426a17da9 100644 --- a/editor/html2usfm.cpp +++ b/editor/html2usfm.cpp @@ -500,7 +500,7 @@ string editor_export_verse_quill (string stylesheet, string html) string usfm = editor_export.get (); // Remove that recognizable style converted to USFM. - usfm = filter::strings::replace (R"(\)" + style, string(), usfm); + usfm = filter::strings::replace (R"(\)" + style, std::string(), usfm); usfm = filter::strings::trim (usfm); return usfm; diff --git a/editusfm/save.cpp b/editusfm/save.cpp index 64b5c3594..830ae0cef 100644 --- a/editusfm/save.cpp +++ b/editusfm/save.cpp @@ -118,7 +118,7 @@ string editusfm_save (Webserver_Request& webserver_request) // Check on write access. - if (access_bible::book_write (webserver_request, string(), bible, book)) { + if (access_bible::book_write (webserver_request, std::string(), bible, book)) { // Safely store the chapter. string explanation; string message = filter::usfm::safely_store_chapter (webserver_request, bible, book, chapter, chapter_data_to_save, explanation); diff --git a/filter/google.cpp b/filter/google.cpp index 8b14e9e63..85ec3ef2f 100644 --- a/filter/google.cpp +++ b/filter/google.cpp @@ -40,7 +40,7 @@ tuple get_json_key_value_error () string path = config::logic::google_translate_json_key_path (); if (!file_or_dir_exists (path)) { - return { string(), "Cannot find the JSON key to access Google Translate. Looking for this file: " + path }; + return { std::string(), "Cannot find the JSON key to access Google Translate. Looking for this file: " + path }; } string error; diff --git a/filter/url.cpp b/filter/url.cpp index 540c2d591..88208d4db 100644 --- a/filter/url.cpp +++ b/filter/url.cpp @@ -190,7 +190,7 @@ string filter_url_dirname_internal (string url, const char * separator) } size_t pos = url.find_last_of (separator); if (pos != std::string::npos) url = url.substr (0, pos); - else url = string(); + else url = std::string(); } if (url.empty ()) url = "."; return url; diff --git a/mimetic098/contenttype.cxx b/mimetic098/contenttype.cxx index 3e1ef5208..b2174327c 100644 --- a/mimetic098/contenttype.cxx +++ b/mimetic098/contenttype.cxx @@ -91,7 +91,7 @@ using namespace std; const char ContentType::label[] = "Content-Type"; int ContentType::Boundary::ms_i = 0; -string ContentType::Boundary::ms_common_boundary = string(); +string ContentType::Boundary::ms_common_boundary = std::string(); ContentType::Boundary::Boundary() diff --git a/mimetic098/utils.cxx b/mimetic098/utils.cxx index 01420c246..d8f9634fc 100644 --- a/mimetic098/utils.cxx +++ b/mimetic098/utils.cxx @@ -129,7 +129,7 @@ struct Int return m_i; } - operator string() const + operator std::string() const { return m_si; } diff --git a/pugixml/pugixml.cpp b/pugixml/pugixml.cpp index f1a6c7e04..dee2b1467 100644 --- a/pugixml/pugixml.cpp +++ b/pugixml/pugixml.cpp @@ -9599,7 +9599,7 @@ PUGI__NS_BEGIN ast_func_namespace_uri_1, // namespace-uri(left) ast_func_name_0, // name() ast_func_name_1, // name(left) - ast_func_string_0, // string() + ast_func_string_0, // std::string() ast_func_string_1, // string(left) ast_func_concat, // concat(left, right, siblings) ast_func_starts_with, // starts_with(left, right) diff --git a/resource/external.cpp b/resource/external.cpp index 6eadd6fb5..5ed64a6e1 100644 --- a/resource/external.cpp +++ b/resource/external.cpp @@ -393,7 +393,7 @@ string gbs_plus_processor (string url, int book, [[maybe_unused]] int chapter, i post ["slug_id"] = bits[11]; post ["book_id"] = filter::strings::convert_to_string(book); string error {}; - string annotation_html {filter_url_http_post (annotation_url, string(), post, error, false, false, {})}; + string annotation_html {filter_url_http_post (annotation_url, std::string(), post, error, false, false, {})}; if (error.empty()) { annotation_html = filter::strings::fix_invalid_html_gumbo (annotation_html); pugi::xml_document annotation_document {}; diff --git a/resource/select.cpp b/resource/select.cpp index 81e5a9f3b..7ab714b33 100644 --- a/resource/select.cpp +++ b/resource/select.cpp @@ -237,7 +237,7 @@ string resource_select (Webserver_Request& webserver_request) // One of those properties is the title. // This selection mechanism here shows that title only. if (webserver_request.query.count ("comparative")) { - Dialog_List dialog_list = Dialog_List (caller, translate("Select a Comparative resource"), disconnected_info, string(), true); + Dialog_List dialog_list = Dialog_List (caller, translate("Select a Comparative resource"), disconnected_info, std::string(), true); dialog_list.add_query ("page", webserver_request.query["page"]); if (is_def) dialog_list.add_query ("type", webserver_request.query["type"]); std::vector resources; @@ -266,7 +266,7 @@ string resource_select (Webserver_Request& webserver_request) // One of those properties is the title. // This selection mechanism here shows that title only. if (webserver_request.query.count ("translated")) { - Dialog_List dialog_list = Dialog_List (caller, translate("Select a Translated resource"), disconnected_info, string(), true); + Dialog_List dialog_list = Dialog_List (caller, translate("Select a Translated resource"), disconnected_info, std::string(), true); dialog_list.add_query ("page", webserver_request.query["page"]); if (is_def) dialog_list.add_query ("type", webserver_request.query["type"]); std::vector resources; diff --git a/resource/translated1edit.cpp b/resource/translated1edit.cpp index da13b7720..eecccd49d 100644 --- a/resource/translated1edit.cpp +++ b/resource/translated1edit.cpp @@ -96,7 +96,7 @@ string resource_translated1edit (Webserver_Request& webserver_request) if (webserver_request.query.count ("original")) { string value = webserver_request.query["original"]; if (value.empty()) { - Dialog_List dialog_list = Dialog_List ("translated1edit", translate("Select a resource to be used as the original resource"), translate ("The original resource will be translated from the source language to the target language."), string()); + Dialog_List dialog_list = Dialog_List ("translated1edit", translate("Select a resource to be used as the original resource"), translate ("The original resource will be translated from the source language to the target language."), std::string()); dialog_list.add_query ("name", name); std::vector resources = resource_logic_get_names (webserver_request, true); for (const auto & resource : resources) { @@ -115,7 +115,7 @@ string resource_translated1edit (Webserver_Request& webserver_request) if (webserver_request.query.count ("source")) { string value = webserver_request.query["source"]; if (value.empty()) { - Dialog_List dialog_list = Dialog_List ("translated1edit", translate("Select the language of the original resource"), translate ("The language the original resource is written in."), string()); + Dialog_List dialog_list = Dialog_List ("translated1edit", translate("Select the language of the original resource"), translate ("The language the original resource is written in."), std::string()); dialog_list.add_query ("name", name); std::vector > languages = filter::google::get_languages ("en"); for (const auto & language : languages) { @@ -134,7 +134,7 @@ string resource_translated1edit (Webserver_Request& webserver_request) if (webserver_request.query.count ("target")) { string value = webserver_request.query["target"]; if (value.empty()) { - Dialog_List dialog_list = Dialog_List ("translated1edit", translate("Select the language to translate the resource into"), translate ("The language the resource will be translated into."), string()); + Dialog_List dialog_list = Dialog_List ("translated1edit", translate("Select the language to translate the resource into"), translate ("The language the resource will be translated into."), std::string()); dialog_list.add_query ("name", name); std::vector > languages = filter::google::get_languages ("en"); for (const auto & language : languages) { diff --git a/sources/abbott-smith.cpp b/sources/abbott-smith.cpp index fca334a65..5b97a8001 100644 --- a/sources/abbott-smith.cpp +++ b/sources/abbott-smith.cpp @@ -100,7 +100,7 @@ void sources_abbott_smith_parse_entry_element (Database_AbbottSmith * database_a // If there's more Strong's numbers in the entry, store those too, but without any lemma. for (auto strong2 : strongs) { - database_abbottsmith->store (string(), string(), strong2, contents); + database_abbottsmith->store (string(), std::string(), strong2, contents); } } diff --git a/statistics/statistics.cpp b/statistics/statistics.cpp index d9b79e8e5..fa57267cb 100644 --- a/statistics/statistics.cpp +++ b/statistics/statistics.cpp @@ -60,7 +60,7 @@ void statistics_statistics () size_t change_notificatons_count = 0; if (webserver_request.database_config_user()->getUserPendingChangesNotification (user)) { - string any_bible = string(); + string any_bible = std::string(); std::vector ids = database_modifications.getNotificationIdentifiers (user, any_bible); change_notificatons_count = ids.size(); body << "

" << translate("Number of change notifications") << ": " << ids.size() << "

" << std::endl; diff --git a/styles/indexm.cpp b/styles/indexm.cpp index 8bc1964db..e898fca99 100644 --- a/styles/indexm.cpp +++ b/styles/indexm.cpp @@ -84,7 +84,7 @@ string styles_indexm (Webserver_Request& webserver_request) } } if (webserver_request.query.count ("new")) { - Dialog_Entry dialog_entry = Dialog_Entry ("indexm", translate("Please enter the name for the new stylesheet"), string(), "new", string()); + Dialog_Entry dialog_entry = Dialog_Entry ("indexm", translate("Please enter the name for the new stylesheet"), std::string(), "new", std::string()); page += dialog_entry.run(); return page; } diff --git a/styles/sheets.cpp b/styles/sheets.cpp index 6d23b10b5..8fca3ce33 100644 --- a/styles/sheets.cpp +++ b/styles/sheets.cpp @@ -52,9 +52,9 @@ void Styles_Sheets::recreate () std::vector stylesheets = database_styles.getSheets (); for (const auto & stylesheet : stylesheets) { string path = get_location (stylesheet, false); - create (stylesheet, path, false, string()); + create (stylesheet, path, false, std::string()); path = get_location (stylesheet, true); - create (stylesheet, path, true, string()); + create (stylesheet, path, true, std::string()); } } diff --git a/styles/view.cpp b/styles/view.cpp index 2cc158ae9..ee36b4ec5 100644 --- a/styles/view.cpp +++ b/styles/view.cpp @@ -91,7 +91,7 @@ string styles_view (Webserver_Request& webserver_request) // The style's name. string name = marker_data.name; if (webserver_request.query.count ("name")) { - Dialog_Entry dialog_entry = Dialog_Entry ("view", translate("Please enter the name for the style"), name, "name", string()); + Dialog_Entry dialog_entry = Dialog_Entry ("view", translate("Please enter the name for the style"), name, "name", std::string()); dialog_entry.add_query ("sheet", sheet); dialog_entry.add_query ("style", style); page += dialog_entry.run (); @@ -110,7 +110,7 @@ string styles_view (Webserver_Request& webserver_request) // The style's info. string info = marker_data.info; if (webserver_request.query.count ("info")) { - Dialog_Entry dialog_entry = Dialog_Entry ("view", translate("Please enter the description for the style"), info, "info", string()); + Dialog_Entry dialog_entry = Dialog_Entry ("view", translate("Please enter the description for the style"), info, "info", std::string()); dialog_entry.add_query ("sheet", sheet); dialog_entry.add_query ("style", style); page += dialog_entry.run (); @@ -199,7 +199,7 @@ string styles_view (Webserver_Request& webserver_request) const string s = webserver_request.query["subtype"]; subtype = filter::strings::convert_to_int (s); if (s.empty()) { - Dialog_List dialog_list = Dialog_List ("view", translate("Would you like to change the sub type of this style?"), string(), string()); + Dialog_List dialog_list = Dialog_List ("view", translate("Would you like to change the sub type of this style?"), std::string(), std::string()); dialog_list.add_query ("sheet", sheet); dialog_list.add_query ("style", style); Database_Styles_Item style_data = database_styles.getMarkerData (sheet, style); @@ -259,7 +259,7 @@ string styles_view (Webserver_Request& webserver_request) if (webserver_request.query.count ("italic")) { const string s = webserver_request.query["italic"]; if (s.empty()) { - Dialog_List dialog_list = Dialog_List ("view", translate("Would you like to change whether this style is in italics?"), string(), string()); + Dialog_List dialog_list = Dialog_List ("view", translate("Would you like to change whether this style is in italics?"), std::string(), std::string()); dialog_list.add_query ("sheet", sheet); dialog_list.add_query ("style", style); Database_Styles_Item style_item = database_styles.getMarkerData (sheet, style); @@ -287,7 +287,7 @@ string styles_view (Webserver_Request& webserver_request) if (webserver_request.query.count ("bold")) { const string s = webserver_request.query["bold"]; if (s.empty()) { - Dialog_List dialog_list = Dialog_List ("view", translate("Would you like to change whether this style is in bold?"), string(), string()); + Dialog_List dialog_list = Dialog_List ("view", translate("Would you like to change whether this style is in bold?"), std::string(), std::string()); dialog_list.add_query ("sheet", sheet); dialog_list.add_query ("style", style); Database_Styles_Item style_data = database_styles.getMarkerData (sheet, style); @@ -315,7 +315,7 @@ string styles_view (Webserver_Request& webserver_request) if (webserver_request.query.count ("underline")) { const string s = webserver_request.query["underline"]; if (s.empty()) { - Dialog_List dialog_list = Dialog_List ("view", translate("Would you like to change whether this style is underlined?"), string(), string()); + Dialog_List dialog_list = Dialog_List ("view", translate("Would you like to change whether this style is underlined?"), std::string(), std::string()); dialog_list.add_query ("sheet", sheet); dialog_list.add_query ("style", style); Database_Styles_Item style_data = database_styles.getMarkerData (sheet, style); @@ -343,7 +343,7 @@ string styles_view (Webserver_Request& webserver_request) if (webserver_request.query.count ("smallcaps")) { const string s = webserver_request.query["smallcaps"]; if (s.empty()) { - Dialog_List dialog_list = Dialog_List ("view", translate("Would you like to change whether this style is in small caps?"), string(), string()); + Dialog_List dialog_list = Dialog_List ("view", translate("Would you like to change whether this style is in small caps?"), std::string(), std::string()); dialog_list.add_query ("sheet", sheet); dialog_list.add_query ("style", style); Database_Styles_Item style_data = database_styles.getMarkerData (sheet, style); @@ -387,7 +387,7 @@ string styles_view (Webserver_Request& webserver_request) // Text alignment. int justification = marker_data.justification; if (webserver_request.query.count ("alignment")) { - Dialog_List dialog_list = Dialog_List ("view", translate("Would you like to change the text alignment of this style?"), string(), string()); + Dialog_List dialog_list = Dialog_List ("view", translate("Would you like to change the text alignment of this style?"), std::string(), std::string()); dialog_list.add_query ("sheet", sheet); dialog_list.add_query ("style", style); for (int i = AlignmentLeft; i <= AlignmentJustify; i++) { @@ -629,7 +629,7 @@ string styles_view (Webserver_Request& webserver_request) case UserInt1NoteNumbering : view.enable_zone ("userint1_notenumbering"); if (webserver_request.query.count ("notenumbering")) { - Dialog_List dialog_list = Dialog_List ("view", translate("Would you like to change the numbering of the note?"), string(), string()); + Dialog_List dialog_list = Dialog_List ("view", translate("Would you like to change the numbering of the note?"), std::string(), std::string()); dialog_list.add_query ("sheet", sheet); dialog_list.add_query ("style", style); for (int i = NoteNumbering123; i <= NoteNumberingUser; i++) { @@ -680,7 +680,7 @@ string styles_view (Webserver_Request& webserver_request) case UserInt2NoteNumberingRestart : view.enable_zone ("userint2_notenumberingrestart"); if (webserver_request.query.count ("notenumberingrestart")) { - Dialog_List dialog_list = Dialog_List ("view", translate("Would you like to change when the note numbering restarts?"), string(), string()); + Dialog_List dialog_list = Dialog_List ("view", translate("Would you like to change when the note numbering restarts?"), std::string(), std::string()); dialog_list.add_query ("sheet", sheet); dialog_list.add_query ("style", style); for (int i = NoteRestartNumberingNever; i <= NoteRestartNumberingEveryChapter; i++) { @@ -701,7 +701,7 @@ string styles_view (Webserver_Request& webserver_request) case UserInt2EndnotePosition : view.enable_zone ("userint2_endnoteposition"); if (webserver_request.query.count ("endnoteposition")) { - Dialog_List dialog_list = Dialog_List ("view", translate("Would you like to change the position where to dump the endnotes?"), string(), string()); + Dialog_List dialog_list = Dialog_List ("view", translate("Would you like to change the position where to dump the endnotes?"), std::string(), std::string()); dialog_list.add_query ("sheet", sheet); dialog_list.add_query ("style", style); for (int i = EndNotePositionAfterBook; i <= EndNotePositionAtMarker; i++) { diff --git a/sync/logic.cpp b/sync/logic.cpp index 307b0c439..7c2a37d8e 100644 --- a/sync/logic.cpp +++ b/sync/logic.cpp @@ -145,7 +145,7 @@ vector Sync_Logic::create_range (int start, int end) string Sync_Logic::post (map & post, const std::string& url, string & error, bool burst) { error.clear (); - string response = filter_url_http_post (url, string(), post, error, burst, true, {}); + string response = filter_url_http_post (url, std::string(), post, error, burst, true, {}); if (error.empty ()) { // Success: Return response. return response; diff --git a/unittests/studylight.cpp b/unittests/studylight.cpp index c6e170e73..9966b6a78 100644 --- a/unittests/studylight.cpp +++ b/unittests/studylight.cpp @@ -46,7 +46,7 @@ TEST (studylight, logic) int book_num = static_cast (book_id); text = resource_logic_study_light_get (resource, book_num, 1, 1); if (text.empty ()) { - EXPECT_EQ (database::books::get_english_from_id (book_id) + " should not be empty - book " + to_string(static_cast(book_id)), string()); + EXPECT_EQ (database::books::get_english_from_id (book_id) + " should not be empty - book " + to_string(static_cast(book_id)), std::string()); } } diff --git a/unittests/styles.cpp b/unittests/styles.cpp index 6d8a294da..81da4304d 100644 --- a/unittests/styles.cpp +++ b/unittests/styles.cpp @@ -115,7 +115,7 @@ TEST (styles, css) // CSS. { - string css = Filter_Css::get_css ("class", string(), 0); + string css = Filter_Css::get_css ("class", std::string(), 0); string standard = ".class\n" @@ -123,7 +123,7 @@ TEST (styles, css) "}\n"; EXPECT_EQ (filter::strings::trim (standard), filter::strings::trim (css)); - css = Filter_Css::get_css ("class", string(), 101); + css = Filter_Css::get_css ("class", std::string(), 101); standard = ".class\n" "{\n" @@ -131,7 +131,7 @@ TEST (styles, css) "}\n"; EXPECT_EQ (filter::strings::trim (standard), filter::strings::trim (css)); - css = Filter_Css::get_css ("class", string(), 102); + css = Filter_Css::get_css ("class", std::string(), 102); standard = ".class\n" "{\n" @@ -139,7 +139,7 @@ TEST (styles, css) "}\n"; EXPECT_EQ (filter::strings::trim (standard), filter::strings::trim (css)); - css = Filter_Css::get_css ("class", string(), 110); + css = Filter_Css::get_css ("class", std::string(), 110); standard = ".class\n" "{\n" @@ -147,7 +147,7 @@ TEST (styles, css) "}\n"; EXPECT_EQ (filter::strings::trim (standard), filter::strings::trim (css)); - css = Filter_Css::get_css ("CLass", string(), 130); + css = Filter_Css::get_css ("CLass", std::string(), 130); standard = ".CLass\n" "{\n" @@ -155,7 +155,7 @@ TEST (styles, css) "}\n"; EXPECT_EQ (filter::strings::trim (standard), filter::strings::trim (css)); - css = Filter_Css::get_css ("CLass", string(), 1322); + css = Filter_Css::get_css ("CLass", std::string(), 1322); standard = ".CLass\n" "{\n" diff --git a/unittests/url.cpp b/unittests/url.cpp index 17162548f..8a27795ff 100644 --- a/unittests/url.cpp +++ b/unittests/url.cpp @@ -176,7 +176,7 @@ TEST (filter, url) #endif EXPECT_EQ ("", result); std::map values = {pair ("a", "value1"), pair ("b", "value2")}; - result = filter_url_http_post ("http://localhost/none", string(), values, error, false, false, {}); + result = filter_url_http_post ("http://localhost/none", std::string(), values, error, false, false, {}); #ifndef HAVE_CLIENT EXPECT_EQ ("Couldn't connect to server", error); #endif diff --git a/user/account.cpp b/user/account.cpp index 5d885a28e..0eb8e8c5f 100644 --- a/user/account.cpp +++ b/user/account.cpp @@ -109,7 +109,7 @@ string user_account ([[maybe_unused]] Webserver_Request& webserver_request) string query = webserver_request.database_users()->updateEmailQuery (username, newemail); string subsequent_subject = translate("Email address change"); string subsequent_body = translate("The email address that belongs to your account has been changed successfully."); - confirm_worker.setup (newemail, string(), initial_subject, initial_body, query, subsequent_subject, subsequent_body); + confirm_worker.setup (newemail, std::string(), initial_subject, initial_body, query, subsequent_subject, subsequent_body); actions_taken = true; success_messages.push_back (translate("A verification email was sent to") + " " + newemail); }