diff options
author | Leandro Melo <leandro.melo@nokia.com> | 2012-07-17 16:12:03 +0200 |
---|---|---|
committer | Leandro Melo <leandro.melo@nokia.com> | 2012-07-17 16:23:52 +0200 |
commit | 441c652ce5442b5d04c5998424264973eeb732a2 (patch) | |
tree | b9b7bf604c705c665d3f06d3431ffbb68f2cbb19 /src/plugins | |
parent | 9b5afad239d83f6cc4a566ffb64aa40604963794 (diff) | |
download | qt-creator-441c652ce5442b5d04c5998424264973eeb732a2.tar.gz |
C++: Change back highlighting of types
The type highlighting change part of the recent patch
4a2a17af8aa157cadb4ec230058d9ae34e11fd66 didn't seem to
please much from a visual point of view. It's a better
idea to keep the type highlighting as it was for now
and in the future try again the approach with an explicit
option and perhaps a more restrictive context.
The other patch is not reverted entirely because it does
fix a couple of bugs.
Change-Id: I806afa3d8c1c4b241080b8704255d737f61ee12c
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/cpptools/cppchecksymbols.cpp | 2 | ||||
-rw-r--r-- | src/plugins/texteditor/texteditorsettings.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/cpptools/cppchecksymbols.cpp b/src/plugins/cpptools/cppchecksymbols.cpp index aa948b23c2..112c8d4350 100644 --- a/src/plugins/cpptools/cppchecksymbols.cpp +++ b/src/plugins/cpptools/cppchecksymbols.cpp @@ -56,7 +56,7 @@ // Whenever this feature is considered "accepted" the switch below should be permanently // removed, unless we decide to actually make this a user setting - that is why it's // currently a bool instead of a define. -static const bool highlightCtorDtorAsType = false; +static const bool highlightCtorDtorAsType = true; using namespace CPlusPlus; using namespace CppTools; diff --git a/src/plugins/texteditor/texteditorsettings.cpp b/src/plugins/texteditor/texteditorsettings.cpp index b6529e468a..df912b9af9 100644 --- a/src/plugins/texteditor/texteditorsettings.cpp +++ b/src/plugins/texteditor/texteditorsettings.cpp @@ -144,7 +144,6 @@ TextEditorSettings::TextEditorSettings(QObject *parent) formatDescriptions.append(FormatDescription(C_STATIC, tr("Static"), Qt::darkMagenta)); Format functionFormat; - functionFormat.setForeground(QColor(60, 60, 60)); // very dark grey formatDescriptions.append(FormatDescription(C_FUNCTION, tr("Function"), functionFormat)); functionFormat.setItalic(true); formatDescriptions.append(FormatDescription(C_VIRTUAL_METHOD, tr("Virtual Method"), functionFormat)); |