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

List:       kde-commits
Subject:    KDE/kdepim/kontact/plugins
From:       Laurent Montel <montel () kde ! org>
Date:       2008-11-19 12:53:31
Message-ID: 1227099211.036397.31768.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 886510 by mlaurent:

fix iterator


 M  +3 -3      korganizer/summaryeventinfo.cpp  
 M  +7 -7      specialdates/sdsummarywidget.cpp  
 M  +6 -6      summary/summaryview_part.cpp  


--- trunk/KDE/kdepim/kontact/plugins/korganizer/summaryeventinfo.cpp #886509:886510
@@ -101,7 +101,7 @@
   KCal::Event *ev;
 
   KCal::Event::List events_orig = calendar->events( date, calendar->timeSpec() );
-  KCal::Event::List::ConstIterator it = events_orig.begin();
+  KCal::Event::List::ConstIterator it = events_orig.constBegin();
 
   KCal::Event::List events;
   events.setAutoDelete( true );
@@ -111,7 +111,7 @@
 
   // prevent implicitely sharing while finding recurring events
   // replacing the QDate with the currentDate
-  for ( ; it != events_orig.end(); ++it ) {
+  for ( ; it != events_orig.constEnd(); ++it ) {
     ev = (*it)->clone();
     if ( ev->recursOn( date, calendar->timeSpec() ) ) {
       qdt = ev->dtStart();
@@ -134,7 +134,7 @@
 
   List eventInfoList;
 
-  for ( it=events.begin(); it != events.end(); ++it ) {
+  for ( it=events.constBegin(); it != events.constEnd(); ++it ) {
     ev = *it;
     int daysTo = -1;
 
--- trunk/KDE/kdepim/kontact/plugins/specialdates/sdsummarywidget.cpp #886509:886510
@@ -289,12 +289,12 @@
                                                   KCal::SortDirectionAscending );
     KCal::Event *ev;
     KCal::Event::List::ConstIterator it;
-    for ( it = events.begin(); it != events.end(); ++it ) {
+    for ( it = events.constBegin(); it != events.constEnd(); ++it ) {
       ev = *it;
       if ( !ev->categoriesStr().isEmpty() ) {
         QStringList::ConstIterator it2;
         QStringList c = ev->categories();
-        for ( it2 = c.begin(); it2 != c.end(); ++it2 ) {
+        for ( it2 = c.constBegin(); it2 != c.constEnd(); ++it2 ) {
 
           // Append Birthday Event?
           if ( mShowBirthdaysFromCal && ( ( *it2 ).toUpper() == i18n( "BIRTHDAY" ) ) ) {
@@ -375,8 +375,8 @@
             dt<=QDate::currentDate().addDays( mDaysAhead - 1 );
             dt=dt.addDays(1) ) {
         QList<LibKHolidays::KHoliday> holidays = mHolidays->getHolidays( dt );
-        QList<LibKHolidays::KHoliday>::ConstIterator it = holidays.begin();
-        for ( ; it != holidays.end(); ++it ) {
+        QList<LibKHolidays::KHoliday>::ConstIterator it = holidays.constBegin();
+        for ( ; it != holidays.constEnd(); ++it ) {
           SDEntry entry;
           entry.type = IncidenceTypeEvent;
           entry.category = ( (*it).Category == LibKHolidays::KHolidays::HOLIDAY )?
@@ -566,8 +566,8 @@
     mLabels.append( label );
   }
 
-  QList<QLabel*>::iterator lit;
-  for ( lit = mLabels.begin(); lit != mLabels.end(); ++lit ) {
+  QList<QLabel*>::ConstIterator lit;
+  for ( lit = mLabels.constBegin(); lit != mLabels.constEnd(); ++lit ) {
     (*lit)->show();
   }
 
@@ -683,7 +683,7 @@
 
   KCal::Event::List events = cal->rawEventsForDate( date );
   KCal::Event::List::ConstIterator it;
-  for ( it = events.begin(); it != events.end(); ++it ) {
+  for ( it = events.constBegin(); it != events.constEnd(); ++it ) {
     if ( (*it)->summary() == summary ) {
       return true;
     }
--- trunk/KDE/kdepim/kontact/plugins/summary/summaryview_part.cpp #886509:886510
@@ -153,8 +153,8 @@
   QStringList loadedSummaries;
 
   QList<Kontact::Plugin*> plugins = mCore->pluginList();
-  QList<Kontact::Plugin*>::ConstIterator end = plugins.end();
-  QList<Kontact::Plugin*>::ConstIterator it = plugins.begin();
+  QList<Kontact::Plugin*>::ConstIterator end = plugins.constEnd();
+  QList<Kontact::Plugin*>::ConstIterator it = plugins.constBegin();
   for ( ; it != end; ++it ) {
     Kontact::Plugin *plugin = *it;
     if ( !activeSummaries.contains( plugin->identifier() ) ) {
@@ -410,7 +410,7 @@
            this, SLOT(updateWidgets()) );
 
   QStringList::ConstIterator strIt;
-  for ( strIt = modules.begin(); strIt != modules.end(); ++strIt ) {
+  for ( strIt = modules.constBegin(); strIt != modules.constEnd(); ++strIt ) {
     dlg.addModule( *strIt );
   }
 
@@ -422,10 +422,10 @@
   QStringList modules;
 
   QMap<QString, Kontact::Summary*>::ConstIterator it;
-  for ( it = mSummaries.begin(); it != mSummaries.end(); ++it ) {
+  for ( it = mSummaries.constBegin(); it != mSummaries.constEnd(); ++it ) {
     QStringList cm = it.value()->configModules();
     QStringList::ConstIterator strIt;
-    for ( strIt = cm.begin(); strIt != cm.end(); ++strIt ) {
+    for ( strIt = cm.constBegin(); strIt != cm.constEnd(); ++strIt ) {
       if ( !(*strIt).isEmpty() && !modules.contains( *strIt ) ) {
         modules.append( *strIt );
       }
@@ -520,7 +520,7 @@
 QString SummaryViewPart::widgetName( QWidget *widget ) const
 {
   QMap<QString, Kontact::Summary*>::ConstIterator it;
-  for ( it = mSummaries.begin(); it != mSummaries.end(); ++it ) {
+  for ( it = mSummaries.constBegin(); it != mSummaries.constEnd(); ++it ) {
     if ( it.value() == widget ) {
       return it.key();
     }
[prev in list] [next in list] [prev in thread] [next in thread]