anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-10 20:04:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace occurances of system_tempdir with os::getTmpDir().

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7365 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2003-07-26 18:25:29 +00:00
parent 01403f7e71
commit 8f90cc97a6
8 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ChangeLog
View File

@ -1,3 +1,9 @@
2003-07-26 Angus Leeming <leeming@lyx.org>
* lyx_cb.C:
* lyx_main.[Ch]: replace occurances of system_tempdir with
os::getTmpDir().
2003-07-25 Lars Gullik Bjønnes <larsbj@gullik.net>
* rename Inset to InsetOld

4
src/insets/ChangeLog
View File

@ -1,3 +1,7 @@
2003-07-26 Angus Leeming <leeming@lyx.org>
* insetgraphics.C: remove unused declaration of system_tempdir.
2003-07-25 Lars Gullik Bjønnes <larsbj@gullik.net>
* rename Inset to InsetOld

1
src/insets/insetgraphics.C
View File

@ -82,7 +82,6 @@ TODO
#include <algorithm> // For the std::max
extern string system_tempdir;
// set by Exporters
using namespace lyx::support;

6
src/lyx_cb.C
View File

@ -172,11 +172,11 @@ void QuitLyX()
bufferlist.closeAll();
// do any other cleanup procedures now
lyxerr[Debug::INFO] << "Deleting tmp dir " << system_tempdir << endl;
lyxerr[Debug::INFO] << "Deleting tmp dir " << os::getTmpDir() << endl;
if (destroyDir(system_tempdir) != 0) {
if (destroyDir(os::getTmpDir()) != 0) {
string msg = bformat(_("Could not remove the temporary directory %1$s"),
system_tempdir);
os::getTmpDir());
Alert::warning(_("Could not remove temporary directory"), msg);
}

4
src/lyx_main.C
View File

@ -66,7 +66,6 @@ extern LyXServer * lyxserver;
string system_lyxdir;
string build_lyxdir;
string system_tempdir;
string user_lyxdir;
DebugStream lyxerr;
@ -482,9 +481,8 @@ void LyX::init(bool gui)
lyxrc.print();
os::setTmpDir(CreateLyXTmpDir(lyxrc.tempdir_path));
system_tempdir = os::getTmpDir();
if (lyxerr.debugging(Debug::INIT)) {
lyxerr << "LyX tmp dir: `" << system_tempdir << '\'' << endl;
lyxerr << "LyX tmp dir: `" << os::getTmpDir() << '\'' << endl;
}
lyxerr[Debug::INIT] << "Reading lastfiles `"

2
src/lyx_main.h
View File

@ -29,8 +29,6 @@ class kb_keymap;
extern string user_lyxdir;
/// e.g. /usr/share/lyx/
extern string system_lyxdir;
/// e.g. /tmp
extern string system_tempdir;
/// last files loaded
extern boost::scoped_ptr<LastFiles> lastfiles;

4
src/support/ChangeLog
View File

@ -1,3 +1,7 @@
2003-07-26 Angus Leeming <leeming@lyx.org>
* os.h: remove irrelevant discussion of system_tempdir.
2003-07-21 Angus Leeming <leeming@lyx.org>
* filename.[Ch]: new files implementing class FileName.

3
src/support/os.h
View File

@ -31,8 +31,7 @@ void init(int * argc, char ** argv[]);
string binpath();
// returns name of LyX binary
string binname();
// system_tempdir actually doesn't belong here
// I put it here only to avoid a global variable.
//
void setTmpDir(string const & p);
//
string getTmpDir();