get rid of LYX_LIBS

[lyx.git] / src / buffer.h

diff --git a/src/buffer.h b/src/buffer.h
index cd8c55d7cf966d19e11e8ffe17d2e231613517de..d46e715ef9ce590fff28ac73a8a799bef6c11695 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -128,7 +128,6 @@ public:
 #ifndef NO_COMPABILITY
        ///
        void insertErtContents(Paragraph * par, int & pos,
-                              LyXFont const & font,
                               bool set_inactive = true);
 #endif
        ///
@@ -161,7 +160,7 @@ public:
            \param \a endpar if == 0 then to the end
        */
        void latexParagraphs(std::ostream & os, Paragraph * par,
-                            Paragraph * endpar, TexRow & texrow) const;
+                            Paragraph * endpar, TexRow & texrow) const;
        ///
        void simpleDocBookOnePar(std::ostream &,
                                 Paragraph * par, int & desc_on,
@@ -213,9 +212,13 @@ public:
        /// Mark this buffer as dirty.
        void markDirty();
 
-       /// Returns the buffers filename.
+       /// Returns the buffer's filename. It is always an absolute path.
        string const & fileName() const;
 
+       /// Returns the the path where the buffer lives.
+       /// It is always an absolute path. 
+       string const & filePath() const;
+
        /** A transformed version of the file name, adequate for LaTeX.
            \param no_path optional if \c true then the path is stripped.
        */
@@ -313,9 +316,6 @@ public:
        /// Where to put temporary files.
        string tmppath;
 
-       /// The path to the document file.
-       string filepath;
-
        /** If we are writing a nice LaTeX file or not.
            While writing as LaTeX, tells whether we are
            doing a 'nice' LaTeX file */
@@ -340,7 +340,10 @@ private:
        bool read_only;
 
        /// name of the file the buffer is associated with.
-       string filename;
+       string filename_;
+
+       /// The path to the document file.
+       string filepath_;
 
        /// Format number of buffer
        int file_format;
@@ -530,7 +533,14 @@ void Buffer::markDirty()
 inline
 string const & Buffer::fileName() const
 {
-       return filename;
+       return filename_;
+}
+
+
+inline
+string const & Buffer::filePath() const
+{
+       return filepath_;
 }