Port Dolphin away from KApplication, KCmdLineArgs and K4AboutData

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

diff --git a/src/tests/kfileitemmodelbenchmark.cpp b/src/tests/kfileitemmodelbenchmark.cpp
index 0da1137c40afb5200fba1e9b79338467727bbda8..c970a7198c422db41c558a88a5d573bd70172b28 100644 (file)
--- a/src/tests/kfileitemmodelbenchmark.cpp
+++ b/src/tests/kfileitemmodelbenchmark.cpp
@@ -18,15 +18,17 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 

-#include <qtest.h>
+#include <QTest>

 #include <QSignalSpy>
 #include <QSignalSpy>

+
+#include <algorithm>
+#include <random>
+

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

-#include <KRandomSequence>
-

 void myMessageOutput(QtMsgType type, const char* msg)
 {
     switch (type) {
 void myMessageOutput(QtMsgType type, const char* msg)
 {
     switch (type) {


@@ -45,10 +47,6 @@ void myMessageOutput(QtMsgType type, const char* msg)
     }
 }
 
     }
 }
 

-namespace {
-    const int DefaultTimeout = 5000;
-};
-

 Q_DECLARE_METATYPE(KFileItemList)
 Q_DECLARE_METATYPE(KItemRangeList)
 
 Q_DECLARE_METATYPE(KFileItemList)
 Q_DECLARE_METATYPE(KItemRangeList)
 


@@ -167,7 +165,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)));


@@ -294,8 +292,9 @@ void KFileItemModelBenchmark::insertManyChildItems()
     }
 
     // Bring the items into random order.
     }
 
     // Bring the items into random order.

-    KRandomSequence randomSequence(0);
-    randomSequence.randomize(newItems);
+    std::random_device rd;
+    std::mt19937 g(rd());
+    std::shuffle(newItems.begin(), newItems.end(), g);

 
     // Measure how long it takes to insert and then remove all files.
     QBENCHMARK {
 
     // Measure how long it takes to insert and then remove all files.
     QBENCHMARK {