requires is a keyword in C++2a

[lyx.git] / src / insets / InsetTabular.h

diff --git a/src/insets/InsetTabular.h b/src/insets/InsetTabular.h
index edd7242d2003904b93fae15426f2621b66eea6bd..3e8a6bcfab5a711001dfc8defd949cb861d98582 100644 (file)
--- a/src/insets/InsetTabular.h
+++ b/src/insets/InsetTabular.h
@@ -555,9 +555,13 @@ public:
        ///
        void insertColumn(col_type column, bool copy);
        ///
-       idx_type getFirstCellInRow(row_type row) const;
+       idx_type getFirstCellInRow(row_type row, bool const ct = false) const;
        ///
-       idx_type getLastCellInRow(row_type row) const;
+       idx_type getLastCellInRow(row_type row, bool const ct = false) const;
+       ///
+       idx_type getFirstRow(bool const ct = false) const;
+       ///
+       idx_type getLastRow(bool const ct = false) const;
        ///
        idx_type numberOfCellsInRow(row_type row) const;
        ///
@@ -786,7 +790,7 @@ public:
                /// caption
                bool caption;
                ///
-               Change::Type change;
+               Change change;
        };
        ///
        typedef std::vector<RowData> row_vector;
@@ -811,7 +815,7 @@ public:
                ///
                bool varwidth;
                ///
-               Change::Type change;
+               Change change;
        };
        ///
        typedef std::vector<ColumnData> column_vector;
@@ -869,21 +873,24 @@ public:
        ///
        // helper function for Latex
        ///
-       void TeXTopHLine(otexstream &, row_type row, std::list<col_type>) const;
+       void TeXTopHLine(otexstream &, row_type row, std::list<col_type>,
+                        std::list<col_type>) const;
        ///
-       void TeXBottomHLine(otexstream &, row_type row, std::list<col_type>) const;
+       void TeXBottomHLine(otexstream &, row_type row, std::list<col_type>,
+                           std::list<col_type>) const;
        ///
        void TeXCellPreamble(otexstream &, idx_type cell, bool & ismulticol, bool & ismultirow,
                             bool const bidi) const;
        ///
        void TeXCellPostamble(otexstream &, idx_type cell, bool ismulticol, bool ismultirow) const;
        ///
-       void TeXLongtableHeaderFooter(otexstream &, OutputParams const &, std::list<col_type>) const;
+       void TeXLongtableHeaderFooter(otexstream &, OutputParams const &, std::list<col_type>,
+                                     std::list<col_type>) const;
        ///
        bool isValidRow(row_type const row) const;
        ///
        void TeXRow(otexstream &, row_type const row,
-                   OutputParams const &, std::list<col_type>) const;
+                   OutputParams const &, std::list<col_type>, std::list<col_type>) const;
        ///
        // helper functions for plain text
        ///
@@ -1000,6 +1007,8 @@ public:
        ///
        Text * getText(int) const;
 
+       /// does the inset contain changes ?
+       bool isChanged() const;
        /// set the change for the entire inset
        void setChange(Change const & change);
        /// accept the changes within the inset
@@ -1028,7 +1037,7 @@ public:
        /// can we go further down on mouse click?
        bool descendable(BufferView const &) const { return true; }
        /// Update the counters of this inset and of its contents
-       void updateBuffer(ParIterator const &, UpdateType);
+       void updateBuffer(ParIterator const &, UpdateType, bool const deleted = false);
        ///
        void addToToc(DocIterator const & di, bool output_active,
                                  UpdateType utype, TocBackend & backend) const;