The "I want this in now" patch.

[lyx.git] / src / texrow.C

diff --git a/src/texrow.C b/src/texrow.C
index 2e3bd01fc2252e14058985fd552bf8ad647b9400..96e3d2bd0e8d2dc5d86491ce0113a27e215af482 100644 (file)
--- a/src/texrow.C
+++ b/src/texrow.C
@@ -8,22 +8,17 @@
 
 #include <config.h>
 
-#include <algorithm>
-
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "texrow.h"
-#include "paragraph.h"
 #include "debug.h"
 
+#include <algorithm>
+
 using std::find_if;
 using std::for_each;
 using std::endl;
 
 namespace {
- 
+
 /// function object returning true when row number is found
 class same_rownumber {
 public:
@@ -31,7 +26,7 @@ public:
        bool operator()(TexRow::RowList::value_type const & vt) const {
                return vt.rownumber() == row_;
        }
- 
+
 private:
        int row_;
 };
@@ -48,7 +43,7 @@ public:
                if (vt.id() != id_ || vt.pos() >= pos_)
                        return;
                vt.pos(vt.pos() + 1);
- 
+
                lyxerr[Debug::INFO]
                        << "TeXRow::increasePos: ideally this "
                        "should never happen..." << endl;
@@ -66,29 +61,29 @@ private:
        int id_;
        int pos_;
 };
- 
-} // namespace anon 
 
- 
+} // namespace anon
+
+
 void TexRow::reset()
 {
        rowlist.clear();
        count = 0;
-       lastpar = 0;
+       lastid = -1;
        lastpos = -1;
 }
 
 
-void TexRow::start(Paragraph * par, int pos)
+void TexRow::start(int id, int pos)
 {
-       lastpar = par;
+       lastid = id;
        lastpos = pos;
 }
 
 
 void TexRow::newline()
 {
-       int const id = lastpar ? lastpar->id() : -1;
+       int const id = lastid;
        RowList::value_type tmp(id, lastpos, ++count);
        rowlist.push_back(tmp);
 }
@@ -97,9 +92,9 @@ void TexRow::newline()
 bool TexRow::getIdFromRow(int row, int & id, int & pos) const
 {
        RowList::const_iterator cit =
-               find_if(rowlist.begin(), rowlist.end(), 
+               find_if(rowlist.begin(), rowlist.end(),
                        same_rownumber(row));
- 
+
        if (cit != rowlist.end()) {
                id = cit->id();
                pos = cit->pos();
@@ -113,9 +108,7 @@ bool TexRow::getIdFromRow(int row, int & id, int & pos) const
 
 void TexRow::increasePos(int id, int pos)
 {
-       RowList::iterator it = rowlist.begin();
-       RowList::iterator end = rowlist.end();
-       for_each(it, end, increase_pos(id, pos));
+       for_each(rowlist.begin(), rowlist.end(), increase_pos(id, pos));
 }