Cleanup.

[lyx.git] / src / BufferParams.h

diff --git a/src/BufferParams.h b/src/BufferParams.h
index a1d82104bf255c9065bdac3f04922640d6766aff..9e858275aeaadcf0e0121128f7ad2b930d9e4099 100644 (file)
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -15,14 +15,13 @@
 #ifndef BUFFERPARAMS_H
 #define BUFFERPARAMS_H
 
-#include "BiblioInfo.h"
 #include "Font.h"
+#include "BiblioInfo.h"
 #include "paper.h"
 
 #include "insets/InsetQuotes.h"
 
 #include "support/copied_ptr.h"
-#include "support/types.h"
 
 #include <vector>
 
@@ -35,14 +34,15 @@ class FileName;
 class AuthorList;
 class BranchList;
 class Bullet;
+class DocumentClass;
 class Encoding;
 class Language;
-class Lexer;
 class LatexFeatures;
+class LayoutFile;
+class LayoutFileIndex;
+class Lexer;
 class PDFOptions;
 class Spacing;
-class TextClass;
-class TextClassIndex;
 class TexRow;
 class VSpace;
 
@@ -106,30 +106,33 @@ public:
        InsetQuotes::quote_times quotes_times;
        ///
        std::string fontsize;
-       /// Get the LyX TextClass (that is, the layout file) this document is using.
-       TextClassIndex baseClass() const;
-       /// Set the LyX TextClass (that is, the layout file) this document is using.
-       /// NOTE: This does not call makeTextClass() to update the local TextClass.
-       /// That needs to be done manually.
-       bool setBaseClass(TextClassIndex const & index);
+       ///Get the LayoutFile this document is using.
+       LayoutFile const * baseClass() const;
+       ///
+       LayoutFileIndex const & baseClassID() const;
+       /// Set the LyX layout file this document is using.
+       /// NOTE: This does not call makeDocumentClass() to update the local 
+       /// DocumentClass. That needs to be done manually.
+       /// \param filename the name of the layout file
+       bool setBaseClass(std::string const & classname);
        /// Adds the module information to the baseClass information to
-       /// create our local TextClass.
-       void makeTextClass();
-       /// Returns the TextClass currently in use: the BaseClass as modified
+       /// create our local DocumentClass.
+       void makeDocumentClass();
+       /// Returns the DocumentClass currently in use: the BaseClass as modified
        /// by modules.
-       TextClass const & textClass() const;
-       /// Returns a pointer to the TextClass currently in use: the BaseClass 
-       /// as modified by modules. (See \file TextClass.h for the definition.)
-       TextClassIndex textClassIndex() const;
+       DocumentClass const & documentClass() const;
+       /// \return A pointer to the DocumentClass currently in use: the BaseClass 
+       /// as modified by modules. 
+       DocumentClass * documentClassPtr() const;
        /// This bypasses the baseClass and sets the textClass directly.
        /// Should be called with care and would be better not being here,
        /// but it seems to be needed by CutAndPaste::putClipboard().
-       void setTextClass(TextClassIndex const & index);
+       void setDocumentClass(DocumentClass const * const);
        /// List of modules in use
        std::vector<std::string> const & getModules() const;
        /// Add a module to the list of modules in use.
        /// Returns true if module was successfully added.
-       /// The makeClass variable signals whether to call makeTextClass. This
+       /// The makeClass variable signals whether to call makeDocumentClass. This
        /// need not be done if we know this isn't the final time through, or if
        /// the BufferParams do not represent the parameters for an actual buffer
        /// (as in GuiDocument).
@@ -328,6 +331,8 @@ private:
        /// for use with natbib
        biblio::CiteEngine cite_engine_;
        ///
+       DocumentClass * doc_class_;
+       ///
        typedef std::vector<std::string> LayoutModuleList;
        /// 
        LayoutModuleList layoutModules_;