ws changes only

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

diff --git a/src/insets/insetcommand.C b/src/insets/insetcommand.C
index 7f36b744c44811a6d9701f6225f085ef6411ee22..6eff3dc6a5941a8e09f4711f28b5747cd45ca1e8 100644 (file)
--- a/src/insets/insetcommand.C
+++ b/src/insets/insetcommand.C
@@ -6,25 +6,25 @@
  * \author Angus Leeming
  * \author Lars Gullik Bjønnes
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
 #include "insetcommand.h"
+
 #include "BufferView.h"
-#include "debug.h"
 #include "funcrequest.h"
 #include "lyxlex.h"
 #include "metricsinfo.h"
 
-#include "frontends/Painter.h"
-
-#include "support/lstrings.h"
+#include "support/std_sstream.h"
 
-#include "Lsstream.h"
 
+using std::string;
+using std::istringstream;
 using std::ostream;
+using std::ostringstream;
 
 
 InsetCommand::InsetCommand(InsetCommandParams const & p)
@@ -33,17 +33,11 @@ InsetCommand::InsetCommand(InsetCommandParams const & p)
 {}
 
 
-BufferView * InsetCommand::view() const
-{
-       return button_.view();
-}
-
-
 void InsetCommand::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        if (!set_label_) {
                set_label_ = true;
-               button_.update(getScreenLabel(mi.base.bv->buffer()),
+               button_.update(getScreenLabel(*mi.base.bv->buffer()),
                               editable() != NOT_EDITABLE);
        }
        button_.metrics(mi, dim);
@@ -59,14 +53,12 @@ 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;
 }
 
 
-int InsetCommand::latex(Buffer const *, ostream & os,
+int InsetCommand::latex(Buffer const &, ostream & os,
                        LatexRunParams const &) const
 {
        os << getCommand();
@@ -74,19 +66,19 @@ int InsetCommand::latex(Buffer const *, ostream & os,
 }
 
 
-int InsetCommand::ascii(Buffer const *, ostream &, int) const
+int InsetCommand::ascii(Buffer const &, ostream &, int) const
 {
        return 0;
 }
 
 
-int InsetCommand::linuxdoc(Buffer const *, ostream &) const
+int InsetCommand::linuxdoc(Buffer const &, ostream &) const
 {
        return 0;
 }
 
 
-int InsetCommand::docbook(Buffer const *, ostream &, bool) const
+int InsetCommand::docbook(Buffer const &, ostream &, bool) const
 {
        return 0;
 }
@@ -102,7 +94,7 @@ dispatch_result InsetCommand::localDispatch(FuncRequest const & cmd)
                        return UNDISPATCHED;
 
                setParams(p);
-               cmd.view()->updateInset();
+               cmd.view()->updateInset(this);
                return DISPATCHED;
        }
 
@@ -114,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;
        }
 
 }
@@ -135,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);
 
@@ -172,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();
 }