* src/frontends/controllers/Dialog.{cpp,h}:

[lyx.git] / src / mathed / InsetMathHull.h

diff --git a/src/mathed/InsetMathHull.h b/src/mathed/InsetMathHull.h
index 41123a4cc82309fbe6062e3fc121ebaadc3d3f48..7afdc0eb1b8915f36d4422db96faba3d617d8d2f 100644 (file)
--- a/src/mathed/InsetMathHull.h
+++ b/src/mathed/InsetMathHull.h
@@ -35,7 +35,7 @@ public:
        ///
        mode_type currentMode() const;
        ///
-       void metrics(MetricsInfo & mi, Dimension & dim) const;
+       bool metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
        void draw(PainterInfo &, int x, int y) const;
        ///
@@ -85,9 +85,9 @@ public:
        ///
        char defaultColAlign(col_type col);
        ///
-       bool idxFirst(LCursor &) const;
+       bool idxFirst(Cursor &) const;
        ///
-       bool idxLast(LCursor &) const;
+       bool idxLast(Cursor &) const;
 
        ///
        void write(WriteStream & os) const;
@@ -101,19 +101,18 @@ public:
        ///
        void write(Buffer const &, std::ostream & os) const;
        ///
-       void read(Buffer const &, LyXLex & lex);
+       void read(Buffer const &, Lexer & lex);
        ///
        int plaintext(Buffer const &, odocstream &,
-                 OutputParams const &) const;
+                     OutputParams const &) const;
        ///
        int docbook(Buffer const &, odocstream &,
                    OutputParams const &) const;
        /// the string that is passed to the TOC
-       virtual int textString(Buffer const &, odocstream &,
-               OutputParams const &) const;
+       virtual void textString(Buffer const &, odocstream &) const;
 
        /// get notification when the cursor leaves this inset
-       bool notifyCursorLeaves(LCursor & cur);
+       bool notifyCursorLeaves(Cursor & cur);
        ///
        //bool insetAllowed(Code code) const;
        ///
@@ -125,16 +124,16 @@ public:
 protected:
        InsetMathHull(InsetMathHull const &);
 
-       virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
+       virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
 
        /// do we want to handle this event?
-       bool getStatus(LCursor & cur, FuncRequest const & cmd,
+       bool getStatus(Cursor & cur, FuncRequest const & cmd,
                FuncStatus & status) const;
        ///
        docstring eolString(row_type row, bool emptyline, bool fragile) const;
 
 private:
-       virtual std::auto_ptr<InsetBase> doClone() const;
+       virtual std::auto_ptr<Inset> doClone() const;
        ///
        void setType(HullType type);
        ///
@@ -146,7 +145,7 @@ private:
        ///
        docstring nicelabel(row_type row) const;
        ///
-       void doExtern(LCursor & cur, FuncRequest & func);
+       void doExtern(Cursor & cur, FuncRequest & func);
        ///
        void glueall();
        /*!
@@ -193,24 +192,24 @@ public:
        ///
        virtual void mutateToText();
        ///
-       virtual void revealCodes(LCursor & cur) const;
+       virtual void revealCodes(Cursor & cur) const;
        ///
        EDITABLE editable() const { return HIGHLY_EDITABLE; }
        ///
-       void edit(LCursor & cur, bool left);
+       void edit(Cursor & cur, bool left);
        ///
-       InsetBase * editXY(LCursor & cur, int x, int y);
+       Inset * editXY(Cursor & cur, int x, int y);
        ///
-       bool display() const;
+       DisplayType display() const;
        ///
        Code lyxCode() const;
 
 protected:
        ///
-       void handleFont(LCursor & cur, docstring const & arg,
+       void handleFont(Cursor & cur, docstring const & arg,
                docstring const & font);
        ///
-       void handleFont2(LCursor & cur, docstring const & arg);
+       void handleFont2(Cursor & cur, docstring const & arg);
        ///
        bool previewState(BufferView * bv) const;
 };