DocBook: fix for nomenclature xml:id and glossary paragraphs.

[lyx.git] / src / BufferView.h

diff --git a/src/BufferView.h b/src/BufferView.h
index 40dd0d29c352a4496ef0b3301b2910fda1c67226..74e29c6424681ff0048a9dc660bb8768acd0659f 100644 (file)
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -34,9 +34,9 @@ class Change;
 class CoordCache;
 class Cursor;
 class CursorSlice;
+class Dimension;
 class DispatchResult;
 class DocIterator;
-class DocumentClass;
 class FuncRequest;
 class FuncStatus;
 class Intl;
@@ -44,11 +44,8 @@ class Inset;
 class Length;
 class MathData;
 class MathRow;
-class ParIterator;
 class ParagraphMetrics;
 class Point;
-class Row;
-class TexRow;
 class Text;
 class TextMetrics;
 
@@ -104,9 +101,12 @@ public:
 
        /// right margin
        int rightMargin() const;
-
        /// left margin
        int leftMargin() const;
+       /// top margin
+       int topMargin() const;
+       /// bottom margin
+       int bottomMargin() const;
 
        /// return the on-screen size of this length
        /*
@@ -218,7 +218,7 @@ public:
        /// return the inline completion postfix.
        docstring const & inlineCompletion() const;
        /// return the number of unique characters in the inline completion.
-       size_t const & inlineCompletionUniqueChars() const;
+       size_t inlineCompletionUniqueChars() const;
        /// return the position in the buffer of the inline completion postfix.
        DocIterator const & inlineCompletionPos() const;
        /// make sure inline completion position is OK
@@ -238,7 +238,7 @@ public:
 
        /// request an X11 selection.
        /// \return the selected string.
-       docstring const requestSelection();
+       docstring requestSelection();
        /// clear the X11 selection.
        void clearSelection();
 
@@ -310,7 +310,7 @@ public:
        /// is the caret currently visible in the view
        bool caretInView() const;
        /// get the position and height of the caret
-       void caretPosAndHeight(Point & p, int & h) const;
+       void caretPosAndDim(Point & p, Dimension & dim) const;
 
        ///
        void draw(frontend::Painter & pain, bool paint_caret);
@@ -332,7 +332,7 @@ public:
        /// This signal is emitted when some dialog needs to be shown with
        /// some data.
        void showDialog(std::string const & name, std::string const & data,
-               Inset * inset = 0);
+               Inset * inset = nullptr);
 
        /// This signal is emitted when some dialogs needs to be updated.
        void updateDialog(std::string const & name, std::string const & data);