#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 {
//
///////////////////////////////////////////////////////////////////////////
-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);
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;
}
// 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 =
// 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 =
}
-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);
TocIterator ccit = cit->second.begin();
TocIterator end = cit->second.end();
for (; ccit != end; ++ccit)
- os << ccit->asString() << '\n';
+ os << ccit->asString() << from_utf8("\n");
}
}