* Doxy: polish html output.

[lyx.git] / src / TocBackend.cpp

diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp
index a93e9f324cc5792a7f6a5bccb70d67ddc8cef9f2..8646bc504869b86d6148f5111883ad58eff3a294 100644 (file)
--- a/src/TocBackend.cpp
+++ b/src/TocBackend.cpp
@@ -16,18 +16,21 @@
 
 #include "Buffer.h"
 #include "BufferParams.h"
-#include "debug.h"
 #include "FloatList.h"
 #include "FuncRequest.h"
+#include "InsetList.h"
 #include "Layout.h"
 #include "LyXAction.h"
 #include "Paragraph.h"
+#include "TextClass.h"
 
 #include "insets/InsetOptArg.h"
 
 #include "support/convert.h"
+#include "support/debug.h"
+#include "support/docstream.h"
 
-using std::string;
+using namespace std;
 
 namespace lyx {
 
@@ -80,7 +83,7 @@ FuncRequest TocItem::action() const
 //
 ///////////////////////////////////////////////////////////////////////////
 
-Toc const & TocBackend::toc(std::string const & type) const
+Toc const & TocBackend::toc(string const & type) const
 {
        // Is the type already supported?
        TocList::const_iterator it = tocs_.find(type);
@@ -95,8 +98,7 @@ void TocBackend::updateItem(ParConstIterator const & par_it)
        if (toc("tableofcontents").empty()) {
                // FIXME: should not happen, 
                // a call to TocBackend::update() is missing somewhere
-               lyxerr << "TocBackend::updateItem called but the TOC is empty!"
-                       << std::endl;
+               LYXERR0("TocBackend::updateItem called but the TOC is empty!");
                return;
        }
 
@@ -109,8 +111,8 @@ void TocBackend::updateItem(ParConstIterator const & par_it)
 
        // For each paragraph, traverse its insets and let them add
        // their toc items
-       InsetList::const_iterator it = toc_item->par_it_->insetlist.begin();
-       InsetList::const_iterator end = toc_item->par_it_->insetlist.end();
+       InsetList::const_iterator it = toc_item->par_it_->insetList().begin();
+       InsetList::const_iterator end = toc_item->par_it_->insetList().end();
        for (; it != end; ++it) {
                Inset & inset = *it->inset;
                if (inset.lyxCode() == OPTARG_CODE) {
@@ -152,8 +154,8 @@ void TocBackend::update()
 
                // For each paragraph, traverse its insets and let them add
                // their toc items
-               InsetList::const_iterator it = pit->insetlist.begin();
-               InsetList::const_iterator end = pit->insetlist.end();
+               InsetList::const_iterator it = pit->insetList().begin();
+               InsetList::const_iterator end = pit->insetList().end();
                for (; it != end; ++it) {
                        Inset & inset = *it->inset;
                        inset.addToToc(tocs_, *buffer_, pit);
@@ -187,7 +189,7 @@ void TocBackend::update()
 }
 
 
-TocIterator const TocBackend::item(std::string const & type,
+TocIterator const TocBackend::item(string const & type,
                ParConstIterator const & par_it) const
 {
        TocList::const_iterator toclist_it = tocs_.find(type);
@@ -232,7 +234,7 @@ void TocBackend::writePlaintextTocList(string const & type, odocstream & os) con
                TocIterator ccit = cit->second.begin();
                TocIterator end = cit->second.end();
                for (; ccit != end; ++ccit)
-                       os << ccit->asString() << '\n';
+                       os << ccit->asString() << from_utf8("\n");
        }
 }