From 20527e0bd4418b107634247e78b08d6ec9c608fa Mon Sep 17 00:00:00 2001
From: greye <greye@null.net>
Date: Mon, 19 May 2014 16:56:41 +0400
Subject: [PATCH] use boost::filesystem instead of boost::iostreams

---
 apps/mwiniimporter/importer.cpp | 13 ++++++++-----
 apps/mwiniimporter/importer.hpp |  5 ++---
 apps/mwiniimporter/main.cpp     |  9 ++++++---
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/apps/mwiniimporter/importer.cpp b/apps/mwiniimporter/importer.cpp
index 3226278fe9..3a52592ae8 100644
--- a/apps/mwiniimporter/importer.cpp
+++ b/apps/mwiniimporter/importer.cpp
@@ -1,6 +1,5 @@
 #include "importer.hpp"
-#include <boost/iostreams/device/file.hpp>
-#include <boost/iostreams/stream.hpp>
+
 #include <iostream>
 #include <string>
 #include <map>
@@ -9,6 +8,10 @@
 #include <sstream>
 #include <components/misc/stringops.hpp>
 
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/fstream.hpp>
+
+namespace bfs = boost::filesystem;
 
 MwIniImporter::MwIniImporter()
     : mVerbose(false)
@@ -661,7 +664,7 @@ MwIniImporter::multistrmap MwIniImporter::loadIniFile(const std::string& filenam
 
     std::string section("");
     MwIniImporter::multistrmap map;
-    boost::iostreams::stream<boost::iostreams::file_source>file(filename.c_str());
+    bfs::ifstream file((bfs::path(filename)));
     ToUTF8::Utf8Encoder encoder(mEncoding);
 
     std::string line;
@@ -720,7 +723,7 @@ MwIniImporter::multistrmap MwIniImporter::loadCfgFile(const std::string& filenam
     std::cout << "load cfg file: " << filename << std::endl;
 
     MwIniImporter::multistrmap map;
-    boost::iostreams::stream<boost::iostreams::file_source>file(filename.c_str());
+    bfs::ifstream file((bfs::path(filename)));
 
     std::string line;
     while (std::getline(file, line)) {
@@ -858,7 +861,7 @@ void MwIniImporter::importGameFiles(multistrmap &cfg, const multistrmap &ini) co
     }
 }
 
-void MwIniImporter::writeToFile(boost::iostreams::stream<boost::iostreams::file_sink> &out, const multistrmap &cfg) {
+void MwIniImporter::writeToFile(std::ostream &out, const multistrmap &cfg) {
 
     for(multistrmap::const_iterator it=cfg.begin(); it != cfg.end(); ++it) {
         for(std::vector<std::string>::const_iterator entry=it->second.begin(); entry != it->second.end(); ++entry) {
diff --git a/apps/mwiniimporter/importer.hpp b/apps/mwiniimporter/importer.hpp
index 784980e090..72b14ba75f 100644
--- a/apps/mwiniimporter/importer.hpp
+++ b/apps/mwiniimporter/importer.hpp
@@ -1,12 +1,11 @@
 #ifndef MWINIIMPORTER_IMPORTER
 #define MWINIIMPORTER_IMPORTER 1
 
-#include <boost/iostreams/device/file.hpp>
-#include <boost/iostreams/stream.hpp>
 #include <string>
 #include <map>
 #include <vector>
 #include <exception>
+#include <iosfwd>
 
 #include <components/to_utf8/to_utf8.hpp>
 
@@ -24,7 +23,7 @@ class MwIniImporter {
     void    mergeFallback(multistrmap &cfg, const multistrmap &ini) const;
     void    importGameFiles(multistrmap &cfg, const multistrmap &ini) const;
     void    importArchives(multistrmap &cfg, const multistrmap &ini) const;
-    static void    writeToFile(boost::iostreams::stream<boost::iostreams::file_sink> &out, const multistrmap &cfg);
+    static void    writeToFile(std::ostream &out, const multistrmap &cfg);
 
   private:
     static void insertMultistrmap(multistrmap &cfg, const std::string& key, const std::string& value);
diff --git a/apps/mwiniimporter/main.cpp b/apps/mwiniimporter/main.cpp
index 58ae1d593a..d9c1454fc2 100644
--- a/apps/mwiniimporter/main.cpp
+++ b/apps/mwiniimporter/main.cpp
@@ -1,12 +1,15 @@
 #include "importer.hpp"
 
-#include <iostream>
 #include <string>
+
 #include <boost/program_options.hpp>
-#include <boost/filesystem.hpp>
 #include <boost/locale.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/fstream.hpp>
 
 namespace bpo = boost::program_options;
+namespace bfs = boost::filesystem;
 
 #ifndef _WIN32
 int main(int argc, char *argv[]) {
@@ -126,7 +129,7 @@ int wmain(int argc, wchar_t *wargv[]) {
     }
 
     std::cout << "write to: " << outputFile << std::endl;
-    boost::iostreams::stream<boost::iostreams::file_sink> file(outputFile);
+    bfs::ofstream file((bfs::path(outputFile)));
     importer.writeToFile(file, cfg);
 
     return 0;