Preparing the code to use xtd::string instead of xtd::ustring

gammasoft71 · Aug 10, 2024 · 984f7d2 · 984f7d2
1 parent 1c9e54d
commit 984f7d2
Show file tree

Hide file tree

Showing 10 changed files with 126 additions and 137 deletions.
diff --git 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<std::type_index, std::function<std::string(std::any const&)>> __any_stringer__ {

diff --git 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 <list>
 
-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>& time_zone_info::get_system_time_zones() noexcept {
-  static auto system_time_zones = list<time_zone_info> {};
+const std::list<time_zone_info>& time_zone_info::get_system_time_zones() noexcept {
+  static auto system_time_zones = std::list<time_zone_info> {};
   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
@@ -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
@@ -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
@@ -11,14 +11,13 @@
 #include <xtd/native/translator>
 #undef __XTD_CORE_NATIVE_LIBRARY__
 
-using namespace std;
 using namespace xtd;
 using namespace xtd::collections::specialized;
 using namespace xtd::io;
 
-map<ustring, string_dictionary> translator::language_values_;
+std::map<ustring, string_dictionary> translator::language_values_;
 ustring translator::language_;
-set<ustring> translator::translated_languages_;
+std::set<ustring> 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
@@ -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<ustring> uri::segments() const {
+std::vector<ustring> uri::segments() const {
   auto path = this->absolute_path();
   if (path.empty()) return {};
 
-  auto segments = vector<ustring> {};
+  auto segments = std::vector<ustring> {};
   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<u32string>(scheme)) {
+  for (auto c : as<std::u32string>(scheme)) {
     if (first) {
       first = false;
       if (!char32_object::is_letter(c)) return false;