DolphinView: rename copySelectedItems to copySelectedItemsToClipboard

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

diff --git a/src/tests/kitemsettest.cpp b/src/tests/kitemsettest.cpp
index 2832596ba689a6ef07b444e4a92447dd218b881d..ca2c16b27ba2070ada88efcbbc59e6e0c698431d 100644 (file)
--- a/src/tests/kitemsettest.cpp
+++ b/src/tests/kitemsettest.cpp
@@ -17,13 +17,11 @@
  *   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 "kitemviews/kitemset.h"
 
 #include "kitemviews/kitemset.h"
 

-#include <QVector>
+#include <QTest>

 
 

-Q_DECLARE_METATYPE(KItemRangeList);
+Q_DECLARE_METATYPE(KItemRangeList)

 
 /**
  * Converts a KItemRangeList to a KItemSet.
 
 /**
  * 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;
 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());
 
         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));
     }
 
         Q_ASSERT(result.contains(i));
     }
 


@@ -205,7 +203,7 @@ void KItemSetTest::testIterators()
     QVERIFY(itemSet.isValid());
     QVERIFY(itemSet.count() == itemsQVector.count());
 
     QVERIFY(itemSet.isValid());
     QVERIFY(itemSet.count() == itemsQVector.count());
 

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

         QVERIFY(itemSet.isEmpty());
         QVERIFY(itemSet.begin() == itemSet.end());
         QVERIFY(itemSet.constBegin() == itemSet.constEnd());
         QVERIFY(itemSet.isEmpty());
         QVERIFY(itemSet.begin() == itemSet.end());
         QVERIFY(itemSet.constBegin() == itemSet.constEnd());


@@ -240,7 +238,7 @@ void KItemSetTest::testIterators()
     QCOMPARE(testQVector, itemsQVector);
 
     testQVector.clear();
     QCOMPARE(testQVector, itemsQVector);
 
     testQVector.clear();

-    foreach (int i, itemSet) {
+    for (int i : itemSet) {

         testQVector.append(i);
     }
     QCOMPARE(testQVector, itemsQVector);
         testQVector.append(i);
     }
     QCOMPARE(testQVector, itemsQVector);


@@ -328,7 +326,7 @@ void KItemSetTest::testFind_data()
 
 /**
  * Test all functions that find items:
 
 /**
  * Test all functions that find items:

- * contais(int), find(int), constFind(int)
+ * contains(int), find(int), constFind(int)

  */
 void KItemSetTest::testFind()
 {
  */
 void KItemSetTest::testFind()
 {


@@ -344,7 +342,7 @@ void KItemSetTest::testFind()
     int min;
     int max;
 
     int min;
     int max;
 

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

         // Use some arbitrary values for the upcoming tests.
         min = 0;
         max = 5;
         // Use some arbitrary values for the upcoming tests.
         min = 0;
         max = 5;


@@ -403,7 +401,7 @@ void KItemSetTest::testChangingOneItem()
     int min;
     int max;
 
     int min;
     int max;
 

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

         // Use some arbitrary values for the upcoming tests.
         min = 0;
         max = 5;
         // Use some arbitrary values for the upcoming tests.
         min = 0;
         max = 5;


@@ -500,7 +498,7 @@ void KItemSetTest::testChangingOneItem()
             QCOMPARE(tmp.end(), tmp.find(i));
             QCOMPARE(tmp.constEnd(), tmp.constFind(i));
 
             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 {
             if (i == max) {
                 QCOMPARE(it, tmp.end());
             } else {


@@ -607,6 +605,6 @@ void KItemSetTest::testSymmetricDifference()
 }
 
 
 }
 
 

-QTEST_KDEMAIN(KItemSetTest, NoGUI)
+QTEST_GUILESS_MAIN(KItemSetTest)

 
 #include "kitemsettest.moc"
 
 #include "kitemsettest.moc"