essimporter: Don't use "std::string" to store paths.

crashfix_debugdraw
Project579 2 years ago
parent 14a786bab0
commit 199bf233e8

@ -85,7 +85,7 @@ namespace
namespace ESSImport namespace ESSImport
{ {
Importer::Importer(const std::string &essfile, const std::string &outfile, const std::string &encoding) Importer::Importer(const std::filesystem::path &essfile, const std::filesystem::path &outfile, const std::string &encoding)
: mEssFile(essfile) : mEssFile(essfile)
, mOutFile(outfile) , mOutFile(outfile)
, mEncoding(encoding) , mEncoding(encoding)
@ -112,7 +112,7 @@ namespace ESSImport
std::vector<Record> mRecords; std::vector<Record> mRecords;
}; };
void read(const std::string& filename, File& file) void read(const std::filesystem::path &filename, File& file)
{ {
ESM::ESMReader esm; ESM::ESMReader esm;
esm.open(filename); esm.open(filename);

@ -1,7 +1,7 @@
#ifndef OPENMW_ESSIMPORTER_IMPORTER_H #ifndef OPENMW_ESSIMPORTER_IMPORTER_H
#define OPENMW_ESSIMPORTER_IMPORTER_H #define OPENMW_ESSIMPORTER_IMPORTER_H
#include <string> #include <filesystem>
namespace ESSImport namespace ESSImport
{ {
@ -9,15 +9,15 @@ namespace ESSImport
class Importer class Importer
{ {
public: public:
Importer(const std::string& essfile, const std::string& outfile, const std::string& encoding); Importer(const std::filesystem::path &essfile, const std::filesystem::path &outfile, const std::string& encoding);
void run(); void run();
void compare(); void compare();
private: private:
std::string mEssFile; std::filesystem::path mEssFile;
std::string mOutFile; std::filesystem::path mOutFile;
std::string mEncoding; std::string mEncoding;
}; };

Loading…
Cancel
Save