Commit 4fcbe989 authored by Michael Reeves's avatar Michael Reeves

Fix gcc compile issue

parent 26710be6
Pipeline #5995 failed with stage
in 3 minutes and 48 seconds
...@@ -1196,13 +1196,13 @@ void calcDiff(const QString& line1, const QString& line2, DiffList& diffList, in ...@@ -1196,13 +1196,13 @@ void calcDiff(const QString& line1, const QString& line2, DiffList& diffList, in
} }
for(i2 = 0; i2 < maxSearchRange; ++i2) for(i2 = 0; i2 < maxSearchRange; ++i2)
{ {
if(p2[i2] == line2.end() || (bBestValid && i1 + i2 >= bestI1 + bestI2)) if(p2[i2] == *line2.end() || (bBestValid && i1 + i2 >= bestI1 + bestI2))
{ {
break; break;
} }
else if(p2[i2] == p1[i1] && else if(p2[i2] == p1[i1] &&
(match == 1 || abs(i1 - i2) < 3 || (p2[i2 + 1] == line2.end() && p1[i1 + 1] == line1.end()) || (match == 1 || abs(i1 - i2) < 3 || (p2[i2 + 1] == *line2.end() && p1[i1 + 1] == *line1.end()) ||
(p2[i2 + 1] != line2.end() && p1[i1 + 1] != line1.end() && p2[i2 + 1] == p1[i1 + 1]))) (p2[i2 + 1] != *line2.end() && p1[i1 + 1] != *line1.end() && p2[i2 + 1] == p1[i1 + 1])))
{ {
if(i1 + i2 < bestI1 + bestI2 || !bBestValid) if(i1 + i2 < bestI1 + bestI2 || !bBestValid)
{ {
......
...@@ -84,7 +84,7 @@ class LineData ...@@ -84,7 +84,7 @@ class LineData
Q_DECL_DEPRECATED bool bContainsPureComment = false; Q_DECL_DEPRECATED bool bContainsPureComment = false;
public: public:
explicit LineData() = default; // needed for QtInternal reasons should not be used. explicit LineData() = default; // needed for Qt internal reasons should not be used.
inline LineData(const QSharedPointer<QString> &buffer, const qint64 inOffset, QtNumberType inSize = 0) inline LineData(const QSharedPointer<QString> &buffer, const qint64 inOffset, QtNumberType inSize = 0)
{ {
mBuffer = buffer; mBuffer = buffer;
......
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