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

List:       kde-commits
Subject:    KDE/kdepim/calendarviews/eventviews/agenda
From:       Sergio Luis Martins <iamsergio () gmail ! com>
Date:       2010-12-06 20:10:17
Message-ID: 20101206201017.8D26CAC8A4 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1204341 by smartins:

"items" is a very ambiguous word in this context.

s/items/agendaItems and s/items/akonadiItems.

 M  +11 -11    agenda.cpp  


--- trunk/KDE/kdepim/calendarviews/eventviews/agenda/agenda.cpp #1204340:1204341
@@ -1891,26 +1891,26 @@
 
 QList<AgendaItem::QPtr> Agenda::agendaItems( const Akonadi::Item &aitem ) const
 {
-  QList<AgendaItem::QPtr> items;
-  Q_FOREACH ( AgendaItem::QPtr const item, d->mItems ) {
-    if ( item &&
-         item->incidence().id() == aitem.id() &&
-         item->incidence().parentCollection().id() == aitem.parentCollection().id() ) {
-      items.push_back( item );
+  QList<AgendaItem::QPtr> agendaItems;
+  Q_FOREACH ( AgendaItem::QPtr const agendaItem, d->mItems ) {
+    if ( agendaItem &&
+         agendaItem->incidence().id() == aitem.id() &&
+         agendaItem->incidence().parentCollection().id() == aitem.parentCollection().id() ) {
+      agendaItems.push_back( agendaItem );
     }
   }
-  return items;
+  return agendaItems;
 }
 
-void Agenda::removeIncidence( const Akonadi::Item &incidence )
+void Agenda::removeIncidence( const Akonadi::Item &akonadiItem )
 {
   // First find all items to be deleted and store them
   // in its own list. Otherwise removeAgendaItem will reset
   // the current position in the iterator-loop and mess the logic up.
-  const QList<AgendaItem::QPtr> itemsToRemove = agendaItems( incidence );
+  const QList<AgendaItem::QPtr> agendaItemsToRemove = agendaItems( akonadiItem );
 
-  foreach ( AgendaItem::QPtr  const item, itemsToRemove ) {
-    removeAgendaItem( item );
+  foreach ( AgendaItem::QPtr  const agendaItem, agendaItemsToRemove ) {
+    removeAgendaItem( agendaItem );
   }
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]