forked from qt-creator/qt-creator
Differ: Initialize EqualityData fields by default
The last two fields were not initialized before. Make the struct internal in function. Change-Id: Ib416aa26b17626ec55d76cb944ff9d763beaa190 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
@@ -1356,18 +1356,17 @@ QList<Diff> Differ::merge(const QList<Diff> &diffList)
|
|||||||
return squashedDiffList;
|
return squashedDiffList;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct EqualityData
|
|
||||||
{
|
|
||||||
int equalityIndex;
|
|
||||||
int textCount;
|
|
||||||
int deletesBefore;
|
|
||||||
int insertsBefore;
|
|
||||||
int deletesAfter;
|
|
||||||
int insertsAfter;
|
|
||||||
};
|
|
||||||
|
|
||||||
QList<Diff> Differ::cleanupSemantics(const QList<Diff> &diffList)
|
QList<Diff> Differ::cleanupSemantics(const QList<Diff> &diffList)
|
||||||
{
|
{
|
||||||
|
struct EqualityData
|
||||||
|
{
|
||||||
|
int equalityIndex = 0;
|
||||||
|
int textCount = 0;
|
||||||
|
int deletesBefore = 0;
|
||||||
|
int insertsBefore = 0;
|
||||||
|
int deletesAfter = 0;
|
||||||
|
int insertsAfter = 0;
|
||||||
|
};
|
||||||
int deletes = 0;
|
int deletes = 0;
|
||||||
int inserts = 0;
|
int inserts = 0;
|
||||||
// equality index, equality data
|
// equality index, equality data
|
||||||
@@ -1390,7 +1389,6 @@ QList<Diff> Differ::cleanupSemantics(const QList<Diff> &diffList)
|
|||||||
data.deletesBefore = deletes;
|
data.deletesBefore = deletes;
|
||||||
data.insertsBefore = inserts;
|
data.insertsBefore = inserts;
|
||||||
equalities.append(data);
|
equalities.append(data);
|
||||||
|
|
||||||
deletes = 0;
|
deletes = 0;
|
||||||
inserts = 0;
|
inserts = 0;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user