Refactor InsetQuotes.h enums

[lyx.git] / src / CutAndPaste.cpp

diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index ee3418dd65ce5eb0172783c53f970dc0650df8c8..b6aec8f5a54f990b5f0da697d00946901364106c 100644 (file)
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -292,8 +292,8 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist,
        // Prepare the paragraphs and insets for insertion.
        insertion.swap(in.paragraphs());
 
-       InsetIterator const i_end = inset_iterator_end(in);
-       for (InsetIterator it = inset_iterator_begin(in); it != i_end; ++it) {
+       InsetIterator const i_end = end(in);
+       for (InsetIterator it = begin(in); it != i_end; ++it) {
                // Even though this will also be done later, it has to be done here
                // since some inset might try to access the buffer() member.
                it->setBuffer(const_cast<Buffer &>(buffer));
@@ -315,7 +315,7 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist,
                                if (oldname == newname)
                                        continue;
                                // adapt the references
-                               for (InsetIterator itt = inset_iterator_begin(in);
+                               for (InsetIterator itt = begin(in);
                                      itt != i_end; ++itt) {
                                        if (itt->lyxCode() == REF_CODE) {
                                                InsetCommand * ref = itt->asInsetCommand();
@@ -346,7 +346,7 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist,
                        if (oldname == newname)
                                break;
                        // adapt the references
-                       for (InsetIterator itt = inset_iterator_begin(in); itt != i_end; ++itt) {
+                       for (InsetIterator itt = begin(in); itt != i_end; ++itt) {
                                if (itt->lyxCode() == REF_CODE) {
                                        InsetCommand & ref = static_cast<InsetCommand &>(*itt);
                                        if (ref.getParam("reference") == oldname)
@@ -393,7 +393,7 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist,
                        if (oldkey == newkey)
                                break;
                        // adapt the references
-                       for (InsetIterator itt = inset_iterator_begin(in);
+                       for (InsetIterator itt = begin(in);
                             itt != i_end; ++itt) {
                                if (itt->lyxCode() == CITE_CODE) {
                                        InsetCommand * ref = itt->asInsetCommand();
@@ -728,8 +728,8 @@ void copySelectionHelper(Buffer const & buf, Text const & text,
 namespace cap {
 
 void region(CursorSlice const & i1, CursorSlice const & i2,
-           Inset::row_type & r1, Inset::row_type & r2,
-           Inset::col_type & c1, Inset::col_type & c2)
+                       row_type & r1, row_type & r2,
+                       col_type & c1, col_type & c2)
 {
        Inset const & p = i1.inset();
        c1 = p.col(i1.idx());
@@ -806,10 +806,10 @@ void switchBetweenClasses(DocumentClassConstPtr oldone,
 
        // layouts
        ParIterator it = par_iterator_begin(in);
-       ParIterator end = par_iterator_end(in);
+       ParIterator pend = par_iterator_end(in);
        // for remembering which layouts we've had to add
        set<docstring> newlayouts;
-       for (; it != end; ++it) {
+       for (; it != pend; ++it) {
                docstring const name = it->layout().name();
 
                // the pasted text will keep their own layout name. If this layout does
@@ -832,8 +832,8 @@ void switchBetweenClasses(DocumentClassConstPtr oldone,
        }
 
        // character styles and hidden table cells
-       InsetIterator const i_end = inset_iterator_end(in);
-       for (InsetIterator iit = inset_iterator_begin(in); iit != i_end; ++iit) {
+       InsetIterator const i_end = end(in);
+       for (InsetIterator iit = begin(in); iit != i_end; ++iit) {
                InsetCode const code = iit->lyxCode();
                if (code == FLEX_CODE) {
                        // FIXME: Should we verify all InsetCollapsible?
@@ -1413,20 +1413,20 @@ void eraseSelection(Cursor & cur)
                        cur.pos() = cur.lastpos();
        } else if (p->nrows() > 0 && p->ncols() > 0) {
                // This is a grid, delete a nice square region
-               Inset::row_type r1, r2;
-               Inset::col_type c1, c2;
+               row_type r1, r2;
+               col_type c1, c2;
                region(i1, i2, r1, r2, c1, c2);
-               for (Inset::row_type row = r1; row <= r2; ++row)
-                       for (Inset::col_type col = c1; col <= c2; ++col)
+               for (row_type row = r1; row <= r2; ++row)
+                       for (col_type col = c1; col <= c2; ++col)
                                p->cell(p->index(row, col)).clear();
                // We've deleted the whole cell. Only pos 0 is valid.
                cur.pos() = 0;
        } else {
-               Inset::idx_type idx1 = i1.idx();
-               Inset::idx_type idx2 = i2.idx();
+               idx_type idx1 = i1.idx();
+               idx_type idx2 = i2.idx();
                if (idx1 > idx2)
                        swap(idx1, idx2);
-               for (Inset::idx_type idx = idx1 ; idx <= idx2; ++idx)
+               for (idx_type idx = idx1 ; idx <= idx2; ++idx)
                        p->cell(idx).clear();
                // We've deleted the whole cell. Only pos 0 is valid.
                cur.pos() = 0;
@@ -1485,16 +1485,16 @@ docstring grabSelection(CursorData const & cur)
                }
        }
 
-       Inset::row_type r1, r2;
-       Inset::col_type c1, c2;
+       row_type r1, r2;
+       col_type c1, c2;
        region(i1, i2, r1, r2, c1, c2);
 
        docstring data;
        if (i1.inset().asInsetMath()) {
-               for (Inset::row_type row = r1; row <= r2; ++row) {
+               for (row_type row = r1; row <= r2; ++row) {
                        if (row > r1)
                                data += "\\\\";
-                       for (Inset::col_type col = c1; col <= c2; ++col) {
+                       for (col_type col = c1; col <= c2; ++col) {
                                if (col > c1)
                                        data += '&';
                                data += asString(i1.asInsetMath()->