diff --git a/src/plugins/diffeditor/differ.cpp b/src/plugins/diffeditor/differ.cpp index bd65e4bb4078276d624748455e05024311c9ce61..fba5a4076e3f26db784e4046569367dc9d62bdc1 100644 --- a/src/plugins/diffeditor/differ.cpp +++ b/src/plugins/diffeditor/differ.cpp @@ -516,7 +516,7 @@ QList<Diff> Differ::diffNonCharMode(const QString text1, const QString text2) for (int i = 0; i <= diffList.count(); i++) { const Diff diffItem = i < diffList.count() ? diffList.at(i) - : Diff(Diff::Equal, QLatin1String("")); // dummy, ensure we process to the end even when diffList doesn't end with equality + : Diff(Diff::Equal); // dummy, ensure we process to the end even when diffList doesn't end with equality if (diffItem.command == Diff::Delete) { lastDelete += diffItem.text; } else if (diffItem.command == Diff::Insert) { @@ -605,7 +605,7 @@ QList<Diff> Differ::merge(const QList<Diff> &diffList) for (int i = 0; i <= diffList.count(); i++) { Diff diff = i < diffList.count() ? diffList.at(i) - : Diff(Diff::Equal, QString()); // dummy, ensure we process to the end even when diffList doesn't end with equality + : Diff(Diff::Equal); // dummy, ensure we process to the end even when diffList doesn't end with equality if (diff.command == Diff::Delete) { lastDelete += diff.text; } else if (diff.command == Diff::Insert) { @@ -685,7 +685,7 @@ QList<Diff> Differ::cleanupSemantics(const QList<Diff> &diffList) for (int i = 0; i <= diffList.count(); i++) { Diff diff = i < diffList.count() ? diffList.at(i) - : Diff(Diff::Equal, QString()); // dummy, ensure we process to the end even when diffList doesn't end with equality + : Diff(Diff::Equal); // dummy, ensure we process to the end even when diffList doesn't end with equality if (diff.command == Diff::Equal) { if (!equalities.isEmpty()) { EqualityData &previousData = equalities.last(); diff --git a/src/plugins/diffeditor/differ.h b/src/plugins/diffeditor/differ.h index 89ed32eeb822746382b291db3e30345dd33a1a3f..1387632755cb65bf68a1e35aa0fa360466c73452 100644 --- a/src/plugins/diffeditor/differ.h +++ b/src/plugins/diffeditor/differ.h @@ -50,7 +50,7 @@ public: }; Command command; QString text; - Diff(Command com, const QString &txt); + Diff(Command com, const QString &txt = QString()); Diff(); bool operator==(const Diff &other) const; bool operator!=(const Diff &other) const;