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

Debugger: Introduce enum for columns in breakpoint view

Browse Source 
Change-Id: I771c7fceed31739cfe504ba660796d48fb518a5e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2016-06-03 12:04:14 +02:00
parent b001122900
commit 36a6585fb5
3 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/debugger/breakhandler.cpp
View File

@@ -602,13 +602,13 @@ QVariant BreakpointItem::data(int column, int role) const
}
switch (column) {
case 0:
case BreakpointNumberColumn:
if (role == Qt::DisplayRole)
return m_id.toString();
if (role == Qt::DecorationRole)
return icon();
break;
case 1:
case BreakpointFunctionColumn:
if (role == Qt::DisplayRole) {
if (!m_response.functionName.isEmpty())
return simplifyType(m_response.functionName);
@@ -634,7 +634,7 @@ QVariant BreakpointItem::data(int column, int role) const
return empty;
}
break;
case 2:
case BreakpointFileColumn:
if (role == Qt::DisplayRole) {
QString str;
if (!m_response.fileName.isEmpty())
@@ -654,7 +654,7 @@ QVariant BreakpointItem::data(int column, int role) const
return empty;
}
break;
case 3:
case BreakpointLineColumn:
if (role == Qt::DisplayRole) {
if (m_response.lineNumber > 0)
return m_response.lineNumber;
@@ -665,7 +665,7 @@ QVariant BreakpointItem::data(int column, int role) const
if (role == Qt::UserRole + 1)
return m_params.lineNumber;
break;
case 4:
case BreakpointAddressColumn:
if (role == Qt::DisplayRole) {
const quint64 address = orig ? m_params.address : m_response.address;
if (address)
@@ -673,7 +673,7 @@ QVariant BreakpointItem::data(int column, int role) const
return QVariant();
}
break;
case 5:
case BreakpointConditionColumn:
if (role == Qt::DisplayRole)
return orig ? m_params.condition : m_response.condition;
if (role == Qt::ToolTipRole)
@@ -681,7 +681,7 @@ QVariant BreakpointItem::data(int column, int role) const
if (role == Qt::UserRole + 1)
return m_params.condition;
break;
case 6:
case BreakpointIgnoreColumn:
if (role == Qt::DisplayRole) {
const int ignoreCount =
orig ? m_params.ignoreCount : m_response.ignoreCount;
@@ -692,7 +692,7 @@ QVariant BreakpointItem::data(int column, int role) const
if (role == Qt::UserRole + 1)
return m_params.ignoreCount;
break;
case 7:
case BreakpointThreadsColumn:
if (role == Qt::DisplayRole)
return BreakHandler::displayFromThreadSpec(orig ? m_params.threadSpec : m_response.threadSpec);
if (role == Qt::ToolTipRole)