revert last patch. there's something wrong, possibly unrelated to this

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

diff --git a/src/mathed/InsetMathNest.h b/src/mathed/InsetMathNest.h
index 3d990b273921b63d579d9995f6e98be4b2cb5dbc..275d2731f3860425718cea0f2eb1704d5893573d 100644 (file)
--- a/src/mathed/InsetMathNest.h
+++ b/src/mathed/InsetMathNest.h
@@ -14,36 +14,11 @@
 
 #include "InsetMath.h"
 
-#include <deque>
+// FIXME: remove
+#include "support/docstring.h"
 
 namespace lyx {
 
-class MathCompletionList : public Inset::CompletionList {
-public:
-       ///
-       MathCompletionList(Cursor const & cur);
-       ///
-       virtual ~MathCompletionList();
-
-       ///
-       virtual size_t size() const;
-       ///
-       virtual docstring data(size_t idx) const;
-       ///
-       virtual std::string icon(size_t idx) const;
-
-       ///
-       static void addToFavorites(docstring const & completion);
-
-private:
-       ///
-       static std::vector<docstring> globals;
-       ///
-       std::vector<docstring> locals;
-       ///
-       static std::deque<docstring> favorites;
-};
-
 /** Abstract base class for all math objects that contain nested items.
     This is basically everything that is not a single character or a
     single symbol.
@@ -101,7 +76,7 @@ public:
        /// access to the lock
        void lock(bool);
        /// get notification when the cursor leaves this inset
-       bool notifyCursorLeaves(Cursor & cur);
+       bool notifyCursorLeaves(Cursor const & old, Cursor & cur);
 
        /// direct access to the cell.
        /// inlined because shows in profile.
@@ -130,8 +105,7 @@ public:
        /// writes [, name(), and args in []
        void normalize(NormalStream & os) const;
        ///
-       int latex(Buffer const &, odocstream & os,
-                       OutputParams const & runparams) const;
+       int latex(odocstream & os, OutputParams const & runparams) const;
        ///
        bool setMouseHover(bool mouse_hover);
        ///
@@ -146,7 +120,7 @@ public:
        ///
        bool automaticPopupCompletion() const;
        ///
-       CompletionListPtr completionList(Cursor const & cur) const;
+       CompletionList const * createCompletionList(Cursor const & cur) const;
        ///
        docstring completionPrefix(Cursor const & cur) const;
        ///
@@ -172,13 +146,18 @@ protected:
                docstring const & arg, char const * const font);
        ///
        void handleFont2(Cursor & cur, docstring const & arg);
+       /// Grab and erase selection and insert the InsetMathNest atom in every
+       /// previously selected cell, insert the grabbed former data and \c arg
+       /// in the first cell of the inserted atom.
+       void handleNest(Cursor & cur, MathAtom const & nest);
+       void handleNest(Cursor & cur, MathAtom const & nest, docstring const & arg);
 
        /// interpret \p c and insert the result at the current position of
        /// of \p cur. Return whether the cursor should stay in the formula.
        bool interpretChar(Cursor & cur, char_type c);
        ///
-       bool script(Cursor & cur, bool,
-               docstring const & save_selection = docstring());
+       bool script(Cursor & cur, bool);
+       bool script(Cursor & cur, bool, docstring const & save_selection);
 
 public:
        /// interpret \p str and insert the result at the current position of