cosmetics

[lyx.git] / src / Buffer.cpp

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index fa6dc704f8173e3d01038dbaea4dd18df5e444cf..edb0684b739a678a8623e1d82cbe9d42e892f26e 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -85,7 +85,6 @@
 #include "support/FileFilterList.h"
 #include "support/filetools.h"
 #include "support/Forkedcall.h"
-#include "support/fs_extras.h"
 #include "support/gzstream.h"
 #include "support/lyxlib.h"
 #include "support/os.h"
@@ -98,8 +97,6 @@
 #endif
 
 #include <boost/bind.hpp>
-#include <boost/filesystem/exception.hpp>
-#include <boost/filesystem/operations.hpp>
 #include <boost/shared_ptr.hpp>
 
 #include <algorithm>
@@ -153,11 +150,10 @@ using support::suffixIs;
 
 namespace Alert = frontend::Alert;
 namespace os = support::os;
-namespace fs = boost::filesystem;
 
 namespace {
 
-int const LYX_FORMAT = 299; //Uwe: Hyperlink types
+int const LYX_FORMAT = 299; // Uwe: Hyperlink types
 
 } // namespace anon
 
@@ -850,7 +846,7 @@ bool Buffer::save() const
        bool madeBackup = false;
 
        // make a backup if the file already exists
-       if (lyxrc.make_backup && fs::exists(encodedFilename)) {
+       if (lyxrc.make_backup && fileName().exists()) {
                backupName = FileName(absFileName() + '~');
                if (!lyxrc.backupdir_path.empty()) {
                        string const mangledName =
@@ -859,20 +855,19 @@ bool Buffer::save() const
                        backupName = FileName(addName(lyxrc.backupdir_path,
                                                      mangledName));
                }
-               try {
-                       fs::copy_file(encodedFilename, backupName.toFilesystemEncoding(), false);
+               if (fileName().copyTo(backupName, false)) {
                        madeBackup = true;
-               } catch (fs::filesystem_error const & fe) {
+               } else {
                        Alert::error(_("Backup failure"),
                                     bformat(_("Cannot create backup file %1$s.\n"
                                               "Please check whether the directory exists and is writeable."),
                                             from_utf8(backupName.absFilename())));
-                       LYXERR(Debug::DEBUG) << "Fs error: " << fe.what() << endl;
+                       //LYXERR(Debug::DEBUG) << "Fs error: " << fe.what() << endl;
                }
        }
 
        // ask if the disk file has been externally modified (use checksum method)
-       if (fs::exists(encodedFilename) && isExternallyModified(checksum_method)) {
+       if (fileName().exists() && isExternallyModified(checksum_method)) {
                docstring const file = makeDisplayPath(absFileName(), 20);
                docstring text = bformat(_("Document %1$s has been externally modified. Are you sure "
                                                             "you want to overwrite this file?"), file);
@@ -1318,7 +1313,7 @@ int Buffer::runChktex()
        string const name = addName(path.absFilename(), latexName());
        string const org_path = filePath();
 
-       support::Path p(path); // path to LaTeX file
+       support::PathChanger p(path); // path to LaTeX file
        message(_("Running chktex..."));
 
        // Generate the LaTeX file if neccessary
@@ -1700,6 +1695,12 @@ void Buffer::markDirty()
 }
 
 
+FileName Buffer::fileName() const
+{
+       return pimpl_->filename;
+}
+
+
 string Buffer::absFileName() const
 {
        return pimpl_->filename.absFilename();
@@ -1764,12 +1765,12 @@ bool Buffer::hasMacro(docstring const & name, Paragraph const & par) const
 {
        Impl::PositionToMacroMap::iterator it;
        it = pimpl_->macros[name].upper_bound(par.macrocontextPosition());
-       if( it != pimpl_->macros[name].end() )
+       if (it != pimpl_->macros[name].end())
                return true;
 
        // If there is a master buffer, query that
-       const Buffer *master = masterBuffer();
-       if (master && master!=this)
+       const Buffer * master = masterBuffer();
+       if (master && master != this)
                return master->hasMacro(name);
 
        return MacroTable::globalMacros().has(name);
@@ -1782,15 +1783,16 @@ bool Buffer::hasMacro(docstring const & name) const
                return true;
 
        // If there is a master buffer, query that
-       const Buffer *master = masterBuffer();
-       if (master && master!=this)
+       const Buffer * master = masterBuffer();
+       if (master && master != this)
                return master->hasMacro(name);
 
        return MacroTable::globalMacros().has(name);
 }
 
 
-MacroData const & Buffer::getMacro(docstring const & name, Paragraph const & par) const
+MacroData const & Buffer::getMacro(docstring const & name,
+       Paragraph const & par) const
 {
        Impl::PositionToMacroMap::iterator it;
        it = pimpl_->macros[name].upper_bound(par.macrocontextPosition());
@@ -1798,8 +1800,8 @@ MacroData const & Buffer::getMacro(docstring const & name, Paragraph const & par
                return it->second;
 
        // If there is a master buffer, query that
-       const Buffer *master = masterBuffer();
-       if (master && master!=this)
+       const Buffer * master = masterBuffer();
+       if (master && master != this)
                return master->getMacro(name);
 
        return MacroTable::globalMacros().get(name);
@@ -1814,8 +1816,8 @@ MacroData const & Buffer::getMacro(docstring const & name) const
                return it->second;
 
        // If there is a master buffer, query that
-       const Buffer *master = masterBuffer();
-       if (master && master!=this)
+       const Buffer * master = masterBuffer();
+       if (master && master != this)
                return master->getMacro(name);
 
        return MacroTable::globalMacros().get(name);