X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetindex.C;h=c175cf1ffd14cb5e05d7aafff22049ef7542ac57;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=bf8a73f1c2c8ac9b0bfaa350d79b93452f4261c5;hpb=0be0fcfd5907d448cd51addf83ed7032719a0692;p=lyx.git

diff --git a/src/insets/insetindex.C b/src/insets/insetindex.C
index bf8a73f1c2..c175cf1ffd 100644
--- a/src/insets/insetindex.C
+++ b/src/insets/insetindex.C
@@ -9,20 +9,26 @@
  */
 #include <config.h>
 
-
 #include "insetindex.h"
-#include "BufferView.h"
+
+#include "dispatchresult.h"
 #include "funcrequest.h"
-#include "frontends/LyXView.h"
-#include "frontends/Dialogs.h"
-#include "LaTeXFeatures.h"
 #include "gettext.h"
-#include "support/LOstream.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,49 +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");
 }
 
 
-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
+int InsetIndex::docbook(Buffer const &, odocstream & os,
+			OutputParams const &) 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())
 {}
 
 
@@ -82,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");
 }
@@ -98,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