diff options
| author | David Schulz <david.schulz@qt.io> | 2018-05-16 10:32:08 +0200 |
|---|---|---|
| committer | David Schulz <david.schulz@qt.io> | 2018-05-17 05:55:53 +0000 |
| commit | d4c7814e9e54079ddc4fdbf4d5f506b84a3a1f89 (patch) | |
| tree | 51e75ca8762437416c8f14760d301549c495606c /src/plugins | |
| parent | f68f3c0112e181787efa6710cdd95bc42a698e1e (diff) | |
| download | qt-creator-d4c7814e9e54079ddc4fdbf4d5f506b84a3a1f89.tar.gz | |
Utils: remove Clang from ClangCodeModel_*_TextMarkColor
They are also used by the qml code model, and may be used by additional
code models in the future.
Change-Id: If216cbeb7b77be0f3b6f31671c71d913206315cb
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/clangcodemodel/clangtextmark.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/qmljseditor/qmljstextmark.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/clangcodemodel/clangtextmark.cpp b/src/plugins/clangcodemodel/clangtextmark.cpp index fbe08cb14d..51447e9147 100644 --- a/src/plugins/clangcodemodel/clangtextmark.cpp +++ b/src/plugins/clangcodemodel/clangtextmark.cpp @@ -83,8 +83,8 @@ ClangTextMark::ClangTextMark(const FileName &fileName, updateIcon(); if (fullVisualization) { setLineAnnotation(Utils::diagnosticCategoryPrefixRemoved(diagnostic.text.toString())); - setColor(warning ? ::Utils::Theme::ClangCodeModel_Warning_TextMarkColor - : ::Utils::Theme::ClangCodeModel_Error_TextMarkColor); + setColor(warning ? ::Utils::Theme::CodeModel_Warning_TextMarkColor + : ::Utils::Theme::CodeModel_Error_TextMarkColor); } } diff --git a/src/plugins/qmljseditor/qmljstextmark.cpp b/src/plugins/qmljseditor/qmljstextmark.cpp index 542450a9d4..4eac11b2c6 100644 --- a/src/plugins/qmljseditor/qmljstextmark.cpp +++ b/src/plugins/qmljseditor/qmljstextmark.cpp @@ -90,8 +90,8 @@ void QmlJSTextMark::init(bool warning, const QString message) { setIcon(warning ? Utils::Icons::CODEMODEL_WARNING.icon() : Utils::Icons::CODEMODEL_ERROR.icon()); - setColor(warning ? Utils::Theme::ClangCodeModel_Warning_TextMarkColor - : Utils::Theme::ClangCodeModel_Error_TextMarkColor); + setColor(warning ? Utils::Theme::CodeModel_Warning_TextMarkColor + : Utils::Theme::CodeModel_Error_TextMarkColor); setDefaultToolTip(warning ? QApplication::translate("QmlJS Code Model Marks", "Code Model Warning") : QApplication::translate("QmlJS Code Model Marks", "Code Model Error")); setToolTip(message); |