Fix problems from porting Qt3->Qt4, which were caused by introducing takeFirst()...

[vlp.git] / src / preproc / prep.cpp

diff --git a/src/preproc/prep.cpp b/src/preproc/prep.cpp
index dda3901c4149ad32f404b8ce82848306d95db08e..00b564edd523de2ea95e80c86b2f1adf17134635 100644 (file)
--- a/src/preproc/prep.cpp
+++ b/src/preproc/prep.cpp
@@ -31,41 +31,42 @@ IncFile *findTrueLine(int ln, int *trueline)
        int c1 = 0;
 //     int c2 = 0;
 
-       if (inc.isEmpty()) {
+       QListIterator<NETlink*> incFileIterator(inc);
+       if (!incFileIterator.hasNext()) {
                *trueline = ln;
                return NULL;
-       } 
+       }
        pl.clear();
-       pom = inc.first();
+       pom = incFileIterator.next();
        if (pom->start > ln) {
                *trueline = ln;
                return NULL;
        }
 
-       while ((pom != NULL) && (ln > pom->start)) {
+       while ((incFileIterator.hasNext()) && (ln > pom->start)) {
                if (ln < pom->start + pom->len) {
                        *trueline = ln-pom->start;
                        return pom;
                }
                pl.append(pom);
-               pom=inc.takeFirst();
+               pom=incFileIterator.next();
        }
 
-       if (pom != NULL) {
-               pom1 = pl.first();
+       if (incFileIterator.hasNext()) {
+               QListIterator<NETlink*> plIterator(pl);
                c1=0;
-               while (pom1 != NULL) {
+               while (plIterator.hasNext()) {
+                       pom1 = plIterator.next();
                        c1 += pom1->len;
-                       pom1 = pl.takeFirst();
                }
                *trueline = ln - c1;
                return NULL;
        } else {
-               pom1 = inc.first();
+               incFileIterator.toFront();
                c1 = 0;
-               while (pom1 != NULL) {
+               while (incFileIterator.hasNext()) {
+                       pom1 = incFileIterator.next();
                        c1 += pom1->len;
-                       pom1=inc.takeFirst();
                }
                *trueline = ln - c1;
                return NULL;