X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/fa988586bc923b33497cbc97aaac07fc93a4ca83..fd1a078cc4f5375c856ec49e05c0a33099db8861:/src/tests/kitemsettest.cpp

diff --git a/src/tests/kitemsettest.cpp b/src/tests/kitemsettest.cpp
index 9cc02d060..27f8413a7 100644
--- a/src/tests/kitemsettest.cpp
+++ b/src/tests/kitemsettest.cpp
@@ -17,13 +17,11 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include <qtest.h>
-
 #include "kitemviews/kitemset.h"
 
-#include <QVector>
+#include <QTest>
 
-Q_DECLARE_METATYPE(KItemRangeList);
+Q_DECLARE_METATYPE(KItemRangeList)
 
 /**
  * Converts a KItemRangeList to a KItemSet.
@@ -73,14 +71,14 @@ QVector<int> KItemRangeList2QVector(const KItemRangeList& itemRanges)
 static QSet<int> KItemSet2QSet(const KItemSet& itemSet)
 {
     QSet<int> result;
-    foreach (int i, itemSet) {
+    for (int i : itemSet) {
         result.insert(i);
     }
 
     // Check that the conversion was successful.
     Q_ASSERT(itemSet.count() == result.count());
 
-    foreach (int i, itemSet) {
+    for (int i : itemSet) {
         Q_ASSERT(result.contains(i));
     }
 
@@ -240,7 +238,7 @@ void KItemSetTest::testIterators()
     QCOMPARE(testQVector, itemsQVector);
 
     testQVector.clear();
-    foreach (int i, itemSet) {
+    for (int i : itemSet) {
         testQVector.append(i);
     }
     QCOMPARE(testQVector, itemsQVector);
@@ -328,7 +326,7 @@ void KItemSetTest::testFind_data()
 
 /**
  * Test all functions that find items:
- * contais(int), find(int), constFind(int)
+ * contains(int), find(int), constFind(int)
  */
 void KItemSetTest::testFind()
 {
@@ -500,7 +498,7 @@ void KItemSetTest::testChangingOneItem()
             QCOMPARE(tmp.end(), tmp.find(i));
             QCOMPARE(tmp.constEnd(), tmp.constFind(i));
 
-            // Check the returen value, now contained in 'it'.
+            // Check the returned value, now contained in 'it'.
             if (i == max) {
                 QCOMPARE(it, tmp.end());
             } else {
@@ -607,6 +605,6 @@ void KItemSetTest::testSymmetricDifference()
 }
 
 
-QTEST_MAIN(KItemSetTest)
+QTEST_GUILESS_MAIN(KItemSetTest)
 
 #include "kitemsettest.moc"