Fulfill promise to Andre: TextClass_ptr --> TextClassPtr.

[lyx.git] / src / BufferParams.h

diff --git a/src/BufferParams.h b/src/BufferParams.h
index dd2422ef5d0bcaad8c147e647a9f40fbb34c92cb..ec3ed4e9bf5837d3413b27f8c6dcfd4a0b6a9f7b 100644 (file)
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -17,7 +17,7 @@
 
 #include "BiblioInfo.h"
 #include "TextClass.h"
-#include "TextClass_ptr.h"
+#include "TextClassPtr.h"
 #include "paper.h"
 
 #include "insets/InsetQuotes.h"
@@ -26,8 +26,6 @@
 #include "support/FileName.h"
 #include "support/types.h"
 
-#include "frontends/controllers/frontend_helpers.h"
-
 #include <vector>
 
 namespace lyx {
@@ -103,13 +101,13 @@ public:
        ///Set the LyX TextClass (that is, the layout file) this document is using.
        ///NOTE This also calls makeTextClass(), to update the local
        ///TextClass.
-       void setBaseClass(textclass_type);
+       bool setBaseClass(textclass_type);
        ///Returns the TextClass currently in use: the BaseClass as modified
        ///by modules.
        TextClass const & getTextClass() const;
        ///Returns a pointer to the TextClass currently in use: the BaseClass 
-       ///as modified by modules. (See \file TextClass_ptr.h for the typedef.)
-       TextClass_ptr getTextClass_ptr() const;
+       ///as modified by modules. (See \file TextClassPtr.h for the typedef.)
+       TextClassPtr getTextClassPtr() const;
        ///Set the LyX TextClass---layout file---this document is using.
        ///This does NOT call makeTextClass() and so should be used with
        ///care. This is most likely not what you want if you are operating on 
@@ -121,7 +119,7 @@ public:
        /// 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(TextClass_ptr);
+       void setTextClass(TextClassPtr);
        /// List of modules in use
        std::vector<std::string> const & getModules() const;
        /// Add a module to the list of modules in use.
@@ -261,6 +259,8 @@ public:
        std::string parentname;
        ///
        bool compressed;
+       ///
+       bool embedded;
 
        /// the author list for the document
        AuthorList & authors();
@@ -313,7 +313,7 @@ private:
        /// the base TextClass associated with the document
        textclass_type baseClass_;
        /// the possibly modular TextClass actually in use
-       TextClass_ptr textClass_;
+       TextClassPtr textClass_;
        ///
        typedef std::vector<std::string> LayoutModuleList;
        ///