feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix return arg of Diff class getter

Browse Source 
Change-Id: I25dc6d2992831d79077e4d06f52018d6191e0bfb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
jkobus
2014-01-16 14:55:40 +01:00
committed by Jarek Kobus
parent 096bc3b0e1
commit 242ae4ce37
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/diffeditor/differ.cpp
View File

@@ -298,7 +298,7 @@ void Differ::setDiffMode(Differ::DiffMode mode)
m_diffMode = mode; m_diffMode = mode;
} }
bool Differ::diffMode() const Differ::DiffMode Differ::diffMode() const
{ {
return m_diffMode; return m_diffMode;
} }

2
src/plugins/diffeditor/differ.h
View File

@@ -70,7 +70,7 @@ public:
Differ(); Differ();
QList<Diff> diff(const QString &text1, const QString &text2); QList<Diff> diff(const QString &text1, const QString &text2);
void setDiffMode(DiffMode mode); void setDiffMode(DiffMode mode);
bool diffMode() const; DiffMode diffMode() const;
static QList<Diff> merge(const QList<Diff> &diffList); static QList<Diff> merge(const QList<Diff> &diffList);
static QList<Diff> cleanupSemantics(const QList<Diff> &diffList); static QList<Diff> cleanupSemantics(const QList<Diff> &diffList);
static QList<Diff> cleanupSemanticsLossless(const QList<Diff> &diffList); static QList<Diff> cleanupSemanticsLossless(const QList<Diff> &diffList);