From c3650bf269fa77b4ec647bbe803e0309c0427b6f Mon Sep 17 00:00:00 2001
From: hjk <hjk121@nokiamail.com>
Date: Thu, 18 Dec 2014 13:25:54 +0100
Subject: [PATCH] Debugger: Use an enum for column numbers in stack view

Easier to read.

Change-Id: I85abf6e8c881b4d521f7791625cff37bbd2fffdc
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
---
 src/plugins/debugger/stackhandler.cpp | 20 ++++++++++----------
 src/plugins/debugger/stackhandler.h   | 10 ++++++++++
 src/plugins/debugger/stackwindow.cpp  |  6 +++---
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/plugins/debugger/stackhandler.cpp b/src/plugins/debugger/stackhandler.cpp
index 6ba5ecd5426..eeb3ad948c6 100644
--- a/src/plugins/debugger/stackhandler.cpp
+++ b/src/plugins/debugger/stackhandler.cpp
@@ -84,7 +84,7 @@ int StackHandler::rowCount(const QModelIndex &parent) const
 
 int StackHandler::columnCount(const QModelIndex &parent) const
 {
-    return parent.isValid() ? 0 : 5;
+    return parent.isValid() ? 0 : StackColumnCount;
 }
 
 QVariant StackHandler::data(const QModelIndex &index, int role) const
@@ -93,11 +93,11 @@ QVariant StackHandler::data(const QModelIndex &index, int role) const
         return QVariant();
 
     if (index.row() == m_stackFrames.size()) {
-        if (role == Qt::DisplayRole && index.column() == 0)
+        if (role == Qt::DisplayRole && index.column() == StackLevelColumn)
             return tr("...");
-        if (role == Qt::DisplayRole && index.column() == 1)
+        if (role == Qt::DisplayRole && index.column() == StackFunctionNameColumn)
             return tr("<More>");
-        if (role == Qt::DecorationRole && index.column() == 0)
+        if (role == Qt::DecorationRole && index.column() == StackLevelColumn)
             return m_emptyIcon;
         return QVariant();
     }
@@ -106,15 +106,15 @@ QVariant StackHandler::data(const QModelIndex &index, int role) const
 
     if (role == Qt::DisplayRole) {
         switch (index.column()) {
-        case 0: // Stack frame level
+        case StackLevelColumn:
             return QString::number(frame.level);
-        case 1: // Function name
+        case StackFunctionNameColumn:
             return simplifyType(frame.function);
-        case 2: // File name
+        case StackFileNameColumn:
             return frame.file.isEmpty() ? frame.from : QFileInfo(frame.file).fileName();
-        case 3: // Line number
+        case StackLineNumberColumn:
             return frame.line > 0 ? QVariant(frame.line) : QVariant();
-        case 4: // Address
+        case StackAddressColumn:
             if (frame.address)
                 return QString::fromLatin1("0x%1").arg(frame.address, 0, 16);
             return QString();
@@ -122,7 +122,7 @@ QVariant StackHandler::data(const QModelIndex &index, int role) const
         return QVariant();
     }
 
-    if (role == Qt::DecorationRole && index.column() == 0) {
+    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;
diff --git a/src/plugins/debugger/stackhandler.h b/src/plugins/debugger/stackhandler.h
index 988cc20c8a2..8b59016ead9 100644
--- a/src/plugins/debugger/stackhandler.h
+++ b/src/plugins/debugger/stackhandler.h
@@ -38,6 +38,16 @@
 namespace Debugger {
 namespace Internal {
 
+enum StackColumns
+{
+    StackLevelColumn,
+    StackFunctionNameColumn,
+    StackFileNameColumn,
+    StackLineNumberColumn,
+    StackAddressColumn,
+    StackColumnCount = StackAddressColumn,
+};
+
 ////////////////////////////////////////////////////////////////////////
 //
 // StackCookie
diff --git a/src/plugins/debugger/stackwindow.cpp b/src/plugins/debugger/stackwindow.cpp
index f2193a91a4c..eabf7f75221 100644
--- a/src/plugins/debugger/stackwindow.cpp
+++ b/src/plugins/debugger/stackwindow.cpp
@@ -71,7 +71,7 @@ StackTreeView::StackTreeView()
 
 void StackTreeView::showAddressColumn(bool on)
 {
-    setColumnHidden(4, !on);
+    setColumnHidden(StackAddressColumn, !on);
 }
 
 void StackTreeView::rowActivated(const QModelIndex &index)
@@ -82,8 +82,8 @@ void StackTreeView::rowActivated(const QModelIndex &index)
 void StackTreeView::setModel(QAbstractItemModel *model)
 {
     BaseTreeView::setModel(model);
-    resizeColumnToContents(0);
-    resizeColumnToContents(3);
+    resizeColumnToContents(StackLevelColumn);
+    resizeColumnToContents(StackLineNumberColumn);
     showAddressColumn(action(UseAddressInStackView)->isChecked());
 }