apply the ostream changes to mathed, some other small related things

[features.git] / src / layout.h

diff --git a/src/layout.h b/src/layout.h
index 3926f99bbeb5fa7f51db8414032bd27d5c1943b3..da29bc5d5ea8f7033996f55629723ee022e118e2 100644 (file)
--- a/src/layout.h
+++ b/src/layout.h
@@ -42,7 +42,7 @@ enum { // no good name for this
 /// The different output types
 enum OutputType {
         ///
-        LATEX,
+        LATEX = 1,
        ///
        LINUXDOC,
        ///
@@ -54,7 +54,7 @@ enum OutputType {
 /// The different margin types
 enum LYX_MARGIN_TYPE {
        ///
-       MARGIN_MANUAL,
+       MARGIN_MANUAL = 1,
        ///
        MARGIN_FIRST_DYNAMIC,
        ///
@@ -65,6 +65,7 @@ enum LYX_MARGIN_TYPE {
        MARGIN_RIGHT_ADDRESS_BOX
 };
 
+
 ///
 enum LyXAlignment {
        ///
@@ -84,14 +85,15 @@ enum LyXAlignment {
 };
 
 
-inline void operator|=(LyXAlignment & la1, LyXAlignment la2) {
+inline
+void operator|=(LyXAlignment & la1, LyXAlignment la2) {
        la1 = static_cast<LyXAlignment>(la1 | la2);
 }
 
 /// The different LaTeX-Types
 enum LYX_LATEX_TYPES {
        ///
-       LATEX_PARAGRAPH,
+       LATEX_PARAGRAPH = 1,
        ///
        LATEX_COMMAND,
        ///
@@ -258,16 +260,16 @@ public:
        Spacing spacing;
 
        ///
-       LyXAlignment align; // add approp. signedness
+       LyXAlignment align;
 
        ///
-       LyXAlignment alignpossible; // add approp. signedness
+       LyXAlignment alignpossible;
 
        ///
-       char labeltype; // add approp. signedness
+       char labeltype; // add approp. type
 
        ///
-       char margintype; // add approp. signedness
+       LYX_MARGIN_TYPE margintype;
 
        ///
        bool fill_top;
@@ -340,7 +342,8 @@ public:
        typedef vector<LyXLayout> LayoutList;
        ///
        typedef LayoutList::const_iterator const_iterator;
-
+       ///
+       typedef LayoutList::size_type size_type;
        ///
        LyXTextClass (string const & = string(), 
                      string const & = string(), 
@@ -422,9 +425,9 @@ public:
         ///
        int maxcounter() const { return maxcounter_; }
        ///
-       LayoutList::size_type numLayouts() const { return layoutlist.size(); }
+       size_type numLayouts() const { return layoutlist.size(); }
        ///
-       LyXLayout const & operator[](LayoutList::size_type i) const {
+       LyXLayout const & operator[](size_type i) const {
                return layoutlist[i];
        }
 private:
@@ -483,14 +486,16 @@ private:
 
 
 ///
-inline void operator|=(LyXTextClass::Provides & p1, LyXTextClass::Provides p2)
+inline
+void operator|=(LyXTextClass::Provides & p1, LyXTextClass::Provides p2)
 {
        p1 = static_cast<LyXTextClass::Provides>(p1 | p2);
 }
 
 
 ///
-inline ostream & operator<<(ostream & os, LyXTextClass::PageSides p)
+inline
+ostream & operator<<(ostream & os, LyXTextClass::PageSides p)
 {
        switch (p) {
        case LyXTextClass::OneSide:
@@ -512,41 +517,43 @@ public:
        ///
        typedef ClassList::const_iterator const_iterator;
        ///
+       typedef ClassList::size_type size_type;
+       ///
        const_iterator begin() const { return classlist.begin(); }
        ///
        const_iterator end() const { return classlist.end(); }
        
        /// Gets layout structure from layout number and textclass number
-       LyXLayout const & Style(ClassList::size_type textclass,
-                               LyXTextClass::LayoutList::size_type layout) const;
+       LyXLayout const & Style(size_type textclass,
+                               LyXTextClass::size_type layout) const;
 
        /// Gets layout number from textclass number and layout name
-       pair<bool, LyXTextClass::LayoutList::size_type>
-       NumberOfLayout(ClassList::size_type textclass,
+       pair<bool, LyXTextClass::size_type>
+       NumberOfLayout(size_type textclass,
                       string const & name) const;
 
        /// Gets a layout name from layout number and textclass number
        string const &
-       NameOfLayout(ClassList::size_type textclass,
-                    LyXTextClass::LayoutList::size_type layout) const;
+       NameOfLayout(size_type textclass,
+                    LyXTextClass::size_type layout) const;
 
        /** Gets textclass number from name.
            Returns -1 if textclass name does not exist
        */
-       pair<bool, ClassList::size_type>
+       pair<bool, size_type>
        NumberOfClass(string const & textclass) const;
 
        ///
-       string const & NameOfClass(ClassList::size_type number) const;
+       string const & NameOfClass(size_type number) const;
 
        ///
-       string const & LatexnameOfClass(ClassList::size_type number) const;
+       string const & LatexnameOfClass(size_type number) const;
 
        ///
-       string const & DescOfClass(ClassList::size_type number) const;
+       string const & DescOfClass(size_type number) const;
 
        ///
-       LyXTextClass const & TextClass(ClassList::size_type textclass) const;
+       LyXTextClass const & TextClass(size_type textclass) const;
 
        /** Read textclass list.
            Returns false if this fails
@@ -556,7 +563,7 @@ public:
        /** Load textclass.
            Returns false if this fails
        */
-       bool Load(ClassList::size_type number) const;
+       bool Load(size_type number) const;
 private:
        ///
        mutable ClassList classlist;