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

Check for valid Diagnostic

Browse Source 
Change-Id: Icfce44a373d56f008027330f9b1a2d446f4d2adb
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
This commit is contained in:
Nikolai Kosjar
2014-11-14 14:59:27 +01:00
parent e06c9ec09b
commit 33fd656641
3 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/clangstaticanalyzer/clangstaticanalyzerdiagnostic.cpp
View File

@@ -46,5 +46,10 @@ bool ExplainingStep::isValid() const
return location.isValid() && !ranges.isEmpty() && !message.isEmpty(); return location.isValid() && !ranges.isEmpty() && !message.isEmpty();
} }
bool Diagnostic::isValid() const
{
return !description.isEmpty();
}
} // namespace Internal } // namespace Internal
} // namespace ClangStaticAnalyzer } // namespace ClangStaticAnalyzer

2
plugins/clangstaticanalyzer/clangstaticanalyzerdiagnostic.h
View File

@@ -56,6 +56,8 @@ public:
class Diagnostic class Diagnostic
{ {
public: public:
bool isValid() const;
QString description; QString description;
QString category; QString category;
QString type; QString type;

3
plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticview.cpp
View File

@@ -168,6 +168,7 @@ DetailedErrorDelegate::SummaryLineInfo ClangStaticAnalyzerDiagnosticDelegate::su
const QModelIndex &index) const const QModelIndex &index) const
{ {
const Diagnostic diagnostic = index.data(Qt::UserRole).value<Diagnostic>(); const Diagnostic diagnostic = index.data(Qt::UserRole).value<Diagnostic>();
QTC_ASSERT(diagnostic.isValid(), return SummaryLineInfo());
DetailedErrorDelegate::SummaryLineInfo info; DetailedErrorDelegate::SummaryLineInfo info;
info.errorText = diagnostic.description; info.errorText = diagnostic.description;
@@ -188,6 +189,8 @@ QWidget *ClangStaticAnalyzerDiagnosticDelegate::createDetailsWidget(const QFont
QVBoxLayout *layout = new QVBoxLayout; QVBoxLayout *layout = new QVBoxLayout;
const Diagnostic diagnostic = index.data(Qt::UserRole).value<Diagnostic>(); const Diagnostic diagnostic = index.data(Qt::UserRole).value<Diagnostic>();
if (!diagnostic.isValid())
return widget;
// Add summary label // Add summary label
QLabel *summaryLineLabel = createSummaryLabel(diagnostic); QLabel *summaryLineLabel = createSummaryLabel(diagnostic);