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

diff --git a/src/insets/insetindex.C b/src/insets/insetindex.C
index c7f4b935eb..c175cf1ffd 100644
--- a/src/insets/insetindex.C
+++ b/src/insets/insetindex.C
@@ -5,72 +5,72 @@
  *
  * \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 "insetindex.h"
-#include "BufferView.h"
-#include "frontends/LyXView.h"
-#include "frontends/Dialogs.h"
-#include "LaTeXFeatures.h"
+
+#include "dispatchresult.h"
+#include "funcrequest.h"
 #include "gettext.h"
-#include "support/LOstream.h"
+#include "LaTeXFeatures.h"
+#include "metricsinfo.h"
+#include "sgml.h"
 
-using std::ostream;
+#include "support/std_ostream.h"
 
-InsetIndex::InsetIndex(InsetCommandParams const & p, bool)
-	: InsetCommand(p)
-{}
 
+namespace lyx {
 
-InsetIndex::~InsetIndex()
-{
-	InsetCommandMailer mailer("index", *this);
-	mailer.hideDialog();
-}
+using std::string;
+using std::ostream;
 
 
-string const InsetIndex::getScreenLabel(Buffer const *) const
-{
-	return _("Idx");
-}
+InsetIndex::InsetIndex(InsetCommandParams const & p)
+	: InsetCommand(p, "index")
+{}
 
 
-void InsetIndex::edit(BufferView * bv, int, int, mouse_button::state)
-{
-	InsetCommandMailer mailer("index", *this);
-	mailer.showDialog(bv);
-}
+// InsetIndex::InsetIndex(InsetCommandParams const & p, bool)
+//	: InsetCommand(p, false)
+// {}
 
 
-void InsetIndex::edit(BufferView * bv, bool)
+docstring const InsetIndex::getScreenLabel(Buffer const &) const
 {
-	edit(bv, 0, 0, mouse_button::none);
+	return _("Idx");
 }
 
 
-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;
 }
 
 
-Inset::Code InsetIndex::lyxCode() const
+InsetBase::Code InsetIndex::lyxCode() const
 {
-	return Inset::INDEX_CODE;
+	return InsetBase::INDEX_CODE;
 }
 
 
-InsetPrintIndex::InsetPrintIndex(InsetCommandParams const & p, bool)
-	: InsetCommand(p)
+
+InsetPrintIndex::InsetPrintIndex(InsetCommandParams const & p)
+	: InsetCommand(p, string())
 {}
 
 
-string const InsetPrintIndex::getScreenLabel(Buffer const *) const
+// InsetPrintIndex::InsetPrintIndex(InsetCommandParams const & p, bool)
+//	: InsetCommand(p, false)
+// {}
+
+
+docstring const InsetPrintIndex::getScreenLabel(Buffer const &) const
 {
 	return _("Index");
 }
@@ -82,7 +82,10 @@ void InsetPrintIndex::validate(LaTeXFeatures & features) const
 }
 
 
-Inset::Code InsetPrintIndex::lyxCode() const
+InsetBase::Code InsetPrintIndex::lyxCode() const
 {
-	return Inset::INDEX_PRINT_CODE;
+	return InsetBase::INDEX_PRINT_CODE;
 }
+
+
+} // namespace lyx