Fix reading of old format templates

[lyx.git] / src / buffer.h

diff --git a/src/buffer.h b/src/buffer.h
index d4bddd69381a350faaaaedaca15ed23b313ef062..bae622f9e890559dd3ac1bd1e7906b3d7cfe9066 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -27,18 +27,15 @@
 #include "ParagraphList.h"
 #include "paragraph.h"
 
-#include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>
 
 class BufferView;
-class Counters;
 class LyXRC;
 class TeXErrors;
 class LaTeXFeatures;
 class Language;
 class ParIterator;
 
-#define NO_COMPABILITY 1
 
 ///
 struct DEPCLEAN {
@@ -111,7 +108,7 @@ public:
            \param par if != 0 insert the file.
            \return \c false if method fails.
        */
-       bool readFile(LyXLex &, Paragraph * par = 0);
+       bool readFile(LyXLex &, string const &, Paragraph * par = 0);
 
        /** Reads a file without header.
            \param par if != 0 insert the file.
@@ -128,13 +125,6 @@ public:
        ///
        void insertStringAsLines(Paragraph *&, lyx::pos_type &,
                                 LyXFont const &, string const &) const;
-#ifndef NO_COMPABILITY
-       ///
-       Inset * isErtInset(Paragraph * par, int pos) const;
-       ///
-       void insertErtContents(Paragraph * par, int & pos,
-                              bool set_inactive = true);
-#endif
        ///
        Paragraph * getParFromID(int id) const;
 private:
@@ -275,8 +265,6 @@ public:
        */
        void validate(LaTeXFeatures &) const;
 
-       ///
-       string const getIncludeonlyList(char delim = ',');
        ///
        std::vector<std::pair<string, string> > const getBibkeyList() const;
        ///
@@ -319,9 +307,6 @@ public:
 
        /// Used when typesetting to place errorboxes.
        TexRow texrow;
-       /// Buffer-wide counter array
-       Counters & counters() const;
-
 private:
        /// is save needed
        mutable bool lyx_clean;
@@ -354,10 +339,6 @@ private:
            of the buffers in the list of users to do a #updateLayoutChoice#.
        */
        BufferView * users;
-
-       /// The pointer is const although its contents may not be
-       boost::scoped_ptr<Counters> const ctrs;
-
 public:
        ///
        class inset_iterator {