fix crash due to invalidated iterator

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

diff --git a/src/frontends/controllers/ControlCommand.h b/src/frontends/controllers/ControlCommand.h
index 6763520d11884dcafa2994c710cd25fdcd471785..b7f99d15a2d58fd305b8dc631fb24a93addf5e44 100644 (file)
--- a/src/frontends/controllers/ControlCommand.h
+++ b/src/frontends/controllers/ControlCommand.h
@@ -6,7 +6,7 @@
  *
  * \author Angus Leeming
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  *
  * ControlCommand is a controller class for dialogs that create or modify
  * an inset derived from InsetCommand.
@@ -19,6 +19,8 @@
 #include "Dialog.h"
 #include "insets/insetcommandparams.h"
 
+namespace lyx {
+namespace frontend {
 
 class ControlCommand : public Dialog::Controller {
 public:
@@ -26,13 +28,13 @@ public:
            it knows what to do with the rest of the contents.
            An empty name indicates that no action will occur on 'Apply'.
         */
-       ControlCommand(Dialog &, string const & lfun_name = string());
+       ControlCommand(Dialog &, std::string const & lfun_name = std::string());
        ///
        InsetCommandParams & params() { return params_; }
        ///
        InsetCommandParams const & params() const { return params_; }
        ///
-       virtual bool initialiseParams(string const & data);
+       virtual bool initialiseParams(std::string const & data);
        /// clean-up on hide.
        virtual void clearParams();
        /// clean-up on hide.
@@ -44,8 +46,10 @@ private:
        ///
        InsetCommandParams params_;
        /// Flags what action is taken by Kernel::dispatch()
-       string const lfun_name_;
+       std::string const lfun_name_;
 };
 
+} // namespace frontend
+} // namespace lyx
 
 #endif // CONTROLCOMMAND_H