remove more forms.h cruft

[lyx.git] / src / lyxfunc.C

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 532f8f8856e43468e7f7ba214c9ad5646d6938f2..9a5f2b241016db7f253534c311e9962728624d4f 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -32,7 +32,6 @@
 #include "BufferView.h"
 #include "ColorHandler.h"
 #include "lyxserver.h"
-#include "figure_form.h"
 #include "intl.h"
 #include "lyx_main.h"
 #include "lyx_cb.h"
@@ -1071,25 +1070,25 @@ string const LyXFunc::Dispatch(int ac,
                        setErrorMessage(N_("Missing argument"));
                        break;
                }
-               ProhibitInput(owner->view());
+               owner->prohibitInput();
                string const fname = i18nLibFileSearch("doc", arg, "lyx");
                if (fname.empty()) {
                        lyxerr << "LyX: unable to find documentation file `"
                               << arg << "'. Bad installation?" << endl;
-                       AllowInput(owner->view());
+                       owner->allowInput();
                        break;
                }
                ostringstream str;
                str << _("Opening help file") << ' '
                    << MakeDisplayPath(fname) << "...";
                owner->message(str.str().c_str());
-               owner->view()->buffer(bufferlist.loadLyXFile(fname,false));
-               AllowInput(owner->view());
+               owner->view()->buffer(bufferlist.loadLyXFile(fname, false));
+               owner->allowInput();
                break;
         }
 
        case LFUN_HELP_VERSION: {
-               ProhibitInput(owner->view());
+               owner->prohibitInput();
                string msg(_("LyX Version "));
                msg += LYX_VERSION;
                msg += " of ";
@@ -1099,7 +1098,7 @@ string const LyXFunc::Dispatch(int ac,
                                 + MakeDisplayPath(system_lyxdir)).c_str(),
                                (_("User directory: ") 
                                 + MakeDisplayPath(user_lyxdir)).c_str());
-               AllowInput(owner->view());
+               owner->allowInput();
                break;
        }
        
@@ -1264,7 +1263,7 @@ string const LyXFunc::Dispatch(int ac,
 #else
                string file_name;
                int row;
-               istringstream istr(argument);
+               istringstream istr(argument.c_str());
                istr >> file_name >> row;
 #endif
                // Must replace extension of the file to be .lyx and get full path
@@ -1287,7 +1286,7 @@ string const LyXFunc::Dispatch(int ac,
 
        case LFUN_GOTO_PARAGRAPH:
        {
-                istringstream istr(argument);
+                istringstream istr(argument.c_str());
 
                int id;
                istr >> id;