Debugger: Sanitize Datatypes, part 2: Stackframes.

Make address a quint64. Enable DisassemblerViewAgent
to match the disassembly-addresses by converting the numbers,
making it more robust. Remove the complicated formatting needed
for CDB.

1 files changed, 4 insertions, 2 deletions

diff --git a/src/plugins/debugger/stackhandler.cpp b/src/plugins/debugger/stackhandler.cpp
index 5718bca199..afe9aac45b 100644
--- a/src/plugins/debugger/stackhandler.cpp
+++ b/src/plugins/debugger/stackhandler.cpp
@@ -117,7 +117,9 @@ QVariant StackHandler::data(const QModelIndex &index, int role) const
         case 3: // Line number
             return frame.line;
         case 4: // Address
-            return frame.address;
+            if (frame.address)
+                return QString::fromAscii("0x%1").arg(frame.address, 0, 16);
+            return QString();
         }
         return QVariant();
     }
@@ -225,7 +227,7 @@ void StackHandler::setFrames(const StackFrames &frames, bool canExpand)
     reset();
 }
 
-StackFrames StackHandler::frames() const
+const StackFrames &StackHandler::frames() const
 {
     return m_stackFrames;
 }