Remove nowide usages.

egorpugin · egorpugin · commit 6412cba13414 · 2018-07-02T16:40:08.000+03:00
diff --git a/src/client/fix_imports.cpp b/src/client/fix_imports.cpp
@@ -59,7 +59,7 @@ void fix_imports(const String &target, const path &aliases_file, const path &old
 
     if (!new_file.parent_path().empty())
         fs::create_directories(new_file.parent_path());
-    boost::nowide::ofstream ofile(new_file.string());
+    std::ofstream ofile(new_file);
     if (!ofile)
         throw std::runtime_error("Cannot open the output file for writing");
 
diff --git a/src/common/database.cpp b/src/common/database.cpp
@@ -1024,7 +1024,7 @@ void PackagesDatabase::load(bool drop)
             throw std::runtime_error(sqlite3_errmsg(mdb));
 
         auto fn = db_repo_dir / (td.name + ".csv");
-        boost::nowide::ifstream ifile(fn.string());
+        std::ifstream ifile(fn);
         if (!ifile)
             throw std::runtime_error("Cannot open file " + fn.string() + " for reading");
 
diff --git a/src/common/package.cpp b/src/common/package.cpp
@@ -58,7 +58,7 @@ path Package::getStampFilename() const
 String Package::getStampHash() const
 {
     String hash;
-    boost::nowide::ifstream ifile(getStampFilename().string());
+    std::ifstream ifile(getStampFilename());
     if (ifile)
         ifile >> hash;
     return hash;
diff --git a/src/common/project.cpp b/src/common/project.cpp
@@ -197,9 +197,9 @@ void check_file_types(const Files &files)
         throw std::runtime_error("Project sources did not pass file checks:\n" + errors);
 
     auto fn = get_temp_filename();
-    boost::nowide::ofstream o(fn.string(), std::ios::binary | std::ios::out);
+    std::ofstream o(fn, std::ios::binary | std::ios::out);
     if (!o)
-        throw std::runtime_error("Cannot open file for writing: " + fn.string());
+        throw std::runtime_error("Cannot open file for writing: " + fn.u8string());
     for (auto &file : files)
         o << "file -ib " << normalize_path(file) << "\n";
     o.close();
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
@@ -547,9 +547,9 @@ void Settings::clear_local_settings()
 
 void Settings::save(const path &p) const
 {
-    boost::nowide::ofstream o(p.string());
+    std::ofstream o(p);
     if (!o)
-        throw std::runtime_error("Cannot open file: " + p.string());
+        throw std::runtime_error("Cannot open file: " + p.u8string());
     yaml root;
     root["remotes"][DEFAULT_REMOTE_NAME]["url"] = remotes[0].url;
     root["storage_dir"] = storage_dir.string();
diff --git a/src/common/sqlite_database.cpp b/src/common/sqlite_database.cpp
@@ -109,7 +109,7 @@ sqlite3 *load_from_file(const path &fn, bool read_only)
     else
         flags |= SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE;
     sqlite3_enable_shared_cache(1);
-    ok = sqlite3_open_v2(fn.string().c_str(), &db, flags, nullptr) == SQLITE_OK;
+    ok = sqlite3_open_v2(fn.u8string().c_str(), &db, flags, nullptr) == SQLITE_OK;
     if (!ok)
     {
         String error = "Can't open database file: " + fn.string() + " error: " + sqlite3_errmsg(db);

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ path Package::getStampFilename() const`
`58`	`58`	`String Package::getStampHash() const`
`59`	`59`	`{`
`60`	`60`	`String hash;`
`61`		`- boost::nowide::ifstream ifile(getStampFilename().string());`
	`61`	`+ std::ifstream ifile(getStampFilename());`
`62`	`62`	`if (ifile)`
`63`	`63`	`ifile >> hash;`
`64`	`64`	`return hash;`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ sqlite3 *load_from_file(const path &fn, bool read_only)`
`109`	`109`	`else`
`110`	`110`	`flags \|= SQLITE_OPEN_READWRITE \| SQLITE_OPEN_CREATE;`
`111`	`111`	`sqlite3_enable_shared_cache(1);`
`112`		`- ok = sqlite3_open_v2(fn.string().c_str(), &db, flags, nullptr) == SQLITE_OK;`
	`112`	`+ ok = sqlite3_open_v2(fn.u8string().c_str(), &db, flags, nullptr) == SQLITE_OK;`
`113`	`113`	`if (!ok)`
`114`	`114`	`{`
`115`	`115`	`String error = "Can't open database file: " + fn.string() + " error: " + sqlite3_errmsg(db);`