Streamlining CollapseStatus stuff

[lyx.git] / src / callback.cpp

diff --git a/src/callback.cpp b/src/callback.cpp
index d730e99746ece4729d9cd6ad4e97fc2dc5feb55a..d0ee831216d7674a38ebb0bcf2d3b13f47a3e1c1 100644 (file)
--- a/src/callback.cpp
+++ b/src/callback.cpp
@@ -66,7 +66,7 @@ using std::ios;
 using std::istream_iterator;
 
 using boost::shared_ptr;
-
+namespace fs = boost::filesystem;
 
 namespace lyx {
 
@@ -87,9 +87,9 @@ using support::split;
 using support::Systemcall;
 using support::tempName;
 using support::unlink;
+using frontend::LyXView;
 
 namespace Alert = frontend::Alert;
-namespace fs = boost::filesystem;
 
 // this should be static, but I need it in Buffer.cpp
 bool quitting; // flag, that we are quitting the program
@@ -131,32 +131,9 @@ bool menuWrite(Buffer * buffer)
     If 'newname' is empty (the default), the user is asked via a
     dialog for the buffer's new name and location.
 
-    If 'newname' is not empty, FileName::makeAbsPath() will indirectly
-    produce the following behaviour:
-
-    * If 'newname' has an absolute path, use that.
-
-    * If 'newname' has a relative path (or no path) and the buffer has
-      a path, that path is used as the base for 'newname'. Typically
-      this means that 'M-x buffer-write-as newname.lyx' will write to
-      the same directory as the original file.
-
-    * Otherwise use CWD as the base directory for 'newname'.
-      This behavour is arguably a bug, perhaps a system depedenant
-      "document directory" shoul be used instead. Note that CWD
-      isn't actually used according to a simple test on Linux.
-      Instead, it's based on '~', contrar to the documentation of
-      makeAbsPath(). Don't know what to do. *shrug*
-
-    Note: No checks are done on the extension etc of 'newname' when
-    it's non-empty. This may arguably also be a bug.
-
-    Note: The code may not code check that 'newname' is a valid for
-    the relevant file system?
-
-    Note: In Linux, it doesn't work with e.g. '~/file.lyx'. If it's
-    done from e.g. a buffer '/tmp/buf.lyx', it instead tries to write
-    to '/tmp/~/file.lyx'.
+    If 'newname' is non-empty and has an absolute path, that is used.
+    Otherwise the base directory of the buffer is used as the base
+    for any relative path in 'newname'.
 */
 
 bool writeAs(Buffer * buffer, string const & newname)
@@ -347,7 +324,7 @@ void autoSave(BufferView * bv)
 // create new file with template
 // SERVERCMD !
 //
-void newFile(BufferView * bv, string const & filename)
+void newFile(LyXView & lv, string const & filename)
 {
        // Split argument by :
        string name;
@@ -358,7 +335,7 @@ void newFile(BufferView * bv, string const & filename)
 
        Buffer * const b = newFile(name, tmpname);
        if (b)
-               bv->setBuffer(b);
+               lv.setBuffer(b);
 }