summaryrefslogtreecommitdiff
path: root/src/plugins/diffeditor/diffeditorwidget.h
diff options
context:
space:
mode:
authorjkobus <jaroslaw.kobus@digia.com>2013-06-05 15:25:42 +0200
committerhjk <hjk121@nokiamail.com>2013-06-12 09:23:50 +0200
commitabe3951d67398310287785e8e1a132b42121269d (patch)
tree77fb64f880a214e1a57e4434561d295868afb8d8 /src/plugins/diffeditor/diffeditorwidget.h
parent93ea763a8d09557ce266f37d95352e858dcf9ede (diff)
downloadqt-creator-abe3951d67398310287785e8e1a132b42121269d.tar.gz
Take diff colors from color scheme
Change-Id: I706612a8f89917cb57b7d1e9ecebd86b3f4bcc8d Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: David Schulz <david.schulz@digia.com>
Diffstat (limited to 'src/plugins/diffeditor/diffeditorwidget.h')
-rw-r--r--src/plugins/diffeditor/diffeditorwidget.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/plugins/diffeditor/diffeditorwidget.h b/src/plugins/diffeditor/diffeditorwidget.h
index 28affe26c8..5bb4e1cb7f 100644
--- a/src/plugins/diffeditor/diffeditorwidget.h
+++ b/src/plugins/diffeditor/diffeditorwidget.h
@@ -38,6 +38,7 @@
namespace TextEditor {
class BaseTextEditorWidget;
class SnippetEditorWidget;
+class FontSettings;
}
QT_BEGIN_NAMESPACE
@@ -101,6 +102,7 @@ protected:
TextEditor::SnippetEditorWidget *rightEditor() const;
private slots:
+ void setFontSettings(const TextEditor::FontSettings &fontSettings);
void leftVSliderChanged();
void rightVSliderChanged();
void leftHSliderChanged();
@@ -146,6 +148,13 @@ private:
bool m_syncScrollBars;
bool m_foldingBlocker;
+
+ QTextCharFormat m_fileLineFormat;
+ QTextCharFormat m_chunkLineFormat;
+ QTextCharFormat m_leftLineFormat;
+ QTextCharFormat m_leftCharFormat;
+ QTextCharFormat m_rightLineFormat;
+ QTextCharFormat m_rightCharFormat;
};
} // namespace DiffEditor