Commit 5ad538b3 authored by Michael Reeves's avatar Michael Reeves

Cleanup

parent aee3f618
......@@ -1302,13 +1302,13 @@ void calcDiff(const QChar* p1, LineRef size1, const QChar* p2, LineRef size2, Di
// Verify difflist
{
LineRef l1 = 0;
LineRef l2 = 0;
DiffList::iterator i;
for(i = diffList.begin(); i != diffList.end(); ++i)
qint32 l1 = 0;
qint32 l2 = 0;
DiffList::const_iterator it;
for(it = diffList.begin(); it != diffList.end(); ++it)
{
l1 += (LineRef)(i->nofEquals + i->diff1);
l2 += (LineRef)(i->nofEquals + i->diff2);
l1 += (it->nofEquals + it->diff1);
l2 += (it->nofEquals + it->diff2);
}
Q_ASSERT(l1 == size1 && l2 == size2);
......
......@@ -58,12 +58,12 @@ enum e_MergeDetails
class Diff
{
public:
LineCount nofEquals;
qint32 nofEquals;
qint64 diff1;
qint64 diff2;
Diff(LineCount eq, qint64 d1, qint64 d2)
Diff(qint32 eq, qint64 d1, qint64 d2)
{
nofEquals = eq;
diff1 = d1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment