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

ClangTools: Get rid of some dynamic_casts

Browse Source 
Change-Id: I5b6ebbf993fdf9954f7c5df66a09266b6b155aaf
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Nikolai Kosjar
2019-02-11 15:39:41 +01:00
parent caf6949548
commit baa6b7eab3
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp
View File

@@ -623,9 +623,10 @@ bool DiagnosticFilterModel::filterAcceptsRow(int sourceRow,
// DiagnosticItem // DiagnosticItem
Utils::TreeItem *parentItem = model->itemForIndex(sourceParent); Utils::TreeItem *parentItem = model->itemForIndex(sourceParent);
if (auto filePathItem = dynamic_cast<FilePathItem *>(parentItem)) { QTC_ASSERT(parentItem, return true);
auto diagnosticItem = dynamic_cast<DiagnosticItem *>(filePathItem->childAt(sourceRow)); if (parentItem->level() == 1) {
QTC_ASSERT(diagnosticItem, return false); auto filePathItem = static_cast<FilePathItem *>(parentItem);
auto diagnosticItem = static_cast<DiagnosticItem *>(filePathItem->childAt(sourceRow));
// Is the diagnostic explicitly suppressed? // Is the diagnostic explicitly suppressed?
const Diagnostic &diag = diagnosticItem->diagnostic(); const Diagnostic &diag = diagnosticItem->diagnostic();
@@ -651,11 +652,12 @@ bool DiagnosticFilterModel::lessThan(const QModelIndex &l, const QModelIndex &r)
{ {
auto model = static_cast<ClangToolsDiagnosticModel *>(sourceModel()); auto model = static_cast<ClangToolsDiagnosticModel *>(sourceModel());
Utils::TreeItem *itemLeft = model->itemForIndex(l); Utils::TreeItem *itemLeft = model->itemForIndex(l);
const bool isComparingDiagnostics = !dynamic_cast<FilePathItem *>(itemLeft); QTC_ASSERT(itemLeft, return QSortFilterProxyModel::lessThan(l, r));
const bool isComparingDiagnostics = itemLeft->level() > 1;
if (sortColumn() == Debugger::DetailedErrorView::DiagnosticColumn && isComparingDiagnostics) { if (sortColumn() == Debugger::DetailedErrorView::DiagnosticColumn && isComparingDiagnostics) {
bool result = false; bool result = false;
if (dynamic_cast<DiagnosticItem *>(itemLeft)) { if (itemLeft->level() == 2) {
using Debugger::DiagnosticLocation; using Debugger::DiagnosticLocation;
const int role = Debugger::DetailedErrorView::LocationRole; const int role = Debugger::DetailedErrorView::LocationRole;
@@ -669,8 +671,11 @@ bool DiagnosticFilterModel::lessThan(const QModelIndex &l, const QModelIndex &r)
result = std::tie(leftLoc.line, leftLoc.column, leftText) result = std::tie(leftLoc.line, leftLoc.column, leftText)
< std::tie(rightLoc.line, rightLoc.column, rightText); < std::tie(rightLoc.line, rightLoc.column, rightText);
} else if (auto left = dynamic_cast<ExplainingStepItem *>(itemLeft)) { } else if (itemLeft->level() == 3) {
const auto right = dynamic_cast<ExplainingStepItem *>(model->itemForIndex(r)); Utils::TreeItem *itemRight = model->itemForIndex(r);
QTC_ASSERT(itemRight, QSortFilterProxyModel::lessThan(l, r));
const auto left = static_cast<ExplainingStepItem *>(itemLeft);
const auto right = static_cast<ExplainingStepItem *>(itemRight);
result = left->index() < right->index(); result = left->index() < right->index();
} else { } else {
QTC_CHECK(false && "Unexpected item"); QTC_CHECK(false && "Unexpected item");