use FileName::isDirectory()

[lyx.git] / src / LyXFunc.cpp

diff --git a/src/LyXFunc.cpp b/src/LyXFunc.cpp
index e0d370ed48482d7399f2ce7e6485d41084ee0d97..b8673bb152e4146cdff1501a5552292e4dd7e545 100644 (file)
--- a/src/LyXFunc.cpp
+++ b/src/LyXFunc.cpp
@@ -59,7 +59,6 @@
 #include "Session.h"
 #include "TextClassList.h"
 #include "ToolbarBackend.h"
-#include "Undo.h"
 
 #include "insets/InsetBox.h"
 #include "insets/InsetBranch.h"
@@ -1153,7 +1152,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                                FileName const filename(makeAbsPath(target_name,
                                                        lyx_view_->buffer()->filePath()));
                                FileName const dvifile(makeAbsPath(dviname, path));
-                               if (fs::exists(filename.toFilesystemEncoding())) {
+                               if (filename.exists()) {
                                        docstring text = bformat(
                                                _("The file %1$s already exists.\n\n"
                                                  "Do you want to overwrite that file?"),
@@ -1798,7 +1797,9 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                        Buffer * buffer = lyx_view_->buffer();
 
                        TextClassPtr oldClass = buffer->params().getTextClassPtr();
-                       recordUndoFullDocument(view());
+
+                       Cursor & cur = view()->cursor();
+                       cur.recordUndoFullDocument();
                        
                        istringstream ss(argument);
                        Lexer lex(0,0);
@@ -1818,7 +1819,6 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                                        lyx_view_->buffer()->params().getEngine();
                        
                        if (oldEngine != newEngine) {
-                               Cursor & cur = view()->cursor();
                                FuncRequest fr(LFUN_INSET_REFRESH);
        
                                Inset & inset = lyx_view_->buffer()->inset();
@@ -1837,7 +1837,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                        BOOST_ASSERT(lyx_view_);
                        Buffer * buffer = lyx_view_->buffer();
                        TextClassPtr oldClass = buffer->params().getTextClassPtr();
-                       recordUndoFullDocument(view());
+                       view()->cursor().recordUndoFullDocument();
                        buffer->params().clearLayoutModules();
                        updateLayout(oldClass, buffer);
                        updateFlags = Update::Force | Update::FitCursor;
@@ -1848,7 +1848,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                        BOOST_ASSERT(lyx_view_);
                        Buffer * buffer = lyx_view_->buffer();
                        TextClassPtr oldClass = buffer->params().getTextClassPtr();
-                       recordUndoFullDocument(view());
+                       view()->cursor().recordUndoFullDocument();
                        buffer->params().addLayoutModule(argument);
                        updateLayout(oldClass, buffer);
                        updateFlags = Update::Force | Update::FitCursor;
@@ -1876,7 +1876,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 
                        //Save the old, possibly modular, layout for use in conversion.
                        TextClassPtr oldClass = buffer->params().getTextClassPtr();
-                       recordUndoFullDocument(view());
+                       view()->cursor().recordUndoFullDocument();
                        buffer->params().setBaseClass(new_class);
                        updateLayout(oldClass, buffer);
                        updateFlags = Update::Force | Update::FitCursor;
@@ -2077,7 +2077,7 @@ void LyXFunc::menuNew(string const & name, bool fromTemplate)
                filename = addName(lyxrc.document_path,
                            "newfile" + convert<string>(++newfile_number) + ".lyx");
                while (theBufferList().exists(filename) ||
-                      fs::is_readable(FileName(filename).toFilesystemEncoding())) {
+                      FileName(filename).isReadable()) {
                        ++newfile_number;
                        filename = addName(lyxrc.document_path,
                                           "newfile" +  convert<string>(newfile_number) +
@@ -2155,7 +2155,7 @@ void LyXFunc::open(string const & fname)
                filename = fullname.absFilename();
 
        // if the file doesn't exist, let the user create one
-       if (!fs::exists(fullname.toFilesystemEncoding())) {
+       if (!fullname.exists()) {
                // the user specifically chose this name. Believe him.
                Buffer * const b = newFile(filename, string(), true);
                if (b)
@@ -2247,7 +2247,7 @@ void LyXFunc::doImport(string const & argument)
 
        // if the file exists already, and we didn't do
        // -i lyx thefile.lyx, warn
-       if (fs::exists(lyxfile.toFilesystemEncoding()) && fullname != lyxfile) {
+       if (lyxfile.exists() && fullname != lyxfile) {
                docstring const file = makeDisplayPath(lyxfile.absFilename(), 30);
 
                docstring text = bformat(_("The document %1$s already exists.\n\n"
@@ -2403,9 +2403,8 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
        case LyXRC::RC_DISPLAY_GRAPHICS:
        case LyXRC::RC_DOCUMENTPATH:
                if (lyxrc_orig.document_path != lyxrc_new.document_path) {
-                       string const encoded = FileName(
-                               lyxrc_new.document_path).toFilesystemEncoding();
-                       if (fs::exists(encoded) && fs::is_directory(encoded))
+                       FileName path(lyxrc_new.document_path);
+                       if (path.exists() && path.isDirectory())
                                support::package().document_dir() = FileName(lyxrc.document_path);
                }
        case LyXRC::RC_ESC_CHARS: