Fixed some lines that were too long. It compiled afterwards.

[lyx.git] / src / Layout.h

diff --git a/src/Layout.h b/src/Layout.h
index 8776a66e821a137e1e83e8f9c27d0b5884881a4a..eca24dcc8d821b77fbf09cc24621d42fc53b26ba 100644 (file)
--- a/src/Layout.h
+++ b/src/Layout.h
@@ -78,6 +78,13 @@ void operator|=(LyXAlignment & la1, LyXAlignment la2) {
 }
 
 
+///
+inline
+LyXAlignment operator|(LyXAlignment la1, LyXAlignment la2) {
+       return static_cast<LyXAlignment>(static_cast<int>(la1) | static_cast<int>(la2));
+}
+
+
 /// The different LaTeX-Types
 enum LYX_LATEX_TYPES {
        ///
@@ -188,13 +195,13 @@ public:
        ///
        void readSpacing(Lexer &);
        ///
-       std::string const & name() const;
+       docstring const & name() const;
        ///
-       void setName(std::string const & n);
+       void setName(docstring const & n);
        ///
-       std::string const & obsoleted_by() const;
+       docstring const & obsoleted_by() const;
        ///
-       std::string const & depends_on() const;
+       docstring const & depends_on() const;
        ///
        std::string const & latexname() const { return latexname_; }
        ///
@@ -345,19 +352,19 @@ public:
 
 private:
        /// Name of the layout/paragraph environment
-       std::string name_;
+       docstring name_;
 
        /** Name of an layout that has replaced this layout.
            This is used to rename a layout, while keeping backward
            compatibility
        */
-       std::string obsoleted_by_;
+       docstring obsoleted_by_;
 
        /** Name of an layout which preamble must come before this one
            This is used when the preamble snippet uses macros defined in
            another preamble
         */
-       std::string depends_on_;
+       docstring depends_on_;
 
        /// LaTeX name for environment
        std::string latexname_;