Remove InsetCommand::mailer_name_.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35893 a592a061-630c-0410-9148-cb99ea01b6c8

src/insets/InsetBibitem.cpp

@@ -52,7 +52,7 @@ docstring const key_prefix = from_ascii("key-");
 
 
 InsetBibitem::InsetBibitem(Buffer * buf, InsetCommandParams const & p)
-	: InsetCommand(buf, p, "bibitem")
+	: InsetCommand(buf, p)
 {
 	buffer().invalidateBibinfoCache();
 	if (getParam("key").empty())

src/insets/InsetBibtex.cpp

@@ -52,7 +52,7 @@ namespace os = support::os;
 
 
 InsetBibtex::InsetBibtex(Buffer * buf, InsetCommandParams const & p)
-	: InsetCommand(buf, p, "bibtex")
+	: InsetCommand(buf, p)
 {
 	buffer().invalidateBibinfoCache();
 }

src/insets/InsetCitation.cpp

@@ -40,7 +40,7 @@ ParamInfo InsetCitation::param_info_;
 
 
 InsetCitation::InsetCitation(Buffer * buf, InsetCommandParams const & p)
-	: InsetCommand(buf, p, "citation")
+	: InsetCommand(buf, p)
 {}
 
 

src/insets/InsetCommand.cpp

@@ -52,23 +52,22 @@ namespace lyx {
 
 // FIXME Would it now be possible to use the InsetCode in 
 // place of the mailer name and recover that information?
-InsetCommand::InsetCommand(Buffer * buf, InsetCommandParams const & p,
+InsetCommand::InsetCommand(Buffer * buf, InsetCommandParams const & p)
-			   string const & mailer_name)
+	: Inset(buf), p_(p)
-	: Inset(buf), p_(p), mailer_name_(mailer_name)
 {}
 
 
 // The sole purpose of this copy constructor is to make sure
 // that the mouse_hover_ map is not copied and remains empty.
 InsetCommand::InsetCommand(InsetCommand const & rhs)
-	: Inset(rhs), p_(rhs.p_), mailer_name_(rhs.mailer_name_)
+	: Inset(rhs), p_(rhs.p_)
 {}
 
 
 InsetCommand::~InsetCommand()
 {
-	if (!mailer_name_.empty())
+	if (p_.code() != NO_CODE)
-		hideDialogs(mailer_name_, this);
+		hideDialogs(insetName(p_.code()), this);
 
 	map<BufferView const *, bool>::iterator it = mouse_hover_.begin();
 	map<BufferView const *, bool>::iterator end = mouse_hover_.end();
@@ -209,14 +208,14 @@ bool InsetCommand::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 docstring InsetCommand::contextMenu(BufferView const &, int, int) const
 {
-	return from_ascii("context-") + from_ascii(mailer_name_);
+	return from_ascii("context-") + from_ascii(insetName(p_.code()));
 }
 
 
 bool InsetCommand::showInsetDialog(BufferView * bv) const
 {
-	if (!mailer_name_.empty())
+	if (p_.code() != NO_CODE)
-		bv->showDialog(mailer_name_, params2string(p_),
+		bv->showDialog(insetName(p_.code()), params2string(p_),
 			const_cast<InsetCommand *>(this));
 	return true;
 }

src/insets/InsetCommand.h

@@ -35,8 +35,7 @@ class InsetCommand : public Inset
 {
 public:
 	///
-	InsetCommand(Buffer *, InsetCommandParams const &,
+	InsetCommand(Buffer *, InsetCommandParams const &);
-		std::string const & mailer_name);
 	///
 	InsetCommand(InsetCommand const & rhs);
 	///
@@ -133,8 +132,6 @@ private:
 
 	///
 	InsetCommandParams p_;
-	///
-	std::string mailer_name_;
 	/// changes color when mouse enters/leaves this inset
 	mutable std::map<BufferView const *, bool> mouse_hover_;
 	///

src/insets/InsetFloatList.cpp

@@ -38,12 +38,12 @@ namespace lyx {
 
 
 InsetFloatList::InsetFloatList(Buffer * buf)
-	: InsetCommand(buf, InsetCommandParams(FLOAT_LIST_CODE), "floatlist")
+	: InsetCommand(buf, InsetCommandParams(FLOAT_LIST_CODE))
 {}
 
 
 InsetFloatList::InsetFloatList(Buffer * buf, string const & type)
-	: InsetCommand(buf, InsetCommandParams(FLOAT_LIST_CODE), "floatlist")
+	: InsetCommand(buf, InsetCommandParams(FLOAT_LIST_CODE))
 {
 	setParam("type", from_ascii(type));
 }

src/insets/InsetHyperlink.cpp

@@ -35,7 +35,7 @@ namespace lyx {
 
 
 InsetHyperlink::InsetHyperlink(Buffer * buf, InsetCommandParams const & p)
-	: InsetCommand(buf, p, "href")
+	: InsetCommand(buf, p)
 {}
 
 

src/insets/InsetInclude.cpp

@@ -160,7 +160,7 @@ InsetLabel * createLabel(Buffer * buf, docstring const & label_str)
 
 
 InsetInclude::InsetInclude(Buffer * buf, InsetCommandParams const & p)
-	: InsetCommand(buf, p, "include"), include_label(uniqueID()),
+	: InsetCommand(buf, p), include_label(uniqueID()),
 	  preview_(new RenderMonitoredPreview(this)), failedtoload_(false),
 	  set_label_(false), label_(0), child_buffer_(0)
 {

src/insets/InsetIndex.cpp

@@ -425,7 +425,7 @@ void InsetIndexParams::read(Lexer & lex)
 ///////////////////////////////////////////////////////////////////////
 
 InsetPrintIndex::InsetPrintIndex(Buffer * buf, InsetCommandParams const & p)
-	: InsetCommand(buf, p, "index_print")
+	: InsetCommand(buf, p)
 {}
 
 

src/insets/InsetLabel.cpp

@@ -49,7 +49,7 @@ namespace lyx {
 
 
 InsetLabel::InsetLabel(Buffer * buf, InsetCommandParams const & p)
-	: InsetCommand(buf, p, "label")
+	: InsetCommand(buf, p)
 {}
 
 

src/insets/InsetLine.cpp

@@ -42,7 +42,7 @@ using frontend::Painter;
 
 
 InsetLine::InsetLine(Buffer * buf, InsetCommandParams const & p)
-	: InsetCommand(buf, p, "line")
+	: InsetCommand(buf, p)
 {}
 
 

src/insets/InsetNomencl.cpp

@@ -49,7 +49,7 @@ namespace lyx {
 /////////////////////////////////////////////////////////////////////
 
 InsetNomencl::InsetNomencl(Buffer * buf, InsetCommandParams const & p)
-	: InsetCommand(buf, p, "nomenclature"),
+	: InsetCommand(buf, p),
 	  nomenclature_entry_id(sgml::uniqueID(from_ascii("nomen")))
 {}
 
@@ -135,7 +135,7 @@ void InsetNomencl::validate(LaTeXFeatures & features) const
 /////////////////////////////////////////////////////////////////////
 
 InsetPrintNomencl::InsetPrintNomencl(Buffer * buf, InsetCommandParams const & p)
-	: InsetCommand(buf, p, "nomencl_print")
+	: InsetCommand(buf, p)
 {}
 
 

src/insets/InsetRef.cpp

@@ -36,7 +36,7 @@ namespace lyx {
 
 
 InsetRef::InsetRef(Buffer * buf, InsetCommandParams const & p)
-	: InsetCommand(buf, p, "ref")
+	: InsetCommand(buf, p)
 {}
 
 

src/insets/InsetTOC.cpp

@@ -35,7 +35,7 @@ namespace lyx {
 
 
 InsetTOC::InsetTOC(Buffer * buf, InsetCommandParams const & p)
-	: InsetCommand(buf, p, "toc")
+	: InsetCommand(buf, p)
 {}