anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make sure a temporary file is always created in the global temporary dir.

Browse Source
This commit is contained in:
Enrico Forestieri 2015-03-13 00:31:08 +01:00
parent d752334ec4
commit cbad159ac2
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/support/TempFile.cpp
View File

@ -14,6 +14,7 @@
#include "support/debug.h" #include "support/debug.h"
#include "support/FileName.h" #include "support/FileName.h"
#include "support/filetools.h"
#include "support/Package.h" #include "support/Package.h"
#include "support/qstring_helpers.h" #include "support/qstring_helpers.h"
@ -47,14 +48,16 @@ struct TempFile::Private
TempFile::TempFile(FileName const & temp_dir, string const & mask) TempFile::TempFile(FileName const & temp_dir, string const & mask)
{ {
QFileInfo tmp_fi(QDir(toqstr(temp_dir.absoluteFilePath())), toqstr(mask)); QFileInfo tmp_fi(QDir(toqstr(temp_dir.absoluteFilePath())),
toqstr(onlyFileName(mask)));
d = new Private(tmp_fi.absoluteFilePath()); d = new Private(tmp_fi.absoluteFilePath());
} }
TempFile::TempFile(string const & mask) TempFile::TempFile(string const & mask)
{ {
QFileInfo tmp_fi(QDir(toqstr(package().temp_dir().absoluteFilePath())), toqstr(mask)); QFileInfo tmp_fi(QDir(toqstr(package().temp_dir().absoluteFilePath())),
toqstr(onlyFileName(mask)));
d = new Private(tmp_fi.absoluteFilePath()); d = new Private(tmp_fi.absoluteFilePath());
} }

6
src/support/TempFile.h
View File

@ -33,9 +33,9 @@ class TempFile {
public: public:
/** /**
*Create a temporary file with the given mask. *Create a temporary file with the given mask.
* \p mask must be in filesystem encoding, if it contains a * \p mask must be in filesystem encoding, the template file
* relative path, the template file will be created in the global * will be created in the global temporary directory as given
* temporary directory as given by 'package().temp_dir()'. * by 'package().temp_dir()'.
* If the mask contains "XXXXXX" this portion will be replaced by * If the mask contains "XXXXXX" this portion will be replaced by
* a uniquely generated string. If it does not contain this portion, * a uniquely generated string. If it does not contain this portion,
* it will be automatically appended using a dot. Therefore, please * it will be automatically appended using a dot. Therefore, please