LFUN_UNICODE_INSERT - unicode-insert

[lyx.git] / src / toc.C

diff --git a/src/toc.C b/src/toc.C
index c2d1d789eade927587824588145741798d575062..7892295ce3ea561cdd980eab2f029938c0dcbbf4 100644 (file)
--- a/src/toc.C
+++ b/src/toc.C
@@ -24,8 +24,6 @@
 #include "debug.h"
 #include "undo.h"
 
-#include "frontends/LyXView.h"
-
 #include "insets/insetfloat.h"
 #include "insets/insetoptarg.h"
 #include "insets/insetwrap.h"
@@ -48,7 +46,7 @@ using std::endl;
 namespace lyx {
 namespace toc {
 
-typedef map<Buffer const *, lyx::TocBackend> TocMap;
+typedef map<Buffer const *, TocBackend> TocMap;
 static TocMap toc_backend_;
 
 ///////////////////////////////////////////////////////////////////////////
@@ -95,7 +93,7 @@ vector<string> const & getTypes(Buffer const & buf)
 }
 
 
-void asciiTocList(string const & type, Buffer const & buf, ostream & os)
+void asciiTocList(string const & type, Buffer const & buf, odocstream & os)
 {
        toc_backend_[&buf].asciiTocList(type, os);
 }
@@ -143,7 +141,7 @@ void outline(OutlineOp mode,  LCursor & cur)
        int const thistoclevel = s->layout()->toclevel;
        int toclevel;
        switch (mode) {
-               case UP: {
+               case Up: {
                        if (p != end)
                                ++p;
                        for (; p != end; ++p) {
@@ -175,7 +173,7 @@ void outline(OutlineOp mode,  LCursor & cur)
                        pars.erase(s, t);
                break;
                }
-               case DOWN: {
+               case Down: {
                           if (p != end)
                                ++p;
                        for (; p != end; ++p) {
@@ -206,7 +204,7 @@ void outline(OutlineOp mode,  LCursor & cur)
                        pars.erase(s, t);
                break;
                }
-               case IN:
+               case In:
                        for (; lit != lend; ++lit) {
                                if ((*lit)->toclevel == thistoclevel + 1 &&
                                    s->layout()->labeltype == (*lit)->labeltype) {
@@ -215,7 +213,7 @@ void outline(OutlineOp mode,  LCursor & cur)
                                }
                        }
                break;
-               case OUT:
+               case Out:
                        for (; lit != lend; ++lit) {
                                if ((*lit)->toclevel == thistoclevel - 1 &&
                                    s->layout()->labeltype == (*lit)->labeltype) {