Utils: Clean up ChangeSet

* Stick to coding rules
* Fix a variable name, probably a left-over.
* Simplify removing first items.

Change-Id: Ibfcc5ab4d6fd4cd21e6ab24c6964da4ad4478e8e
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>

1 files changed, 20 insertions, 23 deletions

diff --git a/src/libs/utils/changeset.cpp b/src/libs/utils/changeset.cpp
index 1624c7509e..86548a482e 100644
--- a/src/libs/utils/changeset.cpp
+++ b/src/libs/utils/changeset.cpp
@@ -140,8 +140,9 @@ bool ChangeSet::move_helper(int pos, int length, int to)
 {
     if (hasOverlap(pos, length)
         || hasOverlap(to, 0)
-        || overlaps(pos, length, to, 0))
+        || overlaps(pos, length, to, 0)) {
         m_error = true;
+    }
 
     EditOp cmd(EditOp::Move);
     cmd.pos1 = pos;
@@ -214,8 +215,9 @@ bool ChangeSet::flip_helper(int pos1, int length1, int pos2, int length2)
 {
     if (hasOverlap(pos1, length1)
         || hasOverlap(pos2, length2)
-        || overlaps(pos1, length1, pos2, length2))
+        || overlaps(pos1, length1, pos2, length2)) {
         m_error = true;
+    }
 
     EditOp cmd(EditOp::Flip);
     cmd.pos1 = pos1;
@@ -231,8 +233,9 @@ bool ChangeSet::copy_helper(int pos, int length, int to)
 {
     if (hasOverlap(pos, length)
         || hasOverlap(to, 0)
-        || overlaps(pos, length, to, 0))
+        || overlaps(pos, length, to, 0)) {
         m_error = true;
+    }
 
     EditOp cmd(EditOp::Copy);
     cmd.pos1 = pos;
@@ -243,27 +246,27 @@ bool ChangeSet::copy_helper(int pos, int length, int to)
     return !m_error;
 }
 
-void ChangeSet::doReplace(const EditOp &replace_helper, QList<EditOp> *replaceList)
+void ChangeSet::doReplace(const EditOp &op, QList<EditOp> *replaceList)
 {
-    Q_ASSERT(replace_helper.type == EditOp::Replace);
+    Q_ASSERT(op.type == EditOp::Replace);
 
     {
         QMutableListIterator<EditOp> i(*replaceList);
         while (i.hasNext()) {
             EditOp &c = i.next();
-            if (replace_helper.pos1 <= c.pos1)
-                c.pos1 += replace_helper.text.size();
-            if (replace_helper.pos1 < c.pos1)
-                c.pos1 -= replace_helper.length1;
+            if (op.pos1 <= c.pos1)
+                c.pos1 += op.text.size();
+            if (op.pos1 < c.pos1)
+                c.pos1 -= op.length1;
         }
     }
 
     if (m_string) {
-        m_string->replace(replace_helper.pos1, replace_helper.length1, replace_helper.text);
+        m_string->replace(op.pos1, op.length1, op.text);
     } else if (m_cursor) {
-        m_cursor->setPosition(replace_helper.pos1);
-        m_cursor->setPosition(replace_helper.pos1 + replace_helper.length1, QTextCursor::KeepAnchor);
-        m_cursor->insertText(replace_helper.text);
+        m_cursor->setPosition(op.pos1);
+        m_cursor->setPosition(op.pos1 + op.length1, QTextCursor::KeepAnchor);
+        m_cursor->insertText(op.text);
     }
 }
 
@@ -358,22 +361,16 @@ void ChangeSet::apply_helper()
     // convert all ops to replace
     QList<EditOp> replaceList;
     {
-        while (!m_operationList.isEmpty()) {
-            const EditOp cmd(m_operationList.first());
-            m_operationList.removeFirst();
-            convertToReplace(cmd, &replaceList);
-        }
+        while (!m_operationList.isEmpty())
+            convertToReplace(m_operationList.takeFirst(), &replaceList);
     }
 
     // execute replaces
     if (m_cursor)
         m_cursor->beginEditBlock();
 
-    while (!replaceList.isEmpty()) {
-        const EditOp cmd(replaceList.first());
-        replaceList.removeFirst();
-        doReplace(cmd, &replaceList);
-    }
+    while (!replaceList.isEmpty())
+        doReplace(replaceList.takeFirst(), &replaceList);
 
     if (m_cursor)
         m_cursor->endEditBlock();