Less expensive OP first as this might be called often.

[lyx.git] / src / TextClass.h

diff --git a/src/TextClass.h b/src/TextClass.h
index 11710edfe461043198fc969fe33d34a51441df33..a4c758f3394569c6ccee89fadd6080e6ed3bee06 100644 (file)
--- a/src/TextClass.h
+++ b/src/TextClass.h
@@ -15,7 +15,6 @@
 #include "DocumentClassPtr.h"
 #include "FloatList.h"
 #include "FontInfo.h"
-#include "Layout.h"
 #include "LayoutEnums.h"
 #include "LayoutModuleList.h"
 
@@ -38,7 +37,6 @@ namespace lyx {
 
 namespace support { class FileName; }
 
-class Counters;
 class FloatList;
 class Layout;
 class LayoutFile;
@@ -435,7 +433,7 @@ public:
        /// \return true if there is a Layout with latexname lay
        bool hasLaTeXLayout(std::string const & lay) const;
        /// A DocumentClass nevers count as loaded, since it is dynamic
-       virtual bool loaded() const { return false; }
+       bool loaded() const override { return false; }
        /// \return the layout object of an inset given by name. If the name
        /// is not found as such, the part after the ':' is stripped off, and
        /// searched again. In this way, an error fallback can be provided:
@@ -490,7 +488,7 @@ public:
        ///
        docstring const & htmlstyles() const { return htmlstyles_; }
        ///
-       bool const & docbookforceabstract() const { return docbookforceabstract_; }
+       bool docbookforceabstract() const { return docbookforceabstract_; }
        ///
        std::string const & docbookroot() const { return docbookroot_; }
        /// Looks for the layout of "highest level", other than Part (or other
@@ -553,9 +551,9 @@ public:
        /// The maximum number of citations before "et al."
        size_t max_citenames() const { return maxcitenames_; }
        ///
-       bool const & fullAuthorList() const { return cite_full_author_list_; }
+       bool fullAuthorList() const { return cite_full_author_list_; }
        ///
-       bool const & bibInToc() const { return bibintoc_; }
+       bool bibInToc() const { return bibintoc_; }
 protected:
        /// Constructs a DocumentClass based upon a LayoutFile.
        DocumentClass(LayoutFile const & tc);
@@ -566,7 +564,7 @@ private:
        friend DocumentClassPtr
                getDocumentClass(LayoutFile const &, LayoutModuleList const &,
                                 std::string const &,
-                                bool const clone);
+                                bool clone, bool internal);
 };
 
 
@@ -577,7 +575,7 @@ private:
 DocumentClassPtr getDocumentClass(LayoutFile const & baseClass,
                        LayoutModuleList const & modlist,
                        std::string const & cengine = std::string(),
-                       bool const clone = false);
+                       bool clone = false, bool internal = false);
 
 /// convert page sides option to text 1 or 2
 std::ostream & operator<<(std::ostream & os, PageSides p);