fix crash due to invalidated iterator

[lyx.git] / src / frontends / controllers / ControlMath.h

diff --git a/src/frontends/controllers/ControlMath.h b/src/frontends/controllers/ControlMath.h
index 67f29bb90c302e03c7e919ba1d123f4b42e6dea5..0f220775ae9b2f33555a4c80146f1f3262c46c03 100644 (file)
--- a/src/frontends/controllers/ControlMath.h
+++ b/src/frontends/controllers/ControlMath.h
@@ -18,21 +18,23 @@
 #include "Dialog.h"
 #include "lfuns.h" // for kb_action
 
+namespace lyx {
+namespace frontend {
 
 class ControlMath : public Dialog::Controller {
 public:
        ControlMath(Dialog &);
 
        /// Nothing to initialise in this case.
-       virtual bool initialiseParams(string const &) { return true; }
+       virtual bool initialiseParams(std::string const &) { return true; }
        virtual void clearParams() {}
        virtual void dispatchParams() {}
        virtual bool isBufferDependent() const { return true; }
 
        /// dispatch an LFUN
-       void dispatchFunc(kb_action action, string const & arg = string()) const;
+       void dispatchFunc(kb_action action, std::string const & arg = std::string()) const;
        /// Insert a math symbol into the doc.
-       void dispatchInsert(string const & name) const;
+       void dispatchInsert(std::string const & name) const;
        /// Insert a subscript.
        void dispatchSubscript() const;
        /// Insert a superscript.
@@ -40,15 +42,15 @@ public:
        /// Insert a cube root
        void dispatchCubeRoot() const;
        /// Insert a matrix
-       void dispatchMatrix(string const & str) const;
+       void dispatchMatrix(std::string const & str) const;
        /// Insert a delimiter
-       void dispatchDelim(string const & str) const;
+       void dispatchDelim(std::string const & str) const;
        /// Wwitch between display and inline
        void dispatchToggleDisplay() const;
        /** A request to the kernel to launch a dialog.
         *  \param name the dialog identifier.
         */
-       void showDialog(string const & name) const;
+       void showDialog(std::string const & name) const;
 };
 
 
@@ -85,6 +87,9 @@ extern int const nr_latex_ams_ops;
  * Return the mangled XPM filename of the given
  * math symbol.
  */
-string const find_xpm(string const & name);
+std::string const find_xpm(std::string const & name);
+
+} // namespace frontend
+} // namespace lyx
 
 #endif // NOT CONTROLMATH