do what the FIXME suggested

[lyx.git] / src / sgml.cpp

diff --git a/src/sgml.cpp b/src/sgml.cpp
index 928e0eb09ee8fd1b621039fc1a65299f4d8d77b1..1611f32495ceb0125651af950ef39b4a810a0f5e 100644 (file)
--- a/src/sgml.cpp
+++ b/src/sgml.cpp
@@ -20,6 +20,7 @@
 #include "OutputParams.h"
 #include "Paragraph.h"
 #include "Text.h"
+#include "TextClass.h"
 
 #include "support/convert.h"
 #include "support/docstream.h"
@@ -29,15 +30,11 @@
 #include <map>
 #include <ostream>
 
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::subst;
-
-using std::map;
-using std::ostream;
-using std::ostringstream;
-using std::string;
 
 docstring sgml::escapeChar(char_type c)
 {
@@ -124,9 +121,9 @@ docstring sgml::cleanID(Buffer const & buf, OutputParams const & runparams,
        // and adds a number for uniqueness.
        // If you know what you are doing, you can set allowed==""
        // to disable this mangling.
-       TextClass const & tclass = buf.params().getTextClass();
+       DocumentClass const & tclass = buf.params().documentClass();
        docstring const allowed = from_ascii(
-               runparams.flavor == OutputParams::XML? ".-_:":tclass.options());
+               runparams.flavor == OutputParams::XML ? ".-_:" : tclass.options());
 
        if (allowed.empty())
                return orig;
@@ -142,7 +139,7 @@ docstring sgml::cleanID(Buffer const & buf, OutputParams const & runparams,
 
        MangledMap::const_iterator const known = mangledNames.find(orig);
        if (known != mangledNames.end())
-               return (*known).second;
+               return known->second;
 
        // make sure it starts with a letter
        if (!isAlphaASCII(*it) && allowed.find(*it) >= allowed.size())
@@ -207,12 +204,12 @@ void sgml::openTag(Buffer const & buf, odocstream & os,
        LayoutPtr const & style = par.layout();
        string const & name = style->latexname();
        string param = style->latexparam();
-       Counters & counters = buf.params().getTextClass().counters();
+       Counters & counters = buf.params().documentClass().counters();
 
        string id = par.getID(buf, runparams);
 
        string attribute;
-       if(!id.empty()) {
+       if (!id.empty()) {
                if (param.find('#') != string::npos) {
                        string::size_type pos = param.find("id=<");
                        string::size_type end = param.find(">");
@@ -223,7 +220,7 @@ void sgml::openTag(Buffer const & buf, odocstream & os,
        } else {
                if (param.find('#') != string::npos) {
                        // FIXME UNICODE
-                       if(!style->counter.empty())
+                       if (!style->counter.empty())
                                counters.step(style->counter);
                        else
                                counters.step(from_ascii(name));