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

List:       kde-commits
Subject:    koffice/filters
From:       Laurent Montel <montel () kde ! org>
Date:       2009-01-16 7:50:52
Message-ID: 1232092252.605303.27465.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 911791 by mlaurent:

Fix iterator


 M  +1 -1      generic_wrapper/generic_filter.cc  
 M  +2 -2      kword/abiword/ImportHelpers.cc  
 M  +2 -2      kword/abiword/abiwordexport.cc  
 M  +5 -5      kword/abiword/abiwordimport.cc  
 M  +1 -1      kword/libexport/KWEFKWordLeader.cc  


--- trunk/koffice/filters/generic_wrapper/generic_filter.cc #911790:911791
@@ -52,7 +52,7 @@
         return KoFilter::NotImplemented;
 
 	KService::List::ConstIterator it;
-    for (it=offers.begin(); it!=offers.end(); ++it)
+    for (it=offers.constBegin(); it!=offers.constEnd(); ++it)
     {
         kDebug() <<"Got a filter script, exec:" << (*it)->exec() <<
             ", imports: " << (*it)->property("X-KDE-Wrapper-Import").toString() <<
--- trunk/koffice/filters/kword/abiword/ImportHelpers.cc #911790:911791
@@ -40,8 +40,8 @@
     QString name,value;
 
     QStringList::ConstIterator it;
-	QStringList::ConstIterator end(list.end());
-    for (it=list.begin();it!=end;++it)
+	QStringList::ConstIterator end(list.constEnd());
+    for (it=list.constBegin();it!=end;++it)
     {
         const int result=(*it).find(':');
         if (result==-1)
--- trunk/koffice/filters/kword/abiword/abiwordexport.cc #911790:911791
@@ -303,9 +303,9 @@
         *m_streamOut << "<data>\n";
 
         QMap<QString,KoPictureKey>::ConstIterator it;
-		QMap<QString,KoPictureKey>::ConstIterator end(m_mapPictureData.end());
+		QMap<QString,KoPictureKey>::ConstIterator end(m_mapPictureData.constEnd());
         // all images first
-        for (it=m_mapPictureData.begin(); it!=end; ++it)
+        for (it=m_mapPictureData.constBegin(); it!=end; ++it)
         {
             // Warning: do not mix up KWord's key and the iterator's key!
             writePictureData(it.key(),it.value().filename());
--- trunk/koffice/filters/kword/abiword/abiwordimport.cc #911790:911791
@@ -322,7 +322,7 @@
     {
         strStyle="Normal";
     }
-    StyleDataMap::ConstIterator it=styleDataMap.useOrCreateStyle(strStyle);
+    StyleDataMap::iterator it=styleDataMap.useOrCreateStyle(strStyle);
 
     QString strLevel=attributes.value("level");
     int level;
@@ -1111,7 +1111,7 @@
     stackItem->m_doubleArray[0] = 0.0;
     QStringList::ConstIterator it;
     uint i;
-    for ( i=0, it=widthList.begin(); i<columns; ++i, ++it )
+    for ( i=0, it=widthList.constBegin(); i<columns; ++i, ++it )
     {
         kDebug(30506) <<"Column width:" << (*it) <<" cooked" << \
                ValueWithLengthUnit(*it);
         stackItem->m_doubleArray.at(i+1) = ValueWithLengthUnit(*it) + \
stackItem->m_doubleArray.at(i); @@ -1578,8 +1578,8 @@
     StyleDataMap::ConstIterator it;
 
     // At first, we put the Normal style
-    it=styleDataMap.find("Normal");
-    if (it!=styleDataMap.end())
+    it=styleDataMap.constFind("Normal");
+    if (it!=styleDataMap.constEnd())
     {
         kDebug(30506) <<"\"" << it.key() <<"\" =>" << it.value().m_props;
         QDomElement styleElement=mainDocument.createElement("STYLE");
@@ -1589,7 +1589,7 @@
     else
         kWarning(30506) << "No 'Normal' style";
 
-    for (it=styleDataMap.begin();it!=styleDataMap.end();++it)
+    for (it=styleDataMap.constBegin();it!=styleDataMap.constEnd();++it)
     {
         if (it.key()=="Normal")
             continue;
--- trunk/koffice/filters/kword/libexport/KWEFKWordLeader.cc #911790:911791
@@ -1108,7 +1108,7 @@
 
     kDebug(30508) <<"Unachored Framesets : START";
     QStringList::ConstIterator it;
-    for ( it = leader->m_unanchoredFramesets.begin(); it != \
leader->m_unanchoredFramesets.end(); ++it ) +    for ( it = \
leader->m_unanchoredFramesets.constBegin(); it != \
leader->m_unanchoredFramesets.constEnd(); ++it )  {
         kDebug(30508) << (*it);
     }


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