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

Debugger: Fixes around watch editing.

Browse Source 
assignValueInDebugger: Pass on WatchData as well, pass
on values as QVariant. Based on that, do more extensive
checks in CDB, preventing assignment of non-PODs.

Locals/Watch editing:
* Disable while running
* Edit pointer values as hex with validation.

CDB: Strip class types off reported pointer values and reformat
the values as short 0x-pointer values, introduce flag to
WatchData::source to do dumper expansion handling.

Windows: recognize int64 as int.

Register handler: Fix accessing uninitialized value.
This commit is contained in:
Friedemann Kleint
2010-09-23 13:22:08 +02:00
parent d81d90a67a
commit 13c97d652e
24 changed files with 197 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins/debugger/watchwindow.cpp
View File

@@ -93,36 +93,42 @@ public:
{
if (index.column() == 1) {
editor->setProperty("modelData", index.data(Qt::EditRole));
} else {
QLineEdit *lineEdit = qobject_cast<QLineEdit *>(editor);
QTC_ASSERT(lineEdit, return);
return;
}
QLineEdit *lineEdit = qobject_cast<QLineEdit *>(editor);
QTC_ASSERT(lineEdit, return);
if (index.column() == 0) {
// Watch window: Edit expression in name column.
lineEdit->setText(index.data(LocalsExpressionRole).toString());
} else {
// To be implemented: Edit type (of a pointer, say).
lineEdit->setText(index.data(Qt::EditRole).toString());
}
}
void setModelData(QWidget *editor, QAbstractItemModel *model,
const QModelIndex &index) const
{
const QString exp = index.data(LocalsExpressionRole).toString();
if (index.column() == 1) { // The value column.
const QVariant value = editor->property("modelData");
QTC_ASSERT(value.isValid(), return);
const QString command = exp + QLatin1Char('=') + value.toString();
model->setData(index, QVariant(command), RequestAssignValueRole);
model->setData(index, value, RequestAssignValueRole);
return;
}
//qDebug() << "SET MODEL DATA";
QLineEdit *lineEdit = qobject_cast<QLineEdit*>(editor);
const QLineEdit *lineEdit = qobject_cast<const QLineEdit*>(editor);
QTC_ASSERT(lineEdit, return);
const QString value = lineEdit->text();
model->setData(index, value, Qt::EditRole);
if (index.column() == 2) {
// The type column.
model->setData(index, QString(exp + '=' + value), RequestAssignTypeRole);
model->setData(index, QVariant(value), RequestAssignTypeRole);
} else if (index.column() == 0) {
// The watcher name column.
model->setData(index, exp, RequestRemoveWatchExpressionRole);
model->setData(index, value, RequestWatchExpressionRole);
// The watcher name column: Change the expression.
const QString exp = index.data(LocalsExpressionRole).toString();
if (exp != value ) {
model->setData(index, exp, RequestRemoveWatchExpressionRole);
model->setData(index, value, RequestWatchExpressionRole);
}
}
}