feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Move code model icons to utils

Browse Source 
Using the already established icons for code model errors and warnings
to Utils to mak them accessible for other code models.

Change-Id: If9f8efde60cf20411e043aeb2831a9254398bcaf
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
David Schulz
2017-11-16 08:25:31 +01:00
parent 8eececaa96
commit 97053d9f2f
12 changed files with 24 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/clangcodemodel/clangtextmark.cpp
View File

@@ -28,7 +28,7 @@
#include "clangconstants.h"
#include "clangdiagnostictooltipwidget.h"
#include <utils/icon.h>
#include <utils/utilsicons.h>
#include <utils/qtcassert.h>
#include <utils/theme/theme.h>
@@ -86,23 +86,11 @@ ClangTextMark::ClangTextMark(const QString &fileName,
void ClangTextMark::updateIcon(bool valid)
{
static const QIcon errorIcon = Utils::Icon(
{{":/clangcodemodel/images/error.png", Utils::Theme::IconsErrorColor}},
Utils::Icon::Tint).icon();
static const QIcon warningIcon = Utils::Icon(
{{":/clangcodemodel/images/warning.png", Utils::Theme::IconsWarningColor}},
Utils::Icon::Tint).icon();
static const QIcon invalidErrorIcon = Utils::Icon(
{{":/clangcodemodel/images/error.png", Utils::Theme::IconsDisabledColor}},
Utils::Icon::Tint).icon();
static const QIcon invalidWarningIcon = Utils::Icon(
{{":/clangcodemodel/images/warning.png", Utils::Theme::IconsDisabledColor}},
Utils::Icon::Tint).icon();
using namespace Utils::Icons;
if (isWarningOrNote(m_diagnostic.severity()))
setIcon(valid ? warningIcon : invalidWarningIcon);
setIcon(valid ? CODEMODEL_WARNING.icon() : CODEMODEL_DISABLED_WARNING.icon());
else
setIcon(valid ? errorIcon : invalidErrorIcon);
setIcon(valid ? CODEMODEL_ERROR.icon() : CODEMODEL_DISABLED_ERROR.icon());
}
bool ClangTextMark::addToolTipContent(QLayout *target) const