From 470b55c9cb8692705bc3e01c5bec8cd233a9bca2 Mon Sep 17 00:00:00 2001
From: Montel Laurent <montel@kde.org>
Date: Thu, 10 Nov 2011 12:23:50 +0100
Subject: [PATCH] Optimization. Clean up includes

---
 attachmentcontroller.cpp | 6 ------
 kmmainwidget.cpp         | 3 ++-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/attachmentcontroller.cpp b/attachmentcontroller.cpp
index a11b3fdc6..59b9b32cb 100644
--- a/attachmentcontroller.cpp
+++ b/attachmentcontroller.cpp
@@ -36,15 +36,9 @@
 #include <kabc/addressee.h>
 #include <kdebug.h>
 #include <libkleo/kleo/cryptobackendfactory.h>
-#include <libkleo/ui/keyselectiondialog.h>
 
 #include <messagecomposer/attachmentmodel.h>
-#include <messagecore/attachmentcompressjob.h>
-#include <messagecore/attachmentfrommimecontentjob.h>
-#include <messagecore/attachmentfromurljob.h>
-#include <messagecore/attachmentpropertiesdialog.h>
 #include <messagecore/attachmentpart.h>
-#include <messageviewer/editorwatcher.h>
 
 using namespace KMail;
 using namespace KPIM;
diff --git a/kmmainwidget.cpp b/kmmainwidget.cpp
index 1ed2833d2..300bce582 100644
--- a/kmmainwidget.cpp
+++ b/kmmainwidget.cpp
@@ -404,7 +404,8 @@ void KMMainWidget::showNotifications()
 
   Akonadi::Collection::List collections;
   QMap<Akonadi::Collection::Id, int>::const_iterator it = mCheckMail.constBegin();
-  while ( it != mCheckMail.constEnd() ) {
+  QMap<Akonadi::Collection::Id, int>::const_iterator end = mCheckMail.constEnd();
+  while ( it != end ) {
     Akonadi::Collection collection( it.key() );
     if ( it.value() != 0 )
       collections << collection;