* do not lookup the same macro all the time

[lyx.git] / src / Buffer.h

diff --git a/src/Buffer.h b/src/Buffer.h
index 28cfbab9c00861d3666104ca5aa9d42c0b95b32d..586c47db022d6955b1e834f6ab24a187929f9925 100644 (file)
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -16,7 +16,6 @@
 #include "InsetList.h"
 
 #include "DocIterator.h"
-#include "ParagraphList_fwd.h"
 
 #include "support/FileName.h"
 #include "support/limited_stack.h"
@@ -39,12 +38,12 @@ namespace lyx {
 class BufferParams;
 class ErrorItem;
 class FuncRequest;
-class InsetBase;
+class Inset;
 class InsetText;
-class LyXFont;
-class LyXLex;
+class Font;
+class Lexer;
 class LyXRC;
-class LyXText;
+class Text;
 class LyXVC;
 class LaTeXFeatures;
 class Language;
@@ -52,17 +51,18 @@ class MacroData;
 class OutputParams;
 class ParConstIterator;
 class ParIterator;
+class ParagraphList;
+class StableDocIterator;
 class TeXErrors;
 class TexRow;
 class TocBackend;
 class Undo;
-class StableDocIterator;
 
 
 /** The buffer object.
  * This is the buffer object. It contains all the informations about
  * a document loaded into LyX.
- * The buffer object owns the LyXText (wrapped in an InsetText), which
+ * The buffer object owns the Text (wrapped in an InsetText), which
  * contains the individual paragraphs of the document.
  *
  *
@@ -111,18 +111,18 @@ public:
        bool readFile(support::FileName const & filename);
 
        /// read the header, returns number of unknown tokens
-       int readHeader(LyXLex & lex);
+       int readHeader(Lexer & lex);
 
        /** Reads a file without header.
            \param par if != 0 insert the file.
            \return \c false if file is not completely read.
        */
-       bool readDocument(LyXLex &);
+       bool readDocument(Lexer &);
 
        ///
        void insertStringAsLines(ParagraphList & plist,
                pit_type &, pos_type &,
-               LyXFont const &, docstring const &, bool);
+               Font const &, docstring const &, bool);
        ///
        ParIterator getParFromID(int id) const;
        /// do we have a paragraph with this id?
@@ -349,10 +349,10 @@ public:
        void fully_loaded(bool);
 
        /// Our main text (inside the top InsetText)
-       LyXText & text() const;
+       Text & text() const;
 
        /// Our top InsetText!
-       InsetBase & inset() const;
+       Inset & inset() const;
 
        //
        // Macro handling
@@ -374,7 +374,7 @@ public:
        StableDocIterator getAnchor() const { return anchor_; }
        ///
        void changeRefsIfUnique(docstring const & from, docstring const & to,
-               InsetBase::Code code);
+               Inset::Code code);
 /// get source code (latex/docbook) for some paragraphs, or all paragraphs
 /// including preamble
        void getSourceCode(odocstream & os, pit_type par_begin, pit_type par_end, bool full_source);
@@ -394,7 +394,7 @@ private:
        /** Inserts a file into a document
            \return \c false if method fails.
        */
-       ReadStatus readFile(LyXLex &, support::FileName const & filename,
+       ReadStatus readFile(Lexer &, support::FileName const & filename,
                            bool fromString = false);
 
        /// Use the Pimpl idiom to hide the internals.