mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-30 08:15:37 +00:00
Code Issues Releases Wiki Activity

use converted widechars in ini importer

Browse source
This commit is contained in:
greye 2014-01-14 23:30:56 +04:00
parent cd990a665a
commit b4950509bc
2 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
apps/mwiniimporter/main.cpp
View file

@ -4,11 +4,43 @@
#include <string>
#include <boost/program_options.hpp>
#include <boost/filesystem.hpp>
#include <boost/locale.hpp>
namespace bpo = boost::program_options;
#ifndef _WIN32
int main(int argc, char *argv[]) {
#else
class utf8argv
{
public:
utf8argv(int argc, wchar_t *wargv[])
{
args.reserve(argc);
argv = new const char *[argc];
for (int i = 0; i < argc; ++i) {
args.push_back(boost::locale::conv::utf_to_utf<char>(wargv[i]));
argv[i] = args.back().c_str();
}
}
~utf8argv() { delete[] argv; }
const char * const *get() const { return argv; }
private:
const char **argv;
std::vector<std::string> args;
};
int wmain(int argc, wchar_t *wargv[]) {
utf8argv converter(argc, wargv);
char **argv = converter.get();
boost::filesystem::path::imbue(boost::locale::generator().generate(""));
#endif
bpo::options_description desc("Syntax: mwiniimporter <options> inifile configfile\nAllowed options");
bpo::positional_options_description p_desc;
desc.add_options()

2
components/files/windowspath.cpp
View file

@ -27,7 +27,7 @@ namespace Files
WindowsPath::WindowsPath(const std::string& application_name)
: mName(application_name)
{
boost::filesystem::path::imbue(boost::locale::generator.generate(""));
boost::filesystem::path::imbue(boost::locale::generator().generate(""));
}
boost::filesystem::path WindowsPath::getUserConfigPath() const