#include "buffer.h"
#include "bufferparams.h"
#include "funcrequest.h"
-#include "iterators.h"
#include "LyXAction.h"
#include "paragraph.h"
+#include "pariterator.h"
#include "frontends/LyXView.h"
using std::vector;
using std::max;
using std::ostream;
+using std::string;
namespace lyx {
namespace toc {
}
-int TocItem::action() const
+FuncRequest TocItem::action() const
{
- return lyxaction.getPseudoAction(LFUN_GOTO_PARAGRAPH,
- tostr(id_));
+ return FuncRequest(LFUN_GOTO_PARAGRAPH, tostr(id_));
}
TocList toclist;
BufferParams const & bufparams = buf.params();
- LyXTextClass const & textclass = bufparams.getLyXTextClass();
ParConstIterator pit = buf.par_iterator_begin();
ParConstIterator end = buf.par_iterator_end();
for (; pit != end; ++pit) {
int const toclevel = pit->layout()->toclevel;
- if (toclevel > 0 && toclevel <= bufparams.tocdepth) {
+ if (toclevel > 0 && toclevel <= bufparams.tocdepth) {
// insert this into the table of contents
TocItem const item(pit->id(), toclevel - 1, pit->asString(buf, true));
toclist["TOC"].push_back(item);
InsetList::const_iterator end = pit->insetlist.end();
for (; it != end; ++it) {
if (it->inset->lyxCode() == InsetOld::FLOAT_CODE) {
- InsetFloat * il =
- static_cast<InsetFloat*>(it->inset);
- il->addToToc(toclist, buf);
+ static_cast<InsetFloat*>(it->inset)
+ ->addToToc(toclist, buf);
} else if (it->inset->lyxCode() == InsetOld::WRAP_CODE) {
- InsetWrap * il =
- static_cast<InsetWrap*>(it->inset);
-
- il->addToToc(toclist, buf);
+ static_cast<InsetWrap*>(it->inset)
+ ->addToToc(toclist, buf);
}
}
}