diff --git a/src/xtd.core/src/xtd/register_any_stringer.cpp b/src/xtd.core/src/xtd/register_any_stringer.cpp index 4b7151e116a4..475f00e3bb2a 100644 --- a/src/xtd.core/src/xtd/register_any_stringer.cpp +++ b/src/xtd.core/src/xtd/register_any_stringer.cpp @@ -4,7 +4,6 @@ #include "../../include/xtd/date_time.h" #include "../../include/xtd/time_span.h" -using namespace std; using namespace xtd; std::unordered_map> __any_stringer__ { diff --git a/src/xtd.core/src/xtd/time_zone_info.cpp b/src/xtd.core/src/xtd/time_zone_info.cpp index 9a66e6f0d45f..e80703ba5538 100644 --- a/src/xtd.core/src/xtd/time_zone_info.cpp +++ b/src/xtd.core/src/xtd/time_zone_info.cpp @@ -8,7 +8,6 @@ #undef __XTD_CORE_NATIVE_LIBRARY__ #include -using namespace std; using namespace std::chrono; using namespace xtd; @@ -141,8 +140,8 @@ xtd::date_time time_zone_info::convert_time_to_utc(const xtd::date_time& date_ti return xtd::date_time::specify_kind(date_time.to_universal_time(), date_time_kind::utc); } -const list& time_zone_info::get_system_time_zones() noexcept { - static auto system_time_zones = list {}; +const std::list& time_zone_info::get_system_time_zones() noexcept { + static auto system_time_zones = std::list {}; if (system_time_zones.size()) return system_time_zones; auto stzs = native::date_time::get_system_time_zones(); for_each(stzs.begin(), stzs.end(), [&](auto item) {system_time_zones.emplace_back(time_zone_info(item.id, ticks(item.base_utc_offset), item.daylight_name, item.display_name, item.standard_name, item.supports_daylight_saving_time));}); diff --git a/src/xtd.core/src/xtd/to_string.cpp b/src/xtd.core/src/xtd/to_string.cpp index ad78b71e1c92..c89fd3ca4298 100644 --- a/src/xtd.core/src/xtd/to_string.cpp +++ b/src/xtd.core/src/xtd/to_string.cpp @@ -1,8 +1,6 @@ #include "../../include/xtd/to_string.h" #include "../../include/xtd/ustring.h" -using namespace std; - namespace xtd { std::string to_string(const char* value, const std::string& fmt, const std::locale& loc) { return __string_formatter(fmt, value, loc); diff --git a/src/xtd.core/src/xtd/toolkit.cpp b/src/xtd.core/src/xtd/toolkit.cpp index 03cb61c70bf3..ba09f0103e30 100644 --- a/src/xtd.core/src/xtd/toolkit.cpp +++ b/src/xtd.core/src/xtd/toolkit.cpp @@ -1,6 +1,5 @@ #include "../../include/xtd/toolkit.h" -using namespace std; using namespace xtd; xtd::toolkit::toolkit(const xtd::ustring& name, const xtd::version& version, const xtd::ustring& description) : description_(description), name_(name), version_(version) { diff --git a/src/xtd.core/src/xtd/translator.cpp b/src/xtd.core/src/xtd/translator.cpp index 6db100a32de3..fae6ce3e88b4 100644 --- a/src/xtd.core/src/xtd/translator.cpp +++ b/src/xtd.core/src/xtd/translator.cpp @@ -11,14 +11,13 @@ #include #undef __XTD_CORE_NATIVE_LIBRARY__ -using namespace std; using namespace xtd; using namespace xtd::collections::specialized; using namespace xtd::io; -map translator::language_values_; +std::map translator::language_values_; ustring translator::language_; -set translator::translated_languages_; +std::set translator::translated_languages_; xtd::ustring translator::language() { try { diff --git a/src/xtd.core/src/xtd/uri.cpp b/src/xtd.core/src/xtd/uri.cpp index 37ddce93a0c3..0d724180c706 100644 --- a/src/xtd.core/src/xtd/uri.cpp +++ b/src/xtd.core/src/xtd/uri.cpp @@ -10,7 +10,6 @@ #include "../../include/xtd/io/path.h" #include "../../include/xtd/net/ip_address.h" -using namespace std; using namespace xtd; using namespace xtd::io; using namespace xtd::net; @@ -151,11 +150,11 @@ ustring uri::scheme() const { return get_components(uri_components::scheme, uri_format::uri_escaped); } -vector uri::segments() const { +std::vector uri::segments() const { auto path = this->absolute_path(); if (path.empty()) return {}; - auto segments = vector {}; + auto segments = std::vector {}; auto start_index = 0_z; auto length = 1_z; @@ -180,7 +179,7 @@ ustring uri::user_info() const { bool uri::check_scheme_name(const ustring& scheme) { auto first = true; - for (auto c : as(scheme)) { + for (auto c : as(scheme)) { if (first) { first = false; if (!char32_object::is_letter(c)) return false; diff --git a/src/xtd.core/src/xtd/ustring.cpp b/src/xtd.core/src/xtd/ustring.cpp index daee7211c961..976a74fba2f0 100644 --- a/src/xtd.core/src/xtd/ustring.cpp +++ b/src/xtd.core/src/xtd/ustring.cpp @@ -12,7 +12,6 @@ #include "../../include/xtd/diagnostics/stack_frame.h" #include -using namespace std; using namespace xtd; using namespace xtd::collections::generic; @@ -34,8 +33,8 @@ void __throw_ustring_format_exception_start_colon(const char* file, uint32 line, const ustring ustring::empty_string; -const vector ustring::default_split_separators {9, 10, 11, 12, 13, 32}; -const vector ustring::default_trim_chars {ustring::default_split_separators}; +const std::vector ustring::default_split_separators {9, 10, 11, 12, 13, 32}; +const std::vector ustring::default_trim_chars {ustring::default_split_separators}; ustring::ustring() noexcept { } @@ -58,27 +57,27 @@ ustring::ustring(size_t count, char8 character, const allocator_type& allocator) #endif ustring::ustring(size_t count, char16 character) { - *this = convert_string::to_ustring(u16string(count, character)); + *this = convert_string::to_ustring(std::u16string(count, character)); } ustring::ustring(size_t count, char16 character, const allocator_type& allocator) : basic_string(allocator) { - *this = convert_string::to_ustring(u16string(count, character)); + *this = convert_string::to_ustring(std::u16string(count, character)); } ustring::ustring(size_t count, char32 character) { - *this = convert_string::to_ustring(u32string(count, character)); + *this = convert_string::to_ustring(std::u32string(count, character)); } ustring::ustring(size_t count, char32 character, const allocator_type& allocator) : basic_string(allocator) { - *this = convert_string::to_ustring(u32string(count, character)); + *this = convert_string::to_ustring(std::u32string(count, character)); } ustring::ustring(size_t count, wchar character) { - *this = convert_string::to_ustring(wstring(count, character)); + *this = convert_string::to_ustring(std::wstring(count, character)); } ustring::ustring(size_t count, wchar character, const allocator_type& allocator) : basic_string(allocator) { - *this = convert_string::to_ustring(wstring(count, character)); + *this = convert_string::to_ustring(std::wstring(count, character)); } ustring::ustring(const ustring& str, size_t index, size_t count) : basic_string(str, index, count) { @@ -136,10 +135,10 @@ ustring::ustring(const std::string& str, const allocator_type& allocator) noexce } #if defined(__xtd__cpp_lib_char8_t) -ustring::ustring(const u8string& str) noexcept : basic_string(reinterpret_cast(str.c_str())) { +ustring::ustring(const std::u8string& str) noexcept : basic_string(reinterpret_cast(str.c_str())) { } -ustring::ustring(const u8string& str, const allocator_type& allocator) noexcept : basic_string(reinterpret_cast(str.c_str()), allocator) { +ustring::ustring(const std::u8string& str, const allocator_type& allocator) noexcept : basic_string(reinterpret_cast(str.c_str()), allocator) { } ustring::ustring(const char8* str) { @@ -163,10 +162,10 @@ ustring::ustring(char8* str, const allocator_type& allocator) : basic_string(allocator) { +ustring::ustring(const std::u16string& str, const allocator_type& allocator) noexcept : basic_string(allocator) { *this = convert_string::to_ustring(str); } @@ -186,10 +185,10 @@ ustring::ustring(char16* str, const allocator_type& allocator) : ustring(allocat *this = str; } -ustring::ustring(const u32string& str) noexcept : ustring(str, allocator_type()) { +ustring::ustring(const std::u32string& str) noexcept : ustring(str, allocator_type()) { } -ustring::ustring(const u32string& str, const allocator_type& allocator) noexcept : basic_string(allocator) { +ustring::ustring(const std::u32string& str, const allocator_type& allocator) noexcept : basic_string(allocator) { *this = convert_string::to_ustring(str); } @@ -209,10 +208,10 @@ ustring::ustring(char32* str, const allocator_type& allocator) : ustring(allocat *this = str; } -ustring::ustring(const wstring& str) noexcept : ustring(str, allocator_type()) { +ustring::ustring(const std::wstring& str) noexcept : ustring(str, allocator_type()) { } -ustring::ustring(const wstring& str, const allocator_type& allocator) noexcept : basic_string(allocator) { +ustring::ustring(const std::wstring& str, const allocator_type& allocator) noexcept : basic_string(allocator) { *this = convert_string::to_ustring(str); } @@ -238,46 +237,46 @@ ustring::ustring(ustring&& str) noexcept : basic_string(str) { ustring::ustring(ustring&& str, const allocator_type& allocator) noexcept : basic_string(str, allocator) { } -ustring::ustring(initializer_list il) : basic_string(il) { +ustring::ustring(std::initializer_list il) : basic_string(il) { } -ustring::ustring(initializer_list il, const allocator_type& allocator) : basic_string(il, allocator) { +ustring::ustring(std::initializer_list il, const allocator_type& allocator) : basic_string(il, allocator) { } #if defined(__xtd__cpp_lib_char8_t) -ustring::ustring(initializer_list il) { +ustring::ustring(std::initializer_list il) { for (auto& c : il) push_back(static_cast(c)); } -ustring::ustring(initializer_list il, const allocator_type& allocator) : basic_string(allocator) { +ustring::ustring(std::initializer_list il, const allocator_type& allocator) : basic_string(allocator) { for (auto& c : il) push_back(static_cast(c)); } #endif -ustring::ustring(initializer_list il) { - *this = convert_string::to_ustring(u16string(il)); +ustring::ustring(std::initializer_list il) { + *this = convert_string::to_ustring(std::u16string(il)); } -ustring::ustring(initializer_list il, const allocator_type& allocator) : basic_string(allocator) { - *this = convert_string::to_ustring(u16string(il)); +ustring::ustring(std::initializer_list il, const allocator_type& allocator) : basic_string(allocator) { + *this = convert_string::to_ustring(std::u16string(il)); } -ustring::ustring(initializer_list il) { - *this = convert_string::to_ustring(u32string(il)); +ustring::ustring(std::initializer_list il) { + *this = convert_string::to_ustring(std::u32string(il)); } -ustring::ustring(initializer_list il, const allocator_type& allocator) : basic_string(allocator) { - *this = convert_string::to_ustring(u32string(il)); +ustring::ustring(std::initializer_list il, const allocator_type& allocator) : basic_string(allocator) { + *this = convert_string::to_ustring(std::u32string(il)); } -ustring::ustring(initializer_list il) { - *this = convert_string::to_ustring(wstring(il)); +ustring::ustring(std::initializer_list il) { + *this = convert_string::to_ustring(std::wstring(il)); } -ustring::ustring(initializer_list il, const allocator_type& allocator) : basic_string(allocator) { - *this = convert_string::to_ustring(wstring(il)); +ustring::ustring(std::initializer_list il, const allocator_type& allocator) : basic_string(allocator) { + *this = convert_string::to_ustring(std::wstring(il)); } ustring& ustring::operator =(const ustring& str) noexcept { @@ -297,7 +296,7 @@ ustring& ustring::operator =(const value_type* str) { } #if defined(__xtd__cpp_lib_char8_t) -ustring& ustring::operator =(const u8string& str) noexcept { +ustring& ustring::operator =(const std::u8string& str) noexcept { assign(reinterpret_cast(str.c_str())); return *this; } @@ -309,34 +308,34 @@ ustring& ustring::operator =(const char8* str) { } #endif -ustring& ustring::operator =(const u16string& str) noexcept { +ustring& ustring::operator =(const std::u16string& str) noexcept { *this = convert_string::to_ustring(str); return *this; } ustring& ustring::operator =(const char16* str) { if (str == nullptr) throw null_pointer_exception {csf_}; - return operator =(u16string(str)); + return operator =(std::u16string(str)); } -ustring& ustring::operator =(const u32string& str) noexcept { +ustring& ustring::operator =(const std::u32string& str) noexcept { *this = convert_string::to_ustring(str); return *this; } ustring& ustring::operator =(const char32* str) { if (str == nullptr) throw null_pointer_exception {csf_}; - return operator =(u32string(str)); + return operator =(std::u32string(str)); } -ustring& ustring::operator =(const wstring& str) noexcept { +ustring& ustring::operator =(const std::wstring& str) noexcept { *this = convert_string::to_ustring(str); return *this; } ustring& ustring::operator =(const wchar* str) { if (str == nullptr) throw null_pointer_exception {csf_}; - return operator =(wstring(str)); + return operator =(std::wstring(str)); } ustring& ustring::operator =(ustring&& str) noexcept { @@ -371,34 +370,34 @@ ustring& ustring::operator =(wchar character) { return *this; } -ustring& ustring::operator =(const initializer_list& il) { +ustring& ustring::operator =(const std::initializer_list& il) { assign(il); return *this; } #if defined(__xtd__cpp_lib_char8_t) -ustring& ustring::operator =(const initializer_list& il) { +ustring& ustring::operator =(const std::initializer_list& il) { for (auto c : il) *this += static_cast(c); return *this; } #endif -ustring& ustring::operator =(const initializer_list& il) { +ustring& ustring::operator =(const std::initializer_list& il) { clear(); - *this = convert_string::to_ustring(u16string(il)); + *this = convert_string::to_ustring(std::u16string(il)); return *this; } -ustring& ustring::operator =(const initializer_list& il) { +ustring& ustring::operator =(const std::initializer_list& il) { clear(); - *this = convert_string::to_ustring(u32string(il)); + *this = convert_string::to_ustring(std::u32string(il)); return *this; } -ustring& ustring::operator =(const initializer_list& il) { +ustring& ustring::operator =(const std::initializer_list& il) { clear(); - *this = convert_string::to_ustring(wstring(il)); + *this = convert_string::to_ustring(std::wstring(il)); return *this; } @@ -418,7 +417,7 @@ ustring& ustring::operator +=(const value_type* str) { } #if defined(__xtd__cpp_lib_char8_t) -ustring& ustring::operator +=(const u8string& str) { +ustring& ustring::operator +=(const std::u8string& str) { *this = *this + str; return *this; } @@ -429,7 +428,7 @@ ustring& ustring::operator +=(const char8* str) { } #endif -ustring& ustring::operator +=(const u16string& str) { +ustring& ustring::operator +=(const std::u16string& str) { *this = *this + str; return *this; } @@ -439,7 +438,7 @@ ustring& ustring::operator +=(const char16* str) { return *this; } -ustring& ustring::operator +=(const u32string& str) { +ustring& ustring::operator +=(const std::u32string& str) { *this = *this + str; return *this; } @@ -449,7 +448,7 @@ ustring& ustring::operator +=(const char32* str) { return *this; } -ustring& ustring::operator +=(const wstring& str) { +ustring& ustring::operator +=(const std::wstring& str) { *this = *this + str; return *this; } @@ -486,29 +485,29 @@ ustring& ustring::operator +=(wchar character) { return *this; } -ustring& ustring::operator +=(const initializer_list& il) { +ustring& ustring::operator +=(const std::initializer_list& il) { *this = *this + il; return *this; } #if defined(__xtd__cpp_lib_char8_t) -ustring& ustring::operator +=(const initializer_list& il) { +ustring& ustring::operator +=(const std::initializer_list& il) { *this = *this + il; return *this; } #endif -ustring& ustring::operator +=(const initializer_list& il) { +ustring& ustring::operator +=(const std::initializer_list& il) { *this = *this + il; return *this; } -ustring& ustring::operator +=(const initializer_list& il) { +ustring& ustring::operator +=(const std::initializer_list& il) { *this = *this + il; return *this; } -ustring& ustring::operator +=(const initializer_list& il) { +ustring& ustring::operator +=(const std::initializer_list& il) { *this = *this + il; return *this; } @@ -547,11 +546,11 @@ bool ustring::operator !=(const char8* other) const { } #endif -bool ustring::operator ==(const u16string& other) const { +bool ustring::operator ==(const std::u16string& other) const { return *this == ustring(other); } -bool ustring::operator !=(const u16string& other) const { +bool ustring::operator !=(const std::u16string& other) const { return !operator ==(other); } @@ -563,11 +562,11 @@ bool ustring::operator !=(const char16* other) const { return !operator ==(other); } -bool ustring::operator ==(const u32string& other) const { +bool ustring::operator ==(const std::u32string& other) const { return *this == ustring(other); } -bool ustring::operator !=(const u32string& other) const { +bool ustring::operator !=(const std::u32string& other) const { return !operator ==(other); } @@ -579,11 +578,11 @@ bool ustring::operator !=(const char32* other) const { return !operator ==(other); } -bool ustring::operator ==(const wstring& other) const { +bool ustring::operator ==(const std::wstring& other) const { return *this == ustring(other); } -bool ustring::operator !=(const wstring& other) const { +bool ustring::operator !=(const std::wstring& other) const { return !operator ==(other); } @@ -607,7 +606,7 @@ ustring ustring::substr(size_type index, size_type count) const { return basic_string::substr(index, count); } -ustring ustring::class_name(const type_info& info) { +ustring ustring::class_name(const std::type_info& info) { return typeof_(info).name(); } @@ -657,42 +656,42 @@ ustring ustring::concat(const ustring& str_a, const ustring& str_b) noexcept { return str_a + str_b; } -ustring ustring::concat(const vector& values) noexcept { +ustring ustring::concat(const std::vector& values) noexcept { auto result = ustring::empty_string; - for_each(values.begin(), values.end(), [&](const auto & item) {result += item;}); + std::for_each(values.begin(), values.end(), [&](const auto & item) {result += item;}); return result; } -ustring ustring::concat(const vector& values) noexcept { +ustring ustring::concat(const std::vector& values) noexcept { auto result = ustring::empty_string; - for_each(values.begin(), values.end(), [&](const auto & item) {result += item;}); + std::for_each(values.begin(), values.end(), [&](const auto & item) {result += item;}); return result; } #if defined(__xtd__cpp_lib_char8_t) -ustring ustring::concat(const vector& values) noexcept { +ustring ustring::concat(const std::vector& values) noexcept { auto result = ustring::empty_string; - for_each(values.begin(), values.end(), [&](const auto & item) {result += ustring(item);}); + std::for_each(values.begin(), values.end(), [&](const auto & item) {result += ustring(item);}); return result; } #endif -ustring ustring::concat(const initializer_list& values) noexcept { +ustring ustring::concat(const std::initializer_list& values) noexcept { auto result = ustring::empty_string; - for_each(values.begin(), values.end(), [&](const auto & item) {result += item;}); + std::for_each(values.begin(), values.end(), [&](const auto & item) {result += item;}); return result; } -ustring ustring::concat(const initializer_list& values) noexcept { +ustring ustring::concat(const std::initializer_list& values) noexcept { auto result = ustring::empty_string; - for_each(values.begin(), values.end(), [&](const auto & item) {result += item;}); + std::for_each(values.begin(), values.end(), [&](const auto & item) {result += item;}); return result; } #if defined(__xtd__cpp_lib_char8_t) -ustring ustring::concat(const initializer_list& values) noexcept { +ustring ustring::concat(const std::initializer_list& values) noexcept { auto result = ustring::empty_string; - for_each(values.begin(), values.end(), [&](const auto & item) {result += ustring(item);}); + std::for_each(values.begin(), values.end(), [&](const auto & item) {result += ustring(item);}); return result; } #endif @@ -747,7 +746,7 @@ bool ustring::ends_with(const ustring& value, xtd::string_comparison comparison_ return rfind(value) + value.size() == size(); } -ustring ustring::full_class_name(const type_info& info) { +ustring ustring::full_class_name(const std::type_info& info) { return typeof_(info).full_name(); } @@ -781,15 +780,15 @@ size_t ustring::index_of(const ustring& value, size_t start_index, size_t count) return result > start_index + count ? npos : result; } -size_t ustring::index_of_any(const vector& values) const noexcept { +size_t ustring::index_of_any(const std::vector& values) const noexcept { return index_of_any(values, 0, size()); } -size_t ustring::index_of_any(const vector& values, size_t start_index) const noexcept { +size_t ustring::index_of_any(const std::vector& values, size_t start_index) const noexcept { return index_of_any(values, start_index, size() - start_index); } -size_t ustring::index_of_any(const vector& values, size_t start_index, size_t count) const noexcept { +size_t ustring::index_of_any(const std::vector& values, size_t start_index, size_t count) const noexcept { auto index = 0_z; for (const auto& item : *this) { if (index++ < start_index) continue; @@ -799,16 +798,16 @@ size_t ustring::index_of_any(const vector& values, size_t start_inde return npos; } -size_t ustring::index_of_any(const initializer_list& values) const noexcept { - return index_of_any(vector(values)); +size_t ustring::index_of_any(const std::initializer_list& values) const noexcept { + return index_of_any(std::vector(values)); } -size_t ustring::index_of_any(const initializer_list& values, size_t start_index) const noexcept { - return index_of_any(vector(values), start_index); +size_t ustring::index_of_any(const std::initializer_list& values, size_t start_index) const noexcept { + return index_of_any(std::vector(values), start_index); } -size_t ustring::index_of_any(const initializer_list& values, size_t start_index, size_t count) const noexcept { - return index_of_any(vector(values), start_index, count); +size_t ustring::index_of_any(const std::initializer_list& values, size_t start_index, size_t count) const noexcept { + return index_of_any(std::vector(values), start_index, count); } ustring ustring::insert(size_t start_index, const ustring& value) const noexcept { @@ -847,15 +846,15 @@ size_t ustring::last_index_of(const ustring& value, size_t start_index, size_t c return result < start_index ? npos : result; } -size_t ustring::last_index_of_any(const vector& values) const noexcept { +size_t ustring::last_index_of_any(const std::vector& values) const noexcept { return last_index_of_any(values, 0, size()); } -size_t ustring::last_index_of_any(const vector& values, size_t start_index) const noexcept { +size_t ustring::last_index_of_any(const std::vector& values, size_t start_index) const noexcept { return last_index_of_any(values, start_index, size() - start_index); } -size_t ustring::last_index_of_any(const vector& values, size_t start_index, size_t count) const noexcept { +size_t ustring::last_index_of_any(const std::vector& values, size_t start_index, size_t count) const noexcept { auto index = size() - 1; for (const_reverse_iterator it = crbegin(); it != crend(); ++it) { if (index-- > start_index + count) continue; @@ -865,16 +864,16 @@ size_t ustring::last_index_of_any(const vector& values, size_t start return npos; } -size_t ustring::last_index_of_any(const initializer_list& values) const noexcept { - return last_index_of_any(vector(values)); +size_t ustring::last_index_of_any(const std::initializer_list& values) const noexcept { + return last_index_of_any(std::vector(values)); } -size_t ustring::last_index_of_any(const initializer_list& values, size_t start_index) const noexcept { - return last_index_of_any(vector(values), start_index); +size_t ustring::last_index_of_any(const std::initializer_list& values, size_t start_index) const noexcept { + return last_index_of_any(std::vector(values), start_index); } -size_t ustring::last_index_of_any(const initializer_list& values, size_t start_index, size_t count) const noexcept { - return last_index_of_any(vector(values), start_index, count); +size_t ustring::last_index_of_any(const std::initializer_list& values, size_t start_index, size_t count) const noexcept { + return last_index_of_any(std::vector(values), start_index, count); } ustring ustring::pad_left(size_t total_width) const noexcept { @@ -938,11 +937,11 @@ ustring ustring::replace(const ustring& old_string, const ustring& new_string) c return result; } -vector ustring::split(const vector& separators, size_t count, string_split_options options) const noexcept { +std::vector ustring::split(const std::vector& separators, size_t count, string_split_options options) const noexcept { if (count == 0) return {}; if (count == 1) return {*this}; - auto list = vector {}; + auto list = std::vector {}; auto sub_string = ustring::empty_string; auto split_char_separators = separators.size() == 0 ? default_split_separators : separators; for (auto it = begin(); it != end(); ++it) { @@ -961,19 +960,19 @@ vector ustring::split(const vector& separators, size_t coun return list; } -vector ustring::split() const noexcept { - return split(default_split_separators, numeric_limits::max(), string_split_options::none); +std::vector ustring::split() const noexcept { + return split(default_split_separators, std::numeric_limits::max(), string_split_options::none); } -vector ustring::split(const vector& separators) const noexcept { - return split(separators, numeric_limits::max(), string_split_options::none); +std::vector ustring::split(const std::vector& separators) const noexcept { + return split(separators, std::numeric_limits::max(), string_split_options::none); } -vector ustring::split(const vector& separators, string_split_options options) const noexcept { - return split(separators, numeric_limits::max(), options); +std::vector ustring::split(const std::vector& separators, string_split_options options) const noexcept { + return split(separators, std::numeric_limits::max(), options); } -vector ustring::split(const vector& separators, size_t count) const noexcept { +std::vector ustring::split(const std::vector& separators, size_t count) const noexcept { return split(separators, count, string_split_options::none); } @@ -1005,15 +1004,15 @@ ustring ustring::substring(size_t start_index, size_t length) const noexcept { return substr(start_index, length); } -vector ustring::to_array() const noexcept { +std::vector ustring::to_array() const noexcept { return to_array(0, size()); } -vector ustring::to_array(size_t start_index) const noexcept { +std::vector ustring::to_array(size_t start_index) const noexcept { return to_array(start_index, size() - start_index); } -vector ustring::to_array(size_t start_index, size_t length) const noexcept { +std::vector ustring::to_array(size_t start_index, size_t length) const noexcept { if (start_index >= size()) return {}; if (start_index + length >= size()) return {begin() + start_index, end()}; return {begin() + start_index, begin() + start_index + length}; @@ -1021,7 +1020,7 @@ vector ustring::to_array(size_t start_index, size_t length) ustring ustring::to_lower() const noexcept { auto result = ustring::empty_string; - for_each(begin(), end(), [&](auto c) {result += static_cast(tolower(c));}); + std::for_each(begin(), end(), [&](auto c) {result += static_cast(tolower(c));}); return result; } @@ -1038,7 +1037,7 @@ ustring ustring::to_string() const noexcept { ustring ustring::to_upper() const noexcept { auto result = ustring::empty_string; - for_each(begin(), end(), [&](auto c) {result += static_cast(toupper(c));}); + std::for_each(begin(), end(), [&](auto c) {result += static_cast(toupper(c));}); return result; } @@ -1047,10 +1046,10 @@ ustring ustring::trim() const noexcept { } ustring ustring::trim(value_type trim_char) const noexcept { - return trim(vector {trim_char}); + return trim(std::vector {trim_char}); } -ustring ustring::trim(const vector& trim_chars) const noexcept { +ustring ustring::trim(const std::vector& trim_chars) const noexcept { return trim_start(trim_chars).trim_end(trim_chars); } @@ -1059,10 +1058,10 @@ ustring ustring::trim_end() const noexcept { } ustring ustring::trim_end(value_type trim_char) const noexcept { - return trim_end(vector {trim_char}); + return trim_end(std::vector {trim_char}); } -ustring ustring::trim_end(const vector& trim_chars) const noexcept { +ustring ustring::trim_end(const std::vector& trim_chars) const noexcept { if (!size()) return *this; auto result = *this; while (std::find(trim_chars.begin(), trim_chars.end(), result[result.size() - 1]) != trim_chars.end()) @@ -1075,10 +1074,10 @@ ustring ustring::trim_start() const noexcept { } ustring ustring::trim_start(value_type trim_char) const noexcept { - return trim_start(vector {trim_char}); + return trim_start(std::vector {trim_char}); } -ustring ustring::trim_start(const vector& trim_chars) const noexcept { +ustring ustring::trim_start(const std::vector& trim_chars) const noexcept { if (!size()) return *this; auto result = *this; while (std::find(trim_chars.begin(), trim_chars.end(), result[0]) != trim_chars.end()) diff --git a/src/xtd.core/src/xtd/version.cpp b/src/xtd.core/src/xtd/version.cpp index 8307f407aa9f..dfc3afe2df03 100644 --- a/src/xtd.core/src/xtd/version.cpp +++ b/src/xtd.core/src/xtd/version.cpp @@ -6,7 +6,6 @@ #include "../../include/xtd/format_exception.h" #include -using namespace std; using namespace xtd; version::version(const ustring& version) { @@ -66,9 +65,9 @@ bool version::equals(const version& v) const noexcept { } version version::parse(const xtd::ustring& input) { - auto rgx = regex {"\\."}; + auto rgx = std::regex {"\\."}; auto versions = xtd::collections::specialized::string_collection {}; - for (auto it = sregex_token_iterator {input.begin(), input.end(), rgx, -1}, end = sregex_token_iterator {}; it != end; ++it) + for (auto it = std::sregex_token_iterator {input.begin(), input.end(), rgx, -1}, end = std::sregex_token_iterator {}; it != end; ++it) versions.push_back(it->str()); switch (versions.size()) { diff --git a/src/xtd.drawing.native.wxwidgets/src/xtd/drawing/native/wxwidgets/brush.cpp b/src/xtd.drawing.native.wxwidgets/src/xtd/drawing/native/wxwidgets/brush.cpp index 8077509bf409..c399a685e816 100644 --- a/src/xtd.drawing.native.wxwidgets/src/xtd/drawing/native/wxwidgets/brush.cpp +++ b/src/xtd.drawing.native.wxwidgets/src/xtd/drawing/native/wxwidgets/brush.cpp @@ -8,7 +8,6 @@ #include #include -using namespace std; using namespace xtd; using namespace xtd::drawing::native; @@ -61,8 +60,8 @@ void brush::linear_gradient(intptr brush, int32 x1, int32 y1, int32 x2, int32 y2 if (angle == 0 || angle == 180) p2.y = p1.y; if (angle == 90 || angle == 270) p2.x = p1.x; - if (angle == 135 || angle == 315) swap(p1.x, p2.x); - if (angle == 180 || angle == 225 || angle == 270 || angle == 315) swap(p1, p2); + if (angle == 135 || angle == 315) std::swap(p1.x, p2.x); + if (angle == 180 || angle == 225 || angle == 270 || angle == 315) std::swap(p1, p2); reinterpret_cast(brush)->create_linear_gradiant_brush(p1, p2, colours); } diff --git a/src/xtd.drawing.native.wxwidgets/src/xtd/drawing/native/wxwidgets/graphics_path.cpp b/src/xtd.drawing.native.wxwidgets/src/xtd/drawing/native/wxwidgets/graphics_path.cpp index 4e728f6f52cf..896679feace1 100644 --- a/src/xtd.drawing.native.wxwidgets/src/xtd/drawing/native/wxwidgets/graphics_path.cpp +++ b/src/xtd.drawing.native.wxwidgets/src/xtd/drawing/native/wxwidgets/graphics_path.cpp @@ -10,7 +10,6 @@ #include #include -using namespace std; using namespace xtd; using namespace xtd::collections::generic; using namespace xtd::drawing::native; @@ -56,7 +55,7 @@ namespace { } private: - inline static std::map> figures_; + inline static std::map> figures_; }; }