more NEW_INSETS changes, define NEW_MANUBAR as default some other changes, read ChangeLog

[lyx.git] / src / lyxparagraph.h

diff --git a/src/lyxparagraph.h b/src/lyxparagraph.h
index dd84cf2210c61bbddbb9eef80a5550036a53f54a..dcccb3cd75cfe95bb681f7c517e0eda1898238a9 100644 (file)
--- a/src/lyxparagraph.h
+++ b/src/lyxparagraph.h
@@ -188,9 +188,12 @@ public:
 
        ///
        LyXParagraph * TeXEnvironment(Buffer const *, BufferParams const &,
-                                     std::ostream &, TexRow & texrow,
-                                     std::ostream & foot, TexRow & foot_texrow,
-                                     int & foot_count);
+                                     std::ostream &, TexRow & texrow
+#ifndef NEW_INSETS
+                                     ,std::ostream & foot, TexRow & foot_texrow,
+                                     int & foot_count
+#endif
+               );
        ///
        LyXParagraph * Clone() const;
        
@@ -369,12 +372,11 @@ public:
        LyXParagraph * FirstPhysicalPar();
        ///
        LyXParagraph const * FirstPhysicalPar() const;
-#endif
-
        /// returns the physical paragraph
        LyXParagraph * ParFromPos(size_type pos);
        /// returns the position in the physical par
        int PositionInParFromPos(size_type pos) const;
+#endif
 
        /// for the environments
        LyXParagraph * DepthHook(int depth);
@@ -429,8 +431,6 @@ public:
          */
        LyXFont getFont(BufferParams const &, size_type pos) const;
        ///
-       value_type GetChar(size_type pos);
-       ///
        value_type GetChar(size_type pos) const;
        /// The position must already exist.
        void SetChar(size_type pos, value_type c) {
@@ -619,9 +619,12 @@ private:
        InsetList insetlist;
        ///
        LyXParagraph * TeXDeeper(Buffer const *, BufferParams const &,
-                                std::ostream &, TexRow & texrow,
-                                std::ostream & foot, TexRow & foot_texrow,
-                                int & foot_count);
+                                std::ostream &, TexRow & texrow
+#ifndef NEW_INSETS
+                                ,std::ostream & foot, TexRow & foot_texrow,
+                                int & foot_count
+#endif
+               );
 #ifndef NEW_INSETS
        ///
        LyXParagraph * TeXFootnote(Buffer const *, BufferParams const &,