zlib stuff

[lyx.git] / src / lyx_cb.C

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 08dc527a06e0c7044793240edccc7699a4a338d2..1b49bafece967b5478bbdd34e9879653aab738ce 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -13,6 +13,7 @@
 #include "lyx_cb.h"
 #include "lyx_main.h"
 #include "buffer.h"
+#include "buffer_funcs.h"
 #include "bufferlist.h"
 #include "bufferview_funcs.h"
 #include "debug.h"
@@ -34,6 +35,7 @@
 #include "support/filetools.h"
 #include "support/forkedcall.h"
 #include "support/path.h"
+#include "support/path_defines.h"
 #include "support/systemcall.h"
 #include "support/lstrings.h"
 
@@ -42,6 +44,8 @@
 #include <utility>
 #include <cerrno>
 
+using namespace lyx::support;
+
 using std::vector;
 using std::ifstream;
 using std::copy;
@@ -57,20 +61,6 @@ extern BufferList bufferlist;
 bool quitting; // flag, that we are quitting the program
 
 
-void ShowMessage(Buffer const * buf,
-                string const & msg1,
-                string const & msg2,
-                string const & msg3)
-{
-       if (lyx_gui::use_gui
-           && buf && buf->getUser() && buf->getUser()->owner()) {
-                       string const str = msg1 + ' ' + msg2 + ' ' + msg3;
-                       buf->getUser()->owner()->message(str);
-       } else
-               lyxerr << msg1 << msg2 << msg3 << endl;
-}
-
-
 //
 // Menu callbacks
 //
@@ -183,11 +173,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);
        }
 
@@ -237,16 +227,16 @@ int AutoSaveBuffer::generateChild()
                // anyway.
                bool failed = false;
 
-               string const tmp_ret = lyx::tempName(string(), "lyxauto");
+               string const tmp_ret = tempName(string(), "lyxauto");
                if (!tmp_ret.empty()) {
                        bv_.buffer()->writeFile(tmp_ret);
                        // assume successful write of tmp_ret
-                       if (!lyx::rename(tmp_ret, fname_)) {
+                       if (!rename(tmp_ret, fname_)) {
                                failed = true;
                                // most likely couldn't move between filesystems
                                // unless write of tmp_ret failed
                                // so remove tmp file (if it exists)
-                               lyx::unlink(tmp_ret);
+                               unlink(tmp_ret);
                        }
                } else {
                        failed = true;
@@ -307,7 +297,7 @@ void AutoSave(BufferView * bv)
 // create new file with template
 // SERVERCMD !
 //
-Buffer * NewFile(string const & filename)
+void NewFile(BufferView * bv, string const & filename)
 {
        // Split argument by :
        string name;
@@ -325,11 +315,7 @@ Buffer * NewFile(string const & filename)
                            << "\nName is " << name
                            << "\nTemplate is " << tmpname << endl;
 
-       // find a free buffer
-       Buffer * tmpbuf = bufferlist.newFile(name, tmpname);
-       if (tmpbuf)
-               lastfiles->newFile(tmpbuf->fileName());
-       return tmpbuf;
+       bv->newFile(name, tmpname);
 }
 
 
@@ -468,10 +454,10 @@ void Reconfigure(BufferView * bv)
        bv->owner()->message(_("Running configure..."));
 
        // Run configure in user lyx directory
-       Path p(user_lyxdir);
+       Path p(user_lyxdir());
        Systemcall one;
        one.startscript(Systemcall::Wait,
-                       AddName(system_lyxdir, "configure"));
+                       AddName(system_lyxdir(), "configure"));
        p.pop();
        bv->owner()->message(_("Reloading configuration..."));
        lyxrc.read(LibFileSearch(string(), "lyxrc.defaults"));