More requires --> required, for C++2a.

[lyx.git] / src / Row.h

diff --git a/src/Row.h b/src/Row.h
index e45fa4e8c99e4f8d5857a95c9e68a830847b0917..d210174ef9460b269433dc9ac1c88fc2d7cc318e 100644 (file)
--- a/src/Row.h
+++ b/src/Row.h
@@ -163,18 +163,18 @@ public:
        bool changed() const { return changed_; }
        ///
        void changed(bool c) const { changed_ = c; }
-       /// Set the selection begin and end.
-       /**
-         * This is const because we update the selection status only at draw()
-         * time.
-         */
-       void setSelection(pos_type sel_beg, pos_type sel_end) const;
        ///
        bool selection() const;
-       /// Set the selection begin and end and whether the left and/or right
-       /// margins are selected.
+       /**
+        * Set the selection begin and end and whether the left and/or
+        * right margins are selected.
+        * This is const because we update the selection status only at
+        * draw() time.
+        */
        void setSelectionAndMargins(DocIterator const & beg,
                DocIterator const & end) const;
+       /// no selection on this row.
+       void clearSelectionAndMargins() const;
 
        ///
        void pit(pit_type p) { pit_ = p; }
@@ -198,9 +198,9 @@ public:
        bool flushed() const { return flushed_; }
 
        ///
-       Dimension const & dimension() const { return dim_; }
+       Dimension const & dim() const { return dim_; }
        ///
-       Dimension & dimension() { return dim_; }
+       Dimension & dim() { return dim_; }
        ///
        int height() const { return dim_.height(); }
        /// The width of the row, including the left margin, but not the right one.
@@ -261,8 +261,6 @@ public:
        Element const & back() const { return elements_.back(); }
        /// remove last element
        void pop_back();
-       /// remove all row elements
-       void clear() { elements_.clear(); }
        /**
         * if row width is too large, remove all elements after last
         * separator and update endpos if necessary. If all that
@@ -323,6 +321,8 @@ private:
          */
        bool isMarginSelected(bool left, DocIterator const & beg,
                DocIterator const & end) const;
+       /// Set the selection begin and end.
+       void setSelection(pos_type sel_beg, pos_type sel_end) const;
 
        /**
         * Returns true if a char or string with font \c f and change