more IU

[lyx.git] / src / mathed / ref_inset.C

diff --git a/src/mathed/ref_inset.C b/src/mathed/ref_inset.C
index 33e8000d91b659cf8bfa0b03b11fa5c62e8868b9..2e749924bb3a2e854d5c54a8fed146620bcaf913 100644 (file)
--- a/src/mathed/ref_inset.C
+++ b/src/mathed/ref_inset.C
@@ -1,19 +1,34 @@
+/**
+ * \file ref_inset.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
 #include <config.h>
 
 #include "ref_inset.h"
+#include "math_data.h"
 #include "math_factory.h"
 
 #include "BufferView.h"
+#include "dispatchresult.h"
 #include "debug.h"
 #include "funcrequest.h"
+#include "math_support.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
 
 #include "frontends/LyXView.h"
 #include "frontends/Dialogs.h"
 
-#include "support/LOstream.h"
+
+using std::string;
+using std::auto_ptr;
+using std::endl;
 
 
 RefInset::RefInset()
@@ -26,9 +41,9 @@ RefInset::RefInset(string const & data)
 {}
 
 
-MathInset * RefInset::clone() const
+auto_ptr<InsetBase> RefInset::clone() const
 {
-       return new RefInset(*this);
+       return auto_ptr<InsetBase>(new RefInset(*this));
 }
 
 
@@ -38,42 +53,54 @@ void RefInset::infoize(std::ostream & os) const
 }
 
 
-dispatch_result
-RefInset::dispatch(FuncRequest const & cmd, idx_type & idx, pos_type & pos)
+DispatchResult
+RefInset::priv_dispatch(FuncRequest const & cmd,
+                       idx_type & idx, pos_type & pos)
 {
        switch (cmd.action) {
-               case LFUN_MOUSE_RELEASE:
-                       if (cmd.button() == mouse_button::button3) {
-                               lyxerr << "trying to goto ref" << cell(0) << "\n";
-                               cmd.view()->dispatch(FuncRequest(LFUN_REF_GOTO, asString(cell(0))));
-                               return DISPATCHED;
-                       }
-                       if (cmd.button() == mouse_button::button1) {
-                               // Eventually trigger dialog with button 3
-                               // not 1
-                               string const data = createDialogStr("ref");
-                               cmd.view()->owner()->getDialogs().
-                                       show("ref", data, this);
-                               return DISPATCHED;
-                       }
-                       break;
-               case LFUN_MOUSE_PRESS:
-               case LFUN_MOUSE_MOTION:
-                       // eat other mouse commands
-                       return DISPATCHED;
-               default:
-                       return CommandInset::dispatch(cmd, idx, pos);
+       case LFUN_INSET_MODIFY:
+               if (cmd.getArg(0) == "ref") {
+                       MathArray ar;
+                       if (!createMathInset_fromDialogStr(cmd.argument, ar))
+                               return DispatchResult(false);
+
+                       *this = *ar[0].nucleus()->asRefInset();
+
+                       return DispatchResult(true, true);
+               }
+               break;
+       case LFUN_MOUSE_RELEASE:
+               if (cmd.button() == mouse_button::button3) {
+                       lyxerr << "trying to goto ref" << cell(0) << endl;
+                       cmd.view()->dispatch(FuncRequest(LFUN_REF_GOTO, asString(cell(0))));
+                       return DispatchResult(true, true);
+               }
+               if (cmd.button() == mouse_button::button1) {
+                       // Eventually trigger dialog with button 3
+                       // not 1
+                       string const data = createDialogStr("ref");
+                       cmd.view()->owner()->getDialogs().
+                               show("ref", data, this);
+                       return DispatchResult(true, true);
+               }
+               break;
+       case LFUN_MOUSE_PRESS:
+       case LFUN_MOUSE_MOTION:
+               // eat other mouse commands
+               return DispatchResult(true, true);
+       default:
+               return CommandInset::priv_dispatch(cmd, idx, pos);
        }
        // not our business
-       return UNDISPATCHED;
+       return DispatchResult(false);
 }
 
 
-string RefInset::screenLabel() const
+string const RefInset::screenLabel() const
 {
        string str;
        for (int i = 0; !types[i].latex_name.empty(); ++i)
-               if (name_ == types[i].latex_name) {
+               if (commandname() == types[i].latex_name) {
                        str = _(types[i].short_gui_name);
                        break;
                }
@@ -89,21 +116,21 @@ string RefInset::screenLabel() const
 
 void RefInset::validate(LaTeXFeatures & features) const
 {
-       if (name_ == "vref" || name_ == "vpageref")
+       if (commandname() == "vref" || commandname() == "vpageref")
                features.require("varioref");
-       else if (name_ == "prettyref")
+       else if (commandname() == "prettyref")
                features.require("prettyref");
 }
 
 
-int RefInset::ascii(std::ostream & os, int) const
+int RefInset::plaintext(std::ostream & os, OutputParams const &) const
 {
        os << '[' << asString(cell(0)) << ']';
        return 0;
 }
 
 
-int RefInset::linuxdoc(std::ostream & os) const
+int RefInset::linuxdoc(std::ostream & os, OutputParams const &) const
 {
        os << "<ref id=\"" << asString(cell(0))
           << "\" name=\"" << asString(cell(1)) << "\" >";
@@ -111,7 +138,7 @@ int RefInset::linuxdoc(std::ostream & os) const
 }
 
 
-int RefInset::docbook(std::ostream & os, bool) const
+int RefInset::docbook(std::ostream & os, OutputParams const &) const
 {
        if (cell(1).empty()) {
                os << "<xref linkend=\"" << asString(cell(0)) << "\">";
@@ -124,22 +151,6 @@ int RefInset::docbook(std::ostream & os, bool) const
 }
 
 
-dispatch_result RefInset::localDispatch(FuncRequest const & cmd)
-{
-       if (cmd.action != LFUN_INSET_MODIFY || cmd.getArg(0) != "ref")
-               return UNDISPATCHED;
-
-       MathArray ar;
-       if (!createMathInset_fromDialogStr(cmd.argument, ar))
-               return UNDISPATCHED;
-
-       *this = *ar[0].nucleus()->asRefInset();
-//     if (cmd.view())
-//                 // This does not compile because updateInset expects
-//                 // an Inset* and 'this' isn't.
-//             cmd.view()->updateInset(this);
-       return DISPATCHED;
-}
 
 
 RefInset::ref_type_info RefInset::types[] = {