* temporary fix for the crash of the pixmap cache on Mac with Qt 4.4.

[lyx.git] / src / TextClass.h

diff --git a/src/TextClass.h b/src/TextClass.h
index 475ccb88a121b75432d17cf7bf33035c2d9a09e9..456765eac150476c1ae174b55527e24a8d7edfe7 100644 (file)
--- a/src/TextClass.h
+++ b/src/TextClass.h
@@ -190,12 +190,15 @@ protected:
        /// Protect construction
        TextClass();
        ///
-       Layout & operator[](docstring const & vname);
-       /// Create an new, empty layout for this textclass.
-       /** \param unknown Set to true if this layout is an empty layout used to
-        * represent an unknown layout
+       Layout & operator[](docstring const & name);
+       /** Create an new, very basic layout for this textclass. This is used for
+           the Plain Layout common to all TextClass objects and also, in 
+           DocumentClass, for the creation of new layouts `on the fly' when
+           previously unknown layouts are encountered.
+           \param unknown Set to true if this layout is used to represent an 
+           unknown layout
         */
-       Layout createEmptyLayout(docstring const & name, bool unknown = false) const;
+       Layout createBasicLayout(docstring const & name, bool unknown = false) const;
        
        ///////////////////////////////////////////////////////////////////
        // non-const iterators
@@ -248,8 +251,12 @@ protected:
        std::set<std::string> provides_;
        /// latex packages requested by document class.
        std::set<std::string> requires_;
-       /// modules wanted by document class
-       std::set<std::string> usemod_;
+       /// default modules wanted by document class
+       std::list<std::string> default_modules_;
+       /// modules provided by document class
+       std::list<std::string> provided_modules_;
+       /// modules excluded by document class
+       std::list<std::string> excluded_modules_;
        ///
        unsigned int columns_;
        ///
@@ -302,8 +309,6 @@ private:
        void readCharStyle(Lexer &, std::string const &);
        ///
        void readFloat(Lexer &);
-       ///
-       void readCounter(Lexer &);
 };
 
 
@@ -341,8 +346,8 @@ public:
        /// happen).  -- Idea JMarc, comment MV
        InsetLayout const & insetLayout(docstring const & name) const;
        /// a plain inset layout for use as a default
-       static InsetLayout const & plainInsetLayout() { return empty_insetlayout_; }
-       /// add a new, empty layout \c name if it does not exist in layoutlist_
+       static InsetLayout const & plainInsetLayout() { return plain_insetlayout_; }
+       /// add a new layout \c name if it does not exist in layoutlist_
        void addLayoutIfNeeded(docstring const & name) const;
 
        ///////////////////////////////////////////////////////////////////
@@ -406,7 +411,7 @@ private:
        /// DocumentClassBundle, which calls the protected constructor.
        friend class DocumentClassBundle;
        ///
-       static InsetLayout empty_insetlayout_;
+       static InsetLayout plain_insetlayout_;
 };