From 242ae4ce37220410c60ecb2ed11b80d0eebb0dc3 Mon Sep 17 00:00:00 2001 From: jkobus Date: Thu, 16 Jan 2014 14:55:40 +0100 Subject: [PATCH] Fix return arg of Diff class getter Change-Id: I25dc6d2992831d79077e4d06f52018d6191e0bfb Reviewed-by: Tobias Hunger --- src/plugins/diffeditor/differ.cpp | 2 +- src/plugins/diffeditor/differ.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/diffeditor/differ.cpp b/src/plugins/diffeditor/differ.cpp index fba5a4076e3..0cc269be877 100644 --- a/src/plugins/diffeditor/differ.cpp +++ b/src/plugins/diffeditor/differ.cpp @@ -298,7 +298,7 @@ void Differ::setDiffMode(Differ::DiffMode mode) m_diffMode = mode; } -bool Differ::diffMode() const +Differ::DiffMode Differ::diffMode() const { return m_diffMode; } diff --git a/src/plugins/diffeditor/differ.h b/src/plugins/diffeditor/differ.h index 1387632755c..e0df7050625 100644 --- a/src/plugins/diffeditor/differ.h +++ b/src/plugins/diffeditor/differ.h @@ -70,7 +70,7 @@ public: Differ(); QList diff(const QString &text1, const QString &text2); void setDiffMode(DiffMode mode); - bool diffMode() const; + DiffMode diffMode() const; static QList merge(const QList &diffList); static QList cleanupSemantics(const QList &diffList); static QList cleanupSemanticsLossless(const QList &diffList);