fix crash due to invalidated iterator

[lyx.git] / src / frontends / controllers / ControlNote.C

diff --git a/src/frontends/controllers/ControlNote.C b/src/frontends/controllers/ControlNote.C
index ed9e8ab3aca759616c301bc258cb67d916f95ff5..3d2bd460beeb8bc27f3b449b950ffaa9d6ba0556 100644 (file)
--- a/src/frontends/controllers/ControlNote.C
+++ b/src/frontends/controllers/ControlNote.C
@@ -16,8 +16,10 @@
 #include "gettext.h"
 
 
-using std::vector;
+using std::string;
 
+namespace lyx {
+namespace frontend {
 
 ControlNote::ControlNote(Dialog & parent)
        : Dialog::Controller(parent)
@@ -26,12 +28,10 @@ ControlNote::ControlNote(Dialog & parent)
 
 bool ControlNote::initialiseParams(string const & data)
 {
-    InsetNoteParams params;
+       InsetNoteParams params;
        InsetNoteMailer::string2params(data, params);
        params_.reset(new InsetNoteParams(params));
-
        return true;
-
 }
 
 
@@ -43,18 +43,9 @@ void ControlNote::clearParams()
 
 void ControlNote::dispatchParams()
 {
-       string const lfun = InsetNoteMailer::params2string(string("note"), params());
-       kernel().dispatch(FuncRequest(LFUN_INSET_APPLY, lfun));
+       string const lfun = InsetNoteMailer::params2string(params());
+       kernel().dispatch(FuncRequest(getLfun(), lfun));
 }
 
-
-void note_gui_tokens(vector<string> & ids, vector<string> & gui_names)
-{
-       char const * const ids_[] = {"Note", "Comment", "Greyedout"};
-       size_t const ids_size = sizeof(ids_) / sizeof(char *);
-       ids = vector<string>(ids_, ids_ + ids_size);
-       gui_names.clear();
-       gui_names.push_back(_("LyX Note"));
-       gui_names.push_back(_("Comment"));
-       gui_names.push_back(_("Greyed Out"));
-}
+} // namespace frontend
+} // namespace lyx