make use of initializer lists

[dolphin.git] / src / tests / kfileitemmodelbenchmark.cpp

diff --git a/src/tests/kfileitemmodelbenchmark.cpp b/src/tests/kfileitemmodelbenchmark.cpp
index f72e43edeb982a42518604c9b7918758d21d697f..43d7173de60662356de94ac53cb60cabf0254800 100644 (file)
--- a/src/tests/kfileitemmodelbenchmark.cpp
+++ b/src/tests/kfileitemmodelbenchmark.cpp
@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 

-#include <qtest_kde.h>
-
+#include <qtest.h>
+#include <QSignalSpy>

 #include "kitemviews/kfileitemmodel.h"
 #include "kitemviews/private/kfileitemmodelsortalgorithm.h"
 
 #include "kitemviews/kfileitemmodel.h"
 #include "kitemviews/private/kfileitemmodelsortalgorithm.h"
 


@@ -167,7 +167,7 @@ void KFileItemModelBenchmark::insertAndRemoveManyItems()
     // Avoid overhead caused by natural sorting
     // and determining the isDir/isLink roles.
     model.m_naturalSorting = false;
     // Avoid overhead caused by natural sorting
     // and determining the isDir/isLink roles.
     model.m_naturalSorting = false;

-    model.setRoles(QSet<QByteArray>() << "text");
+    model.setRoles({"text"});

 
     QSignalSpy spyItemsInserted(&model, SIGNAL(itemsInserted(KItemRangeList)));
     QSignalSpy spyItemsRemoved(&model, SIGNAL(itemsRemoved(KItemRangeList)));
 
     QSignalSpy spyItemsInserted(&model, SIGNAL(itemsInserted(KItemRangeList)));
     QSignalSpy spyItemsRemoved(&model, SIGNAL(itemsRemoved(KItemRangeList)));


@@ -185,7 +185,7 @@ void KFileItemModelBenchmark::insertAndRemoveManyItems()
         QCOMPARE(model.count(), initialItems.count() + newItems.count());
 
         if (!removedItems.isEmpty()) {
         QCOMPARE(model.count(), initialItems.count() + newItems.count());
 
         if (!removedItems.isEmpty()) {

-            model.removeItems(removedItems, KFileItemModel::DeleteItemData);
+            model.slotItemsDeleted(removedItems);

         }
         QCOMPARE(model.count(), initialItems.count() + newItems.count() - removedItems.count());
     }
         }
         QCOMPARE(model.count(), initialItems.count() + newItems.count() - removedItems.count());
     }


@@ -322,13 +322,12 @@ KFileItemList KFileItemModelBenchmark::createFileItemList(const QStringList& fil
 
     KFileItemList result;
     foreach (const QString& name, fileNames) {
 
     KFileItemList result;
     foreach (const QString& name, fileNames) {

-        const KUrl url(prefix + name);
-        const KFileItem item(url, QString(), KFileItem::Unknown);
+        const KFileItem item(QUrl::fromLocalFile(prefix + name), QString(), KFileItem::Unknown);

         result << item;
     }
     return result;
 }
 
         result << item;
     }
     return result;
 }
 

-QTEST_KDEMAIN(KFileItemModelBenchmark, NoGUI)
+QTEST_MAIN(KFileItemModelBenchmark)

 
 #include "kfileitemmodelbenchmark.moc"
 
 #include "kfileitemmodelbenchmark.moc"