From: Frank Reininghaus <frank78ac@googlemail.com>
Date: Mon, 9 Sep 2013 19:21:43 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/KDE/4.11'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/258f0f60feb76876c846294c23121d41997ddc34

Merge remote-tracking branch 'origin/KDE/4.11'

The most recent commit from the KDE/4.11 branch (new unit test) had to
be modified slightly due to the changed signal emission when resorting
the model changes only the groups, and not the order of the items
(groupsChaged instead of itemsMoved).
---

258f0f60feb76876c846294c23121d41997ddc34
diff --cc src/tests/kfileitemmodeltest.cpp
index 1d9646b3e,b0a27cd01..797920246
--- a/src/tests/kfileitemmodeltest.cpp
+++ b/src/tests/kfileitemmodeltest.cpp
@@@ -1286,6 -1246,24 +1286,24 @@@ void KFileItemModelTest::testNameRoleGr
      expectedGroups << QPair<int, QVariant>(2, QLatin1String("D"));
      expectedGroups << QPair<int, QVariant>(3, QLatin1String("E"));
      QCOMPARE(m_model->groups(), expectedGroups);
+ 
+     // Change d.txt back to c.txt, but this time using the dir lister's refreshItems() signal.
+     const KFileItem fileItemD = m_model->fileItem(2);
+     KFileItem fileItemC = fileItemD;
+     KUrl urlC = fileItemC.url();
+     urlC.setFileName("c.txt");
+     fileItemC.setUrl(urlC);
+ 
+     m_model->slotRefreshItems(QList<QPair<KFileItem, KFileItem> >() << qMakePair(fileItemD, fileItemC));
 -    QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsMoved(KItemRange,QList<int>)), DefaultTimeout));
++    QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(groupsChanged()), DefaultTimeout));
+     QCOMPARE(itemsInModel(), QStringList() << "a.txt" << "b.txt" << "c.txt" << "e.txt");
+ 
+     expectedGroups.clear();
+     expectedGroups << QPair<int, QVariant>(0, QLatin1String("A"));
+     expectedGroups << QPair<int, QVariant>(1, QLatin1String("B"));
+     expectedGroups << QPair<int, QVariant>(2, QLatin1String("C"));
+     expectedGroups << QPair<int, QVariant>(3, QLatin1String("E"));
+     QCOMPARE(m_model->groups(), expectedGroups);
  }
  
  QStringList KFileItemModelTest::itemsInModel() const