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

Debugger: Remove DetailedErrorDelegate

Browse Source 
Change-Id: I08cd9af5e11e705378a53075c7fade44fc3246ce
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Nikolai Kosjar
2018-05-16 10:41:34 +02:00
parent f129ed9d96
commit f452896308
4 changed files with 38 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/valgrind/xmlprotocol/errorlistmodel.cpp
View File

@@ -173,24 +173,16 @@ ErrorItem::ErrorItem(const ErrorListModel *model, const Error &error)
}
}
static QVariant location(const Frame &frame, int role)
static QVariant locationData(int role, const Frame &frame)
{
switch (role) {
case Debugger::DetailedErrorView::LocationRole:
return QVariant::fromValue(Debugger::DiagnosticLocation(frame.filePath(), frame.line(), 0));
case Qt::ToolTipRole:
return frame.filePath().isEmpty() ? QVariant() : QVariant(frame.filePath());
default:
return QVariant();
}
const Debugger::DiagnosticLocation location(frame.filePath(), frame.line(), 0);
return Debugger::DetailedErrorView::locationData(role, location);
}
QVariant ErrorItem::data(int column, int role) const
{
if (column == Debugger::DetailedErrorView::LocationColumn) {
const Frame frame = m_model->findRelevantFrame(m_error);
return location(frame, role);
}
if (column == Debugger::DetailedErrorView::LocationColumn)
return locationData(role, m_model->findRelevantFrame(m_error));
// DiagnosticColumn
switch (role) {
@@ -243,7 +235,7 @@ QVariant StackItem::data(int column, int role) const
{
const ErrorItem * const errorItem = getErrorItem();
if (column == Debugger::DetailedErrorView::LocationColumn)
return location(errorItem->modelPrivate()->findRelevantFrame(errorItem->error()), role);
return locationData(role, errorItem->modelPrivate()->findRelevantFrame(errorItem->error()));
// DiagnosticColumn
switch (role) {
@@ -271,7 +263,7 @@ FrameItem::FrameItem(const Frame &frame) : m_frame(frame)
QVariant FrameItem::data(int column, int role) const
{
if (column == Debugger::DetailedErrorView::LocationColumn)
return location(m_frame, role);
return locationData(role, m_frame);
// DiagnosticColumn
switch (role) {