Unify Utils::ChangeSet usages

* Remove using Utils::ChangeSet from header files
* Remove unused typedef for Range
* Add it only in source files that contain many occurrences

Change-Id: I60a8b77e2d5a46431507f53b6d60186d511ccf30
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

1 files changed, 55 insertions, 53 deletions

diff --git a/tests/auto/changeset/tst_changeset.cpp b/tests/auto/changeset/tst_changeset.cpp
index 753b95239e..bab9ad5347 100644
--- a/tests/auto/changeset/tst_changeset.cpp
+++ b/tests/auto/changeset/tst_changeset.cpp
@@ -33,6 +33,8 @@
 
 //TESTED_COMPONENT=src/utils/changeset
 
+using Utils::ChangeSet;
+
 class tst_ChangeSet : public QObject
 {
     Q_OBJECT
@@ -53,35 +55,35 @@ private slots:
 void tst_ChangeSet::singleReplace()
 {
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QString test("abcdef");
         QVERIFY(cs.replace(0, 2, "ghi"));
         cs.apply(&test);
         QCOMPARE(test, QLatin1String("ghicdef"));
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QString test("abcdef");
         QVERIFY(cs.replace(4, 6, "ghi"));
         cs.apply(&test);
         QCOMPARE(test, QLatin1String("abcdghi"));
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QString test("abcdef");
         QVERIFY(cs.replace(3, 3, "ghi"));
         cs.apply(&test);
         QCOMPARE(test, QLatin1String("abcghidef"));
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QString test("abcdef");
         QVERIFY(cs.replace(0, 6, ""));
         cs.apply(&test);
         QCOMPARE(test, QLatin1String(""));
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QString test("abcdef");
         QVERIFY(cs.replace(3, 13, "ghi"));
         cs.apply(&test);
@@ -92,35 +94,35 @@ void tst_ChangeSet::singleReplace()
 void tst_ChangeSet::singleMove()
 {
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QString test("abcdef");
         QVERIFY(cs.move(0, 2, 4));
         cs.apply(&test);
         QCOMPARE(test, QLatin1String("cdabef"));
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QString test("abcdef");
         QVERIFY(cs.move(4, 6, 0));
         cs.apply(&test);
         QCOMPARE(test, QLatin1String("efabcd"));
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QString test("abcdef");
         QVERIFY(cs.move(3, 13, 0));
         cs.apply(&test);
         QCOMPARE(test, QLatin1String("defabc"));
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QString test("abcdef");
         QVERIFY(cs.move(3, 3, 0));
         cs.apply(&test);
         QCOMPARE(test, QLatin1String("abcdef"));
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QString test("abcdef");
         QVERIFY(cs.move(0, 1, 10));
         cs.apply(&test);
@@ -132,28 +134,28 @@ void tst_ChangeSet::singleMove()
 void tst_ChangeSet::singleInsert()
 {
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QString test("abcdef");
         QVERIFY(cs.insert(0, "ghi"));
         cs.apply(&test);
         QCOMPARE(test, QLatin1String("ghiabcdef"));
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QString test("abcdef");
         QVERIFY(cs.insert(6, "ghi"));
         cs.apply(&test);
         QCOMPARE(test, QLatin1String("abcdefghi"));
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QString test("abcdef");
         QVERIFY(cs.insert(3, ""));
         cs.apply(&test);
         QCOMPARE(test, QLatin1String("abcdef"));
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QString test("abcdef");
         QVERIFY(cs.insert(7, "g"));
         cs.apply(&test);
@@ -165,35 +167,35 @@ void tst_ChangeSet::singleInsert()
 void tst_ChangeSet::singleRemove()
 {
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QString test("abcdef");
         QVERIFY(cs.remove(0, 1));
         cs.apply(&test);
         QCOMPARE(test, QLatin1String("bcdef"));
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QString test("abcdef");
         QVERIFY(cs.remove(3, 6));
         cs.apply(&test);
         QCOMPARE(test, QLatin1String("abc"));
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QString test("abcdef");
         QVERIFY(cs.remove(4, 14));
         cs.apply(&test);
         QCOMPARE(test, QLatin1String("abcd"));
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QString test("abcdef");
         QVERIFY(cs.remove(2, 2));
         cs.apply(&test);
         QCOMPARE(test, QLatin1String("abcdef"));
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QString test("abcdef");
         QVERIFY(cs.remove(7, 8));
         cs.apply(&test);
@@ -204,42 +206,42 @@ void tst_ChangeSet::singleRemove()
 void tst_ChangeSet::singleFlip()
 {
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QString test("abcdef");
         QVERIFY(cs.flip(0, 2, 3, 6));
         cs.apply(&test);
         QCOMPARE(test, QLatin1String("defcab"));
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QString test("abcdef");
         QVERIFY(cs.flip(1, 3, 3, 4));
         cs.apply(&test);
         QCOMPARE(test, QLatin1String("adbcef"));
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QString test("abcdef");
         QVERIFY(cs.flip(3, 3, 4, 4));
         cs.apply(&test);
         QCOMPARE(test, QLatin1String("abcdef"));
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QString test("abcdef");
         QVERIFY(cs.flip(3, 3, 4, 5));
         cs.apply(&test);
         QCOMPARE(test, QLatin1String("abcedf"));
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QString test("abcdef");
         QVERIFY(cs.flip(0, 6, 6, 12));
         cs.apply(&test);
         QCOMPARE(test, QLatin1String("abcdef"));
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QString test("abcdef");
         QVERIFY(cs.flip(0, 6, 7, 10));
         cs.apply(&test);
@@ -247,29 +249,29 @@ void tst_ChangeSet::singleFlip()
         QCOMPARE(test, QLatin1String(""));
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QCOMPARE(cs.flip(0, 3, 1, 4), false);
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QCOMPARE(cs.flip(0, 3, 2, 5), false);
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QVERIFY(cs.flip(0, 3, 0, 0));
         QString test("abcdef");
         cs.apply(&test);
         QCOMPARE(test, QLatin1String("abcdef"));
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QVERIFY(cs.flip(0, 0, 0, 3));
         QString test("abcdef");
         cs.apply(&test);
         QCOMPARE(test, QLatin1String("abcdef"));
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QVERIFY(cs.flip(0, 3, 3, 3));
         QString test("abcdef");
         cs.apply(&test);
@@ -280,35 +282,35 @@ void tst_ChangeSet::singleFlip()
 void tst_ChangeSet::singleCopy()
 {
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QString test("abcdef");
         QVERIFY(cs.copy(0, 2, 4));
         cs.apply(&test);
         QCOMPARE(test, QLatin1String("abcdabef"));
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QString test("abcdef");
         QVERIFY(cs.copy(1, 3, 3));
         cs.apply(&test);
         QCOMPARE(test, QLatin1String("abcbcdef"));
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QString test("abcdef");
         QVERIFY(cs.copy(3, 3, 4));
         cs.apply(&test);
         QCOMPARE(test, QLatin1String("abcdef"));
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QString test("abcdef");
         QVERIFY(cs.copy(0, 6, 6));
         cs.apply(&test);
         QCOMPARE(test, QLatin1String("abcdefabcdef"));
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QString test("abcdef");
         QVERIFY(cs.copy(0, 6, 7));
         cs.apply(&test);
@@ -316,22 +318,22 @@ void tst_ChangeSet::singleCopy()
         QCOMPARE(test, QLatin1String("abcdef"));
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QCOMPARE(cs.copy(0, 3, 1), false);
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QCOMPARE(cs.copy(0, 3, 2), false);
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QVERIFY(cs.copy(0, 3, 0));
         QString test("abcdef");
         cs.apply(&test);
         QCOMPARE(test, QLatin1String("abcabcdef"));
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QVERIFY(cs.copy(0, 3, 3));
         QString test("abcdef");
         cs.apply(&test);
@@ -342,7 +344,7 @@ void tst_ChangeSet::singleCopy()
 void tst_ChangeSet::doubleInsert()
 {
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QVERIFY(cs.insert(1, "01"));
         QVERIFY(cs.insert(1, "234"));
         QString test("abcdef");
@@ -350,7 +352,7 @@ void tst_ChangeSet::doubleInsert()
         QCOMPARE(test, QLatin1String("a01234bcdef"));
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QVERIFY(cs.insert(1, "234"));
         QVERIFY(cs.insert(1, "01"));
         QString test("abcdef");
@@ -358,7 +360,7 @@ void tst_ChangeSet::doubleInsert()
         QCOMPARE(test, QLatin1String("a23401bcdef"));
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QVERIFY(cs.insert(1, "01"));
         QVERIFY(cs.remove(1, 2));
         QVERIFY(cs.insert(2, "234"));
@@ -371,48 +373,48 @@ void tst_ChangeSet::doubleInsert()
 void tst_ChangeSet::conflicts()
 {
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QVERIFY(cs.move(1, 4, 5));
         QCOMPARE(cs.replace(0, 2, "abc"), false);
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QVERIFY(cs.move(1, 4, 5));
         QCOMPARE(cs.replace(1, 4, "abc"), false);
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QVERIFY(cs.move(1, 4, 5));
         QCOMPARE(cs.replace(1, 2, "abc"), false);
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QVERIFY(cs.move(1, 4, 5));
         QCOMPARE(cs.replace(2, 2, "abc"), false);
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QVERIFY(cs.move(1, 4, 5));
         QCOMPARE(cs.replace(2, 3, "abc"), false);
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QVERIFY(cs.move(1, 4, 5));
         QCOMPARE(cs.replace(3, 3, "abc"), false);
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QVERIFY(cs.move(1, 4, 5));
         QCOMPARE(cs.replace(3, 4, "abc"), false);
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QVERIFY(cs.move(1, 4, 5));
         QCOMPARE(cs.replace(4, 6, "abc"), false);
     }
 
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QVERIFY(cs.move(1, 4, 5));
         QVERIFY(cs.replace(0, 1, "bla"));
         QString test("abcdef");
@@ -420,7 +422,7 @@ void tst_ChangeSet::conflicts()
         QCOMPARE(test, QLatin1String("blaebcdf"));
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QVERIFY(cs.move(1, 4, 5));
         QVERIFY(cs.replace(4, 5, "bla"));
         QString test("abcdef");
@@ -428,7 +430,7 @@ void tst_ChangeSet::conflicts()
         QCOMPARE(test, QLatin1String("ablabcdf"));
     }
     {
-        Utils::ChangeSet cs;
+        ChangeSet cs;
         QVERIFY(cs.move(1, 4, 5));
         QVERIFY(cs.replace(5, 6, "bla"));
         QString test("abcdef");