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

Debugger: Consolidate icon storage handling

Browse Source 
We settled now on global objects being fine for the purpose
in Core and ProjectExplorer, so there's no point in using
something more fancy in the debugger.

Change-Id: I72e45f398c09d22894419c274dfbea77da0fc153
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2016-06-27 14:38:36 +02:00
parent 5199f84f60
commit 2a104dcfe7
15 changed files with 188 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/debugger/stackhandler.cpp
View File

@@ -54,9 +54,7 @@ namespace Internal {
*/
StackHandler::StackHandler(DebuggerEngine *engine)
: m_engine(engine),
m_positionIcon(Icons::LOCATION.icon()),
m_emptyIcon(Icons::EMPTY.icon())
: m_engine(engine)
{
setObjectName(QLatin1String("StackModel"));
m_resetLocationScheduled = false;
@@ -93,7 +91,7 @@ QVariant StackHandler::data(const QModelIndex &index, int role) const
if (role == Qt::DisplayRole && index.column() == StackFunctionNameColumn)
return tr("<More>");
if (role == Qt::DecorationRole && index.column() == StackLevelColumn)
return m_emptyIcon;
return Icons::EMPTY.icon();
return QVariant();
}
@@ -120,7 +118,7 @@ QVariant StackHandler::data(const QModelIndex &index, int role) const
if (role == Qt::DecorationRole && index.column() == StackLevelColumn) {
// Return icon that indicates whether this is the active stack frame
return (m_contentsValid && index.row() == m_currentIndex)
? m_positionIcon : m_emptyIcon;
? Icons::LOCATION.icon() : Icons::EMPTY.icon();
}
if (role == Qt::ToolTipRole && boolSetting(UseToolTipsInStackView))