X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTexRow.cpp;h=f95602ec3a5e27d7a8ca729cf2fef0e88bd79d3c;hb=cb138c6c247e9d4b0eb85c31a1bffe300ee784e6;hp=b8579c5b928d0104fd29090e7cd2514a3f313221;hpb=7ef45b8610ed0fea48f99ded16ba9a08b102c5ed;p=lyx.git

diff --git a/src/TexRow.cpp b/src/TexRow.cpp
index b8579c5b92..f95602ec3a 100644
--- a/src/TexRow.cpp
+++ b/src/TexRow.cpp
@@ -4,7 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Matthias Ettrich
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author John Levon
  *
  * Full author contact details are available in file CREDITS.
@@ -13,7 +13,8 @@
 #include <config.h>
 
 #include "TexRow.h"
-#include "debug.h"
+
+#include "support/debug.h"
 
 #include <algorithm>
 
@@ -60,22 +61,24 @@ bool TexRow::getIdFromRow(int row, int & id, int & pos) const
 
 int TexRow::getRowFromIdPos(int id, int pos) const
 {
-	int bestrow = 0;
 	bool foundid = false;
 
-	// this loop finds the last *nonempty* row whith the same id
+	// this loop finds the last *nonempty* row with the same id
 	// and position <= pos
-	for (unsigned r = 0, n = rowlist.size(); r != n; ++r) {
-		if (rowlist[r].id() == id && rowlist[r].pos() <= pos) {
+	RowList::const_iterator bestrow = rowlist.begin();
+	RowList::const_iterator it = rowlist.begin();
+	RowList::const_iterator const end = rowlist.end();
+	for (; it != end; ++it) {
+		if (it->id() == id && it->pos() <= pos) {
 			foundid = true;
-			if (rowlist[bestrow].id() != id || rowlist[r].pos() > rowlist[bestrow].pos())
-				bestrow = r;
+			if (bestrow->id() != id || it->pos() > bestrow->pos())
+				bestrow = it;
 		} else if (foundid)
 			break;
 	}
 	if (!foundid)
 		return rowlist.size();
-	return bestrow;
+	return distance(rowlist.begin(), bestrow);
 }