Port away from deprecated qrand()

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

diff --git a/src/tests/kfileitemmodeltest.cpp b/src/tests/kfileitemmodeltest.cpp
index b455c521dd4fc8cfc9d5eb1e920d80e83119c77f..7e949c34f71f5feb79558842c95b93b3dd431b4b 100644 (file)
--- a/src/tests/kfileitemmodeltest.cpp
+++ b/src/tests/kfileitemmodeltest.cpp
@@ -18,6 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 

+#include <QRandomGenerator>

 #include <QTest>
 #include <QSignalSpy>
 #include <QTimer>
 #include <QTest>
 #include <QSignalSpy>
 #include <QTimer>


@@ -31,7 +32,7 @@
 
 void myMessageOutput(QtMsgType type, const QMessageLogContext& context, const QString& msg)
 {
 
 void myMessageOutput(QtMsgType type, const QMessageLogContext& context, const QString& msg)
 {

-    Q_UNUSED(context);
+    Q_UNUSED(context)

 
     switch (type) {
     case QtDebugMsg:
 
     switch (type) {
     case QtDebugMsg:


@@ -450,9 +451,9 @@ void KFileItemModelTest::testModelConsistencyWhenInsertingItems()
         itemsInsertedSpy.clear();
 
         for (int j = 0; j < 10; ++j) {
         itemsInsertedSpy.clear();
 
         for (int j = 0; j < 10; ++j) {

-            int itemName = qrand();
+            int itemName = QRandomGenerator::global()->generate();

             while (insertedItems.contains(itemName)) {
             while (insertedItems.contains(itemName)) {

-                itemName = qrand();
+                itemName = QRandomGenerator::global()->generate();

             }
             insertedItems.insert(itemName);
 
             }
             insertedItems.insert(itemName);
 


@@ -460,7 +461,7 @@ void KFileItemModelTest::testModelConsistencyWhenInsertingItems()
         }
 
         m_model->m_dirLister->updateDirectory(m_testDir->url());
         }
 
         m_model->m_dirLister->updateDirectory(m_testDir->url());

-        if (itemsInsertedSpy.count() == 0) {
+        if (itemsInsertedSpy.isEmpty()) {

             QVERIFY(itemsInsertedSpy.wait());
         }
 
             QVERIFY(itemsInsertedSpy.wait());
         }
 


@@ -1551,25 +1552,26 @@ void KFileItemModelTest::testChangeSortRoleWhileFiltering()
 {
     KFileItemList items;
 
 {
     KFileItemList items;
 

-    KIO::UDSEntry entry;
-    entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, 0100000);    // S_IFREG might not be defined on non-Unix platforms.
-    entry.insert(KIO::UDSEntry::UDS_ACCESS, 07777);
-    entry.insert(KIO::UDSEntry::UDS_SIZE, 0);
-    entry.insert(KIO::UDSEntry::UDS_MODIFICATION_TIME, 0);
-    entry.insert(KIO::UDSEntry::UDS_GROUP, "group");
-    entry.insert(KIO::UDSEntry::UDS_ACCESS_TIME, 0);
-
-    entry.insert(KIO::UDSEntry::UDS_NAME, "a.txt");
-    entry.insert(KIO::UDSEntry::UDS_USER, "user-b");
-    items.append(KFileItem(entry, m_testDir->url(), false, true));
-
-    entry.insert(KIO::UDSEntry::UDS_NAME, "b.txt");
-    entry.insert(KIO::UDSEntry::UDS_USER, "user-c");
-    items.append(KFileItem(entry, m_testDir->url(), false, true));
-
-    entry.insert(KIO::UDSEntry::UDS_NAME, "c.txt");
-    entry.insert(KIO::UDSEntry::UDS_USER, "user-a");
-    items.append(KFileItem(entry, m_testDir->url(), false, true));
+    KIO::UDSEntry entry[3];
+
+    entry[0].fastInsert(KIO::UDSEntry::UDS_NAME, "a.txt");
+    entry[0].fastInsert(KIO::UDSEntry::UDS_USER, "user-b");
+
+    entry[1].fastInsert(KIO::UDSEntry::UDS_NAME, "b.txt");
+    entry[1].fastInsert(KIO::UDSEntry::UDS_USER, "user-c");
+
+    entry[2].fastInsert(KIO::UDSEntry::UDS_NAME, "c.txt");
+    entry[2].fastInsert(KIO::UDSEntry::UDS_USER, "user-a");
+
+    for (int i = 0; i < 3; ++i) {
+        entry[i].fastInsert(KIO::UDSEntry::UDS_FILE_TYPE, 0100000);    // S_IFREG might not be defined on non-Unix platforms.
+        entry[i].fastInsert(KIO::UDSEntry::UDS_ACCESS, 07777);
+        entry[i].fastInsert(KIO::UDSEntry::UDS_SIZE, 0);
+        entry[i].fastInsert(KIO::UDSEntry::UDS_MODIFICATION_TIME, 0);
+        entry[i].fastInsert(KIO::UDSEntry::UDS_GROUP, "group");
+        entry[i].fastInsert(KIO::UDSEntry::UDS_ACCESS_TIME, 0);
+        items.append(KFileItem(entry[i], m_testDir->url(), false, true));
+    }

 
     m_model->slotItemsAdded(m_testDir->url(), items);
     m_model->slotCompleted();
 
     m_model->slotItemsAdded(m_testDir->url(), items);
     m_model->slotCompleted();