Buffer::setFileName() can now be private. The only way to change the filename of...

Change its parameter type to support::FileName for convenience.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36375 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 26126da83897de6310ce56470b652a7d7f3d9e1a..01277217613fac95f25e9ddee92ecb54aab01696 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -189,7 +189,7 @@ public:
        /// is autosave needed?
        mutable bool bak_clean;
 
-       /// is this a unnamed file (New...)?
+       /// is this an unnamed file (New...)?
        bool unnamed;
 
        /// buffer is r/o
@@ -642,9 +642,9 @@ void Buffer::setReadonly(bool const flag)
 }
 
 
-void Buffer::setFileName(string const & newfile)
+void Buffer::setFileName(FileName const & fname)
 {
-       d->filename = makeAbsPath(newfile);
+       d->filename = fname;
        setReadonly(d->filename.isReadOnly());
        updateTitles();
 }
@@ -4145,7 +4145,7 @@ bool Buffer::saveAs(FileName const & fn)
        FileName const old_auto = getAutosaveFileName();
        bool const old_unnamed = isUnnamed();
 
-       setFileName(fn.absFileName());
+       setFileName(fn);
        markDirty();
        setUnnamed(false);
 
@@ -4164,7 +4164,7 @@ bool Buffer::saveAs(FileName const & fn)
        } else {
                // save failed
                // reset the old filename and unnamed state
-               setFileName(old_name.absFileName());
+               setFileName(old_name);
                setUnnamed(old_unnamed);
                saveCheckSum();
                return false;

diff --git a/src/Buffer.h b/src/Buffer.h
index 3cc0452ac95cc5fb4c790e097aa2be0040232fd7..03710c7a0f09c36879401024216c6b8f441bc851 100644 (file)
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -365,9 +365,6 @@ public:
        /// Get the name and type of the log.
        std::string logName(LogType * type = 0) const;
 
-       /// Change name of buffer. Updates "read-only" flag.
-       void setFileName(std::string const & newfile);
-
        /// Set document's parent Buffer.
        void setParent(Buffer const *);
        Buffer const * parent() const;
@@ -657,6 +654,8 @@ public:
        void checkChildBuffers();
 
 private:
+       /// Change name of buffer. Updates "read-only" flag.
+       void setFileName(support::FileName const & fname);
        ///
        std::vector<std::string> backends() const;
        ///