1 files changed, 14 insertions, 7 deletions
diff --git a/src/plugins/debugger/stackhandler.h b/src/plugins/debugger/stackhandler.h
index 28c5cd1029..1cbda98ad2 100644
--- a/src/plugins/debugger/stackhandler.h
+++ b/src/plugins/debugger/stackhandler.h
@@ -37,9 +37,13 @@
 
 #include <QtGui/QIcon>
 
+
 namespace Debugger {
 namespace Internal {
 
+class DebuggerEngine;
+class DisassemblerViewAgent;
+
 ////////////////////////////////////////////////////////////////////////
 //
 // StackModel
@@ -54,6 +58,7 @@ struct StackCookie
     bool gotoLocation;
 };
 
+
 ////////////////////////////////////////////////////////////////////////
 //
 // StackModel
@@ -66,10 +71,11 @@ class StackHandler : public QAbstractTableModel
     Q_OBJECT
 
 public:
-    StackHandler(QObject *parent = 0);
+    explicit StackHandler(DebuggerEngine *engine);
+    ~StackHandler();
 
-    void setFrames(const QList<StackFrame> &frames, bool canExpand = false);
-    QList<StackFrame> frames() const;
+    void setFrames(const StackFrames &frames, bool canExpand = false);
+    StackFrames frames() const;
     void setCurrentIndex(int index);
     int currentIndex() const { return m_currentIndex; }
     StackFrame currentFrame() const;
@@ -78,7 +84,7 @@ public:
 
     // Called from StackHandler after a new stack list has been received
     void removeAll();
-    QAbstractItemModel *stackModel() { return this; }
+    QAbstractItemModel *model() { return this; }
     bool isDebuggingDebuggingHelpers() const;
 
 private:
@@ -86,19 +92,20 @@ private:
     int rowCount(const QModelIndex &parent) const;
     int columnCount(const QModelIndex &parent) const;
     QVariant data(const QModelIndex &index, int role) const;
+    bool setData(const QModelIndex &index, const QVariant &, int role);
     QVariant headerData(int section, Qt::Orientation orientation, int role) const;
     Qt::ItemFlags flags(const QModelIndex &index) const;
     Q_SLOT void resetModel() { reset(); }
 
-    QList<StackFrame> m_stackFrames;
+    DebuggerEngine *m_engine;
+    DisassemblerViewAgent *m_disassemblerViewAgent;
+    StackFrames m_stackFrames;
     int m_currentIndex;
     const QVariant m_positionIcon;
     const QVariant m_emptyIcon;
     bool m_canExpand;
 };
 
-
-
 } // namespace Internal
 } // namespace Debugger