[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/filters/kword/rtf/export
From:       Laurent Montel <montel () kde ! org>
Date:       2009-08-08 8:23:56
Message-ID: 1249719836.255830.18732.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1008729 by mlaurent:

Fix iterator


 M  +12 -12    ExportFilter.cc  


--- trunk/koffice/filters/kword/rtf/export/ExportFilter.cc #1008728:1008729
@@ -171,8 +171,8 @@
         QString endOfParagraph;
         QList<ParaData> *paraList = (*itCell).paraList;
         QList<ParaData>::ConstIterator it;
-                QList<ParaData>::ConstIterator end(paraList->end());
-        for (it=paraList->begin();it!=end;++it)
+                QList<ParaData>::ConstIterator end(paraList->constEnd());
+        for (it=paraList->constBegin();it!=end;++it)
         {
             rowText += endOfParagraph;
             rowText += ProcessParagraphData( \
(*it).text,(*it).layout,(*it).formattingList); @@ -729,10 +729,10 @@
                     {
                         QString fstr;
                         QList<ParaData>::ConstIterator it;
-                        QList<ParaData>::ConstIterator end(paraList->end());
+                        QList<ParaData>::ConstIterator end(paraList->constEnd());
                         const QString prefixSaved = m_prefix;
                         m_prefix.clear();
-                        for (it=paraList->begin();it!=end;++it)
+                        for (it=paraList->constBegin();it!=end;++it)
                             fstr += ProcessParagraphData( (*it).text, \
(*it).layout,(*it).formattingList);  m_prefix = prefixSaved;
 
@@ -1015,8 +1015,8 @@
     *m_streamOut << "{\\colortbl;";
     uint count;
     QList<QColor>::ConstIterator it;
-    for (count=0, it=m_colorList.begin();
-        it!=m_colorList.end();
+    for (count=0, it=m_colorList.constBegin();
+        it!=m_colorList.constEnd();
         count++, it++)
     {
         *m_streamOut << "\\red" << (*it).red();
@@ -1033,8 +1033,8 @@
 
     uint count;
     QList<LayoutData>::ConstIterator it;
-    for (count=0, it=m_styleList.begin();
-        it!=m_styleList.end();
+    for (count=0, it=m_styleList.constBegin();
+        it!=m_styleList.constEnd();
         count++, it++)
     {
         *m_streamOut << "{";
@@ -1047,7 +1047,7 @@
         // Find the number of the following style
         uint counter=0;  // counts position in style table starting at 0
         QList < LayoutData > ::ConstIterator it2;
-        for( it2 =  m_styleList.begin(); it2 != m_styleList.end(); counter++, ++it2 \
) +        for( it2 =  m_styleList.constBegin(); it2 != m_styleList.constEnd(); \
counter++, ++it2 )  {
             if ( (*it2).styleName == (*it).styleFollowing )
             {
@@ -1675,7 +1675,7 @@
     QList < QColor > ::ConstIterator it;
 
     // search color table for this color
-    for( it =  m_colorList.begin(); it != m_colorList.end(); counter++, ++it )
+    for( it =  m_colorList.constBegin(); it != m_colorList.constEnd(); counter++, \
++it )  {
         if ( (*it) == color )
         {
@@ -1700,10 +1700,10 @@
     QString strMarkup("\\s");  // Holds RTF markup for the style
 
     QList < LayoutData > ::ConstIterator it;
-        QList < LayoutData > ::ConstIterator end(m_styleList.end());
+        QList < LayoutData > ::ConstIterator end(m_styleList.constEnd());
 
     // search color table for this color
-    for( it =  m_styleList.begin(); it != end; counter++, ++it )
+    for( it =  m_styleList.constBegin(); it != end; counter++, ++it )
     {
         if ( (*it).styleName == styleName )
         {


[prev in list] [next in list] [prev in thread] [next in thread]