* src/insets/InsetListingsParams.cpp: fix user message

[lyx.git] / src / insets / InsetNomencl.cpp

diff --git a/src/insets/InsetNomencl.cpp b/src/insets/InsetNomencl.cpp
index 8c733897e8aff303b2da9dab72eba8d94eb74822..850a670cc452d2f66d02366023af2ed1ce64e53a 100644 (file)
--- a/src/insets/InsetNomencl.cpp
+++ b/src/insets/InsetNomencl.cpp
@@ -13,13 +13,13 @@
 #include "InsetNomencl.h"
 #include "InsetNote.h"
 
-#include "buffer.h"
-#include "dispatchresult.h"
-#include "funcrequest.h"
+#include "Buffer.h"
+#include "DispatchResult.h"
+#include "FuncRequest.h"
 #include "gettext.h"
-#include "insetiterator.h"
+#include "InsetIterator.h"
 #include "LaTeXFeatures.h"
-#include "metricsinfo.h"
+#include "MetricsInfo.h"
 #include "sgml.h"
 
 
@@ -30,20 +30,20 @@ using std::string;
 
 InsetNomencl::InsetNomencl(InsetCommandParams const & p)
        : InsetCommand(p, "nomenclature"),
-         glossary_entry_id(sgml::uniqueID(from_ascii("gloss")))
+         nomenclature_entry_id(sgml::uniqueID(from_ascii("nomen")))
 {}
 
 
 docstring const InsetNomencl::getScreenLabel(Buffer const &) const
 {
-       return _("Glo");
+       return _("Nom");
 }
 
 
 int InsetNomencl::docbook(Buffer const &, odocstream & os,
                OutputParams const &) const
 {
-       os << "<glossterm linkend=\"" << glossary_entry_id << "\">"
+       os << "<glossterm linkend=\"" << nomenclature_entry_id << "\">"
           << sgml::escapeString(getParam("symbol"))
           << "</glossterm>";
        return 0;
@@ -52,7 +52,7 @@ int InsetNomencl::docbook(Buffer const &, odocstream & os,
 
 int InsetNomencl::docbookGlossary(odocstream & os) const
 {
-       os << "<glossentry id=\"" << glossary_entry_id << "\">\n"
+       os << "<glossentry id=\"" << nomenclature_entry_id << "\">\n"
           << "<glossterm>"
           << sgml::escapeString(getParam("symbol"))
           << "</glossterm>\n"
@@ -70,9 +70,9 @@ void InsetNomencl::validate(LaTeXFeatures & features) const
 }
 
 
-InsetBase::Code InsetNomencl::lyxCode() const
+Inset::Code InsetNomencl::lyxCode() const
 {
-       return InsetBase::NOMENCL_CODE;
+       return Inset::NOMENCL_CODE;
 }
 
 
@@ -83,7 +83,7 @@ InsetPrintNomencl::InsetPrintNomencl(InsetCommandParams const & p)
 
 docstring const InsetPrintNomencl::getScreenLabel(Buffer const &) const
 {
-       return _("Glossary");
+       return _("Nomenclature");
 }
 
 
@@ -93,11 +93,11 @@ int InsetPrintNomencl::docbook(Buffer const & buf, odocstream & os,
        os << "<glossary>\n";
        int newlines = 2;
        for (InsetIterator it = inset_iterator_begin(buf.inset()); it;) {
-               if (it->lyxCode() == InsetBase::NOMENCL_CODE) {
+               if (it->lyxCode() == Inset::NOMENCL_CODE) {
                        newlines += static_cast<InsetNomencl const &>(*it).docbookGlossary(os);
                        ++it;
-               } else if(it->lyxCode() == InsetBase::NOTE_CODE &&
-                         static_cast<InsetNote const &>(*it).params().type == InsetNoteParams::Note) {
+               } else if(it->lyxCode() == Inset::NOTE_CODE &&
+                         static_cast<InsetNote const &>(*it).params().type == InsetNoteParams::Note) {
                        // Don't output anything nested in note insets
                        size_t const depth = it.depth();
                        ++it;
@@ -118,9 +118,9 @@ void InsetPrintNomencl::validate(LaTeXFeatures & features) const
 }
 
 
-InsetBase::Code InsetPrintNomencl::lyxCode() const
+Inset::Code InsetPrintNomencl::lyxCode() const
 {
-       return InsetBase::NOMENCL_PRINT_CODE;
+       return Inset::NOMENCL_PRINT_CODE;
 }