ws changes only

[lyx.git] / src / insets / insetcommand.C

diff --git a/src/insets/insetcommand.C b/src/insets/insetcommand.C
index 8408b75e05a2c33601433c18300776b978df326a..6eff3dc6a5941a8e09f4711f28b5747cd45ca1e8 100644 (file)
--- a/src/insets/insetcommand.C
+++ b/src/insets/insetcommand.C
@@ -20,7 +20,11 @@
 
 #include "support/std_sstream.h"
 
+
+using std::string;
+using std::istringstream;
 using std::ostream;
+using std::ostringstream;
 
 
 InsetCommand::InsetCommand(InsetCommandParams const & p)
@@ -29,12 +33,6 @@ InsetCommand::InsetCommand(InsetCommandParams const & p)
 {}
 
 
-BufferView * InsetCommand::view() const
-{
-       return button_.view();
-}
-
-
 void InsetCommand::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        if (!set_label_) {
@@ -55,9 +53,7 @@ void InsetCommand::draw(PainterInfo & pi, int x, int y) const
 
 void InsetCommand::setParams(InsetCommandParams const & p)
 {
-       p_.setCmdName(p.getCmdName());
-       p_.setContents(p.getContents());
-       p_.setOptions(p.getOptions());
+       p_ = p;
        set_label_ = false;
 }
 
@@ -110,7 +106,7 @@ dispatch_result InsetCommand::localDispatch(FuncRequest const & cmd)
                return localDispatch(FuncRequest(cmd.view(), LFUN_INSET_EDIT));
 
        default:
-               return InsetOld::localDispatch(cmd);
+               return UNDISPATCHED;
        }
 
 }
@@ -131,14 +127,12 @@ string const InsetCommandMailer::inset2string(Buffer const &) const
 void InsetCommandMailer::string2params(string const & in,
                                       InsetCommandParams & params)
 {
-       params.setCmdName(string());
-       params.setContents(string());
-       params.setOptions(string());
+       params = InsetCommandParams();
 
        if (in.empty())
                return;
 
-       istringstream data(STRCONV(in));
+       istringstream data(in);
        LyXLex lex(0,0);
        lex.setStream(data);
 
@@ -168,5 +162,5 @@ string const InsetCommandMailer::params2string(string const & name,
        data << name << ' ';
        params.write(data);
        data << "\\end_inset\n";
-       return STRCONV(data.str());
+       return data.str();
 }