mathed uglyfication

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

diff --git a/src/mathed/formulabase.h b/src/mathed/formulabase.h
index 14455e69479d82828c6d041a29cdccc1f7941229..b705c10ad759c3fcf46dcb5b81f802862e9244a0 100644 (file)
--- a/src/mathed/formulabase.h
+++ b/src/mathed/formulabase.h
@@ -19,6 +19,7 @@
 class Buffer;
 class BufferView;
 class MathAtom;
+class CursorSlice;
 
 
 /// An abstract base class for all math related LyX insets
@@ -45,15 +46,15 @@ public:
        /// what appears in the minibuffer when opening
        virtual std::string const editMessage() const;
        ///
-       virtual void getCursorPos(BufferView *, int &, int &) const;
+       virtual void getCursorPos(BufferView & bv, int & x, int & y) const;
        ///
-       virtual void getCursorDim(BufferView *, int &, int &) const;
+       virtual void getCursorDim(int &, int &) const;
        /// get the absolute document x,y of the cursor
        virtual void getCursor(BufferView & bv, int & x, int & y) const;
        ///
        virtual void toggleInsetSelection(BufferView * bv);
        ///
-       virtual void insetUnlock(BufferView *);
+       virtual void insetUnlock(BufferView & bv);
 
        /// To allow transparent use of math editing functions
        //virtual void status(FuncRequest const &);
@@ -74,13 +75,13 @@ public:
        ///
        virtual void mutateToText();
        ///
-       virtual void revealCodes(BufferView *) const;
+       virtual void revealCodes(BufferView & bv) const;
        ///
        virtual EDITABLE editable() const { return HIGHLY_EDITABLE; }
        ///
        bool display() const;
        // return the selection as std::string
-       std::string selectionAsString() const;
+       std::string selectionAsString(BufferView & bv) const;
        ///
        void edit(BufferView * bv, bool);
        ///
@@ -88,19 +89,18 @@ public:
 protected:
        /// To allow transparent use of math editing functions
        virtual
-       DispatchResult
-       priv_dispatch(FuncRequest const &, idx_type &, pos_type &);
+       DispatchResult priv_dispatch(BufferView & bv, FuncRequest const & cmd);
 private:
        /// unimplemented
        void operator=(const InsetFormulaBase &);
        /// common base for handling accents
-       void handleAccent(BufferView * bv, std::string const & arg, std::string const & name);
+       void handleAccent(BufferView & bv, std::string const & arg, std::string const & name);
        /// lfun handler
-       DispatchResult lfunMousePress(FuncRequest const &);
+       DispatchResult lfunMousePress(BufferView &, FuncRequest const &);
        ///
-       DispatchResult lfunMouseRelease(FuncRequest const &);
+       DispatchResult lfunMouseRelease(BufferView &, FuncRequest const &);
        ///
-       DispatchResult lfunMouseMotion(FuncRequest const &);
+       DispatchResult lfunMouseMotion(BufferView &, FuncRequest const &);
 
 protected:
 
@@ -113,16 +113,16 @@ protected:
        virtual void generatePreview(Buffer const &) const {}
 
        ///
-       void handleFont(BufferView * bv, std::string const & arg, std::string const & font);
+       void handleFont(BufferView & bv, std::string const & arg, std::string const & font);
        ///
-       void handleFont2(BufferView * bv, std::string const & arg);
+       void handleFont2(BufferView & bv, std::string const & arg);
 };
 
 // We don't really mess want around with mathed stuff outside mathed.
 // So do it here.
-void mathDispatch(FuncRequest const &);
+void mathDispatch(BufferView & bv, FuncRequest const & cmd);
 
 ///
-void releaseMathCursor(BufferView * bv);
+void releaseMathCursor(BufferView & bv);
 
 #endif