* src/LyXAction.C: mark goto-clear-bookmark as working without buffer

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

diff --git a/src/insets/insetindex.C b/src/insets/insetindex.C
index 17d3e9efaae6ca403037bcb1fe2c870b901e5389..c175cf1ffd14cb5e05d7aafff22049ef7542ac57 100644 (file)
--- a/src/insets/insetindex.C
+++ b/src/insets/insetindex.C
@@ -11,18 +11,24 @@
 
 #include "insetindex.h"
 
+#include "dispatchresult.h"
 #include "funcrequest.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
 #include "metricsinfo.h"
+#include "sgml.h"
 
+#include "support/std_ostream.h"
+
+
+namespace lyx {
 
 using std::string;
 using std::ostream;
 
 
 InsetIndex::InsetIndex(InsetCommandParams const & p)
-       : InsetCommand(p)
+       : InsetCommand(p, "index")
 {}
 
 
@@ -31,64 +37,31 @@ InsetIndex::InsetIndex(InsetCommandParams const & p)
 // {}
 
 
-InsetIndex::~InsetIndex()
-{
-       InsetCommandMailer mailer("index", *this);
-       mailer.hideDialog();
-}
-
-
-string const InsetIndex::getScreenLabel(Buffer const &) const
+docstring const InsetIndex::getScreenLabel(Buffer const &) const
 {
        return _("Idx");
 }
 
 
-void InsetPrintIndex::metrics(MetricsInfo & mi, Dimension & dim) const
+int InsetIndex::docbook(Buffer const &, odocstream & os,
+                       OutputParams const &) const
 {
-       InsetCommand::metrics(mi, dim);
-       center_indent_ = (mi.base.textwidth - dim.wid) / 2;
-       dim.wid = mi.base.textwidth;
-       dim_ = dim;
-}
-
-
-void InsetPrintIndex::draw(PainterInfo & pi, int x, int y) const
-{
-                   InsetCommand::draw(pi, x + center_indent_, y);
-}
-
-
-dispatch_result InsetIndex::localDispatch(FuncRequest const & cmd)
-{
-       switch (cmd.action) {
-               case LFUN_INSET_EDIT:
-                       InsetCommandMailer("index", *this).showDialog(cmd.view());
-                       return DISPATCHED;
-
-               default:
-                       return InsetCommand::localDispatch(cmd);
-       }
-}
-
-
-int InsetIndex::docbook(Buffer const &, ostream & os, bool) const
-{
-       os << "<indexterm><primary>" << getContents()
+       os << "<indexterm><primary>"
+           << sgml::escapeString(getParam("name"))
           << "</primary></indexterm>";
        return 0;
 }
 
 
-InsetOld::Code InsetIndex::lyxCode() const
+InsetBase::Code InsetIndex::lyxCode() const
 {
-       return InsetOld::INDEX_CODE;
+       return InsetBase::INDEX_CODE;
 }
 
 
 
 InsetPrintIndex::InsetPrintIndex(InsetCommandParams const & p)
-       : InsetCommand(p)
+       : InsetCommand(p, string())
 {}
 
 
@@ -97,11 +70,7 @@ InsetPrintIndex::InsetPrintIndex(InsetCommandParams const & p)
 // {}
 
 
-InsetPrintIndex::~InsetPrintIndex()
-{}
-
-
-string const InsetPrintIndex::getScreenLabel(Buffer const &) const
+docstring const InsetPrintIndex::getScreenLabel(Buffer const &) const
 {
        return _("Index");
 }
@@ -113,7 +82,10 @@ void InsetPrintIndex::validate(LaTeXFeatures & features) const
 }
 
 
-InsetOld::Code InsetPrintIndex::lyxCode() const
+InsetBase::Code InsetPrintIndex::lyxCode() const
 {
-       return InsetOld::INDEX_PRINT_CODE;
+       return InsetBase::INDEX_PRINT_CODE;
 }
+
+
+} // namespace lyx