File 4_5_BRANCH.diff of Package kdepimlibs4

Overview Repositories Revisions Requests Users Attributes Meta

File 4_5_BRANCH.diff of Package kdepimlibs4 (Revision fea019f988777a01e9d227e47e72468a)

Currently displaying revision fea019f988777a01e9d227e47e72468a , Show latest

package: kdepimlibs-4.4.93svn1149349.tar.bz2
kdemod: kdepimlibs
--- BRANCH_STATUS
+++ BRANCH_STATUS
@@ -0,0 +1,2 @@
+current HEAD: 1150993
+svn di between //branches/KDE/4.5/kdepimlibs@1149349 and //branches/KDE/4.5/kdepimlibs
--- kholidays/CMakeLists.txt
+++ kholidays/CMakeLists.txt
@@ -19,10 +19,10 @@
   holidayregion.cpp
   lunarphase.cpp
   zodiac.cpp
+  parsers/plan2/holidayscannerplan.cpp
   parsers/holidayparserdriver.cpp
   parsers/plan2/holidayparserdriverplan.cpp
   parsers/plan2/holidayparserplan.cpp
-  parsers/plan2/holidayscannerplan.cpp
 )
 
 kde4_add_library(kholidays SHARED ${kholidays_LIB_SRCS})
--- mailtransport/filteractionjob.h
+++ mailtransport/filteractionjob.h
@@ -1,178 +0,0 @@
-/*
-    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#ifndef AKONADI_FILTERACTIONJOB_H
-#define AKONADI_FILTERACTIONJOB_H
-
-#include <mailtransport/mailtransport_export.h>
-
-#include <akonadi/item.h>
-#include <akonadi/transactionsequence.h>
-
-namespace Akonadi {
-
-class Collection;
-class ItemFetchScope;
-class Job;
-
-/**
- * @short Base class for a filter/action for FilterActionJob.
- *
- * Abstract class defining an interface for a filter and an action for
- * FilterActionJob.  The virtual methods must be implemented in subclasses.
- *
- * @code
- * class ClearErrorAction : public Akonadi::FilterAction
- * {
- *   public:
- *     // reimpl
- *     virtual Akonadi::ItemFetchScope fetchScope() const
- *     {
- *       ItemFetchScope scope;
- *       scope.fetchFullPayload( false );
- *       scope.fetchAttribute<ErrorAttribute>();
- *       return scope;
- *     }
- *
- *     virtual bool itemAccepted( const Akonadi::Item &item ) const
- *     {
- *       return item.hasAttribute<ErrorAttribute>();
- *     }
- *
- *     virtual Akonadi::Job *itemAction( const Akonadi::Item &item ) const
- *     {
- *       Item cp = item;
- *       cp.removeAttribute<ErrorAttribute>();
- *       return new ItemModifyJob( cp );
- *     }
- * };
- * @endcode
- *
- * @see FilterActionJob
- *
- * @author Constantin Berzan <exit3219@gmail.com>
- * @since 4.4
- */
-class MAILTRANSPORT_EXPORT FilterAction
-{
-  public:
-    /**
-     * Destroys this filter action.
-     *
-     * A FilterActionJob will delete its FilterAction automatically.
-     */
-    virtual ~FilterAction();
-
-    /**
-     * Returns an ItemFetchScope to use if the FilterActionJob needs
-     * to fetch the items from a collection.
-     *
-     * @note The items are not fetched unless FilterActionJob is
-     *       constructed with a Collection parameter.
-     */
-    virtual Akonadi::ItemFetchScope fetchScope() const = 0;
-
-    /**
-     * Returns @c true if the @p item is accepted by the filter and should be
-     * acted upon by the FilterActionJob.
-     */
-    virtual bool itemAccepted( const Akonadi::Item &item ) const = 0;
-
-    /**
-     * Returns a job to act on the @p item.
-     * The FilterActionJob will finish when all such jobs are finished.
-     */
-    virtual Akonadi::Job *itemAction( const Akonadi::Item &item ) const = 0;
-};
-
-/**
- * @short Job to filter and apply an action on a set of items.
- *
- * This jobs filters through a set of items, and applies an action to the
- * items which are accepted by the filter.  The filter and action
- * are provided by a functor class derived from FilterAction.
- *
- * For example, a MarkAsRead action/filter may be used to mark all messages
- * in a folder as read.
- *
- * @code
- * FilterActionJob *mjob = new FilterActionJob( LocalFolders::self()->outbox(),
- *                                              new ClearErrorAction, this );
- * connect( mjob, SIGNAL( result( KJob* ) ), this, SLOT( massModifyResult( KJob* ) ) );
- * @endcode
- *
- * @see FilterAction
- *
- * @author Constantin Berzan <exit3219@gmail.com>
- * @since 4.4
- */
-class MAILTRANSPORT_EXPORT FilterActionJob : public TransactionSequence
-{
-  Q_OBJECT
-
-  public:
-    /**
-     * Creates a filter action job to act on a single item.
-     *
-     * @param item The item to act on. The item is not re-fetched.
-     * @param functor The FilterAction to use.
-     * @param parent The parent object.
-     */
-    FilterActionJob( const Item &item, FilterAction *functor, QObject *parent = 0 );
-
-    /**
-     * Creates a filter action job to act on a set of items.
-     *
-     * @param items The items to act on. The items are not re-fetched.
-     * @param functor The FilterAction to use.
-     * @param parent The parent object.
-     */
-    FilterActionJob( const Item::List &items, FilterAction *functor, QObject *parent = 0 );
-
-    /**
-     * Creates a filter action job to act on items in a collection.
-     *
-     * @param collection The collection to act on.
-     *                   The items of the collection are fetched using functor->fetchScope().
-     * @param functor The FilterAction to use.
-     * @param parent The parent object.
-     */
-    FilterActionJob( const Collection &collection, FilterAction *functor, QObject *parent = 0 );
-
-    /**
-     * Destroys the filter action job.
-     */
-    ~FilterActionJob();
-
-  protected:
-    /* reimpl */
-    virtual void doStart();
-
-  private:
-    //@cond PRIVATE
-    class Private;
-    Private *const d;
-
-    Q_PRIVATE_SLOT( d, void fetchResult( KJob* ) )
-    //@endcond
-};
-
-} // namespace Akonadi
-
-#endif // AKONADI_FILTERACTIONJOB_H
--- mailtransport/filteractionjob_p.h
+++ mailtransport/filteractionjob_p.h
@@ -0,0 +1,180 @@
+/*
+    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#ifndef AKONADI_FILTERACTIONJOB_H
+#define AKONADI_FILTERACTIONJOB_H
+
+#include <mailtransport/mailtransport_export.h>
+
+#include <akonadi/item.h>
+#include <akonadi/transactionsequence.h>
+
+namespace Akonadi {
+
+class Collection;
+class ItemFetchScope;
+class Job;
+
+class FilterActionJob;
+
+/**
+ * @short Base class for a filter/action for FilterActionJob.
+ *
+ * Abstract class defining an interface for a filter and an action for
+ * FilterActionJob.  The virtual methods must be implemented in subclasses.
+ *
+ * @code
+ * class ClearErrorAction : public Akonadi::FilterAction
+ * {
+ *   public:
+ *     // reimpl
+ *     virtual Akonadi::ItemFetchScope fetchScope() const
+ *     {
+ *       ItemFetchScope scope;
+ *       scope.fetchFullPayload( false );
+ *       scope.fetchAttribute<ErrorAttribute>();
+ *       return scope;
+ *     }
+ *
+ *     virtual bool itemAccepted( const Akonadi::Item &item ) const
+ *     {
+ *       return item.hasAttribute<ErrorAttribute>();
+ *     }
+ *
+ *     virtual Akonadi::Job *itemAction( const Akonadi::Item &item, Akonadi::FilterActionJob *parent ) const
+ *     {
+ *       Item cp = item;
+ *       cp.removeAttribute<ErrorAttribute>();
+ *       return new ItemModifyJob( cp, parent );
+ *     }
+ * };
+ * @endcode
+ *
+ * @see FilterActionJob
+ *
+ * @author Constantin Berzan <exit3219@gmail.com>
+ * @since 4.4
+ */
+class MAILTRANSPORT_EXPORT FilterAction
+{
+  public:
+    /**
+     * Destroys this filter action.
+     *
+     * A FilterActionJob will delete its FilterAction automatically.
+     */
+    virtual ~FilterAction();
+
+    /**
+     * Returns an ItemFetchScope to use if the FilterActionJob needs
+     * to fetch the items from a collection.
+     *
+     * @note The items are not fetched unless FilterActionJob is
+     *       constructed with a Collection parameter.
+     */
+    virtual Akonadi::ItemFetchScope fetchScope() const = 0;
+
+    /**
+     * Returns @c true if the @p item is accepted by the filter and should be
+     * acted upon by the FilterActionJob.
+     */
+    virtual bool itemAccepted( const Akonadi::Item &item ) const = 0;
+
+    /**
+     * Returns a job to act on the @p item.
+     * The FilterActionJob will finish when all such jobs are finished.
+     */
+    virtual Akonadi::Job *itemAction( const Akonadi::Item &item, Akonadi::FilterActionJob *parent ) const = 0;
+};
+
+/**
+ * @short Job to filter and apply an action on a set of items.
+ *
+ * This jobs filters through a set of items, and applies an action to the
+ * items which are accepted by the filter.  The filter and action
+ * are provided by a functor class derived from FilterAction.
+ *
+ * For example, a MarkAsRead action/filter may be used to mark all messages
+ * in a folder as read.
+ *
+ * @code
+ * FilterActionJob *mjob = new FilterActionJob( LocalFolders::self()->outbox(),
+ *                                              new ClearErrorAction, this );
+ * connect( mjob, SIGNAL( result( KJob* ) ), this, SLOT( massModifyResult( KJob* ) ) );
+ * @endcode
+ *
+ * @see FilterAction
+ *
+ * @author Constantin Berzan <exit3219@gmail.com>
+ * @since 4.4
+ */
+class MAILTRANSPORT_EXPORT FilterActionJob : public TransactionSequence
+{
+  Q_OBJECT
+
+  public:
+    /**
+     * Creates a filter action job to act on a single item.
+     *
+     * @param item The item to act on. The item is not re-fetched.
+     * @param functor The FilterAction to use.
+     * @param parent The parent object.
+     */
+    FilterActionJob( const Item &item, FilterAction *functor, QObject *parent = 0 );
+
+    /**
+     * Creates a filter action job to act on a set of items.
+     *
+     * @param items The items to act on. The items are not re-fetched.
+     * @param functor The FilterAction to use.
+     * @param parent The parent object.
+     */
+    FilterActionJob( const Item::List &items, FilterAction *functor, QObject *parent = 0 );
+
+    /**
+     * Creates a filter action job to act on items in a collection.
+     *
+     * @param collection The collection to act on.
+     *                   The items of the collection are fetched using functor->fetchScope().
+     * @param functor The FilterAction to use.
+     * @param parent The parent object.
+     */
+    FilterActionJob( const Collection &collection, FilterAction *functor, QObject *parent = 0 );
+
+    /**
+     * Destroys the filter action job.
+     */
+    ~FilterActionJob();
+
+  protected:
+    /* reimpl */
+    virtual void doStart();
+
+  private:
+    //@cond PRIVATE
+    class Private;
+    Private *const d;
+
+    Q_PRIVATE_SLOT( d, void fetchResult( KJob* ) )
+    //@endcond
+};
+
+} // namespace Akonadi
+
+#endif // AKONADI_FILTERACTIONJOB_H

Property changes on: mailtransport/filteractionjob_p.h
___________________________________________________________________
Added: svn:mergeinfo

--- mailtransport/outboxactions.cpp
+++ mailtransport/outboxactions.cpp
@@ -59,11 +59,11 @@
   return item.attribute<DispatchModeAttribute>()->dispatchMode() == DispatchModeAttribute::Manual;
 }
 
-Job *SendQueuedAction::itemAction( const Item &item ) const
+Job *SendQueuedAction::itemAction( const Item &item, FilterActionJob *parent ) const
 {
   Item cp = item;
   cp.addAttribute( new DispatchModeAttribute ); // defaults to Automatic
-  return new ItemModifyJob( cp );
+  return new ItemModifyJob( cp, parent );
 }
 
 class MailTransport::ClearErrorAction::Private
@@ -93,13 +93,13 @@
   return item.hasAttribute<ErrorAttribute>();
 }
 
-Job *ClearErrorAction::itemAction( const Item &item ) const
+Job *ClearErrorAction::itemAction( const Item &item, FilterActionJob *parent ) const
 {
   Item cp = item;
   cp.removeAttribute<ErrorAttribute>();
   cp.clearFlag( "error" );
   cp.setFlag( "queued" );
-  return new ItemModifyJob( cp );
+  return new ItemModifyJob( cp, parent );
 }
 
 class MailTransport::DispatchManualTransportAction::Private
@@ -140,12 +140,12 @@
   return item.attribute<DispatchModeAttribute>()->dispatchMode() == DispatchModeAttribute::Manual;
 }
 
-Job *DispatchManualTransportAction::itemAction( const Item &item ) const
+Job *DispatchManualTransportAction::itemAction( const Item &item, FilterActionJob *parent ) const
 {
   Item cp = item;
   cp.attribute<TransportAttribute>()->setTransportId( mTransportId );
   cp.removeAttribute<DispatchModeAttribute>();
   cp.addAttribute( new DispatchModeAttribute ); // defaults to Automatic
   cp.setFlag( "queued" );
-  return new ItemModifyJob( cp );
+  return new ItemModifyJob( cp, parent );
 }
--- mailtransport/filteractionjob.cpp
+++ mailtransport/filteractionjob.cpp
@@ -17,7 +17,7 @@
     02110-1301, USA.
 */
 
-#include "filteractionjob.h"
+#include "filteractionjob_p.h"
 
 #include <akonadi/collection.h>
 #include <akonadi/itemfetchjob.h>
@@ -72,17 +72,16 @@
   kDebug() << "Traversing" << items.count() << "items.";
   foreach ( const Item &item, items ) {
     if ( functor->itemAccepted( item ) ) {
-      q->addSubjob( functor->itemAction( item ) );
+      functor->itemAction( item, q );
       kDebug() << "Added subjob for item" << item.id();
     }
   }
   if ( q->subjobs().isEmpty() ) {
-    kDebug() << "No subjobs; I am done.";
-    q->emitResult();
+    kDebug() << "No subjobs; I am done";
   } else {
-    kDebug() << "Have subjobs; calling commit().";
-    q->commit();
+    kDebug() << "Have subjobs; Done when last of them is";
   }
+  q->commit();
 }
 
 FilterAction::~FilterAction()
@@ -131,4 +130,4 @@
   }
 }
 
-#include "filteractionjob.moc"
+#include "filteractionjob_p.moc"
--- mailtransport/tests/clearerror.cpp
+++ mailtransport/tests/clearerror.cpp
@@ -26,7 +26,7 @@
 
 #include <akonadi/collection.h>
 #include <akonadi/control.h>
-#include <mailtransport/filteractionjob.h>
+#include <mailtransport/filteractionjob_p.h>
 #include <mailtransport/dispatcherinterface.h>
 #include <akonadi/kmime/specialmailcollections.h>
 #include <akonadi/kmime/specialmailcollectionsrequestjob.h>
--- mailtransport/tests/sendqueued.cpp
+++ mailtransport/tests/sendqueued.cpp
@@ -26,7 +26,7 @@
 
 #include <akonadi/collection.h>
 #include <akonadi/control.h>
-#include <mailtransport/filteractionjob.h>
+#include <mailtransport/filteractionjob_p.h>
 #include <mailtransport/dispatcherinterface.h>
 #include <akonadi/kmime/specialmailcollections.h>
 #include <akonadi/kmime/specialmailcollectionsrequestjob.h>
--- mailtransport/tests/filteractiontest.cpp
+++ mailtransport/tests/filteractiontest.cpp
@@ -28,7 +28,7 @@
 #include <akonadi/itemfetchscope.h>
 #include <akonadi/itemmodifyjob.h>
 #include <akonadi/qtest_akonadi.h>
-#include <mailtransport/filteractionjob.h>
+#include <mailtransport/filteractionjob_p.h>
 
 using namespace Akonadi;
 
@@ -56,13 +56,13 @@
       return ( item.attribute<TestAttribute>()->data == acceptable );
     }
 
-    virtual Akonadi::Job *itemAction( const Akonadi::Item &item ) const
+    virtual Akonadi::Job *itemAction( const Akonadi::Item &item, FilterActionJob *parent ) const
     {
       Item cp( item );
       TestAttribute *newa = new TestAttribute;
       newa->data = modified;
       cp.addAttribute( newa );
-      return new ItemModifyJob( cp );
+      return new ItemModifyJob( cp, parent );
     }
 };
 
--- mailtransport/dispatcherinterface.cpp
+++ mailtransport/dispatcherinterface.cpp
@@ -28,7 +28,6 @@
 
 #include <akonadi/agentmanager.h>
 #include <akonadi/collection.h>
-#include "filteractionjob.h"
 #include <akonadi/kmime/specialmailcollections.h>
 #include "transportattribute.h"
 
--- mailtransport/outboxactions_p.h
+++ mailtransport/outboxactions_p.h
@@ -21,7 +21,7 @@
 #define MAILTRANSPORT_OUTBOXACTIONS_P_H
 
 #include <mailtransport/mailtransport_export.h>
-#include <mailtransport/filteractionjob.h>
+#include <mailtransport/filteractionjob_p.h>
 #include <mailtransport/transportattribute.h>
 
 #include <akonadi/itemfetchscope.h>
@@ -56,7 +56,7 @@
     virtual bool itemAccepted( const Akonadi::Item &item ) const;
 
     /* reimpl */
-    virtual Akonadi::Job *itemAction( const Akonadi::Item &item ) const;
+    virtual Akonadi::Job *itemAction( const Akonadi::Item &item, Akonadi::FilterActionJob *parent ) const;
 
   private:
     class Private;
@@ -90,7 +90,7 @@
     virtual bool itemAccepted( const Akonadi::Item &item ) const;
 
     /* reimpl */
-    virtual Akonadi::Job *itemAction( const Akonadi::Item &item ) const;
+    virtual Akonadi::Job *itemAction( const Akonadi::Item &item, Akonadi::FilterActionJob *parent ) const;
 
   private:
     class Private;
@@ -122,7 +122,7 @@
     virtual bool itemAccepted( const Akonadi::Item &item ) const;
 
     /* reimpl */
-    virtual Akonadi::Job *itemAction( const Akonadi::Item &item ) const;
+    virtual Akonadi::Job *itemAction( const Akonadi::Item &item, Akonadi::FilterActionJob *parent ) const;
 
   private:
     class Private;
--- akonadi/kdescendantsproxymodel2.cpp
+++ akonadi/kdescendantsproxymodel2.cpp
@@ -1,862 +0,0 @@
-/*
-    Copyright (c) 2009 Stephen Kelly <steveire@gmail.com>
-    Copyright (C) 2010 Klarälvdalens Datakonsult AB,
-        a KDAB Group company, info@kdab.net,
-        author Stephen Kelly <stephen@kdab.com>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#include "kdescendantsproxymodel_p.h"
-
-#include <QtCore/QStringList>
-#include <QtCore/QTimer>
-
-#include "kdebug.h"
-
-#define KDO(object) kDebug() << #object << object
-
-#include "kbihash_p.h"
-
-typedef KHash2Map<QPersistentModelIndex, int> Mapping;
-
-class KDescendantsProxyModelPrivate
-{
-  KDescendantsProxyModelPrivate(KDescendantsProxyModel * qq)
-    : q_ptr(qq),
-      m_rowCount(0),
-      m_ignoreNextLayoutAboutToBeChanged(false),
-      m_ignoreNextLayoutChanged(false),
-      m_relayouting(false),
-      m_displayAncestorData( false ),
-      m_ancestorSeparator( QLatin1String( " / " ) )
-  {
-  }
-
-  Q_DECLARE_PUBLIC(KDescendantsProxyModel)
-  KDescendantsProxyModel * const q_ptr;
-
-  mutable QVector<QPersistentModelIndex> m_pendingParents;
-
-  void scheduleProcessPendingParents() const;
-  void processPendingParents();
-
-  void synchronousMappingRefresh();
-
-  void updateInternalIndexes(int start, int offset);
-
-  void resetInternalData();
-
-  void sourceRowsAboutToBeInserted(const QModelIndex &, int, int);
-  void sourceRowsInserted(const QModelIndex &, int, int);
-  void sourceRowsAboutToBeRemoved(const QModelIndex &, int, int);
-  void sourceRowsRemoved(const QModelIndex &, int, int);
-  void sourceRowsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int);
-  void sourceRowsMoved(const QModelIndex &, int, int, const QModelIndex &, int);
-  void sourceModelAboutToBeReset();
-  void sourceModelReset();
-  void sourceLayoutAboutToBeChanged();
-  void sourceLayoutChanged();
-  void sourceDataChanged(const QModelIndex &, const QModelIndex &);
-  void sourceModelDestroyed();
-
-  Mapping m_mapping;
-  int m_rowCount;
-  QPair<int, int> m_removePair;
-  QPair<int, int> m_insertPair;
-
-  bool m_ignoreNextLayoutAboutToBeChanged;
-  bool m_ignoreNextLayoutChanged;
-  bool m_relayouting;
-
-  bool m_displayAncestorData;
-  QString m_ancestorSeparator;
-
-  QList<QPersistentModelIndex> m_layoutChangePersistentIndexes;
-  QModelIndexList m_proxyIndexes;
-};
-
-void KDescendantsProxyModelPrivate::resetInternalData()
-{
-  m_rowCount = 0;
-  m_mapping.clear();
-  m_layoutChangePersistentIndexes.clear();
-  m_proxyIndexes.clear();
-}
-
-void KDescendantsProxyModelPrivate::synchronousMappingRefresh()
-{
-  m_rowCount = 0;
-  m_mapping.clear();
-  m_pendingParents.clear();
-
-  m_pendingParents.append(QModelIndex());
-
-  m_relayouting = true;
-  while (!m_pendingParents.isEmpty())
-  {
-    processPendingParents();
-  }
-  m_relayouting = false;
-}
-
-void KDescendantsProxyModelPrivate::scheduleProcessPendingParents() const
-{
-  Q_Q(const KDescendantsProxyModel);
-  const_cast<KDescendantsProxyModelPrivate*>(this)->processPendingParents();
-}
-
-void KDescendantsProxyModelPrivate::processPendingParents()
-{
-  Q_Q(KDescendantsProxyModel);
-  const QVector<QPersistentModelIndex>::iterator begin = m_pendingParents.begin();
-  QVector<QPersistentModelIndex>::iterator it = begin;
-
-  // Process chunkSize elements per invokation.
-  static const int chunkSize = 30;
-
-  const QVector<QPersistentModelIndex>::iterator end =
-          /* (m_pendingParents.size() > chunkSize) ? begin + chunkSize : */ m_pendingParents.end();
-
-  QVector<QPersistentModelIndex> newPendingParents;
-
-  while (it != end && it != m_pendingParents.end()) {
-    const QModelIndex sourceParent = *it;
-    if (!sourceParent.isValid() && m_rowCount > 0)
-    {
-      // It was removed from the source model before it was inserted.
-      it = m_pendingParents.erase(it);
-      continue;
-    }
-    const int rowCount = q->sourceModel()->rowCount(sourceParent);
-
-    Q_ASSERT(rowCount > 0);
-    const QPersistentModelIndex sourceIndex = q->sourceModel()->index(rowCount - 1, 0, sourceParent);
-
-    Q_ASSERT(sourceIndex.isValid());
-
-    const QModelIndex proxyParent = q->mapFromSource(sourceParent);
-
-    Q_ASSERT(sourceParent.isValid() == proxyParent.isValid());
-    const int proxyEndRow = proxyParent.row() + rowCount;
-    const int proxyStartRow = proxyEndRow - rowCount + 1;
-
-    if (!m_relayouting)
-      q->beginInsertRows(QModelIndex(), proxyStartRow, proxyEndRow);
-
-    updateInternalIndexes(proxyStartRow, rowCount);
-    m_mapping.insert(sourceIndex, proxyEndRow);
-    it = m_pendingParents.erase(it);
-    m_rowCount += rowCount;
-
-    if (!m_relayouting)
-      q->endInsertRows();
-
-    for (int sourceRow = 0; sourceRow < rowCount; ++sourceRow ) {
-      static const int column = 0;
-      const QModelIndex child = q->sourceModel()->index(sourceRow, column, sourceParent);
-      Q_ASSERT(child.isValid());
-
-      if (q->sourceModel()->hasChildren(child))
-        newPendingParents.append(child);
-    }
-  }
-  m_pendingParents += newPendingParents;
-  if (!m_pendingParents.isEmpty())
-      processPendingParents();
-//   scheduleProcessPendingParents();
-}
-
-void KDescendantsProxyModelPrivate::updateInternalIndexes(int start, int offset)
-{
-  // TODO: Make KHash2Map support key updates and do this backwards.
-  QHash<int, QPersistentModelIndex> updates;
-  {
-    Mapping::right_const_iterator it = m_mapping.rightLowerBound(start);
-    const Mapping::right_const_iterator end = m_mapping.rightEnd();
-
-    while (it != end)
-    {
-      updates.insert(it.key() + offset, *it);
-      ++it;
-    }
-  }
-
-  {
-    QHash<int, QPersistentModelIndex>::const_iterator it = updates.constBegin();
-    const QHash<int, QPersistentModelIndex>::const_iterator end = updates.constEnd();
-
-    for ( ; it != end; ++it)
-    {
-      m_mapping.insert(it.value(), it.key());
-    }
-  }
-
-}
-
-KDescendantsProxyModel::KDescendantsProxyModel(QObject *parent)
-  : QAbstractProxyModel(parent), d_ptr(new KDescendantsProxyModelPrivate(this))
-{
-}
-
-KDescendantsProxyModel::~KDescendantsProxyModel()
-{
-  delete d_ptr;
-}
-
-void KDescendantsProxyModel::setRootIndex(const QModelIndex &index)
-{
-  Q_UNUSED(index)
-}
-
-QModelIndexList KDescendantsProxyModel::match(const QModelIndex &start, int role, const QVariant &value, int hits, Qt::MatchFlags flags) const
-{
-  return QAbstractProxyModel::match(start, role, value, hits, flags);
-}
-
-void KDescendantsProxyModel::setDisplayAncestorData( bool display )
-{
-  Q_D(KDescendantsProxyModel);
-  d->m_displayAncestorData = display;
-}
-
-bool KDescendantsProxyModel::displayAncestorData() const
-{
-  Q_D(const KDescendantsProxyModel );
-  return d->m_displayAncestorData;
-}
-
-void KDescendantsProxyModel::setAncestorSeparator( const QString &separator )
-{
-  Q_D(KDescendantsProxyModel);
-  d->m_ancestorSeparator = separator;
-}
-
-QString KDescendantsProxyModel::ancestorSeparator() const
-{
-  Q_D(const KDescendantsProxyModel );
-  return d->m_ancestorSeparator;
-}
-
-
-void KDescendantsProxyModel::setSourceModel(QAbstractItemModel *_sourceModel)
-{
-  beginResetModel();
-
-  if (_sourceModel) {
-    disconnect(_sourceModel, SIGNAL(rowsAboutToBeInserted(const QModelIndex &, int, int)),
-               this, SLOT(sourceRowsAboutToBeInserted(const QModelIndex &, int, int)));
-    disconnect(_sourceModel, SIGNAL(rowsInserted(const QModelIndex &, int, int)),
-               this, SLOT(sourceRowsInserted(const QModelIndex &, int, int)));
-    disconnect(_sourceModel, SIGNAL(rowsAboutToBeRemoved(const QModelIndex &, int, int)),
-               this, SLOT(sourceRowsAboutToBeRemoved(const QModelIndex &, int, int)));
-    disconnect(_sourceModel, SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
-               this, SLOT(sourceRowsRemoved(const QModelIndex &, int, int)));
-//     disconnect(_sourceModel, SIGNAL(rowsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)),
-//             this, SLOT(sourceRowsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)));
-//     disconnect(_sourceModel, SIGNAL(rowsMoved(const QModelIndex &, int, int, const QModelIndex &, int)),
-//             this, SLOT(sourceRowsMoved(const QModelIndex &, int, int, const QModelIndex &, int)));
-    disconnect(_sourceModel, SIGNAL(modelAboutToBeReset()),
-               this, SLOT(sourceModelAboutToBeReset()));
-    disconnect(_sourceModel, SIGNAL(modelReset()),
-               this, SLOT(sourceModelReset()));
-    disconnect(_sourceModel, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)),
-               this, SLOT(sourceDataChanged(const QModelIndex &, const QModelIndex &)));
-    disconnect(_sourceModel, SIGNAL(layoutAboutToBeChanged()),
-               this, SLOT(sourceLayoutAboutToBeChanged()));
-    disconnect(_sourceModel, SIGNAL(layoutChanged()),
-               this, SLOT(sourceLayoutChanged()));
-    disconnect(_sourceModel, SIGNAL(destroyed()),
-               this, SLOT(sourceModelDestroyed()));
-  }
-
-  QAbstractProxyModel::setSourceModel(_sourceModel);
-
-  if (_sourceModel) {
-    connect(_sourceModel, SIGNAL(rowsAboutToBeInserted(const QModelIndex &, int, int)),
-            SLOT(sourceRowsAboutToBeInserted(const QModelIndex &, int, int)));
-    connect(_sourceModel, SIGNAL(rowsInserted(const QModelIndex &, int, int)),
-            SLOT(sourceRowsInserted(const QModelIndex &, int, int)));
-    connect(_sourceModel, SIGNAL(rowsAboutToBeRemoved(const QModelIndex &, int, int)),
-            SLOT(sourceRowsAboutToBeRemoved(const QModelIndex &, int, int)));
-    connect(_sourceModel, SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
-            SLOT(sourceRowsRemoved(const QModelIndex &, int, int)));
-//     connect(_sourceModel, SIGNAL(rowsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)),
-//             SLOT(sourceRowsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)));
-//     connect(_sourceModel, SIGNAL(rowsMoved(const QModelIndex &, int, int, const QModelIndex &, int)),
-//             SLOT(sourceRowsMoved(const QModelIndex &, int, int, const QModelIndex &, int)));
-    connect(_sourceModel, SIGNAL(modelAboutToBeReset()),
-            SLOT(sourceModelAboutToBeReset()));
-    connect(_sourceModel, SIGNAL(modelReset()),
-            SLOT(sourceModelReset()));
-    connect(_sourceModel, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)),
-            SLOT(sourceDataChanged(const QModelIndex &, const QModelIndex &)));
-    connect(_sourceModel, SIGNAL(layoutAboutToBeChanged()),
-            SLOT(sourceLayoutAboutToBeChanged()));
-    connect(_sourceModel, SIGNAL(layoutChanged()),
-            SLOT(sourceLayoutChanged()));
-    connect(_sourceModel, SIGNAL(destroyed()),
-            SLOT(sourceModelDestroyed()));
-  }
-
-  endResetModel();
-}
-
-QModelIndex KDescendantsProxyModel::parent(const QModelIndex &index) const
-{
-  Q_UNUSED(index)
-  return QModelIndex();
-}
-
-bool KDescendantsProxyModel::hasChildren(const QModelIndex &parent) const
-{
-  Q_D(const KDescendantsProxyModel);
-  return !(d->m_mapping.isEmpty() || parent.isValid());
-}
-
-int KDescendantsProxyModel::rowCount(const QModelIndex &parent) const
-{
-  Q_D(const KDescendantsProxyModel);
-  if (d->m_pendingParents.contains(parent) || parent.isValid() || !sourceModel())
-    return 0;
-
-  if (d->m_mapping.isEmpty() && sourceModel()->hasChildren())
-  {
-    const_cast<KDescendantsProxyModelPrivate*>(d)->synchronousMappingRefresh();
-  }
-  return d->m_rowCount;
-}
-
-QModelIndex KDescendantsProxyModel::index(int row, int column, const QModelIndex &parent) const
-{
-  if (parent.isValid())
-    return QModelIndex();
-
-  if (!hasIndex(row, column, parent))
-    return QModelIndex();
-
-  return createIndex(row, column);
-}
-
-QModelIndex KDescendantsProxyModel::mapToSource(const QModelIndex &proxyIndex) const
-{
-  Q_D(const KDescendantsProxyModel);
-  if (d->m_mapping.isEmpty() || !proxyIndex.isValid() || !sourceModel())
-    return QModelIndex();
-
-  const Mapping::right_const_iterator result = d->m_mapping.rightLowerBound(proxyIndex.row());
-  Q_ASSERT(result != d->m_mapping.rightEnd());
-
-  const int proxyLastRow = result.key();
-  const QModelIndex sourceLastChild = result.value();
-  Q_ASSERT(sourceLastChild.isValid());
-
-  // proxyLastRow is greater than proxyIndex.row().
-  // sourceLastChild is vertically below the result we're looking for
-  // and not necessarily in the correct parent.
-  // We travel up through its parent hierarchy until we are in the
-  // right parent, then return the correct sibling.
-
-  // Source:           Proxy:    Row
-  // - A               - A       - 0
-  // - B               - B       - 1
-  // - C               - C       - 2
-  // - D               - D       - 3
-  // - - E             - E       - 4
-  // - - F             - F       - 5
-  // - - G             - G       - 6
-  // - - H             - H       - 7
-  // - - I             - I       - 8
-  // - - - J           - J       - 9
-  // - - - K           - K       - 10
-  // - - - L           - L       - 11
-  // - - M             - M       - 12
-  // - - N             - N       - 13
-  // - O               - O       - 14
-
-  // Note that L, N and O are lastChildIndexes, and therefore have a mapping. If we
-  // are trying to map G from the proxy to the source, We at this point have an iterator
-  // pointing to (L -> 11). The proxy row of G is 6. (proxyIndex.row() == 6). We seek the
-  // sourceIndex which is vertically above L by the distance proxyLastRow - proxyIndex.row().
-  // In this case the verticalDistance is 5.
-
-  int verticalDistance = proxyLastRow - proxyIndex.row();
-
-  // We traverse the ancestors of L, until we can index the desired row in the source.
-
-  QModelIndex ancestor = sourceLastChild;
-  while (ancestor.isValid())
-  {
-    const int ancestorRow = ancestor.row();
-    if (verticalDistance <= ancestorRow)
-    {
-      return ancestor.sibling(ancestorRow - verticalDistance, proxyIndex.column());
-    }
-    verticalDistance -= (ancestorRow + 1);
-    ancestor = ancestor.parent();
-  }
-  Q_ASSERT(!"Didn't find target row.");
-  return QModelIndex();
-}
-
-QModelIndex KDescendantsProxyModel::mapFromSource(const QModelIndex &sourceIndex) const
-{
-  Q_D(const KDescendantsProxyModel);
-
-  if (!sourceModel())
-    return QModelIndex();
-
-  if (d->m_mapping.isEmpty())
-    return QModelIndex();
-
-
-  {
-    // TODO: Consider a parent Mapping to speed this up.
-
-    Mapping::right_const_iterator it = d->m_mapping.rightConstBegin();
-    const Mapping::right_const_iterator end = d->m_mapping.rightConstEnd();
-    const QModelIndex sourceParent = sourceIndex.parent();
-    Mapping::right_const_iterator result = end;
-
-    for ( ; it != end; ++it )
-    {
-      QModelIndex index = it.value();
-      bool found_block = false;
-      while (index.isValid())
-      {
-        const QModelIndex ancestor = index.parent();
-        if (ancestor == sourceParent && index.row() >= sourceIndex.row())
-        {
-          found_block = true;
-          if (result == end || it.key() < result.key())
-          {
-            result = it;
-            break; // Leave the while loop. index is still valid.
-          }
-        }
-        index = ancestor;
-      }
-      if (found_block && !index.isValid())
-        // Looked through the ascendants of it.key() without finding sourceParent.
-        // That means we've already got the result we need.
-        break;
-    }
-    Q_ASSERT(result != end);
-    const QModelIndex sourceLastChild = result.value();
-    int proxyRow = result.key();
-    QModelIndex index = sourceLastChild;
-    while (index.isValid())
-    {
-      const QModelIndex ancestor = index.parent();
-      if (ancestor == sourceParent)
-      {
-        return createIndex(proxyRow - (index.row() - sourceIndex.row()), sourceIndex.column());
-      }
-      proxyRow -= (index.row() + 1);
-      index = ancestor;
-    }
-    Q_ASSERT(!"Didn't find valid proxy mapping.");
-    return QModelIndex();
-  }
-
-}
-
-int KDescendantsProxyModel::columnCount(const QModelIndex &parent) const
-{
-  if (parent.isValid() /* || rowCount(parent) == 0 */ || !sourceModel())
-    return 0;
-
-  return sourceModel()->columnCount();
-}
-
-QVariant KDescendantsProxyModel::data(const QModelIndex &index, int role) const
-{
-  Q_D(const KDescendantsProxyModel );
-
-  if (!sourceModel())
-    return QVariant();
-
-  if (!index.isValid())
-    return sourceModel()->data(index, role);
-
-  QModelIndex sourceIndex = mapToSource( index );
-
-  if ((d->m_displayAncestorData) && ( role == Qt::DisplayRole ) )
-  {
-    if (!sourceIndex.isValid())
-    {
-      return QVariant();
-    }
-    QString displayData = sourceIndex.data().toString();
-    sourceIndex = sourceIndex.parent();
-    while (sourceIndex.isValid())
-    {
-      displayData.prepend(d->m_ancestorSeparator);
-      displayData.prepend(sourceIndex.data().toString());
-      sourceIndex = sourceIndex.parent();
-    }
-    return displayData;
-  } else {
-    return sourceIndex.data(role);
-  }
-}
-
-QVariant KDescendantsProxyModel::headerData(int section, Qt::Orientation orientation, int role) const
-{
-  if (!sourceModel() || columnCount() <= section)
-    return QVariant();
-
-  return QAbstractProxyModel::headerData(section, orientation, role);
-}
-
-Qt::ItemFlags KDescendantsProxyModel::flags(const QModelIndex &index) const
-{
-  if (!index.isValid() || !sourceModel())
-    return QAbstractProxyModel::flags(index);
-
-  const QModelIndex srcIndex = mapToSource(index);
-  Q_ASSERT(srcIndex.isValid());
-  return sourceModel()->flags(srcIndex);
-}
-
-void KDescendantsProxyModelPrivate::sourceRowsAboutToBeInserted(const QModelIndex &parent, int start, int end)
-{
-  Q_Q(KDescendantsProxyModel);
-
-  if (!q->sourceModel()->hasChildren(parent))
-  {
-    // parent was not a parent before.
-    return;
-  }
-
-  int proxyStart = -1;
-
-  const int rowCount = q->sourceModel()->rowCount(parent);
-
-  if (rowCount > start)
-  {
-    const QModelIndex belowStart = q->sourceModel()->index(start, 0, parent);
-    proxyStart = q->mapFromSource(belowStart).row();
-  } else if (rowCount == 0)
-  {
-    proxyStart = q->mapFromSource(parent).row() + 1;
-  } else {
-    Q_ASSERT(rowCount == start);
-    static const int column = 0;
-    QModelIndex idx = q->sourceModel()->index(rowCount - 1, column, parent);
-    while (q->sourceModel()->hasChildren(idx))
-    {
-      idx = q->sourceModel()->index(q->sourceModel()->rowCount(idx) - 1, column, idx);
-    }
-    // The last item in the list is getting a sibling below it.
-    proxyStart = q->mapFromSource(idx).row() + 1;
-  }
-  const int proxyEnd = proxyStart + (end - start);
-
-  m_insertPair = qMakePair(proxyStart, proxyEnd);
-  q->beginInsertRows(QModelIndex(), proxyStart, proxyEnd);
-}
-
-void KDescendantsProxyModelPrivate::sourceRowsInserted(const QModelIndex &parent, int start, int end)
-{
-  Q_Q(KDescendantsProxyModel);
-
-  const QModelIndex sourceStart = q->sourceModel()->index(start, 0, parent);
-  Q_ASSERT(sourceStart.isValid());
-
-  const int rowCount = q->sourceModel()->rowCount(parent);
-  Q_ASSERT(rowCount > 0);
-
-  const int difference = end - start + 1;
-
-  if (rowCount == difference)
-  {
-    // @p parent was not a parent before.
-    m_pendingParents.append(parent);
-    scheduleProcessPendingParents();
-    return;
-  }
-
-  const int proxyStart = m_insertPair.first;
-
-  Q_ASSERT(proxyStart >= 0);
-
-  updateInternalIndexes(proxyStart, difference);
-
-  if (rowCount - 1 == end)
-  {
-    // The previously last row (the mapped one) is no longer the last.
-    // For example,
-
-    // - A            - A           0
-    // - - B          - B           1
-    // - - C          - C           2
-    // - - - D        - D           3
-    // - - - E   ->   - E           4
-    // - - F          - F           5
-    // - - G     ->   - G           6
-    // - H            - H           7
-    // - I       ->   - I           8
-
-    // As last children, E, F and G have mappings.
-    // Consider that 'J' is appended to the children of 'C', below 'E'.
-
-    // - A            - A           0
-    // - - B          - B           1
-    // - - C          - C           2
-    // - - - D        - D           3
-    // - - - E   ->   - E           4
-    // - - - J        - ???         5
-    // - - F          - F           6
-    // - - G     ->   - G           7
-    // - H            - H           8
-    // - I       ->   - I           9
-
-    // The updateInternalIndexes call above will have updated the F and G mappings correctly because proxyStart is 5.
-    // That means that E -> 4 was not affected by the updateInternalIndexes call.
-    // Now the mapping for E -> 4 needs to be updated so that it's a mapping for J -> 5.
-
-    Q_ASSERT(!m_mapping.isEmpty());
-    static const int column = 0;
-    const QModelIndex oldIndex = q->sourceModel()->index(rowCount - 1 - difference, column, parent);
-    Q_ASSERT(m_mapping.leftContains(oldIndex));
-
-    // oldIndex is E in the source. proxyRow is 4.
-    const int proxyRow = m_mapping.takeLeft(oldIndex);
-    const QModelIndex newIndex = q->sourceModel()->index(rowCount - 1, column, parent);
-
-    // newIndex is J. (proxyRow + difference) is 5.
-    m_mapping.insert(newIndex, proxyRow + difference);
-  }
-
-  for (int row = start; row <= end; ++row)
-  {
-    static const int column = 0;
-    const QModelIndex idx = q->sourceModel()->index(row, column, parent);
-    Q_ASSERT(idx.isValid());
-    if (q->sourceModel()->hasChildren(idx))
-      m_pendingParents.append(idx);
-  }
-
-  m_rowCount += difference;
-
-  scheduleProcessPendingParents();
-  q->endInsertRows();
-}
-
-void KDescendantsProxyModelPrivate::sourceRowsAboutToBeRemoved(const QModelIndex &parent, int start, int end)
-{
-  Q_Q(KDescendantsProxyModel);
-
-  const int proxyStart = q->mapFromSource(q->sourceModel()->index(start, 0, parent)).row();
-
-  static const int column = 0;
-  QModelIndex idx = q->sourceModel()->index(end, column, parent);
-  while (q->sourceModel()->hasChildren(idx))
-  {
-    idx = q->sourceModel()->index(q->sourceModel()->rowCount(idx) - 1, column, idx);
-  }
-  const int proxyEnd = q->mapFromSource(idx).row();
-
-  m_removePair = qMakePair(proxyStart, proxyEnd);
-
-  q->beginRemoveRows(QModelIndex(), proxyStart, proxyEnd);
-}
-
-void KDescendantsProxyModelPrivate::sourceRowsRemoved(const QModelIndex &parent, int start, int end)
-{
-  Q_Q(KDescendantsProxyModel);
-  Q_UNUSED(end)
-
-  const int rowCount = q->sourceModel()->rowCount(parent);
-
-
-  const int proxyStart = m_removePair.first;
-  const int proxyEnd = m_removePair.second;
-
-  const int difference = proxyEnd - proxyStart + 1;
-  {
-    Mapping::right_iterator it = m_mapping.rightLowerBound(proxyStart);
-    const Mapping::right_iterator endIt = m_mapping.rightUpperBound(proxyEnd);
-
-    if (endIt != m_mapping.rightEnd())
-      while (it != endIt)
-        it = m_mapping.eraseRight(it);
-    else
-      while (it != m_mapping.rightUpperBound(proxyEnd))
-        it = m_mapping.eraseRight(it);
-  }
-
-  m_removePair = qMakePair(-1, -1);
-  m_rowCount -= difference;
-  Q_ASSERT(m_rowCount >= 0);
-
-  updateInternalIndexes(proxyStart, -1 * difference);
-
-  if (rowCount == start && rowCount != 0)
-  {
-    static const int column = 0;
-    const QModelIndex newIndex = q->sourceModel()->index(rowCount - 1, column, parent);
-    m_mapping.insert(newIndex, proxyStart - 1);
-  }
-
-  q->endRemoveRows();
-}
-
-void KDescendantsProxyModelPrivate::sourceRowsAboutToBeMoved(const QModelIndex &srcParent, int srcStart, int srcEnd, const QModelIndex &destParent, int destStart)
-{
-  Q_UNUSED(srcParent)
-  Q_UNUSED(srcStart)
-  Q_UNUSED(srcEnd)
-  Q_UNUSED(destParent)
-  Q_UNUSED(destStart)
-  Q_Q(KDescendantsProxyModel);
-  q->beginResetModel();
-}
-
-void KDescendantsProxyModelPrivate::sourceRowsMoved(const QModelIndex &srcParent, int srcStart, int srcEnd, const QModelIndex &destParent, int destStart)
-{
-  Q_UNUSED(srcParent)
-  Q_UNUSED(srcStart)
-  Q_UNUSED(srcEnd)
-  Q_UNUSED(destParent)
-  Q_UNUSED(destStart)
-  Q_Q(KDescendantsProxyModel);
-  resetInternalData();
-  q->endResetModel();
-}
-
-void KDescendantsProxyModelPrivate::sourceModelAboutToBeReset()
-{
-  Q_Q(KDescendantsProxyModel);
-  q->beginResetModel();
-}
-
-void KDescendantsProxyModelPrivate::sourceModelReset()
-{
-  Q_Q(KDescendantsProxyModel);
-  resetInternalData();
-  if (q->sourceModel()->hasChildren())
-  {
-    m_pendingParents.append(QModelIndex());
-    scheduleProcessPendingParents();
-  }
-  q->endResetModel();
-}
-
-void KDescendantsProxyModelPrivate::sourceLayoutAboutToBeChanged()
-{
-  Q_Q(KDescendantsProxyModel);
-
-  if (m_ignoreNextLayoutChanged) {
-      m_ignoreNextLayoutChanged = false;
-      return;
-  }
-
-  if (m_mapping.isEmpty())
-    return;
-
-  QPersistentModelIndex srcPersistentIndex;
-  foreach(const QPersistentModelIndex &proxyPersistentIndex, q->persistentIndexList()) {
-      m_proxyIndexes << proxyPersistentIndex;
-      Q_ASSERT(proxyPersistentIndex.isValid());
-      srcPersistentIndex = q->mapToSource(proxyPersistentIndex);
-      Q_ASSERT(srcPersistentIndex.isValid());
-      m_layoutChangePersistentIndexes << srcPersistentIndex;
-  }
-
-  q->layoutAboutToBeChanged();
-}
-
-void KDescendantsProxyModelPrivate::sourceLayoutChanged()
-{
-  Q_Q(KDescendantsProxyModel);
-
-  if (m_ignoreNextLayoutAboutToBeChanged) {
-      m_ignoreNextLayoutAboutToBeChanged = false;
-      return;
-  }
-
-  if (m_mapping.isEmpty())
-    return;
-
-  m_rowCount = 0;
-
-  synchronousMappingRefresh();
-
-  for (int i = 0; i < m_proxyIndexes.size(); ++i) {
-      q->changePersistentIndex(m_proxyIndexes.at(i), q->mapFromSource(m_layoutChangePersistentIndexes.at(i)));
-  }
-
-  m_layoutChangePersistentIndexes.clear();
-  m_proxyIndexes.clear();
-
-  q->layoutChanged();
-}
-
-void KDescendantsProxyModelPrivate::sourceDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight)
-{
-  Q_Q(KDescendantsProxyModel);
-
-  const int topRow = topLeft.row();
-  const int bottomRow = bottomRight.row();
-
-  for(int i = topRow; i <= bottomRow; ++i)
-  {
-    const QModelIndex sourceTopLeft = q->sourceModel()->index(i, topLeft.column(), topLeft.parent());
-    const QModelIndex proxyTopLeft = q->mapFromSource(sourceTopLeft);
-    // TODO. If an index does not have any descendants, then we can emit in blocks of rows.
-    // As it is we emit once for each row.
-    const QModelIndex sourceBottomRight = q->sourceModel()->index(i, bottomRight.column(), bottomRight.parent());
-    const QModelIndex proxyBottomRight = q->mapFromSource(sourceBottomRight);
-    emit q->dataChanged(proxyTopLeft, proxyBottomRight);
-  }
-}
-
-void KDescendantsProxyModelPrivate::sourceModelDestroyed()
-{
-  Q_Q(KDescendantsProxyModel);
-  resetInternalData();
-  q->endResetModel();
-}
-
-QMimeData* KDescendantsProxyModel::mimeData( const QModelIndexList & indexes ) const
-{
-  if (!sourceModel())
-    return QAbstractProxyModel::mimeData(indexes);
-  Q_ASSERT(sourceModel());
-  QModelIndexList sourceIndexes;
-  foreach(const QModelIndex& index, indexes)
-    sourceIndexes << mapToSource(index);
-  return sourceModel()->mimeData(sourceIndexes);
-}
-
-QStringList KDescendantsProxyModel::mimeTypes() const
-{
-  if (!sourceModel())
-    return QAbstractProxyModel::mimeTypes();
-  Q_ASSERT(sourceModel());
-  return sourceModel()->mimeTypes();
-}
-
-Qt::DropActions KDescendantsProxyModel::supportedDropActions() const
-{
-  if (!sourceModel())
-    return QAbstractProxyModel::supportedDropActions();
-  return sourceModel()->supportedDropActions();
-}
-
-#include "moc_kdescendantsproxymodel_p.cpp"
--- akonadi/specialcollections.cpp
+++ akonadi/specialcollections.cpp
@@ -66,7 +66,8 @@
   const KConfigSkeletonItem *item = mSettings->findItem( QLatin1String( "DefaultResourceId" ) );
   Q_ASSERT( item );
 
-  return item->property().toString();
+  mDefaultResourceId = item->property().toString();
+  return mDefaultResourceId;
 }
 
 void SpecialCollectionsPrivate::emitChanged( const QString &resourceId )
@@ -75,9 +76,10 @@
     mToEmitChangedFor.insert( resourceId );
   } else {
     kDebug() << "Emitting changed for" << resourceId;
-    const AgentInstance agentInstance = AgentManager::self()->instance( resourceId ); 
+    const AgentInstance agentInstance = AgentManager::self()->instance( resourceId );
     emit q->collectionsChanged( agentInstance );
-    if ( resourceId == defaultResourceId() ) {
+    // first compare with local value then with config value (which also updates the local value)
+    if ( resourceId == mDefaultResourceId || resourceId == defaultResourceId() ) {
       kDebug() << "Emitting defaultFoldersChanged.";
       emit q->defaultCollectionsChanged();
     }
--- akonadi/kcfg2dbus.xsl
+++ akonadi/kcfg2dbus.xsl
@@ -27,6 +27,9 @@
 <node>
 <interface>
   <xsl:attribute name="name"><xsl:value-of select="$interfaceName"/></xsl:attribute>
+  <method>
+    <xsl:attribute name="name">writeConfig</xsl:attribute>
+  </method>
   <xsl:for-each select="kcfg:kcfg/kcfg:group/kcfg:entry">
     <xsl:variable name="annotation"><xsl:call-template name="typeAnnotation"/></xsl:variable>
     <method>
--- akonadi/agentbase.cpp
+++ akonadi/agentbase.cpp
@@ -432,7 +432,7 @@
 void AgentBasePrivate::slotNetworkStatusChange( Solid::Networking::Status stat )
 {
   Q_Q( AgentBase );
-  q->setOnline( stat == Solid::Networking::Connected );
+  q->setOnline( stat == Solid::Networking::Unknown || stat == Solid::Networking::Connected );
 }
 
 
@@ -541,11 +541,7 @@
 void AgentBase::setNeedsNetwork( bool needsNetwork )
 {
   Q_D( AgentBase );
-  /* d->mNeedsNetwork = needsNetwork; */
-  // We can't trust the above code, because there are a lot of broken NetworkManager
-  // installations around, which would cause the resource to be offline, even if there
-  // is an actual network connection available. Instead fake an online state.
-  d->mNeedsNetwork = false;
+  d->mNeedsNetwork = needsNetwork;
 
   if ( d->mNeedsNetwork ) {
     connect( Solid::Networking::notifier()
--- akonadi/kdescendantsproxymodel.cpp
+++ akonadi/kdescendantsproxymodel.cpp
@@ -1,5 +1,8 @@
 /*
     Copyright (c) 2009 Stephen Kelly <steveire@gmail.com>
+    Copyright (C) 2010 Klarälvdalens Datakonsult AB,
+        a KDAB Group company, info@kdab.net,
+        author Stephen Kelly <stephen@kdab.com>
 
     This library is free software; you can redistribute it and/or modify it
     under the terms of the GNU Library General Public License as published by
@@ -17,589 +20,469 @@
     02110-1301, USA.
 */
 
-
 #include "kdescendantsproxymodel_p.h"
 
+#include <QtCore/QStringList>
+#include <QtCore/QTimer>
+
 #include "kdebug.h"
 
-#include <QtCore/QStringList>
+#define KDO(object) kDebug() << #object << object
 
-/**
-  @internal
+#include "kbihash_p.h"
+
+typedef KHash2Map<QPersistentModelIndex, int> Mapping;
 
-  Private implementation of DescendantsProxyModel.
-*/
 class KDescendantsProxyModelPrivate
 {
-  public:
-
-  KDescendantsProxyModelPrivate(KDescendantsProxyModel *model)
-    : q_ptr(model),
+  KDescendantsProxyModelPrivate(KDescendantsProxyModel * qq)
+    : q_ptr(qq),
+      m_rowCount(0),
+      m_ignoreNextLayoutAboutToBeChanged(false),
+      m_ignoreNextLayoutChanged(false),
+      m_relayouting(false),
       m_displayAncestorData( false ),
       m_ancestorSeparator( QLatin1String( " / " ) )
-    {
-    }
-
-  Q_DECLARE_PUBLIC( KDescendantsProxyModel )
-  KDescendantsProxyModel *q_ptr;
-  /**
-  @internal
-
-  Returns the @p row -th descendant of sourceParent.
-
-  For example, if the source model looks like:
-  @code
-  -> Item 0-0 (this is row-depth)
-  -> -> Item 0-1
-  -> -> Item 1-1
-  -> -> -> Item 0-2
-  -> -> -> Item 1-2
-  -> Item 1-0
-  @endcode
-
-  Then findSourceIndexForRow(3, index(Item 0-0)) will return an index for Item 1-2
-
-  @returns The model index in the source model.
-
-  */
-  QModelIndex findSourceIndexForRow( int row, QModelIndex sourceParent) const;
-
-  void processPendingParents() {
-
-  }
-
-  /**
-  @internal
-
-  Returns true if @p sourceIndex has a ancestor that is m_rootDescendIndex.
-  Note that isDescended(m_rootDescendIndex) is false;
-  @param sourceIndex The index in the source model.
-  @returns Whether sourceIndex is an ancestor of rootIndex
-  */
-  bool isDescended(const QModelIndex &sourceIndex) const;
-
-  /**
-  @internal
-
-  Returns the number of descendants below @p sourceIndex.
-
-  For example, if the source model looks like:
-  @code
-  -> Item 0-0 (this is row-depth)
-  -> -> Item 0-1
-  -> -> Item 1-1
-  -> -> -> Item 0-2
-  -> -> -> Item 1-2
-  -> Item 1-0
-  @endcode
-
-  The descendant count of the rootIndex would be 6,
-  of Item 0-0 would be 4,
-  of Item 1-1 would be 2,
-  of Item 1-2 would be 0
-  etc.
-
-  */
-  int descendantCount(const QModelIndex &sourceIndex, int ignoreTerminals=ObserveTerminals) const;
-
-  enum TerminalIgnorance
   {
-    ObserveTerminals,
-    IgnoreTerminals
-  };
-
-  /**
-  @internal
-
-  Returns the row of @p sourceIndex below the rootDescendIndex.
+  }
 
-  For example, if the source model looks like:
-  @code
-  -> Item 0-0 (this is row-depth)
-  -> -> Item 0-1
-  -> -> Item 1-1
-  -> -> -> Item 0-2
-  -> -> -> Item 1-2
-  -> Item 1-0
-  @endcode
+  Q_DECLARE_PUBLIC(KDescendantsProxyModel)
+  KDescendantsProxyModel * const q_ptr;
 
-  Then descendedRow(index(Item 0-0) would be 0,
-  descendedRow(index(Item 0-1) would be 1,
-  descendedRow(index(Item 0-2) would be 3,
-  descendedRow(index(Item 1-0) would be 5
-  etc.
+  mutable QVector<QPersistentModelIndex> m_pendingParents;
 
-  @returns The row in the proxy model where @p sourceIndex is represented.
+  void scheduleProcessPendingParents() const;
+  void processPendingParents();
 
-  */
-  int descendedRow(const QModelIndex &sourceIndex) const;
+  void synchronousMappingRefresh();
 
-  QModelIndexList matchDescendants(const QModelIndex& start, int role, const QVariant& value, int hits, Qt::MatchFlags flags, int until, const bool matchAll) const;
+  void updateInternalIndexes(int start, int offset);
 
-  enum Operation
-  {
-    InsertOperation,
-    RemoveOperation
-  };
+  void resetInternalData();
 
-  void insertOrRemoveRows(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, int type);
-
-  void sourceRowsAboutToBeInserted(const QModelIndex &, int start, int end);
-  void sourceRowsInserted(const QModelIndex &, int start, int end);
-  void sourceRowsAboutToBeRemoved(const QModelIndex &, int start, int end);
-  void sourceRowsRemoved(const QModelIndex &, int start, int end);
-  void sourceRowsAboutToBeMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destParent, int destRow);
-  void sourceRowsMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destParent, int destRow);
+  void sourceRowsAboutToBeInserted(const QModelIndex &, int, int);
+  void sourceRowsInserted(const QModelIndex &, int, int);
+  void sourceRowsAboutToBeRemoved(const QModelIndex &, int, int);
+  void sourceRowsRemoved(const QModelIndex &, int, int);
+  void sourceRowsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int);
+  void sourceRowsMoved(const QModelIndex &, int, int, const QModelIndex &, int);
   void sourceModelAboutToBeReset();
   void sourceModelReset();
   void sourceLayoutAboutToBeChanged();
   void sourceLayoutChanged();
-  void sourceDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
+  void sourceDataChanged(const QModelIndex &, const QModelIndex &);
   void sourceModelDestroyed();
 
-  QPersistentModelIndex m_rootDescendIndex;
-  // Hmm, if I make this QHash<QPersistentModelIndex, int> instead then moves are
-  // automatically handled. Nope, they're not. deeper levels than base would
-  // still need to be updated or calculated.
-
-  mutable QHash<qint64, int> m_descendantsCount;
+  Mapping m_mapping;
+  int m_rowCount;
+  QPair<int, int> m_removePair;
+  QPair<int, int> m_insertPair;
+
+  bool m_ignoreNextLayoutAboutToBeChanged;
+  bool m_ignoreNextLayoutChanged;
+  bool m_relayouting;
 
   bool m_displayAncestorData;
   QString m_ancestorSeparator;
 
-  QList<QPersistentModelIndex> m_terminalIndexes;
-  void descendNewIndexes();
-
   QList<QPersistentModelIndex> m_layoutChangePersistentIndexes;
   QModelIndexList m_proxyIndexes;
-
 };
 
-KDescendantsProxyModel::KDescendantsProxyModel( QObject *parent )
-      : QAbstractProxyModel( parent ),
-        d_ptr( new KDescendantsProxyModelPrivate(this) )
+void KDescendantsProxyModelPrivate::resetInternalData()
 {
-  Q_D(KDescendantsProxyModel);
-
-  d->m_rootDescendIndex = QModelIndex();
+  m_rowCount = 0;
+  m_mapping.clear();
+  m_layoutChangePersistentIndexes.clear();
+  m_proxyIndexes.clear();
 }
 
-void KDescendantsProxyModel::setRootIndex(const QModelIndex &index)
+void KDescendantsProxyModelPrivate::synchronousMappingRefresh()
 {
-  Q_D(KDescendantsProxyModel);
+  m_rowCount = 0;
+  m_mapping.clear();
+  m_pendingParents.clear();
 
-  if (index.isValid())
-    Q_ASSERT(index.model() == sourceModel());
+  m_pendingParents.append(QModelIndex());
 
-  d->m_rootDescendIndex = index;
-  d->m_descendantsCount.clear();
-  reset();
+  m_relayouting = true;
+  while (!m_pendingParents.isEmpty())
+  {
+    processPendingParents();
+  }
+  m_relayouting = false;
 }
 
-KDescendantsProxyModel::~KDescendantsProxyModel()
+void KDescendantsProxyModelPrivate::scheduleProcessPendingParents() const
 {
-  Q_D(KDescendantsProxyModel);
-  d->m_descendantsCount.clear();
-  delete d_ptr;
+  Q_Q(const KDescendantsProxyModel);
+  const_cast<KDescendantsProxyModelPrivate*>(this)->processPendingParents();
 }
 
-QVariant KDescendantsProxyModel::headerData(int section, Qt::Orientation orientation, int role) const
+void KDescendantsProxyModelPrivate::processPendingParents()
 {
-  if (!sourceModel() || columnCount() <= section)
-    return QVariant();
+  Q_Q(KDescendantsProxyModel);
+  const QVector<QPersistentModelIndex>::iterator begin = m_pendingParents.begin();
+  QVector<QPersistentModelIndex>::iterator it = begin;
 
-  return QAbstractProxyModel::headerData(section, orientation, role);
-}
+  // Process chunkSize elements per invokation.
+  static const int chunkSize = 30;
 
-QModelIndex KDescendantsProxyModelPrivate::findSourceIndexForRow( int row, QModelIndex idx ) const
-{
-    Q_Q( const KDescendantsProxyModel );
-    int childCount = q->sourceModel()->rowCount(idx);
-    for (int childRow = 0; childRow < childCount; childRow++)
+  const QVector<QPersistentModelIndex>::iterator end =
+          /* (m_pendingParents.size() > chunkSize) ? begin + chunkSize : */ m_pendingParents.end();
+
+  QVector<QPersistentModelIndex> newPendingParents;
+
+  while (it != end && it != m_pendingParents.end()) {
+    const QModelIndex sourceParent = *it;
+    if (!sourceParent.isValid() && m_rowCount > 0)
     {
-      QModelIndex childIndex = q->sourceModel()->index(childRow, 0, idx);
-      if (row == 0)
-      {
-        return childIndex;
-      }
-      row--;
-      if (q->sourceModel()->hasChildren(childIndex))
-      {
-        int childDesc = descendantCount(childIndex);
-        if (childDesc > row)
-        {
-          return findSourceIndexForRow(row, childIndex);
-        }
-        row -= childDesc;
-      }
+      // It was removed from the source model before it was inserted.
+      it = m_pendingParents.erase(it);
+      continue;
     }
+    const int rowCount = q->sourceModel()->rowCount(sourceParent);
 
-    // This should probably never happen if you use descendantCount before calling this method.
-    return QModelIndex();
-}
+    Q_ASSERT(rowCount > 0);
+    const QPersistentModelIndex sourceIndex = q->sourceModel()->index(rowCount - 1, 0, sourceParent);
 
-void KDescendantsProxyModel::setSourceModel(QAbstractItemModel * sourceModel)
-{
-  Q_D(KDescendantsProxyModel);
+    Q_ASSERT(sourceIndex.isValid());
 
-  disconnect( sourceModel, SIGNAL(modelReset()), this, SLOT( sourceModelReset() ) );
-  disconnect( sourceModel, SIGNAL(modelAboutToBeReset()), this, SLOT(sourceModelAboutToBeReset() ) );
-  disconnect( sourceModel, SIGNAL(layoutChanged()), this, SLOT(sourceLayoutChanged()) );
-  disconnect( sourceModel, SIGNAL(layoutAboutToBeChanged()), this, SLOT(sourceLayoutAboutToBeChanged()) );
-  disconnect( sourceModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
-          this, SLOT(sourceDataChanged(const QModelIndex &, const QModelIndex & ) ) );
-  disconnect( sourceModel, SIGNAL(rowsInserted(const QModelIndex, int, int)),
-          this, SLOT(sourceRowsInserted(const QModelIndex, int, int)) );
-  disconnect( sourceModel, SIGNAL(rowsAboutToBeInserted(const QModelIndex, int, int)),
-          this, SLOT(sourceRowsAboutToBeInserted(const QModelIndex, int, int)) );
-  disconnect( sourceModel, SIGNAL(rowsRemoved(const QModelIndex, int, int)),
-          this, SLOT(sourceRowsRemoved(const QModelIndex, int, int)) );
-  disconnect( sourceModel, SIGNAL(rowsAboutToBeRemoved(const QModelIndex, int, int)),
-          this, SLOT(sourceRowsAboutToBeRemoved(const QModelIndex, int, int)) );
-  disconnect( sourceModel, SIGNAL(rowsMoved(const QModelIndex, int, int, const QModelIndex, int)),
-          this, SLOT(sourceRowsMoved(const QModelIndex, int, int, const QModelIndex, int)) );
-  disconnect( sourceModel, SIGNAL(rowsAboutToBeMoved(const QModelIndex, int, int, const QModelIndex, int)),
-          this, SLOT(sourceRowsAboutToBeMoved(const QModelIndex, int, int, const QModelIndex, int) ) );
-
-  QAbstractProxyModel::setSourceModel( sourceModel );
-  connect( sourceModel, SIGNAL(modelReset()), SLOT( sourceModelReset() ) );
-  connect( sourceModel, SIGNAL(modelAboutToBeReset()), SLOT(sourceModelAboutToBeReset() ) );
-  connect( sourceModel, SIGNAL(layoutChanged()), SLOT(sourceLayoutChanged()) );
-  connect( sourceModel, SIGNAL(layoutAboutToBeChanged()), SLOT(sourceLayoutAboutToBeChanged()) );
-  connect( sourceModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
-          SLOT(sourceDataChanged(const QModelIndex &, const QModelIndex & ) ) );
-  connect( sourceModel, SIGNAL(rowsInserted(const QModelIndex, int, int)),
-          SLOT(sourceRowsInserted(const QModelIndex, int, int)) );
-  connect( sourceModel, SIGNAL(rowsAboutToBeInserted(const QModelIndex, int, int)),
-          SLOT(sourceRowsAboutToBeInserted(const QModelIndex, int, int)) );
-  connect( sourceModel, SIGNAL(rowsRemoved(const QModelIndex, int, int)),
-          SLOT(sourceRowsRemoved(const QModelIndex, int, int)) );
-  connect( sourceModel, SIGNAL(rowsAboutToBeRemoved(const QModelIndex, int, int)),
-          SLOT(sourceRowsAboutToBeRemoved(const QModelIndex, int, int)) );
-  connect( sourceModel, SIGNAL(rowsMoved(const QModelIndex, int, int, const QModelIndex, int)),
-          SLOT(sourceRowsMoved(const QModelIndex, int, int, const QModelIndex, int)) );
-  connect( sourceModel, SIGNAL(rowsAboutToBeMoved(const QModelIndex, int, int, const QModelIndex, int)),
-          SLOT(sourceRowsAboutToBeMoved(const QModelIndex, int, int, const QModelIndex, int) ) );
+    const QModelIndex proxyParent = q->mapFromSource(sourceParent);
 
-  d->m_descendantsCount.clear();
-  reset();
-}
+    Q_ASSERT(sourceParent.isValid() == proxyParent.isValid());
+    const int proxyEndRow = proxyParent.row() + rowCount;
+    const int proxyStartRow = proxyEndRow - rowCount + 1;
 
-bool KDescendantsProxyModelPrivate::isDescended(const QModelIndex &sourceIndex) const
-{
-  Q_Q(const KDescendantsProxyModel);
+    if (!m_relayouting)
+      q->beginInsertRows(QModelIndex(), proxyStartRow, proxyEndRow);
 
-  if (sourceIndex == m_rootDescendIndex)
-  {
-    return false;
-  }
+    updateInternalIndexes(proxyStartRow, rowCount);
+    m_mapping.insert(sourceIndex, proxyEndRow);
+    it = m_pendingParents.erase(it);
+    m_rowCount += rowCount;
 
-  QModelIndex parentIndex = q->sourceModel()->parent(sourceIndex);
+    if (!m_relayouting)
+      q->endInsertRows();
 
-  if (parentIndex == m_rootDescendIndex)
-  {
-    return true;
-  }
-  bool found = false;
+    for (int sourceRow = 0; sourceRow < rowCount; ++sourceRow ) {
+      static const int column = 0;
+      const QModelIndex child = q->sourceModel()->index(sourceRow, column, sourceParent);
+      Q_ASSERT(child.isValid());
 
-  forever
-  {
-    parentIndex = parentIndex.parent();
-    if (parentIndex == m_rootDescendIndex)
-    {
-      found = true;
-      break;
+      if (q->sourceModel()->hasChildren(child))
+        newPendingParents.append(child);
     }
-    if (!parentIndex.isValid())
-      break;
   }
-  return found;
+  m_pendingParents += newPendingParents;
+  if (!m_pendingParents.isEmpty())
+      processPendingParents();
+//   scheduleProcessPendingParents();
 }
 
-int KDescendantsProxyModelPrivate::descendedRow(const QModelIndex &sourceIndex) const
+void KDescendantsProxyModelPrivate::updateInternalIndexes(int start, int offset)
 {
-  Q_Q(const KDescendantsProxyModel);
-  QModelIndex parentIndex = sourceIndex.parent();
-  int row = sourceIndex.row();
-
-  for (int childRow = 0; childRow < sourceIndex.row(); childRow++ )
+  // TODO: Make KHash2Map support key updates and do this backwards.
+  QHash<int, QPersistentModelIndex> updates;
   {
-    QModelIndex childIndex = q->sourceModel()->index( childRow, sourceIndex.column(), parentIndex );
-    if (q->sourceModel()->hasChildren(childIndex))
-      row += descendantCount(childIndex);
-  }
+    Mapping::right_const_iterator it = const_cast<const Mapping&>(m_mapping).rightLowerBound(start);
+    const Mapping::right_const_iterator end = m_mapping.rightConstEnd();
 
-  if (parentIndex == m_rootDescendIndex)
-  {
-    // Return 0 instead of -1 for an invalid index.
-    if (row < 0)
+    while (it != end)
     {
-      return 0;
+      updates.insert(it.key() + offset, *it);
+      ++it;
     }
-    return row;
   }
-  else if(!parentIndex.isValid())
-  {
-    // Should never happen.
-    // Someone must have called this with sourceIndex outside of m_rootDescendIndex
-    return 0;
-  }
-  else {
-  int dr = descendedRow(parentIndex);
-    return row + dr + 1;
-  }
-}
 
-QModelIndex KDescendantsProxyModel::mapFromSource(const QModelIndex & sourceIndex) const
-{
-  Q_D(const KDescendantsProxyModel);
-
-  if (sourceIndex == d->m_rootDescendIndex)
   {
-    return QModelIndex();
-  }
+    QHash<int, QPersistentModelIndex>::const_iterator it = updates.constBegin();
+    const QHash<int, QPersistentModelIndex>::const_iterator end = updates.constEnd();
 
-  if ( d->isDescended( sourceIndex ) )
-  {
-    int row = d->descendedRow( sourceIndex );
-    if (row < 0)
-      return QModelIndex();
-    return createIndex( row, sourceIndex.column() );
-  } else {
-    return QModelIndex();
+    for ( ; it != end; ++it)
+    {
+      m_mapping.insert(it.value(), it.key());
+    }
   }
+
 }
 
-void KDescendantsProxyModelPrivate::sourceRowsAboutToBeInserted(const QModelIndex &sourceParentIndex, int start, int end)
+KDescendantsProxyModel::KDescendantsProxyModel(QObject *parent)
+  : QAbstractProxyModel(parent), d_ptr(new KDescendantsProxyModelPrivate(this))
 {
-  insertOrRemoveRows(sourceParentIndex, start, end, InsertOperation);
 }
 
-void KDescendantsProxyModelPrivate::insertOrRemoveRows(const QModelIndex &sourceParentIndex, int start, int end, int operationType)
+KDescendantsProxyModel::~KDescendantsProxyModel()
 {
-
-  Q_Q(KDescendantsProxyModel);
-
-  int c = descendedRow(sourceParentIndex);
-
-// Can't simply get the descendantCount of sourceModel()->index(start, 0, sourceParent),
-// because start might not exist as a child of sourceParent yet.
-// Maybe I should special case (!sourceParent.hasChildren) instead.
-
-  // Only the first column can have child items. It is only those we need to count.
-  const int column = 0;
-  for (int childRow = 0; childRow < start; childRow++)
-  {
-    QModelIndex childIndex = q->sourceModel()->index( childRow, column, sourceParentIndex );
-//     kDebug() << childIndex << descendantCount(childIndex);
-    if (q->sourceModel()->hasChildren(childIndex))
-      c += descendantCount(childIndex);
-  }
-
-//   @code
-//   -> Item 0-0 (this is row-depth)
-//   -> -> Item 0-1
-//   -> -> Item 1-1
-//   -> -> -> Item 0-2
-//   -> -> -> Item 1-2
-//   -> Item 1-0
-//   @endcode
-//
-// If the sourceModel reports that a row is inserted between Item 0-2 Item 1-2,
-// this methods receives a sourceParent of Item 1-1, and a start of 1.
-// It has a descendedRow of 2. The proxied start is the number of rows above parent,
-// and the start below parent. The parent itself must also be accounted for if it
-// is part of the model.
-
-// Check if it's descended instead?
-
-  int proxy_start = c + start;
-  int proxy_end = c + end;
-
-  if (isDescended(sourceParentIndex))
-  {
-    proxy_start++;
-    proxy_end++;
-  }
-
-  if (operationType == InsertOperation)
-    q->beginInsertRows(m_rootDescendIndex, proxy_start, proxy_end);
-  else if (operationType == RemoveOperation)
-  {
-    // need to notify that we're also removing the descendants.
-    for (int childRow = start; childRow <= end; childRow++)
-    {
-      QModelIndex childIndex = q->sourceModel()->index(childRow, column, sourceParentIndex);
-      if (q->sourceModel()->hasChildren(childIndex))
-        proxy_end += descendantCount(childIndex);
-    }
-    Q_ASSERT( proxy_end <= q->rowCount() );
-    q->beginRemoveRows(m_rootDescendIndex, proxy_start, proxy_end);
-  }
+  delete d_ptr;
 }
 
-void KDescendantsProxyModelPrivate::sourceRowsInserted(const QModelIndex &sourceParentIndex, int start, int end)
+void KDescendantsProxyModel::setRootIndex(const QModelIndex &index)
 {
-  Q_Q(KDescendantsProxyModel);
-
-  m_descendantsCount.clear();
-
-  // Don't count the descendants of newly inserted indexes until after endInsertRows.
-  // The reason for this is that at the time we emitted beginInsertRows, we couldn't count the descendants
-  // of new items (they weren't known to the sourceModel), and now we can.
-  const int column = 0;
-  for (int childRow = start; childRow <= end; childRow++)
-  {
-    QModelIndex childIndex = q->sourceModel()->index( childRow, column, sourceParentIndex );
-    m_terminalIndexes << QPersistentModelIndex(childIndex);
-  }
-
-  q->endInsertRows();
-  descendNewIndexes();
+  Q_UNUSED(index)
 }
 
-void KDescendantsProxyModelPrivate::descendNewIndexes()
+QModelIndexList KDescendantsProxyModel::match(const QModelIndex &start, int role, const QVariant &value, int hits, Qt::MatchFlags flags) const
 {
-  Q_Q(KDescendantsProxyModel);
-
-  QMutableListIterator<QPersistentModelIndex> i(m_terminalIndexes);
-  while (i.hasNext())
-  {
-    QModelIndex idx = i.next();
-
-    int descCount = descendantCount(idx, IgnoreTerminals);
-
-    if (descCount <= 0)
-    {
-      i.remove();
-      continue;
-    }
-
-    // if descCount > 0, this is a new index which has new child indexes.
-
-    int proxyStart = descendedRow(idx);
-    // Need to ignore terminals so we know how many rows will be inserted by removing them.
-    int proxyEnd = proxyStart + descendantCount(idx, IgnoreTerminals);
-
-    if (isDescended(idx))
-    {
-      proxyStart++;
-      proxyEnd++;
-    }
-    q->beginInsertRows(QModelIndex(), proxyStart, proxyEnd - 1 );
-    i.remove();
-    m_descendantsCount.clear();
-    q->endInsertRows();
-  }
+  return QAbstractProxyModel::match(start, role, value, hits, flags);
 }
 
-
-void KDescendantsProxyModelPrivate::sourceRowsAboutToBeMoved(const QModelIndex &parent, int start, int end, const QModelIndex &destParent, int destRow)
+void KDescendantsProxyModel::setDisplayAncestorData( bool display )
 {
-  Q_Q(KDescendantsProxyModel);
-  int c = descendedRow(parent);
-  int d = descendedRow(destParent);
-
-  bool allowMove = q->beginMoveRows(QModelIndex(), c+1+start, c+1+end, QModelIndex(), d+1+destRow);
-  Q_UNUSED(allowMove);
-  Q_ASSERT(allowMove);
+  Q_D(KDescendantsProxyModel);
+  d->m_displayAncestorData = display;
 }
 
-void KDescendantsProxyModelPrivate::sourceRowsMoved(const QModelIndex &sourceParentIndex, int start, int end, const QModelIndex &destParentIndex, int destRow)
+bool KDescendantsProxyModel::displayAncestorData() const
 {
-  Q_Q(KDescendantsProxyModel);
-  Q_UNUSED(sourceParentIndex);
-  Q_UNUSED(start);
-  Q_UNUSED(end);
-  Q_UNUSED(destParentIndex);
-  Q_UNUSED(destRow);
-
-  m_descendantsCount.clear();
-
-  q->endMoveRows();
+  Q_D(const KDescendantsProxyModel );
+  return d->m_displayAncestorData;
 }
 
+void KDescendantsProxyModel::setAncestorSeparator( const QString &separator )
+{
+  Q_D(KDescendantsProxyModel);
+  d->m_ancestorSeparator = separator;
+}
 
-void KDescendantsProxyModelPrivate::sourceRowsAboutToBeRemoved(const QModelIndex &parent, int start, int end)
+QString KDescendantsProxyModel::ancestorSeparator() const
 {
-  insertOrRemoveRows(parent, start, end, RemoveOperation);
+  Q_D(const KDescendantsProxyModel );
+  return d->m_ancestorSeparator;
 }
 
-void KDescendantsProxyModelPrivate::sourceRowsRemoved(const QModelIndex &sourceParentIndex, int start, int end)
+
+void KDescendantsProxyModel::setSourceModel(QAbstractItemModel *_sourceModel)
 {
-  Q_Q(KDescendantsProxyModel);
-  Q_UNUSED(sourceParentIndex);
-  Q_UNUSED(start);
-  Q_UNUSED(end);
+  beginResetModel();
 
-  m_descendantsCount.clear();
-  q->endRemoveRows();
+  if (_sourceModel) {
+    disconnect(_sourceModel, SIGNAL(rowsAboutToBeInserted(const QModelIndex &, int, int)),
+               this, SLOT(sourceRowsAboutToBeInserted(const QModelIndex &, int, int)));
+    disconnect(_sourceModel, SIGNAL(rowsInserted(const QModelIndex &, int, int)),
+               this, SLOT(sourceRowsInserted(const QModelIndex &, int, int)));
+    disconnect(_sourceModel, SIGNAL(rowsAboutToBeRemoved(const QModelIndex &, int, int)),
+               this, SLOT(sourceRowsAboutToBeRemoved(const QModelIndex &, int, int)));
+    disconnect(_sourceModel, SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
+               this, SLOT(sourceRowsRemoved(const QModelIndex &, int, int)));
+//     disconnect(_sourceModel, SIGNAL(rowsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)),
+//             this, SLOT(sourceRowsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)));
+//     disconnect(_sourceModel, SIGNAL(rowsMoved(const QModelIndex &, int, int, const QModelIndex &, int)),
+//             this, SLOT(sourceRowsMoved(const QModelIndex &, int, int, const QModelIndex &, int)));
+    disconnect(_sourceModel, SIGNAL(modelAboutToBeReset()),
+               this, SLOT(sourceModelAboutToBeReset()));
+    disconnect(_sourceModel, SIGNAL(modelReset()),
+               this, SLOT(sourceModelReset()));
+    disconnect(_sourceModel, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)),
+               this, SLOT(sourceDataChanged(const QModelIndex &, const QModelIndex &)));
+    disconnect(_sourceModel, SIGNAL(layoutAboutToBeChanged()),
+               this, SLOT(sourceLayoutAboutToBeChanged()));
+    disconnect(_sourceModel, SIGNAL(layoutChanged()),
+               this, SLOT(sourceLayoutChanged()));
+    disconnect(_sourceModel, SIGNAL(destroyed()),
+               this, SLOT(sourceModelDestroyed()));
+  }
+
+  QAbstractProxyModel::setSourceModel(_sourceModel);
+
+  if (_sourceModel) {
+    connect(_sourceModel, SIGNAL(rowsAboutToBeInserted(const QModelIndex &, int, int)),
+            SLOT(sourceRowsAboutToBeInserted(const QModelIndex &, int, int)));
+    connect(_sourceModel, SIGNAL(rowsInserted(const QModelIndex &, int, int)),
+            SLOT(sourceRowsInserted(const QModelIndex &, int, int)));
+    connect(_sourceModel, SIGNAL(rowsAboutToBeRemoved(const QModelIndex &, int, int)),
+            SLOT(sourceRowsAboutToBeRemoved(const QModelIndex &, int, int)));
+    connect(_sourceModel, SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
+            SLOT(sourceRowsRemoved(const QModelIndex &, int, int)));
+//     connect(_sourceModel, SIGNAL(rowsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)),
+//             SLOT(sourceRowsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int)));
+//     connect(_sourceModel, SIGNAL(rowsMoved(const QModelIndex &, int, int, const QModelIndex &, int)),
+//             SLOT(sourceRowsMoved(const QModelIndex &, int, int, const QModelIndex &, int)));
+    connect(_sourceModel, SIGNAL(modelAboutToBeReset()),
+            SLOT(sourceModelAboutToBeReset()));
+    connect(_sourceModel, SIGNAL(modelReset()),
+            SLOT(sourceModelReset()));
+    connect(_sourceModel, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)),
+            SLOT(sourceDataChanged(const QModelIndex &, const QModelIndex &)));
+    connect(_sourceModel, SIGNAL(layoutAboutToBeChanged()),
+            SLOT(sourceLayoutAboutToBeChanged()));
+    connect(_sourceModel, SIGNAL(layoutChanged()),
+            SLOT(sourceLayoutChanged()));
+    connect(_sourceModel, SIGNAL(destroyed()),
+            SLOT(sourceModelDestroyed()));
+  }
+
+  endResetModel();
 }
 
-void KDescendantsProxyModelPrivate::sourceModelAboutToBeReset()
+QModelIndex KDescendantsProxyModel::parent(const QModelIndex &index) const
 {
-  Q_Q(KDescendantsProxyModel);
-  q->beginResetModel();
+  Q_UNUSED(index)
+  return QModelIndex();
 }
 
-void KDescendantsProxyModelPrivate::sourceModelReset()
+bool KDescendantsProxyModel::hasChildren(const QModelIndex &parent) const
 {
-  Q_Q(KDescendantsProxyModel);
-
-  m_descendantsCount.clear();
-  q->endResetModel();
+  Q_D(const KDescendantsProxyModel);
+  return !(d->m_mapping.isEmpty() || parent.isValid());
 }
 
-void KDescendantsProxyModelPrivate::sourceLayoutAboutToBeChanged()
+int KDescendantsProxyModel::rowCount(const QModelIndex &parent) const
 {
-  Q_Q(KDescendantsProxyModel);
-
-  emit q->layoutAboutToBeChanged();
+  Q_D(const KDescendantsProxyModel);
+  if (d->m_pendingParents.contains(parent) || parent.isValid() || !sourceModel())
+    return 0;
 
-  foreach(const QPersistentModelIndex &proxyPersistentIndex, q->persistentIndexList())
+  if (d->m_mapping.isEmpty() && sourceModel()->hasChildren())
   {
-    m_proxyIndexes << proxyPersistentIndex;
-    m_layoutChangePersistentIndexes << QPersistentModelIndex(q->mapToSource(proxyPersistentIndex));
+    const_cast<KDescendantsProxyModelPrivate*>(d)->synchronousMappingRefresh();
   }
+  return d->m_rowCount;
 }
 
-void KDescendantsProxyModelPrivate::sourceLayoutChanged()
+QModelIndex KDescendantsProxyModel::index(int row, int column, const QModelIndex &parent) const
 {
-  Q_Q(KDescendantsProxyModel);
+  if (parent.isValid())
+    return QModelIndex();
 
-  for(int i = 0; i < m_proxyIndexes.size(); ++i)
-  {
-    q->changePersistentIndex(m_proxyIndexes.at(i), q->mapFromSource(m_layoutChangePersistentIndexes.at(i)));
-  }
+  if (!hasIndex(row, column, parent))
+    return QModelIndex();
 
-  m_layoutChangePersistentIndexes.clear();
-  m_proxyIndexes.clear();
+  return createIndex(row, column);
+}
 
-  m_descendantsCount.clear();
+QModelIndex KDescendantsProxyModel::mapToSource(const QModelIndex &proxyIndex) const
+{
+  Q_D(const KDescendantsProxyModel);
+  if (d->m_mapping.isEmpty() || !proxyIndex.isValid() || !sourceModel())
+    return QModelIndex();
 
-  emit q->layoutChanged();
+  const Mapping::right_const_iterator result = d->m_mapping.rightLowerBound(proxyIndex.row());
+  Q_ASSERT(result != d->m_mapping.rightEnd());
+
+  const int proxyLastRow = result.key();
+  const QModelIndex sourceLastChild = result.value();
+  Q_ASSERT(sourceLastChild.isValid());
+
+  // proxyLastRow is greater than proxyIndex.row().
+  // sourceLastChild is vertically below the result we're looking for
+  // and not necessarily in the correct parent.
+  // We travel up through its parent hierarchy until we are in the
+  // right parent, then return the correct sibling.
+
+  // Source:           Proxy:    Row
+  // - A               - A       - 0
+  // - B               - B       - 1
+  // - C               - C       - 2
+  // - D               - D       - 3
+  // - - E             - E       - 4
+  // - - F             - F       - 5
+  // - - G             - G       - 6
+  // - - H             - H       - 7
+  // - - I             - I       - 8
+  // - - - J           - J       - 9
+  // - - - K           - K       - 10
+  // - - - L           - L       - 11
+  // - - M             - M       - 12
+  // - - N             - N       - 13
+  // - O               - O       - 14
+
+  // Note that L, N and O are lastChildIndexes, and therefore have a mapping. If we
+  // are trying to map G from the proxy to the source, We at this point have an iterator
+  // pointing to (L -> 11). The proxy row of G is 6. (proxyIndex.row() == 6). We seek the
+  // sourceIndex which is vertically above L by the distance proxyLastRow - proxyIndex.row().
+  // In this case the verticalDistance is 5.
+
+  int verticalDistance = proxyLastRow - proxyIndex.row();
+
+  // We traverse the ancestors of L, until we can index the desired row in the source.
+
+  QModelIndex ancestor = sourceLastChild;
+  while (ancestor.isValid())
+  {
+    const int ancestorRow = ancestor.row();
+    if (verticalDistance <= ancestorRow)
+    {
+      return ancestor.sibling(ancestorRow - verticalDistance, proxyIndex.column());
+    }
+    verticalDistance -= (ancestorRow + 1);
+    ancestor = ancestor.parent();
+  }
+  Q_ASSERT(!"Didn't find target row.");
+  return QModelIndex();
 }
 
-QModelIndex KDescendantsProxyModel::mapToSource(const QModelIndex &proxyIndex) const
+QModelIndex KDescendantsProxyModel::mapFromSource(const QModelIndex &sourceIndex) const
 {
   Q_D(const KDescendantsProxyModel);
 
-  if (!proxyIndex.isValid())
-    return d->m_rootDescendIndex;
+  if (!sourceModel())
+    return QModelIndex();
 
-  if (proxyIndex.column() >= sourceModel()->columnCount())
+  if (d->m_mapping.isEmpty())
     return QModelIndex();
 
-  QModelIndex idx = d->findSourceIndexForRow( proxyIndex.row(), d->m_rootDescendIndex );
 
-  if (proxyIndex.column() > 0)
   {
-    return sourceModel()->index(idx.row(), proxyIndex.column(), idx.parent());
+    // TODO: Consider a parent Mapping to speed this up.
+
+    Mapping::right_const_iterator it = d->m_mapping.rightConstBegin();
+    const Mapping::right_const_iterator end = d->m_mapping.rightConstEnd();
+    const QModelIndex sourceParent = sourceIndex.parent();
+    Mapping::right_const_iterator result = end;
+
+    for ( ; it != end; ++it )
+    {
+      QModelIndex index = it.value();
+      bool found_block = false;
+      while (index.isValid())
+      {
+        const QModelIndex ancestor = index.parent();
+        if (ancestor == sourceParent && index.row() >= sourceIndex.row())
+        {
+          found_block = true;
+          if (result == end || it.key() < result.key())
+          {
+            result = it;
+            break; // Leave the while loop. index is still valid.
+          }
+        }
+        index = ancestor;
+      }
+      if (found_block && !index.isValid())
+        // Looked through the ascendants of it.key() without finding sourceParent.
+        // That means we've already got the result we need.
+        break;
+    }
+    Q_ASSERT(result != end);
+    const QModelIndex sourceLastChild = result.value();
+    int proxyRow = result.key();
+    QModelIndex index = sourceLastChild;
+    while (index.isValid())
+    {
+      const QModelIndex ancestor = index.parent();
+      if (ancestor == sourceParent)
+      {
+        return createIndex(proxyRow - (index.row() - sourceIndex.row()), sourceIndex.column());
+      }
+      proxyRow -= (index.row() + 1);
+      index = ancestor;
+    }
+    Q_ASSERT(!"Didn't find valid proxy mapping.");
+    return QModelIndex();
   }
-  return idx;
+
+}
+
+int KDescendantsProxyModel::columnCount(const QModelIndex &parent) const
+{
+  if (parent.isValid() /* || rowCount(parent) == 0 */ || !sourceModel())
+    return 0;
+
+  return sourceModel()->columnCount();
 }
 
-QVariant KDescendantsProxyModel::data(const QModelIndex & index, int role) const
+QVariant KDescendantsProxyModel::data(const QModelIndex &index, int role) const
 {
   Q_D(const KDescendantsProxyModel );
 
@@ -629,302 +512,351 @@
   } else {
     return sourceIndex.data(role);
   }
-
 }
 
-QMimeData* KDescendantsProxyModel::mimeData( const QModelIndexList & indexes ) const
+QVariant KDescendantsProxyModel::headerData(int section, Qt::Orientation orientation, int role) const
 {
-  Q_ASSERT(sourceModel());
-  QModelIndexList sourceIndexes;
-  foreach(const QModelIndex& index, indexes)
-    sourceIndexes << mapToSource(index);
-  return sourceModel()->mimeData(sourceIndexes);
-}
+  if (!sourceModel() || columnCount() <= section)
+    return QVariant();
 
-QStringList KDescendantsProxyModel::mimeTypes() const
-{
-  Q_ASSERT(sourceModel());
-  return sourceModel()->mimeTypes();
+  return QAbstractProxyModel::headerData(section, orientation, role);
 }
 
-bool KDescendantsProxyModel::hasChildren ( const QModelIndex & parent ) const
+Qt::ItemFlags KDescendantsProxyModel::flags(const QModelIndex &index) const
 {
-  return rowCount(parent) > 0;
+  if (!index.isValid() || !sourceModel())
+    return QAbstractProxyModel::flags(index);
+
+  const QModelIndex srcIndex = mapToSource(index);
+  Q_ASSERT(srcIndex.isValid());
+  return sourceModel()->flags(srcIndex);
 }
 
-int KDescendantsProxyModel::rowCount(const QModelIndex & proxyIndex) const
+void KDescendantsProxyModelPrivate::sourceRowsAboutToBeInserted(const QModelIndex &parent, int start, int end)
 {
-  Q_D(const KDescendantsProxyModel );
-
-  if (!sourceModel() || proxyIndex.column() > 0)
-    return 0;
-
-  QModelIndex sourceIndex = mapToSource(proxyIndex);
+  Q_Q(KDescendantsProxyModel);
 
-  if (sourceIndex == d->m_rootDescendIndex)
+  if (!q->sourceModel()->hasChildren(parent))
   {
-    int c = d->descendantCount(sourceIndex);
-    return c;
+    // parent was not a parent before.
+    return;
   }
-  return 0;
-}
 
-void KDescendantsProxyModelPrivate::sourceDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight)
-{
-  Q_Q( KDescendantsProxyModel );
-  int topRow = topLeft.row();
-  int bottomRow = bottomRight.row();
+  int proxyStart = -1;
 
-  for(int i = topRow; i <= bottomRow; ++i)
+  const int rowCount = q->sourceModel()->rowCount(parent);
+
+  if (rowCount > start)
   {
-    QModelIndex sourceTopLeft = q->sourceModel()->index(i, topLeft.column(), topLeft.parent());
-    QModelIndex proxyTopLeft = q->mapFromSource(sourceTopLeft);
-    // TODO. If an index does not have any descendants, then we can emit in blocks of rows.
-    // As it is we emit once for each row.
-    QModelIndex sourceBottomRight = q->sourceModel()->index(i, bottomRight.column(), bottomRight.parent());
-    QModelIndex proxyBottomRight = q->mapFromSource(sourceBottomRight);
-    emit q->dataChanged(proxyTopLeft, proxyBottomRight);
+    const QModelIndex belowStart = q->sourceModel()->index(start, 0, parent);
+    proxyStart = q->mapFromSource(belowStart).row();
+  } else if (rowCount == 0)
+  {
+    proxyStart = q->mapFromSource(parent).row() + 1;
+  } else {
+    Q_ASSERT(rowCount == start);
+    static const int column = 0;
+    QModelIndex idx = q->sourceModel()->index(rowCount - 1, column, parent);
+    while (q->sourceModel()->hasChildren(idx))
+    {
+      idx = q->sourceModel()->index(q->sourceModel()->rowCount(idx) - 1, column, idx);
+    }
+    // The last item in the list is getting a sibling below it.
+    proxyStart = q->mapFromSource(idx).row() + 1;
   }
+  const int proxyEnd = proxyStart + (end - start);
+
+  m_insertPair = qMakePair(proxyStart, proxyEnd);
+  q->beginInsertRows(QModelIndex(), proxyStart, proxyEnd);
 }
 
-int KDescendantsProxyModelPrivate::descendantCount(const QModelIndex &sourceIndex, int ignoreTerminals) const
+void KDescendantsProxyModelPrivate::sourceRowsInserted(const QModelIndex &parent, int start, int end)
 {
-  if (sourceIndex.column() > 0)
-    return 0;
+  Q_Q(KDescendantsProxyModel);
 
-  if (ObserveTerminals == ignoreTerminals)
-  {
-    if (m_terminalIndexes.contains(sourceIndex))
-    {
-      return 0;
-    }
-  }
+  const QModelIndex sourceStart = q->sourceModel()->index(start, 0, parent);
+  Q_ASSERT(sourceStart.isValid());
 
-  Q_Q( const KDescendantsProxyModel );
-  if (m_descendantsCount.contains(sourceIndex.internalId()))
-  {
-    return m_descendantsCount.value(sourceIndex.internalId());
-  }
+  const int rowCount = q->sourceModel()->rowCount(parent);
+  Q_ASSERT(rowCount > 0);
 
-  int sourceIndexRowCount = q->sourceModel()->rowCount(sourceIndex);
-  if (sourceIndexRowCount == 0)
-    return 0;
-  int c = 0;
-  c += sourceIndexRowCount;
+  const int difference = end - start + 1;
 
-  int childRow = 0;
-  QModelIndex childIndex = q->sourceModel()->index(childRow, 0, sourceIndex);
-  while (childIndex.isValid())
+  if (rowCount == difference)
   {
-    c += descendantCount(childIndex);
-    childRow++;
-    childIndex = q->sourceModel()->index(childRow, 0, sourceIndex);
+    // @p parent was not a parent before.
+    m_pendingParents.append(parent);
+    scheduleProcessPendingParents();
+    return;
   }
 
-  m_descendantsCount.insert( sourceIndex.internalId(), c );
+  const int proxyStart = m_insertPair.first;
 
-  return c;
-}
+  Q_ASSERT(proxyStart >= 0);
 
-QModelIndex KDescendantsProxyModel::index(int r, int c, const QModelIndex& parent) const
-{
-  Q_D(const KDescendantsProxyModel );
+  updateInternalIndexes(proxyStart, difference);
 
-  if (!sourceModel())
-    return QModelIndex();
+  if (rowCount - 1 == end)
+  {
+    // The previously last row (the mapped one) is no longer the last.
+    // For example,
 
+    // - A            - A           0
+    // - - B          - B           1
+    // - - C          - C           2
+    // - - - D        - D           3
+    // - - - E   ->   - E           4
+    // - - F          - F           5
+    // - - G     ->   - G           6
+    // - H            - H           7
+    // - I       ->   - I           8
 
-  if ( (r < 0) || (c < 0) || (c >= sourceModel()->columnCount() ) )
-    return QModelIndex();
+    // As last children, E, F and G have mappings.
+    // Consider that 'J' is appended to the children of 'C', below 'E'.
 
-  if ( r >= d->descendantCount(parent) )
-    return QModelIndex();
+    // - A            - A           0
+    // - - B          - B           1
+    // - - C          - C           2
+    // - - - D        - D           3
+    // - - - E   ->   - E           4
+    // - - - J        - ???         5
+    // - - F          - F           6
+    // - - G     ->   - G           7
+    // - H            - H           8
+    // - I       ->   - I           9
 
-  // TODO: Use is decended instead?
-  if (parent.isValid())
-    return QModelIndex();
+    // The updateInternalIndexes call above will have updated the F and G mappings correctly because proxyStart is 5.
+    // That means that E -> 4 was not affected by the updateInternalIndexes call.
+    // Now the mapping for E -> 4 needs to be updated so that it's a mapping for J -> 5.
 
-  return createIndex(r, c);
-}
+    Q_ASSERT(!m_mapping.isEmpty());
+    static const int column = 0;
+    const QModelIndex oldIndex = q->sourceModel()->index(rowCount - 1 - difference, column, parent);
+    Q_ASSERT(m_mapping.leftContains(oldIndex));
 
-QModelIndex KDescendantsProxyModel::parent(const QModelIndex& proxyIndex) const
-{
-  Q_UNUSED(proxyIndex);
+    // oldIndex is E in the source. proxyRow is 4.
+    const int proxyRow = m_mapping.takeLeft(oldIndex);
+    const QModelIndex newIndex = q->sourceModel()->index(rowCount - 1, column, parent);
 
-  return QModelIndex();
-}
+    // newIndex is J. (proxyRow + difference) is 5.
+    m_mapping.insert(newIndex, proxyRow + difference);
+  }
 
-int KDescendantsProxyModel::columnCount(const QModelIndex &index) const
-{
-  Q_UNUSED( index );
+  for (int row = start; row <= end; ++row)
+  {
+    static const int column = 0;
+    const QModelIndex idx = q->sourceModel()->index(row, column, parent);
+    Q_ASSERT(idx.isValid());
+    if (q->sourceModel()->hasChildren(idx))
+      m_pendingParents.append(idx);
+  }
 
-  if (!sourceModel())
-    return 0;
+  m_rowCount += difference;
 
-  return sourceModel()->columnCount();
+  scheduleProcessPendingParents();
+  q->endInsertRows();
 }
 
-void KDescendantsProxyModel::setDisplayAncestorData( bool display )
+void KDescendantsProxyModelPrivate::sourceRowsAboutToBeRemoved(const QModelIndex &parent, int start, int end)
 {
-  Q_D(KDescendantsProxyModel);
-  d->m_displayAncestorData = display;
-}
+  Q_Q(KDescendantsProxyModel);
 
-bool KDescendantsProxyModel::displayAncestorData() const
-{
-  Q_D(const KDescendantsProxyModel );
-  return d->m_displayAncestorData;
-}
+  const int proxyStart = q->mapFromSource(q->sourceModel()->index(start, 0, parent)).row();
 
-void KDescendantsProxyModel::setAncestorSeparator( const QString &separator )
-{
-  Q_D(KDescendantsProxyModel);
-  d->m_ancestorSeparator = separator;
-}
+  static const int column = 0;
+  QModelIndex idx = q->sourceModel()->index(end, column, parent);
+  while (q->sourceModel()->hasChildren(idx))
+  {
+    idx = q->sourceModel()->index(q->sourceModel()->rowCount(idx) - 1, column, idx);
+  }
+  const int proxyEnd = q->mapFromSource(idx).row();
 
-QString KDescendantsProxyModel::ancestorSeparator() const
-{
-  Q_D(const KDescendantsProxyModel );
-  return d->m_ancestorSeparator;
-}
+  m_removePair = qMakePair(proxyStart, proxyEnd);
 
-Qt::ItemFlags KDescendantsProxyModel::flags( const QModelIndex &index ) const
-{
-  // if index is invalid, it might be mapped to a valid source index with more flags.
-  // Can't allow that...
-  if (!index.isValid())
-    return 0;
-  return QAbstractProxyModel::flags(index);
+  q->beginRemoveRows(QModelIndex(), proxyStart, proxyEnd);
 }
 
-QModelIndexList KDescendantsProxyModelPrivate::matchDescendants(const QModelIndex &start, int role, const QVariant &value, int hits, Qt::MatchFlags flags, int until, const bool matchAll) const
+void KDescendantsProxyModelPrivate::sourceRowsRemoved(const QModelIndex &parent, int start, int end)
 {
-  Q_Q(const KDescendantsProxyModel);
-  QModelIndexList matches;
+  Q_Q(KDescendantsProxyModel);
+  Q_UNUSED(end)
+
+  const int rowCount = q->sourceModel()->rowCount(parent);
 
-  if (!start.isValid())
-    return matches;
 
-  const int column = start.column();
-  const int firstRow = 0;
-  QModelIndex idx = start;
+  const int proxyStart = m_removePair.first;
+  const int proxyEnd = m_removePair.second;
 
-  while (idx.row() <= until)
+  const int difference = proxyEnd - proxyStart + 1;
   {
-    Q_ASSERT(idx.isValid());
+    Mapping::right_iterator it = m_mapping.rightLowerBound(proxyStart);
+    const Mapping::right_iterator endIt = m_mapping.rightUpperBound(proxyEnd);
 
-    if (q->sourceModel()->hasChildren(idx))
-    {
-      QModelIndex firstChild = idx.child(firstRow, column);
-      matches << q->match(q->mapFromSource(firstChild), role, value, hits, flags);
-      if (!matchAll && (matches.size() >= hits))
-      {
-        return matches.mid(0, hits);
-      }
-    }
-    int row = idx.row();
-    if (row == until)
-    {
-      break;
-    }
-    idx = idx.sibling(row + 1, column);
+    if (endIt != m_mapping.rightEnd())
+      while (it != endIt)
+        it = m_mapping.eraseRight(it);
+    else
+      while (it != m_mapping.rightUpperBound(proxyEnd))
+        it = m_mapping.eraseRight(it);
   }
 
-  return matches;
+  m_removePair = qMakePair(-1, -1);
+  m_rowCount -= difference;
+  Q_ASSERT(m_rowCount >= 0);
+
+  updateInternalIndexes(proxyStart, -1 * difference);
+
+  if (rowCount == start && rowCount != 0)
+  {
+    static const int column = 0;
+    const QModelIndex newIndex = q->sourceModel()->index(rowCount - 1, column, parent);
+    m_mapping.insert(newIndex, proxyStart - 1);
+  }
+
+  q->endRemoveRows();
 }
 
-QModelIndexList KDescendantsProxyModel::match(const QModelIndex& start, int role, const QVariant& value, int hits, Qt::MatchFlags flags) const
+void KDescendantsProxyModelPrivate::sourceRowsAboutToBeMoved(const QModelIndex &srcParent, int srcStart, int srcEnd, const QModelIndex &destParent, int destStart)
 {
-  Q_D(const KDescendantsProxyModel );
+  Q_UNUSED(srcParent)
+  Q_UNUSED(srcStart)
+  Q_UNUSED(srcEnd)
+  Q_UNUSED(destParent)
+  Q_UNUSED(destStart)
+  Q_Q(KDescendantsProxyModel);
+  q->beginResetModel();
+}
 
-  // We only really need to do all this for the AmazingCompletionRole, but there's no clean way to
-  // determine what that is.
+void KDescendantsProxyModelPrivate::sourceRowsMoved(const QModelIndex &srcParent, int srcStart, int srcEnd, const QModelIndex &destParent, int destStart)
+{
+  Q_UNUSED(srcParent)
+  Q_UNUSED(srcStart)
+  Q_UNUSED(srcEnd)
+  Q_UNUSED(destParent)
+  Q_UNUSED(destStart)
+  Q_Q(KDescendantsProxyModel);
+  resetInternalData();
+  q->endResetModel();
+}
 
-  QModelIndexList sourceList;
-  QModelIndexList proxyList;
+void KDescendantsProxyModelPrivate::sourceModelAboutToBeReset()
+{
+  Q_Q(KDescendantsProxyModel);
+  q->beginResetModel();
+}
 
-  QModelIndex beginIndex = start;
-  QModelIndex sourceStart = mapToSource(start);
-  QModelIndex parent = sourceModel()->parent(sourceStart);
+void KDescendantsProxyModelPrivate::sourceModelReset()
+{
+  Q_Q(KDescendantsProxyModel);
+  resetInternalData();
+  if (q->sourceModel()->hasChildren())
+  {
+    m_pendingParents.append(QModelIndex());
+    scheduleProcessPendingParents();
+  }
+  q->endResetModel();
+}
 
-  int parentRowCount = sourceModel()->rowCount(sourceModel()->parent(sourceStart));
+void KDescendantsProxyModelPrivate::sourceLayoutAboutToBeChanged()
+{
+  Q_Q(KDescendantsProxyModel);
 
-  const bool matchAll = (hits == -1);
-  const int firstHit = 1;
-  const int column = start.column();
-  const int proxyRowCount = rowCount();
+  if (m_ignoreNextLayoutChanged) {
+      m_ignoreNextLayoutChanged = false;
+      return;
+  }
 
-  Q_ASSERT(sourceStart.column() == start.column());
-  sourceList = sourceModel()->match(sourceStart, role, value, firstHit, flags);
+  if (m_mapping.isEmpty())
+    return;
 
-  int lastRow;
-  if (sourceList.isEmpty())
-  {
-    lastRow = parentRowCount - 1;
-    proxyList = d->matchDescendants(mapToSource(start), role, value, hits, flags, lastRow, matchAll);
+  QPersistentModelIndex srcPersistentIndex;
+  foreach(const QPersistentModelIndex &proxyPersistentIndex, q->persistentIndexList()) {
+      m_proxyIndexes << proxyPersistentIndex;
+      Q_ASSERT(proxyPersistentIndex.isValid());
+      srcPersistentIndex = q->mapToSource(proxyPersistentIndex);
+      Q_ASSERT(srcPersistentIndex.isValid());
+      m_layoutChangePersistentIndexes << srcPersistentIndex;
+  }
 
-    if (matchAll)
-      return proxyList;
+  q->layoutAboutToBeChanged();
+}
 
-    return proxyList.mid(0, hits);
+void KDescendantsProxyModelPrivate::sourceLayoutChanged()
+{
+  Q_Q(KDescendantsProxyModel);
 
-  } else {
-    forever
-    {
-      QModelIndex firstIndexHit;
-      if (sourceList.isEmpty())
-      {
-        lastRow = parentRowCount - 1;
-      } else {
-        firstIndexHit = sourceList.first();
+  if (m_ignoreNextLayoutAboutToBeChanged) {
+      m_ignoreNextLayoutAboutToBeChanged = false;
+      return;
+  }
 
-        Q_ASSERT(firstIndexHit.column() == start.column());
+  if (m_mapping.isEmpty())
+    return;
 
-        lastRow = firstIndexHit.row() - 1;
-      }
+  m_rowCount = 0;
 
-      proxyList << d->matchDescendants(sourceStart, role, value, hits, flags, lastRow, matchAll);
+  synchronousMappingRefresh();
 
-      if (sourceList.isEmpty())
-        break;
+  for (int i = 0; i < m_proxyIndexes.size(); ++i) {
+      q->changePersistentIndex(m_proxyIndexes.at(i), q->mapFromSource(m_layoutChangePersistentIndexes.at(i)));
+  }
 
-      QModelIndex proxyFirst = mapFromSource(firstIndexHit);
-      proxyList << proxyFirst;
+  m_layoutChangePersistentIndexes.clear();
+  m_proxyIndexes.clear();
 
-      if (!matchAll && ( proxyList.size() >= hits))
-      {
-        return proxyList.mid(0, hits);
-      }
+  q->layoutChanged();
+}
 
-      if (proxyFirst.row() == proxyRowCount - 1)
-        break;
+void KDescendantsProxyModelPrivate::sourceDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight)
+{
+  Q_Q(KDescendantsProxyModel);
 
-      sourceStart = mapToSource(index(proxyFirst.row() + 1, proxyFirst.column()));
-      Q_ASSERT(sourceStart.isValid());
+  const int topRow = topLeft.row();
+  const int bottomRow = bottomRight.row();
 
-      sourceList = sourceModel()->match(sourceStart, role, value, firstHit, flags);
-    }
+  for(int i = topRow; i <= bottomRow; ++i)
+  {
+    const QModelIndex sourceTopLeft = q->sourceModel()->index(i, topLeft.column(), topLeft.parent());
+    const QModelIndex proxyTopLeft = q->mapFromSource(sourceTopLeft);
+    // TODO. If an index does not have any descendants, then we can emit in blocks of rows.
+    // As it is we emit once for each row.
+    const QModelIndex sourceBottomRight = q->sourceModel()->index(i, bottomRight.column(), bottomRight.parent());
+    const QModelIndex proxyBottomRight = q->mapFromSource(sourceBottomRight);
+    emit q->dataChanged(proxyTopLeft, proxyBottomRight);
   }
+}
 
-  QModelIndex nextStart = start.sibling(start.row() + parentRowCount + 1, column);
-  if (nextStart.isValid())
-    proxyList << match(nextStart, role, value, hits, flags);
-
-  if (matchAll)
-    return proxyList;
-
-  return proxyList.mid(0, hits);
+void KDescendantsProxyModelPrivate::sourceModelDestroyed()
+{
+  Q_Q(KDescendantsProxyModel);
+  resetInternalData();
+  q->endResetModel();
 }
 
-Qt::DropActions KDescendantsProxyModel::supportedDropActions() const
+QMimeData* KDescendantsProxyModel::mimeData( const QModelIndexList & indexes ) const
 {
+  if (!sourceModel())
+    return QAbstractProxyModel::mimeData(indexes);
   Q_ASSERT(sourceModel());
-  return sourceModel()->supportedDropActions();
+  QModelIndexList sourceIndexes;
+  foreach(const QModelIndex& index, indexes)
+    sourceIndexes << mapToSource(index);
+  return sourceModel()->mimeData(sourceIndexes);
 }
 
-void KDescendantsProxyModelPrivate::sourceModelDestroyed()
+QStringList KDescendantsProxyModel::mimeTypes() const
 {
+  if (!sourceModel())
+    return QAbstractProxyModel::mimeTypes();
+  Q_ASSERT(sourceModel());
+  return sourceModel()->mimeTypes();
+}
 
+Qt::DropActions KDescendantsProxyModel::supportedDropActions() const
+{
+  if (!sourceModel())
+    return QAbstractProxyModel::supportedDropActions();
+  return sourceModel()->supportedDropActions();
 }
 
 #include "moc_kdescendantsproxymodel_p.cpp"
--- akonadi/collectionstatisticsdelegate.cpp
+++ akonadi/collectionstatisticsdelegate.cpp
@@ -159,11 +159,30 @@
   }
 }
 
+class PainterStateSaver
+{
+  public:
+    PainterStateSaver( QPainter *painter )
+    {
+      mPainter = painter;
+      mPainter->save();
+    }
+
+    ~PainterStateSaver()
+    {
+      mPainter->restore();
+    }
+
+  private:
+    QPainter *mPainter;
+};
+
 void CollectionStatisticsDelegate::paint( QPainter *painter,
                                           const QStyleOptionViewItem &option,
                                           const QModelIndex &index ) const
 {
   Q_D( const CollectionStatisticsDelegate );
+  PainterStateSaver stateSaver( painter );
 
   // First, paint the basic, but without the text. We remove the text
   // in initStyleOption(), which gets called by QStyledItemDelegate::paint().
@@ -186,7 +205,6 @@
   bool expanded = d->parent->isExpanded( firstColumn );
 
   if ( option.state & QStyle::State_Selected ) {
-    painter->save();
     painter->setPen( option.palette.highlightedText().color() );
   }
 
@@ -214,7 +232,7 @@
         unread = QString( QLatin1String( " (%1)" ) ).arg( unreadCount );
     }
 
-    painter->save();
+    PainterStateSaver stateSaver( painter );
 
     if ( !unread.isEmpty() ) {
       QFont font = painter->font();
@@ -245,11 +263,7 @@
                                    foreground( KColorScheme::LinkText ).color();
     painter->setPen( unreadColor );
     painter->drawText( unreadRect, Qt::AlignLeft, unread );
-    painter->restore();
 
-    if ( option.state & QStyle::State_Selected ) {
-      painter->restore();
-    }
     return;
   }
 
@@ -257,7 +271,7 @@
   // is collapsed
   if ( ( index.column() == 1 || index.column() == 2 ) ) {
 
-    painter->save();
+    PainterStateSaver stateSaver( painter );
 
     QStyleOptionViewItem opt = option;
 
@@ -277,19 +291,11 @@
     }
 
     painter->drawText( textRect, Qt::AlignRight, sumText );
-    painter->restore();
 
-    if ( option.state & QStyle::State_Selected ) {
-      painter->restore();
-    }
     return;
   }
 
   painter->drawText( textRect, option4.displayAlignment, text );
-
-  if ( option.state & QStyle::State_Selected ) {
-    painter->restore();
-  }
 }
 
 #include "collectionstatisticsdelegate.moc"
--- akonadi/specialcollections_p.h
+++ akonadi/specialcollections_p.h
@@ -81,6 +81,8 @@
     bool mBatchMode;
     QSet<QString> mToEmitChangedFor;
     Monitor *mMonitor;
+
+    mutable QString mDefaultResourceId;
 };
 
 } // namespace Akonadi
--- akonadi/subscriptionmodel.cpp
+++ akonadi/subscriptionmodel.cpp
@@ -67,7 +67,7 @@
     bool isSubscribable( Collection::Id id )
     {
       Collection col = q->collectionForId( id );
-      if ( CollectionUtils::isVirtualParent( col ) || CollectionUtils::isStructural( col ) )
+      if ( CollectionUtils::isStructural( col ) || CollectionUtils::isVirtual( col ) )
         return false;
       if ( col.hasAttribute<SpecialCollectionAttribute>() )
         return false;
--- akonadi/contact/editor/imeditwidget.cpp
+++ akonadi/contact/editor/imeditwidget.cpp
@@ -20,6 +20,7 @@
 */
 
 #include "imeditwidget.h"
+#include "customfieldseditwidget.h"
 
 #include "im/imeditordialog.h"
 #include "im/improtocols.h"
@@ -32,20 +33,6 @@
 #include <klineedit.h>
 #include <klocale.h>
 
-static void splitCustomField( const QString &str, QString &app, QString &name, QString &value )
-{
-  const int colon = str.indexOf( QLatin1Char( ':' ) );
-  if ( colon != -1 ) {
-    const QString tmp = str.left( colon );
-    value = str.mid( colon + 1 );
-
-    const int dash = tmp.indexOf( QLatin1Char( '-' ) );
-    if ( dash != -1 ) {
-      app = tmp.left( dash );
-      name = tmp.mid( dash + 1 );
-    }
-  }
-}
 
 IMEditWidget::IMEditWidget( QWidget *parent )
   : QWidget( parent )
--- akonadi/contact/editor/customfieldseditwidget.h
+++ akonadi/contact/editor/customfieldseditwidget.h
@@ -33,6 +33,8 @@
 class QPushButton;
 class QTreeView;
 
+void splitCustomField(  const QString &str, QString &app, QString &name, QString &value );
+
 class CustomFieldsEditWidget : public QWidget
 {
   Q_OBJECT
--- akonadi/contact/editor/customfieldseditwidget.cpp
+++ akonadi/contact/editor/customfieldseditwidget.cpp
@@ -36,7 +36,7 @@
 #include <QtGui/QPushButton>
 #include <QtGui/QTreeView>
 
-static void splitCustomField( const QString &str, QString &app, QString &name, QString &value )
+void splitCustomField( const QString &str, QString &app, QString &name, QString &value )
 {
   const int colon = str.indexOf( QLatin1Char( ':' ) );
   if ( colon != -1 ) {
--- akonadi/contact/editor/im/protocols/jabberprotocol.desktop
+++ akonadi/contact/editor/im/protocols/jabberprotocol.desktop
@@ -14,7 +14,6 @@
 Comment[es]=Protocolo Jabber
 Comment[et]=Jabberi protokoll
 Comment[fr]=Protocole Jabber
-Comment[ga]=Prótacal Jabber
 Comment[km]=ពិធីការ Jabber
 Comment[nb]=Jabber-protokoll
 Comment[nds]=Jabber-Protokoll
@@ -44,7 +43,6 @@
 Name[es]=Jabber
 Name[et]=Jabber
 Name[fr]=Jabber
-Name[ga]=Jabber
 Name[km]=Jabber
 Name[nb]=Jabber
 Name[nds]=Jabber
--- akonadi/contact/editor/im/protocols/aimprotocol.desktop
+++ akonadi/contact/editor/im/protocols/aimprotocol.desktop
@@ -14,7 +14,6 @@
 Comment[es]=Protocolo AIM
 Comment[et]=AIM protokoll
 Comment[fr]=Protocole AIM
-Comment[ga]=Prótacal AIM
 Comment[km]=ពិធីការ AIM 
 Comment[nb]=AIM-protokoll
 Comment[nds]=AIM-Protokoll
@@ -44,7 +43,6 @@
 Name[es]=AIM
 Name[et]=AIM
 Name[fr]=AIM
-Name[ga]=AIM
 Name[km]=AIM
 Name[nb]=AIM
 Name[nds]=AIM
--- akonadi/contact/editor/im/protocols/meanwhileprotocol.desktop
+++ akonadi/contact/editor/im/protocols/meanwhileprotocol.desktop
@@ -14,7 +14,6 @@
 Comment[es]=Protocolo Meanwhile
 Comment[et]=Meanwhile'i protokoll
 Comment[fr]=Protocole Meanwhile
-Comment[ga]=Prótacal Meanwhile
 Comment[km]=ពិធីការ Meanwhile
 Comment[nb]=Meanwhile-protokoll
 Comment[nds]=Meanwhile-Protokoll
@@ -43,7 +42,6 @@
 Name[es]=Meanwhile
 Name[et]=Meanwhile
 Name[fr]=Meanwhile
-Name[ga]=Meanwhile
 Name[km]=Meanwhile
 Name[nb]=Meanwhile
 Name[nds]=Meanwhile
--- akonadi/contact/editor/im/protocols/skypeprotocol.desktop
+++ akonadi/contact/editor/im/protocols/skypeprotocol.desktop
@@ -14,7 +14,6 @@
 Comment[es]=Telefonía por internet de Skype
 Comment[et]=Internetitelefon Skype
 Comment[fr]=Téléphonie sur internet Skype
-Comment[ga]=Teileafónaíocht Idirlín Skype
 Comment[km]=ទូរស័ព្ទតាមអ៊ីនធឺណិត Skype
 Comment[nb]=Skype IP-telefoni
 Comment[nds]=Internet-Telefoneren mit Skype
@@ -42,7 +41,6 @@
 Name[es]=Skype
 Name[et]=Skype
 Name[fr]=Skype
-Name[ga]=Skype
 Name[km]=Skype
 Name[nb]=Skype
 Name[nds]=Skype
--- akonadi/contact/editor/im/protocols/icqprotocol.desktop
+++ akonadi/contact/editor/im/protocols/icqprotocol.desktop
@@ -14,7 +14,6 @@
 Comment[es]=Protocolo ICQ
 Comment[et]=ICQ protokoll
 Comment[fr]=Protocole ICQ
-Comment[ga]=Prótacal ICQ
 Comment[km]=ពិធីការ ICQ
 Comment[nb]=ICQ-protokoll
 Comment[nds]=ICQ-Protokoll
@@ -44,7 +43,6 @@
 Name[es]=ICQ
 Name[et]=ICQ
 Name[fr]=ICQ
-Name[ga]=ICQ
 Name[km]=ICQ
 Name[nb]=ICQ
 Name[nds]=ICQ
--- akonadi/contact/editor/im/protocols/ircprotocol.desktop
+++ akonadi/contact/editor/im/protocols/ircprotocol.desktop
@@ -13,7 +13,6 @@
 Comment[eo]=Interreta plusenda babilado
 Comment[et]=Rühmadiskussioon internetis
 Comment[fr]=Relai Internet de discussion
-Comment[ga]=Internet Relay Chat
 Comment[km]=ជជែកកំសាន្តបញ្ជូនតាមអ៊ីនធឺណិត
 Comment[nb]=Internet Relay Chat
 Comment[nds]=Klöönsnack (Internet Relay Chat)
@@ -41,7 +40,6 @@
 Name[es]=IRC
 Name[et]=IRC
 Name[fr]=IRC
-Name[ga]=IRC
 Name[km]=IRC
 Name[nb]=IRC
 Name[nds]=IRC
--- akonadi/contact/editor/im/protocols/msnprotocol.desktop
+++ akonadi/contact/editor/im/protocols/msnprotocol.desktop
@@ -14,7 +14,6 @@
 Comment[es]=MSN Messenger
 Comment[et]=MSN Messenger
 Comment[fr]=Messagerie MSN
-Comment[ga]=MSN Messenger
 Comment[km]=កម្មវិធីផ្ញើសារ MSN
 Comment[nb]=MSN Messenger
 Comment[nds]=MSN-Kortnarichtenmaker
@@ -42,7 +41,6 @@
 Name[es]=MSN Messenger
 Name[et]=MSN Messenger
 Name[fr]=Messagerie MSN
-Name[ga]=MSN Messenger
 Name[km]=កម្មវិធីផ្ញើសារ MSN
 Name[nb]=MSN Messenger
 Name[nds]=MSN-Kortnarichtenmaker
--- akonadi/contact/editor/im/protocols/yahooprotocol.desktop
+++ akonadi/contact/editor/im/protocols/yahooprotocol.desktop
@@ -14,7 +14,6 @@
 Comment[es]=Protocolo Yahoo
 Comment[et]=Yahoo protokoll
 Comment[fr]=Protocole Yahoo
-Comment[ga]=Prótacal Yahoo
 Comment[km]=ពិធីការយ៉ាហ៊ូ
 Comment[nb]=Yahoo-protokoll
 Comment[nds]=Yahoo-Protokoll
@@ -43,7 +42,6 @@
 Name[es]=Yahoo
 Name[et]=Yahoo
 Name[fr]=Yahoo
-Name[ga]=Yahoo
 Name[km]=យ៉ាហ៊ូ
 Name[nb]=Yahoo
 Name[nds]=Yahoo
--- akonadi/contact/editor/im/protocols/gaduprotocol.desktop
+++ akonadi/contact/editor/im/protocols/gaduprotocol.desktop
@@ -14,7 +14,6 @@
 Comment[es]=Protocolo Gadu-Gadu
 Comment[et]=Gadu-Gadu protokoll
 Comment[fr]=Protocole Gadu-Gadu
-Comment[ga]=Prótacal Gadu-Gadu
 Comment[km]=ពិធីការ Gadu-Gadu
 Comment[nb]=Gadu-Gadu-protokoll
 Comment[nds]=Gadu-Gadu-Protokoll
@@ -44,7 +43,6 @@
 Name[es]=Gadu-Gadu
 Name[et]=Gadu-Gadu
 Name[fr]=Gadu-Gadu
-Name[ga]=Gadu-Gadu
 Name[km]=Gadu-Gadu
 Name[nb]=Gadu-Gadu
 Name[nds]=Gadu-Gadu
--- akonadi/contact/editor/im/protocols/smsprotocol.desktop
+++ akonadi/contact/editor/im/protocols/smsprotocol.desktop
@@ -14,7 +14,6 @@
 Comment[es]=Protocolo SMS
 Comment[et]=SMS protokoll
 Comment[fr]=Protocole SMS
-Comment[ga]=Prótacal SMS
 Comment[km]=ពិធីការ SMS 
 Comment[nb]=SMS Protokoll
 Comment[nds]=SMS-Protokoll
@@ -43,7 +42,6 @@
 Name[es]=SMS
 Name[et]=SMS
 Name[fr]=SMS
-Name[ga]=SMS
 Name[km]=SMS
 Name[nb]=SMS
 Name[nds]=SMS
--- akonadi/contact/editor/im/protocols/groupwiseprotocol.desktop
+++ akonadi/contact/editor/im/protocols/groupwiseprotocol.desktop
@@ -13,7 +13,6 @@
 Comment[eo]=Novell GroupWise mesaĝilo
 Comment[et]=Novell GroupWise Messenger
 Comment[fr]=Messagerie GroupWise Novell
-Comment[ga]=Teachtaire Novell GroupWise
 Comment[km]=កម្មវិធីផ្ញើសាររបស់ Novell GroupWise
 Comment[nb]=Novell GroupWise meldingsprogram
 Comment[nds]=Novell-GroupWise-Kortnarichtenmaker
@@ -41,7 +40,6 @@
 Name[eo]=GroupWise
 Name[et]=GroupWise
 Name[fr]=GroupWise
-Name[ga]=GroupWise
 Name[km]=GroupWise
 Name[nb]=GroupWise
 Name[nds]=GroupWise
--- akonadi/contact/editor/im/kaddressbookimprotocol.desktop
+++ akonadi/contact/editor/im/kaddressbookimprotocol.desktop
@@ -13,7 +13,6 @@
 Name[es]=Protocolo de mensajería instantánea de KAddressbook
 Name[et]=KDE aadressiraamatu kiirsuhtlusprotokoll
 Name[fr]=Protocole de messagerie instantanée KAdressbook
-Name[ga]=Prótacal Teachtaireachtaí Meandaracha KAddressbook
 Name[km]=ពិធីការផ្ញើសារបន្ទាន់របស់ KAddressbook
 Name[nb]=KAdressbook lynmeldingsprotokoll
 Name[nds]=KAddressbook-Kortnarichten-Protokoll
--- akonadi/progressspinnerdelegate_p.h
+++ akonadi/progressspinnerdelegate_p.h
@@ -59,7 +59,7 @@
       { return index == other.index; }
 
 
-      inline void animate() const { frame = ++frame % sCount; }
+      inline void animate() const { frame = ( frame + 1 ) % sCount; }
       mutable int frame;
       QPersistentModelIndex index;
   };

Places

File 4_5_BRANCH.diff of Package kdepimlibs4 (Revision fea019f988777a01e9d227e47e72468a)

Places