aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/diffeditor/diffutils.h
diff options
context:
space:
mode:
authorjkobus <jaroslaw.kobus@digia.com>2014-03-10 12:57:48 +0100
committerJarek Kobus <jaroslaw.kobus@digia.com>2014-03-10 13:01:29 +0100
commitb846840c522944e8103c791bbaa7875777493d73 (patch)
tree0a5a058f765b9ee45cc9e971173e3068cf69ac3c /src/plugins/diffeditor/diffutils.h
parent16bfbceebaf7d0159d2a8436026dc7bbe4200150 (diff)
Move more function into diffutils, fix calculateOriginalData.
Change-Id: Id7bbdbf7778d21cb9aa15148876db95e9228fab3 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Diffstat (limited to 'src/plugins/diffeditor/diffutils.h')
-rw-r--r--src/plugins/diffeditor/diffutils.h11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/plugins/diffeditor/diffutils.h b/src/plugins/diffeditor/diffutils.h
index 5d252d7eb88..aedcd891fd0 100644
--- a/src/plugins/diffeditor/diffutils.h
+++ b/src/plugins/diffeditor/diffutils.h
@@ -32,7 +32,12 @@
#include <QString>
#include <QMap>
+#include <QTextEdit>
+
#include "diffeditorcontroller.h"
+#include "texteditor/texteditorconstants.h"
+
+namespace TextEditor { class FontSettings; }
namespace DiffEditor {
@@ -89,7 +94,11 @@ ChunkData calculateOriginalData(const QList<Diff> &leftDiffList,
const QList<Diff> &rightDiffList);
FileData calculateContextData(const ChunkData &originalData,
int contextLinesNumber);
-
+QList<QTextEdit::ExtraSelection> colorPositions(const QTextCharFormat &format,
+ QTextCursor &cursor,
+ const QMap<int, int> &positions);
+QTextCharFormat fullWidthFormatForTextStyle(const TextEditor::FontSettings &fontSettings,
+ TextEditor::TextStyle textStyle);
} // namespace Internal
} // namespace DiffEditor