#include "Buffer.h"
#include "BufferParams.h"
#include "FuncRequest.h"
-#include "LyXText.h"
+#include "Text.h"
#include "LyXAction.h"
#include "Paragraph.h"
#include "ParIterator.h"
-#include "LCursor.h"
+#include "Cursor.h"
#include "debug.h"
#include "Undo.h"
namespace lyx {
namespace toc {
-void outline(OutlineOp mode, LCursor & cur)
+void outline(OutlineOp mode, Cursor & cur)
{
- Buffer * buf = & cur.buffer();
+ Buffer & buf = cur.buffer();
pit_type & pit = cur.pit();
- ParagraphList & pars = buf->text().paragraphs();
+ ParagraphList & pars = buf.text().paragraphs();
ParagraphList::iterator bgn = pars.begin();
// The first paragraph of the area to be copied:
ParagraphList::iterator start = boost::next(bgn, pit);
ParagraphList::iterator finish = start;
ParagraphList::iterator end = pars.end();
- LyXTextClass::const_iterator lit =
- buf->params().getLyXTextClass().begin();
- LyXTextClass::const_iterator const lend =
- buf->params().getLyXTextClass().end();
+ TextClass::const_iterator lit =
+ buf.params().getTextClass().begin();
+ TextClass::const_iterator const lend =
+ buf.params().getTextClass().end();
int const thistoclevel = start->layout()->toclevel;
int toclevel;
// Seek the one (on same level) below
for (; finish != end; ++finish) {
toclevel = finish->layout()->toclevel;
- if (toclevel != LyXLayout::NOT_IN_TOC
+ if (toclevel != Layout::NOT_IN_TOC
&& toclevel <= thistoclevel) {
break;
}
--dest;
toclevel = dest->layout()->toclevel;
} while(dest != bgn
- && (toclevel == LyXLayout::NOT_IN_TOC
+ && (toclevel == Layout::NOT_IN_TOC
|| toclevel > thistoclevel));
// Not found; do nothing
- if (toclevel == LyXLayout::NOT_IN_TOC
+ if (toclevel == Layout::NOT_IN_TOC
|| toclevel > thistoclevel)
break;
pit_type const newpit = std::distance(bgn, dest);
}
case Down: {
// Go down out of current header:
- if (finish != end)
+ if (finish != end)
++finish;
// Find next same-level header:
for (; finish != end; ++finish) {
toclevel = finish->layout()->toclevel;
- if (toclevel != LyXLayout::NOT_IN_TOC
+ if (toclevel != Layout::NOT_IN_TOC
&& toclevel <= thistoclevel) {
break;
}
// Go further down to find header to insert in front of:
for (; dest != end; ++dest) {
toclevel = dest->layout()->toclevel;
- if (toclevel != LyXLayout::NOT_IN_TOC
+ if (toclevel != Layout::NOT_IN_TOC
&& toclevel <= thistoclevel) {
break;
}