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

List:       kde-commits
Subject:    playground/utils/workflow/src
From:       David Faure <faure () kde ! org>
Date:       2009-09-30 22:14:11
Message-ID: 1254348851.939879.31718.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1029855 by dfaure:

Fix compilation with strict iterators, part 2


 M  +1 -1      commands/image/convertimagecommand.cpp  
 M  +2 -2      ui/commandport.cpp  
 M  +2 -2      ui/helpwidget.cpp  
 M  +1 -1      ui/selectworkflowdialog.cpp  
 M  +5 -5      ui/view.cpp  
 M  +3 -3      ui/widgets/imageviewer.cpp  


--- trunk/playground/utils/workflow/src/commands/image/convertimagecommand.cpp \
#1029854:1029855 @@ -51,7 +51,7 @@
 
   int count = files.count();
   int num = 1;
-  for (QStringList::ConstIterator i = files.begin(); i != files.end(); ++i, ++num) {
+  for (QStringList::ConstIterator i = files.constBegin(); i != files.constEnd(); \
++i, ++num) {  KProcess proc;
     proc << "convert";
     KUrl url(*i);
--- trunk/playground/utils/workflow/src/ui/commandport.cpp #1029854:1029855
@@ -83,7 +83,7 @@
     if (params.count() <= 1)
       return;
 
-    for (Command::ParameterList::ConstIterator it = params.begin(); it != \
params.end(); ++it) { +    for (Command::ParameterList::ConstIterator it = \
params.constBegin(); it != params.constEnd(); ++it) {  menu.addAction(new \
SlotAction(&menu, *it));  }
   } else {
@@ -91,7 +91,7 @@
     if (results.count() <= 1)
       return;
 
-    for (Command::ResultList::ConstIterator it = results.begin(); it != \
results.end(); ++it) { +    for (Command::ResultList::ConstIterator it = \
results.constBegin(); it != results.constEnd(); ++it) {  menu.addAction(new \
SlotAction(&menu, *it));  }
   }
--- trunk/playground/utils/workflow/src/ui/helpwidget.cpp #1029854:1029855
@@ -73,13 +73,13 @@
   typedef CommandDescription::ResultDescList Results;
 
   Params params = desc->parameters();
-  for (Params::ConstIterator i = params.begin(); i != params.end(); ++i) {
+  for (Params::ConstIterator i = params.constBegin(); i != params.constEnd(); ++i) {
     if (!(*i)->description().isEmpty())
       paramlist += slottemplate.arg((*i)->name(), (*i)->description());
   }
 
   Results results = desc->results();
-  for (Results::ConstIterator i = results.begin(); i != results.end(); ++i) {
+  for (Results::ConstIterator i = results.constBegin(); i != results.constEnd(); \
++i) {  if (!(*i)->description().isEmpty())
       resultlist += slottemplate.arg((*i)->name(), (*i)->description());
   }
--- trunk/playground/utils/workflow/src/ui/selectworkflowdialog.cpp #1029854:1029855
@@ -50,7 +50,7 @@
   : FileListModel(parent)
 {
   KStandardDirs stdDirs;
-  QStringList dirs = stdDirs.findDirs("data", "workflow/apps/" + appid);
+  const QStringList dirs = stdDirs.findDirs("data", "workflow/apps/" + appid);
 
   for (QStringList::ConstIterator i = dirs.begin(); i != dirs.end(); ++i) {
     QDir dir(*i, "*.workflow");
--- trunk/playground/utils/workflow/src/ui/view.cpp #1029854:1029855
@@ -209,7 +209,7 @@
   if (!cell)
     return false;
 
-  for (AreaList::ConstIterator i = cellAreas.begin(); i != cellAreas.end(); ++i) {
+  for (AreaList::ConstIterator i = cellAreas.constBegin(); i != \
cellAreas.constEnd(); ++i) {  if ((*i).rect().contains(position)) {
       *cell = *i;
       return true;
@@ -224,7 +224,7 @@
   if (!cell)
     return false;
 
-  for (AreaList::ConstIterator i = cellAreas.begin(); i != cellAreas.end(); ++i) {
+  for (AreaList::ConstIterator i = cellAreas.constBegin(); i != \
cellAreas.constEnd(); ++i) {  if ((*i).row() == row) {
       *cell = *i;
       return true;
@@ -327,7 +327,7 @@
 
 void View::Private::slotSelectionChanged(CommandWidget* /*widget*/)
 {
-  
+
 }
 
 // View implementation
@@ -646,7 +646,7 @@
     p->setPen(Qt::blue);
     p->setBrush(Qt::blue);
 
-    for (AreaList::ConstIterator i = d->cellAreas.begin(); i != d->cellAreas.end(); \
++i) { +    for (AreaList::ConstIterator i = d->cellAreas.constBegin(); i != \
d->cellAreas.constEnd(); ++i) {  CommandWidget* w = d->commandWidget((*i).row());
       if (w && w->isSelected()) {
         p->drawRect((*i).rect());
@@ -816,7 +816,7 @@
     swap(start, end);
   }
 
-  for (AreaList::ConstIterator i = d->cellAreas.begin(); i != d->cellAreas.end(); \
++i) { +  for (AreaList::ConstIterator i = d->cellAreas.constBegin(); i != \
d->cellAreas.constEnd(); ++i) {  if (!inside && start.isEqualTo((*i).row())) {
       inside = true;
     }
--- trunk/playground/utils/workflow/src/ui/widgets/imageviewer.cpp #1029854:1029855
@@ -156,10 +156,10 @@
 //   p->scale(d->zoom, d->zoom);
 //   QMatrix invscale;
 //   invscale.scale(1.0/d->zoom, 1.0/d->zoom);
-// 
+//
 //   QRect exposedRect = invscale.mapRect(QRect(cx, cy, cw, ch));
 //   exposedRect.adjust(-1, -1, 1, 1);
-// 
+//
 //   p->drawPixmap(QPoint(exposedRect.x(), exposedRect.y()), d->pixmap, \
exposedRect);  
   QPainter p(this);
@@ -247,7 +247,7 @@
 {
   KUrl::List urls = KUrl::List::fromMimeData(e->mimeData());
   if (!urls.isEmpty()) {
-    for (KUrl::List::ConstIterator i = urls.begin(); i != urls.end(); ++i) {
+    for (KUrl::List::ConstIterator i = urls.constBegin(); i != urls.constEnd(); ++i) \
{  QString path = (*i).path();
       if (!d->autoLoad || (d->autoLoad && setImage(path))) {
         emit dropped(path);


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