restore comment about boost::shared_ptr and dtor.

[lyx.git] / src / TextClass.h

diff --git a/src/TextClass.h b/src/TextClass.h
index a465f123efed3b6f812a96adde041962ae99e54b..51c42b06a226ef53b1ea35f292cb766bf72f31f8 100644 (file)
--- a/src/TextClass.h
+++ b/src/TextClass.h
@@ -11,6 +11,8 @@
 #define TEXTCLASS_H
 
 #include "ColorCode.h"
+#include "Counters.h"
+#include "FloatList.h"
 #include "FontInfo.h"
 #include "Layout.h"
 #include "LayoutEnums.h"
@@ -20,7 +22,7 @@
 #include "support/docstring.h"
 #include "support/types.h"
 
-#include <boost/shared_ptr.hpp>
+#include <boost/noncopyable.hpp>
 
 #include <list>
 #include <map>
@@ -37,6 +39,19 @@ class Layout;
 class LayoutFile;
 class Lexer;
 
+/// Based upon ideas in boost::noncopyable, inheriting from this
+/// class effectively makes the copy constructor protected but the
+/// assignment constructor private.
+class ProtectCopy
+{
+protected:
+       ProtectCopy() {}
+       ~ProtectCopy() {}
+       ProtectCopy(const ProtectCopy &) {};
+private:
+       const ProtectCopy & operator=(const ProtectCopy &);
+};
+
 
 /// A TextClass represents a collection of layout information: At the 
 /// moment, this includes Layout's and InsetLayout's.
@@ -46,7 +61,7 @@ class Lexer;
 /// Simple TextClass objects are not directly constructed in the main 
 /// LyX code---the constructor is protected. (That said, in tex2lyx
 /// there are what amount to simple TextClass objects.)
-class TextClass {
+class TextClass : protected ProtectCopy {
 public:
        ///
        virtual ~TextClass() {};
@@ -153,9 +168,9 @@ protected:
        /// document class description
        std::string description_;
        /// available types of float, eg. figure, algorithm.
-       boost::shared_ptr<FloatList> floatlist_;
+       mutable FloatList floatlist_;
        /// Types of counters, eg. sections, eqns, figures, avail. in document class.
-       boost::shared_ptr<Counters> counters_;
+       mutable Counters counters_;
        /// Has this layout file been loaded yet?
        mutable bool loaded_;
        /// Is the TeX class available?
@@ -205,7 +220,7 @@ protected:
        /// The name of the title command
        std::string titlename_;
        /// Input layouts available to this layout
-       mutable InsetLayouts insetlayoutlist_;
+       InsetLayouts insetlayoutlist_;
        /// The minimal TocLevel of sectioning layouts
        int min_toclevel_;
        /// The maximal TocLevel of sectioning layouts
@@ -242,7 +257,7 @@ private:
 ///
 /// In the main LyX code, DocumentClass objects are created only by
 /// DocumentClassBundle, for which see below.
-class DocumentClass : public TextClass {
+class DocumentClass : public TextClass, boost::noncopyable {
 public:
        ///
        virtual ~DocumentClass() {}
@@ -255,7 +270,7 @@ public:
        /// A DocumentClass nevers count as loaded, since it is dynamic
        virtual bool loaded() { return false; }
        /// Inset layouts of this doc class
-       InsetLayouts & insetLayouts() const { return insetlayoutlist_; };
+       InsetLayouts const & insetLayouts() const { return insetlayoutlist_; };
        /// \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:
@@ -272,11 +287,10 @@ public:
        // accessors
        ///////////////////////////////////////////////////////////////////
        /// the list of floats defined in the document class
-       FloatList & floats() { return *floatlist_.get(); }
        /// the list of floats defined in the document class
-       FloatList const & floats() const { return *floatlist_.get(); }
-       /// The Counters present in this document class.
-       Counters & counters() const { return *counters_.get(); }
+       FloatList const & floats() const { return floatlist_; }
+       ///
+       Counters & counters() const { return counters_; }
        ///
        std::string const & opt_fontsize() const { return opt_fontsize_; }
        ///
@@ -328,7 +342,7 @@ protected:
        DocumentClass() {};
 private:
        /// The only class that can create a DocumentClass is
-       /// DocumentClassBundle, which calls the private constructor.
+       /// DocumentClassBundle, which calls the protected constructor.
        friend class DocumentClassBundle;
        ///
        static InsetLayout empty_insetlayout_;
@@ -345,7 +359,7 @@ private:
 ///
 /// This is a singleton class. Its sole instance is accessed via 
 /// DocumentClassBundle::get().
-class DocumentClassBundle {
+class DocumentClassBundle : boost::noncopyable {
 public:
        /// \return Pointer to a new class equal to baseClass
        DocumentClass & newClass(LayoutFile const & baseClass);
@@ -354,10 +368,8 @@ public:
 private:
        /// control instantiation
        DocumentClassBundle() {}
-       /// noncopyable
-       DocumentClassBundle(DocumentClassBundle const &);
        ///
-       std::list<DocumentClass> tc_list_;
+       std::list<DocumentClass *> tc_list_;
 };