summaryrefslogtreecommitdiff
path: root/src/plugins/diffeditor/diffeditorwidget.h
diff options
context:
space:
mode:
authorjkobus <jaroslaw.kobus@digia.com>2013-04-23 14:35:49 +0200
committerJarek Kobus <jaroslaw.kobus@digia.com>2013-04-23 16:35:22 +0200
commit5219faf0e2bfd645a5a289584f98c01a3d126d81 (patch)
tree8553b8e91985c311d298040907e9063e2ed3e85a /src/plugins/diffeditor/diffeditorwidget.h
parent5f5b7fa4c18fc68467fab8203ec444896ae533aa (diff)
downloadqt-creator-5219faf0e2bfd645a5a289584f98c01a3d126d81.tar.gz
Refactor code
Create a common method for a similar code. Simplify some logical operations. Change-Id: If25703c51ea96fe5a64698f6fa3ffd6f5cb1b2c5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/plugins/diffeditor/diffeditorwidget.h')
-rw-r--r--src/plugins/diffeditor/diffeditorwidget.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/diffeditor/diffeditorwidget.h b/src/plugins/diffeditor/diffeditorwidget.h
index 79a96c6685..8bd8d11f72 100644
--- a/src/plugins/diffeditor/diffeditorwidget.h
+++ b/src/plugins/diffeditor/diffeditorwidget.h
@@ -129,6 +129,10 @@ private:
QTextCursor &cursor,
const QMap<int, int> &positions) const;
void colorDiff(const FileData &fileData);
+ QList<TextLineData> assemblyRows(const QStringList &lines,
+ const QMap<int, int> &lineSpans,
+ const QMap<int, int> &changedPositions,
+ QMap<int, int> *outputChangedPositions) const;
ChunkData calculateOriginalData(const QList<Diff> &diffList) const;
FileData calculateContextData(const ChunkData &originalData) const;
void showDiff();