[Uml-devel] branches/work/soc-umbrello (silent)

[Gopala Krishna A]

SVN commit 972030 by gopala:

SVN_SILENT:
Merged revisions 971486 via svnmerge from 
svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdesdk/umbrello

........
  r971486 | dfaure | 2009-05-22 19:40:16 +0530 (Fri, 22 May 2009) | 2 lines
  
  Fix compilation with QT_STRICT_ITERATORS.
........


 _M            . (directory)  
 M  +1 -1      umbrello/codegenerators/codegenerator.cpp  
 M  +4 -6      umbrello/umlviewimageexportermodel.cpp  


** branches/work/soc-umbrello #property svnmerge-integrated
   - /trunk/KDE/kdesdk/umbrello:1-854015,854687,854787,855207-866962,866965-870129,871091,872169-887978,889968-889981,890075-890805,896752-896872,901256-910119,911086,911706-911805,912902,913652,914852-917492,918579-919414,920540-921357,922431,922854-927155,928929-928936,931178-937536,937636,937969-941130,941971,942048-942637,943412,945536-946356,948572-948599,949430,951335-951484,952053-952131,952436-953088,956010-956619,957386,958937,961888,962900,963206-963898,964692
   + /trunk/KDE/kdesdk/umbrello:1-854015,854687,854787,855207-866962,866965-870129,871091,872169-887978,889968-889981,890075-890805,896752-896872,901256-910119,911086,911706-911805,912902,913652,914852-917492,918579-919414,920540-921357,922431,922854-927155,928929-928936,931178-937536,937636,937969-941130,941971,942048-942637,943412,945536-946356,948572-948599,949430,951335-951484,952053-952131,952436-953088,956010-956619,957386,958937,961888,962900,963206-963898,964692,971486
--- branches/work/soc-umbrello/umbrello/codegenerators/codegenerator.cpp #972029:972030
@@ -751,7 +751,7 @@
     const QString endLine = UMLApp::app()->getCommonPolicy()->getNewLineEndingChars();
     QString output;
     QStringList lines = text.split(endLine);
-    for (QStringList::ConstIterator lit = lines.begin(); lit != lines.end(); ++lit) {
+    for (QStringList::ConstIterator lit = lines.constBegin(); lit != lines.constEnd(); ++lit) {
         QString input = *lit;
         input.remove( QRegExp("\\s+$") );
         if (input.length() < lineWidth) {
--- branches/work/soc-umbrello/umbrello/umlviewimageexportermodel.cpp #972029:972030
@@ -54,10 +54,8 @@
     if (!supportedImageTypesList.size()) {
         // QT supported formats
         QList<QByteArray> qImageFormats = QImageWriter::supportedImageFormats();
-        QList<QByteArray>::const_iterator it, it_end;
-        it = qImageFormats.begin(); it_end = qImageFormats.end();
-        for (; it != it_end; ++it) {
-            QString format = QString(*it).toLower();
+        Q_FOREACH(const QByteArray& it, qImageFormats) {
+            const QString format = it.toLower();
             if (!supportedImageTypesList.contains(format))
                 supportedImageTypesList << format;
         }
@@ -68,7 +66,7 @@
             supportedImageTypesList << "svg";
     }
     supportedImageTypesList.sort();
-    
+
     return supportedImageTypesList;
 }
 
@@ -303,7 +301,7 @@
 
     // creates the directory and any needed parent directories
     QStringList dirs = url.directory().split(QDir::separator(), QString::SkipEmptyParts );
-    for (QStringList::ConstIterator it = dirs.begin() ; it != dirs.end(); ++it) {
+    for (QStringList::ConstIterator it = dirs.constBegin() ; it != dirs.constEnd(); ++it) {
         directory.addPath(*it);
 
         if (!KIO::NetAccess::exists(directory, KIO::NetAccess::SourceSide, UMLApp::app())) {