Point fix, earlier forgotten

[lyx.git] / src / buffer.h

diff --git a/src/buffer.h b/src/buffer.h
index 26abfd024aa0211fa09b69b269240e7ce6e3dba8..cde82c260d6271772cbb9caa9e7064753bd84146 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -6,7 +6,7 @@
  *
  * \author Lars Gullik Bjønnes
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef BUFFER_H
@@ -72,15 +72,19 @@ public:
        /// Load the autosaved file.
        void loadAutoSaveFile();
 
+private:
        /** Inserts a file into a document
            \param par if != 0 insert the file.
            \return \c false if method fails.
        */
-       bool readFile(LyXLex &, string const &, ParagraphList::iterator pit);
+       bool readFile(LyXLex &, string const & filename,
+                     ParagraphList::iterator pit);
 
-       // FIXME: it's very silly to pass a lex in here
+public:
        /// load a new file
-       bool readFile(LyXLex &, string const &);
+       bool readFile(string const & filename);
+
+       bool readFile(string const & filename, ParagraphList::iterator pit);
 
        /// read the header, returns number of unknown tokens
        int readHeader(LyXLex & lex);
@@ -141,14 +145,14 @@ public:
        void makeLaTeXFile(string const & filename,
                           string const & original_path,
                           LatexRunParams const &,
-                          bool only_body = false,
-                          bool only_preamble = false);
+                          bool output_preamble = true,
+                          bool output_body = true);
        ///
        void makeLaTeXFile(std::ostream & os,
                           string const & original_path,
                           LatexRunParams const &,
-                          bool only_body = false,
-                          bool only_preamble = false);
+                          bool output_preamble = true,
+                          bool output_body = true);
        ///
        void simpleDocBookOnePar(std::ostream &,
                                 ParagraphList::iterator par, int & desc_on,
@@ -292,6 +296,8 @@ public:
        AuthorList & authors();
 
 private:
+       bool do_writeFile(std::ostream & ofs) const;
+
        typedef std::map<string, bool> DepClean;
 
        /// need to regenerate .tex ?
@@ -315,8 +321,6 @@ private:
        /// The path to the document file.
        string filepath_;
 
-       /// Format number of buffer
-       int file_format;
        ///
        boost::scoped_ptr<Messages> messages_;
 public:
@@ -324,10 +328,10 @@ public:
        class inset_iterator {
        public:
                typedef std::input_iterator_tag iterator_category;
-               typedef Inset value_type;
+               typedef InsetOld value_type;
                typedef ptrdiff_t difference_type;
-               typedef Inset * pointer;
-               typedef Inset & reference;
+               typedef InsetOld * pointer;
+               typedef InsetOld & reference;
                typedef ParagraphList::iterator base_type;
 
                ///
@@ -387,7 +391,7 @@ public:
        ParConstIterator par_iterator_end() const;
 
        ///
-       Inset * getInsetFromID(int id_arg) const;
+       InsetOld * getInsetFromID(int id_arg) const;
 };
 
 bool operator==(Buffer::inset_iterator const & iter1,