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

Revert "Enabled the use of Debugger-specific watch/locals models."

Browse Source 
This reverts commit abf5e3ddc3.
This commit is contained in:
hjk
2009-07-13 09:11:07 +02:00
parent d29bdf7126
commit ad46f1286f
29 changed files with 698 additions and 1799 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/plugins/debugger/cdb/cdbstacktracecontext.cpp
View File

@@ -28,11 +28,11 @@
**************************************************************************/
#include "cdbstacktracecontext.h"
#include "cdbstackframecontext.h"
#include "cdbbreakpoint.h"
#include "cdbsymbolgroupcontext.h"
#include "cdbdebugengine_p.h"
#include "cdbdumperhelper.h"
#include "debuggeractions.h"
#include <QtCore/QDir>
#include <QtCore/QTextStream>
@@ -90,7 +90,7 @@ bool CdbStackTraceContext::init(unsigned long frameCount, QString * /*errorMessa
qDebug() << Q_FUNC_INFO << frameCount;
m_frameContexts.resize(frameCount);
qFill(m_frameContexts, static_cast<CdbSymbolGroupContext*>(0));
qFill(m_frameContexts, static_cast<CdbStackFrameContext*>(0));
// Convert the DEBUG_STACK_FRAMEs to our StackFrame structure and populate the frames
WCHAR wszBuf[MAX_PATH];
@@ -145,7 +145,7 @@ static inline QString msgFrameContextFailed(int index, const StackFrame &f, cons
arg(index).arg(f.function).arg(f.line).arg(f.file, why);
}
CdbSymbolGroupContext *CdbStackTraceContext::symbolGroupAt(int index, QString *errorMessage)
CdbStackFrameContext *CdbStackTraceContext::frameContextAt(int index, QString *errorMessage)
{
// Create a frame on demand
if (debugCDB)
@@ -158,7 +158,6 @@ CdbSymbolGroupContext *CdbStackTraceContext::symbolGroupAt(int index, QString *e
}
if (m_frameContexts.at(index))
return m_frameContexts.at(index);
// Create COM and wrap
CIDebugSymbolGroup *sg = createSymbolGroup(index, errorMessage);
if (!sg) {
*errorMessage = msgFrameContextFailed(index, m_frames.at(index), *errorMessage);
@@ -169,8 +168,9 @@ CdbSymbolGroupContext *CdbStackTraceContext::symbolGroupAt(int index, QString *e
*errorMessage = msgFrameContextFailed(index, m_frames.at(index), *errorMessage);
return 0;
}
m_frameContexts[index] = sc;
return sc;
CdbStackFrameContext *fr = new CdbStackFrameContext(m_dumper, sc);
m_frameContexts[index] = fr;
return fr;
}
CIDebugSymbolGroup *CdbStackTraceContext::createSymbolGroup(int index, QString *errorMessage)
@@ -198,49 +198,6 @@ CIDebugSymbolGroup *CdbStackTraceContext::createSymbolGroup(int index, QString *
return sg;
}
bool CdbStackTraceContext::editorToolTip(int frameIndex,
const QString &iname,
QString *value,
QString *errorMessage)
{
value->clear();
// Look up iname in the frame's symbol group.
CdbSymbolGroupContext *m_symbolContext = symbolGroupAt(frameIndex, errorMessage);
if (!m_symbolContext)
return false;
unsigned long index;
if (!m_symbolContext->lookupPrefix(iname, &index)) {
*errorMessage = QString::fromLatin1("%1 not found.").arg(iname);
return false;
}
const WatchData wd = m_symbolContext->symbolAt(index);
// Check dumpers. Should actually be just one item.
if (theDebuggerBoolSetting(UseDebuggingHelpers) && m_dumper->isEnabled()) {
QList<WatchData> result;
if (CdbDumperHelper::DumpOk == m_dumper->dumpType(wd, false, 1, &result, errorMessage)) {
foreach (const WatchData &dwd, result) {
if (!value->isEmpty())
value->append(QLatin1Char('\n'));
value->append(dwd.toToolTip());
}
return true;
} // Dumped ok
} // has Dumpers
*value = wd.toToolTip();
return true;
}
bool CdbStackTraceContext::assignValue(int frameIndex,
const QString &iname,
const QString &value,
QString *newValue /* = 0 */, QString *errorMessage)
{
if (CdbSymbolGroupContext *symbolContext = symbolGroupAt(frameIndex, errorMessage))
return symbolContext->assignValue(iname, value, newValue, errorMessage);
return false;
}
QString CdbStackTraceContext::toString() const
{
QString rc;