X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTocBackend.cpp;h=8646bc504869b86d6148f5111883ad58eff3a294;hb=6b651f2ad9f698c01993dcc6e340682c279f1c55;hp=03f3a7433f56de8eabf1e9b61dd52af6a88e2132;hpb=37333444c0ff59ea53e80b94322a59bc52b1cab1;p=lyx.git

diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp
index 03f3a7433f..8646bc5048 100644
--- a/src/TocBackend.cpp
+++ b/src/TocBackend.cpp
@@ -18,20 +18,27 @@
 #include "BufferParams.h"
 #include "FloatList.h"
 #include "FuncRequest.h"
+#include "InsetList.h"
+#include "Layout.h"
 #include "LyXAction.h"
 #include "Paragraph.h"
-#include "debug.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 {
 
 ///////////////////////////////////////////////////////////////////////////
+//
 // TocItem implementation
+//
+///////////////////////////////////////////////////////////////////////////
 
 TocItem::TocItem(ParConstIterator const & par_it, int d,
 		docstring const & s)
@@ -40,13 +47,13 @@ TocItem::TocItem(ParConstIterator const & par_it, int d,
 }
 
 
-int const TocItem::id() const
+int TocItem::id() const
 {
 	return par_it_->id();
 }
 
 
-int const TocItem::depth() const
+int TocItem::depth() const
 {
 	return depth_;
 }
@@ -71,9 +78,12 @@ FuncRequest TocItem::action() const
 
 
 ///////////////////////////////////////////////////////////////////////////
+//
 // TocBackend implementation
+//
+///////////////////////////////////////////////////////////////////////////
 
-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);
@@ -88,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;
 	}
 
@@ -102,11 +111,11 @@ 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() == Inset::OPTARG_CODE) {
+		if (inset.lyxCode() == OPTARG_CODE) {
 			if (!tocstring.empty())
 				break;
 			Paragraph const & par =
@@ -145,13 +154,13 @@ 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);
 			switch (inset.lyxCode()) {
-			case Inset::OPTARG_CODE: {
+			case OPTARG_CODE: {
 				if (!tocstring.empty())
 					break;
 				Paragraph const & par =
@@ -180,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);
@@ -225,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");
 	}
 }