KDE/kdeedu/kalzium

Laurent_Montel · November 20, 2008, 12:34pm

SVN commit 886880 by mlaurent:

Fix iterator

M +1 -1 libavogadro-kalzium/src/primitivelist.cpp
M +11 -11 libavogadro-kalzium/src/primitivelist.h
M +4 -4 src/rsdialog.cpp

— trunk/KDE/kdeedu/kalzium/libavogadro-kalzium/src/primitivelist.cpp #886879:886880
@@ -156,7 +156,7 @@
PrimitiveList::const_iterator PrimitiveList::end() const
{
const_iterator ci(&(d->vector));

ci.vit = d->vector.end();

ci.vit = d->vector.constEnd();
return ci;
}

— trunk/KDE/kdeedu/kalzium/libavogadro-kalzium/src/primitivelist.h #886879:886880
@@ -139,14 +139,14 @@

     inline const_iterator(QVector< QList<Primitive *> > *p) : vl(p)
     {

```
     vit = vl->begin();
```
```
     lit = (*vit).begin();
```
```
     while(lit == (*vit).end())
```

```
     vit = vl->constBegin();
```
```
     lit = (*vit).constBegin();
```

     while(lit == (*vit).constEnd())
     {
       vit++;

```
       if(vit != vl->end())
```

       if(vit != vl->constEnd())
       {

```
         lit = (*vit).begin();
```

         lit = (*vit).constBegin();
       }
       else
       {

@@ -164,18 +164,18 @@

     inline const_iterator &operator++()
     {

```
     if(vit != vl->end())
```

     if(vit != vl->constEnd())
     {
       lit++;

```
       while(lit == (*vit).end())
```

       while(lit == (*vit).constEnd())
       {
         vit++;

```
         if(vit == vl->end())
```

         if(vit == vl->constEnd())
         {
           break;
         }

```
         lit = (*vit).begin();
```

         lit = (*vit).constBegin();
       }
     }
     return *this;

@@ -183,13 +183,13 @@

     inline bool operator!=(const const_iterator &o) const
     {

     return !(vit == vl->end() && o.vit == vl->end()) &&

     return !(vit == vl->constEnd() && o.vit == vl->constEnd()) &&
         !(vit == o.vit && lit == o.lit);
   }

   inline bool operator==(const const_iterator &o) const
   { // equal if both are at the end

     return (vit == vl->end() && o.vit == vl->end()) ||

     return (vit == vl->constEnd() && o.vit == vl->constEnd()) ||
       (vit == o.vit && lit == o.lit);
   }
 };

— trunk/KDE/kdeedu/kalzium/src/rsdialog.cpp #886879:886880
@@ -121,8 +121,8 @@
{
QString p;

QMap<int, QString>::const_iterator i = rphrases_map.begin();
while ( i != rphrases_map.end() )

QMap<int, QString>::const_iterator i = rphrases_map.constBegin();
while ( i != rphrases_map.constEnd() )
{
if ( i.key() == number )
return i.value();
@@ -137,8 +137,8 @@
{
QString p;

QMap<int, QString>::const_iterator i = sphrases_map.begin();
while ( i != sphrases_map.end() )

QMap<int, QString>::const_iterator i = sphrases_map.constBegin();
while ( i != sphrases_map.constEnd() )
{
if ( i.key() == number )
return i.value();

–Boundary-00=_ludJJA7Ttmo6l6e–