X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fexporter.C;h=c79f001ea2a69bc1216bf7a1599ba39aca8a5181;hb=d1f2a9c0000f0ad038425900b001c16a56c72afa;hp=ba090ea8af942df6bf915f4985e564bea679da86;hpb=dacd4cea2649ebe32ed386eaa6628e47c68e7b6b;p=lyx.git diff --git a/src/exporter.C b/src/exporter.C index ba090ea8af..c79f001ea2 100644 --- a/src/exporter.C +++ b/src/exporter.C @@ -30,10 +30,11 @@ #include "outputparams.h" #include "frontends/Alert.h" -#include "support/FileInfo.h" #include "support/filetools.h" #include "support/lyxlib.h" -#include "support/os.h" +#include "support/package.h" + +#include using lyx::support::AddName; using lyx::support::bformat; @@ -43,12 +44,14 @@ using lyx::support::MakeAbsPath; using lyx::support::MakeDisplayPath; using lyx::support::OnlyFilename; using lyx::support::OnlyPath; +using lyx::support::package; using lyx::support::prefixIs; using std::find; using std::string; using std::vector; +namespace fs = boost::filesystem; namespace { @@ -65,7 +68,7 @@ vector const Backends(Buffer const & buffer) /// ask the user what to do if a file already exists int checkOverwrite(string const & filename) { - if (lyx::support::FileInfo(filename, true).exist()) { + if (fs::exists(filename)) { string text = bformat(_("The file %1$s already exists.\n\n" "Do you want to over-write that file?"), MakeDisplayPath(filename)); @@ -103,7 +106,7 @@ CopyStatus copyFile(string const & format, // overwrite themselves. This check could be changed to // boost::filesystem::equivalent(sourceFile, destFile) if export to // other directories than the document directory is desired. - if (!prefixIs(OnlyPath(sourceFile), lyx::support::os::getTmpDir())) + if (!prefixIs(OnlyPath(sourceFile), package().temp_dir())) return ret; if (!force) {