This should be the last of the commits refactoring the InsetLayout code.

[lyx.git] / src / insets / InsetCommand.cpp

diff --git a/src/insets/InsetCommand.cpp b/src/insets/InsetCommand.cpp
index 477ebfcd4238a4dcce1f0dcb66415553c41c15c5..6ade744ed93c431da1d5f1a4cd1edb9eeec4b7f8 100644 (file)
--- a/src/insets/InsetCommand.cpp
+++ b/src/insets/InsetCommand.cpp
@@ -18,20 +18,19 @@
 #include "DispatchResult.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "gettext.h"
+#include "support/gettext.h"
 #include "Lexer.h"
 #include "MetricsInfo.h"
 
 #include <sstream>
 
+using namespace std;
 
 namespace lyx {
 
-using std::string;
-using std::istringstream;
-using std::ostringstream;
-
 
+// FIXME Would it now be possible to use the InsetCode in 
+// place of the mailer name and recover that information?
 InsetCommand::InsetCommand(InsetCommandParams const & p,
                           string const & mailer_name)
        : p_(p),
@@ -112,7 +111,7 @@ void InsetCommand::doDispatch(Cursor & cur, FuncRequest & cmd)
                break;
 
        case LFUN_INSET_MODIFY: {
-               InsetCommandParams p(p_.insetType());
+               InsetCommandParams p(p_.code());
                InsetCommandMailer::string2params(mailer_name_, to_utf8(cmd.argument()), p);
                if (p.getCmdName().empty())
                        cur.noUpdate();
@@ -161,20 +160,13 @@ bool InsetCommand::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-void InsetCommand::edit(Cursor & cur, bool)
+void InsetCommand::edit(Cursor & cur, bool, EntryDirection)
 {
        if (!mailer_name_.empty())
                InsetCommandMailer(mailer_name_, *this).showDialog(&cur.bv());
 }
 
 
-void InsetCommand::replaceContents(std::string const & from, string const & to)
-{
-       if (getContents() == from)
-               setContents(to);
-}
-
-
 InsetCommandMailer::InsetCommandMailer(
        string const & name, InsetCommand & inset)
        : name_(name), inset_(inset)
@@ -187,6 +179,7 @@ string const InsetCommandMailer::inset2string(Buffer const &) const
 }
 
 
+//FIXME This could take an InsetCode instead of a string
 bool InsetCommandMailer::string2params(
        string const & name, string const & in, InsetCommandParams & params)
 {
@@ -219,6 +212,7 @@ bool InsetCommandMailer::string2params(
 }
 
 
+//FIXME This could take an InsetCode instead of a string
 string const
 InsetCommandMailer::params2string(string const & name,
                                  InsetCommandParams const & params)