mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-22 13:18:28 +00:00
more unicode filenames
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16172 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
3314702bf1
commit
534095ce9e
@ -19,13 +19,14 @@
|
||||
#include <sstream>
|
||||
#include <fstream>
|
||||
|
||||
using lyx::docstring;
|
||||
|
||||
using std::istringstream;
|
||||
using std::ostream;
|
||||
using std::string;
|
||||
|
||||
namespace lyx {
|
||||
|
||||
using support::FileName;
|
||||
|
||||
namespace frontend {
|
||||
|
||||
ControlLog::ControlLog(Dialog & parent)
|
||||
@ -61,7 +62,7 @@ bool ControlLog::initialiseParams(string const & data)
|
||||
else
|
||||
return false;
|
||||
|
||||
logfile_ = logfile;
|
||||
logfile_ = FileName(logfile);
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -95,7 +96,7 @@ docstring const ControlLog::title() const
|
||||
|
||||
void ControlLog::getContents(std::ostream & ss) const
|
||||
{
|
||||
std::ifstream in(logfile_.c_str());
|
||||
std::ifstream in(logfile_.toFilesystemEncoding().c_str());
|
||||
|
||||
bool success = false;
|
||||
|
||||
|
@ -15,6 +15,8 @@
|
||||
|
||||
#include "Dialog.h"
|
||||
|
||||
#include "support/filename.h"
|
||||
|
||||
namespace lyx {
|
||||
namespace frontend {
|
||||
|
||||
@ -51,7 +53,7 @@ private:
|
||||
};
|
||||
|
||||
LOGTYPE type_;
|
||||
std::string logfile_;
|
||||
support::FileName logfile_;
|
||||
};
|
||||
|
||||
} // namespace frontend
|
||||
|
@ -103,9 +103,11 @@ void getTexFileList(string const & filename, std::vector<string> & list)
|
||||
|
||||
string const getListOfOptions(string const & classname, string const & type)
|
||||
{
|
||||
string const filename = getTexFileFromList(classname,type);
|
||||
FileName const filename(getTexFileFromList(classname, type));
|
||||
if (filename.empty())
|
||||
return string();
|
||||
string optionList = string();
|
||||
std::ifstream is(filename.c_str());
|
||||
std::ifstream is(filename.toFilesystemEncoding().c_str());
|
||||
while (is) {
|
||||
string s;
|
||||
is >> s;
|
||||
|
Loading…
Reference in New Issue
Block a user