From 096bc3b0e12100d6b65355e863d66e4605d0f99e Mon Sep 17 00:00:00 2001
From: jkobus <jaroslaw.kobus@digia.com>
Date: Thu, 16 Jan 2014 14:52:37 +0100
Subject: [PATCH] Add default arg to Diff ctor
Change-Id: I97d4b99250d55216ef866f7529ca423e2133db09
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
src/plugins/diffeditor/differ.cpp | 6 +++---
src/plugins/diffeditor/differ.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/plugins/diffeditor/differ.cpp b/src/plugins/diffeditor/differ.cpp
index bd65e4bb407..fba5a4076e3 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 89ed32eeb82..1387632755c 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;
--
GitLab