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

diff --git a/src/ChangeLog b/src/ChangeLog
index 0cb7e275f4f90bc57cf05c2bdbe11bffd24ee579..1389357193510ab0fe44eddeae6f716fa26b62b1 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 42b57ae2cc2c4b9e601dd661303f7351209bb47a..976f4059770c9cf933a9bf5645aaa85d3a4995c2 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -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

diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C
index 3a847d9d83483e835808398ea4568b21abc5061a..dcf759e98293ef54079db6e85f45fce3827eb864 100644 (file)
--- a/src/insets/insetgraphics.C
+++ b/src/insets/insetgraphics.C
@@ -82,7 +82,6 @@ TODO
 
 #include <algorithm> // 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 cc248424d9057155e14a5d073957e8e0ce4c678b..dab4e37d65bb9ea72d33cf152c420df579201514 100644 (file)
--- 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 4b725bbd69c78988840d61d1761488b4e737f9de..20ba091dd9e950026763bd8bcd5734929d76c844 100644 (file)
--- 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 6c3cff1867cadb6bed001f6dd59c0363c36c86e4..6f2dfc7eddfb4fbf71890233a74788cd08bc2915 100644 (file)
--- 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> lastfiles;
 

diff --git a/src/support/ChangeLog b/src/support/ChangeLog
index 424014f01101e4f5fd3acb2bcb59aeb894ef4efc..5548ac2a3dd5a6633dddae565b650171c94e463a 100644 (file)
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -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.

diff --git a/src/support/os.h b/src/support/os.h
index 5d6c47f729666f462ac799ef669388ff01b3f266..55a3378a368e0fcff999a185f5ca7b179c286896 100644 (file)
--- 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();