From fe20970f12b2d098156ce712ac00e0dbe093b836 Mon Sep 17 00:00:00 2001
From: hluk <hluk@email.cz>
Date: Tue, 2 Jul 2013 19:32:12 +0200
Subject: [PATCH] DiffEditor: Fix name for style constant
Change-Id: I8fdbcfc702574a0b61f57bb3d92594b66b2171df
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
---
share/qtcreator/styles/darkvim.xml | 2 +-
share/qtcreator/styles/grayscale.xml | 2 +-
share/qtcreator/styles/inkpot.xml | 2 +-
src/plugins/texteditor/texteditorconstants.cpp | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/share/qtcreator/styles/darkvim.xml b/share/qtcreator/styles/darkvim.xml
index 9c753067eab..eb6aa8ae5ef 100644
--- a/share/qtcreator/styles/darkvim.xml
+++ b/share/qtcreator/styles/darkvim.xml
@@ -45,7 +45,7 @@
<style name="JsScopeVar" foreground="#8888ff" italic="true"/>
<style name="JsImportVar" foreground="#8888ff" italic="true"/>
<style name="JsGlobalVar" foreground="#8888ff" italic="true"/>
- <style name="DillFileLine" foreground="#000000" background="#d7d700"/>
+ <style name="DiffFileLine" foreground="#000000" background="#d7d700"/>
<style name="DiffContextLine" foreground="#000000" background="#8aaab6"/>
<style name="DiffSourceLine" background="#8c2d2d"/>
<style name="DiffSourceChar" foreground="#000000" background="#c34141"/>
diff --git a/share/qtcreator/styles/grayscale.xml b/share/qtcreator/styles/grayscale.xml
index 1d14c348aa4..b7a76c3ba64 100644
--- a/share/qtcreator/styles/grayscale.xml
+++ b/share/qtcreator/styles/grayscale.xml
@@ -5,7 +5,7 @@
<style name="CurrentLine" foreground="#000000" background="#f2f2f2"/>
<style name="DiffFile"/>
<style name="DiffLocation"/>
- <style name="DillFileLine" foreground="#ffffff" background="#000000"/>
+ <style name="DiffFileLine" foreground="#ffffff" background="#000000"/>
<style name="DiffContextLine" foreground="#ffffff" background="#7f7f7f"/>
<style name="DiffSourceLine" background="#d7d7d7"/>
<style name="DiffSourceChar" background="#afafaf"/>
diff --git a/share/qtcreator/styles/inkpot.xml b/share/qtcreator/styles/inkpot.xml
index 2c2200d1d1a..c0a3c75adb6 100644
--- a/share/qtcreator/styles/inkpot.xml
+++ b/share/qtcreator/styles/inkpot.xml
@@ -53,7 +53,7 @@
<style name="JsScopeVar" foreground="#8888ff" italic="true"/>
<style name="JsImportVar" foreground="#8888ff" italic="true"/>
<style name="JsGlobalVar" foreground="#8888ff" italic="true"/>
- <style name="DillFileLine" foreground="#404040" background="#dcb178"/>
+ <style name="DiffFileLine" foreground="#404040" background="#dcb178"/>
<style name="DiffContextLine" foreground="#404040" background="#97bac7"/>
<style name="DiffSourceLine" background="#8c2d2d"/>
<style name="DiffSourceChar" background="#c34141"/>
diff --git a/src/plugins/texteditor/texteditorconstants.cpp b/src/plugins/texteditor/texteditorconstants.cpp
index 6c6166a241d..9444a7d098b 100644
--- a/src/plugins/texteditor/texteditorconstants.cpp
+++ b/src/plugins/texteditor/texteditorconstants.cpp
@@ -87,7 +87,7 @@ const char *nameForStyle(TextStyle style)
case C_DIFF_FILE: return "DiffFile";
case C_DIFF_LOCATION: return "DiffLocation";
- case C_DIFF_FILE_LINE: return "DillFileLine";
+ case C_DIFF_FILE_LINE: return "DiffFileLine";
case C_DIFF_CONTEXT_LINE: return "DiffContextLine";
case C_DIFF_SOURCE_LINE: return "DiffSourceLine";
case C_DIFF_SOURCE_CHAR: return "DiffSourceChar";
--
GitLab