]> git.lyx.org Git - lyx.git/blobdiff - src/BufferView.cpp
cosmetics
[lyx.git] / src / BufferView.cpp
index 40aa978c02731444384b420d954979f6f04d34f9..f01b460b1dd1049d7d75571c38e30375d9f743e7 100644 (file)
 #include "support/filetools.h"
 #include "support/Package.h"
 #include "support/types.h"
-#include "support/fs_extras.h"
 
-#include <boost/bind.hpp>
 #include <boost/current_function.hpp>
-#include <boost/next_prior.hpp>
-#include <boost/filesystem/operations.hpp>
 
 #include <cerrno>
 #include <fstream>
 #include <functional>
+#include <iterator>
 #include <vector>
 
 using std::distance;
@@ -98,8 +95,6 @@ using std::mem_fun_ref;
 using std::string;
 using std::vector;
 
-namespace fs = boost::filesystem;
-
 namespace lyx {
 
 using support::addPath;
@@ -212,129 +207,6 @@ void gotoInset(BufferView * bv, InsetCode code, bool same_content)
 }
 
 
-
-/// the type of outline operation
-enum OutlineOp {
-       OutlineUp, // Move this header with text down
-       OutlineDown,   // Move this header with text up
-       OutlineIn, // Make this header deeper
-       OutlineOut // Make this header shallower
-};
-
-
-void outline(OutlineOp mode, Cursor & cur)
-{
-       Buffer & buf = cur.buffer();
-       pit_type & pit = cur.pit();
-       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);
-       // The final paragraph of area to be copied:
-       ParagraphList::iterator finish = start;
-       ParagraphList::iterator end = pars.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;
-       switch (mode) {
-               case OutlineUp: {
-                       // Move out (down) from this section header
-                       if (finish != end)
-                               ++finish;
-                       // Seek the one (on same level) below
-                       for (; finish != end; ++finish) {
-                               toclevel = finish->layout()->toclevel;
-                               if (toclevel != Layout::NOT_IN_TOC
-                                   && toclevel <= thistoclevel) {
-                                       break;
-                               }
-                       }
-                       ParagraphList::iterator dest = start;
-                       // Move out (up) from this header
-                       if (dest == bgn)
-                               break;
-                       // Search previous same-level header above
-                       do {
-                               --dest;
-                               toclevel = dest->layout()->toclevel;
-                       } while(dest != bgn
-                               && (toclevel == Layout::NOT_IN_TOC
-                                   || toclevel > thistoclevel));
-                       // Not found; do nothing
-                       if (toclevel == Layout::NOT_IN_TOC || toclevel > thistoclevel)
-                               break;
-                       pit_type const newpit = std::distance(bgn, dest);
-                       pit_type const len = std::distance(start, finish);
-                       pit_type const deletepit = pit + len;
-                       buf.undo().recordUndo(cur, ATOMIC_UNDO, newpit, deletepit - 1);
-                       pars.insert(dest, start, finish);
-                       start = boost::next(pars.begin(), deletepit);
-                       pit = newpit;
-                       pars.erase(start, finish);
-                       break;
-               }
-               case OutlineDown: {
-                       // Go down out of current header:
-                       if (finish != end)
-                               ++finish;
-                       // Find next same-level header:
-                       for (; finish != end; ++finish) {
-                               toclevel = finish->layout()->toclevel;
-                               if (toclevel != Layout::NOT_IN_TOC && toclevel <= thistoclevel)
-                                       break;
-                       }
-                       ParagraphList::iterator dest = finish;
-                       // Go one down from *this* header:
-                       if (dest != end)
-                               ++dest;
-                       else
-                               break;
-                       // Go further down to find header to insert in front of:
-                       for (; dest != end; ++dest) {
-                               toclevel = dest->layout()->toclevel;
-                               if (toclevel != Layout::NOT_IN_TOC && toclevel <= thistoclevel)
-                                       break;
-                       }
-                       // One such was found:
-                       pit_type newpit = std::distance(bgn, dest);
-                       pit_type const len = std::distance(start, finish);
-                       buf.undo().recordUndo(cur, ATOMIC_UNDO, pit, newpit - 1);
-                       pars.insert(dest, start, finish);
-                       start = boost::next(bgn, pit);
-                       pit = newpit - len;
-                       pars.erase(start, finish);
-                       break;
-               }
-               case OutlineIn:
-                       buf.undo().recordUndo(cur);
-                       for (; lit != lend; ++lit) {
-                               if ((*lit)->toclevel == thistoclevel + 1 &&
-                                   start->layout()->labeltype == (*lit)->labeltype) {
-                                       start->layout((*lit));
-                                       break;
-                               }
-                       }
-                       break;
-               case OutlineOut:
-                       buf.undo().recordUndo(cur);
-                       for (; lit != lend; ++lit) {
-                               if ((*lit)->toclevel == thistoclevel - 1 &&
-                                   start->layout()->labeltype == (*lit)->labeltype) {
-                                       start->layout((*lit));
-                                       break;
-                               }
-                       }
-                       break;
-               default:
-                       break;
-       }
-}
-
 /// A map from a Text to the associated text metrics
 typedef std::map<Text const *, TextMetrics> TextMetricsCache;
 
@@ -854,11 +726,6 @@ FuncStatus BufferView::getStatus(FuncRequest const & cmd)
        case LFUN_LABEL_INSERT:
        case LFUN_INFO_INSERT:
        case LFUN_PARAGRAPH_GOTO:
-       // FIXME handle non-trivially
-       case LFUN_OUTLINE_UP:
-       case LFUN_OUTLINE_DOWN:
-       case LFUN_OUTLINE_IN:
-       case LFUN_OUTLINE_OUT:
        case LFUN_NOTE_NEXT:
        case LFUN_REFERENCE_NEXT:
        case LFUN_WORD_FIND:
@@ -1098,25 +965,6 @@ Update::flags BufferView::dispatch(FuncRequest const & cmd)
                break;
        }
 
-       case LFUN_OUTLINE_UP:
-               outline(OutlineUp, d->cursor_);
-               d->cursor_.text()->setCursor(d->cursor_, d->cursor_.pit(), 0);
-               updateLabels(buffer_);
-               break;
-       case LFUN_OUTLINE_DOWN:
-               outline(OutlineDown, d->cursor_);
-               d->cursor_.text()->setCursor(d->cursor_, d->cursor_.pit(), 0);
-               updateLabels(buffer_);
-               break;
-       case LFUN_OUTLINE_IN:
-               outline(OutlineIn, d->cursor_);
-               updateLabels(buffer_);
-               break;
-       case LFUN_OUTLINE_OUT:
-               outline(OutlineOut, d->cursor_);
-               updateLabels(buffer_);
-               break;
-
        case LFUN_NOTE_NEXT:
                gotoInset(this, NOTE_CODE, false);
                break;
@@ -2210,7 +2058,7 @@ docstring BufferView::contentsOfPlaintextFile(string const & f,
                        return docstring();
        }
 
-       if (!fs::is_readable(fname.toFilesystemEncoding())) {
+       if (!fname.isReadable()) {
                docstring const error = from_ascii(strerror(errno));
                docstring const file = makeDisplayPath(fname.absFilename(), 50);
                docstring const text =