add missing typename

[lyx.git] / src / texrow.C

diff --git a/src/texrow.C b/src/texrow.C
index 8a1f5b7f4fbf37fe83024a2cdf42fd8753c97ec6..84d9c7ce009cdb11c7198477d50702135ab064da 100644 (file)
--- a/src/texrow.C
+++ b/src/texrow.C
@@ -1,10 +1,10 @@
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           LyX, The Document Processor
- *      
+ *
  *         Copyright 1995 Matthias Ettrich
- *          Copyright 1995-2000 The LyX Team.
+ *          Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
@@ -17,7 +17,7 @@
 #endif
 
 #include "texrow.h"
-#include "lyxparagraph.h"
+#include "paragraph.h"
 #include "debug.h"
 
 using std::find_if;
@@ -34,7 +34,7 @@ void TexRow::reset()
 
 
 // Defines paragraph and position for the beginning of this row
-void TexRow::start(LyXParagraph * par, int pos)
+void TexRow::start(Paragraph * par, int pos)
 {
        lastpar = par;
        lastpos = pos;
@@ -57,7 +57,7 @@ void TexRow::newline()
 
 class same_rownumber {
 public:
-       same_rownumber(TexRow::RowList::value_type const & v):vt(v){}
+       same_rownumber(TexRow::RowList::value_type const & v):vt(v) {}
        bool operator()(TexRow::RowList::value_type const & vt1) const {
                return vt.rownumber() == vt1.rownumber();
        }
@@ -73,24 +73,10 @@ bool TexRow::getIdFromRow(int row, int & id, int & pos) const
        vt.rownumber(row);
        RowList::const_iterator cit =
                find_if(rowlist.begin(), rowlist.end(), same_rownumber(vt));
-       
+
        if (cit != rowlist.end()) {
-#if 0
-               RowList::iterator kit = rowlist.begin();
-               RowList::iterator end = rowlist.end();
-               // Increase the pos of all rows with the
-               // same id (and where the pos is larger)
-               // to avoid putting errorinsets at the
-               // same pos.
-               for(; kit != end; ++kit) {
-                       if (&(*kit) != &(*cit)
-                           && (*kit).id() == (*cit).id()
-                           && (*kit).pos() >= (*cit).pos())
-                               (*kit).pos((*kit).pos() + 1);
-               }
-#endif
-               id = (*cit).id();
-               pos = (*cit).pos();
+               id = cit->id();
+               pos = cit->pos();
                return true;
        }
        id = -1;
@@ -108,17 +94,19 @@ void TexRow::increasePos(int id, int pos) const
 {
        RowList::iterator kit = rowlist.begin();
        RowList::iterator end = rowlist.end();
-       for(; kit != end; ++kit) {
-               if (id == (*kit).id()
-                   && pos < (*kit).pos()) {
-                       (*kit).pos((*kit).pos() + 1);
-                       lyxerr << "TeXRow::increasePos: ideally this "
+       for (; kit != end; ++kit) {
+               if (id == kit->id()
+                   && pos < kit->pos()) {
+                       kit->pos(kit->pos() + 1);
+                       lyxerr[Debug::INFO]
+                               << "TeXRow::increasePos: ideally this "
                                "should never happen..." << endl;
                }
                // When verified to work this clause should be deleted.
-               if (id == (*kit).id()
-                   && pos == (*kit).pos()) {
-                       lyxerr << "TexRow::increasePos: this should happen "
+               if (id == kit->id()
+                   && pos == kit->pos()) {
+                       lyxerr[Debug::INFO]
+                               << "TexRow::increasePos: this should happen "
                                "maximum one time for each run of "
                                "increasePos!" << endl;
                }
@@ -130,4 +118,4 @@ TexRow & TexRow::operator+= (TexRow const & tr)
 {
        rowlist.insert(rowlist.end(), tr.rowlist.begin(), tr.rowlist.end());
        return *this;
-}      
+}