From 8f90cc97a640dcec96e62ecf3d20fb077dd00fb9 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Sat, 26 Jul 2003 18:25:29 +0000 Subject: [PATCH] Replace occurances of system_tempdir with os::getTmpDir(). git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7365 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 6 ++++++ src/insets/ChangeLog | 4 ++++ src/insets/insetgraphics.C | 1 - src/lyx_cb.C | 6 +++--- src/lyx_main.C | 4 +--- src/lyx_main.h | 2 -- src/support/ChangeLog | 4 ++++ src/support/os.h | 3 +-- 8 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 0cb7e275f4..1389357193 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2003-07-26 Angus Leeming + + * lyx_cb.C: + * lyx_main.[Ch]: replace occurances of system_tempdir with + os::getTmpDir(). + 2003-07-25 Lars Gullik Bjønnes * rename Inset to InsetOld diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index 42b57ae2cc..976f405977 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,7 @@ +2003-07-26 Angus Leeming + + * insetgraphics.C: remove unused declaration of system_tempdir. + 2003-07-25 Lars Gullik Bjønnes * rename Inset to InsetOld diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C index 3a847d9d83..dcf759e982 100644 --- a/src/insets/insetgraphics.C +++ b/src/insets/insetgraphics.C @@ -82,7 +82,6 @@ TODO #include // For the std::max -extern string system_tempdir; // set by Exporters using namespace lyx::support; diff --git a/src/lyx_cb.C b/src/lyx_cb.C index cc248424d9..dab4e37d65 100644 --- a/src/lyx_cb.C +++ b/src/lyx_cb.C @@ -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); } diff --git a/src/lyx_main.C b/src/lyx_main.C index 4b725bbd69..20ba091dd9 100644 --- a/src/lyx_main.C +++ b/src/lyx_main.C @@ -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 `" diff --git a/src/lyx_main.h b/src/lyx_main.h index 6c3cff1867..6f2dfc7edd 100644 --- a/src/lyx_main.h +++ b/src/lyx_main.h @@ -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; diff --git a/src/support/ChangeLog b/src/support/ChangeLog index 424014f011..5548ac2a3d 100644 --- a/src/support/ChangeLog +++ b/src/support/ChangeLog @@ -1,3 +1,7 @@ +2003-07-26 Angus Leeming + + * os.h: remove irrelevant discussion of system_tempdir. + 2003-07-21 Angus Leeming * filename.[Ch]: new files implementing class FileName. diff --git a/src/support/os.h b/src/support/os.h index 5d6c47f729..55a3378a36 100644 --- a/src/support/os.h +++ b/src/support/os.h @@ -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(); -- 2.39.2