Replace LString.h with support/std_string.h,

[features.git] / src / buffer.h

diff --git a/src/buffer.h b/src/buffer.h
index 4c28a12014c28e46d2a95492102ba179103c3948..5676fb23c2120bcc1d6582cd983b7e402f3edf59 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -6,13 +6,13 @@
  *
  * \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
 #define BUFFER_H
 
-#include "LString.h"
+#include "support/std_string.h"
 #include "undo.h"
 #include "support/limited_stack.h"
 
@@ -20,22 +20,21 @@
 #include "bufferparams.h"
 #include "texrow.h"
 #include "ParagraphList.h"
-#include "author.h"
-#include "iterators.h"
 #include "errorlist.h"
 
 #include <boost/scoped_ptr.hpp>
 #include <boost/signals/signal0.hpp>
 #include <boost/signals/signal1.hpp>
 
+class AuthorList;
 class LyXRC;
-class TeXErrors;
 class LaTeXFeatures;
 class LatexRunParams;
 class Language;
+class Messages;
 class ParIterator;
 class ParConstIterator;
-class Messages;
+class TeXErrors;
 
 
 /** The buffer object.
@@ -72,15 +71,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(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);
@@ -317,8 +320,6 @@ private:
        /// The path to the document file.
        string filepath_;
 
-       /// Format number of buffer
-       int file_format;
        ///
        boost::scoped_ptr<Messages> messages_;
 public: